htmlgraph 0.26.9__tar.gz → 0.26.11__tar.gz

{htmlgraph-0.26.9 → htmlgraph-0.26.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgraph
-Version: 0.26.9
+Version: 0.26.11
 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.9 → htmlgraph-0.26.11}/packages/gemini-extension/gemini-extension.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlgraph",
-  "version": "0.26.9",
+  "version": "0.26.11",
   "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.9 → htmlgraph-0.26.11}/pyproject.toml

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

{htmlgraph-0.26.9 → htmlgraph-0.26.11}/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.9"
+__version__ = "0.26.11"
 __all__ = [
     # Exceptions
     "HtmlGraphError",

{htmlgraph-0.26.9 → htmlgraph-0.26.11}/src/python/htmlgraph/hooks/event_tracker.py

@@ -770,6 +770,10 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
     # Method 3: Database detection of active task_delegation events
     # CRITICAL: When Task() subprocess is launched, environment variables don't propagate
     # So we must query the database for active task_delegation events to detect subagent context
+    # NOTE: Claude Code passes the SAME session_id to parent and subagent, so we CAN'T use
+    # session_id to distinguish them. Instead, look for the most recent task_delegation event
+    # and if found with status='started', we ARE the subagent.
+    task_event_id_from_db = None  # Track this for later use as parent_event_id
     if not subagent_type and db and db.connection:
         try:
             cursor = db.connection.cursor()
@@ -788,17 +792,19 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
             row = cursor.fetchone()
             if row:
                 task_event_id, detected_subagent_type, parent_sess = row
-                # Only treat as subagent if we're in a DIFFERENT session
-                # (same session = we're the orchestrator running Task())
-                if hook_session_id and hook_session_id != parent_sess:
-                    subagent_type = detected_subagent_type or "general-purpose"
-                    parent_session_id = parent_sess
-                    print(
-                        f"DEBUG subagent detection (database): Detected active task_delegation "
-                        f"type={subagent_type}, parent_session={parent_session_id}, "
-                        f"parent_event={task_event_id}",
-                        file=sys.stderr,
-                    )
+                # If we found an active task_delegation, we're running as a subagent
+                # (Claude Code uses the same session_id for both parent and subagent)
+                subagent_type = detected_subagent_type or "general-purpose"
+                parent_session_id = parent_sess
+                task_event_id_from_db = (
+                    task_event_id  # Store for later use as parent_event_id
+                )
+                print(
+                    f"DEBUG subagent detection (database): Detected active task_delegation "
+                    f"type={subagent_type}, parent_session={parent_session_id}, "
+                    f"parent_event={task_event_id}",
+                    file=sys.stderr,
+                )
         except Exception as e:
             print(
                 f"DEBUG: Error detecting subagent from database: {e}",
@@ -1037,6 +1043,10 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
         )
         if env_parent:
             parent_activity_id = env_parent
+        # If we detected a Task delegation event via database detection (Method 3),
+        # use that as the parent for all tool calls within the subagent
+        elif task_event_id_from_db:
+            parent_activity_id = task_event_id_from_db
         # Query database for most recent UserQuery event as parent
         # Database is the single source of truth for parent-child linking
         elif db:

{htmlgraph-0.26.9 → htmlgraph-0.26.11}/tests/hooks/test_event_tracker.py

@@ -295,9 +295,13 @@ class TestDetectAgentFromEnvironment:
         with mock.patch.dict(
             os.environ, {"HTMLGRAPH_SUBAGENT_TYPE": "researcher"}, clear=True
         ):
-            agent_id, model = detect_agent_from_environment()
-            assert agent_id == "researcher"
-            assert model is None
+            with mock.patch(
+                "htmlgraph.hooks.event_tracker.get_model_from_status_cache",
+                return_value=None,
+            ):
+                agent_id, model = detect_agent_from_environment()
+                assert agent_id == "researcher"
+                assert model is None
 
     def test_detect_claude_model(self):
         """Test detection with CLAUDE_MODEL env var returns model separately."""
@@ -323,16 +327,24 @@ class TestDetectAgentFromEnvironment:
         """Test detection with HTMLGRAPH_PARENT_AGENT env var."""
         env = {"HTMLGRAPH_PARENT_AGENT": "parent-agent"}
         with mock.patch.dict(os.environ, env, clear=True):
-            agent_id, model = detect_agent_from_environment()
-            assert agent_id == "parent-agent"
-            assert model is None
+            with mock.patch(
+                "htmlgraph.hooks.event_tracker.get_model_from_status_cache",
+                return_value=None,
+            ):
+                agent_id, model = detect_agent_from_environment()
+                assert agent_id == "parent-agent"
+                assert model is None
 
     def test_detect_fallback_to_claude_code(self):
         """Test fallback to 'claude-code' when no env vars set."""
         with mock.patch.dict(os.environ, {}, clear=True):
-            agent_id, model = detect_agent_from_environment()
-            assert agent_id == "claude-code"
-            assert model is None
+            with mock.patch(
+                "htmlgraph.hooks.event_tracker.get_model_from_status_cache",
+                return_value=None,
+            ):
+                agent_id, model = detect_agent_from_environment()
+                assert agent_id == "claude-code"
+                assert model is None
 
     def test_detect_priority_order(self):
         """Test environment variable priority order."""