gobby 0.2.8__py3-none-any.whl → 0.2.11__py3-none-any.whl

gobby/storage/skills.py

@@ -23,7 +23,7 @@ logger = logging.getLogger(__name__)
 _UNSET: Any = object()
 
 # Valid source types for skills
-SkillSourceType = Literal["local", "github", "url", "zip", "filesystem"]
+SkillSourceType = Literal["local", "github", "url", "zip", "filesystem", "hub"]
 
 
 @dataclass
@@ -91,6 +91,8 @@ class Skill:
 
     # Gobby-specific
     enabled: bool = True
+    always_apply: bool = False
+    injection_format: str = "summary"  # "summary", "full", "content"
     project_id: str | None = None
 
     # Timestamps
@@ -131,6 +133,10 @@ class Skill:
             hub_slug=row["hub_slug"] if "hub_slug" in row.keys() else None,
             hub_version=row["hub_version"] if "hub_version" in row.keys() else None,
             enabled=bool(row["enabled"]),
+            always_apply=bool(row["always_apply"]) if "always_apply" in row.keys() else False,
+            injection_format=row["injection_format"]
+            if "injection_format" in row.keys()
+            else "summary",
             project_id=row["project_id"],
             created_at=row["created_at"],
             updated_at=row["updated_at"],
@@ -159,6 +165,8 @@ class Skill:
             "hub_slug": self.hub_slug,
             "hub_version": self.hub_version,
             "enabled": self.enabled,
+            "always_apply": self.always_apply,
+            "injection_format": self.injection_format,
             "project_id": self.project_id,
             "created_at": self.created_at,
             "updated_at": self.updated_at,
@@ -192,9 +200,13 @@ class Skill:
     def is_always_apply(self) -> bool:
         """Check if this is a core skill that should always be applied.
 
-        Supports both top-level alwaysApply and nested metadata.skillport.alwaysApply.
-        Top-level takes precedence.
+        Reads from the always_apply column first (set during sync from frontmatter).
+        Falls back to metadata for backwards compatibility with older records.
         """
+        # Primary: read from column (set during sync)
+        if self.always_apply:
+            return True
+        # Fallback: check metadata for backwards compatibility
         if not self.metadata:
             return False
         # Check top-level first
@@ -407,6 +419,8 @@ class LocalSkillManager:
         hub_slug: str | None = None,
         hub_version: str | None = None,
         enabled: bool = True,
+        always_apply: bool = False,
+        injection_format: str = "summary",
         project_id: str | None = None,
     ) -> Skill:
         """Create a new skill.
@@ -427,6 +441,8 @@ class LocalSkillManager:
             hub_slug: Optional hub slug
             hub_version: Optional hub version
             enabled: Whether skill is active
+            always_apply: Whether skill should always be injected at session start
+            injection_format: How to inject skill (summary, full, content)
             project_id: Project scope (None for global)
 
         Returns:
@@ -457,8 +473,9 @@ class LocalSkillManager:
                     id, name, description, content, version, license,
                     compatibility, allowed_tools, metadata, source_path,
                     source_type, source_ref, hub_name, hub_slug, hub_version,
-                    enabled, project_id, created_at, updated_at
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                    enabled, always_apply, injection_format, project_id,
+                    created_at, updated_at
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                 """,
                 (
                     skill_id,
@@ -477,6 +494,8 @@ class LocalSkillManager:
                     hub_slug,
                     hub_version,
                     enabled,
+                    always_apply,
+                    injection_format,
                     project_id,
                     now,
                     now,
@@ -559,6 +578,8 @@ class LocalSkillManager:
         hub_slug: str | None = _UNSET,
         hub_version: str | None = _UNSET,
         enabled: bool | None = None,
+        always_apply: bool | None = None,
+        injection_format: str | None = None,
     ) -> Skill:
         """Update an existing skill.
 
@@ -579,6 +600,8 @@ class LocalSkillManager:
             hub_slug: New hub slug (use _UNSET to leave unchanged, None to clear)
             hub_version: New hub version (use _UNSET to leave unchanged, None to clear)
             enabled: New enabled state (optional)
+            always_apply: New always_apply state (optional)
+            injection_format: New injection format (optional)
 
         Returns:
             The updated Skill
@@ -634,6 +657,12 @@ class LocalSkillManager:
         if enabled is not None:
             updates.append("enabled = ?")
             params.append(enabled)
+        if always_apply is not None:
+            updates.append("always_apply = ?")
+            params.append(always_apply)
+        if injection_format is not None:
+            updates.append("injection_format = ?")
+            params.append(injection_format)
 
         if not updates:
             return self.get_skill(skill_id)
@@ -770,7 +799,7 @@ class LocalSkillManager:
         return [Skill.from_row(row) for row in rows]
 
     def list_core_skills(self, project_id: str | None = None) -> list[Skill]:
-        """List skills with alwaysApply=true.
+        """List skills with always_apply=true (efficiently via column query).
 
         Args:
             project_id: Optional project scope
@@ -778,8 +807,19 @@ class LocalSkillManager:
         Returns:
             List of core skills (always-apply skills)
         """
-        skills = self.list_skills(project_id=project_id, enabled=True, limit=1000)
-        return [s for s in skills if s.is_always_apply()]
+        query = "SELECT * FROM skills WHERE always_apply = 1 AND enabled = 1"
+        params: list[Any] = []
+
+        if project_id:
+            query += " AND (project_id = ? OR project_id IS NULL)"
+            params.append(project_id)
+        else:
+            query += " AND project_id IS NULL"
+
+        query += " ORDER BY name ASC"
+
+        rows = self.db.fetchall(query, tuple(params))
+        return [Skill.from_row(row) for row in rows]
 
     def skill_exists(self, skill_id: str) -> bool:
         """Check if a skill with the given ID exists.

gobby/storage/tasks/_aggregates.py

@@ -97,7 +97,7 @@ def count_ready_tasks(
           -- Blocker is unresolved if not closed AND not in review without requiring user review
           AND NOT (
               blocker.status = 'closed'
-              OR (blocker.status = 'review' AND blocker.requires_user_review = 0)
+              OR (blocker.status = 'needs_review' AND blocker.requires_user_review = 0)
           )
           -- Exclude ancestor blocked by any descendant (completion block, not work block)
           -- Check if t.id appears anywhere in blocker's ancestor chain
@@ -153,7 +153,7 @@ def count_blocked_tasks(
           -- Blocker is unresolved if not closed AND not in review without requiring user review
           AND NOT (
               blocker.status = 'closed'
-              OR (blocker.status = 'review' AND blocker.requires_user_review = 0)
+              OR (blocker.status = 'needs_review' AND blocker.requires_user_review = 0)
           )
           -- Exclude ancestor blocked by any descendant (completion block, not work block)
           -- Check if t.id appears anywhere in blocker's ancestor chain

gobby/storage/tasks/_lifecycle.py

@@ -57,9 +57,9 @@ def close_task(
                 f"Cannot close task {task_id}: has {len(open_children)} open child task(s): {child_list}"
             )
 
-    # Check if task is being closed from review state (user acceptance)
+    # Check if task is being closed from needs_review state (user acceptance)
     current_task = get_task(db, task_id)
-    accepted_by_user = current_task.status == "review" if current_task else False
+    accepted_by_user = current_task.status == "needs_review" if current_task else False
 
     now = datetime.now(UTC).isoformat()
     with db.transaction() as conn:
@@ -117,8 +117,8 @@ def reopen_task(
         ValueError: If task not found or not closed/review
     """
     task = get_task(db, task_id)
-    if task.status not in ("closed", "review"):
-        raise ValueError(f"Task {task_id} is not closed or in review (status: {task.status})")
+    if task.status not in ("closed", "needs_review"):
+        raise ValueError(f"Task {task_id} is not closed or in needs_review (status: {task.status})")
 
     now = datetime.now(UTC).isoformat()
 

gobby/storage/tasks/_models.py

@@ -82,7 +82,13 @@ class Task:
     project_id: str
     title: str
     status: Literal[
-        "open", "in_progress", "review", "closed", "failed", "escalated", "needs_decomposition"
+        "open",
+        "in_progress",
+        "needs_review",
+        "closed",
+        "failed",
+        "escalated",
+        "needs_decomposition",
     ]
     priority: int
     task_type: str  # bug, feature, task, epic, chore

gobby/storage/tasks/_queries.py

@@ -156,7 +156,7 @@ def list_ready_tasks(
               -- Blocker is unresolved if not closed AND not in review without requiring user review
               AND NOT (
                   blocker.status = 'closed'
-                  OR (blocker.status = 'review' AND blocker.requires_user_review = 0)
+                  OR (blocker.status = 'needs_review' AND blocker.requires_user_review = 0)
               )
               -- Exclude ancestor blocked by any descendant (completion block, not work block)
               AND NOT EXISTS (
@@ -186,7 +186,7 @@ def list_ready_tasks(
               -- Blocker is unresolved if not closed AND not in review without requiring user review
               AND NOT (
                   blocker.status = 'closed'
-                  OR (blocker.status = 'review' AND blocker.requires_user_review = 0)
+                  OR (blocker.status = 'needs_review' AND blocker.requires_user_review = 0)
               )
               -- Exclude ancestor blocked by any descendant (completion block, not work block)
               AND NOT EXISTS (
@@ -266,7 +266,7 @@ def list_blocked_tasks(
           -- Blocker is unresolved if not closed AND not in review without requiring user review
           AND NOT (
               blocker.status = 'closed'
-              OR (blocker.status = 'review' AND blocker.requires_user_review = 0)
+              OR (blocker.status = 'needs_review' AND blocker.requires_user_review = 0)
           )
           -- Exclude ancestor blocked by any descendant (completion block, not work block)
           AND NOT EXISTS (

gobby/sync/memories.py

@@ -131,8 +131,8 @@ class MemoryBackupManager:
             from gobby.utils.project_context import get_project_context
 
             project_ctx = get_project_context()
-            if project_ctx and project_ctx.get("path"):
-                project_path = Path(project_ctx["path"]).expanduser().resolve()
+            if project_ctx and project_ctx.get("project_path"):
+                project_path = Path(project_ctx["project_path"]).expanduser().resolve()
                 return project_path / self.export_path
         except Exception:
             pass  # nosec B110 - fall back to cwd if project context unavailable
@@ -289,7 +289,8 @@ class MemoryBackupManager:
             return 0
 
         try:
-            memories = self.memory_manager.list_memories()
+            # Use high limit to export all memories for backup (default is 50)
+            memories = self.memory_manager.list_memories(limit=10000)
 
             # Deduplicate by content before export
             unique_memories = self._deduplicate_memories(memories)

gobby/tasks/commits.py

@@ -487,30 +487,49 @@ def extract_mentioned_symbols(task: dict[str, Any]) -> list[str]:
 
 
 # Task ID patterns to search for in commit messages
-# Supports #N format (e.g., #1, #47) - human-friendly task references
+# Uses {project}-#N format to avoid GitHub auto-linking and match CLI display format
+# Patterns capture both project name and task number for validation
 TASK_ID_PATTERNS = [
-    # [#N] - bracket format
-    r"\[#(\d+)\]",
-    # #N: - hash-colon format (at start of line or after space)
-    r"(?:^|\s)#(\d+):",
-    # Implements/Fixes/Closes/Refs #N (supports multiple: #1, #2, #3)
-    r"(?:implements|fixes|closes|refs)\s+#(\d+)",
-    # Standalone #N after whitespace (with word boundary to avoid false positives)
-    r"(?:^|\s)#(\d+)\b(?![\d.])",
+    # [project-#N] - bracket format (primary)
+    r"\[(\w+)-#(\d+)\]",
+    # project-#N - standalone format (word boundary before, after digits)
+    r"(?:^|\s)(\w+)-#(\d+)\b",
+    # Implements/Fixes/Closes/Refs project-#N
+    r"(?:implements|fixes|closes|refs)\s+(\w+)-#(\d+)",
 ]
 
 
-def extract_task_ids_from_message(message: str) -> list[str]:
+def get_current_project_name() -> str | None:
+    """Get current project name from context.
+
+    Returns:
+        Project name or None if not in a project.
+    """
+    from gobby.utils.project_context import get_project_context
+
+    ctx = get_project_context()
+    if ctx and ctx.get("name"):
+        name: str = ctx["name"]
+        return name
+    return None
+
+
+def extract_task_ids_from_message(
+    message: str,
+    project_name: str | None = None,
+) -> list[str]:
     """Extract task IDs from a commit message.
 
     Supports patterns:
-    - [#N] - bracket format
-    - #N: - hash-colon format (at start of message)
-    - Implements/Fixes/Closes/Refs #N
-    - Multiple references: #1, #2, #3
+    - [project-#N] - bracket format (primary)
+    - project-#N - standalone format
+    - Implements/Fixes/Closes/Refs project-#N
 
     Args:
         message: Commit message to parse.
+        project_name: Optional project name to filter matches. If provided,
+            only returns task IDs from commits referencing this project.
+            If None, returns all task IDs found regardless of project.
 
     Returns:
         List of unique task references found (e.g., ["#1", "#42"]).
@@ -520,8 +539,13 @@ def extract_task_ids_from_message(message: str) -> list[str]:
     for pattern in TASK_ID_PATTERNS:
         matches = re.findall(pattern, message, re.IGNORECASE | re.MULTILINE)
         for match in matches:
+            # match is a tuple: (project, task_number)
+            found_project, task_num = match
+            # Filter by project name if specified
+            if project_name and found_project.lower() != project_name.lower():
+                continue
             # Format as #N
-            task_id = f"#{match}"
+            task_id = f"#{task_num}"
             task_ids.add(task_id)
 
     return list(task_ids)
@@ -547,6 +571,7 @@ def auto_link_commits(
     task_id: str | None = None,
     since: str | None = None,
     cwd: str | Path | None = None,
+    project_name: str | None = None,
 ) -> AutoLinkResult:
     """Auto-detect and link commits that mention task IDs.
 
@@ -558,12 +583,18 @@ def auto_link_commits(
         task_id: Optional specific task ID to filter for.
         since: Optional git --since parameter (e.g., "1 week ago", "2024-01-01").
         cwd: Working directory for git commands.
+        project_name: Optional project name to filter commits. If not provided,
+            auto-detects from current project context.
 
     Returns:
         AutoLinkResult with details of linked and skipped commits.
     """
     working_dir = Path(cwd) if cwd else Path.cwd()
 
+    # Get project name for filtering (auto-detect if not provided)
+    if project_name is None:
+        project_name = get_current_project_name()
+
     # Build git log command
     # Format: "sha|message" for easy parsing
     git_cmd = ["git", "log", "--pretty=format:%h|%s"]
@@ -590,8 +621,8 @@ def auto_link_commits(
 
         commit_sha, message = parts
 
-        # Extract task IDs from message
-        found_task_ids = extract_task_ids_from_message(message)
+        # Extract task IDs from message (filtered by project name)
+        found_task_ids = extract_task_ids_from_message(message, project_name)
 
         if not found_task_ids:
             continue

gobby/tasks/external_validator.py

@@ -46,12 +46,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 # Default system prompt for external validators
-DEFAULT_EXTERNAL_SYSTEM_PROMPT = (
-    "You are an objective QA validator reviewing code changes. "
-    "You have no prior context about this task - evaluate purely based on "
-    "the acceptance criteria and the changes provided. "
-    "Be thorough but fair in your assessment."
-)
+
 
 # Module-level loader (initialized lazily)
 _loader: PromptLoader | None = None
@@ -62,10 +57,7 @@ def _get_loader(project_dir: Path | None = None) -> PromptLoader:
     global _loader
     if _loader is None:
         _loader = PromptLoader(project_dir=project_dir)
-        # Register fallbacks for strangler fig pattern
-        _loader.register_fallback(
-            "external_validation/system", lambda: DEFAULT_EXTERNAL_SYSTEM_PROMPT
-        )
+
     return _loader
 
 
@@ -218,13 +210,8 @@ async def _run_llm_validation(
     # Build the validation prompt
     prompt = _build_external_validation_prompt(task, changes_context)
 
-    # System prompt emphasizing objectivity
-    system_prompt = (
-        "You are an objective QA validator reviewing code changes. "
-        "You have no prior context about this task - evaluate purely based on "
-        "the acceptance criteria and the changes provided. "
-        "Be thorough but fair in your assessment."
-    )
+    # Render system prompt
+    system_prompt = _get_loader().render("external_validation/system", {})
 
     try:
         provider = llm_service.get_provider(config.provider)

gobby/tasks/validation.py

@@ -27,51 +27,6 @@ from gobby.utils.json_helpers import extract_json_object
 
 logger = logging.getLogger(__name__)
 
-# Default prompts (fallbacks for strangler fig pattern)
-DEFAULT_VALIDATE_PROMPT = """Validate if the following changes satisfy the requirements.
-
-Task: {title}
-{category_section}{criteria_text}
-
-{changes_section}
-IMPORTANT: Return ONLY a JSON object, nothing else. No explanation, no preamble.
-Format: {{"status": "valid", "feedback": "..."}} or {{"status": "invalid", "feedback": "..."}}
-"""
-
-DEFAULT_CRITERIA_PROMPT = """Generate validation criteria for this task.
-
-Task: {title}
-Description: {description}
-
-CRITICAL RULES - You MUST follow these:
-1. **Only stated requirements** - Include ONLY requirements explicitly written in the title or description
-2. **No invented values** - Do NOT invent specific numbers, timeouts, thresholds, or limits unless they appear in the task
-3. **No invented edge cases** - Do NOT add edge cases, error scenarios, or boundary conditions beyond what's described
-4. **Proportional detail** - Vague tasks get vague criteria; detailed tasks get detailed criteria
-5. **When in doubt, leave it out** - If something isn't mentioned, don't include it
-
-For vague requirements like "fix X" or "add Y", use criteria like:
-- "X no longer produces the reported error/warning"
-- "Y functionality works as expected"
-- "Existing tests continue to pass"
-- "No regressions introduced"
-
-DO NOT generate criteria like:
-- "timeout defaults to 30 seconds" (unless 30 seconds is in the task description)
-- "handles edge case Z" (unless Z is mentioned in the task)
-- "logs with format X" (unless that format is specified)
-
-Format as markdown checkboxes:
-## Deliverable
-- [ ] What the task explicitly asks for
-
-## Functional Requirements
-- [ ] Only requirements stated in the description
-
-## Verification
-- [ ] Tests pass (if applicable)
-- [ ] No regressions
-"""
 
 # Default number of commits to look back when gathering context
 DEFAULT_COMMIT_WINDOW = 10
@@ -490,10 +445,6 @@ class TaskValidator:
         self.llm_service = llm_service
         self._loader = PromptLoader(project_dir=project_dir)
 
-        # Register fallbacks for strangler fig pattern
-        self._loader.register_fallback("validation/validate", lambda: DEFAULT_VALIDATE_PROMPT)
-        self._loader.register_fallback("validation/criteria", lambda: DEFAULT_CRITERIA_PROMPT)
-
     async def gather_validation_context(self, file_paths: list[str]) -> str:
         """
         Gather context for validation from files.
@@ -588,35 +539,16 @@ class TaskValidator:
             else:
                 category_section += "\n"
 
-        # Build prompt using PromptLoader or legacy config
-        if self.config.prompt_path:
-            prompt_path = self.config.prompt_path
-            template_context = {
-                "title": title,
-                "category_section": category_section,
-                "criteria_text": criteria_text,
-                "changes_section": changes_section,
-                "file_context": file_context[:50000] if file_context else "",
-            }
-            try:
-                prompt = self._loader.render(prompt_path, template_context)
-            except FileNotFoundError:
-                logger.debug(f"Prompt template '{prompt_path}' not found, using fallback")
-                prompt = DEFAULT_VALIDATE_PROMPT.format(**template_context)
-                if file_context:
-                    prompt += f"\nFile Context:\n{file_context[:50000]}\n"
-        else:
-            # Default behavior
-            template_context = {
-                "title": title,
-                "category_section": category_section,
-                "criteria_text": criteria_text,
-                "changes_section": changes_section,
-                "file_context": file_context[:50000] if file_context else "",
-            }
-            prompt = DEFAULT_VALIDATE_PROMPT.format(**template_context)
-            if file_context:
-                prompt += f"\nFile Context:\n{file_context[:50000]}\n"
+        # Build prompt using PromptLoader
+        prompt_path = self.config.prompt_path or "validation/validate"
+        template_context = {
+            "title": title,
+            "category_section": category_section,
+            "criteria_text": criteria_text,
+            "changes_section": changes_section,
+            "file_context": file_context[:50000] if file_context else "",
+        }
+        prompt = self._loader.render(prompt_path, template_context)
 
         try:
             provider = self.llm_service.get_provider(self.config.provider)
@@ -670,19 +602,13 @@ class TaskValidator:
         if not self.config.enabled:
             return None
 
-        # Build prompt using PromptLoader or legacy config
+        # Use PromptLoader
+        prompt_path = self.config.criteria_prompt_path or "validation/criteria"
         template_context = {
             "title": title,
             "description": description or "(no description)",
         }
-
-        # Use PromptLoader
-        prompt_path = self.config.criteria_prompt_path or "validation/criteria"
-        try:
-            prompt = self._loader.render(prompt_path, template_context)
-        except FileNotFoundError:
-            logger.debug(f"Prompt template '{prompt_path}' not found, using fallback")
-            prompt = DEFAULT_CRITERIA_PROMPT.format(**template_context)
+        prompt = self._loader.render(prompt_path, template_context)
 
         try:
             provider = self.llm_service.get_provider(self.config.provider)

gobby/tools/summarizer.py

@@ -23,25 +23,6 @@ MAX_DESCRIPTION_LENGTH = 200
 _config: ToolSummarizerConfig | None = None
 _loader: PromptLoader | None = None
 
-DEFAULT_SUMMARY_PROMPT = """Summarize this MCP tool description in 180 characters or less.
-Keep it to three sentences or less. Be concise and preserve the key functionality.
-Do not add quotes, extra formatting, or code examples.
-
-Description: {description}
-
-Summary:"""
-
-DEFAULT_SUMMARY_SYSTEM_PROMPT = "You are a technical summarizer. Create concise tool descriptions."
-
-DEFAULT_SERVER_DESC_PROMPT = """Write a single concise sentence describing what the '{server_name}' MCP server does based on its tools.
-
-Tools:
-{tools_list}
-
-Description (1 sentence, try to keep under 100 characters):"""
-
-DEFAULT_SERVER_DESC_SYSTEM_PROMPT = "You write concise technical descriptions."
-
 
 def init_summarizer_config(config: ToolSummarizerConfig, project_dir: str | None = None) -> None:
     """Initialize the summarizer with configuration."""
@@ -50,13 +31,6 @@ def init_summarizer_config(config: ToolSummarizerConfig, project_dir: str | None
     global _config, _loader
     _config = config
     _loader = PromptLoader(project_dir=Path(project_dir) if project_dir else None)
-    # Register fallbacks
-    _loader.register_fallback("features/tool_summary", lambda: DEFAULT_SUMMARY_PROMPT)
-    _loader.register_fallback("features/tool_summary_system", lambda: DEFAULT_SUMMARY_SYSTEM_PROMPT)
-    _loader.register_fallback("features/server_description", lambda: DEFAULT_SERVER_DESC_PROMPT)
-    _loader.register_fallback(
-        "features/server_description_system", lambda: DEFAULT_SERVER_DESC_SYSTEM_PROMPT
-    )
 
 
 def _get_config() -> ToolSummarizerConfig:
@@ -96,9 +70,9 @@ async def _summarize_description_with_claude(description: str) -> str:
             if _loader is None:
                 raise RuntimeError("Summarizer not initialized")
             prompt = _loader.render(prompt_path, {"description": description})
-        except (FileNotFoundError, OSError, KeyError, ValueError, RuntimeError) as e:
-            logger.debug(f"Failed to load prompt from {prompt_path}: {e}, using default")
-            prompt = DEFAULT_SUMMARY_PROMPT.format(description=description)
+        except (OSError, KeyError, ValueError, RuntimeError) as e:
+            logger.debug(f"Failed to load prompt from {prompt_path}: {e}")
+            raise
 
         # Get system prompt
         sys_prompt_path = config.system_prompt_path or "features/tool_summary_system"
@@ -106,9 +80,9 @@ async def _summarize_description_with_claude(description: str) -> str:
             if _loader is None:
                 raise RuntimeError("Summarizer not initialized")
             system_prompt = _loader.render(sys_prompt_path, {})
-        except (FileNotFoundError, OSError, KeyError, ValueError, RuntimeError) as e:
-            logger.debug(f"Failed to load system prompt from {sys_prompt_path}: {e}, using default")
-            system_prompt = DEFAULT_SUMMARY_SYSTEM_PROMPT
+        except (OSError, KeyError, ValueError, RuntimeError) as e:
+            logger.debug(f"Failed to load system prompt from {sys_prompt_path}: {e}")
+            system_prompt = "You are a technical summarizer."
 
         # Configure for single-turn completion
         options = ClaudeAgentOptions(
@@ -198,30 +172,23 @@ async def generate_server_description(
             "server_name": server_name,
             "tools_list": tools_list,
         }
-        try:
-            if _loader is None:
-                _get_config()  # force init
-            if _loader is None:
-                # Still None after _get_config, use default
-                prompt = DEFAULT_SERVER_DESC_PROMPT.format(**context)
-            else:
-                prompt = _loader.render(prompt_path, context)
-        except (FileNotFoundError, OSError, KeyError, ValueError, RuntimeError) as e:
-            logger.debug(f"Failed to load prompt from {prompt_path}: {e}, using default")
-            prompt = DEFAULT_SERVER_DESC_PROMPT.format(**context)
+        if _loader is None:
+            _get_config()  # force init
+        if _loader is None:
+            # Still None after _get_config, use default
+            raise RuntimeError("Summarizer not initialized")
+        else:
+            prompt = _loader.render(prompt_path, context)
 
         # Get system prompt
         sys_prompt_path = (
             config.server_description_system_prompt_path or "features/server_description_system"
         )
-        try:
-            if _loader is None:
-                system_prompt = DEFAULT_SERVER_DESC_SYSTEM_PROMPT
-            else:
-                system_prompt = _loader.render(sys_prompt_path, {})
-        except (FileNotFoundError, OSError, KeyError, ValueError, RuntimeError) as e:
-            logger.debug(f"Failed to load system prompt from {sys_prompt_path}: {e}, using default")
-            system_prompt = DEFAULT_SERVER_DESC_SYSTEM_PROMPT
+
+        if _loader is None:
+            system_prompt = "You write concise technical descriptions."
+        else:
+            system_prompt = _loader.render(sys_prompt_path, {})
 
         # Configure for single-turn completion
         options = ClaudeAgentOptions(