@kvell007/embed-labs-cli 0.1.0-alpha.75 → 0.1.0-alpha.77

package/dist/index.js

@@ -7,7 +7,6 @@ import { createRequire } from "node:module";
 import { homedir, tmpdir } from "node:os";
 import { basename, delimiter, dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { startServer } from "@embed-labs/local-bridge";
 import { composeBootLogoPackage } from "./image-compose.js";
 import { buildTaishanPiQtSmoke, compileTaishanPiSingleFile, currentLocalToolchain, installLocalToolchain, latestLocalToolchain, validateLocalToolchain } from "./local-toolchain.js";
 import { fail, ok } from "@embed-labs/protocol";
@@ -147,11 +146,20 @@ async function main(argv) {
             return output(parsed, await bridgePost("/v1/board/taishanpi/deploy", request), renderBoardDeployResult);
         }
         if (area === "bridge" && action === "start") {
-            startServer({
-                host: stringFlag(parsed, "host"),
-                port: numberFlag(parsed, "port")
+            const launcher = await resolveBridgeLauncher();
+            const args = [
+                ...launcher.args,
+                ...(stringFlag(parsed, "host") ? ["--host", stringFlag(parsed, "host")] : []),
+                ...(numberFlag(parsed, "port") ? ["--port", String(numberFlag(parsed, "port"))] : [])
+            ];
+            const child = spawn(launcher.command, args, {
+                cwd: process.cwd(),
+                env: process.env,
+                stdio: "inherit"
+            });
+            return await new Promise((resolveExit) => {
+                child.on("close", (code) => resolveExit(code ?? 0));
             });
-            return await waitForever();
         }
         if (area === "bridge" && action === "status") {
             return output(parsed, await bridgeGet("/healthz"), renderBridgeStatus);
@@ -1559,7 +1567,7 @@ async function installOpenCodePlugin(parsed, context) {
     }
     await mkdir(join(targetRoot, "plugins"), { recursive: true });
     const packagePath = await prepareOpenCodePackageForInstall(targetRoot, source.data.packagePath);
-    const npmResult = await runLocalProcess("npm", [
+    const npmResult = await runLocalProcess(await resolveNpmExecutable(), [
         "install",
         "--prefix",
         targetRoot,
@@ -1641,7 +1649,7 @@ async function resolveOpenCodePluginSource(context) {
             remediation: "Run from the Embed-Labs-Cloud repo root or pass --release-dir pointing to a plugin release directory."
         });
     }
-    const packed = await runLocalProcess("npm", ["pack", packagePath, "--pack-destination", context.tempDir, "--json"]);
+    const packed = await runLocalProcess(await resolveNpmExecutable(), ["pack", packagePath, "--pack-destination", context.tempDir, "--json"]);
     if (packed.code !== 0) {
         return fail("opencode_plugin_pack_failed", "npm pack failed while preparing the OpenCode plugin source package.", {
             details: {
@@ -1972,6 +1980,55 @@ async function resolveExecutableOnPath(name) {
     }
     return undefined;
 }
+async function resolveNpmExecutable() {
+    const candidate = process.platform === "win32" ? "npm.cmd" : "npm";
+    return await resolveExecutableOnPath(candidate) ?? candidate;
+}
+async function resolveBridgeLauncher() {
+    const explicitBinary = process.env.EMBED_LOCAL_BRIDGE_BINARY?.trim();
+    if (explicitBinary) {
+        try {
+            await access(explicitBinary, constants.X_OK);
+            return { command: explicitBinary, args: [] };
+        }
+        catch {
+            // Fall through so the package launcher can print its clearer repair message.
+        }
+    }
+    const pathBinary = await resolveExecutableOnPath(process.platform === "win32" ? "embed-local-bridge.cmd" : "embed-local-bridge");
+    if (pathBinary) {
+        return { command: pathBinary, args: [] };
+    }
+    const packageLauncher = await resolveBridgePackageLauncher();
+    if (packageLauncher) {
+        return { command: process.execPath, args: [packageLauncher] };
+    }
+    return {
+        command: process.execPath,
+        args: [resolve(SOURCE_CHECKOUT_ROOT, "packages", "local-bridge", "dist", "index.js")]
+    };
+}
+async function resolveBridgePackageLauncher() {
+    const candidates = [];
+    try {
+        const packageJson = require.resolve("@embed-labs/local-bridge/package.json");
+        candidates.push(join(dirname(packageJson), "dist", "index.js"));
+    }
+    catch {
+        // Source checkout fallback below.
+    }
+    candidates.push(resolve(SOURCE_CHECKOUT_ROOT, "packages", "local-bridge", "dist", "index.js"));
+    for (const candidate of candidates) {
+        try {
+            await access(candidate, constants.R_OK);
+            return candidate;
+        }
+        catch {
+            // Keep looking.
+        }
+    }
+    return undefined;
+}
 function defaultOpenCodeRoot() {
     return join(process.cwd(), ".opencode");
 }