Skip to content

fix(external-sources): improve controls and recovery #2241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
limityan merged 2 commits into from
Aug 12, 2026
Merged

fix(external-sources): improve controls and recovery #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efac2c3
fix(external-sources): improve controls and recovery
limityan Aug 12, 2026
4d64eba
fix(external-sources): repair CI and source boundaries
limityan Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/core-boundaries/rules/source/forbidden-rules.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4207,6 +4207,7 @@ export const forbiddenContentUnderRules = [
'src/crates/adapters/static-hook-support/tests/parser.rs',
'src/crates/adapters/opencode-adapter/src/hook_source.rs',
'src/crates/adapters/opencode-adapter/src/command_source.rs',
'src/crates/adapters/opencode-adapter/src/agent_source.rs',
'src/crates/adapters/opencode-adapter/src/mcp_source.rs',
'src/crates/adapters/claude-code-adapter/src/hook_source.rs',
'src/crates/adapters/claude-code-adapter/src/command_source.rs',
Expand Down
25 changes: 24 additions & 1 deletion scripts/core-boundaries/rules/source/public-api-rules.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,23 @@ function staticSourceSupportEntry(symbol) {
};
}

function commonExternalSubagentToolMappingEntry(symbol) {
return {
symbol,
owner: 'static-hook-support shared declarative source adapter utility owner',
consumer: 'reviewed OpenCode and Claude Code declarative subagent adapters',
verification:
'shared mapping unit tests, ecosystem subagent adapter fixtures, and core-boundary public API budget checks',
p0: 'runtime-free common external Agent tool capability normalization',
contractSlice: contractSlices.externalSourceControlContract,
wireImpact: false,
rationale:
'sibling declarative adapters need one static mapping while provider-specific aliases remain adapter-owned',
exit:
'remove only if every reviewed consumer moves to an equivalent adapter-layer mapping owner',
};
}

function declarativeSourceAdapterEntry(
symbol,
owner,
Expand Down Expand Up @@ -477,7 +494,9 @@ export const staticHookSupportPublicApiEntries = [
'BoundedDirectoryWalkLimit',
'BoundedDirectoryWalkError',
'collect_bounded_regular_files',
].map(staticSourceSupportEntry));
].map(staticSourceSupportEntry)).concat([
'common_external_subagent_tool_capability',
].map(commonExternalSubagentToolMappingEntry));

function externalHookContractEntry(symbol, owner, consumer, wireImpact = false) {
return {
Expand Down Expand Up @@ -868,6 +887,7 @@ export const externalSubagentContractPublicApiEntries = [
'ExternalSubagentModelBindingMethod',
'ExternalSubagentModelBindingOption',
'ExternalSubagentModelBindingGroup',
'ExternalSubagentToolCapability',
'ExternalSubagentToolSelector',
'ExternalSubagentToolRequest',
'ExternalSubagentCompatibilityState',
Expand Down Expand Up @@ -1102,6 +1122,7 @@ export const externalSourceCorePublicApiEntries = [
'ExternalToolConflictCandidateKind',
'ExternalToolRuntimeKind',
'set_external_tool_target_decision',
'set_external_tool_targets_enabled',
'set_external_tool_conflict_choice',
].map((symbol) =>
externalToolEntry(
Expand All @@ -1123,6 +1144,7 @@ export const externalSourceCorePublicApiEntries = [
'ExternalSubagentModelRequest',
'ExternalSubagentSummary',
'set_external_subagent_activation',
'set_external_subagents_enabled',
'set_external_subagent_model_binding',
'choose_external_subagent_conflict',
].map((symbol) =>
Expand All @@ -1140,6 +1162,7 @@ export const externalSourceCorePublicApiEntries = [
'ExternalMcpTransportKind',
'native_mcp_candidate_id',
'set_external_mcp_server_decision',
'set_external_mcp_servers_enabled',
'choose_external_mcp_conflict',
].map((symbol) =>
externalMcpEntry(
Expand Down
82 changes: 77 additions & 5 deletions src/apps/cli/src/peer_host/commands/external_sources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ use bitfun_core::external_sources::{
apply_external_source_control_action, choose_external_mcp_conflict,
choose_external_subagent_conflict, external_source_snapshot,
get_external_source_control_snapshot, set_external_mcp_server_decision,
set_external_prompt_command_conflict_choice, set_external_source_enabled,
set_external_subagent_activation, set_external_subagent_model_binding,
set_external_mcp_servers_enabled, set_external_prompt_command_conflict_choice,
set_external_source_enabled, set_external_subagent_activation,
set_external_subagent_model_binding, set_external_subagents_enabled,
set_external_tool_conflict_choice, set_external_tool_target_decision,
update_external_integration_policy, ExternalIntegrationPolicyMutation,
ExternalSourceControlRequestV1, ExternalSourceHostCapabilities, ExternalSourceOperationError,
ExternalSourceOperationErrorCode, ExternalSourceOperationResult, ExternalSourcePublicSnapshot,
set_external_tool_targets_enabled, update_external_integration_policy,
ExternalIntegrationPolicyMutation, ExternalSourceControlRequestV1,
ExternalSourceHostCapabilities, ExternalSourceOperationError, ExternalSourceOperationErrorCode,
ExternalSourceOperationResult, ExternalSourcePublicSnapshot,
ExternalSubagentModelBindingTarget,
};
use serde_json::Value;
Expand Down Expand Up @@ -60,6 +62,28 @@ fn required_u64(request: &Value, key: &str) -> ExternalSourceOperationResult<u64
})
}

fn decision_pairs(
request: &Value,
first_key: &str,
second_key: &str,
) -> ExternalSourceOperationResult<Vec<(String, String)>> {
let decisions = request
.get("decisions")
.and_then(Value::as_array)
.ok_or_else(|| {
ExternalSourceOperationError::invalid_request("Missing or invalid 'decisions'")
})?;
decisions
.iter()
.map(|decision| {
Ok((
required_string(decision, first_key)?,
required_string(decision, second_key)?,
))
})
.collect()
}

fn model_binding_target_field(
request: &Value,
key: &str,
Expand Down Expand Up @@ -221,6 +245,16 @@ async fn dispatch_inner(
)
.await
}
"set_external_tool_targets_enabled_command" => {
set_external_tool_targets_enabled(
workspace,
decision_pairs(request, "approvalKey", "decisionKey")?,
required_bool(request, "enabled")?,
required_u64(request, "expectedCatalogGeneration")?,
required_u64(request, "expectedPreferenceRevision")?,
)
.await
}
"set_external_tool_conflict_choice_command" => {
set_external_tool_conflict_choice(
workspace,
Expand All @@ -241,6 +275,16 @@ async fn dispatch_inner(
)
.await
}
"set_external_subagents_enabled_command" => {
set_external_subagents_enabled(
workspace,
decision_pairs(request, "candidateId", "decisionKey")?,
required_bool(request, "enabled")?,
required_u64(request, "expectedSubagentGeneration")?,
required_u64(request, "expectedPreferenceRevision")?,
)
.await
}
"set_external_subagent_model_binding_command" => {
set_external_subagent_model_binding(
workspace,
Expand Down Expand Up @@ -273,6 +317,16 @@ async fn dispatch_inner(
)
.await
}
"set_external_mcp_servers_enabled_command" => {
set_external_mcp_servers_enabled(
workspace,
decision_pairs(request, "candidateId", "decisionKey")?,
required_bool(request, "enabled")?,
required_u64(request, "expectedMcpGeneration")?,
required_u64(request, "expectedPreferenceRevision")?,
)
.await
}
"choose_external_mcp_conflict_command" => {
choose_external_mcp_conflict(
workspace,
Expand Down Expand Up @@ -395,4 +449,22 @@ mod tests {
ExternalSourceOperationErrorCode::InvalidRequest
);
}

#[test]
fn peer_bulk_decisions_preserve_the_reviewed_identity_pairs() {
let request = serde_json::json!({
"decisions": [
{ "candidateId": "agent-a", "decisionKey": "decision-a" },
{ "candidateId": "agent-b", "decisionKey": "decision-b" }
]
});

assert_eq!(
decision_pairs(&request, "candidateId", "decisionKey").unwrap(),
vec![
("agent-a".to_string(), "decision-a".to_string()),
("agent-b".to_string(), "decision-b".to_string()),
]
);
}
}
3 changes: 3 additions & 0 deletions src/apps/cli/src/peer_host/commands/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,14 @@ pub(crate) async fn dispatch(
| "set_external_source_enabled_command"
| "set_external_source_conflict_choice_command"
| "set_external_tool_target_decision_command"
| "set_external_tool_targets_enabled_command"
| "set_external_tool_conflict_choice_command"
| "set_external_subagent_activation_command"
| "set_external_subagents_enabled_command"
| "set_external_subagent_model_binding_command"
| "choose_external_subagent_conflict_command"
| "set_external_mcp_server_decision_command"
| "set_external_mcp_servers_enabled_command"
| "choose_external_mcp_conflict_command"
| "update_external_integration_policy_command" => {
external_sources::dispatch(command, args, state).await
Expand Down
128 changes: 118 additions & 10 deletions src/apps/desktop/src/api/external_sources_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ use bitfun_core::external_sources::{
external_source_snapshot,
get_external_source_control_snapshot as core_get_external_source_control_snapshot,
native_prompt_command_conflicts, set_external_mcp_server_decision,
set_external_prompt_command_conflict_choice, set_external_source_enabled,
set_external_subagent_activation, set_external_subagent_model_binding,
set_external_mcp_servers_enabled, set_external_prompt_command_conflict_choice,
set_external_source_enabled, set_external_subagent_activation,
set_external_subagent_model_binding, set_external_subagents_enabled,
set_external_tool_conflict_choice, set_external_tool_target_decision,
set_native_prompt_command_conflict_choice, unacknowledged_external_ecosystems,
update_external_integration_policy, workspace_reference_snapshot,
ExternalIntegrationPolicyMutation, ExternalSourceControlRequestV1,
ExternalSourceHostCapabilities, ExternalSourceOperationError, ExternalSourceOperationErrorCode,
ExternalSourceOperationResult, ExternalSourcePublicSnapshot, ExternalSourceSurfaceSnapshotV1,
ExternalSubagentModelBindingTarget, NativePromptCommandConflictSnapshot,
NativePromptCommandDescriptor, PromptCommandInvocationOutcome,
PromptCommandShellReviewDecision,
set_external_tool_targets_enabled, set_native_prompt_command_conflict_choice,
unacknowledged_external_ecosystems, update_external_integration_policy,
workspace_reference_snapshot, ExternalIntegrationPolicyMutation,
ExternalSourceControlRequestV1, ExternalSourceHostCapabilities, ExternalSourceOperationError,
ExternalSourceOperationErrorCode, ExternalSourceOperationResult, ExternalSourcePublicSnapshot,
ExternalSourceSurfaceSnapshotV1, ExternalSubagentModelBindingTarget,
NativePromptCommandConflictSnapshot, NativePromptCommandDescriptor,
PromptCommandInvocationOutcome, PromptCommandShellReviewDecision,
};
use bitfun_core::service::remote_ssh::workspace_state::is_remote_path;
use bitfun_core::service::remote_ssh::workspace_state::{
Expand Down Expand Up @@ -154,6 +155,23 @@ pub struct SetExternalToolTargetDecisionRequest {
pub expected_preference_revision: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct ExternalToolDecisionRef {
pub approval_key: String,
pub decision_key: String,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct SetExternalToolTargetsEnabledRequest {
pub workspace_path: Option<String>,
pub decisions: Vec<ExternalToolDecisionRef>,
pub enabled: bool,
pub expected_catalog_generation: u64,
pub expected_preference_revision: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct SetExternalToolConflictChoiceRequest {
Expand All @@ -174,6 +192,23 @@ pub struct SetExternalSubagentActivationRequest {
pub decision_key: String,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct ExternalCandidateDecisionRef {
pub candidate_id: String,
pub decision_key: String,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct SetExternalSubagentsEnabledRequest {
pub workspace_path: Option<String>,
pub decisions: Vec<ExternalCandidateDecisionRef>,
pub enabled: bool,
pub expected_subagent_generation: u64,
pub expected_preference_revision: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct SetExternalSubagentModelBindingRequest {
Expand Down Expand Up @@ -207,6 +242,16 @@ pub struct SetExternalMcpServerDecisionRequest {
pub expected_preference_revision: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct SetExternalMcpServersEnabledRequest {
pub workspace_path: Option<String>,
pub decisions: Vec<ExternalCandidateDecisionRef>,
pub enabled: bool,
pub expected_mcp_generation: u64,
pub expected_preference_revision: u64,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "camelCase", deny_unknown_fields)]
pub struct ChooseExternalMcpConflictRequest {
Expand Down Expand Up @@ -553,6 +598,27 @@ pub async fn set_external_tool_target_decision_command(
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn set_external_tool_targets_enabled_command(
request: SetExternalToolTargetsEnabledRequest,
) -> ExternalSourceOperationResult<ExternalSourceSnapshotResponse> {
let workspace = require_local_workspace(request.workspace_path.as_deref()).await?;
set_external_tool_targets_enabled(
workspace,
request
.decisions
.into_iter()
.map(|decision| (decision.approval_key, decision.decision_key))
.collect(),
request.enabled,
request.expected_catalog_generation,
request.expected_preference_revision,
)
.await
.map(Into::into)
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn set_external_tool_conflict_choice_command(
request: SetExternalToolConflictChoiceRequest,
Expand Down Expand Up @@ -587,6 +653,27 @@ pub async fn set_external_subagent_activation_command(
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn set_external_subagents_enabled_command(
request: SetExternalSubagentsEnabledRequest,
) -> ExternalSourceOperationResult<ExternalSourceSnapshotResponse> {
let workspace = require_local_workspace(request.workspace_path.as_deref()).await?;
set_external_subagents_enabled(
workspace,
request
.decisions
.into_iter()
.map(|decision| (decision.candidate_id, decision.decision_key))
.collect(),
request.enabled,
request.expected_subagent_generation,
request.expected_preference_revision,
)
.await
.map(Into::into)
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn set_external_subagent_model_binding_command(
request: SetExternalSubagentModelBindingRequest,
Expand Down Expand Up @@ -640,6 +727,27 @@ pub async fn set_external_mcp_server_decision_command(
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn set_external_mcp_servers_enabled_command(
request: SetExternalMcpServersEnabledRequest,
) -> ExternalSourceOperationResult<ExternalSourceSnapshotResponse> {
let workspace = require_local_workspace(request.workspace_path.as_deref()).await?;
set_external_mcp_servers_enabled(
workspace,
request
.decisions
.into_iter()
.map(|decision| (decision.candidate_id, decision.decision_key))
.collect(),
request.enabled,
request.expected_mcp_generation,
request.expected_preference_revision,
)
.await
.map(Into::into)
.map_err(bitfun_core::external_sources::sanitize_external_source_operation_error)
}

#[tauri::command]
pub async fn choose_external_mcp_conflict_command(
request: ChooseExternalMcpConflictRequest,
Expand Down
Loading