@trac3er/oh-my-god 1.0.2

package/commands/session-fork.md

@@ -0,0 +1,53 @@
+---
+description: "Fork OMG state from a specific snapshot checkpoint."
+allowed-tools: Read, Write, Edit, Bash
+argument-hint: "--from <snapshot_id> --name <fork-name>"
+---
+
+# /OMG: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.
+
+## Important
+
+Forking is **OMG state only** — it restores a previous `.omg/state/` snapshot and creates a new named branch from it. It does **not** fork the conversation or create a parallel Claude session.
+
+## Usage
+
+```
+/OMG:fork --from 20260302_143000_baseline --name "alt-approach"
+```
+
+## What It Does
+
+1. Looks up the specified snapshot by ID
+2. Restores that snapshot to `.omg/state/`
+3. Creates a new branch with the given name pointing to that snapshot
+4. Updates `.omg/state/current_branch.json`
+
+## When to Use Fork vs Branch
+
+| 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 |
+
+## Example
+
+```
+# List available snapshots to find a good fork point
+python3 tools/session_snapshot.py list
+
+# Fork from a previous checkpoint
+/OMG: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`).
+
+```bash
+export OMG_BRANCHING_ENABLED=true
+```

package/commands/session-merge.md

@@ -0,0 +1,134 @@
+---
+description: "Merge OMG state branches together with conflict detection."
+allowed-tools: Read, Write, Edit, Bash
+argument-hint: "--from <source-branch> [--into <target-branch>] [--preview]"
+---
+
+# /OMG:merge — Merge OMG State Branches
+
+Merge one OMG state branch into another with automatic conflict detection.
+
+## 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.
+
+## Usage
+
+```
+/OMG:merge --from "experiment"
+/OMG:merge --from "experiment" --into "main"
+/OMG:merge --from "experiment" --preview
+```
+
+## What It Does
+
+1. Loads the source and target branch metadata as flat JSON dicts
+2. Detects conflicts (keys present in both branches with different values)
+3. If `--preview`: returns conflict report without applying changes
+4. If no conflicts: applies source changes on top of target (last-write-wins)
+5. Marks the source branch as `status: "merged"` in its metadata file
+6. Updates `.omg/state/current_branch.json` to the target branch
+
+## Conflict Detection
+
+A **value_conflict** occurs when both branches have the same key but different values. When conflicts are found, the merge is **aborted** — you must resolve conflicts manually before merging.
+
+Conflict report format:
+
+```json
+{
+  "key": "snapshot_id",
+  "source_value": "20260302_150000_experiment",
+  "target_value": "20260302_140000_main",
+  "conflict_type": "value_conflict"
+}
+```
+
+## Preview Mode
+
+Use `--preview` to see what a merge would do without applying changes:
+
+```
+python3 tools/session_snapshot.py merge-preview experiment --into main
+```
+
+Returns:
+
+```json
+{
+  "source": "experiment",
+  "target": "main",
+  "conflicts": [],
+  "changes": 2,
+  "preview": true
+}
+```
+
+## CLI Commands
+
+```
+# Merge source into target
+python3 tools/session_snapshot.py merge experiment --into main
+
+# Preview merge without applying
+python3 tools/session_snapshot.py merge-preview experiment --into main
+
+# Merge into default target (main)
+python3 tools/session_snapshot.py merge experiment
+```
+
+## Feature Flag
+
+Merging is gated behind `OMG_MERGE_ENABLED` (default: `False`).
+
+Enable via environment variable:
+```bash
+export OMG_MERGE_ENABLED=true
+```
+
+Or in `settings.json`:
+```json
+{
+  "_omg": {
+    "features": {
+      "MERGE": true
+    }
+  }
+}
+```
+
+## Merge Behavior
+
+| Scenario | Result |
+|----------|--------|
+| No conflicts | Source state overlaid on target (last-write-wins) |
+| Conflicts found | Merge aborted, conflicts returned |
+| Source branch missing | Error returned |
+| Target branch missing | Error returned |
+| Feature flag disabled | `{"skipped": true}` |
+
+## After Merge
+
+- The **target** branch is updated with merged state
+- The **source** branch status changes to `"merged"` (not deleted)
+- `current_branch.json` is updated to the target branch
+- Source branch remains accessible for reference
+
+## Example Workflow
+
+```
+# 1. Create branches
+/OMG:branch --name "main"
+/OMG:branch --name "experiment"
+
+# 2. Do experimental work on "experiment" branch...
+
+# 3. Preview the merge
+/OMG:merge --from "experiment" --preview
+
+# 4. If no conflicts, apply the merge
+/OMG:merge --from "experiment" --into "main"
+
+# 5. Verify merge
+python3 tools/session_snapshot.py branches
+```

package/commands/theme.md

@@ -0,0 +1,44 @@
+---
+description: "Interactive theme selection, preview, and auto-detection."
+usage: "/OMG:theme [--list|--set <name>|--preview <name>|--auto]"
+---
+
+# /OMG:theme — Theme Selector
+
+Interactive theme selection, preview, and auto-detection for OMG.
+
+## Usage
+
+```
+/OMG:theme --list
+/OMG:theme --preview catppuccin-mocha
+/OMG:theme --set catppuccin-mocha
+/OMG:theme --auto
+```
+
+## What It Does
+
+1. `--list`: Returns a sorted list of available theme names.
+2. `--preview <name>`: Returns preview info `{name, colors, ansi_preview: str}` without applying.
+3. `--set <name>`: Applies and persists the theme, returns `{success, theme, applied_at}`.
+4. `--auto`: Detects dark/light mode and returns appropriate default theme name.
+
+## Feature Flag
+
+Themes are gated behind `OMG_THEMES_ENABLED` (default: `False`).
+
+Enable via environment variable:
+```bash
+export OMG_THEMES_ENABLED=true
+```
+
+Or in `settings.json`:
+```json
+{
+  "_omg": {
+    "features": {
+      "THEMES": true
+    }
+  }
+}
+```

package/config/lsp_languages.yaml

@@ -0,0 +1,324 @@
+# LSP Language Configuration
+# 40+ language server configurations for auto-discovery
+# Each entry specifies server command, discovery paths, and capabilities
+
+languages:
+  - name: python
+    extensions: [.py]
+    server_command: [pylsp]
+    server_name: pylsp
+    discovery_paths: [.venv/bin/pylsp, ~/.local/bin/pylsp, /usr/local/bin/pylsp]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: typescript
+    extensions: [.ts]
+    server_command: [typescript-language-server, --stdio]
+    server_name: typescript-language-server
+    discovery_paths: [node_modules/.bin/typescript-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: javascript
+    extensions: [.js]
+    server_command: [typescript-language-server, --stdio]
+    server_name: typescript-language-server
+    discovery_paths: [node_modules/.bin/typescript-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: tsx
+    extensions: [.tsx]
+    server_command: [typescript-language-server, --stdio]
+    server_name: typescript-language-server
+    discovery_paths: [node_modules/.bin/typescript-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: jsx
+    extensions: [.jsx]
+    server_command: [typescript-language-server, --stdio]
+    server_name: typescript-language-server
+    discovery_paths: [node_modules/.bin/typescript-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: rust
+    extensions: [.rs]
+    server_command: [rust-analyzer]
+    server_name: rust-analyzer
+    discovery_paths: [~/.cargo/bin/rust-analyzer, /usr/local/bin/rust-analyzer]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: go
+    extensions: [.go]
+    server_command: [gopls]
+    server_name: gopls
+    discovery_paths: [~/go/bin/gopls, /usr/local/bin/gopls]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: java
+    extensions: [.java]
+    server_command: [java, -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005, -jar, eclipse.jdt.ls.jar]
+    server_name: eclipse-jdt-ls
+    discovery_paths: [~/.local/share/eclipse.jdt.ls/eclipse.jdt.ls.jar]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: c
+    extensions: [.c]
+    server_command: [clangd]
+    server_name: clangd
+    discovery_paths: [/usr/local/bin/clangd, /usr/bin/clangd]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: cpp
+    extensions: [.cpp, .cc, .cxx, .h, .hpp]
+    server_command: [clangd]
+    server_name: clangd
+    discovery_paths: [/usr/local/bin/clangd, /usr/bin/clangd]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: csharp
+    extensions: [.cs]
+    server_command: [omnisharp, -lsp]
+    server_name: omnisharp
+    discovery_paths: [~/.local/bin/omnisharp, /usr/local/bin/omnisharp]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: ruby
+    extensions: [.rb]
+    server_command: [ruby-lsp]
+    server_name: ruby-lsp
+    discovery_paths: [~/.local/bin/ruby-lsp, /usr/local/bin/ruby-lsp]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: php
+    extensions: [.php]
+    server_command: [php, -S, localhost:8000]
+    server_name: intelephense
+    discovery_paths: [node_modules/.bin/intelephense]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: swift
+    extensions: [.swift]
+    server_command: [sourcekit-lsp]
+    server_name: sourcekit-lsp
+    discovery_paths: [/usr/bin/sourcekit-lsp]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: kotlin
+    extensions: [.kt, .kts]
+    server_command: [kotlin-language-server]
+    server_name: kotlin-language-server
+    discovery_paths: [~/.local/bin/kotlin-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: scala
+    extensions: [.scala]
+    server_command: [metals]
+    server_name: metals
+    discovery_paths: [~/.local/bin/metals, /usr/local/bin/metals]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: haskell
+    extensions: [.hs]
+    server_command: [haskell-language-server, --lsp]
+    server_name: haskell-language-server
+    discovery_paths: [~/.cabal/bin/haskell-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: elixir
+    extensions: [.ex, .exs]
+    server_command: [elixir-ls]
+    server_name: elixir-ls
+    discovery_paths: [~/.local/bin/elixir-ls]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: erlang
+    extensions: [.erl]
+    server_command: [erlang-ls]
+    server_name: erlang-ls
+    discovery_paths: [~/.local/bin/erlang-ls]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: lua
+    extensions: [.lua]
+    server_command: [lua-language-server]
+    server_name: lua-language-server
+    discovery_paths: [~/.local/bin/lua-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: r
+    extensions: [.r, .R]
+    server_command: [R, --slave, -e, languageserver::run()]
+    server_name: r-language-server
+    discovery_paths: []
+    format_on_write: false
+    diagnostics_on_edit: true
+
+  - name: julia
+    extensions: [.jl]
+    server_command: [julia, --project=@., -e, using LanguageServer; run_server()]
+    server_name: julia-language-server
+    discovery_paths: []
+    format_on_write: false
+    diagnostics_on_edit: true
+
+  - name: dart
+    extensions: [.dart]
+    server_command: [dart, language-server]
+    server_name: dart-language-server
+    discovery_paths: [~/.pub-cache/bin/dart]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: vue
+    extensions: [.vue]
+    server_command: [vue-language-server, --stdio]
+    server_name: vue-language-server
+    discovery_paths: [node_modules/.bin/vue-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: svelte
+    extensions: [.svelte]
+    server_command: [svelteserver, --stdio]
+    server_name: svelte-language-server
+    discovery_paths: [node_modules/.bin/svelteserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: html
+    extensions: [.html, .htm]
+    server_command: [html-languageserver, --stdio]
+    server_name: html-languageserver
+    discovery_paths: [node_modules/.bin/html-languageserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: css
+    extensions: [.css]
+    server_command: [css-languageserver, --stdio]
+    server_name: css-languageserver
+    discovery_paths: [node_modules/.bin/css-languageserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: scss
+    extensions: [.scss]
+    server_command: [css-languageserver, --stdio]
+    server_name: css-languageserver
+    discovery_paths: [node_modules/.bin/css-languageserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: less
+    extensions: [.less]
+    server_command: [css-languageserver, --stdio]
+    server_name: css-languageserver
+    discovery_paths: [node_modules/.bin/css-languageserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: json
+    extensions: [.json]
+    server_command: [json-languageserver, --stdio]
+    server_name: json-languageserver
+    discovery_paths: [node_modules/.bin/json-languageserver]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: yaml
+    extensions: [.yaml, .yml]
+    server_command: [yaml-language-server, --stdio]
+    server_name: yaml-language-server
+    discovery_paths: [node_modules/.bin/yaml-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: toml
+    extensions: [.toml]
+    server_command: [taplo, lsp, stdio]
+    server_name: taplo
+    discovery_paths: [~/.cargo/bin/taplo]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: markdown
+    extensions: [.md, .markdown]
+    server_command: [marksman]
+    server_name: marksman
+    discovery_paths: [~/.local/bin/marksman, /usr/local/bin/marksman]
+    format_on_write: false
+    diagnostics_on_edit: true
+
+  - name: bash
+    extensions: [.sh, .bash]
+    server_command: [bash-language-server, start]
+    server_name: bash-language-server
+    discovery_paths: [node_modules/.bin/bash-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: dockerfile
+    extensions: [Dockerfile]
+    server_command: [docker-langserver, --stdio]
+    server_name: docker-langserver
+    discovery_paths: [node_modules/.bin/docker-langserver]
+    format_on_write: false
+    diagnostics_on_edit: true
+
+  - name: terraform
+    extensions: [.tf]
+    server_command: [terraform-ls, serve]
+    server_name: terraform-ls
+    discovery_paths: [~/.local/bin/terraform-ls, /usr/local/bin/terraform-ls]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: sql
+    extensions: [.sql]
+    server_command: [sql-language-server, up, --method, stdio]
+    server_name: sql-language-server
+    discovery_paths: [node_modules/.bin/sql-language-server]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: graphql
+    extensions: [.graphql, .gql]
+    server_command: [graphql-language-service, server]
+    server_name: graphql-language-service
+    discovery_paths: [node_modules/.bin/graphql-language-service]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: proto
+    extensions: [.proto]
+    server_command: [buf, beta, lsp]
+    server_name: buf-lsp
+    discovery_paths: [~/.local/bin/buf, /usr/local/bin/buf]
+    format_on_write: true
+    diagnostics_on_edit: true
+
+  - name: xml
+    extensions: [.xml]
+    server_command: [lemminx]
+    server_name: lemminx
+    discovery_paths: [~/.local/bin/lemminx]
+    format_on_write: true
+    diagnostics_on_edit: true

package/config/themes/catppuccin-frappe.yaml

@@ -0,0 +1,14 @@
+name: "Catppuccin Frappé"
+variant: "dark"
+colors:
+  background: "#303446"
+  foreground: "#c6d0f5"
+  primary: "#ca9ee6"
+  secondary: "#8caaee"
+  accent: "#e78284"
+  error: "#e78284"
+  warning: "#e5c890"
+  success: "#a6d189"
+metadata:
+  author: "Catppuccin"
+  url: "https://github.com/catppuccin/catppuccin"

package/config/themes/catppuccin-latte.yaml

@@ -0,0 +1,14 @@
+name: "Catppuccin Latte"
+variant: "light"
+colors:
+  background: "#eff1f5"
+  foreground: "#4c4f69"
+  primary: "#8839ef"
+  secondary: "#1e66f5"
+  accent: "#d20f39"
+  error: "#d20f39"
+  warning: "#df8e1d"
+  success: "#40a02b"
+metadata:
+  author: "Catppuccin"
+  url: "https://github.com/catppuccin/catppuccin"

package/config/themes/catppuccin-macchiato.yaml

@@ -0,0 +1,14 @@
+name: "Catppuccin Macchiato"
+variant: "dark"
+colors:
+  background: "#24273a"
+  foreground: "#cad3f5"
+  primary: "#c6a0f6"
+  secondary: "#8aadf4"
+  accent: "#ed8796"
+  error: "#ed8796"
+  warning: "#eed49f"
+  success: "#a6da95"
+metadata:
+  author: "Catppuccin"
+  url: "https://github.com/catppuccin/catppuccin"

package/config/themes/catppuccin-mocha.yaml

@@ -0,0 +1,14 @@
+name: "Catppuccin Mocha"
+variant: "dark"
+colors:
+  background: "#1e1e2e"
+  foreground: "#cdd6f4"
+  primary: "#cba6f7"
+  secondary: "#89b4fa"
+  accent: "#f38ba8"
+  error: "#f38ba8"
+  warning: "#f9e2af"
+  success: "#a6e3a1"
+metadata:
+  author: "Catppuccin"
+  url: "https://github.com/catppuccin/catppuccin"

package/config/themes/dracula.yaml

@@ -0,0 +1,14 @@
+name: "Dracula"
+variant: "dark"
+colors:
+  background: "#282a36"
+  foreground: "#f8f8f2"
+  primary: "#bd93f9"
+  secondary: "#6272a4"
+  accent: "#ff79c6"
+  error: "#ff5555"
+  warning: "#ffb86c"
+  success: "#50fa7b"
+metadata:
+  author: "Zeno Rocha"
+  url: "https://draculatheme.com/"

package/config/themes/gruvbox-dark.yaml

@@ -0,0 +1,14 @@
+name: "Gruvbox Dark"
+variant: "dark"
+colors:
+  background: "#282828"
+  foreground: "#ebdbb2"
+  primary: "#d79921"
+  secondary: "#504945"
+  accent: "#cc241d"
+  error: "#fb4934"
+  warning: "#fabd2f"
+  success: "#b8bb26"
+metadata:
+  author: "Pavel Pertsev"
+  url: "https://github.com/morhetz/gruvbox"

package/config/themes/nord.yaml

@@ -0,0 +1,14 @@
+name: "Nord"
+variant: "dark"
+colors:
+  background: "#2e3440"
+  foreground: "#d8dee9"
+  primary: "#81a1c1"
+  secondary: "#4c566a"
+  accent: "#88c0d0"
+  error: "#bf616a"
+  warning: "#ebcb8b"
+  success: "#a3be8c"
+metadata:
+  author: "Arctic Ice Studio"
+  url: "https://www.nordtheme.com/"

package/config/themes/one-dark.yaml

@@ -0,0 +1,14 @@
+name: "One Dark"
+variant: "dark"
+colors:
+  background: "#282c34"
+  foreground: "#abb2bf"
+  primary: "#61afef"
+  secondary: "#3e4451"
+  accent: "#c678dd"
+  error: "#e06c75"
+  warning: "#e5c07b"
+  success: "#98c379"
+metadata:
+  author: "Atom"
+  url: "https://github.com/atom/atom"

package/config/themes/solarized-dark.yaml

@@ -0,0 +1,14 @@
+name: "Solarized Dark"
+variant: "dark"
+colors:
+  background: "#002b36"
+  foreground: "#839496"
+  primary: "#268bd2"
+  secondary: "#073642"
+  accent: "#2aa198"
+  error: "#dc322f"
+  warning: "#b58900"
+  success: "#859900"
+metadata:
+  author: "Ethan Schoonover"
+  url: "https://ethanschoonover.com/solarized/"