balladeer 1.0.5 → 1.0.6

package/dist/install.js

@@ -23,9 +23,10 @@ function commandOnPath(name, env) {
     }
     return undefined;
 }
-function execute(command, args, env) {
+function execute(command, args, env, cwd) {
     return execFileSync(command, args, {
         env,
+        ...(cwd ? { cwd } : {}),
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"],
         timeout: 120_000,
@@ -33,14 +34,14 @@ function execute(command, args, env) {
     }).trim();
 }
 /** Inspect package ownership before executing a command from PATH. */
-function packageVersion(command, env) {
+function packageVersion(command, env, cwd) {
     let entry = realpathSync(command);
     if (basename(entry) === "volta-shim") {
         const volta = commandOnPath("volta", env);
         if (!volta)
             return undefined;
         try {
-            entry = realpathSync(execute(volta, ["which", "balladeer"], env));
+            entry = realpathSync(execute(volta, ["which", "balladeer"], env, cwd));
         }
         catch {
             return undefined;
@@ -121,25 +122,114 @@ function shellProfiles(env, bin) {
         return { path, text, previous: old };
     });
 }
+function atLeastCurrent(version) {
+    if (!/^\d+\.\d+\.\d+$/.test(version))
+        return false;
+    const actual = version.split(".").map(Number), expected = CLI_VERSION.split(".").map(Number);
+    for (let i = 0; i < 3; i++) {
+        if (actual[i] !== expected[i])
+            return actual[i] > expected[i];
+    }
+    return true;
+}
+/** npm exec may put the actual Node-image bin ahead of Volta's registered shim. */
+function installWithVolta(env) {
+    const home = env.VOLTA_HOME ?? (env.HOME ? join(env.HOME, ".volta") : undefined);
+    const volta = commandOnPath("volta", env);
+    if (!home || !isAbsolute(home) || !volta)
+        return undefined;
+    const bin = join(home, "bin"), shim = join(bin, "balladeer");
+    const nodeShim = join(bin, "node");
+    // Merely having Volta somewhere on PATH must not select it for another toolchain.
+    const onPath = (env.PATH ?? "")
+        .split(delimiter)
+        .some((part) => resolve(part || ".") === resolve(bin));
+    const managedNode = existsSync(nodeShim) && basename(realpathSync(nodeShim)) === "volta-shim";
+    const imageDirectory = join(home, "tools/image/node");
+    const imageRoot = existsSync(imageDirectory)
+        ? realpathSync(imageDirectory)
+        : resolve(imageDirectory);
+    const selectedNode = commandOnPath("node", env);
+    const actualNode = selectedNode ? realpathSync(selectedNode) : undefined;
+    const activeToolchain = actualNode !== undefined &&
+        ((managedNode && actualNode === realpathSync(nodeShim)) ||
+            actualNode.startsWith(imageRoot + "/"));
+    if (!onPath || !managedNode || !activeToolchain)
+        return undefined;
+    const bootstrap = env.npm_command === "exec";
+    const parentEnv = {
+        ...env,
+        PATH: (env.PATH ?? "")
+            .split(delimiter)
+            .filter((part) => {
+            const full = resolve(part || ".");
+            if (full.split(/[\\/]/).includes("node_modules"))
+                return false;
+            return !(bootstrap &&
+                (existsSync(full) ? realpathSync(full) : full).startsWith(imageRoot + "/") &&
+                basename(full) === "bin");
+        })
+            .join(delimiter),
+    };
+    const selected = commandOnPath("balladeer", parentEnv);
+    if (selected && resolve(selected) !== resolve(shim))
+        throw new InstallError(`Another command precedes Volta at ${selected}. Resolve that PATH conflict before installing; nothing was overwritten.`);
+    if (existsSync(shim) && basename(realpathSync(shim)) !== "volta-shim")
+        throw new InstallError("Another command owns Volta's balladeer path. Nothing was overwritten.");
+    const neutral = mkdtempSync(join(tmpdir(), "balladeer-volta-install-"));
+    const installEnv = { ...parentEnv, npm_config_cache: join(neutral, "npm-cache") };
+    try {
+        let version = existsSync(shim) ? packageVersion(shim, installEnv, neutral) : undefined;
+        if (existsSync(shim) && version === undefined)
+            throw new InstallError("Volta's registered Balladeer package cannot be verified. Repair the toolchain before pairing.");
+        const alreadyCurrent = version !== undefined && atLeastCurrent(version);
+        if (!alreadyCurrent) {
+            try {
+                execute(volta, ["install", `balladeer@${CLI_VERSION}`], installEnv, neutral);
+            }
+            catch {
+                throw new InstallError("Volta could not install the exact Balladeer release. Check network and toolchain write access, then repeat npx -y balladeer@latest install. No pairing has started.");
+            }
+            version = existsSync(shim) ? packageVersion(shim, installEnv, neutral) : undefined;
+            if (version !== CLI_VERSION)
+                throw new InstallError("Volta finished, but its registered default is not the expected Balladeer release. No pairing has started.");
+        }
+        // Verify both the global default and what an ordinary fresh child in the
+        // caller's directory sees. A project override is never mistaken for a default.
+        if (!version ||
+            execute(shim, ["--version"], installEnv, neutral) !== version ||
+            commandOnPath("balladeer", parentEnv) !== shim ||
+            execute(shim, ["--version"], parentEnv) !== version)
+            throw new InstallError("Volta's default was checked, but this terminal or project selects a different Balladeer. Resolve its PATH or project tool pin before pairing.");
+        const shell = execute("/bin/sh", ["-c", "command -v balladeer; balladeer --version"], parentEnv).split("\n");
+        if (shell[0] !== shim || shell[1] !== version)
+            throw new InstallError("The fresh terminal PATH does not select the verified Volta command. No pairing has started.");
+        env.PATH = parentEnv.PATH;
+        return {
+            status: alreadyCurrent ? "current" : "installed",
+            command: shim,
+            version,
+            restartRequired: false,
+        };
+    }
+    finally {
+        rmSync(neutral, { recursive: true, force: true });
+    }
+}
 export function ensureInstalled(options) {
     const env = options.environment;
     const platform = options.platform ?? process.platform;
     if (platform === "win32")
         throw new InstallError("Automatic command installation currently supports macOS and Linux. On Windows, use npm install --global balladeer@latest, then verify balladeer --version. No files or pairing were changed.");
+    const managed = installWithVolta(env);
+    if (managed)
+        return managed;
     const current = commandOnPath("balladeer", env);
     if (current) {
         const version = packageVersion(current, env);
         if (version === undefined)
             throw new InstallError(`Another command already owns ${current}. Keep it intact and resolve that command conflict before installing Balladeer.`);
-        const newer = /^\d+\.\d+\.\d+$/.test(version) &&
-            version
-                .split(".")
-                .map(Number)
-                .some((part, index, parts) => part > Number(CLI_VERSION.split(".")[index]) &&
-                parts
-                    .slice(0, index)
-                    .every((value, before) => value === Number(CLI_VERSION.split(".")[before])));
-        if (version === CLI_VERSION || newer) {
+        if (atLeastCurrent(version)) {
             if (execute(current, ["--version"], env) !== version)
                 throw new InstallError("The installed Balladeer command does not run the expected version. Repair the installation before pairing.");
             return { status: "current", command: current, restartRequired: false, version };

package/dist/wire.d.ts

@@ -5,10 +5,10 @@
  * runtime dependency at all: Node 22 builtins and global fetch, nothing else.
  * A contract test compares the scope list below against the server's.
  */
-export declare const CLI_VERSION = "1.0.5";
+export declare const CLI_VERSION = "1.0.6";
 export declare const CLI_INVOCATION = "npx -y balladeer@latest";
 export declare const CLIENT_HEADER = "x-balladeer-client";
-export declare const CLIENT_HEADER_VALUE = "balladeer/1.0.5";
+export declare const CLIENT_HEADER_VALUE = "balladeer/1.0.6";
 export declare const DEFAULT_CONTROL_PLANE = "https://envelopes.balladeer.ai";
 export type DelegatedScope = "repository:enroll" | "agent:issue" | "ci:connect" | "workspace:invite" | "candidate:propose";
 export declare const DELEGATED_SCOPES: readonly DelegatedScope[];

package/dist/wire.js

@@ -5,7 +5,7 @@
  * runtime dependency at all: Node 22 builtins and global fetch, nothing else.
  * A contract test compares the scope list below against the server's.
  */
-export const CLI_VERSION = "1.0.5";
+export const CLI_VERSION = "1.0.6";
 export const CLI_INVOCATION = "npx -y balladeer@latest";
 export const CLIENT_HEADER = "x-balladeer-client";
 export const CLIENT_HEADER_VALUE = `balladeer/${CLI_VERSION}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "balladeer",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Set up Balladeer from your terminal, or from a coding agent's.",
   "license": "Apache-2.0",
   "private": false,