htmlgraph 0.26.20__tar.gz → 0.26.22__tar.gz

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgraph
-Version: 0.26.20
+Version: 0.26.22
 Summary: HTML is All You Need - Graph database on web standards
 Project-URL: Homepage, https://github.com/Shakes-tzd/htmlgraph
 Project-URL: Documentation, https://github.com/Shakes-tzd/htmlgraph#readme

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/packages/gemini-extension/gemini-extension.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlgraph",
-  "version": "0.26.20",
+  "version": "0.26.22",
   "description": "HtmlGraph session tracking and documentation for Gemini CLI. Ensures proper activity attribution, feature awareness, and continuous work tracking.",
   "author": "Shakes",
   "license": "MIT",

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "htmlgraph"
-version = "0.26.20"
+version = "0.26.22"
 description = "HTML is All You Need - Graph database on web standards"
 authors = [{name = "Shakes", email = "shakestzd@gmail.com"}]
 readme = "README.md"

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/src/python/htmlgraph/__init__.py

@@ -95,7 +95,7 @@ from htmlgraph.types import (
 )
 from htmlgraph.work_type_utils import infer_work_type, infer_work_type_from_id
 
-__version__ = "0.26.20"
+__version__ = "0.26.22"
 __all__ = [
     # Exceptions
     "HtmlGraphError",

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/src/python/htmlgraph/hooks/event_tracker.py

@@ -709,6 +709,7 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
     db = None
     try:
         from htmlgraph.config import get_database_path
+        from htmlgraph.db.schema import HtmlGraphDB
 
         db = HtmlGraphDB(str(get_database_path()))
     except Exception as e:
@@ -1129,36 +1130,51 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
         # This handles Claude Code's session reuse where parent_session_id is NULL
         # When tool calls come from a subagent, they should be under the task_delegation parent,
         # NOT under UserQuery. So we MUST check for active tasks BEFORE falling back to UserQuery.
-        elif db:
+        # IMPORTANT: This must work EVEN IF db is None, so try to get it from htmlgraph_db
+        else:
+            # Ensure we have a db connection (may not have been passed in for parent session)
+            db_to_use = db
+            if not db_to_use:
+                try:
+                    from htmlgraph.config import get_database_path
+                    from htmlgraph.db.schema import HtmlGraphDB
+
+                    db_to_use = HtmlGraphDB(str(get_database_path()))
+                except Exception:
+                    db_to_use = None
+
             # Try to find an active task_delegation event
-            try:
-                cursor = db.connection.cursor()  # type: ignore[union-attr]
-                cursor.execute(
-                    """
-                    SELECT event_id
-                    FROM agent_events
-                    WHERE event_type = 'task_delegation'
-                      AND status = 'started'
-                    ORDER BY timestamp DESC
-                    LIMIT 1
-                    """,
-                )
-                task_row = cursor.fetchone()
-                if task_row:
-                    parent_activity_id = task_row[0]
+            if db_to_use:
+                try:
+                    cursor = db_to_use.connection.cursor()  # type: ignore[union-attr]
+                    cursor.execute(
+                        """
+                        SELECT event_id
+                        FROM agent_events
+                        WHERE event_type = 'task_delegation'
+                          AND status = 'started'
+                        ORDER BY timestamp DESC
+                        LIMIT 1
+                        """,
+                    )
+                    task_row = cursor.fetchone()
+                    if task_row:
+                        parent_activity_id = task_row[0]
+                        print(
+                            f"DEBUG: Found active task_delegation={parent_activity_id} in parent_activity_id fallback",
+                            file=sys.stderr,
+                        )
+                except Exception as e:
                     print(
-                        f"DEBUG: Found active task_delegation={parent_activity_id} in parent_activity_id fallback",
+                        f"DEBUG: Error finding task_delegation in parent_activity_id: {e}",
                         file=sys.stderr,
                     )
-            except Exception as e:
-                print(
-                    f"DEBUG: Error finding task_delegation in parent_activity_id: {e}",
-                    file=sys.stderr,
-                )
 
-            # Only if no active task found, fall back to UserQuery
-            if not parent_activity_id:
-                parent_activity_id = get_parent_user_query(db, active_session_id)
+                # Only if no active task found, fall back to UserQuery
+                if not parent_activity_id:
+                    parent_activity_id = get_parent_user_query(
+                        db_to_use, active_session_id
+                    )
 
         # Track the activity
         nudge = None

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/src/python/htmlgraph/hooks/subagent_stop.py

@@ -204,6 +204,52 @@ def get_parent_event_start_time(db_path: str, parent_event_id: str) -> str | Non
         return None
 
 
+def get_parent_event_from_db(db_path: str) -> str | None:
+    """
+    Query database for the most recent task_delegation event.
+
+    Used when HTMLGRAPH_PARENT_EVENT environment variable is not available
+    (due to inter-process communication limitations).
+
+    Args:
+        db_path: Path to SQLite database
+
+    Returns:
+        Parent event ID (evt-XXXXX) or None if not found
+    """
+    try:
+        conn = sqlite3.connect(db_path)
+        cursor = conn.cursor()
+
+        # Query for the most recent task_delegation with status='started'
+        # This is the task that spawned the current subagent
+        query = """
+            SELECT event_id FROM agent_events
+            WHERE event_type = 'task_delegation'
+            AND status = 'started'
+            ORDER BY timestamp DESC
+            LIMIT 1
+        """
+
+        cursor.execute(query)
+        result = cursor.fetchone()
+        conn.close()
+
+        if result:
+            parent_event_id: str = result[0]
+            logger.debug(
+                f"Found parent task_delegation from database: {parent_event_id}"
+            )
+            return parent_event_id
+
+        logger.debug("No active task_delegation found in database")
+        return None
+
+    except Exception as e:
+        logger.warning(f"Error querying for parent event: {e}")
+        return None
+
+
 def handle_subagent_stop(hook_input: dict[str, Any]) -> dict[str, Any]:
     """
     Handle SubagentStop hook event.
@@ -222,14 +268,13 @@ def handle_subagent_stop(hook_input: dict[str, Any]) -> dict[str, Any]:
     Returns:
         Response: {"continue": True} with optional context
     """
-    # Get parent event ID from environment
+    # Try to get parent event ID from environment (set by PreToolUse hook)
     parent_event_id = get_parent_event_id()
 
-    if not parent_event_id:
-        logger.debug("No parent event ID found, skipping subagent stop tracking")
-        return {"continue": True}
-
-    # Get project directory and database path
+    # If not available in environment, query database
+    # (environment variables may not be inherited across subagent process boundary)
+    # Get project directory and database path (reuse for both env and db lookup)
+    db_path = None
     try:
         from htmlgraph.config import get_database_path
 
@@ -244,6 +289,20 @@ def handle_subagent_stop(hook_input: dict[str, Any]) -> dict[str, Any]:
         logger.warning(f"Error resolving database path: {e}")
         return {"continue": True}
 
+    # If parent event ID not in environment, query database
+    if not parent_event_id:
+        logger.debug("Parent event ID not in environment, querying database...")
+        try:
+            parent_event_id = get_parent_event_from_db(db_path)
+        except Exception as e:
+            logger.debug(f"Could not query database for parent event: {e}")
+
+    if not parent_event_id:
+        logger.debug(
+            "No parent event ID found (env or db), skipping subagent stop tracking"
+        )
+        return {"continue": True}
+
     # Get parent event start time
     parent_start_time = get_parent_event_start_time(db_path, parent_event_id)
     if not parent_start_time:

{htmlgraph-0.26.20 → htmlgraph-0.26.22}/tests/integration/test_orchestrator_spawner_delegation.py

@@ -341,7 +341,9 @@ class TestOrchestratorDelegationLogic:
             / "plugin.json"
         )
 
-    @pytest.mark.skip(reason="Agent structure changed - gemini agent with capabilities not in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - gemini agent with capabilities not in current plugin.json"
+    )
     def test_orchestrator_delegates_to_gemini_for_exploration(
         self, plugin_json_path: Path
     ) -> None:
@@ -372,7 +374,9 @@ class TestOrchestratorDelegationLogic:
             f"Expected gemini for exploration, got {best_agent}"
         )
 
-    @pytest.mark.skip(reason="Agent structure changed - codex agent with capabilities not in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - codex agent with capabilities not in current plugin.json"
+    )
     def test_orchestrator_delegates_to_codex_for_implementation(
         self, plugin_json_path: Path
     ) -> None:
@@ -398,7 +402,9 @@ class TestOrchestratorDelegationLogic:
             f"Expected codex for implementation, got {best_agent}"
         )
 
-    @pytest.mark.skip(reason="Agent structure changed - copilot agent with capabilities not in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - copilot agent with capabilities not in current plugin.json"
+    )
     def test_orchestrator_delegates_to_copilot_for_git_operations(
         self, plugin_json_path: Path
     ) -> None:
@@ -423,7 +429,9 @@ class TestOrchestratorDelegationLogic:
             f"Expected copilot for git_operations, got {best_agent}"
         )
 
-    @pytest.mark.skip(reason="Agent structure changed - fallback field not present in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - fallback field not present in current plugin.json"
+    )
     def test_orchestrator_failure_handling_transparent(
         self, plugin_json_path: Path
     ) -> None:
@@ -508,7 +516,9 @@ class TestSpawnerCliRequirements:
             / "plugin.json"
         )
 
-    @pytest.mark.skip(reason="Agent structure changed - spawner agents not present in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - spawner agents not present in current plugin.json"
+    )
     def test_all_spawners_declare_cli_requirement(self, plugin_json_path: Path) -> None:
         """Verify each spawner declares which CLI it requires."""
         plugin_json = json.loads(plugin_json_path.read_text())
@@ -530,7 +540,9 @@ class TestSpawnerCliRequirements:
                 f"Agent {agent_name} requires {agent_config['requires_cli']}, expected {expected_cli}"
             )
 
-    @pytest.mark.skip(reason="Agent structure changed - fallback field not present in current plugin.json")
+    @pytest.mark.skip(
+        reason="Agent structure changed - fallback field not present in current plugin.json"
+    )
     def test_spawners_have_no_fallback(self, plugin_json_path: Path) -> None:
         """Verify spawners explicitly have no fallback behavior."""
         plugin_json = json.loads(plugin_json_path.read_text())
@@ -545,7 +557,9 @@ class TestSpawnerCliRequirements:
             )
 
 
-@pytest.mark.skip(reason="Agent structure changed - capabilities field not present in current plugin.json")
+@pytest.mark.skip(
+    reason="Agent structure changed - capabilities field not present in current plugin.json"
+)
 class TestAgentCapabilityMatching:
     """Test orchestrator can match tasks to agents based on capabilities."""