fd

src/Agentic_System/google_mcp_config.py

@@ -82,6 +82,14 @@ def get_mcp_headers() -> dict[str, str] | None:
     return headers
 
 
+def _describe_mcp_auth_mode() -> str:
+    if MCP_SERVER_BEARER_TOKEN:
+        return "bearer-token"
+    if MCP_SERVER_API_KEY:
+        return "api-key-bearer"
+    return "none"
+
+
 # ─── Per-service short names (used with --tools flag) ────────────────────────
 SERVICE_MAP = {
     "sheets": "sheets",
@@ -226,6 +234,10 @@ def create_google_mcp_server(service: str, tool_names: list[str]):
     """
     from agents.mcp import MCPServerStreamableHttp
     from agents.mcp import create_static_tool_filter
+    try:
+        from .mcp_runtime import get_mcp_start_timeout
+    except Exception:
+        from mcp_runtime import get_mcp_start_timeout
 
     allowed_tool_names = list(dict.fromkeys([*tool_names, AUTH_BOOTSTRAP_TOOL]))
     tool_filter = create_static_tool_filter(allowed_tool_names=allowed_tool_names)
@@ -234,6 +246,8 @@ def create_google_mcp_server(service: str, tool_names: list[str]):
     logger.info("[MCP-FACTORY] Creating MCPServerStreamableHttp for service: %s", service)
     logger.info("[MCP-FACTORY]   URL         : %s", MCP_SERVER_URL)
     logger.info("[MCP-FACTORY]   Headers set : %s", bool(get_mcp_headers()))
+    logger.info("[MCP-FACTORY]   Auth mode   : %s", _describe_mcp_auth_mode())
+    logger.info("[MCP-FACTORY]   Start timeout (s): %s", get_mcp_start_timeout())
     logger.info("[MCP-FACTORY]   Tool filter : %s", allowed_tool_names)
     logger.info("=" * 60)
 

src/Agentic_System/test/_do_oauth.py

@@ -26,8 +26,10 @@ from urllib.parse import parse_qs, urlparse
 
 # Add google-mcp-server to path so we can use its auth modules
 MCP_SERVER_DIR = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), "..", "..", "google-mcp-server")
+    os.path.join(os.path.dirname(__file__), "..", "..", "..", "google-mcp-server")
 )
+if not os.path.isdir(MCP_SERVER_DIR):
+    raise RuntimeError(f"google-mcp-server not found at {MCP_SERVER_DIR}")
 sys.path.insert(0, MCP_SERVER_DIR)
 
 from dotenv import load_dotenv
@@ -194,6 +196,9 @@ async def main():
         flow.fetch_token(code=code)
         credentials = flow.credentials
         print(f"  Token exchange successful!")
+        if os.getenv("PRINT_ACCESS_TOKEN", "false").lower() in {"1", "true", "yes", "on"}:
+            print(f"  Access token: {credentials.token}")
+            print("  NOTE: Treat this as a secret.")
 
         # Get user info
         user_info = get_user_info(credentials)