diff --git a/crates/ide-host/src/ops/debug.rs b/crates/ide-host/src/ops/debug.rs index 89dcd1a92..d90d436cb 100644 --- a/crates/ide-host/src/ops/debug.rs +++ b/crates/ide-host/src/ops/debug.rs @@ -9,6 +9,32 @@ use std::path::PathBuf; /// Starts a session owned by this window: its events (and those of child sessions) go here only. pub async fn debug_start(host: &Host, window: &str, config: LaunchConfig) -> IdeResult { + debug_start_request(host, window, config, None).await +} + +pub async fn debug_start_request( + host: &Host, + window: &str, + config: LaunchConfig, + request: Option, +) -> IdeResult { + let cancel = request.map(|id| host.begin_request(id)).unwrap_or_default(); + let result = debug_start_inner(host, window, config, &cancel).await; + if let Some(id) = request { + host.end_request(id); + } + result +} + +async fn debug_start_inner( + host: &Host, + window: &str, + config: LaunchConfig, + cancel: &ide_core::CancellationToken, +) -> IdeResult { + if cancel.is_cancelled() { + return Err(ide_core::IdeError::cancelled()); + } host.require_trust(window)?; let target_id = config .extra_json @@ -17,7 +43,7 @@ pub async fn debug_start(host: &Host, window: &str, config: LaunchConfig) -> Ide .and_then(|v| v.get("__runTarget").and_then(|v| v.as_str()).map(str::to_owned)); if let Some(id) = target_id { let owner = SessionOwner::new(host.owner_window(window), host.window_sink(window)); - return target::start(host, window, config, owner, id).await; + return target::start(host, window, config, owner, id, cancel).await; } let mut config = match_java_debug_encoding(config, cfg!(windows)); if config.adapter == "debugpy" @@ -392,7 +418,9 @@ pub async fn debug_redefine_classes(host: &Host, _window: &str, session: DebugSe /// Commands of this module the remote server answers. pub(crate) fn register(d: &mut Dispatcher) { - d.add("debug_start", |c| async move { debug_start(&c.host, &c.window, c.arg("config")?).await }); + d.add("debug_start", |c| async move { + debug_start_request(&c.host, &c.window, c.arg("config")?, c.arg("request")?).await + }); d.add("debug_set_breakpoints", |c| async move { debug_set_breakpoints(&c.host, &c.window, c.arg("path")?, c.arg("breakpoints")?).await }); diff --git a/crates/ide-host/src/ops/debug/target.rs b/crates/ide-host/src/ops/debug/target.rs index 2dfb4e9cd..d132dd038 100644 --- a/crates/ide-host/src/ops/debug/target.rs +++ b/crates/ide-host/src/ops/debug/target.rs @@ -12,6 +12,7 @@ pub(super) async fn start( mut config: LaunchConfig, owner: SessionOwner, id: String, + cancel: &ide_core::CancellationToken, ) -> IdeResult { let project = host.project(window)?; let plugins = @@ -33,6 +34,23 @@ pub(super) async fn start( { return Err(IdeError::invalid("This debugger does not support plugin run targets")); } + let program = config + .extra_json + .as_deref() + .and_then(|s| serde_json::from_str::(s).ok()) + .and_then(|v| v.get("__runTargetProgram").and_then(|p| p.as_str()).map(str::to_owned)) + .or_else(|| config.program.clone()) + .unwrap_or_else(|| dbg.command.clone()); + let metadata = serde_json::from_value(json!({"id":"debug", "name":config.name, "kind":"shell", "command":program, "args":[], "cwd":config.cwd, "env":{}, "detected":false, "isTest":false})) + .map_err(|e| IdeError::invalid(e.to_string()))?; + let (validator, root, target, token) = (plugins.clone(), project.root.clone(), id.clone(), cancel.clone()); + host.blocking(move || { + validator.prepare_run_target_launch(&root, &target, &metadata, ide_plugin::RunTargetOperation::Debug, &token) + }) + .await?; + if cancel.is_cancelled() { + return Err(IdeError::cancelled()); + } let mapping = TargetMapping { paths: PathMapping::new(&project.root.to_string_lossy(), &container), external_prefix: format!( @@ -48,6 +66,7 @@ pub(super) async fn start( .map_err(|e| IdeError::invalid(e.to_string()))? .unwrap_or(json!({})); extra.as_object_mut().ok_or_else(|| IdeError::invalid("invalid debug launch arguments"))?.remove("__runTarget"); + extra.as_object_mut().unwrap().remove("__runTargetProgram"); // DAP paths already use target coordinates; adapter-native mappings stay identity. if placement == "connect-back" { config.program = None; diff --git a/crates/ide-host/src/ops/run.rs b/crates/ide-host/src/ops/run.rs index 48d06856b..d29f2a0e1 100644 --- a/crates/ide-host/src/ops/run.rs +++ b/crates/ide-host/src/ops/run.rs @@ -203,8 +203,22 @@ pub fn apply_settings(host: &Host, window: &str, configs: Vec) -> Ide } pub async fn start(host: &Host, window: &str, config: RunConfig, on_output: Emit) -> IdeResult { + start_request(host, window, config, on_output, None).await +} + +pub async fn start_request( + host: &Host, + window: &str, + config: RunConfig, + on_output: Emit, + request: Option, +) -> IdeResult { + let cancel = request.map(|id| host.begin_request(id)).unwrap_or_default(); let operation = config.extras.params.get("plugin.operation").cloned(); - let result = start_inner(host, window, config, on_output).await; + let result = start_inner(host, window, config, on_output, &cancel).await; + if let Some(id) = request { + host.end_request(id); + } if let (Ok(info), Some(operation), Some(plugins)) = (&result, operation, host.plugin_host()) { plugins.run_operation_started(window, &operation, info.id); } @@ -216,7 +230,11 @@ async fn start_inner( window: &str, mut config: RunConfig, on_output: Emit, + cancel: &ide_core::CancellationToken, ) -> IdeResult { + if cancel.is_cancelled() { + return Err(IdeError::cancelled()); + } host.require_trust(window)?; let project = host.project(window)?; if config.extras.target.is_none() { @@ -259,7 +277,23 @@ async fn start_inner( host.plugin_host().ok_or_else(|| IdeError::not_found("plugin run target is no longer available"))?; let root = project.root.clone(); let id = id.to_owned(); - let config = host.blocking(move || plugins.prepare_run_target(&root, &id, &config)).await?; + let token = cancel.clone(); + let config = host + .blocking(move || { + let operation = + if config.extras.params.get("plugin.targetOperation").is_some_and(|op| op == "debug") { + ide_plugin::RunTargetOperation::Debug + } else if config.is_test { + ide_plugin::RunTargetOperation::Test + } else { + ide_plugin::RunTargetOperation::Run + }; + plugins.prepare_run_target_launch(&root, &id, &config, operation, &token) + }) + .await?; + if cancel.is_cancelled() { + return Err(IdeError::cancelled()); + } project.require_trust()?; return host.processes.start( &project.root, diff --git a/crates/ide-host/src/plugins/mod.rs b/crates/ide-host/src/plugins/mod.rs index 1b339bbce..bdfae2b43 100644 --- a/crates/ide-host/src/plugins/mod.rs +++ b/crates/ide-host/src/plugins/mod.rs @@ -143,6 +143,8 @@ struct Meta { retry_at: Option, /// The component exports `syntax-provider` (known once activated). has_syntax: bool, + /// Known before activation can publish target registrations. + has_run_target_validation: bool, /// Next `on-schedule` activation. next_schedule: Option, /// The trusted publisher of a signed installed package. @@ -164,6 +166,7 @@ impl Meta { failures: 0, retry_at: None, has_syntax: false, + has_run_target_validation: false, publisher: None, next_schedule: None, } @@ -1432,6 +1435,20 @@ impl PluginHost { cancel: Option<&ide_core::CancellationToken>, f: impl Fn(&mut Runtime, Invocation) -> Result + Clone + Send + 'static, ) -> IdeResult { + self.code_call_with_budget(id, invocation, what, cancel, None, f) + } + + fn code_call_with_budget( + &self, + id: &str, + invocation: Invocation, + what: &str, + cancel: Option<&ide_core::CancellationToken>, + budget: Option, + f: impl Fn(&mut Runtime, Invocation) -> Result + Clone + Send + 'static, + ) -> IdeResult { + let deadline = budget.map(|budget| Instant::now() + budget); + let fallback = ide_core::CancellationToken::new(); let plugin = self.get(id)?; let client = invocation.client.clone(); { @@ -1472,10 +1489,25 @@ impl PluginHost { } let started = Instant::now(); let (call, inv) = (f.clone(), invocation.clone()); - let result = match cancel { - Some(cancel) => actor.call_cancellable(cancel, Duration::from_millis(50), move |rt| call(rt, inv)), - None => actor.call(None, move |rt| call(rt, inv)), + let result = match (deadline, cancel) { + (Some(deadline), cancel) => actor.call_bounded( + cancel.unwrap_or(&fallback), + Duration::from_millis(50), + deadline.saturating_duration_since(Instant::now()), + move |rt| call(rt, inv), + ), + (None, Some(cancel)) => { + actor.call_cancellable(cancel, Duration::from_millis(50), move |rt| call(rt, inv)) + } + (None, None) => actor.call(None, move |rt| call(rt, inv)), }; + if deadline.is_some() && matches!(result, Err(ActorError::SoftTimeout)) { + self.reap(&plugin, &actor, client.as_deref()); + return Err(IdeError::new( + ide_core::error::ErrorKind::TimedOut, + format!("plugin {id:?} timed out while {what}"), + )); + } if matches!(result, Err(ActorError::Cancelled)) { self.reap(&plugin, &actor, client.as_deref()); return Err(IdeError::cancelled()); @@ -2523,6 +2555,7 @@ impl PluginHost { return Err(IdeError::internal(format!("plugin {:?} {e}", plugin.id()))); } }; + plugin.meta.lock().has_run_target_validation = rt.has_run_target_validation(); let crash = match rt.activate() { Ok(_) => None, Err(CallError::Trap(e)) => Some(format!("activation {e}")), diff --git a/crates/ide-host/src/plugins/run_targets.rs b/crates/ide-host/src/plugins/run_targets.rs index 0126440fe..665f69b24 100644 --- a/crates/ide-host/src/plugins/run_targets.rs +++ b/crates/ide-host/src/plugins/run_targets.rs @@ -101,6 +101,28 @@ impl PluginHost { root: &Path, id: &str, config: &ide_run::RunConfig, + ) -> IdeResult { + self.prepare_target(root, id, config, None) + } + + /// Prepares a user launch, including the optional plugin validation gate. + pub fn prepare_run_target_launch( + &self, + root: &Path, + id: &str, + config: &ide_run::RunConfig, + operation: ide_plugin::RunTargetOperation, + cancel: &ide_core::CancellationToken, + ) -> IdeResult { + self.prepare_target(root, id, config, Some((operation, cancel))) + } + + fn prepare_target( + &self, + root: &Path, + id: &str, + config: &ide_run::RunConfig, + launch: Option<(ide_plugin::RunTargetOperation, &ide_core::CancellationToken)>, ) -> IdeResult { if !self.shared.workspace().is_some_and(|w| w.trusted(root)) { return Err(IdeError::new(ide_core::error::ErrorKind::PermissionDenied, "project is not trusted")); @@ -113,7 +135,50 @@ impl PluginHost { .cloned() .ok_or_else(|| IdeError::not_found("plugin run target is no longer available"))?; let program = self.program_for_project(&target.plugin_id, &target.target.program, Some(root))?; - ide_remote::plugin_target::prepare(root, &target.target, &program, config) + let wrapped = ide_remote::plugin_target::prepare(root, &target.target, &program, config)?; + let validates = self.get(&target.plugin_id)?.meta.lock().has_run_target_validation; + if let Some((operation, cancel)) = launch + && validates + { + if cancel.is_cancelled() { + return Err(IdeError::cancelled()); + } + let info = ide_plugin::RunTargetLaunch { + operation, + program: ide_run::wrap::program_name(&config.command), + cwd: wrapped.cwd.as_ref().unwrap().to_string_lossy().into_owned(), + }; + let project_root = root.to_path_buf(); + let invocation = + ide_plugin::Invocation { workspace_root: Some(project_root.clone()), ..Default::default() }; + let (target_id, timeout) = (target.target.id.clone(), self.limits.timeout); + let result = self.code_call_with_budget( + &target.plugin_id, + invocation, + "validating the run target", + Some(cancel), + Some(timeout), + move |rt, _| { + rt.validate_run_target( + project_root.to_string_lossy().into_owned(), + target_id.clone(), + info.clone(), + timeout, + ) + }, + ); + match result { + Ok(Ok(())) => {} + Ok(Err(message)) => return Err(IdeError::invalid(format!("{}: {message}", target.plugin_name))), + Err(error) if error.kind == ide_core::error::ErrorKind::Cancelled => return Err(error), + Err(error) => return Err(IdeError::unavailable(format!("{}: {error}", target.plugin_name))), + } + if cancel.is_cancelled() { + return Err(IdeError::cancelled()); + } + self.program_for_project(&target.plugin_id, &target.target.program, Some(root))?; + } + Ok(wrapped) } } diff --git a/crates/ide-host/src/rpc.rs b/crates/ide-host/src/rpc.rs index ca92ee633..05f12317b 100644 --- a/crates/ide-host/src/rpc.rs +++ b/crates/ide-host/src/rpc.rs @@ -262,7 +262,7 @@ impl Dispatcher { .add("run_system_env", |_| async move { Ok(ide_run::system_env()) }) .add("run_start", |c| async move { let on_output = c.channel("onOutput")?; - ops::run::start(&c.host, &c.window, c.arg("config")?, on_output).await + ops::run::start_request(&c.host, &c.window, c.arg("config")?, on_output, c.arg("request")?).await }) .add("run_stop", |c| async move { ops::run::stop(&c.host, &c.window, c.arg("id")?) }) .add("run_stdin", |c| async move { ops::run::stdin(&c.host, c.arg("id")?, &c.arg::("data")?) }) diff --git a/crates/ide-host/tests/plugin_workbench.rs b/crates/ide-host/tests/plugin_workbench.rs index 715f74e4c..49dd4c344 100644 --- a/crates/ide-host/tests/plugin_workbench.rs +++ b/crates/ide-host/tests/plugin_workbench.rs @@ -396,7 +396,15 @@ async fn run_target_api15_overrides_and_frozen_api14_registration() { for (arg, expected) in cases { plugins.run_command(plugin, command, Some(arg), invocation()).unwrap(); let target = plugins.run_targets(&f.root).into_iter().find(|t| t.plugin_id == plugin).unwrap(); - let wrapped = plugins.prepare_run_target(&f.root, &target.id, &config).unwrap(); + let wrapped = plugins + .prepare_run_target_launch( + &f.root, + &target.id, + &config, + ide_plugin::RunTargetOperation::Run, + &Default::default(), + ) + .unwrap(); assert_eq!(wrapped.args, expected); assert_eq!(PathBuf::from(wrapped.command), tool); assert_eq!(wrapped.cwd.unwrap(), f.root); @@ -421,3 +429,126 @@ async fn run_target_api15_overrides_and_frozen_api14_registration() { } plugins.shutdown(); } + +#[cfg(unix)] +#[tokio::test(flavor = "multi_thread")] +async fn run_target_validation_gates_launches_and_preserves_selection() { + use ide_host::plugins::{Consent, PluginHost}; + use ide_plugin::{Invocation, Limits, RunTargetOperation}; + use std::os::unix::fs::PermissionsExt; + use std::time::Duration; + let f = Harness::new(); + f.host.set_project_trust(&f.root, true, false).await.unwrap(); + let plugins = Arc::new( + PluginHost::new( + f._tmp.path().join("plugins"), + Arc::new(|_: Option<&str>, _| {}), + Limits { + timeout: Duration::from_millis(200), + idle_timeout: Some(Duration::from_millis(20)), + restart_backoff: Duration::ZERO, + ..Default::default() + }, + ) + .unwrap(), + ); + plugins.set_workspace(Some(Arc::new(f.workspace()))); + f.host.set_plugin_host(&plugins); + let fixture = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../ide-plugin/tests/fixtures/execution"); + plugins.install_from_dir(&fixture, &Consent::all()).unwrap(); + let tool = f._tmp.path().join("wrapper"); + std::fs::write(&tool, "#!/bin/sh\ntouch spawned\n").unwrap(); + std::fs::set_permissions(&tool, std::fs::Permissions::from_mode(0o755)).unwrap(); + plugins.choose_program("execution", "process:execution-tool", Some(&f.root), Some(&tool)).unwrap(); + let invocation = + || Invocation { client: Some("main".into()), workspace_root: Some(f.root.clone()), ..Default::default() }; + let config: ide_run::RunConfig = serde_json::from_value(serde_json::json!({ + "id":"composer", "name":"Composer", "kind":"shell", "command":"/tools/composer", "args":["install"], + "env":{"SECRET":"not sent"}, "detected":false, "isTest":false, + })) + .unwrap(); + for id in ["allow", "refuse", "long-refusal", "timeout", "trap"] { + plugins.run_command("execution", "target", Some(id), invocation()).unwrap(); + } + let targets = plugins.run_targets(&f.root); + let id = |name: &str| targets.iter().find(|t| t.target.id == name).unwrap().id.clone(); + for operation in [RunTargetOperation::Run, RunTargetOperation::Test, RunTargetOperation::Debug] { + plugins.prepare_run_target_launch(&f.root, &id("allow"), &config, operation, &Default::default()).unwrap(); + let snapshot = plugins.run_command("execution", "validation", None, invocation()).unwrap().unwrap(); + assert_eq!(snapshot, format!("{}|allow|{operation:?}|composer|{}", f.root.display(), f.root.display())); + } + tokio::time::sleep(Duration::from_millis(30)).await; + plugins.tick(); + assert_eq!(plugins.info_of("execution").unwrap().status, ide_host::plugins::PluginStatus::Inactive); + plugins + .prepare_run_target_launch(&f.root, &id("allow"), &config, RunTargetOperation::Run, &Default::default()) + .unwrap(); + assert!(plugins.info_of("execution").unwrap().stats.reclaims > 0); + // Non-launch consumers (LSP and document reads) do not invoke validation. + assert!(plugins.prepare_run_target(&f.root, &id("refuse"), &config).is_ok()); + let selected = id("refuse"); + ide_host::plugins::run_targets::answer(&f.host, &plugins, "main", &selected, true).unwrap(); + for is_test in [false, true] { + let mut config = config.clone(); + config.is_test = is_test; + config.extras.target = Some(selected.clone()); + let error = ide_host::ops::run::start(&f.host, "main", config, Arc::new(|_| {})).await.unwrap_err(); + assert!(error.message.contains("Plugin execution tests: Project runtime is stopped"), "{error}"); + assert!(f.host.processes.list().is_empty()); + assert!(!f.root.join("spawned").exists()); + assert_eq!(f.host.project("main").unwrap().settings.effective().run.default_target, selected); + assert_eq!(plugins.run_targets(&f.root).len(), targets.len()); + } + for adapter in ["php-debug", "debugpy"] { + let launch = ide_dap::LaunchConfig { + name: "Refused debug".into(), + adapter: adapter.into(), + request: "launch".into(), + program: Some("app.php".into()), + args: Vec::new(), + cwd: Some(f.root.clone().into()), + env: Default::default(), + extra_json: Some(serde_json::json!({"__runTarget":selected, "__runTargetProgram":"php"}).to_string()), + }; + let error = ide_host::ops::debug::debug_start(&f.host, "main", launch).await.unwrap_err(); + assert!(error.message.contains("Project runtime is stopped"), "{adapter}: {error}"); + assert!(f.host.debugger.sessions(None).is_empty()); + } + let error = plugins + .prepare_run_target_launch(&f.root, &id("long-refusal"), &config, RunTargetOperation::Run, &Default::default()) + .unwrap_err(); + assert!(error.message.len() < 4200); + let request = ide_core::RequestId(2408); + let mut cfg = config.clone(); + cfg.extras.target = Some(id("timeout")); + let worker = f.host.clone(); + let pending = tokio::spawn(async move { + ide_host::ops::run::start_request(&worker, "main", cfg, Arc::new(|_| {}), Some(request)).await + }); + tokio::time::sleep(Duration::from_millis(30)).await; + f.host.cancel_request(request); + assert_eq!(pending.await.unwrap().unwrap_err().kind, ide_core::error::ErrorKind::Cancelled); + for name in ["timeout", "trap"] { + let started = std::time::Instant::now(); + let error = plugins + .prepare_run_target_launch(&f.root, &id(name), &config, RunTargetOperation::Run, &Default::default()) + .unwrap_err(); + assert!(error.message.contains("Plugin execution tests"), "{error}"); + if name == "timeout" { + assert!(error.message.contains("timed out"), "{error}"); + assert!(started.elapsed() < Duration::from_secs(2), "background tasks must not extend validation"); + } + assert!(f.host.processes.list().is_empty()); + } + // A cancelled launch never enters the wrapper. + let cancel = ide_core::CancellationToken::new(); + cancel.cancel(); + assert_eq!( + plugins + .prepare_run_target_launch(&f.root, &id("allow"), &config, RunTargetOperation::Run, &cancel) + .unwrap_err() + .kind, + ide_core::error::ErrorKind::Cancelled + ); + plugins.shutdown(); +} diff --git a/crates/ide-host/tests/remote_plugins.rs b/crates/ide-host/tests/remote_plugins.rs index 40374f7f6..dfbc4feb1 100644 --- a/crates/ide-host/tests/remote_plugins.rs +++ b/crates/ide-host/tests/remote_plugins.rs @@ -634,6 +634,28 @@ async fn api14_stage3_remote_terminal_pins_and_exit_events_stay_on_the_execution .await .unwrap(); assert_eq!(invoke(&peer, "plugin_run_targets", json!({})).await.unwrap(), json!([])); + invoke( + &peer, + "plugin_run_command", + json!({"pluginId":"execution", "commandId":"target", "arg":"refuse", "editor":null}), + ) + .await + .unwrap(); + let targets = invoke(&peer, "plugin_run_targets", json!({})).await.unwrap(); + let refused = targets[0]["id"].as_str().unwrap(); + std::fs::remove_file(project.join("wrapped.txt")).unwrap(); + let config = json!({"id":"refused", "name":"Refused", "kind":"shell", "command":"php", "args":[], "env":{}, "detected":false, "isTest":false, "target":refused}); + let error = invoke(&peer, "run_start", json!({"config":config, "onOutput":{"$channel":40}})).await.unwrap_err(); + assert!(error.to_string().contains("Project runtime is stopped"), "{error}"); + assert!(!project.join("wrapped.txt").exists()); + assert!(desktop.run_targets(&project).is_empty()); + invoke( + &peer, + "plugin_run_command", + json!({"pluginId":"execution", "commandId":"untarget", "arg":"refuse", "editor":null}), + ) + .await + .unwrap(); client.plugin_events.lock().clear(); client.events.lock().clear(); let runner = peer.clone(); diff --git a/crates/ide-plugin/src/actor.rs b/crates/ide-plugin/src/actor.rs index fc678f125..b9bd1c1fd 100644 --- a/crates/ide-plugin/src/actor.rs +++ b/crates/ide-plugin/src/actor.rs @@ -196,7 +196,7 @@ impl Actor { grace: Duration, f: impl FnOnce(&mut Runtime) -> Result + Send + 'static, ) -> Result { - self.call_cancellable_before(cancel, grace, None, f) + self.call_cancellable_before(cancel, grace, None, false, f) } /// A cancellable editor call: queued work expires after `soft`, and a @@ -209,7 +209,18 @@ impl Actor { soft: Duration, f: impl FnOnce(&mut Runtime) -> Result + Send + 'static, ) -> Result { - self.call_cancellable_before(cancel, grace, Some(Instant::now() + soft), f) + self.call_cancellable_before(cancel, grace, Some(Instant::now() + soft), false, f) + } + + /// A launch gate's deadline also interrupts running host calls and background tasks. + pub fn call_bounded( + &self, + cancel: &ide_core::CancellationToken, + grace: Duration, + timeout: Duration, + f: impl FnOnce(&mut Runtime) -> Result + Send + 'static, + ) -> Result { + self.call_cancellable_before(cancel, grace, Some(Instant::now() + timeout), true, f) } fn call_cancellable_before( @@ -217,6 +228,7 @@ impl Actor { cancel: &ide_core::CancellationToken, grace: Duration, deadline: Option, + hard_deadline: bool, f: impl FnOnce(&mut Runtime) -> Result + Send + 'static, ) -> Result { let (reply, result) = mpsc::sync_channel(1); @@ -260,7 +272,7 @@ impl Actor { match result.recv_timeout(Duration::from_millis(5)) { Ok(outcome) if cancelled_at.is_some() => { drop(outcome); - return Err(ActorError::Cancelled); + return Err(if cancel.is_cancelled() { ActorError::Cancelled } else { ActorError::SoftTimeout }); } Ok(outcome) => return outcome, Err(mpsc::RecvTimeoutError::Disconnected) => { @@ -268,19 +280,21 @@ impl Actor { } Err(mpsc::RecvTimeoutError::Timeout) => {} } - if !cancel.is_cancelled() { + let timed_out = hard_deadline && deadline.is_some_and(|t| Instant::now() >= t); + if !cancel.is_cancelled() && !timed_out { if deadline.is_some_and(|t| Instant::now() >= t) && !*running.lock().unwrap_or_else(|e| e.into_inner()) { return Err(ActorError::SoftTimeout); } continue; } + let failure = || if cancel.is_cancelled() { ActorError::Cancelled } else { ActorError::SoftTimeout }; match cancelled_at { None => { cancelled_at = Some(Instant::now()); let running = running.lock().unwrap_or_else(|e| e.into_inner()); if !*running { - return Err(ActorError::Cancelled); + return Err(failure()); } self.cancel.cancel_soft(); } @@ -290,7 +304,7 @@ impl Actor { if *running { self.cancel(); } - return Err(ActorError::Cancelled); + return Err(failure()); } Some(_) => {} } diff --git a/crates/ide-plugin/src/execution.rs b/crates/ide-plugin/src/execution.rs index 36c85bd39..8b76a8402 100644 --- a/crates/ide-plugin/src/execution.rs +++ b/crates/ide-plugin/src/execution.rs @@ -151,3 +151,19 @@ pub enum PluginTestEvent { Output(TestOutput), Other { kind: String, data: String }, } + +/// Operation about to launch through a plugin-owned run target (API 1.5). +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum RunTargetOperation { + Run, + Debug, + Test, +} + +/// Launch metadata available to a target validator; arguments and environment are omitted. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct RunTargetLaunch { + pub operation: RunTargetOperation, + pub program: String, + pub cwd: String, +} diff --git a/crates/ide-plugin/src/runtime.rs b/crates/ide-plugin/src/runtime.rs index a3c2e0030..d4437e6f5 100644 --- a/crates/ide-plugin/src/runtime.rs +++ b/crates/ide-plugin/src/runtime.rs @@ -18,6 +18,7 @@ use crate::types::{ }; use crate::wit_host::injections_bindings::exports::openidea::plugin::injections as wit_inj; use crate::wit_host::language_features_bindings::exports::openidea::plugin::language_features as wit_lf; +use crate::wit_host::run_target_validation_bindings::exports::openidea::plugin::run_target_validation as wit_rtv; use crate::wit_host::{ bindings, commit_checks_bindings, details_bindings, endpoints_bindings, file_actions_bindings, hover_bindings, indexing_bindings, inlay_bindings, providers_bindings, semantic_bindings, syntax_bindings, views_bindings, @@ -925,6 +926,7 @@ pub struct Runtime { /// What the component exports: the `plugin` world, plus optional interfaces. struct Exports { + run_target_validation: Option, language_features: Option, injections: Option, plugin: bindings::Plugin, @@ -1062,6 +1064,7 @@ impl Runtime { let endpoint_indices = wit_endpoints::GuestIndices::new(&pre).ok(); let configs_indices = wit_configs::GuestIndices::new(&pre).ok(); let tests_indices = wit_tests::GuestIndices::new(&pre).ok(); + let validation_indices = wit_rtv::GuestIndices::new(&pre).ok(); let lf_indices = wit_lf::GuestIndices::new(&pre).ok(); let inj_indices = wit_inj::GuestIndices::new(&pre).ok(); let mcp_indices = @@ -1073,6 +1076,8 @@ impl Runtime { let test_results = tests_indices.map(|i| i.load(&mut store, &instance)).transpose().map_err(api_hint)?; let language_features = lf_indices.map(|i| i.load(&mut store, &instance)).transpose().map_err(api_hint)?; let injections = inj_indices.map(|i| i.load(&mut store, &instance)).transpose().map_err(api_hint)?; + let run_target_validation = + validation_indices.map(|i| i.load(&mut store, &instance)).transpose().map_err(api_hint)?; let plugin = plugin_indices.load(&mut store, &instance).map_err(api_hint)?; let syntax = match syntax_indices { Some(indices) => Some(indices.load(&mut store, &instance).map_err(api_hint)?), @@ -1125,6 +1130,7 @@ impl Runtime { Ok(Self { store, exports: Exports { + run_target_validation, language_features, injections, plugin, @@ -1149,6 +1155,37 @@ impl Runtime { }) } + pub fn has_run_target_validation(&self) -> bool { + self.exports.run_target_validation.is_some() + } + + /// Missing optional validators allow the launch without a guest call. + pub fn validate_run_target( + &mut self, + root: String, + target: String, + launch: crate::RunTargetLaunch, + timeout: Duration, + ) -> Result, CallError> { + if self.exports.run_target_validation.is_none() { + return Ok(Ok(())); + } + let invocation = Invocation { workspace_root: Some(root.clone().into()), ..Default::default() }; + let launch = wit_rtv::LaunchInfo { + operation: match launch.operation { + crate::RunTargetOperation::Run => wit_rtv::Operation::Run, + crate::RunTargetOperation::Debug => wit_rtv::Operation::Debug, + crate::RunTargetOperation::Test => wit_rtv::Operation::Test, + }, + program: launch.program, + cwd: launch.cwd, + }; + self.call(invocation, timeout, |e, store| { + e.run_target_validation.as_ref().unwrap().call_validate(store, &root, &target, &launch) + }) + .map(|r| r.map_err(|message| clip(message, 4096))) + } + /// Complete configurations from the optional API 1.4 export. pub fn run_configurations( &mut self, diff --git a/crates/ide-plugin/src/wit_host.rs b/crates/ide-plugin/src/wit_host.rs index b43b74ec8..fc70fdef7 100644 --- a/crates/ide-plugin/src/wit_host.rs +++ b/crates/ide-plugin/src/wit_host.rs @@ -2335,3 +2335,8 @@ pub(crate) mod mcp_bindings { }, }); } + +/// Optional API 1.5 run-target launch validation. +pub(crate) mod run_target_validation_bindings { + wasmtime::component::bindgen!({ world: "run-target-validator", path: "../../wit" }); +} diff --git a/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm index 95ee9e200..8588b517c 100644 Binary files a/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm.sources index c854f0305..414cb90c4 100644 --- a/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/api14/dist/plugin.wasm.sources @@ -1 +1 @@ -d81ad44c8f692952bbe4607767a4170764baa1679710247994d6b8eea0d10c61 +023542d758cd359aa4d1282b95ddd2edca9fcf746862700705dd637b3e524571 diff --git a/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm index ebc347aac..ba6dfce54 100644 Binary files a/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm.sources index 38a3a3181..238040bbc 100644 --- a/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/commit/dist/plugin.wasm.sources @@ -1 +1 @@ -21c33be60354c4d5e46f4dee586b537ed8746bc2da0e64263a9f4e93b6e5894d +ef4cedb7ab9caa7a5a597fa8bd302e4e10607989c575af1ca0c237f2d8bb06c8 diff --git a/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm index 013dd1c9b..79bb63c25 100644 Binary files a/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm.sources index 40eb0ae89..42aa858ea 100644 --- a/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/data-tools/dist/plugin.wasm.sources @@ -1 +1 @@ -d8c39a1706d6ba876bcab84f170449dadad4f77803825eeee6848e3d5554f849 +c215812502ccbb85b08efb9da234e6e9709deb84a492b41e771c61d4c38a05fb diff --git a/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm index 96c7e70f1..8f8c9beef 100644 Binary files a/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm.sources index 4e0ddf06d..b73e873e4 100644 --- a/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/detail-views/dist/plugin.wasm.sources @@ -1 +1 @@ -7569252352dc948cfd842633ea830bb0f136d1490124d2263bcd639e4c6c3ee1 +52efdb99877cded6fc5357d80f722975e314610b9d2bc91979b4b4cb05d8cdb8 diff --git a/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm index 2ba9a269d..063f715c0 100644 Binary files a/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm.sources index c374fb490..f22ccd43b 100644 --- a/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/diagnostics/dist/plugin.wasm.sources @@ -1 +1 @@ -b9106a3fd3bfa4e33cfaa78cf5b76c4bb1c2b85f74c8757ede38d50076aee8cc +0fb78e5c48f267e529ceb719ceb1e5aca82f2288071e9a0cc14809c27e7cd15a diff --git a/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm index 446b20c33..f9ca3c300 100644 Binary files a/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm.sources index de035f2e1..47b109612 100644 --- a/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/endpoints/dist/plugin.wasm.sources @@ -1 +1 @@ -50d8dea354f8ffe7ef944ba87f0b20691d1c7c352e0bcb1077d6c3d7d57cdd10 +5a4c7a37b5ff83d62dcc3da616da3712113fa6257e834f51705a4f7e417e519a diff --git a/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm index 191214a6a..d5b6ab32a 100644 Binary files a/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm.sources index 10e3b46cd..44153cb7c 100644 --- a/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/execution/dist/plugin.wasm.sources @@ -1 +1 @@ -0fd9a8a38a8841a13ea8850218e7d890beb6d6d3ad5a70b9960a672fc5bd2335 +e5598d719f6e66790858758718842e4474747c6e14eb3e1c29c4584b26279ef6 diff --git a/crates/ide-plugin/tests/fixtures/execution/plugin.toml b/crates/ide-plugin/tests/fixtures/execution/plugin.toml index 765a4f39a..223529775 100644 --- a/crates/ide-plugin/tests/fixtures/execution/plugin.toml +++ b/crates/ide-plugin/tests/fixtures/execution/plugin.toml @@ -54,3 +54,7 @@ title = "untarget" [[contributes.commands]] id = "target-overrides" title = "target-overrides" + +[[contributes.commands]] +id = "validation" +title = "validation" diff --git a/crates/ide-plugin/tests/fixtures/execution/src/lib.rs b/crates/ide-plugin/tests/fixtures/execution/src/lib.rs index dd8e1abd0..5abbf8ed5 100644 --- a/crates/ide-plugin/tests/fixtures/execution/src/lib.rs +++ b/crates/ide-plugin/tests/fixtures/execution/src/lib.rs @@ -79,6 +79,7 @@ impl Plugin for Execution { Ok(None) } "events" => host::storage::get("events"), + "validation" => host::storage::get("validation"), _ => Err(Error::NotFound(id.into())), } } @@ -147,4 +148,25 @@ impl TestResults for Execution { ] } } -register_plugin!(Execution, run_configurations, test_results); +impl RunTargetValidation for Execution { + fn validate(&mut self, project: &str, target: &str, launch: &RunTargetLaunch) -> Result<(), String> { + host::storage::set( + "validation", + &format!("{project}|{target}|{:?}|{}|{}", launch.operation, launch.program, launch.cwd), + ) + .unwrap(); + match target { + "refuse" => Err("Project runtime is stopped".into()), + "long-refusal" => Err("x".repeat(10000)), + "trap" => panic!("validator failed"), + "timeout" => { + let _task = host::begin_task("Validation", true); + loop { + std::hint::spin_loop(); + } + } + _ => Ok(()), + } + } +} +register_plugin!(Execution, run_configurations, test_results, run_target_validation); diff --git a/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm index 3912f6565..547d8882e 100644 Binary files a/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm.sources index aafb5d0ef..71fc39efc 100644 --- a/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/file-templates/dist/plugin.wasm.sources @@ -1 +1 @@ -bbc685cc20c007f636ac4c5d746beeed1a7c2bd7c695d63406ee4f117ce2b9fb +18a37beb12a0a3da68345314f7bfbb9521e8819702ef50a1c81f29bc3112c997 diff --git a/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm index 3a4fbb16e..63976bcb1 100644 Binary files a/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm.sources index cc9142bd1..602f9e0df 100644 --- a/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/files-events/dist/plugin.wasm.sources @@ -1 +1 @@ -1f7162ecc79f15759955323d18f177f2509a74d45ba243e6b16c175d709d2e89 +c464178ead4043d49d10e63430436f9e261b211b1a7ff18d146ed244975baf7d diff --git a/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm index 6930a0466..a75106794 100644 Binary files a/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm.sources index f9ace6444..217135638 100644 --- a/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/grouped-views/dist/plugin.wasm.sources @@ -1 +1 @@ -29fbb94310dabe5b17a02c798bfb3b12f33ed477c2ef40f487938b78c82217c2 +655bbe70bf3280a6e301255955d3e99e68b29242538b60060f61082977019212 diff --git a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm index 653981476..345722b51 100644 Binary files a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources index ba459f696..5914a6387 100644 --- a/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/hello/dist/plugin.wasm.sources @@ -1 +1 @@ -fd770a1afbe7d72274489ff242acbc6a43dee26db4326912b72336af7895ac46 +2987ca7af6f5ae800ed3bcf826b7f85b713371cb6efa483953e0a4974248f61f diff --git a/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm index 9c11e9c41..62591aa2d 100644 Binary files a/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm.sources index e7e962902..d235027e7 100644 --- a/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/hover/dist/plugin.wasm.sources @@ -1 +1 @@ -37de792bbee6fde3d67ff764ae44b89e445e2f26c8d08da51e4640330a467b01 +ff914b1c3ae4709c86e8138cdc84ea500ebde77ac09dcd3722faeffeb25b3454 diff --git a/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm index f983fcea4..85d24b62b 100644 Binary files a/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm.sources index c562227c7..85e55a3a4 100644 --- a/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/indexer/dist/plugin.wasm.sources @@ -1 +1 @@ -756f63c986b1cec81ea90bbb3d6b3f85d8334dbd8f83910c2cdc80c416c9d66c +8db8367b3e0872ebcb03b7f37a55fa1510f52e7f40eb07e401a40a0019349eb8 diff --git a/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm index 0363f21f0..881de6d5f 100644 Binary files a/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm.sources index 3bc396b1e..642ec05e0 100644 --- a/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/inlay-hints/dist/plugin.wasm.sources @@ -1 +1 @@ -cbbf102678d2f7c5ecafb4ab4d1b3400d174a7a8f5b03294a08ee933cc00e113 +8ec23043c138a4fe9ba13cdaf13b78b56032eea14f48caddde6e5016226e3d28 diff --git a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm index cc765a0b5..c6fba534e 100644 Binary files a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources index ba04a430e..9aab13ada 100644 --- a/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/jobs/dist/plugin.wasm.sources @@ -1 +1 @@ -544de6da356058e1922cbb5dc3baf6600854408e62dbfcc6b82deb88151f24c1 +cde70a51050b29cbf553df08c6aadb660be51c9146ec1d3e186de55a3130a7c1 diff --git a/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm index 07a490d72..b72501c07 100644 Binary files a/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm.sources index dbd801a84..e2792f1b9 100644 --- a/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/language-features/dist/plugin.wasm.sources @@ -1 +1 @@ -deae386bce1cfaad1ef53bcfbac5566ccc75701ba114f58694070fd33393e6c5 +21ac46f028c4a151b1f89eac12ad8894d1dbc84a3489f3054dec239c87de5e4a diff --git a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources index cfe33bb08..ce48c7600 100644 --- a/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/misbehave/dist/plugin.wasm.sources @@ -1 +1 @@ -10ce571ece76b5827ee8978920b1308a28e68f1bf5720b0f647ea5fd707ee8f1 +7981067231363be183e28e9aa0dd8cffb430783080c702a1843c361187b3f267 diff --git a/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm index 70821093c..aa335d1bb 100644 Binary files a/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm.sources index b5d282dd5..21e4878a8 100644 --- a/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/path-events/dist/plugin.wasm.sources @@ -1 +1 @@ -ed1f9f0aea72e716741d7ef9ca7e32f6ad4a14407542820ae225ea950b6f8f17 +e4fafd8b7ea6d9bb6d10836c8fc133a58277f68e293410d221372bced719a192 diff --git a/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm index 700693f8f..77a5c7053 100644 Binary files a/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm.sources index 7c70a8ca7..75b88f40e 100644 --- a/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/private-dir/dist/plugin.wasm.sources @@ -1 +1 @@ -ee185fdb8c1b2a63e502e81580d0d1c71e5ed04fd142179e7d3c30f9f1d874f7 +c6d9a0c72cf63c1a4ddb9cb45fa7eaf2cd4d6e14d6977b6e834196ad526f0a2a diff --git a/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm index 1b6744ddc..ff50f6042 100644 Binary files a/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm.sources index 48fe6f558..2ceb7510a 100644 --- a/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/semantic-tokens/dist/plugin.wasm.sources @@ -1 +1 @@ -cebb6995dc8c59add6cee7289040f5d0373f34c403084a349ff650bd1dcf3331 +004d552137bc2d2654b7343a9368c14e8b8f07a03f31fb70b7ac42481bdfac8c diff --git a/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm index 029c65590..ffef69d79 100644 Binary files a/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm.sources index ef7328cb8..f41307e33 100644 --- a/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/settings-pages/dist/plugin.wasm.sources @@ -1 +1 @@ -12d2044f25d901f512da5e9ec06750d76e9bbd9e78d68f1f39466bcf0bea7c2a +bfbadd644f0b65d36817177a935f1262baf136ea26378902d01e9e3b6eec6412 diff --git a/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm index 2eb6b70a0..cc25c2f3a 100644 Binary files a/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm.sources index a4d1e037f..7a4011339 100644 --- a/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/storage/dist/plugin.wasm.sources @@ -1 +1 @@ -d5584311077faeb8780508d3aecc4a828291def9fabd139fd2a0fce2423f6f48 +691d78767dadaa3bb8892b15592072cd343ca618d59e82653012de78e5072b22 diff --git a/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm index 283f02592..9717ee947 100644 Binary files a/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm.sources index 3f18936e2..c79a141d7 100644 --- a/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/symbols/dist/plugin.wasm.sources @@ -1 +1 @@ -3bbf01325ae6acf1561d5a451fff60e82bee3ea8ec1cb1969aaada6e44d0b984 +280029aedd5945d7ddff74431e8b95aa785974849f86edeb9537da3a091e7dc7 diff --git a/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm index f72ecc66f..ef14b6cf8 100644 Binary files a/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm.sources index ebbd8785d..e6b82d542 100644 --- a/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/tables/dist/plugin.wasm.sources @@ -1 +1 @@ -ae23673dd954183f9c282a9cbca9551cd6a4169c7df5df57d5a46a96c5b67dce +a9f63e4356ee83109e94b19d69d5bef0e49ef6f1a46c37fb00821824b82a1f0e diff --git a/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm index 5abcf57c4..b018ad69c 100644 Binary files a/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm.sources index 15fe1e337..35f0d6a1c 100644 --- a/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/web-content/dist/plugin.wasm.sources @@ -1 +1 @@ -b15392faca085b6e5f352028842ab71b94e0cba5c5831df6a706ecd1a00228d2 +18ff48039b86b8d2f071adefcba4c44e51d8b5726f9f670f31cf63473b1a657f diff --git a/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm index a50244cf7..4650c9796 100644 Binary files a/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm.sources index 06f253430..02602e85f 100644 --- a/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/web-log/dist/plugin.wasm.sources @@ -1 +1 @@ -d17868c5ce30ed1d7c21e99b802199b5fb49ea8b962433915d16db40eed11e16 +3ae6657f9a01dfd7767c1a2d211baeba2fadca0f2f7e4c1df35d35dd4f348dba diff --git a/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm b/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm index ac3292c57..e5de970b7 100644 Binary files a/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm and b/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm differ diff --git a/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm.sources b/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm.sources index e2556781e..3c7dd0658 100644 --- a/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm.sources +++ b/crates/ide-plugin/tests/fixtures/web-pty/dist/plugin.wasm.sources @@ -1 +1 @@ -d765f7ae65ca7b904589b73f5580346a98b3423982ce3655759442c250218202 +0ed690a8233920d47bcf162954eb5e8d15cd9fd4cd704232d5a92708cd49cb18 diff --git a/plugins/README.md b/plugins/README.md index a9597177f..ecc95856a 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -2541,6 +2541,39 @@ and diagnostic-related locations. Navigation inside these documents returns to that server; editing and saving are disabled. No WIT signature change is needed for this opt-in host setting. +### Validating run targets (API 1.5) + +A plugin can export `run-target-validation.validate` to check current project +runtime state immediately before Run, Test or Debug. In the Rust SDK implement +`RunTargetValidation` and add `run_target_validation` to `register_plugin!`: + +```rust +impl RunTargetValidation for MyPlugin { + fn validate(&mut self, project: &str, target_id: &str, launch: &RunTargetLaunch) -> Result<(), String> { + // Inspect runtime state through the plugin's granted APIs. + if runtime_is_running(project) { Ok(()) } else { Err("Project runtime is stopped".into()) } + } +} +register_plugin!(MyPlugin, run_target_validation); +``` + +The callback receives the project root, the plugin's own target id and +`RunTargetLaunch { operation, program, cwd }`. `operation` is Run, Debug or Test; +`program` is the bare program being wrapped, and `cwd` is the absolute local +working directory on the plugin's machine. Arguments and environment are omitted. +Trust, target ownership, process grants and executable pins are checked first. +No extra manifest contribution or capability is required; plugins without the +export retain their existing behavior. Language server startup and target document +reads do not invoke this user-launch gate. + +`Err(message)` refuses startup through the normal launch error path, prefixed +with the plugin name and bounded to 4096 bytes. The registration and selected +target remain unchanged. A trap or timeout also refuses startup; cancellation +interrupts the callback. Calls wake idle-reclaimed instances and use the host's +normal call timeout (five seconds by default). For remote projects validation +runs on the server, alongside the plugin and wrapper. Native SDK tests can use +`MockHost::validate_run_target` to invoke their validator. + ### Debugging run targets Plugin targets require `container-root` for debugging. PHP uses `connect-back`: the diff --git a/plugins/official/ai-completion/dist/plugin.wasm b/plugins/official/ai-completion/dist/plugin.wasm index c40838d14..efe84d380 100644 Binary files a/plugins/official/ai-completion/dist/plugin.wasm and b/plugins/official/ai-completion/dist/plugin.wasm differ diff --git a/plugins/official/ai-completion/dist/plugin.wasm.sources b/plugins/official/ai-completion/dist/plugin.wasm.sources index 8677d1bad..33392fbd0 100644 --- a/plugins/official/ai-completion/dist/plugin.wasm.sources +++ b/plugins/official/ai-completion/dist/plugin.wasm.sources @@ -1 +1 @@ -f5a9a182faefb9520664479cf2b926ced08806d4258b5790745d95a2df09e32c +2c50c70ca000609f9eaa2f197e0c3f4d9f397689211b77182505743e341ca925 diff --git a/plugins/official/blame-annotations/dist/plugin.wasm b/plugins/official/blame-annotations/dist/plugin.wasm index 9906a3d12..0178ad0ff 100644 Binary files a/plugins/official/blame-annotations/dist/plugin.wasm and b/plugins/official/blame-annotations/dist/plugin.wasm differ diff --git a/plugins/official/blame-annotations/dist/plugin.wasm.sources b/plugins/official/blame-annotations/dist/plugin.wasm.sources index db4ad7c07..4f45ed0d7 100644 --- a/plugins/official/blame-annotations/dist/plugin.wasm.sources +++ b/plugins/official/blame-annotations/dist/plugin.wasm.sources @@ -1 +1 @@ -8b31a00cfb1bc12bf6a959ac63c4ac0ff9c589d23d85b76fd8d583cbe22ce4f3 +b0bd637ce12972984c77774b2acae270c425f5b7177ad91c1dc62231eb098218 diff --git a/plugins/official/checkstyle/dist/plugin.wasm b/plugins/official/checkstyle/dist/plugin.wasm index 102c686bd..da9247507 100644 Binary files a/plugins/official/checkstyle/dist/plugin.wasm and b/plugins/official/checkstyle/dist/plugin.wasm differ diff --git a/plugins/official/checkstyle/dist/plugin.wasm.sources b/plugins/official/checkstyle/dist/plugin.wasm.sources index 11fce3bf1..5d2560462 100644 --- a/plugins/official/checkstyle/dist/plugin.wasm.sources +++ b/plugins/official/checkstyle/dist/plugin.wasm.sources @@ -1 +1 @@ -8bb797a7162fa056ddff521be27bea97be613d449adf963a60aa2a4e98fec225 +bbb8845b97a504431625929ad8eb627773eb365f8b6728b9c33f43ab61e15687 diff --git a/plugins/official/container-runner/dist/plugin.wasm b/plugins/official/container-runner/dist/plugin.wasm index 10b821354..327565d00 100644 Binary files a/plugins/official/container-runner/dist/plugin.wasm and b/plugins/official/container-runner/dist/plugin.wasm differ diff --git a/plugins/official/container-runner/dist/plugin.wasm.sources b/plugins/official/container-runner/dist/plugin.wasm.sources index 3d6c93591..0902c1e84 100644 --- a/plugins/official/container-runner/dist/plugin.wasm.sources +++ b/plugins/official/container-runner/dist/plugin.wasm.sources @@ -1 +1 @@ -a32f53654d20f9f2c63dcc4f935ece7da5d2f5a7b6353be2c852c2ff90210879 +ce4ffc8dea00757ed4ff3ef7949563afca656987f9b589ef68c76a66140caa03 diff --git a/plugins/official/csv-editor/dist/plugin.wasm b/plugins/official/csv-editor/dist/plugin.wasm index 665b57610..10147284c 100644 Binary files a/plugins/official/csv-editor/dist/plugin.wasm and b/plugins/official/csv-editor/dist/plugin.wasm differ diff --git a/plugins/official/csv-editor/dist/plugin.wasm.sources b/plugins/official/csv-editor/dist/plugin.wasm.sources index 116820d84..0805d2b96 100644 --- a/plugins/official/csv-editor/dist/plugin.wasm.sources +++ b/plugins/official/csv-editor/dist/plugin.wasm.sources @@ -1 +1 @@ -545f82f9b4f3fb8b8205728062eaf786efdcf8021b89e5a3f83f4729d67b70c8 +e3aca14076ac010d3115123eebef58249c8200264d706c95c3177ec5215153c8 diff --git a/plugins/official/git-toolbox/dist/plugin.wasm b/plugins/official/git-toolbox/dist/plugin.wasm index b08983342..f840dfc3e 100644 Binary files a/plugins/official/git-toolbox/dist/plugin.wasm and b/plugins/official/git-toolbox/dist/plugin.wasm differ diff --git a/plugins/official/git-toolbox/dist/plugin.wasm.sources b/plugins/official/git-toolbox/dist/plugin.wasm.sources index 3044d6f15..3578ef177 100644 --- a/plugins/official/git-toolbox/dist/plugin.wasm.sources +++ b/plugins/official/git-toolbox/dist/plugin.wasm.sources @@ -1 +1 @@ -84eec5f62cf13b2a42efe2e3d0cd82ac4ba14289ad1996dd20d10e5e314faacb +a46eb4786834655a4706ee1b2219c52f390bbb3b38c5b74fd7127ff4dd8abd73 diff --git a/plugins/official/graphviz/dist/plugin.wasm b/plugins/official/graphviz/dist/plugin.wasm index 61962c3da..3ca7835e9 100644 Binary files a/plugins/official/graphviz/dist/plugin.wasm and b/plugins/official/graphviz/dist/plugin.wasm differ diff --git a/plugins/official/graphviz/dist/plugin.wasm.sources b/plugins/official/graphviz/dist/plugin.wasm.sources index 3685a70ce..269fa3e54 100644 --- a/plugins/official/graphviz/dist/plugin.wasm.sources +++ b/plugins/official/graphviz/dist/plugin.wasm.sources @@ -1 +1 @@ -e3cf0c8796400e9cd1d078df3deb597c1eb05d90c24dbc071813d0dd165c0f74 +57e5f1c3cece832b309d48fcf8e8cd2e2227de9bc993415b05c7562dc931edce diff --git a/plugins/official/key-promoter/dist/plugin.wasm b/plugins/official/key-promoter/dist/plugin.wasm index c7b6c71ea..13bb13626 100644 Binary files a/plugins/official/key-promoter/dist/plugin.wasm and b/plugins/official/key-promoter/dist/plugin.wasm differ diff --git a/plugins/official/key-promoter/dist/plugin.wasm.sources b/plugins/official/key-promoter/dist/plugin.wasm.sources index 49030a1e7..8f4f433a6 100644 --- a/plugins/official/key-promoter/dist/plugin.wasm.sources +++ b/plugins/official/key-promoter/dist/plugin.wasm.sources @@ -1 +1 @@ -25067d01e6be39c86d0a0437293a11b39d7023d35f5c42322f814009c2c6f38f +5057bf63ee9af0ed529a8eb6fc803889d4fed08c83b480171494a4c28e60f7e7 diff --git a/plugins/official/license-header/dist/plugin.wasm b/plugins/official/license-header/dist/plugin.wasm index d01a6d358..c59f6d168 100644 Binary files a/plugins/official/license-header/dist/plugin.wasm and b/plugins/official/license-header/dist/plugin.wasm differ diff --git a/plugins/official/license-header/dist/plugin.wasm.sources b/plugins/official/license-header/dist/plugin.wasm.sources index f506d91f8..0bad0bbb9 100644 --- a/plugins/official/license-header/dist/plugin.wasm.sources +++ b/plugins/official/license-header/dist/plugin.wasm.sources @@ -1 +1 @@ -72b4be4fedf6cddd4c73ce26b9cdf6495f1878d3b1a3aa376659af3d1fe21bda +46cd532de4daa85adb73beaae3f1ed078b7de14e7959a065f5e72b774c086c4c diff --git a/plugins/official/mybatis/dist/plugin.wasm b/plugins/official/mybatis/dist/plugin.wasm index 6ad5e115a..05e6971c8 100644 Binary files a/plugins/official/mybatis/dist/plugin.wasm and b/plugins/official/mybatis/dist/plugin.wasm differ diff --git a/plugins/official/mybatis/dist/plugin.wasm.sources b/plugins/official/mybatis/dist/plugin.wasm.sources index 5d23b0e64..4a504bcb5 100644 --- a/plugins/official/mybatis/dist/plugin.wasm.sources +++ b/plugins/official/mybatis/dist/plugin.wasm.sources @@ -1 +1 @@ -f0ea10f9e0a24e9fd9d7f28198f4d15b74cd768889e50c7b79dbf3491c4c864d +428308db73d25b65fdad1fc2cfee28009befd7a2cdc6694f1c54bcb0dad700e7 diff --git a/plugins/official/regex-tester/dist/plugin.wasm b/plugins/official/regex-tester/dist/plugin.wasm index b36554146..2415d6e94 100644 Binary files a/plugins/official/regex-tester/dist/plugin.wasm and b/plugins/official/regex-tester/dist/plugin.wasm differ diff --git a/plugins/official/regex-tester/dist/plugin.wasm.sources b/plugins/official/regex-tester/dist/plugin.wasm.sources index 6b4066261..3d285185d 100644 --- a/plugins/official/regex-tester/dist/plugin.wasm.sources +++ b/plugins/official/regex-tester/dist/plugin.wasm.sources @@ -1 +1 @@ -423c63836d4534143c671e147ca92d46f1542212a538efbc980db89ec93a4ef2 +d5155bf79f921bf90a3432cf4cd1b1aae31a08d1f0b61c9777649905fdfe2526 diff --git a/plugins/official/solidity/dist/plugin.wasm b/plugins/official/solidity/dist/plugin.wasm index 5c276278e..798a72893 100644 Binary files a/plugins/official/solidity/dist/plugin.wasm and b/plugins/official/solidity/dist/plugin.wasm differ diff --git a/plugins/official/solidity/dist/plugin.wasm.sources b/plugins/official/solidity/dist/plugin.wasm.sources index e9f9d2098..15ec7f7e3 100644 --- a/plugins/official/solidity/dist/plugin.wasm.sources +++ b/plugins/official/solidity/dist/plugin.wasm.sources @@ -1 +1 @@ -ed13572441774355ceada20a503fc051989fe16235564503b7394c3a597b322f +46bb85f125d5b9bd141abca3ff6456e58f58f45969c4a9d2106f59b6b2b80fdd diff --git a/plugins/official/string-tools/dist/plugin.wasm b/plugins/official/string-tools/dist/plugin.wasm index e08091ca9..cd7d97653 100644 Binary files a/plugins/official/string-tools/dist/plugin.wasm and b/plugins/official/string-tools/dist/plugin.wasm differ diff --git a/plugins/official/string-tools/dist/plugin.wasm.sources b/plugins/official/string-tools/dist/plugin.wasm.sources index 7ff1525c8..e5263de1e 100644 --- a/plugins/official/string-tools/dist/plugin.wasm.sources +++ b/plugins/official/string-tools/dist/plugin.wasm.sources @@ -1 +1 @@ -9065f67eb3a31cc7b87397aaa7e287491d0f6ddc69ff3c12ef3b171ee02edc2d +c149abe2339645a3472c399f2286123e1c82e3a76ec29c3768804dbbee90b39a diff --git a/plugins/official/test-runner/dist/plugin.wasm b/plugins/official/test-runner/dist/plugin.wasm index c5823d2e0..7ff68f011 100644 Binary files a/plugins/official/test-runner/dist/plugin.wasm and b/plugins/official/test-runner/dist/plugin.wasm differ diff --git a/plugins/official/test-runner/dist/plugin.wasm.sources b/plugins/official/test-runner/dist/plugin.wasm.sources index c62f896be..4108b98d2 100644 --- a/plugins/official/test-runner/dist/plugin.wasm.sources +++ b/plugins/official/test-runner/dist/plugin.wasm.sources @@ -1 +1 @@ -e34b4830edaf1917197e59839c8a403e394e9e84f9921cabd837442955ad1754 +786bda583e0fcc63b2dd869fbde927a401388ea7a355fd7de9123f49c2bb1636 diff --git a/plugins/official/todo-finder/dist/plugin.wasm b/plugins/official/todo-finder/dist/plugin.wasm index b820fad66..3222e4eb9 100644 Binary files a/plugins/official/todo-finder/dist/plugin.wasm and b/plugins/official/todo-finder/dist/plugin.wasm differ diff --git a/plugins/official/todo-finder/dist/plugin.wasm.sources b/plugins/official/todo-finder/dist/plugin.wasm.sources index 19164e6a4..1da60d603 100644 --- a/plugins/official/todo-finder/dist/plugin.wasm.sources +++ b/plugins/official/todo-finder/dist/plugin.wasm.sources @@ -1 +1 @@ -abea88f2e82077f6a2e1b428d583c2b79fcf985c485e25b4441aaa64336e7e28 +7e04fc25c3bf14d8242a0b0f7fb93312a3fb1fb0034c732a7964a314ca4be4d0 diff --git a/sdk/rust/openidea-plugin/src/execution.rs b/sdk/rust/openidea-plugin/src/execution.rs index de38d73da..d622a6a76 100644 --- a/sdk/rust/openidea-plugin/src/execution.rs +++ b/sdk/rust/openidea-plugin/src/execution.rs @@ -237,3 +237,25 @@ impl From for PluginRunTargetWithOverrides { } } } + +/// Operation about to launch through a plugin-owned run target (API 1.5). +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum RunTargetOperation { + Run, + Debug, + Test, +} + +/// Launch metadata available to a target validator; arguments and environment are omitted. +#[derive(Clone, Debug, PartialEq, Eq)] +pub struct RunTargetLaunch { + pub operation: RunTargetOperation, + pub program: String, + pub cwd: String, +} + +/// Optional pre-launch validation; register with `run_target_validation`. +pub trait RunTargetValidation { + /// Refuse with a user-facing explanation, or allow with `Ok(())`. + fn validate(&mut self, project: &str, target_id: &str, launch: &RunTargetLaunch) -> Result<(), String>; +} diff --git a/sdk/rust/openidea-plugin/src/lib.rs b/sdk/rust/openidea-plugin/src/lib.rs index 6c81ef186..efe190423 100644 --- a/sdk/rust/openidea-plugin/src/lib.rs +++ b/sdk/rust/openidea-plugin/src/lib.rs @@ -286,6 +286,7 @@ macro_rules! register_plugin { #[doc(hidden)] #[macro_export] macro_rules! __optional_exports { + (run_target_validation, $plugin:ty, $component:ident) => { $crate::__run_target_validation_exports!($plugin, $component); }; (injections, $plugin:ty, $component:ident) => { $crate::__injections_exports!($plugin, $component); }; (language_features, $plugin:ty, $component:ident) => { $crate::__language_features_exports!($plugin, $component); }; (mcp, $plugin:ty, $component:ident) => { $crate::__mcp_exports!($plugin, $component); }; @@ -1084,6 +1085,24 @@ pub mod __rt { with::(|p| p.call(tool, arguments, &ctx)).map_err(error_out) } + pub fn validate_run_target( + root: &str, + target: &str, + launch: crate::run_target_validation_bindings::exports::openidea::plugin::run_target_validation::LaunchInfo, + ) -> Result<(), String> { + use crate::run_target_validation_bindings::exports::openidea::plugin::run_target_validation::Operation; + let launch = crate::RunTargetLaunch { + operation: match launch.operation { + Operation::Run => crate::RunTargetOperation::Run, + Operation::Debug => crate::RunTargetOperation::Debug, + Operation::Test => crate::RunTargetOperation::Test, + }, + program: launch.program, + cwd: launch.cwd, + }; + with::(|p| p.validate(root, target, &launch)) + } + pub fn configurations( root: &str, ) -> Vec { @@ -1421,3 +1440,23 @@ macro_rules! __mcp_exports { $crate::mcp_bindings::__export_mcp_world!($component with_types_in $crate::mcp_bindings); }; } + +#[cfg(target_arch = "wasm32")] +#[doc(hidden)] +pub mod run_target_validation_bindings { + wit_bindgen::generate!({ world: "run-target-validator", path: "wit", pub_export_macro: true, + export_macro_name: "__export_target_validation_world", + default_bindings_module: "openidea_plugin::run_target_validation_bindings" }); +} +#[doc(hidden)] +#[macro_export] +macro_rules! __run_target_validation_exports { + ($plugin:ty, $component:ident) => { + impl $crate::run_target_validation_bindings::exports::openidea::plugin::run_target_validation::Guest for $component { + fn validate(project: String, target: String, launch: $crate::run_target_validation_bindings::exports::openidea::plugin::run_target_validation::LaunchInfo) -> Result<(), String> { + $crate::__rt::validate_run_target::<$plugin>(&project, &target, launch) + } + } + $crate::run_target_validation_bindings::__export_target_validation_world!($component with_types_in $crate::run_target_validation_bindings); + }; +} diff --git a/sdk/rust/openidea-plugin/src/mock.rs b/sdk/rust/openidea-plugin/src/mock.rs index 0ee6266cc..5c3fca798 100644 --- a/sdk/rust/openidea-plugin/src/mock.rs +++ b/sdk/rust/openidea-plugin/src/mock.rs @@ -451,6 +451,17 @@ impl MockHost { self.state.borrow().diagnostics.clone() } + /// Calls a target validator with the mock project's root and launch metadata. + pub fn validate_run_target( + &self, + validator: &mut impl crate::RunTargetValidation, + target: &str, + launch: &crate::RunTargetLaunch, + ) -> Result<(), String> { + let project = self.invocation().project().expect("mock project").root().expect("mock root"); + validator.validate(&project, target, launch) + } + /// Snapshot supplied to optional language-feature and injection traits in native tests. pub fn provider_document(&self) -> Option { self.state.borrow().editor.as_ref().map(|e| crate::providers::Document { diff --git a/sdk/rust/openidea-plugin/tests/api15_run_target_validation.rs b/sdk/rust/openidea-plugin/tests/api15_run_target_validation.rs new file mode 100644 index 000000000..3baafab89 --- /dev/null +++ b/sdk/rust/openidea-plugin/tests/api15_run_target_validation.rs @@ -0,0 +1,22 @@ +use openidea_plugin::{mock::MockHost, *}; + +#[test] +fn validation_receives_mock_project_and_can_refuse_each_launch_kind() { + struct Validator; + impl RunTargetValidation for Validator { + fn validate(&mut self, project: &str, target: &str, launch: &RunTargetLaunch) -> Result<(), String> { + assert!(!project.is_empty()); + assert_eq!(launch.program, "composer"); + if target == "stopped" { Err("Project runtime is stopped".into()) } else { Ok(()) } + } + } + let mock = MockHost::install(); + for operation in [RunTargetOperation::Run, RunTargetOperation::Test, RunTargetOperation::Debug] { + let launch = RunTargetLaunch { operation, program: "composer".into(), cwd: "/project".into() }; + assert!(mock.validate_run_target(&mut Validator, "running", &launch).is_ok()); + assert_eq!( + mock.validate_run_target(&mut Validator, "stopped", &launch), + Err("Project runtime is stopped".into()) + ); + } +} diff --git a/sdk/rust/openidea-plugin/wit/exports.wit b/sdk/rust/openidea-plugin/wit/exports.wit index 9a003a9c1..d1dc8b62a 100644 --- a/sdk/rust/openidea-plugin/wit/exports.wit +++ b/sdk/rust/openidea-plugin/wit/exports.wit @@ -73,3 +73,22 @@ interface syntax-provider { outline: func(language: string, text: string) -> list; folding: func(language: string, text: string) -> list; } + +/// Optional pre-launch gate for targets owned by this plugin (API 1.5). +interface run-target-validation { + enum operation { run, debug, test } + record launch-info { + operation: operation, + /// Bare program name before wrapping; no arguments or environment. + program: string, + /// Absolute working directory on the machine hosting the plugin. + cwd: string, + } + /// Called after trust, ownership, process grants and executable pin checks. + /// An error refuses the launch without changing the selected target. The + /// host prefixes and bounds the message. Missing exports allow the launch. + /// Calls wake reclaimed instances, use the host call timeout (5s by default), + /// and are cancelled with the launch. Traps/timeouts refuse the launch. + /// For remote projects this runs on the server, where the plugin lives. + validate: func(project: string, target-id: string, launch: launch-info) -> result<_, string>; +} diff --git a/sdk/rust/openidea-plugin/wit/plugin.wit b/sdk/rust/openidea-plugin/wit/plugin.wit index 3b3f4d0eb..2b178fa1c 100644 --- a/sdk/rust/openidea-plugin/wit/plugin.wit +++ b/sdk/rust/openidea-plugin/wit/plugin.wit @@ -200,3 +200,8 @@ world language-injections { export injections; } world plugin-mcp { include plugin; export mcp-provider; } /// Export-only MCP tools, composed with the base plugin world. world mcp-tools { export mcp-provider; } + +/// A plugin that validates launches through its run targets (API 1.5). +world plugin-run-target-validation { include plugin; export run-target-validation; } +/// Export-only validation, composed with the base plugin world. +world run-target-validator { export run-target-validation; } diff --git a/src-tauri/src/commands/debug.rs b/src-tauri/src/commands/debug.rs index c99fb0656..1b2c912bf 100644 --- a/src-tauri/src/commands/debug.rs +++ b/src-tauri/src/commands/debug.rs @@ -15,8 +15,9 @@ pub async fn debug_start( window: Window, state: State<'_, AppState>, config: LaunchConfig, + request: Option, ) -> IdeResult { - ide_host::ops::debug::debug_start(&state.host, window.label(), config).await + ide_host::ops::debug::debug_start_request(&state.host, window.label(), config, request).await } #[tauri::command] diff --git a/src-tauri/src/commands/run.rs b/src-tauri/src/commands/run.rs index 0be1dd525..c3c5a1d86 100644 --- a/src-tauri/src/commands/run.rs +++ b/src-tauri/src/commands/run.rs @@ -99,11 +99,12 @@ pub async fn run_start( state: State<'_, AppState>, config: RunConfig, on_output: Channel, + request: Option, ) -> IdeResult { let emit = std::sync::Arc::new(move |chunk| { let _ = on_output.send(chunk); }); - ide_host::ops::run::start(&state.host, window.label(), config, emit).await + ide_host::ops::run::start_request(&state.host, window.label(), config, emit, request).await } #[tauri::command] diff --git a/src/bindings.ts b/src/bindings.ts index 20a1a320b..6627f21ed 100644 --- a/src/bindings.ts +++ b/src/bindings.ts @@ -708,7 +708,7 @@ export const commands = { runImportConfigs: (source: RunImportSource, existing: RunConfig_Deserialize[]) => typedError(__TAURI_INVOKE("run_import_configs", { source, existing })), /** The environment runs inherit when "Include system environment variables" is on. */ runSystemEnv: () => __TAURI_INVOKE<{ [key in string]: string }>("run_system_env"), - runStart: (config: RunConfig_Deserialize, onOutput: Channel) => typedError(__TAURI_INVOKE("run_start", { config, onOutput })), + runStart: (config: RunConfig_Deserialize, onOutput: Channel, request: number | null) => typedError(__TAURI_INVOKE("run_start", { config, onOutput, request })), runStop: (id: RunId) => typedError(__TAURI_INVOKE("run_stop", { id })), runStdin: (id: RunId, data: string) => typedError(__TAURI_INVOKE("run_stdin", { id, data })), runList: () => __TAURI_INVOKE("run_list"), @@ -811,7 +811,7 @@ export const commands = { /** Incremental build of the jdtls workspace serving `module` (e.g. before HotSwap). */ javaBuildWorkspace: (module: string, request: number | null) => typedError(__TAURI_INVOKE("java_build_workspace", { module, request })), /** Starts a session owned by this window: its events (and those of child sessions) go here only. */ - debugStart: (config: LaunchConfig) => typedError(__TAURI_INVOKE("debug_start", { config })), + debugStart: (config: LaunchConfig, request: number | null) => typedError(__TAURI_INVOKE("debug_start", { config, request })), debugSetBreakpoints: (path: string, breakpoints: Breakpoint[]) => typedError(__TAURI_INVOKE("debug_set_breakpoints", { path, breakpoints })), debugThreads: (session: DebugSessionId) => typedError(__TAURI_INVOKE("debug_threads", { session })), debugStackTrace: (session: DebugSessionId, threadId: number) => typedError(__TAURI_INVOKE("debug_stack_trace", { session, threadId })), diff --git a/src/features/debugger/actions.ts b/src/features/debugger/actions.ts index 96e3c1487..e670b5c7d 100644 --- a/src/features/debugger/actions.ts +++ b/src/features/debugger/actions.ts @@ -345,6 +345,7 @@ async function startConfig(arg: unknown) { if (pluginTarget) { const extra = JSON.parse(launch.extraJson ?? "{}"); extra.__runTarget = config.target; + extra.__runTargetProgram = config.command; launch.extraJson = JSON.stringify(extra); } const xdebugCheck = @@ -352,9 +353,14 @@ async function startConfig(arg: unknown) { await maybeEditorService() ?.saveAll() .catch(() => undefined); - const started = await startSession(launch, { runConfig: origin ?? config, show }); + const started = pluginTarget + ? await startPreparedSession(origin ?? config, async () => launch, { show }) + : await startSession(launch, { runConfig: origin ?? config, show }); if (started && pluginTarget && config.debugAdapter === "php-debug") { - await executeAction("run.runConfig", config); + await executeAction("run.runConfig", { + ...config, + params: { ...config.params, "plugin.targetOperation": "debug" }, + }); } await xdebugCheck; } diff --git a/src/features/debugger/state.ts b/src/features/debugger/state.ts index 1e09716c5..4e20726bc 100644 --- a/src/features/debugger/state.ts +++ b/src/features/debugger/state.ts @@ -13,6 +13,7 @@ import { commands, isTauri, isCancelled, + nextRequestId, type DebugCapabilities, type DebugEvent, type DebugSessionId, @@ -574,7 +575,13 @@ export async function startSession( await flushBreakpoints(); options.preparation?.signal.throwIfAborted(); const adapterStarted = performance.now(); - const id = await call(commands.debugStart(launch)); + const request = nextRequestId(); + const signal = options.preparation?.signal; + const cancel = () => void commands.cancelRequest(request).catch(() => undefined); + signal?.addEventListener("abort", cancel, { once: true }); + const id = await call(commands.debugStart(launch, request)).finally(() => + signal?.removeEventListener("abort", cancel), + ); console.info("Debug adapter started", { name: launch.name, ms: performance.now() - adapterStarted }); owned.add(id); if (afterDetach) dropFinished(); diff --git a/src/features/run/javaModule.test.ts b/src/features/run/javaModule.test.ts index fd839dd88..f448232f7 100644 --- a/src/features/run/javaModule.test.ts +++ b/src/features/run/javaModule.test.ts @@ -77,6 +77,7 @@ it.each(["sibling", "/outside/modules"])("runs from %s using the stored module's expect(ipc.runStart).toHaveBeenCalledWith( expect.objectContaining({ cwd, args: ["-cp", "/p/app/target/classes", "a.Main"] }), expect.anything(), + expect.any(Number), ); expect(ipc.findFiles).not.toHaveBeenCalled(); }); @@ -134,7 +135,11 @@ it("finds the source module for an old saved configuration without a module", as await startRun({ ...config, cwd: "/outside/modules" }); expect(ipc.findFiles).toHaveBeenCalledWith("Main.java", 1000); expect(ipc.javaResolveLaunch).toHaveBeenCalledWith("app", false, "automatic", expect.any(Number)); - expect(ipc.runStart).toHaveBeenCalledWith(expect.objectContaining({ cwd: "/outside/modules" }), expect.anything()); + expect(ipc.runStart).toHaveBeenCalledWith( + expect.objectContaining({ cwd: "/outside/modules" }), + expect.anything(), + expect.any(Number), + ); }); it.each([["-cp", "lib/*"], []])("colours Spring Boot runs without classpath resolution (%j)", async (...classpath) => { @@ -145,6 +150,7 @@ it.each([["-cp", "lib/*"], []])("colours Spring Boot runs without classpath reso expect(ipc.runStart).toHaveBeenCalledWith( expect.objectContaining({ args: ["-Dspring.output.ansi.enabled=always", ...args] }), expect.anything(), + expect.any(Number), ); expect(ipc.javaResolveLaunch).toHaveBeenCalledWith("app", false, "automatic", expect.any(Number)); expect(boot.args).toBe(args); @@ -154,14 +160,14 @@ it.each([["-cp", "lib/*"], []])("colours Spring Boot runs without classpath reso it.each(["never", "detect", "always"])("preserves an explicit Spring Boot console setting (%s)", async (value) => { const args = [`-Dspring.output.ansi.enabled=${value}`, "-cp", "lib/*", "a.Main"]; await startRun({ ...config, kind: "spring-boot", args }); - expect(ipc.runStart).toHaveBeenCalledWith(expect.objectContaining({ args }), expect.anything()); + expect(ipc.runStart).toHaveBeenCalledWith(expect.objectContaining({ args }), expect.anything(), expect.any(Number)); expect(ipc.javaResolveLaunch).toHaveBeenCalledWith("app", false, "automatic", expect.any(Number)); }); it("keeps plain Java runs with an explicit classpath free of Spring Boot options", async () => { const args = ["-cp", "lib/*", "a.Main"]; await startRun({ ...config, args }); - expect(ipc.runStart).toHaveBeenCalledWith(expect.objectContaining({ args }), expect.anything()); + expect(ipc.runStart).toHaveBeenCalledWith(expect.objectContaining({ args }), expect.anything(), expect.any(Number)); expect(ipc.javaResolveLaunch).toHaveBeenCalledWith("app", false, "automatic", expect.any(Number)); }); @@ -172,6 +178,7 @@ it("adds the Spring Boot console option once when resolving the module classpath args: ["-Dspring.output.ansi.enabled=always", "-cp", "/p/app/target/classes", "a.Main"], }), expect.anything(), + expect.any(Number), ); }); diff --git a/src/features/run/remote.test.tsx b/src/features/run/remote.test.tsx index 774a52ef4..2556b0351 100644 --- a/src/features/run/remote.test.tsx +++ b/src/features/run/remote.test.tsx @@ -322,6 +322,7 @@ describe("remote debugging", () => { expect(ipc.runStart).toHaveBeenCalledWith( expect.objectContaining({ id: "app", params: { containerDebug: "true" } }), expect.anything(), + expect.any(Number), ); const channel = ipc.runStart.mock.calls.at(-1)![1] as { onmessage: (m: unknown) => void }; channel.onmessage({ diff --git a/src/features/run/resolveCancellation.test.ts b/src/features/run/resolveCancellation.test.ts index d023a1b23..95c7d5a8d 100644 --- a/src/features/run/resolveCancellation.test.ts +++ b/src/features/run/resolveCancellation.test.ts @@ -5,6 +5,7 @@ const ipc = vi.hoisted(() => ({ javaResolveLaunch: vi.fn(), cancelRequest: vi.fn(async () => undefined), runStart: vi.fn(), + runStop: vi.fn(async () => ({ status: "ok", data: null })), })); vi.mock("@/platform/ipc", async (importOriginal) => { const real = await importOriginal(); @@ -109,3 +110,38 @@ describe("Java run host separator", () => { ]); }); }); + +describe("Stop during target validation", () => { + it.each(["cancelled", "success"])("cancels startup and handles a late %s response", async (response) => { + let resolve!: (value: unknown) => void; + ipc.runStart.mockImplementationOnce( + () => + new Promise((done) => { + resolve = done; + }), + ); + const launch = startRun({ + ...config, + kind: "shell", + command: "composer", + args: ["install"], + target: "plugin-target:fixture", + }); + await vi.waitFor(() => expect(ipc.runStart).toHaveBeenCalledOnce()); + const session = useRun.getState().sessions[0]!; + const request = ipc.runStart.mock.calls[0]![2]; + expect(request).toEqual(expect.any(Number)); + await stopSession(session.id); + expect(ipc.cancelRequest).toHaveBeenCalledExactlyOnceWith(request); + resolve( + response === "cancelled" + ? { status: "error", error: { kind: "cancelled", message: "cancelled" } } + : { status: "ok", data: { id: 42 } }, + ); + await launch; + if (response === "success") expect(ipc.runStop).toHaveBeenCalledWith(42); + expect(useRun.getState().sessions[0]).toMatchObject({ stopped: true, status: "finished", runId: null }); + expect(runtime(session.id)!.resolveRequest).toBeUndefined(); + expect(notify).not.toHaveBeenCalled(); + }); +}); diff --git a/src/features/run/store.ts b/src/features/run/store.ts index 0c67b9cb3..b108bfa66 100644 --- a/src/features/run/store.ts +++ b/src/features/run/store.ts @@ -910,7 +910,18 @@ export async function startRun( } if (runtimes.get(sessionId)?.generation !== generation) return getSession(sessionId) ?? null; const processStarted = performance.now(); - const info = await startWithRemedies(started, () => call(commands.runStart(started, channel))); + const request = { id: nextRequestId(), controller: new AbortController() }; + rt.resolveRequest = request; + const info = await startWithRemedies(started, () => { + request.controller.signal.throwIfAborted(); + return call(commands.runStart(started, channel, request.id)); + }).finally(() => { + if (rt.resolveRequest === request) delete rt.resolveRequest; + }); + if (request.controller.signal.aborted || getSession(sessionId)?.stopped) { + await call(commands.runStop(info.id)).catch(() => undefined); + return getSession(sessionId) ?? null; + } console.info("Run process started", { name: config.name, ms: performance.now() - processStarted }); if (runtimes.get(sessionId)?.generation !== generation) return getSession(sessionId) ?? null; if (info.pty && rt.terminalSize) void commands.runResize(info.id, rt.terminalSize.cols, rt.terminalSize.rows); @@ -923,6 +934,7 @@ export async function startRun( finishSession(sessionId, exited); } } catch (e) { + if (getSession(sessionId)?.stopped || isCancelled(e)) return getSession(sessionId) ?? null; const message = e instanceof Error ? e.message : String(e); enqueue(sessionId, { kind: "stderr", text: tx`Error running '${config.name}': ${message}\n` }); flush(sessionId); diff --git a/src/platform/dotnet.ts b/src/platform/dotnet.ts index b6584f58b..4e577e99e 100644 --- a/src/platform/dotnet.ts +++ b/src/platform/dotnet.ts @@ -71,7 +71,7 @@ export async function dotnet(args: string[], cwd: string, signal?: AbortSignal): }; signal?.addEventListener("abort", stop); try { - const info = await call(commands.runStart(dotnetConfig(args, cwd), channel)); + const info = await call(commands.runStart(dotnetConfig(args, cwd), channel, null)); id = info.id; if (signal?.aborted || overflow) stop(); if (exits.has(id)) finish(exits.get(id)!); diff --git a/wit/exports.wit b/wit/exports.wit index 9a003a9c1..d1dc8b62a 100644 --- a/wit/exports.wit +++ b/wit/exports.wit @@ -73,3 +73,22 @@ interface syntax-provider { outline: func(language: string, text: string) -> list; folding: func(language: string, text: string) -> list; } + +/// Optional pre-launch gate for targets owned by this plugin (API 1.5). +interface run-target-validation { + enum operation { run, debug, test } + record launch-info { + operation: operation, + /// Bare program name before wrapping; no arguments or environment. + program: string, + /// Absolute working directory on the machine hosting the plugin. + cwd: string, + } + /// Called after trust, ownership, process grants and executable pin checks. + /// An error refuses the launch without changing the selected target. The + /// host prefixes and bounds the message. Missing exports allow the launch. + /// Calls wake reclaimed instances, use the host call timeout (5s by default), + /// and are cancelled with the launch. Traps/timeouts refuse the launch. + /// For remote projects this runs on the server, where the plugin lives. + validate: func(project: string, target-id: string, launch: launch-info) -> result<_, string>; +} diff --git a/wit/plugin.wit b/wit/plugin.wit index 3b3f4d0eb..2b178fa1c 100644 --- a/wit/plugin.wit +++ b/wit/plugin.wit @@ -200,3 +200,8 @@ world language-injections { export injections; } world plugin-mcp { include plugin; export mcp-provider; } /// Export-only MCP tools, composed with the base plugin world. world mcp-tools { export mcp-provider; } + +/// A plugin that validates launches through its run targets (API 1.5). +world plugin-run-target-validation { include plugin; export run-target-validation; } +/// Export-only validation, composed with the base plugin world. +world run-target-validator { export run-target-validation; }