@miraland-labs/conduit-bridge 0.16.120 → 0.16.121

package/dist/service.js

@@ -90,7 +90,17 @@ export function applyRunnerToolPath(env = process.env, home = homedir(), nodeBin
     env.PATH = next;
     return next;
 }
-export function launchdPlist(programArguments, stdoutPath, pathEnv = runnerServicePath()) {
+/**
+ * A service must run the installation that installed it. Without this the unit started with the
+ * default configuration directory, so the second lane's service ran the first lane's credentials —
+ * seen on the trial host the moment two lanes existed.
+ */
+export function installationEnvironment(configDirectory = configDir()) {
+    return resolve(configDirectory) === resolve(join(homedir(), ".config", "conduit"))
+        ? {}
+        : { CONDUIT_BRIDGE_CONFIG_DIR: configDirectory };
+}
+export function launchdPlist(programArguments, stdoutPath, pathEnv = runnerServicePath(), environment = {}) {
     const argsXml = programArguments.map((arg) => `    <string>${escapeXml(arg)}</string>`).join("\n");
     return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -106,6 +116,7 @@ ${argsXml}
   <dict>
     <key>PATH</key>
     <string>${escapeXml(pathEnv)}</string>
+${Object.entries(environment).map(([key, value]) => `    <key>${escapeXml(key)}</key>\n    <string>${escapeXml(value)}</string>`).join("\n")}
   </dict>
   <key>RunAtLoad</key>
   <true/>
@@ -119,7 +130,7 @@ ${argsXml}
 </plist>
 `;
 }
-export function systemdUserUnit(programArguments, workingDirectory, pathEnv = runnerServicePath()) {
+export function systemdUserUnit(programArguments, workingDirectory, pathEnv = runnerServicePath(), environment = {}) {
     const execStart = programArguments.map(escapeSystemdExecArgument).join(" ");
     return `[Unit]
 Description=Conduit Bridge runner
@@ -131,6 +142,7 @@ Type=simple
 WorkingDirectory=${escapeSystemdUnitValue(workingDirectory)}
 Environment=PATH=${escapeSystemdUnitValue(pathEnv)}
 Environment=CONDUIT_RUNNER_SERVICE=systemd
+${Object.entries(environment).map(([key, value]) => `Environment=${key}=${escapeSystemdUnitValue(value)}`).join("\n")}
 ExecStart=${execStart}
 Restart=always
 RestartSec=5
@@ -390,7 +402,7 @@ export async function installRunnerService(options = {}) {
         const log = logPath(serviceName);
         await mkdir(dirname(plistPath), { recursive: true });
         await mkdir(dirname(log), { recursive: true });
-        await writeFile(plistPath, launchdPlist(programArguments, log), { mode: 0o644 });
+        await writeFile(plistPath, launchdPlist(programArguments, log, runnerServicePath(), installationEnvironment()), { mode: 0o644 });
         const domain = `gui/${process.getuid?.() ?? 501}`;
         let loaded = false;
         if (runningInsideRunnerLaunchAgent()) {
@@ -430,7 +442,7 @@ export async function installRunnerService(options = {}) {
     }
     await mkdir(dirname(unitPath), { recursive: true });
     await mkdir(linuxLogDir(), { recursive: true });
-    await writeFile(unitPath, systemdUserUnit(programArguments, configDir()), { mode: 0o644 });
+    await writeFile(unitPath, systemdUserUnit(programArguments, configDir(), runnerServicePath(), installationEnvironment()), { mode: 0o644 });
     run("systemctl", ["--user", "daemon-reload"]);
     for (const args of systemdActivationCommands(runningInsideRunnerSystemd(), serviceName)) {
         run("systemctl", args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miraland-labs/conduit-bridge",
-  "version": "0.16.120",
+  "version": "0.16.121",
   "description": "Conduit Bridge CLI \u2014 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": {