@miraland-labs/conduit-bridge 0.16.1 → 0.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +2 -1
- package/dist/service.js +18 -2
- package/package.json +1 -1
package/dist/cli.js
CHANGED
|
@@ -18,7 +18,7 @@ import { ensureCheckout } from "./checkout.js";
|
|
|
18
18
|
import { maybeApplyOnShiftIntent } from "./on-shift-apply.js";
|
|
19
19
|
import { loadOpsEnv, OPS_VERBS, runOps } from "./ops.js";
|
|
20
20
|
import { pumpExecutionSlots, renewLeases } from "./execution.js";
|
|
21
|
-
import { installRunnerService, uninstallRunnerService } from "./service.js";
|
|
21
|
+
import { applyRunnerToolPath, installRunnerService, uninstallRunnerService } from "./service.js";
|
|
22
22
|
import { BRIDGE_PROTOCOL_VERSION, cachedBridgePreflight, unavailableWorkspacePreflight } from "./preflight.js";
|
|
23
23
|
import { executeNextInvestigation } from "./investigation.js";
|
|
24
24
|
import { bridgeVersion } from "./version.js";
|
|
@@ -454,6 +454,7 @@ async function driversCommand() {
|
|
|
454
454
|
throw new Error(`Usage: ${bridgeUsage("drivers", "[list|online|offline|fuel]", "…")}`);
|
|
455
455
|
}
|
|
456
456
|
async function runner() {
|
|
457
|
+
applyRunnerToolPath();
|
|
457
458
|
const { values } = parseArgs({ args: process.argv.slice(3), options: {
|
|
458
459
|
workspace: { type: "string" }, interval: { type: "string" }, once: { type: "boolean" },
|
|
459
460
|
"agent-timeout-minutes": { type: "string" }, fuel: { type: "string" }, "ensure-checkout": { type: "string" },
|
package/dist/service.js
CHANGED
|
@@ -33,13 +33,14 @@ export function runnerProgramArguments(options = {}) {
|
|
|
33
33
|
return args;
|
|
34
34
|
}
|
|
35
35
|
/**
|
|
36
|
-
* PATH for LaunchAgent/systemd so agent CLIs in ~/.local/bin
|
|
37
|
-
* without the operator hand-editing the unit.
|
|
36
|
+
* PATH for LaunchAgent/systemd so agent CLIs in ~/.local/bin, rustup cargo,
|
|
37
|
+
* and Homebrew resolve without the operator hand-editing the unit.
|
|
38
38
|
*/
|
|
39
39
|
export function runnerServicePath(home = homedir(), nodeBin = dirname(process.execPath)) {
|
|
40
40
|
const parts = [
|
|
41
41
|
nodeBin,
|
|
42
42
|
join(home, ".local", "bin"),
|
|
43
|
+
join(home, ".cargo", "bin"),
|
|
43
44
|
"/opt/homebrew/bin",
|
|
44
45
|
"/usr/local/bin",
|
|
45
46
|
"/usr/bin",
|
|
@@ -49,6 +50,21 @@ export function runnerServicePath(home = homedir(), nodeBin = dirname(process.ex
|
|
|
49
50
|
];
|
|
50
51
|
return [...new Set(parts.filter(Boolean))].join(":");
|
|
51
52
|
}
|
|
53
|
+
/**
|
|
54
|
+
* Merge the install-service PATH into this process so `cargo` / agent CLIs resolve
|
|
55
|
+
* even when a stale LaunchAgent plist omitted them. Call at runner boot — not a
|
|
56
|
+
* per-machine hand edit.
|
|
57
|
+
*/
|
|
58
|
+
export function applyRunnerToolPath(env = process.env, home = homedir(), nodeBin = dirname(process.execPath)) {
|
|
59
|
+
if (platform() === "win32")
|
|
60
|
+
return env.PATH ?? env.Path ?? "";
|
|
61
|
+
const current = env.PATH ?? "";
|
|
62
|
+
const seen = new Set(current.split(":").filter(Boolean));
|
|
63
|
+
const prefix = runnerServicePath(home, nodeBin).split(":").filter((dir) => dir && !seen.has(dir));
|
|
64
|
+
const next = [...prefix, ...current.split(":").filter(Boolean)].join(":");
|
|
65
|
+
env.PATH = next;
|
|
66
|
+
return next;
|
|
67
|
+
}
|
|
52
68
|
export function launchdPlist(programArguments, stdoutPath, pathEnv = runnerServicePath()) {
|
|
53
69
|
const argsXml = programArguments.map((arg) => ` <string>${escapeXml(arg)}</string>`).join("\n");
|
|
54
70
|
return `<?xml version="1.0" encoding="UTF-8"?>
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miraland-labs/conduit-bridge",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"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",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|