.env.example

@@ -5,7 +5,7 @@
 COMPOSE_PROJECT_NAME=mcwaddams
 
 # Hostname for caddy-docker-proxy
-MCWADDAMS_HOST=mcwaddams.l.supported.systems
+MCWADDAMS_HOST=mcwaddams.supported.systems
 
 # Debug mode (enables verbose logging)
 DEBUG=false

Makefile

@@ -146,7 +146,7 @@ docker-up: .env
 	@docker compose logs --tail=20
 	@echo ""
 	@echo "✅ Server running! Connect via:"
-	@echo "   https://$${MCWADDAMS_HOST:-mcwaddams.l.supported.systems}/mcp"
+	@echo "   https://$${MCWADDAMS_HOST:-mcwaddams.supported.systems}/mcp"
 
 # Stop server
 docker-down:

docker-compose.yml

@@ -15,24 +15,25 @@ services:
       - MCP_PORT=8000
       - DEBUG=${DEBUG:-false}
       - OFFICE_TEMP_DIR=/tmp/mcwaddams
-      # Security: Disable local file access for hosted server
-      # Clients must use file_content parameter to upload documents
-      - MCP_ALLOW_LOCAL_FILES=false
     volumes:
       # Temp directory for document processing
       - mcwaddams-temp:/tmp/mcwaddams
     networks:
       - caddy
     labels:
-      # Caddy-docker-proxy labels - direct reverse proxy (no path stripping)
+      # Caddy-docker-proxy labels for /mcp endpoint
-      # MCP is served at /mcp on the backend
+      caddy: ${MCWADDAMS_HOST:-mcwaddams.supported.systems}
-      caddy: ${MCWADDAMS_HOST:-mcwaddams.l.supported.systems}
+      caddy.@mcp.path: /mcp/*
-      caddy.reverse_proxy: "{{upstreams 8000}}"
+      caddy.@mcp.path_strip: /mcp
-      caddy.reverse_proxy.flush_interval: "-1"
+      caddy.handle: "@mcp"
-      caddy.reverse_proxy.transport: "http"
+      caddy.handle.reverse_proxy: "{{upstreams 8000}}"
-      caddy.reverse_proxy.transport.read_timeout: "0"
+      caddy.handle.reverse_proxy.flush_interval: "-1"
-      caddy.reverse_proxy.transport.write_timeout: "0"
+      caddy.handle.reverse_proxy.transport: "http"
-      caddy.reverse_proxy.stream_timeout: "24h"
+      caddy.handle.reverse_proxy.transport.read_timeout: "0"
+      caddy.handle.reverse_proxy.transport.write_timeout: "0"
+      caddy.handle.reverse_proxy.stream_timeout: "24h"
+      caddy.handle.reverse_proxy.header_up.Connection: "{http.request.header.Connection}"
+      caddy.handle.reverse_proxy.header_up.Upgrade: "{http.request.header.Upgrade}"
     healthcheck:
       test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/health')"]
       interval: 30s

src/mcwaddams/mixins/excel.py

@@ -17,13 +17,6 @@ from ..utils import (
 )
 
 
-# Common field description for file_content parameter
-FILE_CONTENT_DESC = (
-    "Base64-encoded file content (for hosted/HTTP transport). "
-    "When provided, file_path is used only for extension detection."
-)
-
-
 class ExcelMixin(MCPMixin):
     """Mixin containing Excel-specific tools for advanced spreadsheet processing."""
 
@@ -41,7 +34,6 @@ class ExcelMixin(MCPMixin):
     async def analyze_excel_data(
         self,
         file_path: str = Field(description="Path to Excel document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         sheet_names: List[str] = Field(default=[], description="Specific sheets to analyze (empty = all sheets)"),
         include_statistics: bool = Field(default=True, description="Include statistical analysis (mean, median, etc.)"),
         detect_data_types: bool = Field(default=True, description="Analyze and detect optimal data types"),
@@ -50,8 +42,8 @@ class ExcelMixin(MCPMixin):
         """Analyze Excel data with comprehensive statistics and data quality assessment."""
         start_time = time.time()
 
-        # Resolve and validate file (download if URL, or decode if content provided)
+        # Resolve and validate file
-        resolved_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        resolved_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(resolved_path)
 
         if validation["category"] not in ["excel"]:
@@ -186,7 +178,6 @@ class ExcelMixin(MCPMixin):
     async def extract_excel_formulas(
         self,
         file_path: str = Field(description="Path to Excel document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         sheet_names: List[str] = Field(default=[], description="Specific sheets to process (empty = all sheets)"),
         include_values: bool = Field(default=True, description="Include calculated values alongside formulas"),
         analyze_dependencies: bool = Field(default=True, description="Analyze formula dependencies and references")
@@ -195,8 +186,8 @@ class ExcelMixin(MCPMixin):
         start_time = time.time()
         import re
 
-        # Resolve and validate file (download if URL, or decode if content provided)
+        # Resolve and validate file
-        resolved_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        resolved_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(resolved_path)
 
         if validation["category"] not in ["excel"] or validation["extension"] == ".csv":
@@ -297,7 +288,6 @@ class ExcelMixin(MCPMixin):
     async def create_excel_chart_data(
         self,
         file_path: str = Field(description="Path to Excel document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         sheet_name: str = Field(default="", description="Sheet to process (empty = first sheet)"),
         chart_type: str = Field(default="auto", description="Chart type: auto, bar, line, pie, scatter, histogram"),
         x_column: str = Field(default="", description="Column for X-axis (empty = auto-detect)"),
@@ -307,8 +297,8 @@ class ExcelMixin(MCPMixin):
         """Generate chart-ready data and configurations from Excel spreadsheets."""
         start_time = time.time()
 
-        # Resolve and validate file (download if URL, or decode if content provided)
+        # Resolve and validate file
-        resolved_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        resolved_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(resolved_path)
 
         if validation["category"] not in ["excel"]:

src/mcwaddams/mixins/universal.py

@@ -1,7 +1,7 @@
 """Universal Office Tools Mixin - Format-agnostic tools that work across all Office document types."""
 
 import time
-from typing import Any, Optional
+from typing import Any
 
 from fastmcp.contrib.mcp_mixin import MCPMixin, mcp_tool
 from pydantic import Field
@@ -17,13 +17,6 @@ from ..utils import (
 from ..resources import resource_store, EmbeddedResource, ResourceStore
 
 
-# Common field description for file_content parameter
-FILE_CONTENT_DESC = (
-    "Base64-encoded file content (for hosted/HTTP transport). "
-    "When provided, file_path is used only for extension detection."
-)
-
-
 class UniversalMixin(MCPMixin):
     """Mixin containing format-agnostic tools that work across Word, Excel, PowerPoint, and CSV files."""
 
@@ -34,7 +27,6 @@ class UniversalMixin(MCPMixin):
     async def extract_text(
         self,
         file_path: str = Field(description="Path to Office document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         preserve_formatting: bool = Field(default=False, description="Preserve text formatting and structure"),
         include_metadata: bool = Field(default=True, description="Include document metadata in output"),
         method: str = Field(default="auto", description="Extraction method: auto, primary, fallback")
@@ -42,8 +34,8 @@ class UniversalMixin(MCPMixin):
         start_time = time.time()
 
         try:
-            # Resolve file path (download if URL, or decode if content provided)
+            # Resolve file path (download if URL)
-            local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+            local_path = await resolve_office_file_path(file_path)
 
             # Validate file
             validation = await validate_office_file(local_path)
@@ -93,7 +85,6 @@ class UniversalMixin(MCPMixin):
     async def extract_images(
         self,
         file_path: str = Field(description="Path to Office document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         min_width: int = Field(default=100, description="Minimum image width in pixels"),
         min_height: int = Field(default=100, description="Minimum image height in pixels"),
         output_format: str = Field(default="png", description="Output image format: png, jpg, jpeg"),
@@ -102,8 +93,8 @@ class UniversalMixin(MCPMixin):
         start_time = time.time()
 
         try:
-            # Resolve file path (download if URL, or decode if content provided)
+            # Resolve file path
-            local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+            local_path = await resolve_office_file_path(file_path)
 
             # Validate file
             validation = await validate_office_file(local_path)
@@ -144,14 +135,13 @@ class UniversalMixin(MCPMixin):
     )
     async def extract_metadata(
         self,
-        file_path: str = Field(description="Path to Office document or URL"),
+        file_path: str = Field(description="Path to Office document or URL")
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC)
     ) -> dict[str, Any]:
         start_time = time.time()
 
         try:
-            # Resolve file path (download if URL, or decode if content provided)
+            # Resolve file path
-            local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+            local_path = await resolve_office_file_path(file_path)
 
             # Validate file
             validation = await validate_office_file(local_path)
@@ -185,12 +175,11 @@ class UniversalMixin(MCPMixin):
     )
     async def detect_office_format(
         self,
-        file_path: str = Field(description="Path to Office document or URL"),
+        file_path: str = Field(description="Path to Office document or URL")
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC)
     ) -> dict[str, Any]:
         try:
-            # Resolve file path (download if URL, or decode if content provided)
+            # Resolve file path
-            local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+            local_path = await resolve_office_file_path(file_path)
 
             # Get comprehensive format detection
             format_info = await detect_format(local_path)
@@ -210,14 +199,13 @@ class UniversalMixin(MCPMixin):
     )
     async def analyze_document_health(
         self,
-        file_path: str = Field(description="Path to Office document or URL"),
+        file_path: str = Field(description="Path to Office document or URL")
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC)
     ) -> dict[str, Any]:
         start_time = time.time()
 
         try:
-            # Resolve file path (download if URL, or decode if content provided)
+            # Resolve file path
-            local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+            local_path = await resolve_office_file_path(file_path)
 
             # Validate file thoroughly
             validation = await validate_office_file(local_path)
@@ -362,7 +350,6 @@ class UniversalMixin(MCPMixin):
     async def index_document(
         self,
         file_path: str = Field(description="Path to Office document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         include_images: bool = Field(default=True, description="Index embedded images"),
         include_chapters: bool = Field(default=True, description="Index chapters/sections (Word docs)"),
         include_sheets: bool = Field(default=True, description="Index sheets (Excel docs)"),
@@ -375,8 +362,8 @@ class UniversalMixin(MCPMixin):
         """
         start_time = time.time()
 
-        # Resolve and validate (download if URL, or decode if content provided)
+        # Resolve and validate
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
             raise OfficeFileError(f"Invalid file: {', '.join(validation['errors'])}")

src/mcwaddams/mixins/word.py

@@ -18,13 +18,6 @@ from ..utils import (
 from ..pagination import paginate_document_conversion, PaginationParams
 
 
-# Common field description for file_content parameter
-FILE_CONTENT_DESC = (
-    "Base64-encoded file content (for hosted/HTTP transport). "
-    "When provided, file_path is used only for extension detection."
-)
-
-
 class WordMixin(MCPMixin):
     """Mixin containing Word-specific tools for advanced document processing."""
 
@@ -51,7 +44,6 @@ class WordMixin(MCPMixin):
     async def convert_to_markdown(
         self,
         file_path: str = Field(description="Path to Office document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         include_images: bool = Field(default=True, description="Include images in markdown output. When True, images are extracted to files and linked in the markdown."),
         image_mode: str = Field(default="files", description="Image handling mode: 'files' (default, saves to disk and links), 'base64' (embeds inline - WARNING: can create massive responses), or 'references' (metadata only, no content)"),
         max_image_size: int = Field(default=1024*1024, description="Maximum image size in bytes for base64 encoding (only used when image_mode='base64')"),
@@ -69,8 +61,8 @@ class WordMixin(MCPMixin):
     ) -> dict[str, Any]:
         start_time = time.time()
 
-        # Resolve file path (download if URL, or decode if content provided)
+        # Resolve file path
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         # Validate file
         validation = await validate_office_file(local_path)
@@ -283,7 +275,6 @@ class WordMixin(MCPMixin):
     async def extract_word_tables(
         self,
         file_path: str = Field(description="Path to Word document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         include_styling: bool = Field(default=True, description="Include table styling information (borders, alignment, etc.)"),
         output_format: str = Field(default="structured", description="Output format: structured, csv, json, markdown"),
         preserve_merged_cells: bool = Field(default=True, description="Handle merged cells appropriately"),
@@ -295,8 +286,8 @@ class WordMixin(MCPMixin):
         import json
         import io
 
-        # Resolve and validate file (download if URL, or decode if content provided)
+        # Resolve and validate file
-        resolved_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        resolved_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(resolved_path)
 
         if validation["category"] != "word":
@@ -460,7 +451,6 @@ class WordMixin(MCPMixin):
     async def analyze_word_structure(
         self,
         file_path: str = Field(description="Path to Word document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         include_page_info: bool = Field(default=True, description="Include page layout and section information"),
         extract_outline: bool = Field(default=True, description="Extract document outline and heading hierarchy"),
         analyze_styles: bool = Field(default=True, description="Analyze custom styles and formatting patterns")
@@ -468,8 +458,8 @@ class WordMixin(MCPMixin):
         """Analyze Word document structure and organization."""
         start_time = time.time()
 
-        # Resolve and validate file (download if URL, or decode if content provided)
+        # Resolve and validate file
-        resolved_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        resolved_path = await resolve_office_file_path(file_path)
         validation = await validate_office_file(resolved_path)
 
         if validation["category"] != "word":
@@ -656,7 +646,6 @@ class WordMixin(MCPMixin):
     async def get_document_outline(
         self,
         file_path: str = Field(description="Path to Word document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         include_word_counts: bool = Field(default=True, description="Include estimated word count per section"),
         detect_chapters: bool = Field(default=True, description="Detect and flag chapter headings specifically")
     ) -> dict[str, Any]:
@@ -665,7 +654,7 @@ class WordMixin(MCPMixin):
         from docx.oxml.ns import qn
 
         start_time = time.time()
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -776,14 +765,13 @@ class WordMixin(MCPMixin):
     @handle_office_errors("Style consistency check")
     async def check_style_consistency(
         self,
-        file_path: str = Field(description="Path to Word document or URL"),
+        file_path: str = Field(description="Path to Word document or URL")
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC)
     ) -> dict[str, Any]:
         """Check document for style and formatting consistency issues."""
         from docx import Document
 
         start_time = time.time()
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -936,7 +924,6 @@ class WordMixin(MCPMixin):
         self,
         file_path: str = Field(description="Path to Word document or URL"),
         query: str = Field(description="Text to search for (case-insensitive)"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         context_chars: int = Field(default=100, description="Number of characters of context before and after match"),
         max_results: int = Field(default=20, description="Maximum number of results to return")
     ) -> dict[str, Any]:
@@ -944,7 +931,7 @@ class WordMixin(MCPMixin):
         from docx import Document
 
         start_time = time.time()
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -1022,7 +1009,6 @@ class WordMixin(MCPMixin):
     async def extract_entities(
         self,
         file_path: str = Field(description="Path to Word document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         entity_types: str = Field(default="all", description="Entity types to extract: 'all', 'people', 'places', 'organizations', or comma-separated combination"),
         min_occurrences: int = Field(default=1, description="Minimum occurrences for an entity to be included"),
         include_context: bool = Field(default=True, description="Include sample context for each entity")
@@ -1033,7 +1019,7 @@ class WordMixin(MCPMixin):
         import re
 
         start_time = time.time()
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -1233,7 +1219,6 @@ class WordMixin(MCPMixin):
     async def get_chapter_summaries(
         self,
         file_path: str = Field(description="Path to Word document or URL"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         sentences_per_chapter: int = Field(default=3, description="Number of opening sentences to include per chapter"),
         include_word_counts: bool = Field(default=True, description="Include word count for each chapter")
     ) -> dict[str, Any]:
@@ -1242,7 +1227,7 @@ class WordMixin(MCPMixin):
         import re
 
         start_time = time.time()
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -1333,7 +1318,6 @@ class WordMixin(MCPMixin):
     async def save_reading_progress(
         self,
         file_path: str = Field(description="Path to Word document"),
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC),
         chapter_number: int = Field(default=1, description="Current chapter number"),
         paragraph_index: int = Field(default=0, description="Current paragraph index"),
         notes: str = Field(default="", description="Optional notes about where you left off")
@@ -1342,7 +1326,7 @@ class WordMixin(MCPMixin):
         import json
         from datetime import datetime
 
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:
@@ -1402,13 +1386,12 @@ class WordMixin(MCPMixin):
     @handle_office_errors("Get reading progress")
     async def get_reading_progress(
         self,
-        file_path: str = Field(description="Path to Word document"),
+        file_path: str = Field(description="Path to Word document")
-        file_content: Optional[str] = Field(default=None, description=FILE_CONTENT_DESC)
     ) -> dict[str, Any]:
         """Retrieve saved reading progress from bookmark file."""
         import json
 
-        local_path = await resolve_office_file_path(file_path, file_content=file_content, filename=file_path)
+        local_path = await resolve_office_file_path(file_path)
 
         validation = await validate_office_file(local_path)
         if not validation["is_valid"]:

src/mcwaddams/server.py

@@ -12,7 +12,6 @@ Architecture uses official FastMCP MCPMixin pattern for clean separation of conc
 
 import os
 import tempfile
-from datetime import datetime, timezone
 
 from fastmcp import FastMCP
 from fastmcp.prompts import Prompt
@@ -569,11 +568,6 @@ def main():
 
     if transport == "streamable-http":
         # HTTP transport for hosted/Docker mode
-        import uvicorn
-        from starlette.applications import Starlette
-        from starlette.responses import JSONResponse
-        from starlette.routing import Route, Mount
-
         host = os.environ.get("MCP_HOST", "0.0.0.0")
         port = int(os.environ.get("MCP_PORT", "8000"))
 
@@ -583,37 +577,17 @@ def main():
         except Exception:
             pkg_version = "0.1.0"
 
-        # Health check endpoint
-        async def health_check(request):
-            return JSONResponse({
-                "status": "healthy",
-                "service": "mcwaddams",
-                "version": pkg_version,
-                "timestamp": datetime.now(timezone.utc).isoformat(),
-                "transport": "streamable-http",
-            })
-
-        # Get FastMCP's HTTP app
-        mcp_app = app.http_app()
-
-        # Create wrapper app with health endpoint + MCP routes
-        # IMPORTANT: Must pass mcp_app.lifespan to initialize task groups
-        wrapper_app = Starlette(
-            routes=[
-                Route("/health", health_check, methods=["GET"]),
-                Mount("/", app=mcp_app),  # Mount MCP at root (serves /mcp)
-            ],
-            lifespan=mcp_app.lifespan,  # Required for FastMCP session management
-        )
-
         print(f"🖨️  mcwaddams v{pkg_version}")
         print(f"📋 MCP Office Tools - Document Extraction Server")
         print(f"🌐 Starting streamable-http transport on {host}:{port}")
         print(f"   Endpoint: http://{host}:{port}/mcp")
-        print(f"   Health:   http://{host}:{port}/health")
         print()
 
-        uvicorn.run(wrapper_app, host=host, port=port, log_level="info")
+        app.run(
+            transport="streamable-http",
+            host=host,
+            port=port,
+        )
     else:
         # Default stdio transport for local CLI usage
         # CRITICAL: show_banner=False is required for stdio transport!

src/mcwaddams/utils/caching.py

@@ -4,7 +4,6 @@ import os
 import time
 import hashlib
 import tempfile
-import base64
 from pathlib import Path
 from typing import Optional, Dict, Any
 import aiofiles
@@ -13,23 +12,6 @@ from urllib.parse import urlparse
 from .validation import OfficeFileError
 
 
-# Environment variable to control local file access
-# Default depends on transport mode:
-#   - stdio (local): allow local files by default
-#   - streamable-http (remote): block local files by default
-def _get_allow_local_files() -> bool:
-    """Determine if local file access is allowed based on transport mode."""
-    explicit = os.environ.get("MCP_ALLOW_LOCAL_FILES")
-    if explicit is not None:
-        return explicit.lower() == "true"
-
-    # If not explicitly set, default based on transport mode
-    transport = os.environ.get("MCP_TRANSPORT", "stdio").lower()
-    return transport == "stdio"
-
-MCP_ALLOW_LOCAL_FILES = _get_allow_local_files()
-
-
 class OfficeFileCache:
     """Simple file cache for downloaded Office documents."""
     
@@ -230,45 +212,20 @@ def get_cache() -> OfficeFileCache:
     return _global_cache
 
 
-async def resolve_office_file_path(
+async def resolve_office_file_path(file_path: str, use_cache: bool = True) -> str:
-    file_path: str,
+    """Resolve file path, downloading from URL if necessary.
-    use_cache: bool = True,
-    file_content: Optional[str] = None,
-    filename: Optional[str] = None
-) -> str:
-    """Resolve file path, downloading from URL if necessary, or decode inline content.
     
     Args:
-        file_path: Local file path or URL (ignored if file_content provided)
+        file_path: Local file path or URL
         use_cache: Whether to use caching for URLs
-        file_content: Base64-encoded file content (for hosted/HTTP transport)
-        filename: Original filename for extension detection (used with file_content)
         
     Returns:
-        Local file path (temp file if from content, downloaded if from URL)
+        Local file path (downloaded if was URL)
-
-    Security:
-        When MCP_ALLOW_LOCAL_FILES=false (default for HTTP transport):
-        - Local file paths are rejected
-        - Only URLs and file_content are allowed
-        - This prevents hosted servers from accessing server-side files
     """
-    # Priority 1: If file_content is provided, decode and write to temp file
-    if file_content:
-        return await _resolve_from_content(file_content, filename or file_path)
-
     # Check if it's a URL
     parsed = urlparse(file_path)
-    is_url = bool(parsed.scheme and parsed.netloc)
+    if not (parsed.scheme and parsed.netloc):
-
+        # Local file path
-    if not is_url:
-        # Local file path - check if allowed
-        if not MCP_ALLOW_LOCAL_FILES:
-            raise OfficeFileError(
-                "Local file access is disabled for this server. "
-                "Please use file_content parameter to upload document data, "
-                "or provide a URL. Set MCP_ALLOW_LOCAL_FILES=true to enable local files."
-            )
         return file_path
     
     # Validate URL scheme
@@ -290,60 +247,3 @@ async def resolve_office_file_path(
         # Direct download without caching
         from .validation import download_office_file
         return await download_office_file(file_path)
-
-
-async def _resolve_from_content(file_content: str, filename_hint: str) -> str:
-    """Decode base64 content and write to a temp file.
-
-    Args:
-        file_content: Base64-encoded file data
-        filename_hint: Filename or path to extract extension from
-
-    Returns:
-        Path to temporary file containing decoded content
-    """
-    try:
-        # Decode base64 content
-        content_bytes = base64.b64decode(file_content)
-    except Exception as e:
-        raise OfficeFileError(f"Invalid base64 content: {str(e)}")
-
-    # Extract extension from filename hint
-    ext = Path(filename_hint).suffix.lower()
-    if not ext:
-        # Try to detect from content magic bytes
-        ext = _detect_extension_from_bytes(content_bytes)
-
-    # Create temp file with correct extension
-    temp_dir = Path(tempfile.gettempdir()) / "mcp_office_uploads"
-    temp_dir.mkdir(exist_ok=True)
-
-    # Generate unique filename
-    content_hash = hashlib.sha256(content_bytes).hexdigest()[:12]
-    temp_path = temp_dir / f"upload_{content_hash}{ext}"
-
-    # Write content to temp file
-    async with aiofiles.open(temp_path, 'wb') as f:
-        await f.write(content_bytes)
-
-    return str(temp_path)
-
-
-def _detect_extension_from_bytes(content: bytes) -> str:
-    """Detect file extension from magic bytes."""
-    # ZIP-based formats (docx, xlsx, pptx)
-    if content[:4] == b'PK\x03\x04':
-        # Could be docx, xlsx, or pptx - default to .docx
-        # Full detection would require reading internal XML
-        return ".docx"
-
-    # OLE Compound Document (doc, xls, ppt)
-    if content[:8] == b'\xd0\xcf\x11\xe0\xa1\xb1\x1a\xe1':
-        return ".doc"
-
-    # CSV (text-based, starts with printable characters)
-    if content[:1].isalpha() or content[:1] in b'"\'':
-        return ".csv"
-
-    # Default
-    return ".bin"

tests/test_mixins.py

@@ -324,10 +324,7 @@ class TestMockingStrategies:
                 assert result["document_metadata"] == mock_office_file["metadata"]
 
                 # Verify mocks were called correctly
-                mock_resolve.assert_called_once()
+                mock_resolve.assert_called_once_with(mock_office_file["path"])
-                # First positional arg should be the file path
-                call_args = mock_resolve.call_args
-                assert call_args[0][0] == mock_office_file["path"]
                 mock_validate.assert_called_once_with(mock_office_file["path"])
                 mock_detect.assert_called_once_with(mock_office_file["path"])
 

tests/test_universal_mixin.py

@@ -408,10 +408,7 @@ class TestMockingPatterns:
                             assert "structure" in result  # Because preserve_formatting=True
 
                             # Verify all mocks were called appropriately
-                            mock_resolve.assert_called_once()
+                            mock_resolve.assert_called_once_with("/test/document.docx")
-                            # First positional arg should be the file path
-                            call_args = mock_resolve.call_args
-                            assert call_args[0][0] == "/test/document.docx"
                             mock_validate.assert_called_once_with("/realistic/path/document.docx")
                             mock_detect.assert_called_once_with("/realistic/path/document.docx")
                             mock_extract.assert_called_once()