@moxt-ai/mobius 0.0.156 → 0.0.158

package/dist/cli.js

@@ -3381,7 +3381,7 @@ var program = new Command();
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.156",
+  version: "0.0.158",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -24821,16 +24821,15 @@ var threadStartResponseSchema = external_exports.object({
   serviceTier: boundedText(256).nullish(),
   thread: external_exports.object({ id: boundedText(256) })
 });
+var threadTurnSchema = external_exports.object({
+  items: external_exports.array(external_exports.unknown()).max(1e5)
+});
+var threadTurnsSchema = external_exports.array(threadTurnSchema).max(1e5);
 var threadLifecycleResponseSchema = external_exports.object({
   model: boundedText(256).nullish(),
   reasoningEffort: boundedText(256).nullish(),
   serviceTier: boundedText(256).nullish(),
-  thread: external_exports.object({ id: boundedText(256) }),
-  turns: external_exports.array(
-    external_exports.object({
-      items: external_exports.array(external_exports.unknown()).max(1e5)
-    })
-  ).max(1e5).nullish()
+  thread: external_exports.object({ id: boundedText(256), turns: threadTurnsSchema })
 });
 var threadResumeResponseSchema = threadLifecycleResponseSchema;
 var threadForkResponseSchema = threadLifecycleResponseSchema;
@@ -25845,7 +25844,7 @@ var CodexAcpAgent = class {
       this.#nativeSessionId = resumed.thread.id;
       this.#settings.selectRestoredThread(resumed);
       await this.#settings.probeCollaborationMode(this.#nativeSessionId, context.signal);
-      await this.#replayHistory(resumed.turns);
+      await this.#replayHistory(resumed.thread.turns);
       await this.#emitAvailableCommands();
       return { configOptions: this.#settings.configOptions() };
     }).onRequest(methods.agent.session.fork, async (context) => {
@@ -25863,7 +25862,7 @@ var CodexAcpAgent = class {
       this.#nativeSessionId = forked.thread.id;
       this.#settings.selectRestoredThread(forked);
       await this.#settings.probeCollaborationMode(this.#nativeSessionId, context.signal);
-      await this.#replayHistory(forked.turns);
+      await this.#replayHistory(forked.thread.turns);
       await this.#emitAvailableCommands();
       return { configOptions: this.#settings.configOptions(), sessionId: forked.thread.id };
     }).onRequest(methods.agent.session.resume, async (context) => {
@@ -30086,8 +30085,15 @@ var acpSessionUpdateV2Schema = external_exports.discriminatedUnion("sessionUpdat
   }).readonly()
 ]);
 var lifecycleBase = { commandId: identifierStringSchema };
-var sessionEventPayloadV2Schema = external_exports.discriminatedUnion("kind", [
-  external_exports.strictObject({ kind: external_exports.literal("acp.session.update"), update: acpSessionUpdateV2Schema }).readonly(),
+var lifecycleMetadataV2Schema = external_exports.discriminatedUnion("kind", [
+  external_exports.strictObject({ kind: external_exports.literal("session.queue.changed") }).readonly(),
+  external_exports.strictObject({ event: sessionPermissionRequestedEventSchema, kind: external_exports.literal("session.permission.requested") }).readonly(),
+  external_exports.strictObject({ event: sessionPermissionResolvedEventSchema, kind: external_exports.literal("session.permission.resolved") }).readonly(),
+  external_exports.strictObject({
+    event: sessionElicitationRequestedEventSchema,
+    kind: external_exports.literal("session.elicitation.requested")
+  }).readonly(),
+  external_exports.strictObject({ event: sessionElicitationResolvedEventSchema, kind: external_exports.literal("session.elicitation.resolved") }).readonly(),
   external_exports.strictObject({
     ...lifecycleBase,
     content: external_exports.array(contentBlockV2Schema).min(1).max(100).readonly(),
@@ -30109,6 +30115,10 @@ var sessionEventPayloadV2Schema = external_exports.discriminatedUnion("kind", [
     message: external_exports.string().min(1).max(500)
   }).readonly()
 ]);
+var sessionEventPayloadV2Schema = external_exports.discriminatedUnion("type", [
+  external_exports.strictObject({ payload: acpSessionUpdateV2Schema, type: external_exports.literal("acp") }).readonly(),
+  external_exports.strictObject({ payload: lifecycleMetadataV2Schema, type: external_exports.literal("lifecycle-metadata") }).readonly()
+]);
 var positionSchema = external_exports.string().regex(/^(0|[1-9][0-9]*)$/);
 var provenanceSchema = external_exports.discriminatedUnion("kind", [
   external_exports.strictObject({ kind: external_exports.literal("original") }).readonly(),
@@ -30125,13 +30135,62 @@ var provenanceSchema = external_exports.discriminatedUnion("kind", [
     sourceSessionId: identifierStringSchema
   }).readonly()
 ]);
-var sessionEventV2Schema = external_exports.strictObject({
+var sessionEventFieldsV2 = {
   eventId: identifierStringSchema,
-  payload: sessionEventPayloadV2Schema,
   position: positionSchema,
   provenance: provenanceSchema,
   recordedAt: external_exports.iso.datetime({ offset: true }),
   sessionId: identifierStringSchema
+};
+var sessionEventV2Schema = external_exports.discriminatedUnion("type", [
+  external_exports.strictObject({ ...sessionEventFieldsV2, payload: acpSessionUpdateV2Schema, type: external_exports.literal("acp") }).readonly(),
+  external_exports.strictObject({
+    ...sessionEventFieldsV2,
+    payload: lifecycleMetadataV2Schema,
+    type: external_exports.literal("lifecycle-metadata")
+  }).readonly()
+]);
+var sessionExportV2Schema = external_exports.strictObject({
+  binding: external_exports.strictObject({
+    bindingId: identifierStringSchema,
+    runtimeId: identifierStringSchema
+  }).readonly(),
+  events: external_exports.array(sessionEventV2Schema).max(MAX_EVENT_COUNT).readonly(),
+  sessionId: identifierStringSchema,
+  truncated: external_exports.boolean()
+}).readonly().superRefine((session, context) => {
+  let previousPosition = 0n;
+  const eventIds = /* @__PURE__ */ new Set();
+  for (const [index2, event] of session.events.entries()) {
+    if (event.sessionId !== session.sessionId) {
+      context.addIssue({
+        code: "custom",
+        message: "Exported event belongs to a different Session",
+        path: ["events", index2, "sessionId"]
+      });
+    }
+    const position = BigInt(event.position);
+    if (position <= previousPosition) {
+      context.addIssue({
+        code: "custom",
+        message: "Exported events are not in increasing position order",
+        path: ["events", index2, "position"]
+      });
+    }
+    if (eventIds.has(event.eventId)) {
+      context.addIssue({
+        code: "custom",
+        message: "Exported event identities are not unique",
+        path: ["events", index2, "eventId"]
+      });
+    }
+    previousPosition = position;
+    eventIds.add(event.eventId);
+  }
+});
+var mobiusSessionExportV2Schema = external_exports.strictObject({
+  formatVersion: external_exports.literal("2"),
+  session: sessionExportV2Schema
 }).readonly();
 var sessionEventEnvelopeV2Schema = external_exports.strictObject({ event: sessionEventV2Schema, kind: external_exports.literal(SESSION_EVENT_V2_KIND) }).readonly();
 var sessionEventLogPageV2Schema = external_exports.strictObject({
@@ -39397,8 +39456,15 @@ var MemoryAcpSessionStore = class {
   #sessions = /* @__PURE__ */ new Map();
   #deleted = /* @__PURE__ */ new Set();
   #eventsV2 = /* @__PURE__ */ new Map();
-  appendEventV2 = (event) => {
-    this.#eventsV2.set(event.sessionId, [...this.#eventsV2.get(event.sessionId) ?? [], event]);
+  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();
@@ -39429,7 +39495,12 @@ var MemoryAcpSessionStore = class {
     this.#sessions.delete(sessionId);
     this.#eventsV2.delete(sessionId);
   };
-  readEventsV2 = (sessionId) => this.#eventsV2.get(sessionId) ?? [];
+  readExecutingPromptEventsV2 = (sessionId) => [
+    ...this.#eventsV2.get(sessionId) ?? []
+  ];
+  startExecutingPromptEventsV2 = (sessionId, events) => {
+    this.#eventsV2.set(sessionId, [...events]);
+  };
   write = (session) => {
     this.#sessions.set(session.sessionId, session);
   };
@@ -39497,7 +39568,7 @@ var SqliteAcpSessionStore = class {
   close = () => {
     this.#sqliteDatabase.close();
   };
-  appendEventV2 = (event) => {
+  appendExecutingPromptEventV2 = (event) => {
     this.#database.insert(sessionEventV2).values({
       eventId: event.eventId,
       eventJson: JSON.stringify(event),
@@ -39505,6 +39576,22 @@ var SqliteAcpSessionStore = class {
       sessionId: event.sessionId
     }).run();
   };
+  clearExecutingPromptEventsV2 = (sessionId) => {
+    this.#database.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
+  };
+  startExecutingPromptEventsV2 = (sessionId, events) => {
+    this.#database.transaction((transaction) => {
+      transaction.delete(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).run();
+      for (const event of events) {
+        transaction.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) => {
@@ -39527,7 +39614,7 @@ 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));
   };
-  readEventsV2 = (sessionId) => this.#database.select({ eventJson: sessionEventV2.eventJson }).from(sessionEventV2).where(eq(sessionEventV2.sessionId, sessionId)).orderBy(asc(sessionEventV2.position)).all().map((row) => decodeSessionEventV2(row.eventJson));
+  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.#database.transaction((transaction) => {
       transaction.delete(acpSession).where(eq(acpSession.sessionId, sessionId)).run();
@@ -39593,6 +39680,7 @@ var AgentSession = class _AgentSession {
   #configRevision = 0;
   #configOptions = [];
   #lastTerminalCommandId = null;
+  #nativeHistoryOwnership = { kind: "unbound" };
   #prompted = false;
   #nativePrompt = null;
   #sessionLoad = { kind: "not-requested" };
@@ -39713,6 +39801,9 @@ var AgentSession = class _AgentSession {
     return await embedLocalHistoryImages(await loaded.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.",
@@ -40002,6 +40093,7 @@ var AgentSession = class _AgentSession {
         )
       );
       this.selectNativeSession(created.sessionId);
+      this.#nativeHistoryOwnership = { kind: "fresh-session" };
       lifecycleResponse = created;
     }
     this.#configOptions = this.#sessionConfigProtocol.normalizeLifecycle(lifecycleResponse);
@@ -40205,6 +40297,19 @@ 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 prompt = this.buildPrompt(options);
     if (this.#sessionTitle === null || this.#sessionTitle.length === 0) {
       this.#sessionTitle = truncate(options.prompt, 500);
@@ -40365,12 +40470,15 @@ var AgentSession = class _AgentSession {
   onElicitation = (request, signal) => this.#interactions.onElicitation(request, signal);
   onElicitationComplete = (notification) => this.#interactions.onElicitationComplete(notification);
   onUpdate = (notification) => this.#updates.receive(notification);
-  selectNativeSession = (sessionId) => this.#updates.select(sessionId);
+  selectNativeSession = (sessionId) => {
+    this.#updates.select(sessionId);
+    this.#nativeHistoryOwnership = { kind: "agent-owned" };
+  };
   #processUpdate = async (notification) => {
     this.assertNativeSession(notification.sessionId);
     const update = notification.update;
     const rawUpdate = decodeAcpSessionUpdateV2(JSON.stringify(update));
-    if (this.#sessionLoad.kind !== "not-requested") {
+    if (this.#sessionLoad.kind === "capturing") {
       await this.#sessionLoad.history.record(update, rawUpdate);
     } else {
       const onAcpUpdate = this.#getObserver().onAcpUpdate;
@@ -42721,7 +42829,7 @@ var DaemonAcpObserver = class {
     this.#recordV2 = recordV2;
   }
   onAcpUpdate = (sessionId, update) => {
-    this.#recordV2(sessionId, update);
+    this.#recordV2(sessionId, { payload: update, type: "acp" });
     return Promise.resolve();
   };
   onCommands = (event) => {
@@ -42738,10 +42846,18 @@ 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) => {
@@ -42750,10 +42866,18 @@ 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) => {
@@ -45994,25 +46118,16 @@ function replayEvent(sessionId, position, update) {
   const eventId = `native-${createHash6("sha256").update(sessionId).update(":").update(position.toString()).update(":").update(encoded).digest("hex")}`;
   return {
     eventId,
-    payload: { kind: "acp.session.update", update },
+    payload: update,
     position: position.toString(),
     provenance: { kind: "original" },
     recordedAt: "1970-01-01T00:00:00.000Z",
-    sessionId
+    sessionId,
+    type: "acp"
   };
 }
-async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, directories, audit, sessions, localRecovery, executingPromptRequest, signal) {
+async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, directories, audit, sessions, executingPromptRequest, signal) {
   try {
-    const local = localRecovery(command.sessionId, command.eventLimit, command.cursor);
-    if (local !== null) {
-      send(socket, {
-        events: local,
-        kind: "session.live-history.v2.page.loaded",
-        requestId: command.requestId,
-        sessionId: command.sessionId
-      });
-      return;
-    }
     const resolved = await resolveSessionDirectories(
       directories,
       config2.bindingId,
@@ -46896,7 +47011,10 @@ function createDaemonCommandHandler({
     timer,
     resolveEnvironment: resolveAgentCatalogEnvironment
   });
-  const queueChanged = (sessionId) => publisher.publish(sessionId, { kind: "session.queue.changed", sessionId });
+  const queueChanged = (sessionId) => {
+    publisher.publish(sessionId, { kind: "session.queue.changed", sessionId });
+    eventLogV2.queueChanged(sessionId);
+  };
   const activeTurnRecovery = (sessionId) => activeTurns.recovery((command) => command.sessionId === sessionId);
   const nativeRequestHandler = createNativeSessionRequestHandler({
     audit,
@@ -46946,7 +47064,6 @@ function createDaemonCommandHandler({
           directories,
           audit,
           sessions,
-          eventLogV2.recovery,
           eventLogV2.executingPromptRequest,
           signal
         );
@@ -47662,6 +47779,15 @@ var systemDaemonTimer = new SystemDaemonTimer();
 
 // src/session-event-log-v2.ts
 var EXECUTING_PROMPT_EVENT_LIMIT = 1e4;
+function eventArray(tail) {
+  const reversed = [];
+  let node2 = tail;
+  while (node2 !== null) {
+    reversed.push(node2.event);
+    node2 = node2.previous;
+  }
+  return reversed.reverse();
+}
 function promptContent(command) {
   const content = [];
   if (command.prompt.length > 0) {
@@ -47685,27 +47811,8 @@ function promptContent(command) {
   }
   return content;
 }
-function encodeLocalEventCursor(cursor) {
-  return Buffer.from(JSON.stringify(cursor), "utf8").toString("base64url");
-}
-function decodeLocalEventCursor(sessionId, cursor) {
-  try {
-    const value = JSON.parse(Buffer.from(cursor, "base64url").toString("utf8"));
-    if (typeof value !== "object" || value === null || Array.isArray(value) || Object.keys(value).sort().join(",") !== "endEvent,sessionId" || Reflect.get(value, "sessionId") !== sessionId) {
-      throw new Error("Invalid V2 event cursor target");
-    }
-    const endEvent = Reflect.get(value, "endEvent");
-    if (typeof endEvent !== "number" || !Number.isSafeInteger(endEvent) || endEvent < 0) {
-      throw new Error("Invalid V2 event cursor boundary");
-    }
-    return { endEvent, sessionId };
-  } catch (cause) {
-    throw new AcpExecutionError("The native Session event cursor is invalid", { cause }, "invalid_cursor");
-  }
-}
 var DaemonSessionEventLogV2 = class {
   #positions = /* @__PURE__ */ new Map();
-  #events = /* @__PURE__ */ new Map();
   #requests = /* @__PURE__ */ new Map();
   #loadedRequestSessions = /* @__PURE__ */ new Set();
   #publisher;
@@ -47714,13 +47821,8 @@ var DaemonSessionEventLogV2 = class {
     this.#publisher = publisher;
     this.#store = store;
   }
-  #eventsFor = (sessionId) => {
-    const cached2 = this.#events.get(sessionId);
-    if (cached2 !== void 0) {
-      return cached2;
-    }
-    const stored = this.#store.readEventsV2(sessionId);
-    this.#events.set(sessionId, stored);
+  #loadStoredEvents = (sessionId) => {
+    const stored = this.#store.readExecutingPromptEventsV2(sessionId);
     const lastPosition = stored.at(-1)?.position;
     if (lastPosition !== void 0) {
       this.#positions.set(sessionId, Number(lastPosition));
@@ -47731,25 +47833,37 @@ var DaemonSessionEventLogV2 = class {
     if (this.#loadedRequestSessions.has(sessionId)) {
       return;
     }
-    for (const event of this.#eventsFor(sessionId)) {
+    for (const event of this.#loadStoredEvents(sessionId)) {
+      if (event.type === "acp") {
+        const executing = [...this.#requests.values()].find(
+          (request) => request.sessionId === sessionId && request.kind === "executing"
+        );
+        if (executing !== void 0) {
+          this.#requests.set(executing.commandId, {
+            ...executing,
+            eventTail: { event, previous: executing.eventTail }
+          });
+        }
+        continue;
+      }
       const payload = event.payload;
       if (payload.kind === "prompt.requested") {
         this.#requests.set(payload.commandId, {
           commandId: payload.commandId,
-          events: [event],
+          eventTail: { event, previous: null },
           kind: "requested",
           sessionId
         });
         continue;
       }
-      if (payload.kind === "acp.session.update") {
+      if ("event" in payload) {
         const executing = [...this.#requests.values()].find(
           (request) => request.sessionId === sessionId && request.kind === "executing"
         );
         if (executing !== void 0) {
           this.#requests.set(executing.commandId, {
             ...executing,
-            events: [...executing.events, event]
+            eventTail: { event, previous: executing.eventTail }
           });
         }
         continue;
@@ -47761,13 +47875,12 @@ var DaemonSessionEventLogV2 = class {
       if (state === void 0) {
         continue;
       }
-      const events = [...state.events, event];
       if (payload.kind === "prompt.started") {
         this.#requests.set(payload.commandId, {
           attemptId: payload.attemptId,
           commandId: payload.commandId,
           epoch: payload.epoch,
-          events,
+          eventTail: { event, previous: state.eventTail },
           kind: "executing",
           sessionId
         });
@@ -47778,31 +47891,41 @@ var DaemonSessionEventLogV2 = class {
     this.#loadedRequestSessions.add(sessionId);
   };
   #append = (sessionId, payload) => {
-    this.#eventsFor(sessionId);
+    this.#loadRequests(sessionId);
     const position = (this.#positions.get(sessionId) ?? 0) + 1;
     const event = {
       eventId: `event-${crypto.randomUUID()}`,
-      payload,
+      ...payload,
       position: position.toString(),
       provenance: { kind: "original" },
       recordedAt: (/* @__PURE__ */ new Date()).toISOString(),
       sessionId
     };
-    this.#store.appendEventV2(event);
     this.#positions.set(sessionId, position);
-    this.#events.set(sessionId, [...this.#eventsFor(sessionId), event]);
     this.#publisher.publishV2(event);
     return event;
   };
   requested = (command) => {
+    const content = promptContent(command);
     const event = this.#append(command.sessionId, {
-      commandId: command.commandId,
-      content: promptContent(command),
-      kind: "prompt.requested"
+      payload: { commandId: command.commandId, content, kind: "prompt.requested" },
+      type: "lifecycle-metadata"
     });
+    let eventTail = { event, previous: null };
+    for (const block of content) {
+      const userMessageEvent = this.#append(command.sessionId, {
+        payload: {
+          content: block,
+          messageId: command.commandId,
+          sessionUpdate: "user_message_chunk"
+        },
+        type: "acp"
+      });
+      eventTail = { event: userMessageEvent, previous: eventTail };
+    }
     this.#requests.set(command.commandId, {
       commandId: command.commandId,
-      events: [event],
+      eventTail,
       kind: "requested",
       sessionId: command.sessionId
     });
@@ -47813,39 +47936,85 @@ var DaemonSessionEventLogV2 = class {
     if (request?.sessionId !== sessionId) {
       return;
     }
-    const event = this.#append(sessionId, { attemptId, commandId, epoch, kind: "prompt.started" });
+    const event = this.#append(sessionId, {
+      payload: { attemptId, commandId, epoch, kind: "prompt.started" },
+      type: "lifecycle-metadata"
+    });
     this.#requests.set(commandId, {
       attemptId,
       commandId,
       epoch,
-      events: [...request.events, event],
+      eventTail: { event, previous: request.eventTail },
       kind: "executing",
       sessionId
     });
+    this.#store.startExecutingPromptEventsV2(sessionId, eventArray({ event, previous: request.eventTail }));
   };
-  acpUpdate = (sessionId, update) => {
+  record = (sessionId, payload) => {
     this.#loadRequests(sessionId);
-    const event = this.#append(sessionId, { kind: "acp.session.update", update });
+    const event = this.#append(sessionId, payload);
+    this.#appendToExecutingRequest(sessionId, event);
+  };
+  #appendToExecutingRequest = (sessionId, event) => {
     const executing = [...this.#requests.values()].find(
       (request) => request.sessionId === sessionId && request.kind === "executing"
     );
     if (executing !== void 0) {
-      this.#requests.set(executing.commandId, { ...executing, events: [...executing.events, event] });
+      this.#requests.set(executing.commandId, {
+        ...executing,
+        eventTail: { event, previous: executing.eventTail }
+      });
+      this.#store.appendExecutingPromptEventV2(event);
     }
   };
+  queueChanged = (sessionId) => {
+    const event = this.#append(sessionId, {
+      payload: { kind: "session.queue.changed" },
+      type: "lifecycle-metadata"
+    });
+    this.#appendToExecutingRequest(sessionId, event);
+  };
   completed = (sessionId, commandId, stopReason) => {
-    this.#append(sessionId, { commandId, kind: "prompt.completed", stopReason });
+    this.#loadRequests(sessionId);
+    const request = this.#requests.get(commandId);
+    const event = this.#append(sessionId, {
+      payload: { commandId, kind: "prompt.completed", stopReason },
+      type: "lifecycle-metadata"
+    });
     this.#requests.delete(commandId);
+    if (request?.kind === "executing" && request.sessionId === sessionId) {
+      this.#store.clearExecutingPromptEventsV2(sessionId);
+    } else {
+      this.#appendToExecutingRequest(sessionId, event);
+    }
   };
   failed = (sessionId, commandId, code, message) => {
     this.#loadRequests(sessionId);
     const request = this.#requests.get(commandId);
+    let event;
     if (request?.kind === "executing" && request.commandId === commandId) {
-      this.#append(sessionId, { attemptId: request.attemptId, code, commandId, kind: "prompt.failed", message });
+      event = this.#append(sessionId, {
+        payload: {
+          attemptId: request.attemptId,
+          code,
+          commandId,
+          kind: "prompt.failed",
+          message
+        },
+        type: "lifecycle-metadata"
+      });
     } else {
-      this.#append(sessionId, { code, commandId, kind: "prompt.failed-before-start", message });
+      event = this.#append(sessionId, {
+        payload: { code, commandId, kind: "prompt.failed-before-start", message },
+        type: "lifecycle-metadata"
+      });
     }
     this.#requests.delete(commandId);
+    if (request?.kind === "executing" && request.sessionId === sessionId) {
+      this.#store.clearExecutingPromptEventsV2(sessionId);
+    } else {
+      this.#appendToExecutingRequest(sessionId, event);
+    }
   };
   executingPromptRequest = (sessionId) => {
     this.#loadRequests(sessionId);
@@ -47855,42 +48024,15 @@ var DaemonSessionEventLogV2 = class {
     if (request?.kind !== "executing") {
       return null;
     }
-    const events = request.events.slice(-EXECUTING_PROMPT_EVENT_LIMIT);
+    const requestEvents = eventArray(request.eventTail);
+    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 < request.events.length
-    };
-  };
-  recovery = (sessionId, eventLimit, cursor) => {
-    const events = this.#eventsFor(sessionId);
-    if (events.length === 0) {
-      return null;
-    }
-    const executingPromptRequest = this.executingPromptRequest(sessionId);
-    const executingRequestState = [...this.#requests.values()].find(
-      (request) => request.sessionId === sessionId && request.kind === "executing"
-    );
-    const firstExecutingPosition = executingRequestState?.events[0]?.position;
-    const historyEvents = firstExecutingPosition === void 0 ? events : events.filter((event) => BigInt(event.position) < BigInt(firstExecutingPosition));
-    const endEvent = cursor === null ? historyEvents.length : decodeLocalEventCursor(sessionId, cursor).endEvent;
-    if (endEvent > historyEvents.length) {
-      throw new AcpExecutionError("The native Session event cursor is invalid", {}, "invalid_cursor");
-    }
-    const startEvent = Math.max(0, endEvent - eventLimit);
-    const pageEvents = historyEvents.slice(startEvent, endEvent);
-    return {
-      executingPromptRequest,
-      history: {
-        events: pageEvents,
-        nextCursor: startEvent === 0 ? null : encodeLocalEventCursor({ endEvent: startEvent, sessionId }),
-        tailCursor: pageEvents.at(-1)?.eventId ?? "",
-        truncated: startEvent > 0,
-        version: 2
-      }
+      truncated: events.length < requestEvents.length
     };
   };
 };
@@ -47972,7 +48114,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
     publisher.publish(sessionId, activeTurns.recordEvent(event));
   };
   const agentRuntime = new AgentRuntimeManager(
-    new DaemonAcpObserver(recordSessionEvent, eventLogV2.acpUpdate),
+    new DaemonAcpObserver(recordSessionEvent, eventLogV2.record),
     sessionStore,
     {
       read: async (options2, nativeSessionId, nativeTurn) => options2.agent.id === "codex" ? (await readCodexFullHistory(