Preserve original chat execution admission and actor-scoped Stop intent

Author: mzxchandra

apps/sim/app/api/copilot/api-keys/validate/route.ts

@@ -391,7 +391,8 @@ export const POST = withRouteHandler((req: NextRequest) =>
             protocol !== COPILOT_BILLING_PROTOCOL.direct &&
             !localUnbilledCallback &&
             !workspaceId &&
-            !organizationId
+            !organizationId &&
+            !req.headers.has('x-mothership-execution-stream-id')
           ) {
             span.setAttribute(TraceAttr.CopilotValidateOutcome, CopilotValidateOutcome.InvalidBody)
             span.setAttribute(TraceAttr.HttpStatusCode, 400)
@@ -400,6 +401,7 @@ export const POST = withRouteHandler((req: NextRequest) =>
           /** Direct keys carry self-hosted scope IDs that do not name hosted Sim resources. */
           if (protocol !== COPILOT_BILLING_PROTOCOL.direct && !localUnbilledCallback) {
             await authorizeCopilotChatCallback({
+              executionStreamId: req.headers.get('x-mothership-execution-stream-id') ?? undefined,
               userId,
               workspaceId,
               organizationId,

apps/sim/app/api/files/uploads/purposes.ts

@@ -250,6 +250,11 @@ function requireSessionScope(value: string | null, label = 'scope'): string {
 
 async function principalUserId(principal: Principal, workspaceId?: string): Promise<string> {
   switch (principal.kind) {
+    case 'personal_chat_delegated':
+      throw new UploadSessionError(
+        'forbidden',
+        'Personal chat delegation cannot create workspace uploads'
+      )
     case 'resource_delegated':
       throw new UploadSessionError(
         'forbidden',

apps/sim/app/api/mothership/integrations/catalog/route.ts

@@ -13,7 +13,7 @@ import {
 
 export const POST = defineInternalJsonRoute({
   contract: readIntegrationCatalogContract,
-  auth: internalCopilotAuth(INTEGRATION_CATALOG_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(INTEGRATION_CATALOG_AUDIENCE, { organization: true, personal: true }),
   operation: readIntegrationCatalogOperation,
   rateLimit: internalRateLimits.none({
     reason: 'Private bounded catalog discovery rechecks current authorization on every request.',

apps/sim/app/api/mothership/memories/access/route.ts

@@ -13,7 +13,7 @@ import {
 
 export const POST = defineInternalJsonRoute({
   contract: resolveMemoryNotesAccessContract,
-  auth: internalCopilotAuth(MEMORY_NOTES_ACCESS_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(MEMORY_NOTES_ACCESS_AUDIENCE, { organization: true, personal: true }),
   operation: resolveMemoryNotesAccessOperation,
   rateLimit: internalRateLimits.none({
     reason:

apps/sim/app/api/mothership/memory/scope/route.ts

@@ -13,7 +13,7 @@ import {
 
 export const POST = defineInternalJsonRoute({
   contract: readMemoryScopeContract,
-  auth: internalCopilotAuth(MEMORY_SCOPE_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(MEMORY_SCOPE_AUDIENCE, { organization: true, personal: true }),
   operation: readMemoryScopeOperation,
   rateLimit: internalRateLimits.none({
     reason: 'Authenticated worker resolves its current private chat memory scope.',

apps/sim/app/api/mothership/runs/control/route.ts

@@ -13,7 +13,7 @@ import {
 
 export const POST = defineInternalJsonRoute({
   contract: readRunControlContract,
-  auth: internalCopilotAuth(RUN_CONTROL_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(RUN_CONTROL_AUDIENCE, { organization: true, personal: true }),
   operation: readRunControlOperation,
   rateLimit: internalRateLimits.none({
     reason: 'Worker reconciles durable cancellation for its own run.',

apps/sim/app/api/mothership/tasks/workflow-status/route.ts

@@ -11,7 +11,7 @@ import { readWatchedWorkflowStatus } from '@/lib/mothership/tasks/application/re
 
 export const POST = defineInternalJsonRoute({
   contract: workflowWatchStatusContract,
-  auth: internalCopilotAuth(TASK_DELEGATION_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(TASK_DELEGATION_AUDIENCE, { organization: true, personal: true }),
   operation: taskOperations.readWorkflowStatus,
   rateLimit: internalRateLimits.none({
     reason: 'Authenticated worker reconciles its bounded task inbox.',

apps/sim/app/api/mothership/workspaces/context/route.ts

@@ -13,7 +13,7 @@ import { WORKSPACE_TARGET_AUDIENCE } from '@/lib/mothership/chat/application/wor
 
 export const POST = defineInternalJsonRoute({
   contract: readWorkspaceContextContract,
-  auth: internalCopilotAuth(WORKSPACE_TARGET_AUDIENCE, { organization: true }),
+  auth: internalCopilotAuth(WORKSPACE_TARGET_AUDIENCE, { organization: true, personal: true }),
   operation: readWorkspaceContextOperation,
   rateLimit: internalRateLimits.none({
     reason:

apps/sim/lib/core/application/operation.ts

@@ -115,7 +115,12 @@ export function assertOperationOAuthPolicy(
  */
 export type PrincipalKind = Exclude<
   Principal['kind'],
-  'credential_group_enrollment' | 'system' | 'scim_connection' | 'slack_installation' | 'slack_app'
+  | 'credential_group_enrollment'
+  | 'system'
+  | 'scim_connection'
+  | 'slack_installation'
+  | 'slack_app'
+  | 'personal_chat_delegated'
 >
 
 /**

apps/sim/lib/core/application/workspace-authorization.ts

@@ -55,6 +55,7 @@ export function capabilityGovernedPrincipalUserId(principal: Principal): string
     case 'slack_installation':
     case 'slack_app':
       return null
+    case 'personal_chat_delegated':
     case 'resource_delegated':
     case 'organization_delegated':
       return principal.subjectUserId