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(code-mode): attribute SDK messages to the session agent (#8286)
Wolf Mermelsteine6bd3ebc1f50
diff --git a/Cargo.lock b/Cargo.lockindex 656fe54ba8..54c0235e9f 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -11836,6 +11836,7 @@ dependencies = ["thiserror 2.0.18","tokio","tracing",+ "uuid","workspace-hack",]diff --git a/crates/agent_code_mode/AGENTS.md b/crates/agent_code_mode/AGENTS.mdindex 7d9dea1932..ec07e4d848 100644--- a/crates/agent_code_mode/AGENTS.md+++ b/crates/agent_code_mode/AGENTS.md@@ -2,6 +2,9 @@## Scope+Execution credentials carry the authenticated session bot for SDK message+attribution while retaining the owner's API permissions.+Owns session-authorized code executions, SDK documentation selection, savedexecution records, and durable review stacks. Process isolation belongs to`crates/code_execution`; session presentation belongs to `crates/agent_session`.diff --git a/crates/agent_code_mode/SKILL.md b/crates/agent_code_mode/SKILL.mdindex 376c990166..f4c2c7a242 100644--- a/crates/agent_code_mode/SKILL.md+++ b/crates/agent_code_mode/SKILL.md@@ -18,7 +18,7 @@ export async function main({macro, session, execution}) {Return an object with data; reviews is optional and defaults to []. Include review references when you prepare editable drafts.-macro, session and execution are real SDK handles. You can instead import {Macro} from '@macro-inc/sdk' and construct it with main's token and hosts. Do not log, return, persist or transmit that credential elsewhere. It is a short-lived normal user credential, with the user's API permissions. SDK operations make real HTTP calls. No custom sdk.ToolName dispatcher, TypeScript transpilation, runtime help or package installation is involved.+macro, session and execution are real SDK handles. You can instead import {Macro} from '@macro-inc/sdk' and construct it with main's token and hosts. Do not log, return, persist or transmit that credential elsewhere. It is a short-lived normal user credential, with the user's API permissions. SDK operations make real HTTP calls. Messages are attributed to the session's agent, with the owner recorded as the requesting user; do not supply sender identities yourself. No custom sdk.ToolName dispatcher, TypeScript transpilation, runtime help or package installation is involved.## Useful workflowsdiff --git a/crates/agent_code_mode/src/domain/models.rs b/crates/agent_code_mode/src/domain/models.rsindex 571f02286b..8efb75bd88 100644--- a/crates/agent_code_mode/src/domain/models.rs+++ b/crates/agent_code_mode/src/domain/models.rs@@ -41,6 +41,8 @@ pub struct ExecutionIdentity {pub session: AgentSessionId,/// User whose permissions the tools enforce.pub owner: MacroUserIdStr<'static>,+ /// Agent from the authenticated session, used to attribute SDK messages.+ pub agent_id: bot_id::BotId,/// The server-resolved turn. Work cannot outlive or move to another turn.pub turn: Uuid,}diff --git a/crates/agent_code_mode/src/domain/service.rs b/crates/agent_code_mode/src/domain/service.rsindex 7d919a6306..735a93e9e9 100644--- a/crates/agent_code_mode/src/domain/service.rs+++ b/crates/agent_code_mode/src/domain/service.rs@@ -312,6 +312,7 @@ impl SessionCodeMode for CodeModeService {let identity = ExecutionIdentity {execution,session: session.id,+ agent_id: session.bot_id,owner,turn: self.0diff --git a/crates/agent_code_mode/src/domain/service/test.rs b/crates/agent_code_mode/src/domain/service/test.rsindex 2017d1da73..4004ba95f4 100644--- a/crates/agent_code_mode/src/domain/service/test.rs+++ b/crates/agent_code_mode/src/domain/service/test.rs@@ -66,7 +66,7 @@ impl ExecutionTurns for TestTurns {}#[derive(Default)]-struct Credentials(Mutex<Vec<String>>);+struct Credentials(Mutex<Vec<(String, bot_id::BotId)>>);#[async_trait]impl ExecutionCredentials for Credentials {async fn issue(@@ -75,7 +75,10 @@ impl ExecutionCredentials for Credentials {_: &str,_: CancellationToken,) -> Result<code_execution::domain::RunEnvironment, CodeModeError> {- self.0.lock().unwrap().push(identity.owner.to_string());+ self.0+ .lock()+ .unwrap()+ .push((identity.owner.to_string(), identity.agent_id));Ok(code_execution::domain::RunEnvironment {token: "run-only-secret".into(),..Default::default()@@ -127,7 +130,9 @@ fn request() -> ExecuteRequest {#[tokio::test]async fn run_uses_session_owner_and_records_source_and_result_without_credential() {let (service, credentials, store, _) = service();- let session = test_agent_session(AgentSessionId::new_from_uuid(macro_uuid::generate_uuid_v7()));+ let mut session =+ test_agent_session(AgentSessionId::new_from_uuid(macro_uuid::generate_uuid_v7()));+ session.bot_id = bot_id::BotId::new_from_uuid(uuid::Uuid::from_u128(0xcafe));let id = ExecutionId::mint();let result = service.execute(&session, id, request(), CancellationToken::new())@@ -136,7 +141,7 @@ async fn run_uses_session_owner_and_records_source_and_result_without_credentialassert_eq!(result.status, ExecutionStatus::Succeeded);assert_eq!(*credentials.0.lock().unwrap(),- [session.owner_user().unwrap().to_string()]+ [(session.owner_user().unwrap().to_string(), session.bot_id)]);let record = store.get(session.id, id).await.unwrap();assert_eq!(record.source, request().source);diff --git a/crates/agent_egress/AGENTS.md b/crates/agent_egress/AGENTS.mdindex f9c064910c..d5c8896e7b 100644--- a/crates/agent_egress/AGENTS.md+++ b/crates/agent_egress/AGENTS.md@@ -42,6 +42,9 @@ MCP app, a custom server, or a GitHub installation token) on each request.- `cargo test -p agent_egress` (`SQLX_OFFLINE` unset).+Code-mode minting attaches the session agent to a short-lived owner token;+ordinary MCP owner tokens omit agent attribution.+## Gotchas- Never let the sandbox see an upstream credential directly; every egressdiff --git a/crates/agent_egress/src/outbound/macro_mcp.rs b/crates/agent_egress/src/outbound/macro_mcp.rsindex b54112537b..4f248d8301 100644--- a/crates/agent_egress/src/outbound/macro_mcp.rs+++ b/crates/agent_egress/src/outbound/macro_mcp.rs@@ -253,6 +253,17 @@ impl MacroApiTokenSigner {&self,owner: &MacroUserIdStr<'static>,lifetime_seconds: usize,+ ) -> Result<String, EgressError> {+ self.mint_for_agent(owner, lifetime_seconds, None).await+ }++ /// Mint an owner credential with signed agent attribution for SDK messages.+ #[tracing::instrument(skip_all, err, fields(?agent_id))]+ pub async fn mint_for_agent(+ &self,+ owner: &MacroUserIdStr<'static>,+ lifetime_seconds: usize,+ agent_id: Option<macro_uuid::Uuid>,) -> Result<String, EgressError> {if !(1..=MINTED_TOKEN_LIFETIME_SECONDS).contains(&lifetime_seconds) {return Err(EgressError::Internal(rootcause::report!(@@ -293,6 +304,7 @@ impl MacroApiTokenSigner {issuer: self.issuer.clone(),private_key: self.private_key.clone(),expiry_seconds: lifetime_seconds,+ agent_id,}).map_err(|error| {EgressError::Internal(rootcause::report!(diff --git a/crates/agent_harness/src/inbound/runtime_gateway/test.rs b/crates/agent_harness/src/inbound/runtime_gateway/test.rsindex 49b4294a70..40acaab52e 100644--- a/crates/agent_harness/src/inbound/runtime_gateway/test.rs+++ b/crates/agent_harness/src/inbound/runtime_gateway/test.rs@@ -25,6 +25,7 @@ struct FakeJwtValidator;impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {Ok(ValidatedIdentity {+ agent_id: None,user_id: jwt.to_string(),fusion_user_id: "fusion-user".to_string(),organization_id: None,@@ -56,6 +57,7 @@ impl HarnessAuthorizer for SelfHarnessAuthorizer {user_id: user_id.clone(),},acting_user: MacroUserAuthentication {+ agent_id: None,macro_user_id,user_context: model_user::UserContext {user_id,diff --git a/crates/agent_session/src/inbound/axum_router/test.rs b/crates/agent_session/src/inbound/axum_router/test.rsindex 84bbc609bc..91c4cce50a 100644--- a/crates/agent_session/src/inbound/axum_router/test.rs+++ b/crates/agent_session/src/inbound/axum_router/test.rs@@ -100,6 +100,7 @@ struct FakeJwtValidator;impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {Ok(ValidatedIdentity {+ agent_id: None,user_id: jwt.to_string(),fusion_user_id: "fusion-user".to_string(),organization_id: None,@@ -127,6 +128,7 @@ impl BotAuthorizer for SelfBotAuthorizer {let macro_user_id = MacroUserIdStr::try_from(user_id.clone()).map_err(|_| Report::new(MacroAuthorizationError::ActingUserNotAuthorized))?;Some(MacroUserAuthentication {+ agent_id: None,macro_user_id,user_context: model_user::UserContext {user_id,@@ -173,6 +175,7 @@ impl HarnessAuthorizer for SelfHarnessAuthorizer {user_id: user_id.clone(),},acting_user: MacroUserAuthentication {+ agent_id: None,macro_user_id,user_context: model_user::UserContext {user_id,diff --git a/crates/agent_session/src/inbound/coding_agents/test.rs b/crates/agent_session/src/inbound/coding_agents/test.rsindex 701e26e0b5..79e7a796fb 100644--- a/crates/agent_session/src/inbound/coding_agents/test.rs+++ b/crates/agent_session/src/inbound/coding_agents/test.rs@@ -19,6 +19,7 @@ struct UserCredentials;impl JwtValidator for UserCredentials {fn validate(&self, _: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {Ok(ValidatedIdentity {+ agent_id: None,user_id: USER.into(),fusion_user_id: "fusion-owner".into(),organization_id: None,diff --git a/crates/agent_session/src/inbound/routine_sessions/test.rs b/crates/agent_session/src/inbound/routine_sessions/test.rsindex 0174419240..dcd0955dc3 100644--- a/crates/agent_session/src/inbound/routine_sessions/test.rs+++ b/crates/agent_session/src/inbound/routine_sessions/test.rs@@ -27,6 +27,7 @@ struct Credentials;impl JwtValidator for Credentials {fn validate(&self, _: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {Ok(ValidatedIdentity {+ agent_id: None,user_id: OWNER.into(),fusion_user_id: "fusion-owner".into(),organization_id: None,@@ -65,6 +66,7 @@ impl HarnessAuthorizer for Credentials {user_id: OWNER.into(),},acting_user: MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(OWNER).unwrap(),user_context: model_user::UserContext {user_id: OWNER.into(),diff --git a/crates/bots/src/inbound/axum_router/tests.rs b/crates/bots/src/inbound/axum_router/tests.rsindex 0d850c9f3b..95cda06eb4 100644--- a/crates/bots/src/inbound/axum_router/tests.rs+++ b/crates/bots/src/inbound/axum_router/tests.rs@@ -417,6 +417,7 @@ impl JwtValidator for FakeJwtValidator {}Ok(ValidatedIdentity {+ agent_id: None,user_id: jwt.to_string(),fusion_user_id: "fusion-user".to_string(),organization_id: None,diff --git a/crates/bots/src/inbound/channel_webhook_router/tests.rs b/crates/bots/src/inbound/channel_webhook_router/tests.rsindex 8764193853..98e3f3279a 100644--- a/crates/bots/src/inbound/channel_webhook_router/tests.rs+++ b/crates/bots/src/inbound/channel_webhook_router/tests.rs@@ -727,6 +727,7 @@ struct FakeJwtValidator;impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {Ok(ValidatedIdentity {+ agent_id: None,user_id: jwt.to_string(),fusion_user_id: "fusion-user".to_string(),organization_id: None,@@ -814,6 +815,7 @@ fn bot_authentication_with_acting_user(bot_id: BotId) -> BotAuthentication {bot_scope: BotScope::User,team_id: None,acting_user: Some(MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::parse_from_str("macro|[email protected]").unwrap(),user_context: Default::default(),}),diff --git a/crates/channels/src/inbound/axum_router/test.rs b/crates/channels/src/inbound/axum_router/test.rsindex 5580f06ee0..eee523f461 100644--- a/crates/channels/src/inbound/axum_router/test.rs+++ b/crates/channels/src/inbound/axum_router/test.rs@@ -665,6 +665,7 @@ impl JwtValidator for FakeJwtValidator {};Ok(ValidatedIdentity {+ agent_id: None,user_id: TEST_USER_ID.to_string(),fusion_user_id: "test-fusion-user".to_string(),organization_id,diff --git a/crates/channels/src/inbound/list_router/test.rs b/crates/channels/src/inbound/list_router/test.rsindex 755a123530..c51199ffed 100644--- a/crates/channels/src/inbound/list_router/test.rs+++ b/crates/channels/src/inbound/list_router/test.rs@@ -114,6 +114,7 @@ impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {match jwt {VALID_BEARER_TOKEN => Ok(ValidatedIdentity {+ agent_id: None,user_id: BEARER_USER_ID.to_string(),fusion_user_id: "fusion-user-id".to_string(),organization_id: None,diff --git a/crates/chat/src/inbound/test.rs b/crates/chat/src/inbound/test.rsindex fedb498092..9f6e8b75c7 100644--- a/crates/chat/src/inbound/test.rs+++ b/crates/chat/src/inbound/test.rs@@ -543,6 +543,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {acting_user: acting_user.and_then(|claims| claims.user_id).map(|user_id| MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(user_id.clone()).expect("test user id should be valid"),user_context: UserContext {diff --git a/crates/contacts/src/inbound/http/test.rs b/crates/contacts/src/inbound/http/test.rsindex d766dc661b..a1b5b9ae6f 100644--- a/crates/contacts/src/inbound/http/test.rs+++ b/crates/contacts/src/inbound/http/test.rs@@ -74,6 +74,7 @@ impl JwtValidator for FakeJwtValidator {};Ok(ValidatedIdentity {+ agent_id: None,user_id: user_id.to_string(),fusion_user_id: "fusion-user-id".to_string(),permissions: None,diff --git a/crates/crm/src/inbound/axum_extractors/test.rs b/crates/crm/src/inbound/axum_extractors/test.rsindex ad18e39e79..2ad34fd123 100644--- a/crates/crm/src/inbound/axum_extractors/test.rs+++ b/crates/crm/src/inbound/axum_extractors/test.rs@@ -59,6 +59,7 @@ impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {match jwt {VALID_TOKEN => Ok(ValidatedIdentity {+ agent_id: None,user_id: USER_ID.to_string(),fusion_user_id: "test-fusion-user".to_string(),organization_id: None,diff --git a/crates/crm/tests/pipelines.rs b/crates/crm/tests/pipelines.rsindex d5dda92e42..d9cad85d57 100644--- a/crates/crm/tests/pipelines.rs+++ b/crates/crm/tests/pipelines.rs@@ -737,6 +737,7 @@ async fn http_creation_listing_schema_and_records_use_pipeline_access(pool: PgPo));}Ok(ValidatedIdentity {+ agent_id: None,user_id: if jwt == "owner" { OWNER } else { OUTSIDER }.into(),fusion_user_id: "test-fusion-user".into(),organization_id: None,diff --git a/crates/databases/src/inbound/axum_router/test/fakes.rs b/crates/databases/src/inbound/axum_router/test/fakes.rsindex e0df0f1924..832ba1d51e 100644--- a/crates/databases/src/inbound/axum_router/test/fakes.rs+++ b/crates/databases/src/inbound/axum_router/test/fakes.rs@@ -45,6 +45,7 @@ impl JwtValidator for ValidToken {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {match jwt {"valid" => Ok(ValidatedIdentity {+ agent_id: None,user_id: USER.to_string(),fusion_user_id: "fusion-ops-router".to_string(),organization_id: None,diff --git a/crates/documents/src/inbound/axum_router/tests.rs b/crates/documents/src/inbound/axum_router/tests.rsindex c20d90ab7f..b2c27e934d 100644--- a/crates/documents/src/inbound/axum_router/tests.rs+++ b/crates/documents/src/inbound/axum_router/tests.rs@@ -897,6 +897,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {acting_user: acting_user.and_then(|claims| claims.user_id).map(|user_id| MacroUserAuthentication {+ agent_id: None,macro_user_id: user(&user_id),user_context: user_context(&user_id),}),diff --git a/crates/entity_access/AGENTS.md b/crates/entity_access/AGENTS.mdindex 62e241a53e..3f4dbb4169 100644--- a/crates/entity_access/AGENTS.md+++ b/crates/entity_access/AGENTS.md@@ -49,6 +49,11 @@ depended-on crates in the backend.- `cargo test -p entity_access` (`SQLX_OFFLINE` unset; requires localMacroDB — `just setup_macrodb`).+The message sender extractor maps signed user `agent_id` attribution to a bot+receipt scoped to that same user and organization only for new posts. Reads,+edits, deletes, and reactions keep the caller identity; access policy remains in+the entity-access domain service.+## Gotchas- `#![deny(missing_docs)]`.diff --git a/crates/entity_access/src/inbound/axum_extractors.rs b/crates/entity_access/src/inbound/axum_extractors.rsindex bcc406f77a..1007e19628 100644--- a/crates/entity_access/src/inbound/axum_extractors.rs+++ b/crates/entity_access/src/inbound/axum_extractors.rs@@ -42,7 +42,7 @@ pub use form::FormAccessLevelExtractor;pub use history::HistoryAccessExtractor;pub use initiative::InitiativeAccessExtractor;pub use pin::PinAccessLevelExtractor;-pub use principal::principal_entity_access_receipt;+pub use principal::{message_sender_entity_access_receipt, principal_entity_access_receipt};pub use project::{ProjectAccessLevelExtractor, ProjectBodyAccessLevelExtractorV2};pub use reminder::ReminderAccessExtractor;pub use scheduled_action::ScheduledActionAccessExtractor;diff --git a/crates/entity_access/src/inbound/axum_extractors/initiative/test.rs b/crates/entity_access/src/inbound/axum_extractors/initiative/test.rsindex 323a505534..3ba3ce9f28 100644--- a/crates/entity_access/src/inbound/axum_extractors/initiative/test.rs+++ b/crates/entity_access/src/inbound/axum_extractors/initiative/test.rs@@ -85,6 +85,7 @@ async fn response_body(response: axum::response::Response) -> String {fn user_authentication(user_id: &str) -> MacroUserAuthentication {MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(user_id.to_string()).expect("valid user id"),user_context: UserContext {user_id: user_id.to_string(),diff --git a/crates/entity_access/src/inbound/axum_extractors/principal.rs b/crates/entity_access/src/inbound/axum_extractors/principal.rsindex b147f81b5f..01db156d67 100644--- a/crates/entity_access/src/inbound/axum_extractors/principal.rs+++ b/crates/entity_access/src/inbound/axum_extractors/principal.rs@@ -1,7 +1,10 @@//! Shared capability minting for authenticated entity-message adapters.+#[cfg(test)]+mod test;+use crate::domain::{- models::{AccessError, EntityAccessReceipt, EntityType, RequiredPermission},+ models::{AccessError, BotAccessScope, EntityAccessReceipt, EntityType, RequiredPermission},ports::EntityAccessService,};use macro_authorization::MacroAuthorization;@@ -42,3 +45,29 @@ pub async fn principal_entity_access_receipt<T: RequiredPermission>(}}}++/// Mint a new message's sender capability, retaining signed agent attribution.+/// Use the caller capability above for reads, edits, deletes, and reactions.+pub async fn message_sender_entity_access_receipt<T: RequiredPermission>(+ service: &impl EntityAccessService,+ principal: &MacroAuthorization,+ entity_id: &str,+ entity_type: EntityType,+) -> Result<EntityAccessReceipt<T>, AccessError> {+ if let MacroAuthorization::User(user) = principal+ && let Some(agent_id) = user.agent_id+ {+ return service+ .generate_bot_entity_access_receipt::<T>(+ agent_id,+ BotAccessScope::User {+ user_id: user.macro_user_id.clone(),+ user_org_id: user.user_context.organization_id.map(i64::from),+ },+ entity_id,+ entity_type,+ )+ .await;+ }+ principal_entity_access_receipt(service, principal, entity_id, entity_type).await+}diff --git a/crates/entity_access/src/inbound/axum_extractors/principal/test.rs b/crates/entity_access/src/inbound/axum_extractors/principal/test.rsnew file mode 100644index 0000000000..7f89f95274--- /dev/null+++ b/crates/entity_access/src/inbound/axum_extractors/principal/test.rs@@ -0,0 +1,109 @@+use super::*;+use crate::{+ domain::models::{+ AccessLevel, EditAccessLevel, EntityPermission, MemberParticipantRole, ParticipantRole,+ },+ inbound::axum_extractors::test_support::{BotAccessCall, FakeEntityAccessService},+};+use macro_authorization::MacroUserAuthentication;+use model_user::UserContext;++#[tokio::test]+async fn signed_agent_uses_owner_scope_and_preserves_both_identities() {+ let service =+ FakeEntityAccessService::new(None).with_bot_permission(EntityPermission::ChannelRole {+ role: ParticipantRole::Member,+ });+ let agent_id = bot_id::MACRO_NEW_BOT_ID;+ let owner = "macro|[email protected]".to_string().try_into().unwrap();+ let principal = MacroAuthorization::User(MacroUserAuthentication {+ agent_id: Some(agent_id),+ macro_user_id: owner,+ user_context: UserContext {+ user_id: "macro|[email protected]".into(),+ fusion_user_id: "fusion-owner".into(),+ organization_id: Some(42),+ permissions: None,+ },+ });+ let receipt = message_sender_entity_access_receipt::<MemberParticipantRole>(+ &service,+ &principal,+ "channel-id",+ EntityType::Channel,+ )+ .await+ .unwrap();++ assert_eq!(receipt.get_authenticated_bot().unwrap().bot_id(), agent_id);+ assert_eq!(+ receipt.acting_user_id().unwrap().as_ref(),+ "macro|[email protected]"+ );+ assert_eq!(+ service.bot_calls(),+ vec![BotAccessCall {+ bot_id: agent_id,+ scope: BotAccessScope::User {+ user_id: "macro|[email protected]".to_string().try_into().unwrap(),+ user_org_id: Some(42),+ },+ entity_id: "channel-id".into(),+ entity_type: EntityType::Channel,+ }]+ );+}++#[tokio::test]+async fn signed_agent_cannot_send_without_owner_access() {+ let service = FakeEntityAccessService::new(None);+ let principal = MacroAuthorization::User(MacroUserAuthentication {+ agent_id: Some(bot_id::MACRO_NEW_BOT_ID),+ macro_user_id: "macro|[email protected]".to_string().try_into().unwrap(),+ user_context: UserContext {+ user_id: "macro|[email protected]".into(),+ fusion_user_id: "fusion-owner".into(),+ organization_id: None,+ permissions: None,+ },+ });+ assert!(matches!(+ message_sender_entity_access_receipt::<MemberParticipantRole>(+ &service,+ &principal,+ "channel-id",+ EntityType::Channel,+ )+ .await,+ Err(AccessError::Unauthorized)+ ));+}++#[tokio::test]+async fn signed_agent_does_not_change_caller_identity_for_existing_messages() {+ let service = FakeEntityAccessService::new(Some(AccessLevel::Edit));+ let principal = MacroAuthorization::User(MacroUserAuthentication {+ agent_id: Some(bot_id::MACRO_NEW_BOT_ID),+ macro_user_id: "macro|[email protected]".to_string().try_into().unwrap(),+ user_context: UserContext {+ user_id: "macro|[email protected]".into(),+ fusion_user_id: "fusion-owner".into(),+ organization_id: Some(42),+ permissions: None,+ },+ });+ let receipt = principal_entity_access_receipt::<EditAccessLevel>(+ &service,+ &principal,+ "document-id",+ EntityType::Document,+ )+ .await+ .unwrap();+ assert_eq!(+ receipt.get_authenticated_user().unwrap().as_ref(),+ "macro|[email protected]"+ );+ assert!(receipt.get_authenticated_bot().is_err());+ assert!(service.bot_calls().is_empty());+}diff --git a/crates/entity_access/src/inbound/axum_extractors/test_support.rs b/crates/entity_access/src/inbound/axum_extractors/test_support.rsindex 01f003e32e..e73017736a 100644--- a/crates/entity_access/src/inbound/axum_extractors/test_support.rs+++ b/crates/entity_access/src/inbound/axum_extractors/test_support.rs@@ -7,6 +7,7 @@ use macro_authorization::{MacroUserAuthentication,};use macro_user_id::{+ cowlike::CowLike,lowercased::Lowercase,user_id::{MacroUserId, MacroUserIdStr},};@@ -86,12 +87,20 @@ impl FakeEntityAccessService {impl EntityAccessService for FakeEntityAccessService {async fn generate_entity_access_receipt<T: RequiredPermission>(&self,- _user_id: &MacroUserId<Lowercase<'_>>,+ user_id: &MacroUserId<Lowercase<'_>>,_user_org_id: Option<i64>,- _entity_id: &str,- _entity_type: EntityType,+ entity_id: &str,+ entity_type: EntityType,) -> Result<EntityAccessReceipt<T>, AccessError> {- panic!("unexpected generate_entity_access_receipt call")+ let access_level = self.access_level.ok_or(AccessError::Unauthorized)?;+ EntityAccessReceipt::try_new_authenticated_user(+ MacroUserIdStr(user_id.clone().into_owned()),+ Entity {+ entity_id: entity_id.into(),+ entity_type,+ },+ EntityPermission::AccessLevel { access_level },+ )}async fn generate_bot_entity_access_receipt<T: RequiredPermission>(@@ -272,6 +281,7 @@ pub(super) fn user_scoped_bot_authentication() -> BotAuthentication {bot_scope: BotScope::User,team_id: None,acting_user: Some(MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(BOT_ACTING_USER_ID.to_string()).expect("valid bot acting user id"),user_context: user_context_with_organization(diff --git a/crates/entity_registry/entity_registry/src/domain/creation_principal/test.rs b/crates/entity_registry/entity_registry/src/domain/creation_principal/test.rsindex c645bcf7be..15215f4f3d 100644--- a/crates/entity_registry/entity_registry/src/domain/creation_principal/test.rs+++ b/crates/entity_registry/entity_registry/src/domain/creation_principal/test.rs@@ -17,6 +17,7 @@ fn user_id() -> MacroUserIdStr<'static> {fn user() -> MacroUserAuthentication {MacroUserAuthentication {+ agent_id: None,macro_user_id: user_id(),user_context: Default::default(),}diff --git a/crates/forms/src/inbound/axum_router/test/fakes.rs b/crates/forms/src/inbound/axum_router/test/fakes.rsindex 9871b6c4d7..bd44262112 100644--- a/crates/forms/src/inbound/axum_router/test/fakes.rs+++ b/crates/forms/src/inbound/axum_router/test/fakes.rs@@ -47,6 +47,7 @@ impl JwtValidator for Tokens {_ => return Err(Report::new(MacroAuthorizationError::InvalidCredentials)),};Ok(ValidatedIdentity {+ agent_id: None,user_id: user_id.to_string(),fusion_user_id: format!("fusion-{jwt}"),organization_id: None,diff --git a/crates/local_e2e_test_support/src/jwt.rs b/crates/local_e2e_test_support/src/jwt.rsindex fbeefe0aa7..1e65708af6 100644--- a/crates/local_e2e_test_support/src/jwt.rs+++ b/crates/local_e2e_test_support/src/jwt.rs@@ -94,6 +94,7 @@ pub fn encode_local_jwt_claims_with(};encode_macro_api_token(EncodeMacroApiTokenArgs {+ agent_id: None,fusionauth_id: claims.fusion_user_id.to_owned(),macro_user_id: claims.macro_user_id.to_owned(),organization_id: claims.organization_id,diff --git a/crates/macro_auth/AGENTS.md b/crates/macro_auth/AGENTS.mdindex 30742ce38c..98f7f39643 100644--- a/crates/macro_auth/AGENTS.md+++ b/crates/macro_auth/AGENTS.md@@ -32,6 +32,9 @@ internal API key, and the Axum JWT-decode middleware.- `cargo test -p macro_auth` (`SQLX_OFFLINE` unset).+Macro API tokens may include a signed `agent_id` for SDK message attribution;+ordinary user token producers leave it absent.+## Gotchas- This crate only decodes/validates credentials; it has no concept ofdiff --git a/crates/macro_auth/Cargo.toml b/crates/macro_auth/Cargo.tomlindex 1999edb0bf..6fcda60c35 100644--- a/crates/macro_auth/Cargo.toml+++ b/crates/macro_auth/Cargo.toml@@ -24,4 +24,5 @@ serde_json = { workspace = true }thiserror = { workspace = true }tokio = { workspace = true, features = ["macros"] }tracing = { workspace = true }+uuid = { workspace = true }workspace-hack = { version = "0.1", path = "../workspace-hack" }diff --git a/crates/macro_auth/src/macro_api_token.rs b/crates/macro_auth/src/macro_api_token.rsindex 7952fd3bba..a278092d15 100644--- a/crates/macro_auth/src/macro_api_token.rs+++ b/crates/macro_auth/src/macro_api_token.rs@@ -1,8 +1,9 @@use std::time::{SystemTime, UNIX_EPOCH};use anyhow::Context;+use uuid::Uuid;-/// The expected JWT access token that is provided back from FusionAuth+/// A Macro-signed API token with optional agent attribution for SDK messages.#[derive(serde::Serialize, serde::Deserialize, Eq, PartialEq, Debug, Clone)]pub struct MacroApiToken {/// The expiration time of the token@@ -17,6 +18,9 @@ pub struct MacroApiToken {pub macro_user_id: String,/// The organization id for the user if they belong to onepub macro_organization_id: Option<i32>,+ /// Agent responsible for this user-authorized execution, signed by the harness.+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub agent_id: Option<Uuid>,}pub struct EncodeMacroApiTokenArgs {@@ -32,6 +36,8 @@ pub struct EncodeMacroApiTokenArgs {pub private_key: String,/// The token expiry duration in secondspub expiry_seconds: usize,+ /// Optional agent attribution; never supplied by an API caller.+ pub agent_id: Option<Uuid>,}#[tracing::instrument(skip(args))]@@ -43,6 +49,7 @@ pub fn encode_macro_api_token(args: EncodeMacroApiTokenArgs) -> anyhow::Result<Slet claims = MacroApiToken {exp: now + args.expiry_seconds,+ agent_id: args.agent_id,iss: args.issuer.clone(),fusion_user_id: args.fusionauth_id.clone(),macro_user_id: args.macro_user_id.clone(),diff --git a/crates/macro_auth/src/middleware/decode_jwt.rs b/crates/macro_auth/src/middleware/decode_jwt.rsindex 775a8cb0d0..db1f441617 100644--- a/crates/macro_auth/src/middleware/decode_jwt.rs+++ b/crates/macro_auth/src/middleware/decode_jwt.rs@@ -1,3 +1,6 @@+#[cfg(test)]+mod agent_test;+use std::sync::OnceLock;use anyhow::Context;@@ -387,6 +390,7 @@ CwIDAQAB});let claims = MacroApiToken {+ agent_id: None,exp: now + 3600, // Token expires in 1 houriss: issuer.to_string(),fusion_user_id: fusionauth_id.to_string(),diff --git a/crates/macro_auth/src/middleware/decode_jwt/agent_test.rs b/crates/macro_auth/src/middleware/decode_jwt/agent_test.rsnew file mode 100644index 0000000000..51d2b46cca--- /dev/null+++ b/crates/macro_auth/src/middleware/decode_jwt/agent_test.rs@@ -0,0 +1,61 @@+use super::*;+use crate::macro_api_token::{EncodeMacroApiTokenArgs, encode_macro_api_token};++#[test]+fn signed_execution_token_preserves_owner_agent_and_lifetime() {+ let agent = uuid::Uuid::from_u128(0xa2a2);+ let token = encode_macro_api_token(EncodeMacroApiTokenArgs {+ fusionauth_id: "fusion-owner".into(),+ macro_user_id: "macro|[email protected]".into(),+ organization_id: Some(42),+ issuer: "execution-test".into(),+ private_key: tests::PRIVATE_KEY.into(),+ expiry_seconds: 60,+ agent_id: Some(agent),+ })+ .unwrap();+ let args = JwtValidationArgs {+ audience: Audience::new_testing(""),+ issuer: Issuer::new_testing(""),+ jwt_secret: LocalOrRemoteSecret::Local(JwtSecretKey::new_testing("")),+ macro_api_token_issuer: MacroApiTokenIssuer::new_testing("execution-test"),+ macro_api_token_public_key: LocalOrRemoteSecret::Local(+ MacroApiTokenPublicKey::new_testing(tests::PUBLIC_KEY),+ ),+ };+ let JwtToken::MacroApiToken(claims) = handler(&args, &token).unwrap() else {+ panic!("expected Macro API token");+ };+ assert_eq!(claims.agent_id, Some(agent));+ assert_eq!(claims.macro_user_id, "macro|[email protected]");+ assert_eq!(claims.macro_organization_id, Some(42));+ let now = std::time::SystemTime::now()+ .duration_since(std::time::UNIX_EPOCH)+ .unwrap()+ .as_secs() as usize;+ assert!(claims.exp <= now + 60);+ assert!(claims.exp > now);++ // An edited attribution cannot be signed with a user's HMAC credential.+ let mut forged = claims;+ forged.agent_id = Some(uuid::Uuid::from_u128(0xb0b));+ let mut header = jsonwebtoken::Header::new(Algorithm::HS256);+ header.kid = Some("macro".into());+ let token = jsonwebtoken::encode(+ &header,+ &forged,+ &jsonwebtoken::EncodingKey::from_secret(b"user-secret"),+ )+ .unwrap();+ assert!(handler(&args, &token).is_err());+}++#[test]+fn legacy_user_token_has_no_agent_attribution() {+ let claims: MacroApiToken = serde_json::from_value(serde_json::json!({+ "exp": 12345, "iss": "test", "fusion_user_id": "fusion-owner",+ "macro_user_id": "macro|[email protected]", "macro_organization_id": null,+ }))+ .unwrap();+ assert_eq!(claims.agent_id, None);+}diff --git a/crates/macro_authorization/AGENTS.md b/crates/macro_authorization/AGENTS.mdindex 2e08ab1c40..e91df4e1c8 100644--- a/crates/macro_authorization/AGENTS.md+++ b/crates/macro_authorization/AGENTS.md@@ -48,6 +48,9 @@ by policy.- `cargo test -p macro_authorization` (`SQLX_OFFLINE` unset).+`authorize_identity` retains signed agent attribution on user authentication. It+does not turn a user credential into bot authority or change endpoint policies.+## Gotchas- Both extractors reject (400) a request that combines explicit credentialdiff --git a/crates/macro_authorization/src/domain/bot_authorizer.rs b/crates/macro_authorization/src/domain/bot_authorizer.rsindex aac18eb012..2b44039338 100644--- a/crates/macro_authorization/src/domain/bot_authorizer.rs+++ b/crates/macro_authorization/src/domain/bot_authorizer.rs@@ -153,6 +153,7 @@ wherefn user_authentication(acting_user: ResolvedBotActingUser) -> MacroUserAuthentication {let user_id = acting_user.macro_user_id.as_ref().to_owned();MacroUserAuthentication {+ agent_id: None,macro_user_id: acting_user.macro_user_id,user_context: UserContext {user_id,diff --git a/crates/macro_authorization/src/domain/harness_authorizer.rs b/crates/macro_authorization/src/domain/harness_authorizer.rsindex 308c86bea1..8d255e45a1 100644--- a/crates/macro_authorization/src/domain/harness_authorizer.rs+++ b/crates/macro_authorization/src/domain/harness_authorizer.rs@@ -110,6 +110,7 @@ wherefn user_authentication(acting_user: ResolvedBotActingUser) -> MacroUserAuthentication {let user_id = acting_user.macro_user_id.as_ref().to_owned();MacroUserAuthentication {+ agent_id: None,macro_user_id: acting_user.macro_user_id,user_context: UserContext {user_id,diff --git a/crates/macro_authorization/src/domain/models.rs b/crates/macro_authorization/src/domain/models.rsindex fe942d8e31..0801603f4e 100644--- a/crates/macro_authorization/src/domain/models.rs+++ b/crates/macro_authorization/src/domain/models.rs@@ -13,6 +13,8 @@ use uuid::Uuid;/// A user identity that has been authenticated or verified for a bot.#[derive(Clone, Debug)]pub struct MacroUserAuthentication {+ /// Signed agent attribution for user-authorized SDK messages, not a bot credential.+ pub agent_id: Option<BotId>,/// The user's parsed Macro identifier.pub macro_user_id: MacroUserIdStr<'static>,/// The authenticated user context.@@ -253,6 +255,8 @@ pub struct InternalAuthConfig {/// to the authorization service.#[derive(Clone, Debug, Eq, PartialEq)]pub struct ValidatedIdentity {+ /// Agent attribution from a cryptographically verified Macro API token.+ pub agent_id: Option<BotId>,/// The user's Macro identifier.pub user_id: String,/// The user's FusionAuth or root identifier.diff --git a/crates/macro_authorization/src/domain/models/test.rs b/crates/macro_authorization/src/domain/models/test.rsindex f6651db41d..95f16dbb49 100644--- a/crates/macro_authorization/src/domain/models/test.rs+++ b/crates/macro_authorization/src/domain/models/test.rs@@ -14,6 +14,7 @@ const TEAM_ID: Uuid = Uuid::from_u128(3);fn user_authentication() -> MacroUserAuthentication {MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from("macro|[email protected]".to_string()).expect("valid Macro user id"),user_context: UserContext {diff --git a/crates/macro_authorization/src/domain/ports.rs b/crates/macro_authorization/src/domain/ports.rsindex 136cd56575..ebb3211d65 100644--- a/crates/macro_authorization/src/domain/ports.rs+++ b/crates/macro_authorization/src/domain/ports.rs@@ -181,6 +181,25 @@ pub trait MacroAuthorizationService: Clone + Send + Sync + 'static {jwt: &str,) -> impl Future<Output = Result<UserContext, Report<MacroAuthorizationError>>> + Send;+ /// Authorize a user credential while retaining signed agent attribution.+ /// Context-only authorizers establish no agent identity.+ fn authorize_identity(+ &self,+ jwt: &str,+ ) -> impl Future<Output = Result<ValidatedIdentity, Report<MacroAuthorizationError>>> + Send+ {+ async {+ let context = self.authorize(jwt).await?;+ Ok(ValidatedIdentity {+ agent_id: None,+ user_id: context.user_id,+ fusion_user_id: context.fusion_user_id,+ organization_id: context.organization_id,+ permissions: context.permissions,+ })+ }+ }+/// Authorize a bot token, verifying any acting-user claims.////// Services reject bot credentials unless they explicitly provide a botdiff --git a/crates/macro_authorization/src/domain/service.rs b/crates/macro_authorization/src/domain/service.rsindex 50fe900495..0f4a5fef24 100644--- a/crates/macro_authorization/src/domain/service.rs+++ b/crates/macro_authorization/src/domain/service.rs@@ -11,7 +11,7 @@ use tracing::Level;use super::{models::{BotActingUserClaims, BotAuthentication, BotScope, HarnessAuthentication,- InternalAuthConfig, InternalIdentityClaims, MacroAuthorizationError,+ InternalAuthConfig, InternalIdentityClaims, MacroAuthorizationError, ValidatedIdentity,},ports::{BotAuthorizer, HarnessAuthorizer, JwtValidator, MacroAuthorizationService,@@ -155,6 +155,14 @@ where})}+ #[tracing::instrument(skip_all, err(level = Level::DEBUG))]+ async fn authorize_identity(+ &self,+ jwt: &str,+ ) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {+ self.validator.validate(jwt)+ }+#[tracing::instrument(err(level = Level::DEBUG),skip_all,diff --git a/crates/macro_authorization/src/domain/service/test.rs b/crates/macro_authorization/src/domain/service/test.rsindex 0d790ae90f..587bc95802 100644--- a/crates/macro_authorization/src/domain/service/test.rs+++ b/crates/macro_authorization/src/domain/service/test.rs@@ -161,6 +161,7 @@ fn bot_authentication() -> BotAuthentication {bot_scope: BotScope::Team,team_id: Some(TEAM_ID),acting_user: Some(MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from("macro|[email protected]".to_string()).expect("valid Macro user id"),user_context: UserContext {@@ -308,6 +309,7 @@ async fn authorize_constructs_user_context_from_validated_identity() {let service = MacroAuthorizationServiceImpl::new(FakeJwtValidator {result: Ok(ValidatedIdentity {+ agent_id: None,user_id: "macro|[email protected]".to_string(),fusion_user_id: "fusion-user-id".to_string(),organization_id: Some(42),@@ -523,3 +525,28 @@ async fn authorize_user_api_key_passes_through_authorizer_errors() {assert_eq!(error.current_context(), &expected);}}++#[tokio::test]+async fn authorize_identity_keeps_verified_agent_and_owner() {+ let service = MacroAuthorizationServiceImpl::new(+ FakeJwtValidator {+ result: Ok(ValidatedIdentity {+ agent_id: Some(bot_id::MACRO_NEW_BOT_ID),+ user_id: "macro|[email protected]".into(),+ fusion_user_id: "fusion-owner".into(),+ organization_id: Some(42),+ permissions: None,+ }),+ },+ internal_auth_config(None),+ NoBotAuthorizer,+ NoUserApiKeyAuthorizer,+ );+ let identity = service.authorize_identity("signed-token").await.unwrap();+ assert_eq!(identity.agent_id, Some(bot_id::MACRO_NEW_BOT_ID));+ assert_eq!(identity.user_id, "macro|[email protected]");+ assert_eq!(+ service.authorize("signed-token").await.unwrap().user_id,+ identity.user_id+ );+}diff --git a/crates/macro_authorization/src/inbound/axum.rs b/crates/macro_authorization/src/inbound/axum.rsindex 4caaedab60..a3dc6c2fbd 100644--- a/crates/macro_authorization/src/inbound/axum.rs+++ b/crates/macro_authorization/src/inbound/axum.rs@@ -143,6 +143,7 @@ pub(super) fn authenticated_user(})?;Ok(MacroUserAuthentication {+ agent_id: None,macro_user_id,user_context,})diff --git a/crates/macro_authorization/src/inbound/axum/test.rs b/crates/macro_authorization/src/inbound/axum/test.rsindex 061fdcfbda..655c4236cb 100644--- a/crates/macro_authorization/src/inbound/axum/test.rs+++ b/crates/macro_authorization/src/inbound/axum/test.rs@@ -179,6 +179,7 @@ fn bot_authentication(bot_scope: BotScope, acting_user_id: Option<&str>) -> BotAbot_scope,team_id: (bot_scope == BotScope::Team).then_some(BOT_TEAM_ID),acting_user: acting_user_id.map(|user_id| MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(user_id.to_owned()).expect("valid bot acting user id"),user_context: user_context(user_id, Some(42)),@@ -2202,6 +2203,7 @@ fn policies_report_typed_acting_entity_variants_with_display_parity() {fn macro_user_authentication(user_id: &str) -> MacroUserAuthentication {MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(user_id.to_owned()).expect("valid Macro user ID"),user_context: user_context(user_id, None),}diff --git a/crates/macro_authorization/src/inbound/axum/user.rs b/crates/macro_authorization/src/inbound/axum/user.rsindex 65720d1ea1..514a780fe0 100644--- a/crates/macro_authorization/src/inbound/axum/user.rs+++ b/crates/macro_authorization/src/inbound/axum/user.rs@@ -1,3 +1,6 @@+#[cfg(test)]+mod test;+use ::axum::{extract::{FromRef, FromRequestParts, Query},http::{header, request::Parts},@@ -135,13 +138,20 @@ whereSvc: MacroAuthorizationService,{let authorization = MacroAuthorizationState::<Svc>::from_ref(state);- let user_context = authorization+ let identity = authorization.service- .authorize(token)+ .authorize_identity(token).await.map_err(authorization_rejection)?;- authenticated_user(user_context)+ let mut user = authenticated_user(model_user::UserContext {+ user_id: identity.user_id,+ fusion_user_id: identity.fusion_user_id,+ organization_id: identity.organization_id,+ permissions: identity.permissions,+ })?;+ user.agent_id = identity.agent_id;+ Ok(user)}fn authorization_rejection(error: Report<MacroAuthorizationError>) -> MacroAuthorizationRejection {diff --git a/crates/macro_authorization/src/inbound/axum/user/test.rs b/crates/macro_authorization/src/inbound/axum/user/test.rsnew file mode 100644index 0000000000..f4851525ac--- /dev/null+++ b/crates/macro_authorization/src/inbound/axum/user/test.rs@@ -0,0 +1,83 @@+use super::*;+use crate::{+ BotOnly, InternalAuthConfig, JwtValidator, MacroAuthorizationExtractor,+ MacroAuthorizationServiceImpl, NoBotAuthorizer, NoUserApiKeyAuthorizer, UserOnly,+ ValidatedIdentity,+};+use std::sync::Arc;++#[derive(Clone)]+struct Validator;+impl JwtValidator for Validator {+ fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {+ match jwt {+ "execution" | "user" => Ok(ValidatedIdentity {+ agent_id: (jwt == "execution").then_some(bot_id::MACRO_NEW_BOT_ID),+ user_id: "macro|[email protected]".into(),+ fusion_user_id: "fusion-owner".into(),+ organization_id: Some(42),+ permissions: None,+ }),+ _ => Err(Report::new(MacroAuthorizationError::InvalidCredentials)),+ }+ }+}++type AuthorizationService = MacroAuthorizationServiceImpl<Validator>;++#[tokio::test]+async fn bearer_agent_attribution_survives_user_policy_without_becoming_bot_authority() {+ let state = MacroAuthorizationState::new(Arc::new(MacroAuthorizationServiceImpl::new(+ Validator,+ InternalAuthConfig {+ api_key: "internal-key".into(),+ default_user_id: None,+ },+ NoBotAuthorizer,+ NoUserApiKeyAuthorizer,+ )));+ for (token, agent) in [+ ("execution", Some(bot_id::MACRO_NEW_BOT_ID)),+ ("user", None),+ ] {+ let (mut parts, _) = axum::http::Request::builder()+ .header(header::AUTHORIZATION, format!("Bearer {token}"))+ .body(())+ .unwrap()+ .into_parts();+ let caller = MacroAuthorizationExtractor::<+ MacroAuthorizationServiceImpl<Validator>,+ UserOnly,+ >::from_request_parts(&mut parts, &state)+ .await+ .unwrap();+ assert_eq!(caller.authorization.agent_id, agent);+ assert_eq!(+ caller.authorization.macro_user_id.as_ref(),+ "macro|[email protected]"+ );+ assert_eq!(caller.authorization.user_context.organization_id, Some(42));+ assert!(+ MacroAuthorizationExtractor::<AuthorizationService, BotOnly>::from_request_parts(+ &mut parts, &state+ )+ .await+ .is_err()+ );+ }+ let (mut parts, _) = axum::http::Request::builder()+ .header(header::AUTHORIZATION, "Bearer user")+ .header(+ "x-macro-agent-id",+ bot_id::MACRO_NEW_BOT_ID.as_uuid().to_string(),+ )+ .body(())+ .unwrap()+ .into_parts();+ let caller = MacroAuthorizationExtractor::<AuthorizationService, UserOnly>::from_request_parts(+ &mut parts, &state,+ )+ .await+ .unwrap();+ assert_eq!(caller.authorization.agent_id, None);+}diff --git a/crates/macro_authorization/src/outbound/macro_auth.rs b/crates/macro_authorization/src/outbound/macro_auth.rsindex 107d11c5a9..2ae838d900 100644--- a/crates/macro_authorization/src/outbound/macro_auth.rs+++ b/crates/macro_authorization/src/outbound/macro_auth.rs@@ -42,20 +42,23 @@ impl JwtValidator for MacroAuthJwtValidator {}fn identity_from_token(token: JwtToken) -> ValidatedIdentity {- let (user_id, fusion_user_id, organization_id) = match token {+ let (user_id, fusion_user_id, organization_id, agent_id) = match token {JwtToken::MacroAccessToken(token) => (token.macro_user_id,token.root_macro_id.unwrap_or(token.fusion_user_id),token.macro_organization_id,+ None,),JwtToken::MacroApiToken(token) => (token.macro_user_id,token.fusion_user_id,token.macro_organization_id,+ token.agent_id.map(bot_id::BotId::new_from_uuid),),};ValidatedIdentity {+ agent_id,user_id,fusion_user_id,organization_id,diff --git a/crates/macro_authorization/src/outbound/macro_auth/test.rs b/crates/macro_authorization/src/outbound/macro_auth/test.rsindex b362464050..229004f710 100644--- a/crates/macro_authorization/src/outbound/macro_auth/test.rs+++ b/crates/macro_authorization/src/outbound/macro_auth/test.rs@@ -69,6 +69,7 @@ fn validates_access_token() {assert_eq!(identity.fusion_user_id, FUSION_USER_ID);assert_eq!(identity.organization_id, None);assert_eq!(identity.permissions, None);+ assert_eq!(identity.agent_id, None);}#[test]@@ -139,6 +140,7 @@ fn preserves_access_token_organization_id() {#[test]fn maps_macro_api_token_claims() {let identity = identity_from_token(JwtToken::MacroApiToken(MacroApiToken {+ agent_id: None,exp: unix_timestamp() + 3_600,iss: String::new(),fusion_user_id: FUSION_USER_ID.to_string(),@@ -150,4 +152,21 @@ fn maps_macro_api_token_claims() {assert_eq!(identity.fusion_user_id, FUSION_USER_ID);assert_eq!(identity.organization_id, Some(84));assert_eq!(identity.permissions, None);+ assert_eq!(identity.agent_id, None);+}++#[test]+fn maps_signed_agent_without_changing_owner_identity() {+ let agent = bot_id::MACRO_NEW_BOT_ID;+ let identity = identity_from_token(JwtToken::MacroApiToken(MacroApiToken {+ agent_id: Some(agent.as_uuid()),+ exp: unix_timestamp() + 60,+ iss: String::new(),+ fusion_user_id: FUSION_USER_ID.into(),+ macro_user_id: MACRO_USER_ID.into(),+ macro_organization_id: Some(42),+ }));+ assert_eq!(identity.agent_id, Some(agent));+ assert_eq!(identity.user_id, MACRO_USER_ID);+ assert_eq!(identity.organization_id, Some(42));}diff --git a/crates/messages/AGENTS.md b/crates/messages/AGENTS.mdindex 9ff6e49ab5..6b837af7b9 100644--- a/crates/messages/AGENTS.md+++ b/crates/messages/AGENTS.md@@ -51,6 +51,10 @@ they need.- `cargo test -p messages --all-features` (`SQLX_OFFLINE` unset).+New posts use the message sender receipt to retain signed code-mode agent+attribution. All other operations use the caller receipt so attribution cannot+grant users another agent invocation's edit, deletion, or reaction authority.+## Gotchas- Most modules are feature-gated (`annotations`, `broker`, `delivery`,diff --git a/crates/messages/src/inbound/axum_router.rs b/crates/messages/src/inbound/axum_router.rsindex 376bd56c10..d39808b15f 100644--- a/crates/messages/src/inbound/axum_router.rs+++ b/crates/messages/src/inbound/axum_router.rs@@ -180,6 +180,19 @@ async fn receipt<P: RequiredPermission, A: EntityAccessService, Auth: MacroAuthoaccess: &A,user: &MacroAuthorizationExtractor<Auth, AnyPrincipal>,path: &ParentPath,+) -> Result<EntityAccessReceipt<P>, MessageHttpError> {+ receipt_with_sender(access, user, path, false).await+}++async fn receipt_with_sender<+ P: RequiredPermission,+ A: EntityAccessService,+ Auth: MacroAuthorizationService,+>(+ access: &A,+ user: &MacroAuthorizationExtractor<Auth, AnyPrincipal>,+ path: &ParentPath,+ as_sender: bool,) -> Result<EntityAccessReceipt<P>, MessageHttpError> {let parent = MessageParent::parse(&path.parent_type, &path.parent_id).map_err(|_| MessageError::Invalid("invalid message parent"))?;@@ -191,14 +204,22 @@ async fn receipt<P: RequiredPermission, A: EntityAccessService, Auth: MacroAuthoMessageParent::CrmContact(_) => EntityType::CrmContact,MessageParent::Call(_) => EntityType::Call,};- entity_access::inbound::axum_extractors::principal_entity_access_receipt::<P>(- access,- &user.authorization,- &path.parent_id,- kind,- )- .await- .map_err(|error| match error {+ use entity_access::inbound::axum_extractors::{+ message_sender_entity_access_receipt, principal_entity_access_receipt,+ };+ let receipt = if as_sender {+ message_sender_entity_access_receipt::<P>(+ access,+ &user.authorization,+ &path.parent_id,+ kind,+ )+ .await+ } else {+ principal_entity_access_receipt::<P>(access, &user.authorization, &path.parent_id, kind)+ .await+ };+ receipt.map_err(|error| match error {entity_access::domain::models::AccessError::Unavailable(error)| entity_access::domain::models::AccessError::Internal(error) => {MessageError::Repository(error).into()@@ -227,7 +248,10 @@ whereOk(Json(state.service- .post(receipt(state.access.as_ref(), &user, &path).await?, input)+ .post(+ receipt_with_sender(state.access.as_ref(), &user, &path, true).await?,+ input,+ ).await?,))}diff --git a/crates/projects/src/inbound/axum_router/tests.rs b/crates/projects/src/inbound/axum_router/tests.rsindex 25bd32c575..7bb59f2c94 100644--- a/crates/projects/src/inbound/axum_router/tests.rs+++ b/crates/projects/src/inbound/axum_router/tests.rs@@ -431,6 +431,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {acting_user: acting_user.and_then(|claims| claims.user_id).map(|user_id| MacroUserAuthentication {+ agent_id: None,macro_user_id: user(&user_id),user_context: user_context(&user_id),}),diff --git a/crates/properties/src/inbound/axum_router/test.rs b/crates/properties/src/inbound/axum_router/test.rsindex 46a9db09f9..3b7d529e34 100644--- a/crates/properties/src/inbound/axum_router/test.rs+++ b/crates/properties/src/inbound/axum_router/test.rs@@ -224,6 +224,7 @@ impl JwtValidator for FakeJwtValidator {fn validate(&self, jwt: &str) -> Result<ValidatedIdentity, Report<MacroAuthorizationError>> {match jwt {"valid" => Ok(ValidatedIdentity {+ agent_id: None,user_id: VALID_USER_ID.to_string(),fusion_user_id: "fusion-valid-user".to_string(),organization_id: Some(ORGANIZATION_ID),diff --git a/crates/webhook/src/inbound/axum_router/test.rs b/crates/webhook/src/inbound/axum_router/test.rsindex f90a090e1f..a3d714fa3a 100644--- a/crates/webhook/src/inbound/axum_router/test.rs+++ b/crates/webhook/src/inbound/axum_router/test.rs@@ -114,6 +114,7 @@ impl MacroAuthorizationService for FakeAuthorizationService {let acting_user = acting_user.and_then(|claims| claims.user_id).map(|user_id| macro_authorization::MacroUserAuthentication {+ agent_id: None,macro_user_id: MacroUserIdStr::try_from(user_id).unwrap(),user_context: UserContext::default(),});diff --git a/docs/agent-guide/ai-chat.md b/docs/agent-guide/ai-chat.mdindex 2e0f5752f2..fe37d74b4c 100644--- a/docs/agent-guide/ai-chat.md+++ b/docs/agent-guide/ai-chat.md@@ -829,7 +829,11 @@ The harness spawns a fresh Deno process for each execution. Dependencies arebundled at build time; no TypeScript compilation or package downloads happenin a run. The process receives a short-lived normal user token after the sessionowner's execution approval. SDK methods make HTTP requests to configured Macro-service hosts using normal API authorization. There is no runner service,+service hosts using normal API authorization. The token also signs the session's+agent identity: SDK messages show that agent as sender and the owner in the+`from` pill. Ordinary user tokens have no agent attribution; client headers and+message bodies cannot choose it. Other SDK endpoints still authenticate the owner+as a user. There is no runner service,WebSocket bridge, or per-API-call approval callback. Eight executions may runper harness process. Network hosts, process lifetime, output and memory arebounded; filesystem writes, arbitrary imports and subprocesses are denied.diff --git a/packages/code-mode-sdk/README.md b/packages/code-mode-sdk/README.mdindex ea412b9e2a..08deab88ae 100644--- a/packages/code-mode-sdk/README.md+++ b/packages/code-mode-sdk/README.md@@ -12,7 +12,9 @@ or TypeScript compilation happen during a run. SDK local portmap discovery isremoved from the bundle because service hosts are supplied by the harness.The harness mints a normal user token lasting 60 seconds after the session's-execution approval policy permits the run.+execution approval policy permits the run. Its signed agent identity comes from+the authenticated session. SDK messages use that agent as sender and record the+owner as `triggered_by`; other SDK endpoints retain normal user authentication.Deno permits network access only to configured Macro service hosts and deniesfilesystem writes, arbitrary imports, subprocesses, environment access and FFI.User API authorization and metering apply. Tokens expire; process exit does notdiff --git a/services/agent_harness_service/AGENTS.md b/services/agent_harness_service/AGENTS.mdindex 0fe89e03e6..6cceb9310e 100644--- a/services/agent_harness_service/AGENTS.md+++ b/services/agent_harness_service/AGENTS.md@@ -45,6 +45,9 @@ sessions: agent-session trigger events in, sandboxed coding agent sessions- `just run-local` — needs `DAYTONA_API_KEY`, `DAYTONA_SNAPSHOT`,`GITHUB_TOKEN` in the environment or a local `.env`.+Code-mode credentials sign the authenticated session bot identity for SDK+message attribution after owner approval, while retaining user authentication.+## Gotchas- Two managed bots run on different runtimes: `@coder` (`HARNESS_BOT_ID`) in adiff --git a/services/agent_harness_service/src/code_mode.rs b/services/agent_harness_service/src/code_mode.rsindex 90eec09eb7..975948e45a 100644--- a/services/agent_harness_service/src/code_mode.rs+++ b/services/agent_harness_service/src/code_mode.rs@@ -26,7 +26,7 @@ impl ExecutionCredentials for RunCredentials {// clock margin; a normal user token expires rather than revoking on exit.let token = self.signer- .mint_for(&identity.owner, 60)+ .mint_for_agent(&identity.owner, 60, Some(identity.agent_id.as_uuid())).await.map_err(|error| {tracing::error!(?error, "could not mint execution credential");diff --git a/services/agent_harness_service/src/code_mode/test.rs b/services/agent_harness_service/src/code_mode/test.rsindex 397aac2c83..03572fd200 100644--- a/services/agent_harness_service/src/code_mode/test.rs+++ b/services/agent_harness_service/src/code_mode/test.rs@@ -29,6 +29,7 @@ async fn owner_approval_is_required_before_credentials_and_cancel_skips_gate() {let identity = ExecutionIdentity {execution: agent_code_mode::domain::ExecutionId::mint(),session: session.id,+ agent_id: session.bot_id,owner: session.owner_user().unwrap().clone(),turn: macro_uuid::Uuid::from_u128(1),};diff --git a/services/authentication_service/AGENTS.md b/services/authentication_service/AGENTS.mdindex a535f08d46..2789e6d60d 100644--- a/services/authentication_service/AGENTS.md+++ b/services/authentication_service/AGENTS.md@@ -73,6 +73,9 @@ key issuance, and account merge/link flows.- Deploy the eligibility endpoint before web clients that require it; otherwisethe clients keep Pro checkout disabled until the lookup can succeed.+API-token exchange preserves verified incoming agent attribution; query/body+inputs cannot select an agent, and ordinary user credentials remain unattributed.+## Gotchas- The signup allowlist has a temporary Develop-only bypassdiff --git a/services/authentication_service/src/api/jwt/macro_api_token.rs b/services/authentication_service/src/api/jwt/macro_api_token.rsindex c8efac1a1c..e0d64fffba 100644--- a/services/authentication_service/src/api/jwt/macro_api_token.rs+++ b/services/authentication_service/src/api/jwt/macro_api_token.rs@@ -89,6 +89,11 @@ pub async fn handler(let macro_api_token =macro_auth::macro_api_token::encode_macro_api_token(EncodeMacroApiTokenArgs {+ agent_id: authorization+ .authorization+ .user+ .agent_id+ .map(|agent| agent.as_uuid()),macro_user_id,fusionauth_id: user_context.fusion_user_id.clone(),organization_id, // TOOD: get from user profilediff --git a/services/scheduled_action/src/inbound/axum_router/test.rs b/services/scheduled_action/src/inbound/axum_router/test.rsindex d38a6b3fe7..98bc0a999e 100644--- a/services/scheduled_action/src/inbound/axum_router/test.rs+++ b/services/scheduled_action/src/inbound/axum_router/test.rs@@ -152,6 +152,7 @@ impl MacroAuthorizationService for FakeAuth {.map(|user_id| {let macro_user_id = MacroUserIdStr::try_from(user_id).expect("acting user id");MacroUserAuthentication {+ agent_id: None,user_context: UserContext {user_id: macro_user_id.to_string(),..Default::default()