blomios/IdeA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(window): support des fenêtres plugin-hébergées (backend)

Browse Source 
Étend le port/usecases window et layout.customPluginLayout pour ouvrir et
piloter des fenêtres OS hébergeant un layout plugin, en réutilisant
contributes.layouts plutôt qu'un système de fenêtres parallèle. Câble la
commande Tauri et l'état app-tauri correspondants.

Cargo test -p domain --test window : 5/5
Cargo test -p application --test window_usecases : 7/7
Cargo test -p infrastructure --test window_state_store : 1/1
Cargo test -p app-tauri view_window_tests : 8/8

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blomios
2026-08-04 00:39:42 +02:00
parent 3ea1d58b38
commit 551eb09ad2
14 changed files with 884 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/application/src/layout/management.rs
View File

@ -15,7 +15,7 @@ use crate::error::AppError;
use super::store::{
default_tree, persist_doc, plugin_layout_tree, resolve_doc, LayoutKind, NamedLayout,
};
use crate::plugin::runtime_plugin_from_entry;
use crate::plugin::ensure_runtime_plugin_layout_contribution;
/// Lightweight descriptor of a named layout (no tree), for the layouts tab bar.
#[derive(Debug, Clone, PartialEq, Eq)]
@ -183,36 +183,15 @@ impl CreateLayout {
&self,
origin: &super::store::PluginLayoutOrigin,
) -> Result<(), AppError> {
let registry = self
.registry
.load_registry()
.await
.map_err(|e| AppError::Store(e.to_string()))?;
for entry in registry.plugins {
if entry.id != origin.plugin_id || !entry.lifecycle_state.is_runtime_active() {
continue;
}
let runtime =
runtime_plugin_from_entry(self.packages.as_ref(), self.validator.as_ref(), entry)
.await?;
if runtime
.contributes
.layouts
.iter()
.any(|layout| layout.layout_type == origin.layout_type)
{
return Ok(());
}
return Err(AppError::Invalid(format!(
"plugin `{}` does not contribute layout `{}`",
origin.plugin_id.as_str(),
origin.layout_type.as_str()
)));
}
Err(AppError::Invalid(format!(
"plugin `{}` is not active at runtime",
origin.plugin_id.as_str()
)))
ensure_runtime_plugin_layout_contribution(
self.packages.as_ref(),
self.registry.as_ref(),
self.validator.as_ref(),
&origin.plugin_id,
&origin.layout_type,
)
.await
.map(|_| ())
}
}

3
crates/application/src/lib.rs
View File

@ -222,7 +222,8 @@ pub use ticket_assistant::{
OpenTicketAssistantOutput,
};
pub use window::{
MoveTabToNewWindow, MoveTabToNewWindowInput, MoveTabToNewWindowOutput, RestoreOpenWindows,
MoveTabToNewWindow, MoveTabToNewWindowInput, MoveTabToNewWindowOutput, OpenPluginLayoutWindow,
OpenPluginLayoutWindowInput, OpenPluginLayoutWindowOutput, RestoreOpenWindows,
RestoreOpenWindowsOutput, SnapshotOpenWindows, SnapshotOpenWindowsInput,
};
pub use workstate::{

62
crates/application/src/plugin/mod.rs
View File

@ -14,8 +14,9 @@ use domain::ports::{
use domain::{
AgentId, BackgroundTask, BackgroundTaskState, BackgroundTaskWakePolicy, ContentHash,
DomainEvent, PluginContributionSet, PluginDescriptor, PluginId, PluginInstallSource,
PluginLifecycleState, PluginManifest, PluginMcpServerSpec, PluginRegistryEntry,
PluginTrustLevel, Project, ProjectId, ProjectPath, RemovalOutcome, StagedPluginPackage, TaskId,
PluginLayoutType, PluginLifecycleState, PluginManifest, PluginMcpServerSpec,
PluginRegistryEntry, PluginTrustLevel, Project, ProjectId, ProjectPath, RemovalOutcome,
StagedPluginPackage, TaskId,
};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
@ -159,6 +160,20 @@ pub struct PluginRuntimePlugin {
pub contributes: PluginContributionSet,
}
/// Runtime-validated plugin layout contribution.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct PluginRuntimeLayoutContribution {
/// Plugin id.
pub plugin_id: String,
/// Provider display name.
pub provider_plugin_display_name: String,
/// Layout type.
pub layout_type: String,
/// Layout display label.
pub label: String,
}
/// Input for plugin-owned storage reads/deletes.
#[derive(Debug, Clone, PartialEq, Eq, Deserialize)]
#[serde(rename_all = "camelCase")]
@ -2801,6 +2816,49 @@ pub(crate) async fn runtime_plugin_from_entry(
})
}
/// Validates that a plugin layout contribution exists and is active at runtime.
///
/// This is the canonical application-layer rule for every surface that wants to
/// host a plugin layout, whether inside a named project layout or a detached OS
/// window.
pub async fn ensure_runtime_plugin_layout_contribution(
packages: &dyn PluginPackageStore,
registry: &dyn PluginRegistryStore,
validator: &dyn PluginManifestValidator,
plugin_id: &PluginId,
layout_type: &PluginLayoutType,
) -> Result<PluginRuntimeLayoutContribution, AppError> {
let registry = registry.load_registry().await.map_err(map_registry)?;
for entry in registry.plugins {
if entry.id != *plugin_id || !entry.lifecycle_state.is_runtime_active() {
continue;
}
let runtime = runtime_plugin_from_entry(packages, validator, entry).await?;
if let Some(layout) = runtime
.contributes
.layouts
.iter()
.find(|layout| layout.layout_type == *layout_type)
{
return Ok(PluginRuntimeLayoutContribution {
plugin_id: runtime.id,
provider_plugin_display_name: runtime.display_name,
layout_type: layout.layout_type.as_str().to_owned(),
label: layout.label.clone(),
});
}
return Err(AppError::Invalid(format!(
"plugin `{}` does not contribute layout `{}`",
plugin_id.as_str(),
layout_type.as_str()
)));
}
Err(AppError::Invalid(format!(
"plugin `{}` is not active at runtime",
plugin_id.as_str()
)))
}
fn checked_plugin_asset_url(
packages: &dyn PluginPackageStore,
plugin_id: &PluginId,

3
crates/application/src/window/mod.rs
View File

@ -4,6 +4,7 @@
mod usecases;
pub use usecases::{
MoveTabToNewWindow, MoveTabToNewWindowInput, MoveTabToNewWindowOutput, RestoreOpenWindows,
MoveTabToNewWindow, MoveTabToNewWindowInput, MoveTabToNewWindowOutput, OpenPluginLayoutWindow,
OpenPluginLayoutWindowInput, OpenPluginLayoutWindowOutput, RestoreOpenWindows,
RestoreOpenWindowsOutput, SnapshotOpenWindows, SnapshotOpenWindowsInput,
};

120
crates/application/src/window/usecases.rs
View File

@ -9,10 +9,18 @@ use std::sync::Arc;
use domain::ids::{TabId, WindowId};
use std::collections::HashSet;
use domain::layout::{PersistedWindowKind, PersistedWindowState, WindowStateSnapshot, Workspace};
use domain::ports::{IdGenerator, ProjectStore, WindowStateStore};
use domain::layout::{
PersistedPluginLayoutWindow, PersistedWindowKind, PersistedWindowState, WindowStateSnapshot,
Workspace,
};
use domain::ports::{
IdGenerator, PluginManifestValidator, PluginPackageStore, PluginRegistryStore, ProjectStore,
WindowStateStore,
};
use domain::{PluginId, PluginLayoutType};
use crate::error::AppError;
use crate::plugin::{ensure_runtime_plugin_layout_contribution, PluginRuntimeLayoutContribution};
/// Input for [`MoveTabToNewWindow::execute`].
#[derive(Debug, Clone, PartialEq, Eq)]
@ -116,15 +124,27 @@ pub struct RestoreOpenWindowsOutput {
pub struct RestoreOpenWindows {
windows: Arc<dyn WindowStateStore>,
_projects: Arc<dyn ProjectStore>,
packages: Arc<dyn PluginPackageStore>,
registry: Arc<dyn PluginRegistryStore>,
validator: Arc<dyn PluginManifestValidator>,
}
impl RestoreOpenWindows {
/// Builds the use case from its ports.
#[must_use]
pub fn new(windows: Arc<dyn WindowStateStore>, projects: Arc<dyn ProjectStore>) -> Self {
pub fn new(
windows: Arc<dyn WindowStateStore>,
projects: Arc<dyn ProjectStore>,
packages: Arc<dyn PluginPackageStore>,
registry: Arc<dyn PluginRegistryStore>,
validator: Arc<dyn PluginManifestValidator>,
) -> Self {
Self {
windows,
_projects: projects,
packages,
registry,
validator,
}
}
@ -154,9 +174,103 @@ impl RestoreOpenWindows {
}
windows.push(window);
}
PersistedWindowKind::PluginLayout => {
let Some(surface) = &window.plugin_layout else {
continue;
};
if self.validate_plugin_layout_surface(surface).await.is_ok() {
windows.push(window);
}
}
}
}
Ok(RestoreOpenWindowsOutput { windows })
}
async fn validate_plugin_layout_surface(
&self,
surface: &PersistedPluginLayoutWindow,
) -> Result<(), AppError> {
ensure_runtime_plugin_layout_contribution(
self.packages.as_ref(),
self.registry.as_ref(),
self.validator.as_ref(),
&surface.plugin_id,
&surface.layout_type,
)
.await
.map(|_| ())
}
}
/// Input for [`OpenPluginLayoutWindow::execute`].
#[derive(Debug, Clone, PartialEq)]
pub struct OpenPluginLayoutWindowInput {
/// Provider plugin id.
pub plugin_id: PluginId,
/// Layout type declared by the provider plugin.
pub layout_type: PluginLayoutType,
/// Opaque plugin-owned initial/window state.
pub state: serde_json::Value,
}
/// Output of [`OpenPluginLayoutWindow::execute`].
#[derive(Debug, Clone, PartialEq)]
pub struct OpenPluginLayoutWindowOutput {
/// Runtime contribution that was validated.
pub contribution: PluginRuntimeLayoutContribution,
/// Persistable plugin layout surface.
pub surface: PersistedPluginLayoutWindow,
}
/// Validates a plugin layout contribution before a detached OS window hosts it.
pub struct OpenPluginLayoutWindow {
packages: Arc<dyn PluginPackageStore>,
registry: Arc<dyn PluginRegistryStore>,
validator: Arc<dyn PluginManifestValidator>,
}
impl OpenPluginLayoutWindow {
/// Builds the use case from plugin runtime ports.
#[must_use]
pub fn new(
packages: Arc<dyn PluginPackageStore>,
registry: Arc<dyn PluginRegistryStore>,
validator: Arc<dyn PluginManifestValidator>,
) -> Self {
Self {
packages,
registry,
validator,
}
}
/// Executes the validation.
///
/// # Errors
/// [`AppError::Invalid`] when the plugin is inactive or does not declare the
/// requested layout contribution; other errors bubble from plugin loading.
pub async fn execute(
&self,
input: OpenPluginLayoutWindowInput,
) -> Result<OpenPluginLayoutWindowOutput, AppError> {
let contribution = ensure_runtime_plugin_layout_contribution(
self.packages.as_ref(),
self.registry.as_ref(),
self.validator.as_ref(),
&input.plugin_id,
&input.layout_type,
)
.await?;
let surface = PersistedPluginLayoutWindow {
plugin_id: input.plugin_id,
layout_type: input.layout_type,
state: input.state,
};
Ok(OpenPluginLayoutWindowOutput {
contribution,
surface,
})
}
}

279
crates/application/tests/window_usecases.rs
View File

@ -6,17 +6,25 @@ use std::sync::{Arc, Mutex};
use async_trait::async_trait;
use domain::ids::{ProjectId, TabId, WindowId};
use domain::layout::{
LayoutNode, LayoutTree, LeafCell, PersistedWindowKind, PersistedWindowState, Tab, Window,
WindowStateSnapshot, Workspace,
LayoutNode, LayoutTree, LeafCell, PersistedPluginLayoutWindow, PersistedWindowKind,
PersistedWindowState, Tab, Window, WindowStateSnapshot, Workspace,
};
use domain::ports::{
IdGenerator, PluginManifestBytes, PluginPackageStore, PluginRegistryError, PluginRegistryStore,
PluginStoreError, ProjectStore, StoreError, WindowStateStore,
};
use domain::ports::{IdGenerator, ProjectStore, StoreError, WindowStateStore};
use domain::project::{Project, ProjectPath};
use domain::{NodeId, RemoteRef};
use domain::{
ContentHash, LocalPath, NodeId, PluginBundleUrl, PluginId, PluginInstallSource,
PluginLayoutType, PluginLifecycleState, PluginPackageRef, PluginRegistry, PluginRegistryEntry,
RelativePath, RemoteRef, RemovalOutcome, StagedPluginPackage,
};
use uuid::Uuid;
use application::plugin::JsonPluginManifestValidator;
use application::{
MoveTabToNewWindow, MoveTabToNewWindowInput, RestoreOpenWindows, SnapshotOpenWindows,
SnapshotOpenWindowsInput,
MoveTabToNewWindow, MoveTabToNewWindowInput, OpenPluginLayoutWindow,
OpenPluginLayoutWindowInput, RestoreOpenWindows, SnapshotOpenWindows, SnapshotOpenWindowsInput,
};
/// A `ProjectStore` fake that only implements the workspace persistence the use
@ -68,6 +76,134 @@ impl WindowStateStore for FakeWindowStateStore {
}
}
fn plugin_manifest() -> Vec<u8> {
br#"{
"ideaPluginManifestVersion": 1,
"id": "dev.idea.android-plugin",
"displayName": "Android",
"version": "1.0.0",
"engines": {"idea": ">=0.1.0 <1.0.0"},
"main": "dist/index.js",
"trustLevel": "full",
"capabilities": ["ui"],
"contributes": {
"layouts": [{"type":"idea-android.health","label":"Android Health","component":"AndroidHealth"}]
}
}"#.to_vec()
}
#[derive(Clone)]
struct FakePluginPackages {
manifest: Arc<Mutex<Vec<u8>>>,
}
impl FakePluginPackages {
fn new(manifest: Vec<u8>) -> Self {
Self {
manifest: Arc::new(Mutex::new(manifest)),
}
}
}
#[async_trait]
impl PluginPackageStore for FakePluginPackages {
async fn list_installed(&self) -> Result<Vec<PluginPackageRef>, PluginStoreError> {
Ok(Vec::new())
}
async fn read_manifest(
&self,
_package: &PluginPackageRef,
) -> Result<PluginManifestBytes, PluginStoreError> {
Ok(PluginManifestBytes {
bytes: self.manifest.lock().unwrap().clone(),
})
}
async fn install_from_archive(
&self,
_archive: &LocalPath,
) -> Result<StagedPluginPackage, PluginStoreError> {
Err(PluginStoreError::Invalid("unused".to_owned()))
}
async fn install_from_directory(
&self,
_dir: &LocalPath,
) -> Result<StagedPluginPackage, PluginStoreError> {
Err(PluginStoreError::Invalid("unused".to_owned()))
}
async fn commit_install(
&self,
staged: StagedPluginPackage,
plugin_id: &PluginId,
) -> Result<PluginPackageRef, PluginStoreError> {
Ok(PluginPackageRef {
plugin_id: Some(plugin_id.clone()),
root: staged.root,
})
}
async fn remove_package(
&self,
_plugin_id: &PluginId,
) -> Result<RemovalOutcome, PluginStoreError> {
Ok(RemovalOutcome::NotFound)
}
fn bundle_url(
&self,
plugin_id: &PluginId,
entry: &RelativePath,
hash: &ContentHash,
) -> Result<PluginBundleUrl, PluginStoreError> {
Ok(PluginBundleUrl::new(format!(
"idea-plugin://{}/current/{}/{}",
plugin_id.as_str(),
hash.as_str(),
entry.as_str()
)))
}
}
#[derive(Clone)]
struct FakePluginRegistry {
registry: Arc<Mutex<PluginRegistry>>,
}
impl FakePluginRegistry {
fn with_state(lifecycle_state: PluginLifecycleState) -> Self {
Self {
registry: Arc::new(Mutex::new(PluginRegistry {
version: 1,
plugins: vec![PluginRegistryEntry {
id: PluginId::new("dev.idea.android-plugin").unwrap(),
lifecycle_state,
source: PluginInstallSource::Directory {
path_label: "/plugin".to_owned(),
},
content_hash: ContentHash::new("abc123").unwrap(),
restart_required: false,
error: None,
}],
})),
}
}
}
#[async_trait]
impl PluginRegistryStore for FakePluginRegistry {
async fn load_registry(&self) -> Result<PluginRegistry, PluginRegistryError> {
Ok(self.registry.lock().unwrap().clone())
}
async fn save_registry(&self, registry: &PluginRegistry) -> Result<(), PluginRegistryError> {
*self.registry.lock().unwrap() = registry.clone();
Ok(())
}
}
#[derive(Clone)]
struct FakeProjectRegistry {
existing: Arc<Mutex<Vec<ProjectId>>>,
@ -148,6 +284,7 @@ fn persisted_main() -> PersistedWindowState {
kind: PersistedWindowKind::Main,
panel: None,
project_id: None,
plugin_layout: None,
url: None,
visible: true,
maximized: false,
@ -165,6 +302,7 @@ fn persisted_view(label: &str, project_id: ProjectId) -> PersistedWindowState {
kind: PersistedWindowKind::View,
panel: Some("tickets".to_owned()),
project_id: Some(project_id),
plugin_layout: None,
url: Some(format!("index.html?panel=tickets&project={project_id}")),
visible: true,
maximized: false,
@ -176,6 +314,52 @@ fn persisted_view(label: &str, project_id: ProjectId) -> PersistedWindowState {
}
}
fn persisted_plugin_layout(
label: &str,
plugin_id: &str,
layout_type: &str,
) -> PersistedWindowState {
PersistedWindowState {
label: label.to_owned(),
kind: PersistedWindowKind::PluginLayout,
panel: None,
project_id: None,
plugin_layout: Some(PersistedPluginLayoutWindow {
plugin_id: PluginId::new(plugin_id).unwrap(),
layout_type: PluginLayoutType::new(layout_type).unwrap(),
state: serde_json::json!({ "from": "test" }),
}),
url: Some(format!(
"index.html?pluginLayout=1&pluginId={plugin_id}&layoutType={layout_type}"
)),
visible: true,
maximized: false,
fullscreen: false,
outer_position: None,
outer_size: None,
monitor: None,
last_focused_at: None,
}
}
fn restore_uc(store: FakeWindowStateStore, registry: FakePluginRegistry) -> RestoreOpenWindows {
RestoreOpenWindows::new(
Arc::new(store),
Arc::new(FakeProjectRegistry::new(vec![])),
Arc::new(FakePluginPackages::new(plugin_manifest())),
Arc::new(registry),
Arc::new(JsonPluginManifestValidator::new("0.3.0")),
)
}
fn open_plugin_layout_uc(registry: FakePluginRegistry) -> OpenPluginLayoutWindow {
OpenPluginLayoutWindow::new(
Arc::new(FakePluginPackages::new(plugin_manifest())),
Arc::new(registry),
Arc::new(JsonPluginManifestValidator::new("0.3.0")),
)
}
#[tokio::test]
async fn detaches_tab_and_persists_workspace() {
let store = seeded();
@ -250,8 +434,10 @@ async fn restore_open_windows_keeps_panel_views_without_reopening_projects() {
url_missing,
no_panel,
]))));
let projects = FakeProjectRegistry::new(vec![]);
let uc = RestoreOpenWindows::new(Arc::new(store), Arc::new(projects));
let uc = restore_uc(
store,
FakePluginRegistry::with_state(PluginLifecycleState::Enabled),
);
let out = uc.execute().await.unwrap();
@ -268,3 +454,80 @@ async fn restore_open_windows_keeps_panel_views_without_reopening_projects() {
]
);
}
#[tokio::test]
async fn open_plugin_layout_window_validates_active_runtime_contribution() {
let uc = open_plugin_layout_uc(FakePluginRegistry::with_state(
PluginLifecycleState::Enabled,
));
let out = uc
.execute(OpenPluginLayoutWindowInput {
plugin_id: PluginId::new("dev.idea.android-plugin").unwrap(),
layout_type: PluginLayoutType::new("idea-android.health").unwrap(),
state: serde_json::json!({ "deviceId": "pixel-8" }),
})
.await
.unwrap();
assert_eq!(out.contribution.provider_plugin_display_name, "Android");
assert_eq!(out.contribution.label, "Android Health");
assert_eq!(out.surface.plugin_id.as_str(), "dev.idea.android-plugin");
assert_eq!(out.surface.layout_type.as_str(), "idea-android.health");
assert_eq!(out.surface.state["deviceId"], "pixel-8");
}
#[tokio::test]
async fn open_plugin_layout_window_rejects_inactive_plugin() {
let uc = open_plugin_layout_uc(FakePluginRegistry::with_state(
PluginLifecycleState::Disabled,
));
let err = uc
.execute(OpenPluginLayoutWindowInput {
plugin_id: PluginId::new("dev.idea.android-plugin").unwrap(),
layout_type: PluginLayoutType::new("idea-android.health").unwrap(),
state: serde_json::Value::Null,
})
.await
.unwrap_err();
assert_eq!(err.code(), "INVALID", "got {err:?}");
}
#[tokio::test]
async fn restore_open_windows_keeps_valid_plugin_layout_windows_only() {
let mut missing_surface = persisted_plugin_layout(
"view-plugin-layout-missing",
"dev.idea.android-plugin",
"idea-android.health",
);
missing_surface.plugin_layout = None;
let store = FakeWindowStateStore(Arc::new(Mutex::new(WindowStateSnapshot::new(vec![
persisted_plugin_layout(
"view-plugin-layout-valid",
"dev.idea.android-plugin",
"idea-android.health",
),
persisted_plugin_layout(
"view-plugin-layout-unknown-layout",
"dev.idea.android-plugin",
"idea-android.missing",
),
missing_surface,
]))));
let uc = restore_uc(
store,
FakePluginRegistry::with_state(PluginLifecycleState::Enabled),
);
let out = uc.execute().await.unwrap();
assert_eq!(
out.windows
.iter()
.map(|w| w.label.as_str())
.collect::<Vec<_>>(),
vec!["view-plugin-layout-valid"]
);
}