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

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/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/adapters/claude_code.py

@@ -191,11 +191,17 @@ class ClaudeCodeAdapter(BaseAdapter):
             additional_context_parts.append(response.context)
 
         # 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
         if response.metadata:
-            session_id = response.metadata.get("session_id")
-            if session_id:
+            gobby_session_id = response.metadata.get("session_id")
+            external_id = response.metadata.get("external_id")
+            if gobby_session_id:
                 # Build context with all available identifiers
-                context_lines = [f"session_id: {session_id}"]
+                # 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']}"
@@ -227,7 +233,10 @@ class ClaudeCodeAdapter(BaseAdapter):
                 additional_context_parts.append("\n".join(context_lines))
 
         # Build hookSpecificOutput if we have any context to inject
-        if additional_context_parts:
+        # Only include hookSpecificOutput for hook types that Claude Code's schema accepts
+        # Valid hookEventName values: PreToolUse, UserPromptSubmit, PostToolUse
+        valid_hook_event_names = {"PreToolUse", "UserPromptSubmit", "PostToolUse"}
+        if additional_context_parts and hook_event_name in valid_hook_event_names:
             result["hookSpecificOutput"] = {
                 "hookEventName": hook_event_name,
                 "additionalContext": "\n\n".join(additional_context_parts),

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] = []