usebeeline 0.0.105 → 0.0.107

package/dist/usebeeline.mjs

@@ -3987,7 +3987,7 @@ __export(self_update_exports, {
 import { createHash as createHash7 } from "node:crypto";
 import { constants as fsConstants2 } from "node:fs";
 import { access, chmod as chmod5, lstat as lstat3, mkdir as mkdir15, open, readFile as readFile10, rename as rename4, rm as rm6, symlink as symlink3, writeFile as writeFile10 } from "node:fs/promises";
-import { spawn as spawn5 } from "node:child_process";
+import { spawn as spawn6 } from "node:child_process";
 import { homedir as homedir9 } from "node:os";
 import { dirname as dirname11, join as join9, resolve as resolve22 } from "node:path";
 function anchorLayout(rawLibDir) {
@@ -4137,7 +4137,7 @@ async function fetchText(url, fetchImpl) {
 }
 function run(command, args, timeoutMs) {
   return new Promise((resolveRun) => {
-    const child = spawn5(command, args, { stdio: ["ignore", "ignore", "pipe"] });
+    const child = spawn6(command, args, { stdio: ["ignore", "ignore", "pipe"] });
     let stderr = "";
     child.stderr?.setEncoding("utf8");
     child.stderr?.on("data", (chunk) => {
@@ -4210,7 +4210,7 @@ async function stageRelease(layout, manifestUrl, published, opts = {}) {
     }
     await writeFile10(tempArchive, Buffer.concat(chunks), { mode: 384 });
     const entries = (await new Promise((resolveList, rejectList) => {
-      const child = spawn5("tar", ["-tzf", tempArchive], { stdio: ["ignore", "pipe", "inherit"] });
+      const child = spawn6("tar", ["-tzf", tempArchive], { stdio: ["ignore", "pipe", "inherit"] });
       let out = "";
       child.stdout?.on("data", (chunk) => {
         out += chunk.toString("utf8");
@@ -8157,9 +8157,8 @@ async function syncAgentModelCatalog(input) {
 }
 
 // apps/body/dist/connector-squire.js
-import { execFile } from "node:child_process";
-var REMOTE_LOGIN_BINARIES = ["Xvfb", "x11vnc", "websockify", "cloudflared"];
-var SQUIRE_CONNECT_PACKAGE = "@trusty-squire/mcp";
+import { execFile, spawn as spawn2 } from "node:child_process";
+var SQUIRE_CONNECT_PACKAGE = "@trusty-squire/mcp@next";
 var defaultShellRunner = (command, args) => new Promise((resolve31) => {
   execFile(command, [...args], { timeout: 12e4, maxBuffer: 4 * 1024 * 1024, encoding: "utf8" }, (error, stdout6, stderr) => {
     const code = error?.code;
@@ -8170,26 +8169,63 @@ var defaultShellRunner = (command, args) => new Promise((resolve31) => {
     });
   });
 });
+var CONNECT_TIMEOUT_MS = 3e5;
+var defaultStreamedRunner = (command, args) => new Promise((resolve31) => {
+  const child = spawn2(command, args, {
+    stdio: ["ignore", "pipe", "pipe"]
+  });
+  let stdout6 = "";
+  let stderr = "";
+  let resolved = false;
+  const safetyTimer = setTimeout(() => {
+    if (!resolved) {
+      resolved = true;
+      resolve31({ stdout: stdout6, stderr, signIn: void 0, abort: () => {
+      } });
+    }
+    child.kill();
+  }, CONNECT_TIMEOUT_MS);
+  const abort = () => {
+    clearTimeout(safetyTimer);
+    child.kill();
+  };
+  const finish = (result) => {
+    if (!resolved) {
+      resolved = true;
+      clearTimeout(safetyTimer);
+      resolve31(result);
+    }
+  };
+  const checkOutput = () => {
+    const combined = `${stdout6}
+${stderr}`;
+    const signIn = parseConnectOutput(combined);
+    if (signIn) {
+      finish({ stdout: stdout6, stderr, signIn, abort });
+    }
+  };
+  child.stdout?.on("data", (chunk) => {
+    stdout6 += String(chunk);
+    checkOutput();
+  });
+  child.stderr?.on("data", (chunk) => {
+    stderr += String(chunk);
+    checkOutput();
+  });
+  child.on("close", () => {
+    finish({ stdout: stdout6, stderr, signIn: void 0, abort: () => {
+    } });
+  });
+  child.on("error", () => {
+    finish({ stdout: stdout6, stderr, signIn: void 0, abort: () => {
+    } });
+  });
+});
 var step = (label, status, reason) => ({
   label,
   status,
   ...reason ? { reason } : {}
 });
-function binaryExists(binary) {
-  return new Promise((resolve31) => {
-    execFile("sh", ["-c", `command -v ${JSON.stringify(binary)}`], (error, stdout6) => {
-      const path = String(stdout6 ?? "").trim();
-      resolve31({ binary, found: !error && path.length > 0, ...path ? { path } : {} });
-    });
-  });
-}
-async function checkRemoteLoginPrerequisites(probe = binaryExists) {
-  return Promise.all(REMOTE_LOGIN_BINARIES.map(probe));
-}
-function missingPrerequisiteStep(checks) {
-  const missing = checks.filter((check) => !check.found).map((check) => check.binary);
-  return step("remote sign-in prerequisites", "failed", `missing on this helper: ${missing.join(", ")}`);
-}
 function parseConnectOutput(output) {
   const url = output.match(/https:\/\/[^\s"'<>]+/)?.[0];
   if (!url)
@@ -8212,6 +8248,7 @@ function parseSignedInAs(output) {
 }
 async function installSquire(options) {
   const run2 = options.run ?? defaultShellRunner;
+  const streamRun = options.streamRun ?? defaultStreamedRunner;
   const steps = [step("helper reached", "done")];
   const emit = () => options.onProgress?.([...steps]);
   const push = (next) => {
@@ -8224,34 +8261,25 @@ async function installSquire(options) {
     return { status: "error", steps, errorMessage: reason };
   };
   emit();
-  const checks = await checkRemoteLoginPrerequisites(options.probeBinary);
-  if (checks.some((check) => !check.found)) {
-    push(missingPrerequisiteStep(checks));
-    return fail("this helper cannot host the remote sign-in surface");
-  }
-  push(step("remote sign-in prerequisites", "done"));
-  const install = await run2("npx", [
+  const install = await streamRun("npx", [
     "-y",
     SQUIRE_CONNECT_PACKAGE,
     "connect",
-    "--target=pi",
+    "--force-relogin=google",
+    "--target=codex",
     "--skip-browser"
   ]);
-  if (install.code !== 0) {
-    push(step("trusty-squire installed", "failed", install.stderr.trim() || "connect failed"));
-    return fail("the trusty-squire install command failed");
+  if (!install.signIn) {
+    const stderr = install.stderr.trim();
+    push(step("trusty-squire installed", "failed", stderr || "connect printed no sign-in URL"));
+    return fail(stderr || "the trusty-squire connect command printed no sign-in surface");
   }
   const version = await installedSquireVersion(run2);
   push(step(`trusty-squire${version ? ` ${version}` : ""} installed`, "done"));
-  const output = `${install.stdout}
-${install.stderr}`;
-  const signIn = parseConnectOutput(output);
-  if (!signIn) {
-    push(step("waiting for sign-in", "failed", "connect printed no sign-in URL"));
-    return fail("the trusty-squire connect command printed no sign-in surface");
-  }
+  const signIn = install.signIn;
+  const signedInAs = parseSignedInAs(`${install.stdout}
+${install.stderr}`);
   push(step("waiting for sign-in", "done"));
-  const signedInAs = parseSignedInAs(output);
   const pair = await pairSquire(options.mcp, options.workspaceId);
   if (!pair.ok) {
     push(step("paired to workspace", "failed", pair.reason));
@@ -8346,7 +8374,7 @@ async function revokeGrants(mcp, ref) {
 }
 
 // apps/body/dist/squire-mcp-client.js
-import { spawn as spawn2 } from "node:child_process";
+import { spawn as spawn3 } from "node:child_process";
 var INITIALIZE_TIMEOUT_MS = 3e4;
 var CALL_TIMEOUT_MS = 12e4;
 var StdioSquireMcpClient = class {
@@ -8402,8 +8430,10 @@ var StdioSquireMcpClient = class {
     return this.initialized;
   }
   initialize() {
-    const child = (this.options.spawn ?? spawn2)(this.options.command ?? "npx", [
-      ...this.options.args ?? ["-y", "@trusty-squire/mcp"]
+    const child = (this.options.spawn ?? spawn3)(this.options.command ?? "npx", [
+      // `@next` RC: only the RC coordinates with a running Trusty Squire broker
+      // for concurrent sessions; stable `latest` cannot share its browser.
+      ...this.options.args ?? ["-y", "@trusty-squire/mcp@next"]
     ]);
     this.child = child;
     this.buffer = "";
@@ -8692,7 +8722,7 @@ import { closeSync, openSync } from "node:fs";
 import { mkdir, readFile as readFile2, readdir, rename, stat, writeFile as writeFile2 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
 import { dirname as dirname2, resolve as resolve6 } from "node:path";
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { promisify } from "node:util";
 
 // node_modules/@noble/hashes/_u64.js
@@ -17413,7 +17443,7 @@ async function launchRuntimeDaemon(configPath, opts = {}) {
   const entrypoint = opts.entrypoint ?? process.argv[1];
   if (!entrypoint)
     throw new Error("cannot resolve daemon CLI entrypoint");
-  const child = spawn3(process.execPath, [...opts.execArgv ?? [], entrypoint, "daemon", "--config", resolve6(configPath)], {
+  const child = spawn4(process.execPath, [...opts.execArgv ?? [], entrypoint, "daemon", "--config", resolve6(configPath)], {
     cwd: directory,
     env: opts.env ?? process.env,
     detached: !foreground,
@@ -18351,9 +18381,9 @@ var GrantCommandRunner = class {
       ...Object.fromEntries(secrets)
     };
     const cap = this.options.outputCapBytes ?? GRANT_COMMAND_OUTPUT_CAP_BYTES;
-    const spawn9 = surfaceAllows(policy.surface, "run-host-command") ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv);
+    const spawn10 = surfaceAllows(policy.surface, "run-host-command") ? { command: argv[0], args: argv.slice(1) } : roomSandboxCommand(policy, room.cwd, argv);
     const outcome = await new Promise((resolveRun) => {
-      const child = execFile3(spawn9.command, spawn9.args, {
+      const child = execFile3(spawn10.command, spawn10.args, {
         cwd: room.cwd,
         env,
         timeout: this.options.timeoutMs ?? GRANT_COMMAND_TIMEOUT_MS,
@@ -18988,7 +19018,7 @@ Then take exactly one action:
 }
 
 // apps/body/dist/external-mcp-capabilities.js
-var SQUIRE_MCP_VERSION = "1.1.12";
+var SQUIRE_MCP_VERSION = "next";
 var SQUIRE_MCP_PACKAGE = `@trusty-squire/mcp@${SQUIRE_MCP_VERSION}`;
 function isTrustySquireMcpLaunch(command, args = []) {
   return [command, ...args].some((value) => {
@@ -25210,9 +25240,10 @@ async function runStartCommand(args, interactiveUi) {
 }
 
 // apps/body/dist/connect-command.js
-import { spawn as spawn6 } from "node:child_process";
-import { createHash as createHash8 } from "node:crypto";
+import { spawn as spawn7 } from "node:child_process";
+import { createHash as createHash8, randomUUID as randomUUID5 } from "node:crypto";
 import { chmod as chmod6, mkdir as mkdir16, readFile as readFile11, unlink as unlink2, writeFile as writeFile11 } from "node:fs/promises";
+import { homedir as homedir10, hostname } from "node:os";
 import { dirname as dirname12, resolve as resolve23 } from "node:path";
 import { stdin as stdin3, stdout as stdout4 } from "node:process";
 
@@ -25297,7 +25328,7 @@ async function verifyProviderKey(input) {
 }
 
 // apps/body/dist/pair-agent-selection.js
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import { stdin as stdin2, stdout as stdout3 } from "node:process";
 var NO_AGENT_MESSAGE = `No supported ACP-capable coding agent was detected.
 Install one of these supported agents:
@@ -25325,7 +25356,7 @@ async function clackSelectAgent(candidates) {
 }
 async function installAdapter(install, opts) {
   await new Promise((resolveInstall, rejectInstall) => {
-    const child = spawn4(install.command, install.args, {
+    const child = spawn5(install.command, install.args, {
       cwd: opts.cwd,
       env: opts.env ?? process.env,
       stdio: "inherit"
@@ -25826,7 +25857,29 @@ function parseConnectSubscriptions(value) {
     ...new Set((value ?? "").split(",").map((entry) => entry.trim().toLowerCase()).filter(Boolean))
   ];
 }
-function requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl) {
+async function readMachineId(env = process.env) {
+  const configDir = resolve23(env.XDG_CONFIG_HOME ?? resolve23(homedir10(), ".config"), "beeline");
+  const machineIdPath = resolve23(configDir, "machine-id");
+  let machineId;
+  let machineName = hostname();
+  try {
+    const existing = await readFile11(machineIdPath, "utf8");
+    machineId = existing.trim();
+    if (!/^[0-9a-f-]{32,}$/.test(machineId))
+      throw new Error("invalid persisted machine id");
+  } catch {
+    machineId = randomUUID5();
+    try {
+      await mkdir16(configDir, { recursive: true, mode: 448 });
+      await writeFile11(machineIdPath, `${machineId}
+`, { mode: 384 });
+    } catch {
+      machineId = createHash8("sha256").update(machineName).digest("hex").slice(0, 36);
+    }
+  }
+  return { machineId, machineName };
+}
+function requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl, machineInfo) {
   const normalizedPairingCode = normalizeAgentPairingCode(pairingCode);
   if (!normalizedPairingCode)
     throw new Error("invalid pairing code");
@@ -25841,7 +25894,8 @@ function requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl) {
     // This wizard always finishes the join itself (`finishConnectedAgentPairing`,
     // called once the rename prompt below settles), so the claim must not
     // join Rooms or announce yet.
-    defer_join: true
+    defer_join: true,
+    ...machineInfo ? { machine_id: machineInfo.machineId, machine_name: machineInfo.machineName } : {}
   }, fetchImpl);
 }
 async function renameConnectedAgent(baseUrl, pairingCode, name, fetchImpl) {
@@ -25920,7 +25974,7 @@ async function writeProviderEnv(selection, agentPubkey) {
 }
 async function runInstalledFinish(binary, grantPath) {
   await new Promise((resolveRun, rejectRun) => {
-    const child = spawn6(binary, ["connect-finish", grantPath], {
+    const child = spawn7(binary, ["connect-finish", grantPath], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     let diagnostic = "";
@@ -25971,7 +26025,8 @@ async function runConnectWizard(code, fetchImpl, eventSubscriptions, accessPolic
   });
   const selection = await collectConnectWizard(clackPrompts, loadConnectModelCatalog, fileConnectKeyStore, process.env, (input) => verifyProviderKey({ ...input, fetchImpl }));
   const baseUrl = (process.env.BEELINE_AUTH_URL ?? "https://server.usebeeline.app").replace(/\/$/, "");
-  const claimed = await brassSpinner("Connecting to your Beeline Workspace\u2026", () => requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl), (connectedGrant) => `Connected to ${connectedGrant.workspace_name}`);
+  const machineInfo = await readMachineId(process.env);
+  const claimed = await brassSpinner("Connecting to your Beeline Workspace\u2026", () => requestConnectGrant(baseUrl, pairingCode, selection, fetchImpl, machineInfo), (connectedGrant) => `Connected to ${connectedGrant.workspace_name}`);
   const grant = { ...claimed, agent_name: await confirmSeededName(baseUrl, pairingCode, claimed, fetchImpl) };
   await finishConnectedAgentPairing(baseUrl, pairingCode, grant.workspace_joined, eventSubscriptions, fetchImpl);
   const installedRelease = await brassSpinner("Installing the Beeline daemon\u2026", () => installCurrentRelease(fetchImpl), (release) => `Installed Beeline helper ${release.version}`);
@@ -26093,7 +26148,7 @@ init_self_update_manifest();
 
 // apps/body/dist/managed-update.js
 init_self_update();
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import { mkdir as mkdir18, rm as rm7, stat as stat3, writeFile as writeFile13 } from "node:fs/promises";
 import { dirname as dirname14, resolve as resolve25 } from "node:path";
 
@@ -26507,7 +26562,7 @@ async function runManagedUpdateWorkerProcess() {
   if (!entrypoint)
     throw new Error("cannot resolve the current Beeline entrypoint");
   await new Promise((resolveWorker, rejectWorker) => {
-    const child = spawn7(process.execPath, [entrypoint, "managed-update-worker"], {
+    const child = spawn8(process.execPath, [entrypoint, "managed-update-worker"], {
       detached: true,
       env: { ...process.env, BEELINE_INTERNAL_UPDATE_WORKER: "1" },
       stdio: ["ignore", "pipe", "pipe"]
@@ -26861,7 +26916,7 @@ async function clearDaemonStartFailures(runtimeDir) {
 
 // apps/body/dist/update-functional-probe.js
 import { mkdir as mkdir20, rm as rm9 } from "node:fs/promises";
-import { homedir as homedir10 } from "node:os";
+import { homedir as homedir11 } from "node:os";
 import { resolve as resolve27 } from "node:path";
 var UPDATE_PROBE_SESSION_TIMEOUT_MS = 1e4;
 var UPDATE_PROBE_SESSION_OPEN_TIMEOUT_MS = 2e4;
@@ -26967,7 +27022,7 @@ async function runUpdateFunctionalProbe(input) {
       ...input.config.agentEnv,
       ...await prepareRoomAgentHome({
         root: homeRoot,
-        operatorHome: input.config.operatorHome ?? homedir10(),
+        operatorHome: input.config.operatorHome ?? homedir11(),
         sharedSkills: input.config.sharedSkills ?? [],
         ...input.config.agentKind ? { agentKind: input.config.agentKind } : {},
         skillReleaseId: input.releaseId,
@@ -26988,7 +27043,7 @@ async function runUpdateFunctionalProbe(input) {
     let turnCompleted = true;
     if (input.config.bwrapPath) {
       const { stateDirs, tmpDir } = harnessStateDirsFromEnv(agentEnv);
-      const operatorHome = input.config.operatorHome ?? homedir10();
+      const operatorHome = input.config.operatorHome ?? homedir11();
       const homeStateDirs = harnessHomeStateDirs(command, agentEnv.HOME ?? operatorHome);
       await Promise.all(homeStateDirs.map((dir) => mkdir20(dir, { recursive: true })));
       spawnCommand = wrapAgentCommand({
@@ -27139,7 +27194,7 @@ async function runUpdateFunctionalProbe(input) {
 }
 
 // apps/body/dist/current-release-probe.js
-import { spawn as spawn8 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 import { dirname as dirname16, join as join10 } from "node:path";
 init_self_update();
 var CURRENT_RELEASE_PROBE_TIMEOUT_MS = 12e4;
@@ -27190,7 +27245,7 @@ async function probeReleaseInSubprocess(input) {
   }
   const timeoutMs = input.timeoutMs ?? CURRENT_RELEASE_PROBE_TIMEOUT_MS;
   return new Promise((resolve31) => {
-    const child = spawn8(input.execPath ?? process.execPath, [entrypoint, UPDATE_PROBE_COMMAND, "--config", input.runtimeConfigPath], { env: input.env ?? process.env, stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn9(input.execPath ?? process.execPath, [entrypoint, UPDATE_PROBE_COMMAND, "--config", input.runtimeConfigPath], { env: input.env ?? process.env, stdio: ["ignore", "pipe", "pipe"] });
     let stdout6 = "";
     let stderr = "";
     let settled = false;
@@ -27608,6 +27663,7 @@ async function runStoredDaemon(pathOrPointer) {
           ...runtime.modelSelection ? { runtimeSelection: runtime.modelSelection } : {},
           ...config.modelUnavailable ? { startupUnavailable: config.modelUnavailable.unavailable.label } : {}
         });
+        void readMachineId(process.env).then(({ machineId, machineName }) => daemonApi.execute("postAgentMachineReport", { machineId, machineName }));
         connectorLoop ??= new ConnectorAssignmentLoop({
           api: daemonApi,
           agentId: runtime.agent.publicKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "usebeeline",
-  "version": "0.0.105",
+  "version": "0.0.107",
   "description": "Connect an AI coding agent to Beeline with one command.",
   "homepage": "https://usebeeline.app",
   "bugs": {