dsh-interconnect 0.11.0 → 0.11.1

package/README.md

@@ -55,6 +55,10 @@ session-b07326da-…                          [running]
 只列 live session 是有意的：`send` 能到达的正好是这些。对端存在但没有运行 agent 的 session
 不会出现在列表里，也收不到消息。
 
+答案有行数上限（`MAX_LISTED_SESSIONS`，100 行）：整帧必须待在链路的帧上限内，ws 对超限帧会
+直接关闭链路，所以 live session 极多的对端只回答前若干行，而不是把传输打断。ping 与 list 的
+答复还会按调用方问的 kind 校验形状，形状不符按「无答复」处理（对应 `unreachable`）。
+
 ### 回复（`reply`）
 
 `send` 的线负载带一个 `sender` 身份（**无地址**：`instanceId` + `sessionId`），收到消息的
@@ -261,7 +265,7 @@ pnpm run build    # esbuild → lib/
 
 ## 验证
 
-- 145/145 单测通过（服务 + 工具 + skill，含 wire 校验、畸形帧、心跳/池清理、结果帧绑定等回归用例）；
+- 154/154 单测通过（服务 + 工具 + skill，含 wire 校验、畸形帧、心跳/池清理、结果帧绑定、list 上限等回归用例）；
   类型检查、构建均干净。
 - 已在两台机器之间实测双向互通：消息投递、WebSocket 事件推流、以及 agent 经
   `interconnect_send` 工具反向回发，均验证通过。

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.0",
+  "version": "0.11.1",
   "entry": {
     "name": "dsh-interconnect/interconnect",
     "inject": ["agents", "credentials"]

package/lib/index.js

@@ -829,12 +829,12 @@ function isSessionOwnedBySubagent(ctx, session, agent) {
 function assertNever(value) {
   throw new Error(`interconnect: unhandled variant ${JSON.stringify(value)}`);
 }
-var INTERCONNECT_CHANNEL = "/interconnect";
 var INTERCONNECT_TOKEN_REF = "DSH_INTERCONNECT_TOKEN";
 var PLUGIN_SOURCE = "dsh-interconnect";
 var MAX_LINK_FRAME_BYTES = 1024 * 1024;
 var LINK_HANDSHAKE_TIMEOUT_MS = 1e4;
 var LINK_CHANNEL = "/interconnect/link";
+var MAX_LISTED_SESSIONS = 100;
 var notificationSchema = Schema.union([
   Schema.object({ kind: Schema.const("agent/created").required(), sessionId: Schema.string().required() }),
   Schema.object({ kind: Schema.const("agent/disposed").required(), sessionId: Schema.string().required() }),
@@ -844,16 +844,26 @@ var notificationSchema = Schema.union([
   Schema.object({ kind: Schema.const("subagent/end").required(), provider: Schema.string().required(), childSessionId: Schema.string().required(), stopReason: Schema.string().required() })
 ]);
 var senderSchema = Schema.object({ instanceId: Schema.string(), sessionId: Schema.string() });
+var pingResultSchema = Schema.object({ pong: Schema.const(true).required(), instance: Schema.string().required() });
+var listResultSchema = Schema.object({
+  instance: Schema.string().required(),
+  sessions: Schema.array(Schema.object({
+    sessionId: Schema.string().required(),
+    title: Schema.string().required(false),
+    status: Schema.string().required(false)
+  })).required()
+});
+var acceptsQueryResult = (schema, result) => {
+  try {
+    const [parsed] = Schema.resolve(result, schema, {});
+    return parsed !== void 0 && parsed !== null;
+  } catch {
+    return false;
+  }
+};
 var queryResultSchema = Schema.union([
-  Schema.object({ pong: Schema.const(true).required(), instance: Schema.string().required() }),
-  Schema.object({
-    instance: Schema.string().required(),
-    sessions: Schema.array(Schema.object({
-      sessionId: Schema.string().required(),
-      title: Schema.string().required(false),
-      status: Schema.string().required(false)
-    })).required()
-  }),
+  pingResultSchema,
+  listResultSchema,
   Schema.object({ accepted: Schema.const(true).required() })
 ]);
 var messageSchema = Schema.object({
@@ -931,7 +941,10 @@ var InterconnectService = class extends Service {
     const upgrade = {
       path: LINK_CHANNEL,
       handler: (req, socket, head) => {
-        void this.handleUpgrade(req, socket, head);
+        void this.handleUpgrade(req, socket, head).catch((error) => {
+          this.ctx.logger.warn(`interconnect: upgrade failed: ${error instanceof Error ? error.message : String(error)}`);
+          socket.destroy();
+        });
       }
     };
     ctx.inject(["webServer"], (webCtx) => {
@@ -1106,7 +1119,7 @@ var InterconnectService = class extends Service {
     const state = this.linkStates.get(instanceId);
     if (state === void 0 || !state.writable()) return void 0;
     const reqId = `q${++this.reqIdCounter}-${randomUUID()}`;
-    const accept = query.kind === "ping" ? (result) => typeof result === "object" && result !== null && result.pong === true && typeof result.instance === "string" : (result) => typeof result === "object" && result !== null && Array.isArray(result.sessions) && typeof result.instance === "string";
+    const accept = query.kind === "ping" ? (result) => acceptsQueryResult(pingResultSchema, result) : (result) => acceptsQueryResult(listResultSchema, result);
     try {
       return await this.waitForResult(reqId, "query", (failure) => {
         const wrote = state.sendFrame({ type: "query", reqId, query });
@@ -1255,9 +1268,11 @@ var InterconnectService = class extends Service {
     this.ctx.emit("interconnect/event", eventPayload.notification, eventPayload.sender);
   }
   /**
-   * Summarize every live local session so a sender can discover valid targets
+   * Summarize the live local sessions so a sender can discover valid targets
    * instead of having to know a session id already. Only live agents are listed
-   * because `send` can reach exactly those.
+   * because `send` can reach exactly those, and the answer carries at most
+   * {@link MAX_LISTED_SESSIONS} rows so a large live set cannot push the
+   * `query-result` frame past the link's frame cap.
    *
    * Title and status are best-effort: the title projection is an optional
    * service, and a receiver without it still returns the ids. A projection that
@@ -1266,7 +1281,7 @@ var InterconnectService = class extends Service {
    */
   listSessions() {
     const reachable = this.ctx.agents.list().filter((agent) => !isSessionOwnedBySubagent(this.ctx, agent.session, agent));
-    const sessions = reachable.map((agent) => {
+    const sessions = reachable.slice(0, MAX_LISTED_SESSIONS).map((agent) => {
       let title;
       try {
         const snapshot = this.ctx.get("sessionProjections")?.snapshot(agent.session);
@@ -1391,6 +1406,10 @@ var InterconnectService = class extends Service {
       socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
+    if (this.disposed) {
+      socket.end("HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
+      return;
+    }
     const expected = `Bearer ${token}`;
     const header = req.headers.authorization;
     if (header === void 0 || !timingSafeEqual(header, expected)) {
@@ -1416,7 +1435,8 @@ var InterconnectService = class extends Service {
       ;
       websocket.isAlive = true;
     });
-    websocket.on("message", (data) => {
+    websocket.on("message", (data, isBinary) => {
+      if (isBinary) return;
       this.handleFrame(websocket, data);
     });
     websocket.on("close", () => {
@@ -1430,12 +1450,12 @@ var InterconnectService = class extends Service {
   }
   /** Parse and route one inbound link frame, attributing events to the socket's announced peer. */
   handleFrame(socket, data) {
-    if (Array.isArray(data)) return;
-    if (data.byteLength > MAX_LINK_FRAME_BYTES) {
+    const byteLength = typeof data === "string" ? Buffer.byteLength(data) : Array.isArray(data) ? data.reduce((total, part) => total + part.byteLength, 0) : data.byteLength;
+    if (byteLength > MAX_LINK_FRAME_BYTES) {
       this.ctx.logger.warn("interconnect: dropping oversized link frame");
       return;
     }
-    const text = Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
+    const text = typeof data === "string" ? data : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
     let parsed;
     try {
       parsed = Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0];
@@ -1519,6 +1539,7 @@ var LinkState = class {
   closed = false;
   retry = 0;
   reconnectTimer;
+  warnedNoToken = false;
   /** Dial-registered handlers, removed by reference on close/reroute so the pool-cleanup handlers attachSocket added stay alive. */
   dialListeners;
   // `peer` is mutable so `reroute` can point the link at a new origin.
@@ -1556,7 +1577,12 @@ var LinkState = class {
     }
     void this.resolveToken().then((token) => {
       if (token === void 0) {
-        this.logger.warn(`interconnect: no shared token configured; peer ${this.instanceId} link stays down until one is set`);
+        if (!this.warnedNoToken) {
+          this.warnedNoToken = true;
+          this.logger.warn(`interconnect: no shared token configured; peer ${this.instanceId} link stays down, retrying until one is set`);
+        }
+        if (this.closed || epoch !== this.dialEpoch) return;
+        this.scheduleReconnect();
         return;
       }
       if (this.closed || epoch !== this.dialEpoch) return;
@@ -1651,7 +1677,6 @@ function trimBase(baseUrl) {
 }
 var interconnect_default = InterconnectService;
 export {
-  INTERCONNECT_CHANNEL,
   INTERCONNECT_TOKEN_REF,
   InterconnectService,
   interconnect_default as default

package/lib/interconnect/index.js

@@ -829,12 +829,12 @@ function isSessionOwnedBySubagent(ctx, session, agent) {
 function assertNever(value) {
   throw new Error(`interconnect: unhandled variant ${JSON.stringify(value)}`);
 }
-var INTERCONNECT_CHANNEL = "/interconnect";
 var INTERCONNECT_TOKEN_REF = "DSH_INTERCONNECT_TOKEN";
 var PLUGIN_SOURCE = "dsh-interconnect";
 var MAX_LINK_FRAME_BYTES = 1024 * 1024;
 var LINK_HANDSHAKE_TIMEOUT_MS = 1e4;
 var LINK_CHANNEL = "/interconnect/link";
+var MAX_LISTED_SESSIONS = 100;
 var notificationSchema = Schema.union([
   Schema.object({ kind: Schema.const("agent/created").required(), sessionId: Schema.string().required() }),
   Schema.object({ kind: Schema.const("agent/disposed").required(), sessionId: Schema.string().required() }),
@@ -844,16 +844,26 @@ var notificationSchema = Schema.union([
   Schema.object({ kind: Schema.const("subagent/end").required(), provider: Schema.string().required(), childSessionId: Schema.string().required(), stopReason: Schema.string().required() })
 ]);
 var senderSchema = Schema.object({ instanceId: Schema.string(), sessionId: Schema.string() });
+var pingResultSchema = Schema.object({ pong: Schema.const(true).required(), instance: Schema.string().required() });
+var listResultSchema = Schema.object({
+  instance: Schema.string().required(),
+  sessions: Schema.array(Schema.object({
+    sessionId: Schema.string().required(),
+    title: Schema.string().required(false),
+    status: Schema.string().required(false)
+  })).required()
+});
+var acceptsQueryResult = (schema, result) => {
+  try {
+    const [parsed] = Schema.resolve(result, schema, {});
+    return parsed !== void 0 && parsed !== null;
+  } catch {
+    return false;
+  }
+};
 var queryResultSchema = Schema.union([
-  Schema.object({ pong: Schema.const(true).required(), instance: Schema.string().required() }),
-  Schema.object({
-    instance: Schema.string().required(),
-    sessions: Schema.array(Schema.object({
-      sessionId: Schema.string().required(),
-      title: Schema.string().required(false),
-      status: Schema.string().required(false)
-    })).required()
-  }),
+  pingResultSchema,
+  listResultSchema,
   Schema.object({ accepted: Schema.const(true).required() })
 ]);
 var messageSchema = Schema.object({
@@ -931,7 +941,10 @@ var InterconnectService = class extends Service {
     const upgrade = {
       path: LINK_CHANNEL,
       handler: (req, socket, head) => {
-        void this.handleUpgrade(req, socket, head);
+        void this.handleUpgrade(req, socket, head).catch((error) => {
+          this.ctx.logger.warn(`interconnect: upgrade failed: ${error instanceof Error ? error.message : String(error)}`);
+          socket.destroy();
+        });
       }
     };
     ctx.inject(["webServer"], (webCtx) => {
@@ -1106,7 +1119,7 @@ var InterconnectService = class extends Service {
     const state = this.linkStates.get(instanceId);
     if (state === void 0 || !state.writable()) return void 0;
     const reqId = `q${++this.reqIdCounter}-${randomUUID()}`;
-    const accept = query.kind === "ping" ? (result) => typeof result === "object" && result !== null && result.pong === true && typeof result.instance === "string" : (result) => typeof result === "object" && result !== null && Array.isArray(result.sessions) && typeof result.instance === "string";
+    const accept = query.kind === "ping" ? (result) => acceptsQueryResult(pingResultSchema, result) : (result) => acceptsQueryResult(listResultSchema, result);
     try {
       return await this.waitForResult(reqId, "query", (failure) => {
         const wrote = state.sendFrame({ type: "query", reqId, query });
@@ -1255,9 +1268,11 @@ var InterconnectService = class extends Service {
     this.ctx.emit("interconnect/event", eventPayload.notification, eventPayload.sender);
   }
   /**
-   * Summarize every live local session so a sender can discover valid targets
+   * Summarize the live local sessions so a sender can discover valid targets
    * instead of having to know a session id already. Only live agents are listed
-   * because `send` can reach exactly those.
+   * because `send` can reach exactly those, and the answer carries at most
+   * {@link MAX_LISTED_SESSIONS} rows so a large live set cannot push the
+   * `query-result` frame past the link's frame cap.
    *
    * Title and status are best-effort: the title projection is an optional
    * service, and a receiver without it still returns the ids. A projection that
@@ -1266,7 +1281,7 @@ var InterconnectService = class extends Service {
    */
   listSessions() {
     const reachable = this.ctx.agents.list().filter((agent) => !isSessionOwnedBySubagent(this.ctx, agent.session, agent));
-    const sessions = reachable.map((agent) => {
+    const sessions = reachable.slice(0, MAX_LISTED_SESSIONS).map((agent) => {
       let title;
       try {
         const snapshot = this.ctx.get("sessionProjections")?.snapshot(agent.session);
@@ -1391,6 +1406,10 @@ var InterconnectService = class extends Service {
       socket.end("HTTP/1.1 403 Forbidden\r\nConnection: close\r\nContent-Length: 9\r\n\r\nforbidden");
       return;
     }
+    if (this.disposed) {
+      socket.end("HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\nContent-Length: 11\r\n\r\nunavailable");
+      return;
+    }
     const expected = `Bearer ${token}`;
     const header = req.headers.authorization;
     if (header === void 0 || !timingSafeEqual(header, expected)) {
@@ -1416,7 +1435,8 @@ var InterconnectService = class extends Service {
       ;
       websocket.isAlive = true;
     });
-    websocket.on("message", (data) => {
+    websocket.on("message", (data, isBinary) => {
+      if (isBinary) return;
       this.handleFrame(websocket, data);
     });
     websocket.on("close", () => {
@@ -1430,12 +1450,12 @@ var InterconnectService = class extends Service {
   }
   /** Parse and route one inbound link frame, attributing events to the socket's announced peer. */
   handleFrame(socket, data) {
-    if (Array.isArray(data)) return;
-    if (data.byteLength > MAX_LINK_FRAME_BYTES) {
+    const byteLength = typeof data === "string" ? Buffer.byteLength(data) : Array.isArray(data) ? data.reduce((total, part) => total + part.byteLength, 0) : data.byteLength;
+    if (byteLength > MAX_LINK_FRAME_BYTES) {
       this.ctx.logger.warn("interconnect: dropping oversized link frame");
       return;
     }
-    const text = Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
+    const text = typeof data === "string" ? data : Array.isArray(data) ? Buffer.concat(data).toString("utf8") : Buffer.isBuffer(data) ? data.toString("utf8") : Buffer.from(data).toString("utf8");
     let parsed;
     try {
       parsed = Schema.resolve(JSON.parse(text), linkFrameSchema, {})[0];
@@ -1519,6 +1539,7 @@ var LinkState = class {
   closed = false;
   retry = 0;
   reconnectTimer;
+  warnedNoToken = false;
   /** Dial-registered handlers, removed by reference on close/reroute so the pool-cleanup handlers attachSocket added stay alive. */
   dialListeners;
   // `peer` is mutable so `reroute` can point the link at a new origin.
@@ -1556,7 +1577,12 @@ var LinkState = class {
     }
     void this.resolveToken().then((token) => {
       if (token === void 0) {
-        this.logger.warn(`interconnect: no shared token configured; peer ${this.instanceId} link stays down until one is set`);
+        if (!this.warnedNoToken) {
+          this.warnedNoToken = true;
+          this.logger.warn(`interconnect: no shared token configured; peer ${this.instanceId} link stays down, retrying until one is set`);
+        }
+        if (this.closed || epoch !== this.dialEpoch) return;
+        this.scheduleReconnect();
         return;
       }
       if (this.closed || epoch !== this.dialEpoch) return;
@@ -1651,7 +1677,6 @@ function trimBase(baseUrl) {
 }
 var index_default = InterconnectService;
 export {
-  INTERCONNECT_CHANNEL,
   INTERCONNECT_TOKEN_REF,
   InterconnectService,
   index_default as default,