diff --git a/apps/sim/tools/agentmail/agentmail.test.ts b/apps/sim/tools/agentmail/agentmail.test.ts
new file mode 100644
index 00000000000..f716cd3ee5d
--- /dev/null
+++ b/apps/sim/tools/agentmail/agentmail.test.ts
@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { agentmailGetMessageTool } from '@/tools/agentmail/get_message'
+import { agentmailReplyMessageTool } from '@/tools/agentmail/reply_message'
+
+const scope = { apiKey: 'key', inboxId: 'agent@agentmail.to' }
+
+function buildUrl
(url: string | ((params: P) => string), params: P): string {
+ return typeof url === 'function' ? url(params) : url
+}
+
+describe('agentmail request paths', () => {
+ it('encodes RFC 5322 message IDs so their characters stay inside one path segment', () => {
+ const url = buildUrl(agentmailGetMessageTool.request.url, {
+ ...scope,
+ messageId: '',
+ })
+
+ expect(new URL(url).pathname).toBe(
+ '/v0/inboxes/agent%40agentmail.to/messages/%3Ca%2Fb%23c%3Fd%25e%40mail.example.com%3E'
+ )
+ })
+
+ it('rejects a dot-segment message ID instead of addressing the parent path', () => {
+ expect(() =>
+ buildUrl(agentmailReplyMessageTool.request.url, { ...scope, messageId: '..' })
+ ).toThrow(/messageId/)
+ })
+})
diff --git a/apps/sim/tools/agentmail/create_draft.ts b/apps/sim/tools/agentmail/create_draft.ts
index ea1fe683430..cd737e4e4a8 100644
--- a/apps/sim/tools/agentmail/create_draft.ts
+++ b/apps/sim/tools/agentmail/create_draft.ts
@@ -1,6 +1,7 @@
import type { CreateDraftParams, CreateDraftResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailCreateDraftTool: ToolConfig = {
id: 'agentmail_create_draft',
@@ -73,7 +74,8 @@ export const agentmailCreateDraftTool: ToolConfig `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/drafts`,
+ url: (params) =>
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/drafts`,
method: 'POST',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/delete_draft.ts b/apps/sim/tools/agentmail/delete_draft.ts
index 227c7210acf..e9a1c9d78c8 100644
--- a/apps/sim/tools/agentmail/delete_draft.ts
+++ b/apps/sim/tools/agentmail/delete_draft.ts
@@ -1,6 +1,7 @@
import type { DeleteDraftParams, DeleteDraftResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailDeleteDraftTool: ToolConfig = {
id: 'agentmail_delete_draft',
@@ -32,7 +33,7 @@ export const agentmailDeleteDraftTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/drafts/${params.draftId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/drafts/${safeUrlPathSegment(params.draftId, 'draftId')}`,
method: 'DELETE',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/delete_inbox.ts b/apps/sim/tools/agentmail/delete_inbox.ts
index 92c3f6fed16..b2de5fceb7e 100644
--- a/apps/sim/tools/agentmail/delete_inbox.ts
+++ b/apps/sim/tools/agentmail/delete_inbox.ts
@@ -1,6 +1,7 @@
import type { DeleteInboxParams, DeleteInboxResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailDeleteInboxTool: ToolConfig = {
id: 'agentmail_delete_inbox',
@@ -25,7 +26,8 @@ export const agentmailDeleteInboxTool: ToolConfig `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}`,
+ url: (params) =>
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}`,
method: 'DELETE',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/delete_thread.ts b/apps/sim/tools/agentmail/delete_thread.ts
index b7c533f8f47..1f77f5624ee 100644
--- a/apps/sim/tools/agentmail/delete_thread.ts
+++ b/apps/sim/tools/agentmail/delete_thread.ts
@@ -1,6 +1,7 @@
import type { DeleteThreadParams, DeleteThreadResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailDeleteThreadTool: ToolConfig = {
id: 'agentmail_delete_thread',
@@ -42,7 +43,7 @@ export const agentmailDeleteThreadTool: ToolConfig ({
diff --git a/apps/sim/tools/agentmail/forward_message.ts b/apps/sim/tools/agentmail/forward_message.ts
index e45f6d76e97..142b1c13fb6 100644
--- a/apps/sim/tools/agentmail/forward_message.ts
+++ b/apps/sim/tools/agentmail/forward_message.ts
@@ -1,6 +1,7 @@
import type { ForwardMessageParams, ForwardMessageResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailForwardMessageTool: ToolConfig = {
id: 'agentmail_forward_message',
@@ -68,7 +69,7 @@ export const agentmailForwardMessageTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/messages/${params.messageId.trim()}/forward`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/messages/${safeUrlPathSegment(params.messageId, 'messageId', { allowSeparators: true })}/forward`,
method: 'POST',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/get_draft.ts b/apps/sim/tools/agentmail/get_draft.ts
index 0f6293b57bf..c4f8d1e0c57 100644
--- a/apps/sim/tools/agentmail/get_draft.ts
+++ b/apps/sim/tools/agentmail/get_draft.ts
@@ -1,6 +1,7 @@
import type { GetDraftParams, GetDraftResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailGetDraftTool: ToolConfig = {
id: 'agentmail_get_draft',
@@ -32,7 +33,7 @@ export const agentmailGetDraftTool: ToolConfig =
request: {
url: (params) =>
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/drafts/${params.draftId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/drafts/${safeUrlPathSegment(params.draftId, 'draftId')}`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/get_inbox.ts b/apps/sim/tools/agentmail/get_inbox.ts
index 0431a516e5b..5416958403d 100644
--- a/apps/sim/tools/agentmail/get_inbox.ts
+++ b/apps/sim/tools/agentmail/get_inbox.ts
@@ -1,6 +1,7 @@
import type { GetInboxParams, GetInboxResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailGetInboxTool: ToolConfig = {
id: 'agentmail_get_inbox',
@@ -25,7 +26,8 @@ export const agentmailGetInboxTool: ToolConfig =
},
request: {
- url: (params) => `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}`,
+ url: (params) =>
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/get_message.ts b/apps/sim/tools/agentmail/get_message.ts
index 42da61fb8f4..0e077df2f3b 100644
--- a/apps/sim/tools/agentmail/get_message.ts
+++ b/apps/sim/tools/agentmail/get_message.ts
@@ -1,6 +1,7 @@
import type { GetMessageParams, GetMessageResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailGetMessageTool: ToolConfig = {
id: 'agentmail_get_message',
@@ -32,7 +33,7 @@ export const agentmailGetMessageTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/messages/${params.messageId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/messages/${safeUrlPathSegment(params.messageId, 'messageId', { allowSeparators: true })}`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/get_thread.ts b/apps/sim/tools/agentmail/get_thread.ts
index f9eff0d53fa..233fa051dd3 100644
--- a/apps/sim/tools/agentmail/get_thread.ts
+++ b/apps/sim/tools/agentmail/get_thread.ts
@@ -1,6 +1,7 @@
import type { GetThreadParams, GetThreadResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailGetThreadTool: ToolConfig = {
id: 'agentmail_get_thread',
@@ -32,7 +33,7 @@ export const agentmailGetThreadTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/threads/${params.threadId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/threads/${safeUrlPathSegment(params.threadId, 'threadId')}`,
method: 'GET',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/list_drafts.ts b/apps/sim/tools/agentmail/list_drafts.ts
index 1a5bf06d40b..8848191f9de 100644
--- a/apps/sim/tools/agentmail/list_drafts.ts
+++ b/apps/sim/tools/agentmail/list_drafts.ts
@@ -1,6 +1,7 @@
import type { ListDraftsParams, ListDraftsResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailListDraftsTool: ToolConfig = {
id: 'agentmail_list_drafts',
@@ -42,7 +43,7 @@ export const agentmailListDraftsTool: ToolConfig ({
diff --git a/apps/sim/tools/agentmail/list_messages.ts b/apps/sim/tools/agentmail/list_messages.ts
index 24e3e8d867d..01031b671a5 100644
--- a/apps/sim/tools/agentmail/list_messages.ts
+++ b/apps/sim/tools/agentmail/list_messages.ts
@@ -1,6 +1,7 @@
import type { ListMessagesParams, ListMessagesResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailListMessagesTool: ToolConfig = {
id: 'agentmail_list_messages',
@@ -42,7 +43,7 @@ export const agentmailListMessagesTool: ToolConfig ({
diff --git a/apps/sim/tools/agentmail/list_threads.ts b/apps/sim/tools/agentmail/list_threads.ts
index f90f51916a1..04ffb194563 100644
--- a/apps/sim/tools/agentmail/list_threads.ts
+++ b/apps/sim/tools/agentmail/list_threads.ts
@@ -1,6 +1,7 @@
import type { ListThreadsParams, ListThreadsResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailListThreadsTool: ToolConfig = {
id: 'agentmail_list_threads',
@@ -67,7 +68,7 @@ export const agentmailListThreadsTool: ToolConfig ({
diff --git a/apps/sim/tools/agentmail/reply_message.ts b/apps/sim/tools/agentmail/reply_message.ts
index c6ecfd62028..9c811931ad5 100644
--- a/apps/sim/tools/agentmail/reply_message.ts
+++ b/apps/sim/tools/agentmail/reply_message.ts
@@ -1,6 +1,7 @@
import type { ReplyMessageParams, ReplyMessageResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailReplyMessageTool: ToolConfig = {
id: 'agentmail_reply_message',
@@ -69,7 +70,7 @@ export const agentmailReplyMessageTool: ToolConfig {
const endpoint = params.replyAll ? 'reply-all' : 'reply'
- return `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/messages/${params.messageId.trim()}/${endpoint}`
+ return `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/messages/${safeUrlPathSegment(params.messageId, 'messageId', { allowSeparators: true })}/${endpoint}`
},
method: 'POST',
headers: (params) => ({
diff --git a/apps/sim/tools/agentmail/send_draft.ts b/apps/sim/tools/agentmail/send_draft.ts
index 719e7104438..173dd676021 100644
--- a/apps/sim/tools/agentmail/send_draft.ts
+++ b/apps/sim/tools/agentmail/send_draft.ts
@@ -1,6 +1,7 @@
import type { SendDraftParams, SendDraftResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailSendDraftTool: ToolConfig = {
id: 'agentmail_send_draft',
@@ -32,7 +33,7 @@ export const agentmailSendDraftTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/drafts/${params.draftId.trim()}/send`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/drafts/${safeUrlPathSegment(params.draftId, 'draftId')}/send`,
method: 'POST',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/send_message.ts b/apps/sim/tools/agentmail/send_message.ts
index c6119484122..87f06aa5b57 100644
--- a/apps/sim/tools/agentmail/send_message.ts
+++ b/apps/sim/tools/agentmail/send_message.ts
@@ -1,6 +1,7 @@
import type { SendMessageParams, SendMessageResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailSendMessageTool: ToolConfig = {
id: 'agentmail_send_message',
@@ -61,7 +62,8 @@ export const agentmailSendMessageTool: ToolConfig `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/messages/send`,
+ url: (params) =>
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/messages/send`,
method: 'POST',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/update_draft.ts b/apps/sim/tools/agentmail/update_draft.ts
index aecb7e241a8..d9c1ed9c122 100644
--- a/apps/sim/tools/agentmail/update_draft.ts
+++ b/apps/sim/tools/agentmail/update_draft.ts
@@ -1,6 +1,7 @@
import type { UpdateDraftParams, UpdateDraftResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailUpdateDraftTool: ToolConfig = {
id: 'agentmail_update_draft',
@@ -74,7 +75,7 @@ export const agentmailUpdateDraftTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/drafts/${params.draftId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/drafts/${safeUrlPathSegment(params.draftId, 'draftId')}`,
method: 'PATCH',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/update_inbox.ts b/apps/sim/tools/agentmail/update_inbox.ts
index 02a3f36bf14..cca9ef58028 100644
--- a/apps/sim/tools/agentmail/update_inbox.ts
+++ b/apps/sim/tools/agentmail/update_inbox.ts
@@ -1,6 +1,7 @@
import type { UpdateInboxParams, UpdateInboxResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailUpdateInboxTool: ToolConfig = {
id: 'agentmail_update_inbox',
@@ -31,7 +32,8 @@ export const agentmailUpdateInboxTool: ToolConfig `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}`,
+ url: (params) =>
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}`,
method: 'PATCH',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/update_message.ts b/apps/sim/tools/agentmail/update_message.ts
index e061b266f73..27121073c70 100644
--- a/apps/sim/tools/agentmail/update_message.ts
+++ b/apps/sim/tools/agentmail/update_message.ts
@@ -1,6 +1,7 @@
import type { UpdateMessageParams, UpdateMessageResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailUpdateMessageTool: ToolConfig = {
id: 'agentmail_update_message',
@@ -44,7 +45,7 @@ export const agentmailUpdateMessageTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/messages/${params.messageId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/messages/${safeUrlPathSegment(params.messageId, 'messageId', { allowSeparators: true })}`,
method: 'PATCH',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,
diff --git a/apps/sim/tools/agentmail/update_thread.ts b/apps/sim/tools/agentmail/update_thread.ts
index 8ffe5e9be83..9cbd10b8a8f 100644
--- a/apps/sim/tools/agentmail/update_thread.ts
+++ b/apps/sim/tools/agentmail/update_thread.ts
@@ -1,6 +1,7 @@
import type { UpdateThreadParams, UpdateThreadResult } from '@/tools/agentmail/types'
import { AGENTMAIL_CREDENTIAL_OAUTH } from '@/tools/shared/saved-credentials'
import type { ToolConfig } from '@/tools/types'
+import { safeUrlPathSegment } from '@/tools/url-path'
export const agentmailUpdateThreadTool: ToolConfig = {
id: 'agentmail_update_thread',
@@ -44,7 +45,7 @@ export const agentmailUpdateThreadTool: ToolConfig
- `https://api.agentmail.to/v0/inboxes/${params.inboxId.trim()}/threads/${params.threadId.trim()}`,
+ `https://api.agentmail.to/v0/inboxes/${safeUrlPathSegment(params.inboxId, 'inboxId')}/threads/${safeUrlPathSegment(params.threadId, 'threadId')}`,
method: 'PATCH',
headers: (params) => ({
Authorization: `Bearer ${params.apiKey}`,