negotium 0.3.9 → 0.3.11

package/dist/main.js

@@ -1869,7 +1869,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.3.9";
+var NEGOTIUM_VERSION = "0.3.11";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn } from "child_process";
@@ -46078,12 +46078,18 @@ var init_workspace_control = __esm(async () => {
 // ../../adapters/otium/src/join-cli.ts
 var exports_join_cli = {};
 __export(exports_join_cli, {
+  localNodeNameDefault: () => localNodeNameDefault,
   joinCommand: () => joinCommand
 });
+import { hostname as hostname2 } from "os";
 function option2(args, name) {
   const index = args.indexOf(`--${name}`);
   return index >= 0 ? args[index + 1]?.trim() : undefined;
 }
+function localNodeNameDefault() {
+  const normalized = hostname2().trim().toLowerCase().replace(/\.local$/, "").replace(/[^a-z0-9._-]+/g, "-").replace(/^[-._]+|[-._]+$/g, "").slice(0, 32).replace(/[-._]+$/g, "");
+  return normalized || undefined;
+}
 async function confirmEnrollment(message) {
   if (!process.stdin.isTTY)
     return false;
@@ -46116,7 +46122,7 @@ async function joinCommand(args) {
     try {
       const invite = parseEnrollmentInvite(code);
       const resuming = isEnrollmentPending(invite);
-      let nodeName = option2(args, "name");
+      let nodeName = option2(args, "name") || localNodeNameDefault();
       if (resuming) {
         console.log(`Resuming interrupted Otium enrollment with ${invite.central}`);
       } else {
@@ -46184,8 +46190,30 @@ var init_join_cli = __esm(async () => {
 var exports_sidecar = {};
 __export(exports_sidecar, {
   runOtiumSidecar: () => runOtiumSidecar,
+  resolveTunnelTargets: () => resolveTunnelTargets,
   proxyOtiumPeerRequest: () => proxyOtiumPeerRequest
 });
+function withCellId(base, cellId) {
+  return {
+    info: (obj, msg) => base.info({ ...obj, cellId }, msg),
+    warn: (obj, msg) => base.warn({ ...obj, cellId }, msg),
+    error: (obj, msg) => base.error({ ...obj, cellId }, msg)
+  };
+}
+function resolveTunnelTargets(joins, relayOverride) {
+  const targets = [];
+  const skippedNoRelay = [];
+  const envRelay = process.env.OTIUM_RELAY_URL?.trim();
+  for (const join44 of joins) {
+    const relayUrl = relayOverride?.trim() || join44.relay || envRelay;
+    if (!relayUrl) {
+      skippedNoRelay.push(join44.cellId);
+      continue;
+    }
+    targets.push({ cellId: join44.cellId, relayUrl, secret: join44.secret });
+  }
+  return { targets, skippedNoRelay };
+}
 function isPublicPeerPath(pathname) {
   return pathname === "/ready" || pathname.startsWith("/api/v1/peer/");
 }
@@ -46219,8 +46247,8 @@ async function proxyOtiumPeerRequest(req, dependencies = {}) {
   }
 }
 async function runOtiumSidecar(options) {
-  const join44 = loadJoin();
-  if (!join44) {
+  const joins = loadJoins();
+  if (joins.length === 0) {
     throw new Error("not joined to an Otium workspace \u2014 run `negotium otium join <code>` first");
   }
   const initialNode = await inspectNodeDaemon();
@@ -46252,24 +46280,34 @@ async function runOtiumSidecar(options) {
     lease.stop();
     throw error2;
   }
-  const selectedRelay = options.relayUrl?.trim() || join44.relay || process.env.OTIUM_RELAY_URL?.trim();
-  const tunnel = selectedRelay ? new TunnelClient({
-    relayUrl: selectedRelay,
-    token: join44.secret,
-    targetOrigin: `http://127.0.0.1:${server.port}`,
-    nodeVersion: `negotium@${NEGOTIUM_VERSION}`,
-    logger
-  }) : null;
-  tunnel?.start();
+  const { targets, skippedNoRelay } = resolveTunnelTargets(joins, options.relayUrl);
+  const tunnels = new Map;
+  for (const target of targets) {
+    tunnels.set(target.cellId, new TunnelClient({
+      relayUrl: target.relayUrl,
+      token: target.secret,
+      targetOrigin: `http://127.0.0.1:${server.port}`,
+      nodeVersion: `negotium@${NEGOTIUM_VERSION}`,
+      logger: withCellId(logger, target.cellId)
+    }));
+  }
+  if (skippedNoRelay.length > 0) {
+    logger.warn({ cellIds: skippedNoRelay }, "otium sidecar: no relay URL for these joined workspaces; they have no tunnel and will not be reachable");
+  }
+  for (const tunnel of tunnels.values())
+    tunnel.start();
   let resolveCompleted;
   const completed = new Promise((resolve27) => {
     resolveCompleted = resolve27;
   });
   onShutdown("otium-sidecar-server", 130, () => server?.stop(true));
-  onShutdown("otium-sidecar-tunnel", 120, () => tunnel?.stop());
+  onShutdown("otium-sidecar-tunnel", 120, () => {
+    for (const tunnel of tunnels.values())
+      tunnel.stop();
+  });
   onShutdown("otium-sidecar-lease", 110, () => lease.stop());
   onShutdown("otium-sidecar-completed", -100, resolveCompleted);
-  process.stdout.write(`negotium Otium adapter listening on 127.0.0.1:${server.port} (canonical node pid ${initialNode.info?.pid})
+  process.stdout.write(`negotium Otium adapter listening on 127.0.0.1:${server.port} (canonical node pid ${initialNode.info?.pid}, ${tunnels.size}/${joins.length} workspace tunnel${joins.length === 1 ? "" : "s"} started)
 `);
   await completed;
 }
@@ -47189,4 +47227,4 @@ switch (command) {
   }
 }
 
-//# debugId=CD070F248BC98B8864756E2164756E21
+//# debugId=4271BDC4F3BBFD0764756E2164756E21