pi-revit 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-revit",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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).