Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(agent-egress): drop the Macro-staff gate on egress (#7785)
Wolf Mermelstein7ff115fd0ea8
diff --git a/crates/agent_egress/src/domain/service.rs b/crates/agent_egress/src/domain/service.rsindex 711acbed34..c24ac6c463 100644--- a/crates/agent_egress/src/domain/service.rs+++ b/crates/agent_egress/src/domain/service.rs@@ -13,8 +13,8 @@ use crate::domain::error::EgressError;use crate::domain::model::{EgressTarget, MAX_MCP_REQUEST_BYTES, McpDestination, McpResolution, ProxyRequest,ProxyResponse, SessionToken, TOOLS_CALL_METHOD, UpstreamCall, disconnected_tool_result,- ensure_method_allowed, is_macro_staff, not_connected_tool_result, peek_json_rpc,- sanitize_request_headers, sanitize_response_headers,+ ensure_method_allowed, not_connected_tool_result, peek_json_rpc, sanitize_request_headers,+ sanitize_response_headers,};use crate::domain::observed_body::{ObservedBody, StreamIdentity};use crate::domain::ports::{Forwarder, GithubTokens, McpCredentials, SessionAuthority};@@ -142,17 +142,6 @@ wherespan.record("session", tracing::field::display(&grant.session));span.record("owner", tracing::field::display(&grant.owner));- // Workspace and Git egress remain staff-only. Session-scoped preview tools- // are available to every session owner, like the internal MCP tools.- if !matches!(&target, EgressTarget::McpServer(McpDestination::Preview))- && !is_macro_staff(&grant.owner)- {- tracing::warn!(owner = %grant.owner, "refusing egress for a session owned outside macro.com");- return Err(EgressError::Unauthenticated(- "the session owner is not Macro staff",- ));- }-let call = match &target {EgressTarget::McpServer(McpDestination::Preview) => {let (url, local) = self.preview_mcp.as_ref().ok_or_else(|| {diff --git a/crates/agent_egress/src/domain/service/test.rs b/crates/agent_egress/src/domain/service/test.rsindex e9b79635ce..ed63637dd9 100644--- a/crates/agent_egress/src/domain/service/test.rs+++ b/crates/agent_egress/src/domain/service/test.rs@@ -876,16 +876,16 @@ async fn strips_hop_by_hop_headers_from_the_response() {assert_eq!(names(response.headers()), ["mcp-session-id"]);}-/// The proxy is staff-only for now: a session owned outside macro.com gets-/// nothing, whatever its token says - told only, in our words, that staff-/// membership is what it lacks.+/// Egress is open to every session owner, not only Macro staff: an outside+/// owner's call resolves against their own connections and goes through.#[tokio::test]-async fn a_session_owned_outside_macro_gets_nothing() {+async fn a_session_owned_outside_macro_is_proxied_with_its_owners_credentials() {+ let visitor = MacroUserIdStr::try_from_email("[email protected]").expect("a valid user id");let service = EgressServiceImpl::new(StubSessions(Ok(SessionGrant {session: AgentSessionId::new(),- owner: MacroUserIdStr::try_from_email("[email protected]").expect("a valid user id"),- repo: Some(session_repo()),+ owner: visitor.clone(),+ repo: None,mcp_servers: Vec::new(),prompter: None,})),@@ -894,24 +894,27 @@ async fn a_session_owned_outside_macro_gets_nothing() {SpyForwarder::answering(&[]),);- let refusal = service+ service.proxy(&SessionToken::new("token"),datadog(),request(Method::POST, &[]),).await- .expect_err("refused");+ .expect("proxied");- assert!(- matches!(refusal, EgressError::Unauthenticated(_)),- "{refusal}"- );- assert!(- service.credentials.asked.lock().expect("lock").is_empty(),- "an outside owner must never reach credential resolution"+ assert_eq!(+ service+ .credentials+ .asked+ .lock()+ .expect("lock")+ .iter()+ .map(|(owner, _)| owner.clone())+ .collect::<Vec<_>>(),+ [visitor.to_string()]);- assert!(!service.forward.was_called());+ assert!(service.forward.was_called());}/// Resolution reads the owner's connected servers, so an unverified token@@ -1263,57 +1266,6 @@ async fn preview_uses_only_the_authenticated_session_token_at_a_fixed_destinatioassert!(service.credentials.asked.lock().unwrap().is_empty());}-#[tokio::test]-async fn non_staff_session_owners_can_share_previews_without_workspace_or_git_access() {- let service = EgressServiceImpl::new(- StubSessions(Ok(SessionGrant {- session: AgentSessionId::new(),- owner: MacroUserIdStr::try_from_email("[email protected]").unwrap(),- repo: None,- prompter: None,- mcp_servers: Vec::new(),- })),- SpyCredentials::knowing(),- SpyGithubTokens::default(),- SpyForwarder::answering(&[]),- )- .with_preview_mcp(- "https://preview-control.example/mcp".parse().unwrap(),- false,- )- .unwrap();- service- .proxy(- &SessionToken::new("session-token"),- EgressTarget::McpServer(McpDestination::Preview),- request(Method::POST, &[]),- )- .await- .unwrap();- assert!(matches!(- service- .proxy(- &SessionToken::new("session-token"),- EgressTarget::McpServer(McpDestination::Macro),- request(Method::POST, &[])- )- .await,- Err(EgressError::Unauthenticated(_))- ));- assert!(matches!(- service- .proxy(- &SessionToken::new("session-token"),- git(GitEndpoint::UploadPack),- request(Method::POST, &[])- )- .await,- Err(EgressError::Unauthenticated(_))- ));- assert!(service.credentials.asked.lock().unwrap().is_empty());- assert!(service.tokens.asked.lock().unwrap().is_empty());-}-fn asker() -> MacroUserIdStr<'static> {MacroUserIdStr::try_from_email("[email protected]").expect("a valid user id")}