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

merge feature/ticket96-effective-permissions-assistants-ticket dans develop

Browse Source
This commit is contained in:
Blomios
2026-07-27 14:18:59 +02:00
parent ce375c3e70 e74a9703f9
commit 6f532d7434
6 changed files with 343 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/infrastructure/src/assistant/mod.rs
View File

@ -214,6 +214,7 @@ impl TicketAssistantEnvironmentPreparer {
cwd: &ProjectPath,
requester: &str,
env: &mut Vec<(String, String)>,
eff: Option<&EffectivePermissions>,
) -> Result<(), RuntimeError> {
let Some(mcp) = &profile.mcp else {
return Ok(());
@ -244,14 +245,8 @@ impl TicketAssistantEnvironmentPreparer {
if profile.structured_adapter != Some(StructuredAdapter::OpenCode) {
return Ok(());
}
// No `PermissionStore` is wired for ticket-assistant sessions (no
// per-agent policy exists in this path, for any CLI) — `eff` is
// always `None` here, which per `opencode_permission_block`'s
// contract omits the `permission` key entirely and preserves
// OpenCode's native prompting, matching Claude/Codex's behaviour
// on this same path.
let body = if let Some(opencode) = profile.opencode.as_ref() {
opencode_config_json(opencode, project.root.as_str(), runtime.as_ref(), None)
opencode_config_json(opencode, project.root.as_str(), runtime.as_ref(), eff)
.to_string()
} else if let Some(provider) = profile.opencode_provider.as_ref() {
let api_key = self.resolve_opencode_provider_api_key(provider).await?;
@ -260,7 +255,7 @@ impl TicketAssistantEnvironmentPreparer {
&api_key,
project.root.as_str(),
runtime.as_ref(),
None,
eff,
)
.to_string()
} else {
@ -304,6 +299,7 @@ impl StructuredSessionEnvironmentPreparer for TicketAssistantEnvironmentPreparer
profile: &AgentProfile,
prepared: &PreparedContext,
requester: &str,
permissions: Option<&EffectivePermissions>,
) -> Result<StructuredSessionEnvironment, RuntimeError> {
let run_dir = self.run_dir(project, issue_ref)?;
self.create_dir(run_dir.as_str()).await?;
@ -313,8 +309,15 @@ impl StructuredSessionEnvironmentPreparer for TicketAssistantEnvironmentPreparer
let mut env = spec.env;
self.materialise_context(spec.context_plan, &spec.cwd, prepared, &mut env)
.await?;
self.materialise_mcp(project, profile, &spec.cwd, requester, &mut env)
.await?;
self.materialise_mcp(
project,
profile,
&spec.cwd,
requester,
&mut env,
permissions,
)
.await?;
Ok(StructuredSessionEnvironment {
cwd: spec.cwd,
env,