@trac3er/oh-my-god 2.1.9 → 2.2.2

package/registry/bundles/delta-classifier.yaml

@@ -1,6 +1,6 @@
 id: delta-classifier
 kind: routing
-version: 2.1.9
+version: 2.2.2
 title: OMG Delta Classifier
 description: Change classifier that attaches risk-aware checks, approvals, and packs.
 hosts:

package/registry/bundles/eval-gate.yaml

@@ -1,6 +1,6 @@
 id: eval-gate
 kind: evaluation
-version: 2.1.9
+version: 2.2.2
 title: OMG Eval Gate
 description: Reproducible evaluation gate that blocks regressions before release.
 hosts:

package/registry/bundles/hash-edit.yaml

@@ -0,0 +1,73 @@
+id: hash-edit
+kind: governance
+version: 2.2.2
+title: OMG Hash Edit Lane
+description: Governed hash-bound edit lane with signed approvals and evidence routing.
+hosts:
+  - claude
+  - codex
+assets:
+  references:
+    - runtime/tool_fabric.py
+    - registry/approval_artifact.py
+invocation_policy:
+  user_invocable: true
+  model_invocable: true
+  allow_implicit_invocation: false
+tool_policy:
+  side_effect_level: medium
+  allowed_tools:
+    claude:
+      - Edit
+    codex:
+      - Edit
+lifecycle_hooks:
+  native:
+    - PreToolUse
+    - PostToolUse
+  emulated:
+    - TaskCompleted
+mcp_contract:
+  servers:
+    - omg-control
+lsp_contract:
+  languages:
+    - python
+    - typescript
+evidence_outputs:
+  artifacts:
+    - .omg/evidence/hash-edit-{run_id}.json
+execution_contract:
+  modes:
+    - embedded
+    - local_supervisor
+tool_fabric:
+  lane: hash-edit
+  enforcement_order:
+    - tool_selection
+    - approval_state
+    - evidence_requirements
+    - attestation_proof_validation
+    - execution
+  tools:
+    - Edit
+  semantic_operations:
+    - name: single_file_hash_edit
+      tool: Edit
+      mutation_capable: true
+      requires_explicit_promotion: false
+  requires_signed_approval: true
+  requires_signed_approval_for_mutation: true
+  requires_attestation: false
+  requires_attestation_for_mutation: true
+  single_file_hash_bound: true
+  require_run_scoped_evidence: true
+  require_fresh_evidence: true
+  evidence_max_age_seconds: 3600
+  required_evidence:
+    - .omg/evidence/hash-edit-{run_id}.json
+channel_overrides:
+  public:
+    posture: advisory
+  enterprise:
+    posture: managed

package/registry/bundles/health.yaml

@@ -1,6 +1,6 @@
 id: health
 kind: domain-pack
-version: 2.1.9
+version: 2.2.2
 title: OMG Health Pack
 description: Health-sensitive approvals, provenance, and replay attachments.
 hosts:

package/registry/bundles/hook-governor.yaml

@@ -1,6 +1,6 @@
 id: hook-governor
 kind: governance
-version: 2.1.9
+version: 2.2.2
 title: OMG Hook Governor
 description: Canonical hook ordering, policy reinjection, and protected-path governance.
 hosts:
@@ -39,37 +39,37 @@ lifecycle_hooks:
     - TaskCompleted
 compiled_hooks:
   SessionStart:
-    - command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/session-start.py\""
+    - command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/session-start.py"'
       timeout: 10
   SessionEnd:
-    - command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/session-end-capture.py\""
+    - command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/session-end-capture.py"'
   PreToolUse:
     - matcher: Bash
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/firewall.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/firewall.py"'
       timeout: 10
     - matcher: Read|Write|Edit|MultiEdit
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/secret-guard.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/secret-guard.py"'
       timeout: 10
     - matcher: ""
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/pre-tool-inject.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/pre-tool-inject.py"'
   PostToolUse:
     - matcher: Bash
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/circuit-breaker.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/circuit-breaker.py"'
       timeout: 10
     - matcher: Write|Edit|MultiEdit
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/tool-ledger.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/tool-ledger.py"'
       timeout: 10
     - matcher: Write|Edit|MultiEdit
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/test_generator_hook.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/test_generator_hook.py"'
       timeout: 10
     - matcher: ""
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/budget_governor.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/budget_governor.py"'
       timeout: 10
   PostToolUseFailure:
-    - command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/post-tool-failure.py\""
+    - command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/post-tool-failure.py"'
   Stop:
     - matcher: ""
-      command: "\"$HOME/.claude/omg-runtime/.venv/bin/python\" \"$HOME/.claude/hooks/stop_dispatcher.py\""
+      command: '"$HOME/.claude/omg-runtime/.venv/bin/python" "$HOME/.claude/hooks/stop_dispatcher.py"'
       timeout: 90
 feature_dependencies:
   defense-state:

package/registry/bundles/incident-replay.yaml

@@ -1,6 +1,6 @@
 id: incident-replay
 kind: debugging
-version: 2.1.9
+version: 2.2.2
 title: OMG Incident Replay
 description: Replayable bug packs built from logs, failing tests, traces, and diffs.
 hosts:

package/registry/bundles/lsp-pack.yaml

@@ -1,6 +1,6 @@
 id: lsp-pack
 kind: diagnostics
-version: 2.1.9
+version: 2.2.2
 title: OMG LSP Pack
 description: Optional LSP-backed diagnostics and navigation bundle for production verification.
 hosts:
@@ -19,8 +19,10 @@ tool_policy:
   allowed_tools:
     claude:
       - Read
+      - Edit
     codex:
       - Read
+      - Edit
 lifecycle_hooks:
   native:
     - PostToolUse
@@ -36,11 +38,41 @@ lsp_contract:
     - typescript
 evidence_outputs:
   artifacts:
-    - .omg/evidence/lsp-diagnostics.json
+    - .omg/evidence/lsp-pack-{run_id}.json
 execution_contract:
   modes:
     - embedded
     - local_supervisor
+tool_fabric:
+  lane: lsp-pack
+  enforcement_order:
+    - tool_selection
+    - approval_state
+    - evidence_requirements
+    - attestation_proof_validation
+    - execution
+  tools:
+    - Read
+    - Edit
+  semantic_operations:
+    - name: lsp_read_diagnostics
+      tool: Read
+      mutation_capable: false
+      requires_explicit_promotion: false
+    - name: lsp_promoted_edit
+      tool: Edit
+      mutation_capable: true
+      requires_explicit_promotion: true
+  requires_signed_approval: false
+  requires_signed_approval_for_mutation: true
+  requires_attestation: false
+  requires_attestation_for_mutation: true
+  read_only_by_default: true
+  require_run_scoped_evidence: true
+  require_fresh_evidence: true
+  evidence_max_age_seconds: 3600
+  required_evidence:
+    - .omg/evidence/lsp-pack-{run_id}.json
 channel_overrides:
   public:
     diagnostics: advisory

package/registry/bundles/mcp-fabric.yaml

@@ -1,6 +1,6 @@
 id: mcp-fabric
 kind: mcp
-version: 2.1.9
+version: 2.2.2
 title: OMG MCP Fabric
 description: Tools, prompts, resources, and server instructions for the OMG control plane.
 hosts:

package/registry/bundles/plan-council.yaml

@@ -1,6 +1,6 @@
 id: plan-council
 kind: planning
-version: 2.1.9
+version: 2.2.2
 title: OMG Plan Council
 description: Canonical council-style planning bundle for explicit, evidence-backed deep plans.
 hosts:

package/registry/bundles/preflight.yaml

@@ -1,6 +1,6 @@
 id: preflight
 kind: routing
-version: 2.1.9
+version: 2.2.2
 title: OMG Preflight
 description: Repo-aware route selection based on diff, manifests, and classified risk.
 hosts:

package/registry/bundles/proof-gate.yaml

@@ -1,6 +1,6 @@
 id: proof-gate
 kind: proof
-version: 2.1.9
+version: 2.2.2
 title: OMG Proof Gate
 description: Structured release proof gate that binds claims to required evidence artifacts and trace links.
 hosts:

package/registry/bundles/remote-supervisor.yaml

@@ -1,6 +1,6 @@
 id: remote-supervisor
 kind: orchestration
-version: 2.1.9
+version: 2.2.2
 title: OMG Remote Supervisor
 description: Local-only authenticated supervisor sessions for worker orchestration.
 hosts:

package/registry/bundles/robotics.yaml

@@ -1,6 +1,6 @@
 id: robotics
 kind: domain-pack
-version: 2.1.9
+version: 2.2.2
 title: OMG Robotics Pack
 description: Robotics safety policy, replay, and evaluation attachments.
 hosts:

package/registry/bundles/secure-worktree-pipeline.yaml

@@ -1,6 +1,6 @@
 id: secure-worktree-pipeline
 kind: runtime
-version: 2.1.9
+version: 2.2.2
 title: OMG Secure Worktree Pipeline
 description: Ephemeral worktree execution and supervisor-safe worker dispatch for production jobs.
 hosts:
@@ -8,7 +8,9 @@ hosts:
   - codex
 assets:
   references:
+    - runtime/exec_kernel.py
     - runtime/subagent_dispatcher.py
+    - runtime/merge_writer.py
     - hooks/branch_manager.py
 invocation_policy:
   user_invocable: false
@@ -39,10 +41,23 @@ mcp_contract:
 lsp_contract:
   languages:
     - python
+merge_writer_policy:
+  lock_path: .omg/state/merge-writer.lock
+  provenance_pattern: .omg/evidence/merge-writer-{run_id}.json
+  readers: concurrent
+  writers: exclusive
+  mutation_requires:
+    - worktree_isolation
+    - merge_writer_lock
 evidence_outputs:
   artifacts:
     - .omg/evidence/subagents/*.json
+    - .omg/evidence/merge-writer-*.json
+    - .omg/state/exec-kernel/*.json
+    - .omg/state/merge-writer.lock
 execution_contract:
+  flags:
+    - OMG_EXEC_KERNEL_ENABLED=false
   modes:
     - automation
     - ephemeral_worktree

package/registry/bundles/security-check.yaml

@@ -1,6 +1,6 @@
 id: security-check
 kind: security
-version: 2.1.9
+version: 2.2.2
 title: OMG Security Check
 description: Canonical security audit bundle with provenance, trust scoring, and deterministic evidence.
 hosts:

package/registry/bundles/terminal-lane.yaml

@@ -0,0 +1,61 @@
+id: terminal-lane
+kind: governance
+version: 2.2.2
+title: OMG Terminal Lane
+description: Highest-risk governed terminal execution lane with strict approval and attestation.
+hosts:
+  - claude
+  - codex
+assets:
+  references:
+    - runtime/tool_fabric.py
+    - runtime/compliance_governor.py
+invocation_policy:
+  user_invocable: true
+  model_invocable: true
+  allow_implicit_invocation: false
+tool_policy:
+  side_effect_level: high
+  allowed_tools:
+    claude:
+      - Bash
+    codex:
+      - Bash
+lifecycle_hooks:
+  native:
+    - PreToolUse
+    - PostToolUse
+  emulated:
+    - TaskCompleted
+mcp_contract:
+  servers:
+    - omg-control
+lsp_contract:
+  languages:
+    - bash
+evidence_outputs:
+  artifacts:
+    - .omg/evidence/terminal-lane-{run_id}.json
+execution_contract:
+  modes:
+    - embedded
+    - local_supervisor
+tool_fabric:
+  lane: terminal-lane
+  enforcement_order:
+    - tool_selection
+    - approval_state
+    - evidence_requirements
+    - attestation_proof_validation
+    - execution
+  tools:
+    - Bash
+  requires_signed_approval: true
+  requires_attestation: true
+  required_evidence:
+    - .omg/evidence/terminal-lane-{run_id}.json
+channel_overrides:
+  public:
+    posture: restricted
+  enterprise:
+    posture: managed

package/registry/bundles/test-intent-lock.yaml

@@ -1,6 +1,6 @@
 id: test-intent-lock
 kind: proof
-version: 2.1.9
+version: 2.2.2
 title: OMG Test Intent Lock
 description: Structured test-delta guard that blocks weakened tests unless explicit override evidence is present.
 hosts:

package/registry/bundles/tracebank.yaml

@@ -1,6 +1,6 @@
 id: tracebank
 kind: evidence
-version: 2.1.9
+version: 2.2.2
 title: OMG Tracebank
 description: Structured plan-to-patch-to-verify trace capture for OMG routes.
 hosts:

package/registry/bundles/vision.yaml

@@ -1,6 +1,6 @@
 id: vision
 kind: domain-pack
-version: 2.1.9
+version: 2.2.2
 title: OMG Vision Pack
 description: Vision-specific OCR, comparison, lineage, drift, and replay attachments.
 hosts:

package/registry/omg-capability.schema.json

@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://github.com/trac3er00/OMG/registry/omg-capability.schema.json",
   "title": "OMG Capability Bundle",
-  "version": "2.1.9",
+  "version": "2.2.2",
   "type": "object",
   "required": [
     "id",

package/registry/verify_artifact.py

@@ -4,9 +4,7 @@ from __future__ import annotations
 import base64
 from datetime import datetime, timezone
 import hashlib
-import hmac
 import json
-import os
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
@@ -53,10 +51,6 @@ def _key_id_from_public_key(public_key_raw: bytes) -> str:
     return hashlib.sha256(public_key_raw).hexdigest()[:16]
 
 
-def _legacy_key_id(signer_key: str) -> str:
-    return hashlib.sha256(signer_key.encode("utf-8")).hexdigest()[:16]
-
-
 def _subject_is_valid(subject: Any) -> bool:
     if not isinstance(subject, list) or not subject:
         return False
@@ -160,25 +154,6 @@ def _parse_minisign_detached(value: str, trusted_comment_hint: str | None) -> tu
     return signature, trusted_comment_hint, None
 
 
-def _resolve_legacy_hmac_secret(key_id: str, signer_pubkey: str | None) -> str | None:
-    if signer_pubkey:
-        expected = _legacy_key_id(signer_pubkey)
-        if expected == key_id:
-            return signer_pubkey
-    raw_map = os.getenv("OMG_LEGACY_HMAC_KEYS", "")
-    if raw_map:
-        try:
-            mapping = json.loads(raw_map)
-        except json.JSONDecodeError:
-            mapping = {}
-        if isinstance(mapping, dict):
-            secret = mapping.get(key_id)
-            if isinstance(secret, str) and secret:
-                return secret
-    specific = os.getenv(f"OMG_LEGACY_HMAC_KEY_{key_id.upper()}", "")
-    return specific or None
-
-
 def sign_artifact(
     artifact_path: str,
     subject_digest: str,
@@ -356,35 +331,8 @@ def _verify_ed25519_statement(statement: dict[str, Any]) -> tuple[bool, str]:
     return True, "verified"
 
 
-def _verify_hmac_bridge_statement(statement: dict[str, Any], signer_pubkey: str | None = None) -> tuple[bool, str]:
-    key_id = _statement_key_id(statement)
-    if not key_id:
-        return False, "missing signer key id"
-
-    secret = _resolve_legacy_hmac_secret(key_id=key_id, signer_pubkey=signer_pubkey)
-    if not secret:
-        return False, "missing legacy hmac bridge key"
-
-    signature = statement.get("signature")
-    if not isinstance(signature, dict):
-        return False, "missing signature object"
-    if str(signature.get("alg", "")) != "hmac-sha256":
-        return False, "signature algorithm mismatch"
-    try:
-        actual_sig = base64.b64decode(str(signature.get("value", "")), validate=True)
-    except Exception:
-        return False, "invalid signature encoding"
-    expected_sig = hmac.new(
-        secret.encode("utf-8"),
-        _canonical_json(_statement_signing_payload(statement)),
-        hashlib.sha256,
-    ).digest()
-    if not hmac.compare_digest(actual_sig, expected_sig):
-        return False, "invalid legacy hmac signature"
-    return True, "verified"
-
-
 def verify_artifact_statement(statement: dict[str, Any], signer_pubkey: str | None = None) -> bool:
+    _ = signer_pubkey
     if not isinstance(statement, dict):
         return False
     if str(statement.get("_type", "")) != _IN_TOTO_STATEMENT_TYPE:
@@ -398,9 +346,6 @@ def verify_artifact_statement(statement: dict[str, Any], signer_pubkey: str | No
     if algorithm == "ed25519-minisign":
         ok, _reason = _verify_ed25519_statement(statement)
         return ok
-    if algorithm == "hmac-sha256":
-        ok, _reason = _verify_hmac_bridge_statement(statement, signer_pubkey=signer_pubkey)
-        return ok
     return False
 
 
@@ -422,9 +367,6 @@ def _verify_statement_with_bridge(statement: dict[str, Any]) -> tuple[str, str]:
     if algorithm == "ed25519-minisign":
         ok, reason = _verify_ed25519_statement(statement)
         return ("allow", "artifact verified") if ok else ("block", reason)
-    if algorithm == "hmac-sha256":
-        ok, reason = _verify_hmac_bridge_statement(statement)
-        return ("allow", "artifact verified") if ok else ("block", reason)
     return "block", f"unsupported signing algorithm: {algorithm or 'missing'}"
 
 
@@ -519,3 +461,33 @@ def verify_artifact(artifact: dict[str, Any], mode: str = "warn_and_run") -> dic
         "controls": [],
         "trusted": True,
     }
+
+
+def verify_tool_attestation(
+    *,
+    lane_name: str,
+    tool_name: str,
+    artifact: dict[str, Any] | None,
+    mode: str = "warn_and_run",
+) -> dict[str, Any]:
+    if not isinstance(artifact, dict):
+        return {
+            "status": "blocked",
+            "reason": f"missing attestation artifact for lane={lane_name} tool={tool_name}",
+            "action": "deny",
+        }
+    decision = verify_artifact(artifact, mode=mode)
+    action = str(decision.get("action", "")).strip().lower()
+    if action == "allow":
+        return {
+            "status": "allowed",
+            "reason": str(decision.get("reason", "artifact verified")),
+            "action": action,
+            "artifact": decision,
+        }
+    return {
+        "status": "blocked",
+        "reason": str(decision.get("reason", "attestation verification failed")),
+        "action": action or "deny",
+        "artifact": decision,
+    }

package/runtime/adoption.py

@@ -5,6 +5,7 @@ import json
 import importlib
 import shutil
 from pathlib import Path
+from typing import Callable, cast
 
 
 CANONICAL_BRAND = "OMG"
@@ -12,7 +13,7 @@ CANONICAL_REPO_URL = "https://github.com/trac3er00/OMG"
 CANONICAL_PACKAGE_NAME = "@trac3er/oh-my-god"
 CANONICAL_PLUGIN_ID = "omg"
 CANONICAL_MARKETPLACE_ID = "omg"
-CANONICAL_VERSION = "2.1.9"
+CANONICAL_VERSION = "2.2.2"
 
 VALID_ADOPTION_MODES = ("omg-only", "coexist")
 CANONICAL_MODE_NAMES = ("chill", "focused", "exploratory")
@@ -119,7 +120,7 @@ def get_preset_features(preset: str | None) -> dict[str, bool]:
 
 def get_mode_profile(mode: str) -> dict[str, object]:
     runtime_profile = importlib.import_module("runtime.runtime_profile")
-    loader = getattr(runtime_profile, "load_canonical_mode_profile")
+    loader = cast(Callable[[str], dict[str, object]], getattr(runtime_profile, "load_canonical_mode_profile"))
     return loader(mode)
 
 

package/runtime/background_verification.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import json
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any
+from typing import Any, Callable
 
 BACKGROUND_VERIFICATION_REL_PATH = Path(".omg") / "state" / "background-verification.json"
 
@@ -35,14 +35,25 @@ def publish_verification_state(
     return str(path)
 
 
-def read_verification_state(project_dir: str) -> dict[str, Any] | None:
+def read_verification_state(project_dir: str, run_id: str | None = None) -> dict[str, Any] | None:
     path = Path(project_dir) / BACKGROUND_VERIFICATION_REL_PATH
     if not path.exists():
         return None
     try:
         payload = json.loads(path.read_text(encoding="utf-8"))
-        if isinstance(payload, dict) and payload.get("schema") == "BackgroundVerificationState":
-            return payload
+        if not isinstance(payload, dict):
+            return None
+        if payload.get("schema") != "BackgroundVerificationState":
+            return None
+        if int(payload.get("schema_version", 0)) != 2:
+            return None
+        status = str(payload.get("status", "")).strip()
+        if status not in _VALID_STATUSES:
+            return None
+        expected_run_id = str(run_id or "").strip()
+        if expected_run_id and str(payload.get("run_id", "")).strip() != expected_run_id:
+            return None
+        return payload
     except (json.JSONDecodeError, OSError):
         pass
     return None
@@ -89,7 +100,7 @@ def skipped_stages_for_profile(evidence_profile: str | None) -> list[str]:
 
 
 def run_validation_with_timeout(
-    fn: object,
+    fn: Callable[[], str],
     timeout_seconds: float = 60.0,
 ) -> dict[str, Any]:
     """Execute a validation callable with a timeout gate.
@@ -101,10 +112,25 @@ def run_validation_with_timeout(
     import concurrent.futures
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
-        future = pool.submit(fn)  # type: ignore[arg-type]
+        future = pool.submit(fn)
         try:
             result = future.result(timeout=timeout_seconds)
             return {"status": result, "timed_out": False}
         except concurrent.futures.TimeoutError:
             future.cancel()
             return {"status": "timeout", "timed_out": True}
+
+
+def check_worker_stalls(project_dir: str) -> dict[str, Any]:
+    """Check for stalled workers via WorkerWatchdog; returns stall summary with run_ids."""
+    try:
+        from runtime.worker_watchdog import get_worker_watchdog
+        watchdog = get_worker_watchdog(project_dir)
+        stalled = watchdog.get_stalled_workers()
+        return {
+            "stalled_count": len(stalled),
+            "stalled_run_ids": [str(w.get("run_id", "")) for w in stalled],
+            "checked_at": datetime.now(timezone.utc).isoformat(),
+        }
+    except Exception:
+        return {"stalled_count": 0, "stalled_run_ids": [], "checked_at": datetime.now(timezone.utc).isoformat()}