@jonaskahn/relo 0.1.14-beta.50.42407133 → 0.1.14-beta.52.4a559ce0

package/lib/conflict.mjs

@@ -3,8 +3,8 @@
 // installers. Two installs would still fight over the name, the home
 // directory, and the ports, so the install refuses when a command this
 // package did not install answers PATH.
-import { accessSync, constants, existsSync, realpathSync } from 'node:fs';
-import { delimiter, join, resolve, sep } from 'node:path';
+import { accessSync, constants, existsSync, readFileSync, realpathSync } from 'node:fs';
+import { delimiter, dirname, join, resolve, sep } from 'node:path';
 import { homedir } from 'node:os';
 import { execFileSync } from 'node:child_process';
 
@@ -44,11 +44,29 @@ export function findConflictingRelo({
 		if (selfDir && insideDir(candidate, selfDir)) {
 			continue;
 		}
+		if (selfDir && nodePlatform === 'win32' && ownNpmShim(candidate, selfDir)) {
+			continue;
+		}
 		return candidate;
 	}
 	return null;
 }
 
+// npm's Windows command shim is a batch file, not a symlink. Recognize its
+// launcher invocation only; other shim formats remain conflicts until supported.
+function ownNpmShim(candidate, selfDir) {
+	if (!candidate.toLowerCase().endsWith('.cmd')) return false;
+	try {
+		const text = readFileSync(candidate, 'utf8');
+		const match = /"%_prog%"[ \t]+"%dp0%\\([^"\r\n]+)"[ \t]+%\*/i.exec(text);
+		if (!match) return false;
+		const launcher = resolve(dirname(candidate), ...match[1].split('\\'));
+		return realpathSync(launcher) === realpathSync(join(selfDir, 'relo.mjs'));
+	} catch {
+		return false;
+	}
+}
+
 // appBundles lists where the macOS Relo.app may live. The bundle installs
 // no command on PATH, so the PATH search below never sees it, and a stacked
 // install would fight it over the home directory and the ports.

package/lib/progress.mjs

@@ -20,7 +20,7 @@ const BRIGHT = [155, 188, 15];
 // all share this width, so every row ends on the same column.
 const INNER = 76;
 
-let handle;
+let handle = null;
 let tried = false;
 let active = null;
 let frame = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@jonaskahn/relo",
-	"version": "0.1.14-beta.50.42407133",
+	"version": "0.1.14-beta.52.4a559ce0",
 	"description": "One local proxy that lets Codex, Claude Code, Cursor and Grok, etc. Talk to any model, any provider with no config changes",
 	"license": "AGPL-3.0-only",
 	"type": "module",