@moxt-ai/mobius 0.0.25 → 0.0.26

package/dist/runtime.js

@@ -1450,7 +1450,53 @@ import { fetch } from "undici";
 
 // src/network/environment-proxy.ts
 import { EnvHttpProxyAgent } from "undici";
+var configuredHttpProxy = process.env["http_proxy"] ?? process.env["HTTP_PROXY"] ?? "";
+var configuredHttpsProxy = process.env["https_proxy"] ?? process.env["HTTPS_PROXY"] ?? configuredHttpProxy;
 var environmentProxyDispatcher = new EnvHttpProxyAgent();
+function bypassesProxy(target) {
+  const noProxy = process.env["no_proxy"] ?? process.env["NO_PROXY"] ?? "";
+  if (noProxy === "*") {
+    return true;
+  }
+  const hostname4 = target.hostname.replace(/^\[|\]$/gu, "").toLowerCase();
+  const defaultPort = target.protocol === "wss:" || target.protocol === "https:" ? 443 : 80;
+  const port = Number.parseInt(target.port, 10) || defaultPort;
+  for (const rawEntry of noProxy.split(/[,\s]/u)) {
+    if (rawEntry.length === 0) {
+      continue;
+    }
+    const parsed = rawEntry.match(/^(.+):(\d+)$/u);
+    const entryHostname = (parsed?.[1] ?? rawEntry).replace(/^\*?\./u, "").toLowerCase();
+    const entryPort = parsed?.[2] === void 0 ? 0 : Number.parseInt(parsed[2], 10);
+    if (entryPort !== 0 && entryPort !== port) {
+      continue;
+    }
+    if (hostname4 === entryHostname || hostname4.endsWith(`.${entryHostname}`)) {
+      return true;
+    }
+  }
+  return false;
+}
+function sanitizedProxyOrigin(proxyUrl) {
+  try {
+    return new URL(proxyUrl).origin;
+  } catch {
+    return "configured-invalid-url";
+  }
+}
+function describeEnvironmentProxyRoute(target) {
+  if (bypassesProxy(target)) {
+    return { proxyRoute: "direct" };
+  }
+  const proxyUrl = target.protocol === "wss:" || target.protocol === "https:" ? configuredHttpsProxy : configuredHttpProxy;
+  if (proxyUrl.length === 0) {
+    return { proxyRoute: "direct" };
+  }
+  return {
+    proxyOrigin: sanitizedProxyOrigin(proxyUrl),
+    proxyRoute: "proxy"
+  };
+}
 
 // src/agent-installation/managed-agent-archive.ts
 var ARCHIVE_DOWNLOAD_LIMIT_BYTES = 128 * 1024 * 1024;
@@ -22967,6 +23013,7 @@ var encode4 = (message, schema) => {
   }
   return JSON.stringify(decoded.data);
 };
+var decodeSessionEventEnvelope = (encoded) => decode5(encoded, eventEnvelopeSchema);
 var encodeSessionEventEnvelope = (message) => encode4(message, eventEnvelopeSchema);
 var decodeSessionEventAcknowledgement = (encoded) => decode5(encoded, eventAcknowledgementSchema);
 var decodeSessionEventRejection = (encoded) => decode5(encoded, eventRejectionSchema);
@@ -28616,9 +28663,11 @@ import { WebSocket } from "undici";
 var CONNECTION_TIMEOUT_MILLISECONDS = 15e3;
 var RelayConnectionError = class extends Error {
   code;
-  constructor(code, message, options = {}) {
+  diagnosticDetails;
+  constructor(code, message, diagnosticDetails = {}, options = {}) {
     super(message, options);
     this.code = code;
+    this.diagnosticDetails = diagnosticDetails;
     this.name = "RelayConnectionError";
   }
 };
@@ -28656,16 +28705,34 @@ function connectRelay(url2, signal) {
     };
     const onAbort = () => {
       fail(
-        new RelayConnectionError("relay_connection_cancelled", "Relay connection was cancelled", {
-          cause: signal.reason
-        })
+        new RelayConnectionError(
+          "relay_connection_cancelled",
+          "Relay connection was cancelled",
+          {
+            cancellation: "requested"
+          },
+          { cause: signal.reason }
+        )
       );
     };
-    const onClose = () => {
-      fail(new RelayConnectionError("relay_connection_closed", "Relay connection closed before it was ready"));
+    const onClose = (event) => {
+      fail(
+        new RelayConnectionError("relay_connection_closed", "Relay connection closed before it was ready", {
+          closeCode: event.code.toString(),
+          closeReason: event.reason
+        })
+      );
     };
-    const onError = () => {
-      fail(new RelayConnectionError("relay_connection_failed", "Relay connection failed"));
+    const onError = (event) => {
+      const cause = Reflect.get(event, "error");
+      fail(
+        new RelayConnectionError(
+          "relay_connection_failed",
+          "Relay connection failed",
+          {},
+          { cause: cause ?? event }
+        )
+      );
     };
     const onOpen = () => {
       if (finished) {
@@ -28676,7 +28743,11 @@ function connectRelay(url2, signal) {
       resolve6(socket);
     };
     function onTimeout() {
-      fail(new RelayConnectionError("relay_connection_timeout", "Relay connection timed out"));
+      fail(
+        new RelayConnectionError("relay_connection_timeout", "Relay connection timed out", {
+          timeoutMilliseconds: CONNECTION_TIMEOUT_MILLISECONDS.toString()
+        })
+      );
     }
     signal.addEventListener("abort", onAbort, { once: true });
     socket.addEventListener("close", onClose, { once: true });
@@ -28688,6 +28759,142 @@ function connectRelay(url2, signal) {
   });
 }
 
+// src/relay-connection/diagnostics.ts
+var MAX_DIAGNOSTIC_TEXT_LENGTH = 256;
+function sanitizeDiagnosticText(value) {
+  const printable = Array.from(value, (character) => {
+    const code = character.charCodeAt(0);
+    return code < 32 || code === 127 ? " " : character;
+  }).join("");
+  const withoutSecrets = printable.replace(/([?&](?:access_token|authorization|credential|key|secret|token)=)[^&\s]*/giu, "$1[redacted]").replace(/(?:https?|wss?):\/\/[^\s)]+/giu, (encodedUrl) => {
+    try {
+      return new URL(encodedUrl).origin;
+    } catch {
+      return "[redacted-url]";
+    }
+  });
+  return withoutSecrets.slice(0, MAX_DIAGNOSTIC_TEXT_LENGTH);
+}
+function addFailureDetails(details, failure) {
+  let current = failure;
+  for (let depth = 0; depth < 3 && current instanceof Error; depth += 1) {
+    const prefix = depth === 0 ? "failure" : `cause${depth.toString()}`;
+    details[`${prefix}Name`] = current.name;
+    details[`${prefix}Message`] = sanitizeDiagnosticText(current.message);
+    const code = Reflect.get(current, "code");
+    if (typeof code === "string" || typeof code === "number") {
+      details[`${prefix}Code`] = String(code);
+    }
+    const statusCode = Reflect.get(current, "statusCode");
+    if (typeof statusCode === "string" || typeof statusCode === "number") {
+      details[`${prefix}StatusCode`] = String(statusCode);
+    }
+    const diagnosticDetails = Reflect.get(current, "diagnosticDetails");
+    if (typeof diagnosticDetails === "object" && diagnosticDetails !== null) {
+      for (const [key, value] of Object.entries(diagnosticDetails)) {
+        if (typeof value === "string") {
+          details[key] = sanitizeDiagnosticText(value);
+        }
+      }
+    }
+    current = current.cause;
+  }
+}
+var RelayConnectionDiagnostics = class {
+  #audit;
+  #channelId;
+  #lastClosedEpoch = 0;
+  #lastFailedEpoch = 0;
+  #relayOrigin;
+  #route;
+  constructor(audit, channelId, relayUrl) {
+    this.#audit = audit;
+    this.#channelId = channelId;
+    this.#relayOrigin = relayUrl.origin;
+    this.#route = describeEnvironmentProxyRoute(relayUrl);
+  }
+  catalogFailed = (failure) => {
+    const details = { ...this.#route, relayOrigin: this.#relayOrigin };
+    addFailureDetails(details, failure);
+    this.#record("agent_catalog_publish_failed", "catalog", details, true);
+  };
+  connectionClosed = (connectionEpoch, code, reason, source) => {
+    if (this.#lastClosedEpoch === connectionEpoch) {
+      return;
+    }
+    this.#lastClosedEpoch = connectionEpoch;
+    this.#record(
+      "relay_connection_closed",
+      connectionEpoch.toString(),
+      {
+        closeCode: code.toString(),
+        closeReason: sanitizeDiagnosticText(reason),
+        connectionEpoch: connectionEpoch.toString(),
+        relayOrigin: this.#relayOrigin,
+        source,
+        ...this.#route
+      },
+      true
+    );
+  };
+  connectionFailed = (connectionEpoch, failure, source) => {
+    if (this.#lastFailedEpoch === connectionEpoch) {
+      return;
+    }
+    this.#lastFailedEpoch = connectionEpoch;
+    const details = {
+      connectionEpoch: connectionEpoch.toString(),
+      relayOrigin: this.#relayOrigin,
+      source,
+      ...this.#route
+    };
+    addFailureDetails(details, failure);
+    this.#record("relay_connection_failed", connectionEpoch.toString(), details, true);
+  };
+  connectionOpened = (connectionEpoch) => {
+    this.#record(
+      "relay_connection_opened",
+      connectionEpoch.toString(),
+      {
+        connectionEpoch: connectionEpoch.toString(),
+        relayOrigin: this.#relayOrigin,
+        ...this.#route
+      },
+      false
+    );
+  };
+  heartbeatTimedOut = (connectionEpoch, heartbeatId, timeoutMilliseconds) => {
+    this.#record(
+      "relay_heartbeat_timed_out",
+      connectionEpoch.toString(),
+      {
+        connectionEpoch: connectionEpoch.toString(),
+        heartbeatId,
+        relayOrigin: this.#relayOrigin,
+        timeoutMilliseconds: timeoutMilliseconds.toString(),
+        ...this.#route
+      },
+      true
+    );
+  };
+  #record = (event, commandId, details, warning) => {
+    this.#audit.record({
+      commandId,
+      details,
+      event,
+      sessionId: this.#channelId
+    });
+    const encoded = JSON.stringify({ channelId: this.#channelId, event, ...details });
+    if (warning) {
+      process.stderr.write(`Mobius relay diagnostic ${encoded}
+`);
+      return;
+    }
+    process.stdout.write(`Mobius relay diagnostic ${encoded}
+`);
+  };
+};
+
 // src/relay-connection/liveness.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 var HEARTBEAT_ACK_TIMEOUT_MILLISECONDS = 1e4;
@@ -28764,9 +28971,10 @@ var RelayConnectionLiveness = class {
     if (!(this.#state instanceof AwaitingHeartbeatAckState)) {
       throw new Error("Heartbeat timeout occurred in an invalid state");
     }
+    const heartbeatId = this.#state.heartbeatId;
     this.#state.timeout.cancel();
     this.#state = new FinishedRelayLivenessState();
-    this.#transport.unresponsive();
+    this.#transport.unresponsive(heartbeatId, HEARTBEAT_ACK_TIMEOUT_MILLISECONDS);
   };
   #sendHeartbeat = () => {
     if (this.#state instanceof WaitingForHeartbeatState) {
@@ -28815,6 +29023,7 @@ var SessionEventOutbox = class {
         ordinal INTEGER PRIMARY KEY AUTOINCREMENT,
         event_id TEXT NOT NULL UNIQUE,
         session_id TEXT NOT NULL,
+        source_key TEXT NOT NULL,
         envelope_json TEXT NOT NULL
       ) STRICT;
       CREATE INDEX IF NOT EXISTS relay_session_event_outbox_order
@@ -28842,6 +29051,27 @@ var SessionEventOutbox = class {
         )
       ) STRICT;
     `);
+    const outboxColumns = this.#database.prepare("PRAGMA table_info(relay_session_event_outbox)").all();
+    const hasSourceKey = outboxColumns.some(
+      (column) => typeof column === "object" && column !== null && Reflect.get(column, "name") === "source_key"
+    );
+    if (!hasSourceKey) {
+      this.#database.exec(`
+        ALTER TABLE relay_session_event_outbox
+          ADD COLUMN source_key TEXT NOT NULL DEFAULT '';
+      `);
+    }
+    this.#database.exec(`
+      UPDATE relay_session_event_outbox
+      SET source_key = CASE json_extract(envelope_json, '$.source.kind')
+        WHEN 'attempt' THEN
+          'attempt:' || session_id || ':' || json_extract(envelope_json, '$.source.attemptId')
+        ELSE 'runtime:' || session_id
+      END
+      WHERE source_key = '';
+      CREATE INDEX IF NOT EXISTS relay_session_event_outbox_source_order
+        ON relay_session_event_outbox(source_key, ordinal);
+    `);
   }
   claimExecution = (commandId, sessionId, commandJson) => {
     this.#database.exec("BEGIN IMMEDIATE");
@@ -28899,12 +29129,10 @@ var SessionEventOutbox = class {
     const state = typeof row === "object" && row !== null ? Reflect.get(row, "state") : void 0;
     return state === "succeeded" || state === "failed" || state === "cancelled";
   };
-  acknowledge = (acknowledgement) => {
-    this.#database.prepare(
-      `DELETE FROM relay_session_event_outbox
+  acknowledge = (acknowledgement) => this.#database.prepare(
+    `DELETE FROM relay_session_event_outbox
          WHERE event_id = ? AND session_id = ?`
-    ).run(acknowledgement.eventId, acknowledgement.sessionId);
-  };
+  ).run(acknowledgement.eventId, acknowledgement.sessionId).changes === 1;
   quarantine = (rejection) => {
     this.#database.exec("BEGIN IMMEDIATE");
     try {
@@ -28971,9 +29199,9 @@ var SessionEventOutbox = class {
       ).run(sourceKey, nextSourceSeq + 1);
       this.#database.prepare(
         `INSERT INTO relay_session_event_outbox (
-             event_id, session_id, envelope_json
-           ) VALUES (?, ?, ?)`
-      ).run(envelope2.eventId, envelope2.sessionId, encoded);
+             event_id, session_id, source_key, envelope_json
+           ) VALUES (?, ?, ?, ?)`
+      ).run(envelope2.eventId, envelope2.sessionId, sourceKey, encoded);
       this.#database.exec("COMMIT");
       return encoded;
     } catch (error61) {
@@ -28986,6 +29214,27 @@ var SessionEventOutbox = class {
          FROM relay_session_event_outbox
          ORDER BY ordinal`
   ).all().map(readPendingEnvelope);
+  pendingBatch = (limit) => {
+    if (!Number.isSafeInteger(limit) || limit < 1) {
+      throw new Error("Session event replay batch limit must be a positive integer");
+    }
+    return this.#database.prepare(
+      `WITH ranked_events AS (
+                   SELECT ordinal,
+                          ROW_NUMBER() OVER (
+                            PARTITION BY source_key
+                            ORDER BY ordinal
+                          ) AS source_position
+                   FROM relay_session_event_outbox
+                 )
+                 SELECT outbox.envelope_json
+                 FROM ranked_events AS ranked
+                 INNER JOIN relay_session_event_outbox AS outbox
+                   ON outbox.ordinal = ranked.ordinal
+                 ORDER BY ranked.source_position, outbox.ordinal
+                 LIMIT ?`
+    ).all(limit).map(readPendingEnvelope);
+  };
 };
 function isDaemonExecutionState(value) {
   return value === "cancelled" || value === "dispatching" || value === "failed" || value === "running" || value === "succeeded";
@@ -29002,7 +29251,7 @@ var systemDaemonTimer = new SystemDaemonTimer();
 
 // src/run-daemon.ts
 var RELAY_RECONNECT_DELAY_MILLISECONDS = 500;
-var RELAY_CONNECTION_REFRESH_MILLISECONDS = 20 * 60 * 1e3;
+var AGENT_ACTIVITY_COALESCING_MILLISECONDS = 100;
 var ACTIVE_TURN_RECONCILIATION_TIMEOUT_MILLISECONDS = 2e4;
 var ACTIVE_TURN_RECONCILIATION_CLOSE_CODE = 4009;
 function botIpcSocketPath() {
@@ -29011,54 +29260,6 @@ function botIpcSocketPath() {
   }
   return join15("/tmp", `mobius-bot-${randomUUID4()}.sock`);
 }
-var RelayConnectionRefreshState = class {
-};
-var ScheduledRelayConnectionRefreshState = class extends RelayConnectionRefreshState {
-};
-var DueRelayConnectionRefreshState = class extends RelayConnectionRefreshState {
-};
-var FinishedRelayConnectionRefreshState = class extends RelayConnectionRefreshState {
-};
-var RelayConnectionRefresh = class {
-  #isSafe;
-  #refresh;
-  #scheduledTask;
-  #state = new ScheduledRelayConnectionRefreshState();
-  constructor(timer, isSafe, refresh) {
-    this.#isSafe = isSafe;
-    this.#refresh = refresh;
-    this.#scheduledTask = timer.schedule(this.#request, RELAY_CONNECTION_REFRESH_MILLISECONDS);
-  }
-  afterTurnFinished = () => {
-    if (this.#state instanceof DueRelayConnectionRefreshState) {
-      this.#request();
-      return;
-    }
-    if (this.#state instanceof ScheduledRelayConnectionRefreshState || this.#state instanceof FinishedRelayConnectionRefreshState) {
-      return;
-    }
-    throw new Error("Unknown relay connection refresh state");
-  };
-  close = () => {
-    this.#scheduledTask.cancel();
-    this.#state = new FinishedRelayConnectionRefreshState();
-  };
-  #request = () => {
-    if (this.#state instanceof FinishedRelayConnectionRefreshState) {
-      return;
-    }
-    if (!(this.#state instanceof ScheduledRelayConnectionRefreshState) && !(this.#state instanceof DueRelayConnectionRefreshState)) {
-      throw new Error("Unknown relay connection refresh state");
-    }
-    if (!this.#isSafe()) {
-      this.#state = new DueRelayConnectionRefreshState();
-      return;
-    }
-    this.#state = new FinishedRelayConnectionRefreshState();
-    this.#scheduledTask.cancel();
-    this.#refresh();
-  };
-};
 var DaemonAcpObserver = class {
   #record;
   constructor(record2) {
@@ -29323,7 +29524,8 @@ var DaemonSessionEventConnectionState = class {
 };
 var DisconnectedDaemonSessionEventState = class extends DaemonSessionEventConnectionState {
   disconnect = () => this;
-  send = () => void 0;
+  matches = () => false;
+  send = () => false;
 };
 var ConnectedDaemonSessionEventState = class extends DaemonSessionEventConnectionState {
   #socket;
@@ -29332,38 +29534,155 @@ var ConnectedDaemonSessionEventState = class extends DaemonSessionEventConnectio
     this.#socket = socket;
   }
   disconnect = (socket) => socket === this.#socket ? new DisconnectedDaemonSessionEventState() : this;
+  matches = (socket) => socket === this.#socket;
   send = (message) => {
-    if (this.#socket.readyState === WebSocket2.OPEN) {
-      try {
-        this.#socket.send(message);
-      } catch {
-      }
+    if (this.#socket.readyState !== WebSocket2.OPEN) {
+      return false;
+    }
+    try {
+      this.#socket.send(message);
+      return true;
+    } catch {
+      return false;
     }
   };
 };
+var SESSION_EVENT_REPLAY_WINDOW = 4;
 var DaemonSessionEventPublisher = class {
   #outbox;
+  #inFlightEventIds = /* @__PURE__ */ new Set();
   #connection = new DisconnectedDaemonSessionEventState();
   constructor(outbox) {
     this.#outbox = outbox;
   }
   connect = (socket) => {
-    const connection = new ConnectedDaemonSessionEventState(socket);
-    this.#connection = connection;
-    for (const pending of this.#outbox.pending()) {
-      connection.send(pending);
-    }
+    this.#connection = new ConnectedDaemonSessionEventState(socket);
+    this.#inFlightEventIds.clear();
+    this.#publishNextBatch();
   };
   disconnect = (socket) => {
+    if (!this.#connection.matches(socket)) {
+      return;
+    }
     this.#connection = this.#connection.disconnect(socket);
+    this.#inFlightEventIds.clear();
   };
   recordAttempt = (sessionId, payload, attemptId) => {
-    this.#connection.send(this.#outbox.enqueue(sessionId, payload, attemptId));
+    this.#outbox.enqueue(sessionId, payload, attemptId);
+    this.#publishNextBatch();
   };
   recordRuntime = (sessionId, payload) => {
-    this.#connection.send(this.#outbox.enqueue(sessionId, payload));
+    this.#outbox.enqueue(sessionId, payload);
+    this.#publishNextBatch();
+  };
+  acknowledge = (acknowledgement) => {
+    if (!this.#outbox.acknowledge(acknowledgement)) {
+      return;
+    }
+    this.#inFlightEventIds.delete(acknowledgement.eventId);
+    this.#publishNextBatch();
+  };
+  quarantine = (rejection) => {
+    const quarantined = this.#outbox.quarantine(rejection);
+    if (!quarantined) {
+      return false;
+    }
+    this.#inFlightEventIds.delete(rejection.eventId);
+    this.#publishNextBatch();
+    return true;
+  };
+  #publishNextBatch = () => {
+    if (this.#inFlightEventIds.size > 0) {
+      return;
+    }
+    const batch = this.#outbox.pendingBatch(SESSION_EVENT_REPLAY_WINDOW);
+    for (const encoded of batch) {
+      const envelope2 = decodeSessionEventEnvelope(encoded);
+      if (!this.#connection.send(encoded)) {
+        this.#inFlightEventIds.clear();
+        return;
+      }
+      this.#inFlightEventIds.add(envelope2.eventId);
+    }
+  };
+};
+var CoalescingDaemonActivityPublisher = class {
+  #pending = /* @__PURE__ */ new Map();
+  #publish;
+  #publishedActivityIds = /* @__PURE__ */ new Set();
+  #scheduled = /* @__PURE__ */ new Map();
+  #timer;
+  constructor(timer, publish) {
+    this.#publish = publish;
+    this.#timer = timer;
+  }
+  flush = () => {
+    const activities = [...this.#pending.values()].sort((left, right) => left.sequence - right.sequence);
+    for (const task of this.#scheduled.values()) {
+      task.cancel();
+    }
+    this.#pending.clear();
+    this.#scheduled.clear();
+    for (const activity of activities) {
+      this.#publish(activity);
+    }
+  };
+  record = (activity) => {
+    if (activity.status !== "pending" && activity.status !== "running") {
+      this.#discardPending(activity.activityId);
+      this.#publishedActivityIds.add(activity.activityId);
+      this.#publish(activity);
+      return Promise.resolve();
+    }
+    if (!this.#publishedActivityIds.has(activity.activityId)) {
+      this.#publishedActivityIds.add(activity.activityId);
+      this.#publish(activity);
+      return Promise.resolve();
+    }
+    this.#pending.set(activity.activityId, activity);
+    if (!this.#scheduled.has(activity.activityId)) {
+      this.#scheduled.set(
+        activity.activityId,
+        this.#timer.schedule(
+          () => this.#flushActivity(activity.activityId),
+          AGENT_ACTIVITY_COALESCING_MILLISECONDS
+        )
+      );
+    }
+    return Promise.resolve();
+  };
+  #discardPending = (activityId) => {
+    this.#scheduled.get(activityId)?.cancel();
+    this.#scheduled.delete(activityId);
+    this.#pending.delete(activityId);
+  };
+  #flushActivity = (activityId) => {
+    const activity = this.#pending.get(activityId);
+    this.#discardPending(activityId);
+    if (activity !== void 0) {
+      this.#publish(activity);
+    }
   };
 };
+function encodeDaemonActivity(command, activity) {
+  return encodeAgentActivityEvent({
+    activityId: activity.activityId,
+    activityType: activity.activityType,
+    commandId: command.commandId,
+    content: activity.content,
+    detail: activity.detail,
+    input: activity.input,
+    kind: AGENT_ACTIVITY_KIND,
+    locations: activity.locations,
+    name: activity.name,
+    output: activity.output,
+    sequence: activity.sequence,
+    sessionId: command.sessionId,
+    status: activity.status,
+    title: activity.title,
+    toolKind: activity.toolKind
+  });
+}
 function reportFailure(publisher, command, code, message, attemptId) {
   publisher.recordAttempt(
     command.sessionId,
@@ -29540,7 +29859,10 @@ async function executeSessionConfigure(publisher, socket, command, config2, dire
     reportOperationFailure(socket, command.requestId, command.sessionId, error61);
   }
 }
-async function executePrompt(outbox, publisher, command, config2, directories, audit, sessions, attemptId, signal) {
+async function executePrompt(outbox, publisher, command, config2, directories, audit, sessions, attemptId, timer, signal) {
+  const activities = new CoalescingDaemonActivityPublisher(timer, (activity) => {
+    publisher.recordAttempt(command.sessionId, encodeDaemonActivity(command, activity), attemptId);
+  });
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -29597,30 +29919,7 @@ async function executePrompt(outbox, publisher, command, config2, directories, a
         cwd: resolved.cwd,
         disposition: command.disposition,
         images: attachments.images,
-        onActivity: (activity) => {
-          publisher.recordAttempt(
-            command.sessionId,
-            encodeAgentActivityEvent({
-              activityId: activity.activityId,
-              activityType: activity.activityType,
-              commandId: command.commandId,
-              content: activity.content,
-              detail: activity.detail,
-              input: activity.input,
-              kind: AGENT_ACTIVITY_KIND,
-              locations: activity.locations,
-              name: activity.name,
-              output: activity.output,
-              sequence: activity.sequence,
-              sessionId: command.sessionId,
-              status: activity.status,
-              title: activity.title,
-              toolKind: activity.toolKind
-            }),
-            attemptId
-          );
-          return Promise.resolve();
-        },
+        onActivity: activities.record,
         onText: (text, messageId) => {
           publisher.recordAttempt(
             command.sessionId,
@@ -29643,6 +29942,7 @@ async function executePrompt(outbox, publisher, command, config2, directories, a
       });
       stopReason = result.stopReason;
     }
+    activities.flush();
     publisher.recordAttempt(
       command.sessionId,
       encodeSessionCompletedEvent({
@@ -29660,6 +29960,7 @@ async function executePrompt(outbox, publisher, command, config2, directories, a
       sessionId: command.sessionId
     });
   } catch (error61) {
+    activities.flush();
     audit.record({
       commandId: command.commandId,
       event: "session_failed",
@@ -29698,7 +29999,10 @@ function botExecutionAgent(agent, contextHandle, socketPath) {
     agent.capabilities
   );
 }
-async function executeBotPrompt(outbox, publisher, command, config2, directories, audit, sessions, grants, contexts, applicator, ipc, attemptId, signal) {
+async function executeBotPrompt(outbox, publisher, command, config2, directories, audit, sessions, grants, contexts, applicator, ipc, attemptId, timer, signal) {
+  const activities = new CoalescingDaemonActivityPublisher(timer, (activity) => {
+    publisher.recordAttempt(command.sessionId, encodeDaemonActivity(command, activity), attemptId);
+  });
   try {
     const deadline = Date.parse(command.executionDeadlineAt);
     const remaining = deadline - Date.now();
@@ -29782,30 +30086,7 @@ async function executeBotPrompt(outbox, publisher, command, config2, directories
         commandId: command.commandId,
         cwd: resolved.cwd,
         images: attachments.images,
-        onActivity: (activity) => {
-          publisher.recordAttempt(
-            command.sessionId,
-            encodeAgentActivityEvent({
-              activityId: activity.activityId,
-              activityType: activity.activityType,
-              commandId: command.commandId,
-              content: activity.content,
-              detail: activity.detail,
-              input: activity.input,
-              kind: AGENT_ACTIVITY_KIND,
-              locations: activity.locations,
-              name: activity.name,
-              output: activity.output,
-              sequence: activity.sequence,
-              sessionId: command.sessionId,
-              status: activity.status,
-              title: activity.title,
-              toolKind: activity.toolKind
-            }),
-            attemptId
-          );
-          return Promise.resolve();
-        },
+        onActivity: activities.record,
         onText: (text, messageId) => {
           publisher.recordAttempt(
             command.sessionId,
@@ -29825,6 +30106,7 @@ async function executeBotPrompt(outbox, publisher, command, config2, directories
         sessionId: command.sessionId,
         signal: executionSignal
       });
+      activities.flush();
       publisher.recordAttempt(
         command.sessionId,
         encodeSessionCompletedEvent({
@@ -29849,6 +30131,7 @@ async function executeBotPrompt(outbox, publisher, command, config2, directories
       lease.release();
     }
   } catch (error61) {
+    activities.flush();
     const failure = Date.parse(command.executionDeadlineAt) <= Date.now() ? new LocalBotAuthorizationError("turn_expired", "The Bot execution deadline has expired", {
       cause: error61
     }) : error61;
@@ -29888,15 +30171,15 @@ function waitForRelayRetry(signal, timer) {
     signal.addEventListener("abort", finish, { once: true });
   });
 }
-async function publishAgentCatalogUntilAvailable(config2, signal, timer) {
+async function publishAgentCatalogUntilAvailable(config2, diagnostics, signal, timer) {
   try {
     await publishAgentCatalog(config2, signal);
     return;
-  } catch {
+  } catch (error61) {
     if (signal.aborted) {
       return;
     }
-    console.warn("Mobius daemon is waiting to publish its Agent catalog");
+    diagnostics.catalogFailed(error61);
   }
   while (!signal.aborted) {
     await waitForRelayRetry(signal, timer);
@@ -29910,11 +30193,12 @@ async function publishAgentCatalogUntilAvailable(config2, signal, timer) {
     }
   }
 }
-async function runRelayConnection(config2, directories, audit, sessions, installations, installationObserver, nativeSessions, outbox, publisher, grants, contexts, applicator, ipc, activeTurns, activeAttemptIds, onConnected, signal, timer) {
+async function runRelayConnection(config2, directories, audit, sessions, installations, installationObserver, nativeSessions, outbox, publisher, grants, contexts, applicator, ipc, activeTurns, activeAttemptIds, connectionEpoch, diagnostics, onConnected, signal, timer) {
   const relayUrl = new URL(config2.relayUrl);
   relayUrl.searchParams.set("liveness", "1");
   const socket = await connectRelay(relayUrl, signal);
   const reconnectingTurns = [...activeTurns.values()];
+  diagnostics.connectionOpened(connectionEpoch);
   onConnected();
   const connectionController = new AbortController();
   const nativeRequests = /* @__PURE__ */ new Map();
@@ -29923,7 +30207,6 @@ async function runRelayConnection(config2, directories, audit, sessions, install
     await new Promise((resolve6, reject) => {
       let finished = false;
       const cleanup = () => {
-        connectionRefresh.close();
         connectionLiveness.close();
         signal.removeEventListener("abort", stop);
         socket.removeEventListener("close", handleClose);
@@ -29941,61 +30224,70 @@ async function runRelayConnection(config2, directories, audit, sessions, install
         cleanup();
         resolve6();
       };
-      const rejectConnection = () => {
+      const rejectConnection = (failure) => {
         if (finished) {
           return;
         }
         finished = true;
         cleanup();
-        reject(new Error("Relay WebSocket failed"));
+        reject(failure);
       };
       const stop = () => {
+        diagnostics.connectionClosed(connectionEpoch, 1e3, "Daemon stopped", "daemon_stop");
         closeRelaySocket(socket, 1e3, "Daemon stopped");
         resolveConnection();
       };
-      const refreshConnection = () => {
-        closeRelaySocket(socket, 1e3, "Refreshing idle relay connection");
-        resolveConnection();
+      const failAndClose = (failure, code, reason, source) => {
+        diagnostics.connectionFailed(connectionEpoch, failure, source);
+        diagnostics.connectionClosed(connectionEpoch, code, reason, source);
+        closeRelaySocket(socket, code, reason);
+        rejectConnection(failure);
       };
       const connectionLiveness = new RelayConnectionLiveness(timer, {
         send: (message) => send(socket, message),
-        unresponsive: () => {
+        unresponsive: (heartbeatId, timeoutMilliseconds) => {
+          diagnostics.heartbeatTimedOut(connectionEpoch, heartbeatId, timeoutMilliseconds);
+          diagnostics.connectionClosed(
+            connectionEpoch,
+            4001,
+            "Relay liveness check timed out",
+            "heartbeat_timeout"
+          );
           closeRelaySocket(socket, 4001, "Relay liveness check timed out");
           resolveConnection();
         }
       });
-      const connectionRefresh = new RelayConnectionRefresh(
-        timer,
-        () => activeTurns.size === 0,
-        refreshConnection
-      );
       signal.addEventListener("abort", stop, { once: true });
-      const handleClose = () => {
+      const handleClose = (event) => {
+        diagnostics.connectionClosed(connectionEpoch, event.code, event.reason, "relay");
         resolveConnection();
       };
-      const handleError = () => {
+      const handleError = (event) => {
         if (signal.aborted) {
           resolveConnection();
           return;
         }
-        rejectConnection();
+        const cause = Reflect.get(event, "error");
+        const failure = new Error("Relay WebSocket emitted an error", { cause: cause ?? event });
+        diagnostics.connectionFailed(connectionEpoch, failure, "socket_error");
+        diagnostics.connectionClosed(connectionEpoch, 1006, "WebSocket error", "socket_error");
+        rejectConnection(failure);
       };
       const handleMessage = (event) => {
         const encoded = event.data;
         if (typeof encoded !== "string") {
-          closeRelaySocket(socket, 4003, "Text message required");
-          rejectConnection();
+          failAndClose(new Error("Relay sent a non-text message"), 4003, "Text message required", "protocol");
           return;
         }
         try {
           const kind = decodeMessageKind(encoded);
           if (kind === SESSION_EVENT_ACK_KIND) {
-            outbox.acknowledge(decodeSessionEventAcknowledgement(encoded));
+            publisher.acknowledge(decodeSessionEventAcknowledgement(encoded));
             return;
           }
           if (kind === SESSION_EVENT_REJECTED_KIND) {
             const rejection = decodeSessionEventRejection(encoded);
-            if (outbox.quarantine(rejection)) {
+            if (publisher.quarantine(rejection)) {
               audit.record({
                 commandId: rejection.eventId,
                 details: { code: rejection.code },
@@ -30374,6 +30666,7 @@ async function runRelayConnection(config2, directories, audit, sessions, install
               applicator,
               ipc,
               receipt2.attemptId,
+              timer,
               turn2.signal
             ).catch((error61) => {
               console.error("Mobius daemon Bot turn failed", error61);
@@ -30383,7 +30676,6 @@ async function runRelayConnection(config2, directories, audit, sessions, install
                 activeAttemptIds.delete(command2.sessionId);
               }
               turn2.finish();
-              connectionRefresh.afterTurnFinished();
             });
             return;
           }
@@ -30412,6 +30704,7 @@ async function runRelayConnection(config2, directories, audit, sessions, install
             audit,
             sessions,
             receipt.attemptId,
+            timer,
             turn.signal
           ).catch((error61) => {
             console.error("Mobius daemon turn failed", error61);
@@ -30421,12 +30714,15 @@ async function runRelayConnection(config2, directories, audit, sessions, install
               activeAttemptIds.delete(command.sessionId);
             }
             turn.finish();
-            connectionRefresh.afterTurnFinished();
           });
         } catch (error61) {
           console.error("Mobius daemon rejected a message", error61);
-          closeRelaySocket(socket, 4008, "Invalid protocol message");
-          rejectConnection();
+          failAndClose(
+            new Error("Relay sent an invalid protocol message", { cause: error61 }),
+            4008,
+            "Invalid protocol message",
+            "protocol"
+          );
         }
       };
       socket.addEventListener("close", handleClose);
@@ -30438,21 +30734,18 @@ async function runRelayConnection(config2, directories, audit, sessions, install
             return;
           }
           publisher.connect(socket);
-          void Promise.all(reconnectingTurns.map((turn) => turn.completion)).then(
-            connectionRefresh.afterTurnFinished
-          );
         },
         (error61) => {
           if (finished) {
             return;
           }
           console.error("Mobius daemon could not reconcile active Agent turns", error61);
-          closeRelaySocket(
-            socket,
+          failAndClose(
+            new Error("Active Agent turn reconciliation failed", { cause: error61 }),
             ACTIVE_TURN_RECONCILIATION_CLOSE_CODE,
-            "Active Agent turn reconciliation failed"
+            "Active Agent turn reconciliation failed",
+            "reconciliation"
           );
-          rejectConnection();
         }
       );
       if (signal.aborted) {
@@ -30496,6 +30789,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
   const sessions = new AcpSessionManager(new DaemonAcpObserver(recordSessionEvent), sessionStore);
   const directories = new WorkspaceDirectoryService(config2.bindingId, config2.defaultWorkspace);
   const installationObserver = new DaemonInstallationObserver();
+  const diagnostics = new RelayConnectionDiagnostics(audit, config2.channelId, config2.relayUrl);
   const nativeSessions = new NativeSessionService(config2, directories, sessions, audit);
   const installations = new AgentInstallationManager(
     specifications,
@@ -30503,7 +30797,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
     installationObserver,
     installationAudit
   );
-  let retryAnnounced = false;
+  let connectionEpoch = 0;
   let connectionAnnounced = false;
   const announceConnection = () => {
     if (connectionAnnounced) {
@@ -30519,10 +30813,11 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
 `
     );
   };
-  const catalogPublication = publishAgentCatalogUntilAvailable(config2, signal, timer);
+  const catalogPublication = publishAgentCatalogUntilAvailable(config2, diagnostics, signal, timer);
   try {
     await ipc.listen(signal);
     while (!signal.aborted) {
+      connectionEpoch += 1;
       try {
         await runRelayConnection(
           config2,
@@ -30540,19 +30835,17 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
           ipc,
           activeTurns,
           activeAttemptIds,
+          connectionEpoch,
+          diagnostics,
           announceConnection,
           signal,
           timer
         );
-        retryAnnounced = false;
-      } catch {
+      } catch (error61) {
         if (signal.aborted) {
           return;
         }
-        if (!retryAnnounced) {
-          console.warn("Mobius daemon is waiting for the relay");
-          retryAnnounced = true;
-        }
+        diagnostics.connectionFailed(connectionEpoch, error61, "connection");
       }
       await waitForRelayRetry(signal, timer);
     }