htmlgraph 0.23.1__py3-none-any.whl → 0.23.2__py3-none-any.whl

htmlgraph/__init__.py

@@ -84,7 +84,7 @@ from htmlgraph.types import (
 )
 from htmlgraph.work_type_utils import infer_work_type, infer_work_type_from_id
 
-__version__ = "0.23.1"
+__version__ = "0.23.2"
 __all__ = [
     # Exceptions
     "HtmlGraphError",

htmlgraph/event_log.py

@@ -38,6 +38,22 @@ class EventRecord:
     session_status: str | None = None
     file_paths: list[str] | None = None
     payload: dict[str, Any] | None = None
+    # Phase 1: Enhanced Event Data Schema for multi-AI delegation tracking
+    delegated_to_ai: str | None = (
+        None  # "gemini", "codex", "copilot", "claude", or None
+    )
+    task_id: str | None = None  # Unique task ID for parallel tracking
+    task_status: str | None = (
+        None  # "pending", "running", "completed", "failed", "timeout"
+    )
+    model_selected: str | None = None  # Specific model (e.g., "gemini-2.0-flash")
+    complexity_level: str | None = None  # "low", "medium", "high", "very-high"
+    budget_mode: str | None = None  # "free", "balanced", "performance"
+    execution_duration_seconds: float | None = None  # How long delegation took
+    tokens_estimated: int | None = None  # Estimated token usage
+    tokens_actual: int | None = None  # Actual token usage
+    cost_usd: float | None = None  # Calculated cost
+    task_findings: str | None = None  # Results from delegated task
 
     def to_json(self) -> dict[str, Any]:
         return {
@@ -56,6 +72,18 @@ class EventRecord:
             "session_status": self.session_status,
             "file_paths": self.file_paths or [],
             "payload": self.payload,
+            # Delegation fields
+            "delegated_to_ai": self.delegated_to_ai,
+            "task_id": self.task_id,
+            "task_status": self.task_status,
+            "model_selected": self.model_selected,
+            "complexity_level": self.complexity_level,
+            "budget_mode": self.budget_mode,
+            "execution_duration_seconds": self.execution_duration_seconds,
+            "tokens_estimated": self.tokens_estimated,
+            "tokens_actual": self.tokens_actual,
+            "cost_usd": self.cost_usd,
+            "task_findings": self.task_findings,
         }
 
 

htmlgraph/hooks/orchestrator.py

@@ -107,6 +107,23 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
         - reason_if_not: Explanation if blocked (empty if allowed)
         - category: Operation category for logging
     """
+    # Get enforcement level from manager
+    try:
+        cwd = Path.cwd()
+        graph_dir = cwd / ".htmlgraph"
+        if not graph_dir.exists():
+            for parent in [cwd.parent, cwd.parent.parent, cwd.parent.parent.parent]:
+                candidate = parent / ".htmlgraph"
+                if candidate.exists():
+                    graph_dir = candidate
+                    break
+        manager = OrchestratorModeManager(graph_dir)
+        enforcement_level = (
+            manager.get_enforcement_level() if manager.is_enabled() else "guidance"
+        )
+    except Exception:
+        enforcement_level = "guidance"
+
     # Use OrchestratorValidator for comprehensive validation
     validator = OrchestratorValidator()
     result, reason = validator.validate_tool_use(tool, params)
@@ -121,6 +138,10 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
     if tool in ["Task", "AskUserQuestion", "TodoWrite"]:
         return True, "", "orchestrator-core"
 
+    # FIX #2: Block Skills in strict mode (must be invoked via Task delegation)
+    if tool == "Skill" and enforcement_level == "strict":
+        return False, "Skills must be invoked via Task delegation", "skill-blocked"
+
     # Category 2: SDK Operations - Always allowed
     if tool == "Bash":
         command = params.get("command", "")
@@ -141,11 +162,51 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
         if "from htmlgraph import" in command or "import htmlgraph" in command:
             return True, "", "sdk-inline"
 
+        # FIX #3: Check if bash command is in allowed whitelist (strict mode only)
+        # If we've gotten here, it's not a whitelisted command above
+        # Block non-whitelisted bash commands in strict mode
+        if enforcement_level == "strict":
+            # Check if it's a blocked test/build pattern (handled below)
+            blocked_patterns = [
+                r"^npm (run|test|build)",
+                r"^pytest",
+                r"^uv run pytest",
+                r"^python -m pytest",
+                r"^cargo (build|test)",
+                r"^mvn (compile|test|package)",
+                r"^make (test|build)",
+            ]
+            is_blocked_pattern = any(
+                re.match(pattern, command) for pattern in blocked_patterns
+            )
+
+            if not is_blocked_pattern:
+                # Not a specifically blocked pattern, but also not whitelisted
+                # In strict mode, we should delegate
+                return (
+                    False,
+                    f"Bash command not in allowed list. Delegate to subagent.\n\n"
+                    f"Command: {command[:100]}",
+                    "bash-blocked",
+                )
+
     # Category 3: Quick Lookups - Single operations only
     if tool in ["Read", "Grep", "Glob"]:
         # Check tool history to see if this is a single lookup or part of a sequence
         history = load_tool_history()
 
+        # FIX #4: Check for mixed exploration pattern
+        exploration_count = sum(
+            1 for h in history[-5:] if h["tool"] in ["Read", "Grep", "Glob"]
+        )
+        if exploration_count >= 3 and enforcement_level == "strict":
+            return (
+                False,
+                "Multiple exploration calls detected. Delegate to Explorer agent.\n\n"
+                "Use Task tool with explorer subagent.",
+                "exploration-blocked",
+            )
+
         # Look at last 3 tool calls
         recent_same_tool = sum(1 for h in history[-3:] if h["tool"] == tool)
 
@@ -181,7 +242,7 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
         command = params.get("command", "")
 
         # Block compilation, testing, building (should be in subagent)
-        blocked_patterns = [
+        test_build_patterns: list[tuple[str, str]] = [
             (r"^npm (run|test|build)", "npm test/build"),
             (r"^pytest", "pytest"),
             (r"^uv run pytest", "pytest"),
@@ -191,7 +252,7 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
             (r"^make (test|build)", "make test/build"),
         ]
 
-        for pattern, name in blocked_patterns:
+        for pattern, name in test_build_patterns:
             if re.match(pattern, command):
                 return (
                     False,
@@ -200,8 +261,11 @@ def is_allowed_orchestrator_operation(tool: str, params: dict) -> tuple[bool, st
                     "test-build-blocked",
                 )
 
-    # Default: Allow with guidance
-    return True, "Allowed but consider if delegation would be better", "allowed-default"
+    # FIX #1: Remove "allowed-default" escape hatch in strict mode
+    if enforcement_level == "strict":
+        return False, "Not in allowed whitelist", "strict-blocked"
+    else:
+        return True, "Allowed in guidance mode", "guidance-allowed"
 
 
 def create_task_suggestion(tool: str, params: dict) -> str:

{htmlgraph-0.23.1.dist-info → htmlgraph-0.23.2.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-htmlgraph/__init__.py,sha256=nWM6HtPl0ASV6Y-Flmw0VxM2eGiuoxt1Lt-8Y2B_Gx4,4979
+htmlgraph/__init__.py,sha256=CpjmLuef0RQAd4Op9FbEPyFMeLmaavFZMejnMU9FbWM,4979
 htmlgraph/agent_detection.py,sha256=MG1kx9S-ey_Wi84hJTwwgw6VDvYEbUpygmDjGPhHcUA,3805
 htmlgraph/agent_registry.py,sha256=Usa_35by7p5gtpvHO7K3AcGimnorw-FzgPVa3cWTQ58,9448
 htmlgraph/agents.py,sha256=Yvu6x1nOfrW2WhRTAHiCuSpvqoVJXx1Mkzd59kwEczw,33466
@@ -12,7 +12,7 @@ htmlgraph/dependency_models.py,sha256=eKpBz9y_pTE5E8baESqHyGUDj5-uXokVd2Bx3ZogAy
 htmlgraph/deploy.py,sha256=kM_IMa3PmKpQf4YVH57aL9uV5IfpVJgaj-IFsgAKIbY,17771
 htmlgraph/deployment_models.py,sha256=8pjvfe0YmExuYg65D4jO4kET52HaG8WhcArWXOJpfCQ,16064
 htmlgraph/edge_index.py,sha256=epeUiTj1Hm-NQj8WCWjSUypG1e8Z2hJulNT9drHstcM,14937
-htmlgraph/event_log.py,sha256=BjLmN73ohqwhTUQrlTd4E53eoitbMExmFCVRGNjlNY0,7866
+htmlgraph/event_log.py,sha256=zJUefAaz97LvoVA-pi8uVMcCqA_pyS_saVczbioQf-Q,9372
 htmlgraph/event_migration.py,sha256=7vocfwy-E6_D8_Aeql630FrlBXppIYp1iLmZ_cw_ras,2512
 htmlgraph/exceptions.py,sha256=o_BPNQXtv9zaejbiItDVBK7kcGvYbh4Icj5NXmDSLeU,1592
 htmlgraph/file_watcher.py,sha256=qwwmDkWnKLPp8a_48VrtJZo6HcoYPRz1KMAD39yCV7U,6296
@@ -104,7 +104,7 @@ htmlgraph/hooks/__init__.py,sha256=jL2HyCoFWQQ8l-4-EAlypDxPalNE3JBfDyELYWAg-g0,8
 htmlgraph/hooks/event_tracker.py,sha256=KQcIWbhNJser6Tip87oUAPQJgUAAKESKE5ARQasLtCM,23301
 htmlgraph/hooks/hooks-config.example.json,sha256=tXpk-U-FZzGOoNJK2uiDMbIHCYEHA794J-El0fBwkqg,197
 htmlgraph/hooks/installer.py,sha256=nOctCFDEV7BEh7ZzxNY-apu1KZG0SHPMq74UPIOChqY,11756
-htmlgraph/hooks/orchestrator.py,sha256=55xjmfg680e9PKcMkBmpbAmSXkZa33EQcZXlwPjDn50,17105
+htmlgraph/hooks/orchestrator.py,sha256=rKRx5EYED-BFQrnAJ_roIjpP8GOs3RKDpulDouA29K0,19781
 htmlgraph/hooks/orchestrator_reflector.py,sha256=j3kZge33m42CEUVYiufiz7mf7Qm4DimnsRZKjbpZStA,5154
 htmlgraph/hooks/post-checkout.sh,sha256=Hsr5hqD54jisGbtqf7-Z-G_b6XNGcee_CZRYaKYzWzU,615
 htmlgraph/hooks/post-commit.sh,sha256=if65jNGZnEWsZPq_iYDNYunrZ1cmjPUEUbh6_4vfpOE,511
@@ -134,12 +134,12 @@ htmlgraph/services/claiming.py,sha256=HcrltEJKN72mxuD7fGuXWeh1U0vwhjMvhZcFc02Eiy
 htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
 htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
 htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
-htmlgraph-0.23.1.data/data/htmlgraph/dashboard.html,sha256=rkZYjSnPbUuAm35QMpCNWemenYqQTdkkumCX2hhe8Dc,173537
-htmlgraph-0.23.1.data/data/htmlgraph/styles.css,sha256=oDUSC8jG-V-hKojOBO9J88hxAeY2wJrBYTq0uCwX_Y4,7135
-htmlgraph-0.23.1.data/data/htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
-htmlgraph-0.23.1.data/data/htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
-htmlgraph-0.23.1.data/data/htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
-htmlgraph-0.23.1.dist-info/METADATA,sha256=ZYzuVrkX-RqywaYq_QkiI3ILuYFEq5nUo_WnhgK2ZB4,7753
-htmlgraph-0.23.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-htmlgraph-0.23.1.dist-info/entry_points.txt,sha256=EaUbjA_bbDwEO_XDLEGMeK8aQP-ZnHiUTkLshyKDyB8,98
-htmlgraph-0.23.1.dist-info/RECORD,,
+htmlgraph-0.23.2.data/data/htmlgraph/dashboard.html,sha256=rkZYjSnPbUuAm35QMpCNWemenYqQTdkkumCX2hhe8Dc,173537
+htmlgraph-0.23.2.data/data/htmlgraph/styles.css,sha256=oDUSC8jG-V-hKojOBO9J88hxAeY2wJrBYTq0uCwX_Y4,7135
+htmlgraph-0.23.2.data/data/htmlgraph/templates/AGENTS.md.template,sha256=f96h7V6ygwj-v-fanVI48eYMxR6t_se4bet1H4ZsDpI,7642
+htmlgraph-0.23.2.data/data/htmlgraph/templates/CLAUDE.md.template,sha256=h1kG2hTX2XYig2KszsHBfzrwa_4Cfcq2Pj4SwqzeDlM,1984
+htmlgraph-0.23.2.data/data/htmlgraph/templates/GEMINI.md.template,sha256=gAGzE53Avki87BM_otqy5HdcYCoLsHgqaKjVzNzPMX8,1622
+htmlgraph-0.23.2.dist-info/METADATA,sha256=sXhGvvPyc0ZtSB0FvkXu4A_gaKqs9x0uu0pS8Yb2kh8,7753
+htmlgraph-0.23.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+htmlgraph-0.23.2.dist-info/entry_points.txt,sha256=EaUbjA_bbDwEO_XDLEGMeK8aQP-ZnHiUTkLshyKDyB8,98
+htmlgraph-0.23.2.dist-info/RECORD,,