gobby 0.2.6__tar.gz → 0.2.8__tar.gz

{gobby-0.2.6 → gobby-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gobby
-Version: 0.2.6
+Version: 0.2.8
 Summary: A local-first daemon to unify your AI coding tools. Session tracking and handoffs across Claude Code, Gemini CLI, and Codex. An MCP proxy that discovers tools without flooding context. Task management with dependencies, validation, and TDD expansion. Agent spawning and worktree orchestration. Persistent memory, extensible workflows, and hooks.
 Author-email: Josh Wilhelmi <josh@gobby.ai>
 License-Expression: MIT
@@ -39,6 +39,7 @@ Requires-Dist: gitingest>=0.3.1
 Requires-Dist: scikit-learn>=1.0.0
 Requires-Dist: textual>=7.3.0
 Requires-Dist: memu-py>=1.0.0
+Requires-Dist: python-multipart>=0.0.22
 Provides-Extra: mem0
 Requires-Dist: mem0ai; extra == "mem0"
 Dynamic: license-file
@@ -378,6 +379,10 @@ See [ROADMAP.md](ROADMAP.md) for the full plan, but highlights:
 
 **Vision:** Always local first, but Pro cloud features to keep the lights on: Fleet management (manage sessions across multiple machines), Plugin ecosystem, Team workflows, Enterprise hardening
 
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md) for release history and detailed changes.
+
 ## Development
 
 ```bash

{gobby-0.2.6 → gobby-0.2.8}/README.md

@@ -333,6 +333,10 @@ See [ROADMAP.md](ROADMAP.md) for the full plan, but highlights:
 
 **Vision:** Always local first, but Pro cloud features to keep the lights on: Fleet management (manage sessions across multiple machines), Plugin ecosystem, Team workflows, Enterprise hardening
 
+## Changelog
+
+See [CHANGELOG.md](CHANGELOG.md) for release history and detailed changes.
+
 ## Development
 
 ```bash

{gobby-0.2.6 → gobby-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gobby"
-version = "0.2.6"
+version = "0.2.8"
 description = "A local-first daemon to unify your AI coding tools. Session tracking and handoffs across Claude Code, Gemini CLI, and Codex. An MCP proxy that discovers tools without flooding context. Task management with dependencies, validation, and TDD expansion. Agent spawning and worktree orchestration. Persistent memory, extensible workflows, and hooks."
 readme = "README.md"
 license = "MIT"
@@ -42,6 +42,8 @@ dependencies = [
     "textual>=7.3.0",
     # mem0ai moved to optional [mem0] extra due to CVE-2026-0994 (protobuf<=6.33.4 vulnerable)
     "memu-py>=1.0.0",
+    # python-multipart 0.0.21 has CVE-2026-24486 - pin to fixed version
+    "python-multipart>=0.0.22",
 ]
 
 [project.optional-dependencies]

{gobby-0.2.6 → gobby-0.2.8}/src/gobby/__init__.py

@@ -1,3 +1,3 @@
 """Gobby - Local-first daemon for multi-CLI session management."""
 
-__version__ = "0.2.3"
+__version__ = "0.2.7"

{gobby-0.2.6 → gobby-0.2.8}/src/gobby/adapters/__init__.py

@@ -17,7 +17,8 @@ Adapters:
 
 from gobby.adapters.base import BaseAdapter
 from gobby.adapters.claude_code import ClaudeCodeAdapter
-from gobby.adapters.codex import CodexAdapter, CodexAppServerClient, CodexNotifyAdapter
+from gobby.adapters.codex_impl.adapter import CodexAdapter, CodexNotifyAdapter
+from gobby.adapters.codex_impl.client import CodexAppServerClient
 from gobby.adapters.gemini import GeminiAdapter
 
 __all__ = [

{gobby-0.2.6 → gobby-0.2.8}/src/gobby/adapters/claude_code.py

@@ -104,6 +104,10 @@ class ClaudeCodeAdapter(BaseAdapter):
         is_failure = hook_type == "post-tool-use-failure"
         metadata = {"is_failure": is_failure} if is_failure else {}
 
+        # Normalize event data for CLI-agnostic processing
+        # This allows downstream code to use consistent field names
+        normalized_data = self._normalize_event_data(input_data)
+
         return HookEvent(
             event_type=event_type,
             session_id=session_id,
@@ -111,10 +115,46 @@ class ClaudeCodeAdapter(BaseAdapter):
             timestamp=datetime.now(UTC),
             machine_id=input_data.get("machine_id"),
             cwd=input_data.get("cwd"),
-            data=input_data,
+            data=normalized_data,
             metadata=metadata,
         )
 
+    def _normalize_event_data(self, input_data: dict[str, Any]) -> dict[str, Any]:
+        """Normalize Claude Code event data for CLI-agnostic processing.
+
+        This method enriches the input_data with normalized fields so downstream
+        code doesn't need to handle Claude-specific formats.
+
+        Normalizations performed:
+        1. tool_input.server_name/tool_name → mcp_server/mcp_tool (for MCP calls)
+        2. tool_result → tool_output
+
+        Args:
+            input_data: Raw input data from Claude Code
+
+        Returns:
+            Enriched data dict with normalized fields added
+        """
+        # Start with a copy to avoid mutating original
+        data = dict(input_data)
+
+        # Get tool info
+        tool_name = data.get("tool_name", "")
+        tool_input = data.get("tool_input", {}) or {}
+
+        # 1. Extract MCP info from nested tool_input for call_tool calls
+        if tool_name in ("call_tool", "mcp__gobby__call_tool"):
+            if "mcp_server" not in data:
+                data["mcp_server"] = tool_input.get("server_name")
+            if "mcp_tool" not in data:
+                data["mcp_tool"] = tool_input.get("tool_name")
+
+        # 2. Normalize tool_result → tool_output
+        if "tool_result" in data and "tool_output" not in data:
+            data["tool_output"] = data["tool_result"]
+
+        return data
+
     # Map Claude Code hook types to hookEventName for hookSpecificOutput
     HOOK_EVENT_NAME_MAP: dict[str, str] = {
         "session-start": "SessionStart",
@@ -193,44 +233,65 @@ class ClaudeCodeAdapter(BaseAdapter):
         # Add session identifiers from metadata
         # Note: "session_id" in metadata is Gobby's internal platform session ID
         #       "external_id" in metadata is the CLI's session UUID
+        #       "session_ref" is the short #N format for easier reference
+        # Token optimization: Only inject full metadata on first hook per session
         if response.metadata:
             gobby_session_id = response.metadata.get("session_id")
+            session_ref = response.metadata.get("session_ref")
             external_id = response.metadata.get("external_id")
+            is_first_hook = response.metadata.get("_first_hook_for_session", False)
+
             if gobby_session_id:
-                # Build context with all available identifiers
-                # Use clear naming: Gobby Session ID for MCP calls, External ID for transcripts
-                context_lines = [f"Gobby Session ID: {gobby_session_id}"]
-                if external_id:
-                    context_lines.append(f"External ID: {external_id}")
-                if response.metadata.get("parent_session_id"):
-                    context_lines.append(
-                        f"parent_session_id: {response.metadata['parent_session_id']}"
-                    )
-                if response.metadata.get("machine_id"):
-                    context_lines.append(f"machine_id: {response.metadata['machine_id']}")
-                if response.metadata.get("project_id"):
-                    context_lines.append(f"project_id: {response.metadata['project_id']}")
-                # Add terminal context (non-null values only)
-                if response.metadata.get("terminal_term_program"):
-                    context_lines.append(f"terminal: {response.metadata['terminal_term_program']}")
-                if response.metadata.get("terminal_tty"):
-                    context_lines.append(f"tty: {response.metadata['terminal_tty']}")
-                if response.metadata.get("terminal_parent_pid"):
-                    context_lines.append(f"parent_pid: {response.metadata['terminal_parent_pid']}")
-                # Add terminal-specific session IDs (only one will be present)
-                for key in [
-                    "terminal_iterm_session_id",
-                    "terminal_term_session_id",
-                    "terminal_kitty_window_id",
-                    "terminal_tmux_pane",
-                    "terminal_vscode_terminal_id",
-                    "terminal_alacritty_socket",
-                ]:
-                    if response.metadata.get(key):
-                        # Use friendlier names in output
-                        friendly_name = key.replace("terminal_", "").replace("_", " ")
-                        context_lines.append(f"{friendly_name}: {response.metadata[key]}")
-                additional_context_parts.append("\n".join(context_lines))
+                if is_first_hook:
+                    # First hook: inject full metadata (~60-100 tokens)
+                    context_lines = []
+                    if session_ref:
+                        context_lines.append(
+                            f"Gobby Session ID: {session_ref} (or {gobby_session_id})"
+                        )
+                    else:
+                        context_lines.append(f"Gobby Session ID: {gobby_session_id}")
+                    if external_id:
+                        context_lines.append(
+                            f"CLI-Specific Session ID (external_id): {external_id}"
+                        )
+                    if response.metadata.get("parent_session_id"):
+                        context_lines.append(
+                            f"parent_session_id: {response.metadata['parent_session_id']}"
+                        )
+                    if response.metadata.get("machine_id"):
+                        context_lines.append(f"machine_id: {response.metadata['machine_id']}")
+                    if response.metadata.get("project_id"):
+                        context_lines.append(f"project_id: {response.metadata['project_id']}")
+                    # Add terminal context (non-null values only)
+                    if response.metadata.get("terminal_term_program"):
+                        context_lines.append(
+                            f"terminal: {response.metadata['terminal_term_program']}"
+                        )
+                    if response.metadata.get("terminal_tty"):
+                        context_lines.append(f"tty: {response.metadata['terminal_tty']}")
+                    if response.metadata.get("terminal_parent_pid"):
+                        context_lines.append(
+                            f"parent_pid: {response.metadata['terminal_parent_pid']}"
+                        )
+                    # Add terminal-specific session IDs (only one will be present)
+                    for key in [
+                        "terminal_iterm_session_id",
+                        "terminal_term_session_id",
+                        "terminal_kitty_window_id",
+                        "terminal_tmux_pane",
+                        "terminal_vscode_terminal_id",
+                        "terminal_alacritty_socket",
+                    ]:
+                        if response.metadata.get(key):
+                            # Use friendlier names in output
+                            friendly_name = key.replace("terminal_", "").replace("_", " ")
+                            context_lines.append(f"{friendly_name}: {response.metadata[key]}")
+                    additional_context_parts.append("\n".join(context_lines))
+                else:
+                    # Subsequent hooks: inject minimal session ref only (~8 tokens)
+                    if session_ref:
+                        additional_context_parts.append(f"Gobby Session ID: {session_ref}")
 
         # Build hookSpecificOutput if we have any context to inject
         # Only include hookSpecificOutput for hook types that Claude Code's schema accepts

gobby-0.2.8/src/gobby/adapters/codex_impl/__init__.py

@@ -0,0 +1,28 @@
+"""
+Codex adapter implementation package.
+
+This package contains the decomposed implementation of the Codex adapter,
+extracted from the monolithic codex.py using the Strangler Fig pattern.
+
+Modules:
+- types.py: Type definitions and data classes
+- protocol.py: Protocol/interface definitions
+- client.py: CodexAppServerClient implementation
+- adapter.py: CodexAdapter and CodexNotifyAdapter implementations
+
+Importer analysis (from codex.py):
+- src/gobby/servers/http.py: imports CodexAdapter
+- src/gobby/servers/routes/mcp/hooks.py: imports CodexNotifyAdapter
+- src/gobby/adapters/__init__.py: imports CodexAdapter, CodexAppServerClient, CodexNotifyAdapter
+- tests/adapters/test_codex.py: imports various items for testing
+
+Migration strategy:
+1. Extract types/dataclasses to types.py
+2. Extract protocol definitions to protocol.py
+3. Extract CodexAppServerClient to client.py
+4. Extract adapters to adapter.py
+5. Update codex.py to re-export from submodules
+"""
+
+# Phase 3: Placeholders - exports will be added as code is migrated
+__all__: list[str] = []