dsh-interconnect 0.13.0 → 0.15.0

package/lib/tool-interconnect/index.js

@@ -823,12 +823,8 @@ defineMethod("transform", [
 
 // src/interconnect/index.ts
 import WebSocket, { WebSocketServer } from "ws";
-function isSessionOwnedBySubagent(ctx, session, agent) {
-  if (session.header.origin === "subagent") return true;
-  const parentId = session.header.parentSession;
-  if (parentId === void 0 || agent === void 0) return false;
-  const parent = ctx.agents.get(parentId);
-  return parent !== void 0 && ctx.agents.isOwnedBy(agent.id, parent);
+function isSessionOwnedBySubagent(session) {
+  return session.header.origin === "subagent";
 }
 function assertNever(value) {
   throw new Error(`interconnect: unhandled variant ${JSON.stringify(value)}`);
@@ -839,6 +835,7 @@ var DEFAULT_INSTANCE_ID = "dsh";
 var DEFAULT_REQUEST_TIMEOUT_MS = 1e4;
 var LINK_HANDSHAKE_TIMEOUT_MS = 1e4;
 var LINK_CHANNEL = "/interconnect/link";
+var SELF_PEER_ORIGIN = "self";
 var MAX_INSTANCE_ID_CHARS = 256;
 var MAX_REQUEST_ID_CHARS = 256;
 var MAX_LISTED_SESSIONS = 100;
@@ -966,11 +963,19 @@ var InterconnectService = class extends Service {
     this.requestTimeoutMs = config.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
     this.delivery = config.delivery ?? "followup";
     this.allowResume = config.allowResume ?? true;
-    for (const origin of Object.values(config.peers ?? {})) {
+    for (const [peerInstanceId, origin] of Object.entries(config.peers ?? {})) {
+      if (origin === SELF_PEER_ORIGIN) {
+        if (peerInstanceId !== this.instanceId) {
+          throw new Error(
+            `interconnect: peer "${peerInstanceId}" is configured as self, but this instance announces "${this.instanceId}"; key a self peer by the instanceId`
+          );
+        }
+        continue;
+      }
       linkUrl(trimBase(origin));
     }
     for (const [peerInstanceId, origin] of Object.entries(config.peers ?? {})) {
-      this.link(peerInstanceId, origin);
+      this.link(peerInstanceId, origin === SELF_PEER_ORIGIN ? () => this.selfOrigin() : origin);
     }
     const upgrade = {
       path: LINK_CHANNEL,
@@ -1213,7 +1218,8 @@ var InterconnectService = class extends Service {
    * `Config.peers` entry; the resulting state owns reconnection for the life of
    * the service fiber.
    * @param instanceId - the peer's `instanceId`.
-   * @param origin - receiver origin this instance dials, e.g. `http://127.0.0.1:13080`.
+   * @param origin - receiver origin this instance dials (e.g.
+   *   `http://127.0.0.1:13080`), or a resolver for a `self` route.
    */
   link(instanceId, origin) {
     const state = new LinkState(
@@ -1223,11 +1229,28 @@ var InterconnectService = class extends Service {
       this.ctx.logger,
       () => this.resolveToken(),
       instanceId,
-      trimBase(origin)
+      typeof origin === "string" ? trimBase(origin) : origin
     );
     this.linkStates.set(instanceId, state);
     state.dial();
   }
+  /**
+   * The origin of this instance's own host webserver, or undefined while no
+   * listening port exists. Read on every dial rather than cached: the
+   * webserver may activate after this service, its port is assigned only in
+   * its listen callback (`--port 0` picks a fresh one per start), and a
+   * replacement webserver would move it again. Loopback is used regardless of
+   * the bind host: a server bound to `0.0.0.0` also accepts `127.0.0.1`, while
+   * `0.0.0.0` itself is a bind address, not a dialable origin.
+   * @returns `http://127.0.0.1:<port>`, or undefined without a listening server.
+   */
+  selfOrigin() {
+    const server = this.ctx.get("webServer");
+    if (server === void 0) return void 0;
+    const port = server.port;
+    if (typeof port !== "number" || port <= 0) return void 0;
+    return `http://127.0.0.1:${String(port)}`;
+  }
   /** Push one serialized lifecycle fact out to every linked peer over WS. */
   fanout(notification) {
     this.broadcast(notification);
@@ -1362,7 +1385,7 @@ var InterconnectService = class extends Service {
    * @returns the bounded listing.
    */
   listSessions(rowBudgetBytes) {
-    const reachable = this.ctx.agents.list().filter((agent) => !isSessionOwnedBySubagent(this.ctx, agent.session, agent));
+    const reachable = this.ctx.agents.list().filter((agent) => !isSessionOwnedBySubagent(agent.session));
     const sessions = [];
     let used = 0;
     for (const agent of reachable.slice(0, MAX_LISTED_SESSIONS)) {
@@ -1389,7 +1412,8 @@ var InterconnectService = class extends Service {
     let title;
     try {
       const snapshot = this.ctx.get("sessionProjections")?.snapshot(agent.session);
-      const value = snapshot?.values.title;
+      const values = snapshot?.values;
+      const value = values?.title;
       if (typeof value === "string" && value !== "") title = value;
     } catch {
       title = void 0;
@@ -1447,7 +1471,7 @@ var InterconnectService = class extends Service {
       }
       agent = woken.agent;
     }
-    if (isSessionOwnedBySubagent(this.ctx, agent.session, agent)) {
+    if (isSessionOwnedBySubagent(agent.session)) {
       return { delivered: false, instance: this.instanceId, reason: "session-owned-by-subagent" };
     }
     const sender = (() => {
@@ -1656,24 +1680,40 @@ var LinkState = class {
     this.logger = logger;
     this.resolveToken = resolveToken;
     this.instanceId = instanceId;
-    this.peer = origin;
+    this.origin = origin;
   }
   dialed;
   closed = false;
   retry = 0;
   reconnectTimer;
   warnedNoToken = false;
-  /** Receiver origin this link dials. */
-  peer;
+  warnedNoOrigin = false;
   instanceId;
+  origin;
+  /** The origin this link dials now; for an unresolved `self` route, the sentinel is shown. */
+  get peer() {
+    return typeof this.origin === "string" ? this.origin : this.origin() ?? SELF_PEER_ORIGIN;
+  }
   /** Open the socket; reconnect is scheduled by the close handler. */
   dial() {
     if (this.closed) return;
+    const origin = typeof this.origin === "string" ? this.origin : this.origin();
+    if (origin === void 0) {
+      if (this.retry >= 1 && !this.warnedNoOrigin) {
+        this.warnedNoOrigin = true;
+        this.logger.warn(
+          `interconnect: peer ${this.instanceId} is configured as self but this instance has no listening webServer port yet; the link stays down and retries`
+        );
+      }
+      this.scheduleReconnect();
+      return;
+    }
+    this.warnedNoOrigin = false;
     let url;
     try {
-      url = linkUrl(this.peer);
+      url = linkUrl(origin);
     } catch {
-      this.logger.warn(`interconnect: invalid peer origin ${this.peer}; link to ${this.instanceId} stays down`);
+      this.logger.warn(`interconnect: invalid peer origin ${origin}; link to ${this.instanceId} stays down`);
       return;
     }
     void this.resolveToken().then((token) => {