@usejunior/email-core 0.1.11 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/actions/compose-helpers.d.ts +24 -4
- package/dist/actions/compose-helpers.d.ts.map +1 -1
- package/dist/actions/compose-helpers.js +40 -11
- package/dist/actions/compose-helpers.js.map +1 -1
- package/dist/actions/draft.d.ts +4 -2
- package/dist/actions/draft.d.ts.map +1 -1
- package/dist/actions/draft.js +46 -24
- package/dist/actions/draft.js.map +1 -1
- package/dist/actions/read.d.ts +1 -1
- package/dist/actions/registry.d.ts +6 -3
- package/dist/actions/registry.d.ts.map +1 -1
- package/dist/actions/registry.js +52 -10
- package/dist/actions/registry.js.map +1 -1
- package/dist/actions/reply.d.ts +2 -1
- package/dist/actions/reply.d.ts.map +1 -1
- package/dist/actions/reply.js +16 -7
- package/dist/actions/reply.js.map +1 -1
- package/dist/actions/send.d.ts +2 -1
- package/dist/actions/send.d.ts.map +1 -1
- package/dist/actions/send.js +19 -8
- package/dist/actions/send.js.map +1 -1
- package/dist/content/attachment-loader.d.ts +2 -1
- package/dist/content/attachment-loader.d.ts.map +1 -1
- package/dist/content/attachment-loader.js +13 -4
- package/dist/content/attachment-loader.js.map +1 -1
- package/dist/content/body-loader.d.ts +2 -1
- package/dist/content/body-loader.d.ts.map +1 -1
- package/dist/content/body-loader.js +28 -6
- package/dist/content/body-loader.js.map +1 -1
- package/dist/content/safe-path.d.ts +56 -8
- package/dist/content/safe-path.d.ts.map +1 -1
- package/dist/content/safe-path.js +153 -48
- package/dist/content/safe-path.js.map +1 -1
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/metrics.d.ts +8 -0
- package/dist/metrics.d.ts.map +1 -0
- package/dist/metrics.js +26 -0
- package/dist/metrics.js.map +1 -0
- package/dist/providers/provider.d.ts +104 -0
- package/dist/providers/provider.d.ts.map +1 -1
- package/dist/providers/provider.js +197 -7
- package/dist/providers/provider.js.map +1 -1
- package/dist/scope-profile.d.ts.map +1 -1
- package/dist/scope-profile.js +21 -3
- package/dist/scope-profile.js.map +1 -1
- package/package.json +1 -1
- package/dist/actions/configure.d.ts +0 -36
- package/dist/actions/configure.d.ts.map +0 -1
- package/dist/actions/configure.js +0 -112
- package/dist/actions/configure.js.map +0 -1
- package/dist/actions/status.d.ts +0 -27
- package/dist/actions/status.d.ts.map +0 -1
- package/dist/actions/status.js +0 -90
- package/dist/actions/status.js.map +0 -1
package/dist/actions/registry.js
CHANGED
|
@@ -1,11 +1,53 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
}
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
}
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
import { listAttachmentsAction, downloadAttachmentAction } from './attachments.js';
|
|
2
|
+
import { getThreadAction } from './conversation.js';
|
|
3
|
+
import { createDraftAction, sendDraftAction, updateDraftAction } from './draft.js';
|
|
4
|
+
import { listFoldersAction, createFolderAction, deleteFolderAction } from './folders.js';
|
|
5
|
+
import { labelEmailAction, flagEmailAction, markReadAction, deleteEmailAction } from './label.js';
|
|
6
|
+
import { listEmailsAction } from './list.js';
|
|
7
|
+
import { moveToFolderAction } from './move.js';
|
|
8
|
+
import { readEmailAction } from './read.js';
|
|
9
|
+
import { replyToEmailAction } from './reply.js';
|
|
10
|
+
import { listInboxRulesAction, createInboxRuleAction, deleteInboxRuleAction } from './rules.js';
|
|
11
|
+
import { cancelScheduledSendAction, listScheduledSendsAction } from './scheduling.js';
|
|
12
|
+
import { searchEmailsAction } from './search.js';
|
|
13
|
+
import { sendEmailAction } from './send.js';
|
|
14
|
+
// Canonical, explicit list of every email action defined in this package.
|
|
15
|
+
// Deliberately NOT side-effect registration (a previous mutable
|
|
16
|
+
// `registerAction()` mechanism was never called, leaving this array
|
|
17
|
+
// permanently empty — see issue #174): an explicit list is ordering-safe,
|
|
18
|
+
// tree-shake-safe, and testable. Adding a new action module means adding it
|
|
19
|
+
// here; `registry.test.ts` enforces that the list stays complete and
|
|
20
|
+
// duplicate-free.
|
|
21
|
+
export const EMAIL_ACTIONS = [
|
|
22
|
+
// Read / list / search
|
|
23
|
+
listEmailsAction,
|
|
24
|
+
readEmailAction,
|
|
25
|
+
searchEmailsAction,
|
|
26
|
+
getThreadAction,
|
|
27
|
+
// Compose / send
|
|
28
|
+
sendEmailAction,
|
|
29
|
+
replyToEmailAction,
|
|
30
|
+
createDraftAction,
|
|
31
|
+
sendDraftAction,
|
|
32
|
+
updateDraftAction,
|
|
33
|
+
cancelScheduledSendAction,
|
|
34
|
+
listScheduledSendsAction,
|
|
35
|
+
// Attachments
|
|
36
|
+
listAttachmentsAction,
|
|
37
|
+
downloadAttachmentAction,
|
|
38
|
+
// Triage
|
|
39
|
+
labelEmailAction,
|
|
40
|
+
flagEmailAction,
|
|
41
|
+
markReadAction,
|
|
42
|
+
deleteEmailAction,
|
|
43
|
+
moveToFolderAction,
|
|
44
|
+
// Folders
|
|
45
|
+
listFoldersAction,
|
|
46
|
+
createFolderAction,
|
|
47
|
+
deleteFolderAction,
|
|
48
|
+
// Inbox rules
|
|
49
|
+
listInboxRulesAction,
|
|
50
|
+
createInboxRuleAction,
|
|
51
|
+
deleteInboxRuleAction,
|
|
52
|
+
];
|
|
11
53
|
//# sourceMappingURL=registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/actions/registry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/actions/registry.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAClG,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AA8C5C,0EAA0E;AAC1E,gEAAgE;AAChE,oEAAoE;AACpE,0EAA0E;AAC1E,4EAA4E;AAC5E,qEAAqE;AACrE,kBAAkB;AAClB,MAAM,CAAC,MAAM,aAAa,GAAqC;IAC7D,uBAAuB;IACvB,gBAAgB;IAChB,eAAe;IACf,kBAAkB;IAClB,eAAe;IACf,iBAAiB;IACjB,eAAe;IACf,kBAAkB;IAClB,iBAAiB;IACjB,eAAe;IACf,iBAAiB;IACjB,yBAAyB;IACzB,wBAAwB;IACxB,cAAc;IACd,qBAAqB;IACrB,wBAAwB;IACxB,SAAS;IACT,gBAAgB;IAChB,eAAe;IACf,cAAc;IACd,iBAAiB;IACjB,kBAAkB;IAClB,UAAU;IACV,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,cAAc;IACd,oBAAoB;IACpB,qBAAqB;IACrB,qBAAqB;CACtB,CAAC"}
|
package/dist/actions/reply.d.ts
CHANGED
|
@@ -9,8 +9,8 @@ declare const ReplyToEmailInput: z.ZodObject<{
|
|
|
9
9
|
include_quoted: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
10
10
|
reply_all: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
|
|
11
11
|
format: z.ZodOptional<z.ZodEnum<{
|
|
12
|
-
text: "text";
|
|
13
12
|
html: "html";
|
|
13
|
+
text: "text";
|
|
14
14
|
markdown: "markdown";
|
|
15
15
|
}>>;
|
|
16
16
|
force_black: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -55,6 +55,7 @@ declare const ReplyToEmailOutput: z.ZodObject<{
|
|
|
55
55
|
recoverable: z.ZodBoolean;
|
|
56
56
|
availableMailboxes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
57
57
|
defaultMailbox: z.ZodOptional<z.ZodString>;
|
|
58
|
+
retryAfter: z.ZodOptional<z.ZodNumber>;
|
|
58
59
|
}, z.core.$strip>>;
|
|
59
60
|
}, z.core.$strip>;
|
|
60
61
|
export declare const replyToEmailAction: EmailAction<z.infer<typeof ReplyToEmailInput>, z.infer<typeof ReplyToEmailOutput>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply.d.ts","sourceRoot":"","sources":["../../src/actions/reply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,eAAe,CAAC;AAkBhE,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;iBAgBrB,CAAC;AAEH,QAAA,MAAM,kBAAkB
|
|
1
|
+
{"version":3,"file":"reply.d.ts","sourceRoot":"","sources":["../../src/actions/reply.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAiB,WAAW,EAAE,MAAM,eAAe,CAAC;AAkBhE,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;iBAgBrB,CAAC;AAEH,QAAA,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBActB,CAAC;AA8DH,eAAO,MAAM,kBAAkB,EAAE,WAAW,CAC1C,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,EACjC,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CA+InC,CAAC"}
|
package/dist/actions/reply.js
CHANGED
|
@@ -2,9 +2,8 @@
|
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { checkSendAllowlist } from '../security/send-allowlist.js';
|
|
4
4
|
import { isPlausibleMessageId } from '../security/reply-validation.js';
|
|
5
|
-
import { withRetry } from '../providers/provider.js';
|
|
6
5
|
import { renderEmailBody } from '../content/body-renderer.js';
|
|
7
|
-
import { checkMailboxRequired, checkRateLimit, handleProviderError, parseRecipients, buildDraftPreview, resolveAttachments, AttachmentInputSchema, DraftPreviewSchema, PreviewErrorSchema, } from './compose-helpers.js';
|
|
6
|
+
import { checkMailboxRequired, checkRateLimit, handleProviderError, parseRecipients, buildDraftPreview, resolveAttachments, AttachmentInputSchema, DraftPreviewSchema, PreviewErrorSchema, pathSandbox, } from './compose-helpers.js';
|
|
8
7
|
const ReplyToEmailInput = z.object({
|
|
9
8
|
message_id: z.string(),
|
|
10
9
|
body: z.string(),
|
|
@@ -34,6 +33,7 @@ const ReplyToEmailOutput = z.object({
|
|
|
34
33
|
recoverable: z.boolean(),
|
|
35
34
|
availableMailboxes: z.array(z.string()).optional(),
|
|
36
35
|
defaultMailbox: z.string().optional(),
|
|
36
|
+
retryAfter: z.number().optional(),
|
|
37
37
|
}).optional(),
|
|
38
38
|
});
|
|
39
39
|
function collectCurrentMailboxEmails(ctx) {
|
|
@@ -83,7 +83,7 @@ function collectReplyAllowlistRecipients(ctx, originalMessage, parsedCc, replyAl
|
|
|
83
83
|
}
|
|
84
84
|
export const replyToEmailAction = {
|
|
85
85
|
name: 'reply_to_email',
|
|
86
|
-
description: 'Reply to an email within an existing thread. Default reply_all=true cc\'s the original thread; pass reply_all=false to reply only to the sender. Send path validates all effective recipients against the send allowlist; draft path bypasses.',
|
|
86
|
+
description: 'Reply to an email within an existing thread. Default reply_all=true cc\'s the original thread; pass reply_all=false to reply only to the sender. Send path validates all effective recipients against the send allowlist; draft path bypasses. If a send fails with SEND_STATUS_UNKNOWN, the message may already have been delivered; do not resend without checking Sent Items.',
|
|
87
87
|
input: ReplyToEmailInput,
|
|
88
88
|
output: ReplyToEmailOutput,
|
|
89
89
|
annotations: { readOnlyHint: false, destructiveHint: false },
|
|
@@ -111,7 +111,7 @@ export const replyToEmailAction = {
|
|
|
111
111
|
return { success: false, error: parsed.error };
|
|
112
112
|
}
|
|
113
113
|
// Resolve attachments (sandboxed path reads + validation)
|
|
114
|
-
const attResult = await resolveAttachments(input.attachments, ctx
|
|
114
|
+
const attResult = await resolveAttachments(input.attachments, pathSandbox(ctx));
|
|
115
115
|
if (attResult.error) {
|
|
116
116
|
return { success: false, error: attResult.error };
|
|
117
117
|
}
|
|
@@ -182,12 +182,16 @@ export const replyToEmailAction = {
|
|
|
182
182
|
return rateLimitError;
|
|
183
183
|
}
|
|
184
184
|
try {
|
|
185
|
-
|
|
185
|
+
// Exactly one provider attempt — replies deliver mail through
|
|
186
|
+
// non-idempotent provider endpoints with no idempotency key, so an
|
|
187
|
+
// automatic retry after an ambiguous failure (timeout/5xx post-
|
|
188
|
+
// acceptance) could deliver duplicates. Fail fast instead.
|
|
189
|
+
const result = await ctx.provider.replyToMessage(input.message_id, bodyPlain, {
|
|
186
190
|
cc: parsed.cc,
|
|
187
191
|
bodyHtml,
|
|
188
192
|
replyAll: input.reply_all,
|
|
189
193
|
attachments,
|
|
190
|
-
})
|
|
194
|
+
});
|
|
191
195
|
if (ctx.rateLimiter) {
|
|
192
196
|
ctx.rateLimiter.recordUsage('reply_to_email');
|
|
193
197
|
}
|
|
@@ -198,11 +202,16 @@ export const replyToEmailAction = {
|
|
|
198
202
|
code: result.error.code,
|
|
199
203
|
message: result.error.message,
|
|
200
204
|
recoverable: result.error.recoverable,
|
|
205
|
+
...(typeof result.error.retryAfter === 'number' ? { retryAfter: result.error.retryAfter } : {}),
|
|
201
206
|
} : undefined,
|
|
202
207
|
};
|
|
203
208
|
}
|
|
204
209
|
catch (err) {
|
|
205
|
-
|
|
210
|
+
const handled = handleProviderError(err, 'SEND_STATUS_UNKNOWN');
|
|
211
|
+
if (ctx.rateLimiter && handled.error.code === 'SEND_STATUS_UNKNOWN') {
|
|
212
|
+
ctx.rateLimiter.recordUsage('reply_to_email');
|
|
213
|
+
}
|
|
214
|
+
return handled;
|
|
206
215
|
}
|
|
207
216
|
},
|
|
208
217
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply.js","sourceRoot":"","sources":["../../src/actions/reply.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"reply.js","sourceRoot":"","sources":["../../src/actions/reply.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EACL,oBAAoB,EACpB,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IAC7B,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;SAClD,QAAQ,CAAC,gJAAgJ,CAAC;IAC7J,SAAS,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;SAC5C,QAAQ,CAAC,oHAAoH,CAAC;IACjI,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE;SACpD,QAAQ,CAAC,oIAAoI,CAAC;IACjJ,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;SAChC,QAAQ,CAAC,oGAAoG,CAAC;IACjH,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE;SACnD,QAAQ,CAAC,0EAA0E,CAAC;CACxF,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;IACpB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,OAAO,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IACtC,YAAY,EAAE,kBAAkB,CAAC,QAAQ,EAAE;IAC3C,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC;QACd,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACnB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;QACxB,kBAAkB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE;QAClD,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACrC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;KAClC,CAAC,CAAC,QAAQ,EAAE;CACd,CAAC,CAAC;AAEH,SAAS,2BAA2B,CAAC,GAAkB;IACrD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/C,IAAI,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACnC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,eAAe,GAAG,GAAG,CAAC,WAAW;QACrC,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CACjC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,GAAG,CAAC,WAAY,CAAC,WAAW,EAAE;eAC1D,OAAO,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,GAAG,CAAC,WAAY,CAAC,WAAW,EAAE,CAC1E;QACD,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,MAAM,KAAK,CAAC;YAC/B,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAE5D,IAAI,eAAe,EAAE,YAAY,EAAE,CAAC;QAClC,oBAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAS,+BAA+B,CACtC,GAAkB,EAClB,eAA6B,EAC7B,QAAwB,EACxB,QAAiB;IAEjB,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAC9D,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,IAAuC,EAAE,EAAE;QAC9E,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC9C,IAAI,CAAC,UAAU;YAAE,OAAO;QACxB,IAAI,IAAI,EAAE,kBAAkB,IAAI,oBAAoB,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,OAAO;QAC7E,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAAE,OAAO;QACjC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEzC,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;YAC3C,YAAY,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,MAAM,SAAS,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;YACjD,YAAY,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,QAAQ,EAAE,CAAC;QACjC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAG3B;IACF,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,kXAAkX;IAC/X,KAAK,EAAE,iBAAiB;IACxB,MAAM,EAAE,kBAAkB;IAC1B,WAAW,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE;IAC5D,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACxB,8CAA8C;QAC9C,MAAM,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;QAC3E,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;QACjD,CAAC;QAED,mCAAmC;QACnC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5C,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,8DAA8D;oBACvE,WAAW,EAAE,KAAK;iBACnB;aACF,CAAC;QACJ,CAAC;QAED,+EAA+E;QAC/E,yEAAyE;QACzE,MAAM,MAAM,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACjD,CAAC;QAED,0DAA0D;QAC1D,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;YACpB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;QACpD,CAAC;QACD,MAAM,WAAW,GAAG,SAAS,CAAC,KAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;QAE9E,0CAA0C;QAC1C,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;QACtG,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAEnC,sDAAsD;QACtD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC;gBACnC,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,eAAe;wBACrB,OAAO,EAAE,uDAAuD;wBAChE,WAAW,EAAE,KAAK;qBACnB;iBACF,CAAC;YACJ,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE;oBACnF,EAAE,EAAE,MAAM,CAAC,EAAE;oBACb,QAAQ;oBACR,QAAQ,EAAE,KAAK,CAAC,SAAS;oBACzB,WAAW;iBACZ,CAAC,CAAC;gBACH,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO;oBAC9D,CAAC,CAAC,MAAM,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,OAAO,EAAE;wBAC3D,YAAY,EAAE,CAAC,KAAK,CAAC,cAAc;qBACpC,CAAC;oBACF,CAAC,CAAC,EAAE,CAAC;gBACP,OAAO;oBACL,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,OAAO,EAAE,WAAW,CAAC,OAAO;oBAC5B,GAAG,aAAa;oBAChB,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;wBACzB,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI;wBAC5B,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,OAAO;wBAClC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,WAAW;qBAC3C,CAAC,CAAC,CAAC,SAAS;iBACd,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,OAAO,mBAAmB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,MAAM,eAAe,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxE,MAAM,eAAe,GAAG,+BAA+B,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC;QAEpH,+DAA+D;QAC/D,MAAM,cAAc,GAAG,kBAAkB,CAAC,eAAe,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QAC9E,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC;wBAChD,CAAC,CAAC,cAAc;wBAChB,CAAC,CAAC,iCAAiC;oBACrC,WAAW,EAAE,KAAK;iBACnB;aACF,CAAC;QACJ,CAAC;QAED,mBAAmB;QACnB,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;QACzE,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC;QACxB,CAAC;QAED,IAAI,CAAC;YACH,8DAA8D;YAC9D,mEAAmE;YACnE,gEAAgE;YAChE,2DAA2D;YAC3D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE;gBAC5E,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,QAAQ;gBACR,QAAQ,EAAE,KAAK,CAAC,SAAS;gBACzB,WAAW;aACZ,CAAC,CAAC;YAEH,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;gBACpB,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YAChD,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;oBAClB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;oBACvB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;oBAC7B,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW;oBACrC,GAAG,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAClG,CAAC,CAAC,CAAC,SAAS;aACd,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC;YAChE,IAAI,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gBACpE,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;IACH,CAAC;CACF,CAAC"}
|
package/dist/actions/send.d.ts
CHANGED
|
@@ -9,8 +9,8 @@ declare const SendEmailInput: z.ZodObject<{
|
|
|
9
9
|
mailbox: z.ZodOptional<z.ZodString>;
|
|
10
10
|
draft: z.ZodOptional<z.ZodBoolean>;
|
|
11
11
|
format: z.ZodOptional<z.ZodEnum<{
|
|
12
|
-
text: "text";
|
|
13
12
|
html: "html";
|
|
13
|
+
text: "text";
|
|
14
14
|
markdown: "markdown";
|
|
15
15
|
}>>;
|
|
16
16
|
force_black: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -57,6 +57,7 @@ declare const SendEmailOutput: z.ZodObject<{
|
|
|
57
57
|
recoverable: z.ZodBoolean;
|
|
58
58
|
availableMailboxes: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
59
59
|
defaultMailbox: z.ZodOptional<z.ZodString>;
|
|
60
|
+
retryAfter: z.ZodOptional<z.ZodNumber>;
|
|
60
61
|
}, z.core.$strip>>;
|
|
61
62
|
}, z.core.$strip>;
|
|
62
63
|
export declare const sendEmailAction: EmailAction<z.infer<typeof SendEmailInput>, z.infer<typeof SendEmailOutput>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/actions/send.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyBjD,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;iBAelB,CAAC;AAEH,QAAA,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"send.d.ts","sourceRoot":"","sources":["../../src/actions/send.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyBjD,QAAA,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;iBAelB,CAAC;AAEH,QAAA,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAenB,CAAC;AAEH,eAAO,MAAM,eAAe,EAAE,WAAW,CACvC,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,EAC9B,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAsMhC,CAAC"}
|
package/dist/actions/send.js
CHANGED
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
import { z } from 'zod';
|
|
3
3
|
import { checkSendAllowlist } from '../security/send-allowlist.js';
|
|
4
4
|
import { checkReplyThreading } from '../security/reply-validation.js';
|
|
5
|
-
import { withRetry } from '../providers/provider.js';
|
|
6
5
|
import { truncateBody, BODY_SIZE_LIMIT } from '../content/body-loader.js';
|
|
7
6
|
import { renderEmailBody } from '../content/body-renderer.js';
|
|
8
7
|
import { ScheduledSendAtSchema, scheduledSendNotSupportedError, validateScheduledSendAt, } from './scheduling.js';
|
|
9
|
-
import { checkMailboxRequired, resolveComposeFields, validateRequiredFields, checkRateLimit, handleProviderError, parseRecipients, buildDraftPreview, resolveAttachments, AttachmentInputSchema, DraftPreviewSchema, PreviewErrorSchema, } from './compose-helpers.js';
|
|
8
|
+
import { checkMailboxRequired, resolveComposeFields, validateRequiredFields, checkRateLimit, handleProviderError, parseRecipients, buildDraftPreview, resolveAttachments, AttachmentInputSchema, DraftPreviewSchema, PreviewErrorSchema, pathSandbox, } from './compose-helpers.js';
|
|
10
9
|
const SendEmailInput = z.object({
|
|
11
10
|
to: z.string().or(z.array(z.string())).optional(),
|
|
12
11
|
cc: z.array(z.string()).optional(),
|
|
@@ -36,11 +35,12 @@ const SendEmailOutput = z.object({
|
|
|
36
35
|
recoverable: z.boolean(),
|
|
37
36
|
availableMailboxes: z.array(z.string()).optional(),
|
|
38
37
|
defaultMailbox: z.string().optional(),
|
|
38
|
+
retryAfter: z.number().optional(),
|
|
39
39
|
}).optional(),
|
|
40
40
|
});
|
|
41
41
|
export const sendEmailAction = {
|
|
42
42
|
name: 'send_email',
|
|
43
|
-
description: 'Compose and send a new email. Gated by send allowlist. Draft mode bypasses allowlist.',
|
|
43
|
+
description: 'Compose and send a new email. Gated by send allowlist. Draft mode bypasses allowlist. If a send fails with SEND_STATUS_UNKNOWN, the message may already have been delivered; do not resend without checking Sent Items.',
|
|
44
44
|
input: SendEmailInput,
|
|
45
45
|
output: SendEmailOutput,
|
|
46
46
|
annotations: { readOnlyHint: false, destructiveHint: false },
|
|
@@ -68,14 +68,14 @@ export const sendEmailAction = {
|
|
|
68
68
|
scheduledSendAt = validated.value;
|
|
69
69
|
}
|
|
70
70
|
// Resolve body content and frontmatter
|
|
71
|
-
const fields = await resolveComposeFields(input, ctx
|
|
71
|
+
const fields = await resolveComposeFields(input, pathSandbox(ctx));
|
|
72
72
|
if (fields.error) {
|
|
73
73
|
return { success: false, error: fields.error };
|
|
74
74
|
}
|
|
75
75
|
const { to, cc, subject, draft, format, forceBlack } = fields;
|
|
76
76
|
let { body } = fields;
|
|
77
77
|
// Resolve attachments (sandboxed path reads + validation)
|
|
78
|
-
const attResult = await resolveAttachments(input.attachments, ctx
|
|
78
|
+
const attResult = await resolveAttachments(input.attachments, pathSandbox(ctx));
|
|
79
79
|
if (attResult.error) {
|
|
80
80
|
return { success: false, error: attResult.error };
|
|
81
81
|
}
|
|
@@ -181,6 +181,7 @@ export const sendEmailAction = {
|
|
|
181
181
|
code: result.error.code,
|
|
182
182
|
message: result.error.message,
|
|
183
183
|
recoverable: result.error.recoverable,
|
|
184
|
+
...(typeof result.error.retryAfter === 'number' ? { retryAfter: result.error.retryAfter } : {}),
|
|
184
185
|
} : undefined,
|
|
185
186
|
};
|
|
186
187
|
}
|
|
@@ -188,9 +189,14 @@ export const sendEmailAction = {
|
|
|
188
189
|
return handleProviderError(err, 'SCHEDULE_SEND_FAILED');
|
|
189
190
|
}
|
|
190
191
|
}
|
|
191
|
-
// Immediate send
|
|
192
|
+
// Immediate send — exactly one provider attempt. Graph /sendMail (and
|
|
193
|
+
// Gmail messages.send) are non-idempotent POSTs with no idempotency key:
|
|
194
|
+
// a timeout or 5xx after the provider accepted the message is
|
|
195
|
+
// indistinguishable from a pre-acceptance failure, so an automatic retry
|
|
196
|
+
// can silently deliver duplicates. Fail fast and surface the structured
|
|
197
|
+
// error instead (mirrors the scheduled-send branch above).
|
|
192
198
|
try {
|
|
193
|
-
const result = await
|
|
199
|
+
const result = await ctx.provider.sendMessage(composeMessage);
|
|
194
200
|
if (ctx.rateLimiter) {
|
|
195
201
|
ctx.rateLimiter.recordUsage('send_email');
|
|
196
202
|
}
|
|
@@ -201,11 +207,16 @@ export const sendEmailAction = {
|
|
|
201
207
|
code: result.error.code,
|
|
202
208
|
message: result.error.message,
|
|
203
209
|
recoverable: result.error.recoverable,
|
|
210
|
+
...(typeof result.error.retryAfter === 'number' ? { retryAfter: result.error.retryAfter } : {}),
|
|
204
211
|
} : undefined,
|
|
205
212
|
};
|
|
206
213
|
}
|
|
207
214
|
catch (err) {
|
|
208
|
-
|
|
215
|
+
const handled = handleProviderError(err, 'SEND_STATUS_UNKNOWN');
|
|
216
|
+
if (ctx.rateLimiter && handled.error.code === 'SEND_STATUS_UNKNOWN') {
|
|
217
|
+
ctx.rateLimiter.recordUsage('send_email');
|
|
218
|
+
}
|
|
219
|
+
return handled;
|
|
209
220
|
}
|
|
210
221
|
},
|
|
211
222
|
};
|
package/dist/actions/send.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/actions/send.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"send.js","sourceRoot":"","sources":["../../src/actions/send.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type PathSandboxInput } from './safe-path.js';
|
|
1
2
|
export declare const MAX_ATTACHMENT_SIZE: number;
|
|
2
3
|
export interface AttachmentFileResult {
|
|
3
4
|
content?: Buffer;
|
|
@@ -15,5 +16,5 @@ export interface AttachmentFileResult {
|
|
|
15
16
|
* the check and read cannot race against a file swap. Never throws — all
|
|
16
17
|
* filesystem errors are mapped to a structured error result.
|
|
17
18
|
*/
|
|
18
|
-
export declare function resolveAttachmentFile(filePath: string,
|
|
19
|
+
export declare function resolveAttachmentFile(filePath: string, sandbox?: PathSandboxInput): Promise<AttachmentFileResult>;
|
|
19
20
|
//# sourceMappingURL=attachment-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment-loader.d.ts","sourceRoot":"","sources":["../../src/content/attachment-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"attachment-loader.d.ts","sourceRoot":"","sources":["../../src/content/attachment-loader.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwC,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE7F,eAAO,MAAM,mBAAmB,QAAmB,CAAC;AAEpD,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;CACjE;AAgCD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAwC/B"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// assertPathInSafeDir, but reads raw bytes — no text-extension gate, no
|
|
4
4
|
// null-byte rejection, no UTF-8 decode, no frontmatter parsing.
|
|
5
5
|
import { open } from 'node:fs/promises';
|
|
6
|
-
import { assertPathInSafeDir } from './safe-path.js';
|
|
6
|
+
import { assertPathInSafeDir, SAFE_READ_FLAGS } from './safe-path.js';
|
|
7
7
|
export const MAX_ATTACHMENT_SIZE = 25 * 1024 * 1024; // 25MB
|
|
8
8
|
/** Map a Node filesystem error to a structured AttachmentFileResult error. */
|
|
9
9
|
function mapFsError(err, filePath) {
|
|
@@ -14,6 +14,15 @@ function mapFsError(err, filePath) {
|
|
|
14
14
|
if (code === 'EACCES' || code === 'EPERM') {
|
|
15
15
|
return { error: { code: 'PERMISSION_DENIED', message: `attachment path is not readable: ${filePath}`, recoverable: false } };
|
|
16
16
|
}
|
|
17
|
+
if (code === 'ELOOP') {
|
|
18
|
+
return {
|
|
19
|
+
error: {
|
|
20
|
+
code: 'SYMLINK_ESCAPE',
|
|
21
|
+
message: `attachment path changed to a symlink during validation: ${filePath}`,
|
|
22
|
+
recoverable: false,
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
17
26
|
if (code === 'EISDIR') {
|
|
18
27
|
return { error: { code: 'INVALID_FILE_TYPE', message: `attachment path is not a regular file: ${filePath}`, recoverable: false } };
|
|
19
28
|
}
|
|
@@ -33,15 +42,15 @@ function mapFsError(err, filePath) {
|
|
|
33
42
|
* the check and read cannot race against a file swap. Never throws — all
|
|
34
43
|
* filesystem errors are mapped to a structured error result.
|
|
35
44
|
*/
|
|
36
|
-
export async function resolveAttachmentFile(filePath,
|
|
37
|
-
const pathCheck = await assertPathInSafeDir(filePath,
|
|
45
|
+
export async function resolveAttachmentFile(filePath, sandbox) {
|
|
46
|
+
const pathCheck = await assertPathInSafeDir(filePath, sandbox, 'attachment path');
|
|
38
47
|
if (pathCheck.error) {
|
|
39
48
|
return { error: pathCheck.error };
|
|
40
49
|
}
|
|
41
50
|
const resolved = pathCheck.resolved;
|
|
42
51
|
let filehandle;
|
|
43
52
|
try {
|
|
44
|
-
filehandle = await open(resolved,
|
|
53
|
+
filehandle = await open(resolved, SAFE_READ_FLAGS);
|
|
45
54
|
const fileStat = await filehandle.stat();
|
|
46
55
|
if (!fileStat.isFile()) {
|
|
47
56
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachment-loader.js","sourceRoot":"","sources":["../../src/content/attachment-loader.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,kEAAkE;AAClE,wEAAwE;AACxE,gEAAgE;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"attachment-loader.js","sourceRoot":"","sources":["../../src/content/attachment-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type FrontmatterFields } from './frontmatter.js';
|
|
2
|
+
import { type PathSandboxInput } from './safe-path.js';
|
|
2
3
|
export declare const BODY_SIZE_LIMIT: number;
|
|
3
4
|
export declare const TEXT_EXTENSIONS: Set<string>;
|
|
4
5
|
export interface BodyFileResult {
|
|
@@ -10,6 +11,6 @@ export interface BodyFileResult {
|
|
|
10
11
|
recoverable: boolean;
|
|
11
12
|
};
|
|
12
13
|
}
|
|
13
|
-
export declare function resolveBodyFile(bodyFile: string,
|
|
14
|
+
export declare function resolveBodyFile(bodyFile: string, sandbox?: PathSandboxInput): Promise<BodyFileResult>;
|
|
14
15
|
export declare function truncateBody(body: string, maxBytes?: number): string;
|
|
15
16
|
//# sourceMappingURL=body-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-loader.d.ts","sourceRoot":"","sources":["../../src/content/body-loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"body-loader.d.ts","sourceRoot":"","sources":["../../src/content/body-loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAwC,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE7F,eAAO,MAAM,eAAe,QAAoB,CAAC;AACjD,eAAO,MAAM,eAAe,aAAqD,CAAC;AAElF,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAA;KAAE,CAAC;CACjE;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,cAAc,CAAC,CA8DzB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAwB,GAAG,MAAM,CAcrF"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
// Shared body-file resolution — safe file loading with frontmatter support
|
|
2
|
-
import {
|
|
2
|
+
import { open } from 'node:fs/promises';
|
|
3
3
|
import { extname } from 'node:path';
|
|
4
4
|
import { parseFrontmatter } from './frontmatter.js';
|
|
5
|
-
import { assertPathInSafeDir } from './safe-path.js';
|
|
5
|
+
import { assertPathInSafeDir, SAFE_READ_FLAGS } from './safe-path.js';
|
|
6
6
|
export const BODY_SIZE_LIMIT = 3.5 * 1024 * 1024; // 3.5MB
|
|
7
7
|
export const TEXT_EXTENSIONS = new Set(['.md', '.html', '.htm', '.txt', '.text']);
|
|
8
|
-
export async function resolveBodyFile(bodyFile,
|
|
9
|
-
const pathCheck = await assertPathInSafeDir(bodyFile,
|
|
8
|
+
export async function resolveBodyFile(bodyFile, sandbox) {
|
|
9
|
+
const pathCheck = await assertPathInSafeDir(bodyFile, sandbox, 'body_file');
|
|
10
10
|
if (pathCheck.error) {
|
|
11
11
|
return { error: pathCheck.error };
|
|
12
12
|
}
|
|
@@ -22,8 +22,30 @@ export async function resolveBodyFile(bodyFile, safeDir) {
|
|
|
22
22
|
},
|
|
23
23
|
};
|
|
24
24
|
}
|
|
25
|
-
// Read
|
|
26
|
-
|
|
25
|
+
// Read through an opened descriptor with O_NOFOLLOW, matching the
|
|
26
|
+
// attachment loader: the validated leaf cannot be swapped for a symlink
|
|
27
|
+
// between the containment check and the read.
|
|
28
|
+
let raw;
|
|
29
|
+
let filehandle;
|
|
30
|
+
try {
|
|
31
|
+
filehandle = await open(resolved, SAFE_READ_FLAGS);
|
|
32
|
+
raw = await filehandle.readFile();
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
if (err?.code === 'ELOOP') {
|
|
36
|
+
return {
|
|
37
|
+
error: {
|
|
38
|
+
code: 'SYMLINK_ESCAPE',
|
|
39
|
+
message: `body_file changed to a symlink during validation: ${bodyFile}`,
|
|
40
|
+
recoverable: false,
|
|
41
|
+
},
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
throw err;
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
await filehandle?.close();
|
|
48
|
+
}
|
|
27
49
|
// Binary file detection: check for null bytes
|
|
28
50
|
if (raw.includes(0)) {
|
|
29
51
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-loader.js","sourceRoot":"","sources":["../../src/content/body-loader.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"body-loader.js","sourceRoot":"","sources":["../../src/content/body-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
/** Env var that adds trusted roots beyond the safe base directory. */
|
|
2
|
+
export declare const ALLOWED_DIRS_ENV = "AGENT_EMAIL_ALLOWED_DIRS";
|
|
3
|
+
/**
|
|
4
|
+
* Open flags for a path already validated by `assertPathInSafeDir`. The
|
|
5
|
+
* returned path is canonical, so its leaf is not a symlink — `O_NOFOLLOW`
|
|
6
|
+
* therefore rejects nothing legitimate, and closes the window in which the
|
|
7
|
+
* leaf is swapped for a symlink between validation and open. Windows has no
|
|
8
|
+
* `O_NOFOLLOW`; there the flags degrade to a plain read.
|
|
9
|
+
*/
|
|
10
|
+
export declare const SAFE_READ_FLAGS: number;
|
|
1
11
|
export interface SafePathError {
|
|
2
12
|
code: string;
|
|
3
13
|
message: string;
|
|
@@ -8,16 +18,54 @@ export interface SafePathResult {
|
|
|
8
18
|
error?: SafePathError;
|
|
9
19
|
}
|
|
10
20
|
/**
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
21
|
+
* Filesystem sandbox for caller-supplied paths: the primary root that relative
|
|
22
|
+
* paths resolve against, plus extra operator-allowlisted roots. A bare string
|
|
23
|
+
* is accepted as shorthand for `{ safeDir }`.
|
|
24
|
+
*/
|
|
25
|
+
export interface PathSandbox {
|
|
26
|
+
safeDir?: string;
|
|
27
|
+
allowedDirs?: readonly string[];
|
|
28
|
+
}
|
|
29
|
+
export type PathSandboxInput = string | PathSandbox | undefined;
|
|
30
|
+
/**
|
|
31
|
+
* Parse a delimiter-separated list of extra allowed roots (the
|
|
32
|
+
* `AGENT_EMAIL_ALLOWED_DIRS` env var). Entries are split on the platform path
|
|
33
|
+
* delimiter (`:` on POSIX, `;` on Windows), trimmed, `~`-expanded, and
|
|
34
|
+
* deduplicated. Non-absolute entries are dropped with a warning rather than
|
|
35
|
+
* silently resolved against the process working directory, since an operator
|
|
36
|
+
* writing a relative root almost certainly means a different directory than
|
|
37
|
+
* whatever cwd the server happens to start in.
|
|
38
|
+
*/
|
|
39
|
+
export declare function parseAllowedDirs(raw: string | undefined, opts?: {
|
|
40
|
+
home?: string;
|
|
41
|
+
}): {
|
|
42
|
+
dirs: string[];
|
|
43
|
+
warnings: string[];
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Resolve `filePath` within the sandbox and verify it does not escape via `..`
|
|
47
|
+
* segments, an absolute path outside every root, or a symlink (leaf OR an
|
|
48
|
+
* ancestor directory). A RELATIVE path resolves against the safe base
|
|
49
|
+
* directory only; an ABSOLUTE path is checked against every root in order and
|
|
50
|
+
* the first containment match wins. Every root and the fully resolved target
|
|
51
|
+
* are canonicalized with `realpath` before the containment check, so a symlink
|
|
52
|
+
* anywhere in the chain that points outside every root is caught — and the
|
|
53
|
+
* comparison is a true path-segment containment test, not a string prefix (so
|
|
54
|
+
* a sibling like `<safeDir>-evil` cannot pass). A root that cannot be
|
|
55
|
+
* canonicalized authorizes nothing.
|
|
56
|
+
*
|
|
57
|
+
* Note the residual TOCTOU window: this returns a canonical *pathname* that
|
|
58
|
+
* the caller then opens. The leaf cannot be swapped for a symlink (callers
|
|
59
|
+
* open with `O_NOFOLLOW`), but an ancestor directory inside a root could be
|
|
60
|
+
* replaced between validation and open. Allowlisted roots and their ancestors
|
|
61
|
+
* must therefore not be writable by untrusted principals.
|
|
62
|
+
*
|
|
63
|
+
* A symlink that lands inside *another* allowlisted root is accepted: the
|
|
64
|
+
* operator has already declared that directory trusted, so which root the
|
|
65
|
+
* caller entered through does not change what they are permitted to read.
|
|
18
66
|
*
|
|
19
67
|
* `fieldName` is interpolated into error messages (e.g. "body_file",
|
|
20
68
|
* "attachment path") so callers get a field-specific message.
|
|
21
69
|
*/
|
|
22
|
-
export declare function assertPathInSafeDir(filePath: string,
|
|
70
|
+
export declare function assertPathInSafeDir(filePath: string, sandbox: PathSandboxInput, fieldName: string): Promise<SafePathResult>;
|
|
23
71
|
//# sourceMappingURL=safe-path.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safe-path.d.ts","sourceRoot":"","sources":["../../src/content/safe-path.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"safe-path.d.ts","sourceRoot":"","sources":["../../src/content/safe-path.ts"],"names":[],"mappings":"AAUA,sEAAsE;AACtE,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAE3D;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,QAAuD,CAAC;AAEpF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACjC;AAED,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,WAAW,GAAG,SAAS,CAAC;AAuBhE;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CA0BxC;AAeD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,gBAAgB,EACzB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,cAAc,CAAC,CAoEzB"}
|