@moxt-ai/mobius 0.0.173 → 0.0.174

package/dist/index.js

@@ -19815,9 +19815,6 @@ var AGENT_INSTALL_CANCELLED_KIND = "agent.integration.install.cancelled";
 var AGENT_SETTINGS_DISCOVER_KIND = "agent.settings.discover";
 var AGENT_SETTINGS_DISCOVERED_KIND = "agent.settings.discovered";
 var AGENT_SETTINGS_DISCOVERY_FAILED_KIND = "agent.settings.discovery.failed";
-var AGENT_CATALOG_REFRESH_KIND = "agent.catalog.refresh";
-var AGENT_CATALOG_REFRESHED_KIND = "agent.catalog.refreshed";
-var AGENT_CATALOG_REFRESH_FAILED_KIND = "agent.catalog.refresh.failed";
 var FILE_READ_KIND = "file.read";
 var FILE_BEGIN_KIND = "file.begin";
 var FILE_CHUNK_KIND = "file.chunk";
@@ -19979,20 +19976,6 @@ var agentSettingsDiscoveryFailedEventSchema = external_exports.object({
   message: external_exports.string().min(1).max(500),
   requestId: identifierStringSchema
 }).readonly();
-var agentCatalogRefreshCommandSchema = external_exports.object({
-  kind: external_exports.literal(AGENT_CATALOG_REFRESH_KIND),
-  requestId: identifierStringSchema
-}).readonly();
-var agentCatalogRefreshedEventSchema = external_exports.object({
-  kind: external_exports.literal(AGENT_CATALOG_REFRESHED_KIND),
-  requestId: identifierStringSchema
-}).readonly();
-var agentCatalogRefreshFailedEventSchema = external_exports.object({
-  code: identifierStringSchema,
-  kind: external_exports.literal(AGENT_CATALOG_REFRESH_FAILED_KIND),
-  message: external_exports.string().min(1).max(500),
-  requestId: identifierStringSchema
-}).readonly();
 var sessionConfigurationSelectionSchema = external_exports.object({
   booleanValue: external_exports.boolean(),
   configId: identifierStringSchema,
@@ -20397,12 +20380,6 @@ var decodeAgentSettingsDiscoveredEvent = (encoded) => decode3(encoded, agentSett
 var encodeAgentSettingsDiscoveredEvent = (message) => encode3(message, agentSettingsDiscoveredEventSchema);
 var decodeAgentSettingsDiscoveryFailedEvent = (encoded) => decode3(encoded, agentSettingsDiscoveryFailedEventSchema);
 var encodeAgentSettingsDiscoveryFailedEvent = (message) => encode3(message, agentSettingsDiscoveryFailedEventSchema);
-var decodeAgentCatalogRefreshCommand = (encoded) => decode3(encoded, agentCatalogRefreshCommandSchema);
-var encodeAgentCatalogRefreshCommand = (message) => encode3(message, agentCatalogRefreshCommandSchema);
-var decodeAgentCatalogRefreshedEvent = (encoded) => decode3(encoded, agentCatalogRefreshedEventSchema);
-var encodeAgentCatalogRefreshedEvent = (message) => encode3(message, agentCatalogRefreshedEventSchema);
-var decodeAgentCatalogRefreshFailedEvent = (encoded) => decode3(encoded, agentCatalogRefreshFailedEventSchema);
-var encodeAgentCatalogRefreshFailedEvent = (message) => encode3(message, agentCatalogRefreshFailedEventSchema);
 var decodeFileReadCommand = (encoded) => decode3(encoded, fileReadCommandSchema);
 var encodeFileReadCommand = (message) => encode3(message, fileReadCommandSchema);
 var decodeFileBeginEvent = (encoded) => decode3(encoded, fileBeginEventSchema);
@@ -20471,6 +20448,8 @@ var SESSION_CANCEL_KIND = "session.cancel";
 var RUNTIME_LIVENESS_READY_KIND = "runtime.liveness.ready";
 var RUNTIME_HEARTBEAT_KIND = "runtime.heartbeat";
 var RUNTIME_HEARTBEAT_ACK_KIND = "runtime.heartbeat.ack";
+var RUNTIME_PING_KIND = "runtime.ping";
+var RUNTIME_PONG_KIND = "runtime.pong";
 var SESSION_STARTED_KIND = "session.started";
 var SESSION_QUEUED_KIND = "session.queued";
 var AGENT_MESSAGE_DELTA_KIND = "agent.message.delta";
@@ -20783,6 +20762,16 @@ function decodeRuntimeHeartbeatAckEvent(encoded) {
     kind: RUNTIME_HEARTBEAT_ACK_KIND
   };
 }
+function decodeRuntimePingCommand(encoded) {
+  const value = parseJson2(encoded);
+  assertKind(value, RUNTIME_PING_KIND);
+  return { kind: RUNTIME_PING_KIND, requestId: readIdentifier(value, "requestId") };
+}
+function decodeRuntimePongEvent(encoded) {
+  const value = parseJson2(encoded);
+  assertKind(value, RUNTIME_PONG_KIND);
+  return { kind: RUNTIME_PONG_KIND, requestId: readIdentifier(value, "requestId") };
+}
 function decodeSessionStartedEvent(encoded) {
   const value = parseJson2(encoded);
   assertKind(value, SESSION_STARTED_KIND);
@@ -20880,6 +20869,12 @@ function encodeRuntimeHeartbeatEvent(message) {
 function encodeRuntimeHeartbeatAckEvent(message) {
   return JSON.stringify(decodeRuntimeHeartbeatAckEvent(JSON.stringify(message)));
 }
+function encodeRuntimePingCommand(message) {
+  return JSON.stringify(decodeRuntimePingCommand(JSON.stringify(message)));
+}
+function encodeRuntimePongEvent(message) {
+  return JSON.stringify(decodeRuntimePongEvent(JSON.stringify(message)));
+}
 function decodeAgentActivityNarrationEvent(encoded) {
   const value = parseJson2(encoded);
   assertKind(value, AGENT_ACTIVITY_NARRATION_KIND);
@@ -20993,10 +20988,6 @@ function withinHistoryContentLimits(history) {
   ) <= SESSION_HISTORY_IMAGE_CHARACTER_LIMIT;
 }
 var sessionHistorySchema = external_exports.discriminatedUnion("status", [availableSessionHistorySchema, unavailableSessionHistorySchema]).refine(withinHistoryContentLimits);
-var nativeMessagePageSchema = external_exports.discriminatedUnion("status", [
-  availableSessionHistoryObjectSchema.extend({ nextCursor: external_exports.string().max(512).nullable() }).readonly(),
-  unavailableSessionHistoryObjectSchema.extend({ nextCursor: external_exports.null() }).readonly()
-]).refine(withinHistoryContentLimits);
 
 // ../protocol/src/native-sessions.ts
 var NATIVE_SESSION_REQUEST_KIND = "native.session.request";
@@ -21062,10 +21053,7 @@ var identity = {
   directoryId
 };
 var nativeSessionRequestSchema = external_exports.discriminatedUnion("action", [
-  external_exports.object({ ...identity, action: external_exports.literal("create") }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("active-turn"), targetSessionId: identifierStringSchema }).readonly(),
-  external_exports.object({ ...identity, action: external_exports.literal("preview"), entryId: identifierStringSchema }).readonly(),
-  external_exports.object({ ...identity, action: external_exports.literal("history"), entryId: identifierStringSchema }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("find"), nativeSessionId: identifierStringSchema }).readonly(),
   external_exports.object({
     ...identity,
@@ -21091,10 +21079,7 @@ var nativeSessionRequestSchema = external_exports.discriminatedUnion("action", [
   }).readonly()
 ]);
 var nativeSessionCommandSchema = external_exports.discriminatedUnion("action", [
-  external_exports.object({ ...identity, action: external_exports.literal("create") }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("active-turn"), targetSessionId: identifierStringSchema }).readonly(),
-  external_exports.object({ ...identity, action: external_exports.literal("preview"), entryId: identifierStringSchema }).readonly(),
-  external_exports.object({ ...identity, action: external_exports.literal("history"), entryId: identifierStringSchema }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("find"), nativeSessionId: identifierStringSchema }).readonly(),
   external_exports.object({
     ...identity,
@@ -21134,7 +21119,6 @@ var resultEnvelope = {
   kind: external_exports.literal(NATIVE_SESSION_RESULT_KIND)
 };
 var nativeSessionResultSchema = external_exports.discriminatedUnion("action", [
-  external_exports.object({ ...resultEnvelope, action: external_exports.literal("create"), nativeSessionId: identifierStringSchema }).readonly(),
   external_exports.object({
     ...resultEnvelope,
     action: external_exports.literal("active-turn"),
@@ -21167,22 +21151,6 @@ var nativeSessionResultSchema = external_exports.discriminatedUnion("action", [
     ready: sessionReadyEventSchema,
     title: external_exports.string().max(500)
   }).readonly(),
-  external_exports.object({
-    ...resultEnvelope,
-    action: external_exports.literal("preview"),
-    entryId: identifierStringSchema,
-    targetSessionId: identifierStringSchema,
-    reason: external_exports.enum(["continuation_unavailable", "requested"]),
-    history: sessionHistorySchema,
-    title: external_exports.string().max(500)
-  }).readonly(),
-  external_exports.object({
-    ...resultEnvelope,
-    action: external_exports.literal("history"),
-    entryId: identifierStringSchema,
-    history: sessionHistorySchema,
-    title: external_exports.string().max(500)
-  }).readonly(),
   external_exports.object({
     ...resultEnvelope,
     action: external_exports.literal("delete"),
@@ -21753,28 +21721,9 @@ function decodeRecordedSessionEvent(encoded) {
 var encodeRecordedSessionEvent = (event) => JSON.stringify(decodeRecordedSessionEvent(JSON.stringify(event)));
 
 // ../protocol/src/session-live-history.ts
-var SESSION_LIVE_HISTORY_PAGE_LOAD_KIND = "session.live-history.page.load";
-var SESSION_LIVE_HISTORY_PAGE_LOADED_KIND = "session.live-history.page.loaded";
 var SESSION_LIVE_HISTORY_V2_PAGE_LOAD_KIND = "session.live-history.v2.page.load";
 var SESSION_LIVE_HISTORY_V2_PAGE_LOADED_KIND = "session.live-history.v2.page.loaded";
 var directoryIdentifier = external_exports.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9_-]{0,2047}$/);
-var sessionLiveHistoryPageLoadSchema = external_exports.object({
-  additionalDirectoryIds: external_exports.array(directoryIdentifier).max(16).readonly(),
-  agentId: identifierStringSchema,
-  bindingId: identifierStringSchema,
-  cursor: external_exports.string().min(1).max(512).nullable(),
-  directoryId: directoryIdentifier,
-  kind: external_exports.literal(SESSION_LIVE_HISTORY_PAGE_LOAD_KIND),
-  limit: external_exports.number().int().min(1).max(100),
-  requestId: identifierStringSchema,
-  sessionId: identifierStringSchema
-}).readonly();
-var sessionLiveHistoryPageLoadedSchema = external_exports.object({
-  kind: external_exports.literal(SESSION_LIVE_HISTORY_PAGE_LOADED_KIND),
-  page: nativeMessagePageSchema,
-  requestId: identifierStringSchema,
-  sessionId: identifierStringSchema
-}).readonly();
 var sessionLiveHistoryV2PageLoadSchema = external_exports.object({
   additionalDirectoryIds: external_exports.array(directoryIdentifier).max(16).readonly(),
   agentId: identifierStringSchema,
@@ -21800,10 +21749,6 @@ function decode7(schema, encoded) {
     throw new ProtocolMessageError("Invalid live Session history message", { cause });
   }
 }
-var decodeSessionLiveHistoryPageLoad = (encoded) => decode7(sessionLiveHistoryPageLoadSchema, encoded);
-var decodeSessionLiveHistoryPageLoaded = (encoded) => decode7(sessionLiveHistoryPageLoadedSchema, encoded);
-var encodeSessionLiveHistoryPageLoad = (value) => JSON.stringify(sessionLiveHistoryPageLoadSchema.parse(value));
-var encodeSessionLiveHistoryPageLoaded = (value) => JSON.stringify(sessionLiveHistoryPageLoadedSchema.parse(value));
 var decodeSessionLiveHistoryV2PageLoad = (encoded) => decode7(sessionLiveHistoryV2PageLoadSchema, encoded);
 var decodeSessionLiveHistoryV2PageLoaded = (encoded) => decode7(sessionLiveHistoryV2PageLoadedSchema, encoded);
 var encodeSessionLiveHistoryV2PageLoad = (value) => JSON.stringify(sessionLiveHistoryV2PageLoadSchema.parse(value));
@@ -21820,11 +21765,6 @@ function defineMessageSignature(kind, encoder, decoder) {
   };
 }
 var serviceToDaemonSignatures = {
-  [AGENT_CATALOG_REFRESH_KIND]: defineMessageSignature(
-    AGENT_CATALOG_REFRESH_KIND,
-    encodeAgentCatalogRefreshCommand,
-    decodeAgentCatalogRefreshCommand
-  ),
   [AGENT_INSTALL_CANCEL_KIND]: defineMessageSignature(
     AGENT_INSTALL_CANCEL_KIND,
     encodeAgentInstallCancelCommand,
@@ -21867,6 +21807,7 @@ var serviceToDaemonSignatures = {
     encodeRuntimeLivenessReadyEvent,
     decodeRuntimeLivenessReadyEvent
   ),
+  [RUNTIME_PING_KIND]: defineMessageSignature(RUNTIME_PING_KIND, encodeRuntimePingCommand, decodeRuntimePingCommand),
   [SESSION_CANCEL_KIND]: defineMessageSignature(
     SESSION_CANCEL_KIND,
     encodeSessionCancelCommand,
@@ -21882,11 +21823,6 @@ var serviceToDaemonSignatures = {
     encodeSessionElicitationRespondCommand,
     decodeSessionElicitationRespondCommand
   ),
-  [SESSION_LIVE_HISTORY_PAGE_LOAD_KIND]: defineMessageSignature(
-    SESSION_LIVE_HISTORY_PAGE_LOAD_KIND,
-    encodeSessionLiveHistoryPageLoad,
-    decodeSessionLiveHistoryPageLoad
-  ),
   [SESSION_LIVE_HISTORY_V2_PAGE_LOAD_KIND]: defineMessageSignature(
     SESSION_LIVE_HISTORY_V2_PAGE_LOAD_KIND,
     encodeSessionLiveHistoryV2PageLoad,
@@ -21928,16 +21864,6 @@ function decodeServiceToDaemonMessage(encoded) {
   return signature.decoder(encoded);
 }
 var daemonToServiceSignatures = {
-  [AGENT_CATALOG_REFRESHED_KIND]: defineMessageSignature(
-    AGENT_CATALOG_REFRESHED_KIND,
-    encodeAgentCatalogRefreshedEvent,
-    decodeAgentCatalogRefreshedEvent
-  ),
-  [AGENT_CATALOG_REFRESH_FAILED_KIND]: defineMessageSignature(
-    AGENT_CATALOG_REFRESH_FAILED_KIND,
-    encodeAgentCatalogRefreshFailedEvent,
-    decodeAgentCatalogRefreshFailedEvent
-  ),
   [AGENT_INSTALL_CANCELLED_KIND]: defineMessageSignature(
     AGENT_INSTALL_CANCELLED_KIND,
     encodeAgentInstallCancelledEvent,
@@ -22007,6 +21933,7 @@ var daemonToServiceSignatures = {
     encodeRuntimeHeartbeatEvent,
     decodeRuntimeHeartbeatEvent
   ),
+  [RUNTIME_PONG_KIND]: defineMessageSignature(RUNTIME_PONG_KIND, encodeRuntimePongEvent, decodeRuntimePongEvent),
   [SESSION_EVENT_KIND]: defineMessageSignature(
     SESSION_EVENT_KIND,
     encodeSessionEventEnvelope,
@@ -22022,11 +21949,6 @@ var daemonToServiceSignatures = {
     encodeSessionOperationFailedEvent,
     decodeSessionOperationFailedEvent
   ),
-  [SESSION_LIVE_HISTORY_PAGE_LOADED_KIND]: defineMessageSignature(
-    SESSION_LIVE_HISTORY_PAGE_LOADED_KIND,
-    encodeSessionLiveHistoryPageLoaded,
-    decodeSessionLiveHistoryPageLoaded
-  ),
   [SESSION_LIVE_HISTORY_V2_PAGE_LOADED_KIND]: defineMessageSignature(
     SESSION_LIVE_HISTORY_V2_PAGE_LOADED_KIND,
     encodeSessionLiveHistoryV2PageLoaded,
@@ -32125,9 +32047,6 @@ var LocalExternalContentStore = class {
 };
 
 // src/native-sessions/chat-agent.ts
-function supportsNativeChat(agentId) {
-  return agentId === "codex" || agentId === "claude" || agentId === "opencode" || agentId === "pi";
-}
 function isNativeChatSessionId(agentId, sessionId) {
   if (!nativeSessionIdSchema.safeParse(sessionId).success) {
     return false;
@@ -40473,7 +40392,6 @@ async function readCodexHistoryWithOptions(agent, cwd, nativeSessionId, signal,
     child2.removeListener("exit", onExit);
   }
 }
-var readCodexHistory = async (agent, cwd, nativeSessionId, signal) => await readCodexHistoryWithOptions(agent, cwd, nativeSessionId, signal, { detail: "messages" });
 var readCodexFullHistory = async (agent, cwd, nativeSessionId, signal, nativeTurn) => await readCodexHistoryWithOptions(agent, cwd, nativeSessionId, signal, {
   detail: "rich",
   ...nativeTurn === void 0 ? {} : { nativeTurn }
@@ -40482,84 +40400,6 @@ var readCodexFullHistory = async (agent, cwd, nativeSessionId, signal, nativeTur
 // src/native-sessions/service.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { basename as basename5 } from "node:path";
-
-// src/native-sessions/acp-history.ts
-async function readAcpHistory(sessions, directories, bindingId, options, nativeSessionId) {
-  let cursor = null;
-  let inspected = 0;
-  for (let pageNumber = 0; pageNumber < 500 && inspected < 500; pageNumber += 1) {
-    const page = await sessions.listNativeSessions(options, cursor);
-    inspected += page.sessions.length;
-    const found = page.sessions.find((entry) => entry.sessionId === nativeSessionId);
-    if (found !== void 0) {
-      const primary = await directories.identify(bindingId, found.cwd, options.signal);
-      const additional = await Promise.all(
-        found.additionalDirectories.map(
-          async (directory) => await directories.identify(bindingId, directory, options.signal)
-        )
-      );
-      if (primary.path !== options.cwd || additional.length !== options.additionalDirectories.length || additional.some((directory, index) => directory.path !== options.additionalDirectories[index])) {
-        throw new AcpExecutionError(
-          "The native Session belongs to another workspace.",
-          {},
-          "session_identity_mismatch"
-        );
-      }
-      return await sessions.previewNativeSession(options, nativeSessionId);
-    }
-    if (page.nextCursor === null || page.nextCursor === cursor) {
-      break;
-    }
-    cursor = page.nextCursor ?? null;
-  }
-  throw new AcpExecutionError("The native Session was not found.", {}, "native_session_not_found");
-}
-
-// src/native-sessions/acp-adapter.ts
-var acpSessionAdapter = {
-  history: async ({ sessions, directories, bindingId, options, nativeSessionId }) => await readAcpHistory(sessions, directories, bindingId, options, nativeSessionId),
-  preview: async ({ sessions, options, nativeSessionId }) => await sessions.previewNativeSession(options, nativeSessionId)
-};
-
-// src/native-sessions/codex-adapter.ts
-async function verifiedHistory(context, full) {
-  const { options, nativeSessionId, directories, bindingId } = context;
-  const snapshot = full ? await readCodexFullHistory(options.agent, options.cwd, nativeSessionId, options.signal) : await readCodexHistory(options.agent, options.cwd, nativeSessionId, options.signal);
-  const resolved = await directories.identify(bindingId, snapshot.cwd, options.signal);
-  if (snapshot.nativeSessionId !== nativeSessionId || resolved.path !== options.cwd) {
-    throw new AcpExecutionError(
-      "Codex returned history for a different session or workspace.",
-      {},
-      "invalid_native_session_response"
-    );
-  }
-  return snapshot.history;
-}
-var codexSessionAdapter = {
-  history: async (context) => await verifiedHistory(context, true),
-  // Codex enforces an exclusive writer per thread. Its read-only app-server
-  // history path keeps externally owned conversations previewable.
-  preview: async (context) => await verifiedHistory(context, false)
-};
-
-// src/native-sessions/agent-adapter.ts
-var genericSessionAdapter = {
-  history: async () => {
-    throw new AcpExecutionError("Native history is unavailable for this Agent", {}, "native_session_unsupported");
-  },
-  preview: async ({ sessions, options, nativeSessionId }) => await sessions.previewNativeSession(options, nativeSessionId)
-};
-function nativeSessionAdapter(agentId) {
-  if (agentId === "codex") {
-    return codexSessionAdapter;
-  }
-  if (agentId === "claude" || agentId === "opencode" || agentId === "pi") {
-    return acpSessionAdapter;
-  }
-  return genericSessionAdapter;
-}
-
-// src/native-sessions/service.ts
 var NativeSessionService = class {
   #entries = /* @__PURE__ */ new Map();
   #cursors = /* @__PURE__ */ new Map();
@@ -40603,25 +40443,6 @@ var NativeSessionService = class {
         ...await this.#activeTurn(command, options)
       };
     }
-    if (command.action === "create") {
-      if (!supportsNativeChat(options.agent.id)) {
-        throw new AcpExecutionError(
-          "Native session creation is unavailable for this Agent",
-          {},
-          "native_session_unsupported"
-        );
-      }
-      const nativeSessionId = await this.#sessions.createNativeSession(options);
-      signal.throwIfAborted();
-      this.record(command, "native_session_created");
-      return {
-        action: "create",
-        kind: "native.session.result",
-        nativeSessionId: decodeIdentifier(nativeSessionId),
-        requestId: command.requestId,
-        sessionId: command.sessionId
-      };
-    }
     if (command.action === "fork-recorded") {
       const source = this.#sessions.findSessions([command.sessionId])[0];
       if (source === void 0 || !source.prompted) {
@@ -40814,44 +40635,6 @@ var NativeSessionService = class {
       );
     }
     const target = await this.resolveTarget(command, options, selected);
-    if (command.action === "history") {
-      const history = await nativeSessionAdapter(options.agent.id).history({
-        sessions: this.#sessions,
-        directories: this.#directories,
-        bindingId: command.bindingId,
-        options: { ...options, cwd: target.cwd, additionalDirectories: target.additionalDirectories },
-        nativeSessionId: target.info.sessionId
-      });
-      signal.throwIfAborted();
-      this.record(command, "native_session_history_read");
-      return {
-        ...envelope2,
-        action: "history",
-        entryId: command.entryId,
-        history,
-        title: target.info.title ?? "Untitled session"
-      };
-    }
-    if (command.action === "preview") {
-      const history = await nativeSessionAdapter(options.agent.id).preview({
-        sessions: this.#sessions,
-        directories: this.#directories,
-        bindingId: command.bindingId,
-        options: { ...options, cwd: target.cwd, additionalDirectories: target.additionalDirectories },
-        nativeSessionId: target.info.sessionId
-      });
-      signal.throwIfAborted();
-      this.record(command, "native_session_previewed");
-      return {
-        ...envelope2,
-        action: "preview",
-        entryId: command.entryId,
-        targetSessionId: command.sessionId,
-        reason: "requested",
-        title: target.info.title ?? "Untitled session",
-        history
-      };
-    }
     if (command.action === "delete") {
       if (!prepared.capabilities.deleteSession) {
         throw new AcpExecutionError(
@@ -41255,135 +41038,13 @@ var RelayConnectionDiagnostics = class {
 };
 
 // src/relay-connection/run-relay-connection.ts
-import { WebSocket as WebSocket8 } from "undici";
+import { WebSocket as WebSocket7 } from "undici";
 
 // src/daemon-command-handler.ts
-import { WebSocket as WebSocket6 } from "undici";
-
-// src/agent-catalog/handle-agent-catalog-refresh.ts
-import { WebSocket as WebSocket3 } from "undici";
-async function retainStillInstalledAgents(previous, refreshed, signal) {
-  const refreshedIdentifiers = new Set(refreshed.map((agent) => agent.id));
-  const retained = [];
-  for (const agent of previous) {
-    if (refreshedIdentifiers.has(agent.id)) {
-      continue;
-    }
-    signal.throwIfAborted();
-    if (await revalidateExecutable(agent.agentIdentity)) {
-      retained.push(agent);
-    }
-  }
-  return Object.freeze([...refreshed, ...retained]);
-}
-async function refreshAgentCatalog(config2, resolveEnvironment, signal) {
-  signal.throwIfAborted();
-  const shellEnvironment = await resolveEnvironment(signal);
-  const environment = new DaemonLocalContext(config2.localContext.stateDirectory, shellEnvironment).environment;
-  signal.throwIfAborted();
-  const inventory = await discoverLocalAgentInventory({
-    defaultWorkspace: config2.defaultWorkspace,
-    environment,
-    signal
-  });
-  const previousCatalog = config2.catalog.read();
-  const refreshedAgents = inventory.readyAgents().map((agent) => withDaemonEnvironment(agent, environment));
-  const agents = await retainStillInstalledAgents(previousCatalog.agents, refreshedAgents, signal);
-  const verifiedIdentifiers = new Set(agents.map((agent) => agent.id));
-  config2.catalog.transition(
-    agents,
-    inventory.installable.filter((agent) => !verifiedIdentifiers.has(agent.id))
-  );
-  try {
-    await publishAgentCatalog(config2, signal);
-  } catch (error62) {
-    config2.catalog.transition(previousCatalog.agents, previousCatalog.installableAgents);
-    throw error62;
-  }
-}
-function createAgentCatalogRefreshHandler(dependencies) {
-  const { config: config2, audit, diagnostics, socket, signal, timer, resolveEnvironment } = dependencies;
-  const agentCatalogRefreshes = /* @__PURE__ */ new Map();
-  const handle = (command) => {
-    if (agentCatalogRefreshes.has(command.requestId) || agentCatalogRefreshes.size > 0) {
-      if (socket.readyState === WebSocket3.OPEN) {
-        send(socket, {
-          code: "agent_catalog_refresh_busy",
-          kind: AGENT_CATALOG_REFRESH_FAILED_KIND,
-          message: "Another local Agent catalog refresh is already running",
-          requestId: command.requestId
-        });
-      }
-      return;
-    }
-    const controller = new AbortController();
-    const operationSignal = AbortSignal.any([signal, controller.signal]);
-    const timeout = timer.schedule(
-      () => controller.abort(
-        new AcpExecutionError(
-          "The local Agent catalog refresh timed out",
-          {},
-          "agent_catalog_refresh_timeout"
-        )
-      ),
-      9e4
-    );
-    const completion = (async () => {
-      try {
-        await refreshAgentCatalog(config2, resolveEnvironment, operationSignal);
-        audit.record({
-          commandId: command.requestId,
-          event: "agent_catalog_refreshed",
-          sessionId: "agent-catalog"
-        });
-        if (socket.readyState === WebSocket3.OPEN) {
-          send(socket, {
-            kind: AGENT_CATALOG_REFRESHED_KIND,
-            requestId: command.requestId
-          });
-        }
-      } catch (error62) {
-        const failure2 = operationSignal.aborted ? controller.signal.reason ?? new AcpExecutionError(
-          "The local Agent catalog refresh was cancelled",
-          {},
-          "agent_catalog_refresh_cancelled"
-        ) : error62;
-        audit.record({
-          commandId: command.requestId,
-          details: { code: operationErrorCode(failure2) },
-          event: "agent_catalog_refresh_failed",
-          sessionId: "agent-catalog"
-        });
-        diagnostics.daemonDiagnostic(
-          "agent_catalog_refresh_failed",
-          command.requestId,
-          { code: operationErrorCode(failure2) },
-          failure2
-        );
-        if (socket.readyState === WebSocket3.OPEN) {
-          send(socket, {
-            code: operationErrorCode(failure2),
-            kind: AGENT_CATALOG_REFRESH_FAILED_KIND,
-            message: operationErrorMessage(failure2),
-            requestId: command.requestId
-          });
-        }
-      } finally {
-        timeout.cancel();
-        agentCatalogRefreshes.delete(command.requestId);
-      }
-    })();
-    agentCatalogRefreshes.set(command.requestId, { completion, controller });
-    return;
-  };
-  const settle2 = async () => {
-    await Promise.all([...agentCatalogRefreshes.values()].map((request) => request.completion));
-  };
-  return { handle, settle: settle2 };
-}
+import { WebSocket as WebSocket5 } from "undici";
 
 // src/agent-catalog/handle-agent-settings-discovery.ts
-import { WebSocket as WebSocket4 } from "undici";
+import { WebSocket as WebSocket3 } from "undici";
 
 // src/agent-catalog/discover-agent-settings.ts
 import { createHash as createHash6 } from "node:crypto";
@@ -41871,7 +41532,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
       (request) => request.agentId === command.agentId && !request.controller.signal.aborted
     );
     if ([...agentSettingsDiscoveries.values()].some((request) => request.requestIds.has(command.requestId))) {
-      if (socket.readyState === WebSocket4.OPEN) {
+      if (socket.readyState === WebSocket3.OPEN) {
         send(socket, {
           code: "agent_settings_discovery_busy",
           kind: AGENT_SETTINGS_DISCOVERY_FAILED_KIND,
@@ -41886,7 +41547,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
       return;
     }
     if (existing !== void 0) {
-      if (socket.readyState === WebSocket4.OPEN) {
+      if (socket.readyState === WebSocket3.OPEN) {
         send(socket, {
           code: "agent_settings_discovery_busy",
           kind: AGENT_SETTINGS_DISCOVERY_FAILED_KIND,
@@ -41897,7 +41558,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
       return;
     }
     if (agentSettingsDiscoveries.size >= 4) {
-      if (socket.readyState === WebSocket4.OPEN) {
+      if (socket.readyState === WebSocket3.OPEN) {
         send(socket, {
           code: "agent_settings_discovery_busy",
           kind: AGENT_SETTINGS_DISCOVERY_FAILED_KIND,
@@ -41943,7 +41604,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
             event: "agent_settings_discovered",
             sessionId: `agent-settings:${command.agentId}`
           });
-          if (socket.readyState === WebSocket4.OPEN) {
+          if (socket.readyState === WebSocket3.OPEN) {
             send(socket, { ...result.event, requestId });
           }
         }
@@ -41969,7 +41630,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
 `
           );
         }
-        if (socket.readyState === WebSocket4.OPEN) {
+        if (socket.readyState === WebSocket3.OPEN) {
           for (const requestId of requestIds) {
             send(socket, {
               code: operationErrorCode(failure2),
@@ -42115,300 +41776,7 @@ async function resolveSessionDirectories(directories, bindingId, directoryId2, a
   return new ResolvedSessionDirectories(cwd, additionalDirectories, additionalDirectoryEntries);
 }
 
-// src/native-sessions/live-history-page.ts
-function encodeLiveHistoryCursor(cursor) {
-  return Buffer.from(JSON.stringify(cursor), "utf8").toString("base64url");
-}
-function decodeLiveHistoryCursor(cursor, sessionId) {
-  try {
-    if (!/^[A-Za-z0-9_-]{1,512}$/u.test(cursor)) {
-      throw new Error("Invalid cursor alphabet");
-    }
-    const value = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
-    if (typeof value !== "object" || value === null || Array.isArray(value)) {
-      throw new Error("Invalid cursor shape");
-    }
-    const record2 = Object.fromEntries(Object.entries(value));
-    const keys = Object.keys(record2).sort().join(",");
-    const legacyNative = keys === "endIndex,sessionId";
-    const kind = legacyNative ? "native" : record2["kind"];
-    if (keys !== "endIndex,kind,sessionId" && keys !== "endIndex,epoch,kind,sessionId" && !legacyNative || record2["sessionId"] !== sessionId || kind !== "active" && kind !== "native" || typeof record2["endIndex"] !== "number" || !Number.isSafeInteger(record2["endIndex"]) || record2["endIndex"] < 0) {
-      throw new Error("Invalid cursor target");
-    }
-    if (kind === "active") {
-      if (keys !== "endIndex,epoch,kind,sessionId" || typeof record2["epoch"] !== "string") {
-        throw new Error("Invalid active cursor target");
-      }
-      return { endIndex: record2["endIndex"], epoch: record2["epoch"], kind, sessionId };
-    }
-    if (keys !== "endIndex,kind,sessionId" && !legacyNative) {
-      throw new Error("Invalid native cursor target");
-    }
-    return { endIndex: record2["endIndex"], kind, sessionId };
-  } catch (cause) {
-    throw new AcpExecutionError("The native Session history cursor is invalid", { cause }, "invalid_cursor");
-  }
-}
-function activeHistoryCursor(sessionId, epoch, endIndex) {
-  return encodeLiveHistoryCursor({ endIndex, epoch, kind: "active", sessionId });
-}
-function nativeHistoryCursor(sessionId, endIndex) {
-  return encodeLiveHistoryCursor({ endIndex, kind: "native", sessionId });
-}
-function liveHistoryCoveredTurnRanges(history) {
-  const ranges = [];
-  let historyIndex = history.messages.length;
-  for (const commandId of history.coveredCommandIds) {
-    let assistantStartIndex = historyIndex;
-    while (assistantStartIndex > 0 && history.messages[assistantStartIndex - 1]?.role === "assistant") {
-      assistantStartIndex -= 1;
-    }
-    const userIndex = assistantStartIndex - 1;
-    if (assistantStartIndex === historyIndex || history.messages[userIndex]?.role !== "user") {
-      break;
-    }
-    ranges.push({ assistantEndIndex: historyIndex, assistantStartIndex, commandId, userIndex });
-    historyIndex = userIndex;
-  }
-  return ranges;
-}
-function historyMessageCharacters(message) {
-  return message.text.length + (message.role === "assistant" ? JSON.stringify(message.activities).length + JSON.stringify(message.content).length : 0);
-}
-function isNativeHistoryImageMimeType(mimeType) {
-  return mimeType === "image/png" || mimeType === "image/jpeg" || mimeType === "image/gif" || mimeType === "image/webp";
-}
-function selectMessagesBefore(messages, endIndex, messageLimit, characterLimit) {
-  const selected = [];
-  let remainingCharacters = characterLimit;
-  let startIndex = endIndex;
-  for (let index = endIndex - 1; index >= 0 && selected.length < messageLimit; index -= 1) {
-    const message = messages[index];
-    if (message === void 0) {
-      break;
-    }
-    const characters = historyMessageCharacters(message);
-    if (characters > remainingCharacters) {
-      break;
-    }
-    selected.unshift(message);
-    remainingCharacters -= characters;
-    startIndex = index;
-  }
-  if (selected.length === 0 && endIndex > 0) {
-    throw new AcpExecutionError(
-      "A native Session history item exceeds the page budget",
-      {},
-      "history_item_too_large"
-    );
-  }
-  return { characters: characterLimit - remainingCharacters, messages: selected, startIndex };
-}
-function nativeActiveMessage(message) {
-  if (message.role === "assistant") {
-    return {
-      activities: message.activities,
-      content: message.content,
-      role: "assistant",
-      text: message.text
-    };
-  }
-  const images = (message.images ?? []).flatMap((image) => {
-    if (image.data.length < 4 || image.data.length % 4 !== 0 || !/^[A-Za-z0-9+/]*={0,2}$/u.test(image.data) || !isNativeHistoryImageMimeType(image.mimeType)) {
-      return [];
-    }
-    return [{ data: image.data, mimeType: image.mimeType, name: image.name }];
-  });
-  return { ...images.length === 0 ? {} : { images }, role: "user", text: message.text };
-}
-function nativeHistoryCoversCompletedRecovery(history, recovery) {
-  const root = recovery.messages.find((message) => message.role === "user" && message.id === recovery.commandId);
-  if (root === void 0) {
-    return false;
-  }
-  const rootIndex = history.messages.findLastIndex(
-    (message) => message.role === "user" && message.text === root.text
-  );
-  if (rootIndex < 0) {
-    return false;
-  }
-  const nativeAssistant = history.messages.slice(rootIndex + 1).filter((message) => message.role === "assistant");
-  if (nativeAssistant.length === 0) {
-    return false;
-  }
-  const recoveryAssistant = recovery.messages.filter((message) => message.role === "assistant");
-  const recoveryText = recoveryAssistant.map((message) => message.text).join("");
-  const nativeText = nativeAssistant.map((message) => message.text).join("");
-  if (recoveryText.length > 0 && !nativeText.includes(recoveryText)) {
-    return false;
-  }
-  const nativeContent = new Set(
-    nativeAssistant.flatMap((message) => message.content).map((content) => JSON.stringify(content))
-  );
-  return recoveryAssistant.flatMap((message) => message.content).every((content) => nativeContent.has(JSON.stringify(content)));
-}
-function historyBeforeActiveTurn(history, activeTurn) {
-  if (history.status === "unavailable") {
-    return history;
-  }
-  const activeRoot = activeTurn.messages.find(
-    (message) => message.role === "user" && message.id === activeTurn.commandId
-  );
-  const matchingActiveUserIndex = activeRoot === void 0 ? -1 : activeTurn.state === "completed" || history.messages.at(-1)?.role === "user" && history.messages.at(-1)?.text === activeRoot.text || history.coveredCommandIds.includes(activeTurn.commandId) ? history.messages.findLastIndex((message) => message.role === "user" && message.text === activeRoot.text) : -1;
-  const activeUserIndex = matchingActiveUserIndex >= 0 ? matchingActiveUserIndex : liveHistoryCoveredTurnRanges(history).find((range) => range.commandId === activeTurn.commandId)?.userIndex ?? -1;
-  if (activeUserIndex < 0) {
-    return history;
-  }
-  return {
-    ...history,
-    coveredCommandIds: history.coveredCommandIds.filter((id) => id !== activeTurn.commandId),
-    coveredMessageIds: history.coveredMessageIds.filter(
-      (id) => id !== `${activeTurn.commandId}:user` && id !== `${activeTurn.commandId}:agent`
-    ),
-    messages: history.messages.slice(0, activeUserIndex)
-  };
-}
-function paginateAvailableNativeHistory(history, sessionId, endIndex, limit, characterLimit) {
-  if (endIndex > history.messages.length) {
-    throw new AcpExecutionError("The native Session history cursor is invalid", {}, "invalid_cursor");
-  }
-  const selected = selectMessagesBefore(history.messages, endIndex, limit, characterLimit);
-  const coveredMessageIds = new Set(history.coveredMessageIds);
-  const ranges = liveHistoryCoveredTurnRanges(history);
-  return {
-    coveredCommandIds: ranges.filter((range) => range.userIndex >= selected.startIndex && range.assistantEndIndex <= endIndex).map((range) => range.commandId),
-    coveredMessageIds: ranges.flatMap((range) => [
-      ...range.userIndex >= selected.startIndex && range.userIndex < endIndex && coveredMessageIds.has(`${range.commandId}:user`) ? [`${range.commandId}:user`] : [],
-      ...range.assistantStartIndex >= selected.startIndex && range.assistantEndIndex <= endIndex && coveredMessageIds.has(`${range.commandId}:agent`) ? [`${range.commandId}:agent`] : []
-    ]),
-    messages: selected.messages,
-    nextCursor: selected.startIndex > 0 ? nativeHistoryCursor(sessionId, selected.startIndex) : null,
-    status: "available",
-    truncated: history.truncated
-  };
-}
-function paginateNativeHistory(history, sessionId, cursor, limit) {
-  if (cursor?.kind === "active") {
-    throw new AcpExecutionError("The native Session history cursor is invalid", {}, "invalid_cursor");
-  }
-  if (history.status === "unavailable") {
-    if (cursor !== null) {
-      throw new AcpExecutionError("Unavailable native Session history has no cursor", {}, "invalid_cursor");
-    }
-    return { cause: history.cause, nextCursor: null, status: "unavailable" };
-  }
-  return paginateAvailableNativeHistory(
-    history,
-    sessionId,
-    cursor?.endIndex ?? history.messages.length,
-    limit,
-    SESSION_HISTORY_CHARACTER_LIMIT
-  );
-}
-function paginateActiveTurn(history, activeTurn, sessionId, endIndex, limit) {
-  if (endIndex > activeTurn.messages.length) {
-    throw new AcpExecutionError("The native Session history cursor is invalid", {}, "invalid_cursor");
-  }
-  const activeMessages = activeTurn.messages.map(nativeActiveMessage);
-  const active = selectMessagesBefore(activeMessages, endIndex, limit, SESSION_HISTORY_CHARACTER_LIMIT);
-  const historicalLimit = limit - active.messages.length;
-  const historicalCharacterLimit = SESSION_HISTORY_CHARACTER_LIMIT - active.characters;
-  const pendingHistoricalCursor = history.status === "available" && history.messages.length > 0 ? nativeHistoryCursor(sessionId, history.messages.length) : null;
-  const latestHistoricalMessage = history.status === "available" ? history.messages.at(-1) : void 0;
-  const historicalPageFits = latestHistoricalMessage === void 0 || historyMessageCharacters(latestHistoricalMessage) <= historicalCharacterLimit;
-  const historical = active.startIndex === 0 && history.status === "available" && historicalLimit > 0 && historicalPageFits ? paginateAvailableNativeHistory(
-    history,
-    sessionId,
-    history.messages.length,
-    historicalLimit,
-    historicalCharacterLimit
-  ) : null;
-  return {
-    streamPosition: { commandId: activeTurn.commandId, epoch: activeTurn.epoch, sequence: activeTurn.sequence },
-    coveredCommandIds: historical?.coveredCommandIds ?? [],
-    coveredMessageIds: [
-      ...historical?.coveredMessageIds ?? [],
-      ...active.startIndex === 0 ? [`${activeTurn.commandId}:user`, `${activeTurn.commandId}:agent`] : []
-    ],
-    messages: [...historical?.messages ?? [], ...active.messages],
-    nextCursor: active.startIndex > 0 ? activeHistoryCursor(sessionId, activeTurn.epoch, active.startIndex) : historical === null ? pendingHistoricalCursor : historical.nextCursor,
-    status: "available",
-    truncated: activeTurn.truncated || (historical?.truncated ?? false)
-  };
-}
-function paginateLiveSessionHistory(history, activeTurn, sessionId, encodedCursor, limit) {
-  const cursor = encodedCursor === null ? null : decodeLiveHistoryCursor(encodedCursor, sessionId);
-  if (activeTurn === null || activeTurn.state === "completed" && history.status === "available" && nativeHistoryCoversCompletedRecovery(history, activeTurn)) {
-    return paginateNativeHistory(history, sessionId, cursor, limit);
-  }
-  const historical = historyBeforeActiveTurn(history, activeTurn);
-  if (cursor?.kind === "native") {
-    return paginateNativeHistory(historical, sessionId, cursor, limit);
-  }
-  if (cursor !== null && cursor.epoch !== activeTurn.epoch) {
-    throw new AcpExecutionError("The active Turn history cursor is stale", {}, "stale_cursor");
-  }
-  return paginateActiveTurn(historical, activeTurn, sessionId, cursor?.endIndex ?? activeTurn.messages.length, limit);
-}
-
 // src/daemon-history-commands.ts
-async function executeSessionLiveHistoryPageLoad(socket, command, config2, directories, audit, sessions, activeTurn, signal) {
-  try {
-    const resolved = await resolveSessionDirectories(
-      directories,
-      config2.bindingId,
-      command.directoryId,
-      command.additionalDirectoryIds,
-      signal
-    );
-    const history = await sessions.loadSessionHistory({
-      additionalDirectories: resolved.additionalDirectories,
-      agent: config2.catalog.find(command.agentId),
-      cwd: resolved.cwd,
-      sessionId: command.sessionId,
-      signal
-    });
-    signal.throwIfAborted();
-    const page = paginateLiveSessionHistory(
-      history,
-      activeTurn(command.sessionId),
-      command.sessionId,
-      command.cursor,
-      command.limit
-    );
-    audit.record({
-      commandId: command.requestId,
-      event: "session_history_loaded",
-      sessionId: command.sessionId
-    });
-    send(socket, {
-      kind: "session.live-history.page.loaded",
-      page,
-      requestId: command.requestId,
-      sessionId: command.sessionId
-    });
-  } catch (error62) {
-    if (signal.aborted) {
-      return;
-    }
-    audit.record({
-      commandId: command.requestId,
-      details: { code: operationErrorCode(error62) },
-      event: "session_history_unavailable",
-      sessionId: command.sessionId
-    });
-    send(socket, {
-      kind: "session.live-history.page.loaded",
-      page: {
-        status: "unavailable",
-        cause: { code: operationErrorCode(error62), message: operationErrorMessage(error62) },
-        nextCursor: null
-      },
-      requestId: command.requestId,
-      sessionId: command.sessionId
-    });
-  }
-}
 async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, directories, audit, diagnostics, sessions, eventLogV2, signal) {
   try {
     const resolved = await resolveSessionDirectories(
@@ -43179,7 +42547,7 @@ async function executeSessionConfigure(publisher, socket, command, config2, dire
 }
 
 // src/native-sessions/handle-native-requests.ts
-import { WebSocket as WebSocket5 } from "undici";
+import { WebSocket as WebSocket4 } from "undici";
 function createNativeSessionRequestHandler(dependencies) {
   const { audit, diagnostics, nativeSessions, publisher, signal, socket, timer } = dependencies;
   const pending = /* @__PURE__ */ new Map();
@@ -43244,7 +42612,7 @@ function createNativeSessionRequestHandler(dependencies) {
             }
           ]);
         }
-        if (socket.readyState === WebSocket5.OPEN) {
+        if (socket.readyState === WebSocket4.OPEN) {
           send(socket, result);
         }
       } catch (error62) {
@@ -43303,8 +42671,7 @@ function createDaemonCommandHandler({
   socket,
   signal,
   runtimeSignal,
-  timer,
-  resolveAgentCatalogEnvironment
+  timer
 }) {
   const handleSettingsDiscovery = createAgentSettingsDiscoveryHandler({
     config: config2,
@@ -43316,20 +42683,10 @@ function createDaemonCommandHandler({
     signal,
     timer
   });
-  const handleCatalogRefresh = createAgentCatalogRefreshHandler({
-    config: config2,
-    audit,
-    diagnostics,
-    socket,
-    signal,
-    timer,
-    resolveEnvironment: resolveAgentCatalogEnvironment
-  });
   const queueChanged = (sessionId) => {
     publisher.publish(sessionId, { kind: "session.queue.changed", sessionId });
     eventLogV2.queueChanged(sessionId);
   };
-  const activeTurnRecovery = (sessionId) => activeTurns.recovery((command) => command.sessionId === sessionId);
   const nativeRequestHandler = createNativeSessionRequestHandler({
     audit,
     diagnostics,
@@ -43342,18 +42699,8 @@ function createDaemonCommandHandler({
   return {
     handle: (message) => {
       const kind = message.kind;
-      if (kind === SESSION_LIVE_HISTORY_PAGE_LOAD_KIND) {
-        const command2 = message;
-        void executeSessionLiveHistoryPageLoad(
-          socket,
-          command2,
-          config2,
-          directories,
-          audit,
-          sessions,
-          activeTurnRecovery,
-          signal
-        );
+      if (kind === RUNTIME_PING_KIND) {
+        send(socket, { kind: RUNTIME_PONG_KIND, requestId: message.requestId });
         return;
       }
       if (kind === SESSION_LIVE_HISTORY_V2_PAGE_LOAD_KIND) {
@@ -43378,10 +42725,6 @@ function createDaemonCommandHandler({
         handleSettingsDiscovery.handle(message);
         return;
       }
-      if (kind === AGENT_CATALOG_REFRESH_KIND) {
-        handleCatalogRefresh.handle(message);
-        return;
-      }
       if (kind === NATIVE_SESSION_REQUEST_KIND) {
         nativeRequestHandler.handle(message);
         return;
@@ -43395,7 +42738,7 @@ function createDaemonCommandHandler({
           sessions.findSessions([command2.sessionId])[0]?.cwd ?? null,
           externalContent
         ).catch((error62) => {
-          if (socket.readyState !== WebSocket6.OPEN || signal.aborted) {
+          if (socket.readyState !== WebSocket5.OPEN || signal.aborted) {
             return;
           }
           send(socket, {
@@ -43601,17 +42944,13 @@ function createDaemonCommandHandler({
       });
     },
     settle: async () => {
-      await Promise.all([
-        nativeRequestHandler.settle(),
-        handleSettingsDiscovery.settle(),
-        handleCatalogRefresh.settle()
-      ]);
+      await Promise.all([nativeRequestHandler.settle(), handleSettingsDiscovery.settle()]);
     }
   };
 }
 
 // src/relay-connection/connect.ts
-import { WebSocket as WebSocket7 } from "undici";
+import { WebSocket as WebSocket6 } from "undici";
 var CONNECTION_TIMEOUT_MILLISECONDS = 6e4;
 var RelayConnectionError = class extends Error {
   code;
@@ -43629,7 +42968,7 @@ function connectRelay(url2, signal) {
     const endpoint = new URL(url2);
     const headers = runtimeAuthorization(endpoint);
     endpoint.searchParams.delete("token");
-    const socket = new WebSocket7(endpoint, {
+    const socket = new WebSocket6(endpoint, {
       dispatcher: environmentProxyDispatcher,
       headers
     });
@@ -43847,8 +43186,7 @@ async function runRelayConnection({
   diagnostics,
   onConnected,
   signal,
-  timer,
-  resolveAgentCatalogEnvironment
+  timer
 }) {
   const relayUrl = new URL(config2.relayUrl);
   relayUrl.searchParams.set("liveness", "1");
@@ -43871,8 +43209,7 @@ async function runRelayConnection({
     socket,
     signal: connectionController.signal,
     runtimeSignal: signal,
-    timer,
-    resolveAgentCatalogEnvironment
+    timer
   });
   installationObserver.connect(socket);
   onConnected();
@@ -43918,14 +43255,14 @@ async function runRelayConnection({
       };
       const connectionLiveness = new RelayConnectionLiveness(timer, {
         send: (message) => {
-          if (socket.readyState !== WebSocket8.OPEN) {
+          if (socket.readyState !== WebSocket7.OPEN) {
             return false;
           }
           try {
             send(socket, message);
             return true;
           } catch (error62) {
-            if (socket.readyState !== WebSocket8.OPEN) {
+            if (socket.readyState !== WebSocket7.OPEN) {
               return false;
             }
             throw error62;
@@ -44014,7 +43351,7 @@ async function runRelayConnection({
 }
 
 // src/relay-connection/session-event-publisher.ts
-import { WebSocket as WebSocket9 } from "undici";
+import { WebSocket as WebSocket8 } from "undici";
 var MAX_BUFFERED_BYTES = 32 * 1024 * 1024;
 var DaemonSessionEventPublisher = class {
   #socket = null;
@@ -44031,7 +43368,7 @@ var DaemonSessionEventPublisher = class {
   };
   publish = (sessionId, event) => {
     const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket9.OPEN) {
+    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
       return;
     }
     const encoded = encodeDaemonToServiceMessage({
@@ -44055,7 +43392,7 @@ var DaemonSessionEventPublisher = class {
   };
   publishStatus = (event) => {
     const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket9.OPEN) {
+    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
       return;
     }
     const encoded = encodeDaemonToServiceMessage(event);
@@ -44070,7 +43407,7 @@ var DaemonSessionEventPublisher = class {
   };
   publishV2 = (event) => {
     const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket9.OPEN) {
+    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
       return;
     }
     const encoded = encodeDaemonToServiceMessage({ event, kind: SESSION_EVENT_V2_KIND });
@@ -44309,10 +43646,6 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
   let connectionAnnounced = false;
   let catalogPublished = false;
   let readinessAnnounced = false;
-  const resolveAgentCatalogEnvironment = options.resolveAgentCatalogEnvironment ?? (async (catalogSignal) => {
-    catalogSignal.throwIfAborted();
-    return config2.localContext.environment;
-  });
   const startAutomaticIntegrationProvisioning = () => {
     if (!connectionAnnounced || !catalogPublished || automaticIntegrationProvisioningStarted) {
       return;
@@ -44390,8 +43723,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
             announceConnection();
           },
           signal,
-          timer,
-          resolveAgentCatalogEnvironment
+          timer
         });
       } catch (error62) {
         if (signal.aborted) {
@@ -44560,8 +43892,7 @@ var MobiusRuntimeEngine = class {
     const audit = new AuditStore();
     try {
       await runDaemon(this.#config, audit, signal, void 0, {
-        ...this.#options.onConnectionStatus === void 0 ? {} : { onConnectionStatus: this.#options.onConnectionStatus },
-        ...this.#options.resolveAgentCatalogEnvironment === void 0 ? {} : { resolveAgentCatalogEnvironment: this.#options.resolveAgentCatalogEnvironment }
+        ...this.#options.onConnectionStatus === void 0 ? {} : { onConnectionStatus: this.#options.onConnectionStatus }
       });
     } finally {
       audit.close();