embedlabs 0.1.0-alpha.104 → 0.1.0-alpha.105

package/README.md

@@ -7,4 +7,4 @@ npm install -g embedlabs@alpha
 embedlabs --help
 ```
 
-This package forwards to `@kvell007/embed-labs-cli@0.1.0-alpha.104`.
+This package forwards to `@kvell007/embed-labs-cli@0.1.0-alpha.105`.

package/bin/install-progress.js

@@ -1,9 +1,16 @@
 #!/usr/bin/env node
-import { writeFileSync } from "node:fs";
+import { spawnSync } from "node:child_process";
+import { chmodSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { arch, platform } from "node:os";
+import { basename, dirname, join } from "node:path";
 
 const phase = process.argv[2] ?? "postinstall";
 const target = `${platform()}-${arch()}`;
+if (phase === "preinstall") {
+  cleanupWindowsInstallState();
+} else {
+  installCommandShim();
+}
 const steps = phase === "preinstall"
   ? [
       [5, `install: initializing (${target})`],
@@ -48,6 +55,109 @@ function writeProgress(percent, message) {
   }
 }
 
+function cleanupWindowsInstallState() {
+  stopOldBridgeProcess();
+  deleteLegacyBridgeScheduledTask();
+  cleanupOldCommandShims();
+}
+
+function stopOldBridgeProcess() {
+  if (platform() !== "win32") {
+    return;
+  }
+  for (const imageName of ["embed-local-bridge.exe", "embed-local-bridge-fixed.exe"]) {
+    spawnSync("taskkill.exe", ["/IM", imageName, "/F"], { stdio: "ignore" });
+  }
+}
+
+function deleteLegacyBridgeScheduledTask() {
+  if (platform() !== "win32") {
+    return;
+  }
+  spawnSync("schtasks.exe", ["/Delete", "/TN", "EmbedLabsLocalBridge", "/F"], { stdio: "ignore" });
+}
+
+function cleanupOldCommandShims() {
+  const prefix = process.env.npm_config_prefix;
+  if (!prefix) {
+    return;
+  }
+  for (const candidate of commandShimCandidates(prefix)) {
+    const filePath = join(prefix, candidate);
+    if (!existsSync(filePath) || !isEmbedLabsShim(filePath)) {
+      continue;
+    }
+    try {
+      rmSync(filePath, { force: true });
+      writeProgress(3, `install: removed stale command shim (${basename(filePath)})`);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new Error(`stale EmbedLabs command shim is locked: ${filePath}; close running terminals or processes and retry npm install. ${message}`);
+    }
+  }
+}
+
+function commandShimCandidates(prefix) {
+  if (platform() === "win32") {
+    return ["embedlabs", "embedlabs.cmd", "embedlabs.ps1", "embedlabs.bat"];
+  }
+  return [join("bin", "embedlabs")];
+}
+
+function isEmbedLabsShim(filePath) {
+  try {
+    const body = readFileSync(filePath, "utf8").toLowerCase();
+    return body.includes("embedlabs")
+      && (
+        body.includes("@kvell007\\embed-labs-cli")
+        || body.includes("@kvell007/embed-labs-cli")
+        || body.includes("node_modules\\embedlabs")
+        || body.includes("node_modules/embedlabs")
+        || body.includes("embed-labs-cli")
+      );
+  } catch {
+    return false;
+  }
+}
+
+function installCommandShim() {
+  const prefix = process.env.npm_config_prefix;
+  if (!prefix) {
+    return;
+  }
+  cleanupOldCommandShims();
+  if (platform() === "win32") {
+    const target = join(prefix, "embedlabs.cmd");
+    writeFileSync(target, windowsCmdShim(), "utf8");
+    writeProgress(90, "install: command ready (embedlabs.cmd)");
+    return;
+  }
+  const target = join(prefix, "bin", "embedlabs");
+  mkdirSync(dirname(target), { recursive: true });
+  writeFileSync(target, unixShellShim(), "utf8");
+  chmodSync(target, 0o755);
+  writeProgress(90, "install: command ready (embedlabs)");
+}
+
+function windowsCmdShim() {
+  return [
+    "@ECHO off",
+    "SETLOCAL",
+    "SET \"EMBEDLABS_ALIAS_DIR=%~dp0\"",
+    "node \"%EMBEDLABS_ALIAS_DIR%node_modules\\embedlabs\\bin\\embedlabs.js\" %*",
+    ""
+  ].join("\r\n");
+}
+
+function unixShellShim() {
+  return [
+    "#!/bin/sh",
+    "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")",
+    "exec node \"$basedir/../lib/node_modules/embedlabs/bin/embedlabs.js\" \"$@\"",
+    ""
+  ].join("\n");
+}
+
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "embedlabs",
-  "version": "0.1.0-alpha.104",
+  "version": "0.1.0-alpha.105",
   "description": "EmbedLabs CLI alias package for local-first embedded agent testing.",
   "private": false,
   "type": "module",
-  "bin": {
-    "embedlabs": "bin/embedlabs.js"
-  },
   "scripts": {
     "preinstall": "node bin/install-progress.js preinstall",
     "postinstall": "node bin/install-progress.js postinstall"
@@ -16,7 +13,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@kvell007/embed-labs-cli": "0.1.0-alpha.104"
+    "@kvell007/embed-labs-cli": "0.1.0-alpha.105"
   },
   "publishConfig": {
     "access": "public",