adjust perms

Author: icecrasher321

apps/sim/lib/copilot/request/tools/executor.test.ts

@@ -36,7 +36,7 @@ describe('pendingToolWaitBudgetMs', () => {
 })
 
 describe('buildToolExecutionContext', () => {
-  it('threads logical tool-call identity and server approval into the handler context', () => {
+  it('threads logical tool-call identity into the handler context', () => {
     const executionContext: ExecutionContext = {
       userId: 'user-1',
       workflowId: 'workflow-1',
@@ -48,28 +48,13 @@ describe('buildToolExecutionContext', () => {
         {
           id: 'call-1',
           parentToolCallId: 'parent-1',
-          userApproved: true,
         },
         executionContext
       )
     ).toMatchObject({
       runId: 'run-1',
       toolCallId: 'call-1',
       parentToolCallId: 'parent-1',
-      userApprovedToolCall: true,
-    })
-  })
-
-  it('does not inherit approval from the turn-scoped context', () => {
-    const executionContext: ExecutionContext = {
-      userId: 'user-1',
-      workflowId: 'workflow-1',
-      userApprovedToolCall: true,
-    }
-
-    expect(buildToolExecutionContext({ id: 'call-2' }, executionContext)).toMatchObject({
-      toolCallId: 'call-2',
-      userApprovedToolCall: false,
     })
   })
 })

apps/sim/lib/copilot/request/tools/executor.ts

@@ -257,13 +257,12 @@ class ToolExecutionTimeoutError extends Error {
 
 /** Builds the per-call context from the turn-scoped execution context. */
 export function buildToolExecutionContext(
-  toolCall: Pick<ToolCallState, 'id' | 'parentToolCallId' | 'userApproved'>,
+  toolCall: Pick<ToolCallState, 'id' | 'parentToolCallId'>,
   execContext: ExecutionContext
 ): ExecutionContext {
   return {
     ...execContext,
     toolCallId: toolCall.id,
-    userApprovedToolCall: toolCall.userApproved === true,
     ...(toolCall.parentToolCallId ? { parentToolCallId: toolCall.parentToolCallId } : {}),
   }
 }

apps/sim/lib/copilot/request/tools/permission.test.ts

@@ -95,13 +95,14 @@ describe('toolCallNeedsApproval', () => {
   })
 
   it.each(['deploy_api', 'deploy_chat', 'deploy_mcp'])(
-    'always gates a %s undeploy even when the tool was previously allowed',
+    'honors the saved permission for a %s undeploy',
     (toolName) => {
       const context = makeContext()
       context.toolPermissions.autoAllowed.add(toolName)
 
-      expect(toolCallNeedsApproval(toolName, context, {}, false, { action: 'undeploy' })).toBe(true)
-      expect(toolCallNeedsApproval(toolName, context, {}, false, { action: 'deploy' })).toBe(false)
+      expect(toolCallNeedsApproval(toolName, context, {}, false, { action: 'undeploy' })).toBe(
+        false
+      )
     }
   )
 
@@ -316,7 +317,6 @@ describe('runGatedToolExecution', () => {
     await gate(context, toolCall, execute, [])
 
     expect(execute).toHaveBeenCalledTimes(1)
-    expect(toolCall.userApproved).toBe(true)
     expect(context.toolPermissions.autoAllowed.has('terminal')).toBe(true)
   })
 

apps/sim/lib/copilot/request/tools/permission.ts

@@ -43,17 +43,6 @@ function terminalOperationNeedsApproval(args: Record<string, unknown> | undefine
   return args?.operation === 'run'
 }
 
-/** Destructive deployment calls always require approval for the exact call. */
-function callRequiresFreshApproval(
-  toolName: string,
-  args: Record<string, unknown> | undefined
-): boolean {
-  return (
-    (toolName === 'deploy_api' || toolName === 'deploy_chat' || toolName === 'deploy_mcp') &&
-    args?.action === 'undeploy'
-  )
-}
-
 /**
  * A human can take as long as they like to answer, so the wait is bounded only
  * by the overall orchestration budget rather than a per-tool watchdog.
@@ -100,9 +89,7 @@ export function toolCallNeedsApproval(
     }
   }
 
-  return (
-    callRequiresFreshApproval(toolName, args) || !context.toolPermissions.autoAllowed.has(toolName)
-  )
+  return !context.toolPermissions.autoAllowed.has(toolName)
 }
 
 function skipOutput(toolName: string) {
@@ -313,7 +300,6 @@ export function runGatedToolExecution(
         return { status: MothershipStreamV1ToolOutcome.success, message: output.message }
       }
 
-      toolCall.userApproved = true
       await emitApprovedCall(toolCallId, toolName, executor, args, options)
 
       const execution = execute()

apps/sim/lib/copilot/request/types.ts

@@ -43,8 +43,6 @@ export interface ToolCallState {
    * for main-lane tool calls.
    */
   parentToolCallId?: string
-  /** Set only after the server-side permission gate approves this exact call. */
-  userApproved?: boolean
 }
 
 export type ToolCallResult<T = unknown> = ToolExecutionResult & {

apps/sim/lib/copilot/tool-executor/types.ts

@@ -13,8 +13,6 @@ export interface ToolExecutionContext {
   runId?: string
   /** Stable identity of the individual tool call being executed. */
   toolCallId?: string
-  /** True only after the server-side permission gate approved this exact call. */
-  userApprovedToolCall?: boolean
   billingAttribution?: BillingAttributionSnapshot
   copilotToolExecution?: boolean
   requestMode?: string

apps/sim/lib/copilot/tools/handlers/deployment/context.test.ts

@@ -5,7 +5,6 @@ import { describe, expect, it } from 'vitest'
 import {
   getCopilotDeploymentIdempotencyKey,
   getHistoricalDeploymentAttemptError,
-  getUnapprovedUndeployError,
 } from '@/lib/copilot/tools/handlers/deployment/context'
 
 describe('getCopilotDeploymentIdempotencyKey', () => {
@@ -30,15 +29,6 @@ describe('getCopilotDeploymentIdempotencyKey', () => {
   })
 })
 
-describe('getUnapprovedUndeployError', () => {
-  it('fails closed unless the server approved this exact tool call', () => {
-    expect(getUnapprovedUndeployError({ userApprovedToolCall: false })).toContain(
-      'requires explicit approval'
-    )
-    expect(getUnapprovedUndeployError({ userApprovedToolCall: true })).toBeNull()
-  })
-})
-
 describe('getHistoricalDeploymentAttemptError', () => {
   it('requires a new tool call when the persisted attempt is no longer current', () => {
     expect(getHistoricalDeploymentAttemptError({ isCurrent: false }, 'redeploy')).toContain(

apps/sim/lib/copilot/tools/handlers/deployment/context.ts

@@ -25,14 +25,6 @@ export function getCopilotDeploymentIdempotencyKey(
     : `copilot:tool-call:${context.toolCallId}`
 }
 
-/** Returns the error used when an undeploy did not receive per-call user approval. */
-export function getUnapprovedUndeployError(
-  context: Pick<ToolExecutionContext, 'userApprovedToolCall'>
-): string | null {
-  if (context.userApprovedToolCall === true) return null
-  return 'Undeploy requires explicit approval for this exact interactive Copilot call. Never undeploy to recover a failed deploy or redeploy; a failed redeploy already leaves the prior live version active.'
-}
-
 /** Rejects a replay whose persisted operation no longer describes production. */
 export function getHistoricalDeploymentAttemptError(
   attempt: DeploymentAttemptCurrentState | null | undefined,

apps/sim/lib/copilot/tools/handlers/deployment/deploy.test.ts

@@ -1,26 +1,35 @@
 /**
  * @vitest-environment node
  */
+import { dbChainMockFns, resetDbChainMock } from '@sim/testing'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockEnsureWorkflowAccess, mockPerformFullDeploy, mockPerformFullUndeploy } = vi.hoisted(
-  () => ({
-    mockEnsureWorkflowAccess: vi.fn(),
-    mockPerformFullDeploy: vi.fn(),
-    mockPerformFullUndeploy: vi.fn(),
-  })
-)
+const {
+  mockCheckChatAccess,
+  mockEnsureWorkflowAccess,
+  mockPerformChatUndeploy,
+  mockPerformDeleteWorkflowMcpTool,
+  mockPerformFullDeploy,
+  mockPerformFullUndeploy,
+} = vi.hoisted(() => ({
+  mockCheckChatAccess: vi.fn(),
+  mockEnsureWorkflowAccess: vi.fn(),
+  mockPerformChatUndeploy: vi.fn(),
+  mockPerformDeleteWorkflowMcpTool: vi.fn(),
+  mockPerformFullDeploy: vi.fn(),
+  mockPerformFullUndeploy: vi.fn(),
+}))
 
 vi.mock('@/lib/workflows/orchestration', () => ({
   performChatDeploy: vi.fn(),
-  performChatUndeploy: vi.fn(),
+  performChatUndeploy: mockPerformChatUndeploy,
   performFullDeploy: mockPerformFullDeploy,
   performFullUndeploy: mockPerformFullUndeploy,
 }))
 
 vi.mock('@/lib/mcp/orchestration', () => ({
   performCreateWorkflowMcpTool: vi.fn(),
-  performDeleteWorkflowMcpTool: vi.fn(),
+  performDeleteWorkflowMcpTool: mockPerformDeleteWorkflowMcpTool,
   performUpdateWorkflowMcpTool: vi.fn(),
 }))
 
@@ -35,7 +44,7 @@ vi.mock('@/lib/mcp/workflow-tool-schema', () => ({
 }))
 
 vi.mock('@/app/api/chat/utils', () => ({
-  checkChatAccess: vi.fn(),
+  checkChatAccess: mockCheckChatAccess,
   checkWorkflowAccessForChatCreation: vi.fn(),
 }))
 
@@ -55,30 +64,16 @@ import {
   executeRedeploy,
 } from '@/lib/copilot/tools/handlers/deployment/deploy'
 
-describe('executeDeployApi', () => {
+describe('deployment handlers', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    resetDbChainMock()
     mockEnsureWorkflowAccess.mockResolvedValue({
       workflow: { id: 'workflow-1', workspaceId: 'workspace-1' },
     })
   })
 
-  it('refuses undeploy without approval for the exact tool call', async () => {
-    const result = await executeDeployApi(
-      { workflowId: 'workflow-1', action: 'undeploy' },
-      {
-        userId: 'user-1',
-        workflowId: 'workflow-1',
-        toolCallId: 'call-1',
-        userApprovedToolCall: false,
-      }
-    )
-
-    expect(result).toMatchObject({ success: false, error: expect.stringContaining('approval') })
-    expect(mockPerformFullUndeploy).not.toHaveBeenCalled()
-  })
-
-  it('allows an explicitly approved undeploy', async () => {
+  it('undeploys the API without approval context when permission gating is disabled', async () => {
     mockPerformFullUndeploy.mockResolvedValue({ success: true })
 
     const result = await executeDeployApi(
@@ -87,7 +82,6 @@ describe('executeDeployApi', () => {
         userId: 'user-1',
         workflowId: 'workflow-1',
         toolCallId: 'call-1',
-        userApprovedToolCall: true,
       }
     )
 
@@ -182,31 +176,62 @@ describe('executeDeployApi', () => {
     })
   })
 
-  it('refuses chat undeploy without exact-call approval', async () => {
+  it('undeploys chat without approval context when permission gating is disabled', async () => {
+    dbChainMockFns.limit.mockResolvedValueOnce([
+      {
+        id: 'chat-1',
+        identifier: 'production-helper',
+        title: 'Production Helper',
+        description: null,
+        authType: 'public',
+        allowedEmails: [],
+        outputConfigs: [],
+        includeThinking: false,
+        includeToolCalls: false,
+        customizations: null,
+      },
+    ])
+    mockCheckChatAccess.mockResolvedValue({ hasAccess: true, workspaceId: 'workspace-1' })
+    mockPerformChatUndeploy.mockResolvedValue({ success: true })
+
     const result = await executeDeployChat(
       { workflowId: 'workflow-1', action: 'undeploy' },
       {
         userId: 'user-1',
         workflowId: 'workflow-1',
         toolCallId: 'call-1',
-        userApprovedToolCall: false,
       }
     )
 
-    expect(result).toMatchObject({ success: false, error: expect.stringContaining('approval') })
+    expect(result.success).toBe(true)
+    expect(mockPerformChatUndeploy).toHaveBeenCalledWith({
+      chatId: 'chat-1',
+      userId: 'user-1',
+      workspaceId: 'workspace-1',
+    })
   })
 
-  it('refuses MCP undeploy without exact-call approval', async () => {
+  it('undeploys MCP without approval context when permission gating is disabled', async () => {
+    dbChainMockFns.limit
+      .mockResolvedValueOnce([{ id: 'server-1', name: 'Production MCP' }])
+      .mockResolvedValueOnce([{ id: 'tool-1' }])
+    mockPerformDeleteWorkflowMcpTool.mockResolvedValue({ success: true })
+
     const result = await executeDeployMcp(
       { workflowId: 'workflow-1', serverId: 'server-1', action: 'undeploy' },
       {
         userId: 'user-1',
         workflowId: 'workflow-1',
         toolCallId: 'call-1',
-        userApprovedToolCall: false,
       }
     )
 
-    expect(result).toMatchObject({ success: false, error: expect.stringContaining('approval') })
+    expect(result.success).toBe(true)
+    expect(mockPerformDeleteWorkflowMcpTool).toHaveBeenCalledWith({
+      serverId: 'server-1',
+      toolId: 'tool-1',
+      workspaceId: 'workspace-1',
+      userId: 'user-1',
+    })
   })
 })

apps/sim/lib/copilot/tools/handlers/deployment/deploy.ts

@@ -28,11 +28,7 @@ import {
 } from '@/ee/access-control/utils/permission-check'
 import { ensureWorkflowAccess } from '../access'
 import type { DeployApiParams, DeployChatParams, DeployMcpParams } from '../param-types'
-import {
-  getCopilotDeploymentIdempotencyKey,
-  getHistoricalDeploymentAttemptError,
-  getUnapprovedUndeployError,
-} from './context'
+import { getCopilotDeploymentIdempotencyKey, getHistoricalDeploymentAttemptError } from './context'
 
 function buildWorkflowApiEndpoint(baseUrl: string, workflowId: string): string {
   return `${baseUrl}/api/workflows/${workflowId}/execute`
@@ -140,9 +136,6 @@ export async function executeDeployApi(
     )
 
     if (action === 'undeploy') {
-      const approvalError = getUnapprovedUndeployError(context)
-      if (approvalError) return { success: false, error: approvalError }
-
       const result = await performFullUndeploy({ workflowId, userId: context.userId })
       if (!result.success) {
         return { success: false, error: result.error || 'Failed to undeploy workflow' }
@@ -263,9 +256,6 @@ export async function executeDeployChat(
 
     const action = params.action === 'undeploy' ? 'undeploy' : 'deploy'
     if (action === 'undeploy') {
-      const approvalError = getUnapprovedUndeployError(context)
-      if (approvalError) return { success: false, error: approvalError }
-
       const baseUrl = getBaseUrl()
       const apiEndpoint = buildWorkflowApiEndpoint(baseUrl, workflowId)
       const apiConfig = buildWorkflowApiConfig(baseUrl, apiEndpoint)
@@ -554,10 +544,6 @@ export async function executeDeployMcp(
     if (!workflowId) {
       return { success: false, error: 'workflowId is required' }
     }
-    if (params.action === 'undeploy') {
-      const approvalError = getUnapprovedUndeployError(context)
-      if (approvalError) return { success: false, error: approvalError }
-    }
 
     const { workflow: workflowRecord } = await ensureWorkflowAccess(
       workflowId,