@miraland-labs/conduit-bridge 0.16.19 → 0.16.20

package/README.md

@@ -2,7 +2,7 @@
 
 Local Bridge CLI for [Conduit](https://github.com/miralandlabs/conduit). Connects a computer to one organization, claims work, and drives a local agent.
 
-**Package version:** `0.16.19` — `ops.env` is enrollment/bootstrap defaults only: an explicit workspace does not inherit an old repository, and project switches do not rewrite global project state. `ops enroll` exchanges a single-use token, registers the machine, binds project affinity, provisions fuel keys, brings detected drivers online, and starts the runner in one command. On Linux, `ops install` refuses any effective systemd drop-in. A switch intent remains queued until the target runner heartbeat proves Bound. After every Bridge publish, operators must re-run `ops install` (LaunchAgent pins an absolute `cli.js`).
+**Package version:** `0.16.20` — `ops disconnect` now asks before it removes the runner service and clears credentials; pass `--yes` to skip the question. `ops.env` is enrollment/bootstrap defaults only: an explicit workspace does not inherit an old repository, and project switches do not rewrite global project state. `ops enroll` exchanges a single-use token, registers the machine, binds project affinity, provisions fuel keys, brings detected drivers online, and starts the runner in one command. On Linux, `ops install` refuses any effective systemd drop-in. A switch intent remains queued until the target runner heartbeat proves Bound. After every Bridge publish, operators must re-run `ops install` (LaunchAgent pins an absolute `cli.js`).
 
 ## Prerequisites
 

package/dist/cli.js

@@ -371,7 +371,7 @@ async function initOps() {
     console.log(`Config file (separate): ${envPath}`);
     console.log("");
     console.log("Works the same on macOS, Linux, and Windows via:");
-    console.log(`  ${bridgeUsage("ops", "<connect|install|switch|online|offline|status|disconnect|uninstall>")}`);
+    console.log(`  ${bridgeUsage("ops", "<connect|install|switch|online|offline|status|doctor|disconnect|uninstall>")}`);
     console.log("");
     console.log("1. Set enrollment/bootstrap defaults once:");
     console.log(`   Create folder: ${configDir}`);

package/dist/ops.js

@@ -6,6 +6,8 @@ import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { stdin as input, stdout as output } from "node:process";
+import { createInterface } from "node:readline/promises";
 import { parseArgs } from "node:util";
 import { ConduitClient } from "./client.js";
 import { loadConfig } from "./config.js";
@@ -51,7 +53,7 @@ export function expandOpsValue(value, home = homedir()) {
     }
     next = next.replace(/%USERPROFILE%/gi, home).replace(/%HOME%/gi, home);
     next = next.replace(/\$HOME\b/g, home).replace(/\$\{HOME\}/g, home);
-    if (next.startsWith("~/") || next === "~")
+    if (next.startsWith("~/") || next.startsWith("~\\") || next === "~")
         next = join(home, next.slice(2));
     return next;
 }
@@ -67,7 +69,12 @@ export function parseOpsEnvFile(text, home = homedir()) {
         const key = line.slice(0, eq).trim();
         if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
             continue;
-        out[key] = expandOpsValue(line.slice(eq + 1), home);
+        // Drop a trailing annotation such as `CONDUIT_WORKSPACE=$HOME/repo # laptop`, so it does not
+        // become part of the path. A quoted value keeps everything inside its quotes, and a `#` with no
+        // space before it stays in the value.
+        const rawValue = line.slice(eq + 1).trim();
+        const quoted = rawValue.startsWith('"') || rawValue.startsWith("'");
+        out[key] = expandOpsValue(quoted ? rawValue : rawValue.replace(/\s+#.*$/, ""), home);
     }
     return out;
 }
@@ -185,6 +192,20 @@ export function shellQuoteArgs(args) {
         return `"${arg.replaceAll('"', '\\"')}"`;
     }).join(" ");
 }
+/** Ask the operator to approve a step that cannot be undone. Non-interactive shells must pass --yes. */
+async function confirmOps(question) {
+    if (!input.isTTY || !output.isTTY) {
+        throw new Error("This step needs confirmation. Re-run with --yes to approve it without a prompt.");
+    }
+    const rl = createInterface({ input, output });
+    try {
+        const answer = (await rl.question(question)).trim().toLowerCase();
+        return answer === "y" || answer === "yes";
+    }
+    finally {
+        rl.close();
+    }
+}
 function defaultRunBridge(args, options = {}) {
     // Re-enter this package's CLI in a child so ops stays a thin orchestrator.
     const cli = process.argv[1];
@@ -205,6 +226,13 @@ export async function runOps(verb, argv = [], deps = {}) {
     const runBridge = deps.runBridge ?? defaultRunBridge;
     const env = deps.env ?? loadOpsEnv();
     if (verb === "disconnect") {
+        // Ask here, not in the child command: this verb also removes the runner service, and the
+        // child's own prompt would come too late to stop that.
+        const approved = argv.includes("--yes") || argv.includes("-y") || await (deps.confirm ?? confirmOps)("Disengage this computer from the organization, remove the runner service, and clear local credentials? [y/N] ");
+        if (!approved) {
+            console.log("Cancelled.");
+            return;
+        }
         runBridge(["uninstall-service"], { allowFail: true });
         runBridge(["disconnect", "--yes"]);
         console.log("Disconnected. Run: npx @miraland-labs/conduit-bridge@latest ops connect");

package/ops/conduit-ops.cmd

@@ -4,5 +4,5 @@ if "%~1"=="" (
   echo Usage: %~nx0 ^<connect^|install^|online^|offline^|status^|doctor^|disconnect^|uninstall^> [args…]
   exit /b 1
 )
-npx --yes @miraland-labs/conduit-bridge@latest ops %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/connect.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use connect.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops connect %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops connect %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/disconnect.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use disconnect.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops disconnect %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops disconnect %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/doctor.cmd

@@ -1,3 +1,3 @@
 @echo off
-npx --yes @miraland-labs/conduit-bridge@latest ops doctor %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops doctor %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/install.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use install.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops install %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops install %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/offline.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use offline.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops offline %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops offline %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/online.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use online.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops online %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops online %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/status.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use status.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops status %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops status %*
 if errorlevel 1 exit /b %errorlevel%

package/ops/uninstall.cmd

@@ -1,4 +1,4 @@
 @echo off
 REM Windows launcher. macOS/Linux: use uninstall.sh
-npx --yes @miraland-labs/conduit-bridge@latest ops uninstall %*
+call npx --yes @miraland-labs/conduit-bridge@latest ops uninstall %*
 if errorlevel 1 exit /b %errorlevel%

package/package.json

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