@trac3er/oh-my-god 2.1.8 → 2.2.2

package/build/lib/runtime/tool_plan_gate.py

@@ -9,8 +9,14 @@ from uuid import uuid4
 import json
 
 from runtime.context_engine import ContextEngine
-from runtime.release_run_coordinator import resolve_current_run_id as resolve_coordinator_run_id
+from runtime.compliance_governor import classify_bash_command_mode, evaluate_tool_compliance
+from runtime.complexity_scorer import score_complexity
+from runtime.release_run_coordinator import (
+    get_active_coordinator_run_id,
+    resolve_current_run_id as resolve_coordinator_run_id,
+)
 from runtime.runtime_contracts import read_run_state
+from runtime.test_intent_lock import verify_done_when, verify_lock
 
 
 _TOOL_KEYWORDS: dict[str, tuple[str, ...]] = {
@@ -19,21 +25,8 @@ _TOOL_KEYWORDS: dict[str, tuple[str, ...]] = {
     "omg_security_check": ("security", "scan", "vulnerability", "audit", "auth", "token", "secret"),
     "omg-control": ("policy", "governance", "release", "proof", "control plane"),
 }
-
-_READ_ONLY_TOOL_HINTS = (
-    "read",
-    "search",
-    "review",
-    "grep",
-    "glob",
-    "list",
-    "ls",
-    "context7",
-    "websearch",
-)
 _MUTATION_TOOLS = frozenset({"write", "edit", "multiedit", "bash"})
 
-
 def build_tool_plan(
     goal: str,
     available_tools: list[str],
@@ -50,14 +43,13 @@ def build_tool_plan(
     )
     council = _read_council_verdicts(str(_project_dir()), canonical_run_id)
 
-    project_dir = _project_dir()
     selected_tools: list[dict[str, object]] = []
     for tool_name in normalized_tools:
         if _is_tool_needed(tool_name, normalized_goal):
             selected_tools.append(
                 {
                     "name": tool_name,
-                    "args": _default_args(tool_name, normalized_goal, bounded_context, project_dir=project_dir),
+                    "args": _default_args(tool_name, normalized_goal, bounded_context),
                     "rationale": _rationale(tool_name),
                 }
             )
@@ -67,13 +59,20 @@ def build_tool_plan(
         selected_tools.append(
             {
                 "name": fallback,
-                "args": _default_args(fallback, normalized_goal, bounded_context, project_dir=project_dir),
+                "args": _default_args(fallback, normalized_goal, bounded_context),
                 "rationale": "fallback: no explicit keyword match; keep single minimal tool",
             }
         )
 
     selected_tools = _apply_context_optimization(selected_tools, bounded_context, council)
     plan_id = _new_plan_id(run_id=canonical_run_id)
+    _governance: dict[str, object] = {}
+    try:
+        governance_raw = score_complexity(normalized_goal).get("governance")
+        if isinstance(governance_raw, Mapping):
+            _governance = {str(key): value for key, value in governance_raw.items()}
+    except Exception:
+        pass
     payload: dict[str, object] = {
         "plan_id": plan_id,
         "goal": normalized_goal,
@@ -84,11 +83,12 @@ def build_tool_plan(
             "goal_complexity": _goal_complexity(normalized_goal),
         },
         "context_packet": bounded_context,
+        "governance_payload": _governance,
         "council_verdicts": council.get("verdicts", {}),
         "run_id": canonical_run_id,
         "created_at": datetime.now(timezone.utc).isoformat(),
     }
-    _persist_plan(project_dir, plan_id, payload)
+    _persist_plan(_project_dir(), plan_id, payload)
     return payload
 
 
@@ -107,53 +107,83 @@ def has_tool_plan_for_run(project_dir: str, run_id: str | None) -> bool:
     return any(plans_dir.glob(f"{run_prefix}-plan-*.json"))
 
 
-def tool_plan_gate_check(project_dir: str, run_id: str | None, tool: str) -> dict[str, object]:
-    if not run_id:
+def tool_plan_gate_check(
+    project_dir: str,
+    run_id: str | None,
+    tool: str,
+    tool_input: dict[str, object] | None = None,
+) -> dict[str, object]:
+    effective_run_id = get_active_coordinator_run_id(project_dir=project_dir) or run_id
+    if not effective_run_id:
         return {"status": "allowed", "reason": "run_id unavailable; skip tool plan gate"}
 
+    tool_input_obj = tool_input if isinstance(tool_input, dict) else {}
+    has_plan = has_tool_plan_for_run(project_dir, effective_run_id)
+
     context_packet = _resolve_bounded_context_packet(
         project_dir=project_dir,
-        run_id=run_id,
+        run_id=effective_run_id,
         fallback_context=None,
     )
     clarification = _clarification_status(context_packet)
-    if clarification["requires_clarification"]:
-        reason = _clarification_reason(str(clarification["clarification_prompt"]))
-        if _is_mutation_capable_tool(tool):
-            _persist_gate_error(project_dir, run_id, tool, reason)
+    decision = evaluate_tool_compliance(
+        project_dir=project_dir,
+        run_id=effective_run_id,
+        tool=tool,
+        has_tool_plan=has_plan,
+        clarification_status=clarification,
+        tool_input=tool_input,
+    )
+    reason = str(decision.get("reason", ""))
+    if decision.get("status") == "blocked":
+        _persist_gate_error(project_dir, effective_run_id, tool, reason)
+        return {
+            **decision,
+            "run_id": effective_run_id,
+            "tool": tool,
+        }
+
+    if _is_mutation_capable_tool(tool, tool_input_obj) and not _is_docs_exemption(tool_input_obj):
+        lock_id = _extract_lock_id(tool_input_obj)
+        lock_verdict = verify_lock(project_dir, run_id=effective_run_id, lock_id=lock_id)
+        if lock_verdict.get("status") != "ok":
             return {
                 "status": "blocked",
-                "reason": reason,
-                "run_id": run_id,
+                "authority": "test_intent_lock",
+                "reason": "test_intent_lock_required_before_mutation",
+                "run_id": effective_run_id,
                 "tool": tool,
-                "clarification_status": clarification,
-            }
-        if _is_read_search_review_tool(tool):
-            return {
-                "status": "allowed",
-                "reason": "clarification pending; read/search/review tool allowed",
-                "run_id": run_id,
-                "clarification_status": clarification,
             }
 
-    if has_tool_plan_for_run(project_dir, run_id):
-        council = _read_council_verdicts(project_dir, run_id)
-        verdict = _council_gate_verdict(council)
-        if verdict["blocked"]:
-            reason = str(verdict["reason"])
-            _persist_gate_error(project_dir, run_id, tool, reason)
+        metadata = _extract_metadata(tool_input_obj)
+        done_when_verdict = verify_done_when(metadata, run_id=effective_run_id)
+        if done_when_verdict.get("status") != "ok":
             return {
                 "status": "blocked",
-                "reason": reason,
-                "run_id": run_id,
+                "authority": "done_when",
+                "reason": "done_when_required_before_mutation",
+                "run_id": effective_run_id,
                 "tool": tool,
-                "council_verdicts": council.get("verdicts", {}),
             }
-        return {"status": "allowed", "reason": "tool plan present", "run_id": run_id}
 
-    reason = "tool plan required before mutation-capable MCP evaluation"
-    _persist_gate_error(project_dir, run_id, tool, reason)
-    return {"status": "blocked", "reason": reason, "run_id": run_id, "tool": tool}
+    return {
+        **decision,
+        "run_id": effective_run_id,
+        "tool": tool,
+    }
+
+
+def governed_tool_plan_gate_check(
+    project_dir: str,
+    run_id: str | None,
+    lane_name: str,
+    tool: str,
+) -> dict[str, object]:
+    decision = tool_plan_gate_check(project_dir=project_dir, run_id=run_id, tool=tool)
+    return {
+        **decision,
+        "lane_name": str(lane_name).strip().lower(),
+    }
 
 
 def _normalize_tools(available_tools: list[str]) -> list[str]:
@@ -175,15 +205,7 @@ def _is_tool_needed(tool_name: str, goal: str) -> bool:
     return any(token in lowered_goal for token in keywords)
 
 
-def _default_args(
-    tool_name: str,
-    goal: str,
-    context_packet: dict[str, object] | None,
-    *,
-    project_dir: Path,
-) -> dict[str, object]:
-    token = tool_name.strip().lower()
-
+def _default_args(tool_name: str, goal: str, context_packet: dict[str, object] | None) -> dict[str, object]:
     if tool_name == "context7":
         return {"query": goal}
     if tool_name == "websearch":
@@ -193,23 +215,6 @@ def _default_args(
     if tool_name == "omg-control":
         return {"query": goal}
 
-    if token in {"todowrite", "proxy_todowrite"}:
-        content = goal.strip()[:120] or "Track current task"
-        return {
-            "todos": [
-                {
-                    "content": content,
-                    "status": "in_progress",
-                    "priority": "medium",
-                }
-            ]
-        }
-    if token in {"read", "proxy_read"}:
-        default_target = project_dir / "README.md"
-        if not default_target.exists():
-            default_target = project_dir
-        return {"filePath": str(default_target)}
-
     context_hint = ""
     if isinstance(context_packet, dict):
         context_hint = str(context_packet.get("summary", ""))[:120]
@@ -230,12 +235,10 @@ def _estimate_context_chars(context_packet: dict[str, object] | None) -> int:
 
 
 def _goal_complexity(goal: str) -> str:
-    length = len(goal.split())
-    if length >= 25:
-        return "high"
-    if length >= 10:
-        return "medium"
-    return "low"
+    category = str(score_complexity(goal).get("category", "low"))
+    if category == "trivial":
+        return "low"
+    return category
 
 
 def _new_plan_id(run_id: str | None) -> str:
@@ -246,8 +249,8 @@ def _new_plan_id(run_id: str | None) -> str:
 
 def _project_dir(project_dir: str | None = None) -> Path:
     if project_dir:
-        return Path(project_dir).resolve()
-    return Path(os.environ.get("CLAUDE_PROJECT_DIR", os.getcwd())).resolve()
+        return Path(project_dir)
+    return Path(os.environ.get("CLAUDE_PROJECT_DIR", os.getcwd()))
 
 
 def _persist_plan(project_dir: Path, plan_id: str, payload: dict[str, object]) -> None:
@@ -336,23 +339,6 @@ def _read_council_verdicts(project_dir: str, run_id: str | None) -> dict[str, ob
     return {}
 
 
-def _council_gate_verdict(council: dict[str, object]) -> dict[str, object]:
-    verdicts = council.get("verdicts")
-    if not isinstance(verdicts, dict):
-        return {"blocked": False, "reason": ""}
-
-    for critic_name, critic_payload in verdicts.items():
-        if not isinstance(critic_payload, dict):
-            continue
-        token = str(critic_payload.get("verdict", "")).strip().lower()
-        if token == "fail":
-            return {
-                "blocked": True,
-                "reason": f"council critic '{critic_name}' failed; block mutation-capable tool execution",
-            }
-    return {"blocked": False, "reason": ""}
-
-
 def _apply_context_optimization(
     tools: list[dict[str, object]],
     context_packet: dict[str, object],
@@ -407,22 +393,36 @@ def _clarification_status(context_packet: dict[str, object]) -> dict[str, object
     }
 
 
-def _clarification_reason(clarification_prompt: str) -> str:
-    prompt = " ".join(str(clarification_prompt or "").split())
-    if prompt:
-        return f"Clarification required before mutation: {prompt}"
-    return "Clarification required before mutation: provide the missing intent details."
+def _is_mutation_capable_tool(tool: str, tool_input: dict[str, object]) -> bool:
+    token = str(tool or "").strip().lower()
+    if token == "bash":
+        return classify_bash_command_mode(str(tool_input.get("command", ""))) == "mutation"
+    return token in _MUTATION_TOOLS
 
 
-def _is_mutation_capable_tool(tool: str) -> bool:
-    token = str(tool or "").strip().lower()
-    if token in _MUTATION_TOOLS:
-        return True
-    return token.startswith("bash:")
+def _extract_metadata(tool_input: dict[str, object]) -> dict[str, object]:
+    metadata = tool_input.get("metadata")
+    if isinstance(metadata, dict):
+        return dict(metadata)
+    return {}
 
 
-def _is_read_search_review_tool(tool: str) -> bool:
-    token = str(tool or "").strip().lower()
-    if not token:
-        return False
-    return any(hint in token for hint in _READ_ONLY_TOOL_HINTS)
+def _extract_lock_id(tool_input: dict[str, object]) -> str | None:
+    lock_id = tool_input.get("lock_id")
+    if isinstance(lock_id, str) and lock_id.strip():
+        return lock_id.strip()
+    metadata = _extract_metadata(tool_input)
+    metadata_lock_id = metadata.get("lock_id")
+    if isinstance(metadata_lock_id, str) and metadata_lock_id.strip():
+        return metadata_lock_id.strip()
+    return None
+
+
+def _is_docs_exemption(tool_input: dict[str, object]) -> bool:
+    exemption = str(tool_input.get("exemption", "")).strip().lower()
+    if exemption == "docs":
+        return True
+    metadata = _extract_metadata(tool_input)
+    if metadata.get("exempt") is True and str(metadata.get("exemption", "")).strip().lower() == "docs":
+        return True
+    return False

package/build/lib/runtime/untrusted_content.py

@@ -133,7 +133,7 @@ def write_trust_evidence(inputs: list[dict[str, Any]], output_dir: str | Path) -
     normalized_inputs: list[dict[str, Any]] = []
     for item in inputs:
         data = dict(item)
-        trust_tier = str(data.get("_trust_tier", "research"))
+        trust_tier = str(data.get("trust_tier", data.get("_trust_tier", "research")))
         trust_label = str(data.get("_trust_label", "UNTRUSTED_EXTERNAL_CONTENT"))
         try:
             trust_score = float(data.get("_trust_score", 0.0))
@@ -164,6 +164,31 @@ def write_trust_evidence(inputs: list[dict[str, Any]], output_dir: str | Path) -
     return evidence_path.as_posix()
 
 
+def write_sandbox_budget_evidence(
+    *,
+    project_dir: str | Path,
+    run_id: str,
+    budget: dict[str, Any],
+    isolation: dict[str, Any],
+) -> str:
+    tagged = tag_content(
+        {
+            "source_type": "workspace",
+            "source_ref": f"forge:{run_id}",
+            "content": {
+                "run_id": run_id,
+                "budget": budget,
+                "isolation": isolation,
+            },
+        },
+        TrustTier.BALANCED,
+    )
+    return write_trust_evidence(
+        [tagged],
+        output_dir=Path(project_dir) / EVIDENCE_REL_DIR,
+    )
+
+
 def mark_untrusted_content(
     project_dir: str,
     *,
@@ -178,20 +203,24 @@ def mark_untrusted_content(
     resolved_tier = normalize_trust_tier(tier) if tier is not None else trust_tier_for_source(source_type)
     entry = tag_content(
         {
-        "source_type": source_type,
-        "source_ref": source_ref,
-        "quarantined_fragments": quarantined,
-        "sanitized_content": sanitized,
+            "source_type": source_type,
+            "source_ref": source_ref,
+            "quarantined_fragments": quarantined,
+            "sanitized_content": sanitized,
         },
         resolved_tier,
     )
+    entry["trust_tier"] = resolved_tier.value
     entry["trust_score"] = entry.get("_trust_score", 0.0)
-    provenance = list(state.get("provenance", []))
-    provenance.append(entry)
+
     evidence_path = write_trust_evidence(
         [entry],
         output_dir=Path(project_dir) / EVIDENCE_REL_DIR,
     )
+    entry["evidence_artifact"] = evidence_path
+
+    provenance = list(state.get("provenance", []))
+    provenance.append(entry)
 
     prior_scores = state.get("trust_scores", {})
     next_external_score = min(
@@ -207,6 +236,7 @@ def mark_untrusted_content(
         "last_trust_tier": resolved_tier.value,
         "last_trust_label": entry.get("_trust_label"),
         "last_trust_score": entry.get("_trust_score"),
+        "last_evidence_artifact": evidence_path,
         "sanitized_content": sanitized,
         "quarantined_fragments": quarantined,
         "provenance": provenance[-20:],

package/build/lib/runtime/validate.py

@@ -15,7 +15,7 @@ from runtime.adoption import CANONICAL_VERSION
 from runtime.compat import run_doctor, _doctor_check
 from runtime.contract_compiler import validate_contract_registry
 from runtime.plugin_diagnostics import run_plugin_diagnostics
-from runtime.profile_io import load_profile, ensure_governed_preferences
+from runtime.profile_io import load_profile, ensure_governed_preferences, assess_profile_risk
 
 
 def _check_contract_registry(root_dir: Path) -> dict[str, Any]:
@@ -81,9 +81,13 @@ def _check_profile_governor(root_dir: Path) -> dict[str, Any]:
         if isinstance(e, dict) and e.get("confirmation_state") == "pending_confirmation"
     )
 
+    risk = assess_profile_risk(profile)
+    risk_level = str(risk.get("risk_level", "low"))
+
     parts = [f"{len(style_entries)} style, {len(safety_entries)} safety"]
     if pending:
         parts.append(f"{pending} pending confirmation")
+    parts.append(f"risk={risk_level}")
 
     return _doctor_check(
         "profile_governor",

package/build/lib/runtime/vision_artifacts.py

@@ -0,0 +1,31 @@
+"""Artifact writers for vision runtime jobs."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+
+def write_vision_artifacts(
+    project_dir: str,
+    job: dict[str, Any],
+    deterministic_results: list[dict[str, Any]],
+) -> dict[str, Any]:
+    artifacts_dir = Path(project_dir) / ".omg" / "vision"
+    artifacts_dir.mkdir(parents=True, exist_ok=True)
+
+    artifact_path = artifacts_dir / f"{job['job_id']}.json"
+    payload = {
+        "schema": "VisionJobArtifact",
+        "job": job,
+        "results": deterministic_results,
+    }
+    artifact_path.write_text(json.dumps(payload, indent=2, sort_keys=True), encoding="utf-8")
+
+    return {
+        "artifact_path": str(artifact_path.relative_to(project_dir)),
+        "compare_count": sum(1 for item in deterministic_results if item.get("operation") == "compare"),
+        "ocr_count": sum(1 for item in deterministic_results if item.get("operation") == "ocr"),
+        "result_count": len(deterministic_results),
+    }

package/build/lib/runtime/vision_cache.py

@@ -0,0 +1,38 @@
+"""Content-addressed cache helpers for vision jobs."""
+
+from __future__ import annotations
+
+import hashlib
+import json
+from pathlib import Path
+from typing import Any
+
+
+def _cache_dir(project_dir: str) -> Path:
+    path = Path(project_dir) / ".omg" / "cache" / "vision"
+    path.mkdir(parents=True, exist_ok=True)
+    return path
+
+
+def build_cache_key(mode: str, inputs: list[str]) -> str:
+    digest = hashlib.sha256()
+    digest.update(mode.encode("utf-8"))
+    for input_path in sorted(inputs):
+        digest.update(input_path.encode("utf-8"))
+        with open(input_path, "rb") as handle:
+            for chunk in iter(lambda: handle.read(65536), b""):
+                digest.update(chunk)
+    return digest.hexdigest()
+
+
+def load_cached_result(project_dir: str, cache_key: str) -> dict[str, Any] | None:
+    cache_path = _cache_dir(project_dir) / f"{cache_key}.json"
+    if not cache_path.exists():
+        return None
+    return json.loads(cache_path.read_text(encoding="utf-8"))
+
+
+def store_cached_result(project_dir: str, cache_key: str, payload: dict[str, Any]) -> str:
+    cache_path = _cache_dir(project_dir) / f"{cache_key}.json"
+    cache_path.write_text(json.dumps(payload, indent=2, sort_keys=True), encoding="utf-8")
+    return str(cache_path)

package/build/lib/runtime/vision_jobs.py

@@ -0,0 +1,89 @@
+"""Runtime orchestration for vision jobs."""
+
+from __future__ import annotations
+
+import hashlib
+import itertools
+from pathlib import Path
+from typing import Any
+
+from omg_natives.image import image
+
+from runtime.vision_artifacts import write_vision_artifacts
+from runtime.vision_cache import build_cache_key, load_cached_result, store_cached_result
+
+
+VALID_VISION_MODES = frozenset({"ocr", "compare", "analyze", "batch", "eval"})
+IMPLEMENTED_VISION_MODES = frozenset({"ocr", "compare"})
+
+
+def _resolve_inputs(project_dir: str, inputs: list[str]) -> list[str]:
+    return [str((Path(project_dir) / item).resolve()) for item in inputs]
+
+
+def _job_id(mode: str, inputs: list[str]) -> str:
+    digest = hashlib.sha256()
+    digest.update(mode.encode("utf-8"))
+    for item in inputs:
+        digest.update(item.encode("utf-8"))
+    return f"vision-{digest.hexdigest()[:12]}"
+
+
+def normalize_vision_payload(project_dir: str, payload: dict[str, Any]) -> dict[str, Any]:
+    mode = str(payload.get("mode", "")).strip()
+    raw_inputs = payload.get("inputs")
+    if mode not in VALID_VISION_MODES:
+        raise ValueError(f"unsupported vision mode: {mode}")
+    if mode not in IMPLEMENTED_VISION_MODES:
+        raise ValueError(f"vision mode is not implemented yet: {mode}")
+    if not isinstance(raw_inputs, list) or not raw_inputs or not all(isinstance(item, str) and item.strip() for item in raw_inputs):
+        raise ValueError("inputs must be a non-empty list of file paths")
+    if mode == "compare" and len(raw_inputs) < 2:
+        raise ValueError("compare mode requires at least two input files")
+
+    resolved_inputs = _resolve_inputs(project_dir, raw_inputs)
+    for input_path in resolved_inputs:
+        if not Path(input_path).exists():
+            raise ValueError(f"missing vision input: {input_path}")
+
+    return {
+        "job_id": _job_id(mode, resolved_inputs),
+        "mode": mode,
+        "inputs": resolved_inputs,
+    }
+
+
+def expand_pairs(job: dict[str, Any]) -> list[tuple[str, str]]:
+    if job["mode"] != "compare":
+        return []
+    return list(itertools.combinations(job["inputs"], 2))
+
+
+def run_vision_job(project_dir: str, payload: dict[str, Any]) -> dict[str, Any]:
+    job = normalize_vision_payload(project_dir, payload)
+    cache_key = build_cache_key(job["mode"], job["inputs"])
+    cached = load_cached_result(project_dir, cache_key)
+    if cached is not None:
+        cached["cached"] = True
+        return cached
+
+    if job["mode"] == "compare":
+        deterministic_results = [
+            image(left_path, "compare", other_path=right_path)
+            for left_path, right_path in expand_pairs(job)
+        ]
+    elif job["mode"] == "ocr":
+        deterministic_results = [image(input_path, "ocr") for input_path in job["inputs"]]
+    else:
+        deterministic_results = []
+
+    artifacts = write_vision_artifacts(project_dir, job, deterministic_results)
+    result = {
+        "status": "ok",
+        "job": job,
+        "results": deterministic_results,
+        "artifacts": artifacts,
+        "cached": False,
+    }
+    store_cached_result(project_dir, cache_key, result)
+    return result