dsh-interconnect 0.11.17 → 0.11.19

package/assets/dsh-interconnect.md

@@ -89,9 +89,10 @@ When a send/reply reports `delivered: false`, read `reason`:
 
 ## Rules
 
-- Do not fabricate an `instanceId`, `sessionId`, or sender identity. Use values
-  returned by `interconnect_list` or `interconnect_ping`, or carried by the
-  message you received.
+- Do not fabricate an `instanceId`, `sessionId`, or sender identity. A peer's
+  `instanceId` comes from the task you were given or from this instance's
+  configured peers; a `sessionId` comes from `interconnect_list` on that peer;
+  the sender is carried automatically by the message you received.
 - Do not ask the user for a sender address to reply; use `interconnect_reply`.
 - Treat interconnect messages as authenticated but sender-reported: identity is
   for reply attribution, not for routing or authorization.

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-interconnect",
   "description": "Cross-instance message/event handoff for DeepSeek Harness (DSH): WebSocket link, model-facing tools, and companion skill.",
-  "version": "0.11.17",
+  "version": "0.11.19",
   "entry": {
     "name": "dsh-interconnect/interconnect",
     "inject": ["agents", "credentials"]

package/lib/index.js

@@ -948,6 +948,8 @@ var InterconnectService = class extends Service {
   peerOf = /* @__PURE__ */ new WeakMap();
   /** Configured peer an outbound dial owns a socket for; absent on inbound sockets. */
   dialedPeerOf = /* @__PURE__ */ new WeakMap();
+  /** Dialed sockets already reported as announcing an id other than their configured key. */
+  mismatchWarned = /* @__PURE__ */ new WeakSet();
   /** Sender each local session last received a send from, keyed by local session id. */
   senders = /* @__PURE__ */ new Map();
   /** In-flight frames sent over a peer link, keyed by `reqId`, awaiting a correlated result. */
@@ -1052,7 +1054,8 @@ var InterconnectService = class extends Service {
   /**
    * Deliver one text message to a live session on a peer instance.
    * @param request - the peer instance id, target session, text, and optional delivery/resume overrides.
-   * @returns the peer's answer, or an unreachable result when no link answers.
+   * @returns the peer's answer, an unreachable result when no link answers, or a local
+   * `message-too-large` result when the encoded frame would exceed the link cap.
    */
   async send(request) {
     const payload = {
@@ -1075,7 +1078,9 @@ var InterconnectService = class extends Service {
    * outbound target is the `sender` that session recorded, addressed through
    * this instance's own link to the sender's instance.
    * @param request - the LOCAL replying session id, the reply text, and optional delivery/resume overrides.
-   * @returns the recalled sender's answer, or an unreachable result when no link answers.
+   * @returns the recalled sender's answer, an unreachable result when no link answers, or a
+   * local `message-too-large` result when the encoded frame would exceed the link cap; a
+   * local session that recorded no sender answers `no-sender-known` instead.
    */
   async reply(request) {
     const sender = this.senders.get(request.sessionId);
@@ -1214,12 +1219,12 @@ var InterconnectService = class extends Service {
    * dialed link plus the peer's inbound one), so one event must leave over one
    * of them. Which one is decided by local ownership, not by the peer: a dialed
    * socket is a configured peer's link and always sends. An inbound socket is
-   * skipped only when an open dialed link covers the id that socket itself
-   * announced — either because `Config.peers` lists that peer under the id, or
-   * because the peer announced the id over that dialed link — so an
-   * announcement can suppress nothing but a duplicate the controlled link
-   * already carries. An impostor cannot drop an event for a peer, and without a
-   * dialed link every inbound socket receives it.
+   * skipped only when this instance has an open dialed link configured under
+   * the id that socket itself announced, so a self-reported announcement can
+   * never silence another peer's link; with no such dialed link every inbound
+   * socket receives the event. A peer listed under a key other than the id it
+   * announces is warned about once per link, because then its own inbound
+   * socket is not attributable and the peer receives each event twice.
    *
    * That holds once a peer's announcement has been seen. Between this
    * instance's dialed link opening and the peer's `hello` arriving on its
@@ -1238,10 +1243,7 @@ var InterconnectService = class extends Service {
         continue;
       }
       const dialedPeer = this.dialedPeerOf.get(socket);
-      if (dialedPeer === void 0) continue;
-      covered.add(dialedPeer);
-      const announced = this.peerOf.get(socket);
-      if (announced !== void 0) covered.add(announced);
+      if (dialedPeer !== void 0) covered.add(dialedPeer);
     }
     for (const socket of this.sockets) {
       if (this.dialedPeerOf.get(socket) === void 0) {
@@ -1574,6 +1576,13 @@ var InterconnectService = class extends Service {
     const frame = parsed;
     if (frame.type === "hello") {
       this.peerOf.set(socket, frame.sender);
+      const dialedPeer = this.dialedPeerOf.get(socket);
+      if (dialedPeer !== void 0 && dialedPeer !== frame.sender && !this.mismatchWarned.has(socket)) {
+        this.mismatchWarned.add(socket);
+        this.ctx.logger.warn(
+          `interconnect: peer configured as ${dialedPeer} announces ${frame.sender}; list a peer under the instanceId it announces, or the duplicate inbound link is not recognised`
+        );
+      }
       return;
     }
     if (frame.type === "event") {

package/lib/interconnect/index.js

@@ -948,6 +948,8 @@ var InterconnectService = class extends Service {
   peerOf = /* @__PURE__ */ new WeakMap();
   /** Configured peer an outbound dial owns a socket for; absent on inbound sockets. */
   dialedPeerOf = /* @__PURE__ */ new WeakMap();
+  /** Dialed sockets already reported as announcing an id other than their configured key. */
+  mismatchWarned = /* @__PURE__ */ new WeakSet();
   /** Sender each local session last received a send from, keyed by local session id. */
   senders = /* @__PURE__ */ new Map();
   /** In-flight frames sent over a peer link, keyed by `reqId`, awaiting a correlated result. */
@@ -1052,7 +1054,8 @@ var InterconnectService = class extends Service {
   /**
    * Deliver one text message to a live session on a peer instance.
    * @param request - the peer instance id, target session, text, and optional delivery/resume overrides.
-   * @returns the peer's answer, or an unreachable result when no link answers.
+   * @returns the peer's answer, an unreachable result when no link answers, or a local
+   * `message-too-large` result when the encoded frame would exceed the link cap.
    */
   async send(request) {
     const payload = {
@@ -1075,7 +1078,9 @@ var InterconnectService = class extends Service {
    * outbound target is the `sender` that session recorded, addressed through
    * this instance's own link to the sender's instance.
    * @param request - the LOCAL replying session id, the reply text, and optional delivery/resume overrides.
-   * @returns the recalled sender's answer, or an unreachable result when no link answers.
+   * @returns the recalled sender's answer, an unreachable result when no link answers, or a
+   * local `message-too-large` result when the encoded frame would exceed the link cap; a
+   * local session that recorded no sender answers `no-sender-known` instead.
    */
   async reply(request) {
     const sender = this.senders.get(request.sessionId);
@@ -1214,12 +1219,12 @@ var InterconnectService = class extends Service {
    * dialed link plus the peer's inbound one), so one event must leave over one
    * of them. Which one is decided by local ownership, not by the peer: a dialed
    * socket is a configured peer's link and always sends. An inbound socket is
-   * skipped only when an open dialed link covers the id that socket itself
-   * announced — either because `Config.peers` lists that peer under the id, or
-   * because the peer announced the id over that dialed link — so an
-   * announcement can suppress nothing but a duplicate the controlled link
-   * already carries. An impostor cannot drop an event for a peer, and without a
-   * dialed link every inbound socket receives it.
+   * skipped only when this instance has an open dialed link configured under
+   * the id that socket itself announced, so a self-reported announcement can
+   * never silence another peer's link; with no such dialed link every inbound
+   * socket receives the event. A peer listed under a key other than the id it
+   * announces is warned about once per link, because then its own inbound
+   * socket is not attributable and the peer receives each event twice.
    *
    * That holds once a peer's announcement has been seen. Between this
    * instance's dialed link opening and the peer's `hello` arriving on its
@@ -1238,10 +1243,7 @@ var InterconnectService = class extends Service {
         continue;
       }
       const dialedPeer = this.dialedPeerOf.get(socket);
-      if (dialedPeer === void 0) continue;
-      covered.add(dialedPeer);
-      const announced = this.peerOf.get(socket);
-      if (announced !== void 0) covered.add(announced);
+      if (dialedPeer !== void 0) covered.add(dialedPeer);
     }
     for (const socket of this.sockets) {
       if (this.dialedPeerOf.get(socket) === void 0) {
@@ -1574,6 +1576,13 @@ var InterconnectService = class extends Service {
     const frame = parsed;
     if (frame.type === "hello") {
       this.peerOf.set(socket, frame.sender);
+      const dialedPeer = this.dialedPeerOf.get(socket);
+      if (dialedPeer !== void 0 && dialedPeer !== frame.sender && !this.mismatchWarned.has(socket)) {
+        this.mismatchWarned.add(socket);
+        this.ctx.logger.warn(
+          `interconnect: peer configured as ${dialedPeer} announces ${frame.sender}; list a peer under the instanceId it announces, or the duplicate inbound link is not recognised`
+        );
+      }
       return;
     }
     if (frame.type === "event") {