@jbctechsolutions/mcp-office365 2.5.1 → 3.0.0

package/dist/graph/repository.js

@@ -55,6 +55,39 @@ export class GraphRepository {
         this.client = new GraphClient(deviceCodeCallback);
     }
     // ===========================================================================
+    // Cache Resolvers (auto-fetch parent on cache miss)
+    // ===========================================================================
+    async resolveTeamId(teamId) {
+        let graphId = this.idCache.teams.get(teamId);
+        if (graphId != null)
+            return graphId;
+        await this.listTeamsAsync();
+        graphId = this.idCache.teams.get(teamId);
+        if (graphId != null)
+            return graphId;
+        throw new Error(`Team ID ${teamId} not found. Verify the ID is correct by calling list_teams.`);
+    }
+    async resolvePlanId(planId) {
+        let cached = this.idCache.plans.get(planId);
+        if (cached != null)
+            return cached;
+        await this.listPlansAsync();
+        cached = this.idCache.plans.get(planId);
+        if (cached != null)
+            return cached;
+        throw new Error(`Plan ID ${planId} not found. Verify the ID is correct by calling list_plans.`);
+    }
+    async resolveChatId(chatId) {
+        let graphId = this.idCache.chats.get(chatId);
+        if (graphId != null)
+            return graphId;
+        await this.listChatsAsync();
+        graphId = this.idCache.chats.get(chatId);
+        if (graphId != null)
+            return graphId;
+        throw new Error(`Chat ID ${chatId} not found. Verify the ID is correct by calling list_chats.`);
+    }
+    // ===========================================================================
     // Folders
     // ===========================================================================
     listFolders() {
@@ -198,10 +231,12 @@ export class GraphRepository {
         return messages.map((m) => mapMessageToEmailRow(m, folderId));
     }
     /**
-     * Advanced search using raw KQL query syntax.
+     * Structured advanced search (U7 / D9). Runs a compiled query on the correct
+     * Graph mechanism ($filter / quoted $search / /search/query), then caches IDs
+     * and maps to EmailRow[] exactly like the raw-KQL path it replaces.
      */
-    async searchEmailsAdvancedAsync(query, limit) {
-        const messages = await this.client.searchMessagesKql(query, limit);
+    async searchEmailsStructuredAsync(compiled, limit) {
+        const messages = await this.runStructuredSearch(compiled, limit);
         for (const msg of messages) {
             if (msg.id != null) {
                 this.idCache.messages.set(hashStringToNumber(msg.id), msg.id);
@@ -212,24 +247,15 @@ export class GraphRepository {
         }
         return messages.map((m) => mapMessageToEmailRow(m));
     }
-    /**
-     * Advanced search in a specific folder using raw KQL query syntax.
-     */
-    async searchEmailsAdvancedInFolderAsync(folderId, query, limit) {
-        const graphFolderId = this.idCache.folders.get(folderId);
-        if (graphFolderId == null) {
-            throw new Error(`Folder ID ${folderId} not found in cache. Try searching for or listing the item first to refresh the cache.`);
+    runStructuredSearch(compiled, limit) {
+        switch (compiled.mechanism) {
+            case 'filter':
+                return this.client.searchMessagesFilter(compiled.filter, limit);
+            case 'search':
+                return this.client.searchMessagesSearchValue(compiled.search, limit);
+            case 'searchQuery':
+                return this.client.searchMessagesQuery(compiled.kql, limit);
         }
-        const messages = await this.client.searchMessagesKqlInFolder(graphFolderId, query, limit);
-        for (const msg of messages) {
-            if (msg.id != null) {
-                this.idCache.messages.set(hashStringToNumber(msg.id), msg.id);
-            }
-            if (msg.conversationId != null) {
-                this.idCache.conversations.set(hashStringToNumber(msg.conversationId), msg.conversationId);
-            }
-        }
-        return messages.map((m) => mapMessageToEmailRow(m));
     }
     async checkNewEmailsAsync(folderId) {
         const graphFolderId = this.idCache.folders.get(folderId);
@@ -993,17 +1019,14 @@ export class GraphRepository {
         const graphMessageId = this.idCache.messages.get(messageId);
         if (graphMessageId == null)
             throw new Error(`Message ID ${messageId} not found in cache. Try searching for or listing the item first to refresh the cache.`);
+        // Pass comment/body through createReply so the quoted thread is preserved
+        const body = comment != null ? { contentType: bodyType, content: comment } : undefined;
         const draft = replyAll
-            ? await this.client.createReplyAllDraft(graphMessageId)
-            : await this.client.createReplyDraft(graphMessageId);
+            ? await this.client.createReplyAllDraft(graphMessageId, undefined, body)
+            : await this.client.createReplyDraft(graphMessageId, undefined, body);
         const graphId = draft.id;
         const numericId = hashStringToNumber(graphId);
         this.idCache.messages.set(numericId, graphId);
-        if (comment != null) {
-            await this.client.updateDraft(graphId, {
-                body: { contentType: bodyType, content: comment },
-            });
-        }
         return { numericId, graphId };
     }
     /**
@@ -1901,9 +1924,7 @@ export class GraphRepository {
      * Lists all channels in a team with cached numeric IDs.
      */
     async listChannelsAsync(teamId) {
-        const graphTeamId = this.idCache.teams.get(teamId);
-        if (graphTeamId == null)
-            throw new Error(`Team ID ${teamId} not found in cache. Try listing teams first.`);
+        const graphTeamId = await this.resolveTeamId(teamId);
         const channels = await this.client.listChannels(graphTeamId);
         return channels.map((ch) => {
             const graphId = ch.id;
@@ -1926,9 +1947,7 @@ export class GraphRepository {
      * Creates a new channel in a team.
      */
     async createChannelAsync(teamId, name, description) {
-        const graphTeamId = this.idCache.teams.get(teamId);
-        if (graphTeamId == null)
-            throw new Error(`Team ID ${teamId} not found in cache. Try listing teams first.`);
+        const graphTeamId = await this.resolveTeamId(teamId);
         const ch = await this.client.createChannel(graphTeamId, name, description);
         const graphId = ch.id;
         const numericId = hashStringToNumber(graphId);
@@ -1963,9 +1982,7 @@ export class GraphRepository {
      * Lists members of a team.
      */
     async listTeamMembersAsync(teamId) {
-        const graphTeamId = this.idCache.teams.get(teamId);
-        if (graphTeamId == null)
-            throw new Error(`Team ID ${teamId} not found in cache. Try listing teams first.`);
+        const graphTeamId = await this.resolveTeamId(teamId);
         const members = await this.client.listTeamMembers(graphTeamId);
         return members.map((m) => ({
             id: m.id ?? '',
@@ -2082,9 +2099,7 @@ export class GraphRepository {
         });
     }
     async getChatAsync(chatId) {
-        const graphId = this.idCache.chats.get(chatId);
-        if (graphId == null)
-            throw new Error(`Chat ID ${chatId} not found in cache. Try listing chats first.`);
+        const graphId = await this.resolveChatId(chatId);
         const chat = await this.client.getChat(graphId);
         return {
             id: chatId,
@@ -2095,9 +2110,7 @@ export class GraphRepository {
         };
     }
     async listChatMessagesAsync(chatId, limit = 25) {
-        const graphChatId = this.idCache.chats.get(chatId);
-        if (graphChatId == null)
-            throw new Error(`Chat ID ${chatId} not found in cache. Try listing chats first.`);
+        const graphChatId = await this.resolveChatId(chatId);
         const messages = await this.client.listChatMessages(graphChatId, limit);
         return messages.map((msg) => {
             const graphId = msg.id;
@@ -2115,9 +2128,7 @@ export class GraphRepository {
         });
     }
     async sendChatMessageAsync(chatId, body, contentType = 'html') {
-        const graphChatId = this.idCache.chats.get(chatId);
-        if (graphChatId == null)
-            throw new Error(`Chat ID ${chatId} not found in cache. Try listing chats first.`);
+        const graphChatId = await this.resolveChatId(chatId);
         const msg = await this.client.sendChatMessage(graphChatId, body, contentType);
         const graphId = msg.id;
         const numericId = hashStringToNumber(graphId);
@@ -2184,9 +2195,7 @@ export class GraphRepository {
         }
     }
     async listChatMembersAsync(chatId) {
-        const graphChatId = this.idCache.chats.get(chatId);
-        if (graphChatId == null)
-            throw new Error(`Chat ID ${chatId} not found in cache. Try listing chats first.`);
+        const graphChatId = await this.resolveChatId(chatId);
         const members = await this.client.listChatMembers(graphChatId);
         return members.map((m) => ({
             displayName: m.displayName ?? '',
@@ -2219,9 +2228,7 @@ export class GraphRepository {
      * Gets a specific plan by cached numeric ID.
      */
     async getPlanAsync(planId) {
-        const cached = this.idCache.plans.get(planId);
-        if (cached == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cached = await this.resolvePlanId(planId);
         const plan = await this.client.getPlan(cached.planId);
         const etag = plan['@odata.etag'] ?? '';
         this.idCache.plans.set(planId, { planId: cached.planId, etag });
@@ -2248,9 +2255,7 @@ export class GraphRepository {
      * Updates a plan (requires cached ETag).
      */
     async updatePlanAsync(planId, updates) {
-        const cached = this.idCache.plans.get(planId);
-        if (cached == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cached = await this.resolvePlanId(planId);
         const graphUpdates = {};
         if (updates.title != null)
             graphUpdates['title'] = updates.title;
@@ -2265,9 +2270,7 @@ export class GraphRepository {
      * Lists all buckets in a plan.
      */
     async listBucketsAsync(planId) {
-        const cached = this.idCache.plans.get(planId);
-        if (cached == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cached = await this.resolvePlanId(planId);
         const buckets = await this.client.listBuckets(cached.planId);
         return buckets.map((bucket) => {
             const graphId = bucket.id;
@@ -2286,9 +2289,7 @@ export class GraphRepository {
      * Creates a new bucket in a plan.
      */
     async createBucketAsync(planId, name) {
-        const cached = this.idCache.plans.get(planId);
-        if (cached == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cached = await this.resolvePlanId(planId);
         const bucket = await this.client.createBucket(cached.planId, name);
         const graphId = bucket.id;
         const numericId = hashStringToNumber(graphId);
@@ -2327,9 +2328,7 @@ export class GraphRepository {
      * Lists all tasks in a plan.
      */
     async listPlannerTasksAsync(planId) {
-        const cached = this.idCache.plans.get(planId);
-        if (cached == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cached = await this.resolvePlanId(planId);
         const tasks = await this.client.listPlannerTasks(cached.planId);
         return tasks.map((task) => {
             const graphId = task.id;
@@ -2387,9 +2386,7 @@ export class GraphRepository {
      * Creates a new planner task.
      */
     async createPlannerTaskAsync(planId, title, bucketId, assignments, priority, startDate, dueDate) {
-        const cachedPlan = this.idCache.plans.get(planId);
-        if (cachedPlan == null)
-            throw new Error(`Plan ID ${planId} not found in cache. Try listing plans first.`);
+        const cachedPlan = await this.resolvePlanId(planId);
         const body = { planId: cachedPlan.planId, title };
         if (bucketId != null) {
             const cachedBucket = this.idCache.plannerBuckets.get(bucketId);