pi-revit 0.1.4 → 0.1.6

package/bin/pi-revit.js

@@ -1,95 +1,95 @@
-#!/usr/bin/env node
-const { spawnSync } = require("node:child_process");
-const fs = require("node:fs");
-const path = require("node:path");
-
-const root = path.resolve(__dirname, "..");
-const scriptsDir = path.join(root, "scripts");
-
-function usage() {
-	console.log(`pi-revit installer\n\nUsage:\n  npx.cmd -y pi-revit\n\nWhat it does on Windows:\n  1. Runs: pi install npm:pi-revit\n  2. Builds and deploys the Revit bridge add-in\n  3. Creates the Documents\\pi-revit workspace and global pi-revit command\n\nClose Revit before running. Revit 2025, 2026, or 2027 and the matching .NET SDK are required.`);
-}
-
-function fail(message) {
-	console.error(`\npi-revit install failed: ${message}`);
-	process.exit(1);
-}
-
-function commandExists(command) {
-	return spawnSync("where.exe", [command], { stdio: "ignore" }).status === 0;
-}
-
-function run(title, command, args) {
-	console.log(`\n==> ${title}`);
-	const result = spawnSync(command, args, { stdio: "inherit", shell: false });
-	if (result.error) fail(`${command} could not be started: ${result.error.message}`);
-	if (result.status !== 0) process.exit(result.status ?? 1);
-}
-
-function runCmd(title, commandLine) {
-	console.log(`\n==> ${title}`);
-	// On Windows, npm/pi are usually .cmd shims. Run them through cmd.exe so PATHEXT
-	// resolution works from npx's Node process just like it does in PowerShell/CMD.
-	const result = spawnSync("cmd.exe", ["/d", "/s", "/c", commandLine], { stdio: "inherit" });
-	if (result.error) fail(`${commandLine} could not be started: ${result.error.message}`);
-	if (result.status !== 0) process.exit(result.status ?? 1);
-}
-
-function runPowerShellScript(scriptName) {
-	const scriptPath = path.join(scriptsDir, scriptName);
-	if (!fs.existsSync(scriptPath)) fail(`missing script: ${scriptPath}`);
-	run(scriptName, "powershell.exe", ["-ExecutionPolicy", "Bypass", "-File", scriptPath]);
-}
-
-function revitIsRunning() {
-	const result = spawnSync(
-		"powershell.exe",
-		["-NoProfile", "-Command", "if (Get-Process Revit -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"],
-		{ stdio: "ignore" },
-	);
-	return result.status === 0;
-}
-
-function waitForEnter() {
-	console.log("\nRevit appears to be running. Close Revit now, then press Enter to continue (or Ctrl+C to cancel).");
-	try {
-		fs.readSync(0, Buffer.alloc(1), 0, 1);
-	} catch {
-		// Non-interactive shell: fall through to the second running check.
-	}
-}
-
-if (process.argv.includes("--help") || process.argv.includes("-h")) {
-	usage();
-	process.exit(0);
-}
-
-if (process.platform !== "win32") {
-	fail("pi-revit's Revit bridge installer supports Windows only.");
-}
-
-if (!commandExists("pi")) {
-	fail("the 'pi' command was not found on PATH. Install Pi first: npm install -g --ignore-scripts @earendil-works/pi-coding-agent");
-}
-
-if (!commandExists("dotnet")) {
-	fail("the 'dotnet' command was not found on PATH. Install the .NET SDK required by your Revit version.");
-}
-
-if (revitIsRunning()) {
-	waitForEnter();
-	if (revitIsRunning()) fail("Revit is still running. Close Revit and run 'npx.cmd -y pi-revit' again.");
-}
-
-console.log("pi-revit full installer");
-console.log("This installs the Pi package, deploys the Revit add-in, and creates the workspace/global command.");
-
-runCmd("Install the Pi package from npm", "pi install npm:pi-revit");
-runPowerShellScript("deploy.ps1");
-runPowerShellScript("setup-workspace.ps1");
-
-console.log("\npi-revit installed.");
-console.log("Next steps:");
-console.log("  1. Start Revit and click Always Load if prompted.");
-console.log("  2. Open a project.");
-console.log("  3. Run: pi-revit");
+#!/usr/bin/env node
+const { spawnSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
+
+const root = path.resolve(__dirname, "..");
+const scriptsDir = path.join(root, "scripts");
+
+function usage() {
+	console.log(`pi-revit installer\n\nUsage:\n  npx.cmd -y pi-revit\n\nWhat it does on Windows:\n  1. Runs: pi install npm:pi-revit\n  2. Builds and deploys the Revit bridge add-in\n  3. Creates the Documents\\pi-revit workspace and global pi-revit command\n\nClose Revit before running. Revit 2025, 2026, or 2027 and the matching .NET SDK are required.`);
+}
+
+function fail(message) {
+	console.error(`\npi-revit install failed: ${message}`);
+	process.exit(1);
+}
+
+function commandExists(command) {
+	return spawnSync("where.exe", [command], { stdio: "ignore" }).status === 0;
+}
+
+function run(title, command, args) {
+	console.log(`\n==> ${title}`);
+	const result = spawnSync(command, args, { stdio: "inherit", shell: false });
+	if (result.error) fail(`${command} could not be started: ${result.error.message}`);
+	if (result.status !== 0) process.exit(result.status ?? 1);
+}
+
+function runCmd(title, commandLine) {
+	console.log(`\n==> ${title}`);
+	// On Windows, npm/pi are usually .cmd shims. Run them through cmd.exe so PATHEXT
+	// resolution works from npx's Node process just like it does in PowerShell/CMD.
+	const result = spawnSync("cmd.exe", ["/d", "/s", "/c", commandLine], { stdio: "inherit" });
+	if (result.error) fail(`${commandLine} could not be started: ${result.error.message}`);
+	if (result.status !== 0) process.exit(result.status ?? 1);
+}
+
+function runPowerShellScript(scriptName) {
+	const scriptPath = path.join(scriptsDir, scriptName);
+	if (!fs.existsSync(scriptPath)) fail(`missing script: ${scriptPath}`);
+	run(scriptName, "powershell.exe", ["-ExecutionPolicy", "Bypass", "-File", scriptPath]);
+}
+
+function revitIsRunning() {
+	const result = spawnSync(
+		"powershell.exe",
+		["-NoProfile", "-Command", "if (Get-Process Revit -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"],
+		{ stdio: "ignore" },
+	);
+	return result.status === 0;
+}
+
+function waitForEnter() {
+	console.log("\nRevit appears to be running. Close Revit now, then press Enter to continue (or Ctrl+C to cancel).");
+	try {
+		fs.readSync(0, Buffer.alloc(1), 0, 1);
+	} catch {
+		// Non-interactive shell: fall through to the second running check.
+	}
+}
+
+if (process.argv.includes("--help") || process.argv.includes("-h")) {
+	usage();
+	process.exit(0);
+}
+
+if (process.platform !== "win32") {
+	fail("pi-revit's Revit bridge installer supports Windows only.");
+}
+
+if (!commandExists("pi")) {
+	fail("the 'pi' command was not found on PATH. Install Pi first: npm install -g --ignore-scripts @earendil-works/pi-coding-agent");
+}
+
+if (!commandExists("dotnet")) {
+	fail("the 'dotnet' command was not found on PATH. Install the .NET SDK required by your Revit version.");
+}
+
+if (revitIsRunning()) {
+	waitForEnter();
+	if (revitIsRunning()) fail("Revit is still running. Close Revit and run 'npx.cmd -y pi-revit' again.");
+}
+
+console.log("pi-revit full installer");
+console.log("This installs the Pi package, deploys the Revit add-in, and creates the workspace/global command.");
+
+runCmd("Install the Pi package from npm", "pi install npm:pi-revit");
+runPowerShellScript("deploy.ps1");
+runPowerShellScript("setup-workspace.ps1");
+
+console.log("\npi-revit installed.");
+console.log("Next steps:");
+console.log("  1. Start Revit and click Always Load if prompted.");
+console.log("  2. Open a project.");
+console.log("  3. Run: pi-revit");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-revit",
-  "version": "0.1.4",
+  "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,14 +40,44 @@ 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
-    $globalCmd = Get-Content (Join-Path $templates 'pi-revit-global.cmd')
-    $globalCmd = $globalCmd -replace '^set "WORKSPACE=.*$', ('set "WORKSPACE=' + $WorkspaceDir + '"')
-    Set-Content -Path (Join-Path $binDir 'pi-revit.cmd') -Value $globalCmd -Encoding Ascii
+    # Literal line swap (no regex): the workspace path may contain characters
+    # like $ that a -replace replacement string would misinterpret.
+    $globalCmd = Get-Content (Join-Path $templates 'pi-revit-global.cmd') | ForEach-Object {
+        if ($_ -like 'set "WORKSPACE=*') { 'set "WORKSPACE=' + $WorkspaceDir + '"' } else { $_ }
+    }
+    # cmd.exe parses .cmd files in the console's OEM code page: write the launcher
+    # in that encoding so workspace paths with non-ASCII characters (user names,
+    # localized folder names) stay intact.
+    Set-Content -Path (Join-Path $binDir 'pi-revit.cmd') -Value $globalCmd -Encoding Oem
     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,36 +54,65 @@ 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).
 Remove-IfExists (Join-Path $env:APPDATA 'RevitBridge') 'bridge runtime folder'
 
-# 4. Pi package registration. Mirror the documented install command exactly:
-#    `pi install ./` stores the package keyed by a path resolved relative to Pi's
-#    settings file, so removal must use the same `./` form from the repo root.
-#    An absolute path may not match the original registration. The repo root is
-#    the parent of this script's folder.
+# 4. Pi package registration. Pi keys a package by its install source: the npm
+#    installer (npx.cmd -y pi-revit) registers `npm:pi-revit`, while an install
+#    from a clone of this repo (`pi install ./`) registers the repo path resolved
+#    from the repo root. Try both forms; each succeeds only for the source that
+#    is actually registered, so a machine with both gets both removed.
 if ($pi) {
     $repoRoot = Split-Path $PSScriptRoot -Parent
     Push-Location $repoRoot
     try {
-        $global:LASTEXITCODE = 0
-        & pi remove ./
-        if ($LASTEXITCODE -eq 0) {
-            Write-Host 'Removed the pi-revit Pi package.' -ForegroundColor Green
+        $removed = @()
+        foreach ($source in @('npm:pi-revit', './')) {
+            $global:LASTEXITCODE = 0
+            & pi remove $source
+            if ($LASTEXITCODE -eq 0) {
+                $removed += $source
+            }
+        }
+        if ($removed.Count -gt 0) {
+            Write-Host "Removed the pi-revit Pi package ($($removed -join ', '))." -ForegroundColor Green
         } else {
-            Write-Warning "pi remove exited with code $LASTEXITCODE; run 'pi remove ./' from this repo manually."
+            Write-Warning "No pi-revit Pi package registration was found. If pi still lists it, run 'pi remove npm:pi-revit' (npm install) or 'pi remove ./' from this repo (install from source)."
         }
     } catch {
-        Write-Warning "Could not auto-remove the Pi package; run 'pi remove ./' from this repo manually. ($_)"
+        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
     }