@moxt-ai/mobius 0.0.31 → 0.0.33

package/dist/cli.js

@@ -11,7 +11,7 @@ import { mkdir as mkdir5 } from "node:fs/promises";
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.31",
+  version: "0.0.33",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -600,6 +600,7 @@ var InstallableAgentDefinition = class {
 };
 var MissingAgentDefinition = class extends InstallableAgentDefinition {
   status = "agent_not_installed";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(id, label) {
     super(id, label);
   }
@@ -694,6 +695,7 @@ var MissingAdapter = class extends UnavailableInstalledAgent {
   code = "adapter_not_found";
   message = "ACP adapter not found";
   status = "missing_adapter";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(specification, agent) {
     super(specification, agent);
   }
@@ -702,6 +704,7 @@ var MissingAgent = class extends UnavailableAgent {
   code = "agent_not_found";
   message = "Agent executable not found";
   status = "missing_agent";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(specification) {
     super(specification);
   }
@@ -730,6 +733,7 @@ var IncompatibleAdapter = class extends UnavailableInstalledAgent {
   code = "acp_incompatible";
   message = "ACP adapter is incompatible";
   status = "incompatible_adapter";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(specification, agent) {
     super(specification, agent);
   }
@@ -738,6 +742,7 @@ var AuthenticationRequiredAgent = class extends UnavailableInstalledAgent {
   code = "authentication_required";
   message = "Agent authentication is required";
   status = "authentication_required";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(specification, agent) {
     super(specification, agent);
   }
@@ -23367,6 +23372,7 @@ var decodeNativeSessionTurnForkCommand = (encoded) => decode4(nativeSessionTurnF
 var SESSION_EVENT_KIND = "session.event";
 var SESSION_EVENT_ACK_KIND = "session.event.ack";
 var SESSION_EVENT_COMMITTED_KIND = "session.event.committed";
+var SESSION_EVENT_DEFERRED_KIND = "session.event.deferred";
 var SESSION_EVENT_REJECTED_KIND = "session.event.rejected";
 var SessionEventRejectionCode = {
   SessionDeleted: "session_deleted",
@@ -23413,6 +23419,12 @@ var eventAcknowledgementSchema = external_exports.strictObject({
   sequence: external_exports.string().min(1).max(40).regex(DECIMAL_SEQUENCE_PATTERN),
   sessionId: external_exports.string().min(1).max(128).regex(IDENTIFIER_PATTERN4)
 }).readonly();
+var eventDeferredSchema = external_exports.strictObject({
+  eventId: external_exports.string().min(1).max(128).regex(IDENTIFIER_PATTERN4),
+  kind: external_exports.literal(SESSION_EVENT_DEFERRED_KIND),
+  retryAfterMilliseconds: external_exports.number().int().min(100).max(6e4),
+  sessionId: external_exports.string().min(1).max(128).regex(IDENTIFIER_PATTERN4)
+}).readonly();
 var eventRejectionSchema = external_exports.strictObject({
   code: external_exports.enum(SessionEventRejectionCode),
   eventId: external_exports.string().min(1).max(128).regex(IDENTIFIER_PATTERN4),
@@ -23446,6 +23458,7 @@ var encode4 = (message, schema) => {
 var decodeSessionEventEnvelope = (encoded) => decode5(encoded, eventEnvelopeSchema);
 var encodeSessionEventEnvelope = (message) => encode4(message, eventEnvelopeSchema);
 var decodeSessionEventAcknowledgement = (encoded) => decode5(encoded, eventAcknowledgementSchema);
+var decodeSessionEventDeferred = (encoded) => decode5(encoded, eventDeferredSchema);
 var decodeSessionEventRejection = (encoded) => decode5(encoded, eventRejectionSchema);
 
 // src/pairing/pair-local-machine.ts
@@ -24614,6 +24627,23 @@ function sniffRasterMime(bytes) {
   }
   return null;
 }
+function readInlineRaster(data, name = "Image") {
+  if (data.length === 0 || data.length > Math.ceil(MAX_LOCAL_RASTER_BYTES / 3) * 4 || data.length % 4 !== 0) {
+    return null;
+  }
+  if (!/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(data)) {
+    return null;
+  }
+  const bytes = new Uint8Array(Buffer.from(data, "base64"));
+  if (bytes.byteLength < 1 || bytes.byteLength > MAX_LOCAL_RASTER_BYTES) {
+    return null;
+  }
+  const mimeType = sniffRasterMime(bytes);
+  if (mimeType === null) {
+    return null;
+  }
+  return new LocalRasterImage(basename3(name) || "Image", mimeType, bytes);
+}
 function isInsideRoot(root, target) {
   const relation = relative5(root, target);
   return relation !== ".." && !relation.startsWith(`..${sep4}`) && !isAbsolute9(relation);
@@ -24978,7 +25008,7 @@ function normalizeContentBlock(content) {
     mimeType: content.mimeType
   };
 }
-function normalizeToolContent(content) {
+async function normalizeToolContent(content, prepareContent) {
   const normalized = [];
   for (const item of content) {
     if (item.type === "diff") {
@@ -24997,7 +25027,7 @@ function normalizeToolContent(content) {
       });
       continue;
     }
-    normalized.push(normalizeContentBlock(item.content));
+    normalized.push(await prepareContent(normalizeContentBlock(item.content)));
   }
   return normalized;
 }
@@ -25071,10 +25101,12 @@ var AcpActivityTracker = class {
   #activities = /* @__PURE__ */ new Map();
   #identities = /* @__PURE__ */ new Map();
   #onActivity;
+  #prepareContent;
   #activeNarrativeKey = "";
   #nextSequence = 0;
-  constructor(onActivity) {
+  constructor(onActivity, prepareContent = (content) => Promise.resolve(content)) {
     this.#onActivity = onActivity;
+    this.#prepareContent = prepareContent;
   }
   recordNarrative = async (activityType, messageId, text) => {
     const key = `${activityType}:${messageId}`;
@@ -25162,7 +25194,7 @@ var AcpActivityTracker = class {
     const output2 = update.rawOutput === void 0 ? readContentOutput(update.content) : formatUnknown(update.rawOutput);
     const detailInput = update.rawInput === void 0 ? "" : formatUnknownDetail(update.rawInput);
     const detailOutput = update.rawOutput === void 0 ? readContentOutputDetail(update.content) : formatUnknownDetail(update.rawOutput);
-    const detailContent = normalizeToolContent(update.content ?? []);
+    const detailContent = await normalizeToolContent(update.content ?? [], this.#prepareContent);
     await this.#record(
       key,
       new AcpActivity(
@@ -25188,10 +25220,10 @@ var AcpActivityTracker = class {
     const identity2 = this.#identity(key);
     const previousDetail = recordedDetail(previous);
     const output2 = update.rawOutput !== void 0 ? formatUnknown(update.rawOutput) : update.content !== void 0 && update.content !== null ? readContentOutput(update.content) : previous?.output ?? "";
-    const content = update.content === void 0 || update.content === null ? previous?.content ?? [] : normalizeToolContent(update.content);
+    const content = update.content === void 0 || update.content === null ? previous?.content ?? [] : await normalizeToolContent(update.content, this.#prepareContent);
     const detailInput = update.rawInput === void 0 ? previousDetail?.input ?? previous?.input ?? "" : formatUnknownDetail(update.rawInput);
     const detailOutput = update.rawOutput !== void 0 ? formatUnknownDetail(update.rawOutput) : update.content !== void 0 && update.content !== null ? readContentOutputDetail(update.content) : previousDetail?.output ?? previous?.output ?? "";
-    const detailContent = update.content === void 0 || update.content === null ? previousDetail?.content ?? previous?.content ?? [] : normalizeToolContent(update.content);
+    const detailContent = update.content === void 0 || update.content === null ? previousDetail?.content ?? previous?.content ?? [] : content;
     await this.#record(
       key,
       new AcpActivity(
@@ -26357,10 +26389,10 @@ var RunningAcpTurn = class extends AcpTurnState {
   running = true;
   activities;
   onText;
-  constructor(commandId, onActivity, onText) {
+  constructor(commandId, onActivity, onText, prepareContent) {
     super();
     this.commandId = commandId;
-    this.activities = new AcpActivityTracker(onActivity);
+    this.activities = new AcpActivityTracker(onActivity, prepareContent);
     this.onText = onText;
   }
 };
@@ -26644,18 +26676,27 @@ var AcpProcessSession = class _AcpProcessSession {
       await this.#turn.onText(leftover, messageId);
     }
   };
-  emitAgentContent = async (content, messageId) => {
+  prepareAgentContent = async (content) => {
+    if (content.type === "image" && content.data.length > 0) {
+      const raster = readInlineRaster(content.data, content.name);
+      if (raster !== null) {
+        return await this.importRaster(raster, AbortSignal.timeout(2e4));
+      }
+    }
     if (content.type === "image" && content.data.length === 0 && content.uri.length > 0) {
       const signal = AbortSignal.timeout(2e4);
       const raster = await readAuthorizedRaster(content.uri, this.imageRoots(), signal);
       if (raster !== null) {
-        await this.emitRaster(raster, messageId, signal);
-        return;
+        return await this.importRaster(raster, signal);
       }
     }
+    return content;
+  };
+  emitAgentContent = async (content, messageId) => {
+    const prepared = await this.prepareAgentContent(content);
     await this.#getObserver().onContent({
       commandId: this.#turn.commandId,
-      content,
+      content: prepared,
       contentId: `content-${crypto.randomUUID()}`,
       kind: AGENT_CONTENT_KIND,
       messageId,
@@ -26663,21 +26704,25 @@ var AcpProcessSession = class _AcpProcessSession {
     });
   };
   emitRaster = async (raster, messageId, signal) => {
-    const artifactId = await this.#getObserver().importLocalImage(this.#mobiusSessionId, raster, signal);
+    const content = await this.importRaster(raster, signal);
     await this.#getObserver().onContent({
       commandId: this.#turn.commandId,
-      content: imageDisplayContent(
-        raster.mimeType,
-        raster.name,
-        artifactId.length > 0 ? "" : raster.base64(),
-        artifactId
-      ),
+      content,
       contentId: `content-${crypto.randomUUID()}`,
       kind: AGENT_CONTENT_KIND,
       messageId,
       sessionId: this.#mobiusSessionId
     });
   };
+  importRaster = async (raster, signal) => {
+    const artifactId = await this.#getObserver().importLocalImage(this.#mobiusSessionId, raster, signal);
+    return imageDisplayContent(
+      raster.mimeType,
+      raster.name,
+      artifactId.length > 0 ? "" : raster.base64(),
+      artifactId
+    );
+  };
   async #initializeAgent(signal) {
     const initialized = await this.race(
       this.#connection.agent.request(
@@ -27045,7 +27090,12 @@ var AcpProcessSession = class _AcpProcessSession {
       )
     );
     this.#prompted = true;
-    const running = new RunningAcpTurn(options.commandId, options.onActivity, options.onText);
+    const running = new RunningAcpTurn(
+      options.commandId,
+      options.onActivity,
+      options.onText,
+      this.prepareAgentContent
+    );
     this.#turn = running;
     try {
       const response = await this.race(
@@ -28297,6 +28347,7 @@ var AgentInstallation = class {
 };
 var RequestedInstallation = class extends AgentInstallation {
   status = "requested";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(requestId, agentId) {
     super(requestId, agentId);
   }
@@ -28312,6 +28363,7 @@ var RunningInstallation = class extends AgentInstallation {
 var SucceededInstallation = class extends AgentInstallation {
   authenticationMayBeRequired = true;
   status = "succeeded";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(requestId, agentId) {
     super(requestId, agentId);
   }
@@ -28328,6 +28380,7 @@ var FailedInstallation = class extends AgentInstallation {
 };
 var CancelledInstallation = class extends AgentInstallation {
   status = "cancelled";
+  // biome-ignore lint/complexity/noUselessConstructor: Exposes the protected base constructor publicly.
   constructor(requestId, agentId) {
     super(requestId, agentId);
   }
@@ -29236,7 +29289,7 @@ var BotExecutionContextRegistry = class {
   activate = (command) => {
     let handle = this.#handlesBySession.get(command.sessionId);
     if (handle === void 0) {
-      handle = `ctx_${randomBytes(32).toString("base64url")}`;
+      handle = `ctx_${Buffer.from(randomBytes(32)).toString("base64url")}`;
       this.#handlesBySession.set(command.sessionId, handle);
     }
     if (this.#activeByHandle.has(handle)) {
@@ -29518,255 +29571,6 @@ var BotOutboundIpcServer = class {
 // src/native-sessions/service.ts
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { basename as basename4 } from "node:path";
-
-// src/native-sessions/codex-history.ts
-import { spawn as spawn4 } from "node:child_process";
-var responseSchema = external_exports.union([
-  external_exports.object({
-    id: external_exports.number(),
-    error: external_exports.object({ code: external_exports.number(), message: external_exports.string() })
-  }),
-  external_exports.object({ id: external_exports.number(), result: external_exports.unknown() }),
-  external_exports.object({ method: external_exports.string() })
-]);
-var threadSchema = external_exports.object({
-  thread: external_exports.object({
-    id: nativeSessionIdSchema,
-    cwd: external_exports.string().min(1).max(2048).refine((path2) => !path2.includes("\0"))
-  })
-});
-var turnsSchema = external_exports.object({
-  data: external_exports.array(external_exports.object({ items: external_exports.array(external_exports.unknown()).max(1e5) })).max(SESSION_HISTORY_PREVIEW_MESSAGE_LIMIT),
-  nextCursor: external_exports.string().nullish()
-});
-var itemTypeSchema = external_exports.object({ type: external_exports.string().min(1).max(80) });
-var userMessageSchema = external_exports.object({
-  content: external_exports.array(external_exports.unknown()).max(1e4)
-});
-var textSchema = external_exports.object({ text: external_exports.string() });
-var imageSchema = external_exports.object({ url: external_exports.string() });
-var agentMessageSchema = textSchema.extend({ phase: external_exports.string().nullish() });
-function decodeHistory(thread, value) {
-  const page = turnsSchema.parse(value);
-  const messages = [];
-  let characters = 0;
-  let truncated = page.nextCursor != null;
-  for (const turn of page.data.toReversed()) {
-    for (const item of turn.items) {
-      const { type } = itemTypeSchema.parse(item);
-      let message;
-      if (type === "userMessage") {
-        const { content } = userMessageSchema.parse(item);
-        const text2 = content.map((block) => {
-          const { type: type2 } = itemTypeSchema.parse(block);
-          if (type2 === "text") {
-            return textSchema.parse(block).text;
-          }
-          if (type2 === "image") {
-            return `[@image](${imageSchema.parse(block).url})`;
-          }
-          return "[Attachment]";
-        }).join("");
-        message = {
-          role: "user",
-          text: text2
-        };
-      } else if (type === "agentMessage") {
-        const agent = agentMessageSchema.parse(item);
-        if (agent.phase === "commentary") {
-          continue;
-        }
-        message = { role: "assistant", text: agent.text };
-      } else {
-        continue;
-      }
-      const text = message.text.slice(-SESSION_HISTORY_CHARACTER_LIMIT);
-      if (text.length === 0 && (message.images?.length ?? 0) === 0) {
-        continue;
-      }
-      truncated ||= text.length < message.text.length;
-      messages.push({ ...message, text });
-      characters += text.length;
-      while (messages.length > SESSION_HISTORY_PREVIEW_MESSAGE_LIMIT || characters > SESSION_HISTORY_CHARACTER_LIMIT) {
-        const removed = messages.shift();
-        if (removed !== void 0) {
-          characters -= removed.text.length;
-        }
-        truncated = true;
-      }
-    }
-  }
-  return {
-    nativeSessionId: thread.id,
-    cwd: thread.cwd,
-    history: {
-      status: "available",
-      messages,
-      truncated,
-      coveredCommandIds: [],
-      coveredMessageIds: []
-    }
-  };
-}
-async function readCodexHistory(agent, cwd, nativeSessionId, signal) {
-  signal.throwIfAborted();
-  nativeSessionIdSchema.parse(nativeSessionId);
-  if (agent.id !== "codex" || !await revalidateExecutable(agent.agentIdentity)) {
-    throw new AcpExecutionError(
-      "The local Codex executable changed. Restart Mobius to discover it again.",
-      {},
-      "agent_executable_changed"
-    );
-  }
-  signal.throwIfAborted();
-  const child = spawn4(agent.agentIdentity.realPath, ["app-server"], {
-    cwd,
-    env: { ...process.env, ...agent.environment },
-    detached: process.platform !== "win32",
-    shell: false,
-    stdio: ["pipe", "pipe", "ignore"]
-  });
-  const response = Promise.withResolvers();
-  let state = { kind: "initializing", requestId: 1 };
-  let pending = "";
-  let receivedBytes = 0;
-  const fail = (cause) => response.reject(
-    cause instanceof AcpExecutionError ? cause : new AcpExecutionError(
-      "Saved Codex history could not be read.",
-      { cause },
-      "native_history_unavailable"
-    )
-  );
-  const send2 = (message) => {
-    child.stdin.write(`${JSON.stringify(message)}
-`);
-  };
-  const onData = (chunk) => {
-    try {
-      receivedBytes += Buffer.byteLength(chunk);
-      if (receivedBytes > 32 * 1024 * 1024) {
-        throw new AcpExecutionError(
-          "This saved conversation is too large to preview.",
-          {},
-          "native_history_too_large"
-        );
-      }
-      pending += chunk;
-      let newline = pending.indexOf("\n");
-      while (newline >= 0) {
-        const line = pending.slice(0, newline);
-        pending = pending.slice(newline + 1);
-        newline = pending.indexOf("\n");
-        if (line.trim().length === 0) {
-          continue;
-        }
-        const value = JSON.parse(line);
-        const message = responseSchema.parse(value);
-        if (!("id" in message)) {
-          continue;
-        }
-        if (message.id !== state.requestId) {
-          throw new AcpExecutionError(
-            "Codex returned an invalid history response.",
-            {},
-            "invalid_native_session_response"
-          );
-        }
-        if ("error" in message) {
-          fail(
-            new AcpExecutionError(
-              "Saved Codex history could not be read.",
-              { cause: message.error },
-              "native_history_unavailable"
-            )
-          );
-          return;
-        }
-        switch (state.kind) {
-          case "initializing":
-            state = { kind: "metadata", requestId: 2 };
-            send2({ method: "initialized", params: {} });
-            send2({
-              id: state.requestId,
-              method: "thread/read",
-              params: { threadId: nativeSessionId, includeTurns: false }
-            });
-            break;
-          case "metadata": {
-            const { thread } = threadSchema.parse(message.result);
-            state = { kind: "turns", requestId: 3, thread };
-            send2({
-              id: state.requestId,
-              method: "thread/turns/list",
-              params: {
-                threadId: nativeSessionId,
-                limit: SESSION_HISTORY_PREVIEW_MESSAGE_LIMIT,
-                sortDirection: "desc",
-                itemsView: "summary"
-              }
-            });
-            break;
-          }
-          case "turns":
-            response.resolve(decodeHistory(state.thread, message.result));
-            return;
-          default: {
-            const unhandled = state;
-            throw new Error(`Unknown history read state: ${String(unhandled)}`);
-          }
-        }
-      }
-    } catch (cause) {
-      fail(cause);
-    }
-  };
-  const abort = () => response.reject(signal.reason);
-  const onExit = () => fail(
-    new AcpExecutionError(
-      "Codex stopped before its saved history was available.",
-      {},
-      "native_history_unavailable"
-    )
-  );
-  const timeout = setTimeout(
-    () => fail(new AcpExecutionError("Reading saved Codex history timed out.", {}, "native_history_timeout")),
-    15e3
-  );
-  child.stdout.setEncoding("utf8");
-  child.stdout.on("data", onData);
-  child.stdin.on("error", fail);
-  child.on("error", fail);
-  child.on("exit", onExit);
-  signal.addEventListener("abort", abort, { once: true });
-  try {
-    if (signal.aborted) {
-      abort();
-    } else {
-      send2({
-        id: 1,
-        method: "initialize",
-        params: { clientInfo: { name: "mobius_history", version: "1.0.0" } }
-      });
-    }
-    const snapshot = await response.promise;
-    return {
-      ...snapshot,
-      history: await embedLocalHistoryImages(snapshot.history, [cwd, snapshot.cwd], signal)
-    };
-  } finally {
-    clearTimeout(timeout);
-    signal.removeEventListener("abort", abort);
-    child.stdout.removeListener("data", onData);
-    if (child.pid !== void 0) {
-      await stopProcessTree(child);
-    }
-    child.stdin.removeListener("error", fail);
-    child.removeListener("error", fail);
-    child.removeListener("exit", onExit);
-  }
-}
-
-// src/native-sessions/service.ts
 var NativeSessionService = class {
   #entries = /* @__PURE__ */ new Map();
   #cursors = /* @__PURE__ */ new Map();
@@ -29929,7 +29733,7 @@ var NativeSessionService = class {
         "native_session_unsupported"
       );
     }
-    const opening = this.#sessions.openNativeSession(
+    const opened = await this.#sessions.openNativeSession(
       {
         ...options,
         cwd: target.cwd,
@@ -29938,35 +29742,6 @@ var NativeSessionService = class {
       },
       { kind: command.action, nativeSessionId: target.info.sessionId }
     );
-    const opened = await opening.catch(async (cause) => {
-      signal.throwIfAborted();
-      if (command.action !== "import" || options.agent.id !== "codex" || !(cause instanceof AcpExecutionError) || cause.code !== "acp_execution_failed") {
-        throw cause;
-      }
-      const snapshot = await readCodexHistory(options.agent, target.cwd, target.info.sessionId, signal);
-      const resolved = await this.#directories.identify(command.bindingId, snapshot.cwd, signal);
-      if (snapshot.nativeSessionId !== target.info.sessionId || resolved.path !== target.cwd) {
-        throw new AcpExecutionError(
-          "Codex returned history for a different session or workspace.",
-          { cause },
-          "invalid_native_session_response"
-        );
-      }
-      signal.throwIfAborted();
-      this.record(command, "native_session_previewed");
-      return { kind: "preview", history: snapshot.history };
-    });
-    if ("kind" in opened) {
-      return {
-        ...envelope2,
-        action: "preview",
-        entryId: command.entryId,
-        reason: "continuation_unavailable",
-        targetSessionId: command.targetSessionId,
-        title: target.info.title ?? "Untitled session",
-        history: opened.history
-      };
-    }
     signal.throwIfAborted();
     const ready = {
       additionalDirectories: target.additionalEntries,
@@ -30702,11 +30477,9 @@ import { dirname as dirname8 } from "node:path";
 import { DatabaseSync as DatabaseSync4 } from "node:sqlite";
 var DEFAULT_OUTBOX_LIMITS = {
   criticalEventBytes: 136 * 1024 * 1024,
-  criticalEventCount: 10128,
   runtimeDeliveryBytes: 64 * 1024 * 1024,
   runtimeDeliveryCount: 64,
-  standardEventBytes: 128 * 1024 * 1024,
-  standardEventCount: 1e4
+  standardEventBytes: 128 * 1024 * 1024
 };
 var SessionEventOutboxCapacityError = class extends Error {
   code = "session_event_outbox_full";
@@ -30989,21 +30762,9 @@ var SessionEventOutbox = class {
     this.#database.close();
   };
   enqueue = (sessionId, payload, attemptId = null) => {
-    return this.#enqueueBounded(
-      sessionId,
-      payload,
-      attemptId ?? "",
-      this.#limits.standardEventCount,
-      this.#limits.standardEventBytes
-    );
+    return this.#enqueueBounded(sessionId, payload, attemptId ?? "", this.#limits.standardEventBytes);
   };
-  enqueueCritical = (sessionId, payload, attemptId = "") => this.#enqueueBounded(
-    sessionId,
-    payload,
-    attemptId,
-    this.#limits.criticalEventCount,
-    this.#limits.criticalEventBytes
-  );
+  enqueueCritical = (sessionId, payload, attemptId = "") => this.#enqueueBounded(sessionId, payload, attemptId, this.#limits.criticalEventBytes);
   claimRuntimeDelivery = (delivery) => {
     const payloadBytes = new TextEncoder().encode(delivery.payload).byteLength;
     this.#database.exec("BEGIN IMMEDIATE");
@@ -31110,7 +30871,7 @@ var SessionEventOutbox = class {
       true
     )
   );
-  #enqueueBounded = (sessionId, payload, attemptId, maximumEventCount, maximumEventBytes) => {
+  #enqueueBounded = (sessionId, payload, attemptId, maximumEventBytes) => {
     const sourceKey = attemptId.length === 0 ? `runtime:${sessionId}` : `attempt:${sessionId}:${attemptId}`;
     this.#database.exec("BEGIN IMMEDIATE");
     try {
@@ -31137,11 +30898,11 @@ var SessionEventOutbox = class {
       const encoded = encodeSessionEventEnvelope(envelope2);
       const byteLength = new TextEncoder().encode(encoded).byteLength;
       const state = this.#database.prepare(
-        `SELECT event_count, total_bytes
+        `SELECT total_bytes
                      FROM relay_session_event_outbox_state
                      WHERE singleton = 1`
       ).get();
-      if (rowNumber(state, "event_count") + 1 > maximumEventCount || rowNumber(state, "total_bytes") + byteLength > maximumEventBytes) {
+      if (rowNumber(state, "total_bytes") + byteLength > maximumEventBytes) {
         throw new SessionEventOutboxCapacityError();
       }
       this.#database.prepare(
@@ -31275,16 +31036,14 @@ var SessionEventOutbox = class {
 function validateLimits(limits) {
   const values = [
     limits.criticalEventBytes,
-    limits.criticalEventCount,
     limits.runtimeDeliveryBytes,
     limits.runtimeDeliveryCount,
-    limits.standardEventBytes,
-    limits.standardEventCount
+    limits.standardEventBytes
   ];
   if (values.some((value) => !Number.isSafeInteger(value) || value < 1)) {
     throw new Error("Session event outbox limits must be positive integers");
   }
-  if (limits.criticalEventBytes < limits.standardEventBytes || limits.criticalEventCount < limits.standardEventCount) {
+  if (limits.criticalEventBytes < limits.standardEventBytes) {
     throw new Error("Critical Session event capacity must include the standard capacity");
   }
 }
@@ -31634,10 +31393,13 @@ function sessionEventSourceKey(envelope2) {
 var DaemonSessionEventPublisher = class {
   #outbox;
   #inFlightEvents = /* @__PURE__ */ new Map();
+  #pausedSources = /* @__PURE__ */ new Map();
+  #timer;
   #inFlightBytes = 0;
   #connection = new DisconnectedDaemonSessionEventState();
-  constructor(outbox) {
+  constructor(outbox, timer) {
     this.#outbox = outbox;
+    this.#timer = timer;
   }
   connect = (socket) => {
     this.#connection = new ConnectedDaemonSessionEventState(socket);
@@ -31680,6 +31442,30 @@ var DaemonSessionEventPublisher = class {
     this.#publishNextBatch();
     return true;
   };
+  defer = (deferred) => {
+    const inFlight = this.#inFlightEvents.get(deferred.eventId);
+    if (inFlight === void 0) {
+      return;
+    }
+    this.#clearInFlightSource(inFlight.sourceKey);
+    if (!this.#pausedSources.has(inFlight.sourceKey)) {
+      this.#pausedSources.set(
+        inFlight.sourceKey,
+        this.#timer.schedule(() => {
+          this.#pausedSources.delete(inFlight.sourceKey);
+          this.#publishNextBatch();
+        }, deferred.retryAfterMilliseconds)
+      );
+    }
+    this.#publishNextBatch();
+  };
+  close = () => {
+    for (const task of this.#pausedSources.values()) {
+      task.cancel();
+    }
+    this.#pausedSources.clear();
+    this.#clearInFlight();
+  };
   #publishNextBatch = () => {
     while (this.#inFlightEvents.size < SESSION_EVENT_REPLAY_WINDOW) {
       const sourceCounts = /* @__PURE__ */ new Map();
@@ -31690,7 +31476,7 @@ var DaemonSessionEventPublisher = class {
       const batch = this.#outbox.pendingSourceHeads(
         SESSION_EVENT_REPLAY_WINDOW - this.#inFlightEvents.size,
         [...this.#inFlightEvents.keys()],
-        saturatedSources
+        [...this.#pausedSources.keys(), ...saturatedSources]
       );
       let sent = 0;
       for (const encoded of batch) {
@@ -31730,6 +31516,15 @@ var DaemonSessionEventPublisher = class {
     this.#inFlightEvents.clear();
     this.#inFlightBytes = 0;
   };
+  #clearInFlightSource = (sourceKey) => {
+    for (const [eventId, inFlight] of this.#inFlightEvents) {
+      if (inFlight.sourceKey !== sourceKey) {
+        continue;
+      }
+      this.#inFlightEvents.delete(eventId);
+      this.#inFlightBytes -= inFlight.byteLength;
+    }
+  };
 };
 var CoalescingDaemonActivityPublisher = class {
   #pending = /* @__PURE__ */ new Map();
@@ -32664,6 +32459,10 @@ async function runRelayConnection(config2, directories, audit, sessions, install
             publisher.acknowledge(decodeSessionEventAcknowledgement(encoded));
             return;
           }
+          if (kind === SESSION_EVENT_DEFERRED_KIND) {
+            publisher.defer(decodeSessionEventDeferred(encoded));
+            return;
+          }
           if (kind === SESSION_EVENT_REJECTED_KIND) {
             const rejection = decodeSessionEventRejection(encoded);
             if (publisher.quarantine(rejection)) {
@@ -33157,7 +32956,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
   });
   const sessionStore = new SqliteAcpSessionStore(config2.auditDatabasePath);
   const outbox = new SessionEventOutbox(config2.auditDatabasePath);
-  const publisher = new DaemonSessionEventPublisher(outbox);
+  const publisher = new DaemonSessionEventPublisher(outbox, timer);
   const grants = new LocalBotGrantStore(config2.auditDatabasePath);
   const contexts = new BotExecutionContextRegistry();
   const applicator = new EmbeddedBotContextApplicator();
@@ -33259,7 +33058,11 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer) {
               try {
                 grants.close();
               } finally {
-                outbox.close();
+                try {
+                  publisher.close();
+                } finally {
+                  outbox.close();
+                }
               }
             }
           }