@ai-matrx/desktop-protocol 0.21.78 → 0.21.80

package/dist/client.cjs

@@ -144,7 +144,7 @@ var import_zod2 = require("zod");
 var import_zod = require("zod");
 var import_uuid = require("@ai-matrx/kit/uuid");
 var PROTOCOL_MAJOR = 1;
-var PROTOCOL_MINOR = 76;
+var PROTOCOL_MINOR = 77;
 var PROTOCOL_VERSION = `${PROTOCOL_MAJOR}.${PROTOCOL_MINOR}`;
 var ProtocolVersion = import_zod.z.string().regex(/^[1-9][0-9]{0,2}\.[0-9]{1,3}$/);
 var RequestId = import_zod.z.string().min(1).max(64).regex(/^[A-Za-z0-9_-]+$/);
@@ -2479,7 +2479,13 @@ var CodingServiceCredentials = import_zod27.z.strictObject({
   access_token: import_zod27.z.string().min(16).max(16384),
   user_id: import_zod27.z.string().regex(import_uuid4.UUID_SHAPE_PATTERN),
   /** The AI Matrx server this app talks to (production, or a local server on the nightly copy). */
-  server_url: import_zod27.z.string().min(1).max(2048).regex(/^https?:\/\/[^\s/?#]+(\/[^\s?#]*)?$/)
+  server_url: import_zod27.z.string().min(1).max(2048).regex(/^https?:\/\/[^\s/?#]+(\/[^\s?#]*)?$/),
+  /**
+   * The organization the person works in (the core's active organization): the service sends it as
+   * X-Organization-Id on every AI Matrx request, as the app's own calls do. Absent: the
+   * service sends nothing and says an organization is needed (1.77).
+   */
+  organization_id: import_zod27.z.string().regex(import_uuid4.UUID_SHAPE_PATTERN).optional()
 });
 var CodingHistoryBlocked = import_zod27.z.enum([
   "signed_out",
@@ -5200,6 +5206,7 @@ function createDesktopClient(options) {
   const makeSocket = options.webSocket ?? defaultWebSocket();
   const heartbeatMs = options.heartbeatMs ?? 25e3;
   const requestTimeoutMs = options.requestTimeoutMs ?? 7e4;
+  const firstFrameMs = options.firstFrameMs ?? requestTimeoutMs;
   const protocolVersion = options.protocolVersion ?? `${PROTOCOL_MAJOR}.${PROTOCOL_MINOR}`;
   const backoff = (0, import_realtime.createBackoff)({ ...options.backoff, now: timers.now });
   const diagnose = options.onDiagnostic ?? ((d) => {
@@ -5237,6 +5244,7 @@ function createDesktopClient(options) {
   let probeTimer = null;
   let lastHeardAt = 0;
   let heardCount = 0;
+  let pongs = 0;
   let closedByUser = false;
   const newId = (prefix) => `${prefix}${(++nextId).toString(36)}`;
   function setState(patch) {
@@ -5284,6 +5292,7 @@ function createDesktopClient(options) {
     ws.onopen = () => {
       if (generation !== socketGeneration) return;
       lastHeardAt = timers.now();
+      pongs = 0;
       helloId = newId("h");
       setState({ status: "handshaking" });
       sendJson({ type: "hello", id: helloId, protocolVersion, clientType: options.clientType, clientVersion: options.clientVersion });
@@ -5299,6 +5308,8 @@ function createDesktopClient(options) {
     };
     ws.onclose = (event) => {
       if (generation !== socketGeneration) return;
+      const ev = event;
+      reportClose(ev.code, ev.reason ?? "", ev.wasClean ?? false);
       onSocketGone(generation, event.code, null);
     };
   }
@@ -5310,6 +5321,7 @@ function createDesktopClient(options) {
       const silentMs = timers.now() - lastHeardAt;
       if (silentMs >= heartbeatMs * 2) {
         diagnose({ kind: "heartbeat_timeout", silentMs });
+        reportClose(null, "heartbeat timeout", false);
         const dead = socket;
         onSocketGone(generation, null, new DesktopProtocolError("TIMEOUT", "Connection went silent", { retryable: true }));
         try {
@@ -5322,6 +5334,9 @@ function createDesktopClient(options) {
       scheduleHeartbeat(generation);
     }, heartbeatMs);
   }
+  function reportClose(code, reason, wasClean) {
+    diagnose({ kind: "socket_closed", code, reason: reason.slice(0, 120), wasClean, idleSinceLastRxMs: Math.max(0, timers.now() - lastHeardAt), pongs });
+  }
   function onSocketGone(generation, code, error) {
     if (generation !== socketGeneration) return;
     socketGeneration++;
@@ -5410,7 +5425,10 @@ function createDesktopClient(options) {
   }
   function onMessage(data) {
     if (typeof data === "string") {
-      if (data === PONG_TEXT) return;
+      if (data === PONG_TEXT) {
+        pongs++;
+        return;
+      }
       let json;
       try {
         json = JSON.parse(data);
@@ -5441,6 +5459,10 @@ function createDesktopClient(options) {
     onFrame(frame.header, frame.payload);
   }
   function onEnvelope(msg) {
+    if (msg.type !== "event") {
+      const heard = streams.get(msg.id);
+      if (heard) clearFirstFrame(heard);
+    }
     switch (msg.type) {
       case "response": {
         if (msg.id === helloId) return onWelcome(msg.result);
@@ -5582,6 +5604,7 @@ function createDesktopClient(options) {
       diagnose({ kind: "unknown_stream", sid: header.sid });
       return;
     }
+    clearFirstFrame(s);
     const isData = header.channel === FrameChannel.DATA || header.channel === FrameChannel.STDERR;
     const isSnapshot = header.channel === FrameChannel.SNAPSHOT;
     if (!isData && !isSnapshot) {
@@ -5627,8 +5650,29 @@ function createDesktopClient(options) {
       socket.send(encodeFrame({ version: FRAME_VERSION, flags: 0, channel: FrameChannel.STDIN, cid: 0, sid: s.sid, seq: s.sendSeq }, chunk));
     }
   }
+  function clearFirstFrame(s) {
+    if (s.firstFrameTimer === null) return;
+    timers.clearTimeout(s.firstFrameTimer);
+    s.firstFrameTimer = null;
+  }
+  function armFirstFrame(s) {
+    clearFirstFrame(s);
+    const waitMs = s.options.firstFrameMs ?? firstFrameMs;
+    const id = s.id;
+    s.firstFrameTimer = timers.setTimeout(() => {
+      s.firstFrameTimer = null;
+      if (s.ended || s.id !== id) return;
+      diagnose({ kind: "first_frame_timeout", id, op: s.op, waitedMs: waitMs });
+      streams.delete(id);
+      if (s.sid !== null) bySid.delete(s.sid);
+      abandon(id);
+      endStream(s, null, new DesktopProtocolError("TIMEOUT", `${s.op}: no answer within ${waitMs} ms`, { retryable: true }));
+      wake();
+    }, waitMs);
+  }
   function endStream(s, reason, error) {
     if (s.ended) return;
+    clearFirstFrame(s);
     s.ended = true;
     s.sendQueue = [];
     if (!s.resultSettled) {
@@ -5651,7 +5695,7 @@ function createDesktopClient(options) {
     const params = { resource_id: s.resourceId, mode: s.options.mode ?? "control" };
     if (s.lastSeq > 0) params.since_seq = s.lastSeq;
     if (s.options.windowBytes !== void 0) params.window_bytes = s.options.windowBytes;
-    sendJson({ id, type: "request", cap: "session", op: "attach", params });
+    if (sendJson({ id, type: "request", cap: "session", op: "attach", params })) armFirstFrame(s);
   }
   function safeCall(where, fn) {
     try {
@@ -5760,7 +5804,8 @@ function createDesktopClient(options) {
       resolveDone,
       rejectDone,
       ended: false,
-      reattaching: false
+      reattaching: false,
+      firstFrameTimer: null
     };
     const start = async () => {
       let welcome;
@@ -5779,7 +5824,9 @@ function createDesktopClient(options) {
       if (!sendJson({ id: s.id, type: "request", ...capOf(op), params: wire })) {
         streams.delete(s.id);
         endStream(s, null, new DesktopProtocolError("DEVICE_OFFLINE", "Connection lost", { retryable: true }));
+        return;
       }
+      armFirstFrame(s);
     };
     void start();
     opts.signal?.addEventListener("abort", () => handle.cancel(), { once: true });
@@ -5855,6 +5902,7 @@ function createDesktopClient(options) {
       if (heardCount > heardBefore) return;
       const silentMs = timers.now() - lastHeardAt;
       diagnose({ kind: "heartbeat_timeout", silentMs });
+      reportClose(null, "wake probe timeout", false);
       const dead = socket;
       onSocketGone(generation, null, new DesktopProtocolError("TIMEOUT", "Connection went silent", { retryable: true }));
       try {