From ac9587bfdaaba9ec085fafa37f8ae5dfd1f7e288 Mon Sep 17 00:00:00 2001
From: Safi <safishamsi98@gmail.com>
Date: Fri, 15 May 2026 14:09:31 +0100
Subject: [PATCH] Fix antigravity Windows skill and Python detection for
 uv/pipx (#831)

antigravity install on Windows now installs skill-windows.md instead
of skill.md by redirecting to a new antigravity-windows platform config
at install time via sys.platform check.

Python detection in Find-GraphifyPython now uses uv tool dir (respects
UV_TOOL_DIR) and pipx environment --value PIPX_LOCAL_VENVS (respects
PIPX_HOME) instead of guessing from the shim location. The graphify.exe
shim and python.exe live in different directories for both uv and pipx
on Windows so the previous Get-Command approach was wrong.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 graphify/__main__.py      |  8 ++++++
 graphify/skill-windows.md | 58 +++++++++++++++++++++------------------
 2 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/graphify/__main__.py b/graphify/__main__.py
index 48e05ea9..dfdd465a 100644
--- a/graphify/__main__.py
+++ b/graphify/__main__.py
@@ -145,6 +145,11 @@ _PLATFORM_CONFIG: dict[str, dict] = {
         "skill_dst": Path(".agents") / "skills" / "graphify" / "SKILL.md",
         "claude_md": False,
     },
+    "antigravity-windows": {
+        "skill_file": "skill-windows.md",
+        "skill_dst": Path(".agents") / "skills" / "graphify" / "SKILL.md",
+        "claude_md": False,
+    },
     "windows": {
         "skill_file": "skill-windows.md",
         "skill_dst": Path(".claude") / "skills" / "graphify" / "SKILL.md",
@@ -165,6 +170,9 @@ def install(platform: str = "claude") -> None:
     if platform == "cursor":
         _cursor_install(Path("."))
         return
+    # On Windows, antigravity needs the PowerShell skill, not the bash one
+    if platform == "antigravity" and sys.platform == "win32":
+        platform = "antigravity-windows"
     if platform not in _PLATFORM_CONFIG:
         print(
             f"error: unknown platform '{platform}'. Choose from: {', '.join(_PLATFORM_CONFIG)}, gemini, cursor",
diff --git a/graphify/skill-windows.md b/graphify/skill-windows.md
index 98bbe008..449b3600 100644
--- a/graphify/skill-windows.md
+++ b/graphify/skill-windows.md
@@ -68,44 +68,50 @@ New-Item -ItemType Directory -Force -Path graphify-out | Out-Null
 $GRAPHIFY_PYTHON = $null
 
 function Find-GraphifyPython {
-    # graphify.exe and python.exe live in the same Scripts\ dir for both uv tool and pipx installs
-    $cmd = Get-Command graphify -ErrorAction SilentlyContinue
-    if (-not $cmd) { return $null }
-    $candidatePy = Join-Path (Split-Path $cmd.Source) "python.exe"
-    if (-not (Test-Path $candidatePy)) { return $null }
-    & $candidatePy -c "import graphify" 2>$null
-    if ($LASTEXITCODE -eq 0) { return $candidatePy }
+    # 1. uv tool install — 'uv tool dir' is authoritative, respects UV_TOOL_DIR automatically
+    if (Get-Command uv -ErrorAction SilentlyContinue) {
+        $uvDir = (uv tool dir 2>$null).Trim()
+        if ($uvDir) {
+            $py = Join-Path $uvDir "graphifyy\Scripts\python.exe"
+            if (Test-Path $py) {
+                & $py -c "import graphify" 2>$null
+                if ($LASTEXITCODE -eq 0) { return $py }
+            }
+        }
+    }
+    # 2. pipx install — 'pipx environment' respects PIPX_HOME automatically
+    if (Get-Command pipx -ErrorAction SilentlyContinue) {
+        $venvs = (pipx environment --value PIPX_LOCAL_VENVS 2>$null).Trim()
+        if ($venvs) {
+            $py = Join-Path $venvs "graphifyy\Scripts\python.exe"
+            if (Test-Path $py) {
+                & $py -c "import graphify" 2>$null
+                if ($LASTEXITCODE -eq 0) { return $py }
+            }
+        }
+    }
+    # 3. Active venv / conda / pip-into-current-env
+    $pyCmd = Get-Command python -ErrorAction SilentlyContinue
+    if ($pyCmd) {
+        & $pyCmd.Source -c "import graphify" 2>$null
+        if ($LASTEXITCODE -eq 0) {
+            return (& $pyCmd.Source -c "import sys; print(sys.executable)").Trim()
+        }
+    }
     return $null
 }
 
-# 1. Find Python co-located with the graphify binary (uv tool / pipx)
+# Try to find the right Python (uv → pipx → active env)
 $GRAPHIFY_PYTHON = Find-GraphifyPython
 
-# 2. Fall back to bare python if graphify is already importable there
-if (-not $GRAPHIFY_PYTHON) {
-    $pyCmd = Get-Command python -ErrorAction SilentlyContinue
-    if ($pyCmd) {
-        python -c "import graphify" 2>$null
-        if ($LASTEXITCODE -eq 0) {
-            $GRAPHIFY_PYTHON = (python -c "import sys; print(sys.executable)").Trim()
-        }
-    }
-}
-
-# 3. Install if not found anywhere, then re-detect
+# Not found — install then re-detect
 if (-not $GRAPHIFY_PYTHON) {
     if (Get-Command uv -ErrorAction SilentlyContinue) {
         uv tool install --upgrade graphifyy -q 2>&1 | Select-Object -Last 3
     } else {
         pip install graphifyy -q 2>&1 | Select-Object -Last 3
     }
-    # Re-detect after install using the same reliable method
     $GRAPHIFY_PYTHON = Find-GraphifyPython
-    # Last resort: bare python (covers pip-into-active-venv installs)
-    if (-not $GRAPHIFY_PYTHON) {
-        $pyCmd = Get-Command python -ErrorAction SilentlyContinue
-        if ($pyCmd) { $GRAPHIFY_PYTHON = (python -c "import sys; print(sys.executable)").Trim() }
-    }
 }
 
 # Save interpreter path — all subsequent steps read this