pi-revit 0.1.5 → 0.1.7

package/README.md

@@ -70,10 +70,10 @@ pi install npm:pi-revit
 cd "$env:USERPROFILE\.pi\agent\npm\node_modules\pi-revit"
 
 # 3. Build + deploy the Revit add-in (RevitBridge.dll + the Roslyn DLLs for execute_csharp).
-npm run deploy
+npm.cmd run deploy
 
 # 4. Create the workspace and global pi-revit command.
-npm run setup
+npm.cmd run setup
 ```
 
 For a non-default Revit install location, use the PowerShell deploy script directly and pass
@@ -111,7 +111,7 @@ That's all. Pi starts with the Revit tools ready:
 > select all structural columns
 ```
 
-**How this works:** install step 3 placed a small `pi-revit` command in the same folder as the
+**How this works:** the setup step placed a small `pi-revit` command in the same folder as the
 `pi` command itself. That folder is on your system PATH — which is exactly why *every* terminal
 finds `pi-revit`, with no extra configuration. When you run it, it switches to your workspace at
 `Documents\pi-revit` and starts Pi there, so your conventions file (`AGENTS.md`) loads
@@ -165,12 +165,11 @@ Plain `pi` from any folder also works; `pi-revit` just adds the right working fo
 
 ### npm install
 
-Close Revit, then in PowerShell:
+Close Revit, then in PowerShell — from any folder **outside** the installed package (Windows
+cannot delete a folder your shell is standing in):
 
 ```powershell
-cd "$env:USERPROFILE\.pi\agent\npm\node_modules\pi-revit"
-powershell -ExecutionPolicy Bypass -File scripts\uninstall.ps1
-pi remove npm:pi-revit
+powershell -ExecutionPolicy Bypass -File "$env:USERPROFILE\.pi\agent\npm\node_modules\pi-revit\scripts\uninstall.ps1"
 ```
 
 ### Source install
@@ -182,9 +181,9 @@ powershell -ExecutionPolicy Bypass -File scripts\uninstall.ps1
 ```
 
 This removes the Revit bridge add-in (every installed Revit version), the global `pi-revit`
-command, and the bridge runtime folder (`%APPDATA%\RevitBridge\`). It also removes the Pi
-package registration for source installs; npm installs should additionally run
-`pi remove npm:pi-revit` as shown above. Your workspace at `Documents\pi-revit` (notes + session
+command, the bridge runtime folder (`%APPDATA%\RevitBridge\`), and the Pi package registration
+(it tries both the npm and the source-install form, so no extra `pi remove` is needed for
+either install kind). Your workspace at `Documents\pi-revit` (notes + session
 history) is **preserved** — add `-RemoveWorkspace` to delete it too, or `-RevitVersion 2026` to
 target a single Revit version. Pi itself is left installed; remove it with
 `npm uninstall -g @earendil-works/pi-coding-agent` if you want.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-revit",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Native Pi connector for Autodesk Revit. Run npx.cmd -y pi-revit for the full Windows install.",
   "author": "Ahmad Altahlawi",
   "license": "MIT",

package/scripts/setup-workspace.ps1

@@ -40,7 +40,31 @@ Write-Host "Workspace ready: $WorkspaceDir" -ForegroundColor Green
 
 # 2. Global pi-revit command next to pi (that directory is on PATH by definition).
 #    The template's workspace path is rewritten to honor -WorkspaceDir.
-$pi = Get-Command pi -ErrorAction SilentlyContinue
+#    Under `npx pi-revit`, npx prepends its ephemeral cache's node_modules\.bin to
+#    PATH, and that folder holds a pi shim pulled in via peerDependencies. A launcher
+#    written next to that shim lands in a folder that is neither on the user's own
+#    PATH nor long-lived, so skip pi entries inside this package's node_modules tree
+#    or any npx cache and use the user's permanent pi instead.
+function Get-PermanentPiCommand {
+    # Long-form both sides of the prefix comparison: PATH entries may carry 8.3
+    # short names (AHMAD~1.TAH) while $PSScriptRoot is normalized, and a form
+    # mismatch would silently defeat the own-tree exclusion.
+    function Resolve-LongPath([string]$p) {
+        try { (Get-Item -LiteralPath $p -ErrorAction Stop).FullName } catch { $p }
+    }
+    $ownTree = $null
+    $repoRoot = Resolve-LongPath (Split-Path $PSScriptRoot -Parent)
+    $idx = $repoRoot.LastIndexOf('\node_modules\', [StringComparison]::OrdinalIgnoreCase)
+    if ($idx -ge 0) { $ownTree = $repoRoot.Substring(0, $idx + '\node_modules\'.Length) }
+    Get-Command pi -All -ErrorAction SilentlyContinue | Where-Object {
+        if (-not $_.Source) { return $false }
+        $src = Resolve-LongPath $_.Source
+        ($src -notmatch '\\_npx\\') -and
+        (-not $ownTree -or -not $src.StartsWith($ownTree, [StringComparison]::OrdinalIgnoreCase))
+    } | Select-Object -First 1
+}
+
+$pi = Get-PermanentPiCommand
 if ($pi) {
     $binDir = Split-Path $pi.Source -Parent
     # Literal line swap (no regex): the workspace path may contain characters
@@ -55,5 +79,5 @@ if ($pi) {
     Write-Host "Global command installed: $(Join-Path $binDir 'pi-revit.cmd')" -ForegroundColor Green
     Write-Host 'Run pi-revit from any terminal (pi-revit <project> for a project folder).'
 } else {
-    Write-Warning 'pi command not found on PATH. Install Pi first (npm install -g --ignore-scripts @earendil-works/pi-coding-agent), then re-run this script to get the global pi-revit command.'
+    Write-Warning 'No permanent pi command found on PATH. Install Pi first (npm install -g --ignore-scripts @earendil-works/pi-coding-agent), then run npx.cmd -y pi-revit again (or re-run this script) to get the global pi-revit command.'
 }

package/scripts/uninstall.ps1

@@ -54,13 +54,36 @@ foreach ($v in $versions) {
     Remove-IfExists (Join-Path $dir 'RevitBridge')       "Revit $v add-in folder"
 }
 
-# 2. Global pi-revit command next to pi.
+# 2. Global pi-revit command next to the user's permanent pi. When this script runs
+#    from an npx cache or a node_modules copy, PATH may lead Get-Command to a pi shim
+#    inside that ephemeral tree first (see setup-workspace.ps1) — the launcher was
+#    never installed there, so resolve the permanent pi the same way setup does.
+function Get-PermanentPiCommand {
+    # Long-form both sides of the prefix comparison: PATH entries may carry 8.3
+    # short names (AHMAD~1.TAH) while $PSScriptRoot is normalized, and a form
+    # mismatch would silently defeat the own-tree exclusion.
+    function Resolve-LongPath([string]$p) {
+        try { (Get-Item -LiteralPath $p -ErrorAction Stop).FullName } catch { $p }
+    }
+    $ownTree = $null
+    $repoRoot = Resolve-LongPath (Split-Path $PSScriptRoot -Parent)
+    $idx = $repoRoot.LastIndexOf('\node_modules\', [StringComparison]::OrdinalIgnoreCase)
+    if ($idx -ge 0) { $ownTree = $repoRoot.Substring(0, $idx + '\node_modules\'.Length) }
+    Get-Command pi -All -ErrorAction SilentlyContinue | Where-Object {
+        if (-not $_.Source) { return $false }
+        $src = Resolve-LongPath $_.Source
+        ($src -notmatch '\\_npx\\') -and
+        (-not $ownTree -or -not $src.StartsWith($ownTree, [StringComparison]::OrdinalIgnoreCase))
+    } | Select-Object -First 1
+}
+
 $pi = Get-Command pi -ErrorAction SilentlyContinue
-if ($pi) {
-    $binDir = Split-Path $pi.Source -Parent
+$piPermanent = Get-PermanentPiCommand
+if ($piPermanent) {
+    $binDir = Split-Path $piPermanent.Source -Parent
     Remove-IfExists (Join-Path $binDir 'pi-revit.cmd') 'global pi-revit command'
 } else {
-    Write-Host 'pi not found on PATH; skipping the global pi-revit command.'
+    Write-Host 'No permanent pi found on PATH; skipping the global pi-revit command.'
 }
 
 # 3. Bridge runtime folder (connection token; recreated on each Revit start).
@@ -73,14 +96,30 @@ Remove-IfExists (Join-Path $env:APPDATA 'RevitBridge') 'bridge runtime folder'
 #    is actually registered, so a machine with both gets both removed.
 if ($pi) {
     $repoRoot = Split-Path $PSScriptRoot -Parent
-    Push-Location $repoRoot
+    # When this script runs from the npm-installed copy, `pi remove npm:pi-revit`
+    # deletes the very folder the script lives in — and Windows fails that delete
+    # (EBUSY) while any working directory sits inside it. Step our own process out
+    # if needed; the calling shell's location we can only warn about.
+    if ($repoRoot -match '\\node_modules\\' -and
+        (Get-Location).Path.StartsWith($repoRoot, [StringComparison]::OrdinalIgnoreCase)) {
+        Set-Location $env:SystemRoot
+        Write-Warning "This PowerShell was started inside $repoRoot. If the package removal below fails, run 'cd \' in your shell and re-run the uninstall."
+    }
     try {
         $removed = @()
-        foreach ($source in @('npm:pi-revit', './')) {
-            $global:LASTEXITCODE = 0
-            & pi remove $source
-            if ($LASTEXITCODE -eq 0) {
-                $removed += $source
+        # './' resolves against the repo root, so it runs from there — and first,
+        # while this folder is guaranteed to still exist. 'npm:pi-revit' then runs
+        # from a neutral directory so no working directory blocks the folder delete.
+        foreach ($source in @('./', 'npm:pi-revit')) {
+            Push-Location $(if ($source -eq './') { $repoRoot } else { $env:SystemRoot })
+            try {
+                $global:LASTEXITCODE = 0
+                & pi remove $source
+                if ($LASTEXITCODE -eq 0) {
+                    $removed += $source
+                }
+            } finally {
+                Pop-Location
             }
         }
         if ($removed.Count -gt 0) {
@@ -90,8 +129,6 @@ if ($pi) {
         }
     } catch {
         Write-Warning "Could not auto-remove the Pi package; run 'pi remove npm:pi-revit' (npm install) or 'pi remove ./' from this repo (install from source). ($_)"
-    } finally {
-        Pop-Location
     }
 }