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

feat(infrastructure,backend,app-tauri,frontend): tools MCP workspace natifs read-only idea_workspace_map/list/read/search, activés par défaut et configurables dans les permissions MCP et les templates — #341 (QA verte)

Browse Source
This commit is contained in:
Blomios
2026-09-12 19:17:09 +02:00
parent ea42d95f2e
commit 7b712f2b62
16 changed files with 1503 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
crates/backend/src/lib.rs
View File

@ -111,16 +111,17 @@ use infrastructure::{
FsPluginStorageStore, FsProfileStore, FsProjectPluginSettingsStore, FsProjectSettingsStore,
FsProjectStore, FsProviderSessionStore, FsScheduledProjectTaskStore, FsSecretStore,
FsSkillStore, FsSprintStore, FsSystemPermissionStore, FsTemplateStore, FsUserSettingsStore,
FsWindowStateStore, Git2Repository, HeuristicHandoffSummarizer, HfModelArtifactDownloader,
HttpOpenAiCompatibleProbe, HttpProviderModelCatalogue, IdeaiContextStore,
InMemoryConversationRegistry, InMemoryMailbox, InMemoryPairAttemptLimiter, LlamaCppRuntime,
LocalEnvironmentReader, LocalFileSystem, LocalManagedProcess, LocalProcessSpawner,
ManagedTempToolProvider, McpServer, MediatedInbox, NaiveMemoryRecall, OrchestratorWatchHandle,
PortablePtyAdapter, ProcessCliVersionReader, ReadOnlyRuntimePermissionProbe, RwFileGuard,
StructuredSessionFactory, SystemClock, SystemMillisClock, TemplateToolProvider,
TicketAssistantEnvironmentPreparer, TicketToolProvider, TokioBroadcastEventBus, TokioScheduler,
ToolPolicyRegistry, UuidGenerator, VectorMemoryRecall, DEFAULT_OLLAMA_BASE_URL,
ONNX_CACHE_SUBDIR, RECOMMENDED_ONNX_MODELS, VECTOR_HTTP_ENABLED, VECTOR_ONNX_ENABLED,
FsWindowStateStore, FsWorkspaceToolProvider, Git2Repository, HeuristicHandoffSummarizer,
HfModelArtifactDownloader, HttpOpenAiCompatibleProbe, HttpProviderModelCatalogue,
IdeaiContextStore, InMemoryConversationRegistry, InMemoryMailbox, InMemoryPairAttemptLimiter,
LlamaCppRuntime, LocalEnvironmentReader, LocalFileSystem, LocalManagedProcess,
LocalProcessSpawner, ManagedTempToolProvider, McpServer, MediatedInbox, NaiveMemoryRecall,
OrchestratorWatchHandle, PortablePtyAdapter, ProcessCliVersionReader,
ReadOnlyRuntimePermissionProbe, RwFileGuard, StructuredSessionFactory, SystemClock,
SystemMillisClock, TemplateToolProvider, TicketAssistantEnvironmentPreparer,
TicketToolProvider, TokioBroadcastEventBus, TokioScheduler, ToolPolicyRegistry, UuidGenerator,
VectorMemoryRecall, WorkspaceToolProvider, DEFAULT_OLLAMA_BASE_URL, ONNX_CACHE_SUBDIR,
RECOMMENDED_ONNX_MODELS, VECTOR_HTTP_ENABLED, VECTOR_ONNX_ENABLED,
};
pub mod dto;
@ -2184,6 +2185,8 @@ pub struct BackendCore {
pub(crate) managed_temp_tool_provider: Arc<dyn ManagedTempToolProvider>,
/// MCP provider for public plugin administration tools.
pub(crate) plugin_tool_provider: Arc<dyn PluginToolProvider>,
/// MCP provider for the read-only `idea_workspace_*` tools.
pub(crate) workspace_tool_provider: Arc<dyn WorkspaceToolProvider>,
/// Open an ephemeral AI assistant chat bound to one ticket.
pub open_ticket_assistant: Arc<OpenTicketAssistant>,
/// Close an ephemeral AI assistant chat bound to one ticket.
@ -3112,6 +3115,8 @@ impl BackendCore {
let managed_temp_tool_binder = Arc::new(LateBoundManagedTempToolProvider::new());
let managed_temp_tool_provider: Arc<dyn ManagedTempToolProvider> =
managed_temp_tool_binder.clone();
let workspace_tool_provider: Arc<dyn WorkspaceToolProvider> =
Arc::new(FsWorkspaceToolProvider::new());
let tool_policy_registry = Arc::new(ToolPolicyRegistry::new());
let tool_policy_store = Arc::clone(&tool_policy_registry) as Arc<dyn AgentToolPolicyStore>;
let system_permission_store = Arc::new(FsSystemPermissionStore::new(Arc::clone(&fs_port)));
@ -4296,16 +4301,19 @@ impl BackendCore {
.with_spawn_background_command(Arc::clone(&spawn_background_command))
.with_scheduled_project_tasks(Arc::clone(&scheduled_project_tasks)),
);
openai_tool_invoker.bind(Arc::new(AppOpenAiToolInvoker::new(
Arc::clone(&orchestrator_service),
Arc::clone(&store_port),
Arc::clone(&tool_policy_registry) as Arc<dyn AgentToolPolicyStore>,
Arc::clone(&mcp_tool_permission_store_port),
Arc::clone(&ticket_tool_provider),
Arc::clone(&template_tool_provider),
Arc::clone(&managed_temp_tool_provider),
Arc::clone(&plugin_tool_provider),
)) as Arc<dyn ToolInvoker>);
openai_tool_invoker.bind(Arc::new(
AppOpenAiToolInvoker::new(
Arc::clone(&orchestrator_service),
Arc::clone(&store_port),
Arc::clone(&tool_policy_registry) as Arc<dyn AgentToolPolicyStore>,
Arc::clone(&mcp_tool_permission_store_port),
Arc::clone(&ticket_tool_provider),
Arc::clone(&template_tool_provider),
Arc::clone(&managed_temp_tool_provider),
Arc::clone(&plugin_tool_provider),
)
.with_workspace_tools(Arc::clone(&workspace_tool_provider)),
) as Arc<dyn ToolInvoker>);
let stop_live_agent = Arc::new(
StopAgentRuntime::new(Arc::clone(&live_sessions), Arc::clone(&close_terminal))
@ -4444,6 +4452,7 @@ impl BackendCore {
ticket_tool_provider,
template_tool_provider,
managed_temp_tool_provider,
workspace_tool_provider,
open_ticket_assistant,
close_ticket_assistant,
tool_policy_registry,
@ -4793,6 +4802,7 @@ impl BackendCore {
.with_template_tools(Arc::clone(&self.template_tool_provider))
.with_managed_temp_tools(Arc::clone(&self.managed_temp_tool_provider))
.with_plugin_tools(Arc::clone(&self.plugin_tool_provider))
.with_workspace_tools(Arc::clone(&self.workspace_tool_provider))
.with_tool_policies(Arc::clone(&self.tool_policy_registry))
.with_mcp_tool_permissions(Arc::clone(&self.mcp_tool_permission_store)),
endpoint,

100
crates/backend/src/openai_tools.rs
View File

@ -1,7 +1,8 @@
//! ToolInvoker for the OpenAI-compatible adapter.
//!
//! C'est la porte locale qui donne aux modèles HTTP la même surface `idea_*` que
//! le serveur MCP : même catalogue, même mapping en `OrchestratorCommand`, même
//! le serveur MCP : même catalogue et même policy. Les outils spécialisés
//! utilisent leurs providers dédiés ; les commandes d'orchestration passent par
//! `OrchestratorService::dispatch`.
use std::str::FromStr;
@ -15,7 +16,10 @@ use domain::ports::{
};
use domain::{AgentToolPolicy, IssueRef, McpToolPolicy, Project};
use infrastructure::orchestrator::mcp::PluginToolProvider;
use infrastructure::{ManagedTempToolProvider, TemplateToolProvider, TicketToolProvider};
use infrastructure::{
FsWorkspaceToolProvider, ManagedTempToolProvider, TemplateToolProvider, TicketToolProvider,
WorkspaceToolProvider,
};
use serde_json::Value;
const PROJECT_ROOT_ARG: &str = "__ideaProjectRoot";
@ -31,6 +35,7 @@ pub struct AppOpenAiToolInvoker {
template_tools: Arc<dyn TemplateToolProvider>,
managed_temp_tools: Arc<dyn ManagedTempToolProvider>,
plugin_tools: Arc<dyn PluginToolProvider>,
workspace_tools: Arc<dyn WorkspaceToolProvider>,
}
/// Proxy injecté avant que l'orchestrateur soit construit, puis lié dans la
@ -116,8 +121,16 @@ impl AppOpenAiToolInvoker {
template_tools,
managed_temp_tools,
plugin_tools,
workspace_tools: Arc::new(FsWorkspaceToolProvider::new()),
}
}
/// Replaces the default filesystem workspace adapter at the composition root.
#[must_use]
pub fn with_workspace_tools(mut self, workspace_tools: Arc<dyn WorkspaceToolProvider>) -> Self {
self.workspace_tools = workspace_tools;
self
}
}
#[async_trait]
@ -249,6 +262,24 @@ impl ToolInvoker for AppOpenAiToolInvoker {
return serde_json::to_string(&value)
.map_err(|e| ToolInvocationError::Execution(format!("JSON plugin tool: {e}")));
}
if infrastructure::orchestrator::mcp::tools::is_workspace_tool(name) {
let mut workspace_arguments = value;
if let Some(arguments) = workspace_arguments.as_object_mut() {
arguments.remove(PROJECT_ROOT_ARG);
arguments.remove(REQUESTER_ARG);
}
let value = self
.workspace_tools
.handle_workspace_tool(&project, &requester, name, workspace_arguments)
.await
.map_err(|e| {
let detail =
serde_json::to_string(&e.to_value()).unwrap_or_else(|_| e.to_string());
ToolInvocationError::Execution(detail)
})?;
return serde_json::to_string(&value)
.map_err(|e| ToolInvocationError::Execution(format!("JSON workspace tool: {e}")));
}
let command = infrastructure::orchestrator::mcp::map_tool_call(name, &value, &requester)
.map_err(|e| match e {
infrastructure::orchestrator::mcp::ToolMapError::UnknownTool(tool) => {
@ -961,6 +992,71 @@ mod tests {
let _ = std::fs::remove_dir_all(temp);
}
#[tokio::test]
async fn openai_workspace_tools_are_listed_and_use_the_workspace_provider() {
let temp =
std::env::temp_dir().join(format!("idea-openai-workspace-tools-{}", Uuid::new_v4()));
std::fs::create_dir_all(temp.join("src")).unwrap();
std::fs::write(temp.join("src/lib.rs"), "pub fn workspace_marker() {}\n").unwrap();
let root = temp.to_string_lossy().into_owned();
let workspace_project = Project::new(
ProjectId::from_uuid(Uuid::from_u128(341)),
"workspace-tools",
ProjectPath::new(root.clone()).unwrap(),
RemoteRef::local(),
1_000,
)
.unwrap();
let core = crate::BackendCore::build(temp.join("state"));
let requester = AgentId::from_uuid(Uuid::from_u128(341)).to_string();
let invoker = AppOpenAiToolInvoker::new(
Arc::clone(&core.orchestrator_service),
Arc::new(FakeProjects::with(workspace_project)) as Arc<dyn ProjectStore>,
Arc::new(FakePolicies::default()),
mcp_permissions(ProjectMcpToolPermissions::default()),
Arc::new(FakeTicketTools::default()),
Arc::new(FakeTemplateTools::default()),
fake_managed_temp_tools(),
fake_plugin_tools(),
);
let tools = invoker
.tools_for_context(&root, &requester)
.await
.expect("default read-only catalogue");
let names = tools
.iter()
.map(|tool| tool.name.as_str())
.collect::<Vec<_>>();
for name in [
"idea_workspace_map",
"idea_workspace_list",
"idea_workspace_read",
"idea_workspace_search",
] {
assert!(names.contains(&name), "missing {name}");
}
let result = invoker
.call(
"idea_workspace_search",
&json!({
PROJECT_ROOT_ARG: root,
REQUESTER_ARG: requester,
"query": "workspace_marker",
"path": "src",
})
.to_string(),
)
.await
.expect("workspace search should use its dedicated provider");
let result: Value = serde_json::from_str(&result).unwrap();
assert_eq!(result["matches"][0]["path"], "src/lib.rs");
assert_eq!(result["matches"][0]["line"], 1);
let _ = std::fs::remove_dir_all(temp);
}
#[tokio::test]
async fn openai_tools_list_matches_durable_agent_policy() {
let temp =