@trac3er/oh-my-god 1.0.2 → 1.0.4

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "omg",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "OMG standalone orchestration layer for Claude Code - multi-agent coordination with Codex/Gemini",
   "author": {
     "name": "trac3er00"

package/OMG-setup.sh

@@ -212,6 +212,10 @@ parse_args() {
     if [ "$ACTION" = "reinstall" ]; then
         FRESH_INSTALL=true
     fi
+
+    if [ ! -t 0 ] || [ -n "${npm_lifecycle_event:-}" ] || [ -n "${npm_execpath:-}" ]; then
+        NON_INTERACTIVE=true
+    fi
 }
 
 preflight() {
@@ -630,7 +634,7 @@ remove_omg_files() {
             local pruned_mcp=0
             pruned_mcp=$(prune_plugin_mcp_from_settings)
             if [ "${pruned_mcp:-0}" -gt 0 ]; then
-                echo "  ✓ Plugin-managed MCP servers removed from settings.json ($pruned_mcp)"
+                echo "  ✓ Plugin-managed MCP servers removed from .mcp.json ($pruned_mcp)"
             fi
         fi
     fi
@@ -649,7 +653,7 @@ install_plugin_bundle() {
     if $DRY_RUN; then
         echo "  (would install plugin bundle under $plugin_root and deploy HUD to $hud_target)"
         echo "  (would register plugin in ~/.claude/plugins/installed_plugins.json and enable it in settings.json)"
-        echo "  (would merge plugin MCP servers into user-level settings.json)"
+        echo "  (would merge plugin MCP servers into .mcp.json)"
         return 0
     fi
 
@@ -762,7 +766,7 @@ run_install_like() {
     else
         echo "  ✓ Fresh install"
     fi
-    echo "  ✓ Standalone mode: OMG-only command surface (no OMC aliases)"
+    echo "  ✓ Standalone mode: OMG-only command surface (standalone mode)"
 
     if $FRESH_INSTALL; then
         echo ""
@@ -854,7 +858,7 @@ run_install_like() {
             [ -f "$cmd" ] || continue
             if is_omg_managed_command_file "$cmd"; then
                 ! $DRY_RUN && rm "$cmd"
-                echo "  - commands/$(basename "$cmd") (removed OMC command alias)"
+                echo "  - commands/$(basename "$cmd") (removed legacy command)"
                 removed=$((removed + 1))
             fi
         done
@@ -926,7 +930,7 @@ run_install_like() {
     for f in "$SCRIPT_DIR"/commands/*.md; do
         name=$(basename "$f")
         if [[ "$name" == *omc* ]]; then
-            echo "  - /$(basename "$name" .md) (skipped: OMC alias commands are unsupported)"
+            echo "  - /$(basename "$name" .md) (skipped: legacy alias commands are unsupported)"
             continue
         fi
         target="$CLAUDE_DIR/commands/$name"
@@ -961,15 +965,27 @@ run_install_like() {
                 echo "  ✓ Settings merged (auto)"
             else
                 echo "  Merging settings.json..."
-                python3 "$MERGE" "$TARGET" "$SOURCE" --dry-run 2>&1 | head -5 | sed 's/^/      /'
-                echo ""
-                read -p "  Apply merge? [Y/n] " -n 1 -r
+                dry_run_preview="$(python3 "$MERGE" "$TARGET" "$SOURCE" --dry-run 2>&1)"
+                printf '%s\n' "$dry_run_preview" | sed -n '1,5p' | sed 's/^/      /'
                 echo ""
-                if [[ ! $REPLY =~ ^[Nn]$ ]]; then
-                    python3 "$MERGE" "$TARGET" "$SOURCE"
-                    echo "  ✓ Settings merged"
+                if read -p "  Apply merge? [Y/n] " -n 1 -r 2>/dev/null; then
+                    echo ""
+                    if [[ ! $REPLY =~ ^[Nn]$ ]]; then
+                        python3 "$MERGE" "$TARGET" "$SOURCE"
+                        echo "  ✓ Settings merged"
+                    else
+                        echo "  ⊘ Skipped (manual merge needed)"
+                    fi
                 else
-                    echo "  ⊘ Skipped (manual merge needed)"
+                    # read failed — only auto-apply if we can confirm non-interactive context
+                    # non-interactive fallback: check for clear non-interactive indicators
+                    if [ ! -t 0 ] || [ -n "${npm_lifecycle_event:-}" ] || [ -n "${npm_execpath:-}" ]; then
+                        python3 "$MERGE" "$TARGET" "$SOURCE"
+                        echo "  ✓ Settings merged (auto — non-interactive fallback)"
+                    else
+                        echo "  ⚠ Could not read input. Skipping merge to be safe."
+                        echo "    Run manually: ./OMG-setup.sh update --merge-policy=apply"
+                    fi
                 fi
             fi
         fi

package/README.md

@@ -1,16 +1,17 @@
-# OAL v1.0.2
+# OMG v1.0.4
 
-OAL (Orchestration Abstraction Layer) is a standalone orchestration layer for Claude Code.
+OMG (Oh My God) is a standalone orchestration layer for Claude Code.
 It adds structured multi-agent workflows, intelligent model routing (Claude/Codex/Gemini), and durable session state for long-running engineering tasks.
 
-- Version: `v1.0.2`
+- Version: `v1.0.4`
+- npm: `npm install @trac3er/oh-my-god`
 - Maintainer: `trac3er00`
-- Repo: `git@github.com:trac3er00/OAL.git`
-- Release: `https://github.com/trac3er00/OAL/releases/tag/v1.0.2`
+- Repo: `git@github.com:trac3er00/OMG.git`
+- Release: `https://github.com/trac3er00/OMG/releases/tag/v1.0.4`
 
-## What OAL Solves
+## What OMG Solves
 
-OAL is built for teams and solo developers who want:
+OMG is built for teams and solo developers who want:
 
 - Reliable execution loops (explore -> decide -> implement -> verify)
 - Strong verification discipline (no unverified completion claims)
@@ -30,8 +31,8 @@ OAL is built for teams and solo developers who want:
 - Hooks: 27 Python hooks
 - Core rules: 5
 - Contextual rules: 17
-- Agents: 15
-- Commands: 10 core + 10 advanced (+ compatibility aliases)
+- Agents: 21
+- Commands: 18 (`/OMG:*` namespace)
 
 ## Requirements
 
@@ -40,34 +41,48 @@ OAL is built for teams and solo developers who want:
 
 ## Installation
 
-### Standard install
+### Via npm (recommended)
 
 ```bash
-chmod +x OAL-setup.sh
-./OAL-setup.sh install
+npm install @trac3er/oh-my-god
 ```
 
-### Plugin-oriented install (recommended)
+Or install the latest version explicitly:
 
 ```bash
-./OAL-setup.sh install --install-as-plugin
+npm install @trac3er/oh-my-god@latest
+```
+
+### Via git
+
+```bash
+git clone git@github.com:trac3er00/OMG.git
+cd OMG
+chmod +x OMG-setup.sh
+./OMG-setup.sh install
+```
+
+### Plugin-oriented install
+
+```bash
+./OMG-setup.sh install --install-as-plugin
 ```
 
 ### Update
 
 ```bash
-./OAL-setup.sh update
+./OMG-setup.sh update
 ```
 
 ### Uninstall
 
 ```bash
-./OAL-setup.sh uninstall
+./OMG-setup.sh uninstall
 ```
 
 ### Common flags
 
-Supported by `OAL-setup.sh`:
+Supported by `OMG-setup.sh`:
 
 - `--fresh` clean reinstall before install/update
 - `--symlink` development mode with live updates from repo source
@@ -78,12 +93,12 @@ Supported by `OAL-setup.sh`:
 
 ## Plugin Update Behavior
 
-If OAL is installed through Claude Code plugin flow (`/plugin`), update works like this:
+If OMG is installed through Claude Code plugin flow (`/plugin`), update works like this:
 
 - Claude plugin update triggers `.claude-plugin/scripts/update.sh`
 - In git-backed installs, update stashes local changes (if needed) and pulls from `origin/main`
 - When a git tag is available, plugin manifests are synced to the tagged version
-- In cache/copy installs, update delegates to `OAL-setup.sh update`
+- In cache/copy installs, update delegates to `OMG-setup.sh update`
 
 If plugin update appears silent, check:
 
@@ -96,51 +111,51 @@ If plugin update appears silent, check:
 After install, from your target project directory:
 
 ```text
-/OAL:init
-/OAL:health-check
+/OMG:init
+/OMG:health-check
 ```
 
 Common flows:
 
 ```text
-/OAL:mode implement
-/OAL:escalate codex "debug auth middleware"
-/OAL:crazy fix flaky tests in payment module
-/OAL:handoff
+/OMG:mode implement
+/OMG:escalate codex "debug auth middleware"
+/OMG:crazy fix flaky tests in payment module
+/OMG:handoff
 ```
 
 ## Command Groups
 
 ### Core commands
 
-- `/OAL:init`
-- `/OAL:project-init`
-- `/OAL:domain-init`
-- `/OAL:health-check`
-- `/OAL:mode`
-- `/OAL:escalate`
-- `/OAL:teams`
-- `/OAL:ccg`
-- `/OAL:crazy`
-- `/OAL:compat`
+- `/OMG:init`
+- `/OMG:project-init`
+- `/OMG:domain-init`
+- `/OMG:health-check`
+- `/OMG:mode`
+- `/OMG:escalate`
+- `/OMG:teams`
+- `/OMG:ccg`
+- `/OMG:crazy`
+- `/OMG:compat`
 
 ### Advanced commands
 
-- `/OAL:deep-plan`
-- `/OAL:learn`
-- `/OAL:code-review`
-- `/OAL:security-review`
-- `/OAL:ship`
-- `/OAL:maintainer`
-- `/OAL:handoff`
-- `/OAL:sequential-thinking`
-- `/OAL:ralph-start`
-- `/OAL:ralph-stop`
-- `/OAL:theme`
+- `/OMG:deep-plan`
+- `/OMG:learn`
+- `/OMG:code-review`
+- `/OMG:security-review`
+- `/OMG:ship`
+- `/OMG:maintainer`
+- `/OMG:handoff`
+- `/OMG:sequential-thinking`
+- `/OMG:ralph-start`
+- `/OMG:ralph-stop`
+- `/OMG:theme`
 
 ## Agent Routing Model
 
-OAL dispatches by domain intent:
+OMG dispatches by domain intent:
 
 - Codex path: backend logic, debugging, algorithms, security-sensitive implementation
 - Gemini path: UI/UX, layout, visual refinements, accessibility-oriented frontend work
@@ -151,17 +166,17 @@ OAL dispatches by domain intent:
 Set an explicit operating mode per session:
 
 ```text
-/OAL:mode research
-/OAL:mode architect
-/OAL:mode implement
-/OAL:mode clear
+/OMG:mode research
+/OMG:mode architect
+/OMG:mode implement
+/OMG:mode clear
 ```
 
-Modes are persisted to `.oal/state/mode.txt`.
+Modes are persisted to `.omg/state/mode.txt`.
 
 ## Verification and Safety
 
-OAL enforces practical completion gates:
+OMG enforces practical completion gates:
 
 - Prevents unverified completion claims
 - Tracks repeated failures and recommends escalation
@@ -176,10 +191,10 @@ Important behavior:
 
 ## Project State Layout
 
-After `/OAL:init`, project state is created under `.oal/`:
+After `/OMG:init`, project state is created under `.omg/`:
 
 ```text
-.oal/
+.omg/
   state/
     profile.yaml
     working-memory.md
@@ -195,7 +210,7 @@ After `/OAL:init`, project state is created under `.oal/`:
 ## Repository Layout (High Level)
 
 ```text
-oal/
+omg/
   hooks/
   rules/
     core/
@@ -206,24 +221,45 @@ oal/
   templates/
   runtime/
   scripts/
-  OAL-setup.sh
+  OMG-setup.sh
 ```
 
 ## Versioning and Releases
 
-Current version: `v1.0.2`
+Current version: `v1.0.4`
+
+### v1.0.4 emergency installation bug fix notes
+
+- Fixed npm global install failures in non-TTY environments by auto-enabling non-interactive merge behavior in `OMG-setup.sh`.
+- Removed a fragile dry-run merge preview pipeline that could terminate early under `set -euo pipefail`.
+- Updated npm packaging to include required install-time assets (`settings.json` template and `lab/`).
+- Added regression coverage for non-TTY install merge flow in `tests/e2e/test_setup_script.py`.
+
+### v1.0.3 emergency installation bug fix notes
+
+- Fixed npm global install failures in non-TTY environments by auto-enabling non-interactive merge behavior in `OMG-setup.sh`.
+- Removed a fragile dry-run merge preview pipeline that could terminate early under `set -euo pipefail`.
+- Updated npm packaging to include required install-time assets (`settings.json` template and `lab/`).
+- Added regression coverage for non-TTY install merge flow in `tests/e2e/test_setup_script.py`.
+
+Releases are automated via GitHub Actions. When a version tag is pushed, the `publish-npm.yml` workflow automatically publishes to npm:
+
+```bash
+# bump version in package.json, then:
+git tag v1.0.4
+git push origin v1.0.4
+# → GitHub Actions auto-publishes @trac3er/oh-my-god@1.0.4 to npm
+```
 
-Recommended release flow:
+Manual release (if needed):
 
 ```bash
-git tag -a v1.0.2 -m "OAL v1.0.2"
-git push origin v1.0.2
-gh release create v1.0.2 --title "OAL v1.0.2" --notes "Release notes"
+gh release create v1.0.4 --title "OMG v1.0.4" --notes "Release notes"
 ```
 
 ## Compatibility Notes
 
-- OAL runs standalone (OMC not required)
+- OMG runs fully standalone
 - Legacy migration utilities remain available where needed
 - Works alongside other plugins when command namespaces do not conflict
 
@@ -259,23 +295,23 @@ All new features are disabled by default. Enable via environment variables or `s
 
 | Feature | Env Var | Default |
 |---------|---------|---------|
-| IntentGate keyword detection | `OAL_INTENTGATE_ENABLED=1` | Off |
-| Multi-credential store | `OAL_MULTI_CREDENTIAL_ENABLED=1` | Off |
-| Model roles routing | `OAL_MODEL_ROLES_ENABLED=1` | Off |
-| LSP client | `OAL_LSP_ENABLED=1` | Off |
-| Hashline anchors | `OAL_HASHLINE_ENABLED=1` | Off |
-| Python REPL | `OAL_PYTHON_REPL_ENABLED=1` | Off |
-| Web search | `OAL_WEB_SEARCH_ENABLED=1` | Off |
-| Browser automation | `OAL_BROWSER_ENABLED=1` | Off |
-| SSH manager | `OAL_SSH_ENABLED=1` | Off |
-| Themes | `OAL_THEMES_ENABLED=true` | Off |
-| Rust engine | `OAL_RUST_ENGINE_ENABLED=1` | Off |
-
-You can also enable features in `settings.json` under `_oal.features`:
+| IntentGate keyword detection | `OMG_INTENTGATE_ENABLED=1` | Off |
+| Multi-credential store | `OMG_MULTI_CREDENTIAL_ENABLED=1` | Off |
+| Model roles routing | `OMG_MODEL_ROLES_ENABLED=1` | Off |
+| LSP client | `OMG_LSP_ENABLED=1` | Off |
+| Hashline anchors | `OMG_HASHLINE_ENABLED=1` | Off |
+| Python REPL | `OMG_PYTHON_REPL_ENABLED=1` | Off |
+| Web search | `OMG_WEB_SEARCH_ENABLED=1` | Off |
+| Browser automation | `OMG_BROWSER_ENABLED=1` | Off |
+| SSH manager | `OMG_SSH_ENABLED=1` | Off |
+| Themes | `OMG_THEMES_ENABLED=true` | Off |
+| Rust engine | `OMG_RUST_ENGINE_ENABLED=1` | Off |
+
+You can also enable features in `settings.json` under `_omg.features`:
 
 ```json
 {
-  "_oal": {
+  "_omg": {
     "features": {
       "THEMES": true,
       "INTENTGATE": true
@@ -286,27 +322,27 @@ You can also enable features in `settings.json` under `_oal.features`:
 
 ### New Commands
 
-- `/OAL:theme` — Interactive theme selector with `--list`, `--preview`, `--set`, and `--auto` modes
+- `/OMG:theme` — Interactive theme selector with `--list`, `--preview`, `--set`, and `--auto` modes
 
 ### New Agents
 
 v1.1 ships with expanded agent coverage:
 
-- `oal-api-builder` — API scaffolding and endpoint design
-- `oal-architect` — System design and architecture decisions
-- `oal-backend-engineer` — Backend implementation tasks
-- `oal-critic` — Code review and critique
-- `oal-database-engineer` — Schema design and query optimization
-- `oal-escalation-router` — Intelligent escalation to Codex/Gemini
-- `oal-frontend-designer` — UI/UX implementation
-- `oal-infra-engineer` — Infrastructure and DevOps tasks
-- `oal-qa-tester` — Test writing and quality assurance
-- `oal-security-auditor` — Security review and vulnerability analysis
-- `oal-testing-engineer` — Test strategy and coverage
+- `omg-api-builder` — API scaffolding and endpoint design
+- `omg-architect` — System design and architecture decisions
+- `omg-backend-engineer` — Backend implementation tasks
+- `omg-critic` — Code review and critique
+- `omg-database-engineer` — Schema design and query optimization
+- `omg-escalation-router` — Intelligent escalation to Codex/Gemini
+- `omg-frontend-designer` — UI/UX implementation
+- `omg-infra-engineer` — Infrastructure and DevOps tasks
+- `omg-qa-tester` — Test writing and quality assurance
+- `omg-security-auditor` — Security review and vulnerability analysis
+- `omg-testing-engineer` — Test strategy and coverage
 
 ## Migration Guide
 
-### Upgrading from OAL v1.0 to v1.1
+### Upgrading from OMG v1.0 to v1.1
 
 All new features default to `False` and are fully backward-compatible. Existing workflows continue unchanged.
 
@@ -314,14 +350,14 @@ To adopt new features selectively:
 
 1. **Enable via env var** before launching Claude Code:
    ```bash
-   export OAL_THEMES_ENABLED=true
-   export OAL_MODEL_ROLES_ENABLED=1
+   export OMG_THEMES_ENABLED=true
+   export OMG_MODEL_ROLES_ENABLED=1
    ```
 
 2. **Or enable in `settings.json`** for persistent config:
    ```json
    {
-     "_oal": {
+     "_omg": {
        "features": {
          "THEMES": true,
          "MODEL_ROLES": true
@@ -332,4 +368,4 @@ To adopt new features selectively:
 
 3. **No breaking changes** — all v1.0 commands, agents, and hooks remain intact.
 
-4. **New command**: `/OAL:theme` is available immediately after update, gated by `OAL_THEMES_ENABLED`.
+4. **New command**: `/OMG:theme` is available immediately after update, gated by `OMG_THEMES_ENABLED`.

package/agents/omg-escalation-router.md

@@ -14,4 +14,4 @@ Always: include project context (from profile.yaml) in delegation.
 Always: propose to user first, never auto-spawn.
 Collect outputs → synthesize into single report with model attribution.
 If models disagree: present both views, let user decide.
-Standalone mode: use `/OMG:teams` or `/OMG:ccg` directly (no OMC dependency).
+Standalone mode: use `/OMG:teams` or `/OMG:ccg` directly (standalone — no external dependency).

package/commands/OMG:compat.md

@@ -23,7 +23,7 @@ python3 "$OMG_CLI" compat list
 
 ```bash
 python3 "$OMG_CLI" compat contract --all
-python3 "$OMG_CLI" compat contract --skill omc-teams
+python3 "$OMG_CLI" compat contract --skill omg-teams
 python3 "$OMG_CLI" compat snapshot --output runtime/omg_compat_contract_snapshot.json
 python3 scripts/check-omg-compat-contract-snapshot.py --strict-version
 python3 scripts/check-omg-standalone-clean.py
@@ -51,7 +51,7 @@ python3 "$OMG_CLI" compat run --skill "<skill-name>" --problem "$ARGUMENTS"
 Examples:
 
 ```bash
-python3 "$OMG_CLI" compat run --skill omc-teams --problem "review auth flow"
+python3 "$OMG_CLI" compat run --skill omg-teams --problem "review auth flow"
 python3 "$OMG_CLI" compat run --skill plan --problem "ship secure release"
 python3 "$OMG_CLI" compat run --skill pipeline --problem "train model"
 ```

package/commands/OMG:escalate.md

@@ -49,4 +49,4 @@ Evidence now includes provider health details (`cli_health`) with:
 - auth readiness (`auth status` probe)
 - `live_connection` boolean per provider
 
-No external OMC plugin is required.
+No external legacy plugin is required.

package/commands/{session-branch.md → OMG:session-branch.md}

@@ -4,7 +4,7 @@ allowed-tools: Read, Write, Edit, Bash
 argument-hint: "--name <branch-name> [--from <snapshot_id>]"
 ---
 
-# /OMG:branch — Branch OMG State
+# /OMG:session-branch — Branch OMG State
 
 Create a named branch of the current OMG state for experimentation or parallel exploration.
 
@@ -15,8 +15,8 @@ Branching is **OMG state only** — it captures and restores `.omg/state/` direc
 ## Usage
 
 ```
-/OMG:branch --name "experiment"
-/OMG:branch --name "refactor-v2" --from 20260302_143000_baseline
+/OMG:session-branch --name "experiment"
+/OMG:session-branch --name "refactor-v2" --from 20260302_143000_baseline
 ```
 
 ## What It Does
@@ -74,11 +74,11 @@ Or in `settings.json`:
 
 ```
 # 1. Create a baseline branch
-/OMG:branch --name "baseline"
+/OMG:session-branch --name "baseline"
 
 # 2. Do some experimental work...
 # 3. Create experiment branch to save progress
-/OMG:branch --name "experiment-auth"
+/OMG:session-branch --name "experiment-auth"
 
 # 4. Switch back to baseline if experiment didn't work
 python3 tools/session_snapshot.py switch baseline

package/commands/{session-fork.md → OMG:session-fork.md}

@@ -4,9 +4,9 @@ allowed-tools: Read, Write, Edit, Bash
 argument-hint: "--from <snapshot_id> --name <fork-name>"
 ---
 
-# /OMG:fork — Fork OMG State from Checkpoint
+# /OMG:session-fork — Fork OMG State from Checkpoint
 
-Create a new branch from a specific snapshot checkpoint. This is a convenience wrapper around `/OMG:branch` that always requires a source snapshot.
+Create a new branch from a specific snapshot checkpoint. This is a convenience wrapper around `/OMG:session-branch` that always requires a source snapshot.
 
 ## Important
 
@@ -15,7 +15,7 @@ Forking is **OMG state only** — it restores a previous `.omg/state/` snapshot
 ## Usage
 
 ```
-/OMG:fork --from 20260302_143000_baseline --name "alt-approach"
+/OMG:session-fork --from 20260302_143000_baseline --name "alt-approach"
 ```
 
 ## What It Does
@@ -29,8 +29,8 @@ Forking is **OMG state only** — it restores a previous `.omg/state/` snapshot
 
 | Action | Use Case |
 |--------|----------|
-| `/OMG:branch --name X` | Save current state as a named branch |
-| `/OMG:fork --from S --name X` | Go back to snapshot S and start a new exploration path |
+| `/OMG:session-branch --name X` | Save current state as a named branch |
+| `/OMG:session-fork --from S --name X` | Go back to snapshot S and start a new exploration path |
 
 ## Example
 
@@ -39,14 +39,14 @@ Forking is **OMG state only** — it restores a previous `.omg/state/` snapshot
 python3 tools/session_snapshot.py list
 
 # Fork from a previous checkpoint
-/OMG:fork --from 20260302_100000_pre-refactor --name "approach-b"
+/OMG:session-fork --from 20260302_100000_pre-refactor --name "approach-b"
 
 # Continue working from that earlier state...
 ```
 
 ## Feature Flag
 
-Forking shares the `OMG_BRANCHING_ENABLED` feature flag with `/OMG:branch` (default: `False`).
+Forking shares the `OMG_BRANCHING_ENABLED` feature flag with `/OMG:session-branch` (default: `False`).
 
 ```bash
 export OMG_BRANCHING_ENABLED=true

package/commands/{session-merge.md → OMG:session-merge.md}

@@ -4,7 +4,7 @@ allowed-tools: Read, Write, Edit, Bash
 argument-hint: "--from <source-branch> [--into <target-branch>] [--preview]"
 ---
 
-# /OMG:merge — Merge OMG State Branches
+# /OMG:session-merge — Merge OMG State Branches
 
 Merge one OMG state branch into another with automatic conflict detection.
 
@@ -15,9 +15,9 @@ Merging is **OMG state only** — it merges branch metadata (`.omg/state/branche
 ## Usage
 
 ```
-/OMG:merge --from "experiment"
-/OMG:merge --from "experiment" --into "main"
-/OMG:merge --from "experiment" --preview
+/OMG:session-merge --from "experiment"
+/OMG:session-merge --from "experiment" --into "main"
+/OMG:session-merge --from "experiment" --preview
 ```
 
 ## What It Does
@@ -118,16 +118,16 @@ Or in `settings.json`:
 
 ```
 # 1. Create branches
-/OMG:branch --name "main"
-/OMG:branch --name "experiment"
+/OMG:session-branch --name "main"
+/OMG:session-branch --name "experiment"
 
 # 2. Do experimental work on "experiment" branch...
 
 # 3. Preview the merge
-/OMG:merge --from "experiment" --preview
+/OMG:session-merge --from "experiment" --preview
 
 # 4. If no conflicts, apply the merge
-/OMG:merge --from "experiment" --into "main"
+/OMG:session-merge --from "experiment" --into "main"
 
 # 5. Verify merge
 python3 tools/session_snapshot.py branches

package/commands/OMG:teams.md

@@ -1,12 +1,12 @@
 ---
-description: OMG internal team routing (standalone). Replaces /omc-teams dependency.
+description: OMG internal team routing (standalone). Standalone team routing.
 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
 
-Use OMG's internal router without requiring OMC.
+Use OMG's internal router using internal routing.
 
 ## Input contract
 - target: `auto|codex|gemini|ccg`