gobby 0.2.6__py3-none-any.whl → 0.2.7__py3-none-any.whl

gobby/mcp_proxy/importer.py

@@ -5,6 +5,8 @@ import re
 from typing import TYPE_CHECKING, Any
 
 from gobby.config.app import DaemonConfig
+from gobby.config.features import DEFAULT_IMPORT_MCP_SERVER_PROMPT
+from gobby.prompts import PromptLoader
 from gobby.storage.database import DatabaseProtocol
 from gobby.storage.mcp import LocalMCPManager
 from gobby.storage.projects import LocalProjectManager
@@ -18,6 +20,21 @@ logger = logging.getLogger(__name__)
 # Pattern to detect placeholder secrets like <YOUR_API_KEY>
 SECRET_PLACEHOLDER_PATTERN = re.compile(r"<YOUR_[A-Z0-9_]+>")
 
+DEFAULT_GITHUB_FETCH_PROMPT = """Fetch the README from this GitHub repository and extract MCP server configuration:
+
+{github_url}
+
+If the URL doesn't point directly to a README, try to find and fetch the README.md file.
+
+After reading the documentation, extract the MCP server configuration as a JSON object."""
+
+DEFAULT_SEARCH_FETCH_PROMPT = """Search for MCP server: {search_query}
+
+Find the official documentation or GitHub repository for this MCP server.
+Then fetch and read the README or installation docs.
+
+After reading the documentation, extract the MCP server configuration as a JSON object."""
+
 
 class MCPServerImporter:
     """Handles importing MCP servers from various sources."""
@@ -46,6 +63,21 @@ class MCPServerImporter:
         self.mcp_client_manager = mcp_client_manager
         self.import_config = config.get_import_mcp_server_config()
 
+        # Initialize prompt loader
+        project_path = None
+        if current_project_id:
+            if project := self.project_manager.get(current_project_id):
+                project_path = project.repo_path
+
+        from pathlib import Path
+
+        self._loader = PromptLoader(project_dir=Path(project_path) if project_path else None)
+
+        # Register fallbacks
+        self._loader.register_fallback("import/github_fetch", lambda: DEFAULT_GITHUB_FETCH_PROMPT)
+        self._loader.register_fallback("import/search_fetch", lambda: DEFAULT_SEARCH_FETCH_PROMPT)
+        self._loader.register_fallback("import/system", lambda: DEFAULT_IMPORT_MCP_SERVER_PROMPT)
+
     async def import_from_project(
         self,
         source_project: str,
@@ -171,10 +203,23 @@ class MCPServerImporter:
             from claude_agent_sdk import AssistantMessage, ClaudeAgentOptions, TextBlock, query
 
             # Build prompt to fetch and extract config
-            prompt = self.import_config.github_fetch_prompt.format(github_url=github_url)
+            prompt_path = self.import_config.github_fetch_prompt_path or "import/github_fetch"
+            try:
+                prompt = self._loader.render(prompt_path, {"github_url": github_url})
+            except Exception as e:
+                logger.warning(f"Failed to load Github fetch prompt: {e}")
+                prompt = DEFAULT_GITHUB_FETCH_PROMPT.format(github_url=github_url)
+
+            # Get system prompt
+            sys_prompt_path = self.import_config.prompt_path or "import/system"
+            try:
+                system_prompt = self._loader.render(sys_prompt_path, {})
+            except Exception as e:
+                logger.warning(f"Failed to load import system prompt: {e}")
+                system_prompt = DEFAULT_IMPORT_MCP_SERVER_PROMPT
 
             options = ClaudeAgentOptions(
-                system_prompt=self.import_config.prompt,
+                system_prompt=system_prompt,
                 max_turns=3,
                 model=self.import_config.model,
                 allowed_tools=["WebFetch"],
@@ -222,10 +267,23 @@ class MCPServerImporter:
             from claude_agent_sdk import AssistantMessage, ClaudeAgentOptions, TextBlock, query
 
             # Build prompt to search and extract config
-            prompt = self.import_config.search_fetch_prompt.format(search_query=search_query)
+            prompt_path = self.import_config.search_fetch_prompt_path or "import/search_fetch"
+            try:
+                prompt = self._loader.render(prompt_path, {"search_query": search_query})
+            except Exception as e:
+                logger.warning(f"Failed to load search fetch prompt: {e}")
+                prompt = DEFAULT_SEARCH_FETCH_PROMPT.format(search_query=search_query)
+
+            # Get system prompt
+            sys_prompt_path = self.import_config.prompt_path or "import/system"
+            try:
+                system_prompt = self._loader.render(sys_prompt_path, {})
+            except Exception as e:
+                logger.warning(f"Failed to load import system prompt: {e}")
+                system_prompt = DEFAULT_IMPORT_MCP_SERVER_PROMPT
 
             options = ClaudeAgentOptions(
-                system_prompt=self.import_config.prompt,
+                system_prompt=system_prompt,
                 max_turns=5,  # More turns for search + fetch
                 model=self.import_config.model,
                 allowed_tools=["WebSearch", "WebFetch"],

gobby/mcp_proxy/instructions.py

@@ -29,6 +29,8 @@ At the start of EVERY session:
 3. Session ID: Look for `session_id: <uuid>` in your context.
    If missing, call:
    `call_tool("gobby-sessions", "get_current", {"external_id": "<your-session-id>", "source": "claude"})`
+
+Session and task references use `#N` format (e.g., `#1`, `#42`) which is project-scoped.
 </startup>
 
 <tool_discovery>

gobby/mcp_proxy/registries.py

@@ -114,7 +114,7 @@ def setup_internal_registries(
     # Initialize sessions registry (messages + session CRUD)
     # Register if either message_manager or local_session_manager is available
     if message_manager is not None or local_session_manager is not None:
-        from gobby.mcp_proxy.tools.session_messages import create_session_messages_registry
+        from gobby.mcp_proxy.tools.sessions import create_session_messages_registry
 
         session_messages_registry = create_session_messages_registry(
             message_manager=message_manager,
@@ -173,7 +173,6 @@ def setup_internal_registries(
 
         agents_registry = create_agents_registry(
             runner=agent_runner,
-            tool_proxy_getter=tool_proxy_getter,
         )
 
         # Add inter-agent messaging tools if message manager is available
@@ -198,7 +197,6 @@ def setup_internal_registries(
             worktree_storage=worktree_storage,
             git_manager=git_manager,
             project_id=project_id,
-            agent_runner=agent_runner,
         )
         manager.add_registry(worktrees_registry)
         logger.debug("Worktrees registry initialized")
@@ -222,7 +220,6 @@ def setup_internal_registries(
                 clone_storage=clone_storage,
                 git_manager=clone_git_manager,
                 project_id=project_id or "",
-                agent_runner=agent_runner,
             )
             manager.add_registry(clones_registry)
             logger.debug("Clones registry initialized")

gobby/mcp_proxy/services/recommendation.py

@@ -7,13 +7,30 @@ import logging
 from typing import TYPE_CHECKING, Any, Literal
 
 if TYPE_CHECKING:
-    from gobby.config.app import RecommendToolsConfig
+    from gobby.config.features import RecommendToolsConfig
+from gobby.prompts import PromptLoader
 
 logger = logging.getLogger("gobby.mcp.server")
 
 # Search mode type
 SearchMode = Literal["llm", "semantic", "hybrid"]
 
+DEFAULT_HYBRID_RERANK_PROMPT = """Re-rank the following tools for the task: "{task_description}"
+
+Candidates:
+{candidate_list}
+
+Select the best {top_k} tools. Return JSON:
+{{"recommendations": [{{"server": "...", "tool": "...", "reason": "..."}}]}}"""
+
+DEFAULT_LLM_PROMPT = """Recommend tools for the task: "{task_description}"
+
+Available Servers:
+{available_servers}
+
+Return JSON:
+{{"recommendations": [{{"server": "...", "tool": "...", "reason": "..."}}]}}"""
+
 
 class RecommendationService:
     """Service for recommending tools."""
@@ -31,12 +48,17 @@ class RecommendationService:
         self._semantic_search = semantic_search
         self._project_id = project_id
         self._config = config
+        self._loader = PromptLoader()
+        self._loader.register_fallback(
+            "features/recommend_hybrid", lambda: DEFAULT_HYBRID_RERANK_PROMPT
+        )
+        self._loader.register_fallback("features/recommend_llm", lambda: DEFAULT_LLM_PROMPT)
 
     def _get_config(self) -> RecommendToolsConfig:
         """Get config with fallback to defaults."""
         if self._config is not None:
             return self._config
-        from gobby.config.app import RecommendToolsConfig
+        from gobby.config.features import RecommendToolsConfig
 
         return RecommendToolsConfig()
 
@@ -153,11 +175,16 @@ class RecommendationService:
                 for c in candidates
             )
 
-            prompt = config.hybrid_rerank_prompt.format(
-                task_description=task_description,
-                candidate_list=candidate_list,
-                top_k=top_k,
-            )
+            prompt_path = config.hybrid_rerank_prompt_path or "features/recommend_hybrid"
+            context = {
+                "task_description": task_description,
+                "candidate_list": candidate_list,
+                "top_k": top_k,
+            }
+            try:
+                prompt = self._loader.render(prompt_path, context)
+            except Exception:
+                prompt = DEFAULT_HYBRID_RERANK_PROMPT.format(**context)
 
             provider = self._llm_service.get_default_provider()
             response = await provider.generate_text(prompt)
@@ -191,10 +218,15 @@ class RecommendationService:
             config = self._get_config()
             available_servers = self._mcp_manager.get_available_servers()
 
-            prompt = config.llm_prompt.format(
-                task_description=task_description,
-                available_servers=", ".join(available_servers),
-            )
+            prompt_path = config.llm_prompt_path or "features/recommend_llm"
+            context = {
+                "task_description": task_description,
+                "available_servers": ", ".join(available_servers),
+            }
+            try:
+                prompt = self._loader.render(prompt_path, context)
+            except Exception:
+                prompt = DEFAULT_LLM_PROMPT.format(**context)
 
             provider = self._llm_service.get_default_provider()
             response = await provider.generate_text(prompt)