@copilotkit/aimock 1.46.0 → 1.47.0

package/dist/ws-framing.js

@@ -49,12 +49,11 @@ var WebSocketConnection = class extends EventEmitter {
 				this.parseFrames();
 			}
 		});
-		socket.on("close", () => {
-			if (!this.closed) {
-				this.closed = true;
-				this.release(/* @__PURE__ */ new Error("WebSocket closed"));
-				this.emit("close", 1006, "Connection lost");
-			}
+		socket.on("close", () => this.lost());
+		socket.on("end", () => {
+			if (this.closed) return;
+			this.socket.destroy();
+			this.lost();
 		});
 		socket.on("error", (err) => {
 			this.emit("error", err);
@@ -102,6 +101,13 @@ var WebSocketConnection = class extends EventEmitter {
 			}
 		});
 	}
+	/** Mark an unannounced connection loss and emit close once. */
+	lost() {
+		if (this.closed) return;
+		this.closed = true;
+		this.release(/* @__PURE__ */ new Error("WebSocket closed"));
+		this.emit("close", 1006, "Connection lost");
+	}
 	release(error) {
 		this.buffer = Buffer.alloc(0);
 		this.fragments = [];

package/dist/ws-framing.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws-framing.js","names":[],"sources":["../src/ws-framing.ts"],"sourcesContent":["/**\n * Minimal RFC 6455 WebSocket server implementation.\n *\n * Zero dependencies — uses only Node.js builtins (node:crypto, node:events).\n * Supports text frames, ping/pong, close handshake, and client frame unmasking.\n * Designed for a mock server — no extensions, no binary frames, no compression.\n */\n\nimport { createHash, randomBytes } from \"node:crypto\";\nimport { EventEmitter } from \"node:events\";\nimport type * as net from \"node:net\";\nimport type * as http from \"node:http\";\n\nconst WS_GUID = \"258EAFA5-E914-47DA-95CA-C5AB0DC85B11\";\n\n// Opcodes\nconst OP_CONTINUATION = 0x0;\nconst OP_TEXT = 0x1;\nconst OP_CLOSE = 0x8;\nconst OP_PING = 0x9;\nconst OP_PONG = 0xa;\n\nexport interface WebSocketLimits {\n  maxMessageBytes?: number;\n  maxBufferedBytes?: number;\n  maxWriteBytes?: number;\n  /** Client role: mask outgoing frames and require unmasked incoming frames. */\n  maskOutgoing?: boolean;\n}\n\nexport class WebSocketConnection extends EventEmitter {\n  private socket: net.Socket;\n  private buffer: Buffer = Buffer.alloc(0);\n  private closed = false;\n\n  // For fragmented messages (continuation frames)\n  private fragments: Buffer[] = [];\n\n  private fragmentBytes = 0;\n  private fragmented = false;\n  private pendingWriteBytes = 0;\n  private pendingWrites = new Set<(error: Error) => void>();\n  private limits: WebSocketLimits;\n\n  constructor(socket: net.Socket, limits: WebSocketLimits = {}) {\n    super();\n    for (const value of [limits.maxMessageBytes, limits.maxBufferedBytes, limits.maxWriteBytes]) {\n      if (value !== undefined && (!Number.isSafeInteger(value) || value <= 0)) {\n        throw new RangeError(\"WebSocket limits must be positive safe integers\");\n      }\n    }\n    this.limits = { ...limits };\n    this.socket = socket;\n\n    socket.on(\"data\", (data: Buffer) => {\n      // Byte-idle consumers must see partial frames and control traffic too.\n      // Emit no payload, and notify before parsing can dispatch a message.\n      if (data.length > 0 && !this.closed) this.emit(\"activity\");\n      let offset = 0;\n      while (offset < data.length && !this.closed) {\n        const room =\n          (this.limits.maxBufferedBytes ?? Infinity) - this.fragmentBytes - this.buffer.length;\n        if (room <= 0) {\n          this.close(1009, \"WebSocket buffer limit exceeded\");\n          return;\n        }\n        const end = offset + Math.min(room, data.length - offset);\n        this.buffer = Buffer.concat([this.buffer, data.subarray(offset, end)]);\n        offset = end;\n        this.parseFrames();\n      }\n    });\n\n    socket.on(\"close\", () => {\n      if (!this.closed) {\n        this.closed = true;\n        this.release(new Error(\"WebSocket closed\"));\n        this.emit(\"close\", 1006, \"Connection lost\");\n      }\n    });\n\n    socket.on(\"error\", (err: Error) => {\n      this.emit(\"error\", err);\n    });\n  }\n\n  send(data: string): void {\n    if (this.closed) return;\n    void this.sendAsync(data).catch(() => {\n      /* Legacy fire-and-forget API. */\n    });\n  }\n\n  sendAsync(data: string, signal?: AbortSignal): Promise<void> {\n    if (this.closed || this.socket.destroyed) return Promise.reject(new Error(\"WebSocket closed\"));\n    if (signal?.aborted) return Promise.reject(new Error(\"WebSocket send aborted\"));\n    const length = Buffer.byteLength(data);\n    const frameBytes =\n      length + (length < 126 ? 2 : length < 65536 ? 4 : 10) + (this.limits.maskOutgoing ? 4 : 0);\n    if (\n      frameBytes >\n      (this.limits.maxWriteBytes ?? Infinity) -\n        Math.max(this.pendingWriteBytes, this.socket.writableLength)\n    ) {\n      this.close(1009, \"WebSocket write limit exceeded\");\n      return Promise.reject(new Error(\"WebSocket write limit exceeded\"));\n    }\n    this.pendingWriteBytes += frameBytes;\n    return new Promise<void>((resolve, reject) => {\n      let settled = false;\n      const finish = (error?: Error) => {\n        if (settled) return;\n        settled = true;\n        this.pendingWriteBytes -= frameBytes;\n        this.pendingWrites.delete(fail);\n        signal?.removeEventListener(\"abort\", abort);\n        if (error) reject(error);\n        else resolve();\n      };\n      const fail = (error: Error) => finish(error);\n      const abort = () => {\n        finish(new Error(\"WebSocket send aborted\"));\n        this.destroy();\n      };\n      this.pendingWrites.add(fail);\n      signal?.addEventListener(\"abort\", abort, { once: true });\n      try {\n        this.socket.write(this.encodeFrame(OP_TEXT, Buffer.from(data)), (error?: Error | null) => {\n          if (error) finish(new Error(\"WebSocket write failed\"));\n          else finish();\n        });\n      } catch {\n        finish(new Error(\"WebSocket write failed\"));\n      }\n    });\n  }\n\n  private release(error: Error): void {\n    this.buffer = Buffer.alloc(0);\n    this.fragments = [];\n    this.fragmentBytes = 0;\n    for (const fail of this.pendingWrites) fail(error);\n  }\n\n  close(code = 1000, reason = \"\"): void {\n    if (this.closed) return;\n    this.closed = true;\n    this.release(new Error(\"WebSocket closed\"));\n\n    const encodedReason = Buffer.from(reason, \"utf-8\");\n    let reasonEnd = Math.min(encodedReason.length, 123);\n    // A continuation byte at the cut means its code point straddles the limit.\n    while (reasonEnd < encodedReason.length && (encodedReason[reasonEnd] & 0xc0) === 0x80) {\n      reasonEnd--;\n    }\n    const reasonBuf = encodedReason.subarray(0, reasonEnd);\n    const payload = Buffer.alloc(2 + reasonBuf.length);\n    payload.writeUInt16BE(code, 0);\n    reasonBuf.copy(payload, 2);\n    this.writeFrame(OP_CLOSE, payload);\n\n    // Give the client a moment to receive the close frame before destroying.\n    // If writeFrame failed (socket already destroyed), this is a no-op.\n    setTimeout(() => {\n      if (!this.socket.destroyed) {\n        this.socket.destroy();\n      }\n      // Emit close event for server-initiated closes so listeners\n      // (e.g. activeConnections.delete) always fire.\n      this.emit(\"close\", code, reason);\n    }, 100);\n  }\n\n  destroy(): void {\n    if (this.closed) return;\n    this.closed = true;\n    this.release(new Error(\"WebSocket destroyed\"));\n    if (!this.socket.destroyed) {\n      this.socket.destroy();\n    }\n    this.emit(\"close\", 1006, \"Connection destroyed\");\n  }\n\n  get isClosed(): boolean {\n    return this.closed;\n  }\n\n  private encodeFrame(opcode: number, payload: Buffer): Buffer {\n    const length = payload.length;\n    const headerSize = length < 126 ? 2 : length < 65536 ? 4 : 10;\n    const maskSize = this.limits.maskOutgoing ? 4 : 0;\n    const frame = Buffer.allocUnsafe(headerSize + maskSize + length);\n    frame[0] = 0x80 | opcode;\n    frame[1] = (maskSize ? 0x80 : 0) | (length < 126 ? length : length < 65536 ? 126 : 127);\n    if (headerSize === 4) frame.writeUInt16BE(length, 2);\n    if (headerSize === 10) frame.writeBigUInt64BE(BigInt(length), 2);\n    if (maskSize) {\n      const mask = randomBytes(4);\n      mask.copy(frame, headerSize);\n      for (let i = 0; i < length; i++) frame[headerSize + 4 + i] = payload[i] ^ mask[i % 4];\n    } else payload.copy(frame, headerSize);\n    return frame;\n  }\n\n  private writeFrame(opcode: number, payload: Buffer): void {\n    if (this.socket.destroyed) return;\n    const available =\n      (this.limits.maxWriteBytes ?? Infinity) -\n      Math.max(this.pendingWriteBytes, this.socket.writableLength);\n    const headerBytes = 2 + (this.limits.maskOutgoing ? 4 : 0);\n    if (opcode === OP_CLOSE && payload.length + headerBytes > available) {\n      // Keep even the final control frame inside the configured socket budget.\n      if (available < headerBytes + 2) {\n        this.socket.destroy();\n        return;\n      }\n      payload = payload.subarray(0, 2);\n    } else if (payload.length + headerBytes > available) {\n      this.close(1009, \"WebSocket write limit exceeded\");\n      return;\n    }\n    const frame = this.encodeFrame(opcode, payload);\n    this.socket.write(frame);\n  }\n\n  private parseFrames(): void {\n    while (this.buffer.length >= 2 && !this.closed) {\n      const byte0 = this.buffer[0];\n      const byte1 = this.buffer[1];\n\n      const fin = (byte0 & 0x80) !== 0;\n      const opcode = byte0 & 0x0f;\n      const masked = (byte1 & 0x80) !== 0;\n      if (\n        byte0 & 0x70 ||\n        masked === Boolean(this.limits.maskOutgoing) ||\n        ![OP_CONTINUATION, OP_TEXT, 2, OP_CLOSE, OP_PING, OP_PONG].includes(opcode) ||\n        (opcode >= 8 && (!fin || (byte1 & 0x7f) > 125)) ||\n        (opcode === OP_CONTINUATION && !this.fragmented) ||\n        (opcode === OP_TEXT && this.fragmented)\n      ) {\n        this.close(1002, \"Invalid WebSocket frame\");\n        return;\n      }\n      let payloadLength = byte1 & 0x7f;\n      let offset = 2;\n\n      if (payloadLength === 126) {\n        if (this.buffer.length < 4) return; // need more data\n        payloadLength = this.buffer.readUInt16BE(2);\n        offset = 4;\n      } else if (payloadLength === 127) {\n        if (this.buffer.length < 10) return;\n        const advertised = this.buffer.readBigUInt64BE(2);\n        if (advertised & (1n << 63n)) {\n          this.close(1002, \"Invalid WebSocket length\");\n          return;\n        }\n        if (advertised > BigInt(Number.MAX_SAFE_INTEGER)) {\n          this.close(1009, \"WebSocket message limit exceeded\");\n          return;\n        }\n        payloadLength = Number(advertised);\n        offset = 10;\n      }\n\n      if (\n        ((byte1 & 0x7f) === 126 && payloadLength < 126) ||\n        ((byte1 & 0x7f) === 127 && payloadLength < 65536)\n      ) {\n        this.close(1002, \"Invalid WebSocket length\");\n        return;\n      }\n      if (\n        opcode < 8 &&\n        payloadLength > (this.limits.maxMessageBytes ?? Infinity) - this.fragmentBytes\n      ) {\n        this.close(1009, \"WebSocket message limit exceeded\");\n        return;\n      }\n      if (\n        payloadLength + offset + (masked ? 4 : 0) >\n        (this.limits.maxBufferedBytes ?? Infinity) - this.fragmentBytes\n      ) {\n        this.close(1009, \"WebSocket buffer limit exceeded\");\n        return;\n      }\n      const maskSize = masked ? 4 : 0;\n      const totalFrameSize = offset + maskSize + payloadLength;\n\n      if (this.buffer.length < totalFrameSize) return; // need more data\n\n      let maskKey: Buffer | null = null;\n      if (masked) {\n        maskKey = this.buffer.subarray(offset, offset + 4);\n        offset += 4;\n      }\n\n      let payload = this.buffer.subarray(offset, offset + payloadLength);\n\n      // Unmask client payload\n      if (maskKey) {\n        payload = Buffer.from(payload); // copy before mutating\n        for (let i = 0; i < payload.length; i++) {\n          payload[i] ^= maskKey[i % 4];\n        }\n      }\n\n      // Consume the frame from the buffer\n      this.buffer = this.buffer.subarray(totalFrameSize);\n\n      this.handleFrame(fin, opcode, payload);\n    }\n  }\n\n  private handleFrame(fin: boolean, opcode: number, payload: Buffer): void {\n    // Control frames (opcode >= 0x8) must not be fragmented\n    if (opcode === OP_PING) {\n      this.writeFrame(OP_PONG, payload);\n      return;\n    }\n\n    if (opcode === OP_PONG) {\n      // Ignore unsolicited pongs\n      return;\n    }\n\n    if (opcode === OP_CLOSE) {\n      if (payload.length === 1) {\n        this.close(1002, \"Invalid WebSocket close\");\n        return;\n      }\n      const code = payload.length >= 2 ? payload.readUInt16BE(0) : 1005;\n      const reason = payload.length > 2 ? payload.subarray(2).toString(\"utf-8\") : \"\";\n\n      if (!this.closed) {\n        this.closed = true;\n        this.release(new Error(\"WebSocket closed\"));\n        // Echo close frame back\n        this.writeFrame(OP_CLOSE, payload);\n        this.socket.end();\n        this.emit(\"close\", code, reason);\n      }\n      // If already closed (server-initiated or duplicate), ignore — the\n      // close event was already emitted by close() or the first OP_CLOSE.\n      return;\n    }\n\n    // Text or continuation frames\n    if (opcode === OP_TEXT || opcode === OP_CONTINUATION) {\n      this.fragmented = !fin;\n      this.fragmentBytes += payload.length;\n      if (payload.length) this.fragments.push(payload);\n\n      if (fin) {\n        const message = Buffer.concat(this.fragments).toString(\"utf-8\");\n        this.fragments = [];\n        this.fragmentBytes = 0;\n        this.emit(\"message\", message);\n      }\n      // If !fin, wait for more continuation frames\n      return;\n    }\n\n    // Binary or unknown — just ignore for a mock server\n  }\n}\n\nexport function computeAcceptKey(wsKey: string): string {\n  return createHash(\"sha1\")\n    .update(wsKey + WS_GUID)\n    .digest(\"base64\");\n}\n\nexport function upgradeToWebSocket(\n  req: http.IncomingMessage,\n  socket: net.Socket,\n  limits?: WebSocketLimits,\n): WebSocketConnection {\n  const key = req.headers[\"sec-websocket-key\"];\n  if (!key) {\n    socket.write(\"HTTP/1.1 400 Bad Request\\r\\n\\r\\n\");\n    socket.destroy();\n    throw new Error(\"Missing Sec-WebSocket-Key header\");\n  }\n\n  const acceptKey = computeAcceptKey(key);\n\n  let responseHeaders =\n    \"HTTP/1.1 101 Switching Protocols\\r\\n\" +\n    \"Upgrade: websocket\\r\\n\" +\n    \"Connection: Upgrade\\r\\n\" +\n    `Sec-WebSocket-Accept: ${acceptKey}\\r\\n`;\n\n  // Echo back requested subprotocol if present\n  const protocol = req.headers[\"sec-websocket-protocol\"];\n  if (protocol) {\n    // Take the first offered protocol\n    const first = protocol.split(\",\")[0].trim();\n    responseHeaders += `Sec-WebSocket-Protocol: ${first}\\r\\n`;\n  }\n\n  responseHeaders += \"\\r\\n\";\n\n  socket.write(responseHeaders);\n\n  return new WebSocketConnection(socket, limits);\n}\n"],"mappings":"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"}
+{"version":3,"file":"ws-framing.js","names":[],"sources":["../src/ws-framing.ts"],"sourcesContent":["/**\n * Minimal RFC 6455 WebSocket server implementation.\n *\n * Zero dependencies — uses only Node.js builtins (node:crypto, node:events).\n * Supports text frames, ping/pong, close handshake, and client frame unmasking.\n * Designed for a mock server — no extensions, no binary frames, no compression.\n */\n\nimport { createHash, randomBytes } from \"node:crypto\";\nimport { EventEmitter } from \"node:events\";\nimport type * as net from \"node:net\";\nimport type * as http from \"node:http\";\n\nconst WS_GUID = \"258EAFA5-E914-47DA-95CA-C5AB0DC85B11\";\n\n// Opcodes\nconst OP_CONTINUATION = 0x0;\nconst OP_TEXT = 0x1;\nconst OP_CLOSE = 0x8;\nconst OP_PING = 0x9;\nconst OP_PONG = 0xa;\n\nexport interface WebSocketLimits {\n  maxMessageBytes?: number;\n  maxBufferedBytes?: number;\n  maxWriteBytes?: number;\n  /** Client role: mask outgoing frames and require unmasked incoming frames. */\n  maskOutgoing?: boolean;\n}\n\nexport class WebSocketConnection extends EventEmitter {\n  private socket: net.Socket;\n  private buffer: Buffer = Buffer.alloc(0);\n  private closed = false;\n\n  // For fragmented messages (continuation frames)\n  private fragments: Buffer[] = [];\n\n  private fragmentBytes = 0;\n  private fragmented = false;\n  private pendingWriteBytes = 0;\n  private pendingWrites = new Set<(error: Error) => void>();\n  private limits: WebSocketLimits;\n\n  constructor(socket: net.Socket, limits: WebSocketLimits = {}) {\n    super();\n    for (const value of [limits.maxMessageBytes, limits.maxBufferedBytes, limits.maxWriteBytes]) {\n      if (value !== undefined && (!Number.isSafeInteger(value) || value <= 0)) {\n        throw new RangeError(\"WebSocket limits must be positive safe integers\");\n      }\n    }\n    this.limits = { ...limits };\n    this.socket = socket;\n\n    socket.on(\"data\", (data: Buffer) => {\n      // Byte-idle consumers must see partial frames and control traffic too.\n      // Emit no payload, and notify before parsing can dispatch a message.\n      if (data.length > 0 && !this.closed) this.emit(\"activity\");\n      let offset = 0;\n      while (offset < data.length && !this.closed) {\n        const room =\n          (this.limits.maxBufferedBytes ?? Infinity) - this.fragmentBytes - this.buffer.length;\n        if (room <= 0) {\n          this.close(1009, \"WebSocket buffer limit exceeded\");\n          return;\n        }\n        const end = offset + Math.min(room, data.length - offset);\n        this.buffer = Buffer.concat([this.buffer, data.subarray(offset, end)]);\n        offset = end;\n        this.parseFrames();\n      }\n    });\n\n    socket.on(\"close\", () => this.lost());\n\n    // A peer FIN without a close frame is a disconnect. HTTP upgrade sockets\n    // allow half-open, so without this the loss surfaces only on a later\n    // failed write. Data events precede \"end\", so frames that arrive just\n    // before the FIN still parse, but any turn they start is cancelled at once\n    // because the connection is then lost.\n    socket.on(\"end\", () => {\n      if (this.closed) return;\n      this.socket.destroy();\n      this.lost();\n    });\n\n    socket.on(\"error\", (err: Error) => {\n      this.emit(\"error\", err);\n    });\n  }\n\n  send(data: string): void {\n    if (this.closed) return;\n    void this.sendAsync(data).catch(() => {\n      /* Legacy fire-and-forget API. */\n    });\n  }\n\n  sendAsync(data: string, signal?: AbortSignal): Promise<void> {\n    if (this.closed || this.socket.destroyed) return Promise.reject(new Error(\"WebSocket closed\"));\n    if (signal?.aborted) return Promise.reject(new Error(\"WebSocket send aborted\"));\n    const length = Buffer.byteLength(data);\n    const frameBytes =\n      length + (length < 126 ? 2 : length < 65536 ? 4 : 10) + (this.limits.maskOutgoing ? 4 : 0);\n    if (\n      frameBytes >\n      (this.limits.maxWriteBytes ?? Infinity) -\n        Math.max(this.pendingWriteBytes, this.socket.writableLength)\n    ) {\n      this.close(1009, \"WebSocket write limit exceeded\");\n      return Promise.reject(new Error(\"WebSocket write limit exceeded\"));\n    }\n    this.pendingWriteBytes += frameBytes;\n    return new Promise<void>((resolve, reject) => {\n      let settled = false;\n      const finish = (error?: Error) => {\n        if (settled) return;\n        settled = true;\n        this.pendingWriteBytes -= frameBytes;\n        this.pendingWrites.delete(fail);\n        signal?.removeEventListener(\"abort\", abort);\n        if (error) reject(error);\n        else resolve();\n      };\n      const fail = (error: Error) => finish(error);\n      const abort = () => {\n        finish(new Error(\"WebSocket send aborted\"));\n        this.destroy();\n      };\n      this.pendingWrites.add(fail);\n      signal?.addEventListener(\"abort\", abort, { once: true });\n      try {\n        this.socket.write(this.encodeFrame(OP_TEXT, Buffer.from(data)), (error?: Error | null) => {\n          if (error) finish(new Error(\"WebSocket write failed\"));\n          else finish();\n        });\n      } catch {\n        finish(new Error(\"WebSocket write failed\"));\n      }\n    });\n  }\n\n  /** Mark an unannounced connection loss and emit close once. */\n  private lost(): void {\n    if (this.closed) return;\n    this.closed = true;\n    this.release(new Error(\"WebSocket closed\"));\n    this.emit(\"close\", 1006, \"Connection lost\");\n  }\n\n  private release(error: Error): void {\n    this.buffer = Buffer.alloc(0);\n    this.fragments = [];\n    this.fragmentBytes = 0;\n    for (const fail of this.pendingWrites) fail(error);\n  }\n\n  close(code = 1000, reason = \"\"): void {\n    if (this.closed) return;\n    this.closed = true;\n    this.release(new Error(\"WebSocket closed\"));\n\n    const encodedReason = Buffer.from(reason, \"utf-8\");\n    let reasonEnd = Math.min(encodedReason.length, 123);\n    // A continuation byte at the cut means its code point straddles the limit.\n    while (reasonEnd < encodedReason.length && (encodedReason[reasonEnd] & 0xc0) === 0x80) {\n      reasonEnd--;\n    }\n    const reasonBuf = encodedReason.subarray(0, reasonEnd);\n    const payload = Buffer.alloc(2 + reasonBuf.length);\n    payload.writeUInt16BE(code, 0);\n    reasonBuf.copy(payload, 2);\n    this.writeFrame(OP_CLOSE, payload);\n\n    // Give the client a moment to receive the close frame before destroying.\n    // If writeFrame failed (socket already destroyed), this is a no-op.\n    setTimeout(() => {\n      if (!this.socket.destroyed) {\n        this.socket.destroy();\n      }\n      // Emit close event for server-initiated closes so listeners\n      // (e.g. activeConnections.delete) always fire.\n      this.emit(\"close\", code, reason);\n    }, 100);\n  }\n\n  destroy(): void {\n    if (this.closed) return;\n    this.closed = true;\n    this.release(new Error(\"WebSocket destroyed\"));\n    if (!this.socket.destroyed) {\n      this.socket.destroy();\n    }\n    this.emit(\"close\", 1006, \"Connection destroyed\");\n  }\n\n  get isClosed(): boolean {\n    return this.closed;\n  }\n\n  private encodeFrame(opcode: number, payload: Buffer): Buffer {\n    const length = payload.length;\n    const headerSize = length < 126 ? 2 : length < 65536 ? 4 : 10;\n    const maskSize = this.limits.maskOutgoing ? 4 : 0;\n    const frame = Buffer.allocUnsafe(headerSize + maskSize + length);\n    frame[0] = 0x80 | opcode;\n    frame[1] = (maskSize ? 0x80 : 0) | (length < 126 ? length : length < 65536 ? 126 : 127);\n    if (headerSize === 4) frame.writeUInt16BE(length, 2);\n    if (headerSize === 10) frame.writeBigUInt64BE(BigInt(length), 2);\n    if (maskSize) {\n      const mask = randomBytes(4);\n      mask.copy(frame, headerSize);\n      for (let i = 0; i < length; i++) frame[headerSize + 4 + i] = payload[i] ^ mask[i % 4];\n    } else payload.copy(frame, headerSize);\n    return frame;\n  }\n\n  private writeFrame(opcode: number, payload: Buffer): void {\n    if (this.socket.destroyed) return;\n    const available =\n      (this.limits.maxWriteBytes ?? Infinity) -\n      Math.max(this.pendingWriteBytes, this.socket.writableLength);\n    const headerBytes = 2 + (this.limits.maskOutgoing ? 4 : 0);\n    if (opcode === OP_CLOSE && payload.length + headerBytes > available) {\n      // Keep even the final control frame inside the configured socket budget.\n      if (available < headerBytes + 2) {\n        this.socket.destroy();\n        return;\n      }\n      payload = payload.subarray(0, 2);\n    } else if (payload.length + headerBytes > available) {\n      this.close(1009, \"WebSocket write limit exceeded\");\n      return;\n    }\n    const frame = this.encodeFrame(opcode, payload);\n    this.socket.write(frame);\n  }\n\n  private parseFrames(): void {\n    while (this.buffer.length >= 2 && !this.closed) {\n      const byte0 = this.buffer[0];\n      const byte1 = this.buffer[1];\n\n      const fin = (byte0 & 0x80) !== 0;\n      const opcode = byte0 & 0x0f;\n      const masked = (byte1 & 0x80) !== 0;\n      if (\n        byte0 & 0x70 ||\n        masked === Boolean(this.limits.maskOutgoing) ||\n        ![OP_CONTINUATION, OP_TEXT, 2, OP_CLOSE, OP_PING, OP_PONG].includes(opcode) ||\n        (opcode >= 8 && (!fin || (byte1 & 0x7f) > 125)) ||\n        (opcode === OP_CONTINUATION && !this.fragmented) ||\n        (opcode === OP_TEXT && this.fragmented)\n      ) {\n        this.close(1002, \"Invalid WebSocket frame\");\n        return;\n      }\n      let payloadLength = byte1 & 0x7f;\n      let offset = 2;\n\n      if (payloadLength === 126) {\n        if (this.buffer.length < 4) return; // need more data\n        payloadLength = this.buffer.readUInt16BE(2);\n        offset = 4;\n      } else if (payloadLength === 127) {\n        if (this.buffer.length < 10) return;\n        const advertised = this.buffer.readBigUInt64BE(2);\n        if (advertised & (1n << 63n)) {\n          this.close(1002, \"Invalid WebSocket length\");\n          return;\n        }\n        if (advertised > BigInt(Number.MAX_SAFE_INTEGER)) {\n          this.close(1009, \"WebSocket message limit exceeded\");\n          return;\n        }\n        payloadLength = Number(advertised);\n        offset = 10;\n      }\n\n      if (\n        ((byte1 & 0x7f) === 126 && payloadLength < 126) ||\n        ((byte1 & 0x7f) === 127 && payloadLength < 65536)\n      ) {\n        this.close(1002, \"Invalid WebSocket length\");\n        return;\n      }\n      if (\n        opcode < 8 &&\n        payloadLength > (this.limits.maxMessageBytes ?? Infinity) - this.fragmentBytes\n      ) {\n        this.close(1009, \"WebSocket message limit exceeded\");\n        return;\n      }\n      if (\n        payloadLength + offset + (masked ? 4 : 0) >\n        (this.limits.maxBufferedBytes ?? Infinity) - this.fragmentBytes\n      ) {\n        this.close(1009, \"WebSocket buffer limit exceeded\");\n        return;\n      }\n      const maskSize = masked ? 4 : 0;\n      const totalFrameSize = offset + maskSize + payloadLength;\n\n      if (this.buffer.length < totalFrameSize) return; // need more data\n\n      let maskKey: Buffer | null = null;\n      if (masked) {\n        maskKey = this.buffer.subarray(offset, offset + 4);\n        offset += 4;\n      }\n\n      let payload = this.buffer.subarray(offset, offset + payloadLength);\n\n      // Unmask client payload\n      if (maskKey) {\n        payload = Buffer.from(payload); // copy before mutating\n        for (let i = 0; i < payload.length; i++) {\n          payload[i] ^= maskKey[i % 4];\n        }\n      }\n\n      // Consume the frame from the buffer\n      this.buffer = this.buffer.subarray(totalFrameSize);\n\n      this.handleFrame(fin, opcode, payload);\n    }\n  }\n\n  private handleFrame(fin: boolean, opcode: number, payload: Buffer): void {\n    // Control frames (opcode >= 0x8) must not be fragmented\n    if (opcode === OP_PING) {\n      this.writeFrame(OP_PONG, payload);\n      return;\n    }\n\n    if (opcode === OP_PONG) {\n      // Ignore unsolicited pongs\n      return;\n    }\n\n    if (opcode === OP_CLOSE) {\n      if (payload.length === 1) {\n        this.close(1002, \"Invalid WebSocket close\");\n        return;\n      }\n      const code = payload.length >= 2 ? payload.readUInt16BE(0) : 1005;\n      const reason = payload.length > 2 ? payload.subarray(2).toString(\"utf-8\") : \"\";\n\n      if (!this.closed) {\n        this.closed = true;\n        this.release(new Error(\"WebSocket closed\"));\n        // Echo close frame back\n        this.writeFrame(OP_CLOSE, payload);\n        this.socket.end();\n        this.emit(\"close\", code, reason);\n      }\n      // If already closed (server-initiated or duplicate), ignore — the\n      // close event was already emitted by close() or the first OP_CLOSE.\n      return;\n    }\n\n    // Text or continuation frames\n    if (opcode === OP_TEXT || opcode === OP_CONTINUATION) {\n      this.fragmented = !fin;\n      this.fragmentBytes += payload.length;\n      if (payload.length) this.fragments.push(payload);\n\n      if (fin) {\n        const message = Buffer.concat(this.fragments).toString(\"utf-8\");\n        this.fragments = [];\n        this.fragmentBytes = 0;\n        this.emit(\"message\", message);\n      }\n      // If !fin, wait for more continuation frames\n      return;\n    }\n\n    // Binary or unknown — just ignore for a mock server\n  }\n}\n\nexport function computeAcceptKey(wsKey: string): string {\n  return createHash(\"sha1\")\n    .update(wsKey + WS_GUID)\n    .digest(\"base64\");\n}\n\nexport function upgradeToWebSocket(\n  req: http.IncomingMessage,\n  socket: net.Socket,\n  limits?: WebSocketLimits,\n): WebSocketConnection {\n  const key = req.headers[\"sec-websocket-key\"];\n  if (!key) {\n    socket.write(\"HTTP/1.1 400 Bad Request\\r\\n\\r\\n\");\n    socket.destroy();\n    throw new Error(\"Missing Sec-WebSocket-Key header\");\n  }\n\n  const acceptKey = computeAcceptKey(key);\n\n  let responseHeaders =\n    \"HTTP/1.1 101 Switching Protocols\\r\\n\" +\n    \"Upgrade: websocket\\r\\n\" +\n    \"Connection: Upgrade\\r\\n\" +\n    `Sec-WebSocket-Accept: ${acceptKey}\\r\\n`;\n\n  // Echo back requested subprotocol if present\n  const protocol = req.headers[\"sec-websocket-protocol\"];\n  if (protocol) {\n    // Take the first offered protocol\n    const first = protocol.split(\",\")[0].trim();\n    responseHeaders += `Sec-WebSocket-Protocol: ${first}\\r\\n`;\n  }\n\n  responseHeaders += \"\\r\\n\";\n\n  socket.write(responseHeaders);\n\n  return new WebSocketConnection(socket, limits);\n}\n"],"mappings":"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"}

package/dist/ws-gemini-live.cjs

@@ -5,7 +5,7 @@ const require_sse_writer = require('./sse-writer.cjs');
 const require_misbehavior = require('./misbehavior.cjs');
 const require_router = require('./router.cjs');
 require('./journal.cjs');
-const require_interruption = require('./interruption.cjs');
+const require_lifecycle = require('./response/lifecycle.cjs');
 
 //#region src/ws-gemini-live.ts
 /**
@@ -201,6 +201,7 @@ function preflightBlocks(response, journalEntry) {
 }
 function handleWebSocketGeminiLive(ws, fixtures, journal, defaults) {
 	const { logger } = defaults;
+	require_lifecycle.watchWsClose(ws);
 	const session = {
 		setupDone: false,
 		model: defaults.model,
@@ -397,40 +398,45 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 	const latency = fixture.latency ?? defaults.latency;
 	if (misbehavior.kind === "applied" && (misbehavior.summary.fault === "tool-args-invalid-json" || misbehavior.summary.fault === "empty-response")) {
 		const journalEntry = addResponseEntry(200);
-		const interruption = require_interruption.createInterruptionSignal(fixture);
-		const markInterrupted = () => {
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
+		const lifecycle = require_lifecycle.wsLifecycle(ws, fixture);
+		const interruptTurn = () => {
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
 			ws.destroy();
 		};
 		try {
-			if (ws.isClosed) return;
+			if (ws.isClosed) {
+				interruptTurn();
+				return;
+			}
 			const chunkDelay = require_sse_writer.calculateDelay(0, void 0, latency, fixture.recordedTimings, fixture.replaySpeed ?? defaults.replaySpeed);
-			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, interruption?.signal);
-			if (interruption?.signal.aborted) {
-				markInterrupted();
+			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, lifecycle.signal);
+			if (lifecycle.signal.aborted || ws.isClosed) {
+				interruptTurn();
 				return;
 			}
-			if (ws.isClosed) return;
 			const malformed = misbehavior.summary.fault === "tool-args-invalid-json";
 			ws.send(JSON.stringify({ serverContent: malformed ? {
 				turnComplete: true,
 				turnCompleteReason: "MALFORMED_FUNCTION_CALL"
 			} : { modelTurn: { parts: [{ text: "" }] } } }));
-			interruption?.tick();
-			if (interruption?.signal.aborted) {
-				markInterrupted();
+			lifecycle.tick();
+			if (lifecycle.signal.aborted || ws.isClosed) {
+				interruptTurn();
 				return;
 			}
-			if (!malformed && !ws.isClosed) {
+			if (!malformed) {
 				ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+				if (ws.isClosed) {
+					interruptTurn();
+					return;
+				}
 				session.conversationHistory.push({
 					role: "assistant",
 					content: ""
 				});
 			}
 		} finally {
-			interruption?.cleanup();
+			lifecycle.dispose();
 		}
 		return;
 	}
@@ -467,25 +473,32 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 			...tc,
 			resolvedId: tc.id ?? require_helpers.generateToolCallId()
 		}));
+		const stoppedByClose = () => {
+			if (!ws.isClosed) return false;
+			require_lifecycle.markWsTurnStopped(journalEntry, ws);
+			return true;
+		};
+		if (stoppedByClose()) return;
 		if (resolvedToolCalls.length === 0) ws.send(JSON.stringify({ serverContent: {
 			modelTurn: { parts },
 			turnComplete: true
 		} }));
 		else {
 			ws.send(JSON.stringify({ serverContent: { modelTurn: { parts } } }));
-			if (!ws.isClosed) {
-				const functionCalls = resolvedToolCalls.map((tc) => {
-					const argsObj = liveToolArguments(tc);
-					return {
-						name: tc.name,
-						args: argsObj,
-						id: tc.resolvedId
-					};
-				});
-				ws.send(JSON.stringify({ toolCall: { functionCalls } }));
-			}
-			if (!ws.isClosed) ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+			if (stoppedByClose()) return;
+			const functionCalls = resolvedToolCalls.map((tc) => {
+				const argsObj = liveToolArguments(tc);
+				return {
+					name: tc.name,
+					args: argsObj,
+					id: tc.resolvedId
+				};
+			});
+			ws.send(JSON.stringify({ toolCall: { functionCalls } }));
+			if (stoppedByClose()) return;
+			ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
 		}
+		if (stoppedByClose()) return;
 		session.conversationHistory.push({
 			role: "assistant",
 			content: audioResp.content ?? "[audio]",
@@ -504,7 +517,7 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 		const journalEntry = addResponseEntry(200);
 		if (response.blocks && response.blocks.length > 0) {
 			const resolvedBlocks = preflightBlocks(response, journalEntry);
-			const interruption = require_interruption.createInterruptionSignal(fixture);
+			const lifecycle = require_lifecycle.wsLifecycle(ws, fixture);
 			const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
 			const { recordedTimings } = fixture;
 			let chunkIndex = 0;
@@ -514,8 +527,8 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 			outer: for (const block of resolvedBlocks) if (block.type === "toolCall") {
 				if (ws.isClosed) break;
 				const tcDelay = require_sse_writer.calculateDelay(chunkIndex, void 0, latency, recordedTimings, replaySpeed);
-				if (tcDelay > 0) await require_sse_writer.delay(tcDelay, interruption?.signal);
-				if (interruption?.signal.aborted) {
+				if (tcDelay > 0) await require_sse_writer.delay(tcDelay, lifecycle.signal);
+				if (lifecycle.signal.aborted) {
 					interrupted = true;
 					break;
 				}
@@ -541,8 +554,8 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 						arguments: block.arguments
 					}
 				});
-				interruption?.tick();
-				if (interruption?.signal.aborted) {
+				lifecycle.tick();
+				if (lifecycle.signal.aborted) {
 					interrupted = true;
 					break;
 				}
@@ -553,8 +566,8 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 				for (let i = 0; i < text.length; i += chunkSize) {
 					if (ws.isClosed) break outer;
 					const chunkDelay = require_sse_writer.calculateDelay(chunkIndex, void 0, latency, recordedTimings, replaySpeed);
-					if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, interruption?.signal);
-					if (interruption?.signal.aborted) {
+					if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, lifecycle.signal);
+					if (lifecycle.signal.aborted) {
 						interrupted = true;
 						break outer;
 					}
@@ -566,22 +579,25 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 						break outer;
 					}
 					chunkIndex++;
-					interruption?.tick();
-					if (interruption?.signal.aborted) {
+					lifecycle.tick();
+					if (lifecycle.signal.aborted) {
 						interrupted = true;
 						break outer;
 					}
 				}
 			}
-			if (interrupted) {
+			if (interrupted || ws.isClosed) {
 				ws.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-				interruption?.cleanup();
+				require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+				lifecycle.dispose();
+				return;
+			}
+			lifecycle.dispose();
+			ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+			if (ws.isClosed) {
+				require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
 				return;
 			}
-			interruption?.cleanup();
-			if (!ws.isClosed) ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
 			session.conversationHistory.push({
 				role: "assistant",
 				content: historyContent || null,
@@ -593,7 +609,7 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 		const content = response.content ?? "";
 		const chunkList = [];
 		for (let i = 0; i < content.length; i += chunkSize) chunkList.push(content.slice(i, i + chunkSize));
-		const interruption = require_interruption.createInterruptionSignal(fixture);
+		const lifecycle = require_lifecycle.wsLifecycle(ws, fixture);
 		const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
 		const { recordedTimings } = fixture;
 		let interrupted = false;
@@ -602,8 +618,8 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 		} else for (let i = 0; i < chunkList.length; i++) {
 			if (ws.isClosed) break;
 			const chunkDelay = require_sse_writer.calculateDelay(i, void 0, latency, recordedTimings, replaySpeed);
-			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, interruption?.signal);
-			if (interruption?.signal.aborted) {
+			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, lifecycle.signal);
+			if (lifecycle.signal.aborted) {
 				interrupted = true;
 				break;
 			}
@@ -614,17 +630,16 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 				defaults.logger.debug("[gemini-live] send failed during text streaming, closing", err);
 				break;
 			}
-			interruption?.tick();
-			if (interruption?.signal.aborted) {
+			lifecycle.tick();
+			if (lifecycle.signal.aborted) {
 				interrupted = true;
 				break;
 			}
 		}
-		if (interrupted) {
+		if (interrupted || ws.isClosed) {
 			ws.destroy();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
 			return;
 		}
 		const resolvedToolCalls = functionToolCalls.map((tc) => ({
@@ -633,12 +648,11 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 		}));
 		if (!ws.isClosed) {
 			const tcDelay = require_sse_writer.calculateDelay(chunkList.length, void 0, latency, recordedTimings, replaySpeed);
-			if (tcDelay > 0) await require_sse_writer.delay(tcDelay, interruption?.signal);
-			if (interruption?.signal.aborted) {
+			if (tcDelay > 0) await require_sse_writer.delay(tcDelay, lifecycle.signal);
+			if (lifecycle.signal.aborted || ws.isClosed) {
 				ws.destroy();
-				journalEntry.response.interrupted = true;
-				journalEntry.response.interruptReason = interruption?.reason();
-				interruption?.cleanup();
+				require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+				lifecycle.dispose();
 				return;
 			}
 			const functionCalls = resolvedToolCalls.map((tc) => {
@@ -650,17 +664,20 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 				};
 			});
 			ws.send(JSON.stringify({ toolCall: { functionCalls } }));
-			interruption?.tick();
+			lifecycle.tick();
 		}
-		if (interruption?.signal.aborted) {
+		if (lifecycle.signal.aborted || ws.isClosed) {
 			ws.destroy();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
+			return;
+		}
+		lifecycle.dispose();
+		ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+		if (ws.isClosed) {
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
 			return;
 		}
-		interruption?.cleanup();
-		if (!ws.isClosed) ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
 		session.conversationHistory.push({
 			role: "assistant",
 			content: content || null,
@@ -679,22 +696,30 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 		const journalEntry = addResponseEntry(200);
 		const content = response.content;
 		if (content.length === 0) {
-			if (ws.isClosed) return;
+			if (ws.isClosed) {
+				require_lifecycle.markWsTurnStopped(journalEntry, ws);
+				return;
+			}
 			ws.send(JSON.stringify({ serverContent: { modelTurn: { parts: [{ text: "" }] } } }));
+			if (ws.isClosed) {
+				require_lifecycle.markWsTurnStopped(journalEntry, ws);
+				return;
+			}
 			ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+			if (ws.isClosed) require_lifecycle.markWsTurnStopped(journalEntry, ws);
 			return;
 		}
 		const chunks = [];
 		for (let i = 0; i < content.length; i += chunkSize) chunks.push(content.slice(i, i + chunkSize));
-		const interruption = require_interruption.createInterruptionSignal(fixture);
+		const lifecycle = require_lifecycle.wsLifecycle(ws, fixture);
 		const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
 		const { recordedTimings } = fixture;
 		let interrupted = false;
 		for (let i = 0; i < chunks.length; i++) {
 			if (ws.isClosed) break;
 			const chunkDelay = require_sse_writer.calculateDelay(i, void 0, latency, recordedTimings, replaySpeed);
-			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, interruption?.signal);
-			if (interruption?.signal.aborted) {
+			if (chunkDelay > 0) await require_sse_writer.delay(chunkDelay, lifecycle.signal);
+			if (lifecycle.signal.aborted) {
 				interrupted = true;
 				break;
 			}
@@ -705,21 +730,24 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 				defaults.logger.debug("[gemini-live] send failed during text streaming, closing", err);
 				break;
 			}
-			interruption?.tick();
-			if (interruption?.signal.aborted) {
+			lifecycle.tick();
+			if (lifecycle.signal.aborted) {
 				interrupted = true;
 				break;
 			}
 		}
-		if (interrupted) {
+		if (interrupted || ws.isClosed) {
 			ws.destroy();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
+			return;
+		}
+		lifecycle.dispose();
+		ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+		if (ws.isClosed) {
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
 			return;
 		}
-		interruption?.cleanup();
-		if (!ws.isClosed) ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
 		session.conversationHistory.push({
 			role: "assistant",
 			content
@@ -729,24 +757,20 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 	if (require_helpers.isToolCallResponse(response)) {
 		const journalEntry = addResponseEntry(200);
 		const functionToolCalls = preflightToolArguments(response, journalEntry);
-		const interruption = require_interruption.createInterruptionSignal(fixture);
+		const lifecycle = require_lifecycle.wsLifecycle(ws, fixture);
 		const replaySpeed = fixture.replaySpeed ?? defaults.replaySpeed;
 		const { recordedTimings } = fixture;
 		if (ws.isClosed) {
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
 			return;
 		}
 		const tcDelay = require_sse_writer.calculateDelay(0, void 0, latency, recordedTimings, replaySpeed);
-		if (tcDelay > 0) await require_sse_writer.delay(tcDelay, interruption?.signal);
-		if (interruption?.signal.aborted) {
+		if (tcDelay > 0) await require_sse_writer.delay(tcDelay, lifecycle.signal);
+		if (lifecycle.signal.aborted || ws.isClosed) {
 			ws.destroy();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-			interruption?.cleanup();
-			return;
-		}
-		if (ws.isClosed) {
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
 			return;
 		}
 		const resolvedToolCalls = functionToolCalls.map((tc) => ({
@@ -762,16 +786,19 @@ async function processMessage(raw, ws, fixtures, journal, defaults, session) {
 			};
 		});
 		ws.send(JSON.stringify({ toolCall: { functionCalls } }));
-		interruption?.tick();
-		if (interruption?.signal.aborted) {
+		lifecycle.tick();
+		if (lifecycle.signal.aborted || ws.isClosed) {
 			ws.destroy();
-			journalEntry.response.interrupted = true;
-			journalEntry.response.interruptReason = interruption?.reason();
-			interruption?.cleanup();
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
+			lifecycle.dispose();
+			return;
+		}
+		lifecycle.dispose();
+		ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
+		if (ws.isClosed) {
+			require_lifecycle.markWsTurnStopped(journalEntry, ws, lifecycle);
 			return;
 		}
-		interruption?.cleanup();
-		if (!ws.isClosed) ws.send(JSON.stringify({ serverContent: { turnComplete: true } }));
 		session.conversationHistory.push({
 			role: "assistant",
 			content: null,