htmlgraph 0.26.7__py3-none-any.whl → 0.26.9__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- htmlgraph/__init__.py +1 -1
- htmlgraph/hooks/event_tracker.py +101 -339
- htmlgraph/hooks/subagent_stop.py +12 -71
- {htmlgraph-0.26.7.dist-info → htmlgraph-0.26.9.dist-info}/METADATA +1 -1
- {htmlgraph-0.26.7.dist-info → htmlgraph-0.26.9.dist-info}/RECORD +12 -12
- {htmlgraph-0.26.7.data → htmlgraph-0.26.9.data}/data/htmlgraph/dashboard.html +0 -0
- {htmlgraph-0.26.7.data → htmlgraph-0.26.9.data}/data/htmlgraph/styles.css +0 -0
- {htmlgraph-0.26.7.data → htmlgraph-0.26.9.data}/data/htmlgraph/templates/AGENTS.md.template +0 -0
- {htmlgraph-0.26.7.data → htmlgraph-0.26.9.data}/data/htmlgraph/templates/CLAUDE.md.template +0 -0
- {htmlgraph-0.26.7.data → htmlgraph-0.26.9.data}/data/htmlgraph/templates/GEMINI.md.template +0 -0
- {htmlgraph-0.26.7.dist-info → htmlgraph-0.26.9.dist-info}/WHEEL +0 -0
- {htmlgraph-0.26.7.dist-info → htmlgraph-0.26.9.dist-info}/entry_points.txt +0 -0
htmlgraph/__init__.py
CHANGED
htmlgraph/hooks/event_tracker.py
CHANGED
|
@@ -446,179 +446,6 @@ def detect_agent_from_environment() -> tuple[str, str | None]:
|
|
|
446
446
|
return agent_id, model_name
|
|
447
447
|
|
|
448
448
|
|
|
449
|
-
def detect_subagent_context_from_database(
|
|
450
|
-
db: HtmlGraphDB,
|
|
451
|
-
current_session_id: str,
|
|
452
|
-
parent_event_id_hint: str | None = None,
|
|
453
|
-
current_tool_name: str | None = None,
|
|
454
|
-
) -> tuple[str | None, str | None, str | None]:
|
|
455
|
-
"""
|
|
456
|
-
Detect if we're in a subagent context by checking for active task_delegation events.
|
|
457
|
-
|
|
458
|
-
This is the DATABASE-BASED approach to subagent detection, which is necessary because
|
|
459
|
-
environment variables set by PreToolUse hooks in the parent process do NOT propagate
|
|
460
|
-
to subagent processes spawned by Claude Code's Task() tool.
|
|
461
|
-
|
|
462
|
-
IMPORTANT CONTEXT:
|
|
463
|
-
- Claude Code passes the SAME session_id to both parent and subagent hooks
|
|
464
|
-
- Environment variables set in hooks don't persist (each hook is a new subprocess)
|
|
465
|
-
- The only way to detect subagent context is through database state
|
|
466
|
-
|
|
467
|
-
DETECTION STRATEGY:
|
|
468
|
-
- If there's an active task_delegation (status='started') within the time window,
|
|
469
|
-
AND the current tool is NOT the Task tool itself (to avoid self-detection),
|
|
470
|
-
then we're likely in a subagent context.
|
|
471
|
-
- The Task tool check is critical: when PostToolUse fires for the Task tool itself,
|
|
472
|
-
we should NOT consider ourselves in a subagent context - we're the orchestrator
|
|
473
|
-
that just finished delegating.
|
|
474
|
-
|
|
475
|
-
Strategy (in order of precedence):
|
|
476
|
-
1. If parent_event_id_hint is provided, look up that specific event directly
|
|
477
|
-
2. Otherwise, query for task_delegation events with status='started' (fallback)
|
|
478
|
-
3. If found within the last 5 minutes AND current tool is not Task, we're in subagent context
|
|
479
|
-
4. Return the subagent_type and parent session info
|
|
480
|
-
|
|
481
|
-
Args:
|
|
482
|
-
db: HtmlGraphDB instance
|
|
483
|
-
current_session_id: The session_id from hook_input (Claude Code's session ID)
|
|
484
|
-
parent_event_id_hint: Optional event_id from environment variable for direct lookup.
|
|
485
|
-
This is the preferred method when available, as it correctly
|
|
486
|
-
handles parallel Task() calls.
|
|
487
|
-
current_tool_name: The tool being executed. If "Task", we skip subagent detection
|
|
488
|
-
to avoid the orchestrator thinking it's a subagent.
|
|
489
|
-
|
|
490
|
-
Returns:
|
|
491
|
-
Tuple of (subagent_type, parent_session_id, parent_event_id)
|
|
492
|
-
All None if not in subagent context
|
|
493
|
-
"""
|
|
494
|
-
# Skip detection if the current tool is Task - we're the orchestrator, not a subagent
|
|
495
|
-
if current_tool_name == "Task":
|
|
496
|
-
print(
|
|
497
|
-
"DEBUG detect_subagent_context_from_database: "
|
|
498
|
-
"Skipping detection for Task tool (we're the orchestrator)",
|
|
499
|
-
file=sys.stderr,
|
|
500
|
-
)
|
|
501
|
-
return None, None, None
|
|
502
|
-
try:
|
|
503
|
-
if db.connection is None:
|
|
504
|
-
return None, None, None
|
|
505
|
-
|
|
506
|
-
cursor = db.connection.cursor()
|
|
507
|
-
|
|
508
|
-
# Priority 1: Direct lookup using parent_event_id_hint (handles parallel tasks correctly)
|
|
509
|
-
if parent_event_id_hint:
|
|
510
|
-
cursor.execute(
|
|
511
|
-
"""
|
|
512
|
-
SELECT event_id, session_id, subagent_type, timestamp
|
|
513
|
-
FROM agent_events
|
|
514
|
-
WHERE event_id = ?
|
|
515
|
-
AND event_type = 'task_delegation'
|
|
516
|
-
AND status = 'started'
|
|
517
|
-
""",
|
|
518
|
-
(parent_event_id_hint,),
|
|
519
|
-
)
|
|
520
|
-
row = cursor.fetchone()
|
|
521
|
-
|
|
522
|
-
if row:
|
|
523
|
-
parent_event_id = row[0]
|
|
524
|
-
parent_session_id = row[1]
|
|
525
|
-
subagent_type = row[2] or "general-purpose"
|
|
526
|
-
|
|
527
|
-
print(
|
|
528
|
-
f"Debug: Detected subagent context via hint: "
|
|
529
|
-
f"type={subagent_type}, parent_session={parent_session_id}, "
|
|
530
|
-
f"parent_event={parent_event_id}",
|
|
531
|
-
file=sys.stderr,
|
|
532
|
-
)
|
|
533
|
-
|
|
534
|
-
return subagent_type, parent_session_id, parent_event_id
|
|
535
|
-
|
|
536
|
-
# Hint provided but event not found or not in 'started' status
|
|
537
|
-
# This can happen if the event was already completed
|
|
538
|
-
print(
|
|
539
|
-
f"Debug: Parent event hint '{parent_event_id_hint}' not found or not active",
|
|
540
|
-
file=sys.stderr,
|
|
541
|
-
)
|
|
542
|
-
|
|
543
|
-
# Priority 2: Fallback to most recent active task_delegation
|
|
544
|
-
# WARNING: This can pick the wrong parent when multiple Task() calls run in parallel!
|
|
545
|
-
# This is kept as a fallback for cases where environment variables don't propagate.
|
|
546
|
-
#
|
|
547
|
-
# IMPORTANT: We previously had `AND session_id != ?` to exclude the current session,
|
|
548
|
-
# but this was WRONG. Claude Code passes the SAME session_id to subagent hooks as
|
|
549
|
-
# to the parent session. So we need to find task_delegation events from the SAME
|
|
550
|
-
# session that are in 'started' status (not yet completed).
|
|
551
|
-
#
|
|
552
|
-
# The key insight: when a subagent runs, the task_delegation event from the parent
|
|
553
|
-
# is ALREADY in the database with status='started'. We just need to find it.
|
|
554
|
-
print(
|
|
555
|
-
f"DEBUG detect_subagent_context_from_database: "
|
|
556
|
-
f"Querying for task_delegation events in session {current_session_id}",
|
|
557
|
-
file=sys.stderr,
|
|
558
|
-
)
|
|
559
|
-
|
|
560
|
-
# First, let's see what task_delegation events exist at all (debug)
|
|
561
|
-
cursor.execute(
|
|
562
|
-
"""
|
|
563
|
-
SELECT event_id, session_id, subagent_type, status, timestamp
|
|
564
|
-
FROM agent_events
|
|
565
|
-
WHERE event_type = 'task_delegation'
|
|
566
|
-
ORDER BY timestamp DESC
|
|
567
|
-
LIMIT 5
|
|
568
|
-
"""
|
|
569
|
-
)
|
|
570
|
-
debug_rows = cursor.fetchall()
|
|
571
|
-
print(
|
|
572
|
-
f"DEBUG detect_subagent_context_from_database: "
|
|
573
|
-
f"Recent task_delegation events: {debug_rows}",
|
|
574
|
-
file=sys.stderr,
|
|
575
|
-
)
|
|
576
|
-
|
|
577
|
-
# Query for active task_delegation in the SAME session (or any session within time window)
|
|
578
|
-
# The subagent may have the same session_id as parent, so we look for ANY active
|
|
579
|
-
# task_delegation within the time window. The most recent one is likely our parent.
|
|
580
|
-
cursor.execute(
|
|
581
|
-
"""
|
|
582
|
-
SELECT event_id, session_id, subagent_type, timestamp
|
|
583
|
-
FROM agent_events
|
|
584
|
-
WHERE event_type = 'task_delegation'
|
|
585
|
-
AND status = 'started'
|
|
586
|
-
AND timestamp >= datetime('now', '-5 minutes')
|
|
587
|
-
ORDER BY timestamp DESC
|
|
588
|
-
LIMIT 1
|
|
589
|
-
"""
|
|
590
|
-
)
|
|
591
|
-
row = cursor.fetchone()
|
|
592
|
-
print(
|
|
593
|
-
f"DEBUG detect_subagent_context_from_database: "
|
|
594
|
-
f"Fallback query result: {row}",
|
|
595
|
-
file=sys.stderr,
|
|
596
|
-
)
|
|
597
|
-
|
|
598
|
-
if row:
|
|
599
|
-
parent_event_id = row[0]
|
|
600
|
-
parent_session_id = row[1]
|
|
601
|
-
subagent_type = row[2] or "general-purpose"
|
|
602
|
-
|
|
603
|
-
print(
|
|
604
|
-
f"Debug: Detected subagent context from database (fallback): "
|
|
605
|
-
f"type={subagent_type}, parent_session={parent_session_id}, "
|
|
606
|
-
f"parent_event={parent_event_id}",
|
|
607
|
-
file=sys.stderr,
|
|
608
|
-
)
|
|
609
|
-
|
|
610
|
-
return subagent_type, parent_session_id, parent_event_id
|
|
611
|
-
|
|
612
|
-
return None, None, None
|
|
613
|
-
|
|
614
|
-
except Exception as e:
|
|
615
|
-
print(
|
|
616
|
-
f"Debug: Error detecting subagent context from database: {e}",
|
|
617
|
-
file=sys.stderr,
|
|
618
|
-
)
|
|
619
|
-
return None, None, None
|
|
620
|
-
|
|
621
|
-
|
|
622
449
|
def extract_file_paths(tool_input: dict[str, Any], tool_name: str) -> list[str]:
|
|
623
450
|
"""Extract file paths from tool input based on tool type."""
|
|
624
451
|
paths = []
|
|
@@ -853,24 +680,6 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
853
680
|
Returns:
|
|
854
681
|
Response dict with {"continue": True} and optional hookSpecificOutput
|
|
855
682
|
"""
|
|
856
|
-
# Check for debug mode (set HTMLGRAPH_DEBUG=1 to enable verbose logging)
|
|
857
|
-
debug_mode = os.environ.get("HTMLGRAPH_DEBUG") == "1"
|
|
858
|
-
|
|
859
|
-
if debug_mode:
|
|
860
|
-
print(
|
|
861
|
-
f"DEBUG track_event: hook_type={hook_type}, "
|
|
862
|
-
f"session_id={hook_input.get('session_id')}, "
|
|
863
|
-
f"tool_name={hook_input.get('tool_name', hook_input.get('name', 'unknown'))}",
|
|
864
|
-
file=sys.stderr,
|
|
865
|
-
)
|
|
866
|
-
print(
|
|
867
|
-
f"DEBUG track_event: ENV HTMLGRAPH_PARENT_EVENT="
|
|
868
|
-
f"{os.environ.get('HTMLGRAPH_PARENT_EVENT')}, "
|
|
869
|
-
f"HTMLGRAPH_SUBAGENT_TYPE={os.environ.get('HTMLGRAPH_SUBAGENT_TYPE')}, "
|
|
870
|
-
f"HTMLGRAPH_PARENT_SESSION={os.environ.get('HTMLGRAPH_PARENT_SESSION')}",
|
|
871
|
-
file=sys.stderr,
|
|
872
|
-
)
|
|
873
|
-
|
|
874
683
|
cwd = hook_input.get("cwd")
|
|
875
684
|
project_dir = resolve_project_path(cwd if cwd else None)
|
|
876
685
|
graph_dir = Path(project_dir) / ".htmlgraph"
|
|
@@ -904,115 +713,104 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
904
713
|
detected_model = model_from_input
|
|
905
714
|
|
|
906
715
|
active_session = None
|
|
907
|
-
is_subagent_session = False
|
|
908
|
-
parent_event_id_for_session = None
|
|
909
|
-
|
|
910
|
-
# Get session_id from hook_input first (Claude Code provides this)
|
|
911
|
-
hook_session_id = hook_input.get("session_id") or hook_input.get("sessionId")
|
|
912
716
|
|
|
913
717
|
# Check if we're in a subagent context using multiple methods:
|
|
914
718
|
#
|
|
915
|
-
# PRECEDENCE ORDER
|
|
916
|
-
# 1.
|
|
917
|
-
#
|
|
918
|
-
# 2.
|
|
919
|
-
# 3.
|
|
719
|
+
# PRECEDENCE ORDER:
|
|
720
|
+
# 1. Sessions table - if THIS session is already marked as subagent, use stored parent info
|
|
721
|
+
# (fixes persistence issue for subsequent tool calls in same subagent)
|
|
722
|
+
# 2. Environment variables - set by spawner router for first tool call
|
|
723
|
+
# 3. Fallback to normal orchestrator context
|
|
920
724
|
#
|
|
921
|
-
# Method 1:
|
|
922
|
-
|
|
923
|
-
|
|
924
|
-
|
|
925
|
-
|
|
926
|
-
|
|
927
|
-
print(
|
|
928
|
-
f"DEBUG subagent detection: "
|
|
929
|
-
f"env subagent_type={subagent_type}, "
|
|
930
|
-
f"env parent_session_id={parent_session_id}, "
|
|
931
|
-
f"env parent_event_id={env_parent_event_id}",
|
|
932
|
-
file=sys.stderr,
|
|
933
|
-
)
|
|
934
|
-
|
|
935
|
-
# If we have parent event from environment, use it directly
|
|
936
|
-
if env_parent_event_id:
|
|
937
|
-
parent_event_id_for_session = env_parent_event_id
|
|
938
|
-
print(
|
|
939
|
-
f"Debug: Using environment variable for parent event: {env_parent_event_id}",
|
|
940
|
-
file=sys.stderr,
|
|
941
|
-
)
|
|
725
|
+
# Method 1: Check if current session is already a subagent (CRITICAL for persistence!)
|
|
726
|
+
# This fixes the issue where subsequent tool calls in the same subagent session
|
|
727
|
+
# lose the parent_event_id linkage.
|
|
728
|
+
subagent_type = None
|
|
729
|
+
parent_session_id = None
|
|
730
|
+
hook_session_id = hook_input.get("session_id") or hook_input.get("sessionId")
|
|
942
731
|
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
file=sys.stderr,
|
|
955
|
-
)
|
|
956
|
-
if not subagent_type and db and hook_session_id:
|
|
957
|
-
print(
|
|
958
|
-
f"DEBUG db detection: calling detect_subagent_context_from_database "
|
|
959
|
-
f"with current_session_id={hook_session_id}, hint={env_parent_event_id}, "
|
|
960
|
-
f"current_tool_name={current_tool_name}",
|
|
961
|
-
file=sys.stderr,
|
|
962
|
-
)
|
|
963
|
-
db_subagent_type, db_parent_session_id, db_parent_event_id = (
|
|
964
|
-
detect_subagent_context_from_database(
|
|
965
|
-
db,
|
|
966
|
-
hook_session_id,
|
|
967
|
-
parent_event_id_hint=env_parent_event_id,
|
|
968
|
-
current_tool_name=current_tool_name,
|
|
732
|
+
if db and db.connection and hook_session_id:
|
|
733
|
+
try:
|
|
734
|
+
cursor = db.connection.cursor()
|
|
735
|
+
cursor.execute(
|
|
736
|
+
"""
|
|
737
|
+
SELECT parent_session_id, agent_assigned
|
|
738
|
+
FROM sessions
|
|
739
|
+
WHERE session_id = ? AND is_subagent = 1
|
|
740
|
+
LIMIT 1
|
|
741
|
+
""",
|
|
742
|
+
(hook_session_id,),
|
|
969
743
|
)
|
|
970
|
-
|
|
971
|
-
|
|
972
|
-
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
|
|
979
|
-
|
|
980
|
-
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
744
|
+
row = cursor.fetchone()
|
|
745
|
+
if row:
|
|
746
|
+
parent_session_id = row[0]
|
|
747
|
+
# Extract subagent_type from agent_assigned (e.g., "general-purpose-spawner" -> "general-purpose")
|
|
748
|
+
agent_assigned = row[1] or ""
|
|
749
|
+
if agent_assigned and agent_assigned.endswith("-spawner"):
|
|
750
|
+
subagent_type = agent_assigned[:-8] # Remove "-spawner" suffix
|
|
751
|
+
else:
|
|
752
|
+
subagent_type = "general-purpose" # Default if format unexpected
|
|
753
|
+
|
|
754
|
+
print(
|
|
755
|
+
f"DEBUG subagent persistence: Found current session as subagent in sessions table: "
|
|
756
|
+
f"type={subagent_type}, parent_session={parent_session_id}",
|
|
757
|
+
file=sys.stderr,
|
|
758
|
+
)
|
|
759
|
+
except Exception as e:
|
|
984
760
|
print(
|
|
985
|
-
f"
|
|
986
|
-
f"type={subagent_type}, parent={parent_session_id}, "
|
|
987
|
-
f"parent_event={parent_event_id_for_session}",
|
|
761
|
+
f"DEBUG: Error checking sessions table for subagent: {e}",
|
|
988
762
|
file=sys.stderr,
|
|
989
763
|
)
|
|
990
764
|
|
|
991
|
-
#
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
f"will_create_subagent_session={bool(subagent_type and parent_session_id)}",
|
|
996
|
-
file=sys.stderr,
|
|
997
|
-
)
|
|
765
|
+
# Method 2: Environment variables (for first tool call before session table is populated)
|
|
766
|
+
if not subagent_type:
|
|
767
|
+
subagent_type = os.environ.get("HTMLGRAPH_SUBAGENT_TYPE")
|
|
768
|
+
parent_session_id = os.environ.get("HTMLGRAPH_PARENT_SESSION")
|
|
998
769
|
|
|
999
|
-
|
|
1000
|
-
|
|
1001
|
-
|
|
1002
|
-
|
|
1003
|
-
|
|
1004
|
-
|
|
1005
|
-
|
|
770
|
+
# Method 3: Database detection of active task_delegation events
|
|
771
|
+
# CRITICAL: When Task() subprocess is launched, environment variables don't propagate
|
|
772
|
+
# So we must query the database for active task_delegation events to detect subagent context
|
|
773
|
+
if not subagent_type and db and db.connection:
|
|
774
|
+
try:
|
|
775
|
+
cursor = db.connection.cursor()
|
|
776
|
+
# Find the most recent active task_delegation event
|
|
777
|
+
cursor.execute(
|
|
778
|
+
"""
|
|
779
|
+
SELECT event_id, subagent_type, session_id
|
|
780
|
+
FROM agent_events
|
|
781
|
+
WHERE event_type = 'task_delegation'
|
|
782
|
+
AND status = 'started'
|
|
783
|
+
AND tool_name = 'Task'
|
|
784
|
+
ORDER BY timestamp DESC
|
|
785
|
+
LIMIT 1
|
|
786
|
+
""",
|
|
787
|
+
)
|
|
788
|
+
row = cursor.fetchone()
|
|
789
|
+
if row:
|
|
790
|
+
task_event_id, detected_subagent_type, parent_sess = row
|
|
791
|
+
# Only treat as subagent if we're in a DIFFERENT session
|
|
792
|
+
# (same session = we're the orchestrator running Task())
|
|
793
|
+
if hook_session_id and hook_session_id != parent_sess:
|
|
794
|
+
subagent_type = detected_subagent_type or "general-purpose"
|
|
795
|
+
parent_session_id = parent_sess
|
|
796
|
+
print(
|
|
797
|
+
f"DEBUG subagent detection (database): Detected active task_delegation "
|
|
798
|
+
f"type={subagent_type}, parent_session={parent_session_id}, "
|
|
799
|
+
f"parent_event={task_event_id}",
|
|
800
|
+
file=sys.stderr,
|
|
801
|
+
)
|
|
802
|
+
except Exception as e:
|
|
803
|
+
print(
|
|
804
|
+
f"DEBUG: Error detecting subagent from database: {e}",
|
|
805
|
+
file=sys.stderr,
|
|
806
|
+
)
|
|
1006
807
|
|
|
1007
|
-
|
|
1008
|
-
#
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
f"DEBUG: subagent_session_id={subagent_session_id}",
|
|
1012
|
-
file=sys.stderr,
|
|
1013
|
-
)
|
|
808
|
+
if subagent_type and parent_session_id:
|
|
809
|
+
# We're in a subagent - create or get subagent session
|
|
810
|
+
# Use deterministic session ID based on parent + subagent type
|
|
811
|
+
subagent_session_id = f"{parent_session_id}-{subagent_type}"
|
|
1014
812
|
|
|
1015
|
-
# Check if session already exists
|
|
813
|
+
# Check if subagent session already exists
|
|
1016
814
|
existing = manager.session_converter.load(subagent_session_id)
|
|
1017
815
|
if existing:
|
|
1018
816
|
active_session = existing
|
|
@@ -1023,11 +821,6 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1023
821
|
else:
|
|
1024
822
|
# Create new subagent session with parent link
|
|
1025
823
|
try:
|
|
1026
|
-
print(
|
|
1027
|
-
f"DEBUG: Creating NEW subagent session with is_subagent=True, "
|
|
1028
|
-
f"parent_session_id={parent_session_id}",
|
|
1029
|
-
file=sys.stderr,
|
|
1030
|
-
)
|
|
1031
824
|
active_session = manager.start_session(
|
|
1032
825
|
session_id=subagent_session_id,
|
|
1033
826
|
agent=f"{subagent_type}-spawner",
|
|
@@ -1037,7 +830,7 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1037
830
|
)
|
|
1038
831
|
print(
|
|
1039
832
|
f"Debug: Created subagent session: {subagent_session_id} "
|
|
1040
|
-
f"(parent: {parent_session_id}
|
|
833
|
+
f"(parent: {parent_session_id})",
|
|
1041
834
|
file=sys.stderr,
|
|
1042
835
|
)
|
|
1043
836
|
except Exception as e:
|
|
@@ -1053,6 +846,8 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1053
846
|
# Normal orchestrator/parent context
|
|
1054
847
|
# CRITICAL: Use session_id from hook_input (Claude Code provides this)
|
|
1055
848
|
# Only fall back to manager.get_active_session() if not in hook_input
|
|
849
|
+
# hook_session_id already defined at line 730
|
|
850
|
+
|
|
1056
851
|
if hook_session_id:
|
|
1057
852
|
# Claude Code provided session_id - use it directly
|
|
1058
853
|
# Check if session already exists
|
|
@@ -1101,13 +896,10 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1101
896
|
except Exception:
|
|
1102
897
|
return default
|
|
1103
898
|
|
|
1104
|
-
# Use is_subagent_session flag from our detection, not just from session object
|
|
1105
899
|
is_subagent_raw = safe_getattr(active_session, "is_subagent", False)
|
|
1106
|
-
|
|
900
|
+
is_subagent = (
|
|
1107
901
|
bool(is_subagent_raw) if isinstance(is_subagent_raw, bool) else False
|
|
1108
902
|
)
|
|
1109
|
-
# Prefer our detection (is_subagent_session) over object attribute
|
|
1110
|
-
final_is_subagent = is_subagent_session or is_subagent_from_obj
|
|
1111
903
|
|
|
1112
904
|
transcript_id = safe_getattr(active_session, "transcript_id", None)
|
|
1113
905
|
transcript_path = safe_getattr(active_session, "transcript_path", None)
|
|
@@ -1117,35 +909,14 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1117
909
|
if transcript_path is not None and not isinstance(transcript_path, str):
|
|
1118
910
|
transcript_path = None
|
|
1119
911
|
|
|
1120
|
-
# Get parent_session_id from our detection or from session object
|
|
1121
|
-
final_parent_session_id = parent_session_id or safe_getattr(
|
|
1122
|
-
active_session, "parent_session_id", None
|
|
1123
|
-
)
|
|
1124
|
-
if final_parent_session_id is not None and not isinstance(
|
|
1125
|
-
final_parent_session_id, str
|
|
1126
|
-
):
|
|
1127
|
-
final_parent_session_id = None
|
|
1128
|
-
|
|
1129
912
|
db.insert_session(
|
|
1130
913
|
session_id=active_session_id,
|
|
1131
914
|
agent_assigned=safe_getattr(active_session, "agent", None)
|
|
1132
915
|
or detected_agent,
|
|
1133
|
-
|
|
1134
|
-
parent_event_id=parent_event_id_for_session,
|
|
1135
|
-
is_subagent=final_is_subagent,
|
|
916
|
+
is_subagent=is_subagent,
|
|
1136
917
|
transcript_id=transcript_id,
|
|
1137
918
|
transcript_path=transcript_path,
|
|
1138
919
|
)
|
|
1139
|
-
|
|
1140
|
-
# Log subagent session creation for debugging
|
|
1141
|
-
if final_is_subagent:
|
|
1142
|
-
print(
|
|
1143
|
-
f"Debug: Inserted subagent session to SQLite: "
|
|
1144
|
-
f"session_id={active_session_id}, is_subagent=True, "
|
|
1145
|
-
f"parent_session={final_parent_session_id}, "
|
|
1146
|
-
f"parent_event={parent_event_id_for_session}",
|
|
1147
|
-
file=sys.stderr,
|
|
1148
|
-
)
|
|
1149
920
|
except Exception as e:
|
|
1150
921
|
# Session may already exist, that's OK - continue
|
|
1151
922
|
print(
|
|
@@ -1256,29 +1027,20 @@ def track_event(hook_type: str, hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
1256
1027
|
warning_threshold = drift_settings.get("warning_threshold") or 0.7
|
|
1257
1028
|
auto_classify_threshold = drift_settings.get("auto_classify_threshold") or 0.85
|
|
1258
1029
|
|
|
1259
|
-
# Determine parent activity context using
|
|
1030
|
+
# Determine parent activity context using database-only lookup
|
|
1260
1031
|
parent_activity_id = None
|
|
1261
1032
|
|
|
1262
|
-
#
|
|
1263
|
-
# the task_delegation that spawned us (detected from database)
|
|
1264
|
-
if is_subagent_session and parent_event_id_for_session:
|
|
1265
|
-
parent_activity_id = parent_event_id_for_session
|
|
1266
|
-
print(
|
|
1267
|
-
f"Debug: Using parent_event from subagent detection: {parent_activity_id}",
|
|
1268
|
-
file=sys.stderr,
|
|
1269
|
-
)
|
|
1270
|
-
# Priority 2: Check environment variable for cross-process parent linking
|
|
1033
|
+
# Check environment variable FIRST for cross-process parent linking
|
|
1271
1034
|
# This is set by PreToolUse hook when Task() spawns a subagent
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1275
|
-
|
|
1276
|
-
|
|
1277
|
-
|
|
1278
|
-
|
|
1279
|
-
|
|
1280
|
-
|
|
1281
|
-
parent_activity_id = get_parent_user_query(db, active_session_id)
|
|
1035
|
+
env_parent = os.environ.get("HTMLGRAPH_PARENT_EVENT") or os.environ.get(
|
|
1036
|
+
"HTMLGRAPH_PARENT_QUERY_EVENT"
|
|
1037
|
+
)
|
|
1038
|
+
if env_parent:
|
|
1039
|
+
parent_activity_id = env_parent
|
|
1040
|
+
# Query database for most recent UserQuery event as parent
|
|
1041
|
+
# Database is the single source of truth for parent-child linking
|
|
1042
|
+
elif db:
|
|
1043
|
+
parent_activity_id = get_parent_user_query(db, active_session_id)
|
|
1282
1044
|
|
|
1283
1045
|
# Track the activity
|
|
1284
1046
|
nudge = None
|
htmlgraph/hooks/subagent_stop.py
CHANGED
|
@@ -35,61 +35,12 @@ def get_parent_event_id() -> str | None:
|
|
|
35
35
|
|
|
36
36
|
Set by PreToolUse hook when Task() is detected.
|
|
37
37
|
|
|
38
|
-
NOTE: This relies on environment variables which DON'T persist between
|
|
39
|
-
hook invocations (each hook is a new subprocess). This function is kept
|
|
40
|
-
for backward compatibility but will almost always return None.
|
|
41
|
-
Use get_parent_event_id_from_database() instead.
|
|
42
|
-
|
|
43
38
|
Returns:
|
|
44
39
|
Parent event ID (evt-XXXXX) or None if not found
|
|
45
40
|
"""
|
|
46
41
|
return os.environ.get("HTMLGRAPH_PARENT_EVENT")
|
|
47
42
|
|
|
48
43
|
|
|
49
|
-
def get_parent_event_id_from_database(db_path: str) -> tuple[str | None, str | None]:
|
|
50
|
-
"""
|
|
51
|
-
Get the parent event ID by querying the database for active task_delegation events.
|
|
52
|
-
|
|
53
|
-
This is the reliable method for finding parent events since environment variables
|
|
54
|
-
don't persist between hook invocations.
|
|
55
|
-
|
|
56
|
-
Args:
|
|
57
|
-
db_path: Path to SQLite database
|
|
58
|
-
|
|
59
|
-
Returns:
|
|
60
|
-
Tuple of (parent_event_id, parent_start_time) or (None, None) if not found
|
|
61
|
-
"""
|
|
62
|
-
try:
|
|
63
|
-
conn = sqlite3.connect(db_path)
|
|
64
|
-
cursor = conn.cursor()
|
|
65
|
-
|
|
66
|
-
# Find the most recent task_delegation event that's still 'started'
|
|
67
|
-
cursor.execute(
|
|
68
|
-
"""
|
|
69
|
-
SELECT event_id, timestamp
|
|
70
|
-
FROM agent_events
|
|
71
|
-
WHERE event_type = 'task_delegation'
|
|
72
|
-
AND status = 'started'
|
|
73
|
-
AND timestamp >= datetime('now', '-10 minutes')
|
|
74
|
-
ORDER BY timestamp DESC
|
|
75
|
-
LIMIT 1
|
|
76
|
-
"""
|
|
77
|
-
)
|
|
78
|
-
row = cursor.fetchone()
|
|
79
|
-
conn.close()
|
|
80
|
-
|
|
81
|
-
if row:
|
|
82
|
-
logger.debug(f"Found active task_delegation from database: {row[0]}")
|
|
83
|
-
return row[0], row[1]
|
|
84
|
-
|
|
85
|
-
logger.debug("No active task_delegation found in database")
|
|
86
|
-
return None, None
|
|
87
|
-
|
|
88
|
-
except Exception as e:
|
|
89
|
-
logger.warning(f"Error querying database for parent event: {e}")
|
|
90
|
-
return None, None
|
|
91
|
-
|
|
92
|
-
|
|
93
44
|
def get_session_id() -> str | None:
|
|
94
45
|
"""
|
|
95
46
|
Get the current session ID from environment.
|
|
@@ -271,7 +222,14 @@ def handle_subagent_stop(hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
271
222
|
Returns:
|
|
272
223
|
Response: {"continue": True} with optional context
|
|
273
224
|
"""
|
|
274
|
-
# Get
|
|
225
|
+
# Get parent event ID from environment
|
|
226
|
+
parent_event_id = get_parent_event_id()
|
|
227
|
+
|
|
228
|
+
if not parent_event_id:
|
|
229
|
+
logger.debug("No parent event ID found, skipping subagent stop tracking")
|
|
230
|
+
return {"continue": True}
|
|
231
|
+
|
|
232
|
+
# Get project directory and database path
|
|
275
233
|
try:
|
|
276
234
|
from htmlgraph.config import get_database_path
|
|
277
235
|
|
|
@@ -286,28 +244,11 @@ def handle_subagent_stop(hook_input: dict[str, Any]) -> dict[str, Any]:
|
|
|
286
244
|
logger.warning(f"Error resolving database path: {e}")
|
|
287
245
|
return {"continue": True}
|
|
288
246
|
|
|
289
|
-
#
|
|
290
|
-
|
|
291
|
-
parent_start_time = None
|
|
292
|
-
|
|
293
|
-
# Fall back to database-based detection (the reliable method)
|
|
294
|
-
if not parent_event_id:
|
|
295
|
-
parent_event_id, parent_start_time = get_parent_event_id_from_database(db_path)
|
|
296
|
-
|
|
297
|
-
if not parent_event_id:
|
|
298
|
-
logger.debug(
|
|
299
|
-
"No parent event ID found (env or database), skipping subagent stop tracking"
|
|
300
|
-
)
|
|
301
|
-
return {"continue": True}
|
|
302
|
-
|
|
303
|
-
logger.info(f"SubagentStop: Found parent event {parent_event_id}")
|
|
304
|
-
|
|
305
|
-
# Get parent event start time if not already retrieved from database
|
|
247
|
+
# Get parent event start time
|
|
248
|
+
parent_start_time = get_parent_event_start_time(db_path, parent_event_id)
|
|
306
249
|
if not parent_start_time:
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
logger.warning(f"Could not find parent event start time: {parent_event_id}")
|
|
310
|
-
return {"continue": True}
|
|
250
|
+
logger.warning(f"Could not find parent event: {parent_event_id}")
|
|
251
|
+
return {"continue": True}
|
|
311
252
|
|
|
312
253
|
# Count child spikes
|
|
313
254
|
child_spike_count = count_child_spikes(db_path, parent_event_id, parent_start_time)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: htmlgraph
|
|
3
|
-
Version: 0.26.
|
|
3
|
+
Version: 0.26.9
|
|
4
4
|
Summary: HTML is All You Need - Graph database on web standards
|
|
5
5
|
Project-URL: Homepage, https://github.com/Shakes-tzd/htmlgraph
|
|
6
6
|
Project-URL: Documentation, https://github.com/Shakes-tzd/htmlgraph#readme
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
htmlgraph/__init__.py,sha256=
|
|
1
|
+
htmlgraph/__init__.py,sha256=mZ6F5k0z-ycUNJBv49V5hypqSF0-MRSu-MzvBhz0u0Q,5717
|
|
2
2
|
htmlgraph/agent_detection.py,sha256=wEmrDv4hssPX2OkEnJZBHPbalxcaloiJF_hOOow_5WE,3511
|
|
3
3
|
htmlgraph/agent_registry.py,sha256=Usa_35by7p5gtpvHO7K3AcGimnorw-FzgPVa3cWTQ58,9448
|
|
4
4
|
htmlgraph/agents.py,sha256=Yvu6x1nOfrW2WhRTAHiCuSpvqoVJXx1Mkzd59kwEczw,33466
|
|
@@ -189,7 +189,7 @@ htmlgraph/hooks/cigs_pretool_enforcer.py,sha256=Lyp4DDaw_sVHEcW-kzdegldyfXjvVD25
|
|
|
189
189
|
htmlgraph/hooks/concurrent_sessions.py,sha256=qOiwDfynphVG0-2pVBakEzOwMORU8ebN1gMjcN4S0z0,6476
|
|
190
190
|
htmlgraph/hooks/context.py,sha256=tJ4dIL8uTFHyqyuuMc-ETDuOikeD5cN3Mdjmfg6W0HE,13108
|
|
191
191
|
htmlgraph/hooks/drift_handler.py,sha256=QckL5U5ooku51kI6mppGLsXzaKVt1Yx5uNu-iXZrgSk,17602
|
|
192
|
-
htmlgraph/hooks/event_tracker.py,sha256=
|
|
192
|
+
htmlgraph/hooks/event_tracker.py,sha256=zoCyTol3833Kji_v079t9i7kIB6PvsGqUJ6hZsr-x6o,45283
|
|
193
193
|
htmlgraph/hooks/git_commands.py,sha256=NPzthfzGJ_bkDi7soehHOxI9FLL-6BL8Tie9Byb_zf4,4803
|
|
194
194
|
htmlgraph/hooks/hooks-config.example.json,sha256=tXpk-U-FZzGOoNJK2uiDMbIHCYEHA794J-El0fBwkqg,197
|
|
195
195
|
htmlgraph/hooks/installer.py,sha256=nOctCFDEV7BEh7ZzxNY-apu1KZG0SHPMq74UPIOChqY,11756
|
|
@@ -209,7 +209,7 @@ htmlgraph/hooks/session_handler.py,sha256=Kft-rpSOnAYXPUzvujhWhy8TeWzzjTw0Rz_O-y
|
|
|
209
209
|
htmlgraph/hooks/session_summary.py,sha256=t-7VZP4BcQQS3213xZBO9ZZvuMcT3K64ZUymZTx1FCY,13055
|
|
210
210
|
htmlgraph/hooks/state_manager.py,sha256=ni86zHChSqzlr2CnDoTDwJ9a_zbNqRlPIdQkhLIUEKQ,17645
|
|
211
211
|
htmlgraph/hooks/subagent_detection.py,sha256=SQBksApkGniCnsf8_l3TNoH9l9Kvc50ruKGc3y3wtN0,5737
|
|
212
|
-
htmlgraph/hooks/subagent_stop.py,sha256
|
|
212
|
+
htmlgraph/hooks/subagent_stop.py,sha256=-YgIs1fUyuuzarweukk51XfDUZO-vZfdkfReExUfJaU,9085
|
|
213
213
|
htmlgraph/hooks/task_enforcer.py,sha256=eXaQaNibUu1ty78t9M46h0Hhw2M1Fi1lnqCpUdsBZ9Y,7927
|
|
214
214
|
htmlgraph/hooks/task_validator.py,sha256=GwEoqL2lptPWQqckkfl0N-Auc7TtHiyRlOf6p7HcoIo,5438
|
|
215
215
|
htmlgraph/hooks/validator.py,sha256=QO1NLdiFB7Uli6XZP_CRYHDGR1r4ujbr282b1d_cDk0,21437
|
|
@@ -249,12 +249,12 @@ htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4be
|
|
|
249
249
|
htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
|
|
250
250
|
htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
|
|
251
251
|
htmlgraph/templates/orchestration-view.html,sha256=DlS7LlcjH0oO_KYILjuF1X42t8QhKLH4F85rkO54alY,10472
|
|
252
|
-
htmlgraph-0.26.
|
|
253
|
-
htmlgraph-0.26.
|
|
254
|
-
htmlgraph-0.26.
|
|
255
|
-
htmlgraph-0.26.
|
|
256
|
-
htmlgraph-0.26.
|
|
257
|
-
htmlgraph-0.26.
|
|
258
|
-
htmlgraph-0.26.
|
|
259
|
-
htmlgraph-0.26.
|
|
260
|
-
htmlgraph-0.26.
|
|
252
|
+
htmlgraph-0.26.9.data/data/htmlgraph/dashboard.html,sha256=MUT6SaYnazoyDcvHz5hN1omYswyIoUfeoZLf2M_iblo,251268
|
|
253
|
+
htmlgraph-0.26.9.data/data/htmlgraph/styles.css,sha256=oDUSC8jG-V-hKojOBO9J88hxAeY2wJrBYTq0uCwX_Y4,7135
|
|
254
|
+
htmlgraph-0.26.9.data/data/htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
|
|
255
|
+
htmlgraph-0.26.9.data/data/htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
|
|
256
|
+
htmlgraph-0.26.9.data/data/htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
|
|
257
|
+
htmlgraph-0.26.9.dist-info/METADATA,sha256=8XXIUBNfu_ztwt_BiWbrjxiCiB3VJ_1tVY5Bj0EvwBY,10236
|
|
258
|
+
htmlgraph-0.26.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
|
|
259
|
+
htmlgraph-0.26.9.dist-info/entry_points.txt,sha256=Wmdo5cx8pt6NoMsssVE2mZH1CZLSUsrg_3iSWatiyn0,103
|
|
260
|
+
htmlgraph-0.26.9.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|