@mcp-z/mcp-outlook 2.4.1 → 2.4.3
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/README.md +5 -1
- package/dist/cjs/constants.d.cts +1 -0
- package/dist/cjs/constants.d.ts +1 -0
- package/dist/cjs/constants.js +4 -0
- package/dist/cjs/constants.js.map +1 -1
- package/dist/cjs/email/querying/next-link.d.cts +5 -0
- package/dist/cjs/email/querying/next-link.d.ts +5 -0
- package/dist/cjs/email/querying/next-link.js +30 -0
- package/dist/cjs/email/querying/next-link.js.map +1 -0
- package/dist/cjs/email/querying/pagination-token.d.cts +3 -4
- package/dist/cjs/email/querying/pagination-token.d.ts +3 -4
- package/dist/cjs/email/querying/pagination-token.js +71 -49
- package/dist/cjs/email/querying/pagination-token.js.map +1 -1
- package/dist/cjs/email/querying/paging-decisions.d.cts +14 -0
- package/dist/cjs/email/querying/paging-decisions.d.ts +14 -0
- package/dist/cjs/email/querying/paging-decisions.js +91 -0
- package/dist/cjs/email/querying/paging-decisions.js.map +1 -0
- package/dist/cjs/email/querying/search-execution.js +130 -88
- package/dist/cjs/email/querying/search-execution.js.map +1 -1
- package/dist/cjs/lib/create-store.js +1 -1
- package/dist/cjs/lib/create-store.js.map +1 -1
- package/dist/cjs/mcp/tools/message-search.d.cts +1 -1
- package/dist/cjs/mcp/tools/message-search.d.ts +1 -1
- package/dist/cjs/mcp/tools/message-search.js +1 -1
- package/dist/cjs/mcp/tools/message-search.js.map +1 -1
- package/dist/cjs/mcp/tools/messages-export-csv.js +10 -6
- package/dist/cjs/mcp/tools/messages-export-csv.js.map +1 -1
- package/dist/cjs/setup/config.d.cts +2 -6
- package/dist/cjs/setup/config.d.ts +2 -6
- package/dist/cjs/setup/config.js +22 -0
- package/dist/cjs/setup/config.js.map +1 -1
- package/dist/cjs/setup/http.js +2 -1
- package/dist/cjs/setup/http.js.map +1 -1
- package/dist/cjs/setup/oauth-microsoft.d.cts +6 -1
- package/dist/cjs/setup/oauth-microsoft.d.ts +6 -1
- package/dist/cjs/setup/oauth-microsoft.js +5 -1
- package/dist/cjs/setup/oauth-microsoft.js.map +1 -1
- package/dist/cjs/setup/runtime.d.cts +1 -1
- package/dist/cjs/setup/runtime.d.ts +1 -1
- package/dist/cjs/setup/runtime.js +11 -6
- package/dist/cjs/setup/runtime.js.map +1 -1
- package/dist/cjs/setup/version-help.js +1 -1
- package/dist/cjs/setup/version-help.js.map +1 -1
- package/dist/esm/constants.d.ts +1 -0
- package/dist/esm/constants.js +2 -0
- package/dist/esm/constants.js.map +1 -1
- package/dist/esm/email/querying/next-link.d.ts +5 -0
- package/dist/esm/email/querying/next-link.js +22 -0
- package/dist/esm/email/querying/next-link.js.map +1 -0
- package/dist/esm/email/querying/pagination-token.d.ts +3 -4
- package/dist/esm/email/querying/pagination-token.js +22 -44
- package/dist/esm/email/querying/pagination-token.js.map +1 -1
- package/dist/esm/email/querying/paging-decisions.d.ts +14 -0
- package/dist/esm/email/querying/paging-decisions.js +21 -0
- package/dist/esm/email/querying/paging-decisions.js.map +1 -0
- package/dist/esm/email/querying/search-execution.js +82 -77
- package/dist/esm/email/querying/search-execution.js.map +1 -1
- package/dist/esm/lib/create-store.js +1 -1
- package/dist/esm/lib/create-store.js.map +1 -1
- package/dist/esm/mcp/tools/message-search.d.ts +1 -1
- package/dist/esm/mcp/tools/message-search.js +1 -1
- package/dist/esm/mcp/tools/message-search.js.map +1 -1
- package/dist/esm/mcp/tools/messages-export-csv.js +10 -6
- package/dist/esm/mcp/tools/messages-export-csv.js.map +1 -1
- package/dist/esm/setup/config.d.ts +2 -6
- package/dist/esm/setup/config.js +24 -6
- package/dist/esm/setup/config.js.map +1 -1
- package/dist/esm/setup/http.js +2 -1
- package/dist/esm/setup/http.js.map +1 -1
- package/dist/esm/setup/oauth-microsoft.d.ts +6 -1
- package/dist/esm/setup/oauth-microsoft.js +6 -2
- package/dist/esm/setup/oauth-microsoft.js.map +1 -1
- package/dist/esm/setup/runtime.d.ts +1 -1
- package/dist/esm/setup/runtime.js +11 -5
- package/dist/esm/setup/runtime.js.map +1 -1
- package/dist/esm/setup/version-help.js +3 -7
- package/dist/esm/setup/version-help.js.map +1 -1
- package/package.json +10 -4
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { buildClientPredicate } from './client-filter.js';
|
|
2
|
-
import {
|
|
2
|
+
import { checkNextLink } from './next-link.js';
|
|
3
|
+
import { decodeNextPageToken, encodeNextPageToken } from './pagination-token.js';
|
|
4
|
+
import { midPageToken, resumeCollection } from './paging-decisions.js';
|
|
3
5
|
import { buildQueryFilter, toGraphFilter } from './query-builder.js';
|
|
4
6
|
export async function searchMessages(graph, opts) {
|
|
5
7
|
var _graphPlan_search;
|
|
@@ -29,21 +31,28 @@ export async function searchMessages(graph, opts) {
|
|
|
29
31
|
const result = await fetchGraphPage(graph, {
|
|
30
32
|
search: (_graphPlan_search1 = graphPlan.search) !== null && _graphPlan_search1 !== void 0 ? _graphPlan_search1 : undefined,
|
|
31
33
|
filter: (_graphPlan_filter = graphPlan.filter) !== null && _graphPlan_filter !== void 0 ? _graphPlan_filter : undefined,
|
|
32
|
-
|
|
34
|
+
link: pageState.link,
|
|
33
35
|
includeBody: effectiveIncludeBody,
|
|
34
36
|
pageSize,
|
|
35
37
|
logger
|
|
36
38
|
});
|
|
37
39
|
return {
|
|
38
40
|
messages: result.messages,
|
|
39
|
-
|
|
41
|
+
...result.nextLink && {
|
|
42
|
+
nextPageToken: encodeNextPageToken({
|
|
43
|
+
link: result.nextLink,
|
|
44
|
+
offset: 0
|
|
45
|
+
})
|
|
46
|
+
}
|
|
40
47
|
};
|
|
41
48
|
}
|
|
42
|
-
const
|
|
49
|
+
const resumeFilter = pageToken !== undefined && resumeCollection(pageState.mode) === 'filter';
|
|
50
|
+
const fallbackFilter = query ? buildQueryFilter(query).trim() : '';
|
|
51
|
+
const searchResult = resumeFilter ? EMPTY_COLLECT : await collectClientFilteredPages({
|
|
43
52
|
graph,
|
|
44
53
|
search: (_graphPlan_search = graphPlan.search) !== null && _graphPlan_search !== void 0 ? _graphPlan_search : undefined,
|
|
45
54
|
filter: undefined,
|
|
46
|
-
|
|
55
|
+
startLink: pageState.link,
|
|
47
56
|
startOffset: pageState.offset,
|
|
48
57
|
predicate,
|
|
49
58
|
includeBody: effectiveIncludeBody,
|
|
@@ -64,11 +73,11 @@ export async function searchMessages(graph, opts) {
|
|
|
64
73
|
nextPageToken: searchResult.midPageToken
|
|
65
74
|
};
|
|
66
75
|
}
|
|
67
|
-
if (searchResult.
|
|
76
|
+
if (searchResult.nextLink) {
|
|
68
77
|
return {
|
|
69
78
|
messages: searchResult.collected,
|
|
70
79
|
nextPageToken: encodeNextPageToken({
|
|
71
|
-
|
|
80
|
+
link: searchResult.nextLink,
|
|
72
81
|
offset: 0,
|
|
73
82
|
mode: 'search'
|
|
74
83
|
})
|
|
@@ -80,7 +89,6 @@ export async function searchMessages(graph, opts) {
|
|
|
80
89
|
};
|
|
81
90
|
}
|
|
82
91
|
if (predicate && query) {
|
|
83
|
-
const fallbackFilter = buildQueryFilter(query).trim();
|
|
84
92
|
if (fallbackFilter) {
|
|
85
93
|
const fallbackResult = await collectClientFilteredPages({
|
|
86
94
|
graph,
|
|
@@ -91,8 +99,8 @@ export async function searchMessages(graph, opts) {
|
|
|
91
99
|
logger,
|
|
92
100
|
maxPages: maxPages !== null && maxPages !== void 0 ? maxPages : null,
|
|
93
101
|
maxItemsScanned: maxItemsScanned !== null && maxItemsScanned !== void 0 ? maxItemsScanned : null,
|
|
94
|
-
|
|
95
|
-
startOffset: 0,
|
|
102
|
+
startLink: resumeFilter ? pageState.link : undefined,
|
|
103
|
+
startOffset: resumeFilter ? pageState.offset : 0,
|
|
96
104
|
mode: 'filter'
|
|
97
105
|
});
|
|
98
106
|
if (fallbackResult.capHit) {
|
|
@@ -106,11 +114,11 @@ export async function searchMessages(graph, opts) {
|
|
|
106
114
|
nextPageToken: fallbackResult.midPageToken
|
|
107
115
|
};
|
|
108
116
|
}
|
|
109
|
-
if (fallbackResult.
|
|
117
|
+
if (fallbackResult.nextLink) {
|
|
110
118
|
return {
|
|
111
119
|
messages: fallbackResult.collected,
|
|
112
120
|
nextPageToken: encodeNextPageToken({
|
|
113
|
-
|
|
121
|
+
link: fallbackResult.nextLink,
|
|
114
122
|
offset: 0,
|
|
115
123
|
mode: 'filter'
|
|
116
124
|
})
|
|
@@ -128,76 +136,73 @@ export async function searchMessages(graph, opts) {
|
|
|
128
136
|
};
|
|
129
137
|
}
|
|
130
138
|
async function fetchGraphPage(graph, params) {
|
|
131
|
-
const { search, filter,
|
|
132
|
-
let request
|
|
133
|
-
if (
|
|
134
|
-
request =
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
139
|
+
const { search, filter, link, includeBody, pageSize, logger } = params;
|
|
140
|
+
let request;
|
|
141
|
+
if (link) {
|
|
142
|
+
request = graph.api(link);
|
|
143
|
+
} else {
|
|
144
|
+
request = graph.api('/me/messages');
|
|
145
|
+
if (search) {
|
|
146
|
+
request = request.search(search);
|
|
147
|
+
}
|
|
148
|
+
if (filter) {
|
|
149
|
+
request = request.filter(filter);
|
|
150
|
+
}
|
|
151
|
+
request = request.top(Math.min(pageSize, 1000));
|
|
152
|
+
const selectFields = includeBody ? [
|
|
153
|
+
'id',
|
|
154
|
+
'conversationId',
|
|
155
|
+
'receivedDateTime',
|
|
156
|
+
'subject',
|
|
157
|
+
'bodyPreview',
|
|
158
|
+
'body',
|
|
159
|
+
'from',
|
|
160
|
+
'toRecipients',
|
|
161
|
+
'ccRecipients',
|
|
162
|
+
'bccRecipients'
|
|
163
|
+
] : [
|
|
164
|
+
'id',
|
|
165
|
+
'conversationId',
|
|
166
|
+
'receivedDateTime',
|
|
167
|
+
'subject',
|
|
168
|
+
'bodyPreview',
|
|
169
|
+
'from',
|
|
170
|
+
'toRecipients',
|
|
171
|
+
'ccRecipients',
|
|
172
|
+
'bccRecipients'
|
|
173
|
+
];
|
|
174
|
+
request = request.select(selectFields.join(','));
|
|
166
175
|
}
|
|
167
176
|
logger.info('Fetching Outlook Graph page', {
|
|
168
177
|
search: !!search,
|
|
169
178
|
filter: !!filter,
|
|
170
|
-
|
|
171
|
-
pageSize:
|
|
179
|
+
link: link ? '[provided]' : undefined,
|
|
180
|
+
pageSize: Math.min(pageSize, 1000)
|
|
172
181
|
});
|
|
173
182
|
const response = await request.get();
|
|
174
183
|
const messages = response.value || [];
|
|
175
|
-
|
|
176
|
-
if (response['@odata.nextLink']) {
|
|
177
|
-
try {
|
|
178
|
-
const nextLinkUrl = new URL(response['@odata.nextLink']);
|
|
179
|
-
nextSkipToken = nextLinkUrl.searchParams.get('$skiptoken') || undefined;
|
|
180
|
-
} catch {
|
|
181
|
-
logger.info('Failed to parse nextLink skipToken', {
|
|
182
|
-
nextLink: response['@odata.nextLink']
|
|
183
|
-
});
|
|
184
|
-
}
|
|
185
|
-
}
|
|
184
|
+
const nextLink = response['@odata.nextLink'] ? checkNextLink(response['@odata.nextLink']) : undefined;
|
|
186
185
|
logger.info(`Graph page returned ${messages.length} messages`, {
|
|
187
|
-
hasNextPage: !!
|
|
186
|
+
hasNextPage: !!nextLink
|
|
188
187
|
});
|
|
189
188
|
return {
|
|
190
189
|
messages,
|
|
191
|
-
|
|
190
|
+
...nextLink && {
|
|
191
|
+
nextLink
|
|
192
|
+
}
|
|
192
193
|
};
|
|
193
194
|
}
|
|
195
|
+
const EMPTY_COLLECT = {
|
|
196
|
+
collected: [],
|
|
197
|
+
capHit: false
|
|
198
|
+
};
|
|
194
199
|
async function collectClientFilteredPages(params) {
|
|
195
|
-
const { graph, search, filter,
|
|
196
|
-
let
|
|
200
|
+
const { graph, search, filter, startLink, startOffset = 0, predicate, includeBody, pageSize, logger, maxPages, maxItemsScanned, mode } = params;
|
|
201
|
+
let currentLink = startLink;
|
|
197
202
|
let offset = startOffset;
|
|
198
203
|
const collected = [];
|
|
199
|
-
let
|
|
200
|
-
let
|
|
204
|
+
let midToken;
|
|
205
|
+
let lastNextLink;
|
|
201
206
|
let capHit = false;
|
|
202
207
|
let pagesFetched = 0;
|
|
203
208
|
let scannedItems = 0;
|
|
@@ -206,17 +211,17 @@ async function collectClientFilteredPages(params) {
|
|
|
206
211
|
capHit = true;
|
|
207
212
|
break;
|
|
208
213
|
}
|
|
209
|
-
const
|
|
214
|
+
const pageLinkUsed = currentLink;
|
|
210
215
|
const graphPage = await fetchGraphPage(graph, {
|
|
211
216
|
search,
|
|
212
217
|
filter,
|
|
213
|
-
|
|
218
|
+
link: currentLink,
|
|
214
219
|
includeBody,
|
|
215
220
|
pageSize,
|
|
216
221
|
logger
|
|
217
222
|
});
|
|
218
223
|
pagesFetched += 1;
|
|
219
|
-
|
|
224
|
+
lastNextLink = graphPage.nextLink;
|
|
220
225
|
const pageItems = graphPage.messages;
|
|
221
226
|
if (!pageItems.length) {
|
|
222
227
|
break;
|
|
@@ -236,24 +241,24 @@ async function collectClientFilteredPages(params) {
|
|
|
236
241
|
}
|
|
237
242
|
collected.push(message);
|
|
238
243
|
if (collected.length === pageSize) {
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
244
|
+
midToken = midPageToken({
|
|
245
|
+
link: pageLinkUsed,
|
|
246
|
+
pageStart: startIndex,
|
|
247
|
+
index: idx,
|
|
243
248
|
mode
|
|
244
249
|
});
|
|
245
250
|
break mainLoop;
|
|
246
251
|
}
|
|
247
252
|
}
|
|
248
|
-
|
|
249
|
-
if (!
|
|
253
|
+
currentLink = graphPage.nextLink;
|
|
254
|
+
if (!currentLink) {
|
|
250
255
|
break;
|
|
251
256
|
}
|
|
252
257
|
}
|
|
253
258
|
return {
|
|
254
259
|
collected,
|
|
255
|
-
midPageToken,
|
|
256
|
-
|
|
260
|
+
midPageToken: midToken,
|
|
261
|
+
nextLink: lastNextLink,
|
|
257
262
|
capHit
|
|
258
263
|
};
|
|
259
264
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/email/querying/search-execution.ts"],"sourcesContent":["import type { Client } from '@microsoft/microsoft-graph-client';\nimport type { Message } from '@microsoft/microsoft-graph-types';\nimport type { OutlookQuery as QueryNode } from '../../schemas/outlook-query-schema.ts';\nimport type { Logger } from '../../types.ts';\nimport { buildClientPredicate } from './client-filter.ts';\nimport { decodeNextPageToken, encodeNextPageToken, FIRST_PAGE_SKIP_TOKEN } from './pagination-token.ts';\nimport { buildQueryFilter, toGraphFilter } from './query-builder.ts';\n\nexport interface OutlookSearchOptions {\n query?: QueryNode;\n limit?: number;\n includeBody?: boolean;\n maxPages?: number | null;\n maxItemsScanned?: number | null;\n pageSize?: number;\n pageToken?: string | undefined;\n logger: Logger;\n}\n\nexport interface OutlookSearchResult {\n messages: Message[];\n nextPageToken?: string | undefined;\n}\n\nexport async function searchMessages(graph: Client, opts: OutlookSearchOptions): Promise<OutlookSearchResult> {\n const { query, includeBody = false, pageSize = 50, pageToken, maxPages = null, maxItemsScanned = null, logger } = opts;\n\n const graphPlan = query\n ? toGraphFilter(query)\n : {\n search: null,\n filter: null,\n requireBodyClientFilter: false,\n hasFullText: false,\n };\n const pageState = decodeNextPageToken(pageToken);\n const useClientFiltering = Boolean(query && graphPlan.hasFullText);\n const predicate = useClientFiltering && query ? buildClientPredicate(query) : null;\n const requireBody = graphPlan.requireBodyClientFilter;\n const effectiveIncludeBody = includeBody || (requireBody && !includeBody);\n\n logger.info('Executing Outlook search', {\n hasSearch: !!graphPlan.search,\n hasFilter: !!graphPlan.filter,\n useClientFiltering,\n pageSize,\n includeBody: effectiveIncludeBody,\n pageToken: pageToken ? '[provided]' : undefined,\n forcedBody: requireBody && !includeBody,\n });\n\n if (!useClientFiltering) {\n const result = await fetchGraphPage(graph, {\n search: graphPlan.search ?? undefined,\n filter: graphPlan.filter ?? undefined,\n skipToken: pageState.skipToken,\n includeBody: effectiveIncludeBody,\n pageSize,\n logger,\n });\n return {\n messages: result.messages,\n nextPageToken: result.nextSkipToken,\n };\n }\n\n const searchResult = await collectClientFilteredPages({\n graph,\n search: graphPlan.search ?? undefined,\n filter: undefined,\n startSkipToken: pageState.skipToken,\n startOffset: pageState.offset,\n predicate,\n includeBody: effectiveIncludeBody,\n pageSize,\n logger,\n maxPages: maxPages ?? null,\n maxItemsScanned: maxItemsScanned ?? null,\n mode: 'search',\n });\n\n if (searchResult.capHit) {\n return { messages: searchResult.collected };\n }\n if (searchResult.midPageToken) {\n return { messages: searchResult.collected, nextPageToken: searchResult.midPageToken };\n }\n if (searchResult.nextSkipToken) {\n return {\n messages: searchResult.collected,\n nextPageToken: encodeNextPageToken({ skipToken: searchResult.nextSkipToken, offset: 0, mode: 'search' }),\n };\n }\n if (searchResult.collected.length > 0) {\n return { messages: searchResult.collected };\n }\n\n if (predicate && query) {\n const fallbackFilter = buildQueryFilter(query).trim();\n if (fallbackFilter) {\n const fallbackResult = await collectClientFilteredPages({\n graph,\n filter: fallbackFilter,\n includeBody: effectiveIncludeBody,\n pageSize,\n predicate,\n logger,\n maxPages: maxPages ?? null,\n maxItemsScanned: maxItemsScanned ?? null,\n startSkipToken: undefined,\n startOffset: 0,\n mode: 'filter',\n });\n\n if (fallbackResult.capHit) {\n return { messages: fallbackResult.collected };\n }\n if (fallbackResult.midPageToken) {\n return { messages: fallbackResult.collected, nextPageToken: fallbackResult.midPageToken };\n }\n if (fallbackResult.nextSkipToken) {\n return {\n messages: fallbackResult.collected,\n nextPageToken: encodeNextPageToken({ skipToken: fallbackResult.nextSkipToken, offset: 0, mode: 'filter' }),\n };\n }\n if (fallbackResult.collected.length > 0) {\n return { messages: fallbackResult.collected };\n }\n }\n }\n\n return { messages: searchResult.collected };\n}\n\ninterface GraphPageParams {\n search?: string;\n filter?: string;\n skipToken?: string;\n includeBody: boolean;\n pageSize: number;\n logger: Logger;\n}\n\nasync function fetchGraphPage(graph: Client, params: GraphPageParams): Promise<{ messages: Message[]; nextSkipToken?: string }> {\n const { search, filter, skipToken, includeBody, pageSize, logger } = params;\n let request = graph.api('/me/messages');\n\n if (search) {\n request = request.search(search);\n }\n if (filter) {\n request = request.filter(filter);\n }\n\n const top = Math.min(pageSize, 1000);\n request = request.top(top);\n\n const selectFields = includeBody ? ['id', 'conversationId', 'receivedDateTime', 'subject', 'bodyPreview', 'body', 'from', 'toRecipients', 'ccRecipients', 'bccRecipients'] : ['id', 'conversationId', 'receivedDateTime', 'subject', 'bodyPreview', 'from', 'toRecipients', 'ccRecipients', 'bccRecipients'];\n request = request.select(selectFields.join(','));\n\n if (skipToken && skipToken !== FIRST_PAGE_SKIP_TOKEN) {\n request = request.skipToken(skipToken);\n }\n\n logger.info('Fetching Outlook Graph page', {\n search: !!search,\n filter: !!filter,\n skipToken: skipToken ? '[provided]' : undefined,\n pageSize: top,\n });\n\n const response = await request.get();\n const messages: Message[] = response.value || [];\n let nextSkipToken: string | undefined;\n if (response['@odata.nextLink']) {\n try {\n const nextLinkUrl = new URL(response['@odata.nextLink']);\n nextSkipToken = nextLinkUrl.searchParams.get('$skiptoken') || undefined;\n } catch {\n logger.info('Failed to parse nextLink skipToken', { nextLink: response['@odata.nextLink'] });\n }\n }\n\n logger.info(`Graph page returned ${messages.length} messages`, {\n hasNextPage: !!nextSkipToken,\n });\n\n return { messages, nextSkipToken };\n}\n\ninterface CollectParams {\n graph: Client;\n search?: string;\n filter?: string;\n startSkipToken?: string;\n startOffset?: number;\n predicate: ((message: Message) => boolean) | null;\n includeBody: boolean;\n pageSize: number;\n logger: Logger;\n maxPages: number | null;\n maxItemsScanned: number | null;\n mode: 'search' | 'filter';\n}\n\ninterface CollectResult {\n collected: Message[];\n midPageToken?: string;\n nextSkipToken?: string;\n capHit: boolean;\n}\n\nasync function collectClientFilteredPages(params: CollectParams): Promise<CollectResult> {\n const { graph, search, filter, startSkipToken, startOffset = 0, predicate, includeBody, pageSize, logger, maxPages, maxItemsScanned, mode } = params;\n let currentSkipToken = startSkipToken;\n let offset = startOffset;\n const collected: Message[] = [];\n let midPageToken: string | undefined;\n let lastNextSkipToken: string | undefined;\n let capHit = false;\n let pagesFetched = 0;\n let scannedItems = 0;\n\n mainLoop: while (collected.length < pageSize) {\n if (maxPages !== null && pagesFetched >= maxPages) {\n capHit = true;\n break;\n }\n\n const pageTokenUsed = currentSkipToken;\n const graphPage = await fetchGraphPage(graph, {\n search,\n filter,\n skipToken: currentSkipToken,\n includeBody,\n pageSize,\n logger,\n });\n\n pagesFetched += 1;\n lastNextSkipToken = graphPage.nextSkipToken;\n const pageItems = graphPage.messages;\n if (!pageItems.length) {\n break;\n }\n\n const startIndex = offset;\n const sliced = startIndex > 0 ? pageItems.slice(startIndex) : pageItems;\n offset = 0;\n\n for (let idx = 0; idx < sliced.length; idx += 1) {\n const message = sliced[idx];\n scannedItems += 1;\n if (maxItemsScanned !== null && scannedItems > maxItemsScanned) {\n capHit = true;\n break mainLoop;\n }\n if (predicate && !predicate(message)) {\n continue;\n }\n collected.push(message);\n if (collected.length === pageSize) {\n const nextOffset = startIndex + idx + 1;\n midPageToken = encodeNextPageToken({\n skipToken: pageTokenUsed,\n offset: nextOffset,\n mode,\n });\n break mainLoop;\n }\n }\n\n currentSkipToken = graphPage.nextSkipToken;\n if (!currentSkipToken) {\n break;\n }\n }\n\n return {\n collected,\n midPageToken,\n nextSkipToken: lastNextSkipToken,\n capHit,\n };\n}\n"],"names":["buildClientPredicate","decodeNextPageToken","encodeNextPageToken","FIRST_PAGE_SKIP_TOKEN","buildQueryFilter","toGraphFilter","searchMessages","graph","opts","graphPlan","query","includeBody","pageSize","pageToken","maxPages","maxItemsScanned","logger","search","filter","requireBodyClientFilter","hasFullText","pageState","useClientFiltering","Boolean","predicate","requireBody","effectiveIncludeBody","info","hasSearch","hasFilter","undefined","forcedBody","result","fetchGraphPage","skipToken","messages","nextPageToken","nextSkipToken","searchResult","collectClientFilteredPages","startSkipToken","startOffset","offset","mode","capHit","collected","midPageToken","length","fallbackFilter","trim","fallbackResult","params","request","api","top","Math","min","selectFields","select","join","response","get","value","nextLinkUrl","URL","searchParams","nextLink","hasNextPage","currentSkipToken","lastNextSkipToken","pagesFetched","scannedItems","mainLoop","pageTokenUsed","graphPage","pageItems","startIndex","sliced","slice","idx","message","push","nextOffset"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/email/querying/search-execution.ts"],"sourcesContent":["import type { Client, GraphRequest } from '@microsoft/microsoft-graph-client';\nimport type { Message } from '@microsoft/microsoft-graph-types';\nimport type { OutlookQuery as QueryNode } from '../../schemas/outlook-query-schema.ts';\nimport type { Logger } from '../../types.ts';\nimport { buildClientPredicate } from './client-filter.ts';\nimport { checkNextLink } from './next-link.ts';\nimport { decodeNextPageToken, encodeNextPageToken } from './pagination-token.ts';\nimport { midPageToken, resumeCollection } from './paging-decisions.ts';\nimport { buildQueryFilter, toGraphFilter } from './query-builder.ts';\n\nexport interface OutlookSearchOptions {\n query?: QueryNode;\n limit?: number;\n includeBody?: boolean;\n maxPages?: number | null;\n maxItemsScanned?: number | null;\n pageSize?: number;\n pageToken?: string | undefined;\n logger: Logger;\n}\n\nexport interface OutlookSearchResult {\n messages: Message[];\n nextPageToken?: string | undefined;\n}\n\nexport async function searchMessages(graph: Client, opts: OutlookSearchOptions): Promise<OutlookSearchResult> {\n const { query, includeBody = false, pageSize = 50, pageToken, maxPages = null, maxItemsScanned = null, logger } = opts;\n\n const graphPlan = query\n ? toGraphFilter(query)\n : {\n search: null,\n filter: null,\n requireBodyClientFilter: false,\n hasFullText: false,\n };\n const pageState = decodeNextPageToken(pageToken);\n const useClientFiltering = Boolean(query && graphPlan.hasFullText);\n const predicate = useClientFiltering && query ? buildClientPredicate(query) : null;\n const requireBody = graphPlan.requireBodyClientFilter;\n const effectiveIncludeBody = includeBody || (requireBody && !includeBody);\n\n logger.info('Executing Outlook search', {\n hasSearch: !!graphPlan.search,\n hasFilter: !!graphPlan.filter,\n useClientFiltering,\n pageSize,\n includeBody: effectiveIncludeBody,\n pageToken: pageToken ? '[provided]' : undefined,\n forcedBody: requireBody && !includeBody,\n });\n\n if (!useClientFiltering) {\n const result = await fetchGraphPage(graph, {\n search: graphPlan.search ?? undefined,\n filter: graphPlan.filter ?? undefined,\n link: pageState.link,\n includeBody: effectiveIncludeBody,\n pageSize,\n logger,\n });\n return {\n messages: result.messages,\n ...(result.nextLink && { nextPageToken: encodeNextPageToken({ link: result.nextLink, offset: 0 }) }),\n };\n }\n\n const resumeFilter = pageToken !== undefined && resumeCollection(pageState.mode) === 'filter';\n const fallbackFilter = query ? buildQueryFilter(query).trim() : '';\n\n const searchResult = resumeFilter\n ? EMPTY_COLLECT\n : await collectClientFilteredPages({\n graph,\n search: graphPlan.search ?? undefined,\n filter: undefined,\n startLink: pageState.link,\n startOffset: pageState.offset,\n predicate,\n includeBody: effectiveIncludeBody,\n pageSize,\n logger,\n maxPages: maxPages ?? null,\n maxItemsScanned: maxItemsScanned ?? null,\n mode: 'search',\n });\n\n if (searchResult.capHit) {\n return { messages: searchResult.collected };\n }\n if (searchResult.midPageToken) {\n return { messages: searchResult.collected, nextPageToken: searchResult.midPageToken };\n }\n if (searchResult.nextLink) {\n return {\n messages: searchResult.collected,\n nextPageToken: encodeNextPageToken({ link: searchResult.nextLink, offset: 0, mode: 'search' }),\n };\n }\n if (searchResult.collected.length > 0) {\n return { messages: searchResult.collected };\n }\n\n if (predicate && query) {\n if (fallbackFilter) {\n const fallbackResult = await collectClientFilteredPages({\n graph,\n filter: fallbackFilter,\n includeBody: effectiveIncludeBody,\n pageSize,\n predicate,\n logger,\n maxPages: maxPages ?? null,\n maxItemsScanned: maxItemsScanned ?? null,\n startLink: resumeFilter ? pageState.link : undefined,\n startOffset: resumeFilter ? pageState.offset : 0,\n mode: 'filter',\n });\n\n if (fallbackResult.capHit) {\n return { messages: fallbackResult.collected };\n }\n if (fallbackResult.midPageToken) {\n return { messages: fallbackResult.collected, nextPageToken: fallbackResult.midPageToken };\n }\n if (fallbackResult.nextLink) {\n return {\n messages: fallbackResult.collected,\n nextPageToken: encodeNextPageToken({ link: fallbackResult.nextLink, offset: 0, mode: 'filter' }),\n };\n }\n if (fallbackResult.collected.length > 0) {\n return { messages: fallbackResult.collected };\n }\n }\n }\n\n return { messages: searchResult.collected };\n}\n\ninterface GraphPageParams {\n search?: string;\n filter?: string;\n /** Path and query of a next-page link; when set it is requested as given and the other parameters are not used. */\n link?: string | undefined;\n includeBody: boolean;\n pageSize: number;\n logger: Logger;\n}\n\nasync function fetchGraphPage(graph: Client, params: GraphPageParams): Promise<{ messages: Message[]; nextLink?: string }> {\n const { search, filter, link, includeBody, pageSize, logger } = params;\n let request: GraphRequest;\n\n if (link) {\n request = graph.api(link);\n } else {\n request = graph.api('/me/messages');\n if (search) {\n request = request.search(search);\n }\n if (filter) {\n request = request.filter(filter);\n }\n request = request.top(Math.min(pageSize, 1000));\n const selectFields = includeBody ? ['id', 'conversationId', 'receivedDateTime', 'subject', 'bodyPreview', 'body', 'from', 'toRecipients', 'ccRecipients', 'bccRecipients'] : ['id', 'conversationId', 'receivedDateTime', 'subject', 'bodyPreview', 'from', 'toRecipients', 'ccRecipients', 'bccRecipients'];\n request = request.select(selectFields.join(','));\n }\n\n logger.info('Fetching Outlook Graph page', {\n search: !!search,\n filter: !!filter,\n link: link ? '[provided]' : undefined,\n pageSize: Math.min(pageSize, 1000),\n });\n\n const response = await request.get();\n const messages: Message[] = response.value || [];\n const nextLink: string | undefined = response['@odata.nextLink'] ? checkNextLink(response['@odata.nextLink']) : undefined;\n\n logger.info(`Graph page returned ${messages.length} messages`, {\n hasNextPage: !!nextLink,\n });\n\n return { messages, ...(nextLink && { nextLink }) };\n}\n\ninterface CollectParams {\n graph: Client;\n search?: string;\n filter?: string;\n startLink?: string | undefined;\n startOffset?: number;\n predicate: ((message: Message) => boolean) | null;\n includeBody: boolean;\n pageSize: number;\n logger: Logger;\n maxPages: number | null;\n maxItemsScanned: number | null;\n mode: 'search' | 'filter';\n}\n\ninterface CollectResult {\n collected: Message[];\n midPageToken?: string;\n nextLink?: string;\n capHit: boolean;\n}\n\nconst EMPTY_COLLECT: CollectResult = { collected: [], capHit: false };\n\nasync function collectClientFilteredPages(params: CollectParams): Promise<CollectResult> {\n const { graph, search, filter, startLink, startOffset = 0, predicate, includeBody, pageSize, logger, maxPages, maxItemsScanned, mode } = params;\n let currentLink = startLink;\n let offset = startOffset;\n const collected: Message[] = [];\n let midToken: string | undefined;\n let lastNextLink: string | undefined;\n let capHit = false;\n let pagesFetched = 0;\n let scannedItems = 0;\n\n mainLoop: while (collected.length < pageSize) {\n if (maxPages !== null && pagesFetched >= maxPages) {\n capHit = true;\n break;\n }\n\n const pageLinkUsed = currentLink;\n const graphPage = await fetchGraphPage(graph, {\n search,\n filter,\n link: currentLink,\n includeBody,\n pageSize,\n logger,\n });\n\n pagesFetched += 1;\n lastNextLink = graphPage.nextLink;\n const pageItems = graphPage.messages;\n if (!pageItems.length) {\n break;\n }\n\n const startIndex = offset;\n const sliced = startIndex > 0 ? pageItems.slice(startIndex) : pageItems;\n offset = 0;\n\n for (let idx = 0; idx < sliced.length; idx += 1) {\n const message = sliced[idx];\n scannedItems += 1;\n if (maxItemsScanned !== null && scannedItems > maxItemsScanned) {\n capHit = true;\n break mainLoop;\n }\n if (predicate && !predicate(message)) {\n continue;\n }\n collected.push(message);\n if (collected.length === pageSize) {\n midToken = midPageToken({ link: pageLinkUsed, pageStart: startIndex, index: idx, mode });\n break mainLoop;\n }\n }\n\n currentLink = graphPage.nextLink;\n if (!currentLink) {\n break;\n }\n }\n\n return {\n collected,\n midPageToken: midToken,\n nextLink: lastNextLink,\n capHit,\n };\n}\n"],"names":["buildClientPredicate","checkNextLink","decodeNextPageToken","encodeNextPageToken","midPageToken","resumeCollection","buildQueryFilter","toGraphFilter","searchMessages","graph","opts","graphPlan","query","includeBody","pageSize","pageToken","maxPages","maxItemsScanned","logger","search","filter","requireBodyClientFilter","hasFullText","pageState","useClientFiltering","Boolean","predicate","requireBody","effectiveIncludeBody","info","hasSearch","hasFilter","undefined","forcedBody","result","fetchGraphPage","link","messages","nextLink","nextPageToken","offset","resumeFilter","mode","fallbackFilter","trim","searchResult","EMPTY_COLLECT","collectClientFilteredPages","startLink","startOffset","capHit","collected","length","fallbackResult","params","request","api","top","Math","min","selectFields","select","join","response","get","value","hasNextPage","currentLink","midToken","lastNextLink","pagesFetched","scannedItems","mainLoop","pageLinkUsed","graphPage","pageItems","startIndex","sliced","slice","idx","message","push","pageStart","index"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';
|
|
2
|
-
// keyv-file is a direct dependency so
|
|
2
|
+
// keyv-file is a direct dependency so explicit file:// URIs resolve; keyv-registry
|
|
3
3
|
// loads adapters with require() rather than depending on any of them itself.
|
|
4
4
|
export default async function createStore(uri, logger) {
|
|
5
5
|
const store = await keyvRegistry(uri);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/lib/create-store.ts"],"sourcesContent":["import type { Logger } from '@mcp-z/server';\nimport type Keyv from 'keyv';\nimport keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';\n\n// keyv-file is a direct dependency so
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/lib/create-store.ts"],"sourcesContent":["import type { Logger } from '@mcp-z/server';\nimport type Keyv from 'keyv';\nimport keyvRegistry, { migrateKeyv5Keys } from 'keyv-registry';\n\n// keyv-file is a direct dependency so explicit file:// URIs resolve; keyv-registry\n// loads adapters with require() rather than depending on any of them itself.\n\nexport default async function createStore<T>(uri: string, logger: Logger): Promise<Keyv<T>> {\n const store = await keyvRegistry<T>(uri);\n // Name only the protocol: the URI can hold a password.\n if (!store) throw new Error(`Failed to create store for protocol: ${uri.split(':')[0]}:`);\n // Saved sign-ins written by keyv 5 sit under old keys; move them once. The URI is never logged.\n try {\n const moved = await migrateKeyv5Keys(store as Keyv);\n if (moved > 0) logger.info(`Moved ${moved} saved sign-in entries to the keyv 6 format`);\n } catch (error) {\n // Keep the migration error as the one reported, even if closing the store fails too.\n await store.disconnect().catch(() => {});\n throw error;\n }\n return store;\n}\n"],"names":["keyvRegistry","migrateKeyv5Keys","createStore","uri","logger","store","Error","split","moved","info","error","disconnect","catch"],"mappings":"AAEA,OAAOA,gBAAgBC,gBAAgB,QAAQ,gBAAgB;AAE/D,mFAAmF;AACnF,6EAA6E;AAE7E,eAAe,eAAeC,YAAeC,GAAW,EAAEC,MAAc;IACtE,MAAMC,QAAQ,MAAML,aAAgBG;IACpC,uDAAuD;IACvD,IAAI,CAACE,OAAO,MAAM,IAAIC,MAAM,CAAC,qCAAqC,EAAEH,IAAII,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACxF,gGAAgG;IAChG,IAAI;QACF,MAAMC,QAAQ,MAAMP,iBAAiBI;QACrC,IAAIG,QAAQ,GAAGJ,OAAOK,IAAI,CAAC,CAAC,MAAM,EAAED,MAAM,2CAA2C,CAAC;IACxF,EAAE,OAAOE,OAAO;QACd,qFAAqF;QACrF,MAAML,MAAMM,UAAU,GAAGC,KAAK,CAAC,KAAO;QACtC,MAAMF;IACR;IACA,OAAOL;AACT"}
|
|
@@ -68,7 +68,7 @@ declare function handler({ query, pageSize, pageToken, fields, shape, contentTyp
|
|
|
68
68
|
export default function createTool(): {
|
|
69
69
|
name: string;
|
|
70
70
|
config: {
|
|
71
|
-
readonly description: "Search Outlook messages using structured query objects with flexible field selection.";
|
|
71
|
+
readonly description: "Search Outlook messages using structured query objects with flexible field selection. A pageSize or fields changed alongside a pageToken has no effect, because the token carries the next-page link that governs the page.";
|
|
72
72
|
readonly inputSchema: z.ZodObject<{
|
|
73
73
|
shape: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
|
|
74
74
|
objects: "objects";
|
|
@@ -46,7 +46,7 @@ const outputSchema = z.union([
|
|
|
46
46
|
AuthRequiredBranchSchema
|
|
47
47
|
]);
|
|
48
48
|
const config = {
|
|
49
|
-
description: 'Search Outlook messages using structured query objects with flexible field selection.',
|
|
49
|
+
description: 'Search Outlook messages using structured query objects with flexible field selection. A pageSize or fields changed alongside a pageToken has no effect, because the token carries the next-page link that governs the page.',
|
|
50
50
|
inputSchema: inputSchema,
|
|
51
51
|
outputSchema: z.object({
|
|
52
52
|
result: outputSchema
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/mcp/tools/message-search.ts"],"sourcesContent":["import { EMAIL_COMMON_PATTERNS, EMAIL_FIELD_DESCRIPTIONS, EMAIL_FIELDS, EmailContentTypeSchema, type EmailDetail, EmailDetailSchema, ExcludeThreadHistorySchema, extractCurrentMessageFromHtml, extractCurrentMessageFromHtmlToText } from '@mcp-z/email';\nimport type { EnrichedExtra } from '@mcp-z/oauth-microsoft';\nimport { schemas } from '@mcp-z/oauth-microsoft';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, ProtocolError, ProtocolErrorCode, parseFields, type ToolModule, toColumnarFormat } from '@mcp-z/server';\nimport { Client } from '@microsoft/microsoft-graph-client';\nimport type * as MicrosoftGraph from '@microsoft/microsoft-graph-types';\nimport { z } from 'zod';\nimport { needsBody } from '../../email/querying/client-filter.ts';\nimport { executeQuery as executeOutlookQuery } from '../../email/querying/execute-query.ts';\nimport { InvalidQueryError, OutlookQueryParameterSchema, parseOutlookQueryParameter } from '../../schemas/outlook-query-schema.ts';\n\nconst inputSchema = z.object({\n query: OutlookQueryParameterSchema.optional().describe('Structured query object or JSON string for filtering messages. Use query-syntax prompt for reference and kqlQuery for KQL syntax.'),\n fields: createFieldsSchema({\n availableFields: EMAIL_FIELDS,\n fieldDescriptions: EMAIL_FIELD_DESCRIPTIONS,\n commonPatterns: EMAIL_COMMON_PATTERNS,\n resourceName: 'email message',\n }),\n ...createPaginationSchema({\n defaultPageSize: 50,\n maxPageSize: 500,\n provider: 'outlook',\n }).shape,\n shape: createShapeSchema(),\n contentType: EmailContentTypeSchema,\n excludeThreadHistory: ExcludeThreadHistorySchema,\n});\n\n// Success branch schemas for different shapes\nconst successObjectsBranchSchema = z.object({\n type: z.literal('success'),\n shape: z.literal('objects'),\n items: z.array(EmailDetailSchema).describe('Matching email messages'),\n nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\nconst successArraysBranchSchema = z.object({\n type: z.literal('success'),\n shape: z.literal('arrays'),\n columns: z.array(z.string()).describe('Column names in canonical order'),\n rows: z.array(z.array(z.unknown())).describe('Row data matching column order'),\n nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\n// Output schema with auth_required support\n// Using z.union instead of discriminatedUnion since we have two success branches with different shapes\nconst outputSchema = z.union([successObjectsBranchSchema, successArraysBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n description: 'Search Outlook messages using structured query objects with flexible field selection.',\n inputSchema: inputSchema,\n outputSchema: z.object({\n result: outputSchema,\n }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ query, pageSize = 50, pageToken, fields, shape = 'arrays', contentType, excludeThreadHistory }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n const logger = extra.logger;\n\n try {\n const parsedQuery = parseOutlookQueryParameter(query);\n const requestedFields = parseFields(fields, EMAIL_FIELDS);\n const needsBodyContent = needsBody(parsedQuery);\n const includeBody = requestedFields === 'all' || requestedFields.has('body') || needsBodyContent;\n\n logger.info('outlook.search called with', {\n query: parsedQuery,\n pageSize,\n pageToken: pageToken ? '[provided]' : undefined,\n fields: fields || 'all',\n includeBody,\n });\n\n const graph = Client.initWithMiddleware({\n authProvider: extra.authContext.auth,\n });\n const started = Date.now();\n const exec = await executeOutlookQuery(\n graph,\n parsedQuery,\n {\n logger,\n pageSize,\n ...(pageToken ? { pageToken } : {}),\n includeBody,\n limit: pageSize,\n },\n (m: unknown) => {\n const message = m as MicrosoftGraph.Message;\n const to = Array.isArray(message?.toRecipients)\n ? message.toRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const cc = Array.isArray(message?.ccRecipients)\n ? message.ccRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const bcc = Array.isArray(message?.bccRecipients)\n ? message.bccRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const fromAddr = message?.from?.emailAddress?.address ?? null;\n const fromName = message?.from?.emailAddress?.name ?? null;\n // Process body based on contentType and excludeThreadHistory options\n let bodyContent: string | undefined;\n if (includeBody && message?.body?.content) {\n const isHtml = message.body.contentType?.toLowerCase() === 'html';\n bodyContent = message.body.content;\n\n if (isHtml && excludeThreadHistory) {\n bodyContent = extractCurrentMessageFromHtml(bodyContent);\n }\n\n if (isHtml && contentType === 'text') {\n bodyContent = excludeThreadHistory ? extractCurrentMessageFromHtmlToText(bodyContent) : extractCurrentMessageFromHtmlToText(message.body.content);\n }\n }\n\n const mapped: Partial<EmailDetail> = {\n id: message?.id ?? undefined,\n subject: message?.subject ?? undefined,\n from: fromAddr ?? undefined,\n fromName: fromName ?? undefined,\n to,\n cc,\n bcc,\n date: message?.receivedDateTime ?? undefined,\n snippet: message?.bodyPreview ?? undefined,\n ...(bodyContent && { body: bodyContent, bodyContentType: contentType }),\n };\n return mapped;\n }\n );\n const durationMs = Date.now() - started;\n\n const filteredItems = exec.items.map((item) => filterFields(item, requestedFields));\n logger.info('outlook.message.search returning', {\n query,\n pageSize,\n itemsLength: filteredItems.length,\n fields: fields || 'all',\n });\n logger.info('outlook.message.search metrics', {\n durationMs,\n metadata: exec.metadata,\n });\n\n // Type-safe metadata access\n const metadataObj = exec.metadata as { nextPageToken?: string } | undefined;\n\n // Build result based on shape\n const result: Output =\n shape === 'arrays'\n ? {\n type: 'success' as const,\n shape: 'arrays' as const,\n ...toColumnarFormat(filteredItems, requestedFields, EMAIL_FIELDS),\n ...(metadataObj?.nextPageToken && { nextPageToken: metadataObj.nextPageToken }),\n }\n : {\n type: 'success' as const,\n shape: 'objects' as const,\n items: filteredItems,\n ...(metadataObj?.nextPageToken && { nextPageToken: metadataObj.nextPageToken }),\n };\n\n return {\n content: [\n {\n type: 'text' as const,\n text: JSON.stringify(result),\n },\n ],\n structuredContent: { result },\n };\n } catch (error) {\n if (error instanceof ProtocolError) throw error;\n if (error instanceof InvalidQueryError) throw new ProtocolError(ProtocolErrorCode.InvalidParams, error.message);\n\n const message = error instanceof Error ? error.message : String(error);\n logger.error('outlook.message.search error', { error: message });\n\n throw new ProtocolError(ProtocolErrorCode.InternalError, `Error searching messages: ${message}`, {\n stack: error instanceof Error ? error.stack : undefined,\n });\n }\n}\n\nexport default function createTool() {\n return {\n name: 'message-search',\n config,\n handler,\n } satisfies ToolModule;\n}\n"],"names":["EMAIL_COMMON_PATTERNS","EMAIL_FIELD_DESCRIPTIONS","EMAIL_FIELDS","EmailContentTypeSchema","EmailDetailSchema","ExcludeThreadHistorySchema","extractCurrentMessageFromHtml","extractCurrentMessageFromHtmlToText","schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","ProtocolError","ProtocolErrorCode","parseFields","toColumnarFormat","Client","z","needsBody","executeQuery","executeOutlookQuery","InvalidQueryError","OutlookQueryParameterSchema","parseOutlookQueryParameter","inputSchema","object","query","optional","describe","fields","availableFields","fieldDescriptions","commonPatterns","resourceName","defaultPageSize","maxPageSize","provider","shape","contentType","excludeThreadHistory","successObjectsBranchSchema","type","literal","items","array","nextPageToken","string","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","description","result","handler","pageSize","pageToken","extra","logger","parsedQuery","requestedFields","needsBodyContent","includeBody","has","info","undefined","graph","initWithMiddleware","authProvider","authContext","auth","started","Date","now","exec","limit","m","message","to","Array","isArray","toRecipients","map","r","emailAddress","address","filter","Boolean","join","cc","ccRecipients","bcc","bccRecipients","fromAddr","from","fromName","name","bodyContent","body","content","isHtml","toLowerCase","mapped","id","subject","date","receivedDateTime","snippet","bodyPreview","bodyContentType","durationMs","filteredItems","item","itemsLength","length","metadata","metadataObj","text","JSON","stringify","structuredContent","error","InvalidParams","Error","String","InternalError","stack","createTool"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-outlook/src/mcp/tools/message-search.ts"],"sourcesContent":["import { EMAIL_COMMON_PATTERNS, EMAIL_FIELD_DESCRIPTIONS, EMAIL_FIELDS, EmailContentTypeSchema, type EmailDetail, EmailDetailSchema, ExcludeThreadHistorySchema, extractCurrentMessageFromHtml, extractCurrentMessageFromHtmlToText } from '@mcp-z/email';\nimport type { EnrichedExtra } from '@mcp-z/oauth-microsoft';\nimport { schemas } from '@mcp-z/oauth-microsoft';\n\nconst { AuthRequiredBranchSchema } = schemas;\n\nimport { type CallToolResult, createFieldsSchema, createPaginationSchema, createShapeSchema, filterFields, ProtocolError, ProtocolErrorCode, parseFields, type ToolModule, toColumnarFormat } from '@mcp-z/server';\nimport { Client } from '@microsoft/microsoft-graph-client';\nimport type * as MicrosoftGraph from '@microsoft/microsoft-graph-types';\nimport { z } from 'zod';\nimport { needsBody } from '../../email/querying/client-filter.ts';\nimport { executeQuery as executeOutlookQuery } from '../../email/querying/execute-query.ts';\nimport { InvalidQueryError, OutlookQueryParameterSchema, parseOutlookQueryParameter } from '../../schemas/outlook-query-schema.ts';\n\nconst inputSchema = z.object({\n query: OutlookQueryParameterSchema.optional().describe('Structured query object or JSON string for filtering messages. Use query-syntax prompt for reference and kqlQuery for KQL syntax.'),\n fields: createFieldsSchema({\n availableFields: EMAIL_FIELDS,\n fieldDescriptions: EMAIL_FIELD_DESCRIPTIONS,\n commonPatterns: EMAIL_COMMON_PATTERNS,\n resourceName: 'email message',\n }),\n ...createPaginationSchema({\n defaultPageSize: 50,\n maxPageSize: 500,\n provider: 'outlook',\n }).shape,\n shape: createShapeSchema(),\n contentType: EmailContentTypeSchema,\n excludeThreadHistory: ExcludeThreadHistorySchema,\n});\n\n// Success branch schemas for different shapes\nconst successObjectsBranchSchema = z.object({\n type: z.literal('success'),\n shape: z.literal('objects'),\n items: z.array(EmailDetailSchema).describe('Matching email messages'),\n nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\nconst successArraysBranchSchema = z.object({\n type: z.literal('success'),\n shape: z.literal('arrays'),\n columns: z.array(z.string()).describe('Column names in canonical order'),\n rows: z.array(z.array(z.unknown())).describe('Row data matching column order'),\n nextPageToken: z.string().optional().describe('Token for fetching next page of results'),\n});\n\n// Output schema with auth_required support\n// Using z.union instead of discriminatedUnion since we have two success branches with different shapes\nconst outputSchema = z.union([successObjectsBranchSchema, successArraysBranchSchema, AuthRequiredBranchSchema]);\n\nconst config = {\n description: 'Search Outlook messages using structured query objects with flexible field selection. A pageSize or fields changed alongside a pageToken has no effect, because the token carries the next-page link that governs the page.',\n inputSchema: inputSchema,\n outputSchema: z.object({\n result: outputSchema,\n }),\n} as const;\n\nexport type Input = z.infer<typeof inputSchema>;\nexport type Output = z.infer<typeof outputSchema>;\n\nasync function handler({ query, pageSize = 50, pageToken, fields, shape = 'arrays', contentType, excludeThreadHistory }: Input, extra: EnrichedExtra): Promise<CallToolResult> {\n const logger = extra.logger;\n\n try {\n const parsedQuery = parseOutlookQueryParameter(query);\n const requestedFields = parseFields(fields, EMAIL_FIELDS);\n const needsBodyContent = needsBody(parsedQuery);\n const includeBody = requestedFields === 'all' || requestedFields.has('body') || needsBodyContent;\n\n logger.info('outlook.search called with', {\n query: parsedQuery,\n pageSize,\n pageToken: pageToken ? '[provided]' : undefined,\n fields: fields || 'all',\n includeBody,\n });\n\n const graph = Client.initWithMiddleware({\n authProvider: extra.authContext.auth,\n });\n const started = Date.now();\n const exec = await executeOutlookQuery(\n graph,\n parsedQuery,\n {\n logger,\n pageSize,\n ...(pageToken ? { pageToken } : {}),\n includeBody,\n limit: pageSize,\n },\n (m: unknown) => {\n const message = m as MicrosoftGraph.Message;\n const to = Array.isArray(message?.toRecipients)\n ? message.toRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const cc = Array.isArray(message?.ccRecipients)\n ? message.ccRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const bcc = Array.isArray(message?.bccRecipients)\n ? message.bccRecipients\n .map((r: MicrosoftGraph.Recipient) => r?.emailAddress?.address)\n .filter(Boolean)\n .join(', ')\n : undefined;\n const fromAddr = message?.from?.emailAddress?.address ?? null;\n const fromName = message?.from?.emailAddress?.name ?? null;\n // Process body based on contentType and excludeThreadHistory options\n let bodyContent: string | undefined;\n if (includeBody && message?.body?.content) {\n const isHtml = message.body.contentType?.toLowerCase() === 'html';\n bodyContent = message.body.content;\n\n if (isHtml && excludeThreadHistory) {\n bodyContent = extractCurrentMessageFromHtml(bodyContent);\n }\n\n if (isHtml && contentType === 'text') {\n bodyContent = excludeThreadHistory ? extractCurrentMessageFromHtmlToText(bodyContent) : extractCurrentMessageFromHtmlToText(message.body.content);\n }\n }\n\n const mapped: Partial<EmailDetail> = {\n id: message?.id ?? undefined,\n subject: message?.subject ?? undefined,\n from: fromAddr ?? undefined,\n fromName: fromName ?? undefined,\n to,\n cc,\n bcc,\n date: message?.receivedDateTime ?? undefined,\n snippet: message?.bodyPreview ?? undefined,\n ...(bodyContent && { body: bodyContent, bodyContentType: contentType }),\n };\n return mapped;\n }\n );\n const durationMs = Date.now() - started;\n\n const filteredItems = exec.items.map((item) => filterFields(item, requestedFields));\n logger.info('outlook.message.search returning', {\n query,\n pageSize,\n itemsLength: filteredItems.length,\n fields: fields || 'all',\n });\n logger.info('outlook.message.search metrics', {\n durationMs,\n metadata: exec.metadata,\n });\n\n // Type-safe metadata access\n const metadataObj = exec.metadata as { nextPageToken?: string } | undefined;\n\n // Build result based on shape\n const result: Output =\n shape === 'arrays'\n ? {\n type: 'success' as const,\n shape: 'arrays' as const,\n ...toColumnarFormat(filteredItems, requestedFields, EMAIL_FIELDS),\n ...(metadataObj?.nextPageToken && { nextPageToken: metadataObj.nextPageToken }),\n }\n : {\n type: 'success' as const,\n shape: 'objects' as const,\n items: filteredItems,\n ...(metadataObj?.nextPageToken && { nextPageToken: metadataObj.nextPageToken }),\n };\n\n return {\n content: [\n {\n type: 'text' as const,\n text: JSON.stringify(result),\n },\n ],\n structuredContent: { result },\n };\n } catch (error) {\n if (error instanceof ProtocolError) throw error;\n if (error instanceof InvalidQueryError) throw new ProtocolError(ProtocolErrorCode.InvalidParams, error.message);\n\n const message = error instanceof Error ? error.message : String(error);\n logger.error('outlook.message.search error', { error: message });\n\n throw new ProtocolError(ProtocolErrorCode.InternalError, `Error searching messages: ${message}`, {\n stack: error instanceof Error ? error.stack : undefined,\n });\n }\n}\n\nexport default function createTool() {\n return {\n name: 'message-search',\n config,\n handler,\n } satisfies ToolModule;\n}\n"],"names":["EMAIL_COMMON_PATTERNS","EMAIL_FIELD_DESCRIPTIONS","EMAIL_FIELDS","EmailContentTypeSchema","EmailDetailSchema","ExcludeThreadHistorySchema","extractCurrentMessageFromHtml","extractCurrentMessageFromHtmlToText","schemas","AuthRequiredBranchSchema","createFieldsSchema","createPaginationSchema","createShapeSchema","filterFields","ProtocolError","ProtocolErrorCode","parseFields","toColumnarFormat","Client","z","needsBody","executeQuery","executeOutlookQuery","InvalidQueryError","OutlookQueryParameterSchema","parseOutlookQueryParameter","inputSchema","object","query","optional","describe","fields","availableFields","fieldDescriptions","commonPatterns","resourceName","defaultPageSize","maxPageSize","provider","shape","contentType","excludeThreadHistory","successObjectsBranchSchema","type","literal","items","array","nextPageToken","string","successArraysBranchSchema","columns","rows","unknown","outputSchema","union","config","description","result","handler","pageSize","pageToken","extra","logger","parsedQuery","requestedFields","needsBodyContent","includeBody","has","info","undefined","graph","initWithMiddleware","authProvider","authContext","auth","started","Date","now","exec","limit","m","message","to","Array","isArray","toRecipients","map","r","emailAddress","address","filter","Boolean","join","cc","ccRecipients","bcc","bccRecipients","fromAddr","from","fromName","name","bodyContent","body","content","isHtml","toLowerCase","mapped","id","subject","date","receivedDateTime","snippet","bodyPreview","bodyContentType","durationMs","filteredItems","item","itemsLength","length","metadata","metadataObj","text","JSON","stringify","structuredContent","error","InvalidParams","Error","String","InternalError","stack","createTool"],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { createWriteStream } from 'fs';
|
|
|
8
8
|
import { unlink } from 'fs/promises';
|
|
9
9
|
import { z } from 'zod';
|
|
10
10
|
import { executeQuery as executeOutlookQuery } from '../../email/querying/execute-query.js';
|
|
11
|
+
import { cutToMaxItems } from '../../email/querying/paging-decisions.js';
|
|
11
12
|
import { InvalidQueryError, OutlookQueryParameterSchema, parseOutlookQueryParameter } from '../../schemas/outlook-query-schema.js';
|
|
12
13
|
const DEFAULT_PAGE_SIZE = 50;
|
|
13
14
|
const DEFAULT_MAX_ITEMS = 10000;
|
|
@@ -106,9 +107,10 @@ const config = {
|
|
|
106
107
|
// NO RETRIES: If any error occurs, fail the whole operation and clean up
|
|
107
108
|
let totalRows = 0;
|
|
108
109
|
let nextPageToken;
|
|
110
|
+
let truncated = false;
|
|
109
111
|
const started = Date.now();
|
|
110
112
|
while(totalRows < maxItems){
|
|
111
|
-
var _exec_metadata;
|
|
113
|
+
var _exec_metadata, _exec_metadata1;
|
|
112
114
|
const remainingItems = maxItems - totalRows;
|
|
113
115
|
const pageSize = Math.min(remainingItems, DEFAULT_PAGE_SIZE);
|
|
114
116
|
const exec = await executeOutlookQuery(graph, parsedQuery, {
|
|
@@ -166,7 +168,10 @@ const config = {
|
|
|
166
168
|
labels: categories
|
|
167
169
|
};
|
|
168
170
|
});
|
|
169
|
-
|
|
171
|
+
// The next-page link fixes $top at the first page's size, so a batch can hold more than is still wanted
|
|
172
|
+
const cut = cutToMaxItems(exec.items, totalRows, maxItems, Boolean((_exec_metadata = exec.metadata) === null || _exec_metadata === void 0 ? void 0 : _exec_metadata.nextPageToken));
|
|
173
|
+
truncated = cut.truncated;
|
|
174
|
+
const csvRows = cut.rows.map((item)=>{
|
|
170
175
|
return [
|
|
171
176
|
item.id,
|
|
172
177
|
item.threadId,
|
|
@@ -192,10 +197,10 @@ const config = {
|
|
|
192
197
|
});
|
|
193
198
|
writeStream.write(rowsContent);
|
|
194
199
|
}
|
|
195
|
-
totalRows +=
|
|
196
|
-
nextPageToken = (
|
|
200
|
+
totalRows += cut.rows.length;
|
|
201
|
+
nextPageToken = (_exec_metadata1 = exec.metadata) === null || _exec_metadata1 === void 0 ? void 0 : _exec_metadata1.nextPageToken;
|
|
197
202
|
logger.info('outlook.messages.export-csv batch written', {
|
|
198
|
-
batchSize:
|
|
203
|
+
batchSize: cut.rows.length,
|
|
199
204
|
totalRows,
|
|
200
205
|
hasMore: Boolean(nextPageToken)
|
|
201
206
|
});
|
|
@@ -210,7 +215,6 @@ const config = {
|
|
|
210
215
|
writeStream.on('error', reject);
|
|
211
216
|
});
|
|
212
217
|
const durationMs = Date.now() - started;
|
|
213
|
-
const truncated = totalRows >= maxItems && Boolean(nextPageToken);
|
|
214
218
|
logger.info('outlook.messages.export-csv completed', {
|
|
215
219
|
rowCount: totalRows,
|
|
216
220
|
truncated,
|