htmlgraph 0.26.17__py3-none-any.whl → 0.26.19__py3-none-any.whl

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.17"
+__version__ = "0.26.19"
 __all__ = [
     # Exceptions
     "HtmlGraphError",

htmlgraph/hooks/event_tracker.py

@@ -766,22 +766,53 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
                 # CRITICAL FIX: When Method 1 succeeds, also find the task_delegation event!
                 # This ensures parent_activity_id will use the task event, not fall back to UserQuery
                 try:
-                    cursor.execute(
-                        """
-                        SELECT event_id
-                        FROM agent_events
-                        WHERE event_type = 'task_delegation'
-                          AND subagent_type = ?
-                          AND status = 'started'
-                          AND session_id = ?
-                        ORDER BY timestamp DESC
-                        LIMIT 1
-                        """,
-                        (subagent_type, parent_session_id),
-                    )
-                    task_row = cursor.fetchone()
-                    if task_row:
-                        task_event_id_from_db = task_row[0]
+                    # First try to find task in parent_session_id (if not NULL)
+                    if parent_session_id:
+                        cursor.execute(
+                            """
+                            SELECT event_id
+                            FROM agent_events
+                            WHERE event_type = 'task_delegation'
+                              AND subagent_type = ?
+                              AND status = 'started'
+                              AND session_id = ?
+                            ORDER BY timestamp DESC
+                            LIMIT 1
+                            """,
+                            (subagent_type, parent_session_id),
+                        )
+                        task_row = cursor.fetchone()
+                        if task_row:
+                            task_event_id_from_db = task_row[0]
+
+                    # If not found (parent_session_id is NULL), fallback to finding most recent task
+                    # This handles Claude Code's session reuse where parent_session_id can be NULL
+                    if not task_event_id_from_db:
+                        cursor.execute(
+                            """
+                            SELECT event_id
+                            FROM agent_events
+                            WHERE event_type = 'task_delegation'
+                              AND subagent_type = ?
+                              AND status = 'started'
+                            ORDER BY timestamp DESC
+                            LIMIT 1
+                            """,
+                            (subagent_type,),
+                        )
+                        task_row = cursor.fetchone()
+                        if task_row:
+                            task_event_id_from_db = task_row[0]
+                            print(
+                                f"DEBUG Method 1 fallback: Found task_delegation={task_event_id_from_db} for {subagent_type}",
+                                file=sys.stderr,
+                            )
+                        else:
+                            print(
+                                f"DEBUG Method 1: No task_delegation found for subagent_type={subagent_type}",
+                                file=sys.stderr,
+                            )
+                    else:
                         print(
                             f"DEBUG Method 1: Found task_delegation={task_event_id_from_db} for subagent {subagent_type}",
                             file=sys.stderr,
@@ -1094,10 +1125,40 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
         # 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
+        # CRITICAL FIX: Check for active task_delegation EVEN IF task_event_id_from_db not set
+        # 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:
-            parent_activity_id = get_parent_user_query(db, active_session_id)
+            # 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]
+                    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: 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)
 
         # Track the activity
         nudge = None

{htmlgraph-0.26.17.dist-info → htmlgraph-0.26.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: htmlgraph
-Version: 0.26.17
+Version: 0.26.19
 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.17.dist-info → htmlgraph-0.26.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-htmlgraph/__init__.py,sha256=8NssRZ_s0HFZ69J27yuvYBZshbmq3uHoUSsTyvdO4Kw,5718
+htmlgraph/__init__.py,sha256=Z3qd3jS8qYZt8MI_sa2cpGA2PCk4XUyRE5Iq3YPpSfk,5718
 htmlgraph/agent_detection.py,sha256=wEmrDv4hssPX2OkEnJZBHPbalxcaloiJF_hOOow_5WE,3511
 htmlgraph/agent_registry.py,sha256=Usa_35by7p5gtpvHO7K3AcGimnorw-FzgPVa3cWTQ58,9448
 htmlgraph/agents.py,sha256=Yvu6x1nOfrW2WhRTAHiCuSpvqoVJXx1Mkzd59kwEczw,33466
@@ -192,7 +192,7 @@ htmlgraph/hooks/cigs_pretool_enforcer.py,sha256=Lyp4DDaw_sVHEcW-kzdegldyfXjvVD25
 htmlgraph/hooks/concurrent_sessions.py,sha256=qOiwDfynphVG0-2pVBakEzOwMORU8ebN1gMjcN4S0z0,6476
 htmlgraph/hooks/context.py,sha256=tJ4dIL8uTFHyqyuuMc-ETDuOikeD5cN3Mdjmfg6W0HE,13108
 htmlgraph/hooks/drift_handler.py,sha256=QckL5U5ooku51kI6mppGLsXzaKVt1Yx5uNu-iXZrgSk,17602
-htmlgraph/hooks/event_tracker.py,sha256=tSlgrWA9KEQVJDGy_hF6DfRdKaedrqHs9m7Xir_VOUs,48231
+htmlgraph/hooks/event_tracker.py,sha256=0EQFRiz4tihADiaaF2yQqJ635re-LTR1brKDi0wvUx8,51245
 htmlgraph/hooks/git_commands.py,sha256=NPzthfzGJ_bkDi7soehHOxI9FLL-6BL8Tie9Byb_zf4,4803
 htmlgraph/hooks/hooks-config.example.json,sha256=tXpk-U-FZzGOoNJK2uiDMbIHCYEHA794J-El0fBwkqg,197
 htmlgraph/hooks/installer.py,sha256=nOctCFDEV7BEh7ZzxNY-apu1KZG0SHPMq74UPIOChqY,11756
@@ -252,12 +252,12 @@ htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4be
 htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
 htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
 htmlgraph/templates/orchestration-view.html,sha256=DlS7LlcjH0oO_KYILjuF1X42t8QhKLH4F85rkO54alY,10472
-htmlgraph-0.26.17.data/data/htmlgraph/dashboard.html,sha256=MUT6SaYnazoyDcvHz5hN1omYswyIoUfeoZLf2M_iblo,251268
-htmlgraph-0.26.17.data/data/htmlgraph/styles.css,sha256=oDUSC8jG-V-hKojOBO9J88hxAeY2wJrBYTq0uCwX_Y4,7135
-htmlgraph-0.26.17.data/data/htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
-htmlgraph-0.26.17.data/data/htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
-htmlgraph-0.26.17.data/data/htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
-htmlgraph-0.26.17.dist-info/METADATA,sha256=DQseSEEJx0CyN8Y-3NcndcjbkwFLX6yGPbr5TEMWep8,10237
-htmlgraph-0.26.17.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-htmlgraph-0.26.17.dist-info/entry_points.txt,sha256=Wmdo5cx8pt6NoMsssVE2mZH1CZLSUsrg_3iSWatiyn0,103
-htmlgraph-0.26.17.dist-info/RECORD,,
+htmlgraph-0.26.19.data/data/htmlgraph/dashboard.html,sha256=MUT6SaYnazoyDcvHz5hN1omYswyIoUfeoZLf2M_iblo,251268
+htmlgraph-0.26.19.data/data/htmlgraph/styles.css,sha256=oDUSC8jG-V-hKojOBO9J88hxAeY2wJrBYTq0uCwX_Y4,7135
+htmlgraph-0.26.19.data/data/htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
+htmlgraph-0.26.19.data/data/htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
+htmlgraph-0.26.19.data/data/htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
+htmlgraph-0.26.19.dist-info/METADATA,sha256=JFDksv4VQ6eDi6EHcKH8wwlMFxM6alM_iW0LoHlBIVA,10237
+htmlgraph-0.26.19.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+htmlgraph-0.26.19.dist-info/entry_points.txt,sha256=Wmdo5cx8pt6NoMsssVE2mZH1CZLSUsrg_3iSWatiyn0,103
+htmlgraph-0.26.19.dist-info/RECORD,,