@moxt-ai/mobius 0.0.169 → 0.0.172

package/dist/index.js

@@ -21520,10 +21520,7 @@ 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(),
   external_exports.object({ event: sessionPermissionResolvedEventSchema, kind: external_exports.literal("session.permission.resolved") }).readonly(),
-  external_exports.object({
-    event: sessionElicitationRequestedEventSchema,
-    kind: external_exports.literal("session.elicitation.requested")
-  }).readonly(),
+  external_exports.object({ event: sessionElicitationRequestedEventSchema, kind: external_exports.literal("session.elicitation.requested") }).readonly(),
   external_exports.object({ event: sessionElicitationResolvedEventSchema, kind: external_exports.literal("session.elicitation.resolved") }).readonly(),
   external_exports.object({
     ...lifecycleBase,
@@ -21625,6 +21622,7 @@ var mobiusSessionExportV2Schema = external_exports.object({
 }).readonly();
 var sessionEventEnvelopeV2Schema = external_exports.object({ event: sessionEventV2Schema, kind: external_exports.literal(SESSION_EVENT_V2_KIND) }).readonly();
 var sessionEventLogPageV2Schema = external_exports.object({
+  daemonGenerationId: identifierStringSchema,
   events: external_exports.array(sessionEventV2Schema).max(MAX_EVENT_COUNT).readonly(),
   nextCursor: external_exports.string().min(1).max(512).nullable(),
   tailCursor: external_exports.string().max(512),
@@ -21632,17 +21630,13 @@ var sessionEventLogPageV2Schema = external_exports.object({
   version: external_exports.literal(2)
 }).readonly();
 var nativeEventPageRequestV2Schema = external_exports.object({ cursor: external_exports.string().min(1).max(512).nullable(), eventLimit: external_exports.number().int().min(1).max(1e4) }).readonly();
-var executingPromptRequestEventLogV2Schema = external_exports.object({
-  attemptId: identifierStringSchema,
+var queuedPromptRequestEventLogV2Schema = external_exports.object({
   commandId: identifierStringSchema,
-  epoch: identifierStringSchema,
-  events: external_exports.array(sessionEventV2Schema).max(MAX_EVENT_COUNT).readonly(),
-  tailCursor: external_exports.string().max(512),
-  truncated: external_exports.boolean()
+  content: external_exports.array(contentBlockV2Schema).min(1).max(100).readonly()
 }).readonly();
 var nativeSessionEventsV2Schema = external_exports.object({
-  executingPromptRequest: executingPromptRequestEventLogV2Schema.nullable(),
-  history: sessionEventLogPageV2Schema
+  events: sessionEventLogPageV2Schema,
+  queuedPromptRequests: external_exports.array(queuedPromptRequestEventLogV2Schema).max(MAX_COLLECTION_SIZE).readonly()
 }).readonly();
 function inputValue(value) {
   if (typeof value !== "string") {
@@ -21666,7 +21660,6 @@ function decode5(value, schema) {
 function encode4(value, schema) {
   return JSON.stringify(decode5(value, schema));
 }
-var decodeSessionEventV2 = (value) => decode5(value, sessionEventV2Schema);
 var decodeSessionEventEnvelopeV2 = (value) => decode5(value, sessionEventEnvelopeV2Schema);
 var encodeSessionEventEnvelopeV2 = (value) => encode4(value, sessionEventEnvelopeV2Schema);
 var decodeAcpSessionUpdateV2 = (value) => decode5(value, acpSessionUpdateV2Schema);
@@ -21760,28 +21753,11 @@ function decodeRecordedSessionEvent(encoded) {
 var encodeRecordedSessionEvent = (event) => JSON.stringify(decodeRecordedSessionEvent(JSON.stringify(event)));
 
 // ../protocol/src/session-live-history.ts
-var SESSION_LIVE_HISTORY_LOAD_KIND = "session.live-history.load";
-var SESSION_LIVE_HISTORY_LOADED_KIND = "session.live-history.loaded";
 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 sessionLiveHistoryLoadSchema = external_exports.object({
-  additionalDirectoryIds: external_exports.array(directoryIdentifier).max(16).readonly(),
-  agentId: identifierStringSchema,
-  bindingId: identifierStringSchema,
-  directoryId: directoryIdentifier,
-  kind: external_exports.literal(SESSION_LIVE_HISTORY_LOAD_KIND),
-  requestId: identifierStringSchema,
-  sessionId: identifierStringSchema
-}).readonly();
-var sessionLiveHistoryLoadedSchema = external_exports.object({
-  history: sessionHistorySchema,
-  kind: external_exports.literal(SESSION_LIVE_HISTORY_LOADED_KIND),
-  requestId: identifierStringSchema,
-  sessionId: identifierStringSchema
-}).readonly();
 var sessionLiveHistoryPageLoadSchema = external_exports.object({
   additionalDirectoryIds: external_exports.array(directoryIdentifier).max(16).readonly(),
   agentId: identifierStringSchema,
@@ -21824,10 +21800,6 @@ function decode7(schema, encoded) {
     throw new ProtocolMessageError("Invalid live Session history message", { cause });
   }
 }
-var decodeSessionLiveHistoryLoad = (encoded) => decode7(sessionLiveHistoryLoadSchema, encoded);
-var decodeSessionLiveHistoryLoaded = (encoded) => decode7(sessionLiveHistoryLoadedSchema, encoded);
-var encodeSessionLiveHistoryLoad = (value) => JSON.stringify(sessionLiveHistoryLoadSchema.parse(value));
-var encodeSessionLiveHistoryLoaded = (value) => JSON.stringify(sessionLiveHistoryLoadedSchema.parse(value));
 var decodeSessionLiveHistoryPageLoad = (encoded) => decode7(sessionLiveHistoryPageLoadSchema, encoded);
 var decodeSessionLiveHistoryPageLoaded = (encoded) => decode7(sessionLiveHistoryPageLoadedSchema, encoded);
 var encodeSessionLiveHistoryPageLoad = (value) => JSON.stringify(sessionLiveHistoryPageLoadSchema.parse(value));
@@ -21910,11 +21882,6 @@ var serviceToDaemonSignatures = {
     encodeSessionElicitationRespondCommand,
     decodeSessionElicitationRespondCommand
   ),
-  [SESSION_LIVE_HISTORY_LOAD_KIND]: defineMessageSignature(
-    SESSION_LIVE_HISTORY_LOAD_KIND,
-    encodeSessionLiveHistoryLoad,
-    decodeSessionLiveHistoryLoad
-  ),
   [SESSION_LIVE_HISTORY_PAGE_LOAD_KIND]: defineMessageSignature(
     SESSION_LIVE_HISTORY_PAGE_LOAD_KIND,
     encodeSessionLiveHistoryPageLoad,
@@ -22055,11 +22022,6 @@ var daemonToServiceSignatures = {
     encodeSessionOperationFailedEvent,
     decodeSessionOperationFailedEvent
   ),
-  [SESSION_LIVE_HISTORY_LOADED_KIND]: defineMessageSignature(
-    SESSION_LIVE_HISTORY_LOADED_KIND,
-    encodeSessionLiveHistoryLoaded,
-    decodeSessionLiveHistoryLoaded
-  ),
   [SESSION_LIVE_HISTORY_PAGE_LOADED_KIND]: defineMessageSignature(
     SESSION_LIVE_HISTORY_PAGE_LOADED_KIND,
     encodeSessionLiveHistoryPageLoaded,
@@ -24512,7 +24474,7 @@ function sessionConfigProtocolForAgent(_agentId) {
 
 // src/acp/session-contracts.ts
 var NullAcpSessionObserver = class {
-  onAcpUpdate = (_sessionId, _update) => Promise.resolve();
+  onSessionEventV2 = (_sessionId, _event, _position) => Promise.resolve();
   onCommands = () => Promise.resolve();
   onConfig = () => Promise.resolve();
   onContent = () => Promise.resolve();
@@ -24637,7 +24599,8 @@ function historyContentCharacters(messages) {
 var AcpHistoryReplay = class {
   #activities = /* @__PURE__ */ new Map();
   #messages = [];
-  #updates = [];
+  #events = [];
+  #records = [];
   #turnActivityIds = /* @__PURE__ */ new Set();
   #activityTracker = new AcpActivityTracker(
     async (activity2) => {
@@ -24659,8 +24622,10 @@ var AcpHistoryReplay = class {
   #firstMessageIndex = 0;
   #characters = 0;
   #truncated = false;
-  record = async (update, rawUpdate) => {
-    this.#updates.push(rawUpdate);
+  record = async (update, rawUpdate, onRecorded = () => Promise.resolve()) => {
+    this.#records.push({ kind: "acp", rawUpdate, update });
+    this.#events.push({ payload: rawUpdate, type: "acp" });
+    await onRecorded(this.#events.length);
     if (update.sessionUpdate === "agent_thought_chunk") {
       if (update.content.type === "text") {
         await this.#activityTracker.recordNarrative(
@@ -24669,30 +24634,30 @@ var AcpHistoryReplay = class {
           update.content.text
         );
       }
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "tool_call") {
       await this.#activityTracker.recordToolCall(update);
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "tool_call_update") {
       await this.#activityTracker.recordToolCallUpdate(update);
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "plan") {
       await this.#activityTracker.recordPlan(update);
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "plan_update") {
       await this.#activityTracker.recordPlanUpdate(update);
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "plan_removed") {
       await this.#activityTracker.removePlan(update);
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate !== "user_message_chunk" && update.sessionUpdate !== "agent_message_chunk") {
-      return;
+      return this.#events.length;
     }
     if (update.sessionUpdate === "agent_message_chunk" && isProgressMessage(update)) {
       if (update.content.type === "text") {
@@ -24702,18 +24667,18 @@ var AcpHistoryReplay = class {
           update.content.text
         );
       }
-      return;
+      return this.#events.length;
     }
     const role = update.sessionUpdate === "user_message_chunk" ? "user" : "assistant";
     const content = update.content;
     if (role === "assistant" && content.type !== "text") {
       await this.#activityTracker.finishNarrative();
       this.recordAssistantContent(update.messageId ?? null, normalizeContentBlock(content));
-      return;
+      return this.#events.length;
     }
     const text2 = content.type === "text" ? content.text : content.type === "image" ? content.data.length > 0 ? `[@image](data:${content.mimeType};base64,${content.data})` : content.uri != null && content.uri.length > 0 ? `[@image](${content.uri})` : "[image attachment]" : `[${content.type} attachment]`;
     if (text2.length === 0) {
-      return;
+      return this.#events.length;
     }
     const previous = this.#messages.at(-1);
     const id = update.messageId ?? null;
@@ -24740,10 +24705,30 @@ var AcpHistoryReplay = class {
     this.#characters += bounded2.length;
     this.#lastMessageId = id;
     this.trimMessages();
+    return this.#events.length;
   };
-  eventPage = (eventLimit, cursor) => {
-    const parsedCursor = cursor === null ? this.#updates.length : Number(cursor);
-    if (!Number.isSafeInteger(parsedCursor) || parsedCursor < 0 || parsedCursor > this.#updates.length) {
+  recordLifecycle = (event) => {
+    if (event.type !== "lifecycle-metadata") {
+      throw new Error("Lifecycle history only accepts lifecycle metadata");
+    }
+    this.#records.push({ event, kind: "lifecycle" });
+    this.#events.push(event);
+    return this.#events.length;
+  };
+  eventCount = () => this.#events.length;
+  append = async (replay) => {
+    for (const record2 of replay.#records) {
+      if (record2.kind === "acp") {
+        await this.record(record2.update, record2.rawUpdate);
+      } else {
+        this.recordLifecycle(record2.event);
+      }
+    }
+  };
+  eventPage = (eventLimit, cursor, appended = null) => {
+    const events = appended === null ? this.#events : [...this.#events, ...appended.#events];
+    const parsedCursor = cursor === null ? events.length : Number(cursor);
+    if (!Number.isSafeInteger(parsedCursor) || parsedCursor < 0 || parsedCursor > events.length) {
       throw new Error("The native event cursor is invalid");
     }
     const endUpdate = parsedCursor;
@@ -24752,7 +24737,7 @@ var AcpHistoryReplay = class {
       nextCursor: startUpdate === 0 ? null : startUpdate.toString(),
       startPosition: startUpdate + 1,
       truncated: startUpdate > 0,
-      updates: this.#updates.slice(startUpdate, endUpdate)
+      events: events.slice(startUpdate, endUpdate)
     };
   };
   snapshot = async () => {
@@ -25139,6 +25124,34 @@ var AcpSessionInteractions = class {
   constructor(context) {
     this.#context = context;
   }
+  #notifyPermissionRequested = async (event) => {
+    await this.#context.recordSessionEventV2({
+      payload: { event, kind: "session.permission.requested" },
+      type: "lifecycle-metadata"
+    });
+    await this.#context.observer().onPermission(event);
+  };
+  #notifyPermissionResolved = async (event) => {
+    await this.#context.recordSessionEventV2({
+      payload: { event, kind: "session.permission.resolved" },
+      type: "lifecycle-metadata"
+    });
+    await this.#context.observer().onPermissionResolved(event);
+  };
+  #notifyElicitationRequested = async (event) => {
+    await this.#context.recordSessionEventV2({
+      payload: { event, kind: "session.elicitation.requested" },
+      type: "lifecycle-metadata"
+    });
+    await this.#context.observer().onElicitation(event);
+  };
+  #notifyElicitationResolved = async (event) => {
+    await this.#context.recordSessionEventV2({
+      payload: { event, kind: "session.elicitation.resolved" },
+      type: "lifecycle-metadata"
+    });
+    await this.#context.observer().onElicitationResolved(event);
+  };
   respondPermission = async (options) => {
     const pending = this.#pendingPermissions.get(options.interactionId);
     if (pending === void 0) {
@@ -25164,7 +25177,7 @@ var AcpSessionInteractions = class {
       );
     }
     this.#pendingPermissions.delete(options.interactionId);
-    await this.#context.observer().onPermissionResolved({
+    await this.#notifyPermissionResolved({
       interactionId: options.interactionId,
       kind: SESSION_PERMISSION_RESOLVED_KIND,
       optionId: options.outcome === "selected" ? options.optionId : "",
@@ -25204,7 +25217,7 @@ var AcpSessionInteractions = class {
       );
     }
     this.#pendingElicitations.delete(options.interactionId);
-    await this.#context.observer().onElicitationResolved({
+    await this.#notifyElicitationResolved({
       action: options.action,
       interactionId: options.interactionId,
       kind: SESSION_ELICITATION_RESOLVED_KIND,
@@ -25233,7 +25246,7 @@ var AcpSessionInteractions = class {
     };
     signal.addEventListener("abort", abort, { once: true });
     try {
-      await this.#context.observer().onPermission({
+      await this.#notifyPermissionRequested({
         commandId: this.#context.commandId(),
         interactionId,
         kind: SESSION_PERMISSION_REQUESTED_KIND,
@@ -25278,7 +25291,7 @@ var AcpSessionInteractions = class {
     };
     signal.addEventListener("abort", abort, { once: true });
     try {
-      await this.#context.observer().onElicitation({
+      await this.#notifyElicitationRequested({
         accepted: false,
         commandId: this.#context.commandId(),
         elicitationId,
@@ -25302,7 +25315,7 @@ var AcpSessionInteractions = class {
       return;
     }
     this.#acceptedUrlElicitations.delete(notification.elicitationId);
-    await this.#context.observer().onElicitationResolved({
+    await this.#notifyElicitationResolved({
       action: "complete",
       interactionId,
       kind: SESSION_ELICITATION_RESOLVED_KIND,
@@ -25315,7 +25328,7 @@ var AcpSessionInteractions = class {
       return;
     }
     this.#pendingPermissions.delete(interactionId);
-    await this.#context.observer().onPermissionResolved({
+    await this.#notifyPermissionResolved({
       interactionId,
       kind: SESSION_PERMISSION_RESOLVED_KIND,
       optionId: "",
@@ -25329,7 +25342,7 @@ var AcpSessionInteractions = class {
       return;
     }
     this.#pendingElicitations.delete(interactionId);
-    await this.#context.observer().onElicitationResolved({
+    await this.#notifyElicitationResolved({
       action: "cancel",
       interactionId,
       kind: SESSION_ELICITATION_RESOLVED_KIND,
@@ -25348,7 +25361,7 @@ var AcpSessionInteractions = class {
       await this.cancelElicitation(interactionId);
     }
     for (const interactionId of acceptedElicitationIds) {
-      await this.#context.observer().onElicitationResolved({
+      await this.#notifyElicitationResolved({
         action: "cancel",
         interactionId,
         kind: SESSION_ELICITATION_RESOLVED_KIND,
@@ -30283,21 +30296,9 @@ var DeletedAcpStoredSession = class extends AcpStoredSessionLookup {
 var MemoryAcpSessionStore = class {
   #sessions = /* @__PURE__ */ new Map();
   #deleted = /* @__PURE__ */ new Set();
-  #eventsV2 = /* @__PURE__ */ new Map();
-  appendExecutingPromptEventV2 = (event) => {
-    const events = this.#eventsV2.get(event.sessionId);
-    if (events === void 0) {
-      throw new Error("The executing prompt event log has not started");
-    }
-    events.push(event);
-  };
-  clearExecutingPromptEventsV2 = (sessionId) => {
-    this.#eventsV2.delete(sessionId);
-  };
   close = () => {
     this.#sessions.clear();
     this.#deleted.clear();
-    this.#eventsV2.clear();
   };
   findNative = (agentId, nativeSessionId) => [...this.#sessions.values()].filter(
     (session) => session.agentId === agentId && session.nativeSessionId === nativeSessionId
@@ -30308,7 +30309,6 @@ var MemoryAcpSessionStore = class {
     for (const id of ids) {
       this.#sessions.delete(id);
       this.#deleted.add(id);
-      this.#eventsV2.delete(id);
     }
     return ids;
   };
@@ -30321,13 +30321,6 @@ var MemoryAcpSessionStore = class {
   };
   remove = (sessionId) => {
     this.#sessions.delete(sessionId);
-    this.#eventsV2.delete(sessionId);
-  };
-  readExecutingPromptEventsV2 = (sessionId) => [
-    ...this.#eventsV2.get(sessionId) ?? []
-  ];
-  startExecutingPromptEventsV2 = (sessionId, events) => {
-    this.#eventsV2.set(sessionId, [...events]);
   };
   write = (session) => {
     this.#sessions.set(session.sessionId, session);
@@ -30406,30 +30399,6 @@ var SqliteAcpSessionStore = class {
   close = () => {
     this.#sqliteDatabase.close();
   };
-  appendExecutingPromptEventV2 = (event) => {
-    this.#database.insert(sessionEventV2).values({
-      eventId: event.eventId,
-      eventJson: JSON.stringify(event),
-      position: Number(event.position),
-      sessionId: event.sessionId
-    }).run();
-  };
-  clearExecutingPromptEventsV2 = (sessionId) => {
-    this.#database.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
-  };
-  startExecutingPromptEventsV2 = (sessionId, events) => {
-    this.#transaction(() => {
-      this.#database.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
-      for (const event of events) {
-        this.#database.insert(sessionEventV2).values({
-          eventId: event.eventId,
-          eventJson: JSON.stringify(event),
-          position: Number(event.position),
-          sessionId: event.sessionId
-        }).run();
-      }
-    });
-  };
   findNative = (agentId, nativeSessionId) => this.#database.select().from(acpSession).where(and(eq(acpSession.agentId, agentId), eq(acpSession.nativeSessionId, nativeSessionId))).all().map(decodeStoredSession);
   list = () => this.#database.select().from(acpSession).orderBy(desc(acpSession.updatedAt)).all().map(decodeStoredSession);
   markDeleted = (agentId, nativeSessionId) => {
@@ -30438,7 +30407,6 @@ var SqliteAcpSessionStore = class {
       this.#database.delete(acpSession).where(and(eq(acpSession.agentId, agentId), eq(acpSession.nativeSessionId, nativeSessionId))).run();
       for (const id of ids) {
         this.#database.insert(deletedAcpSession).values({ sessionId: id }).onConflictDoNothing().run();
-        this.#database.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, id)).run();
       }
     });
     return ids;
@@ -30452,12 +30420,8 @@ var SqliteAcpSessionStore = class {
     const row = this.#database.select().from(acpSession).where(eq(acpSession.sessionId, sessionId)).get();
     return row === void 0 ? new MissingAcpStoredSession() : new FoundAcpStoredSession(decodeStoredSession(row));
   };
-  readExecutingPromptEventsV2 = (sessionId) => this.#database.select({ eventJson: sessionEventV2.eventJson }).from(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).orderBy(asc(sessionEventV2.position)).all().map((row) => decodeSessionEventV2(row.eventJson));
   remove = (sessionId) => {
-    this.#transaction(() => {
-      this.#database.delete(acpSession).where(eq(acpSession.sessionId, sessionId)).run();
-      this.#database.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
-    });
+    this.#database.delete(acpSession).where(eq(acpSession.sessionId, sessionId)).run();
   };
   write = (session) => {
     const value = {
@@ -30527,6 +30491,7 @@ var AgentSession = class _AgentSession {
   #sessionTitle = null;
   #sessionUpdatedAt = "";
   #turn = new IdleAcpTurn();
+  #turnHistory = null;
   constructor(agent, cwd, additionalDirectories, mobiusSessionId, getObserver, store, metrics, contentExternalizer) {
     this.#updates = new AgentUpdateStream((notification) => this.#processUpdate(notification));
     this.#additionalDirectories = [...additionalDirectories];
@@ -30544,7 +30509,8 @@ var AgentSession = class _AgentSession {
       sessionId: () => this.#mobiusSessionId,
       commandId: () => this.#turn.commandId,
       assertNativeSession: (sessionId) => this.assertNativeSession(sessionId),
-      observer: getObserver
+      observer: getObserver,
+      recordSessionEventV2: this.#recordLifecycleEventV2
     });
     this.#connection = new AgentConnection(agent, cwd, this);
     this.#contentExternalizer = contentExternalizer;
@@ -30640,13 +30606,10 @@ var AgentSession = class _AgentSession {
         }
       };
     }
-    const loaded = await this.#loadSession(signal, "ACP agent exited while loading history");
-    return await embedLocalHistoryImages(await loaded.history.snapshot(), signal);
+    const history = await this.#completedHistory(signal, "ACP agent exited while loading history");
+    return await embedLocalHistoryImages(await history.snapshot(), signal);
   };
   loadHistoryEventsV2 = async (eventLimit, cursor, signal) => {
-    if (!this.#prompted && this.#nativeHistoryOwnership.kind === "fresh-session") {
-      return new AcpHistoryReplay().eventPage(eventLimit, cursor);
-    }
     if (!this.#capabilities.loadSession) {
       throw new AcpExecutionError(
         "This Agent restores context but does not provide message history.",
@@ -30654,9 +30617,20 @@ var AgentSession = class _AgentSession {
         "native_history_unsupported"
       );
     }
-    const loaded = await this.#loadSession(signal, "ACP agent exited while loading history");
-    return loaded.history.eventPage(eventLimit, cursor);
+    const history = await this.#completedHistory(signal, "ACP agent exited while loading history");
+    return history.eventPage(eventLimit, cursor, this.#turnHistory);
   };
+  async #completedHistory(signal, exitMessage) {
+    if (!this.#prompted && this.#nativeHistoryOwnership.kind === "fresh-session") {
+      if (this.#sessionLoad.kind === "not-requested") {
+        this.#sessionLoad = { history: new AcpHistoryReplay(), kind: "loaded", response: {} };
+      }
+      if (this.#sessionLoad.kind === "loaded") {
+        return this.#sessionLoad.history;
+      }
+    }
+    return (await this.#loadSession(signal, exitMessage)).history;
+  }
   async #loadSession(signal, exitMessage) {
     if (this.#sessionLoad.kind === "loaded") {
       return this.#sessionLoad;
@@ -31140,19 +31114,7 @@ var AgentSession = class _AgentSession {
     if (this.#turn.running) {
       throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
     }
-    switch (this.#sessionLoad.kind) {
-      case "not-requested":
-        break;
-      case "loaded":
-        this.#sessionLoad = { kind: "not-requested" };
-        break;
-      case "capturing":
-        throw new AcpExecutionError("Session history is still loading", {}, "session_busy");
-      default: {
-        const unexpected = this.#sessionLoad;
-        throw new Error(`Unexpected Session load state: ${JSON.stringify(unexpected)}`);
-      }
-    }
+    const completedHistory = this.#capabilities.loadSession ? await this.#completedHistory(options.signal, "ACP agent exited while loading history before a prompt") : null;
     const prompt = this.buildPrompt(options);
     if (this.#sessionTitle === null || this.#sessionTitle.length === 0) {
       this.#sessionTitle = truncate2(options.prompt, 500);
@@ -31179,6 +31141,23 @@ var AgentSession = class _AgentSession {
       this.prepareAgentContent
     );
     this.#turn = running;
+    this.#turnHistory = completedHistory === null ? null : new AcpHistoryReplay();
+    const lifecycleV2 = options.lifecycleV2;
+    if (lifecycleV2 !== void 0) {
+      await this.#recordLifecycleEventV2({
+        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+        type: "lifecycle-metadata"
+      });
+      await this.#recordLifecycleEventV2({
+        payload: {
+          attemptId: lifecycleV2.attemptId,
+          commandId: options.commandId,
+          epoch: lifecycleV2.epoch,
+          kind: "prompt.started"
+        },
+        type: "lifecycle-metadata"
+      });
+    }
     this.#nativePrompt = {
       commandId: options.commandId,
       previousTurnId: this.#connection.inProcessAgent?.nativeTurnId?.() ?? null
@@ -31233,16 +31212,37 @@ var AgentSession = class _AgentSession {
           this.#lastTerminalCommandId
         )
       );
+      if (lifecycleV2 !== void 0) {
+        await this.#recordLifecycleEventV2({
+          payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: result.stopReason },
+          type: "lifecycle-metadata"
+        });
+      }
       return result;
     } catch (error62) {
       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: {
+            attemptId: lifecycleV2.attemptId,
+            code: failure2.code,
+            commandId: options.commandId,
+            kind: "prompt.failed",
+            message: truncate2(failure2.message, 500)
+          },
+          type: "lifecycle-metadata"
+        });
+      }
       if (error62 instanceof AcpExecutionError) {
         throw error62;
       }
-      throw new AcpExecutionError("ACP agent execution failed", {
-        cause: error62
-      });
+      throw failure2;
     } finally {
+      if (completedHistory !== null && this.#turnHistory !== null) {
+        await completedHistory.append(this.#turnHistory);
+      }
+      this.#turnHistory = null;
       this.#turn = new IdleAcpTurn();
     }
   };
@@ -31258,41 +31258,80 @@ var AgentSession = class _AgentSession {
       throw new AcpExecutionError("The target turn is no longer active", {}, "steering_target_unavailable");
     }
     const prompt = this.buildPrompt(options);
-    const response = await this.race(
-      this.#connection.connection.agent.request("_session/steering", {
-        _meta: { steering: { idleBehavior: "promptRequired" } },
-        prompt,
-        sessionId: this.#updates.sessionId()
-      }),
-      "ACP agent exited during steering",
-      options.signal
-    );
-    if (!isRecord4(response)) {
+    const lifecycleV2 = options.lifecycleV2;
+    if (lifecycleV2 !== void 0) {
+      await this.#recordLifecycleEventV2({
+        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+        type: "lifecycle-metadata"
+      });
+      await this.#recordLifecycleEventV2({
+        payload: {
+          attemptId: lifecycleV2.attemptId,
+          commandId: options.commandId,
+          epoch: lifecycleV2.epoch,
+          kind: "prompt.started"
+        },
+        type: "lifecycle-metadata"
+      });
+    }
+    try {
+      const response = await this.race(
+        this.#connection.connection.agent.request("_session/steering", {
+          _meta: { steering: { idleBehavior: "promptRequired" } },
+          prompt,
+          sessionId: this.#updates.sessionId()
+        }),
+        "ACP agent exited during steering",
+        options.signal
+      );
+      if (!isRecord4(response)) {
+        throw new AcpExecutionError(
+          "ACP agent returned an invalid steering response",
+          {},
+          "acp_invalid_steering_response"
+        );
+      }
+      const outcome = response["outcome"];
+      if (outcome === "injected" || outcome === "startedNewTurn") {
+        if (lifecycleV2 !== void 0) {
+          await this.#recordLifecycleEventV2({
+            payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: "steered" },
+            type: "lifecycle-metadata"
+          });
+        }
+        return outcome;
+      }
+      if (outcome === "promptRequired") {
+        throw new AcpExecutionError(
+          "The target turn finished before steering could be injected",
+          {},
+          "steering_target_unavailable"
+        );
+      }
+      if (outcome === "failed") {
+        throw new AcpExecutionError("The Agent could not inject steering", {}, "steering_failed");
+      }
       throw new AcpExecutionError(
         "ACP agent returned an invalid steering response",
         {},
         "acp_invalid_steering_response"
       );
+    } catch (error62) {
+      const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
+      if (lifecycleV2 !== void 0) {
+        await this.#recordLifecycleEventV2({
+          payload: {
+            attemptId: lifecycleV2.attemptId,
+            code: failure2.code,
+            commandId: options.commandId,
+            kind: "prompt.failed",
+            message: truncate2(failure2.message, 500)
+          },
+          type: "lifecycle-metadata"
+        });
+      }
+      throw failure2;
     }
-    const outcome = response["outcome"];
-    if (outcome === "injected" || outcome === "startedNewTurn") {
-      return outcome;
-    }
-    if (outcome === "promptRequired") {
-      throw new AcpExecutionError(
-        "The target turn finished before steering could be injected",
-        {},
-        "steering_target_unavailable"
-      );
-    }
-    if (outcome === "failed") {
-      throw new AcpExecutionError("The Agent could not inject steering", {}, "steering_failed");
-    }
-    throw new AcpExecutionError(
-      "ACP agent returned an invalid steering response",
-      {},
-      "acp_invalid_steering_response"
-    );
   };
   cancel = async () => {
     const capturedProcesses = await this.#connection.captureProcessTree();
@@ -31313,6 +31352,13 @@ 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) => {
+    if (event.type !== "lifecycle-metadata" || this.#sessionLoad.kind !== "loaded") {
+      return;
+    }
+    const position = this.#turnHistory === null ? this.#sessionLoad.history.recordLifecycle(event) : this.#sessionLoad.history.eventCount() + this.#turnHistory.recordLifecycle(event);
+    await this.#getObserver().onSessionEventV2?.(this.#mobiusSessionId, event, position);
+  };
   selectNativeSession = (sessionId) => {
     this.#updates.select(sessionId);
     this.#nativeHistoryOwnership = { kind: "agent-owned" };
@@ -31329,9 +31375,20 @@ var AgentSession = class _AgentSession {
     if (this.#sessionLoad.kind === "capturing") {
       await this.#sessionLoad.history.record(update, rawUpdate);
     } else {
-      const onAcpUpdate = this.#getObserver().onAcpUpdate;
-      if (onAcpUpdate !== void 0) {
-        await onAcpUpdate(this.#mobiusSessionId, rawUpdate);
+      const onSessionEventV2 = this.#getObserver().onSessionEventV2;
+      if (this.#turnHistory !== null) {
+        const completedEventCount = this.#sessionLoad.kind === "loaded" ? this.#sessionLoad.history.eventCount() : 0;
+        await this.#turnHistory.record(update, rawUpdate, async (turnPosition) => {
+          await onSessionEventV2?.(
+            this.#mobiusSessionId,
+            { payload: rawUpdate, type: "acp" },
+            completedEventCount + turnPosition
+          );
+        });
+      } else if (this.#sessionLoad.kind === "loaded") {
+        await this.#sessionLoad.history.record(update, rawUpdate, async (position) => {
+          await onSessionEventV2?.(this.#mobiusSessionId, { payload: rawUpdate, type: "acp" }, position);
+        });
       }
     }
     if (this.#sessionLoad.kind === "capturing" && (update.sessionUpdate === "user_message_chunk" || update.sessionUpdate === "agent_message_chunk" || update.sessionUpdate === "agent_thought_chunk" || update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update" || update.sessionUpdate === "plan" || update.sessionUpdate === "plan_update" || update.sessionUpdate === "plan_removed")) {
@@ -33025,13 +33082,19 @@ var AgentRuntimeManager = class {
 // src/acp/run-prompt.ts
 async function runAcpPrompt(options) {
   const agentRuntime = new AgentRuntimeManager();
+  const commandId = crypto.randomUUID();
   try {
     return await agentRuntime.runPrompt({
       additionalDirectories: [],
       agent: new LocalAgentDefinition("test-agent", "Test agent", options.agentCommand, options.agentArguments),
       cwd: options.cwd,
-      commandId: crypto.randomUUID(),
+      commandId,
       images: [],
+      lifecycleV2: {
+        attemptId: crypto.randomUUID(),
+        content: [{ text: options.prompt, type: "text" }],
+        epoch: crypto.randomUUID()
+      },
       onActivity: options.onActivity,
       ...options.onNarration === void 0 ? {} : { onNarration: options.onNarration },
       onText: options.onText,
@@ -34140,7 +34203,6 @@ var CodexAppServerClient = class {
 // src/acp/codex/items.ts
 var TOOL_OUTPUT_CHARACTER_LIMIT = 32768;
 var TITLE_CHARACTER_LIMIT = 500;
-var CODEX_META_KEY = "codex";
 function truncate4(value, limit) {
   return value.length <= limit ? value : value.slice(0, limit);
 }
@@ -34279,12 +34341,6 @@ function reasoningText(item) {
   }
   return boundedParagraphs(item.summary.length > 0 ? item.summary : item.content, TOOL_OUTPUT_CHARACTER_LIMIT);
 }
-function agentMessageMeta(phase) {
-  if (phase == null) {
-    return null;
-  }
-  return { [CODEX_META_KEY]: { phase } };
-}
 
 // src/acp/codex/settings.ts
 var APPROVAL_TIMEOUT_MILLISECONDS = 36e5;
@@ -34729,8 +34785,8 @@ function promptInput(prompt) {
 function isCompactPrompt(prompt) {
   return prompt.length === 1 && prompt[0]?.type === "text" && prompt[0].text.trim() === "/compact";
 }
-function steeringPromptInput(prompt) {
-  const input2 = [];
+function steeringPrompt(prompt) {
+  const blocks = [];
   for (const block of prompt) {
     if (typeof block !== "object" || block === null) {
       throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
@@ -34741,7 +34797,7 @@ function steeringPromptInput(prompt) {
       if (typeof text2 !== "string") {
         throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
       }
-      input2.push({ text: text2, text_elements: [], type: "text" });
+      blocks.push({ content: { text: text2, type: "text" }, input: { text: text2, text_elements: [], type: "text" } });
       continue;
     }
     if (type === "image") {
@@ -34750,7 +34806,10 @@ function steeringPromptInput(prompt) {
       if (typeof data !== "string" || typeof mimeType !== "string") {
         throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
       }
-      input2.push({ type: "image", url: `data:${mimeType};base64,${data}` });
+      blocks.push({
+        content: { data, mimeType, type: "image" },
+        input: { type: "image", url: `data:${mimeType};base64,${data}` }
+      });
       continue;
     }
     if (type === "resource") {
@@ -34758,24 +34817,40 @@ function steeringPromptInput(prompt) {
       if (typeof resource !== "object" || resource === null) {
         throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
       }
+      const uri = Reflect.get(resource, "uri");
       const text2 = Reflect.get(resource, "text");
-      if (text2 !== void 0 && typeof text2 !== "string") {
+      const blob2 = Reflect.get(resource, "blob");
+      if (typeof uri !== "string" || typeof text2 !== "string" && typeof blob2 !== "string" || text2 !== void 0 && typeof text2 !== "string" || blob2 !== void 0 && typeof blob2 !== "string") {
         throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
       }
-      input2.push({ text: text2 ?? "", text_elements: [], type: "text" });
+      blocks.push({
+        content: typeof text2 === "string" ? { resource: { text: text2, uri }, type: "resource" } : { resource: { blob: blob2, uri }, type: "resource" },
+        input: { text: text2 ?? "", text_elements: [], type: "text" }
+      });
       continue;
     }
     if (type === "resource_link") {
+      const name2 = Reflect.get(block, "name");
       const uri = Reflect.get(block, "uri");
-      if (typeof uri !== "string") {
+      if (typeof name2 !== "string" || typeof uri !== "string") {
         throw new AcpExecutionError("Codex received an invalid steering prompt", {}, "invalid_request");
       }
-      input2.push({ text: `Resource: ${uri}`, text_elements: [], type: "text" });
+      blocks.push({
+        content: { name: name2, type: "resource_link", uri },
+        input: { text: `Resource: ${uri}`, text_elements: [], type: "text" }
+      });
       continue;
     }
     throw new AcpExecutionError("Codex received an unsupported steering prompt", {}, "invalid_request");
   }
-  return input2;
+  return blocks;
+}
+function agentMessageUpdate(messageId, text2, phase) {
+  return {
+    content: { text: text2, type: "text" },
+    messageId,
+    sessionUpdate: phase === "commentary" ? "agent_thought_chunk" : "agent_message_chunk"
+  };
 }
 function userInputSchema(questions) {
   const properties = {};
@@ -34915,6 +34990,14 @@ 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",
@@ -35002,12 +35085,7 @@ var CodexAcpAgent = class {
           continue;
         }
         if (item.type === "agentMessage") {
-          await this.#emit({
-            _meta: agentMessageMeta(item.phase),
-            content: { text: item.text, type: "text" },
-            messageId: item.id,
-            sessionUpdate: "agent_message_chunk"
-          });
+          await this.#emit(agentMessageUpdate(item.id, item.text, item.phase));
           continue;
         }
         const update = toolCallUpdate(item, "snapshot");
@@ -35144,12 +35222,7 @@ var CodexAcpAgent = class {
         const phase = this.#agentMessages.get(decoded.data.itemId)?.phase;
         this.#agentMessages.set(decoded.data.itemId, { phase, kind: "streaming" });
         await this.#enqueue(async () => {
-          await this.#emit({
-            _meta: agentMessageMeta(phase),
-            content: { text: decoded.data.delta, type: "text" },
-            messageId: decoded.data.itemId,
-            sessionUpdate: "agent_message_chunk"
-          });
+          await this.#emit(agentMessageUpdate(decoded.data.itemId, decoded.data.delta, phase));
         });
       }
       return;
@@ -35172,12 +35245,7 @@ var CodexAcpAgent = class {
         return;
       }
       await this.#enqueue(async () => {
-        await this.#emit({
-          _meta: agentMessageMeta(item.phase),
-          content: { text: item.text, type: "text" },
-          messageId: item.id,
-          sessionUpdate: "agent_message_chunk"
-        });
+        await this.#emit(agentMessageUpdate(item.id, item.text, item.phase));
       });
       return;
     }
@@ -35411,14 +35479,22 @@ var CodexAcpAgent = class {
     if (sessionId !== this.#nativeSessionId || active === null || active.turn.id.length === 0) {
       return { outcome: "promptRequired", reason: "noRunningTurn" };
     }
-    const input2 = steeringPromptInput(prompt);
-    if (input2.length === 0) {
+    const steering = steeringPrompt(prompt);
+    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",
-        { expectedTurnId: active.turn.id, input: input2, threadId: this.#nativeSessionId },
+        {
+          expectedTurnId: active.turn.id,
+          input: steering.map((block) => block.input),
+          threadId: this.#nativeSessionId
+        },
         AbortSignal.any([signal, AbortSignal.timeout(APPROVAL_TIMEOUT_MILLISECONDS2)])
       )
     );
@@ -38098,7 +38174,7 @@ function isRuntimeRelayRevocation(closeCode, closeReason) {
 }
 
 // src/run-daemon.ts
-import { createHash as createHash8, randomUUID as randomUUID8 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID9 } from "node:crypto";
 import { join as join19 } from "node:path";
 import { styleText } from "node:util";
 
@@ -39179,8 +39255,8 @@ var DaemonAcpObserver = class {
     this.#record = record2;
     this.#recordV2 = recordV2;
   }
-  onAcpUpdate = (sessionId, update) => {
-    this.#recordV2(sessionId, { payload: update, type: "acp" });
+  onSessionEventV2 = (sessionId, event, position) => {
+    this.#recordV2(sessionId, event, position);
     return Promise.resolve();
   };
   onCommands = (event) => {
@@ -39197,18 +39273,10 @@ var DaemonAcpObserver = class {
   };
   onElicitation = (event) => {
     this.#record(event.sessionId, event);
-    this.#recordV2(event.sessionId, {
-      payload: { event, kind: "session.elicitation.requested" },
-      type: "lifecycle-metadata"
-    });
     return Promise.resolve();
   };
   onElicitationResolved = (event) => {
     this.#record(event.sessionId, event);
-    this.#recordV2(event.sessionId, {
-      payload: { event, kind: "session.elicitation.resolved" },
-      type: "lifecycle-metadata"
-    });
     return Promise.resolve();
   };
   onInfo = (event) => {
@@ -39217,18 +39285,10 @@ var DaemonAcpObserver = class {
   };
   onPermission = (event) => {
     this.#record(event.sessionId, event);
-    this.#recordV2(event.sessionId, {
-      payload: { event, kind: "session.permission.requested" },
-      type: "lifecycle-metadata"
-    });
     return Promise.resolve();
   };
   onPermissionResolved = (event) => {
     this.#record(event.sessionId, event);
-    this.#recordV2(event.sessionId, {
-      payload: { event, kind: "session.permission.resolved" },
-      type: "lifecycle-metadata"
-    });
     return Promise.resolve();
   };
   onUsage = (event) => {
@@ -40063,14 +40123,14 @@ function decodeHistory(thread, value, options) {
           if (options.detail === "rich" && historyItem.text.length > 0) {
             append({
               activities: [
-                activity(historyItem.id ?? `progress-${sequence.toString()}`, "progress", sequence, {
+                activity(historyItem.id ?? `reasoning-${sequence.toString()}`, "reasoning", sequence, {
                   input: "",
                   locations: [],
                   name: "",
                   output: historyItem.text,
                   status: "completed",
-                  title: "Progress",
-                  toolKind: ""
+                  title: "Reasoning",
+                  toolKind: "think"
                 })
               ],
               content: [],
@@ -42088,9 +42148,6 @@ async function streamLocalFile(command, send2, signal, workingDirectory, externa
   });
 }
 
-// src/daemon-history-commands.ts
-import { createHash as createHash7 } from "node:crypto";
-
 // src/authorization/resolve-session-directories.ts
 import { basename as basename7 } from "node:path";
 var ResolvedSessionDirectories = class {
@@ -42358,72 +42415,8 @@ function paginateLiveSessionHistory(history, activeTurn, sessionId, encodedCurso
   }
   return paginateActiveTurn(historical, activeTurn, sessionId, cursor?.endIndex ?? activeTurn.messages.length, limit);
 }
-function mergeLiveSessionHistory(history, activeTurn, sessionId) {
-  const page = paginateLiveSessionHistory(history, activeTurn, sessionId, null, 1e3);
-  if (page.status === "unavailable") {
-    return { cause: page.cause, status: "unavailable" };
-  }
-  return {
-    coveredCommandIds: page.coveredCommandIds,
-    ...page.streamPosition === void 0 ? {} : { streamPosition: page.streamPosition },
-    coveredMessageIds: page.coveredMessageIds,
-    messages: page.messages,
-    status: "available",
-    truncated: page.truncated || page.nextCursor !== null
-  };
-}
 
 // src/daemon-history-commands.ts
-async function executeSessionLiveHistoryLoad(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 mergedHistory = mergeLiveSessionHistory(history, activeTurn(command.sessionId), command.sessionId);
-    audit.record({
-      commandId: command.requestId,
-      event: "session_history_loaded",
-      sessionId: command.sessionId
-    });
-    send(socket, {
-      history: mergedHistory,
-      kind: "session.live-history.loaded",
-      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, {
-      history: {
-        status: "unavailable",
-        cause: { code: operationErrorCode(error62), message: operationErrorMessage(error62) }
-      },
-      kind: "session.live-history.loaded",
-      requestId: command.requestId,
-      sessionId: command.sessionId
-    });
-  }
-}
 async function executeSessionLiveHistoryPageLoad(socket, command, config2, directories, audit, sessions, activeTurn, signal) {
   try {
     const resolved = await resolveSessionDirectories(
@@ -42481,20 +42474,7 @@ async function executeSessionLiveHistoryPageLoad(socket, command, config2, direc
     });
   }
 }
-function replayEvent(sessionId, position, update) {
-  const encoded = JSON.stringify(update);
-  const eventId = `native-${createHash7("sha256").update(sessionId).update(":").update(position.toString()).update(":").update(encoded).digest("hex")}`;
-  return {
-    eventId,
-    payload: update,
-    position: position.toString(),
-    provenance: { kind: "original" },
-    recordedAt: "1970-01-01T00:00:00.000Z",
-    sessionId,
-    type: "acp"
-  };
-}
-async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, directories, audit, diagnostics, sessions, executingPromptRequest, signal) {
+async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, directories, audit, diagnostics, sessions, eventLogV2, signal) {
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -42503,20 +42483,18 @@ async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, dir
       command.additionalDirectoryIds,
       signal
     );
-    const replay = await sessions.loadSessionEventsV2(
-      {
-        additionalDirectories: resolved.additionalDirectories,
-        agent: config2.catalog.find(command.agentId),
-        cwd: resolved.cwd,
-        sessionId: command.sessionId,
-        signal
-      },
-      command.eventLimit,
-      command.cursor
-    );
+    const loadOptions = {
+      additionalDirectories: resolved.additionalDirectories,
+      agent: config2.catalog.find(command.agentId),
+      cwd: resolved.cwd,
+      sessionId: command.sessionId,
+      signal
+    };
+    const recovery = eventLogV2.promptRequestRecovery(command.sessionId);
+    const replay = await sessions.loadSessionEventsV2(loadOptions, command.eventLimit, command.cursor);
     signal.throwIfAborted();
-    const events = replay.updates.map(
-      (update, index2) => replayEvent(command.sessionId, replay.startPosition + index2, update)
+    const events = replay.events.map(
+      (event, index2) => eventLogV2.event(command.sessionId, replay.startPosition + index2, event, "1970-01-01T00:00:00.000Z")
     );
     const tailCursor = events.at(-1)?.eventId ?? "";
     audit.record({
@@ -42526,14 +42504,15 @@ async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, dir
     });
     send(socket, {
       events: {
-        executingPromptRequest: executingPromptRequest(command.sessionId),
-        history: {
+        events: {
+          daemonGenerationId: eventLogV2.daemonGenerationId,
           events,
           nextCursor: replay.nextCursor,
           tailCursor,
           truncated: replay.truncated,
           version: 2
-        }
+        },
+        queuedPromptRequests: recovery.queuedPromptRequests
       },
       kind: "session.live-history.v2.page.loaded",
       requestId: command.requestId,
@@ -42983,7 +42962,7 @@ async function executePrompt({
       }
     }
     const stream = activateAttempt();
-    eventLogV2.started(command.sessionId, command.commandId, attemptId, stream.epoch);
+    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, {
@@ -43020,6 +42999,7 @@ async function executePrompt({
         commandId: command.commandId,
         cwd: resolved.cwd,
         images: attachments.images,
+        lifecycleV2,
         prompt: command.prompt,
         resources: attachments.resources,
         sessionId: command.sessionId,
@@ -43035,6 +43015,7 @@ async function executePrompt({
         cwd: resolved.cwd,
         disposition: availability.disposition,
         images: attachments.images,
+        lifecycleV2,
         onActivity: events.recordActivity,
         onNarration: events.recordNarration,
         onText: events.recordText,
@@ -43426,20 +43407,6 @@ function createDaemonCommandHandler({
   return {
     handle: (message) => {
       const kind = message.kind;
-      if (kind === SESSION_LIVE_HISTORY_LOAD_KIND) {
-        const command2 = message;
-        void executeSessionLiveHistoryLoad(
-          socket,
-          command2,
-          config2,
-          directories,
-          audit,
-          sessions,
-          activeTurnRecovery,
-          signal
-        );
-        return;
-      }
       if (kind === SESSION_LIVE_HISTORY_PAGE_LOAD_KIND) {
         const command2 = message;
         void executeSessionLiveHistoryPageLoad(
@@ -43463,7 +43430,7 @@ function createDaemonCommandHandler({
           audit,
           diagnostics,
           sessions,
-          eventLogV2.executingPromptRequest,
+          eventLogV2,
           signal
         );
         return;
@@ -44116,10 +44083,6 @@ import { WebSocket as WebSocket9 } from "undici";
 var MAX_BUFFERED_BYTES = 32 * 1024 * 1024;
 var DaemonSessionEventPublisher = class {
   #socket = null;
-  #store;
-  constructor(store) {
-    this.#store = store;
-  }
   connect = (socket) => {
     this.#socket = socket;
   };
@@ -44171,7 +44134,6 @@ var DaemonSessionEventPublisher = class {
     }
   };
   publishV2 = (event) => {
-    this.#store.appendExecutingPromptEventV2(event);
     const socket = this.#socket;
     if (socket === null || socket.readyState !== WebSocket9.OPEN) {
       return;
@@ -44198,7 +44160,7 @@ var SystemDaemonTimer = class {
 var systemDaemonTimer = new SystemDaemonTimer();
 
 // src/session-event-log-v2.ts
-var EXECUTING_PROMPT_EVENT_LIMIT = 1e4;
+import { createHash as createHash7, randomUUID as randomUUID8 } from "node:crypto";
 function promptContent(command) {
   const content = [];
   if (command.prompt.length > 0) {
@@ -44222,176 +44184,59 @@ function promptContent(command) {
   }
   return content;
 }
+function sessionEventV22(daemonGenerationId, sessionId, position, event, recordedAt) {
+  const sessionPrefix = createHash7("sha256").update(sessionId).digest("hex").slice(0, 16);
+  return {
+    eventId: `event-${daemonGenerationId}-${sessionPrefix}-${position.toString().padStart(16, "0")}`,
+    ...event,
+    position: position.toString(),
+    provenance: { kind: "original" },
+    recordedAt,
+    sessionId
+  };
+}
 var DaemonSessionEventLogV2 = class {
-  #positions = /* @__PURE__ */ new Map();
-  #requests = /* @__PURE__ */ new Map();
-  #loadedRequestSessions = /* @__PURE__ */ new Set();
+  daemonGenerationId = randomUUID8();
   #publisher;
-  #store;
-  constructor(publisher, store) {
+  #queued = /* @__PURE__ */ new Map();
+  constructor(publisher) {
     this.#publisher = publisher;
-    this.#store = store;
   }
-  #loadStoredEvents = (sessionId) => {
-    const stored = this.#store.readExecutingPromptEventsV2(sessionId);
-    const lastPosition = stored.at(-1)?.position;
-    if (lastPosition !== void 0) {
-      this.#positions.set(sessionId, Number(lastPosition));
-    }
-    return stored;
-  };
-  #loadRequests = (sessionId) => {
-    if (this.#loadedRequestSessions.has(sessionId)) {
-      return;
-    }
-    for (const event of this.#loadStoredEvents(sessionId)) {
-      if (event.type === "acp") {
-        continue;
-      }
-      const payload = event.payload;
-      if (payload.kind === "prompt.requested") {
-        this.#requests.set(payload.commandId, {
-          commandId: payload.commandId,
-          kind: "requested",
-          sessionId
-        });
-        continue;
-      }
-      if ("event" in payload) {
-        continue;
-      }
-      if (!("commandId" in payload)) {
-        continue;
-      }
-      const state = this.#requests.get(payload.commandId);
-      if (state === void 0) {
-        continue;
-      }
-      if (payload.kind === "prompt.started") {
-        this.#requests.set(payload.commandId, {
-          attemptId: payload.attemptId,
-          commandId: payload.commandId,
-          epoch: payload.epoch,
-          kind: "executing",
-          sessionId
-        });
-      } else if (payload.kind === "prompt.completed" || payload.kind === "prompt.failed" || payload.kind === "prompt.failed-before-start") {
-        this.#requests.delete(payload.commandId);
-      }
-    }
-    this.#loadedRequestSessions.add(sessionId);
-  };
-  #append = (sessionId, payload) => {
-    this.#loadRequests(sessionId);
-    const position = (this.#positions.get(sessionId) ?? 0) + 1;
-    const event = {
-      eventId: `event-${crypto.randomUUID()}`,
-      ...payload,
-      position: position.toString(),
-      provenance: { kind: "original" },
-      recordedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      sessionId
-    };
-    this.#publisher.publishV2(event);
-    this.#positions.set(sessionId, position);
-    return event;
-  };
   requested = (command) => {
-    const content = promptContent(command);
-    this.#append(command.sessionId, {
-      payload: { commandId: command.commandId, content, kind: "prompt.requested" },
-      type: "lifecycle-metadata"
-    });
-    this.#requests.set(command.commandId, {
+    this.#queued.set(command.commandId, {
       commandId: command.commandId,
-      kind: "requested",
+      content: promptContent(command),
       sessionId: command.sessionId
     });
   };
   started = (sessionId, commandId, attemptId, epoch) => {
-    this.#loadRequests(sessionId);
-    const request = this.#requests.get(commandId);
-    if (request?.sessionId !== sessionId) {
-      return;
+    const request = this.#queued.get(commandId);
+    if (request?.sessionId === sessionId) {
+      this.#queued.delete(commandId);
+      return { attemptId, content: request.content, epoch };
     }
-    this.#append(sessionId, {
-      payload: { attemptId, commandId, epoch, kind: "prompt.started" },
-      type: "lifecycle-metadata"
-    });
-    this.#requests.set(commandId, {
-      attemptId,
-      commandId,
-      epoch,
-      kind: "executing",
-      sessionId
-    });
+    throw new Error("The executing prompt was not registered in the V2 queue");
   };
-  record = (sessionId, payload) => {
-    this.#loadRequests(sessionId);
-    this.#append(sessionId, payload);
+  record = (sessionId, event, position) => {
+    this.#publisher.publishV2(this.event(sessionId, position, event, (/* @__PURE__ */ new Date()).toISOString()));
   };
-  #clearCompletedSession = (sessionId) => {
-    if (![...this.#requests.values()].some((request) => request.sessionId === sessionId)) {
-      this.#store.clearExecutingPromptEventsV2(sessionId);
+  event = (sessionId, position, event, recordedAt) => sessionEventV22(this.daemonGenerationId, sessionId, position, event, recordedAt);
+  queueChanged = (_sessionId) => void 0;
+  completed = (sessionId, commandId, _stopReason) => {
+    const request = this.#queued.get(commandId);
+    if (request?.sessionId === sessionId) {
+      this.#queued.delete(commandId);
     }
   };
-  queueChanged = (sessionId) => {
-    this.#append(sessionId, {
-      payload: { kind: "session.queue.changed" },
-      type: "lifecycle-metadata"
-    });
-  };
-  completed = (sessionId, commandId, stopReason) => {
-    this.#loadRequests(sessionId);
-    this.#append(sessionId, {
-      payload: { commandId, kind: "prompt.completed", stopReason },
-      type: "lifecycle-metadata"
-    });
-    this.#requests.delete(commandId);
-    this.#clearCompletedSession(sessionId);
-  };
-  failed = (sessionId, commandId, code, message) => {
-    this.#loadRequests(sessionId);
-    const request = this.#requests.get(commandId);
-    if (request?.kind === "executing" && request.commandId === commandId) {
-      this.#append(sessionId, {
-        payload: {
-          attemptId: request.attemptId,
-          code,
-          commandId,
-          kind: "prompt.failed",
-          message
-        },
-        type: "lifecycle-metadata"
-      });
-    } else {
-      this.#append(sessionId, {
-        payload: { code, commandId, kind: "prompt.failed-before-start", message },
-        type: "lifecycle-metadata"
-      });
-    }
-    this.#requests.delete(commandId);
-    this.#clearCompletedSession(sessionId);
-  };
-  executingPromptRequest = (sessionId) => {
-    this.#loadRequests(sessionId);
-    const request = [...this.#requests.values()].find(
-      (candidate) => candidate.sessionId === sessionId && candidate.kind === "executing"
-    );
-    if (request?.kind !== "executing") {
-      return null;
+  failed = (sessionId, commandId, _code, _message) => {
+    const request = this.#queued.get(commandId);
+    if (request?.sessionId === sessionId) {
+      this.#queued.delete(commandId);
     }
-    const requestEvents = this.#store.readExecutingPromptEventsV2(sessionId);
-    const events = requestEvents.slice(-EXECUTING_PROMPT_EVENT_LIMIT);
-    return {
-      attemptId: request.attemptId,
-      commandId: request.commandId,
-      epoch: request.epoch,
-      events,
-      tailCursor: events.at(-1)?.eventId ?? "",
-      truncated: events.length < requestEvents.length
-    };
   };
+  promptRequestRecovery = (sessionId) => ({
+    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId).map(({ commandId, content }) => ({ commandId, content }))
+  });
 };
 
 // src/run-daemon.ts
@@ -44442,7 +44287,7 @@ async function installDetectedAgentIntegrations(config2, installations, signal)
       {
         agentId: agent.id,
         kind: AGENT_INSTALL_REQUEST_KIND,
-        requestId: `automatic-integration-${randomUUID8()}`
+        requestId: `automatic-integration-${randomUUID9()}`
       },
       signal
     );
@@ -44465,8 +44310,8 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
   );
   await using externalContent = new LocalExternalContentStore(stateDirectory);
   const operations = new DaemonOperationState();
-  const publisher = new DaemonSessionEventPublisher(sessionStore);
-  const eventLogV2 = new DaemonSessionEventLogV2(publisher, sessionStore);
+  const publisher = new DaemonSessionEventPublisher();
+  const eventLogV2 = new DaemonSessionEventLogV2(publisher);
   const activeTurns = new DaemonTurnRegistry(operations);
   const recordSessionEvent = (sessionId, event) => {
     publisher.publish(sessionId, activeTurns.recordEvent(event));