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

gobby/config/extensions.py

@@ -137,8 +137,8 @@ class PluginsConfig(BaseModel):
         description="Enable plugin system (disabled by default for security)",
     )
     plugin_dirs: list[str] = Field(
-        default_factory=lambda: ["~/.gobby/plugins", ".gobby/plugins"],
-        description="Directories to scan for plugins (supports ~ expansion)",
+        default_factory=lambda: [".gobby/plugins"],
+        description="Directories to scan for plugins (project-scoped)",
     )
     auto_discover: bool = Field(
         default=True,

gobby/config/features.py

@@ -42,45 +42,22 @@ class ToolSummarizerConfig(BaseModel):
         default="claude-haiku-4-5",
         description="Model to use for summarization (fast/cheap recommended)",
     )
-    prompt: str = Field(
-        default="""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:""",
-        description="DEPRECATED: Use prompt_path instead. Prompt template for tool description summarization",
-    )
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom tool summary prompt template (e.g., 'features/tool_summary')",
     )
-    system_prompt: str = Field(
-        default="You are a technical summarizer. Create concise tool descriptions.",
-        description="DEPRECATED: Use system_prompt_path instead. System prompt for tool description summarization",
-    )
+
     system_prompt_path: str | None = Field(
         default=None,
         description="Path to custom tool summary system prompt (e.g., 'features/tool_summary_system')",
     )
-    server_description_prompt: str = Field(
-        default="""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):""",
-        description="DEPRECATED: Use server_description_prompt_path instead. Prompt template for server description generation",
-    )
     server_description_prompt_path: str | None = Field(
         default=None,
         description="Path to custom server description prompt (e.g., 'features/server_description')",
     )
-    server_description_system_prompt: str = Field(
-        default="You write concise technical descriptions.",
-        description="DEPRECATED: Use server_description_system_prompt_path instead. System prompt for server description generation",
-    )
+
     server_description_system_prompt_path: str | None = Field(
         default=None,
         description="Path to custom server description system prompt (e.g., 'features/server_description_system')",
@@ -110,26 +87,12 @@ class TaskDescriptionConfig(BaseModel):
         default=50,
         description="Minimum length of structured extraction before LLM fallback triggers",
     )
-    prompt: str = Field(
-        default="""Generate a concise task description for this task from a spec document.
-
-Task title: {task_title}
-Section: {section_title}
-Section content: {section_content}
-Existing context: {existing_context}
 
-Write a 1-2 sentence description focusing on the goal and deliverable.
-Do not add quotes, extra formatting, or implementation details.""",
-        description="DEPRECATED: Use prompt_path instead. Prompt template for task description generation",
-    )
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom task description prompt (e.g., 'features/task_description')",
     )
-    system_prompt: str = Field(
-        default="You are a technical writer creating concise task descriptions for developers.",
-        description="DEPRECATED: Use system_prompt_path instead. System prompt for task description generation",
-    )
+
     system_prompt_path: str | None = Field(
         default=None,
         description="Path to custom task description system prompt (e.g., 'features/task_description_system')",
@@ -159,83 +122,17 @@ class RecommendToolsConfig(BaseModel):
         default="claude-sonnet-4-5",
         description="Model to use for tool recommendations",
     )
-    prompt: str = Field(
-        default="""You are a tool recommendation assistant for Claude Code with access to MCP servers.
-
-CRITICAL PRIORITIZATION RULES:
-1. Analyze the task type (code navigation, docs lookup, database query, planning, data processing, etc.)
-2. Check available MCP server DESCRIPTIONS for capability matches
-3. If ANY MCP server's description matches the task type -> recommend those tools FIRST
-4. Only recommend built-in Claude Code tools (Grep, Read, Bash, WebSearch) if NO suitable MCP server exists
-
-TASK TYPE MATCHING GUIDELINES:
-- Task needs library/framework documentation -> Look for MCP servers describing "documentation", "library docs", "API reference"
-- Task needs code navigation/architecture understanding -> Look for MCP servers describing "code analysis", "symbols", "semantic search"
-- Task needs database operations -> Look for MCP servers describing "database", "PostgreSQL", "SQL"
-- Task needs complex reasoning/planning -> Look for MCP servers describing "problem-solving", "thinking", "reasoning"
-- Task needs data processing/large datasets -> Look for MCP servers describing "code execution", "data processing", "token optimization"
-
-ANTI-PATTERNS (What NOT to recommend):
-- Don't recommend WebSearch when an MCP server provides library/framework documentation
-- Don't recommend Grep/Read for code architecture questions when an MCP server does semantic code analysis
-- Don't recommend Bash for database queries when an MCP server provides database tools
-- Don't recommend direct implementation when an MCP server provides structured reasoning
-
-OUTPUT FORMAT:
-Be concise and specific. Recommend 1-3 tools maximum with:
-1. Which MCP server and tools to use (if applicable)
-2. Brief rationale based on server description matching task type
-3. Suggested workflow (e.g., "First call X, then use result with Y")
-4. Only mention built-in tools if no MCP server is suitable""",
-        description="DEPRECATED: Use prompt_path instead. System prompt for recommend_tools() MCP tool.",
-    )
+
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom recommend tools system prompt (e.g., 'features/recommend_tools')",
     )
-    hybrid_rerank_prompt: str = Field(
-        default="""You are an expert at selecting tools for tasks.
-Task: {task_description}
-
-Candidate tools (ranked by semantic similarity):
-{candidate_list}
-
-Re-rank these tools by relevance to the task and provide reasoning.
-Return the top {top_k} most relevant as JSON:
-{{
-  "recommendations": [
-    {{
-      "server": "server_name",
-      "tool": "tool_name",
-      "reason": "Why this tool is the best choice"
-    }}
-  ]
-}}""",
-        description="DEPRECATED: Use hybrid_rerank_prompt_path instead. Prompt template for hybrid mode re-ranking",
-    )
+
     hybrid_rerank_prompt_path: str | None = Field(
         default=None,
         description="Path to custom hybrid re-rank prompt (e.g., 'features/recommend_tools_hybrid')",
     )
-    llm_prompt: str = Field(
-        default="""You are an expert at selecting the right tools for a given task.
-Task: {task_description}
-
-Available Servers: {available_servers}
-
-Please recommend which tools from these servers would be most useful for this task.
-Return a JSON object with this structure:
-{{
-  "recommendations": [
-    {{
-      "server": "server_name",
-      "tool": "tool_name",
-      "reason": "Why this tool is useful"
-    }}
-  ]
-}}""",
-        description="DEPRECATED: Use llm_prompt_path instead. Prompt template for LLM mode recommendations",
-    )
+
     llm_prompt_path: str | None = Field(
         default=None,
         description="Path to custom LLM recommendation prompt (e.g., 'features/recommend_tools_llm')",
@@ -276,37 +173,17 @@ class ImportMCPServerConfig(BaseModel):
         default="claude-haiku-4-5",
         description="Model to use for config extraction",
     )
-    prompt: str = Field(
-        default=DEFAULT_IMPORT_MCP_SERVER_PROMPT,
-        description="DEPRECATED: Use prompt_path instead. System prompt for MCP server config extraction",
-    )
+
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom import MCP system prompt (e.g., 'features/import_mcp')",
     )
-    github_fetch_prompt: str = Field(
-        default="""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.""",
-        description="DEPRECATED: Use github_fetch_prompt_path instead. User prompt template for GitHub import",
-    )
     github_fetch_prompt_path: str | None = Field(
         default=None,
         description="Path to custom GitHub fetch prompt (e.g., 'features/import_mcp_github')",
     )
-    search_fetch_prompt: str = Field(
-        default="""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.""",
-        description="DEPRECATED: Use search_fetch_prompt_path instead. User prompt template for search-based import",
-    )
     search_fetch_prompt_path: str | None = Field(
         default=None,
         description="Path to custom search fetch prompt (e.g., 'features/import_mcp_search')",

gobby/config/skills.py

@@ -11,6 +11,37 @@ from typing import Literal
 from pydantic import BaseModel, Field, field_validator
 
 
+class HubConfig(BaseModel):
+    """
+    Configuration for a skill hub or collection.
+    """
+
+    type: Literal["clawdhub", "skillhub", "github-collection"] = Field(
+        ...,
+        description="Type of the hub: 'clawdhub', 'skillhub', or 'github-collection'",
+    )
+
+    base_url: str | None = Field(
+        default=None,
+        description="Base URL for the hub",
+    )
+
+    repo: str | None = Field(
+        default=None,
+        description="GitHub repository (e.g. 'owner/repo')",
+    )
+
+    branch: str | None = Field(
+        default=None,
+        description="Git branch to use",
+    )
+
+    auth_key_name: str | None = Field(
+        default=None,
+        description="Environment variable name for auth key",
+    )
+
+
 class SkillsConfig(BaseModel):
     """
     Configuration for skill injection and discovery.

gobby/config/tasks.py

@@ -38,14 +38,6 @@ class CompactHandoffConfig(BaseModel):
         default=True,
         description="Enable compact handoff context extraction and injection",
     )
-    # DEPRECATED: prompt field is no longer used.
-    # Template is now defined in session-handoff.yaml workflow file.
-    # Kept for backwards compatibility but will be removed in a future version.
-    prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: Template moved to session-handoff.yaml workflow. "
-        "This field is ignored.",
-    )
 
 
 class PatternCriteriaConfig(BaseModel):
@@ -147,10 +139,7 @@ class TaskExpansionConfig(BaseModel):
         default="claude-opus-4-5",
         description="Model to use for expansion",
     )
-    prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: Use prompt_path instead. Custom prompt template for task expansion",
-    )
+
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom user prompt template (e.g., 'expansion/user')",
@@ -175,14 +164,7 @@ class TaskExpansionConfig(BaseModel):
         default="You are a senior developer researching a codebase. Use tools to find relevant code.",
         description="System prompt for the research agent",
     )
-    system_prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: Use system_prompt_path instead. Custom system prompt for task expansion",
-    )
-    tdd_prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: TDD instructions are now embedded in task descriptions for code/config categories",
-    )
+
     web_research_enabled: bool = Field(
         default=True,
         description="Enable web research for task expansion using MCP tools",
@@ -228,10 +210,7 @@ class TaskValidationConfig(BaseModel):
         default="You are a QA validator. Output ONLY valid JSON. No markdown, no explanation, no code blocks. Just the raw JSON object.",
         description="System prompt for task validation",
     )
-    prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: Use prompt_path instead. Custom prompt template for task validation",
-    )
+
     prompt_path: str | None = Field(
         default=None,
         description="Path to custom validation prompt template (e.g., 'validation/validate')",
@@ -260,10 +239,7 @@ class TaskValidationConfig(BaseModel):
         default="You are a QA engineer writing acceptance criteria. CRITICAL: Only include requirements explicitly stated in the task. Do NOT invent specific values, thresholds, timeouts, or edge cases that aren't mentioned. Vague tasks get vague criteria. Use markdown checkboxes.",
         description="System prompt for generating validation criteria",
     )
-    criteria_prompt: str | None = Field(
-        default=None,
-        description="DEPRECATED: Use criteria_prompt_path instead. Custom prompt template for generating validation criteria",
-    )
+
     # Validation loop control
     max_iterations: int = Field(
         default=10,

gobby/hooks/__init__.py

@@ -65,14 +65,6 @@ from gobby.hooks.plugins import (
 from gobby.hooks.session_coordinator import SessionCoordinator
 from gobby.hooks.webhooks import WebhookDispatcher
 
-# Legacy imports for backward compatibility
-from gobby.sessions.manager import SessionManager
-from gobby.sessions.summary import SummaryFileGenerator
-from gobby.sessions.transcripts.claude import ClaudeTranscriptParser
-
-# Backward-compatible alias
-TranscriptProcessor = ClaudeTranscriptParser
-
 __all__ = [
     # Core coordinator
     "HookManager",
@@ -96,9 +88,4 @@ __all__ = [
     "RegisteredHandler",
     "hook_handler",
     "run_plugin_handlers",
-    # Legacy exports (backward compatibility)
-    "SessionManager",
-    "SummaryFileGenerator",
-    "TranscriptProcessor",
-    "ClaudeTranscriptParser",
 ]

gobby/hooks/event_handlers.py

@@ -29,6 +29,16 @@ if TYPE_CHECKING:
     from gobby.workflows.hooks import WorkflowHookHandler
 
 
+EDIT_TOOLS = {
+    "write_file",
+    "replace",
+    "edit_file",
+    "notebook_edit",
+    "edit",
+    "write",
+}
+
+
 class EventHandlers:
     """
     Manages event handler registration and dispatch.
@@ -137,6 +147,56 @@ class EventHandlers:
         """
         return dict(self._handler_map)
 
+    def _auto_activate_workflow(
+        self, workflow_name: str, session_id: str, project_path: str | None
+    ) -> None:
+        """Auto-activate a workflow for a session.
+
+        Args:
+            workflow_name: Name of the workflow to activate
+            session_id: Session ID to activate workflow for
+            project_path: Project path for workflow context
+        """
+        if not self._workflow_handler:
+            return
+
+        try:
+            result = self._workflow_handler.activate_workflow(
+                workflow_name=workflow_name,
+                session_id=session_id,
+                project_path=project_path,
+            )
+            if result.get("success"):
+                self.logger.info(
+                    "Auto-activated workflow for session",
+                    extra={
+                        "workflow_name": workflow_name,
+                        "session_id": session_id,
+                        "project_path": project_path,
+                    },
+                )
+            else:
+                self.logger.warning(
+                    "Failed to auto-activate workflow",
+                    extra={
+                        "workflow_name": workflow_name,
+                        "session_id": session_id,
+                        "project_path": project_path,
+                        "error": result.get("error"),
+                    },
+                )
+        except Exception as e:
+            self.logger.warning(
+                "Failed to auto-activate workflow",
+                extra={
+                    "workflow_name": workflow_name,
+                    "session_id": session_id,
+                    "project_path": project_path,
+                    "error": str(e),
+                },
+                exc_info=True,
+            )
+
     # ==================== SESSION HANDLERS ====================
 
     def handle_session_start(self, event: HookEvent) -> HookResponse:
@@ -197,6 +257,12 @@ class EventHandlers:
                         except Exception as e:
                             self.logger.warning(f"Failed to start agent run: {e}")
 
+                    # Auto-activate workflow if specified for this session
+                    if existing_session.workflow_name and session_id:
+                        self._auto_activate_workflow(
+                            existing_session.workflow_name, session_id, cwd
+                        )
+
                     # Update event metadata
                     event.metadata["_platform_session_id"] = session_id
 
@@ -221,8 +287,13 @@ class EventHandlers:
                             self.logger.warning(f"Workflow error: {e}")
 
                     # Build system message (terminal display only)
-                    system_message = f"\nGobby Session ID: {session_id}"
-                    system_message += f"\nExternal ID: {external_id}"
+                    # Display #N format if seq_num available, fallback to UUID
+                    session_ref = (
+                        f"#{existing_session.seq_num}" if existing_session.seq_num else session_id
+                    )
+                    system_message = f"\nGobby Session ID: {session_ref}"
+                    system_message += " <- Use this for MCP tool calls (session_id parameter)"
+                    system_message += f"\nExternal ID: {external_id} (CLI-native, rarely needed)"
                     if parent_session_id:
                         context_parts.append(f"Parent session: {parent_session_id}")
 
@@ -246,6 +317,7 @@ class EventHandlers:
                         system_message=system_message,
                         metadata={
                             "session_id": session_id,
+                            "session_ref": session_ref,
                             "parent_session_id": parent_session_id,
                             "machine_id": machine_id,
                             "project_id": existing_session.project_id,
@@ -257,9 +329,13 @@ class EventHandlers:
             except Exception as e:
                 self.logger.debug(f"No pre-created session found: {e}")
 
-        # Step 1: Find parent session if this is a handoff (source='clear' only)
-        parent_session_id = None
-        if session_source == "clear" and self._session_storage:
+        # Step 1: Find parent session
+        # Check env vars first (spawned agent case), then handoff (source='clear')
+        parent_session_id = input_data.get("parent_session_id")
+        workflow_name = input_data.get("workflow_name")
+        agent_depth = input_data.get("agent_depth")
+
+        if not parent_session_id and session_source == "clear" and self._session_storage:
             try:
                 parent = self._session_storage.find_parent(
                     machine_id=machine_id,
@@ -276,6 +352,14 @@ class EventHandlers:
         # Step 2: Register new session with parent if found
         # Extract terminal context (injected by hook_dispatcher for terminal correlation)
         terminal_context = input_data.get("terminal_context")
+        # Parse agent_depth as int if provided
+        agent_depth_val = 0
+        if agent_depth:
+            try:
+                agent_depth_val = int(agent_depth)
+            except (ValueError, TypeError):
+                pass
+
         session_id = None
         if self._session_manager:
             session_id = self._session_manager.register_session(
@@ -287,6 +371,8 @@ class EventHandlers:
                 source=cli_source,
                 project_path=cwd,
                 terminal_context=terminal_context,
+                workflow_name=workflow_name,
+                agent_depth=agent_depth_val,
             )
 
         # Step 2b: Mark parent session as expired after successful handoff
@@ -297,6 +383,10 @@ class EventHandlers:
             except Exception as e:
                 self.logger.warning(f"Failed to mark parent session as expired: {e}")
 
+        # Step 2c: Auto-activate workflow if specified (for spawned agents)
+        if workflow_name and session_id:
+            self._auto_activate_workflow(workflow_name, session_id, cwd)
+
         # Step 3: Track registered session
         if transcript_path and self._session_coordinator:
             try:
@@ -333,8 +423,19 @@ class EventHandlers:
             context_parts.append(f"Parent session: {parent_session_id}")
 
         # Build system message (terminal display only)
-        system_message = f"\nGobby Session ID: {session_id}"
-        system_message += f"\nExternal ID: {external_id}"
+        # Fetch session to get seq_num for #N display
+        session_ref = session_id  # fallback
+        if session_id and self._session_storage:
+            session_obj = self._session_storage.get(session_id)
+            if session_obj and session_obj.seq_num:
+                session_ref = f"#{session_obj.seq_num}"
+        # Format: "Gobby Session ID: #N" with usage hint
+        if session_ref and session_ref != session_id:
+            system_message = f"\nGobby Session ID: {session_ref}"
+        else:
+            system_message = f"\nGobby Session ID: {session_id}"
+        system_message += " <- Use this for MCP tool calls (session_id parameter)"
+        system_message += f"\nExternal ID: {external_id} (CLI-native, rarely needed)"
 
         # Add active lifecycle workflows
         if wf_response.metadata and "discovered_workflows" in wf_response.metadata:
@@ -362,6 +463,7 @@ class EventHandlers:
         # Build metadata with terminal context (filter out nulls)
         metadata: dict[str, Any] = {
             "session_id": session_id,
+            "session_ref": session_ref,
             "parent_session_id": parent_session_id,
             "machine_id": machine_id,
             "project_id": project_id,
@@ -691,6 +793,33 @@ class EventHandlers:
         status = "FAIL" if is_failure else "OK"
         if session_id:
             self.logger.debug(f"AFTER_TOOL [{status}]: {tool_name}, session {session_id}")
+
+            # Track edits for session high-water mark
+            # Only if tool succeeded, matches edit tools, and session has claimed a task
+            # Skip .gobby/ internal files (tasks.jsonl, memories.jsonl, etc.)
+            tool_input = input_data.get("tool_input", {})
+            file_path = tool_input.get("file_path", "")
+            is_gobby_internal = "/.gobby/" in file_path or file_path.startswith(".gobby/")
+
+            if (
+                not is_failure
+                and tool_name
+                and tool_name.lower() in EDIT_TOOLS
+                and not is_gobby_internal
+                and self._session_storage
+                and self._task_manager
+            ):
+                try:
+                    # Check if session has any claimed tasks in progress
+                    claimed_tasks = self._task_manager.list_tasks(
+                        assignee=session_id, status="in_progress", limit=1
+                    )
+                    if claimed_tasks:
+                        self._session_storage.mark_had_edits(session_id)
+                        self.logger.debug(f"Marked session {session_id} as had_edits")
+                except Exception as e:
+                    self.logger.warning(f"Failed to track edit history: {e}")
+
         else:
             self.logger.debug(f"AFTER_TOOL [{status}]: {tool_name}")
 
@@ -737,10 +866,23 @@ class EventHandlers:
     # ==================== COMPACT HANDLER ====================
 
     def handle_pre_compact(self, event: HookEvent) -> HookResponse:
-        """Handle PRE_COMPACT event."""
+        """Handle PRE_COMPACT event.
+
+        Note: Gemini fires PreCompress constantly during normal operation,
+        unlike Claude which fires it only when approaching context limits.
+        We skip handoff logic and workflow execution for Gemini to avoid
+        excessive state changes and workflow interruptions.
+        """
+        from gobby.hooks.events import SessionSource
+
         trigger = event.data.get("trigger", "auto")
         session_id = event.metadata.get("_platform_session_id")
 
+        # Skip handoff logic for Gemini - it fires PreCompress too frequently
+        if event.source == SessionSource.GEMINI:
+            self.logger.debug(f"PRE_COMPACT ({trigger}): session {session_id} [Gemini - skipped]")
+            return HookResponse(decision="allow")
+
         if session_id:
             self.logger.debug(f"PRE_COMPACT ({trigger}): session {session_id}")
             # Mark session as handoff_ready so it can be found as parent after compact

gobby/hooks/hook_manager.py

@@ -228,7 +228,7 @@ class HookManager:
         )
 
         if not memory_config:
-            from gobby.config.app import MemoryConfig
+            from gobby.config.persistence import MemoryConfig
 
             memory_config = MemoryConfig()
 
@@ -316,7 +316,7 @@ class HookManager:
         if self._config and hasattr(self._config, "hook_extensions"):
             webhooks_config = self._config.hook_extensions.webhooks
         if not webhooks_config:
-            from gobby.config.app import WebhooksConfig
+            from gobby.config.extensions import WebhooksConfig
 
             webhooks_config = WebhooksConfig()
         self._webhook_dispatcher = WebhookDispatcher(webhooks_config)
@@ -369,6 +369,10 @@ class HookManager:
         # Skill manager for core skill injection
         self._skill_manager = HookSkillManager()
 
+        # Track sessions that have received full metadata injection
+        # Key: "{platform_session_id}:{source}" - cleared on daemon restart
+        self._injected_sessions: set[str] = set()
+
         # Event handlers (delegated to EventHandlers module)
         self._event_handlers = EventHandlers(
             session_manager=self._session_manager,
@@ -644,7 +648,21 @@ class HookManager:
             # Copy session metadata from event to response for adapter injection
             # The adapter reads response.metadata to inject session info into agent context
             if event.metadata.get("_platform_session_id"):
-                response.metadata["session_id"] = event.metadata["_platform_session_id"]
+                platform_session_id = event.metadata["_platform_session_id"]
+                response.metadata["session_id"] = platform_session_id
+                # Look up seq_num for session_ref (#N format)
+                if self._session_storage:
+                    session_obj = self._session_storage.get(platform_session_id)
+                    if session_obj and session_obj.seq_num:
+                        response.metadata["session_ref"] = f"#{session_obj.seq_num}"
+
+                # Track first hook per session for token optimization
+                # Adapters use this flag to inject full metadata only on first hook
+                session_key = f"{platform_session_id}:{event.source.value}"
+                is_first = session_key not in self._injected_sessions
+                if is_first:
+                    self._injected_sessions.add(session_key)
+                response.metadata["_first_hook_for_session"] = is_first
             if event.session_id:  # external_id (e.g., Claude Code's session UUID)
                 response.metadata["external_id"] = event.session_id
             if event.machine_id:

gobby/hooks/plugins.py

@@ -23,7 +23,7 @@ from typing import TYPE_CHECKING, Any
 from gobby.hooks.events import HookEvent, HookEventType, HookResponse
 
 if TYPE_CHECKING:
-    from gobby.config.app import PluginsConfig
+    from gobby.config.extensions import PluginsConfig
 
 logger = logging.getLogger(__name__)
 

gobby/hooks/webhooks.py

@@ -20,7 +20,7 @@ from typing import TYPE_CHECKING, Any
 import httpx
 
 if TYPE_CHECKING:
-    from gobby.config.app import WebhookEndpointConfig, WebhooksConfig
+    from gobby.config.extensions import WebhookEndpointConfig, WebhooksConfig
     from gobby.hooks.events import HookEvent
 
 logger = logging.getLogger(__name__)