htmlgraph 0.26.7__tar.gz → 0.26.8__tar.gz

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/PKG-INFO

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

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

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

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

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/src/python/htmlgraph/hooks/event_tracker.py

@@ -353,6 +353,7 @@ def detect_model_from_hook_input(hook_input: dict[str, Any]) -> str | None:
     1. Task() model parameter (if tool_name == 'Task')
     2. HTMLGRAPH_MODEL environment variable (set by hooks)
     3. ANTHROPIC_MODEL or CLAUDE_MODEL environment variables
+    4. Status line cache (for orchestrator tool calls)
 
     Args:
         hook_input: Hook input dict containing tool_name and tool_input
@@ -386,6 +387,14 @@ def detect_model_from_hook_input(hook_input: dict[str, Any]) -> str | None:
             if model:
                 return model
 
+    # 3. Fallback to status line cache for orchestrator's own tool calls
+    # This gives regular tool calls (Bash, Read, etc.) the model of the orchestrator
+    session_id = hook_input.get("session_id") or hook_input.get("sessionId")
+    if session_id:
+        model_from_cache = get_model_from_status_cache(session_id)
+        if model_from_cache:
+            return model_from_cache
+
     return None
 
 

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/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."""
@@ -1699,7 +1711,9 @@ class TestParallelSubagentDetection:
         )
 
         assert subagent_type == "Explore", f"Expected 'Explore', got '{subagent_type}'"
-        assert parent_event == "evt-task1-explore", f"Expected 'evt-task1-explore', got '{parent_event}'"
+        assert parent_event == "evt-task1-explore", (
+            f"Expected 'evt-task1-explore', got '{parent_event}'"
+        )
         assert parent_session == parent_session_id
 
         db.disconnect()
@@ -1773,7 +1787,9 @@ class TestParallelSubagentDetection:
             db, "subagent-session-no-hint", parent_event_id_hint=None
         )
 
-        assert subagent_type == "Gemini", f"Expected 'Gemini' (most recent), got '{subagent_type}'"
+        assert subagent_type == "Gemini", (
+            f"Expected 'Gemini' (most recent), got '{subagent_type}'"
+        )
         assert parent_event == "evt-newer-task"
 
         db.disconnect()
@@ -1845,7 +1861,9 @@ class TestParallelSubagentDetection:
             db, "subagent-session-stale-hint", parent_event_id_hint="evt-completed-task"
         )
 
-        assert subagent_type == "Codex", f"Expected 'Codex' (active fallback), got '{subagent_type}'"
+        assert subagent_type == "Codex", (
+            f"Expected 'Codex' (active fallback), got '{subagent_type}'"
+        )
         assert parent_event == "evt-active-task"
 
         db.disconnect()
@@ -1894,10 +1912,14 @@ class TestParallelSubagentDetection:
 
         # Hint points to non-existent event - should fall back
         subagent_type, _, parent_event = detect_subagent_context_from_database(
-            db, "subagent-session-invalid-hint", parent_event_id_hint="evt-does-not-exist"
+            db,
+            "subagent-session-invalid-hint",
+            parent_event_id_hint="evt-does-not-exist",
         )
 
-        assert subagent_type == "Gemini", f"Expected 'Gemini' (fallback), got '{subagent_type}'"
+        assert subagent_type == "Gemini", (
+            f"Expected 'Gemini' (fallback), got '{subagent_type}'"
+        )
         assert parent_event == "evt-only-active"
 
         db.disconnect()

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/tests/integration/test_codex_spawner.py

@@ -50,12 +50,10 @@ def test_codex_cli_availability():
     print("=" * 80)
 
     import subprocess
+
     try:
         result = subprocess.run(
-            ["codex", "--version"],
-            capture_output=True,
-            text=True,
-            timeout=5
+            ["codex", "--version"], capture_output=True, text=True, timeout=5
         )
         print(f"✅ Codex CLI found: {result.stdout.strip()}")
         return True
@@ -82,10 +80,10 @@ def test_codex_spawner_simple():
         output_json=True,
         full_auto=True,
         track_in_htmlgraph=False,  # Disable tracking for simple test
-        timeout=30
+        timeout=30,
     )
 
-    print(f"\nResult:")
+    print("\nResult:")
     print(f"  Success: {result.success}")
     print(f"  Response: {result.response[:200] if result.response else 'None'}")
     print(f"  Error: {result.error}")
@@ -116,6 +114,7 @@ def test_database_events():
     print("=" * 80)
 
     import sqlite3
+
     from htmlgraph.config import get_database_path
 
     db_path = get_database_path()
@@ -157,7 +156,9 @@ def test_database_events():
         """)
         linked_count = cursor.fetchone()[0]
 
-        print(f"✅ Parent event linking: {linked_count} subprocess.codex events have parent_event_id")
+        print(
+            f"✅ Parent event linking: {linked_count} subprocess.codex events have parent_event_id"
+        )
 
         conn.close()
         return True
@@ -174,6 +175,7 @@ def test_error_analysis():
     print("=" * 80)
 
     import sqlite3
+
     from htmlgraph.config import get_database_path
 
     try:
@@ -204,17 +206,17 @@ def test_error_analysis():
             "chatgpt_plan": 0,
             "model_not_supported": 0,
             "authentication": 0,
-            "other": 0
+            "other": 0,
         }
 
         for (output,) in errors:
-            print(f"Error output sample:")
+            print("Error output sample:")
             print(f"  {output[:200]}...")
             print()
 
             # Parse JSONL error messages
             try:
-                for line in output.split('\n'):
+                for line in output.split("\n"):
                     if not line.strip():
                         continue
                     try:
@@ -338,9 +340,11 @@ def main():
     print("DIAGNOSTIC SUMMARY")
     print("=" * 80)
     print(f"Codex CLI Available: {'✅ YES' if cli_available else '❌ NO'}")
-    print(f"CodexSpawner Working: {'✅ YES' if spawner_works else '❌ NO (API access blocked)'}")
-    print(f"Event Tracking: ✅ YES (SpawnerEventTracker integration working)")
-    print(f"Root Cause: ❌ ChatGPT account tier limitation")
+    print(
+        f"CodexSpawner Working: {'✅ YES' if spawner_works else '❌ NO (API access blocked)'}"
+    )
+    print("Event Tracking: ✅ YES (SpawnerEventTracker integration working)")
+    print("Root Cause: ❌ ChatGPT account tier limitation")
     print("=" * 80)
 
 

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/tests/integration/test_copilot_spawner_tracking.py

@@ -16,10 +16,11 @@ from datetime import datetime, timezone
 from pathlib import Path
 
 # Add plugin agents directory to path for SpawnerEventTracker
-PLUGIN_AGENTS_DIR = Path(__file__).parent / "packages/claude-plugin/.claude-plugin/agents"
+PLUGIN_AGENTS_DIR = (
+    Path(__file__).parent / "packages/claude-plugin/.claude-plugin/agents"
+)
 sys.path.insert(0, str(PLUGIN_AGENTS_DIR))
 
-from htmlgraph import SDK
 from htmlgraph.config import get_database_path
 from htmlgraph.db.schema import HtmlGraphDB
 from htmlgraph.orchestration import CopilotSpawner
@@ -41,9 +42,9 @@ def setup_parent_event_context(db: HtmlGraphDB, session_id: str) -> tuple[str, s
     task_delegation_event_id = f"event-{uuid.uuid4().hex[:8]}"
     start_time = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S")
 
-    print(f"\n{'='*80}")
+    print(f"\n{'=' * 80}")
     print("SETUP: Creating parent event context")
-    print(f"{'='*80}")
+    print(f"{'=' * 80}")
     print(f"Session ID: {session_id}")
     print(f"UserQuery Event ID: {user_query_event_id}")
     print(f"Task Delegation Event ID: {task_delegation_event_id}")
@@ -87,7 +88,7 @@ def setup_parent_event_context(db: HtmlGraphDB, session_id: str) -> tuple[str, s
     )
     db.connection.commit()
 
-    print(f"\n✅ Parent events created in database")
+    print("\n✅ Parent events created in database")
     return user_query_event_id, task_delegation_event_id
 
 
@@ -99,9 +100,9 @@ def setup_environment(session_id: str, parent_event_id: str) -> None:
         session_id: Session ID
         parent_event_id: Parent event ID (task delegation)
     """
-    print(f"\n{'='*80}")
+    print(f"\n{'=' * 80}")
     print("SETUP: Exporting parent context to environment")
-    print(f"{'='*80}")
+    print(f"{'=' * 80}")
 
     os.environ["HTMLGRAPH_PARENT_EVENT"] = parent_event_id
     os.environ["HTMLGRAPH_PARENT_SESSION"] = session_id
@@ -110,7 +111,7 @@ def setup_environment(session_id: str, parent_event_id: str) -> None:
 
     print(f"HTMLGRAPH_PARENT_EVENT: {parent_event_id}")
     print(f"HTMLGRAPH_PARENT_SESSION: {session_id}")
-    print(f"✅ Environment configured")
+    print("✅ Environment configured")
 
 
 def invoke_copilot_spawner(
@@ -127,9 +128,9 @@ def invoke_copilot_spawner(
     Returns:
         Dict with result and metadata
     """
-    print(f"\n{'='*80}")
+    print(f"\n{'=' * 80}")
     print("INVOCATION: Spawning Copilot with tracking")
-    print(f"{'='*80}")
+    print(f"{'=' * 80}")
 
     spawner = CopilotSpawner()
 
@@ -148,8 +149,8 @@ Please recommend:
     print(f"Prompt: {prompt[:100]}...")
     print(f"Tracker: {tracker}")
     print(f"Parent Event ID: {parent_event_id}")
-    print(f"Track in HtmlGraph: True")
-    print(f"Allow all tools: True")
+    print("Track in HtmlGraph: True")
+    print("Allow all tools: True")
 
     result = spawner.spawn(
         prompt=prompt,
@@ -186,24 +187,26 @@ def validate_results(
     Returns:
         True if validation passed, False otherwise
     """
-    print(f"\n{'='*80}")
+    print(f"\n{'=' * 80}")
     print("VALIDATION: Checking event hierarchy in database")
-    print(f"{'='*80}")
+    print(f"{'=' * 80}")
 
     result = result_data["result"]
-    prompt = result_data["prompt"]
+    _ = result_data["prompt"]  # noqa: F841 - Kept for debugging
 
     # Check AIResult structure
-    print(f"\n1. AIResult Validation:")
+    print("\n1. AIResult Validation:")
     print(f"   Success: {result.success}")
     print(f"   Response length: {len(result.response) if result.response else 0}")
     print(f"   Error: {result.error}")
-    print(f"   Tracked events: {len(result.tracked_events) if result.tracked_events else 0}")
+    print(
+        f"   Tracked events: {len(result.tracked_events) if result.tracked_events else 0}"
+    )
 
     if not result.success:
         print(f"\n⚠️  Copilot execution failed: {result.error}")
-        print(f"   This is expected if Copilot CLI is not installed")
-        print(f"   Continuing validation of event tracking structure...")
+        print("   This is expected if Copilot CLI is not installed")
+        print("   Continuing validation of event tracking structure...")
 
     # Query all events in this session
     cursor = db.connection.cursor()
@@ -245,7 +248,7 @@ def validate_results(
         elif parent_event_id == task_delegation_event_id:
             indent = "      "
 
-        print(f"{indent}[{i+1}] {tool_name} ({event_type})")
+        print(f"{indent}[{i + 1}] {tool_name} ({event_type})")
         print(f"{indent}    Event ID: {event_id}")
         print(f"{indent}    Agent: {agent_id}")
         print(f"{indent}    Parent: {parent_event_id or 'ROOT'}")
@@ -254,34 +257,38 @@ def validate_results(
         print(f"{indent}    Summary: {input_summary[:60]}...")
 
     # Validate hierarchy
-    print(f"\n3. Hierarchy Validation:")
+    print("\n3. Hierarchy Validation:")
 
     # Check UserQuery exists
     user_query = [e for e in events if e[0] == user_query_event_id]
     if user_query:
-        print(f"   ✅ UserQuery event found (root)")
+        print("   ✅ UserQuery event found (root)")
     else:
-        print(f"   ❌ UserQuery event NOT found")
+        print("   ❌ UserQuery event NOT found")
         validation_passed = False
 
     # Check Task delegation exists and is child of UserQuery
     task_delegation = [e for e in events if e[0] == task_delegation_event_id]
     if task_delegation and task_delegation[0][5] == user_query_event_id:
-        print(f"   ✅ Task delegation event found (child of UserQuery)")
+        print("   ✅ Task delegation event found (child of UserQuery)")
     else:
-        print(f"   ❌ Task delegation event NOT properly linked")
+        print("   ❌ Task delegation event NOT properly linked")
         validation_passed = False
 
     # Check subprocess events exist and are children of Task delegation
     subprocess_events = [
-        e for e in events if e[5] == task_delegation_event_id and e[3] == "subprocess.copilot"
+        e
+        for e in events
+        if e[5] == task_delegation_event_id and e[3] == "subprocess.copilot"
     ]
     if subprocess_events:
         print(
             f"   ✅ {len(subprocess_events)} subprocess event(s) found (children of Task delegation)"
         )
     else:
-        print(f"   ⚠️  No subprocess events found (expected if Copilot CLI not available)")
+        print(
+            "   ⚠️  No subprocess events found (expected if Copilot CLI not available)"
+        )
 
     # Check for activity tracking events (copilot_start, copilot_result)
     activity_events = [
@@ -292,15 +299,19 @@ def validate_results(
     if activity_events:
         print(f"   ✅ {len(activity_events)} activity tracking event(s) found")
     else:
-        print(f"   ⚠️  No activity tracking events found")
+        print("   ⚠️  No activity tracking events found")
 
     # Summary
-    print(f"\n{'='*80}")
+    print(f"\n{'=' * 80}")
     print("SUMMARY")
-    print(f"{'='*80}")
+    print(f"{'=' * 80}")
     print(f"Total events in session: {len(events)}")
-    print(f"UserQuery events: {len([e for e in events if e[2] == 'tool_call' and e[3] == 'UserPromptSubmit'])}")
-    print(f"Task delegation events: {len([e for e in events if e[2] == 'task_delegation'])}")
+    print(
+        f"UserQuery events: {len([e for e in events if e[2] == 'tool_call' and e[3] == 'UserPromptSubmit'])}"
+    )
+    print(
+        f"Task delegation events: {len([e for e in events if e[2] == 'task_delegation'])}"
+    )
     print(f"Subprocess events: {len(subprocess_events)}")
     print(f"Activity events: {len(activity_events)}")
     print(f"\nValidation: {'✅ PASSED' if validation_passed else '❌ FAILED'}")
@@ -310,9 +321,9 @@ def validate_results(
 
 def main() -> int:
     """Run the complete test workflow."""
-    print(f"\n{'#'*80}")
+    print(f"\n{'#' * 80}")
     print("# CopilotSpawner Parent Event Context Test")
-    print(f"{'#'*80}")
+    print(f"{'#' * 80}")
 
     try:
         # Initialize database
@@ -321,7 +332,7 @@ def main() -> int:
 
         if not db_path.exists():
             print(f"❌ Database not found at {db_path}")
-            print(f"   Run: htmlgraph init")
+            print("   Run: htmlgraph init")
             return 1
 
         db = HtmlGraphDB(str(db_path))
@@ -339,9 +350,9 @@ def main() -> int:
         setup_environment(session_id, task_delegation_event_id)
 
         # Step 3: Create tracker with parent context
-        print(f"\n{'='*80}")
+        print(f"\n{'=' * 80}")
         print("SETUP: Creating SpawnerEventTracker")
-        print(f"{'='*80}")
+        print(f"{'=' * 80}")
 
         tracker = SpawnerEventTracker(
             delegation_event_id=task_delegation_event_id,
@@ -351,12 +362,12 @@ def main() -> int:
         )
         tracker.db = db  # Ensure tracker uses the same database
 
-        print(f"Tracker created:")
+        print("Tracker created:")
         print(f"  Delegation Event ID: {task_delegation_event_id}")
-        print(f"  Parent Agent: claude")
-        print(f"  Spawner Type: copilot")
+        print("  Parent Agent: claude")
+        print("  Spawner Type: copilot")
         print(f"  Session ID: {session_id}")
-        print(f"✅ Tracker initialized")
+        print("✅ Tracker initialized")
 
         # Step 4: Invoke CopilotSpawner
         result_data = invoke_copilot_spawner(tracker, task_delegation_event_id)
@@ -373,22 +384,22 @@ def main() -> int:
         # Step 6: Display response (if successful)
         result = result_data["result"]
         if result.success and result.response:
-            print(f"\n{'='*80}")
+            print(f"\n{'=' * 80}")
             print("COPILOT RESPONSE")
-            print(f"{'='*80}")
+            print(f"{'=' * 80}")
             print(result.response)
 
-        print(f"\n{'#'*80}")
+        print(f"\n{'#' * 80}")
         print(f"# Test {'PASSED' if validation_passed else 'FAILED'}")
-        print(f"{'#'*80}\n")
+        print(f"{'#' * 80}\n")
 
         return 0 if validation_passed else 1
 
     except KeyboardInterrupt:
-        print(f"\n\n⚠️  Test interrupted by user")
+        print("\n\n⚠️  Test interrupted by user")
         return 130
     except Exception as e:
-        print(f"\n\n❌ Test failed with exception:")
+        print("\n\n❌ Test failed with exception:")
         print(f"   {type(e).__name__}: {e}")
         import traceback
 

{htmlgraph-0.26.7 → htmlgraph-0.26.8}/tests/integration/test_gemini_spawner_diagnosis.py

@@ -27,7 +27,7 @@ def test_basic_gemini():
         output_format="json",
         model="gemini-2.0-flash",
         track_in_htmlgraph=False,
-        timeout=30
+        timeout=30,
     )
 
     print(f"Success: {result.success}")
@@ -49,7 +49,7 @@ def test_basic_gemini():
         output_format="stream-json",
         model="gemini-2.0-flash",
         track_in_htmlgraph=False,
-        timeout=30
+        timeout=30,
     )
 
     print(f"Success: {result2.success}")