@trac3er/oh-my-god 2.1.9 → 2.2.2

package/artifacts/release/settings.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/claude-code-settings.json",
-  "_comment": "OMG 2.1.9 - project-level config with hook registrations, presets, and feature flags.",
+  "_comment": "OMG 2.2.2 - project-level config with hook registrations, presets, and feature flags.",
   "permissions": {
     "allow": [
       "Agent",
@@ -171,7 +171,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ]
@@ -182,7 +182,7 @@
         "hooks": [
           {
             "type": "command",
-            "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\""
           }
         ]
       }
@@ -192,7 +192,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -202,7 +202,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -212,7 +212,7 @@
         "hooks": [
           {
             "type": "command",
-            "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\""
           }
         ],
         "matcher": ""
@@ -223,7 +223,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -233,7 +233,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -243,7 +243,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -253,7 +253,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -265,7 +265,7 @@
         "hooks": [
           {
             "type": "command",
-            "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\""
           }
         ]
       }
@@ -275,7 +275,7 @@
         "hooks": [
           {
             "type": "command",
-            "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
           }
         ],
@@ -306,7 +306,7 @@
     ]
   },
   "_omg": {
-    "_version": "2.1.9",
+    "_version": "2.2.2",
     "preset": "safe",
     "omgMode": "focused",
     "default_mode": "ulw+ralph",
@@ -366,7 +366,7 @@
       "NOTEBOOKLM": false
     },
     "generated": {
-      "contract_version": "2.1.9",
+      "contract_version": "2.2.2",
       "channel": "enterprise",
       "required_bundles": [
         "control-plane",
@@ -482,6 +482,21 @@
             "requires_approval": true
           }
         ],
+        "tool_fabric_contract": {
+          "enforcement_order": [
+            "tool_selection",
+            "approval_state",
+            "evidence_requirements",
+            "attestation_proof_validation",
+            "execution"
+          ],
+          "lanes": [
+            "lsp-pack",
+            "hash-edit",
+            "ast-pack",
+            "terminal-lane"
+          ]
+        },
         "protected_paths": [
           {
             "path_pattern": ".omg/**",
@@ -657,6 +672,11 @@
           "claim_judge",
           "compliance_governor",
           "execution_primitives"
+        ],
+        "runtime_behavior_surfaces": [
+          "execution_primitives",
+          "provider_host_parity",
+          "host_semantic_parity"
         ]
       }
     },

package/build/lib/commands/OMG:issue.md

@@ -0,0 +1,56 @@
+---
+description: "Active red-team diagnostics and simulation surface for ranked issue triage."
+allowed-tools: Read, Grep, Glob, Bash(python3 scripts/omg.py issue:*), Bash(pytest:*)
+argument-hint: "[optional: --surfaces <csv> --simulate-surface <name> --simulate-scenario <name>]"
+---
+
+# /OMG:issue
+
+Run active, read-only diagnostics across live and governed OMG surfaces, then emit ranked machine-readable issues.
+
+## Command Roles
+
+- `/OMG:issue` is the diagnostic and red-team simulation surface.
+- `omg fix --issue` remains the issue-driven fix surface.
+- Both share the same backend: `runtime/issue_surface.py`.
+- `/OMG:issue` does not mutate targets.
+
+## Surfaces Scanned
+
+- `live_session`
+- `forge_runs`
+- `hooks`
+- `skills`
+- `mcps`
+- `plugin_interop`
+- `governed_tools`
+- `domain_pipelines`
+
+## Severity and Approval
+
+- Severities: `critical`, `high`, `medium`, `low`, `info`
+- High/critical issues must declare signed-approval requirements before fix execution.
+- Output includes fix guidance plus evidence links for replay and audit.
+
+## Usage
+
+```text
+/OMG:issue
+/OMG:issue --surfaces plugin_interop,governed_tools
+/OMG:issue --simulate-surface hooks --simulate-scenario "delete protected lock"
+```
+
+## Backend Output
+
+- Evidence file: `.omg/evidence/issues/<run_id>.json`
+- Report schema: `IssueReport`
+- Each issue includes:
+  - `id`
+  - `severity`
+  - `surface`
+  - `title`
+  - `description`
+  - `fix_guidance`
+  - `evidence_links`
+  - `approval_required`
+  - `approval_reason`

package/build/lib/commands/OMG:teams.md

@@ -1,11 +1,14 @@
 ---
-description: OMG internal team routing (standalone). Standalone team routing.
+description: OMG internal staged team routing (standalone). /OMG:team canonical, /OMG:teams compatibility alias.
 allowed-tools: Read, Grep, Glob, Bash(git:*), Bash(rg:*), Bash(find:*), Bash(cat:*), Bash(python3:*)
 argument-hint: "[codex|gemini|ccg|auto] 'problem statement'"
 ---
 
 # /OMG:teams — Standalone Internal Router
 
+Canonical alias: `/OMG:team`
+Compatibility alias: `/OMG:teams`
+
 Use OMG's internal router using internal routing.
 
 ## Input contract
@@ -16,20 +19,32 @@ Use OMG's internal router using internal routing.
 - expected_outcome: optional acceptance target
 
 ## Execution
-Use internal CLI router:
+Use internal CLI router (canonical):
 
 ```bash
 OMG_CLI="${OMG_CLI_PATH:-$HOME/.claude/omg-runtime/scripts/omg.py}"
 if [ ! -f "$OMG_CLI" ] && [ -f "scripts/omg.py" ]; then OMG_CLI="scripts/omg.py"; fi
+python3 "$OMG_CLI" team --target auto --problem "[problem]"
+```
+
+Compatibility alias (legacy):
+
+```bash
 python3 "$OMG_CLI" teams --target auto --problem "[problem]"
 ```
 
 For explicit target:
 
 ```bash
-python3 "$OMG_CLI" teams --target codex --problem "[problem]"
+python3 "$OMG_CLI" team --target codex --problem "[problem]"
 ```
 
+## Staged flow
+- `team-plan`: resolve context packet and clarification/council gate before dispatch
+- `team-exec`: launch workers only when context is resolved
+- `team-verify`: run verification and critic synthesis
+- `team-fix`: surface blockers/next actions for follow-up iteration
+
 ## Output schema
 `TeamDispatchResult { status, findings[], actions[], evidence{} }`
 

package/build/lib/commands/OMG:validate.md

@@ -36,7 +36,7 @@ python3 scripts/omg.py validate --format json
       "required": true | false
     }
   ],
-  "version": "2.1.9"
+  "version": "2.2.2"
 }
 ```
 

package/build/lib/control_plane/service.py

@@ -24,6 +24,7 @@ from runtime.mutation_gate import check_mutation_allowed
 from runtime.runtime_contracts import read_run_state
 from runtime.security_check import run_security_check
 from runtime.test_intent_lock import lock_intent, verify_intent
+from runtime.tool_fabric import ToolFabric
 
 
 class ControlPlaneService:
@@ -348,6 +349,76 @@ class ControlPlaneService:
         )
         return 200, result
 
+    def tool_fabric_request(self, payload: dict[str, Any]) -> tuple[int, dict[str, Any]]:
+        if not isinstance(payload, dict):
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": "payload must be an object",
+            }
+
+        lane_name = str(payload.get("lane_name", "")).strip()
+        tool_name = str(payload.get("tool_name", "")).strip()
+        run_id = str(payload.get("run_id", "")).strip()
+        context = payload.get("context")
+
+        if not lane_name:
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": "lane_name is required",
+            }
+        if not tool_name:
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": "tool_name is required",
+            }
+        if not run_id:
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": "run_id is required",
+            }
+        if context is not None and not isinstance(context, dict):
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": "context must be an object when provided",
+            }
+
+        fabric = ToolFabric(project_dir=self.project_dir)
+        bundle_map = {
+            "lsp-pack": "registry/bundles/lsp-pack.yaml",
+            "hash-edit": "registry/bundles/hash-edit.yaml",
+            "ast-pack": "registry/bundles/ast-pack.yaml",
+            "terminal-lane": "registry/bundles/terminal-lane.yaml",
+        }
+        for lane, bundle_path in bundle_map.items():
+            fabric.register_lane(lane, bundle_path)
+
+        try:
+            result = fabric.request_tool(
+                lane_name=lane_name,
+                tool_name=tool_name,
+                run_id=run_id,
+                context=context if isinstance(context, dict) else None,
+            )
+        except ValueError as exc:
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_TOOL_FABRIC_INPUT",
+                "message": str(exc),
+            }
+
+        payload_out = {
+            "status": "allowed" if result.allowed else "blocked",
+            "reason": result.reason,
+            "evidence_path": result.evidence_path,
+            "ledger_entry": result.ledger_entry,
+        }
+        return (200 if result.allowed else 403), payload_out
+
     def session_health(self, payload: dict[str, Any]) -> tuple[int, dict[str, Any]]:
         run_id = payload.get("run_id")
         if isinstance(run_id, str) and run_id.strip():

package/build/lib/hooks/_common.py

@@ -107,7 +107,7 @@ def deny_decision(reason):
     }, sys.stdout)
 
 
-def block_decision(reason):
+def block_decision(reason, *, block_reason="unknown", project_dir=None):
     """Emit a Stop hook block decision to stdout.
 
     Also records the block for loop detection. Every stop hook that calls
@@ -117,7 +117,7 @@ def block_decision(reason):
     # Record block BEFORE emitting -- ensures tracker is updated even if
     # the process is killed after emitting the decision.
     try:
-        record_stop_block()
+        record_stop_block(project_dir=project_dir, reason=block_reason)
     except Exception:
         pass  # never let tracker failure prevent the block decision
     json.dump({"decision": "block", "reason": reason}, sys.stdout)
@@ -505,17 +505,24 @@ def should_skip_stop_hooks(data):
             if os.path.exists(_tracker_path):
                 with open(_tracker_path, "r", encoding="utf-8") as _f:
                     _state = json.load(_f)
-                _elapsed = (datetime.now(timezone.utc) - datetime.fromisoformat(_state["ts"])).total_seconds()
-                if _elapsed < _BLOCK_LOOP_WINDOW_SECS and _state.get("count", 0) >= 1:
-                    _reason = _state.get("reason", "unknown")
-                    if _reason in _LOOP_BLOCK_REASONS:
-                        print(
-                            "[OMG] Guard 5 triggered: context may be exhausted and stop hooks recently blocked. "
-                            "Skipping stop-hook blocks so compaction can run. "
-                            "Tip: /OMG:handoff then continue in a fresh session.",
-                            file=sys.stderr,
-                        )
-                        return True
+                # Session isolation: stale tracker from another session cannot suppress hooks
+                _tracker_session = _state.get("session_id", "")
+                _current_session = _get_session_id()
+                if (_tracker_session and _current_session != "unknown"
+                        and _tracker_session != _current_session):
+                    pass  # Different session — not a deadlock
+                else:
+                    _elapsed = (datetime.now(timezone.utc) - datetime.fromisoformat(_state["ts"])).total_seconds()
+                    if _elapsed < _BLOCK_LOOP_WINDOW_SECS and _state.get("count", 0) >= 1:
+                        _reason = _state.get("reason", "unknown")
+                        if _reason in _LOOP_BLOCK_REASONS:
+                            print(
+                                "[OMG] Guard 5 triggered: context may be exhausted and stop hooks recently blocked. "
+                                "Skipping stop-hook blocks so compaction can run. "
+                                "Tip: /OMG:handoff then continue in a fresh session.",
+                                file=sys.stderr,
+                            )
+                            return True
         except Exception:
             pass  # fail open
     return False
@@ -523,6 +530,16 @@ def should_skip_stop_hooks(data):
 
 # --- Stop-Block Loop Breaker (file-based safety net) ---
 
+
+def _get_session_id():
+    """Get current session ID from environment, falling back to 'unknown'."""
+    for key in ("CLAUDE_SESSION_ID", "SESSION_ID", "OMG_SESSION_ID"):
+        val = os.environ.get(key, "").strip()
+        if val:
+            return val
+    return "unknown"
+
+
 def record_stop_block(project_dir=None, reason: str = "unknown", session_id: str = ""):
     """Record that a stop hook block was issued. Called before block_decision().
     
@@ -532,6 +549,8 @@ def record_stop_block(project_dir=None, reason: str = "unknown", session_id: str
         session_id: Session identifier to prevent cross-session interference
     """
     try:
+        if not session_id:
+            session_id = _get_session_id()
         pdir = project_dir or get_project_dir()
         path = os.path.join(pdir, _STOP_BLOCK_TRACKER)
         state = {
@@ -573,6 +592,8 @@ def is_stop_block_loop(project_dir=None, session_id: str = ""):
                    returns False (cross-session, not a loop).
     """
     try:
+        if not session_id:
+            session_id = _get_session_id()
         pdir = project_dir or get_project_dir()
         path = os.path.join(pdir, _STOP_BLOCK_TRACKER)
         if not os.path.exists(path):

package/build/lib/hooks/_token_counter.py

@@ -145,7 +145,7 @@ def _get_anthropic_api_key() -> str | None:
         key = store_mod.get_active_key("anthropic")
         if key:
             return key
-    except Exception:
+    except (ImportError, RuntimeError, ValueError, OSError, AttributeError):
         pass
     return os.environ.get("ANTHROPIC_API_KEY")
 

package/build/lib/hooks/branch_manager.py

@@ -164,8 +164,25 @@ def _extract_task_description(project_dir: str) -> str | None:
     return None
 
 
+def _is_merge_writer_locked(project_dir: str) -> bool:
+    try:
+        _root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        if _root not in sys.path:
+            sys.path.insert(0, _root)
+        from runtime.merge_writer import MergeWriter  # pyright: ignore[reportMissingImports]
+        return MergeWriter(project_dir).is_locked()
+    except Exception:
+        return False
+
+
 def _create_branch(project_dir: str, branch_name: str) -> bool:
     """Create and checkout a new branch. Returns True on success."""
+    if _is_merge_writer_locked(project_dir):
+        print(
+            f"[OMG branch-manager] Branch creation blocked: merge-writer lock is held",
+            file=sys.stderr,
+        )
+        return False
     try:
         result = subprocess.run(
             ["git", "-C", project_dir, "checkout", "-b", branch_name],

package/build/lib/hooks/budget_governor.py

@@ -189,6 +189,27 @@ def _check_thresholds(
     return new_messages
 
 
+def _check_budget_envelope(project_dir: str) -> str:
+    run_id = os.environ.get("OMG_RUN_ID", "").strip()
+    if not run_id:
+        return ""
+    try:
+        parent = os.path.dirname(HOOKS_DIR)
+        if parent not in sys.path:
+            sys.path.insert(0, parent)
+        from runtime.budget_envelopes import get_budget_envelope_manager
+
+        mgr = get_budget_envelope_manager(project_dir)
+        result = mgr.check_envelope(run_id)
+        if result.status == "ok":
+            return ""
+        action_tag = {"warn": "@envelope-warning", "reflect": "@envelope-critical", "block": "@envelope-limit"}
+        tag = action_tag.get(result.governance_action, "@envelope-warning")
+        return f"{tag}: {result.reason} [action={result.governance_action}]"
+    except Exception:
+        return ""
+
+
 def main() -> None:
     setup_crash_handler("budget-governor", fail_closed=False)
 
@@ -224,6 +245,10 @@ def main() -> None:
     if threshold_alerts:
         context += "\n" + "\n".join(threshold_alerts)
 
+    envelope_context = _check_budget_envelope(project_dir)
+    if envelope_context:
+        context += "\n" + envelope_context
+
     json.dump({"additionalContext": context}, sys.stdout)
     sys.exit(0)
 

package/build/lib/hooks/context_pressure.py

@@ -5,19 +5,49 @@ import json
 import os
 from datetime import datetime, timezone
 
-_DEFAULT_THRESHOLD = 150
+try:
+    from runtime.context_limits import get_model_limits, compaction_trigger
+except Exception:
+    get_model_limits = None
+    compaction_trigger = None
 
 
-def estimate_context_pressure(project_dir):
-    threshold = _DEFAULT_THRESHOLD
+def _detect_model_id(context_packet=None):
+    for key in ("CLAUDE_MODEL", "OMG_MODEL_ID", "OPENAI_MODEL"):
+        value = os.environ.get(key, "").strip()
+        if value:
+            return value
+
+    if isinstance(context_packet, dict):
+        model = context_packet.get("model")
+        if isinstance(model, dict):
+            for key in ("id", "display_name", "name"):
+                value = str(model.get(key, "") or "").strip()
+                if value:
+                    return value
+        elif isinstance(model, str) and model.strip():
+            return model.strip()
+    return ""
+
+
+def _host_aware_threshold(context_packet=None):
+    model_id = _detect_model_id(context_packet)
+    if compaction_trigger is not None and get_model_limits is not None:
+        return int(compaction_trigger(model_id)), model_id, get_model_limits(model_id)
+    return 80_000, model_id, {"class_label": "128k-class"}
+
+
+def estimate_context_pressure(project_dir, context_packet=None):
+    threshold, model_id, limits = _host_aware_threshold(context_packet)
     try:
         settings_path = os.path.join(project_dir, "settings.json")
         if os.path.exists(settings_path):
             with open(settings_path, "r", encoding="utf-8") as settings_file:
                 settings = json.load(settings_file)
-            threshold = settings.get("_omg", {}).get("context_budget", {}).get(
-                "pressure_threshold", _DEFAULT_THRESHOLD
+            configured = settings.get("_omg", {}).get("context_budget", {}).get(
+                "pressure_threshold", threshold
             )
+            threshold = int(configured)
     except Exception:
         pass
 
@@ -42,6 +72,8 @@ def estimate_context_pressure(project_dir):
                 {
                     "tool_count": tool_count,
                     "threshold": threshold,
+                    "model_id": model_id,
+                    "class_label": limits.get("class_label", "128k-class"),
                     "is_high": is_high,
                     "ts": datetime.now(timezone.utc).isoformat(),
                 },