From 4a1a84e08e3e60fae9e4e4c799fa82529d7fd2bd Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 9 Apr 2026 15:08:44 -0700
Subject: [PATCH 1/3] fix(tools): add Atlassian error extractor to all Jira,
 JSM, and Confluence tools

Wire up the existing `atlassian-errors` error extractor to all 95 Atlassian
tool configs so the executor surfaces meaningful error messages instead of
generic status codes. Also fix the extractor itself to handle all three
Atlassian error response formats: `errorMessage` (JSM), `errorMessages`
array (Jira), and `message` (Confluence).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 apps/sim/tools/confluence/add_label.ts            |  2 ++
 apps/sim/tools/confluence/create_blogpost.ts      |  2 ++
 apps/sim/tools/confluence/create_comment.ts       |  2 ++
 apps/sim/tools/confluence/create_page.ts          |  2 ++
 apps/sim/tools/confluence/create_page_property.ts |  2 ++
 apps/sim/tools/confluence/create_space.ts         |  2 ++
 .../sim/tools/confluence/create_space_property.ts |  2 ++
 apps/sim/tools/confluence/delete_attachment.ts    |  2 ++
 apps/sim/tools/confluence/delete_blogpost.ts      |  2 ++
 apps/sim/tools/confluence/delete_comment.ts       |  2 ++
 apps/sim/tools/confluence/delete_label.ts         |  2 ++
 apps/sim/tools/confluence/delete_page.ts          |  2 ++
 apps/sim/tools/confluence/delete_page_property.ts |  2 ++
 apps/sim/tools/confluence/delete_space.ts         |  2 ++
 .../sim/tools/confluence/delete_space_property.ts |  2 ++
 apps/sim/tools/confluence/get_blogpost.ts         |  2 ++
 apps/sim/tools/confluence/get_page_ancestors.ts   |  2 ++
 apps/sim/tools/confluence/get_page_children.ts    |  2 ++
 apps/sim/tools/confluence/get_page_descendants.ts |  2 ++
 apps/sim/tools/confluence/get_page_version.ts     |  2 ++
 apps/sim/tools/confluence/get_pages_by_label.ts   |  2 ++
 apps/sim/tools/confluence/get_space.ts            |  2 ++
 apps/sim/tools/confluence/get_task.ts             |  2 ++
 apps/sim/tools/confluence/get_user.ts             |  2 ++
 apps/sim/tools/confluence/list_attachments.ts     |  2 ++
 apps/sim/tools/confluence/list_blogposts.ts       |  2 ++
 .../tools/confluence/list_blogposts_in_space.ts   |  2 ++
 apps/sim/tools/confluence/list_comments.ts        |  2 ++
 apps/sim/tools/confluence/list_labels.ts          |  2 ++
 apps/sim/tools/confluence/list_page_properties.ts |  2 ++
 apps/sim/tools/confluence/list_page_versions.ts   |  2 ++
 apps/sim/tools/confluence/list_pages_in_space.ts  |  2 ++
 apps/sim/tools/confluence/list_space_labels.ts    |  2 ++
 .../tools/confluence/list_space_permissions.ts    |  2 ++
 .../sim/tools/confluence/list_space_properties.ts |  2 ++
 apps/sim/tools/confluence/list_spaces.ts          |  2 ++
 apps/sim/tools/confluence/list_tasks.ts           |  2 ++
 apps/sim/tools/confluence/retrieve.ts             |  2 ++
 apps/sim/tools/confluence/search.ts               |  2 ++
 apps/sim/tools/confluence/search_in_space.ts      |  2 ++
 apps/sim/tools/confluence/update.ts               |  2 ++
 apps/sim/tools/confluence/update_blogpost.ts      |  2 ++
 apps/sim/tools/confluence/update_comment.ts       |  2 ++
 apps/sim/tools/confluence/update_space.ts         |  2 ++
 apps/sim/tools/confluence/update_task.ts          |  2 ++
 apps/sim/tools/confluence/upload_attachment.ts    |  2 ++
 apps/sim/tools/error-extractors.ts                | 15 +++++++++++++--
 apps/sim/tools/jira/add_attachment.ts             |  2 ++
 apps/sim/tools/jira/add_comment.ts                |  2 ++
 apps/sim/tools/jira/add_watcher.ts                |  2 ++
 apps/sim/tools/jira/add_worklog.ts                |  2 ++
 apps/sim/tools/jira/assign_issue.ts               |  2 ++
 apps/sim/tools/jira/bulk_read.ts                  |  2 ++
 apps/sim/tools/jira/create_issue_link.ts          |  2 ++
 apps/sim/tools/jira/delete_attachment.ts          |  2 ++
 apps/sim/tools/jira/delete_comment.ts             |  2 ++
 apps/sim/tools/jira/delete_issue.ts               |  2 ++
 apps/sim/tools/jira/delete_issue_link.ts          |  2 ++
 apps/sim/tools/jira/delete_worklog.ts             |  2 ++
 apps/sim/tools/jira/get_attachments.ts            |  2 ++
 apps/sim/tools/jira/get_comments.ts               |  2 ++
 apps/sim/tools/jira/get_users.ts                  |  2 ++
 apps/sim/tools/jira/get_worklogs.ts               |  2 ++
 apps/sim/tools/jira/remove_watcher.ts             |  2 ++
 apps/sim/tools/jira/retrieve.ts                   |  2 ++
 apps/sim/tools/jira/search_issues.ts              |  2 ++
 apps/sim/tools/jira/search_users.ts               |  2 ++
 apps/sim/tools/jira/transition_issue.ts           |  2 ++
 apps/sim/tools/jira/update.ts                     |  2 ++
 apps/sim/tools/jira/update_comment.ts             |  2 ++
 apps/sim/tools/jira/update_worklog.ts             |  2 ++
 apps/sim/tools/jira/write.ts                      |  2 ++
 apps/sim/tools/jsm/add_comment.ts                 |  2 ++
 apps/sim/tools/jsm/add_customer.ts                |  2 ++
 apps/sim/tools/jsm/add_organization.ts            |  2 ++
 apps/sim/tools/jsm/add_participants.ts            |  2 ++
 apps/sim/tools/jsm/answer_approval.ts             |  2 ++
 apps/sim/tools/jsm/create_organization.ts         |  2 ++
 apps/sim/tools/jsm/create_request.ts              |  2 ++
 apps/sim/tools/jsm/get_approvals.ts               |  2 ++
 apps/sim/tools/jsm/get_comments.ts                |  2 ++
 apps/sim/tools/jsm/get_customers.ts               |  2 ++
 apps/sim/tools/jsm/get_form_structure.ts          |  2 ++
 apps/sim/tools/jsm/get_form_templates.ts          |  2 ++
 apps/sim/tools/jsm/get_issue_forms.ts             |  2 ++
 apps/sim/tools/jsm/get_organizations.ts           |  2 ++
 apps/sim/tools/jsm/get_participants.ts            |  2 ++
 apps/sim/tools/jsm/get_queues.ts                  |  2 ++
 apps/sim/tools/jsm/get_request.ts                 |  2 ++
 apps/sim/tools/jsm/get_request_type_fields.ts     |  2 ++
 apps/sim/tools/jsm/get_request_types.ts           |  2 ++
 apps/sim/tools/jsm/get_requests.ts                |  2 ++
 apps/sim/tools/jsm/get_service_desks.ts           |  2 ++
 apps/sim/tools/jsm/get_sla.ts                     |  2 ++
 apps/sim/tools/jsm/get_transitions.ts             |  2 ++
 apps/sim/tools/jsm/transition_request.ts          |  2 ++
 96 files changed, 203 insertions(+), 2 deletions(-)

diff --git a/apps/sim/tools/confluence/add_label.ts b/apps/sim/tools/confluence/add_label.ts
index db931b3cf0d..2ba111f529d 100644
--- a/apps/sim/tools/confluence/add_label.ts
+++ b/apps/sim/tools/confluence/add_label.ts
@@ -34,6 +34,8 @@ export const confluenceAddLabelTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_blogpost.ts b/apps/sim/tools/confluence/create_blogpost.ts
index b39e91b7f18..e67e0f0732b 100644
--- a/apps/sim/tools/confluence/create_blogpost.ts
+++ b/apps/sim/tools/confluence/create_blogpost.ts
@@ -44,6 +44,8 @@ export const confluenceCreateBlogPostTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_comment.ts b/apps/sim/tools/confluence/create_comment.ts
index aa18a5c4a0b..b09c6ddb54d 100644
--- a/apps/sim/tools/confluence/create_comment.ts
+++ b/apps/sim/tools/confluence/create_comment.ts
@@ -31,6 +31,8 @@ export const confluenceCreateCommentTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_page.ts b/apps/sim/tools/confluence/create_page.ts
index 7a4fec8a846..f4f70bc4afb 100644
--- a/apps/sim/tools/confluence/create_page.ts
+++ b/apps/sim/tools/confluence/create_page.ts
@@ -40,6 +40,8 @@ export const confluenceCreatePageTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_page_property.ts b/apps/sim/tools/confluence/create_page_property.ts
index 36ebfb04a06..99fbe246fdc 100644
--- a/apps/sim/tools/confluence/create_page_property.ts
+++ b/apps/sim/tools/confluence/create_page_property.ts
@@ -38,6 +38,8 @@ export const confluenceCreatePagePropertyTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_space.ts b/apps/sim/tools/confluence/create_space.ts
index f2d8b8a734a..4981c4adc25 100644
--- a/apps/sim/tools/confluence/create_space.ts
+++ b/apps/sim/tools/confluence/create_space.ts
@@ -39,6 +39,8 @@ export const confluenceCreateSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/create_space_property.ts b/apps/sim/tools/confluence/create_space_property.ts
index c702f63539a..e6fee973b82 100644
--- a/apps/sim/tools/confluence/create_space_property.ts
+++ b/apps/sim/tools/confluence/create_space_property.ts
@@ -35,6 +35,8 @@ export const confluenceCreateSpacePropertyTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_attachment.ts b/apps/sim/tools/confluence/delete_attachment.ts
index 37d2d093d80..38159ee4d6a 100644
--- a/apps/sim/tools/confluence/delete_attachment.ts
+++ b/apps/sim/tools/confluence/delete_attachment.ts
@@ -30,6 +30,8 @@ export const confluenceDeleteAttachmentTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_blogpost.ts b/apps/sim/tools/confluence/delete_blogpost.ts
index c53562cf283..6d03a3f60e1 100644
--- a/apps/sim/tools/confluence/delete_blogpost.ts
+++ b/apps/sim/tools/confluence/delete_blogpost.ts
@@ -31,6 +31,8 @@ export const confluenceDeleteBlogPostTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_comment.ts b/apps/sim/tools/confluence/delete_comment.ts
index 6564181dfe0..7cfb1694987 100644
--- a/apps/sim/tools/confluence/delete_comment.ts
+++ b/apps/sim/tools/confluence/delete_comment.ts
@@ -30,6 +30,8 @@ export const confluenceDeleteCommentTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_label.ts b/apps/sim/tools/confluence/delete_label.ts
index 2f92766fc67..182dd066340 100644
--- a/apps/sim/tools/confluence/delete_label.ts
+++ b/apps/sim/tools/confluence/delete_label.ts
@@ -33,6 +33,8 @@ export const confluenceDeleteLabelTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_page.ts b/apps/sim/tools/confluence/delete_page.ts
index a648a2b37c5..bc7be2b8932 100644
--- a/apps/sim/tools/confluence/delete_page.ts
+++ b/apps/sim/tools/confluence/delete_page.ts
@@ -32,6 +32,8 @@ export const confluenceDeletePageTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_page_property.ts b/apps/sim/tools/confluence/delete_page_property.ts
index d7b6c5fbb49..0bd4d04911b 100644
--- a/apps/sim/tools/confluence/delete_page_property.ts
+++ b/apps/sim/tools/confluence/delete_page_property.ts
@@ -33,6 +33,8 @@ export const confluenceDeletePagePropertyTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_space.ts b/apps/sim/tools/confluence/delete_space.ts
index 82442c66ad5..c9fa5cb315e 100644
--- a/apps/sim/tools/confluence/delete_space.ts
+++ b/apps/sim/tools/confluence/delete_space.ts
@@ -31,6 +31,8 @@ export const confluenceDeleteSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/delete_space_property.ts b/apps/sim/tools/confluence/delete_space_property.ts
index 9c69431aac4..0f2a29dfdd4 100644
--- a/apps/sim/tools/confluence/delete_space_property.ts
+++ b/apps/sim/tools/confluence/delete_space_property.ts
@@ -33,6 +33,8 @@ export const confluenceDeleteSpacePropertyTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_blogpost.ts b/apps/sim/tools/confluence/get_blogpost.ts
index 94c9b02de7c..c61d4894117 100644
--- a/apps/sim/tools/confluence/get_blogpost.ts
+++ b/apps/sim/tools/confluence/get_blogpost.ts
@@ -49,6 +49,8 @@ export const confluenceGetBlogPostTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_page_ancestors.ts b/apps/sim/tools/confluence/get_page_ancestors.ts
index 20b7be3ca2c..2e3ea9714e2 100644
--- a/apps/sim/tools/confluence/get_page_ancestors.ts
+++ b/apps/sim/tools/confluence/get_page_ancestors.ts
@@ -39,6 +39,8 @@ export const confluenceGetPageAncestorsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_page_children.ts b/apps/sim/tools/confluence/get_page_children.ts
index 7ca7ca10eda..a7691245ea6 100644
--- a/apps/sim/tools/confluence/get_page_children.ts
+++ b/apps/sim/tools/confluence/get_page_children.ts
@@ -42,6 +42,8 @@ export const confluenceGetPageChildrenTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_page_descendants.ts b/apps/sim/tools/confluence/get_page_descendants.ts
index a9e0bc5a323..9fdb8213331 100644
--- a/apps/sim/tools/confluence/get_page_descendants.ts
+++ b/apps/sim/tools/confluence/get_page_descendants.ts
@@ -43,6 +43,8 @@ export const confluenceGetPageDescendantsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_page_version.ts b/apps/sim/tools/confluence/get_page_version.ts
index dc496b38a24..a67b709295c 100644
--- a/apps/sim/tools/confluence/get_page_version.ts
+++ b/apps/sim/tools/confluence/get_page_version.ts
@@ -54,6 +54,8 @@ export const confluenceGetPageVersionTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_pages_by_label.ts b/apps/sim/tools/confluence/get_pages_by_label.ts
index af67210a0b0..0220341ed16 100644
--- a/apps/sim/tools/confluence/get_pages_by_label.ts
+++ b/apps/sim/tools/confluence/get_pages_by_label.ts
@@ -47,6 +47,8 @@ export const confluenceGetPagesByLabelTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_space.ts b/apps/sim/tools/confluence/get_space.ts
index fbadd7a6575..178ec6e21f1 100644
--- a/apps/sim/tools/confluence/get_space.ts
+++ b/apps/sim/tools/confluence/get_space.ts
@@ -42,6 +42,8 @@ export const confluenceGetSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/get_task.ts b/apps/sim/tools/confluence/get_task.ts
index cf0b6177654..21c2c5c4284 100644
--- a/apps/sim/tools/confluence/get_task.ts
+++ b/apps/sim/tools/confluence/get_task.ts
@@ -41,6 +41,8 @@ export const confluenceGetTaskTool: ToolConfig<ConfluenceGetTaskParams, Confluen
       provider: 'confluence',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/confluence/get_user.ts b/apps/sim/tools/confluence/get_user.ts
index 23048361356..49c4c29e945 100644
--- a/apps/sim/tools/confluence/get_user.ts
+++ b/apps/sim/tools/confluence/get_user.ts
@@ -33,6 +33,8 @@ export const confluenceGetUserTool: ToolConfig<ConfluenceGetUserParams, Confluen
       provider: 'confluence',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/confluence/list_attachments.ts b/apps/sim/tools/confluence/list_attachments.ts
index 932aa9b6876..ef6f1809491 100644
--- a/apps/sim/tools/confluence/list_attachments.ts
+++ b/apps/sim/tools/confluence/list_attachments.ts
@@ -39,6 +39,8 @@ export const confluenceListAttachmentsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_blogposts.ts b/apps/sim/tools/confluence/list_blogposts.ts
index a6b78e2b5e4..83c687f30e0 100644
--- a/apps/sim/tools/confluence/list_blogposts.ts
+++ b/apps/sim/tools/confluence/list_blogposts.ts
@@ -47,6 +47,8 @@ export const confluenceListBlogPostsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_blogposts_in_space.ts b/apps/sim/tools/confluence/list_blogposts_in_space.ts
index d32fcd9f4da..f6e68269a39 100644
--- a/apps/sim/tools/confluence/list_blogposts_in_space.ts
+++ b/apps/sim/tools/confluence/list_blogposts_in_space.ts
@@ -55,6 +55,8 @@ export const confluenceListBlogPostsInSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_comments.ts b/apps/sim/tools/confluence/list_comments.ts
index d841dd6607c..9f180faf9db 100644
--- a/apps/sim/tools/confluence/list_comments.ts
+++ b/apps/sim/tools/confluence/list_comments.ts
@@ -39,6 +39,8 @@ export const confluenceListCommentsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_labels.ts b/apps/sim/tools/confluence/list_labels.ts
index c28bac10bcf..76f0da748bf 100644
--- a/apps/sim/tools/confluence/list_labels.ts
+++ b/apps/sim/tools/confluence/list_labels.ts
@@ -37,6 +37,8 @@ export const confluenceListLabelsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_page_properties.ts b/apps/sim/tools/confluence/list_page_properties.ts
index cd26739c44c..02e11cf91ff 100644
--- a/apps/sim/tools/confluence/list_page_properties.ts
+++ b/apps/sim/tools/confluence/list_page_properties.ts
@@ -43,6 +43,8 @@ export const confluenceListPagePropertiesTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_page_versions.ts b/apps/sim/tools/confluence/list_page_versions.ts
index 8e97f9fdec1..c5711896c01 100644
--- a/apps/sim/tools/confluence/list_page_versions.ts
+++ b/apps/sim/tools/confluence/list_page_versions.ts
@@ -40,6 +40,8 @@ export const confluenceListPageVersionsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_pages_in_space.ts b/apps/sim/tools/confluence/list_pages_in_space.ts
index 558a8c50e39..65d99f86bea 100644
--- a/apps/sim/tools/confluence/list_pages_in_space.ts
+++ b/apps/sim/tools/confluence/list_pages_in_space.ts
@@ -57,6 +57,8 @@ export const confluenceListPagesInSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_space_labels.ts b/apps/sim/tools/confluence/list_space_labels.ts
index d30990d06ed..d0c0d3eeb19 100644
--- a/apps/sim/tools/confluence/list_space_labels.ts
+++ b/apps/sim/tools/confluence/list_space_labels.ts
@@ -38,6 +38,8 @@ export const confluenceListSpaceLabelsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_space_permissions.ts b/apps/sim/tools/confluence/list_space_permissions.ts
index 3d8fe00f2b2..ab2b06671fa 100644
--- a/apps/sim/tools/confluence/list_space_permissions.ts
+++ b/apps/sim/tools/confluence/list_space_permissions.ts
@@ -42,6 +42,8 @@ export const confluenceListSpacePermissionsTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_space_properties.ts b/apps/sim/tools/confluence/list_space_properties.ts
index d47c4570b08..4683cd7d5f2 100644
--- a/apps/sim/tools/confluence/list_space_properties.ts
+++ b/apps/sim/tools/confluence/list_space_properties.ts
@@ -38,6 +38,8 @@ export const confluenceListSpacePropertiesTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_spaces.ts b/apps/sim/tools/confluence/list_spaces.ts
index 3859aad2bc4..f2f82e98466 100644
--- a/apps/sim/tools/confluence/list_spaces.ts
+++ b/apps/sim/tools/confluence/list_spaces.ts
@@ -38,6 +38,8 @@ export const confluenceListSpacesTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/list_tasks.ts b/apps/sim/tools/confluence/list_tasks.ts
index 4f44678a89f..97fb3546422 100644
--- a/apps/sim/tools/confluence/list_tasks.ts
+++ b/apps/sim/tools/confluence/list_tasks.ts
@@ -52,6 +52,8 @@ export const confluenceListTasksTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/retrieve.ts b/apps/sim/tools/confluence/retrieve.ts
index ded0fda90cf..ca66c55825b 100644
--- a/apps/sim/tools/confluence/retrieve.ts
+++ b/apps/sim/tools/confluence/retrieve.ts
@@ -21,6 +21,8 @@ export const confluenceRetrieveTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/search.ts b/apps/sim/tools/confluence/search.ts
index 9b551ade892..89083da0338 100644
--- a/apps/sim/tools/confluence/search.ts
+++ b/apps/sim/tools/confluence/search.ts
@@ -34,6 +34,8 @@ export const confluenceSearchTool: ToolConfig<ConfluenceSearchParams, Confluence
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/search_in_space.ts b/apps/sim/tools/confluence/search_in_space.ts
index 5b10a5c6294..3dc738e600c 100644
--- a/apps/sim/tools/confluence/search_in_space.ts
+++ b/apps/sim/tools/confluence/search_in_space.ts
@@ -44,6 +44,8 @@ export const confluenceSearchInSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/update.ts b/apps/sim/tools/confluence/update.ts
index f9dcd01076e..ab75f74e8ae 100644
--- a/apps/sim/tools/confluence/update.ts
+++ b/apps/sim/tools/confluence/update.ts
@@ -13,6 +13,8 @@ export const confluenceUpdateTool: ToolConfig<ConfluenceUpdateParams, Confluence
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/update_blogpost.ts b/apps/sim/tools/confluence/update_blogpost.ts
index ea873cea179..2e0dfa3caaa 100644
--- a/apps/sim/tools/confluence/update_blogpost.ts
+++ b/apps/sim/tools/confluence/update_blogpost.ts
@@ -37,6 +37,8 @@ export const confluenceUpdateBlogPostTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/update_comment.ts b/apps/sim/tools/confluence/update_comment.ts
index 897517f8b6d..6c2fa4bc369 100644
--- a/apps/sim/tools/confluence/update_comment.ts
+++ b/apps/sim/tools/confluence/update_comment.ts
@@ -31,6 +31,8 @@ export const confluenceUpdateCommentTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/update_space.ts b/apps/sim/tools/confluence/update_space.ts
index c1cc6bd6dbf..324dc235bb8 100644
--- a/apps/sim/tools/confluence/update_space.ts
+++ b/apps/sim/tools/confluence/update_space.ts
@@ -38,6 +38,8 @@ export const confluenceUpdateSpaceTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/update_task.ts b/apps/sim/tools/confluence/update_task.ts
index d7d87387eb9..f3b9b70af95 100644
--- a/apps/sim/tools/confluence/update_task.ts
+++ b/apps/sim/tools/confluence/update_task.ts
@@ -44,6 +44,8 @@ export const confluenceUpdateTaskTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/confluence/upload_attachment.ts b/apps/sim/tools/confluence/upload_attachment.ts
index e8fabd5c0bb..66eb1475dc5 100644
--- a/apps/sim/tools/confluence/upload_attachment.ts
+++ b/apps/sim/tools/confluence/upload_attachment.ts
@@ -37,6 +37,8 @@ export const confluenceUploadAttachmentTool: ToolConfig<
     provider: 'confluence',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/error-extractors.ts b/apps/sim/tools/error-extractors.ts
index 45b6db39220..94656199356 100644
--- a/apps/sim/tools/error-extractors.ts
+++ b/apps/sim/tools/error-extractors.ts
@@ -41,9 +41,20 @@ export interface ErrorExtractorConfig {
 const ERROR_EXTRACTORS: ErrorExtractorConfig[] = [
   {
     id: 'atlassian-errors',
-    description: 'Atlassian REST API errorMessage field',
+    description: 'Atlassian REST API error formats (errorMessage, errorMessages array, message)',
     examples: ['Jira', 'Jira Service Management', 'Confluence'],
-    extract: (errorInfo) => errorInfo?.data?.errorMessage,
+    extract: (errorInfo) => {
+      if (errorInfo?.data?.errorMessage) {
+        return errorInfo.data.errorMessage
+      }
+      if (Array.isArray(errorInfo?.data?.errorMessages) && errorInfo.data.errorMessages.length > 0) {
+        return errorInfo.data.errorMessages.join(', ')
+      }
+      if (errorInfo?.data?.message) {
+        return errorInfo.data.message
+      }
+      return undefined
+    },
   },
   {
     id: 'graphql-errors',
diff --git a/apps/sim/tools/jira/add_attachment.ts b/apps/sim/tools/jira/add_attachment.ts
index bd890e509ed..b9eeba374c1 100644
--- a/apps/sim/tools/jira/add_attachment.ts
+++ b/apps/sim/tools/jira/add_attachment.ts
@@ -14,6 +14,8 @@ export const jiraAddAttachmentTool: ToolConfig<JiraAddAttachmentParams, JiraAddA
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/add_comment.ts b/apps/sim/tools/jira/add_comment.ts
index 29d11f49684..e44195fd7ee 100644
--- a/apps/sim/tools/jira/add_comment.ts
+++ b/apps/sim/tools/jira/add_comment.ts
@@ -30,6 +30,8 @@ export const jiraAddCommentTool: ToolConfig<JiraAddCommentParams, JiraAddComment
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/add_watcher.ts b/apps/sim/tools/jira/add_watcher.ts
index aa44f13df55..66c18c59d51 100644
--- a/apps/sim/tools/jira/add_watcher.ts
+++ b/apps/sim/tools/jira/add_watcher.ts
@@ -14,6 +14,8 @@ export const jiraAddWatcherTool: ToolConfig<JiraAddWatcherParams, JiraAddWatcher
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/add_worklog.ts b/apps/sim/tools/jira/add_worklog.ts
index c7cc869ef55..6872d609801 100644
--- a/apps/sim/tools/jira/add_worklog.ts
+++ b/apps/sim/tools/jira/add_worklog.ts
@@ -57,6 +57,8 @@ export const jiraAddWorklogTool: ToolConfig<JiraAddWorklogParams, JiraAddWorklog
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/assign_issue.ts b/apps/sim/tools/jira/assign_issue.ts
index e1b0e228a27..878e53a050f 100644
--- a/apps/sim/tools/jira/assign_issue.ts
+++ b/apps/sim/tools/jira/assign_issue.ts
@@ -14,6 +14,8 @@ export const jiraAssignIssueTool: ToolConfig<JiraAssignIssueParams, JiraAssignIs
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/bulk_read.ts b/apps/sim/tools/jira/bulk_read.ts
index 8289e672944..745ce23381a 100644
--- a/apps/sim/tools/jira/bulk_read.ts
+++ b/apps/sim/tools/jira/bulk_read.ts
@@ -14,6 +14,8 @@ export const jiraBulkRetrieveTool: ToolConfig<JiraRetrieveBulkParams, JiraRetrie
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/create_issue_link.ts b/apps/sim/tools/jira/create_issue_link.ts
index 86c087419d8..b8dd5f2f2e5 100644
--- a/apps/sim/tools/jira/create_issue_link.ts
+++ b/apps/sim/tools/jira/create_issue_link.ts
@@ -17,6 +17,8 @@ export const jiraCreateIssueLinkTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/delete_attachment.ts b/apps/sim/tools/jira/delete_attachment.ts
index 58448b0213d..b03d9fb4b0a 100644
--- a/apps/sim/tools/jira/delete_attachment.ts
+++ b/apps/sim/tools/jira/delete_attachment.ts
@@ -17,6 +17,8 @@ export const jiraDeleteAttachmentTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/delete_comment.ts b/apps/sim/tools/jira/delete_comment.ts
index 260efc2d436..38ff55d5ef6 100644
--- a/apps/sim/tools/jira/delete_comment.ts
+++ b/apps/sim/tools/jira/delete_comment.ts
@@ -15,6 +15,8 @@ export const jiraDeleteCommentTool: ToolConfig<JiraDeleteCommentParams, JiraDele
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/delete_issue.ts b/apps/sim/tools/jira/delete_issue.ts
index 42b0dd07471..49ab6945881 100644
--- a/apps/sim/tools/jira/delete_issue.ts
+++ b/apps/sim/tools/jira/delete_issue.ts
@@ -14,6 +14,8 @@ export const jiraDeleteIssueTool: ToolConfig<JiraDeleteIssueParams, JiraDeleteIs
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/delete_issue_link.ts b/apps/sim/tools/jira/delete_issue_link.ts
index f420a5a8c41..4f5c4646a3d 100644
--- a/apps/sim/tools/jira/delete_issue_link.ts
+++ b/apps/sim/tools/jira/delete_issue_link.ts
@@ -17,6 +17,8 @@ export const jiraDeleteIssueLinkTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/delete_worklog.ts b/apps/sim/tools/jira/delete_worklog.ts
index 7ad56aeaf59..43af2a41d12 100644
--- a/apps/sim/tools/jira/delete_worklog.ts
+++ b/apps/sim/tools/jira/delete_worklog.ts
@@ -15,6 +15,8 @@ export const jiraDeleteWorklogTool: ToolConfig<JiraDeleteWorklogParams, JiraDele
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/get_attachments.ts b/apps/sim/tools/jira/get_attachments.ts
index 75d67125d8f..940dccb6759 100644
--- a/apps/sim/tools/jira/get_attachments.ts
+++ b/apps/sim/tools/jira/get_attachments.ts
@@ -35,6 +35,8 @@ export const jiraGetAttachmentsTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/get_comments.ts b/apps/sim/tools/jira/get_comments.ts
index a043b13bbdb..f1cceaee8c7 100644
--- a/apps/sim/tools/jira/get_comments.ts
+++ b/apps/sim/tools/jira/get_comments.ts
@@ -32,6 +32,8 @@ export const jiraGetCommentsTool: ToolConfig<JiraGetCommentsParams, JiraGetComme
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/get_users.ts b/apps/sim/tools/jira/get_users.ts
index c67a32a0c10..23b3c874265 100644
--- a/apps/sim/tools/jira/get_users.ts
+++ b/apps/sim/tools/jira/get_users.ts
@@ -32,6 +32,8 @@ export const jiraGetUsersTool: ToolConfig<JiraGetUsersParams, JiraGetUsersRespon
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/get_worklogs.ts b/apps/sim/tools/jira/get_worklogs.ts
index 11769b372eb..5e45cff8740 100644
--- a/apps/sim/tools/jira/get_worklogs.ts
+++ b/apps/sim/tools/jira/get_worklogs.ts
@@ -32,6 +32,8 @@ export const jiraGetWorklogsTool: ToolConfig<JiraGetWorklogsParams, JiraGetWorkl
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/remove_watcher.ts b/apps/sim/tools/jira/remove_watcher.ts
index d33d19858f3..e81be6779e9 100644
--- a/apps/sim/tools/jira/remove_watcher.ts
+++ b/apps/sim/tools/jira/remove_watcher.ts
@@ -15,6 +15,8 @@ export const jiraRemoveWatcherTool: ToolConfig<JiraRemoveWatcherParams, JiraRemo
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/retrieve.ts b/apps/sim/tools/jira/retrieve.ts
index af5e30a0972..0614a7f35ca 100644
--- a/apps/sim/tools/jira/retrieve.ts
+++ b/apps/sim/tools/jira/retrieve.ts
@@ -195,6 +195,8 @@ export const jiraRetrieveTool: ToolConfig<JiraRetrieveParams, JiraRetrieveRespon
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/search_issues.ts b/apps/sim/tools/jira/search_issues.ts
index 364184b9902..e3c504e626b 100644
--- a/apps/sim/tools/jira/search_issues.ts
+++ b/apps/sim/tools/jira/search_issues.ts
@@ -81,6 +81,8 @@ export const jiraSearchIssuesTool: ToolConfig<JiraSearchIssuesParams, JiraSearch
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/search_users.ts b/apps/sim/tools/jira/search_users.ts
index a0cc9dd49f0..4e4b56a314b 100644
--- a/apps/sim/tools/jira/search_users.ts
+++ b/apps/sim/tools/jira/search_users.ts
@@ -15,6 +15,8 @@ export const jiraSearchUsersTool: ToolConfig<JiraSearchUsersParams, JiraSearchUs
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/transition_issue.ts b/apps/sim/tools/jira/transition_issue.ts
index 33f864f948d..473e8a439f2 100644
--- a/apps/sim/tools/jira/transition_issue.ts
+++ b/apps/sim/tools/jira/transition_issue.ts
@@ -17,6 +17,8 @@ export const jiraTransitionIssueTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/update.ts b/apps/sim/tools/jira/update.ts
index 75f53fc8765..8476470fa60 100644
--- a/apps/sim/tools/jira/update.ts
+++ b/apps/sim/tools/jira/update.ts
@@ -13,6 +13,8 @@ export const jiraUpdateTool: ToolConfig<JiraUpdateParams, JiraUpdateResponse> =
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jira/update_comment.ts b/apps/sim/tools/jira/update_comment.ts
index 526e724fb4c..e49fa248332 100644
--- a/apps/sim/tools/jira/update_comment.ts
+++ b/apps/sim/tools/jira/update_comment.ts
@@ -31,6 +31,8 @@ export const jiraUpdateCommentTool: ToolConfig<JiraUpdateCommentParams, JiraUpda
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/update_worklog.ts b/apps/sim/tools/jira/update_worklog.ts
index 3fae9ee2da9..31d5359e7fc 100644
--- a/apps/sim/tools/jira/update_worklog.ts
+++ b/apps/sim/tools/jira/update_worklog.ts
@@ -58,6 +58,8 @@ export const jiraUpdateWorklogTool: ToolConfig<JiraUpdateWorklogParams, JiraUpda
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jira/write.ts b/apps/sim/tools/jira/write.ts
index 42a5f9391c5..446f043acd8 100644
--- a/apps/sim/tools/jira/write.ts
+++ b/apps/sim/tools/jira/write.ts
@@ -13,6 +13,8 @@ export const jiraWriteTool: ToolConfig<JiraWriteParams, JiraWriteResponse> = {
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/add_comment.ts b/apps/sim/tools/jsm/add_comment.ts
index e23069a138a..a06caaf36ca 100644
--- a/apps/sim/tools/jsm/add_comment.ts
+++ b/apps/sim/tools/jsm/add_comment.ts
@@ -13,6 +13,8 @@ export const jsmAddCommentTool: ToolConfig<JsmAddCommentParams, JsmAddCommentRes
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/add_customer.ts b/apps/sim/tools/jsm/add_customer.ts
index 8edd1ddf210..07c2142ce34 100644
--- a/apps/sim/tools/jsm/add_customer.ts
+++ b/apps/sim/tools/jsm/add_customer.ts
@@ -12,6 +12,8 @@ export const jsmAddCustomerTool: ToolConfig<JsmAddCustomerParams, JsmAddCustomer
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/add_organization.ts b/apps/sim/tools/jsm/add_organization.ts
index c826c806e22..78d760527b0 100644
--- a/apps/sim/tools/jsm/add_organization.ts
+++ b/apps/sim/tools/jsm/add_organization.ts
@@ -15,6 +15,8 @@ export const jsmAddOrganizationTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/add_participants.ts b/apps/sim/tools/jsm/add_participants.ts
index 5b1ec46c258..58caf7b2076 100644
--- a/apps/sim/tools/jsm/add_participants.ts
+++ b/apps/sim/tools/jsm/add_participants.ts
@@ -16,6 +16,8 @@ export const jsmAddParticipantsTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/answer_approval.ts b/apps/sim/tools/jsm/answer_approval.ts
index 58f5c7890d5..0bbdb4c8158 100644
--- a/apps/sim/tools/jsm/answer_approval.ts
+++ b/apps/sim/tools/jsm/answer_approval.ts
@@ -13,6 +13,8 @@ export const jsmAnswerApprovalTool: ToolConfig<JsmAnswerApprovalParams, JsmAnswe
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jsm/create_organization.ts b/apps/sim/tools/jsm/create_organization.ts
index 8b3b4617fc4..f59befe4a11 100644
--- a/apps/sim/tools/jsm/create_organization.ts
+++ b/apps/sim/tools/jsm/create_organization.ts
@@ -15,6 +15,8 @@ export const jsmCreateOrganizationTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/create_request.ts b/apps/sim/tools/jsm/create_request.ts
index d8e51a7e7e5..29e08e9fff7 100644
--- a/apps/sim/tools/jsm/create_request.ts
+++ b/apps/sim/tools/jsm/create_request.ts
@@ -12,6 +12,8 @@ export const jsmCreateRequestTool: ToolConfig<JsmCreateRequestParams, JsmCreateR
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_approvals.ts b/apps/sim/tools/jsm/get_approvals.ts
index 91d96ab0207..da1fbc01eb7 100644
--- a/apps/sim/tools/jsm/get_approvals.ts
+++ b/apps/sim/tools/jsm/get_approvals.ts
@@ -13,6 +13,8 @@ export const jsmGetApprovalsTool: ToolConfig<JsmGetApprovalsParams, JsmGetApprov
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_comments.ts b/apps/sim/tools/jsm/get_comments.ts
index 0d4239c965a..3eeb02b5238 100644
--- a/apps/sim/tools/jsm/get_comments.ts
+++ b/apps/sim/tools/jsm/get_comments.ts
@@ -13,6 +13,8 @@ export const jsmGetCommentsTool: ToolConfig<JsmGetCommentsParams, JsmGetComments
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_customers.ts b/apps/sim/tools/jsm/get_customers.ts
index 02f473f8d1f..dc85277d9fc 100644
--- a/apps/sim/tools/jsm/get_customers.ts
+++ b/apps/sim/tools/jsm/get_customers.ts
@@ -13,6 +13,8 @@ export const jsmGetCustomersTool: ToolConfig<JsmGetCustomersParams, JsmGetCustom
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_form_structure.ts b/apps/sim/tools/jsm/get_form_structure.ts
index 48193e37972..cdae9e9c2c8 100644
--- a/apps/sim/tools/jsm/get_form_structure.ts
+++ b/apps/sim/tools/jsm/get_form_structure.ts
@@ -16,6 +16,8 @@ export const jsmGetFormStructureTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_form_templates.ts b/apps/sim/tools/jsm/get_form_templates.ts
index b29652f1764..9acc8adba4d 100644
--- a/apps/sim/tools/jsm/get_form_templates.ts
+++ b/apps/sim/tools/jsm/get_form_templates.ts
@@ -17,6 +17,8 @@ export const jsmGetFormTemplatesTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_issue_forms.ts b/apps/sim/tools/jsm/get_issue_forms.ts
index 764fd20856f..cb2e8fc3c35 100644
--- a/apps/sim/tools/jsm/get_issue_forms.ts
+++ b/apps/sim/tools/jsm/get_issue_forms.ts
@@ -14,6 +14,8 @@ export const jsmGetIssueFormsTool: ToolConfig<JsmGetIssueFormsParams, JsmGetIssu
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_organizations.ts b/apps/sim/tools/jsm/get_organizations.ts
index 6dd91963025..fa5ff96176b 100644
--- a/apps/sim/tools/jsm/get_organizations.ts
+++ b/apps/sim/tools/jsm/get_organizations.ts
@@ -16,6 +16,8 @@ export const jsmGetOrganizationsTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_participants.ts b/apps/sim/tools/jsm/get_participants.ts
index 49c9648bf15..a22144d10c6 100644
--- a/apps/sim/tools/jsm/get_participants.ts
+++ b/apps/sim/tools/jsm/get_participants.ts
@@ -16,6 +16,8 @@ export const jsmGetParticipantsTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_queues.ts b/apps/sim/tools/jsm/get_queues.ts
index d22ae9de7c9..f9d766b2ef8 100644
--- a/apps/sim/tools/jsm/get_queues.ts
+++ b/apps/sim/tools/jsm/get_queues.ts
@@ -13,6 +13,8 @@ export const jsmGetQueuesTool: ToolConfig<JsmGetQueuesParams, JsmGetQueuesRespon
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_request.ts b/apps/sim/tools/jsm/get_request.ts
index cd065b91e67..dfdd083789b 100644
--- a/apps/sim/tools/jsm/get_request.ts
+++ b/apps/sim/tools/jsm/get_request.ts
@@ -17,6 +17,8 @@ export const jsmGetRequestTool: ToolConfig<JsmGetRequestParams, JsmGetRequestRes
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_request_type_fields.ts b/apps/sim/tools/jsm/get_request_type_fields.ts
index f2d8e8a1a50..801d2357eb3 100644
--- a/apps/sim/tools/jsm/get_request_type_fields.ts
+++ b/apps/sim/tools/jsm/get_request_type_fields.ts
@@ -20,6 +20,8 @@ export const jsmGetRequestTypeFieldsTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_request_types.ts b/apps/sim/tools/jsm/get_request_types.ts
index 715715a836e..efc7c082f5f 100644
--- a/apps/sim/tools/jsm/get_request_types.ts
+++ b/apps/sim/tools/jsm/get_request_types.ts
@@ -16,6 +16,8 @@ export const jsmGetRequestTypesTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_requests.ts b/apps/sim/tools/jsm/get_requests.ts
index 5aca92bd065..e4024a52c60 100644
--- a/apps/sim/tools/jsm/get_requests.ts
+++ b/apps/sim/tools/jsm/get_requests.ts
@@ -13,6 +13,8 @@ export const jsmGetRequestsTool: ToolConfig<JsmGetRequestsParams, JsmGetRequests
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_service_desks.ts b/apps/sim/tools/jsm/get_service_desks.ts
index c4e510b3585..09009f49aaa 100644
--- a/apps/sim/tools/jsm/get_service_desks.ts
+++ b/apps/sim/tools/jsm/get_service_desks.ts
@@ -16,6 +16,8 @@ export const jsmGetServiceDesksTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_sla.ts b/apps/sim/tools/jsm/get_sla.ts
index f72271b8908..133ae4c3d0e 100644
--- a/apps/sim/tools/jsm/get_sla.ts
+++ b/apps/sim/tools/jsm/get_sla.ts
@@ -13,6 +13,8 @@ export const jsmGetSlaTool: ToolConfig<JsmGetSlaParams, JsmGetSlaResponse> = {
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',
diff --git a/apps/sim/tools/jsm/get_transitions.ts b/apps/sim/tools/jsm/get_transitions.ts
index d864cf747d6..d439c174cea 100644
--- a/apps/sim/tools/jsm/get_transitions.ts
+++ b/apps/sim/tools/jsm/get_transitions.ts
@@ -14,6 +14,8 @@ export const jsmGetTransitionsTool: ToolConfig<JsmGetTransitionsParams, JsmGetTr
       provider: 'jira',
     },
 
+    errorExtractor: 'atlassian-errors',
+
     params: {
       accessToken: {
         type: 'string',
diff --git a/apps/sim/tools/jsm/transition_request.ts b/apps/sim/tools/jsm/transition_request.ts
index fb2232f6c66..5e89aa913ef 100644
--- a/apps/sim/tools/jsm/transition_request.ts
+++ b/apps/sim/tools/jsm/transition_request.ts
@@ -15,6 +15,8 @@ export const jsmTransitionRequestTool: ToolConfig<
     provider: 'jira',
   },
 
+  errorExtractor: 'atlassian-errors',
+
   params: {
     accessToken: {
       type: 'string',

From 84ecfa52275997eabbf1a9494579c03dbb62ca11 Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 9 Apr 2026 15:11:33 -0700
Subject: [PATCH 2/3] chore(tools): lint formatting fix for error extractor

---
 apps/sim/tools/error-extractors.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/sim/tools/error-extractors.ts b/apps/sim/tools/error-extractors.ts
index 94656199356..0eb8ed42568 100644
--- a/apps/sim/tools/error-extractors.ts
+++ b/apps/sim/tools/error-extractors.ts
@@ -47,7 +47,10 @@ const ERROR_EXTRACTORS: ErrorExtractorConfig[] = [
       if (errorInfo?.data?.errorMessage) {
         return errorInfo.data.errorMessage
       }
-      if (Array.isArray(errorInfo?.data?.errorMessages) && errorInfo.data.errorMessages.length > 0) {
+      if (
+        Array.isArray(errorInfo?.data?.errorMessages) &&
+        errorInfo.data.errorMessages.length > 0
+      ) {
         return errorInfo.data.errorMessages.join(', ')
       }
       if (errorInfo?.data?.message) {

From 83ea42f8368df04ebd674e6a56df93fe05d76b4c Mon Sep 17 00:00:00 2001
From: Waleed Latif <walif6@gmail.com>
Date: Thu, 9 Apr 2026 15:15:04 -0700
Subject: [PATCH 3/3] fix(tools): handle all Atlassian error formats in error
 extractor

Add RFC 7807 errors[].title format (Confluence v2, Forms/ProForma API)
and Jira field-level errors object to the atlassian-errors extractor.
---
 apps/sim/tools/error-extractors.ts | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/apps/sim/tools/error-extractors.ts b/apps/sim/tools/error-extractors.ts
index 0eb8ed42568..1bae33b442b 100644
--- a/apps/sim/tools/error-extractors.ts
+++ b/apps/sim/tools/error-extractors.ts
@@ -41,18 +41,36 @@ export interface ErrorExtractorConfig {
 const ERROR_EXTRACTORS: ErrorExtractorConfig[] = [
   {
     id: 'atlassian-errors',
-    description: 'Atlassian REST API error formats (errorMessage, errorMessages array, message)',
-    examples: ['Jira', 'Jira Service Management', 'Confluence'],
+    description:
+      'Atlassian REST API error formats (errorMessage, errorMessages, errors[].title, message)',
+    examples: ['Jira', 'Jira Service Management', 'Confluence', 'JSM Forms/ProForma'],
     extract: (errorInfo) => {
+      // JSM Service Desk: singular errorMessage string
       if (errorInfo?.data?.errorMessage) {
         return errorInfo.data.errorMessage
       }
+      // Jira Platform: errorMessages array
       if (
         Array.isArray(errorInfo?.data?.errorMessages) &&
         errorInfo.data.errorMessages.length > 0
       ) {
         return errorInfo.data.errorMessages.join(', ')
       }
+      // Confluence v2 / Forms API: RFC 7807 errors array with title/detail
+      if (Array.isArray(errorInfo?.data?.errors) && errorInfo.data.errors.length > 0) {
+        const err = errorInfo.data.errors[0]
+        if (err?.title) {
+          return err.detail ? `${err.title}: ${err.detail}` : err.title
+        }
+      }
+      // Jira Platform field-level errors object
+      if (errorInfo?.data?.errors && !Array.isArray(errorInfo.data.errors)) {
+        const fieldErrors = Object.entries(errorInfo.data.errors)
+          .map(([field, msg]) => `${field}: ${msg}`)
+          .join(', ')
+        if (fieldErrors) return fieldErrors
+      }
+      // Generic message fallback (auth/gateway errors)
       if (errorInfo?.data?.message) {
         return errorInfo.data.message
       }