Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix: close initiative access and lifecycle gaps (#6832)

teo2832db3b4279
diff --git a/.github/workspace-dep-closures.json b/.github/workspace-dep-closures.json
index edaed7ebcb..29fa229202 100644
--- a/.github/workspace-dep-closures.json
+++ b/.github/workspace-dep-closures.json
@@ -54,6 +54,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/bots",
@@ -66,9 +67,12 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -83,6 +87,7 @@
"crates/fusionauth",
"crates/genai_telemetry",
"crates/github",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -93,6 +98,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -112,21 +118,28 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -134,6 +147,8 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"agent_egress": [
@@ -146,6 +161,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/bots",
@@ -158,9 +174,12 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -175,6 +194,7 @@
"crates/fusionauth",
"crates/genai_telemetry",
"crates/github",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -206,8 +226,10 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
"crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_opensearch",
"crates/models_pagination",
@@ -220,11 +242,13 @@
"crates/notification_state",
"crates/pipedream_mcp",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -232,6 +256,7 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
"crates/user_quota",
"crates/workspace-hack"
],
@@ -255,6 +280,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/bots",
@@ -270,11 +296,14 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/cursor_api_key",
"crates/cursor_cloud_agents",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -289,6 +318,7 @@
"crates/fusionauth",
"crates/genai_telemetry",
"crates/github",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -320,8 +350,10 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
"crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_opensearch",
"crates/models_pagination",
@@ -334,11 +366,13 @@
"crates/notification_state",
"crates/pipedream_mcp",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file",
"crates/static_file_service_client",
@@ -347,6 +381,7 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
"crates/user_quota",
"crates/workspace-hack"
],
@@ -1710,6 +1745,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -1730,14 +1766,19 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -1754,6 +1795,7 @@
"crates/soup",
"crates/soup_filter_cache_adapter",
"crates/soup_filter_projection",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -1762,6 +1804,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"cal": [
@@ -2478,6 +2521,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -2499,12 +2543,15 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -2525,6 +2572,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/webhook",
"crates/webhook_signature",
"crates/workspace-hack"
@@ -2732,6 +2780,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -2754,14 +2803,17 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -2789,6 +2841,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"connection": [
@@ -3600,6 +3653,7 @@
"crates/harnesses",
"crates/import",
"crates/initiative",
+ "crates/initiative_documents",
"crates/invite_email",
"crates/ip_extractor",
"crates/item_filter_index",
@@ -3781,6 +3835,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/broadcast",
@@ -3792,9 +3847,12 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -3807,6 +3865,7 @@
"crates/foreign_entity",
"crates/frecency",
"crates/genai_telemetry",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -3817,6 +3876,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -3836,21 +3896,28 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -3858,6 +3925,8 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack",
"services/document_upload_finalizer_handler"
],
@@ -3869,6 +3938,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/broadcast",
@@ -3880,9 +3950,12 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -3895,6 +3968,7 @@
"crates/foreign_entity",
"crates/frecency",
"crates/genai_telemetry",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -3905,6 +3979,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -3924,21 +3999,28 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -3946,6 +4028,8 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"docx_unzip_handler": [
@@ -4898,6 +4982,7 @@
"crates/ai_toolset",
"crates/ai_usage",
"crates/attachment",
+ "crates/authentication_service_client",
"crates/bot_id",
"crates/bot_token",
"crates/broadcast",
@@ -4909,9 +4994,12 @@
"crates/connection_gateway_models",
"crates/contacts",
"crates/cowlike",
+ "crates/crm",
"crates/database_env_vars",
"crates/document_sub_type",
"crates/documents",
+ "crates/email",
+ "crates/email_utils",
"crates/embedding",
"crates/entity_access",
"crates/entity_access_db_utils",
@@ -4926,6 +5014,7 @@
"crates/fusionauth",
"crates/genai_telemetry",
"crates/github",
+ "crates/google_token",
"crates/harness_id",
"crates/harness_token",
"crates/invite_email",
@@ -4936,6 +5025,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -4955,21 +5045,28 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
"crates/prompt",
+ "crates/properties",
"crates/rate_limit",
"crates/remote_env_var",
"crates/s3_key",
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -4977,6 +5074,8 @@
"crates/system_properties",
"crates/system_skills",
"crates/task_dedup",
+ "crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"gmail_client": [
@@ -5295,6 +5394,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -5317,14 +5417,17 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -5352,6 +5455,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"graphql_favorite": [
@@ -5421,6 +5525,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -5443,14 +5548,17 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -5478,6 +5586,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"graphql_notification": [
@@ -5682,6 +5791,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -5704,14 +5814,17 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -5739,6 +5852,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"graphql_soup_filter_input": [
@@ -5975,6 +6089,110 @@
"crates/share_permission_db_utils",
"crates/workspace-hack"
],
+ "initiative_documents": [
+ "crates/activity",
+ "crates/agent",
+ "crates/agent_fold",
+ "crates/agent_runtime_protocol",
+ "crates/ai_toolset",
+ "crates/ai_usage",
+ "crates/attachment",
+ "crates/authentication_service_client",
+ "crates/bot_id",
+ "crates/bot_token",
+ "crates/broadcast",
+ "crates/channel_sender",
+ "crates/channels",
+ "crates/comms_db_client",
+ "crates/connection",
+ "crates/connection_gateway_client",
+ "crates/connection_gateway_models",
+ "crates/contacts",
+ "crates/cowlike",
+ "crates/crm",
+ "crates/database_env_vars",
+ "crates/document_sub_type",
+ "crates/documents",
+ "crates/email",
+ "crates/email_utils",
+ "crates/embedding",
+ "crates/entity_access",
+ "crates/entity_access_db_utils",
+ "crates/entity_access_management",
+ "crates/entity_mutation",
+ "crates/entity_registry/entity_registry",
+ "crates/entity_registry/entity_registry_db_utils",
+ "crates/entity_registry/shared_entity_registry",
+ "crates/filter_ast",
+ "crates/foreign_entity",
+ "crates/frecency",
+ "crates/genai_telemetry",
+ "crates/google_token",
+ "crates/harness_id",
+ "crates/harness_token",
+ "crates/initiative",
+ "crates/initiative_documents",
+ "crates/invite_email",
+ "crates/item_filters",
+ "crates/kafka_util",
+ "crates/last_online_tracker",
+ "crates/lexical_client",
+ "crates/macro_auth",
+ "crates/macro_authorization",
+ "crates/macro_aws_config",
+ "crates/macro_db_client",
+ "crates/macro_entrypoint",
+ "crates/macro_env",
+ "crates/macro_env_var",
+ "crates/macro_event_broker",
+ "crates/macro_event_topics",
+ "crates/macro_service_urls",
+ "crates/macro_sync_service_jwt",
+ "crates/macro_tower_layers",
+ "crates/macro_user_id",
+ "crates/macro_uuid",
+ "crates/mention_utils",
+ "crates/messages",
+ "crates/model",
+ "crates/model-entity",
+ "crates/model-error-response",
+ "crates/model_file_type",
+ "crates/model_notifications",
+ "crates/model_owner",
+ "crates/model_user",
+ "crates/models_ai_projection",
+ "crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
+ "crates/models_entity_access_management",
+ "crates/models_opensearch",
+ "crates/models_pagination",
+ "crates/models_permissions",
+ "crates/models_properties",
+ "crates/models_sfs",
+ "crates/models_team",
+ "crates/non_empty",
+ "crates/notification",
+ "crates/notification_state",
+ "crates/prompt",
+ "crates/properties",
+ "crates/rate_limit",
+ "crates/remote_env_var",
+ "crates/s3_key",
+ "crates/secretsmanager_client",
+ "crates/share_permission_db_utils",
+ "crates/sqs_client",
+ "crates/sqs_worker",
+ "crates/static_file_service_client",
+ "crates/sync_service",
+ "crates/sync_service_client",
+ "crates/system_properties",
+ "crates/system_skills",
+ "crates/task_dedup",
+ "crates/unfurl",
+ "crates/user_quota",
+ "crates/workspace-hack"
+ ],
"invite_email": [
"crates/ai_toolset",
"crates/bot_id",
@@ -7783,6 +8001,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -7805,12 +8024,15 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -7831,6 +8053,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"prompt": [
@@ -8763,6 +8986,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -8782,7 +9006,10 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
"crates/models_opensearch",
@@ -8793,6 +9020,7 @@
"crates/models_search_cursor",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -8810,6 +9038,7 @@
"crates/share_permission_db_utils",
"crates/skills",
"crates/soup",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -8818,6 +9047,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"sns_client": [
@@ -8880,6 +9110,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -8899,14 +9130,19 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -8920,6 +9156,7 @@
"crates/secretsmanager_client",
"crates/share_permission_db_utils",
"crates/soup",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -8928,6 +9165,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"soup-filter-cache-adapter": [
@@ -8990,6 +9228,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -9010,14 +9249,19 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -9034,6 +9278,7 @@
"crates/soup",
"crates/soup_filter_cache_adapter",
"crates/soup_filter_projection",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -9042,6 +9287,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"soup-filter-projection": [
@@ -9101,6 +9347,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -9120,14 +9367,19 @@
"crates/model_notifications",
"crates/model_owner",
"crates/model_user",
+ "crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
+ "crates/models_email",
"crates/models_entity_access_management",
"crates/models_grouping",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
"crates/models_soup",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -9143,6 +9395,7 @@
"crates/share_permission_db_utils",
"crates/soup",
"crates/soup_filter_projection",
+ "crates/sqs_client",
"crates/sqs_worker",
"crates/static_file_service_client",
"crates/sync_service",
@@ -9151,6 +9404,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"soup_realtime": [
@@ -9204,6 +9458,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -9226,12 +9481,15 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -9254,6 +9512,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/workspace-hack"
],
"sqs_client": [
@@ -9923,6 +10182,7 @@
"crates/macro_auth",
"crates/macro_authorization",
"crates/macro_aws_config",
+ "crates/macro_db_client",
"crates/macro_entrypoint",
"crates/macro_env",
"crates/macro_env_var",
@@ -9944,12 +10204,15 @@
"crates/model_user",
"crates/models_ai_projection",
"crates/models_bulk_upload",
+ "crates/models_dcs",
"crates/models_email",
"crates/models_entity_access_management",
+ "crates/models_opensearch",
"crates/models_pagination",
"crates/models_permissions",
"crates/models_properties",
"crates/models_sfs",
+ "crates/models_team",
"crates/non_empty",
"crates/notification",
"crates/notification_state",
@@ -9970,6 +10233,7 @@
"crates/system_skills",
"crates/task_dedup",
"crates/unfurl",
+ "crates/user_quota",
"crates/webhook",
"crates/webhook_signature",
"crates/workspace-hack"
diff --git a/.sqlx/query-bd9bd32d3afaa137889ae90b81a8aa73266047c37c341ed60f965a4c58119b7a.json b/.sqlx/query-bd9bd32d3afaa137889ae90b81a8aa73266047c37c341ed60f965a4c58119b7a.json
new file mode 100644
index 0000000000..56188e98cd
--- /dev/null
+++ b/.sqlx/query-bd9bd32d3afaa137889ae90b81a8aa73266047c37c341ed60f965a4c58119b7a.json
@@ -0,0 +1,22 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n WITH removed AS (\n DELETE FROM task_initiative\n WHERE task_id = $1\n RETURNING initiative_id\n )\n UPDATE initiative\n SET updated_at = now()\n WHERE id IN (SELECT initiative_id FROM removed)\n RETURNING id\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "id",
+ "type_info": "Uuid"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Text"
+ ]
+ },
+ "nullable": [
+ false
+ ]
+ },
+ "hash": "bd9bd32d3afaa137889ae90b81a8aa73266047c37c341ed60f965a4c58119b7a"
+}
diff --git a/.sqlx/query-469a24bfaeb8f3309345777d3ec06f1c32867c385352bb7a568cc1801c23f9e7.json b/.sqlx/query-c14338c83613a887a46aec25ace964ad0fcb992f5461c9e5be988c60b07862d3.json
similarity index 50%
rename from .sqlx/query-469a24bfaeb8f3309345777d3ec06f1c32867c385352bb7a568cc1801c23f9e7.json
rename to .sqlx/query-c14338c83613a887a46aec25ace964ad0fcb992f5461c9e5be988c60b07862d3.json
index 3b80b3c28f..bfac44cde6 100644
--- a/.sqlx/query-469a24bfaeb8f3309345777d3ec06f1c32867c385352bb7a568cc1801c23f9e7.json
+++ b/.sqlx/query-c14338c83613a887a46aec25ace964ad0fcb992f5461c9e5be988c60b07862d3.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope)\n VALUES ($1, 'prompt', 'in-memory', 'default', 'all')\n ",
+ "query": "\n INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, is_coding)\n VALUES ($1, 'prompt', 'in-memory', 'default', 'all', false)\n ",
"describe": {
"columns": [],
"parameters": {
@@ -10,5 +10,5 @@
},
"nullable": []
},
- "hash": "469a24bfaeb8f3309345777d3ec06f1c32867c385352bb7a568cc1801c23f9e7"
+ "hash": "c14338c83613a887a46aec25ace964ad0fcb992f5461c9e5be988c60b07862d3"
}
diff --git a/.sqlx/query-2a71491350e271cdae98edcab6314abc10ffdf95660b452bb67c3c9ada3e98b1.json b/.sqlx/query-c90a782357d39d9eca4093d6f719a31fa32916d97538ce3efec86327d9bd20e3.json
similarity index 50%
rename from .sqlx/query-2a71491350e271cdae98edcab6314abc10ffdf95660b452bb67c3c9ada3e98b1.json
rename to .sqlx/query-c90a782357d39d9eca4093d6f719a31fa32916d97538ce3efec86327d9bd20e3.json
index cae974581e..b83877a448 100644
--- a/.sqlx/query-2a71491350e271cdae98edcab6314abc10ffdf95660b452bb67c3c9ada3e98b1.json
+++ b/.sqlx/query-c90a782357d39d9eca4093d6f719a31fa32916d97538ce3efec86327d9bd20e3.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id)\n VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2)\n ",
+ "query": "\n INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id, is_coding)\n VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2, true)\n ",
"describe": {
"columns": [],
"parameters": {
@@ -11,5 +11,5 @@
},
"nullable": []
},
- "hash": "2a71491350e271cdae98edcab6314abc10ffdf95660b452bb67c3c9ada3e98b1"
+ "hash": "c90a782357d39d9eca4093d6f719a31fa32916d97538ce3efec86327d9bd20e3"
}
diff --git a/Cargo.lock b/Cargo.lock
index c0eb7686bf..a0da8bd261 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5654,6 +5654,7 @@ dependencies = [
"hex",
"http-body-util",
"initiative",
+ "initiative_documents",
"jsonwebtoken 10.3.0",
"last_online_tracker",
"lazy_static",
@@ -5862,6 +5863,7 @@ dependencies = [
"lexical_client",
"macro_authorization",
"macro_aws_config",
+ "macro_db_client",
"macro_db_migrator",
"macro_entrypoint",
"macro_env_var",
@@ -5894,6 +5896,7 @@ dependencies = [
"sha2 0.10.9",
"share_permission_db_utils",
"sqlx",
+ "sqs_client",
"sync_service_client",
"system_skills",
"task_dedup",
@@ -9145,6 +9148,17 @@ dependencies = [
"workspace-hack",
]
+[[package]]
+name = "initiative_documents"
+version = "0.1.0"
+dependencies = [
+ "documents",
+ "initiative",
+ "rootcause",
+ "tracing",
+ "workspace-hack",
+]
+
[[package]]
name = "inout"
version = "0.1.4"
diff --git a/Cargo.toml b/Cargo.toml
index 81d2051d2d..79760c147e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -62,6 +62,7 @@ members = [
"crates/harnesses",
"crates/import",
"crates/initiative",
+ "crates/initiative_documents",
"crates/item_filter_index",
"crates/integration_tests/local_e2e",
"crates/loops_client",
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequest.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequest.ts
index 1919398c34..53430e8460 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequest.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequest.ts
@@ -19,6 +19,7 @@ edits happen in the document editor. */
memberIds?: CreateInitiativeRequestMemberIds;
/** Display name. */
name: string;
- /** When true, share with the owner's team at create time. */
+ /** Share with the owner's team at create time. Defaults to true; users without
+a team create an unshared initiative. Explicit false skips the team grant. */
shareWithTeam?: CreateInitiativeRequestShareWithTeam;
}
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequestShareWithTeam.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequestShareWithTeam.ts
index a1de3814ec..4100e2fa94 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequestShareWithTeam.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/createInitiativeRequestShareWithTeam.ts
@@ -6,6 +6,7 @@
*/
/**
- * When true, share with the owner's team at create time.
+ * Share with the owner's team at create time. Defaults to true; users without
+a team create an unshared initiative. Explicit false skips the team grant.
*/
export type CreateInitiativeRequestShareWithTeam = boolean | null;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequest.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequest.ts
index aba98c9208..13a4c2ae75 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequest.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequest.ts
@@ -13,7 +13,7 @@ import type { UpdateInitiativeRequestSharePermission } from './updateInitiativeR
present is a full replace. The description is edited in its document, not here.
*/
export interface UpdateInitiativeRequest {
- /** Full replacement member list when present. */
+ /** Full replacement collaborator list when present. Only the owner may send this field. */
memberIds?: UpdateInitiativeRequestMemberIds;
/** Replacement name. */
name?: UpdateInitiativeRequestName;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequestMemberIds.ts b/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequestMemberIds.ts
index 0c2fc3c900..2f1a7bb284 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequestMemberIds.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/schemas/updateInitiativeRequestMemberIds.ts
@@ -6,6 +6,6 @@
*/
/**
- * Full replacement member list when present.
+ * Full replacement collaborator list when present. Only the owner may send this field.
*/
export type UpdateInitiativeRequestMemberIds = string[] | null;
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
index 9729b7d925..8644e56ced 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
@@ -10401,7 +10401,9 @@ export const createInitiativeBody = zod
shareWithTeam: zod
.boolean()
.nullish()
- .describe("When true, share with the owner's team at create time."),
+ .describe(
+ "Share with the owner's team at create time. Defaults to true; users without\na team create an unshared initiative. Explicit false skips the team grant."
+ ),
})
.describe('Create-initiative HTTP body.');
@@ -10585,7 +10587,9 @@ export const updateInitiativeBody = zod
memberIds: zod
.array(zod.string())
.nullish()
- .describe('Full replacement member list when present.'),
+ .describe(
+ 'Full replacement collaborator list when present. Only the owner may send this field.'
+ ),
name: zod.string().nullish().describe('Replacement name.'),
sharePermission: zod
.union([
diff --git a/apps/web/src/lib/service-clients/service-storage/openapi.json b/apps/web/src/lib/service-clients/service-storage/openapi.json
index d9686ff15a..ef70322726 100644
--- a/apps/web/src/lib/service-clients/service-storage/openapi.json
+++ b/apps/web/src/lib/service-clients/service-storage/openapi.json
@@ -20715,7 +20715,7 @@
},
"shareWithTeam": {
"type": ["boolean", "null"],
- "description": "When true, share with the owner's team at create time."
+ "description": "Share with the owner's team at create time. Defaults to true; users without\na team create an unshared initiative. Explicit false skips the team grant."
}
}
},
@@ -32029,7 +32029,7 @@
"items": {
"type": "string"
},
- "description": "Full replacement member list when present."
+ "description": "Full replacement collaborator list when present. Only the owner may send this field."
},
"name": {
"type": ["string", "null"],
diff --git a/crates/documents/Cargo.toml b/crates/documents/Cargo.toml
index 804d2275e1..eefdc7598f 100644
--- a/crates/documents/Cargo.toml
+++ b/crates/documents/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/bin/backfill_markdown_content_location.rs"
required-features = ["backfill_binary"]
[features]
+purge = ["ports", "outbound", "dep:macro_db_client", "dep:sqs_client", "dep:comms_db_client"]
ai_tools = [
"dep:ai_toolset",
"dep:ai_usage",
@@ -80,6 +81,8 @@ schema = ["dep:utoipa", "macro_user_id/schema"]
service = ["dep:entity_access_management", "dep:foreign_entity", "ports"]
[dependencies]
+macro_db_client = { path = "../macro_db_client", optional = true }
+sqs_client = { path = "../sqs_client", optional = true }
activity = { path = "../activity", default-features = false }
bot_id = { path = "../bot_id" }
# Core
diff --git a/crates/documents/src/domain.rs b/crates/documents/src/domain.rs
index 5bbdde939a..4b3305b256 100644
--- a/crates/documents/src/domain.rs
+++ b/crates/documents/src/domain.rs
@@ -37,3 +37,6 @@ pub mod ports;
#[cfg(feature = "service")]
pub mod service;
+
+#[cfg(feature = "ports")]
+pub mod purge;
diff --git a/crates/documents/src/domain/purge.rs b/crates/documents/src/domain/purge.rs
new file mode 100644
index 0000000000..d534d26209
--- /dev/null
+++ b/crates/documents/src/domain/purge.rs
@@ -0,0 +1,79 @@
+//! Internal permanent cleanup for owned description documents and failed creations.
+
+use super::{
+ events::{DocumentMacroEvent, DocumentPurgedMetadata},
+ models::DocumentError,
+};
+use macro_event_broker::MacroEventBroker;
+use model_owner::Owner;
+use std::future::Future;
+
+/// Owning document cleanup; callers must obtain the ID from their own lifecycle state.
+pub trait DocumentPurgeService: Send + Sync + 'static {
+ /// Permanently delete document metadata and schedule removal of stored content.
+ fn purge(
+ &self,
+ document_id: uuid::Uuid,
+ ) -> impl Future<Output = Result<(), DocumentError>> + Send;
+}
+
+/// Permanent document persistence cleanup.
+pub trait DocumentPurgeRepository: Send + Sync + 'static {
+ /// Remove document metadata and return its owner captured before deletion.
+ fn purge_rows(
+ &self,
+ document_id: &str,
+ ) -> impl Future<Output = Result<Owner, DocumentError>> + Send;
+}
+
+/// Existing background content-deletion queue.
+pub trait DocumentPurgeQueue: Send + Sync + 'static {
+ /// Schedule content cleanup using the owner retained after metadata deletion.
+ fn enqueue(
+ &self,
+ document_id: String,
+ owner: Owner,
+ ) -> impl Future<Output = Result<(), DocumentError>> + Send;
+}
+
+/// Shared lifecycle orchestration for permanent document cleanup.
+pub struct DocumentPurger<R, Q, B> {
+ repository: R,
+ queue: Q,
+ broker: B,
+}
+
+impl<R, Q, B> DocumentPurger<R, Q, B> {
+ /// Compose persistence, cleanup delivery and the shared event broker.
+ pub fn new(repository: R, queue: Q, broker: B) -> Self {
+ Self {
+ repository,
+ queue,
+ broker,
+ }
+ }
+}
+
+impl<R: DocumentPurgeRepository, Q: DocumentPurgeQueue, B: MacroEventBroker + 'static>
+ DocumentPurgeService for DocumentPurger<R, Q, B>
+{
+ async fn purge(&self, document_id: uuid::Uuid) -> Result<(), DocumentError> {
+ let document_id = document_id.to_string();
+ let owner = self.repository.purge_rows(&document_id).await?;
+ // Both follow-ups must run even if content cleanup delivery is temporarily unavailable.
+ let cleanup = self.queue.enqueue(document_id.clone(), owner).await;
+ let event =
+ DocumentMacroEvent::purged(document_id.clone(), DocumentPurgedMetadata { document_id });
+ let publication = match self.broker.send_event(&event) {
+ Ok(delivery) => delivery
+ .await
+ .map_err(|error| DocumentError::Internal(error.into()))?
+ .map_err(|error| DocumentError::Internal(error.into())),
+ Err(error) => Err(DocumentError::Internal(error.into())),
+ };
+ cleanup.and(publication)
+ }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/crates/documents/src/domain/purge/test.rs b/crates/documents/src/domain/purge/test.rs
new file mode 100644
index 0000000000..4ea3fa287e
--- /dev/null
+++ b/crates/documents/src/domain/purge/test.rs
@@ -0,0 +1,180 @@
+use std::sync::{
+ Arc, Mutex,
+ atomic::{AtomicBool, Ordering},
+};
+
+use macro_event_broker::{EventBrokerError, MacroEvent, MacroEventBroker};
+use model_owner::Owner;
+use tokio::task::JoinHandle;
+use uuid::Uuid;
+
+use super::{DocumentPurgeQueue, DocumentPurgeRepository, DocumentPurgeService, DocumentPurger};
+use crate::domain::models::DocumentError;
+
+#[derive(Clone, Copy, Default)]
+enum BrokerFailure {
+ #[default]
+ None,
+ BeforeSpawn,
+ DuringDelivery,
+ Cancelled,
+}
+
+struct State {
+ steps: Mutex<Vec<(&'static str, String)>>,
+ owner: Mutex<Option<Owner>>,
+ fail_rows: AtomicBool,
+ fail_queue: AtomicBool,
+ broker_failure: BrokerFailure,
+}
+
+impl Default for State {
+ fn default() -> Self {
+ Self {
+ steps: Mutex::default(),
+ owner: Mutex::new(Some(
+ Owner::from_principal_str("macro|[email protected]").unwrap(),
+ )),
+ fail_rows: AtomicBool::default(),
+ fail_queue: AtomicBool::default(),
+ broker_failure: BrokerFailure::default(),
+ }
+ }
+}
+
+impl State {
+ fn record(&self, step: &'static str, id: &str) {
+ self.steps.lock().unwrap().push((step, id.to_owned()));
+ }
+
+ fn steps(&self) -> Vec<(&'static str, String)> {
+ self.steps.lock().unwrap().clone()
+ }
+}
+
+impl DocumentPurgeRepository for Arc<State> {
+ async fn purge_rows(&self, document_id: &str) -> Result<Owner, DocumentError> {
+ self.record("rows", document_id);
+ if self.fail_rows.load(Ordering::SeqCst) {
+ return Err(DocumentError::Internal(anyhow::anyhow!(
+ "row deletion failed"
+ )));
+ }
+ self.owner
+ .lock()
+ .unwrap()
+ .take()
+ .ok_or_else(|| DocumentError::Internal(anyhow::anyhow!("document already removed")))
+ }
+}
+
+impl DocumentPurgeQueue for Arc<State> {
+ async fn enqueue(&self, document_id: String, owner: Owner) -> Result<(), DocumentError> {
+ self.record("queue", &document_id);
+ assert!(self.owner.lock().unwrap().is_none());
+ assert_eq!(owner.principal_id(), "macro|[email protected]");
+ if self.fail_queue.load(Ordering::SeqCst) {
+ return Err(DocumentError::Internal(anyhow::anyhow!(
+ "queue unavailable"
+ )));
+ }
+ Ok(())
+ }
+}
+
+struct Broker(Arc<State>);
+
+impl MacroEventBroker for Broker {
+ fn send_event<E: MacroEvent + ?Sized>(
+ &self,
+ event: &E,
+ ) -> Result<JoinHandle<Result<(), EventBrokerError>>, EventBrokerError> {
+ self.0.record("broker", event.key());
+ // Every retry uses the same document identity for queue and event consumers.
+ let payload = serde_json::to_value(event.event())?;
+ assert_eq!(payload["event_type"], "document.purged");
+ assert_eq!(payload["metadata"]["document_id"], event.key());
+ match self.0.broker_failure {
+ BrokerFailure::BeforeSpawn => {
+ Err(EventBrokerError::Publish("broker unavailable".into()))
+ }
+ BrokerFailure::DuringDelivery => Ok(tokio::spawn(async {
+ Err(EventBrokerError::Publish("delivery failed".into()))
+ })),
+ BrokerFailure::Cancelled => {
+ let delivery = tokio::spawn(std::future::pending());
+ delivery.abort();
+ Ok(delivery)
+ }
+ BrokerFailure::None => Ok(tokio::spawn(async { Ok(()) })),
+ }
+ }
+}
+
+fn purger(state: &Arc<State>) -> DocumentPurger<Arc<State>, Arc<State>, Broker> {
+ DocumentPurger::new(state.clone(), state.clone(), Broker(state.clone()))
+}
+
+fn expected_steps(id: Uuid) -> Vec<(&'static str, String)> {
+ ["rows", "queue", "broker"]
+ .into_iter()
+ .map(|step| (step, id.to_string()))
+ .collect()
+}
+
+#[tokio::test]
+async fn row_failure_does_not_publish_a_deletion_or_remove_stored_content() {
+ let state = Arc::new(State {
+ fail_rows: AtomicBool::new(true),
+ ..State::default()
+ });
+ let id = Uuid::now_v7();
+ assert!(purger(&state).purge(id).await.is_err());
+ assert_eq!(state.steps(), vec![("rows", id.to_string())]);
+}
+
+#[tokio::test]
+async fn queue_failure_still_publishes_the_committed_deletion() {
+ let state = Arc::new(State {
+ fail_queue: AtomicBool::new(true),
+ ..State::default()
+ });
+ let id = Uuid::now_v7();
+ let service = purger(&state);
+ assert!(service.purge(id).await.is_err());
+ assert_eq!(state.steps(), expected_steps(id));
+ assert!(state.owner.lock().unwrap().is_none());
+}
+
+#[tokio::test]
+async fn broker_start_failure_preserves_the_content_cleanup_attempt() {
+ let state = Arc::new(State {
+ broker_failure: BrokerFailure::BeforeSpawn,
+ ..State::default()
+ });
+ let id = Uuid::now_v7();
+ assert!(purger(&state).purge(id).await.is_err());
+ assert_eq!(state.steps(), expected_steps(id));
+}
+
+#[tokio::test]
+async fn broker_delivery_failure_is_awaited_and_returned() {
+ let state = Arc::new(State {
+ broker_failure: BrokerFailure::DuringDelivery,
+ ..State::default()
+ });
+ let id = Uuid::now_v7();
+ assert!(purger(&state).purge(id).await.is_err());
+ assert_eq!(state.steps(), expected_steps(id));
+}
+
+#[tokio::test]
+async fn cancelled_broker_delivery_is_returned_after_content_cleanup() {
+ let state = Arc::new(State {
+ broker_failure: BrokerFailure::Cancelled,
+ ..State::default()
+ });
+ let id = Uuid::now_v7();
+ assert!(purger(&state).purge(id).await.is_err());
+ assert_eq!(state.steps(), expected_steps(id));
+}
diff --git a/crates/documents/src/outbound.rs b/crates/documents/src/outbound.rs
index 746295113d..549d423abd 100644
--- a/crates/documents/src/outbound.rs
+++ b/crates/documents/src/outbound.rs
@@ -25,3 +25,6 @@ pub mod s3_upload_url;
pub mod s3_utf8_object_reader;
#[cfg(feature = "outbound")]
pub mod sync_service_probe;
+
+#[cfg(feature = "purge")]
+pub mod document_purge;
diff --git a/crates/documents/src/outbound/document_purge.rs b/crates/documents/src/outbound/document_purge.rs
new file mode 100644
index 0000000000..aa393ca525
--- /dev/null
+++ b/crates/documents/src/outbound/document_purge.rs
@@ -0,0 +1,66 @@
+//! Adapters preserving the established permanent document cleanup behavior.
+
+use super::super::domain::{
+ models::DocumentError,
+ purge::{DocumentPurgeQueue, DocumentPurgeRepository},
+};
+use model_owner::Owner;
+use std::sync::Arc;
+
+/// Existing document deletion queries behind the owning document boundary.
+pub struct LegacyDocumentPurgeRepository {
+ pool: sqlx::PgPool,
+}
+
+impl LegacyDocumentPurgeRepository {
+ /// Compose from the application's database pool.
+ pub fn new(pool: sqlx::PgPool) -> Self {
+ Self { pool }
+ }
+}
+
+impl DocumentPurgeRepository for LegacyDocumentPurgeRepository {
+ async fn purge_rows(&self, document_id: &str) -> Result<Owner, DocumentError> {
+ let document =
+ macro_db_client::document::get_deleted_document_info(&self.pool, document_id)
+ .await
+ .map_err(|error| DocumentError::Internal(error.into()))?;
+ macro_db_client::document::delete_document(&self.pool, document_id)
+ .await
+ .map_err(DocumentError::Internal)?;
+ comms_db_client::entity_mentions::delete_entity_mentions_by_source(
+ &self.pool,
+ vec![document_id.to_owned()],
+ )
+ .await
+ .inspect_err(|error| {
+ tracing::error!(?error, %document_id, "unable to delete outgoing document mentions");
+ })
+ .ok();
+ Ok(document.owner)
+ }
+}
+
+/// Adapter for the application's existing document deletion queue.
+pub struct SqsDocumentPurgeQueue {
+ sqs: Arc<sqs_client::SQS>,
+}
+
+impl SqsDocumentPurgeQueue {
+ /// Compose from the application's configured queue client.
+ pub fn new(sqs: Arc<sqs_client::SQS>) -> Self {
+ Self { sqs }
+ }
+}
+
+impl DocumentPurgeQueue for SqsDocumentPurgeQueue {
+ async fn enqueue(&self, document_id: String, owner: Owner) -> Result<(), DocumentError> {
+ self.sqs
+ .enqueue_document_delete(&owner.principal_id(), &document_id)
+ .await
+ .map_err(DocumentError::Internal)
+ }
+}
+
+#[cfg(test)]
+mod test;
diff --git a/crates/documents/src/outbound/document_purge/test.rs b/crates/documents/src/outbound/document_purge/test.rs
new file mode 100644
index 0000000000..dc19d740ad
--- /dev/null
+++ b/crates/documents/src/outbound/document_purge/test.rs
@@ -0,0 +1,69 @@
+use std::sync::{Arc, Mutex};
+
+use macro_db_migrator::MACRO_DB_MIGRATIONS;
+use macro_event_broker::NoopMacroEventBroker;
+use model_owner::Owner;
+use sqlx::PgPool;
+use uuid::Uuid;
+
+use super::LegacyDocumentPurgeRepository;
+use crate::domain::{
+ models::DocumentError,
+ purge::{DocumentPurgeQueue, DocumentPurgeService, DocumentPurger},
+};
+
+struct CapturingQueue {
+ pool: PgPool,
+ documents: Mutex<Vec<(String, Owner)>>,
+}
+
+impl DocumentPurgeQueue for Arc<CapturingQueue> {
+ async fn enqueue(&self, document_id: String, owner: Owner) -> Result<(), DocumentError> {
+ // The worker can no longer resolve ownership from the database at this point.
+ let deleted =
+ macro_db_client::document::get_deleted_document_info(&self.pool, &document_id).await;
+ assert!(matches!(deleted, Err(sqlx::Error::RowNotFound)));
+ self.documents.lock().unwrap().push((document_id, owner));
+ Ok(())
+ }
+}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(
+ path = "../../../../entity_access/fixtures",
+ scripts("typed_owner_team")
+ )
+)]
+async fn queues_the_stored_owner_after_document_metadata_is_gone(pool: PgPool) {
+ let queue = Arc::new(CapturingQueue {
+ pool: pool.clone(),
+ documents: Mutex::default(),
+ });
+ let purger = DocumentPurger::new(
+ LegacyDocumentPurgeRepository::new(pool),
+ queue.clone(),
+ NoopMacroEventBroker,
+ );
+ let expected = [
+ (
+ "90000000-0000-0000-0000-000000000031",
+ ),
+ (
+ "90000000-0000-0000-0000-000000000033",
+ "90000000-0000-0000-0000-000000000011",
+ ),
+ (
+ "90000000-0000-0000-0000-000000000034",
+ "bot|90000000-0000-0000-0000-000000000021",
+ ),
+ ];
+ for (id, _) in expected {
+ purger.purge(Uuid::parse_str(id).unwrap()).await.unwrap();
+ }
+ assert_eq!(
+ *queue.documents.lock().unwrap(),
+ expected.map(|(id, owner)| (id.to_owned(), Owner::from_principal_str(owner).unwrap()))
+ );
+}
diff --git a/crates/harnesses/src/outbound/pg_harness_repo/tests.rs b/crates/harnesses/src/outbound/pg_harness_repo/tests.rs
index 8b0e465c22..def13e1cc8 100644
--- a/crates/harnesses/src/outbound/pg_harness_repo/tests.rs
+++ b/crates/harnesses/src/outbound/pg_harness_repo/tests.rs
@@ -345,8 +345,8 @@ async fn bound_agents_lists_only_live_agents_of_this_harness(pool: PgPool) {
.unwrap();
sqlx::query!(
r#"
- INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id)
- VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2)
+ INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id, is_coding)
+ VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2, true)
"#,
bot_id,
harness_id,
@@ -371,8 +371,8 @@ async fn bound_agents_lists_only_live_agents_of_this_harness(pool: PgPool) {
.unwrap();
sqlx::query!(
r#"
- INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope)
- VALUES ($1, 'prompt', 'in-memory', 'default', 'all')
+ INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, is_coding)
+ VALUES ($1, 'prompt', 'in-memory', 'default', 'all', false)
"#,
other_bot,
)
@@ -422,8 +422,8 @@ async fn sessions_list_only_this_harness_newest_first(pool: PgPool) {
.unwrap();
sqlx::query!(
r#"
- INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id)
- VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2)
+ INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, harness_id, is_coding)
+ VALUES ($1, 'prompt', 'macrod', 'default', 'all', $2, true)
"#,
bot_id,
harness_id,
@@ -472,8 +472,8 @@ async fn sessions_list_only_this_harness_newest_first(pool: PgPool) {
.unwrap();
sqlx::query!(
r#"
- INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope)
- VALUES ($1, 'prompt', 'in-memory', 'default', 'all')
+ INSERT INTO agent_configs (bot_id, instructions, harness, default_model, channel_scope, is_coding)
+ VALUES ($1, 'prompt', 'in-memory', 'default', 'all', false)
"#,
other_bot,
)
diff --git a/crates/initiative/src/domain/models.rs b/crates/initiative/src/domain/models.rs
index 1dbd4e7dfe..4eb1e5d85d 100644
--- a/crates/initiative/src/domain/models.rs
+++ b/crates/initiative/src/domain/models.rs
@@ -3,10 +3,13 @@
#[cfg(test)]
mod test;
+use std::collections::HashSet;
use std::fmt;
use std::str::FromStr;
use chrono::{DateTime, Utc};
+#[cfg(feature = "ports")]
+use entity_access::domain::models::{AccessError, EditAccessLevel, EntityAccessReceipt};
use macro_user_id::user_id::MacroUserIdStr;
use models_permissions::share_permission::access_level::AccessLevel;
use models_permissions::share_permission::team_share::{
@@ -180,7 +183,8 @@ pub struct CreateInitiativeRequest {
/// Optional member user ids. Invalid ids fail at the service boundary.
#[serde(skip_serializing_if = "Option::is_none")]
pub member_ids: Option<Vec<String>>,
- /// When true, share with the owner's team at create time.
+ /// Share with the owner's team at create time. Defaults to true; users without
+ /// a team create an unshared initiative. Explicit false skips the team grant.
#[serde(skip_serializing_if = "Option::is_none")]
pub share_with_team: Option<bool>,
}
@@ -194,7 +198,7 @@ pub struct UpdateInitiativeRequest {
/// Replacement name.
#[serde(skip_serializing_if = "Option::is_none")]
pub name: Option<String>,
- /// Full replacement member list when present.
+ /// Full replacement collaborator list when present. Only the owner may send this field.
#[serde(skip_serializing_if = "Option::is_none")]
pub member_ids: Option<Vec<String>>,
/// Share permission patch. Only the owner may send this field.
@@ -211,6 +215,34 @@ pub struct AssignTasksRequest {
pub task_ids: Vec<String>,
}
+/// A bounded, deduplicated task request, validated before looking up access receipts.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct TaskAssignmentBatch(Vec<String>);
+
+impl TaskAssignmentBatch {
+ /// Deduplicate in request order and enforce the assignment limit before access lookup.
+ pub fn try_new(task_ids: Vec<String>) -> Result<Self, InitiativeError> {
+ let mut seen = HashSet::new();
+ let mut unique = Vec::new();
+ for task_id in task_ids {
+ if seen.insert(task_id.clone()) {
+ if unique.len() == MAX_TASKS_PER_ASSIGN {
+ return Err(InitiativeError::BadRequest(format!(
+ "cannot assign more than {MAX_TASKS_PER_ASSIGN} tasks at once"
+ )));
+ }
+ unique.push(task_id);
+ }
+ }
+ Ok(Self(unique))
+ }
+
+ /// Consume the batch for receipt generation.
+ pub fn into_task_ids(self) -> Vec<String> {
+ self.0
+ }
+}
+
/// Per-task outcome of an assign call.
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[cfg_attr(feature = "inbound", derive(utoipa::ToSchema))]
@@ -257,13 +289,14 @@ pub struct InitiativeList {
pub initiatives: Vec<InitiativeSummary>,
}
-/// One task in an assign-tasks service call, after inbound access filtering.
-#[derive(Debug, Clone, PartialEq, Eq)]
+/// One task in an assign-tasks service call, retaining the verified edit capability.
+#[cfg(feature = "ports")]
+#[derive(Debug, Clone)]
pub enum TaskAssignment {
- /// Inbound confirmed the caller can assign this task.
- Candidate {
- /// Task id.
- task_id: String,
+ /// The caller can edit this document; persistence confirms its task subtype.
+ Authorized {
+ /// Verified capability for the task, retained through the domain boundary.
+ receipt: EntityAccessReceipt<EditAccessLevel>,
},
/// Inbound could not find this task.
NotFound {
@@ -277,13 +310,37 @@ pub enum TaskAssignment {
},
}
+#[cfg(feature = "ports")]
impl TaskAssignment {
+ /// Retain a verified task capability or classify the access failure for a partial batch.
+ pub fn from_access(
+ task_id: String,
+ result: Result<EntityAccessReceipt<EditAccessLevel>, AccessError>,
+ ) -> Result<Self, InitiativeError> {
+ match result {
+ Ok(receipt) if receipt.entity().entity_id == task_id => {
+ Ok(Self::Authorized { receipt })
+ }
+ Ok(_) => Err(InitiativeError::BadRequest(
+ "task receipt does not match the requested task".to_string(),
+ )),
+ Err(AccessError::Unauthorized | AccessError::UnauthorizedWithMessage(_)) => {
+ Ok(Self::SkippedNoPermission { task_id })
+ }
+ Err(AccessError::NotFound(_) | AccessError::BadRequest(_)) => {
+ Ok(Self::NotFound { task_id })
+ }
+ Err(error) => Err(InitiativeError::Internal(
+ rootcause::Report::new(error).into_dynamic(),
+ )),
+ }
+ }
+
/// Task id this assignment refers to.
pub fn task_id(&self) -> &str {
match self {
- Self::Candidate { task_id }
- | Self::NotFound { task_id }
- | Self::SkippedNoPermission { task_id } => task_id,
+ Self::Authorized { receipt } => &receipt.entity().entity_id,
+ Self::NotFound { task_id } | Self::SkippedNoPermission { task_id } => task_id,
}
}
}
@@ -371,3 +428,17 @@ impl From<rootcause::Report> for InitiativeError {
InitiativeError::Internal(report)
}
}
+
+#[cfg(feature = "ports")]
+impl From<AccessError> for InitiativeError {
+ fn from(error: AccessError) -> Self {
+ match error {
+ AccessError::Unauthorized | AccessError::UnauthorizedWithMessage(_) => {
+ Self::Unauthorized
+ }
+ AccessError::NotFound(_) => Self::NotFound,
+ AccessError::BadRequest(message) => Self::BadRequest(message.to_string()),
+ other => Self::Internal(rootcause::Report::new(other).into_dynamic()),
+ }
+ }
+}
diff --git a/crates/initiative/src/domain/models/test.rs b/crates/initiative/src/domain/models/test.rs
index 6f364a9218..dd60a50bd1 100644
--- a/crates/initiative/src/domain/models/test.rs
+++ b/crates/initiative/src/domain/models/test.rs
@@ -73,11 +73,15 @@ fn create_request_deserializes_camel_case() {
assert_eq!(request.share_with_team, Some(true));
}
+#[cfg(feature = "ports")]
#[test]
fn task_assignment_exposes_task_id() {
assert_eq!(
- TaskAssignment::Candidate {
- task_id: "t1".into()
+ TaskAssignment::Authorized {
+ receipt: EntityAccessReceipt::dangerously_assert_internal_user(
+ "t1",
+ entity_access::domain::models::EntityType::Document
+ )
}
.task_id(),
"t1"
@@ -97,3 +101,32 @@ fn task_assignment_exposes_task_id() {
"t3"
);
}
+
+#[test]
+fn assignment_batch_bounds_unique_ids_and_keeps_request_order() {
+ let batch =
+ TaskAssignmentBatch::try_new(vec!["b".into(), "a".into(), "b".into()]).expect("bounded");
+ assert_eq!(batch.into_task_ids(), ["b", "a"]);
+ assert!(TaskAssignmentBatch::try_new(vec!["same".into(); MAX_TASKS_PER_ASSIGN + 1]).is_ok());
+ assert!(matches!(
+ TaskAssignmentBatch::try_new(
+ (0..=MAX_TASKS_PER_ASSIGN)
+ .map(|i| format!("task-{i}"))
+ .collect()
+ ),
+ Err(InitiativeError::BadRequest(_))
+ ));
+}
+
+#[cfg(feature = "ports")]
+#[test]
+fn assignment_access_result_must_match_requested_task() {
+ let receipt = EntityAccessReceipt::dangerously_assert_internal_user(
+ "other",
+ entity_access::domain::models::EntityType::Document,
+ );
+ assert!(matches!(
+ TaskAssignment::from_access("requested".into(), Ok(receipt)),
+ Err(InitiativeError::BadRequest(_))
+ ));
+}
diff --git a/crates/initiative/src/domain/ports.rs b/crates/initiative/src/domain/ports.rs
index d5a085f235..f9c13ba292 100644
--- a/crates/initiative/src/domain/ports.rs
+++ b/crates/initiative/src/domain/ports.rs
@@ -100,6 +100,9 @@ pub trait InitiativeRepo: Send + Sync + 'static {
task_id: &str,
) -> impl Future<Output = Result<(), Self::Err>> + Send;
+ /// Clear any initiative association for a task. Already unassigned tasks succeed.
+ fn clear_task(&self, task_id: &str) -> impl Future<Output = Result<(), Self::Err>> + Send;
+
/// Delete the initiative and clean up its own rows in one transaction, returning the
/// description document id for the caller to purge afterwards.
fn delete(
@@ -142,18 +145,26 @@ pub trait InitiativeService: Send + Sync + 'static {
request: UpdateInitiativeRequest,
) -> impl Future<Output = Result<InitiativeDetail, InitiativeError>> + Send;
- /// Assign tasks the receipt already authorized for edit.
+ /// Assign or move tasks using destination and task edit capabilities for the same actor.
+ /// Source initiative edit access is deliberately not required.
fn assign_tasks(
&self,
receipt: EntityAccessReceipt<EditAccessLevel>,
assignments: Vec<TaskAssignment>,
) -> impl Future<Output = Result<AssignTasksResponse, InitiativeError>> + Send;
- /// Unassign one task the receipt already authorized for edit.
+ /// Unassign one task using both initiative and task edit capabilities for the same actor.
fn unassign_task(
&self,
receipt: EntityAccessReceipt<EditAccessLevel>,
- task_id: &str,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
+ ) -> impl Future<Output = Result<(), InitiativeError>> + Send;
+
+ /// Clear a task's initiative using task edit access alone, including after project access
+ /// is revoked. Already unassigned tasks succeed.
+ fn clear_task(
+ &self,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
) -> impl Future<Output = Result<(), InitiativeError>> + Send;
/// Delete the initiative the receipt already authorized as owner.
diff --git a/crates/initiative/src/domain/service.rs b/crates/initiative/src/domain/service.rs
index bede4866e5..ec8bcc9ca1 100644
--- a/crates/initiative/src/domain/service.rs
+++ b/crates/initiative/src/domain/service.rs
@@ -7,8 +7,8 @@ use std::collections::{HashMap, HashSet};
use std::str::FromStr;
use entity_access::domain::models::{
- AccessLevel, EditAccessLevel, EntityAccessReceipt, EntityPermission, EntityType,
- OwnerAccessLevel, ViewAccessLevel,
+ AccessLevel, EditAccessLevel, EntityAccessAuth, EntityAccessReceipt, EntityPermission,
+ EntityType, OwnerAccessLevel, ViewAccessLevel,
};
use macro_user_id::cowlike::CowLike;
use macro_user_id::user_id::MacroUserIdStr;
@@ -29,12 +29,18 @@ use crate::domain::ports::{InitiativeDescriptionDocuments, InitiativeRepo, Initi
/// Concrete initiative service backed by an [`InitiativeRepo`] and the description document
/// port.
-#[derive(Debug, Clone)]
+#[derive(Clone)]
pub struct InitiativeServiceImpl<R, D> {
repo: R,
description_documents: D,
}
+impl<R, D> std::fmt::Debug for InitiativeServiceImpl<R, D> {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ f.write_str("InitiativeServiceImpl")
+ }
+}
+
impl<R, D> InitiativeServiceImpl<R, D>
where
R: InitiativeRepo,
@@ -112,7 +118,7 @@ where
.await
.map_err(Into::into)?;
let share_permission = SharePermissionV2::new_initiative_share_permission(team_default);
- let team_share = if request.share_with_team == Some(true) {
+ let team_share = if request.share_with_team.unwrap_or(true) {
TeamShareCreation::Initiative
} else {
TeamShareCreation::Unshared
@@ -144,7 +150,11 @@ where
)
.await;
match created {
- Ok(detail) => Ok(detail),
+ Ok(mut detail) => {
+ detail.user_access_level = AccessLevel::Owner;
+
+ Ok(detail)
+ }
Err(error) => {
if let Err(purge_error) = self
.description_documents
@@ -181,11 +191,14 @@ where
receipt: EntityAccessReceipt<ViewAccessLevel>,
) -> Result<InitiativeDetail, InitiativeError> {
let id = initiative_id_from_receipt(&receipt)?;
- self.repo
+ let mut detail = self
+ .repo
.get_detail(id)
.await
.map_err(Into::into)?
- .ok_or(InitiativeError::NotFound)
+ .ok_or(InitiativeError::NotFound)?;
+ detail.user_access_level = receipt_access_level(&receipt)?;
+ Ok(detail)
}
#[tracing::instrument(err, skip_all)]
@@ -203,7 +216,9 @@ where
receipt: EntityAccessReceipt<EditAccessLevel>,
request: UpdateInitiativeRequest,
) -> Result<InitiativeDetail, InitiativeError> {
- if request.share_permission.is_some() && !receipt_is_owner(&receipt) {
+ if (request.share_permission.is_some() || request.member_ids.is_some())
+ && !receipt_is_owner(&receipt)
+ {
return Err(InitiativeError::Unauthorized);
}
@@ -236,7 +251,8 @@ where
None
};
- self.repo
+ let mut detail = self
+ .repo
.update(UpdateInitiativeRepoArgs {
id,
name,
@@ -246,7 +262,10 @@ where
team_share,
})
.await
- .map_err(Into::into)
+ .map_err(Into::into)?;
+
+ detail.user_access_level = receipt_access_level(&receipt)?;
+ Ok(detail)
}
#[tracing::instrument(err, skip_all)]
@@ -255,11 +274,7 @@ where
receipt: EntityAccessReceipt<EditAccessLevel>,
assignments: Vec<TaskAssignment>,
) -> Result<AssignTasksResponse, InitiativeError> {
- if receipt.entity().entity_type != EntityType::Initiative {
- return Err(InitiativeError::BadRequest(
- "assign_tasks requires an initiative access receipt".to_string(),
- ));
- }
+ let id = initiative_id_from_receipt(&receipt)?;
let assignments = dedupe_assignments(assignments);
if assignments.len() > MAX_TASKS_PER_ASSIGN {
@@ -268,18 +283,19 @@ where
)));
}
- let id = initiative_id_from_receipt(&receipt)?;
- let candidate_ids: Vec<String> = assignments
- .iter()
- .filter_map(|assignment| match assignment {
- TaskAssignment::Candidate { task_id } => Some(task_id.clone()),
- TaskAssignment::NotFound { .. } | TaskAssignment::SkippedNoPermission { .. } => {
- None
- }
- })
- .collect();
+ let mut candidate_ids = Vec::new();
+ for assignment in &assignments {
+ if let TaskAssignment::Authorized {
+ receipt: task_receipt,
+ } = assignment
+ {
+ validate_task_receipt(task_receipt)?;
+ require_same_actor(&receipt, task_receipt)?;
+ candidate_ids.push(task_receipt.entity().entity_id.clone());
+ }
+ }
- let repo_results = if candidate_ids.is_empty() {
+ let results = if candidate_ids.is_empty() {
Vec::new()
} else {
self.repo
@@ -289,7 +305,7 @@ where
};
Ok(AssignTasksResponse {
- results: merge_assign_results(&assignments, repo_results),
+ results: merge_assign_results(&assignments, results),
})
}
@@ -297,11 +313,25 @@ where
async fn unassign_task(
&self,
receipt: EntityAccessReceipt<EditAccessLevel>,
- task_id: &str,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
) -> Result<(), InitiativeError> {
let id = initiative_id_from_receipt(&receipt)?;
+ validate_task_receipt(&task_receipt)?;
+ require_same_actor(&receipt, &task_receipt)?;
self.repo
- .unassign_task(id, task_id)
+ .unassign_task(id, &task_receipt.entity().entity_id)
+ .await
+ .map_err(Into::into)
+ }
+
+ #[tracing::instrument(err, skip_all)]
+ async fn clear_task(
+ &self,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
+ ) -> Result<(), InitiativeError> {
+ validate_task_receipt(&task_receipt)?;
+ self.repo
+ .clear_task(&task_receipt.entity().entity_id)
.await
.map_err(Into::into)
}
@@ -353,13 +383,56 @@ fn receipt_is_owner<T: entity_access::domain::models::RequiredPermission>(
)
}
-fn initiative_id_from_receipt<T: entity_access::domain::models::RequiredPermission>(
+pub(super) fn initiative_id_from_receipt<T: entity_access::domain::models::RequiredPermission>(
receipt: &EntityAccessReceipt<T>,
) -> Result<InitiativeId, InitiativeError> {
+ if receipt.entity().entity_type != EntityType::Initiative {
+ return Err(InitiativeError::BadRequest(
+ "requires an initiative access receipt".to_string(),
+ ));
+ }
InitiativeId::from_str(&receipt.entity().entity_id)
.map_err(|_| InitiativeError::BadRequest("invalid initiative id".to_string()))
}
+fn receipt_access_level<T: entity_access::domain::models::RequiredPermission>(
+ receipt: &EntityAccessReceipt<T>,
+) -> Result<AccessLevel, InitiativeError> {
+ match receipt.entity_permission() {
+ EntityPermission::AccessLevel { access_level } => Ok(*access_level),
+ _ => Err(InitiativeError::Unauthorized),
+ }
+}
+
+fn validate_task_receipt(
+ receipt: &EntityAccessReceipt<EditAccessLevel>,
+) -> Result<(), InitiativeError> {
+ if receipt.entity().entity_type != EntityType::Document {
+ return Err(InitiativeError::BadRequest(
+ "requires a task document access receipt".to_string(),
+ ));
+ }
+ Ok(())
+}
+
+fn require_same_actor(
+ initiative: &EntityAccessReceipt<EditAccessLevel>,
+ task: &EntityAccessReceipt<EditAccessLevel>,
+) -> Result<(), InitiativeError> {
+ let same_actor = match (initiative.auth(), task.auth()) {
+ (EntityAccessAuth::Authenticated(left), EntityAccessAuth::Authenticated(right)) => {
+ left == right
+ }
+ (EntityAccessAuth::Bot(left), EntityAccessAuth::Bot(right)) => left == right,
+ (EntityAccessAuth::Internal, EntityAccessAuth::Internal) => true,
+ _ => false,
+ };
+ if !same_actor {
+ return Err(InitiativeError::Unauthorized);
+ }
+ Ok(())
+}
+
fn normalize_name(name: &str) -> Result<String, InitiativeError> {
let name = name.trim();
if name.is_empty() {
@@ -443,10 +516,10 @@ fn merge_assign_results(
assignments
.iter()
.map(|assignment| match assignment {
- TaskAssignment::Candidate { task_id } => AssignTasksResult {
- task_id: task_id.clone(),
+ TaskAssignment::Authorized { receipt } => AssignTasksResult {
+ task_id: receipt.entity().entity_id.clone(),
status: repo_by_id
- .get(task_id)
+ .get(&receipt.entity().entity_id)
.copied()
.unwrap_or(AssignTaskStatus::NotFound),
},
diff --git a/crates/initiative/src/domain/service/test.rs b/crates/initiative/src/domain/service/test.rs
index e0cbdccc80..0c207dee1b 100644
--- a/crates/initiative/src/domain/service/test.rs
+++ b/crates/initiative/src/domain/service/test.rs
@@ -1,4 +1,6 @@
use chrono::{TimeZone, Utc};
+
+mod access;
use entity_access::domain::models::{
AccessLevel, EditAccessLevel, Entity, EntityAccessReceipt, EntityPermission, EntityType,
OwnerAccessLevel, ViewAccessLevel,
@@ -83,6 +85,26 @@ fn receipt<T: entity_access::domain::models::RequiredPermission>(
.expect("permission satisfies the receipt")
}
+fn task_receipt(user_id: &str, task_id: &str) -> EntityAccessReceipt<EditAccessLevel> {
+ EntityAccessReceipt::try_new_authenticated_user(
+ user(user_id),
+ Entity {
+ entity_id: task_id.to_string(),
+ entity_type: EntityType::Document,
+ },
+ EntityPermission::AccessLevel {
+ access_level: AccessLevel::Edit,
+ },
+ )
+ .expect("task edit capability")
+}
+
+fn assignment(task_id: &str) -> TaskAssignment {
+ TaskAssignment::Authorized {
+ receipt: task_receipt(OWNER, task_id),
+ }
+}
+
fn edit_receipt() -> EntityAccessReceipt<EditAccessLevel> {
receipt(OWNER, EntityType::Initiative, AccessLevel::Edit)
}
@@ -376,7 +398,7 @@ async fn edit_receipt_cannot_change_share_permission() {
}
#[tokio::test]
-async fn edit_receipt_renames_and_replaces_members() {
+async fn owner_receipt_renames_and_replaces_members() {
let mut repo = MockInitiativeRepo::new();
repo.expect_get_detail()
.return_once(|_| Box::pin(async { Ok(Some(detail(vec![user(MEMBER)]))) }));
@@ -390,7 +412,7 @@ async fn edit_receipt_renames_and_replaces_members() {
let updated = service(repo)
.update(
- edit_receipt(),
+ owner_edit_receipt(),
UpdateInitiativeRequest {
name: Some("Renamed".into()),
member_ids: Some(vec![OTHER.into()]),
@@ -432,7 +454,7 @@ async fn update_rejects_bad_member_id() {
.return_once(|_| Box::pin(async { Ok(Some(detail(Vec::new()))) }));
let result = service(repo)
.update(
- edit_receipt(),
+ owner_edit_receipt(),
UpdateInitiativeRequest {
member_ids: Some(vec!["nope".into()]),
..Default::default()
@@ -498,12 +520,7 @@ async fn assign_rejects_non_initiative_receipts() {
let document_receipt: EntityAccessReceipt<EditAccessLevel> =
receipt(OWNER, EntityType::Document, AccessLevel::Edit);
let result = service(repo)
- .assign_tasks(
- document_receipt,
- vec![TaskAssignment::Candidate {
- task_id: "task-1".into(),
- }],
- )
+ .assign_tasks(document_receipt, vec![assignment("task-1")])
.await;
assert!(matches!(result, Err(InitiativeError::BadRequest(_))));
}
@@ -532,21 +549,15 @@ async fn assign_dedupes_enforces_cap_and_preserves_order() {
.assign_tasks(
edit_receipt(),
vec![
- TaskAssignment::Candidate {
- task_id: "t1".into(),
- },
+ assignment("t1"),
TaskAssignment::SkippedNoPermission {
task_id: "skip".into(),
},
- TaskAssignment::Candidate {
- task_id: "t1".into(),
- },
+ assignment("t1"),
TaskAssignment::NotFound {
task_id: "missing".into(),
},
- TaskAssignment::Candidate {
- task_id: "t2".into(),
- },
+ assignment("t2"),
],
)
.await
@@ -575,9 +586,7 @@ async fn assign_dedupes_enforces_cap_and_preserves_order() {
);
let over_cap: Vec<TaskAssignment> = (0..=MAX_TASKS_PER_ASSIGN)
- .map(|i| TaskAssignment::Candidate {
- task_id: format!("task-{i}"),
- })
+ .map(|i| assignment(&format!("task-{i}")))
.collect();
let capped = service(MockInitiativeRepo::new())
.assign_tasks(edit_receipt(), over_cap)
@@ -620,7 +629,7 @@ async fn get_list_and_unassign_call_the_repo() {
.expect("basic");
svc.get(view_receipt()).await.expect("detail");
svc.list(&user(OWNER)).await.expect("list");
- svc.unassign_task(edit_receipt(), "task-1")
+ svc.unassign_task(edit_receipt(), task_receipt(OWNER, "task-1"))
.await
.expect("unassign");
}
diff --git a/crates/initiative/src/domain/service/test/access.rs b/crates/initiative/src/domain/service/test/access.rs
new file mode 100644
index 0000000000..926c160d30
--- /dev/null
+++ b/crates/initiative/src/domain/service/test/access.rs
@@ -0,0 +1,188 @@
+use super::*;
+
+#[tokio::test]
+async fn create_defaults_to_team_sharing_and_preserves_explicit_opt_out() {
+ for (share_with_team, expected) in [
+ (None, TeamShareCreation::Initiative),
+ (Some(true), TeamShareCreation::Initiative),
+ (Some(false), TeamShareCreation::Unshared),
+ ] {
+ let mut repo = MockInitiativeRepo::new();
+ repo.expect_get_team_default_link_share()
+ .return_once(|_| Box::pin(async { Ok(None) }));
+ repo.expect_create()
+ .withf(move |_, _, intent| *intent == expected)
+ .return_once(|_, _, _| Box::pin(async { Ok(detail(Vec::new())) }));
+ let mut documents = MockInitiativeDescriptionDocuments::new();
+ documents
+ .expect_create()
+ .return_once(|_| Box::pin(async { Ok(description_document_id()) }));
+ let created = service_with_documents(repo, documents)
+ .create(
+ &user(OWNER),
+ CreateInitiativeRequest {
+ name: "Launch".into(),
+ share_with_team,
+ ..Default::default()
+ },
+ )
+ .await
+ .expect("created");
+ assert_eq!(created.user_access_level, AccessLevel::Owner);
+ }
+}
+
+#[tokio::test]
+async fn get_reports_verified_effective_access_instead_of_repository_placeholder() {
+ for level in [
+ AccessLevel::View,
+ AccessLevel::Comment,
+ AccessLevel::Edit,
+ AccessLevel::Owner,
+ ] {
+ let mut repo = MockInitiativeRepo::new();
+ repo.expect_get_detail()
+ .return_once(|_| Box::pin(async { Ok(Some(detail(Vec::new()))) }));
+ let response = service(repo)
+ .get(receipt(OWNER, EntityType::Initiative, level))
+ .await
+ .expect("read");
+ assert_eq!(response.user_access_level, level);
+ }
+}
+
+#[tokio::test]
+async fn update_reports_owner_access_instead_of_repository_placeholder() {
+ let mut repo = MockInitiativeRepo::new();
+ repo.expect_update()
+ .return_once(|_| Box::pin(async { Ok(detail(Vec::new())) }));
+ let response = service(repo)
+ .update(
+ owner_edit_receipt(),
+ UpdateInitiativeRequest {
+ name: Some("Renamed".into()),
+ ..Default::default()
+ },
+ )
+ .await
+ .expect("updated");
+ assert_eq!(response.user_access_level, AccessLevel::Owner);
+}
+
+#[tokio::test]
+async fn editors_cannot_replace_or_clear_collaborators_but_can_rename() {
+ for members in [vec![OTHER.to_string()], Vec::new()] {
+ let result = service(MockInitiativeRepo::new())
+ .update(
+ edit_receipt(),
+ UpdateInitiativeRequest {
+ member_ids: Some(members),
+ ..Default::default()
+ },
+ )
+ .await;
+ assert!(matches!(result, Err(InitiativeError::Unauthorized)));
+ }
+
+ let mut repo = MockInitiativeRepo::new();
+ repo.expect_update()
+ .withf(|args| {
+ args.name.as_deref() == Some("Renamed")
+ && args.member_ids_added.is_empty()
+ && args.member_ids_removed.is_empty()
+ })
+ .times(1)
+ .return_once(|_| Box::pin(async { Ok(detail(Vec::new())) }));
+ service(repo)
+ .update(
+ edit_receipt(),
+ UpdateInitiativeRequest {
+ name: Some("Renamed".into()),
+ ..Default::default()
+ },
+ )
+ .await
+ .expect("editors may rename the project");
+}
+
+#[tokio::test]
+async fn assignment_rejects_task_capability_for_another_principal() {
+ let result = service(MockInitiativeRepo::new())
+ .assign_tasks(
+ edit_receipt(),
+ vec![TaskAssignment::Authorized {
+ receipt: task_receipt(OTHER, "task-1"),
+ }],
+ )
+ .await;
+ assert!(matches!(result, Err(InitiativeError::Unauthorized)));
+}
+
+#[tokio::test]
+async fn assignment_rejects_non_document_task_capability() {
+ let result = service(MockInitiativeRepo::new())
+ .assign_tasks(
+ edit_receipt(),
+ vec![TaskAssignment::Authorized {
+ receipt: edit_receipt(),
+ }],
+ )
+ .await;
+ assert!(matches!(result, Err(InitiativeError::BadRequest(_))));
+}
+
+#[tokio::test]
+async fn removal_rejects_task_capability_for_another_principal() {
+ let result = service(MockInitiativeRepo::new())
+ .unassign_task(edit_receipt(), task_receipt(OTHER, "task-1"))
+ .await;
+ assert!(matches!(result, Err(InitiativeError::Unauthorized)));
+}
+
+#[tokio::test]
+async fn removal_requires_a_task_document_capability() {
+ let result = service(MockInitiativeRepo::new())
+ .unassign_task(edit_receipt(), edit_receipt())
+ .await;
+ assert!(matches!(result, Err(InitiativeError::BadRequest(_))));
+ let clear = service(MockInitiativeRepo::new())
+ .clear_task(edit_receipt())
+ .await;
+ assert!(matches!(clear, Err(InitiativeError::BadRequest(_))));
+}
+
+#[tokio::test]
+async fn task_side_clear_needs_no_source_initiative_receipt() {
+ let mut repo = MockInitiativeRepo::new();
+ repo.expect_clear_task()
+ .withf(|id| id == "task-1")
+ .times(1)
+ .return_once(|_| Box::pin(async { Ok(()) }));
+ service(repo)
+ .clear_task(task_receipt(OWNER, "task-1"))
+ .await
+ .expect("cleared");
+}
+
+#[tokio::test]
+async fn all_lifecycle_operations_validate_initiative_entity_type() {
+ let svc = service(MockInitiativeRepo::new());
+ assert!(matches!(
+ svc.get(receipt(OWNER, EntityType::Document, AccessLevel::View))
+ .await,
+ Err(InitiativeError::BadRequest(_))
+ ));
+ assert!(matches!(
+ svc.update(
+ receipt(OWNER, EntityType::Document, AccessLevel::Owner),
+ UpdateInitiativeRequest::default()
+ )
+ .await,
+ Err(InitiativeError::BadRequest(_))
+ ));
+ assert!(matches!(
+ svc.delete(receipt(OWNER, EntityType::Document, AccessLevel::Owner))
+ .await,
+ Err(InitiativeError::BadRequest(_))
+ ));
+}
diff --git a/crates/initiative/src/inbound/axum_router.rs b/crates/initiative/src/inbound/axum_router.rs
index f8e3ba4290..80a3863b6e 100644
--- a/crates/initiative/src/inbound/axum_router.rs
+++ b/crates/initiative/src/inbound/axum_router.rs
@@ -21,7 +21,7 @@ use axum::{
http::{Request, StatusCode},
middleware::{self, Next},
response::IntoResponse,
- routing::{self, put},
+ routing::{self},
};
use entity_access::domain::ports::EntityAccessService;
use macro_authorization::{MacroAuthorizationService, MacroAuthorizationState};
@@ -130,7 +130,7 @@ where
)
.route(
"/{initiative_id}/tasks",
- put(assign_initiative_tasks_handler::<S, Eas, Auth>),
+ routing::put(assign_initiative_tasks_handler::<S, Eas, Auth>),
)
.route(
"/{initiative_id}/tasks/{task_id}",
diff --git a/crates/initiative/src/inbound/axum_router/assign_tasks.rs b/crates/initiative/src/inbound/axum_router/assign_tasks.rs
index 96d16602a8..ca7748322d 100644
--- a/crates/initiative/src/inbound/axum_router/assign_tasks.rs
+++ b/crates/initiative/src/inbound/axum_router/assign_tasks.rs
@@ -1,9 +1,7 @@
//! Handler for assigning tasks to an initiative.
use axum::{Json, extract::State};
-use entity_access::domain::models::{
- AccessError, EditAccessLevel, EntityAccessReceipt, EntityType,
-};
+use entity_access::domain::models::{EditAccessLevel, EntityType};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::InitiativeAccessExtractor;
use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService, UserOrInternal};
@@ -11,7 +9,10 @@ use model_error_response::ErrorResponse;
use super::{InitiativeIdParams, InitiativeRouterState};
use crate::domain::{
- models::{AssignTasksRequest, AssignTasksResponse, InitiativeError, TaskAssignment},
+ models::{
+ AssignTasksRequest, AssignTasksResponse, InitiativeError, TaskAssignment,
+ TaskAssignmentBatch,
+ },
ports::InitiativeService,
};
@@ -51,8 +52,9 @@ where
.organization_id
.map(i64::from);
- let mut assignments = Vec::with_capacity(request.task_ids.len());
- for task_id in request.task_ids {
+ let task_ids = TaskAssignmentBatch::try_new(request.task_ids)?.into_task_ids();
+ let mut assignments = Vec::with_capacity(task_ids.len());
+ for task_id in task_ids {
let result = state
.entity_access_service
.generate_entity_access_receipt::<EditAccessLevel>(
@@ -62,7 +64,7 @@ where
EntityType::Document,
)
.await;
- assignments.push(task_assignment_from_access(task_id, result)?);
+ assignments.push(TaskAssignment::from_access(task_id, result)?);
}
let response = state
@@ -71,21 +73,3 @@ where
.await?;
Ok(Json(response))
}
-
-fn task_assignment_from_access(
- task_id: String,
- result: Result<EntityAccessReceipt<EditAccessLevel>, AccessError>,
-) -> Result<TaskAssignment, InitiativeError> {
- match result {
- Ok(_) => Ok(TaskAssignment::Candidate { task_id }),
- Err(AccessError::Unauthorized | AccessError::UnauthorizedWithMessage(_)) => {
- Ok(TaskAssignment::SkippedNoPermission { task_id })
- }
- Err(AccessError::NotFound(_) | AccessError::BadRequest(_)) => {
- Ok(TaskAssignment::NotFound { task_id })
- }
- Err(other) => Err(InitiativeError::Internal(
- rootcause::Report::new(other).into_dynamic(),
- )),
- }
-}
diff --git a/crates/initiative/src/inbound/axum_router/test.rs b/crates/initiative/src/inbound/axum_router/test.rs
index 0b990107b5..c0ca92dab6 100644
--- a/crates/initiative/src/inbound/axum_router/test.rs
+++ b/crates/initiative/src/inbound/axum_router/test.rs
@@ -1,4 +1,6 @@
use std::collections::HashMap;
+
+mod access;
use std::sync::{Arc, Mutex};
use axum::http::{StatusCode, header};
@@ -291,8 +293,9 @@ enum ServiceCall {
Create { name: String },
Get,
Update,
- Assign(Vec<TaskAssignment>),
+ Assign(Vec<AssignTasksResult>),
Unassign { task_id: String },
+ Clear { task_id: String },
Delete,
}
@@ -373,13 +376,12 @@ impl InitiativeService for FakeInitiativeService {
_receipt: EntityAccessReceipt<EditAccessLevel>,
assignments: Vec<TaskAssignment>,
) -> Result<AssignTasksResponse, InitiativeError> {
- self.record(ServiceCall::Assign(assignments.clone()));
- Ok(AssignTasksResponse {
+ let response = AssignTasksResponse {
results: assignments
.into_iter()
.map(|assignment| AssignTasksResult {
status: match &assignment {
- TaskAssignment::Candidate { .. } => AssignTaskStatus::Assigned,
+ TaskAssignment::Authorized { .. } => AssignTaskStatus::Assigned,
TaskAssignment::NotFound { .. } => AssignTaskStatus::NotFound,
TaskAssignment::SkippedNoPermission { .. } => {
AssignTaskStatus::SkippedNoPermission
@@ -388,16 +390,28 @@ impl InitiativeService for FakeInitiativeService {
task_id: assignment.task_id().to_string(),
})
.collect(),
- })
+ };
+ self.record(ServiceCall::Assign(response.results.clone()));
+ Ok(response)
}
async fn unassign_task(
&self,
_receipt: EntityAccessReceipt<EditAccessLevel>,
- task_id: &str,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
) -> Result<(), InitiativeError> {
self.record(ServiceCall::Unassign {
- task_id: task_id.to_string(),
+ task_id: task_receipt.entity().entity_id.clone(),
+ });
+ Ok(())
+ }
+
+ async fn clear_task(
+ &self,
+ task_receipt: EntityAccessReceipt<EditAccessLevel>,
+ ) -> Result<(), InitiativeError> {
+ self.record(ServiceCall::Clear {
+ task_id: task_receipt.entity().entity_id.clone(),
});
Ok(())
}
@@ -645,8 +659,9 @@ async fn assign_tasks_returns_200() {
);
assert_eq!(
service.calls(),
- vec![ServiceCall::Assign(vec![TaskAssignment::Candidate {
- task_id: TASK_OK.to_string()
+ vec![ServiceCall::Assign(vec![AssignTasksResult {
+ task_id: TASK_OK.to_string(),
+ status: AssignTaskStatus::Assigned,
}])]
);
}
diff --git a/crates/initiative/src/inbound/axum_router/test/access.rs b/crates/initiative/src/inbound/axum_router/test/access.rs
new file mode 100644
index 0000000000..107ea59e5c
--- /dev/null
+++ b/crates/initiative/src/inbound/axum_router/test/access.rs
@@ -0,0 +1,62 @@
+use super::*;
+
+#[tokio::test]
+async fn unassign_rejects_task_without_edit_access() {
+ let service = FakeInitiativeService::default();
+ let response = send(
+ build_router(
+ service.clone(),
+ FakeEntityAccessService::denying_document(TASK_DENIED, || AccessError::Unauthorized),
+ ),
+ authed(axum::http::Request::delete(format!(
+ "/{}/tasks/{TASK_DENIED}",
+ existing_id()
+ )))
+ .body(axum::body::Body::empty())
+ .expect("request"),
+ )
+ .await;
+ assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+ assert!(service.calls().is_empty());
+}
+
+#[tokio::test]
+async fn assign_rejects_oversized_batch_before_access_lookup() {
+ let task_ids: Vec<String> = (0..=crate::domain::models::MAX_TASKS_PER_ASSIGN)
+ .map(|i| format!("task-{i}"))
+ .collect();
+ let service = FakeInitiativeService::default();
+ let response = send(
+ build_router(
+ service.clone(),
+ FakeEntityAccessService::denying_document("task-0", || {
+ AccessError::internal("access must not run")
+ }),
+ ),
+ authed(axum::http::Request::put(format!(
+ "/{}/tasks",
+ existing_id()
+ )))
+ .header(header::CONTENT_TYPE, "application/json")
+ .body(json_body(serde_json::json!({"taskIds": task_ids})))
+ .expect("request"),
+ )
+ .await;
+ assert_eq!(response.status(), StatusCode::BAD_REQUEST);
+ assert!(service.calls().is_empty());
+}
+
+#[tokio::test]
+async fn assign_deduplicates_before_sending_capabilities_to_the_service() {
+ let response = send(
+ build_router(FakeInitiativeService::default(), FakeEntityAccessService::default()),
+ authed(axum::http::Request::put(format!("/{}/tasks", existing_id())))
+ .header(header::CONTENT_TYPE, "application/json")
+ .body(json_body(serde_json::json!({"taskIds": vec![TASK_OK; crate::domain::models::MAX_TASKS_PER_ASSIGN + 1]}))).expect("request"),
+ ).await;
+ assert_eq!(response.status(), StatusCode::OK);
+ assert_eq!(
+ read_json(response).await,
+ serde_json::json!({"results": [{"taskId": TASK_OK, "status": "assigned"}]})
+ );
+}
diff --git a/crates/initiative/src/inbound/axum_router/unassign_task.rs b/crates/initiative/src/inbound/axum_router/unassign_task.rs
index 5cbb1bd1de..a7adcda329 100644
--- a/crates/initiative/src/inbound/axum_router/unassign_task.rs
+++ b/crates/initiative/src/inbound/axum_router/unassign_task.rs
@@ -4,10 +4,10 @@ use axum::{
Json,
extract::{Path, State},
};
-use entity_access::domain::models::EditAccessLevel;
+use entity_access::domain::models::{EditAccessLevel, EntityType};
use entity_access::domain::ports::EntityAccessService;
use entity_access::inbound::axum_extractors::InitiativeAccessExtractor;
-use macro_authorization::MacroAuthorizationService;
+use macro_authorization::{MacroAuthorizationExtractor, MacroAuthorizationService, UserOrInternal};
use model_error_response::ErrorResponse;
use super::{GenericSuccessResponse, InitiativeRouterState, UnassignTaskParams};
@@ -32,6 +32,7 @@ use crate::domain::{models::InitiativeError, ports::InitiativeService};
pub async fn unassign_initiative_task_handler<S, Eas, Auth>(
State(state): State<InitiativeRouterState<S, Eas, Auth>>,
access: InitiativeAccessExtractor<EditAccessLevel, Eas, Auth>,
+ user: MacroAuthorizationExtractor<Auth, UserOrInternal>,
Path(UnassignTaskParams { task_id, .. }): Path<UnassignTaskParams>,
) -> Result<Json<GenericSuccessResponse>, InitiativeError>
where
@@ -39,9 +40,22 @@ where
Eas: EntityAccessService,
Auth: MacroAuthorizationService,
{
+ let task_receipt = state
+ .entity_access_service
+ .generate_entity_access_receipt::<EditAccessLevel>(
+ &user.authorization.user.macro_user_id,
+ user.authorization
+ .user
+ .user_context
+ .organization_id
+ .map(i64::from),
+ &task_id,
+ EntityType::Document,
+ )
+ .await?;
state
.service
- .unassign_task(access.entity_access_receipt, &task_id)
+ .unassign_task(access.entity_access_receipt, task_receipt)
.await?;
Ok(Json(GenericSuccessResponse { success: true }))
}
diff --git a/crates/initiative/src/outbound/pg_initiative_repo.rs b/crates/initiative/src/outbound/pg_initiative_repo.rs
index aede1ede29..ba4c2eae09 100644
--- a/crates/initiative/src/outbound/pg_initiative_repo.rs
+++ b/crates/initiative/src/outbound/pg_initiative_repo.rs
@@ -124,6 +124,11 @@ impl InitiativeRepo for PgInitiativeRepo {
tasks::unassign_task(&self.pool, id, task_id).await
}
+ #[tracing::instrument(err, skip(self))]
+ async fn clear_task(&self, task_id: &str) -> Result<(), Self::Err> {
+ tasks::clear_task(&self.pool, task_id).await
+ }
+
#[tracing::instrument(err, skip(self))]
async fn delete(&self, id: InitiativeId) -> Result<DescriptionDocumentId, Self::Err> {
create::delete(&self.pool, id).await
diff --git a/crates/initiative/src/outbound/pg_initiative_repo/tasks.rs b/crates/initiative/src/outbound/pg_initiative_repo/tasks.rs
index 74a2481f60..4a57f32c61 100644
--- a/crates/initiative/src/outbound/pg_initiative_repo/tasks.rs
+++ b/crates/initiative/src/outbound/pg_initiative_repo/tasks.rs
@@ -154,6 +154,28 @@ pub(super) async fn unassign_task(
Ok(())
}
+pub(super) async fn clear_task(pool: &PgPool, task_id: &str) -> Result<(), InitiativeError> {
+ sqlx::query_scalar!(
+ r#"
+ WITH removed AS (
+ DELETE FROM task_initiative
+ WHERE task_id = $1
+ RETURNING initiative_id
+ )
+ UPDATE initiative
+ SET updated_at = now()
+ WHERE id IN (SELECT initiative_id FROM removed)
+ RETURNING id
+ "#,
+ task_id,
+ )
+ .fetch_optional(pool)
+ .await
+ .map_err(AdapterError::Sqlx)
+ .map_err(map_sqlx)?;
+ Ok(())
+}
+
async fn lock_initiative(
tx: &mut Transaction<'_, Postgres>,
initiative_id: Uuid,
diff --git a/crates/initiative/src/outbound/pg_initiative_repo/test.rs b/crates/initiative/src/outbound/pg_initiative_repo/test.rs
index ee42642055..23ba76ec18 100644
--- a/crates/initiative/src/outbound/pg_initiative_repo/test.rs
+++ b/crates/initiative/src/outbound/pg_initiative_repo/test.rs
@@ -1,4 +1,6 @@
use entity_access_db_utils::AccessLevel;
+
+mod access;
use macro_db_migrator::MACRO_DB_MIGRATIONS;
use macro_user_id::cowlike::CowLike;
use macro_user_id::user_id::MacroUserIdStr;
@@ -520,20 +522,23 @@ async fn get_detail_reports_each_channel_grant_once(pool: PgPool) -> anyhow::Res
}
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
-async fn create_share_with_team_without_owner_team_is_bad_request(
+async fn create_share_with_team_without_owner_team_succeeds_unshared(
pool: PgPool,
) -> anyhow::Result<()> {
insert_user(&pool, OWNER).await?;
let repo = repo(pool.clone());
- let error = repo
+ let created = repo
.create(
create_args(&pool, OWNER, "Solo", &[]).await?,
share_off(),
TeamShareCreation::Initiative,
)
- .await
- .expect_err("teamless owner cannot share with team");
- assert!(matches!(error, InitiativeError::BadRequest(message) if message.contains("team")));
+ .await?;
+ let facts = repo.get_team_share_facts(created.id).await?;
+ assert_eq!(facts.initiative.current, None);
+ assert_eq!(facts.initiative.revision, 0);
+ assert_eq!(facts.description.current, None);
+ assert_eq!(facts.description.revision, 0);
Ok(())
}
diff --git a/crates/initiative/src/outbound/pg_initiative_repo/test/access.rs b/crates/initiative/src/outbound/pg_initiative_repo/test/access.rs
new file mode 100644
index 0000000000..de5b12a0e1
--- /dev/null
+++ b/crates/initiative/src/outbound/pg_initiative_repo/test/access.rs
@@ -0,0 +1,26 @@
+use super::*;
+
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn task_side_clear_is_idempotent_and_preserves_the_task(pool: PgPool) -> anyhow::Result<()> {
+ insert_user(&pool, OWNER).await?;
+ let task_id = Uuid::now_v7().to_string();
+ insert_document(&pool, &task_id, OWNER, true).await?;
+ let repo = repo(pool.clone());
+ let created = repo
+ .create(
+ create_args(&pool, OWNER, "Launch", &[]).await?,
+ share_off(),
+ TeamShareCreation::Unshared,
+ )
+ .await?;
+ repo.assign_tasks(created.id, vec![task_id.clone()]).await?;
+ repo.clear_task(&task_id).await?;
+ repo.clear_task(&task_id).await?;
+ let detail = repo.get_detail(created.id).await?.expect("project exists");
+ assert!(detail.task_ids.is_empty());
+ assert!(detail.updated_at > created.updated_at);
+ // Reassignment also proves that clearing preserved the task document/subtype.
+ let assigned = repo.assign_tasks(created.id, vec![task_id]).await?;
+ assert_eq!(assigned[0].status, AssignTaskStatus::Assigned);
+ Ok(())
+}
diff --git a/crates/initiative_documents/Cargo.toml b/crates/initiative_documents/Cargo.toml
new file mode 100644
index 0000000000..a04740b23f
--- /dev/null
+++ b/crates/initiative_documents/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "initiative_documents"
+version = "0.1.0"
+edition = "2024"
+publish = false
+
+[dependencies]
+documents_hex = { package = "documents", path = "../documents", default-features = false, features = ["document_create"] }
+initiative = { path = "../initiative", default-features = false, features = ["ports"] }
+rootcause = { workspace = true }
+tracing = { workspace = true }
+workspace-hack = { version = "0.1", path = "../workspace-hack" }
diff --git a/services/document_storage_service/src/outbound/initiative_description_documents.rs b/crates/initiative_documents/src/lib.rs
similarity index 69%
rename from services/document_storage_service/src/outbound/initiative_description_documents.rs
rename to crates/initiative_documents/src/lib.rs
index e4971ea833..234a581cf5 100644
--- a/services/document_storage_service/src/outbound/initiative_description_documents.rs
+++ b/crates/initiative_documents/src/lib.rs
@@ -1,7 +1,8 @@
//! Adapter that gives the initiative domain its description documents.
+#![deny(missing_docs)]
+
use std::str::FromStr;
-use std::sync::Arc;
use documents_hex::domain::create::{
DocumentCreator, MarkdownSubtype, NewDocumentMetadata, NewMarkdownTextDocument,
@@ -10,12 +11,9 @@ use documents_hex::domain::models::DocumentError;
use documents_hex::domain::ports::create::{DocumentBytesUploadPort, DocumentCreationService};
use documents_hex::domain::ports::markdown::MarkdownInitializationPort;
use documents_hex::domain::ports::mentions::DocumentMentionTrackingPort;
+use documents_hex::domain::purge::DocumentPurgeService;
use initiative::domain::models::{DescriptionDocumentId, InitiativeError, NewDescriptionDocument};
use initiative::domain::ports::InitiativeDescriptionDocuments;
-use macro_event_broker::MacroEventBroker;
-use sqlx::PgPool;
-
-use crate::service::document_event_publisher::publish_document_purged_event;
macro_rules! internal {
($error:expr) => {
@@ -23,40 +21,33 @@ macro_rules! internal {
};
}
-pub struct InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, B>
+/// Description document lifecycle composed from document-owned services.
+pub struct InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, P>
{
creator: DocumentCreator<Svc, MarkdownInit, BytesUpload, MentionTracker>,
- db: PgPool,
- sqs: Arc<sqs_client::SQS>,
- event_broker: B,
+ purger: P,
}
-impl<Svc, MarkdownInit, BytesUpload, MentionTracker, B>
- InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, B>
+impl<Svc, MarkdownInit, BytesUpload, MentionTracker, P>
+ InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, P>
{
+ /// Compose creation and permanent cleanup from owning document services.
pub fn new(
creator: DocumentCreator<Svc, MarkdownInit, BytesUpload, MentionTracker>,
- db: PgPool,
- sqs: Arc<sqs_client::SQS>,
- event_broker: B,
+ purger: P,
) -> Self {
- Self {
- creator,
- db,
- sqs,
- event_broker,
- }
+ Self { creator, purger }
}
}
-impl<Svc, MarkdownInit, BytesUpload, MentionTracker, B> InitiativeDescriptionDocuments
- for InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, B>
+impl<Svc, MarkdownInit, BytesUpload, MentionTracker, P> InitiativeDescriptionDocuments
+ for InitiativeDescriptionDocumentsAdapter<Svc, MarkdownInit, BytesUpload, MentionTracker, P>
where
Svc: DocumentCreationService + Send + Sync + 'static,
MarkdownInit: MarkdownInitializationPort + Send + Sync + 'static,
BytesUpload: DocumentBytesUploadPort + Send + Sync + 'static,
MentionTracker: DocumentMentionTrackingPort + Send + Sync + 'static,
- B: MacroEventBroker + Send + Sync + 'static,
+ P: DocumentPurgeService,
{
#[tracing::instrument(skip_all, err)]
async fn create(
@@ -96,25 +87,10 @@ where
#[tracing::instrument(skip(self), err)]
async fn purge(&self, id: DescriptionDocumentId) -> Result<(), InitiativeError> {
- let document_id = id.to_string();
- macro_db_client::document::delete_document(&self.db, &document_id)
- .await
- .map_err(|error| internal!(error))?;
- comms_db_client::entity_mentions::delete_entity_mentions_by_source(
- &self.db,
- vec![document_id.clone()],
- )
- .await
- .inspect_err(|error| {
- tracing::error!(error = ?error, %document_id, "unable to delete entity mentions")
- })
- .ok();
- self.sqs
- .bulk_enqueue_document_delete(vec![document_id.clone()])
+ self.purger
+ .purge(id.as_uuid())
.await
- .map_err(|error| internal!(error))?;
- publish_document_purged_event(&self.event_broker, &document_id)
- .map_err(|error| internal!(error))
+ .map_err(map_document_error)
}
}
diff --git a/crates/models_permissions/src/share_permission/team_share.rs b/crates/models_permissions/src/share_permission/team_share.rs
index 9d96e7ecfe..692f30d9c2 100644
--- a/crates/models_permissions/src/share_permission/team_share.rs
+++ b/crates/models_permissions/src/share_permission/team_share.rs
@@ -215,7 +215,7 @@ pub enum TeamShareCreation {
ExplicitTask,
/// A new call initializes View only if its creator currently belongs to a team.
Call,
- /// A new initiative initializes Edit; missing membership is an error.
+ /// A new initiative initializes Edit when its creator currently belongs to a team.
Initiative,
/// The description document of a new initiative. Resolves like `Initiative`.
InitiativeDescription,
@@ -237,10 +237,12 @@ impl TeamShareCreation {
team_id,
level: TeamShareLevel::View,
})),
- Self::Initiative | Self::InitiativeDescription => Ok(Some(TeamShareGrant {
- team_id: owner_team_id.ok_or(TeamSharePolicyError::MissingTeam)?,
- level: TeamShareLevel::Edit,
- })),
+ Self::Initiative | Self::InitiativeDescription => {
+ Ok(owner_team_id.map(|team_id| TeamShareGrant {
+ team_id,
+ level: TeamShareLevel::Edit,
+ }))
+ }
}
}
}
diff --git a/crates/models_permissions/src/share_permission/team_share/test.rs b/crates/models_permissions/src/share_permission/team_share/test.rs
index ad30672be5..a465ccd4d9 100644
--- a/crates/models_permissions/src/share_permission/team_share/test.rs
+++ b/crates/models_permissions/src/share_permission/team_share/test.rs
@@ -314,10 +314,7 @@ fn creation_contract_distinguishes_ordinary_task_call_and_initiative_defaults()
level: TeamShareLevel::Comment,
}))
);
- assert_eq!(
- TeamShareCreation::Initiative.resolve(None),
- Err(TeamSharePolicyError::MissingTeam)
- );
+ assert_eq!(TeamShareCreation::Initiative.resolve(None), Ok(None));
assert_eq!(
TeamShareCreation::Initiative.resolve(Some(team_id)),
Ok(Some(TeamShareGrant {
@@ -337,7 +334,7 @@ fn initiative_description_resolves_like_initiative() {
}
assert_eq!(
TeamShareCreation::InitiativeDescription.resolve(None),
- Err(TeamSharePolicyError::MissingTeam)
+ Ok(None)
);
}
diff --git a/packages/sdk/generated/storage/types.gen.ts b/packages/sdk/generated/storage/types.gen.ts
index 34b3410dd4..4760ee69b4 100644
--- a/packages/sdk/generated/storage/types.gen.ts
+++ b/packages/sdk/generated/storage/types.gen.ts
@@ -3667,7 +3667,8 @@ export type CreateInitiativeRequest = {
*/
name: string;
/**
- * When true, share with the owner's team at create time.
+ * Share with the owner's team at create time. Defaults to true; users without
+ * a team create an unshared initiative. Explicit false skips the team grant.
*/
shareWithTeam?: boolean | null;
};
@@ -10628,7 +10629,7 @@ export type UpdateCrmTeamSettingsRequest = {
*/
export type UpdateInitiativeRequest = {
/**
- * Full replacement member list when present.
+ * Full replacement collaborator list when present. Only the owner may send this field.
*/
memberIds?: Array<string> | null;
/**
diff --git a/packages/sdk/specs/storage.json b/packages/sdk/specs/storage.json
index d9686ff15a..ef70322726 100644
--- a/packages/sdk/specs/storage.json
+++ b/packages/sdk/specs/storage.json
@@ -20715,7 +20715,7 @@
},
"shareWithTeam": {
"type": ["boolean", "null"],
- "description": "When true, share with the owner's team at create time."
+ "description": "Share with the owner's team at create time. Defaults to true; users without\na team create an unshared initiative. Explicit false skips the team grant."
}
}
},
@@ -32029,7 +32029,7 @@
"items": {
"type": "string"
},
- "description": "Full replacement member list when present."
+ "description": "Full replacement collaborator list when present. Only the owner may send this field."
},
"name": {
"type": ["string", "null"],
diff --git a/services/document_storage_service/Cargo.toml b/services/document_storage_service/Cargo.toml
index af1552a74f..f706e26fea 100644
--- a/services/document_storage_service/Cargo.toml
+++ b/services/document_storage_service/Cargo.toml
@@ -29,6 +29,7 @@ location_check = []
[dependencies]
agent_changes = { path = "../../crates/agent_changes", default-features = false, features = ["outbound"] }
dictation = { path = "../../crates/dictation", features = ["inbound", "outbound"] }
+initiative_documents = { path = "../../crates/initiative_documents" }
agent_session = { path = "../../crates/agent_session", features = ["outbound"] }
activity = { path = "../../crates/activity" }
ai_tools = { path = "../../crates/ai_tools" }
@@ -92,7 +93,7 @@ channel_labels = { path = "../../crates/channel_labels", features = [
] }
crm = { path = "../../crates/crm" }
document_sub_type = { path = "../../crates/document_sub_type" }
-documents_hex = { path = "../../crates/documents", package = "documents" }
+documents_hex = { path = "../../crates/documents", package = "documents", features = ["purge"] }
doppler-config = { workspace = true }
dynamodb_client = { path = "../../crates/dynamodb_client" }
email = { path = "../../crates/email", features = ["outbound", "ports"] }
diff --git a/services/document_storage_service/src/api/context.rs b/services/document_storage_service/src/api/context.rs
index 19f0c235c9..c87f7a002b 100644
--- a/services/document_storage_service/src/api/context.rs
+++ b/services/document_storage_service/src/api/context.rs
@@ -498,12 +498,16 @@ pub(crate) type DssRemindersState =
RemindersRouterState<RemindersServiceType, EntityAccessService, AuthorizationService>;
pub(crate) type InitiativeDescriptionDocumentsType =
- crate::outbound::initiative_description_documents::InitiativeDescriptionDocumentsAdapter<
+ initiative_documents::InitiativeDescriptionDocumentsAdapter<
Arc<DocumentService>,
documents_hex::outbound::markdown_init::LexicalSyncMarkdownInitializer,
documents_hex::outbound::document_bytes_upload::ReqwestDocumentBytesUploader,
documents_hex::outbound::mention_tracker::LexicalCommsMentionTracker,
- DssEventBroker,
+ documents_hex::domain::purge::DocumentPurger<
+ documents_hex::outbound::document_purge::LegacyDocumentPurgeRepository,
+ documents_hex::outbound::document_purge::SqsDocumentPurgeQueue,
+ DssEventBroker,
+ >,
>;
/// Type alias for the initiative service.
diff --git a/services/document_storage_service/src/main.rs b/services/document_storage_service/src/main.rs
index 665a43951c..16509c5809 100644
--- a/services/document_storage_service/src/main.rs
+++ b/services/document_storage_service/src/main.rs
@@ -1211,11 +1211,17 @@ async fn run() -> anyhow::Result<()> {
);
let initiative_service = Arc::new(InitiativeServiceImpl::new(
PgInitiativeRepo::new(db.clone()),
- outbound::initiative_description_documents::InitiativeDescriptionDocumentsAdapter::new(
+ initiative_documents::InitiativeDescriptionDocumentsAdapter::new(
document_creator.clone(),
- db.clone(),
- sqs_client.clone(),
- macro_event_broker.clone(),
+ documents_hex::domain::purge::DocumentPurger::new(
+ documents_hex::outbound::document_purge::LegacyDocumentPurgeRepository::new(
+ db.clone(),
+ ),
+ documents_hex::outbound::document_purge::SqsDocumentPurgeQueue::new(
+ sqs_client.clone(),
+ ),
+ macro_event_broker.clone(),
+ ),
),
));
diff --git a/services/document_storage_service/src/outbound/mod.rs b/services/document_storage_service/src/outbound/mod.rs
index 3bb1c4c462..da4a69ca4f 100644
--- a/services/document_storage_service/src/outbound/mod.rs
+++ b/services/document_storage_service/src/outbound/mod.rs
@@ -1,4 +1,3 @@
//! Outbound adapters owned by document storage service composition.
pub mod entity_mutation;
-pub mod initiative_description_documents;