@moxt-ai/mobius 0.0.176 → 0.0.177

package/dist/index.js

@@ -20368,8 +20368,6 @@ function decodeValue(value, schema) {
   }
   return result.data;
 }
-var decodeAgentDisplayContentValue = (value) => decodeValue(value, displayContentSchema);
-var decodeRecordedAgentContentValue = (value) => decodeValue(value, recordedDisplayContentSchema);
 var decodePromptImagesValue = (value) => decodeValue(value, external_exports.array(promptImageSchema).max(8).readonly());
 var decodePromptResourcesValue = (value) => decodeValue(value, external_exports.array(promptResourceSchema).max(16).readonly());
 var decodeSessionConfigurationSelections = (value) => decodeValue(value, sessionConfigurationSelectionsSchema);
@@ -20411,20 +20409,13 @@ var encodeSessionReadyEvent = (message) => encode3(message, sessionReadyEventSch
 var decodeSessionConfigureCommand = (encoded) => decode3(encoded, sessionConfigureCommandSchema);
 var encodeSessionConfigureCommand = (message) => encode3(message, sessionConfigureCommandSchema);
 var decodeSessionConfigUpdatedEvent = (encoded) => decode3(encoded, sessionConfigUpdatedEventSchema);
-var decodeSessionUsageUpdatedEvent = (encoded) => decode3(encoded, sessionUsageUpdatedEventSchema);
-var decodeSessionCommandsUpdatedEvent = (encoded) => decode3(encoded, sessionCommandsUpdatedEventSchema);
-var decodeSessionInfoUpdatedEvent = (encoded) => decode3(encoded, sessionInfoUpdatedEventSchema);
-var decodeSessionPermissionRequestedEvent = (encoded) => decode3(encoded, sessionPermissionRequestedEventSchema);
+var encodeSessionConfigUpdatedEvent = (message) => encode3(message, sessionConfigUpdatedEventSchema);
 var decodeSessionPermissionRespondCommand = (encoded) => decode3(encoded, sessionPermissionRespondCommandSchema);
 var encodeSessionPermissionRespondCommand = (message) => encode3(message, sessionPermissionRespondCommandSchema);
-var decodeSessionPermissionResolvedEvent = (encoded) => decode3(encoded, sessionPermissionResolvedEventSchema);
-var decodeSessionElicitationRequestedEvent = (encoded) => decode3(encoded, sessionElicitationRequestedEventSchema);
 var decodeSessionElicitationRespondCommand = (encoded) => decode3(encoded, sessionElicitationRespondCommandSchema);
 var encodeSessionElicitationRespondCommand = (message) => encode3(message, sessionElicitationRespondCommandSchema);
-var decodeSessionElicitationResolvedEvent = (encoded) => decode3(encoded, sessionElicitationResolvedEventSchema);
 var decodeSessionOperationFailedEvent = (encoded) => decode3(encoded, sessionOperationFailedEventSchema);
 var encodeSessionOperationFailedEvent = (message) => encode3(message, sessionOperationFailedEventSchema);
-var decodeAgentContentEvent = (encoded) => decode3(encoded, agentContentEventSchema);
 var decodeAgentInstallRequestCommand = (encoded) => decode3(encoded, agentInstallRequestCommandSchema);
 var encodeAgentInstallRequestCommand = (message) => encode3(message, agentInstallRequestCommandSchema);
 var decodeAgentInstallCancelCommand = (encoded) => decode3(encoded, agentInstallCancelCommandSchema);
@@ -20450,7 +20441,6 @@ 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";
 var AGENT_ACTIVITY_KIND = "agent.activity";
@@ -20460,8 +20450,6 @@ var AGENT_ACTIVITY_RECORDED_FIELD_LIMIT = 4e6;
 var AGENT_ACTIVITY_RECORDED_DETAIL_LIMIT = 6e6;
 var AGENT_ACTIVITY_LOCATION_LIMIT = 12;
 var AGENT_ACTIVITY_LOCATION_LENGTH_LIMIT = 1024;
-var SESSION_COMPLETED_KIND = "session.completed";
-var SESSION_FAILED_KIND = "session.failed";
 var SessionPromptDisposition = Object.freeze({
   Queue: "queue",
   Reject: "reject",
@@ -20472,23 +20460,6 @@ var SessionPromptDisposition = Object.freeze({
 var DIRECTORY_IDENTIFIER_PATTERN2 = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,2047}$/;
 var MAX_PROMPT_LENGTH = 1e4;
 var MAX_PROMPT_ATTACHMENT_LENGTH = 6e6;
-var MAX_EVENT_TEXT_LENGTH = 1e5;
-var ACTIVITY_TYPES = /* @__PURE__ */ new Set(["notice", "plan", "progress", "reasoning", "tool"]);
-var NARRATION_ACTIVITY_TYPES = /* @__PURE__ */ new Set(["progress", "reasoning"]);
-var ACTIVITY_STATUSES = /* @__PURE__ */ new Set(["pending", "running", "completed", "failed"]);
-var TOOL_KINDS = /* @__PURE__ */ new Set([
-  "",
-  "delete",
-  "edit",
-  "execute",
-  "fetch",
-  "move",
-  "other",
-  "read",
-  "search",
-  "switch_mode",
-  "think"
-]);
 var ProtocolMessageError = class extends Error {
   code = "invalid_protocol_message";
   constructor(message, options = {}) {
@@ -20538,13 +20509,6 @@ function readText(value, key, maximumLength) {
   }
   return field;
 }
-function readAllowedString(value, key, allowedValues) {
-  const field = readText(value, key, 64);
-  if (!allowedValues.has(field)) {
-    throw new ProtocolMessageError(`Invalid value field: ${key}`);
-  }
-  return field;
-}
 function readPromptDisposition(value) {
   const field = value["disposition"];
   if (field === void 0 || field === SessionPromptDisposition.Reject) {
@@ -20558,32 +20522,6 @@ function readPromptDisposition(value) {
   }
   throw new ProtocolMessageError("Invalid value field: disposition");
 }
-function readSequence(value, key) {
-  const field = value[key];
-  if (typeof field !== "number" || !Number.isSafeInteger(field) || field < 0) {
-    throw new ProtocolMessageError(`Invalid integer field: ${key}`);
-  }
-  return field;
-}
-function readLocations(value) {
-  const field = value["locations"];
-  if (!Array.isArray(field) || field.length > AGENT_ACTIVITY_LOCATION_LIMIT) {
-    throw new ProtocolMessageError("Invalid locations field");
-  }
-  const locations = [];
-  const unique = /* @__PURE__ */ new Set();
-  for (const location of field) {
-    if (typeof location !== "string" || location.length === 0 || location.length > AGENT_ACTIVITY_LOCATION_LENGTH_LIMIT) {
-      throw new ProtocolMessageError("Invalid activity location");
-    }
-    if (unique.has(location)) {
-      throw new ProtocolMessageError("Duplicate activity location");
-    }
-    unique.add(location);
-    locations.push(location);
-  }
-  return locations;
-}
 function readDirectoryIdentifiers(value, key, maximumCount) {
   const field = value[key];
   if (!Array.isArray(field) || field.length > maximumCount) {
@@ -20600,54 +20538,6 @@ function readDirectoryIdentifiers(value, key, maximumCount) {
   }
   return identifiers;
 }
-function readActivityContent(value) {
-  const field = value["content"];
-  if (!Array.isArray(field) || field.length > 100) {
-    throw new ProtocolMessageError("Invalid activity content field");
-  }
-  return field.map((entry) => decodeAgentDisplayContentValue(entry));
-}
-function readActivityDetail(value) {
-  const field = value["detail"];
-  if (!isRecord(field)) {
-    throw new ProtocolMessageError("Invalid activity detail field");
-  }
-  const kind = readString(field, "kind", 32);
-  if (kind === "available") {
-    return {
-      artifactId: readIdentifier(field, "artifactId"),
-      kind
-    };
-  }
-  if (kind === "unrecorded") {
-    return { kind };
-  }
-  if (kind === "truncated") {
-    const capturedBytes = readSequence(field, "capturedBytes");
-    const originalBytes = readSequence(field, "originalBytes");
-    if (capturedBytes > originalBytes) {
-      throw new ProtocolMessageError("Invalid truncated activity detail size");
-    }
-    return { capturedBytes, kind, originalBytes };
-  }
-  if (kind === "recorded") {
-    const contentValue = field["content"];
-    if (!Array.isArray(contentValue) || contentValue.length > 100) {
-      throw new ProtocolMessageError("Invalid recorded activity content");
-    }
-    const detail = {
-      content: contentValue.map((entry) => decodeRecordedAgentContentValue(entry)),
-      input: readText(field, "input", AGENT_ACTIVITY_RECORDED_FIELD_LIMIT),
-      kind,
-      output: readText(field, "output", AGENT_ACTIVITY_RECORDED_FIELD_LIMIT)
-    };
-    if (JSON.stringify(detail).length > AGENT_ACTIVITY_RECORDED_DETAIL_LIMIT) {
-      throw new ProtocolMessageError("Recorded activity detail is too large");
-    }
-    return detail;
-  }
-  throw new ProtocolMessageError("Invalid activity detail availability");
-}
 function readIdentifier(value, key) {
   try {
     return decodeIdentifier(value[key]);
@@ -20772,82 +20662,6 @@ function decodeRuntimePongEvent(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);
-  const sequence = readSequence(value, "sequence");
-  if (sequence !== 0) {
-    throw new ProtocolMessageError("Invalid live start sequence");
-  }
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    epoch: readIdentifier(value, "epoch"),
-    kind: SESSION_STARTED_KIND,
-    attemptId: readIdentifier(value, "attemptId"),
-    prompt: readText(value, "prompt", MAX_PROMPT_LENGTH),
-    sequence,
-    sessionId: readIdentifier(value, "sessionId")
-  };
-}
-function decodeAgentMessageDeltaEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_MESSAGE_DELTA_KIND);
-  const sequence = readSequence(value, "sequence");
-  if (sequence === 0) {
-    throw new ProtocolMessageError("Invalid live sequence");
-  }
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    epoch: readIdentifier(value, "epoch"),
-    kind: AGENT_MESSAGE_DELTA_KIND,
-    messageId: value["messageId"] === void 0 ? "" : readText(value, "messageId", 255),
-    sequence,
-    sessionId: readIdentifier(value, "sessionId"),
-    text: readString(value, "text", MAX_EVENT_TEXT_LENGTH)
-  };
-}
-function decodeAgentActivityEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_ACTIVITY_KIND);
-  return {
-    activityId: readIdentifier(value, "activityId"),
-    activityType: readAllowedString(value, "activityType", ACTIVITY_TYPES),
-    commandId: readIdentifier(value, "commandId"),
-    content: readActivityContent(value),
-    detail: readActivityDetail(value),
-    input: readText(value, "input", AGENT_ACTIVITY_DETAIL_LIMIT),
-    kind: AGENT_ACTIVITY_KIND,
-    locations: readLocations(value),
-    name: readText(value, "name", 128),
-    output: readText(value, "output", AGENT_ACTIVITY_DETAIL_LIMIT),
-    sequence: readSequence(value, "sequence"),
-    sessionId: readIdentifier(value, "sessionId"),
-    status: readAllowedString(value, "status", ACTIVITY_STATUSES),
-    title: readString(value, "title", 500),
-    toolKind: readAllowedString(value, "toolKind", TOOL_KINDS)
-  };
-}
-function decodeSessionCompletedEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, SESSION_COMPLETED_KIND);
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    kind: SESSION_COMPLETED_KIND,
-    sessionId: readIdentifier(value, "sessionId"),
-    stopReason: readString(value, "stopReason", 64)
-  };
-}
-function decodeSessionFailedEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, SESSION_FAILED_KIND);
-  return {
-    code: readIdentifier(value, "code"),
-    commandId: readIdentifier(value, "commandId"),
-    kind: SESSION_FAILED_KIND,
-    message: readString(value, "message", 500),
-    sessionId: readIdentifier(value, "sessionId")
-  };
-}
 function encodeSessionPromptCommand(message) {
   return JSON.stringify(decodeSessionPromptCommand(JSON.stringify(message)));
 }
@@ -20875,19 +20689,6 @@ function encodeRuntimePingCommand(message) {
 function encodeRuntimePongEvent(message) {
   return JSON.stringify(decodeRuntimePongEvent(JSON.stringify(message)));
 }
-function decodeAgentActivityNarrationEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_ACTIVITY_NARRATION_KIND);
-  return {
-    activityId: readIdentifier(value, "activityId"),
-    activityType: readAllowedString(value, "activityType", NARRATION_ACTIVITY_TYPES),
-    commandId: readIdentifier(value, "commandId"),
-    kind: AGENT_ACTIVITY_NARRATION_KIND,
-    sequence: readSequence(value, "sequence"),
-    sessionId: readIdentifier(value, "sessionId"),
-    text: readText(value, "text", MAX_EVENT_TEXT_LENGTH)
-  };
-}
 
 // ../protocol/src/session-history.ts
 var SESSION_HISTORY_CHARACTER_LIMIT = 256e3;
@@ -21456,6 +21257,11 @@ var acpSessionUpdateV2Schema = external_exports.discriminatedUnion("sessionUpdat
   }).readonly()
 ]);
 var lifecycleBase = { commandId: identifierStringSchema };
+var promptExecutionContextV2Schema = external_exports.object({
+  agentId: identifierStringSchema,
+  directoryId: shortString,
+  additionalDirectoryIds: external_exports.array(identifierStringSchema).max(16).readonly()
+}).readonly();
 var lifecycleMetadataV2Schema = external_exports.discriminatedUnion("kind", [
   external_exports.object({ kind: external_exports.literal("session.queue.changed") }).readonly(),
   external_exports.object({ event: sessionPermissionRequestedEventSchema, kind: external_exports.literal("session.permission.requested") }).readonly(),
@@ -21465,7 +21271,8 @@ var lifecycleMetadataV2Schema = external_exports.discriminatedUnion("kind", [
   external_exports.object({
     ...lifecycleBase,
     content: external_exports.array(contentBlockV2Schema).min(1).max(100).readonly(),
-    kind: external_exports.literal("prompt.requested")
+    kind: external_exports.literal("prompt.requested"),
+    context: promptExecutionContextV2Schema.optional()
   }).readonly(),
   external_exports.object({ ...lifecycleBase, attemptId: identifierStringSchema, epoch: identifierStringSchema, kind: external_exports.literal("prompt.started") }).readonly(),
   external_exports.object({ ...lifecycleBase, kind: external_exports.literal("prompt.completed"), stopReason: shortString }).readonly(),
@@ -21605,94 +21412,6 @@ var decodeSessionEventEnvelopeV2 = (value) => decode5(value, sessionEventEnvelop
 var encodeSessionEventEnvelopeV2 = (value) => encode4(value, sessionEventEnvelopeV2Schema);
 var decodeAcpSessionUpdateV2 = (value) => decode5(value, acpSessionUpdateV2Schema);
 
-// ../protocol/src/session-events.ts
-var SESSION_EVENT_KIND = "session.event";
-var SESSION_FORKED_KIND = "session.forked";
-var MAX_RECORDED_EVENT_LENGTH = 8 * 1024 * 1024;
-var sessionEventEnvelopeSchema = external_exports.object({
-  kind: external_exports.literal(SESSION_EVENT_KIND),
-  payload: external_exports.string().min(2).max(MAX_RECORDED_EVENT_LENGTH),
-  sessionId: identifierStringSchema
-}).readonly();
-var SESSION_QUEUE_CHANGED_KIND = "session.queue.changed";
-var sessionQueueChangedSchema = external_exports.object({ kind: external_exports.literal(SESSION_QUEUE_CHANGED_KIND), sessionId: identifierStringSchema }).readonly();
-var sessionForkedSchema = external_exports.object({
-  kind: external_exports.literal(SESSION_FORKED_KIND),
-  sessionId: identifierStringSchema,
-  sourceSessionId: identifierStringSchema,
-  throughCommandId: identifierStringSchema
-}).readonly();
-function decode6(encoded, schema) {
-  let value;
-  try {
-    value = JSON.parse(encoded);
-  } catch (cause) {
-    throw new ProtocolMessageError("Message is not valid JSON", { cause });
-  }
-  const decoded = schema.safeParse(value);
-  if (!decoded.success) {
-    throw new ProtocolMessageError("Message does not match its schema", {
-      cause: decoded.error
-    });
-  }
-  return decoded.data;
-}
-var encode5 = (message, schema) => {
-  const decoded = schema.safeParse(message);
-  if (!decoded.success) {
-    throw new ProtocolMessageError("Message does not match its schema", {
-      cause: decoded.error
-    });
-  }
-  return JSON.stringify(decoded.data);
-};
-var decodeSessionEventEnvelope = (encoded) => decode6(encoded, sessionEventEnvelopeSchema);
-var encodeSessionEventEnvelope = (message) => encode5(message, sessionEventEnvelopeSchema);
-function decodeRecordedSessionEvent(encoded) {
-  const kind = decodeMessageKind(encoded);
-  switch (kind) {
-    case SESSION_QUEUE_CHANGED_KIND:
-      return decode6(encoded, sessionQueueChangedSchema);
-    case SESSION_FORKED_KIND:
-      return decode6(encoded, sessionForkedSchema);
-    case AGENT_ACTIVITY_KIND:
-      return decodeAgentActivityEvent(encoded);
-    case AGENT_ACTIVITY_NARRATION_KIND:
-      return decodeAgentActivityNarrationEvent(encoded);
-    case AGENT_CONTENT_KIND:
-      return decodeAgentContentEvent(encoded);
-    case AGENT_MESSAGE_DELTA_KIND:
-      return decodeAgentMessageDeltaEvent(encoded);
-    case SESSION_COMMANDS_UPDATED_KIND:
-      return decodeSessionCommandsUpdatedEvent(encoded);
-    case SESSION_COMPLETED_KIND:
-      return decodeSessionCompletedEvent(encoded);
-    case SESSION_CONFIG_UPDATED_KIND:
-      return decodeSessionConfigUpdatedEvent(encoded);
-    case SESSION_ELICITATION_REQUESTED_KIND:
-      return decodeSessionElicitationRequestedEvent(encoded);
-    case SESSION_ELICITATION_RESOLVED_KIND:
-      return decodeSessionElicitationResolvedEvent(encoded);
-    case SESSION_FAILED_KIND:
-      return decodeSessionFailedEvent(encoded);
-    case SESSION_INFO_UPDATED_KIND:
-      return decodeSessionInfoUpdatedEvent(encoded);
-    case SESSION_PERMISSION_REQUESTED_KIND:
-      return decodeSessionPermissionRequestedEvent(encoded);
-    case SESSION_PERMISSION_RESOLVED_KIND:
-      return decodeSessionPermissionResolvedEvent(encoded);
-    case SESSION_READY_KIND:
-      return decodeSessionReadyEvent(encoded);
-    case SESSION_STARTED_KIND:
-      return decodeSessionStartedEvent(encoded);
-    case SESSION_USAGE_UPDATED_KIND:
-      return decodeSessionUsageUpdatedEvent(encoded);
-    default:
-      throw new UnsupportedProtocolMessageKindError("daemon-to-service", kind);
-  }
-}
-var encodeRecordedSessionEvent = (event) => JSON.stringify(decodeRecordedSessionEvent(JSON.stringify(event)));
-
 // ../protocol/src/session-live-history.ts
 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";
@@ -21714,7 +21433,7 @@ var sessionLiveHistoryV2PageLoadedSchema = external_exports.object({
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
 }).readonly();
-function decode7(schema, encoded) {
+function decode6(schema, encoded) {
   try {
     const value = JSON.parse(encoded);
     return schema.parse(value);
@@ -21722,8 +21441,8 @@ function decode7(schema, encoded) {
     throw new ProtocolMessageError("Invalid live Session history message", { cause });
   }
 }
-var decodeSessionLiveHistoryV2PageLoad = (encoded) => decode7(sessionLiveHistoryV2PageLoadSchema, encoded);
-var decodeSessionLiveHistoryV2PageLoaded = (encoded) => decode7(sessionLiveHistoryV2PageLoadedSchema, encoded);
+var decodeSessionLiveHistoryV2PageLoad = (encoded) => decode6(sessionLiveHistoryV2PageLoadSchema, encoded);
+var decodeSessionLiveHistoryV2PageLoaded = (encoded) => decode6(sessionLiveHistoryV2PageLoadedSchema, encoded);
 var encodeSessionLiveHistoryV2PageLoad = (value) => JSON.stringify(sessionLiveHistoryV2PageLoadSchema.parse(value));
 var encodeSessionLiveHistoryV2PageLoaded = (value) => JSON.stringify(sessionLiveHistoryV2PageLoadedSchema.parse(value));
 
@@ -21837,6 +21556,11 @@ function decodeServiceToDaemonMessage(encoded) {
   return signature.decoder(encoded);
 }
 var daemonToServiceSignatures = {
+  [SESSION_CONFIG_UPDATED_KIND]: defineMessageSignature(
+    SESSION_CONFIG_UPDATED_KIND,
+    encodeSessionConfigUpdatedEvent,
+    decodeSessionConfigUpdatedEvent
+  ),
   [AGENT_INSTALL_CANCELLED_KIND]: defineMessageSignature(
     AGENT_INSTALL_CANCELLED_KIND,
     encodeAgentInstallCancelledEvent,
@@ -21907,11 +21631,6 @@ var daemonToServiceSignatures = {
     decodeRuntimeHeartbeatEvent
   ),
   [RUNTIME_PONG_KIND]: defineMessageSignature(RUNTIME_PONG_KIND, encodeRuntimePongEvent, decodeRuntimePongEvent),
-  [SESSION_EVENT_KIND]: defineMessageSignature(
-    SESSION_EVENT_KIND,
-    encodeSessionEventEnvelope,
-    decodeSessionEventEnvelope
-  ),
   [SESSION_EVENT_V2_KIND]: defineMessageSignature(
     SESSION_EVENT_V2_KIND,
     encodeSessionEventEnvelopeV2,
@@ -30437,7 +30156,7 @@ var AgentSession = class _AgentSession {
       commandId: () => this.#turn.commandId,
       assertNativeSession: (sessionId) => this.assertNativeSession(sessionId),
       observer: getObserver,
-      recordSessionEventV2: this.#recordLifecycleEventV2
+      recordSessionEventV2: this.recordLifecycleEventV2
     });
     this.#connection = new AgentConnection(agent, cwd, this);
     this.#contentExternalizer = contentExternalizer;
@@ -31020,7 +30739,14 @@ var AgentSession = class _AgentSession {
     if (this.#turn.running) {
       throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
     }
-    const completedHistory = this.#capabilities.loadSession ? await this.#completedHistory(options.signal, "ACP agent exited while loading history before a prompt") : null;
+    if (!this.#capabilities.loadSession && this.#sessionLoad.kind === "not-requested") {
+      this.#sessionLoad = {
+        kind: "loaded",
+        history: new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId),
+        response: {}
+      };
+    }
+    const completedHistory = this.#capabilities.loadSession ? await this.#completedHistory(options.signal, "ACP agent exited while loading history before a prompt") : this.#sessionLoad.kind === "loaded" ? this.#sessionLoad.history : null;
     const prompt = this.buildPrompt(options);
     if (this.#sessionTitle === null || this.#sessionTitle.length === 0) {
       this.#sessionTitle = truncate2(options.prompt, 500);
@@ -31049,11 +30775,16 @@ var AgentSession = class _AgentSession {
     this.#turnHistory = completedHistory === null ? null : new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId);
     const lifecycleV2 = options.lifecycleV2;
     if (lifecycleV2 !== void 0) {
-      await this.#recordLifecycleEventV2({
-        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+      await this.recordLifecycleEventV2({
+        payload: {
+          commandId: options.commandId,
+          content: lifecycleV2.content,
+          kind: "prompt.requested",
+          ...lifecycleV2.context === void 0 ? {} : { context: lifecycleV2.context }
+        },
         type: "lifecycle-metadata"
       });
-      await this.#recordLifecycleEventV2({
+      await this.recordLifecycleEventV2({
         payload: {
           attemptId: lifecycleV2.attemptId,
           commandId: options.commandId,
@@ -31116,7 +30847,7 @@ var AgentSession = class _AgentSession {
         )
       );
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
+        await this.recordLifecycleEventV2({
           payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: result.stopReason },
           type: "lifecycle-metadata"
         });
@@ -31126,8 +30857,8 @@ var AgentSession = class _AgentSession {
       await running.activities.finish();
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
-          payload: {
+        await this.recordLifecycleEventV2({
+          payload: options.cancellationRequested?.() === true ? { commandId: options.commandId, kind: "prompt.completed", stopReason: "cancelled" } : {
             attemptId: lifecycleV2.attemptId,
             code: failure2.code,
             commandId: options.commandId,
@@ -31163,11 +30894,16 @@ var AgentSession = class _AgentSession {
     const prompt = this.buildPrompt(options);
     const lifecycleV2 = options.lifecycleV2;
     if (lifecycleV2 !== void 0) {
-      await this.#recordLifecycleEventV2({
-        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+      await this.recordLifecycleEventV2({
+        payload: {
+          commandId: options.commandId,
+          content: lifecycleV2.content,
+          kind: "prompt.requested",
+          ...lifecycleV2.context === void 0 ? {} : { context: lifecycleV2.context }
+        },
         type: "lifecycle-metadata"
       });
-      await this.#recordLifecycleEventV2({
+      await this.recordLifecycleEventV2({
         payload: {
           attemptId: lifecycleV2.attemptId,
           commandId: options.commandId,
@@ -31197,7 +30933,7 @@ var AgentSession = class _AgentSession {
       const outcome = response["outcome"];
       if (outcome === "injected" || outcome === "startedNewTurn") {
         if (lifecycleV2 !== void 0) {
-          await this.#recordLifecycleEventV2({
+          await this.recordLifecycleEventV2({
             payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: "steered" },
             type: "lifecycle-metadata"
           });
@@ -31222,7 +30958,7 @@ var AgentSession = class _AgentSession {
     } catch (error62) {
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
+        await this.recordLifecycleEventV2({
           payload: {
             attemptId: lifecycleV2.attemptId,
             code: failure2.code,
@@ -31255,7 +30991,14 @@ var AgentSession = class _AgentSession {
   onElicitation = (request, signal) => this.#interactions.onElicitation(request, signal);
   onElicitationComplete = (notification) => this.#interactions.onElicitationComplete(notification);
   onUpdate = (notification) => this.#updates.receive(notification);
-  #recordLifecycleEventV2 = async (event) => {
+  recordControlEventV2 = async (event) => {
+    if (this.#sessionLoad.kind !== "loaded") {
+      return false;
+    }
+    await this.recordLifecycleEventV2(event);
+    return true;
+  };
+  recordLifecycleEventV2 = async (event) => {
     if (event.type !== "lifecycle-metadata" || this.#sessionLoad.kind !== "loaded") {
       return;
     }
@@ -32318,6 +32061,13 @@ var AgentRuntimeManager = class {
     this.#contentExternalizer = contentExternalizer;
     this.#queryProcesses = new AgentQueryProcesses(this.#processes, contentExternalizer);
   }
+  recordLifecycleEventV2 = async (sessionId, event) => {
+    const runtime = this.#executionProcesses.get(sessionId);
+    if (runtime === void 0) {
+      return false;
+    }
+    return await runtime.recordControlEventV2(event);
+  };
   setObserver = (observer) => {
     this.#observer = observer;
   };
@@ -32647,7 +32397,10 @@ var AgentRuntimeManager = class {
         return { stopReason: "cancelled" };
       }
       try {
-        const result = await runtime.prompt(options2);
+        const result = await runtime.prompt({
+          ...options2,
+          cancellationRequested: () => this.#executions.cancellation(options2.sessionId) !== void 0
+        });
         return this.#executions.cancellation(options2.sessionId) !== void 0 ? { stopReason: "cancelled" } : result;
       } catch (error62) {
         if (this.#executions.cancellation(options2.sessionId) !== void 0) {
@@ -34843,14 +34596,6 @@ var CodexAcpAgent = class {
       if (isCompactPrompt(context.params.prompt)) {
         return await this.#compact(context.signal);
       }
-      const messageId = crypto.randomUUID();
-      for (const content of context.params.prompt) {
-        await this.#emit({
-          content,
-          messageId,
-          sessionUpdate: "user_message_chunk"
-        });
-      }
       return await this.#runTurn(promptInput(context.params.prompt), context.signal);
     }).onRequest(
       "_session/steering",
@@ -35336,10 +35081,6 @@ var CodexAcpAgent = class {
     if (steering.length === 0) {
       throw new AcpExecutionError("Codex received an empty steering request", {}, "invalid_request");
     }
-    const messageId = crypto.randomUUID();
-    for (const block of steering) {
-      await this.#emit({ content: block.content, messageId, sessionUpdate: "user_message_chunk" });
-    }
     const response = turnSteerResponseSchema.parse(
       await this.#appServer.request(
         "turn/steer",
@@ -39033,16 +38774,7 @@ function send(socket, message) {
   }
   socket.send(encodeDaemonToServiceMessage(message));
 }
-function reportFailure(publisher, command, code, message) {
-  publisher.publish(command.sessionId, {
-    code,
-    commandId: command.commandId,
-    kind: SESSION_FAILED_KIND,
-    message,
-    sessionId: command.sessionId
-  });
-}
-function settleAbandonedTurn(publisher, operations, audit, cancellation) {
+async function settleAbandonedTurn(eventLog, operations, audit, cancellation) {
   const attemptId = operations.findUnsettledAttemptId(cancellation.commandId, cancellation.sessionId);
   if (attemptId === null) {
     console.warn("Mobius daemon ignored cancellation for an inactive turn");
@@ -39053,13 +38785,14 @@ function settleAbandonedTurn(publisher, operations, audit, cancellation) {
     event: "session_abandoned_turn_settled",
     sessionId: cancellation.sessionId
   });
-  reportFailure(
-    publisher,
-    cancellation,
+  await eventLog.failed(
+    cancellation.sessionId,
+    cancellation.commandId,
     "agent_execution_abandoned",
     "The local Agent execution was abandoned before it completed"
   );
   operations.transitionExecution(cancellation.commandId, "failed");
+  eventLog.publishTerminal(cancellation.sessionId, cancellation.commandId);
 }
 function operationErrorCode(error62) {
   if (error62 instanceof AcpExecutionError || error62 instanceof LocalAuthorizationError || error62 instanceof LocalAgentCatalogError || error62 instanceof PromptArtifactError) {
@@ -42148,112 +41881,6 @@ function warnIgnoredSetting(audit, event, commandId, sessionId, agentId, selecti
 `);
 }
 
-// src/relay-connection/coalescing-agent-event-publisher.ts
-var AGENT_EVENT_COALESCING_MILLISECONDS = 100;
-var AGENT_EVENT_TEXT_MAXIMUM_LENGTH = 1e5;
-var CoalescingAgentEventPublisher = class {
-  #entries = [];
-  #publish;
-  #publishedActivityIds = /* @__PURE__ */ new Set();
-  #scheduled = null;
-  #timer;
-  constructor(timer, publish) {
-    this.#publish = publish;
-    this.#timer = timer;
-  }
-  flush = () => {
-    this.#scheduled?.cancel();
-    this.#scheduled = null;
-    const entries = this.#entries;
-    this.#entries = [];
-    for (const entry of entries) {
-      this.#publish(entry);
-    }
-  };
-  recordActivity = (activity2) => {
-    const latest = this.#entries.at(-1);
-    this.#entries = latest?.kind === "activity" && latest.activity.activityId === activity2.activityId ? [...this.#entries.slice(0, -1), { activity: activity2, kind: "activity" }] : [...this.#entries, { activity: activity2, kind: "activity" }];
-    const first = !this.#publishedActivityIds.has(activity2.activityId);
-    this.#publishedActivityIds.add(activity2.activityId);
-    if (first || activity2.status !== "pending" && activity2.status !== "running") {
-      this.flush();
-    } else {
-      this.schedule();
-    }
-    return Promise.resolve();
-  };
-  recordNarration = (increment) => {
-    if (increment.text.length === 0) {
-      return Promise.resolve();
-    }
-    let remaining = increment.text;
-    while (remaining.length > 0) {
-      const latest = this.#entries.at(-1);
-      if (latest?.kind === "narration" && latest.increment.activityId === increment.activityId) {
-        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.increment.text.length;
-        if (available > 0) {
-          this.#entries = [
-            ...this.#entries.slice(0, -1),
-            {
-              increment: {
-                ...increment,
-                text: `${latest.increment.text}${remaining.slice(0, available)}`
-              },
-              kind: "narration"
-            }
-          ];
-          remaining = remaining.slice(available);
-          continue;
-        }
-      }
-      this.#entries = [
-        ...this.#entries,
-        {
-          increment: { ...increment, text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH) },
-          kind: "narration"
-        }
-      ];
-      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-    }
-    this.schedule();
-    return Promise.resolve();
-  };
-  recordText = (text2, messageId) => {
-    if (text2.length === 0) {
-      return Promise.resolve();
-    }
-    let remaining = text2;
-    while (remaining.length > 0) {
-      const latest = this.#entries.at(-1);
-      if (latest?.kind === "text" && latest.messageId === messageId) {
-        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.text.length;
-        if (available > 0) {
-          this.#entries = [
-            ...this.#entries.slice(0, -1),
-            { ...latest, text: `${latest.text}${remaining.slice(0, available)}` }
-          ];
-          remaining = remaining.slice(available);
-          continue;
-        }
-      }
-      this.#entries = [
-        ...this.#entries,
-        {
-          kind: "text",
-          messageId,
-          text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH)
-        }
-      ];
-      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-    }
-    this.schedule();
-    return Promise.resolve();
-  };
-  schedule() {
-    this.#scheduled ??= this.#timer.schedule(this.flush, AGENT_EVENT_COALESCING_MILLISECONDS);
-  }
-};
-
 // src/daemon-prompt-executor.ts
 function daemonActivity(command, activity2) {
   return {
@@ -42276,7 +41903,6 @@ function daemonActivity(command, activity2) {
 }
 async function executePrompt({
   operations,
-  publisher,
   eventLogV2,
   command,
   config: config2,
@@ -42286,36 +41912,11 @@ async function executePrompt({
   attemptId,
   activateAttempt,
   waitForSessionAvailability,
-  timer,
   signal,
-  recordLiveEvent,
+  recordTurnEvent,
   recordSteeringPrompt,
   cancellationRequested
 }) {
-  const events = new CoalescingAgentEventPublisher(timer, (event) => {
-    if (event.kind === "text") {
-      publisher.publish(
-        command.sessionId,
-        recordLiveEvent({ kind: AGENT_MESSAGE_DELTA_KIND, messageId: event.messageId, text: event.text })
-      );
-      return;
-    }
-    if (event.kind === "narration") {
-      const recorded = {
-        activityId: event.increment.activityId,
-        activityType: event.increment.activityType,
-        commandId: command.commandId,
-        kind: AGENT_ACTIVITY_NARRATION_KIND,
-        sequence: event.increment.sequence,
-        sessionId: command.sessionId,
-        text: event.increment.text
-      };
-      publisher.publish(command.sessionId, recordLiveEvent(recorded));
-      return;
-    }
-    const activity2 = daemonActivity(command, event.activity);
-    publisher.publish(command.sessionId, recordLiveEvent(activity2));
-  });
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -42383,33 +41984,6 @@ async function executePrompt({
     }
     const stream = activateAttempt();
     const lifecycleV2 = eventLogV2.started(command.sessionId, command.commandId, attemptId, stream.epoch);
-    if (!prepared.prompted) {
-      const listing = await directories.list(config2.bindingId, command.directoryId, signal);
-      publisher.publish(command.sessionId, {
-        additionalDirectories: resolved.additionalDirectoryEntries,
-        agentId: command.agentId,
-        agentName: prepared.agentName,
-        agentVersion: prepared.agentVersion,
-        capabilities: prepared.capabilities,
-        commands: prepared.commands,
-        configOptions: prepared.configOptions,
-        directoryId: command.directoryId,
-        directoryLabel: listing.directoryLabel,
-        kind: SESSION_READY_KIND,
-        requestId: command.commandId,
-        restored: prepared.restored,
-        sessionId: command.sessionId
-      });
-    }
-    publisher.publish(command.sessionId, {
-      commandId: command.commandId,
-      epoch: stream.epoch,
-      kind: SESSION_STARTED_KIND,
-      attemptId,
-      prompt: command.prompt,
-      sequence: stream.sequence,
-      sessionId: command.sessionId
-    });
     const attachments = await resolvePromptArtifacts(config2, command, signal);
     let stopReason;
     if (availability.disposition === SessionPromptDisposition.Steer) {
@@ -42436,9 +42010,20 @@ async function executePrompt({
         disposition: availability.disposition,
         images: attachments.images,
         lifecycleV2,
-        onActivity: events.recordActivity,
-        onNarration: events.recordNarration,
-        onText: events.recordText,
+        onActivity: async (activity2) => {
+          recordTurnEvent(daemonActivity(command, activity2));
+        },
+        onNarration: async (increment) => {
+          recordTurnEvent({
+            ...increment,
+            commandId: command.commandId,
+            sessionId: command.sessionId,
+            kind: AGENT_ACTIVITY_NARRATION_KIND
+          });
+        },
+        onText: async (text2, messageId) => {
+          recordTurnEvent({ kind: AGENT_MESSAGE_DELTA_KIND, text: text2, messageId });
+        },
         prompt: command.prompt,
         resources: attachments.resources,
         sessionId: command.sessionId,
@@ -42447,14 +42032,7 @@ async function executePrompt({
       });
       stopReason = result.stopReason;
     }
-    events.flush();
-    publisher.publish(command.sessionId, {
-      commandId: command.commandId,
-      kind: SESSION_COMPLETED_KIND,
-      sessionId: command.sessionId,
-      stopReason
-    });
-    eventLogV2.completed(command.sessionId, command.commandId, stopReason);
+    await eventLogV2.completed(command.sessionId, command.commandId, stopReason);
     operations.transitionExecution(command.commandId, stopReason === "cancelled" ? "cancelled" : "succeeded");
     audit.record({
       commandId: command.commandId,
@@ -42462,15 +42040,8 @@ async function executePrompt({
       sessionId: command.sessionId
     });
   } catch (error62) {
-    events.flush();
     if (signal.aborted && cancellationRequested()) {
-      publisher.publish(command.sessionId, {
-        commandId: command.commandId,
-        kind: SESSION_COMPLETED_KIND,
-        sessionId: command.sessionId,
-        stopReason: "cancelled"
-      });
-      eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
+      await eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
       operations.transitionExecution(command.commandId, "cancelled");
       audit.record({
         commandId: command.commandId,
@@ -42487,8 +42058,7 @@ async function executePrompt({
     const code = operationErrorCode(error62);
     const failureCode = code === "session_operation_failed" ? "agent_execution_failed" : code;
     const failureMessage = code === "session_operation_failed" ? "The local agent could not complete the request" : operationErrorMessage(error62);
-    eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
-    reportFailure(publisher, command, failureCode, failureMessage);
+    await eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
     operations.transitionExecution(command.commandId, "failed");
     console.error("Mobius daemon command failed", error62);
   }
@@ -42516,7 +42086,7 @@ async function executeWorkspaceList(socket, command, directories, audit, signal)
     reportOperationFailure(socket, command.requestId, "", error62);
   }
 }
-async function executeSessionPrepare(publisher, socket, command, config2, directories, audit, sessions, diagnostics, signal) {
+async function executeSessionPrepare(socket, command, config2, directories, audit, sessions, diagnostics, signal) {
   const metrics = new AccumulatingOperationMetrics();
   try {
     const readyEvent = await metrics.measure("prepare-total", async () => {
@@ -42566,12 +42136,6 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
           event: "session_configured",
           sessionId: command.sessionId
         });
-        publisher.publish(command.sessionId, {
-          configOptions,
-          kind: "session.config.updated",
-          requestId: command.requestId,
-          sessionId: command.sessionId
-        });
       }
       const event = {
         additionalDirectories: resolved.additionalDirectoryEntries,
@@ -42589,11 +42153,6 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
         sessionId: command.sessionId,
         runtimeTimings: metrics.snapshot()
       };
-      if (command.transient !== true) {
-        metrics.measureSync("readiness-commit", () => {
-          publisher.publish(command.sessionId, event);
-        });
-      }
       return event;
     });
     send(socket, {
@@ -42623,7 +42182,7 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
     reportOperationFailure(socket, command.requestId, command.sessionId, error62, metrics.snapshot());
   }
 }
-async function executeSessionConfigure(publisher, socket, command, config2, directories, audit, sessions, signal) {
+async function executeSessionConfigure(socket, command, config2, directories, audit, sessions, signal) {
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -42649,7 +42208,7 @@ async function executeSessionConfigure(publisher, socket, command, config2, dire
       event: "session_configured",
       sessionId: command.sessionId
     });
-    publisher.publish(command.sessionId, {
+    send(socket, {
       configOptions,
       kind: "session.config.updated",
       requestId: command.requestId,
@@ -42769,7 +42328,6 @@ function createDaemonCommandHandler({
   installations,
   nativeSessions,
   operations,
-  publisher,
   eventLogV2,
   externalContent,
   activeTurns,
@@ -42790,8 +42348,9 @@ function createDaemonCommandHandler({
     timer
   });
   const queueChanged = (sessionId) => {
-    publisher.publish(sessionId, { kind: "session.queue.changed", sessionId });
-    eventLogV2.queueChanged(sessionId);
+    void eventLogV2.queueChanged(sessionId).catch((error62) => {
+      console.error("Could not record queue change", error62);
+    });
   };
   const nativeRequestHandler = createNativeSessionRequestHandler({
     audit,
@@ -42860,7 +42419,9 @@ function createDaemonCommandHandler({
         const cancellation = message;
         const turn2 = activeTurns.get(cancellation.commandId);
         if (turn2 === void 0 || !turn2.matches(cancellation)) {
-          settleAbandonedTurn(publisher, operations, audit, cancellation);
+          void settleAbandonedTurn(eventLogV2, operations, audit, cancellation).catch((error62) => {
+            console.error("Could not settle abandoned turn", error62);
+          });
           return;
         }
         const cancellationState = turn2.requestCancellation();
@@ -42900,22 +42461,12 @@ function createDaemonCommandHandler({
       }
       if (kind === SESSION_PREPARE_KIND) {
         const command2 = message;
-        void executeSessionPrepare(
-          publisher,
-          socket,
-          command2,
-          config2,
-          directories,
-          audit,
-          sessions,
-          diagnostics,
-          signal
-        );
+        void executeSessionPrepare(socket, command2, config2, directories, audit, sessions, diagnostics, signal);
         return;
       }
       if (kind === SESSION_CONFIGURE_KIND) {
         const command2 = message;
-        void executeSessionConfigure(publisher, socket, command2, config2, directories, audit, sessions, signal);
+        void executeSessionConfigure(socket, command2, config2, directories, audit, sessions, signal);
         return;
       }
       if (kind === SESSION_LIST_KIND) {
@@ -43017,7 +42568,6 @@ function createDaemonCommandHandler({
       eventLogV2.requested(command);
       void executePrompt({
         operations,
-        publisher,
         eventLogV2,
         command,
         config: config2,
@@ -43034,15 +42584,15 @@ function createDaemonCommandHandler({
             sessionId: command.sessionId
           });
         }),
-        timer,
         signal: turn.signal,
-        recordLiveEvent: turn.recordEvent,
+        recordTurnEvent: turn.recordEvent,
         recordSteeringPrompt: () => activeTurns.recordSteeringPrompt(command),
         cancellationRequested: turn.cancellationRequested
       }).catch((error62) => {
         console.error("Mobius daemon turn failed", error62);
       }).finally(() => {
         activeTurns.finish(turn);
+        eventLogV2.publishTerminal(command.sessionId, command.commandId);
         if (command.disposition === SessionPromptDisposition.Queue) {
           queueChanged(command.sessionId);
         }
@@ -43306,7 +42856,6 @@ async function runRelayConnection({
     installations,
     nativeSessions,
     operations,
-    publisher,
     eventLogV2,
     externalContent,
     activeTurns,
@@ -43471,51 +43020,17 @@ var DaemonSessionEventPublisher = class {
   close = () => {
     this.#socket = null;
   };
-  publish = (sessionId, event) => {
-    const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
-      return;
-    }
-    const encoded = encodeDaemonToServiceMessage({
-      kind: SESSION_EVENT_KIND,
-      payload: encodeRecordedSessionEvent(event),
-      sessionId
-    });
-    if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
-      socket.close(1013, "Live event transport overloaded");
-      return;
-    }
-    try {
-      socket.send(encoded);
-    } catch {
-    }
-  };
-  publishBatch = (sessionId, events) => {
-    for (const event of events) {
-      this.publish(sessionId, event);
-    }
-  };
-  publishStatus = (event) => {
-    const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
-      return;
-    }
-    const encoded = encodeDaemonToServiceMessage(event);
-    if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
-      socket.close(1013, "Live event transport overloaded");
-      return;
-    }
-    try {
-      socket.send(encoded);
-    } catch {
-    }
+  publishOperationFailure = (sessionId, requestId, code, message) => {
+    this.#send({ kind: "session.operation.failed", sessionId, requestId, code, message });
   };
-  publishV2 = (event) => {
+  publishStatus = (event) => this.#send(event);
+  publishV2 = (event) => this.#send({ event, kind: SESSION_EVENT_V2_KIND });
+  #send = (message) => {
     const socket = this.#socket;
     if (socket === null || socket.readyState !== WebSocket8.OPEN) {
       return;
     }
-    const encoded = encodeDaemonToServiceMessage({ event, kind: SESSION_EVENT_V2_KIND });
+    const encoded = encodeDaemonToServiceMessage(message);
     if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
       socket.close(1013, "Live event transport overloaded");
       return;
@@ -43575,8 +43090,12 @@ function sessionEventV22(daemonGenerationId, sessionId, position, event, recorde
 var DaemonSessionEventLogV2 = class {
   daemonGenerationId;
   #publisher;
+  #terminal = /* @__PURE__ */ new Map();
+  #publications = /* @__PURE__ */ new Map();
   #queued = /* @__PURE__ */ new Map();
-  constructor(publisher, daemonGenerationId = randomUUID9()) {
+  #recordLifecycle;
+  constructor(publisher, recordLifecycle, daemonGenerationId = randomUUID9()) {
+    this.#recordLifecycle = recordLifecycle;
     this.#publisher = publisher;
     this.daemonGenerationId = daemonGenerationId;
   }
@@ -43584,36 +43103,101 @@ var DaemonSessionEventLogV2 = class {
     this.#queued.set(command.commandId, {
       commandId: command.commandId,
       content: promptContent(command),
+      context: {
+        agentId: command.agentId,
+        directoryId: command.directoryId,
+        additionalDirectoryIds: command.additionalDirectoryIds
+      },
+      phase: "queued",
       sessionId: command.sessionId
     });
   };
   started = (sessionId, commandId, attemptId, epoch) => {
     const request = this.#queued.get(commandId);
     if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
-      return { attemptId, content: request.content, epoch };
+      this.#queued.set(commandId, { ...request, phase: "running" });
+      return { attemptId, content: request.content, epoch, context: request.context };
     }
     throw new Error("The executing prompt was not registered in the V2 queue");
   };
   record = (sessionId, event, position) => {
-    this.#publisher.publishV2(this.event(sessionId, position, event, (/* @__PURE__ */ new Date()).toISOString()));
+    const recorded = this.event(sessionId, position, event, (/* @__PURE__ */ new Date()).toISOString());
+    if (event.type === "lifecycle-metadata" && (event.payload.kind === "prompt.completed" || event.payload.kind === "prompt.failed" || event.payload.kind === "prompt.failed-before-start")) {
+      this.#terminal.set(event.payload.commandId, recorded);
+      const pending2 = this.#publications.get(sessionId) ?? [];
+      pending2.push(recorded);
+      this.#publications.set(sessionId, pending2);
+      return;
+    }
+    const pending = this.#publications.get(sessionId);
+    if (pending !== void 0) {
+      pending.push(recorded);
+    } else {
+      this.#publisher.publishV2(recorded);
+    }
+  };
+  publishTerminal = (sessionId, commandId) => {
+    const event = this.#terminal.get(commandId);
+    if (event?.sessionId === sessionId) {
+      this.#terminal.delete(commandId);
+      const pending = this.#publications.get(sessionId) ?? [];
+      while (pending.length > 0) {
+        const next = pending[0];
+        if (next === void 0) {
+          break;
+        }
+        if (next.type === "lifecycle-metadata" && "commandId" in next.payload && this.#terminal.has(next.payload.commandId)) {
+          break;
+        }
+        pending.shift();
+        this.#publisher.publishV2(next);
+      }
+      if (pending.length === 0) {
+        this.#publications.delete(sessionId);
+      }
+    }
+    this.#queued.delete(commandId);
   };
   event = (sessionId, position, event, recordedAt) => sessionEventV22(this.daemonGenerationId, sessionId, position, event, recordedAt);
-  queueChanged = (_sessionId) => void 0;
-  completed = (sessionId, commandId, _stopReason) => {
+  queueChanged = async (sessionId) => {
+    await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "session.queue.changed" }
+    });
+  };
+  completed = async (sessionId, commandId, stopReason) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
+    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+      return;
+    }
+    const recorded = await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "prompt.completed", commandId, stopReason }
+    });
+    if (!recorded) {
+      this.#publisher.publishOperationFailure(
+        sessionId,
+        commandId,
+        "cancelled",
+        "The prompt was cancelled before execution"
+      );
     }
   };
-  failed = (sessionId, commandId, _code, _message) => {
+  failed = async (sessionId, commandId, code, message) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
+    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+      return;
+    }
+    const recorded = await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "prompt.failed-before-start", commandId, code, message }
+    });
+    if (!recorded) {
+      this.#publisher.publishOperationFailure(sessionId, commandId, code, message);
     }
   };
   promptRequestRecovery = (sessionId) => ({
-    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId).map(({ commandId, content }) => ({ commandId, content }))
+    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId && request.phase === "queued").map(({ commandId, content }) => ({ commandId, content }))
   });
 };
 
@@ -43700,13 +43284,16 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
   await using externalContent = new LocalExternalContentStore(stateDirectory);
   const operations = new DaemonOperationState();
   const publisher = new DaemonSessionEventPublisher();
-  const eventLogV2 = new DaemonSessionEventLogV2(publisher, daemonGenerationId);
+  const eventLogV2 = new DaemonSessionEventLogV2(
+    publisher,
+    (sessionId, event) => agentRuntime.recordLifecycleEventV2(sessionId, event),
+    daemonGenerationId
+  );
   const activeTurns = new DaemonTurnRegistry(operations);
-  const recordSessionEvent = (sessionId, event) => {
-    publisher.publish(sessionId, activeTurns.recordEvent(event));
-  };
   const agentRuntime = new AgentRuntimeManager(
-    new DaemonAcpObserver(recordSessionEvent, eventLogV2.record),
+    new DaemonAcpObserver((_sessionId, event) => {
+      activeTurns.recordEvent(event);
+    }, eventLogV2.record),
     sessionStore,
     {
       read: async (options2, nativeSessionId, nativeTurn) => options2.agent.id === "codex" ? (await readCodexFullHistory(