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

gobby/config/app.py

@@ -15,14 +15,8 @@ from typing import Any
 import yaml
 from pydantic import BaseModel, Field, field_validator
 
-from gobby.config.extensions import (
-    HookExtensionsConfig,
-    PluginItemConfig,
-    PluginsConfig,
-    WebhookEndpointConfig,
-    WebhooksConfig,
-    WebSocketBroadcastConfig,
-)
+# Internal imports for DaemonConfig fields - NOT re-exported
+from gobby.config.extensions import HookExtensionsConfig
 from gobby.config.features import (
     ImportMCPServerConfig,
     MetricsConfig,
@@ -31,14 +25,9 @@ from gobby.config.features import (
     TaskDescriptionConfig,
     ToolSummarizerConfig,
 )
-
-# Re-export from extracted modules (Strangler Fig pattern for backwards compatibility)
-from gobby.config.llm_providers import LLMProviderConfig, LLMProvidersConfig
+from gobby.config.llm_providers import LLMProvidersConfig
 from gobby.config.logging import LoggingSettings
-from gobby.config.persistence import (
-    MemoryConfig,
-    MemorySyncConfig,
-)
+from gobby.config.persistence import MemoryConfig, MemorySyncConfig
 from gobby.config.search import SearchConfig
 from gobby.config.servers import MCPClientProxyConfig, WebSocketSettings
 from gobby.config.sessions import (
@@ -50,61 +39,10 @@ from gobby.config.sessions import (
     TitleSynthesisConfig,
 )
 from gobby.config.skills import SkillsConfig
-from gobby.config.tasks import (
-    CompactHandoffConfig,
-    GobbyTasksConfig,
-    PatternCriteriaConfig,
-    TaskExpansionConfig,
-    TaskValidationConfig,
-    WorkflowConfig,
-)
+from gobby.config.tasks import CompactHandoffConfig, GobbyTasksConfig, WorkflowConfig
 
-# Explicit exports for mypy (re-exported symbols from submodules)
 __all__ = [
-    # From gobby.config.extensions
-    "HookExtensionsConfig",
-    "PluginItemConfig",
-    "PluginsConfig",
-    "WebhookEndpointConfig",
-    "WebhooksConfig",
-    "WebSocketBroadcastConfig",
-    # From gobby.config.features
-    "ImportMCPServerConfig",
-    "MetricsConfig",
-    "ProjectVerificationConfig",
-    "RecommendToolsConfig",
-    "TaskDescriptionConfig",
-    "ToolSummarizerConfig",
-    # From gobby.config.llm_providers
-    "LLMProviderConfig",
-    "LLMProvidersConfig",
-    # From gobby.config.logging
-    "LoggingSettings",
-    # From gobby.config.persistence
-    "MemoryConfig",
-    "MemorySyncConfig",
-    # From gobby.config.search
-    "SearchConfig",
-    # From gobby.config.servers
-    "MCPClientProxyConfig",
-    "WebSocketSettings",
-    # From gobby.config.skills
-    "SkillsConfig",
-    # From gobby.config.sessions
-    "ArtifactHandoffConfig",
-    "ContextInjectionConfig",
-    "MessageTrackingConfig",
-    "SessionLifecycleConfig",
-    "SessionSummaryConfig",
-    "TitleSynthesisConfig",
-    # From gobby.config.tasks
-    "CompactHandoffConfig",
-    "GobbyTasksConfig",
-    "PatternCriteriaConfig",
-    "TaskExpansionConfig",
-    "TaskValidationConfig",
-    "WorkflowConfig",
-    # Local definitions
+    # Local definitions only - no re-exports
     "ConductorConfig",
     "DaemonConfig",
     "expand_env_vars",
@@ -184,32 +122,6 @@ def expand_env_vars(content: str) -> str:
     return ENV_VAR_PATTERN.sub(replace_match, content)
 
 
-# WebSocketSettings moved to gobby.config.servers (re-exported above)
-# LoggingSettings moved to gobby.config.logging (re-exported above)
-# CompactHandoffConfig moved to gobby.config.tasks (re-exported above)
-
-# ContextInjectionConfig, SessionSummaryConfig, TitleSynthesisConfig,
-# MessageTrackingConfig, SessionLifecycleConfig
-# moved to gobby.config.sessions (re-exported above)
-
-# ToolSummarizerConfig, RecommendToolsConfig, ImportMCPServerConfig,
-# MetricsConfig, ProjectVerificationConfig
-# moved to gobby.config.features (re-exported above)
-
-# WebSocketBroadcastConfig, WebhookEndpointConfig, WebhooksConfig,
-# PluginItemConfig, PluginsConfig, HookExtensionsConfig
-# moved to gobby.config.extensions (re-exported above)
-
-# PatternCriteriaConfig, TaskExpansionConfig, TaskValidationConfig, WorkflowConfig,
-# GobbyTasksConfig, CompactHandoffConfig
-# moved to gobby.config.tasks (re-exported above)
-
-# MCPClientProxyConfig moved to gobby.config.servers (re-exported above)
-# LLMProviderConfig and LLMProvidersConfig moved to gobby.config.llm_providers (re-exported above)
-# MemoryConfig, MemorySyncConfig
-# moved to gobby.config.persistence (re-exported above)
-
-
 class DaemonConfig(BaseModel):
     """
     Main configuration for Gobby daemon.
@@ -243,6 +155,10 @@ class DaemonConfig(BaseModel):
         default="~/.gobby/gobby-hub.db",
         description="Path to hub database for cross-project queries.",
     )
+    use_flattened_baseline: bool = Field(
+        default=True,
+        description="Use flattened V2 baseline schema (v75) for new databases instead of legacy migrations.",
+    )
 
     # Sub-configs
     websocket: WebSocketSettings = Field(

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/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.
@@ -221,7 +231,12 @@ class EventHandlers:
                             self.logger.warning(f"Workflow error: {e}")
 
                     # Build system message (terminal display only)
-                    system_message = f"\nGobby Session ID: {session_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 Ref: {session_ref}"
+                    system_message += f"\nGobby Session ID: {session_id}"
                     system_message += f"\nExternal ID: {external_id}"
                     if parent_session_id:
                         context_parts.append(f"Parent session: {parent_session_id}")
@@ -333,7 +348,14 @@ 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}"
+        # 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}"
+        system_message = f"\nGobby Session Ref: {session_ref}"
+        system_message += f"\nGobby Session ID: {session_id}"
         system_message += f"\nExternal ID: {external_id}"
 
         # Add active lifecycle workflows
@@ -691,6 +713,27 @@ 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
+            if (
+                not is_failure
+                and tool_name
+                and tool_name.lower() in EDIT_TOOLS
+                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}")
 

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)

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__)

gobby/llm/resolver.py

@@ -18,7 +18,8 @@ from typing import TYPE_CHECKING, Literal
 from gobby.llm.executor import AgentExecutor
 
 if TYPE_CHECKING:
-    from gobby.config.app import DaemonConfig, LLMProvidersConfig
+    from gobby.config.app import DaemonConfig
+    from gobby.config.llm_providers import LLMProvidersConfig
     from gobby.workflows.definitions import WorkflowDefinition
 
 logger = logging.getLogger(__name__)
@@ -479,7 +480,7 @@ def _create_codex_executor(
 
 # Re-export for TYPE_CHECKING
 if TYPE_CHECKING:
-    from gobby.config.app import LLMProviderConfig
+    from gobby.config.llm_providers import LLMProviderConfig
 
 
 class ExecutorRegistry: