@miraland-labs/conduit-bridge 0.12.1 → 0.12.3

package/dist/ops.js

@@ -310,14 +310,43 @@ export async function runOps(verb, argv = [], deps = {}) {
         return;
     }
     if (verb === "connect") {
-        if (!env.CONDUIT_URL)
-            throw new Error(`Set CONDUIT_URL in ${defaultOpsEnvPath()}`);
-        const args = ["join", "--url", env.CONDUIT_URL];
-        if (env.CONDUIT_ORG)
-            args.push("--organization", env.CONDUIT_ORG);
+        const { values } = parseArgs({
+            args: argv,
+            options: {
+                organization: { type: "string", short: "o" },
+                url: { type: "string" },
+            },
+            allowPositionals: true,
+        });
+        const url = (values.url?.trim() || env.CONDUIT_URL).trim();
+        if (!url)
+            throw new Error(`Set CONDUIT_URL in ${defaultOpsEnvPath()} or pass --url`);
+        // Never silently reuse CONDUIT_ORG from ops.env — a leftover public-org slug skipped
+        // "Join which org?" and enrolled the wrong workspace. Pass --organization explicitly, or
+        // omit it so join prompts interactively (and suggest the prior slug when present).
+        const organization = values.organization?.trim().toLowerCase() || "";
+        if (organization && !/^[a-z0-9][a-z0-9-]{0,62}$/.test(organization)) {
+            throw new Error("Organization must be its lowercase workspace slug");
+        }
+        const envPath = env.loadedFrom ?? defaultOpsEnvPath();
+        writeOpsEnvFile(envPath, {
+            CONDUIT_URL: url,
+            ...(organization ? { CONDUIT_ORG: organization } : {}),
+        });
+        const args = ["join", "--url", url];
+        if (organization)
+            args.push("--organization", organization);
         for (const role of splitOpsList(env.CONDUIT_ROLES))
             args.push("--capability", role);
-        console.log(`Connecting to ${env.CONDUIT_URL} (roles: ${env.CONDUIT_ROLES})`);
+        console.log(`Connecting to ${url} (roles: ${env.CONDUIT_ROLES})`);
+        if (organization) {
+            console.log(`Organization: ${organization}`);
+        }
+        else {
+            console.log(env.CONDUIT_ORG
+                ? `Organization not set on the command — join will ask. (ops.env still has ${env.CONDUIT_ORG}; type the slug you want now.)`
+                : "Organization not set — join will ask which org to connect.");
+        }
         console.log("Approve this computer in Connect when the browser opens.");
         runBridge(args);
         return;

package/dist/service.js

@@ -128,11 +128,55 @@ function shellQuote(value) {
  * the next line never ran, and the machine stayed Binding incomplete with the service unloaded.
  * The swap therefore runs in a detached helper that survives the bootout; failures append to the
  * runner log.
+ *
+ * Interactive `ops install` from a terminal must NOT use only the detached path: on some macOS
+ * hosts `launchctl bootstrap` returns EIO (5) from the helper while an in-process bootstrap of the
+ * same plist succeeds. Prefer a synchronous reload when we are not inside the runner service.
+ * Deprecated `launchctl load -w` also returns EIO on modern macOS — use enable + kickstart instead.
  */
 export function launchdSwapCommand(domain, plistPath, log) {
     const plist = shellQuote(plistPath);
     const logQ = shellQuote(log);
-    return `sleep 1; launchctl bootout ${domain}/${SERVICE_LABEL} 2>>${logQ}; launchctl bootstrap ${domain} ${plist} 2>>${logQ} || launchctl load -w ${plist} 2>>${logQ}`;
+    const label = `${domain}/${SERVICE_LABEL}`;
+    return [
+        "sleep 1",
+        `launchctl bootout ${label} 2>>${logQ}`,
+        `launchctl bootstrap ${domain} ${plist} 2>>${logQ}`,
+        `launchctl enable ${label} 2>>${logQ}`,
+        `launchctl kickstart -k ${label} 2>>${logQ}`,
+    ].join("; ");
+}
+function launchdServiceLoaded(domain) {
+    return spawnSync("launchctl", ["print", `${domain}/${SERVICE_LABEL}`], { encoding: "utf8" }).status === 0;
+}
+function sleepMs(ms) {
+    return new Promise((resolveSleep) => setTimeout(resolveSleep, ms));
+}
+/** True when this process is the LaunchAgent we are about to boot out. */
+export function runningInsideRunnerLaunchAgent() {
+    return process.env.XPC_SERVICE_NAME === SERVICE_LABEL;
+}
+/**
+ * Boot out (ignore miss), bootstrap with retries, then enable + kickstart.
+ * Returns whether `launchctl print` sees the service.
+ */
+export function reloadLaunchdRunnerSync(domain, plistPath) {
+    const label = `${domain}/${SERVICE_LABEL}`;
+    spawnSync("launchctl", ["bootout", label], { encoding: "utf8" });
+    for (let attempt = 0; attempt < 6; attempt++) {
+        const boot = spawnSync("launchctl", ["bootstrap", domain, plistPath], { encoding: "utf8" });
+        if (boot.status === 0 || launchdServiceLoaded(domain))
+            break;
+        spawnSync("launchctl", ["bootout", label], { encoding: "utf8" });
+        // Brief backoff — EIO (5) is often transient right after bootout.
+        const start = Date.now();
+        while (Date.now() - start < 400 * (attempt + 1)) {
+            /* spin */
+        }
+    }
+    spawnSync("launchctl", ["enable", label], { encoding: "utf8" });
+    spawnSync("launchctl", ["kickstart", "-k", label], { encoding: "utf8" });
+    return launchdServiceLoaded(domain);
 }
 export async function installRunnerService(options = {}) {
     const host = platform();
@@ -145,16 +189,25 @@ export async function installRunnerService(options = {}) {
         await mkdir(dirname(plistPath), { recursive: true });
         await mkdir(dirname(logPath()), { recursive: true });
         await writeFile(plistPath, launchdPlist(programArguments, logPath()), { mode: 0o644 });
-        // Detached helper (bootout → bootstrap → load fallback): see launchdSwapCommand for why the
-        // swap must survive this process dying at bootout.
         const domain = `gui/${process.getuid?.() ?? 501}`;
-        spawn("/bin/sh", ["-c", launchdSwapCommand(domain, plistPath, logPath())], { detached: true, stdio: "ignore" }).unref();
-        // Confirm the reloaded service when this process survives to see it (an interactive install).
-        // A self-replacing runner dies at the helper's bootout and the helper still finishes the swap.
         let loaded = false;
-        for (let attempt = 0; attempt < 16 && !loaded; attempt++) {
-            await new Promise((resolveSleep) => setTimeout(resolveSleep, attempt === 0 ? 2000 : 500));
-            loaded = spawnSync("launchctl", ["print", `${domain}/${SERVICE_LABEL}`], { encoding: "utf8" }).status === 0;
+        if (runningInsideRunnerLaunchAgent()) {
+            // Detached helper must survive bootout of this process.
+            spawn("/bin/sh", ["-c", launchdSwapCommand(domain, plistPath, logPath())], { detached: true, stdio: "ignore" }).unref();
+            for (let attempt = 0; attempt < 20 && !loaded; attempt++) {
+                await sleepMs(attempt === 0 ? 2000 : 500);
+                loaded = launchdServiceLoaded(domain);
+            }
+        }
+        else {
+            // Interactive ops install: reload in-process (avoids helper EIO flakiness).
+            loaded = reloadLaunchdRunnerSync(domain, plistPath);
+            for (let attempt = 0; attempt < 10 && !loaded; attempt++) {
+                await sleepMs(500);
+                loaded = launchdServiceLoaded(domain);
+                if (!loaded)
+                    loaded = reloadLaunchdRunnerSync(domain, plistPath);
+            }
         }
         if (!loaded)
             throw new Error(`launchd did not load ${SERVICE_LABEL}; see ${logPath()}`);

package/ops/env.example

@@ -8,6 +8,9 @@
 #
 # Replace the placeholders below with YOUR org, local checkout, and (optional) git remote.
 CONDUIT_URL=https://api.conduit.miraland.io
+# Leave CONDUIT_ORG unset so `ops connect` asks "Join which org?".
+# Or pass once: ops connect --organization your-org-slug
+# Prefer the Connect UI join command (includes the org you are signed into).
 # CONDUIT_ORG=your-org-slug
 CONDUIT_WORKSPACE=$HOME/path/to/your-repo
 # CONDUIT_REPO=https://github.com/your-org/your-repo.git

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraland-labs/conduit-bridge",
-  "version": "0.12.1",
+  "version": "0.12.3",
   "description": "Conduit Bridge CLI — join, connect, disconnect, multi-driver lanes, and run Claude Code / Codex / Cursor / OpenCode / Pi / Kiro / Antigravity agents for a Conduit organization",
   "type": "module",
   "bin": {