@miraland-labs/conduit-bridge 0.12.2 → 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/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.2",
+  "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": {