@rivetkit/engine-runner 2.0.22-rc.2 → 2.0.23

package/dist/mod.cjs

@@ -10,6 +10,129 @@ function logger() {
   return LOGGER;
 }
 
+// src/stringify.ts
+function stringifyArrayBuffer(buffer) {
+  return `ArrayBuffer(${buffer.byteLength})`;
+}
+function stringifyBigInt(value) {
+  return `${value}n`;
+}
+function stringifyMap(map) {
+  const entries = Array.from(map.entries()).map(([k, v]) => `"${k}": "${v}"`).join(", ");
+  return `Map(${map.size}){${entries}}`;
+}
+function stringifyToServerTunnelMessageKind(kind) {
+  switch (kind.tag) {
+    case "TunnelAck":
+      return "TunnelAck";
+    case "ToServerResponseStart": {
+      const { status, headers, body, stream } = kind.val;
+      const bodyStr = body === null ? "null" : stringifyArrayBuffer(body);
+      return `ToServerResponseStart{status: ${status}, headers: ${stringifyMap(headers)}, body: ${bodyStr}, stream: ${stream}}`;
+    }
+    case "ToServerResponseChunk": {
+      const { body, finish } = kind.val;
+      return `ToServerResponseChunk{body: ${stringifyArrayBuffer(body)}, finish: ${finish}}`;
+    }
+    case "ToServerResponseAbort":
+      return "ToServerResponseAbort";
+    case "ToServerWebSocketOpen": {
+      const { canHibernate, lastMsgIndex } = kind.val;
+      return `ToServerWebSocketOpen{canHibernate: ${canHibernate}, lastMsgIndex: ${stringifyBigInt(lastMsgIndex)}}`;
+    }
+    case "ToServerWebSocketMessage": {
+      const { data, binary } = kind.val;
+      return `ToServerWebSocketMessage{data: ${stringifyArrayBuffer(data)}, binary: ${binary}}`;
+    }
+    case "ToServerWebSocketMessageAck": {
+      const { index } = kind.val;
+      return `ToServerWebSocketMessageAck{index: ${index}}`;
+    }
+    case "ToServerWebSocketClose": {
+      const { code, reason, retry } = kind.val;
+      const codeStr = code === null ? "null" : code.toString();
+      const reasonStr = reason === null ? "null" : `"${reason}"`;
+      return `ToServerWebSocketClose{code: ${codeStr}, reason: ${reasonStr}, retry: ${retry}}`;
+    }
+  }
+}
+function stringifyToClientTunnelMessageKind(kind) {
+  switch (kind.tag) {
+    case "TunnelAck":
+      return "TunnelAck";
+    case "ToClientRequestStart": {
+      const { actorId, method, path, headers, body, stream } = kind.val;
+      const bodyStr = body === null ? "null" : stringifyArrayBuffer(body);
+      return `ToClientRequestStart{actorId: "${actorId}", method: "${method}", path: "${path}", headers: ${stringifyMap(headers)}, body: ${bodyStr}, stream: ${stream}}`;
+    }
+    case "ToClientRequestChunk": {
+      const { body, finish } = kind.val;
+      return `ToClientRequestChunk{body: ${stringifyArrayBuffer(body)}, finish: ${finish}}`;
+    }
+    case "ToClientRequestAbort":
+      return "ToClientRequestAbort";
+    case "ToClientWebSocketOpen": {
+      const { actorId, path, headers } = kind.val;
+      return `ToClientWebSocketOpen{actorId: "${actorId}", path: "${path}", headers: ${stringifyMap(headers)}}`;
+    }
+    case "ToClientWebSocketMessage": {
+      const { index, data, binary } = kind.val;
+      return `ToClientWebSocketMessage{index: ${index}, data: ${stringifyArrayBuffer(data)}, binary: ${binary}}`;
+    }
+    case "ToClientWebSocketClose": {
+      const { code, reason } = kind.val;
+      const codeStr = code === null ? "null" : code.toString();
+      const reasonStr = reason === null ? "null" : `"${reason}"`;
+      return `ToClientWebSocketClose{code: ${codeStr}, reason: ${reasonStr}}`;
+    }
+  }
+}
+function stringifyCommand(command) {
+  switch (command.tag) {
+    case "CommandStartActor": {
+      const { actorId, generation, config } = command.val;
+      const keyStr = config.key === null ? "null" : `"${config.key}"`;
+      const inputStr = config.input === null ? "null" : stringifyArrayBuffer(config.input);
+      return `CommandStartActor{actorId: "${actorId}", generation: ${generation}, config: {name: "${config.name}", key: ${keyStr}, createTs: ${stringifyBigInt(config.createTs)}, input: ${inputStr}}}`;
+    }
+    case "CommandStopActor": {
+      const { actorId, generation } = command.val;
+      return `CommandStopActor{actorId: "${actorId}", generation: ${generation}}`;
+    }
+  }
+}
+function stringifyCommandWrapper(wrapper) {
+  return `CommandWrapper{index: ${stringifyBigInt(wrapper.index)}, inner: ${stringifyCommand(wrapper.inner)}}`;
+}
+function stringifyEvent(event) {
+  switch (event.tag) {
+    case "EventActorIntent": {
+      const { actorId, generation, intent } = event.val;
+      const intentStr = intent.tag === "ActorIntentSleep" ? "Sleep" : intent.tag === "ActorIntentStop" ? "Stop" : "Unknown";
+      return `EventActorIntent{actorId: "${actorId}", generation: ${generation}, intent: ${intentStr}}`;
+    }
+    case "EventActorStateUpdate": {
+      const { actorId, generation, state } = event.val;
+      let stateStr;
+      if (state.tag === "ActorStateRunning") {
+        stateStr = "Running";
+      } else if (state.tag === "ActorStateStopped") {
+        const { code, message } = state.val;
+        const messageStr = message === null ? "null" : `"${message}"`;
+        stateStr = `Stopped{code: ${code}, message: ${messageStr}}`;
+      } else {
+        stateStr = "Unknown";
+      }
+      return `EventActorStateUpdate{actorId: "${actorId}", generation: ${generation}, state: ${stateStr}}`;
+    }
+    case "EventActorSetAlarm": {
+      const { actorId, generation, alarmTs } = event.val;
+      const alarmTsStr = alarmTs === null ? "null" : stringifyBigInt(alarmTs);
+      return `EventActorSetAlarm{actorId: "${actorId}", generation: ${generation}, alarmTs: ${alarmTsStr}}`;
+    }
+  }
+}
+
 // src/tunnel.ts
 var _uuid = require('uuid');
 
@@ -30,6 +153,20 @@ function calculateBackoff(attempt, options = {}) {
   }
   return Math.floor(delay);
 }
+function parseWebSocketCloseReason(reason) {
+  var _a;
+  const [mainPart, rayId] = reason.split("#");
+  const [group, error] = mainPart.split(".");
+  if (!group || !error) {
+    (_a = logger()) == null ? void 0 : _a.warn({ msg: "failed to parse close reason", reason });
+    return void 0;
+  }
+  return {
+    group,
+    error,
+    rayId
+  };
+}
 
 // src/websocket-tunnel-adapter.ts
 var WebSocketTunnelAdapter = (_class = class {
@@ -48,6 +185,7 @@ var WebSocketTunnelAdapter = (_class = class {
   #url = "";
   #sendCallback;
   #closeCallback;
+  #canHibernate = false;
   // Event buffering for events fired before listeners are attached
   #bufferedEvents = [];
   constructor(webSocketId, sendCallback, closeCallback) {;_class.prototype.__init.call(this);_class.prototype.__init2.call(this);_class.prototype.__init3.call(this);_class.prototype.__init4.call(this);
@@ -78,6 +216,14 @@ var WebSocketTunnelAdapter = (_class = class {
   get url() {
     return this.#url;
   }
+  /** @experimental */
+  get canHibernate() {
+    return this.#canHibernate;
+  }
+  /** @experimental */
+  set canHibernate(value) {
+    this.#canHibernate = value;
+  }
   get onopen() {
     return this.#onopen;
   }
@@ -171,18 +317,23 @@ var WebSocketTunnelAdapter = (_class = class {
     this.#sendCallback(messageData, isBinary);
   }
   close(code, reason) {
-    this.closeInner(code, reason);
+    this.closeInner(code, reason, false, true);
   }
   __closeWithRetry(code, reason) {
-    this.closeInner(code, reason, true);
+    this.closeInner(code, reason, true, true);
+  }
+  __closeWithoutCallback(code, reason) {
+    this.closeInner(code, reason, false, false);
   }
-  closeInner(code, reason, retry = false) {
+  closeInner(code, reason, retry, callback) {
     if (this.#readyState === 2 || // CLOSING
     this.#readyState === 3) {
       return;
     }
     this.#readyState = 2;
-    this.#closeCallback(code, reason, retry);
+    if (callback) {
+      this.#closeCallback(code, reason, retry);
+    }
     this.#readyState = 3;
     const closeEvent = {
       wasClean: true,
@@ -472,6 +623,11 @@ var WebSocketTunnelAdapter = (_class = class {
 // src/tunnel.ts
 var GC_INTERVAL = 6e4;
 var MESSAGE_ACK_TIMEOUT = 5e3;
+var RunnerShutdownError = class extends Error {
+  constructor() {
+    super("Runner shut down");
+  }
+};
 var Tunnel = class {
   #runner;
   /** Requests over the tunnel to the actor that are in flight. */
@@ -481,6 +637,9 @@ var Tunnel = class {
   /** Messages sent from the actor over the tunnel that have not been acked by the gateway. */
   #pendingTunnelMessages = /* @__PURE__ */ new Map();
   #gcInterval;
+  get log() {
+    return this.#runner.log;
+  }
   constructor(runner) {
     this.#runner = runner;
   }
@@ -493,20 +652,24 @@ var Tunnel = class {
       this.#gcInterval = void 0;
     }
     for (const [_, request] of this.#actorPendingRequests) {
-      request.reject(new Error("Tunnel shutting down"));
+      request.reject(new RunnerShutdownError());
     }
     this.#actorPendingRequests.clear();
     for (const [_, ws] of this.#actorWebSockets) {
-      ws.__closeWithRetry();
+      if (!ws.canHibernate) {
+        ws.__closeWithoutCallback(1e3, "ws.tunnel_shutdown");
+      }
     }
     this.#actorWebSockets.clear();
   }
   #sendMessage(requestId, messageKind) {
     var _a, _b;
     if (!this.#runner.__webSocketReady()) {
-      (_a = logger()) == null ? void 0 : _a.warn(
-        "cannot send tunnel message, socket not connected to engine"
-      );
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "cannot send tunnel message, socket not connected to engine",
+        requestId: idToStr(requestId),
+        message: stringifyToServerTunnelMessageKind(messageKind)
+      });
       return;
     }
     const messageId = generateUuidBuffer();
@@ -516,11 +679,11 @@ var Tunnel = class {
       sentAt: Date.now(),
       requestIdStr
     });
-    (_b = logger()) == null ? void 0 : _b.debug({
+    (_b = this.log) == null ? void 0 : _b.debug({
       msg: "send tunnel msg",
       requestId: requestIdStr,
       messageId: messageIdStr,
-      message: messageKind
+      message: stringifyToServerTunnelMessageKind(messageKind)
     });
     const message = {
       tag: "ToServerTunnelMessage",
@@ -545,7 +708,7 @@ var Tunnel = class {
         messageKind: { tag: "TunnelAck", val: null }
       }
     };
-    (_a = logger()) == null ? void 0 : _a.debug({
+    (_a = this.log) == null ? void 0 : _a.debug({
       msg: "ack tunnel msg",
       requestId: idToStr(requestId),
       messageId: idToStr(messageId)
@@ -591,7 +754,7 @@ var Tunnel = class {
       }
     }
     if (messagesToDelete.length > 0) {
-      (_a = logger()) == null ? void 0 : _a.warn({
+      (_a = this.log) == null ? void 0 : _a.warn({
         msg: "purging unacked tunnel messages, this indicates that the Rivet Engine is disconnected or not responding",
         count: messagesToDelete.length
       });
@@ -610,11 +773,11 @@ var Tunnel = class {
       }
     }
     actor.requests.clear();
-    for (const webSocketId of actor.webSockets) {
-      const ws = this.#actorWebSockets.get(webSocketId);
+    for (const requestIdStr of actor.webSockets) {
+      const ws = this.#actorWebSockets.get(requestIdStr);
       if (ws) {
         ws.__closeWithRetry(1e3, "Actor stopped");
-        this.#actorWebSockets.delete(webSocketId);
+        this.#actorWebSockets.delete(requestIdStr);
       }
     }
     actor.webSockets.clear();
@@ -622,7 +785,7 @@ var Tunnel = class {
   async #fetch(actorId, requestId, request) {
     var _a;
     if (!this.#runner.hasActor(actorId)) {
-      (_a = logger()) == null ? void 0 : _a.warn({
+      (_a = this.log) == null ? void 0 : _a.warn({
         msg: "ignoring request for unknown actor",
         actorId
       });
@@ -646,18 +809,18 @@ var Tunnel = class {
     var _a, _b;
     const requestIdStr = idToStr(message.requestId);
     const messageIdStr = idToStr(message.messageId);
-    (_a = logger()) == null ? void 0 : _a.debug({
+    (_a = this.log) == null ? void 0 : _a.debug({
       msg: "receive tunnel msg",
       requestId: requestIdStr,
       messageId: messageIdStr,
-      message: message.messageKind
+      message: stringifyToClientTunnelMessageKind(message.messageKind)
     });
     if (message.messageKind.tag === "TunnelAck") {
       const pending = this.#pendingTunnelMessages.get(messageIdStr);
       if (pending) {
         const didDelete = this.#pendingTunnelMessages.delete(messageIdStr);
         if (!didDelete) {
-          (_b = logger()) == null ? void 0 : _b.warn({
+          (_b = this.log) == null ? void 0 : _b.warn({
             msg: "received tunnel ack for nonexistent message",
             requestId: requestIdStr,
             messageId: messageIdStr
@@ -712,7 +875,7 @@ var Tunnel = class {
     }
   }
   async #handleRequestStart(requestId, req) {
-    var _a;
+    var _a, _b;
     const requestIdStr = idToStr(requestId);
     const actor = this.#runner.getActor(req.actorId);
     if (actor) {
@@ -766,8 +929,16 @@ var Tunnel = class {
         await this.#sendResponse(requestId, response);
       }
     } catch (error) {
-      (_a = logger()) == null ? void 0 : _a.error({ msg: "error handling request", error });
-      this.#sendResponseError(requestId, 500, "Internal Server Error");
+      if (error instanceof RunnerShutdownError) {
+        (_a = this.log) == null ? void 0 : _a.debug({ msg: "catught runner shutdown error" });
+      } else {
+        (_b = this.log) == null ? void 0 : _b.error({ msg: "error handling request", error });
+        this.#sendResponseError(
+          requestId,
+          500,
+          "Internal Server Error"
+        );
+      }
     } finally {
       const actor2 = this.#runner.getActor(req.actorId);
       if (actor2) {
@@ -827,11 +998,11 @@ var Tunnel = class {
     });
   }
   async #handleWebSocketOpen(requestId, open) {
-    var _a, _b, _c;
-    const webSocketId = idToStr(requestId);
+    var _a, _b, _c, _d;
+    const requestIdStr = idToStr(requestId);
     const actor = this.#runner.getActor(open.actorId);
     if (!actor) {
-      (_a = logger()) == null ? void 0 : _a.warn({
+      (_a = this.log) == null ? void 0 : _a.warn({
         msg: "ignoring websocket for unknown actor",
         actorId: open.actorId
       });
@@ -847,7 +1018,7 @@ var Tunnel = class {
     }
     const websocketHandler = this.#runner.config.websocket;
     if (!websocketHandler) {
-      (_b = logger()) == null ? void 0 : _b.error({
+      (_b = this.log) == null ? void 0 : _b.error({
         msg: "no websocket handler configured for tunnel"
       });
       this.#sendMessage(requestId, {
@@ -860,12 +1031,20 @@ var Tunnel = class {
       });
       return;
     }
+    const existingAdapter = this.#actorWebSockets.get(requestIdStr);
+    if (existingAdapter) {
+      (_c = this.log) == null ? void 0 : _c.warn({
+        msg: "closing existing websocket for duplicate open event for the same request id",
+        requestId: requestIdStr
+      });
+      existingAdapter.__closeWithoutCallback(1e3, "ws.duplicate_open");
+    }
     if (actor) {
-      actor.webSockets.add(webSocketId);
+      actor.webSockets.add(requestIdStr);
     }
     try {
       const adapter = new WebSocketTunnelAdapter(
-        webSocketId,
+        requestIdStr,
         (data, isBinary) => {
           const dataBuffer = typeof data === "string" ? new TextEncoder().encode(data).buffer : data;
           this.#sendMessage(requestId, {
@@ -885,13 +1064,13 @@ var Tunnel = class {
               retry
             }
           });
-          this.#actorWebSockets.delete(webSocketId);
+          this.#actorWebSockets.delete(requestIdStr);
           if (actor) {
-            actor.webSockets.delete(webSocketId);
+            actor.webSockets.delete(requestIdStr);
           }
         }
       );
-      this.#actorWebSockets.set(webSocketId, adapter);
+      this.#actorWebSockets.set(requestIdStr, adapter);
       const headerInit = {};
       if (open.headers) {
         for (const [k, v] of open.headers) {
@@ -909,6 +1088,7 @@ var Tunnel = class {
         requestId,
         request
       );
+      adapter.canHibernate = hibernationConfig.enabled;
       this.#sendMessage(requestId, {
         tag: "ToServerWebSocketOpen",
         val: {
@@ -925,7 +1105,7 @@ var Tunnel = class {
         request
       );
     } catch (error) {
-      (_c = logger()) == null ? void 0 : _c.error({ msg: "error handling websocket open", error });
+      (_d = this.log) == null ? void 0 : _d.error({ msg: "error handling websocket open", error });
       this.#sendMessage(requestId, {
         tag: "ToServerWebSocketClose",
         val: {
@@ -934,16 +1114,16 @@ var Tunnel = class {
           retry: false
         }
       });
-      this.#actorWebSockets.delete(webSocketId);
+      this.#actorWebSockets.delete(requestIdStr);
       if (actor) {
-        actor.webSockets.delete(webSocketId);
+        actor.webSockets.delete(requestIdStr);
       }
     }
   }
   /// Returns false if the message was sent off
   async #handleWebSocketMessage(requestId, msg) {
-    const webSocketId = idToStr(requestId);
-    const adapter = this.#actorWebSockets.get(webSocketId);
+    const requestIdStr = idToStr(requestId);
+    const adapter = this.#actorWebSockets.get(requestIdStr);
     if (adapter) {
       const data = msg.binary ? new Uint8Array(msg.data) : new TextDecoder().decode(new Uint8Array(msg.data));
       return adapter._handleMessage(
@@ -958,7 +1138,7 @@ var Tunnel = class {
   }
   __ackWebsocketMessage(requestId, index) {
     var _a;
-    (_a = logger()) == null ? void 0 : _a.debug({
+    (_a = this.log) == null ? void 0 : _a.debug({
       msg: "ack ws msg",
       requestId: idToStr(requestId),
       index
@@ -1064,6 +1244,23 @@ var Runner = class {
   #kvCleanupInterval;
   // Tunnel for HTTP/WebSocket forwarding
   #tunnel;
+  // Cached child logger with runner-specific attributes
+  #logCached;
+  get log() {
+    if (this.#logCached) return this.#logCached;
+    const l = logger();
+    if (l) {
+      if (this.runnerId) {
+        this.#logCached = l.child({
+          runnerId: this.runnerId
+        });
+        return this.#logCached;
+      } else {
+        return l;
+      }
+    }
+    return void 0;
+  }
   constructor(config) {
     this.#config = config;
     if (this.#config.logger) setLogger(this.#config.logger);
@@ -1073,6 +1270,13 @@ var Runner = class {
   }
   // MARK: Manage actors
   sleepActor(actorId, generation) {
+    var _a;
+    if (this.#shutdown) {
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "runner is shut down, cannot sleep actor"
+      });
+      return;
+    }
     const actor = this.getActor(actorId, generation);
     if (!actor) return;
     this.#sendActorIntent(actorId, actor.generation, "sleep");
@@ -1096,9 +1300,8 @@ var Runner = class {
   }
   #stopAllActors() {
     var _a;
-    (_a = logger()) == null ? void 0 : _a.info({
-      msg: "stopping all actors due to runner lost threshold exceeded",
-      runnerId: this.runnerId
+    (_a = this.log) == null ? void 0 : _a.info({
+      msg: "stopping all actors due to runner lost threshold exceeded"
     });
     const actorIds = Array.from(this.#actors.keys());
     for (const actorId of actorIds) {
@@ -1109,17 +1312,15 @@ var Runner = class {
     var _a, _b;
     const actor = this.#actors.get(actorId);
     if (!actor) {
-      (_a = logger()) == null ? void 0 : _a.error({
+      (_a = this.log) == null ? void 0 : _a.error({
         msg: "actor not found",
-        runnerId: this.runnerId,
         actorId
       });
       return void 0;
     }
     if (generation !== void 0 && actor.generation !== generation) {
-      (_b = logger()) == null ? void 0 : _b.error({
+      (_b = this.log) == null ? void 0 : _b.error({
         msg: "actor generation mismatch",
-        runnerId: this.runnerId,
         actorId,
         generation
       });
@@ -1136,17 +1337,15 @@ var Runner = class {
     var _a, _b;
     const actor = this.#actors.get(actorId);
     if (!actor) {
-      (_a = logger()) == null ? void 0 : _a.error({
+      (_a = this.log) == null ? void 0 : _a.error({
         msg: "actor not found for removal",
-        runnerId: this.runnerId,
         actorId
       });
       return void 0;
     }
     if (generation !== void 0 && actor.generation !== generation) {
-      (_b = logger()) == null ? void 0 : _b.error({
+      (_b = this.log) == null ? void 0 : _b.error({
         msg: "actor generation mismatch",
-        runnerId: this.runnerId,
         actorId,
         generation
       });
@@ -1160,7 +1359,7 @@ var Runner = class {
     var _a, _b;
     if (this.#started) throw new Error("Cannot call runner.start twice");
     this.#started = true;
-    (_a = logger()) == null ? void 0 : _a.info({ msg: "starting runner" });
+    (_a = this.log) == null ? void 0 : _a.info({ msg: "starting runner" });
     this.#tunnel = new Tunnel(this);
     this.#tunnel.start();
     try {
@@ -1173,7 +1372,7 @@ var Runner = class {
       if (!SIGNAL_HANDLERS.length) {
         process.on("SIGTERM", () => {
           var _a2;
-          (_a2 = logger()) == null ? void 0 : _a2.debug("received SIGTERM");
+          (_a2 = this.log) == null ? void 0 : _a2.debug("received SIGTERM");
           for (const handler of SIGNAL_HANDLERS) {
             handler();
           }
@@ -1181,13 +1380,13 @@ var Runner = class {
         });
         process.on("SIGINT", () => {
           var _a2;
-          (_a2 = logger()) == null ? void 0 : _a2.debug("received SIGINT");
+          (_a2 = this.log) == null ? void 0 : _a2.debug("received SIGINT");
           for (const handler of SIGNAL_HANDLERS) {
             handler();
           }
           process.exit(0);
         });
-        (_b = logger()) == null ? void 0 : _b.debug({
+        (_b = this.log) == null ? void 0 : _b.debug({
           msg: "added SIGTERM listeners"
         });
       }
@@ -1201,9 +1400,8 @@ var Runner = class {
   // MARK: Shutdown
   async shutdown(immediate, exit = false) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
-    (_a = logger()) == null ? void 0 : _a.info({
+    (_a = this.log) == null ? void 0 : _a.info({
       msg: "starting shutdown",
-      runnerId: this.runnerId,
       immediate,
       exit
     });
@@ -1237,12 +1435,11 @@ var Runner = class {
     if (this.#pegboardWebSocket && this.#pegboardWebSocket.readyState === 1) {
       const pegboardWebSocket = this.#pegboardWebSocket;
       if (immediate) {
-        pegboardWebSocket.close(1e3, "Stopping");
+        pegboardWebSocket.close(1e3, "pegboard.runner_shutdown");
       } else {
         try {
-          (_b = logger()) == null ? void 0 : _b.info({
+          (_b = this.log) == null ? void 0 : _b.info({
             msg: "sending stopping message",
-            runnerId: this.runnerId,
             readyState: pegboardWebSocket.readyState
           });
           const encoded = protocol.encodeToServer({
@@ -1252,7 +1449,7 @@ var Runner = class {
           if (this.#pegboardWebSocket && this.#pegboardWebSocket.readyState === 1) {
             this.#pegboardWebSocket.send(encoded);
           } else {
-            (_c = logger()) == null ? void 0 : _c.error(
+            (_c = this.log) == null ? void 0 : _c.error(
               "WebSocket not available or not open for sending data"
             );
           }
@@ -1261,38 +1458,33 @@ var Runner = class {
               throw new Error("missing pegboardWebSocket");
             pegboardWebSocket.addEventListener("close", (ev) => {
               var _a2;
-              (_a2 = logger()) == null ? void 0 : _a2.info({
+              (_a2 = this.log) == null ? void 0 : _a2.info({
                 msg: "connection closed",
-                runnerId: this.runnerId,
                 code: ev.code,
                 reason: ev.reason.toString()
               });
               resolve();
             });
           });
-          (_d = logger()) == null ? void 0 : _d.info({
-            msg: "closing WebSocket",
-            runnerId: this.runnerId
+          (_d = this.log) == null ? void 0 : _d.info({
+            msg: "closing WebSocket"
           });
-          pegboardWebSocket.close(1e3, "Stopping");
+          pegboardWebSocket.close(1e3, "pegboard.runner_shutdown");
           await closePromise;
-          (_e = logger()) == null ? void 0 : _e.info({
-            msg: "websocket shutdown completed",
-            runnerId: this.runnerId
+          (_e = this.log) == null ? void 0 : _e.info({
+            msg: "websocket shutdown completed"
           });
         } catch (error) {
-          (_f = logger()) == null ? void 0 : _f.error({
+          (_f = this.log) == null ? void 0 : _f.error({
             msg: "error during websocket shutdown:",
-            runnerId: this.runnerId,
             error
           });
           pegboardWebSocket.close();
         }
       }
     } else {
-      (_h = logger()) == null ? void 0 : _h.warn({
+      (_h = this.log) == null ? void 0 : _h.debug({
         msg: "no runner WebSocket to shutdown or already closed",
-        runnerId: this.runnerId,
         readyState: (_g = this.#pegboardWebSocket) == null ? void 0 : _g.readyState
       });
     }
@@ -1321,7 +1513,7 @@ var Runner = class {
     const WS = await importWebSocket();
     const ws = new WS(this.pegboardUrl, protocols);
     this.#pegboardWebSocket = ws;
-    (_a = logger()) == null ? void 0 : _a.info({
+    (_a = this.log) == null ? void 0 : _a.info({
       msg: "connecting",
       endpoint: this.pegboardEndpoint,
       namespace: this.#config.namespace,
@@ -1329,8 +1521,21 @@ var Runner = class {
       hasToken: !!this.config.token
     });
     ws.addEventListener("open", () => {
-      var _a2;
-      (_a2 = logger()) == null ? void 0 : _a2.info({ msg: "connected" });
+      var _a2, _b;
+      if (this.#reconnectAttempt > 0) {
+        (_a2 = this.log) == null ? void 0 : _a2.info({
+          msg: "runner reconnected",
+          namespace: this.#config.namespace,
+          runnerName: this.#config.runnerName,
+          reconnectAttempt: this.#reconnectAttempt
+        });
+      } else {
+        (_b = this.log) == null ? void 0 : _b.debug({
+          msg: "runner connected",
+          namespace: this.#config.namespace,
+          runnerName: this.#config.runnerName
+        });
+      }
       this.#reconnectAttempt = 0;
       if (this.#reconnectTimeout) {
         clearTimeout(this.#reconnectTimeout);
@@ -1371,9 +1576,8 @@ var Runner = class {
           });
         } else {
           clearInterval(pingLoop);
-          (_a3 = logger()) == null ? void 0 : _a3.info({
-            msg: "WebSocket not open, stopping ping loop",
-            runnerId: this.runnerId
+          (_a3 = this.log) == null ? void 0 : _a3.info({
+            msg: "WebSocket not open, stopping ping loop"
           });
         }
       }, RUNNER_PING_INTERVAL);
@@ -1385,9 +1589,8 @@ var Runner = class {
           this.#sendCommandAcknowledgment();
         } else {
           clearInterval(ackLoop);
-          (_a3 = logger()) == null ? void 0 : _a3.info({
-            msg: "WebSocket not open, stopping ack loop",
-            runnerId: this.runnerId
+          (_a3 = this.log) == null ? void 0 : _a3.info({
+            msg: "WebSocket not open, stopping ack loop"
           });
         }
       }, ackInterval);
@@ -1411,9 +1614,8 @@ var Runner = class {
           this.#eventHistory.length = 0;
         }
         this.#runnerLostThreshold = ((_a2 = init.metadata) == null ? void 0 : _a2.runnerLostThreshold) ? Number(init.metadata.runnerLostThreshold) : void 0;
-        (_b = logger()) == null ? void 0 : _b.info({
+        (_b = this.log) == null ? void 0 : _b.info({
           msg: "received init",
-          runnerId: init.runnerId,
           lastEventIdx: init.lastEventIdx,
           runnerLostThreshold: this.#runnerLostThreshold
         });
@@ -1438,15 +1640,13 @@ var Runner = class {
     });
     ws.addEventListener("error", (ev) => {
       var _a2, _b;
-      (_a2 = logger()) == null ? void 0 : _a2.error({
-        msg: `WebSocket error: ${ev.error}`,
-        runnerId: this.runnerId
+      (_a2 = this.log) == null ? void 0 : _a2.error({
+        msg: `WebSocket error: ${ev.error}`
       });
       if (!this.#shutdown) {
         if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_b = logger()) == null ? void 0 : _b.info({
+          (_b = this.log) == null ? void 0 : _b.info({
             msg: "starting runner lost timeout",
-            runnerId: this.runnerId,
             seconds: this.#runnerLostThreshold / 1e3
           });
           this.#runnerLostTimeout = setTimeout(() => {
@@ -1457,20 +1657,24 @@ var Runner = class {
       }
     });
     ws.addEventListener("close", async (ev) => {
-      var _a2, _b, _c;
-      (_a2 = logger()) == null ? void 0 : _a2.info({
-        msg: "connection closed",
-        runnerId: this.runnerId,
-        code: ev.code,
-        reason: ev.reason.toString()
-      });
-      this.#config.onDisconnected(ev.code, ev.reason);
-      if (ev.reason.toString().startsWith("ws.eviction")) {
-        (_b = logger()) == null ? void 0 : _b.info({
-          msg: "runner evicted",
-          runnerId: this.runnerId
-        });
+      var _a2, _b, _c, _d;
+      const closeError = parseWebSocketCloseReason(ev.reason);
+      if ((closeError == null ? void 0 : closeError.group) === "ws" && (closeError == null ? void 0 : closeError.error) === "eviction") {
+        (_a2 = this.log) == null ? void 0 : _a2.info("runner websocket evicted");
+        this.#config.onDisconnected(ev.code, ev.reason);
         await this.shutdown(true);
+      } else {
+        if ((closeError == null ? void 0 : closeError.group) === "pegboard" && (closeError == null ? void 0 : closeError.error) === "runner_shutdown") {
+          (_b = this.log) == null ? void 0 : _b.info("runner shutdown");
+        } else {
+          (_c = this.log) == null ? void 0 : _c.warn({
+            msg: "runner disconnected",
+            code: ev.code,
+            reason: ev.reason.toString(),
+            closeError
+          });
+        }
+        this.#config.onDisconnected(ev.code, ev.reason);
       }
       if (this.#pingLoop) {
         clearInterval(this.#pingLoop);
@@ -1482,9 +1686,8 @@ var Runner = class {
       }
       if (!this.#shutdown) {
         if (!this.#runnerLostTimeout && this.#runnerLostThreshold && this.#runnerLostThreshold > 0) {
-          (_c = logger()) == null ? void 0 : _c.info({
+          (_d = this.log) == null ? void 0 : _d.info({
             msg: "starting runner lost timeout",
-            runnerId: this.runnerId,
             seconds: this.#runnerLostThreshold / 1e3
           });
           this.#runnerLostTimeout = setTimeout(() => {
@@ -1497,16 +1700,14 @@ var Runner = class {
   }
   #handleCommands(commands) {
     var _a, _b;
-    (_a = logger()) == null ? void 0 : _a.info({
+    (_a = this.log) == null ? void 0 : _a.info({
       msg: "received commands",
-      runnerId: this.runnerId,
       commandCount: commands.length
     });
     for (const commandWrapper of commands) {
-      (_b = logger()) == null ? void 0 : _b.info({
+      (_b = this.log) == null ? void 0 : _b.info({
         msg: "received command",
-        runnerId: this.runnerId,
-        commandWrapper
+        command: stringifyCommandWrapper(commandWrapper)
       });
       if (commandWrapper.inner.tag === "CommandStartActor") {
         this.#handleCommandStartActor(commandWrapper);
@@ -1527,9 +1728,8 @@ var Runner = class {
     );
     const prunedCount = originalLength - this.#eventHistory.length;
     if (prunedCount > 0) {
-      (_a = logger()) == null ? void 0 : _a.info({
+      (_a = this.log) == null ? void 0 : _a.info({
         msg: "pruned acknowledged events",
-        runnerId: this.runnerId,
         lastAckedIdx: lastAckedIdx.toString(),
         prunedCount
       });
@@ -1544,9 +1744,8 @@ var Runner = class {
     this.#eventHistory.push(eventWrapper);
     if (this.#eventHistory.length > EVENT_BACKLOG_WARN_THRESHOLD && !this.#eventBacklogWarned) {
       this.#eventBacklogWarned = true;
-      (_a = logger()) == null ? void 0 : _a.warn({
+      (_a = this.log) == null ? void 0 : _a.warn({
         msg: "unacknowledged event backlog exceeds threshold",
-        runnerId: this.runnerId,
         backlogSize: this.#eventHistory.length,
         threshold: EVENT_BACKLOG_WARN_THRESHOLD
       });
@@ -1574,9 +1773,8 @@ var Runner = class {
     this.#sendActorStateUpdate(actorId, generation, "running");
     this.#config.onActorStart(actorId, generation, actorConfig).catch((err) => {
       var _a;
-      (_a = logger()) == null ? void 0 : _a.error({
+      (_a = this.log) == null ? void 0 : _a.error({
         msg: "error in onactorstart for actor",
-        runnerId: this.runnerId,
         actorId,
         err
       });
@@ -1592,9 +1790,9 @@ var Runner = class {
   #sendActorIntent(actorId, generation, intentType) {
     var _a, _b;
     if (this.#shutdown) {
-      (_a = logger()) == null ? void 0 : _a.warn({
-        msg: "Runner is shut down, cannot send actor intent",
-        runnerId: this.runnerId
+      console.trace("send actor intent", actorId, intentType);
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "Runner is shut down, cannot send actor intent"
       });
       return;
     }
@@ -1623,12 +1821,10 @@ var Runner = class {
       }
     };
     this.#recordEvent(eventWrapper);
-    (_b = logger()) == null ? void 0 : _b.info({
+    (_b = this.log) == null ? void 0 : _b.info({
       msg: "sending event to server",
-      runnerId: this.runnerId,
-      index: eventWrapper.index,
-      tag: eventWrapper.inner.tag,
-      val: eventWrapper.inner.val
+      event: stringifyEvent(eventWrapper.inner),
+      index: eventWrapper.index.toString()
     });
     this.__sendToServer({
       tag: "ToServerEvents",
@@ -1638,9 +1834,8 @@ var Runner = class {
   #sendActorStateUpdate(actorId, generation, stateType) {
     var _a, _b;
     if (this.#shutdown) {
-      (_a = logger()) == null ? void 0 : _a.warn({
-        msg: "Runner is shut down, cannot send actor state update",
-        runnerId: this.runnerId
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "Runner is shut down, cannot send actor state update"
       });
       return;
     }
@@ -1672,12 +1867,10 @@ var Runner = class {
       }
     };
     this.#recordEvent(eventWrapper);
-    (_b = logger()) == null ? void 0 : _b.info({
+    (_b = this.log) == null ? void 0 : _b.info({
       msg: "sending event to server",
-      runnerId: this.runnerId,
-      index: eventWrapper.index,
-      tag: eventWrapper.inner.tag,
-      val: eventWrapper.inner.val
+      event: stringifyEvent(eventWrapper.inner),
+      index: eventWrapper.index.toString()
     });
     this.__sendToServer({
       tag: "ToServerEvents",
@@ -1687,9 +1880,8 @@ var Runner = class {
   #sendCommandAcknowledgment() {
     var _a;
     if (this.#shutdown) {
-      (_a = logger()) == null ? void 0 : _a.warn({
-        msg: "Runner is shut down, cannot send command acknowledgment",
-        runnerId: this.runnerId
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "Runner is shut down, cannot send command acknowledgment"
       });
       return;
     }
@@ -1708,8 +1900,10 @@ var Runner = class {
     const requestId = response.requestId;
     const request = this.#kvRequests.get(requestId);
     if (!request) {
-      const msg = "received kv response for unknown request id";
-      (_a = logger()) == null ? void 0 : _a.error({ msg, runnerId: this.runnerId, requestId });
+      (_a = this.log) == null ? void 0 : _a.error({
+        msg: "received kv response for unknown request id",
+        requestId
+      });
       return;
     }
     this.#kvRequests.delete(requestId);
@@ -2014,9 +2208,8 @@ var Runner = class {
   __sendToServer(message) {
     var _a, _b;
     if (this.#shutdown) {
-      (_a = logger()) == null ? void 0 : _a.warn({
-        msg: "Runner is shut down, cannot send message to server",
-        runnerId: this.runnerId
+      (_a = this.log) == null ? void 0 : _a.warn({
+        msg: "Runner is shut down, cannot send message to server"
       });
       return;
     }
@@ -2024,9 +2217,8 @@ var Runner = class {
     if (this.#pegboardWebSocket && this.#pegboardWebSocket.readyState === 1) {
       this.#pegboardWebSocket.send(encoded);
     } else {
-      (_b = logger()) == null ? void 0 : _b.error({
-        msg: "WebSocket not available or not open for sending data",
-        runnerId: this.runnerId
+      (_b = this.log) == null ? void 0 : _b.error({
+        msg: "WebSocket not available or not open for sending data"
       });
     }
   }
@@ -2050,9 +2242,8 @@ var Runner = class {
   #scheduleReconnect() {
     var _a, _b;
     if (this.#shutdown) {
-      (_a = logger()) == null ? void 0 : _a.debug({
-        msg: "Runner is shut down, not attempting reconnect",
-        runnerId: this.runnerId
+      (_a = this.log) == null ? void 0 : _a.debug({
+        msg: "Runner is shut down, not attempting reconnect"
       });
       return;
     }
@@ -2062,17 +2253,15 @@ var Runner = class {
       multiplier: 2,
       jitter: true
     });
-    (_b = logger()) == null ? void 0 : _b.debug({
-      msg: `Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`,
-      runnerId: this.runnerId
+    (_b = this.log) == null ? void 0 : _b.debug({
+      msg: `Scheduling reconnect attempt ${this.#reconnectAttempt + 1} in ${delay}ms`
     });
     this.#reconnectTimeout = setTimeout(async () => {
       var _a2;
       if (!this.#shutdown) {
         this.#reconnectAttempt++;
-        (_a2 = logger()) == null ? void 0 : _a2.debug({
-          msg: `Attempting to reconnect (attempt ${this.#reconnectAttempt})...`,
-          runnerId: this.runnerId
+        (_a2 = this.log) == null ? void 0 : _a2.debug({
+          msg: `Attempting to reconnect (attempt ${this.#reconnectAttempt})...`
         });
         await this.#openPegboardWebSocket();
       }