fixes

Author: taylorwilsdon

core/attachment_storage.py

@@ -10,7 +10,7 @@
 import os
 import uuid
 from pathlib import Path
-from typing import Optional, Dict
+from typing import NamedTuple, Optional, Dict
 from datetime import datetime, timedelta
 
 logger = logging.getLogger(__name__)
@@ -21,10 +21,17 @@
 # Storage directory - configurable via WORKSPACE_ATTACHMENT_DIR env var
 # Uses absolute path to avoid creating tmp/ in arbitrary working directories (see #327)
 _default_dir = str(Path.home() / ".workspace-mcp" / "attachments")
-STORAGE_DIR = Path(os.getenv("WORKSPACE_ATTACHMENT_DIR", _default_dir))
+STORAGE_DIR = Path(os.getenv("WORKSPACE_ATTACHMENT_DIR", _default_dir)).expanduser().resolve()
 STORAGE_DIR.mkdir(parents=True, exist_ok=True)
 
 
+class SavedAttachment(NamedTuple):
+    """Result of saving an attachment: provides both the UUID and the absolute file path."""
+
+    file_id: str
+    path: str
+
+
 class AttachmentStorage:
     """Manages temporary storage of email attachments."""
 
@@ -37,17 +44,17 @@ def save_attachment(
         base64_data: str,
         filename: Optional[str] = None,
         mime_type: Optional[str] = None,
-    ) -> str:
+    ) -> SavedAttachment:
         """
-        Save an attachment to local disk and return the absolute file path.
+        Save an attachment to local disk.
 
         Args:
             base64_data: Base64-encoded attachment data
             filename: Original filename (optional)
             mime_type: MIME type (optional)
 
         Returns:
-            Absolute file path where the attachment was saved
+            SavedAttachment with file_id (UUID) and path (absolute file path)
         """
         # Generate unique file ID for metadata tracking
         file_id = str(uuid.uuid4())
@@ -104,7 +111,7 @@ def save_attachment(
             "expires_at": expires_at,
         }
 
-        return str(file_path)
+        return SavedAttachment(file_id=file_id, path=str(file_path))
 
     def get_attachment_path(self, file_id: str) -> Optional[Path]:
         """
@@ -213,7 +220,6 @@ def get_attachment_url(file_id: str) -> str:
     Returns:
         Full URL to access the attachment
     """
-    import os
     from core.config import WORKSPACE_MCP_PORT, WORKSPACE_MCP_BASE_URI
 
     # Use external URL if set (for reverse proxy scenarios)

gdrive/drive_tools.py

@@ -348,41 +348,46 @@ async def get_drive_file_download_url(
         )
         return "\n".join(result_lines)
 
-    # Save file and generate URL
+    # Save file to local disk and return file path
     try:
         storage = get_attachment_storage()
 
         # Encode bytes to base64 (as expected by AttachmentStorage)
         base64_data = base64.urlsafe_b64encode(file_content_bytes).decode("utf-8")
 
-        # Save attachment
-        saved_file_id = storage.save_attachment(
+        # Save attachment to local disk
+        result = storage.save_attachment(
             base64_data=base64_data,
             filename=output_filename,
             mime_type=output_mime_type,
         )
 
-        # Generate URL
-        download_url = get_attachment_url(saved_file_id)
-
         result_lines = [
             "File downloaded successfully!",
             f"File: {file_name}",
             f"File ID: {file_id}",
             f"Size: {size_kb:.1f} KB ({size_bytes} bytes)",
             f"MIME Type: {output_mime_type}",
-            f"\n📎 Download URL: {download_url}",
-            "\nThe file has been saved and is available at the URL above.",
-            "The file will expire after 1 hour.",
         ]
 
+        if get_transport_mode() == "stdio":
+            result_lines.append(f"\n📎 Saved to: {result.path}")
+            result_lines.append(
+                "\nThe file has been saved to disk and can be accessed directly via the file path."
+            )
+        else:
+            download_url = get_attachment_url(result.file_id)
+            result_lines.append(f"\n📎 Download URL: {download_url}")
+            result_lines.append(f"📂 Local path: {result.path}")
+            result_lines.append("\nThe file will expire after 1 hour.")
+
         if export_mime_type:
             result_lines.append(
                 f"\nNote: Google native file exported to {output_mime_type} format."
             )
 
         logger.info(
-            f"[get_drive_file_download_url] Successfully saved {size_kb:.1f} KB file as {saved_file_id}"
+            f"[get_drive_file_download_url] Successfully saved {size_kb:.1f} KB file to {result.path}"
         )
         return "\n".join(result_lines)
 

gmail/gmail_tools.py

@@ -910,7 +910,8 @@ async def get_gmail_attachment_content(
 
     # Save attachment to local disk and return file path
     try:
-        from core.attachment_storage import get_attachment_storage
+        from core.attachment_storage import get_attachment_storage, get_attachment_url
+        from core.config import get_transport_mode
 
         storage = get_attachment_storage()
 
@@ -953,23 +954,35 @@ async def get_gmail_attachment_content(
                 f"Could not fetch attachment metadata for {attachment_id}, using defaults"
             )
 
-        # Save attachment to local disk - returns absolute file path
-        saved_path = storage.save_attachment(
+        # Save attachment to local disk
+        result = storage.save_attachment(
             base64_data=base64_data, filename=filename, mime_type=mime_type
         )
 
         result_lines = [
-            "Attachment downloaded and saved to local disk!",
+            "Attachment downloaded successfully!",
             f"Message ID: {message_id}",
             f"Filename: {filename or 'unknown'}",
             f"Size: {size_kb:.1f} KB ({size_bytes} bytes)",
-            f"\n📎 Saved to: {saved_path}",
-            "\nThe file has been saved to disk and can be accessed directly via the file path.",
-            "\nNote: Attachment IDs are ephemeral. Always use IDs from the most recent message fetch.",
         ]
 
+        if get_transport_mode() == "stdio":
+            result_lines.append(f"\n📎 Saved to: {result.path}")
+            result_lines.append(
+                "\nThe file has been saved to disk and can be accessed directly via the file path."
+            )
+        else:
+            download_url = get_attachment_url(result.file_id)
+            result_lines.append(f"\n📎 Download URL: {download_url}")
+            result_lines.append(f"📂 Local path: {result.path}")
+            result_lines.append("\nThe file will expire after 1 hour.")
+
+        result_lines.append(
+            "\nNote: Attachment IDs are ephemeral. Always use IDs from the most recent message fetch."
+        )
+
         logger.info(
-            f"[get_gmail_attachment_content] Successfully saved {size_kb:.1f} KB attachment to {saved_path}"
+            f"[get_gmail_attachment_content] Successfully saved {size_kb:.1f} KB attachment to {result.path}"
         )
         return "\n".join(result_lines)