Fixes

Author: Sg312

apps/sim/lib/copilot/orchestrator/tool-executor/index.ts

@@ -702,10 +702,6 @@ const SERVER_TOOLS = new Set<string>([
   'make_api_request',
   'knowledge_base',
   'user_table',
-  'run_workflow',
-  'run_workflow_until_block',
-  'run_block',
-  'run_from_block',
   'workspace_file',
   'get_execution_summary',
   'get_job_logs',

apps/sim/lib/copilot/orchestrator/tool-executor/integration-tools.ts

@@ -52,9 +52,9 @@ export async function executeIntegrationToolDirect(
   // has active credential_member access before proceeding. This prevents
   // unauthorized credential usage even if the agent hallucinated or received
   // a credential ID the user doesn't have access to.
-  const suppliedCredentialId = (executionParams.oauthCredential || executionParams.credential) as
-    | string
-    | undefined
+  const suppliedCredentialId = (executionParams.credentialId ||
+    executionParams.oauthCredential ||
+    executionParams.credential) as string | undefined
   if (suppliedCredentialId) {
     const actorCtx = await getCredentialActorContext(suppliedCredentialId, userId)
     if (!actorCtx.member) {
@@ -73,9 +73,10 @@ export async function executeIntegrationToolDirect(
   if (toolConfig.oauth?.required && toolConfig.oauth.provider) {
     const provider = toolConfig.oauth.provider
 
-    // If the user already supplied a credential ID that passed the check above,
-    // skip auto-resolution and let executeTool handle it via the token endpoint.
-    if (!suppliedCredentialId) {
+    // Determine which credential to use: supplied by the LLM or auto-resolved
+    let resolvedCredentialId = suppliedCredentialId
+
+    if (!resolvedCredentialId) {
       if (!workspaceId) {
         return {
           success: false,
@@ -93,37 +94,38 @@ export async function executeIntegrationToolDirect(
         }
       }
 
-      // Resolve the credential to its underlying account for token refresh
-      const matchCtx = await getCredentialActorContext(match.id, userId)
-      const accountId = matchCtx.credential?.accountId
-      if (!accountId) {
-        return {
-          success: false,
-          error: `OAuth account for ${provider} not found. Please reconnect your account.`,
-        }
+      resolvedCredentialId = match.id
+    }
+
+    const matchCtx = await getCredentialActorContext(resolvedCredentialId, userId)
+    const accountId = matchCtx.credential?.accountId
+    if (!accountId) {
+      return {
+        success: false,
+        error: `OAuth account for ${provider} not found. Please reconnect your account.`,
       }
+    }
 
-      const [acc] = await db.select().from(account).where(eq(account.id, accountId)).limit(1)
+    const [acc] = await db.select().from(account).where(eq(account.id, accountId)).limit(1)
 
-      if (!acc) {
-        return {
-          success: false,
-          error: `OAuth account for ${provider} not found. Please reconnect your account.`,
-        }
+    if (!acc) {
+      return {
+        success: false,
+        error: `OAuth account for ${provider} not found. Please reconnect your account.`,
       }
+    }
 
-      const requestId = generateRequestId()
-      const { accessToken } = await refreshTokenIfNeeded(requestId, acc, acc.id)
+    const requestId = generateRequestId()
+    const { accessToken } = await refreshTokenIfNeeded(requestId, acc, acc.id)
 
-      if (!accessToken) {
-        return {
-          success: false,
-          error: `OAuth token not available for ${provider}. Please reconnect your account.`,
-        }
+    if (!accessToken) {
+      return {
+        success: false,
+        error: `OAuth token not available for ${provider}. Please reconnect your account.`,
       }
-
-      executionParams.accessToken = accessToken
     }
+
+    executionParams.accessToken = accessToken
   }
 
   const hasHostedKeySupport = isHosted && !!toolConfig.hosting

apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/mutations.ts

@@ -105,7 +105,8 @@ export async function executeCreateWorkflow(
       return { success: false, error: 'Description must be 2000 characters or less' }
     }
 
-    const workspaceId = params?.workspaceId || (await getDefaultWorkspaceId(context.userId))
+    const workspaceId =
+      params?.workspaceId || context.workspaceId || (await getDefaultWorkspaceId(context.userId))
     const folderId = params?.folderId || null
 
     await ensureWorkspaceAccess(workspaceId, context.userId, true)
@@ -145,7 +146,8 @@ export async function executeCreateFolder(
       return { success: false, error: 'Folder name must be 200 characters or less' }
     }
 
-    const workspaceId = params?.workspaceId || (await getDefaultWorkspaceId(context.userId))
+    const workspaceId =
+      params?.workspaceId || context.workspaceId || (await getDefaultWorkspaceId(context.userId))
     const parentId = params?.parentId || null
 
     await ensureWorkspaceAccess(workspaceId, context.userId, true)
@@ -426,7 +428,8 @@ export async function executeGenerateApiKey(
       return { success: false, error: 'API key name must be 200 characters or less' }
     }
 
-    const workspaceId = params.workspaceId || (await getDefaultWorkspaceId(context.userId))
+    const workspaceId =
+      params.workspaceId || context.workspaceId || (await getDefaultWorkspaceId(context.userId))
     await ensureWorkspaceAccess(workspaceId, context.userId, true)
 
     const newKey = await createWorkspaceApiKey({

apps/sim/lib/copilot/orchestrator/tool-executor/workflow-tools/queries.ts

@@ -42,7 +42,9 @@ export async function executeListFolders(
 ): Promise<ToolCallResult> {
   try {
     const workspaceId =
-      (params?.workspaceId as string | undefined) || (await getDefaultWorkspaceId(context.userId))
+      (params?.workspaceId as string | undefined) ||
+      context.workspaceId ||
+      (await getDefaultWorkspaceId(context.userId))
 
     await ensureWorkspaceAccess(workspaceId, context.userId, false)
 

apps/sim/lib/copilot/tools/mcp/definitions.ts

@@ -171,130 +171,6 @@ export const DIRECT_TOOL_DEFS: DirectToolDef[] = [
     },
     annotations: { destructiveHint: false, idempotentHint: true },
   },
-  {
-    name: 'run_workflow',
-    toolId: 'run_workflow',
-    description:
-      'Run a workflow and return its output. Works on both draft and deployed states. By default runs the draft (live) state.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        workflowId: {
-          type: 'string',
-          description: 'REQUIRED. The workflow ID to run.',
-        },
-        workflow_input: {
-          type: 'object',
-          description:
-            'JSON object with input values. Keys should match the workflow start block input field names.',
-        },
-        useDeployedState: {
-          type: 'boolean',
-          description: 'When true, runs the deployed version instead of the draft. Default: false.',
-        },
-      },
-      required: ['workflowId'],
-    },
-    annotations: { destructiveHint: false, openWorldHint: true },
-  },
-  {
-    name: 'run_workflow_until_block',
-    toolId: 'run_workflow_until_block',
-    description:
-      'Run a workflow and stop after a specific block completes. Useful for testing partial execution or debugging specific blocks.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        workflowId: {
-          type: 'string',
-          description: 'REQUIRED. The workflow ID to run.',
-        },
-        stopAfterBlockId: {
-          type: 'string',
-          description:
-            'REQUIRED. The block ID to stop after. Execution halts once this block completes.',
-        },
-        workflow_input: {
-          type: 'object',
-          description: 'JSON object with input values for the workflow.',
-        },
-        useDeployedState: {
-          type: 'boolean',
-          description: 'When true, runs the deployed version instead of the draft. Default: false.',
-        },
-      },
-      required: ['workflowId', 'stopAfterBlockId'],
-    },
-    annotations: { destructiveHint: false, openWorldHint: true },
-  },
-  {
-    name: 'run_from_block',
-    toolId: 'run_from_block',
-    description:
-      'Run a workflow starting from a specific block, using cached outputs from a prior execution for upstream blocks. The workflow must have been run at least once first.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        workflowId: {
-          type: 'string',
-          description: 'REQUIRED. The workflow ID to run.',
-        },
-        startBlockId: {
-          type: 'string',
-          description: 'REQUIRED. The block ID to start execution from.',
-        },
-        executionId: {
-          type: 'string',
-          description:
-            'Optional. Specific execution ID to load the snapshot from. Uses latest if omitted.',
-        },
-        workflow_input: {
-          type: 'object',
-          description: 'Optional input values for the workflow.',
-        },
-        useDeployedState: {
-          type: 'boolean',
-          description: 'When true, runs the deployed version instead of the draft. Default: false.',
-        },
-      },
-      required: ['workflowId', 'startBlockId'],
-    },
-    annotations: { destructiveHint: false, openWorldHint: true },
-  },
-  {
-    name: 'run_block',
-    toolId: 'run_block',
-    description:
-      'Run a single block in isolation using cached outputs from a prior execution. Only the specified block executes — nothing upstream or downstream. The workflow must have been run at least once first.',
-    inputSchema: {
-      type: 'object',
-      properties: {
-        workflowId: {
-          type: 'string',
-          description: 'REQUIRED. The workflow ID.',
-        },
-        blockId: {
-          type: 'string',
-          description: 'REQUIRED. The block ID to run in isolation.',
-        },
-        executionId: {
-          type: 'string',
-          description:
-            'Optional. Specific execution ID to load the snapshot from. Uses latest if omitted.',
-        },
-        workflow_input: {
-          type: 'object',
-          description: 'Optional input values for the workflow.',
-        },
-        useDeployedState: {
-          type: 'boolean',
-          description: 'When true, runs the deployed version instead of the draft. Default: false.',
-        },
-      },
-      required: ['workflowId', 'blockId'],
-    },
-    annotations: { destructiveHint: false, openWorldHint: true },
-  },
   {
     name: 'get_deployed_workflow_state',
     toolId: 'get_deployed_workflow_state',

apps/sim/lib/copilot/vfs/serializers.ts

@@ -727,19 +727,29 @@ export function serializeIntegrationSchema(tool: ToolConfig): string {
         ? { required: tool.oauth.required, provider: tool.oauth.provider }
         : undefined,
       params: tool.params
-        ? Object.fromEntries(
-            Object.entries(tool.params)
-              .filter(([key, val]) => val != null && key !== hostedApiKeyParam)
-              .map(([key, val]) => [
-                key,
-                {
-                  type: val.type,
-                  required: val.required,
-                  description: val.description,
-                  default: val.default,
-                },
-              ])
-          )
+        ? {
+            ...Object.fromEntries(
+              Object.entries(tool.params)
+                .filter(([key, val]) => val != null && key !== hostedApiKeyParam)
+                .map(([key, val]) => [
+                  key,
+                  {
+                    type: val.type,
+                    required: val.required,
+                    description: val.description,
+                    default: val.default,
+                  },
+                ])
+            ),
+            ...(tool.oauth?.required && {
+              credentialId: {
+                type: 'string',
+                required: false,
+                description:
+                  'Optional credential ID to use when multiple accounts are connected for this provider. Get IDs from environment/credentials.json. If omitted, auto-selects the first available credential.',
+              },
+            }),
+          }
         : undefined,
       outputs: tool.outputs
         ? Object.fromEntries(

apps/sim/lib/workflows/utils.ts

@@ -346,7 +346,7 @@ export async function createWorkflowRecord(params: CreateWorkflowInput) {
     workspaceId,
     name,
     description = null,
-    color = '#3972F6',
+    color = '#7F2FFF',
     folderId = null,
   } = params
   const workflowId = crypto.randomUUID()

apps/sim/tools/params.ts

@@ -438,6 +438,14 @@ export function createUserToolSchema(toolConfig: ToolConfig): ToolSchema {
     }
   }
 
+  if (toolConfig.oauth?.required) {
+    schema.properties.credentialId = {
+      type: 'string',
+      description:
+        'Optional credential ID to use when multiple accounts are connected for this provider. Get IDs from environment/credentials.json. If omitted, auto-selects the first available credential.',
+    }
+  }
+
   return schema
 }