From 6d62fa63142f259f5fac3b8c612869263e91255a Mon Sep 17 00:00:00 2001
From: Jordan Ramos <jramos@apophisnetworking.net>
Date: Tue, 24 Feb 2026 13:31:25 -0700
Subject: [PATCH] Refactor: Organize Obsidian MCP into proper package structure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Moved obsidian_mcp.py into mcp_servers/obsidian/ to align with other
MCP server organization (SSH, Cloudflare, Loki). This improves code
discoverability and maintains consistent package structure.

Changes:
- Moved obsidian_mcp.py → mcp_servers/obsidian/obsidian_mcp.py
- Updated lazy import in llm_interface.py (line 396)
- Updated lazy import in tools.py (line 550)
- Deleted empty scripts/ directory

All imports verified with runtime tests. Zero functional changes.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 llm_interface.py                                        | 2 +-
 mcp_servers/obsidian/__init__.py                        | 1 +
 obsidian_mcp.py => mcp_servers/obsidian/obsidian_mcp.py | 0
 tools.py                                                | 4 ++--
 4 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 mcp_servers/obsidian/__init__.py
 rename obsidian_mcp.py => mcp_servers/obsidian/obsidian_mcp.py (100%)

diff --git a/llm_interface.py b/llm_interface.py
index ff466fc..013bc5b 100644
--- a/llm_interface.py
+++ b/llm_interface.py
@@ -393,7 +393,7 @@ class LLMInterface:
 
             # Conditionally add Obsidian MCP server
             try:
-                from obsidian_mcp import (
+                from mcp_servers.obsidian.obsidian_mcp import (
                     is_obsidian_enabled,
                     check_obsidian_health,
                     get_obsidian_server_config,
diff --git a/mcp_servers/obsidian/__init__.py b/mcp_servers/obsidian/__init__.py
new file mode 100644
index 0000000..359fd70
--- /dev/null
+++ b/mcp_servers/obsidian/__init__.py
@@ -0,0 +1 @@
+# mcp_servers.obsidian - Obsidian MCP server integration
diff --git a/obsidian_mcp.py b/mcp_servers/obsidian/obsidian_mcp.py
similarity index 100%
rename from obsidian_mcp.py
rename to mcp_servers/obsidian/obsidian_mcp.py
diff --git a/tools.py b/tools.py
index d0bfa80..3afe8b6 100644
--- a/tools.py
+++ b/tools.py
@@ -547,7 +547,7 @@ def _execute_obsidian_tool(
 ) -> str:
     """Execute an Obsidian MCP tool with fallback to custom tools."""
     try:
-        from obsidian_mcp import (
+        from mcp_servers.obsidian.obsidian_mcp import (
             check_obsidian_health,
             should_fallback_to_custom,
         )
@@ -572,7 +572,7 @@ def _execute_obsidian_tool(
                 f"Please start Obsidian desktop app."
             )
     except ImportError:
-        return f"Error: obsidian_mcp module not found for tool '{tool_name}'"
+        return f"Error: mcp_servers.obsidian.obsidian_mcp module not found for tool '{tool_name}'"
 
 
 # Maximum characters of tool output to return (prevents token explosion)