git-wtf 0.1.0__tar.gz

git_wtf-0.1.0/.gitignore

@@ -0,0 +1,5 @@
+__pycache__/
+*.pyc
+*.egg-info/
+dist/
+.env

git_wtf-0.1.0/PKG-INFO

@@ -0,0 +1,232 @@
+Metadata-Version: 2.4
+Name: git-wtf
+Version: 0.1.0
+Summary: AI-powered git assistant for when git is being git
+Project-URL: Homepage, https://github.com/git-wtf/git-wtf
+Project-URL: Repository, https://github.com/git-wtf/git-wtf
+Project-URL: Issues, https://github.com/git-wtf/git-wtf/issues
+Project-URL: Changelog, https://github.com/git-wtf/git-wtf/releases
+Author-email: git-wtf <hi@git-wtf.sh>
+License: MIT
+Keywords: ai,cli,conflict,developer-tools,git,merge
+Classifier: Development Status :: 3 - Alpha
+Classifier: Environment :: Console
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Software Development :: Version Control :: Git
+Classifier: Topic :: Utilities
+Requires-Python: >=3.9
+Requires-Dist: httpx>=0.25.0
+Requires-Dist: openai>=1.30.0
+Requires-Dist: rich>=13.0.0
+Description-Content-Type: text/markdown
+
+# git-wtf
+
+> AI-powered git assistant. For when git is being git.
+
+Two commands that cover 90% of the pain:
+
+```
+git wtf          # diagnose whatever broken state you're in
+git wtf merge    # resolve merge conflicts — semantically, not just line-by-line
+```
+
+Built for vibe coders who are moving fast with AI tools. When you hit a merge conflict on code you didn't write and don't have time to read, `git wtf merge` reads both sides, understands what each branch was *trying to do*, merges them properly, explains what it did in plain English, and asks you to confirm before touching a single file.
+
+---
+
+## install
+
+**macOS (Homebrew)**
+
+```bash
+brew tap git-wtf/tap
+brew install git-wtf
+```
+
+**Any OS (pip)**
+
+```bash
+pip install git-wtf
+```
+
+**Any OS (pipx — recommended if you use pipx)**
+
+```bash
+pipx install git-wtf
+```
+
+Git automatically picks up `git-wtf` as a subcommand. No PATH tricks, no aliases required.
+
+---
+
+## setup
+
+```bash
+git wtf setup
+```
+
+Interactive. Takes ~30 seconds. Three options:
+
+```
+  1   Anthropic   api.anthropic.com  →  Claude
+  2   OpenAI      api.openai.com  →  GPT-4o, o3, ...
+  3   Proxy       corporate / LiteLLM / custom endpoint
+```
+
+**Option 1 — Anthropic (direct)**
+
+Get your key at [console.anthropic.com](https://console.anthropic.com), paste it in, pick a model. Done.
+
+**Option 2 — OpenAI (direct)**
+
+Get your key at [platform.openai.com](https://platform.openai.com), paste it in. Done.
+
+**Option 3 — Proxy / corporate**
+
+Paste your proxy base URL (e.g. `https://llm-proxy.yourcompany.com/v1`), paste the key if required. The tool fetches the available model list from the proxy and lets you pick. SSL verification is automatically disabled for corporate MITM setups.
+
+Config is saved to `~/.config/git-wtf/config.json`.
+
+### env vars (override config file)
+
+```bash
+GITWFT_API_KEY=...          # API key
+GITWFT_BASE_URL=...         # custom base URL
+GITWFT_MODEL=...            # model override
+GITWFT_VERIFY_SSL=false     # disable SSL verification
+```
+
+Standard `OPENAI_API_KEY` and `ANTHROPIC_API_KEY` are also picked up automatically.
+
+### opencode users
+
+If you use [opencode](https://opencode.ai), git-wtf reads your `~/.config/opencode/opencode.json` automatically and routes through the same proxy. Zero extra config.
+
+---
+
+## usage
+
+### `git wtf`
+
+Diagnoses whatever state your repo is in. Detached HEAD, mid-merge, diverged from remote, unresolved conflicts — it reads the git state, figures out what happened, and tells you exactly what to run.
+
+```
+ __ _(_) |_  __ _____ __
+/ _` | |  _| \ V V / '_ \
+\__, |_|\__|  \_/\_/ | .__/
+|___/               |_|
+
+  feat/onboarding  →  origin/feat/onboarding
+
+  ↓ 3 behind    MID-MERGE    2 CONFLICTS
+
+──────────────────────────── diagnosis ────────────────────────────
+
+## what happened
+ok so basically you're in the middle of a merge that hit conflicts.
+git is frozen waiting for you to resolve them...
+
+## how to fix it
+1. run `git wtf merge` to resolve conflicts automatically
+2. run `git merge --continue` to finish the merge
+...
+```
+
+### `git wtf merge`
+
+The main thing. Reads both sides of every conflict, understands the intent behind each, and produces a resolution that keeps both features intact — not just picking a winner.
+
+**The trust flow (this is the important part):**
+
+After resolving all conflicts, before writing a single file, it shows you:
+
+1. A per-file panel — what each file does now, confidence rating (HIGH / MEDIUM / LOW), and any warnings about things it wasn't sure about
+2. A plain-English summary of the entire merge — what the app will *do* after this, what trade-offs were made, anything that needs manual review
+3. A single `apply this merge? [Y/n]` prompt
+
+Nothing is written to disk until you say Y.
+
+```
+  feat/chat-agent  +  feat/onboarding  →  3 conflicted files
+
+  (1/3)  src/auth.ts        2 hunks    MEDIUM
+  (2/3)  src/api/client.ts  1 hunk     HIGH
+  (3/3)  src/user.ts        3 hunks    HIGH
+
+────────────────────── what i'm about to change ───────────────────
+
+╭──────  src/auth.ts    MEDIUM   2 hunks  ─────────────────────────╮
+│                                                                   │
+│  fetchUser now uses the shared httpClient AND sends the auth      │
+│  token as a Bearer header. logout clears localStorage, the        │
+│  httpClient cache, AND sessionStorage — all three steps kept.     │
+│                                                                   │
+│  ⚠  verify httpClient.get() accepts a headers config object       │
+│     before shipping                                               │
+╰───────────────────────────────────────────────────────────────────╯
+
+───────────────────────── the big picture ─────────────────────────
+
+╭──────────────  what this merge will do  ─────────────────────────╮
+│                                                                   │
+│  • fetchUser now uses the shared HTTP client AND sends auth       │
+│  • logout does a full triple cleanup — nothing left behind        │
+│  • onboarding auth + chat-agent HTTP refactor coexist cleanly     │
+│                                                                   │
+│  ⚠  NEEDS MANUAL REVIEW: httpClient.get() headers assumption      │
+│                                                                   │
+│  vibe check: clean merge, one loose wire — verify before ship     │
+╰───────────────────────────────────────────────────────────────────╯
+
+  3 files resolved  ·  nothing written to disk yet
+
+  apply this merge? [Y/n]
+```
+
+---
+
+## how it works
+
+1. **Reads git state** — `git status`, `git log`, branch info, merge state
+2. **Parses conflict markers** — extracts the three blob versions (`:1:` ancestor, `:2:` yours, `:3:` theirs) for full file context
+3. **Reads project context** — `README.md`, `package.json`, `CLAUDE.md` / `.cursorrules` so the LLM knows what you're building
+4. **One LLM call per conflicted file** — sends both branch commit histories, both full file versions, and each conflict hunk with surrounding context
+5. **Self-validates** — if hunk count doesn't match, skips the file and tells you to resolve manually
+6. **Summary call** — a second LLM call synthesises all per-file resolutions into a plain-English "what this merge will do" summary
+7. **You confirm** — one Y/n. Then it writes and `git add`s everything.
+
+---
+
+## confidence levels
+
+Every resolved file gets a confidence rating:
+
+| Level | Meaning |
+|-------|---------|
+| **HIGH** | both changes are in clearly different parts of the code, no semantic overlap |
+| **MEDIUM** | changes interact — resolution is probably right but verify the integration |
+| **LOW** | genuinely ambiguous — the LLM resolved it but you should read this one manually |
+
+LOW confidence files always get a `⚠ heads up` block in the panel explaining exactly what to check.
+
+---
+
+## what it doesn't do (yet)
+
+- Rebase conflict resolution
+- Multi-file semantic understanding (e.g. a type changed in one file and needs updating in five others)
+- Auto-commit after merge
+
+---
+
+## license
+
+MIT

git_wtf-0.1.0/README.md

@@ -0,0 +1,203 @@
+# git-wtf
+
+> AI-powered git assistant. For when git is being git.
+
+Two commands that cover 90% of the pain:
+
+```
+git wtf          # diagnose whatever broken state you're in
+git wtf merge    # resolve merge conflicts — semantically, not just line-by-line
+```
+
+Built for vibe coders who are moving fast with AI tools. When you hit a merge conflict on code you didn't write and don't have time to read, `git wtf merge` reads both sides, understands what each branch was *trying to do*, merges them properly, explains what it did in plain English, and asks you to confirm before touching a single file.
+
+---
+
+## install
+
+**macOS (Homebrew)**
+
+```bash
+brew tap git-wtf/tap
+brew install git-wtf
+```
+
+**Any OS (pip)**
+
+```bash
+pip install git-wtf
+```
+
+**Any OS (pipx — recommended if you use pipx)**
+
+```bash
+pipx install git-wtf
+```
+
+Git automatically picks up `git-wtf` as a subcommand. No PATH tricks, no aliases required.
+
+---
+
+## setup
+
+```bash
+git wtf setup
+```
+
+Interactive. Takes ~30 seconds. Three options:
+
+```
+  1   Anthropic   api.anthropic.com  →  Claude
+  2   OpenAI      api.openai.com  →  GPT-4o, o3, ...
+  3   Proxy       corporate / LiteLLM / custom endpoint
+```
+
+**Option 1 — Anthropic (direct)**
+
+Get your key at [console.anthropic.com](https://console.anthropic.com), paste it in, pick a model. Done.
+
+**Option 2 — OpenAI (direct)**
+
+Get your key at [platform.openai.com](https://platform.openai.com), paste it in. Done.
+
+**Option 3 — Proxy / corporate**
+
+Paste your proxy base URL (e.g. `https://llm-proxy.yourcompany.com/v1`), paste the key if required. The tool fetches the available model list from the proxy and lets you pick. SSL verification is automatically disabled for corporate MITM setups.
+
+Config is saved to `~/.config/git-wtf/config.json`.
+
+### env vars (override config file)
+
+```bash
+GITWFT_API_KEY=...          # API key
+GITWFT_BASE_URL=...         # custom base URL
+GITWFT_MODEL=...            # model override
+GITWFT_VERIFY_SSL=false     # disable SSL verification
+```
+
+Standard `OPENAI_API_KEY` and `ANTHROPIC_API_KEY` are also picked up automatically.
+
+### opencode users
+
+If you use [opencode](https://opencode.ai), git-wtf reads your `~/.config/opencode/opencode.json` automatically and routes through the same proxy. Zero extra config.
+
+---
+
+## usage
+
+### `git wtf`
+
+Diagnoses whatever state your repo is in. Detached HEAD, mid-merge, diverged from remote, unresolved conflicts — it reads the git state, figures out what happened, and tells you exactly what to run.
+
+```
+ __ _(_) |_  __ _____ __
+/ _` | |  _| \ V V / '_ \
+\__, |_|\__|  \_/\_/ | .__/
+|___/               |_|
+
+  feat/onboarding  →  origin/feat/onboarding
+
+  ↓ 3 behind    MID-MERGE    2 CONFLICTS
+
+──────────────────────────── diagnosis ────────────────────────────
+
+## what happened
+ok so basically you're in the middle of a merge that hit conflicts.
+git is frozen waiting for you to resolve them...
+
+## how to fix it
+1. run `git wtf merge` to resolve conflicts automatically
+2. run `git merge --continue` to finish the merge
+...
+```
+
+### `git wtf merge`
+
+The main thing. Reads both sides of every conflict, understands the intent behind each, and produces a resolution that keeps both features intact — not just picking a winner.
+
+**The trust flow (this is the important part):**
+
+After resolving all conflicts, before writing a single file, it shows you:
+
+1. A per-file panel — what each file does now, confidence rating (HIGH / MEDIUM / LOW), and any warnings about things it wasn't sure about
+2. A plain-English summary of the entire merge — what the app will *do* after this, what trade-offs were made, anything that needs manual review
+3. A single `apply this merge? [Y/n]` prompt
+
+Nothing is written to disk until you say Y.
+
+```
+  feat/chat-agent  +  feat/onboarding  →  3 conflicted files
+
+  (1/3)  src/auth.ts        2 hunks    MEDIUM
+  (2/3)  src/api/client.ts  1 hunk     HIGH
+  (3/3)  src/user.ts        3 hunks    HIGH
+
+────────────────────── what i'm about to change ───────────────────
+
+╭──────  src/auth.ts    MEDIUM   2 hunks  ─────────────────────────╮
+│                                                                   │
+│  fetchUser now uses the shared httpClient AND sends the auth      │
+│  token as a Bearer header. logout clears localStorage, the        │
+│  httpClient cache, AND sessionStorage — all three steps kept.     │
+│                                                                   │
+│  ⚠  verify httpClient.get() accepts a headers config object       │
+│     before shipping                                               │
+╰───────────────────────────────────────────────────────────────────╯
+
+───────────────────────── the big picture ─────────────────────────
+
+╭──────────────  what this merge will do  ─────────────────────────╮
+│                                                                   │
+│  • fetchUser now uses the shared HTTP client AND sends auth       │
+│  • logout does a full triple cleanup — nothing left behind        │
+│  • onboarding auth + chat-agent HTTP refactor coexist cleanly     │
+│                                                                   │
+│  ⚠  NEEDS MANUAL REVIEW: httpClient.get() headers assumption      │
+│                                                                   │
+│  vibe check: clean merge, one loose wire — verify before ship     │
+╰───────────────────────────────────────────────────────────────────╯
+
+  3 files resolved  ·  nothing written to disk yet
+
+  apply this merge? [Y/n]
+```
+
+---
+
+## how it works
+
+1. **Reads git state** — `git status`, `git log`, branch info, merge state
+2. **Parses conflict markers** — extracts the three blob versions (`:1:` ancestor, `:2:` yours, `:3:` theirs) for full file context
+3. **Reads project context** — `README.md`, `package.json`, `CLAUDE.md` / `.cursorrules` so the LLM knows what you're building
+4. **One LLM call per conflicted file** — sends both branch commit histories, both full file versions, and each conflict hunk with surrounding context
+5. **Self-validates** — if hunk count doesn't match, skips the file and tells you to resolve manually
+6. **Summary call** — a second LLM call synthesises all per-file resolutions into a plain-English "what this merge will do" summary
+7. **You confirm** — one Y/n. Then it writes and `git add`s everything.
+
+---
+
+## confidence levels
+
+Every resolved file gets a confidence rating:
+
+| Level | Meaning |
+|-------|---------|
+| **HIGH** | both changes are in clearly different parts of the code, no semantic overlap |
+| **MEDIUM** | changes interact — resolution is probably right but verify the integration |
+| **LOW** | genuinely ambiguous — the LLM resolved it but you should read this one manually |
+
+LOW confidence files always get a `⚠ heads up` block in the panel explaining exactly what to check.
+
+---
+
+## what it doesn't do (yet)
+
+- Rebase conflict resolution
+- Multi-file semantic understanding (e.g. a type changed in one file and needs updating in five others)
+- Auto-commit after merge
+
+---
+
+## license
+
+MIT

git_wtf-0.1.0/git_wtf/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.0"

git_wtf-0.1.0/git_wtf/cli.py

@@ -0,0 +1,114 @@
+"""
+Entry point for the git-wtf CLI.
+
+Registered as `git-wtf` binary via pyproject.toml [project.scripts].
+Git picks it up automatically as a subcommand: `git wtf [subcommand]`
+"""
+from __future__ import annotations
+
+import argparse
+import sys
+
+from rich.console import Console
+
+console = Console()
+
+
+def _not_configured_error() -> None:
+    console.print(
+        "\n[red]git-wtf is not configured.[/red]\n\n"
+        "run this to get set up in ~30 seconds:\n\n"
+        "  [bold]git wtf setup[/bold]\n"
+    )
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        prog="git-wtf",
+        description="AI-powered git assistant. For when git is being git.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=(
+            "commands:\n"
+            "  git wtf              diagnose current repo state\n"
+            "  git wtf merge        resolve merge conflicts with AI\n"
+            "  git wtf setup        configure API key and provider\n"
+        ),
+    )
+
+    parser.add_argument(
+        "command",
+        nargs="?",
+        choices=["merge", "setup"],
+        help="subcommand (omit to diagnose current state)",
+    )
+
+    parser.add_argument(
+        "--version",
+        action="version",
+        version="git-wtf 0.1.0",
+    )
+
+    parser.add_argument(
+        "--dir",
+        metavar="PATH",
+        default=None,
+        help="run as if started in PATH (default: current directory)",
+    )
+
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        help="print resolved config before running",
+    )
+
+    parser.add_argument(
+        "--chaos",
+        action="store_true",
+        help="show chaos level score for the current repo state",
+    )
+
+    parser.add_argument(
+        "--blame",
+        action="store_true",
+        help="show who last touched each conflicted file and who initiated the merge",
+    )
+
+    args = parser.parse_args()
+
+    # ── setup is always available, no config required ────────────────────────
+    if args.command == "setup":
+        from git_wtf.commands.setup import run
+        sys.exit(run())
+
+    # ── debug: show resolved config ──────────────────────────────────────────
+    if args.debug:
+        from git_wtf import config as cfg_module
+        cfg = cfg_module.load()
+        if cfg:
+            console.print(f"\n[dim]config:[/dim]")
+            console.print(f"  provider  : {cfg.provider}")
+            console.print(f"  model     : {cfg.model}")
+            console.print(f"  base_url  : {cfg.base_url or 'sdk default'}")
+            console.print(f"  verify_ssl: {cfg.verify_ssl}")
+            console.print(f"  api_key   : {'set' if cfg.api_key else 'NOT SET'}\n")
+        else:
+            _not_configured_error()
+            sys.exit(1)
+
+    # ── guard: must be configured for all other commands ────────────────────
+    from git_wtf import config as cfg_module
+    if not cfg_module.is_configured():
+        _not_configured_error()
+        sys.exit(1)
+
+    # ── dispatch ─────────────────────────────────────────────────────────────
+    if args.command == "merge":
+        from git_wtf.commands.merge import run
+        sys.exit(run(cwd=args.dir))
+    else:
+        from git_wtf.commands.diagnose import run
+        sys.exit(run(cwd=args.dir, show_chaos=args.chaos, show_blame=args.blame))
+
+
+if __name__ == "__main__":
+    main()