@dguido/google-workspace-mcp 3.0.2 → 3.0.3

package/dist/index.js

@@ -5025,7 +5025,7 @@ var calendarTools = [
     outputSchema: {
       type: "object",
       properties: {
-        deleted: { type: "boolean", description: "Whether deletion succeeded" },
+        deleted: { type: "number", description: "Number of events deleted" },
         eventId: { type: "string", description: "Deleted event ID" }
       }
     }
@@ -5316,9 +5316,13 @@ var gmailTools = [
     outputSchema: {
       type: "object",
       properties: {
-        id: { type: "string", description: "Thread ID" },
-        messageCount: { type: "number", description: "Number of messages in thread" },
-        labelIds: { type: "array", items: { type: "string" }, description: "Current labels" }
+        id: { type: "string", description: "First modified thread ID (for batch: first in list)" },
+        messageCount: { type: "number", description: "Number of threads modified" },
+        labelIds: {
+          type: "array",
+          items: { type: "string" },
+          description: "Labels that were added"
+        }
       }
     }
   },
@@ -5389,7 +5393,7 @@ var gmailTools = [
     outputSchema: {
       type: "object",
       properties: {
-        deleted: { type: "boolean", description: "Whether the deletion succeeded" },
+        deleted: { type: "number", description: "Number of labels deleted" },
         labelId: { type: "string", description: "Deleted label ID" }
       }
     }
@@ -5549,7 +5553,7 @@ var gmailTools = [
     outputSchema: {
       type: "object",
       properties: {
-        deleted: { type: "boolean", description: "Whether the deletion succeeded" },
+        deleted: { type: "number", description: "Number of filters deleted" },
         filterId: { type: "string", description: "Deleted filter ID" }
       }
     }
@@ -7630,10 +7634,11 @@ ${toToon({ files })}`;
 
 More results available. Use pageToken: ${res.data.nextPageToken}`;
   }
-  return structuredResponse(textResponse, {
-    files,
-    nextPageToken: res.data.nextPageToken || null
-  });
+  const responseData = { files };
+  if (res.data.nextPageToken) {
+    responseData.nextPageToken = res.data.nextPageToken;
+  }
+  return structuredResponse(textResponse, responseData);
 }
 async function handleCreateTextFile(drive2, args) {
   const validation = validateArgs(CreateTextFileSchema, args);
@@ -7751,19 +7756,32 @@ async function handleListFolder(drive2, args) {
       supportsAllDrives: true
     });
     const files = res.data.files || [];
-    const formattedFiles = files.map((file) => {
+    const items = [];
+    const formattedLines = [];
+    for (const file of files) {
+      items.push({
+        id: file.id,
+        name: file.name,
+        mimeType: file.mimeType,
+        modifiedTime: file.modifiedTime,
+        size: file.size
+      });
       const isFolder = file.mimeType === FOLDER_MIME_TYPE;
-      return `${isFolder ? "\u{1F4C1}" : "\u{1F4C4}"} ${file.name} (ID: ${file.id})`;
-    }).join("\n");
-    let response = `Contents of folder:
+      formattedLines.push(`${isFolder ? "\u{1F4C1}" : "\u{1F4C4}"} ${file.name} (ID: ${file.id})`);
+    }
+    let textResponse = `Contents of folder:
 
-${formattedFiles}`;
+${formattedLines.join("\n")}`;
     if (res.data.nextPageToken) {
-      response += `
+      textResponse += `
 
 More items available. Use pageToken: ${res.data.nextPageToken}`;
     }
-    return successResponse(response);
+    const responseData = { items };
+    if (res.data.nextPageToken) {
+      responseData.nextPageToken = res.data.nextPageToken;
+    }
+    return structuredResponse(textResponse, responseData);
   } catch (error) {
     if (error instanceof Error && error.message.includes("not found")) {
       return errorResponse(`Folder not found: ${targetFolderId}`, { code: "NOT_FOUND" });
@@ -8779,8 +8797,7 @@ async function handleListTrash(drive2, args) {
   const files = response.data.files || [];
   if (files.length === 0) {
     return structuredResponse("Trash is empty", {
-      files: [],
-      nextPageToken: null
+      files: []
     });
   }
   const fileData = files.map((f) => ({
@@ -8793,10 +8810,11 @@ async function handleListTrash(drive2, args) {
   const textResponse = `Trash contents (${files.length} items):
 
 ${toToon({ files: fileData })}` + (response.data.nextPageToken ? "\n\n(More items available - use nextPageToken to continue)" : "");
-  return structuredResponse(textResponse, {
-    files: fileData,
-    nextPageToken: response.data.nextPageToken || null
-  });
+  const responseData = { files: fileData };
+  if (response.data.nextPageToken) {
+    responseData.nextPageToken = response.data.nextPageToken;
+  }
+  return structuredResponse(textResponse, responseData);
 }
 async function handleRestoreFromTrash(drive2, args) {
   const validation = validateArgs(RestoreFromTrashSchema, args);
@@ -9098,10 +9116,15 @@ async function handleCreateGoogleDoc(drive2, docs, args) {
       ]
     }
   });
-  return successResponse(
+  return structuredResponse(
     `Created Google Doc: ${doc.name}
 ID: ${doc.id}
-Link: ${doc.webViewLink}`
+Link: ${doc.webViewLink}`,
+    {
+      id: doc.id,
+      name: doc.name,
+      webViewLink: doc.webViewLink
+    }
   );
 }
 async function handleUpdateGoogleDoc(docs, args) {
@@ -9148,7 +9171,10 @@ async function handleUpdateGoogleDoc(docs, args) {
       ]
     }
   });
-  return successResponse(`Updated Google Doc: ${document.data.title}`);
+  return structuredResponse(`Updated Google Doc: ${document.data.title}`, {
+    title: document.data.title,
+    updated: true
+  });
 }
 async function handleGetGoogleDocContent(drive2, docs, args) {
   const validation = validateArgs(GetGoogleDocContentSchema, args);
@@ -9239,8 +9265,12 @@ ${data.text}` : data.text;
     documentId: data.documentId,
     textLength: data.text.length
   });
-  return successResponse(
-    `Appended ${data.text.length} characters to document "${document.data.title}"`
+  return structuredResponse(
+    `Appended ${data.text.length} characters to document "${document.data.title}"`,
+    {
+      title: document.data.title,
+      charactersAdded: data.text.length
+    }
   );
 }
 async function handleInsertTextInDoc(docs, args) {
@@ -9272,8 +9302,13 @@ async function handleInsertTextInDoc(docs, args) {
     index: data.index,
     textLength: data.text.length
   });
-  return successResponse(
-    `Inserted ${data.text.length} characters at index ${data.index} in "${document.data.title}"`
+  return structuredResponse(
+    `Inserted ${data.text.length} characters at index ${data.index} in "${document.data.title}"`,
+    {
+      title: document.data.title,
+      index: data.index,
+      charactersInserted: data.text.length
+    }
   );
 }
 async function handleDeleteTextInDoc(docs, args) {
@@ -9308,8 +9343,14 @@ async function handleDeleteTextInDoc(docs, args) {
     startIndex: data.startIndex,
     endIndex: data.endIndex
   });
-  return successResponse(
-    `Deleted ${charsToDelete} characters (indices ${data.startIndex}-${data.endIndex}) from "${document.data.title}"`
+  return structuredResponse(
+    `Deleted ${charsToDelete} characters (indices ${data.startIndex}-${data.endIndex}) from "${document.data.title}"`,
+    {
+      title: document.data.title,
+      startIndex: data.startIndex,
+      endIndex: data.endIndex,
+      charactersDeleted: charsToDelete
+    }
   );
 }
 async function handleReplaceTextInDoc(docs, args) {
@@ -9339,12 +9380,20 @@ async function handleReplaceTextInDoc(docs, args) {
     occurrences: occurrencesChanged
   });
   if (occurrencesChanged === 0) {
-    return successResponse(
-      `No occurrences of "${data.searchText}" found in "${document.data.title}"`
+    return structuredResponse(
+      `No occurrences of "${data.searchText}" found in "${document.data.title}"`,
+      {
+        title: document.data.title,
+        occurrencesChanged: 0
+      }
     );
   }
-  return successResponse(
-    `Replaced ${occurrencesChanged} occurrence(s) of "${data.searchText}" with "${data.replaceText}" in "${document.data.title}"`
+  return structuredResponse(
+    `Replaced ${occurrencesChanged} occurrence(s) of "${data.searchText}" with "${data.replaceText}" in "${document.data.title}"`,
+    {
+      title: document.data.title,
+      occurrencesChanged
+    }
   );
 }
 function buildDocTextStyle(data) {
@@ -9452,8 +9501,13 @@ async function handleFormatGoogleDocRange(docs, args) {
     endIndex,
     formatsApplied
   });
-  return successResponse(
-    `Applied formatting to range ${startIndex}-${endIndex}: ${formatsApplied.join(", ")}`
+  return structuredResponse(
+    `Applied formatting to range ${startIndex}-${endIndex}: ${formatsApplied.join(", ")}`,
+    {
+      startIndex,
+      endIndex,
+      formatsApplied
+    }
   );
 }
 
@@ -9563,9 +9617,13 @@ async function handleCreateGoogleSheet(drive2, sheets, args) {
     valueInputOption: data.valueInputOption || "RAW",
     requestBody: { values: data.data }
   });
-  return successResponse(
+  return structuredResponse(
     `Created Google Sheet: ${data.name}
-ID: ${spreadsheet.data.spreadsheetId}`
+ID: ${spreadsheet.data.spreadsheetId}`,
+    {
+      id: spreadsheet.data.spreadsheetId,
+      name: data.name
+    }
   );
 }
 async function handleUpdateGoogleSheet(sheets, args) {
@@ -9578,7 +9636,10 @@ async function handleUpdateGoogleSheet(sheets, args) {
     valueInputOption: data.valueInputOption || "RAW",
     requestBody: { values: data.data }
   });
-  return successResponse(`Updated Google Sheet range: ${data.range}`);
+  return structuredResponse(`Updated Google Sheet range: ${data.range}`, {
+    range: data.range,
+    updated: true
+  });
 }
 async function handleGetGoogleSheetContent(drive2, sheets, args) {
   const validation = validateArgs(GetGoogleSheetContentSchema, args);
@@ -9754,7 +9815,13 @@ async function handleFormatGoogleSheetCells(sheets, args) {
     spreadsheetId: data.spreadsheetId,
     requestBody: { requests }
   });
-  return successResponse(`Formatted cells in range ${data.range} (${appliedFormats.join(", ")})`);
+  return structuredResponse(
+    `Formatted cells in range ${data.range} (${appliedFormats.join(", ")})`,
+    {
+      range: data.range,
+      applied: true
+    }
+  );
 }
 async function handleMergeGoogleSheetCells(sheets, args) {
   const validation = validateArgs(MergeGoogleSheetCellsSchema, args);
@@ -9779,7 +9846,10 @@ async function handleMergeGoogleSheetCells(sheets, args) {
     spreadsheetId: data.spreadsheetId,
     requestBody: { requests }
   });
-  return successResponse(`Merged cells in range ${data.range} with type ${data.mergeType}`);
+  return structuredResponse(`Merged cells in range ${data.range} with type ${data.mergeType}`, {
+    range: data.range,
+    mergeType: data.mergeType
+  });
 }
 async function handleAddGoogleSheetConditionalFormat(sheets, args) {
   const validation = validateArgs(AddGoogleSheetConditionalFormatSchema, args);
@@ -9829,7 +9899,10 @@ async function handleAddGoogleSheetConditionalFormat(sheets, args) {
     spreadsheetId: data.spreadsheetId,
     requestBody: { requests }
   });
-  return successResponse(`Added conditional formatting to range ${data.range}`);
+  return structuredResponse(`Added conditional formatting to range ${data.range}`, {
+    range: data.range,
+    conditionType: data.condition.type
+  });
 }
 async function getSheetIdByTitle(sheets, spreadsheetId, title) {
   const cached = getCachedSheetMetadata(spreadsheetId, title);
@@ -9907,7 +9980,11 @@ async function createSheetTab(sheets, spreadsheetId, title, index) {
   });
   clearSheetCache(spreadsheetId);
   const newSheetId = response.data.replies?.[0]?.addSheet?.properties?.sheetId;
-  return successResponse(`Created new sheet tab "${title}" (ID: ${newSheetId})`);
+  return structuredResponse(`Created new sheet tab "${title}" (ID: ${newSheetId})`, {
+    action: "create",
+    sheetId: newSheetId,
+    title
+  });
 }
 async function deleteSheetTab(sheets, spreadsheetId, title) {
   const sheetId = await getSheetIdByTitle(sheets, spreadsheetId, title);
@@ -9929,7 +10006,11 @@ async function deleteSheetTab(sheets, spreadsheetId, title) {
     throw error;
   }
   clearSheetCache(spreadsheetId);
-  return successResponse(`Deleted sheet tab "${title}"`);
+  return structuredResponse(`Deleted sheet tab "${title}"`, {
+    action: "delete",
+    sheetId,
+    title
+  });
 }
 async function renameSheetTab(sheets, spreadsheetId, currentTitle, newTitle) {
   const sheetId = await getSheetIdByTitle(sheets, spreadsheetId, currentTitle);
@@ -9958,7 +10039,11 @@ async function renameSheetTab(sheets, spreadsheetId, currentTitle, newTitle) {
     }
   });
   clearSheetCache(spreadsheetId);
-  return successResponse(`Renamed sheet tab "${currentTitle}" to "${newTitle}"`);
+  return structuredResponse(`Renamed sheet tab "${currentTitle}" to "${newTitle}"`, {
+    action: "rename",
+    sheetId,
+    title: newTitle
+  });
 }
 
 // src/handlers/slides.ts
@@ -10034,10 +10119,15 @@ async function handleCreateGoogleSlides(drive2, slides, args) {
       requestBody: { requests: insertTextRequests }
     });
   }
-  return successResponse(
+  return structuredResponse(
     `Created Google Slides presentation: ${data.name}
 ID: ${presentation.data.presentationId}
-Link: https://docs.google.com/presentation/d/${presentation.data.presentationId}`
+Link: https://docs.google.com/presentation/d/${presentation.data.presentationId}`,
+    {
+      id: presentation.data.presentationId,
+      name: data.name,
+      webViewLink: `https://docs.google.com/presentation/d/${presentation.data.presentationId}`
+    }
   );
 }
 async function handleUpdateGoogleSlides(slides, args) {
@@ -10148,9 +10238,13 @@ async function handleUpdateGoogleSlides(slides, args) {
     presentationId: data.presentationId,
     requestBody: { requests }
   });
-  return successResponse(
+  return structuredResponse(
     `Updated Google Slides presentation with ${data.slides.length} slide(s)
-Link: https://docs.google.com/presentation/d/${data.presentationId}`
+Link: https://docs.google.com/presentation/d/${data.presentationId}`,
+    {
+      slideCount: data.slides.length,
+      webViewLink: `https://docs.google.com/presentation/d/${data.presentationId}`
+    }
   );
 }
 async function handleGetGoogleSlidesContent(drive2, slides, args) {
@@ -10322,7 +10416,10 @@ async function handleCreateGoogleSlidesTextBox(slides, args) {
     presentationId: data.presentationId,
     requestBody: { requests }
   });
-  return successResponse(`Created text box with ID: ${elementId}`);
+  return structuredResponse(`Created text box with ID: ${elementId}`, {
+    objectId: elementId,
+    pageObjectId: data.pageObjectId
+  });
 }
 async function handleCreateGoogleSlidesShape(slides, args) {
   const validation = validateArgs(CreateGoogleSlidesShapeSchema, args);
@@ -10377,7 +10474,11 @@ async function handleCreateGoogleSlidesShape(slides, args) {
     presentationId: data.presentationId,
     requestBody: { requests }
   });
-  return successResponse(`Created ${data.shapeType} shape with ID: ${elementId}`);
+  return structuredResponse(`Created ${data.shapeType} shape with ID: ${elementId}`, {
+    objectId: elementId,
+    pageObjectId: data.pageObjectId,
+    shapeType: data.shapeType
+  });
 }
 async function handleSlidesSpeakerNotes(slides, args) {
   const validation = validateArgs(SlidesSpeakerNotesSchema, args);
@@ -10395,24 +10496,39 @@ async function handleSlidesSpeakerNotes(slides, args) {
   const slide = presentation.data.slides[data.slideIndex];
   const notesObjectId = slide.slideProperties?.notesPage?.notesProperties?.speakerNotesObjectId;
   if (data.action === "get") {
-    return getSpeakerNotes(slide, notesObjectId);
+    return getSpeakerNotes(slide, notesObjectId, data.slideIndex);
   } else {
-    return updateSpeakerNotes(slides, data.presentationId, slide, notesObjectId, data.notes);
+    return updateSpeakerNotes(
+      slides,
+      data.presentationId,
+      slide,
+      notesObjectId,
+      data.notes,
+      data.slideIndex
+    );
   }
 }
-function getSpeakerNotes(slide, notesObjectId) {
+function emptyNotesResponse(slideIndex) {
+  return structuredResponse("No speaker notes found for this slide", {
+    action: "get",
+    slideIndex,
+    notes: "",
+    updated: false
+  });
+}
+function getSpeakerNotes(slide, notesObjectId, slideIndex) {
   if (!notesObjectId) {
-    return successResponse("No speaker notes found for this slide");
+    return emptyNotesResponse(slideIndex);
   }
   const notesPage = slide.slideProperties?.notesPage;
   if (!notesPage || !notesPage.pageElements) {
-    return successResponse("No speaker notes found for this slide");
+    return emptyNotesResponse(slideIndex);
   }
   const speakerNotesElement = notesPage.pageElements.find(
     (element) => element.objectId === notesObjectId
   );
   if (!speakerNotesElement || !speakerNotesElement.shape?.text) {
-    return successResponse("No speaker notes found for this slide");
+    return emptyNotesResponse(slideIndex);
   }
   let notesText = "";
   const textElements = speakerNotesElement.shape.text.textElements || [];
@@ -10421,9 +10537,17 @@ function getSpeakerNotes(slide, notesObjectId) {
       notesText += textElement.textRun.content;
     }
   });
-  return successResponse(notesText.trim() || "No speaker notes found for this slide");
+  if (!notesText.trim()) {
+    return emptyNotesResponse(slideIndex);
+  }
+  return structuredResponse(notesText.trim(), {
+    action: "get",
+    slideIndex,
+    notes: notesText.trim(),
+    updated: false
+  });
 }
-async function updateSpeakerNotes(slidesApi, presentationId, slide, notesObjectId, notes) {
+async function updateSpeakerNotes(slidesApi, presentationId, slide, notesObjectId, notes, slideIndex) {
   if (!notesObjectId) {
     return errorResponse(
       "This slide does not have a speaker notes object. Speaker notes may need to be initialized manually in Google Slides first."
@@ -10456,7 +10580,12 @@ async function updateSpeakerNotes(slidesApi, presentationId, slide, notesObjectI
     presentationId,
     requestBody: { requests }
   });
-  return successResponse(`Successfully updated speaker notes for slide`);
+  return structuredResponse(`Successfully updated speaker notes for slide`, {
+    action: "update",
+    slideIndex,
+    notes,
+    updated: true
+  });
 }
 async function handleFormatSlidesText(slides, args) {
   const validation = validateArgs(FormatSlidesTextSchema, args);
@@ -10560,7 +10689,10 @@ async function handleFormatSlidesText(slides, args) {
     presentationId: data.presentationId,
     requestBody: { requests }
   });
-  return successResponse(`Formatted text ${data.objectId}: ${appliedFormats.join(", ")}`);
+  return structuredResponse(`Formatted text ${data.objectId}: ${appliedFormats.join(", ")}`, {
+    objectId: data.objectId,
+    formatsApplied: appliedFormats
+  });
 }
 async function handleFormatSlidesShape(slides, args) {
   const validation = validateArgs(FormatSlidesShapeSchema, args);
@@ -10618,7 +10750,10 @@ async function handleFormatSlidesShape(slides, args) {
       ]
     }
   });
-  return successResponse(`Formatted shape ${data.objectId}: ${appliedFormats.join(", ")}`);
+  return structuredResponse(`Formatted shape ${data.objectId}: ${appliedFormats.join(", ")}`, {
+    objectId: data.objectId,
+    formatsApplied: appliedFormats
+  });
 }
 async function handleFormatSlideBackground(slides, args) {
   const validation = validateArgs(FormatSlideBackgroundSchema, args);
@@ -10637,7 +10772,9 @@ async function handleFormatSlideBackground(slides, args) {
     presentationId: data.presentationId,
     requestBody: { requests }
   });
-  return successResponse(`Set background color for ${data.pageObjectIds.length} slide(s)`);
+  return structuredResponse(`Set background color for ${data.pageObjectIds.length} slide(s)`, {
+    slidesFormatted: data.pageObjectIds.length
+  });
 }
 async function handleListSlidePages(slides, args) {
   const validation = validateArgs(ListSlidePagesSchema, args);
@@ -11136,10 +11273,7 @@ async function handleListEvents(calendar, args) {
   });
   const events = response.data.items || [];
   if (events.length === 0) {
-    return structuredResponse("No events found.", {
-      events: [],
-      nextPageToken: null
-    });
+    return structuredResponse("No events found.", { events: [] });
   }
   const eventData = events.map((event) => ({
     id: event.id,
@@ -11170,10 +11304,11 @@ ${toToon({ events: eventData })}`;
 More events available. Use pageToken: ${response.data.nextPageToken}`;
   }
   log("Listed events", { calendarId, count: events.length });
-  return structuredResponse(textResponse, {
-    events: eventData,
-    nextPageToken: response.data.nextPageToken || null
-  });
+  const responseData = { events: eventData };
+  if (response.data.nextPageToken) {
+    responseData.nextPageToken = response.data.nextPageToken;
+  }
+  return structuredResponse(textResponse, responseData);
 }
 async function handleGetEvent(calendar, args) {
   const validation = validateArgs(GetEventSchema, args);
@@ -11424,7 +11559,10 @@ async function handleDeleteEvent(calendar, args) {
     sendUpdates
   });
   log("Deleted event", { calendarId, eventId });
-  return successResponse(`Deleted event: ${eventSummary} (ID: ${eventId})`);
+  return structuredResponse(`Deleted event: ${eventSummary} (ID: ${eventId})`, {
+    deleted: 1,
+    eventId
+  });
 }
 async function handleFindFreeTime(calendar, args) {
   const validation = validateArgs(FindFreeTimeSchema, args);
@@ -11748,11 +11886,7 @@ async function handleSearchEmails(gmail, args) {
   });
   const messages = response.data.messages || [];
   if (messages.length === 0) {
-    return structuredResponse(`No emails found matching: ${query}`, {
-      messages: [],
-      nextPageToken: null,
-      resultSizeEstimate: 0
-    });
+    return structuredResponse(`No emails found matching: ${query}`, { messages: [] });
   }
   const messageDetails = await Promise.all(
     messages.slice(0, 50).map(async (msg) => {
@@ -11784,11 +11918,14 @@ ${toToon({ messages: messageDetails })}`;
 More results available. Use pageToken: ${response.data.nextPageToken}`;
   }
   log("Searched emails", { query, count: messages.length });
-  return structuredResponse(textResponse, {
-    messages: messageDetails,
-    nextPageToken: response.data.nextPageToken || null,
-    resultSizeEstimate: response.data.resultSizeEstimate
-  });
+  const responseData = { messages: messageDetails };
+  if (response.data.nextPageToken) {
+    responseData.nextPageToken = response.data.nextPageToken;
+  }
+  if (response.data.resultSizeEstimate !== void 0 && response.data.resultSizeEstimate !== null) {
+    responseData.resultSizeEstimate = response.data.resultSizeEstimate;
+  }
+  return structuredResponse(textResponse, responseData);
 }
 async function handleDeleteEmail(gmail, args) {
   const validation = validateArgs(DeleteEmailSchema, args);
@@ -11801,7 +11938,10 @@ async function handleDeleteEmail(gmail, args) {
       id: messageIds[0]
     });
     log("Deleted email", { messageId: messageIds[0] });
-    return successResponse(`Email ${messageIds[0]} permanently deleted.`);
+    return structuredResponse(`Email ${messageIds[0]} permanently deleted.`, {
+      deleted: 1,
+      messageIds: [messageIds[0]]
+    });
   }
   try {
     await gmail.users.messages.batchDelete({
@@ -11828,7 +11968,10 @@ async function handleDeleteEmail(gmail, args) {
     }
   }
   log("Deleted emails (batch)", { count: messageIds.length });
-  return successResponse(`Successfully deleted ${messageIds.length} email(s).`);
+  return structuredResponse(`Successfully deleted ${messageIds.length} email(s).`, {
+    deleted: messageIds.length,
+    messageIds
+  });
 }
 async function handleModifyEmail(gmail, args) {
   const validation = validateArgs(ModifyEmailSchema, args);
@@ -11919,10 +12062,15 @@ ${categoryLines}`,
       { succeeded, failed: allFailures.length, total: ids.length, failuresByCategory }
     );
   }
-  return successResponse(
+  return structuredResponse(
     `Successfully modified labels for ${ids.length} thread(s).` + (addLabelIds ? `
 Added labels: ${addLabelIds.join(", ")}` : "") + (removeLabelIds ? `
-Removed labels: ${removeLabelIds.join(", ")}` : "")
+Removed labels: ${removeLabelIds.join(", ")}` : ""),
+    {
+      id: ids[0],
+      messageCount: ids.length,
+      labelIds: addLabelIds || []
+    }
   );
 }
 async function handleDownloadAttachment(gmail, args) {
@@ -12021,7 +12169,10 @@ async function handleDeleteLabel(gmail, args) {
     id: labelId
   });
   log("Deleted label", { labelId });
-  return successResponse(`Label ${labelId} deleted successfully.`);
+  return structuredResponse(`Label ${labelId} deleted successfully.`, {
+    deleted: 1,
+    labelId
+  });
 }
 async function handleListLabels(gmail, args) {
   const validation = validateArgs(ListLabelsSchema, args);
@@ -12257,7 +12408,10 @@ async function handleDeleteFilter(gmail, args) {
     id: filterId
   });
   log("Deleted filter", { filterId });
-  return successResponse(`Filter ${filterId} deleted successfully.`);
+  return structuredResponse(`Filter ${filterId} deleted successfully.`, {
+    deleted: 1,
+    filterId
+  });
 }
 
 // src/handlers/contacts.ts
@@ -12322,7 +12476,7 @@ async function handleListContacts(people, args) {
   );
   const connections = response.data.connections || [];
   if (connections.length === 0) {
-    return structuredResponse("No contacts found.", { contacts: [], nextPageToken: null });
+    return structuredResponse("No contacts found.", { contacts: [] });
   }
   const contacts = connections.map(extractContactData);
   let textResponse = `Found ${connections.length} contact(s):
@@ -12334,11 +12488,16 @@ ${toToon({ contacts })}`;
 More contacts available. Use pageToken: ${response.data.nextPageToken}`;
   }
   log("Listed contacts", { count: connections.length });
-  return structuredResponse(textResponse, {
-    contacts,
-    nextPageToken: response.data.nextPageToken || null,
-    totalPeople: response.data.totalPeople
-  });
+  const responseData = {
+    contacts
+  };
+  if (response.data.nextPageToken) {
+    responseData.nextPageToken = response.data.nextPageToken;
+  }
+  if (response.data.totalPeople !== void 0 && response.data.totalPeople !== null) {
+    responseData.totalPeople = response.data.totalPeople;
+  }
+  return structuredResponse(textResponse, responseData);
 }
 async function handleGetContact(people, args) {
   const validation = validateArgs(GetContactSchema, args);