@trac3er/oh-my-god 2.0.7 → 2.0.9

package/commands/OMG:session-merge.md

@@ -8,9 +8,13 @@ argument-hint: "--from <source-branch> [--into <target-branch>] [--preview]"
 
 Merge one OMG state branch into another with automatic conflict detection.
 
+## Scope Statement
+
+**This command operates on `.omg/state/` only. It does NOT modify git history, workspace files, or conversation history.**
+
 ## Important
 
-Merging is **OMG state only** — it merges branch metadata (`.omg/state/branches/<name>.json`). It does **not** merge conversations, context windows, or file system state. Think of it as combining the tracked state from two named branches.
+Merging is **OMG state only** — it merges branch metadata (`.omg/state/branches/<name>.json`). It does **not** merge conversations, context windows, or file system state. Think of it as combining the tracked state from two named branches. Rollback restores OMG session state only, NOT git history or repo files.
 
 ## Usage
 

package/control_plane/openapi.yaml

@@ -1,7 +1,7 @@
 openapi: 3.1.0
 info:
   title: OMG Control Plane API
-  version: 2.0.7
+  version: 2.0.8
   description: Policy/trust/evidence/runtime/registry/lab endpoints for OMG v2, with deprecated v1 aliases for one release.
 servers:
   - url: https://api.omg.local

package/control_plane/server.py

@@ -50,6 +50,10 @@ _POST_ROUTE_TABLE = {
     "/v1/registry/verify": ("registry_verify", True),
     "/v2/lab/jobs": ("lab_jobs", False),
     "/v1/lab/jobs": ("lab_jobs", True),
+    "/v2/trust/claim-judge": ("claim_judge", False),
+    "/v1/trust/claim-judge": ("claim_judge", True),
+    "/v2/trust/test-intent-lock": ("test_intent_lock", False),
+    "/v1/trust/test-intent-lock": ("test_intent_lock", True),
 }
 
 _GET_ROUTE_TABLE = {

package/control_plane/service.py

@@ -17,7 +17,9 @@ from lab.pipeline import run_pipeline
 from registry.verify_artifact import verify_artifact
 from runtime.guide_assert import guide_assert
 from runtime.dispatcher import dispatch_runtime
+from runtime.claim_judge import judge_claims
 from runtime.security_check import run_security_check
+from runtime.test_intent_lock import lock_intent, verify_intent
 
 
 class ControlPlaneService:
@@ -103,6 +105,10 @@ class ControlPlaneService:
             route_metadata=payload.get("route_metadata"),
             trace_ids=payload.get("trace_ids"),
             lineage=payload.get("lineage"),
+            claims=payload.get("claims"),
+            test_delta=payload.get("test_delta"),
+            browser_evidence_path=payload.get("browser_evidence_path"),
+            repro_pack_path=payload.get("repro_pack_path"),
         )
         return 202, {
             "status": "accepted",
@@ -210,6 +216,55 @@ class ControlPlaneService:
         result = run_pipeline(payload)
         return 201 if result.get("status") in {"ready", "failed_evaluation"} else 400, result
 
+    def claim_judge(self, payload: dict[str, Any]) -> tuple[int, dict[str, Any]]:
+        claims = payload.get("claims")
+        if not isinstance(claims, list):
+            return 400, {
+                "status": "error",
+                "error_code": "INVALID_CLAIM_INPUT",
+                "message": "claims must be a list",
+            }
+        result = judge_claims(self.project_dir, claims)
+        return 200, result
+
+    def test_intent_lock(self, payload: dict[str, Any]) -> tuple[int, dict[str, Any]]:
+        action = str(payload.get("action", "")).strip()
+
+        if action == "lock":
+            intent = payload.get("intent")
+            if not isinstance(intent, dict):
+                return 400, {
+                    "status": "error",
+                    "error_code": "INVALID_INTENT_INPUT",
+                    "message": "intent must be an object",
+                }
+            result = lock_intent(self.project_dir, intent)
+            return 200, result
+
+        if action == "verify":
+            lock_id = payload.get("lock_id")
+            results = payload.get("results")
+            if not isinstance(lock_id, str) or not lock_id.strip():
+                return 400, {
+                    "status": "error",
+                    "error_code": "INVALID_INTENT_INPUT",
+                    "message": "lock_id is required for verify action",
+                }
+            if not isinstance(results, dict):
+                return 400, {
+                    "status": "error",
+                    "error_code": "INVALID_INTENT_INPUT",
+                    "message": "results must be an object for verify action",
+                }
+            result = verify_intent(self.project_dir, lock_id, results)
+            return 200, result
+
+        return 400, {
+            "status": "error",
+            "error_code": "INVALID_INTENT_ACTION",
+            "message": f"Unknown action: {action!r}; expected 'lock' or 'verify'",
+        }
+
     def scoreboard_baseline(self) -> tuple[int, dict[str, Any]]:
         return 200, {
             "generated_at": datetime.now(timezone.utc).isoformat(),

package/dist/enterprise/bundle/.agents/skills/omg/AGENTS.fragment.md

@@ -31,6 +31,12 @@ Every production action must emit evidence containing these fields:
 - `omg/control-plane`
 - `omg/mcp-fabric`
 
+## Protected Planning Surface
+
+Council planning skills are protected and explicit-invocation only:
+
+- `omg/plan-council`
+
 ## Web Search Policy
 
 - Prefer cached results over live network requests.
@@ -49,4 +55,4 @@ Every production action must emit evidence containing these fields:
 
 - Rules: `protected_paths, explicit_invocation`
 - Automations: `contract-compile, release-readiness`
-- Require explicit invocation for production-control-plane skills.
+- Require explicit invocation for protected production planning skills.

package/dist/enterprise/bundle/.agents/skills/omg/claim-judge/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: omg-claim-judge
+description: "Evidence-backed claim validator for structured release and completion claims."
+---
+
+# OMG Claim Judge
+
+- Channel: `enterprise`
+- Execution modes: `embedded, local_supervisor`
+- MCP servers: `omg-control`
+- Evidence outputs: `.omg/evidence/claim-judge-*.json`

package/dist/enterprise/bundle/.agents/skills/omg/claim-judge/openai.yaml

@@ -0,0 +1,13 @@
+name: omg-claim-judge
+description: "Evidence-backed claim validator for structured release and completion claims."
+allow_implicit_invocation: false
+metadata:
+  channel: enterprise
+  bundle_id: claim-judge
+  title: "OMG Claim Judge"
+mcp_servers:
+  - omg-control
+allowed_tools:
+  - "Read"
+  - "Grep"
+  - "Bash(python3:*)"

package/dist/enterprise/bundle/.agents/skills/omg/codex-rules.md

@@ -18,6 +18,10 @@
 - `omg/control-plane`
 - `omg/mcp-fabric`
 
+## Protected Planning Surface
+
+- `omg/plan-council` (explicit invocation only)
+
 ## Approval Matrix
 
 | Action | Approval Required |

package/dist/enterprise/bundle/.agents/skills/omg/plan-council/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: omg-plan-council
+description: "Canonical council-style planning bundle for explicit, evidence-backed deep plans."
+---
+
+# OMG Plan Council
+
+- Channel: `enterprise`
+- Execution modes: `embedded, local_supervisor`
+- MCP servers: `omg-control`
+- Evidence outputs: `.omg/plans/deep-plan.md, .omg/plans/deep-plan.json, .omg/plans/dissent.json, .omg/evidence/plan-council.json`

package/dist/enterprise/bundle/.agents/skills/omg/plan-council/openai.yaml

@@ -0,0 +1,12 @@
+name: omg-plan-council
+description: "Canonical council-style planning bundle for explicit, evidence-backed deep plans."
+allow_implicit_invocation: false
+metadata:
+  channel: enterprise
+  bundle_id: plan-council
+  title: "OMG Plan Council"
+mcp_servers:
+  - omg-control
+allowed_tools:
+  - "Read"
+  - "Grep"

package/dist/enterprise/bundle/.agents/skills/omg/proof-gate/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: omg-proof-gate
+description: "Structured release proof gate that binds claims to required evidence artifacts and trace links."
+---
+
+# OMG Proof Gate
+
+- Channel: `enterprise`
+- Execution modes: `embedded, local_supervisor`
+- MCP servers: `omg-control`
+- Evidence outputs: `.omg/evidence/proof-gate-*.json`

package/dist/enterprise/bundle/.agents/skills/omg/proof-gate/openai.yaml

@@ -0,0 +1,13 @@
+name: omg-proof-gate
+description: "Structured release proof gate that binds claims to required evidence artifacts and trace links."
+allow_implicit_invocation: false
+metadata:
+  channel: enterprise
+  bundle_id: proof-gate
+  title: "OMG Proof Gate"
+mcp_servers:
+  - omg-control
+allowed_tools:
+  - "Read"
+  - "Grep"
+  - "Bash(python3:*)"

package/dist/enterprise/bundle/.agents/skills/omg/test-intent-lock/SKILL.md

@@ -0,0 +1,11 @@
+---
+name: omg-test-intent-lock
+description: "Structured test-delta guard that blocks weakened tests unless explicit override evidence is present."
+---
+
+# OMG Test Intent Lock
+
+- Channel: `enterprise`
+- Execution modes: `embedded, local_supervisor`
+- MCP servers: `omg-control`
+- Evidence outputs: `.omg/evidence/test-intent-lock-*.json`

package/dist/enterprise/bundle/.agents/skills/omg/test-intent-lock/openai.yaml

@@ -0,0 +1,13 @@
+name: omg-test-intent-lock
+description: "Structured test-delta guard that blocks weakened tests unless explicit override evidence is present."
+allow_implicit_invocation: false
+metadata:
+  channel: enterprise
+  bundle_id: test-intent-lock
+  title: "OMG Test Intent Lock"
+mcp_servers:
+  - omg-control
+allowed_tools:
+  - "Read"
+  - "Grep"
+  - "Bash(python3:*)"

package/dist/enterprise/bundle/.claude-plugin/marketplace.json

@@ -6,7 +6,7 @@
   },
   "metadata": {
     "description": "OMG - Oh-My-God for Claude Code and supported agent hosts",
-    "version": "2.0.7",
+    "version": "2.0.8",
     "homepage": "https://github.com/trac3er00/OMG",
     "repository": "https://github.com/trac3er00/OMG"
   },
@@ -14,7 +14,7 @@
     {
       "name": "omg",
       "description": "OMG plugin layer for Claude Code and supported agent hosts with native setup, orchestration, and interop.",
-      "version": "2.0.7",
+      "version": "2.0.8",
       "source": "./",
       "author": {
         "name": "trac3er00"
@@ -32,5 +32,5 @@
       ]
     }
   ],
-  "version": "2.0.7"
+  "version": "2.0.8"
 }

package/dist/enterprise/bundle/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "omg",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "OMG plugin layer for Claude Code with native setup, orchestration, and interop.",
   "author": {
     "name": "trac3er00"

package/dist/enterprise/bundle/.gemini/settings.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "omg-control": {
+      "command": "python3",
+      "args": [
+        "-m",
+        "runtime.omg_mcp_server"
+      ]
+    }
+  }
+}

package/dist/enterprise/bundle/.kimi/mcp.json

@@ -0,0 +1,11 @@
+{
+  "mcpServers": {
+    "omg-control": {
+      "command": "python3",
+      "args": [
+        "-m",
+        "runtime.omg_mcp_server"
+      ]
+    }
+  }
+}

package/dist/enterprise/bundle/.mcp.json

@@ -1,11 +1,5 @@
 {
   "mcpServers": {
-    "context7": {
-      "command": "npx",
-      "args": [
-        "@upstash/context7-mcp@2.1.3"
-      ]
-    },
     "filesystem": {
       "command": "npx",
       "args": [
@@ -13,22 +7,6 @@
         "."
       ]
     },
-    "websearch": {
-      "command": "npx",
-      "args": [
-        "@zhafron/mcp-web-search@1.2.2"
-      ]
-    },
-    "chrome-devtools": {
-      "command": "npx",
-      "args": [
-        "chrome-devtools-mcp@0.19.0"
-      ]
-    },
-    "omg-memory": {
-      "type": "http",
-      "url": "http://127.0.0.1:8765/mcp"
-    },
     "omg-control": {
       "command": "python3",
       "args": [

package/dist/enterprise/bundle/OMG_COMPAT_CONTRACT.md

@@ -1,9 +1,11 @@
 ---
 title: OMG Production Control Plane
-version: 2.0.7
+version: 2.0.8
 canonical_hosts:
   - claude
   - codex
+  - gemini
+  - kimi
 status: active
 ---
 
@@ -11,6 +13,17 @@ status: active
 
 `OMG_COMPAT_CONTRACT.md` is the normative human-readable contract for OMG capability bundles. Machine-readable manifests in `registry/bundles/` are executable inputs and must remain version-locked to this document.
 
+## provider_tiers
+
+OMG defines four canonical hosts and their host-rule contracts.
+
+- `claude`: requires `compilation_targets`, `hooks`, `subagents`, and `skills`.
+- `codex`: requires `compilation_targets`, `skills`, `agents_fragments`, `rules`, and `automations`.
+- `gemini`: requires `compilation_targets`, `mcp`, `skills`, and `automations`.
+- `kimi`: requires `compilation_targets`, `mcp`, `skills`, and `automations`.
+
+Gemini and Kimi are canonical hosts for contract validation and policy declaration. Their contracts do not require Claude/Codex hook semantics.
+
 ## metadata
 
 Every bundle must declare `id`, `kind`, `version`, `title`, `description`, `hosts`, and `assets`.

package/dist/enterprise/bundle/plugins/advanced/commands/OMG:deep-plan.md

@@ -10,6 +10,9 @@ argument-hint: "[feature or goal to plan]"
 Regular planning = "what steps to take."
 Deep planning = "understand WHY the user wants this, WHAT direction they're heading, and HOW it fits the bigger picture."
 
+This command is the public compatibility path to the canonical `plan-council` bundle.
+Users invoke `/OMG:deep-plan`; the runtime routes to `plan-council` for execution.
+
 ## Step 1: Direction Discovery (MANDATORY)
 
 Do not assume goals, constraints, or context. Extract direction from:
@@ -54,10 +57,12 @@ If DDD reference patterns exist (see .omg/knowledge/ or existing domain modules)
 - Plan the new feature to MATCH the pattern
 - Note any intentional deviations with WHY
 
-## Step 3: Create the Deep Plan
+## Step 3: Create the Deep Plan (Plan Council Artifacts)
 
-Use Bash heredoc to write `.omg/state/_plan.md` (and `.omg/idea.yml`). Do NOT use the `Write` tool — it requires a prior Read which is unnecessary for fresh plan creation:
+Generate the canonical `plan-council` artifacts. Use Bash heredoc to write these files.
+Required artifacts: `.omg/plans/deep-plan.md`, `.omg/plans/deep-plan.json`, `.omg/plans/dissent.json`, `.omg/evidence/plan-council.json`.
 
+### Artifact 1: `.omg/plans/deep-plan.md` (Human-readable)
 ```markdown
 # Deep Plan: [Feature Name]
 Created: [date]
@@ -85,9 +90,9 @@ Key interfaces: [list the interfaces/types this touches]
 3. [ ] [specific action]
 4. [ ] [specific action]
 
-### Phase 3: Integration + Security [N files, ~M lines]
+### Phase 3: Integration + Verification [N files, ~M lines]
 5. [ ] [specific action]
-6. [ ] Security review: /OMG:security-check [affected files]
+6. [ ] Verification: /OMG:security-check [affected files]
 
 ### Phase 4: Verification
 7. [ ] Tests: [what to test, how]
@@ -105,8 +110,48 @@ Key interfaces: [list the interfaces/types this touches]
 ## Files to Read Before Starting
 1. [file] — [why: contains the reference pattern]
 2. [file] — [why: defines the interface this must implement]
+
+## Plan Council Requirements
+### Assumptions
+List your assumptions below:
+- [Assumption 1]
+- [Assumption 2]
+
+### Objections and Dissent
+Record any objections or dissent:
+- [Dissent 1]
+- [Dissent 2]
+
+### Rollback Plan
+Define the rollback plan:
+- [Step 1 to revert]
+- [Step 2 to revert]
+
+### Verification Commands
+List the verification commands:
+- [Command 1]
+- [Command 2]
+
+### Evidence Requirements
+Define the evidence requirements:
+- [Requirement 1]
+- [Requirement 2]
+
+### What would falsify this plan?
+Define what would falsify this plan:
+- [Condition 1]
+- [Condition 2]
 ```
 
+### Artifact 2: `.omg/plans/deep-plan.json` (Machine-readable)
+Include the full task plan, workflow stages, and metadata.
+
+### Artifact 3: `.omg/plans/dissent.json` (Dissent log)
+Record all objections, risks, and counter-arguments raised during planning.
+
+### Artifact 4: `.omg/evidence/plan-council.json` (Planning evidence)
+Record the planning process evidence, including tool outputs and validation results.
+
 ## Step 4: Present and Iterate
 
 Show the plan to the user. Ask:
@@ -191,8 +236,8 @@ Rules:
    - `production=ready` only when QA/simulation/final_test gates pass.
 
 Persist this contract into planning artifacts:
-- `.omg/state/_plan.md` (human-readable plan)
-- `.omg/state/_checklist.md` (atomic execution items)
+- `.omg/plans/deep-plan.md` (human-readable plan)
+- `.omg/plans/deep-plan.json` (machine-readable plan)
 - include structured task metadata in the plan output (`stage`, `title`, `detail`, `source`).
 
 ## Integration with DDD

package/dist/enterprise/bundle/plugins/advanced/commands/OMG:ship.md

@@ -13,7 +13,7 @@ argument-hint: "[goal or optional path to .omg/idea.yml]"
 
 ## Step 2: Convert idea to execution plan
 - Consume plan artifacts generated by `/OMG:deep-plan`.
-- Require `.omg/state/_plan.md` and `.omg/state/_checklist.md` to already encode the business workflow contract.
+- Require `.omg/plans/deep-plan.md` and `.omg/plans/deep-plan.json` to already encode the business workflow contract.
 - If missing, invoke `/OMG:deep-plan` first and return after those artifacts are created.
 - Use the deep-plan workflow path and task metadata as the execution source of truth.
 

package/dist/enterprise/bundle/plugins/advanced/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "omg-advanced",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Advanced OMG commands - deep planning, learning, code review, and specialized workflows",
   "type": "omg-plugin",
   "commands": {

package/dist/enterprise/bundle/registry/bundles/algorithms.yaml

@@ -1,6 +1,6 @@
 id: algorithms
 kind: domain-pack
-version: 2.0.7
+version: 2.0.8
 title: OMG Algorithms Pack
 description: Determinism and benchmark attachments for algorithm-heavy work.
 hosts:

package/dist/enterprise/bundle/registry/bundles/api-twin.yaml

@@ -1,6 +1,6 @@
 id: api-twin
 kind: simulation
-version: 2.0.7
+version: 2.0.8
 title: OMG API Twin
 description: Versioned endpoint cassette replay with latency, drift, and cost reporting.
 hosts:

package/dist/enterprise/bundle/registry/bundles/claim-judge.yaml

@@ -0,0 +1,49 @@
+id: claim-judge
+kind: proof
+version: 2.0.8
+title: OMG Claim Judge
+description: Evidence-backed claim validator for structured release and completion claims.
+hosts:
+  - claude
+  - codex
+assets:
+  references:
+    - runtime/claim_judge.py
+invocation_policy:
+  user_invocable: true
+  model_invocable: true
+  allow_implicit_invocation: false
+tool_policy:
+  side_effect_level: low
+  allowed_tools:
+    claude:
+      - Read
+      - Grep
+      - Bash(python3:*)
+    codex:
+      - Read
+      - Grep
+      - Bash(python3:*)
+lifecycle_hooks:
+  native:
+    - PostToolUse
+  emulated:
+    - TaskCompleted
+mcp_contract:
+  servers:
+    - omg-control
+lsp_contract:
+  languages:
+    - python
+evidence_outputs:
+  artifacts:
+    - .omg/evidence/claim-judge-*.json
+execution_contract:
+  modes:
+    - embedded
+    - local_supervisor
+channel_overrides:
+  public:
+    posture: self-serve
+  enterprise:
+    posture: managed

package/dist/enterprise/bundle/registry/bundles/control-plane.yaml

@@ -1,6 +1,6 @@
 id: control-plane
 kind: skill
-version: 2.0.7
+version: 2.0.8
 title: OMG Control Plane
 description: Canonical production control plane bundle for Claude and Codex.
 hosts:

package/dist/enterprise/bundle/registry/bundles/data-lineage.yaml

@@ -1,6 +1,6 @@
 id: data-lineage
 kind: provenance
-version: 2.0.7
+version: 2.0.8
 title: OMG Data Lineage
 description: Provenance and privacy tracking for traces, fixtures, examples, and synthetic artifacts.
 hosts:

package/dist/enterprise/bundle/registry/bundles/delta-classifier.yaml

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

package/dist/enterprise/bundle/registry/bundles/eval-gate.yaml

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

package/dist/enterprise/bundle/registry/bundles/health.yaml

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

package/dist/enterprise/bundle/registry/bundles/hook-governor.yaml

@@ -1,6 +1,6 @@
 id: hook-governor
 kind: governance
-version: 2.0.7
+version: 2.0.8
 title: OMG Hook Governor
 description: Canonical hook ordering, policy reinjection, and protected-path governance.
 hosts:

package/dist/enterprise/bundle/registry/bundles/incident-replay.yaml

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

package/dist/enterprise/bundle/registry/bundles/lsp-pack.yaml

@@ -1,6 +1,6 @@
 id: lsp-pack
 kind: diagnostics
-version: 2.0.7
+version: 2.0.8
 title: OMG LSP Pack
 description: Optional LSP-backed diagnostics and navigation bundle for production verification.
 hosts:

package/dist/enterprise/bundle/registry/bundles/mcp-fabric.yaml

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