@moxt-ai/mobius 0.0.175 → 0.0.177

package/dist/runtime.js

@@ -3354,11 +3354,11 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
     return payload;
   };
 });
-function handleArrayResult(result, final, index) {
+function handleArrayResult(result, final, index2) {
   if (result.issues.length) {
-    final.issues.push(...prefixIssues(index, result.issues));
+    final.issues.push(...prefixIssues(index2, result.issues));
   }
-  final.value[index] = result.value;
+  final.value[index2] = result.value;
 }
 var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
   $ZodType.init(inst, def);
@@ -3969,14 +3969,14 @@ function mergeValues(a, b) {
       return { valid: false, mergeErrorPath: [] };
     }
     const newArray = [];
-    for (let index = 0; index < a.length; index++) {
-      const itemA = a[index];
-      const itemB = b[index];
+    for (let index2 = 0; index2 < a.length; index2++) {
+      const itemA = a[index2];
+      const itemB = b[index2];
       const sharedValue = mergeValues(itemA, itemB);
       if (!sharedValue.valid) {
         return {
           valid: false,
-          mergeErrorPath: [index, ...sharedValue.mergeErrorPath]
+          mergeErrorPath: [index2, ...sharedValue.mergeErrorPath]
         };
       }
       newArray.push(sharedValue.data);
@@ -4127,11 +4127,11 @@ function getTupleOptStart(items, key) {
   }
   return 0;
 }
-function handleTupleResult(result, final, index) {
+function handleTupleResult(result, final, index2) {
   if (result.issues.length) {
-    final.issues.push(...prefixIssues(index, result.issues));
+    final.issues.push(...prefixIssues(index2, result.issues));
   }
-  final.value[index] = result.value;
+  final.value[index2] = result.value;
 }
 function handleTupleResults(itemResults, final, items, input2, optoutStart) {
   for (let i = 0; i < items.length; i++) {
@@ -18812,7 +18812,7 @@ function detectVersion(schema, defaultTarget) {
   return defaultTarget ?? "draft-2020-12";
 }
 function applyMinItems(items, minItems) {
-  return items.map((item, index) => index < minItems ? item : item.optional());
+  return items.map((item, index2) => index2 < minItems ? item : item.optional());
 }
 function decodeJSONPointerSegment(segment) {
   return segment.replace(/~1/g, "/").replace(/~0/g, "~");
@@ -19997,12 +19997,12 @@ var DEFAULT_AGENT_EXECUTION_CONFIGURATION = Object.freeze({
 });
 var sessionConfigurationSelectionsSchema = external_exports.array(sessionConfigurationSelectionSchema).max(100).superRefine((selections, context) => {
   const identifiers = /* @__PURE__ */ new Set();
-  for (const [index, selection] of selections.entries()) {
+  for (const [index2, selection] of selections.entries()) {
     if (identifiers.has(selection.configId)) {
       context.addIssue({
         code: "custom",
         message: "Session configuration identifiers must be unique",
-        path: [index, "configId"]
+        path: [index2, "configId"]
       });
     }
     identifiers.add(selection.configId);
@@ -20342,8 +20342,6 @@ function decodeValue(value, schema) {
   }
   return result.data;
 }
-var decodeAgentDisplayContentValue = (value) => decodeValue(value, displayContentSchema);
-var decodeRecordedAgentContentValue = (value) => decodeValue(value, recordedDisplayContentSchema);
 var decodePromptImagesValue = (value) => decodeValue(value, external_exports.array(promptImageSchema).max(8).readonly());
 var decodePromptResourcesValue = (value) => decodeValue(value, external_exports.array(promptResourceSchema).max(16).readonly());
 var decodeSessionConfigurationSelections = (value) => decodeValue(value, sessionConfigurationSelectionsSchema);
@@ -20385,20 +20383,13 @@ var encodeSessionReadyEvent = (message) => encode3(message, sessionReadyEventSch
 var decodeSessionConfigureCommand = (encoded) => decode3(encoded, sessionConfigureCommandSchema);
 var encodeSessionConfigureCommand = (message) => encode3(message, sessionConfigureCommandSchema);
 var decodeSessionConfigUpdatedEvent = (encoded) => decode3(encoded, sessionConfigUpdatedEventSchema);
-var decodeSessionUsageUpdatedEvent = (encoded) => decode3(encoded, sessionUsageUpdatedEventSchema);
-var decodeSessionCommandsUpdatedEvent = (encoded) => decode3(encoded, sessionCommandsUpdatedEventSchema);
-var decodeSessionInfoUpdatedEvent = (encoded) => decode3(encoded, sessionInfoUpdatedEventSchema);
-var decodeSessionPermissionRequestedEvent = (encoded) => decode3(encoded, sessionPermissionRequestedEventSchema);
+var encodeSessionConfigUpdatedEvent = (message) => encode3(message, sessionConfigUpdatedEventSchema);
 var decodeSessionPermissionRespondCommand = (encoded) => decode3(encoded, sessionPermissionRespondCommandSchema);
 var encodeSessionPermissionRespondCommand = (message) => encode3(message, sessionPermissionRespondCommandSchema);
-var decodeSessionPermissionResolvedEvent = (encoded) => decode3(encoded, sessionPermissionResolvedEventSchema);
-var decodeSessionElicitationRequestedEvent = (encoded) => decode3(encoded, sessionElicitationRequestedEventSchema);
 var decodeSessionElicitationRespondCommand = (encoded) => decode3(encoded, sessionElicitationRespondCommandSchema);
 var encodeSessionElicitationRespondCommand = (message) => encode3(message, sessionElicitationRespondCommandSchema);
-var decodeSessionElicitationResolvedEvent = (encoded) => decode3(encoded, sessionElicitationResolvedEventSchema);
 var decodeSessionOperationFailedEvent = (encoded) => decode3(encoded, sessionOperationFailedEventSchema);
 var encodeSessionOperationFailedEvent = (message) => encode3(message, sessionOperationFailedEventSchema);
-var decodeAgentContentEvent = (encoded) => decode3(encoded, agentContentEventSchema);
 var decodeAgentInstallRequestCommand = (encoded) => decode3(encoded, agentInstallRequestCommandSchema);
 var encodeAgentInstallRequestCommand = (message) => encode3(message, agentInstallRequestCommandSchema);
 var decodeAgentInstallCancelCommand = (encoded) => decode3(encoded, agentInstallCancelCommandSchema);
@@ -20424,7 +20415,6 @@ var RUNTIME_HEARTBEAT_KIND = "runtime.heartbeat";
 var RUNTIME_HEARTBEAT_ACK_KIND = "runtime.heartbeat.ack";
 var RUNTIME_PING_KIND = "runtime.ping";
 var RUNTIME_PONG_KIND = "runtime.pong";
-var SESSION_STARTED_KIND = "session.started";
 var SESSION_QUEUED_KIND = "session.queued";
 var AGENT_MESSAGE_DELTA_KIND = "agent.message.delta";
 var AGENT_ACTIVITY_KIND = "agent.activity";
@@ -20434,8 +20424,6 @@ var AGENT_ACTIVITY_RECORDED_FIELD_LIMIT = 4e6;
 var AGENT_ACTIVITY_RECORDED_DETAIL_LIMIT = 6e6;
 var AGENT_ACTIVITY_LOCATION_LIMIT = 12;
 var AGENT_ACTIVITY_LOCATION_LENGTH_LIMIT = 1024;
-var SESSION_COMPLETED_KIND = "session.completed";
-var SESSION_FAILED_KIND = "session.failed";
 var SessionPromptDisposition = Object.freeze({
   Queue: "queue",
   Reject: "reject",
@@ -20446,23 +20434,6 @@ var SessionPromptDisposition = Object.freeze({
 var DIRECTORY_IDENTIFIER_PATTERN2 = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,2047}$/;
 var MAX_PROMPT_LENGTH = 1e4;
 var MAX_PROMPT_ATTACHMENT_LENGTH = 6e6;
-var MAX_EVENT_TEXT_LENGTH = 1e5;
-var ACTIVITY_TYPES = /* @__PURE__ */ new Set(["notice", "plan", "progress", "reasoning", "tool"]);
-var NARRATION_ACTIVITY_TYPES = /* @__PURE__ */ new Set(["progress", "reasoning"]);
-var ACTIVITY_STATUSES = /* @__PURE__ */ new Set(["pending", "running", "completed", "failed"]);
-var TOOL_KINDS = /* @__PURE__ */ new Set([
-  "",
-  "delete",
-  "edit",
-  "execute",
-  "fetch",
-  "move",
-  "other",
-  "read",
-  "search",
-  "switch_mode",
-  "think"
-]);
 var ProtocolMessageError = class extends Error {
   code = "invalid_protocol_message";
   constructor(message, options = {}) {
@@ -20512,13 +20483,6 @@ function readText(value, key, maximumLength) {
   }
   return field;
 }
-function readAllowedString(value, key, allowedValues) {
-  const field = readText(value, key, 64);
-  if (!allowedValues.has(field)) {
-    throw new ProtocolMessageError(`Invalid value field: ${key}`);
-  }
-  return field;
-}
 function readPromptDisposition(value) {
   const field = value["disposition"];
   if (field === void 0 || field === SessionPromptDisposition.Reject) {
@@ -20532,32 +20496,6 @@ function readPromptDisposition(value) {
   }
   throw new ProtocolMessageError("Invalid value field: disposition");
 }
-function readSequence(value, key) {
-  const field = value[key];
-  if (typeof field !== "number" || !Number.isSafeInteger(field) || field < 0) {
-    throw new ProtocolMessageError(`Invalid integer field: ${key}`);
-  }
-  return field;
-}
-function readLocations(value) {
-  const field = value["locations"];
-  if (!Array.isArray(field) || field.length > AGENT_ACTIVITY_LOCATION_LIMIT) {
-    throw new ProtocolMessageError("Invalid locations field");
-  }
-  const locations = [];
-  const unique = /* @__PURE__ */ new Set();
-  for (const location of field) {
-    if (typeof location !== "string" || location.length === 0 || location.length > AGENT_ACTIVITY_LOCATION_LENGTH_LIMIT) {
-      throw new ProtocolMessageError("Invalid activity location");
-    }
-    if (unique.has(location)) {
-      throw new ProtocolMessageError("Duplicate activity location");
-    }
-    unique.add(location);
-    locations.push(location);
-  }
-  return locations;
-}
 function readDirectoryIdentifiers(value, key, maximumCount) {
   const field = value[key];
   if (!Array.isArray(field) || field.length > maximumCount) {
@@ -20574,54 +20512,6 @@ function readDirectoryIdentifiers(value, key, maximumCount) {
   }
   return identifiers;
 }
-function readActivityContent(value) {
-  const field = value["content"];
-  if (!Array.isArray(field) || field.length > 100) {
-    throw new ProtocolMessageError("Invalid activity content field");
-  }
-  return field.map((entry) => decodeAgentDisplayContentValue(entry));
-}
-function readActivityDetail(value) {
-  const field = value["detail"];
-  if (!isRecord(field)) {
-    throw new ProtocolMessageError("Invalid activity detail field");
-  }
-  const kind = readString(field, "kind", 32);
-  if (kind === "available") {
-    return {
-      artifactId: readIdentifier(field, "artifactId"),
-      kind
-    };
-  }
-  if (kind === "unrecorded") {
-    return { kind };
-  }
-  if (kind === "truncated") {
-    const capturedBytes = readSequence(field, "capturedBytes");
-    const originalBytes = readSequence(field, "originalBytes");
-    if (capturedBytes > originalBytes) {
-      throw new ProtocolMessageError("Invalid truncated activity detail size");
-    }
-    return { capturedBytes, kind, originalBytes };
-  }
-  if (kind === "recorded") {
-    const contentValue = field["content"];
-    if (!Array.isArray(contentValue) || contentValue.length > 100) {
-      throw new ProtocolMessageError("Invalid recorded activity content");
-    }
-    const detail = {
-      content: contentValue.map((entry) => decodeRecordedAgentContentValue(entry)),
-      input: readText(field, "input", AGENT_ACTIVITY_RECORDED_FIELD_LIMIT),
-      kind,
-      output: readText(field, "output", AGENT_ACTIVITY_RECORDED_FIELD_LIMIT)
-    };
-    if (JSON.stringify(detail).length > AGENT_ACTIVITY_RECORDED_DETAIL_LIMIT) {
-      throw new ProtocolMessageError("Recorded activity detail is too large");
-    }
-    return detail;
-  }
-  throw new ProtocolMessageError("Invalid activity detail availability");
-}
 function readIdentifier(value, key) {
   try {
     return decodeIdentifier(value[key]);
@@ -20746,82 +20636,6 @@ function decodeRuntimePongEvent(encoded) {
   assertKind(value, RUNTIME_PONG_KIND);
   return { kind: RUNTIME_PONG_KIND, requestId: readIdentifier(value, "requestId") };
 }
-function decodeSessionStartedEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, SESSION_STARTED_KIND);
-  const sequence = readSequence(value, "sequence");
-  if (sequence !== 0) {
-    throw new ProtocolMessageError("Invalid live start sequence");
-  }
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    epoch: readIdentifier(value, "epoch"),
-    kind: SESSION_STARTED_KIND,
-    attemptId: readIdentifier(value, "attemptId"),
-    prompt: readText(value, "prompt", MAX_PROMPT_LENGTH),
-    sequence,
-    sessionId: readIdentifier(value, "sessionId")
-  };
-}
-function decodeAgentMessageDeltaEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_MESSAGE_DELTA_KIND);
-  const sequence = readSequence(value, "sequence");
-  if (sequence === 0) {
-    throw new ProtocolMessageError("Invalid live sequence");
-  }
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    epoch: readIdentifier(value, "epoch"),
-    kind: AGENT_MESSAGE_DELTA_KIND,
-    messageId: value["messageId"] === void 0 ? "" : readText(value, "messageId", 255),
-    sequence,
-    sessionId: readIdentifier(value, "sessionId"),
-    text: readString(value, "text", MAX_EVENT_TEXT_LENGTH)
-  };
-}
-function decodeAgentActivityEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_ACTIVITY_KIND);
-  return {
-    activityId: readIdentifier(value, "activityId"),
-    activityType: readAllowedString(value, "activityType", ACTIVITY_TYPES),
-    commandId: readIdentifier(value, "commandId"),
-    content: readActivityContent(value),
-    detail: readActivityDetail(value),
-    input: readText(value, "input", AGENT_ACTIVITY_DETAIL_LIMIT),
-    kind: AGENT_ACTIVITY_KIND,
-    locations: readLocations(value),
-    name: readText(value, "name", 128),
-    output: readText(value, "output", AGENT_ACTIVITY_DETAIL_LIMIT),
-    sequence: readSequence(value, "sequence"),
-    sessionId: readIdentifier(value, "sessionId"),
-    status: readAllowedString(value, "status", ACTIVITY_STATUSES),
-    title: readString(value, "title", 500),
-    toolKind: readAllowedString(value, "toolKind", TOOL_KINDS)
-  };
-}
-function decodeSessionCompletedEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, SESSION_COMPLETED_KIND);
-  return {
-    commandId: readIdentifier(value, "commandId"),
-    kind: SESSION_COMPLETED_KIND,
-    sessionId: readIdentifier(value, "sessionId"),
-    stopReason: readString(value, "stopReason", 64)
-  };
-}
-function decodeSessionFailedEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, SESSION_FAILED_KIND);
-  return {
-    code: readIdentifier(value, "code"),
-    commandId: readIdentifier(value, "commandId"),
-    kind: SESSION_FAILED_KIND,
-    message: readString(value, "message", 500),
-    sessionId: readIdentifier(value, "sessionId")
-  };
-}
 function encodeSessionPromptCommand(message) {
   return JSON.stringify(decodeSessionPromptCommand(JSON.stringify(message)));
 }
@@ -20849,19 +20663,6 @@ function encodeRuntimePingCommand(message) {
 function encodeRuntimePongEvent(message) {
   return JSON.stringify(decodeRuntimePongEvent(JSON.stringify(message)));
 }
-function decodeAgentActivityNarrationEvent(encoded) {
-  const value = parseJson2(encoded);
-  assertKind(value, AGENT_ACTIVITY_NARRATION_KIND);
-  return {
-    activityId: readIdentifier(value, "activityId"),
-    activityType: readAllowedString(value, "activityType", NARRATION_ACTIVITY_TYPES),
-    commandId: readIdentifier(value, "commandId"),
-    kind: AGENT_ACTIVITY_NARRATION_KIND,
-    sequence: readSequence(value, "sequence"),
-    sessionId: readIdentifier(value, "sessionId"),
-    text: readText(value, "text", MAX_EVENT_TEXT_LENGTH)
-  };
-}
 
 // ../protocol/src/session-history.ts
 var SESSION_HISTORY_CHARACTER_LIMIT = 256e3;
@@ -21430,6 +21231,11 @@ var acpSessionUpdateV2Schema = external_exports.discriminatedUnion("sessionUpdat
   }).readonly()
 ]);
 var lifecycleBase = { commandId: identifierStringSchema };
+var promptExecutionContextV2Schema = external_exports.object({
+  agentId: identifierStringSchema,
+  directoryId: shortString,
+  additionalDirectoryIds: external_exports.array(identifierStringSchema).max(16).readonly()
+}).readonly();
 var lifecycleMetadataV2Schema = external_exports.discriminatedUnion("kind", [
   external_exports.object({ kind: external_exports.literal("session.queue.changed") }).readonly(),
   external_exports.object({ event: sessionPermissionRequestedEventSchema, kind: external_exports.literal("session.permission.requested") }).readonly(),
@@ -21439,7 +21245,8 @@ var lifecycleMetadataV2Schema = external_exports.discriminatedUnion("kind", [
   external_exports.object({
     ...lifecycleBase,
     content: external_exports.array(contentBlockV2Schema).min(1).max(100).readonly(),
-    kind: external_exports.literal("prompt.requested")
+    kind: external_exports.literal("prompt.requested"),
+    context: promptExecutionContextV2Schema.optional()
   }).readonly(),
   external_exports.object({ ...lifecycleBase, attemptId: identifierStringSchema, epoch: identifierStringSchema, kind: external_exports.literal("prompt.started") }).readonly(),
   external_exports.object({ ...lifecycleBase, kind: external_exports.literal("prompt.completed"), stopReason: shortString }).readonly(),
@@ -21503,12 +21310,12 @@ var sessionExportV2Schema = external_exports.object({
 }).readonly().superRefine((session, context) => {
   let previousPosition = 0n;
   const eventIds = /* @__PURE__ */ new Set();
-  for (const [index, event] of session.events.entries()) {
+  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", index, "sessionId"]
+        path: ["events", index2, "sessionId"]
       });
     }
     const position = BigInt(event.position);
@@ -21516,14 +21323,14 @@ var sessionExportV2Schema = external_exports.object({
       context.addIssue({
         code: "custom",
         message: "Exported events are not in increasing position order",
-        path: ["events", index, "position"]
+        path: ["events", index2, "position"]
       });
     }
     if (eventIds.has(event.eventId)) {
       context.addIssue({
         code: "custom",
         message: "Exported event identities are not unique",
-        path: ["events", index, "eventId"]
+        path: ["events", index2, "eventId"]
       });
     }
     previousPosition = position;
@@ -21574,98 +21381,11 @@ 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);
 
-// ../protocol/src/session-events.ts
-var SESSION_EVENT_KIND = "session.event";
-var SESSION_FORKED_KIND = "session.forked";
-var MAX_RECORDED_EVENT_LENGTH = 8 * 1024 * 1024;
-var sessionEventEnvelopeSchema = external_exports.object({
-  kind: external_exports.literal(SESSION_EVENT_KIND),
-  payload: external_exports.string().min(2).max(MAX_RECORDED_EVENT_LENGTH),
-  sessionId: identifierStringSchema
-}).readonly();
-var SESSION_QUEUE_CHANGED_KIND = "session.queue.changed";
-var sessionQueueChangedSchema = external_exports.object({ kind: external_exports.literal(SESSION_QUEUE_CHANGED_KIND), sessionId: identifierStringSchema }).readonly();
-var sessionForkedSchema = external_exports.object({
-  kind: external_exports.literal(SESSION_FORKED_KIND),
-  sessionId: identifierStringSchema,
-  sourceSessionId: identifierStringSchema,
-  throughCommandId: identifierStringSchema
-}).readonly();
-function decode6(encoded, schema) {
-  let value;
-  try {
-    value = JSON.parse(encoded);
-  } catch (cause) {
-    throw new ProtocolMessageError("Message is not valid JSON", { cause });
-  }
-  const decoded = schema.safeParse(value);
-  if (!decoded.success) {
-    throw new ProtocolMessageError("Message does not match its schema", {
-      cause: decoded.error
-    });
-  }
-  return decoded.data;
-}
-var encode5 = (message, schema) => {
-  const decoded = schema.safeParse(message);
-  if (!decoded.success) {
-    throw new ProtocolMessageError("Message does not match its schema", {
-      cause: decoded.error
-    });
-  }
-  return JSON.stringify(decoded.data);
-};
-var decodeSessionEventEnvelope = (encoded) => decode6(encoded, sessionEventEnvelopeSchema);
-var encodeSessionEventEnvelope = (message) => encode5(message, sessionEventEnvelopeSchema);
-function decodeRecordedSessionEvent(encoded) {
-  const kind = decodeMessageKind(encoded);
-  switch (kind) {
-    case SESSION_QUEUE_CHANGED_KIND:
-      return decode6(encoded, sessionQueueChangedSchema);
-    case SESSION_FORKED_KIND:
-      return decode6(encoded, sessionForkedSchema);
-    case AGENT_ACTIVITY_KIND:
-      return decodeAgentActivityEvent(encoded);
-    case AGENT_ACTIVITY_NARRATION_KIND:
-      return decodeAgentActivityNarrationEvent(encoded);
-    case AGENT_CONTENT_KIND:
-      return decodeAgentContentEvent(encoded);
-    case AGENT_MESSAGE_DELTA_KIND:
-      return decodeAgentMessageDeltaEvent(encoded);
-    case SESSION_COMMANDS_UPDATED_KIND:
-      return decodeSessionCommandsUpdatedEvent(encoded);
-    case SESSION_COMPLETED_KIND:
-      return decodeSessionCompletedEvent(encoded);
-    case SESSION_CONFIG_UPDATED_KIND:
-      return decodeSessionConfigUpdatedEvent(encoded);
-    case SESSION_ELICITATION_REQUESTED_KIND:
-      return decodeSessionElicitationRequestedEvent(encoded);
-    case SESSION_ELICITATION_RESOLVED_KIND:
-      return decodeSessionElicitationResolvedEvent(encoded);
-    case SESSION_FAILED_KIND:
-      return decodeSessionFailedEvent(encoded);
-    case SESSION_INFO_UPDATED_KIND:
-      return decodeSessionInfoUpdatedEvent(encoded);
-    case SESSION_PERMISSION_REQUESTED_KIND:
-      return decodeSessionPermissionRequestedEvent(encoded);
-    case SESSION_PERMISSION_RESOLVED_KIND:
-      return decodeSessionPermissionResolvedEvent(encoded);
-    case SESSION_READY_KIND:
-      return decodeSessionReadyEvent(encoded);
-    case SESSION_STARTED_KIND:
-      return decodeSessionStartedEvent(encoded);
-    case SESSION_USAGE_UPDATED_KIND:
-      return decodeSessionUsageUpdatedEvent(encoded);
-    default:
-      throw new UnsupportedProtocolMessageKindError("daemon-to-service", kind);
-  }
-}
-var encodeRecordedSessionEvent = (event) => JSON.stringify(decodeRecordedSessionEvent(JSON.stringify(event)));
-
 // ../protocol/src/session-live-history.ts
 var SESSION_LIVE_HISTORY_V2_PAGE_LOAD_KIND = "session.live-history.v2.page.load";
 var SESSION_LIVE_HISTORY_V2_PAGE_LOADED_KIND = "session.live-history.v2.page.loaded";
@@ -21687,7 +21407,7 @@ var sessionLiveHistoryV2PageLoadedSchema = external_exports.object({
   requestId: identifierStringSchema,
   sessionId: identifierStringSchema
 }).readonly();
-function decode7(schema, encoded) {
+function decode6(schema, encoded) {
   try {
     const value = JSON.parse(encoded);
     return schema.parse(value);
@@ -21695,8 +21415,8 @@ function decode7(schema, encoded) {
     throw new ProtocolMessageError("Invalid live Session history message", { cause });
   }
 }
-var decodeSessionLiveHistoryV2PageLoad = (encoded) => decode7(sessionLiveHistoryV2PageLoadSchema, encoded);
-var decodeSessionLiveHistoryV2PageLoaded = (encoded) => decode7(sessionLiveHistoryV2PageLoadedSchema, encoded);
+var decodeSessionLiveHistoryV2PageLoad = (encoded) => decode6(sessionLiveHistoryV2PageLoadSchema, encoded);
+var decodeSessionLiveHistoryV2PageLoaded = (encoded) => decode6(sessionLiveHistoryV2PageLoadedSchema, encoded);
 var encodeSessionLiveHistoryV2PageLoad = (value) => JSON.stringify(sessionLiveHistoryV2PageLoadSchema.parse(value));
 var encodeSessionLiveHistoryV2PageLoaded = (value) => JSON.stringify(sessionLiveHistoryV2PageLoadedSchema.parse(value));
 
@@ -21810,6 +21530,11 @@ function decodeServiceToDaemonMessage(encoded) {
   return signature.decoder(encoded);
 }
 var daemonToServiceSignatures = {
+  [SESSION_CONFIG_UPDATED_KIND]: defineMessageSignature(
+    SESSION_CONFIG_UPDATED_KIND,
+    encodeSessionConfigUpdatedEvent,
+    decodeSessionConfigUpdatedEvent
+  ),
   [AGENT_INSTALL_CANCELLED_KIND]: defineMessageSignature(
     AGENT_INSTALL_CANCELLED_KIND,
     encodeAgentInstallCancelledEvent,
@@ -21880,11 +21605,6 @@ var daemonToServiceSignatures = {
     decodeRuntimeHeartbeatEvent
   ),
   [RUNTIME_PONG_KIND]: defineMessageSignature(RUNTIME_PONG_KIND, encodeRuntimePongEvent, decodeRuntimePongEvent),
-  [SESSION_EVENT_KIND]: defineMessageSignature(
-    SESSION_EVENT_KIND,
-    encodeSessionEventEnvelope,
-    decodeSessionEventEnvelope
-  ),
   [SESSION_EVENT_V2_KIND]: defineMessageSignature(
     SESSION_EVENT_V2_KIND,
     encodeSessionEventEnvelopeV2,
@@ -24625,14 +24345,6 @@ var CodexAcpAgent = class {
       if (isCompactPrompt(context.params.prompt)) {
         return await this.#compact(context.signal);
       }
-      const messageId = crypto.randomUUID();
-      for (const content of context.params.prompt) {
-        await this.#emit({
-          content,
-          messageId,
-          sessionUpdate: "user_message_chunk"
-        });
-      }
       return await this.#runTurn(promptInput(context.params.prompt), context.signal);
     }).onRequest(
       "_session/steering",
@@ -25118,10 +24830,6 @@ var CodexAcpAgent = class {
     if (steering.length === 0) {
       throw new AcpExecutionError("Codex received an empty steering request", {}, "invalid_request");
     }
-    const messageId = crypto.randomUUID();
-    for (const block of steering) {
-      await this.#emit({ content: block.content, messageId, sessionUpdate: "user_message_chunk" });
-    }
     const response = turnSteerResponseSchema.parse(
       await this.#appServer.request(
         "turn/steer",
@@ -26565,9 +26273,9 @@ function comparePrerelease(left, right) {
   if (left.length === 0 || right.length === 0) {
     return left.length === right.length ? 0 : left.length === 0 ? 1 : -1;
   }
-  for (let index = 0; index < Math.max(left.length, right.length); index += 1) {
-    const leftPart = left[index];
-    const rightPart = right[index];
+  for (let index2 = 0; index2 < Math.max(left.length, right.length); index2 += 1) {
+    const leftPart = left[index2];
+    const rightPart = right[index2];
     if (leftPart === void 0 || rightPart === void 0) {
       return leftPart === rightPart ? 0 : leftPart === void 0 ? -1 : 1;
     }
@@ -26592,8 +26300,8 @@ function compareAgentVersions(left, right) {
   if (parsedLeft === null || parsedRight === null) {
     return null;
   }
-  for (let index = 0; index < Math.max(parsedLeft.core.length, parsedRight.core.length); index += 1) {
-    const difference = (parsedLeft.core[index] ?? 0) - (parsedRight.core[index] ?? 0);
+  for (let index2 = 0; index2 < Math.max(parsedLeft.core.length, parsedRight.core.length); index2 += 1) {
+    const difference = (parsedLeft.core[index2] ?? 0) - (parsedRight.core[index2] ?? 0);
     if (difference !== 0) {
       return Math.sign(difference);
     }
@@ -27080,7 +26788,7 @@ function createDaemonConfig(connection, agents = [], installableAgents = [], loc
 }
 
 // src/run-daemon.ts
-import { createHash as createHash7, randomUUID as randomUUID8 } from "node:crypto";
+import { createHash as createHash7, randomUUID as randomUUID9 } from "node:crypto";
 import { join as join18 } from "node:path";
 import { styleText } from "node:util";
 
@@ -27203,7 +26911,7 @@ function startsWith(bytes, signature, offset = 0) {
   if (bytes.byteLength < offset + signature.byteLength) {
     return false;
   }
-  return signature.every((value, index) => bytes[offset + index] === value);
+  return signature.every((value, index2) => bytes[offset + index2] === value);
 }
 function sniffRasterMime(bytes) {
   if (startsWith(bytes, PNG_SIGNATURE)) {
@@ -27331,7 +27039,7 @@ function startsWith2(bytes, signature, offset = 0) {
   if (bytes.byteLength < offset + signature.byteLength) {
     return false;
   }
-  return signature.every((value, index) => bytes[offset + index] === value);
+  return signature.every((value, index2) => bytes[offset + index2] === value);
 }
 function sniffVideoMime(bytes) {
   if (startsWith2(bytes, MP4_FILE_TYPE, 4)) {
@@ -27460,10 +27168,10 @@ async function replaceImageMarkers(text2, replace) {
   let cursor = 0;
   let rewritten = "";
   for (const match of matches) {
-    const index = match.index ?? 0;
-    rewritten += text2.slice(cursor, index);
+    const index2 = match.index ?? 0;
+    rewritten += text2.slice(cursor, index2);
     rewritten += await replace(match[1] ?? "");
-    cursor = index + match[0].length;
+    cursor = index2 + match[0].length;
   }
   return `${rewritten}${text2.slice(cursor)}`;
 }
@@ -28697,9 +28405,9 @@ function historyContentCharacters(messages) {
 var AcpHistoryReplay = class {
   #activities = /* @__PURE__ */ new Map();
   #messages = [];
-  #events = [];
-  #records = [];
+  #events;
   #turnActivityIds = /* @__PURE__ */ new Set();
+  #sessionId;
   #activityTracker = new AcpActivityTracker(
     async (activity2) => {
       this.#activities.set(activity2.activityId, activity2);
@@ -28720,10 +28428,16 @@ var AcpHistoryReplay = class {
   #firstMessageIndex = 0;
   #characters = 0;
   #truncated = false;
+  constructor(events, sessionId) {
+    this.#events = events;
+    this.#sessionId = sessionId;
+  }
   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);
+    const position = this.#events.append(this.#sessionId, { payload: rawUpdate, type: "acp" });
+    await onRecorded(position);
+    return await this.#applyUpdate(update, position);
+  };
+  #applyUpdate = async (update, position) => {
     if (update.sessionUpdate === "agent_thought_chunk") {
       if (update.content.type === "text") {
         await this.#activityTracker.recordNarrative(
@@ -28732,30 +28446,30 @@ var AcpHistoryReplay = class {
           update.content.text
         );
       }
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "tool_call") {
       await this.#activityTracker.recordToolCall(update);
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "tool_call_update") {
       await this.#activityTracker.recordToolCallUpdate(update);
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "plan") {
       await this.#activityTracker.recordPlan(update);
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "plan_update") {
       await this.#activityTracker.recordPlanUpdate(update);
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "plan_removed") {
       await this.#activityTracker.removePlan(update);
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate !== "user_message_chunk" && update.sessionUpdate !== "agent_message_chunk") {
-      return this.#events.length;
+      return position;
     }
     if (update.sessionUpdate === "agent_message_chunk" && isProgressMessage(update)) {
       if (update.content.type === "text") {
@@ -28765,18 +28479,18 @@ var AcpHistoryReplay = class {
           update.content.text
         );
       }
-      return this.#events.length;
+      return position;
     }
     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 this.#events.length;
+      return position;
     }
     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 this.#events.length;
+      return position;
     }
     const previous = this.#messages.at(-1);
     const id = update.messageId ?? null;
@@ -28803,41 +28517,32 @@ var AcpHistoryReplay = class {
     this.#characters += bounded2.length;
     this.#lastMessageId = id;
     this.trimMessages();
-    return this.#events.length;
+    return position;
   };
   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;
+    return this.#events.append(this.#sessionId, event);
   };
-  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);
-      }
+    await replay.#activityTracker.finish();
+    for (const [activityId, activity2] of replay.#activities) {
+      this.#activities.set(activityId, activity2);
     }
-  };
-  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");
+    for (const message of replay.#messages.slice(replay.#firstMessageIndex)) {
+      this.#messages.push(message);
+      this.#characters += message.text.length;
     }
-    const endUpdate = parsedCursor;
-    const startUpdate = Math.max(0, endUpdate - eventLimit);
-    return {
-      nextCursor: startUpdate === 0 ? null : startUpdate.toString(),
-      startPosition: startUpdate + 1,
-      truncated: startUpdate > 0,
-      events: events.slice(startUpdate, endUpdate)
-    };
+    this.#turnActivityIds.clear();
+    for (const activityId of replay.#turnActivityIds) {
+      this.#turnActivityIds.add(activityId);
+    }
+    this.#lastMessageId = replay.#lastMessageId;
+    this.#truncated ||= replay.#truncated;
+    this.trimMessages();
   };
+  eventPage = (eventLimit, cursor) => this.#events.page(this.#sessionId, eventLimit, cursor);
   snapshot = async () => {
     await this.#activityTracker.finish();
     const messages = this.#messages.slice(this.#firstMessageIndex).map((message) => {
@@ -29470,9 +29175,7 @@ var AcpSessionInteractions = class {
 };
 
 // src/acp/session-store.ts
-import { chmodSync, mkdirSync } from "node:fs";
-import { dirname as dirname3 } from "node:path";
-import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
+import { randomUUID } from "node:crypto";
 
 // ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/entity.js
 var entityKind = /* @__PURE__ */ Symbol.for("drizzle:entityKind");
@@ -30588,7 +30291,7 @@ function haveSameKeys(left, right) {
   const leftKeys = Object.keys(left);
   const rightKeys = Object.keys(right);
   if (leftKeys.length !== rightKeys.length) return false;
-  for (const [index, key] of leftKeys.entries()) if (key !== rightKeys[index]) return false;
+  for (const [index2, key] of leftKeys.entries()) if (key !== rightKeys[index2]) return false;
   return true;
 }
 function mapUpdateSet(table, values) {
@@ -31341,195 +31044,6 @@ var NoopLogger = class {
   }
 };
 
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/count.js
-var SQLiteCountBuilder = class SQLiteCountBuilder2 extends SQL {
-  static [entityKind] = "SQLiteCountBuilder";
-  dialect;
-  session;
-  static buildCount(source, filters, parens) {
-    const query = sql`select count(*) from ${source}${sql` where ${filters}`.if(filters)}`;
-    return parens ? sql`(${query})` : query;
-  }
-  constructor(countConfig) {
-    super(SQLiteCountBuilder2.buildCount(countConfig.source, countConfig.filters, true).queryChunks);
-    this.countConfig = countConfig;
-    this.dialect = countConfig.dialect;
-    this.session = countConfig.session;
-    this.mapWith((e) => {
-      if (typeof e === "number") return e;
-      return Number(e ?? 0);
-    });
-  }
-  executableSql;
-  build() {
-    if (!this.executableSql) {
-      const { source, filters } = this.countConfig;
-      this.executableSql = SQLiteCountBuilder2.buildCount(source, filters);
-    }
-    return this.dialect.sqlToQuery(this.executableSql);
-  }
-};
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/count.js
-var SQLiteAsyncCountBuilder = class extends SQLiteCountBuilder {
-  static [entityKind] = "SQLiteAsyncCountBuilder";
-  constructor(countConfig) {
-    super(countConfig);
-  }
-  /** @internal */
-  executeRaw(placeholderValues) {
-    return this.session.prepareQuery(this.build(), "arrays", false, "all", (rows) => {
-      const v = rows[0]?.[0];
-      if (typeof v === "number") return v;
-      return v ? Number(v) : 0;
-    }).execute(placeholderValues);
-  }
-  async execute(placeholderValues) {
-    return await this.executeRaw(placeholderValues);
-  }
-};
-applyMixins(SQLiteAsyncCountBuilder, [QueryPromise]);
-var SQLiteSyncCountBuilder = class extends SQLiteAsyncCountBuilder {
-  static [entityKind] = "SQLiteSyncCountBuilder";
-  sync(placeholderValues) {
-    return this.executeRaw(placeholderValues).sync();
-  }
-};
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/query.js
-var RelationalQueryBuilder = class {
-  static [entityKind] = "SQLiteRelationalQueryBuilderV2";
-  constructor(mode, schema, table, tableConfig, dialect, session, forbidJsonb, builder = SQLiteRelationalQuery) {
-    this.mode = mode;
-    this.schema = schema;
-    this.table = table;
-    this.tableConfig = tableConfig;
-    this.dialect = dialect;
-    this.session = session;
-    this.forbidJsonb = forbidJsonb;
-    this.builder = builder;
-  }
-  findMany(config2) {
-    return new this.builder(this.mode, this.schema, this.table, this.tableConfig, this.dialect, this.session, config2 ?? true, "many", this.forbidJsonb);
-  }
-  findFirst(config2) {
-    return new this.builder(this.mode, this.schema, this.table, this.tableConfig, this.dialect, this.session, config2 ?? true, "first", this.forbidJsonb);
-  }
-};
-var SQLiteRelationalQuery = class {
-  static [entityKind] = "SQLiteRelationalQueryV2";
-  /** @internal */
-  mode;
-  /** @internal */
-  table;
-  /** @internal */
-  resultKind;
-  constructor(resultKind, schema, table, tableConfig, dialect, session, config2, mode, forbidJsonb) {
-    this.schema = schema;
-    this.tableConfig = tableConfig;
-    this.dialect = dialect;
-    this.session = session;
-    this.config = config2;
-    this.forbidJsonb = forbidJsonb;
-    this.resultKind = resultKind;
-    this.mode = mode;
-    this.table = table;
-  }
-  getSQL() {
-    return this._getQuery().sql;
-  }
-  _getQuery() {
-    const jsonb = this.forbidJsonb ? sql`json` : sql`jsonb`;
-    return this.dialect.buildRelationalQuery({
-      schema: this.schema,
-      table: this.table,
-      tableConfig: this.tableConfig,
-      queryConfig: this.config,
-      mode: this.mode,
-      jsonb
-    });
-  }
-  _toSQL() {
-    const query = this._getQuery();
-    return {
-      query,
-      builtQuery: this.dialect.sqlToQuery(query.sql)
-    };
-  }
-  toSQL() {
-    return this._toSQL().builtQuery;
-  }
-};
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/query.js
-var SQLiteAsyncRelationalQuery = class extends SQLiteRelationalQuery {
-  static [entityKind] = "SQLiteAsyncRelationalQueryV2";
-  /** @internal */
-  _prepare(prepare = false) {
-    const { query, builtQuery } = this._toSQL();
-    const mapper = this.dialect.mapperGenerators.relationalRows({
-      isFirst: this.mode === "first",
-      parseJson: true,
-      parseJsonIfString: false,
-      rootJsonMappers: false,
-      selection: query.selection,
-      arrayModeRoot: true
-    });
-    return this.session.prepareQuery(builtQuery, "arrays", prepare, "all", mapper);
-  }
-  prepare() {
-    return this._prepare(true);
-  }
-  async execute(placeholderValues) {
-    return this._prepare().execute(placeholderValues);
-  }
-};
-var SQLiteSyncRelationalQuery = class extends SQLiteAsyncRelationalQuery {
-  static [entityKind] = "SQLiteSyncRelationalQueryV2";
-  sync(placeholderValues) {
-    return this._prepare().execute(placeholderValues).sync();
-  }
-};
-applyMixins(SQLiteAsyncRelationalQuery, [QueryPromise]);
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/selection-proxy.js
-var SelectionProxyHandler = class SelectionProxyHandler2 {
-  static [entityKind] = "SelectionProxyHandler";
-  config;
-  constructor(config2) {
-    this.config = { ...config2 };
-  }
-  get(subquery, prop) {
-    if (prop === "_") return {
-      ...subquery["_"],
-      selectedFields: new Proxy(subquery._.selectedFields, this)
-    };
-    if (prop === ViewBaseConfig) return {
-      ...subquery[ViewBaseConfig],
-      selectedFields: new Proxy(subquery[ViewBaseConfig].selectedFields, this)
-    };
-    if (typeof prop === "symbol") return subquery[prop];
-    const value = (is(subquery, Subquery) ? subquery._.selectedFields : is(subquery, View) ? subquery[ViewBaseConfig].selectedFields : subquery)[prop];
-    if (is(value, SQL.Aliased)) {
-      if (this.config.sqlAliasedBehavior === "sql" && !value.isSelectionField) return value.sql;
-      const newValue = value.clone();
-      newValue.isSelectionField = true;
-      newValue.origin = this.config.alias;
-      return newValue;
-    }
-    if (is(value, SQL)) {
-      if (this.config.sqlBehavior === "sql") return value;
-      throw new Error(`You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias declared. Please add an alias to the field using ".as('alias')" method.`);
-    }
-    if (is(value, Column)) {
-      if (this.config.alias) return new Proxy(value, new ColumnTableAliasProxyHandler(new Proxy(value.table, new TableAliasProxyHandler(this.config.alias, this.config.replaceOriginalName ?? false, true)), true));
-      return value;
-    }
-    if (typeof value !== "object" || value === null) return value;
-    return new Proxy(value, new SelectionProxyHandler2(this.config));
-  }
-};
-
 // ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/foreign-keys.js
 var ForeignKeyBuilder = class {
   static [entityKind] = "SQLiteForeignKeyBuilder";
@@ -32094,130 +31608,144 @@ function sqliteTableWithCasing(casing) {
 }
 var sqliteTable = sqliteTableWithCasing(void 0);
 
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/utils.js
-function extractUsedTable(table) {
-  if (is(table, SQLiteTable)) return [`${table[Table.Symbol.BaseName]}`];
-  if (is(table, Subquery)) return table._.usedTables ?? [];
-  if (is(table, SQL)) return table.usedTables ?? [];
-  return [];
-}
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/delete.js
-var SQLiteDeleteBase = class {
-  static [entityKind] = "SQLiteDelete";
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/indexes.js
+var IndexBuilderOn = class {
+  static [entityKind] = "SQLiteIndexBuilderOn";
+  constructor(name2, unique) {
+    this.name = name2;
+    this.unique = unique;
+  }
+  on(...columns) {
+    return new IndexBuilder(this.name, columns, this.unique);
+  }
+};
+var IndexBuilder = class {
+  static [entityKind] = "SQLiteIndexBuilder";
   /** @internal */
   config;
-  constructor(table, session, dialect, withList) {
-    this.table = table;
-    this.session = session;
-    this.dialect = dialect;
+  constructor(name2, columns, unique) {
     this.config = {
-      table,
-      withList
+      name: name2,
+      columns,
+      unique,
+      where: void 0
     };
   }
   /**
-  * Adds a `where` clause to the query.
-  *
-  * Calling this method will delete only those rows that fulfill a specified condition.
-  *
-  * See docs: {@link https://orm.drizzle.team/docs/delete}
-  *
-  * @param where the `where` clause.
-  *
-  * @example
-  * You can use conditional operators and `sql function` to filter the rows to be deleted.
-  *
-  * ```ts
-  * // Delete all cars with green color
-  * db.delete(cars).where(eq(cars.color, 'green'));
-  * // or
-  * db.delete(cars).where(sql`${cars.color} = 'green'`)
-  * ```
-  *
-  * You can logically combine conditional operators with `and()` and `or()` operators:
-  *
-  * ```ts
-  * // Delete all BMW cars with a green color
-  * db.delete(cars).where(and(eq(cars.color, 'green'), eq(cars.brand, 'BMW')));
-  *
-  * // Delete all cars with the green or blue color
-  * db.delete(cars).where(or(eq(cars.color, 'green'), eq(cars.color, 'blue')));
-  * ```
+  * Condition for partial index.
   */
-  where(where) {
-    this.config.where = where;
-    return this;
-  }
-  orderBy(...columns) {
-    if (typeof columns[0] === "function") {
-      const orderBy = columns[0](new Proxy(this.config.table[Table.Symbol.Columns], new SelectionProxyHandler({
-        sqlAliasedBehavior: "alias",
-        sqlBehavior: "sql"
-      })));
-      const orderByArray = Array.isArray(orderBy) ? orderBy : [orderBy];
-      this.config.orderBy = orderByArray;
-    } else {
-      const orderByArray = columns;
-      this.config.orderBy = orderByArray;
-    }
-    return this;
-  }
-  limit(limit) {
-    this.config.limit = limit;
-    return this;
-  }
-  returning(fields = this.table[SQLiteTable.Symbol.Columns]) {
-    this.config.returning = orderSelectedFields(fields);
+  where(condition) {
+    this.config.where = condition;
     return this;
   }
-  getSQL() {
-    return this.dialect.buildDeleteQuery(this.config);
-  }
-  toSQL() {
-    return this.dialect.sqlToQuery(this.getSQL());
+  /** @internal */
+  build(table) {
+    return new Index(this.config, table);
   }
-  $dynamic() {
-    return this;
+};
+var Index = class {
+  static [entityKind] = "SQLiteIndex";
+  config;
+  isNameExplicit;
+  constructor(config2, table) {
+    this.config = {
+      ...config2,
+      table
+    };
+    this.isNameExplicit = !!config2.name;
   }
 };
+function index(name2) {
+  return new IndexBuilderOn(name2, false);
+}
 
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/delete.js
-var SQLiteAsyncDeleteBase = class extends SQLiteDeleteBase {
-  static [entityKind] = "SQLiteAsyncDelete";
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/primary-keys.js
+function primaryKey(...config2) {
+  if (config2[0].columns) return new PrimaryKeyBuilder(config2[0].columns, config2[0].name);
+  return new PrimaryKeyBuilder(config2);
+}
+var PrimaryKeyBuilder = class {
+  static [entityKind] = "SQLitePrimaryKeyBuilder";
   /** @internal */
-  _prepare(prepare = false) {
-    return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), "arrays", prepare, this.config.returning ? "all" : "run", this.config.returning ? this.dialect.mapperGenerators.rows(this.config.returning, void 0) : void 0, {
-      type: "delete",
-      tables: extractUsedTable(this.config.table)
-    });
+  columns;
+  /** @internal */
+  name;
+  constructor(columns, name2) {
+    this.columns = columns;
+    this.name = name2;
   }
-  prepare() {
-    return this._prepare(true);
+  /** @internal */
+  build(table) {
+    return new PrimaryKey(table, this.columns, this.name);
   }
-  run = (placeholderValues) => {
-    return this._prepare().run(placeholderValues);
-  };
-  all = (placeholderValues) => {
-    return this._prepare().all(placeholderValues);
-  };
-  get = (placeholderValues) => {
-    return this._prepare().get(placeholderValues);
-  };
-  values = (placeholderValues) => {
-    return this._prepare().values(placeholderValues);
-  };
-  async execute(placeholderValues) {
-    return this._prepare().execute(placeholderValues);
+};
+var PrimaryKey = class {
+  static [entityKind] = "SQLitePrimaryKey";
+  columns;
+  name;
+  isNameExplicit;
+  constructor(table, columns, name2) {
+    this.table = table;
+    this.columns = columns;
+    this.name = name2;
+    this.isNameExplicit = !!name2;
+  }
+  getName() {
+    return this.name ?? `${this.table[SQLiteTable.Symbol.Name]}_${this.columns.map((column) => column.name).join("_")}_pk`;
   }
 };
-applyMixins(SQLiteAsyncDeleteBase, [QueryPromise]);
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/utils.js
+function extractUsedTable(table) {
+  if (is(table, SQLiteTable)) return [`${table[Table.Symbol.BaseName]}`];
+  if (is(table, Subquery)) return table._.usedTables ?? [];
+  if (is(table, SQL)) return table.usedTables ?? [];
+  return [];
+}
 
 // ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/view-base.js
 var SQLiteViewBase = class extends View {
   static [entityKind] = "SQLiteViewBase";
 };
 
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/selection-proxy.js
+var SelectionProxyHandler = class SelectionProxyHandler2 {
+  static [entityKind] = "SelectionProxyHandler";
+  config;
+  constructor(config2) {
+    this.config = { ...config2 };
+  }
+  get(subquery, prop) {
+    if (prop === "_") return {
+      ...subquery["_"],
+      selectedFields: new Proxy(subquery._.selectedFields, this)
+    };
+    if (prop === ViewBaseConfig) return {
+      ...subquery[ViewBaseConfig],
+      selectedFields: new Proxy(subquery[ViewBaseConfig].selectedFields, this)
+    };
+    if (typeof prop === "symbol") return subquery[prop];
+    const value = (is(subquery, Subquery) ? subquery._.selectedFields : is(subquery, View) ? subquery[ViewBaseConfig].selectedFields : subquery)[prop];
+    if (is(value, SQL.Aliased)) {
+      if (this.config.sqlAliasedBehavior === "sql" && !value.isSelectionField) return value.sql;
+      const newValue = value.clone();
+      newValue.isSelectionField = true;
+      newValue.origin = this.config.alias;
+      return newValue;
+    }
+    if (is(value, SQL)) {
+      if (this.config.sqlBehavior === "sql") return value;
+      throw new Error(`You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias declared. Please add an alias to the field using ".as('alias')" method.`);
+    }
+    if (is(value, Column)) {
+      if (this.config.alias) return new Proxy(value, new ColumnTableAliasProxyHandler(new Proxy(value.table, new TableAliasProxyHandler(this.config.alias, this.config.replaceOriginalName ?? false, true)), true));
+      return value;
+    }
+    if (typeof value !== "object" || value === null) return value;
+    return new Proxy(value, new SelectionProxyHandler2(this.config));
+  }
+};
+
 // ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/query-builders/query-builder.js
 var TypedQueryBuilder = class {
   static [entityKind] = "TypedQueryBuilder";
@@ -32918,8 +32446,8 @@ var SQLiteDialect = class {
   buildJoins(joins) {
     if (!joins || joins.length === 0) return;
     const joinsArray = [];
-    if (joins) for (const [index, joinMeta] of joins.entries()) {
-      if (index === 0) joinsArray.push(sql` `);
+    if (joins) for (const [index2, joinMeta] of joins.entries()) {
+      if (index2 === 0) joinsArray.push(sql` `);
       const table = joinMeta.table;
       const onSql = joinMeta.on ? sql` on ${joinMeta.on}` : void 0;
       if (is(table, SQLiteTable)) {
@@ -32929,7 +32457,7 @@ var SQLiteDialect = class {
         const alias = tableName === origTableName ? void 0 : joinMeta.alias;
         joinsArray.push(sql`${sql.raw(joinMeta.joinType)} join ${tableSchema ? sql`${sql.identifier(tableSchema)}.` : void 0}${sql.identifier(origTableName)}${alias && sql` ${sql.identifier(alias)}`}${onSql}`);
       } else joinsArray.push(sql`${sql.raw(joinMeta.joinType)} join ${table}${onSql}`);
-      if (index < joins.length - 1) joinsArray.push(sql` `);
+      if (index2 < joins.length - 1) joinsArray.push(sql` `);
     }
     return sql.join(joinsArray);
   }
@@ -32938,9 +32466,9 @@ var SQLiteDialect = class {
   }
   buildOrderBy(orderBy) {
     const orderByList = [];
-    if (orderBy) for (const [index, orderByValue] of orderBy.entries()) {
+    if (orderBy) for (const [index2, orderByValue] of orderBy.entries()) {
       orderByList.push(orderByValue);
-      if (index < orderBy.length - 1) orderByList.push(sql`, `);
+      if (index2 < orderBy.length - 1) orderByList.push(sql`, `);
     }
     return orderByList.length > 0 ? sql` order by ${sql.join(orderByList)}` : void 0;
   }
@@ -32968,9 +32496,9 @@ var SQLiteDialect = class {
     const whereSql = where ? sql` where ${where}` : void 0;
     const havingSql = having ? sql` having ${having}` : void 0;
     const groupByList = [];
-    if (groupBy) for (const [index, groupByValue] of groupBy.entries()) {
+    if (groupBy) for (const [index2, groupByValue] of groupBy.entries()) {
       groupByList.push(groupByValue);
-      if (index < groupBy.length - 1) groupByList.push(sql`, `);
+      if (index2 < groupBy.length - 1) groupByList.push(sql`, `);
     }
     const finalQuery = sql`${withSql}select${distinctSql} ${selection} from ${tableSql}${joinsSql}${whereSql}${groupByList.length > 0 ? sql` group by ${sql.join(groupByList)}` : void 0}${havingSql}${this.buildOrderBy(orderBy)}${this.buildLimit(limit)}${offset ? sql` offset ${offset}` : void 0}`;
     if (setOperators.length > 0) return this.buildSetOperations(finalQuery, setOperators);
@@ -33259,6 +32787,268 @@ var QueryBuilder = class {
   }
 };
 
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/count.js
+var SQLiteCountBuilder = class SQLiteCountBuilder2 extends SQL {
+  static [entityKind] = "SQLiteCountBuilder";
+  dialect;
+  session;
+  static buildCount(source, filters, parens) {
+    const query = sql`select count(*) from ${source}${sql` where ${filters}`.if(filters)}`;
+    return parens ? sql`(${query})` : query;
+  }
+  constructor(countConfig) {
+    super(SQLiteCountBuilder2.buildCount(countConfig.source, countConfig.filters, true).queryChunks);
+    this.countConfig = countConfig;
+    this.dialect = countConfig.dialect;
+    this.session = countConfig.session;
+    this.mapWith((e) => {
+      if (typeof e === "number") return e;
+      return Number(e ?? 0);
+    });
+  }
+  executableSql;
+  build() {
+    if (!this.executableSql) {
+      const { source, filters } = this.countConfig;
+      this.executableSql = SQLiteCountBuilder2.buildCount(source, filters);
+    }
+    return this.dialect.sqlToQuery(this.executableSql);
+  }
+};
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/count.js
+var SQLiteAsyncCountBuilder = class extends SQLiteCountBuilder {
+  static [entityKind] = "SQLiteAsyncCountBuilder";
+  constructor(countConfig) {
+    super(countConfig);
+  }
+  /** @internal */
+  executeRaw(placeholderValues) {
+    return this.session.prepareQuery(this.build(), "arrays", false, "all", (rows) => {
+      const v = rows[0]?.[0];
+      if (typeof v === "number") return v;
+      return v ? Number(v) : 0;
+    }).execute(placeholderValues);
+  }
+  async execute(placeholderValues) {
+    return await this.executeRaw(placeholderValues);
+  }
+};
+applyMixins(SQLiteAsyncCountBuilder, [QueryPromise]);
+var SQLiteSyncCountBuilder = class extends SQLiteAsyncCountBuilder {
+  static [entityKind] = "SQLiteSyncCountBuilder";
+  sync(placeholderValues) {
+    return this.executeRaw(placeholderValues).sync();
+  }
+};
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/query.js
+var RelationalQueryBuilder = class {
+  static [entityKind] = "SQLiteRelationalQueryBuilderV2";
+  constructor(mode, schema, table, tableConfig, dialect, session, forbidJsonb, builder = SQLiteRelationalQuery) {
+    this.mode = mode;
+    this.schema = schema;
+    this.table = table;
+    this.tableConfig = tableConfig;
+    this.dialect = dialect;
+    this.session = session;
+    this.forbidJsonb = forbidJsonb;
+    this.builder = builder;
+  }
+  findMany(config2) {
+    return new this.builder(this.mode, this.schema, this.table, this.tableConfig, this.dialect, this.session, config2 ?? true, "many", this.forbidJsonb);
+  }
+  findFirst(config2) {
+    return new this.builder(this.mode, this.schema, this.table, this.tableConfig, this.dialect, this.session, config2 ?? true, "first", this.forbidJsonb);
+  }
+};
+var SQLiteRelationalQuery = class {
+  static [entityKind] = "SQLiteRelationalQueryV2";
+  /** @internal */
+  mode;
+  /** @internal */
+  table;
+  /** @internal */
+  resultKind;
+  constructor(resultKind, schema, table, tableConfig, dialect, session, config2, mode, forbidJsonb) {
+    this.schema = schema;
+    this.tableConfig = tableConfig;
+    this.dialect = dialect;
+    this.session = session;
+    this.config = config2;
+    this.forbidJsonb = forbidJsonb;
+    this.resultKind = resultKind;
+    this.mode = mode;
+    this.table = table;
+  }
+  getSQL() {
+    return this._getQuery().sql;
+  }
+  _getQuery() {
+    const jsonb = this.forbidJsonb ? sql`json` : sql`jsonb`;
+    return this.dialect.buildRelationalQuery({
+      schema: this.schema,
+      table: this.table,
+      tableConfig: this.tableConfig,
+      queryConfig: this.config,
+      mode: this.mode,
+      jsonb
+    });
+  }
+  _toSQL() {
+    const query = this._getQuery();
+    return {
+      query,
+      builtQuery: this.dialect.sqlToQuery(query.sql)
+    };
+  }
+  toSQL() {
+    return this._toSQL().builtQuery;
+  }
+};
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/query.js
+var SQLiteAsyncRelationalQuery = class extends SQLiteRelationalQuery {
+  static [entityKind] = "SQLiteAsyncRelationalQueryV2";
+  /** @internal */
+  _prepare(prepare = false) {
+    const { query, builtQuery } = this._toSQL();
+    const mapper = this.dialect.mapperGenerators.relationalRows({
+      isFirst: this.mode === "first",
+      parseJson: true,
+      parseJsonIfString: false,
+      rootJsonMappers: false,
+      selection: query.selection,
+      arrayModeRoot: true
+    });
+    return this.session.prepareQuery(builtQuery, "arrays", prepare, "all", mapper);
+  }
+  prepare() {
+    return this._prepare(true);
+  }
+  async execute(placeholderValues) {
+    return this._prepare().execute(placeholderValues);
+  }
+};
+var SQLiteSyncRelationalQuery = class extends SQLiteAsyncRelationalQuery {
+  static [entityKind] = "SQLiteSyncRelationalQueryV2";
+  sync(placeholderValues) {
+    return this._prepare().execute(placeholderValues).sync();
+  }
+};
+applyMixins(SQLiteAsyncRelationalQuery, [QueryPromise]);
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/delete.js
+var SQLiteDeleteBase = class {
+  static [entityKind] = "SQLiteDelete";
+  /** @internal */
+  config;
+  constructor(table, session, dialect, withList) {
+    this.table = table;
+    this.session = session;
+    this.dialect = dialect;
+    this.config = {
+      table,
+      withList
+    };
+  }
+  /**
+  * Adds a `where` clause to the query.
+  *
+  * Calling this method will delete only those rows that fulfill a specified condition.
+  *
+  * See docs: {@link https://orm.drizzle.team/docs/delete}
+  *
+  * @param where the `where` clause.
+  *
+  * @example
+  * You can use conditional operators and `sql function` to filter the rows to be deleted.
+  *
+  * ```ts
+  * // Delete all cars with green color
+  * db.delete(cars).where(eq(cars.color, 'green'));
+  * // or
+  * db.delete(cars).where(sql`${cars.color} = 'green'`)
+  * ```
+  *
+  * You can logically combine conditional operators with `and()` and `or()` operators:
+  *
+  * ```ts
+  * // Delete all BMW cars with a green color
+  * db.delete(cars).where(and(eq(cars.color, 'green'), eq(cars.brand, 'BMW')));
+  *
+  * // Delete all cars with the green or blue color
+  * db.delete(cars).where(or(eq(cars.color, 'green'), eq(cars.color, 'blue')));
+  * ```
+  */
+  where(where) {
+    this.config.where = where;
+    return this;
+  }
+  orderBy(...columns) {
+    if (typeof columns[0] === "function") {
+      const orderBy = columns[0](new Proxy(this.config.table[Table.Symbol.Columns], new SelectionProxyHandler({
+        sqlAliasedBehavior: "alias",
+        sqlBehavior: "sql"
+      })));
+      const orderByArray = Array.isArray(orderBy) ? orderBy : [orderBy];
+      this.config.orderBy = orderByArray;
+    } else {
+      const orderByArray = columns;
+      this.config.orderBy = orderByArray;
+    }
+    return this;
+  }
+  limit(limit) {
+    this.config.limit = limit;
+    return this;
+  }
+  returning(fields = this.table[SQLiteTable.Symbol.Columns]) {
+    this.config.returning = orderSelectedFields(fields);
+    return this;
+  }
+  getSQL() {
+    return this.dialect.buildDeleteQuery(this.config);
+  }
+  toSQL() {
+    return this.dialect.sqlToQuery(this.getSQL());
+  }
+  $dynamic() {
+    return this;
+  }
+};
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/async/delete.js
+var SQLiteAsyncDeleteBase = class extends SQLiteDeleteBase {
+  static [entityKind] = "SQLiteAsyncDelete";
+  /** @internal */
+  _prepare(prepare = false) {
+    return this.session.prepareQuery(this.dialect.sqlToQuery(this.getSQL()), "arrays", prepare, this.config.returning ? "all" : "run", this.config.returning ? this.dialect.mapperGenerators.rows(this.config.returning, void 0) : void 0, {
+      type: "delete",
+      tables: extractUsedTable(this.config.table)
+    });
+  }
+  prepare() {
+    return this._prepare(true);
+  }
+  run = (placeholderValues) => {
+    return this._prepare().run(placeholderValues);
+  };
+  all = (placeholderValues) => {
+    return this._prepare().all(placeholderValues);
+  };
+  get = (placeholderValues) => {
+    return this._prepare().get(placeholderValues);
+  };
+  values = (placeholderValues) => {
+    return this._prepare().values(placeholderValues);
+  };
+  async execute(placeholderValues) {
+    return this._prepare().execute(placeholderValues);
+  }
+};
+applyMixins(SQLiteAsyncDeleteBase, [QueryPromise]);
+
 // ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/sqlite-core/query-builders/insert.js
 var SQLiteInsertBuilder = class {
   static [entityKind] = "SQLiteInsertBuilder";
@@ -34146,133 +33936,6 @@ var SQLiteAsyncTransaction = class extends SQLiteAsyncDatabase {
   }
 };
 
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/node-sqlite/session.js
-var NodeSQLiteSession = class extends SQLiteAsyncSession {
-  static [entityKind] = "SQLJsSession";
-  logger;
-  constructor(client2, dialect, relations, options = {}) {
-    super(dialect, "sync");
-    this.client = client2;
-    this.relations = relations;
-    this.options = options;
-    this.logger = options.logger ?? new NoopLogger();
-  }
-  prepareQuery(query, mode, _prepare, executeMethod, mapper, queryMetadata) {
-    let stmt;
-    try {
-      stmt = this.client.prepare(query.sql);
-    } catch (e) {
-      throw new DrizzleQueryError(query.sql, query.params, e);
-    }
-    return new SQLiteAsyncPreparedQuery("sync", executeMethod, {
-      all: (params) => {
-        stmt.setReturnArrays(mode === "arrays");
-        const res = stmt.all(...params);
-        if (mode === "objects") return res.map((row) => ({ ...row }));
-        return res;
-      },
-      get: (params) => {
-        stmt.setReturnArrays(mode === "arrays");
-        const res = stmt.get(...params);
-        if (res && mode === "objects") return { ...res };
-        return res;
-      },
-      run: (params) => {
-        stmt.setReturnArrays(false);
-        return stmt.run(...params);
-      },
-      values: (params) => {
-        stmt.setReturnArrays(true);
-        return stmt.all(...params);
-      }
-    }, query, mapper, mode, this.logger, void 0, queryMetadata, void 0);
-  }
-  transaction(transaction, config2 = {}) {
-    const tx = new NodeSQLiteTransaction("sync", this.dialect, this, this.relations);
-    this.run(sql.raw(`begin${config2.behavior ? ` ${config2.behavior}` : ""}`));
-    try {
-      const result = transaction(tx);
-      this.run(sql`commit`);
-      return result;
-    } catch (err) {
-      this.run(sql`rollback`);
-      throw err;
-    }
-  }
-};
-var NodeSQLiteTransaction = class NodeSQLiteTransaction2 extends SQLiteAsyncTransaction {
-  static [entityKind] = "SQLJsTransaction";
-  transaction(transaction) {
-    const savepointName = `sp${this.nestedIndex + 1}`;
-    const tx = new NodeSQLiteTransaction2("sync", this.dialect, this.session, this._.relations, this.nestedIndex + 1);
-    tx.run(sql.raw(`savepoint ${savepointName}`));
-    try {
-      const result = transaction(tx);
-      tx.run(sql.raw(`release savepoint ${savepointName}`));
-      return result;
-    } catch (err) {
-      tx.run(sql.raw(`rollback to savepoint ${savepointName}`));
-      throw err;
-    }
-  }
-};
-
-// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/node-sqlite/driver.js
-import { DatabaseSync } from "node:sqlite";
-var NodeSQLiteDatabase = class extends SQLiteAsyncDatabase {
-  static [entityKind] = "NodeSQLiteDatabase";
-};
-function construct(client2, config2 = {}) {
-  const dialect = new SQLiteDialect({ useJitMappers: jitCompatCheck(config2.jit) });
-  let logger;
-  if (config2.logger === true) logger = new DefaultLogger();
-  else if (config2.logger !== false) logger = config2.logger;
-  const relations = config2.relations ?? {};
-  const db = new NodeSQLiteDatabase("sync", dialect, new NodeSQLiteSession(client2, dialect, relations, { logger }), relations);
-  db.$client = client2;
-  return db;
-}
-function drizzle(...params) {
-  if (params[0] === void 0 || typeof params[0] === "string") return construct(params[0] === void 0 ? new DatabaseSync(":memory:") : new DatabaseSync(params[0]), params[1]);
-  const { connection, client: client2, ...config2 } = params[0];
-  if (client2) return construct(client2, config2);
-  if (typeof connection === "object") {
-    const { path: path2, ...options } = connection;
-    return construct(new DatabaseSync(path2 ?? ":memory:", options), config2);
-  }
-  return construct(new DatabaseSync(connection ?? ":memory:"), config2);
-}
-(function(_drizzle) {
-  function mock(config2) {
-    return construct({}, config2);
-  }
-  _drizzle.mock = mock;
-})(drizzle || (drizzle = {}));
-
-// src/generated/acp-session-store-migrations.ts
-var acpSessionStoreMigrations = [
-  {
-    "name": "0000_slimy_captain_midlands.sql",
-    "sql": "CREATE TABLE `acp_session` (\n	`session_id` text PRIMARY KEY NOT NULL,\n	`agent_id` text NOT NULL,\n	`native_session_id` text NOT NULL,\n	`cwd` text NOT NULL,\n	`additional_directories` text NOT NULL,\n	`prompted` integer NOT NULL,\n	`title` text NOT NULL,\n	`updated_at` text NOT NULL\n);\n--> statement-breakpoint\nCREATE TABLE `deleted_acp_session` (\n	`session_id` text PRIMARY KEY NOT NULL\n);\n"
-  },
-  {
-    "name": "0001_regular_ultimates.sql",
-    "sql": "ALTER TABLE `acp_session` ADD `last_terminal_command_id` text;"
-  },
-  {
-    "name": "0002_equal_black_queen.sql",
-    "sql": "CREATE TABLE `session_event_v2` (\n	`event_id` text PRIMARY KEY NOT NULL,\n	`event_json` text NOT NULL,\n	`position` integer NOT NULL,\n	`session_id` text NOT NULL\n);\n--> statement-breakpoint\nCREATE UNIQUE INDEX `session_event_v2_session_position_unique` ON `session_event_v2` (`session_id`,`position`);--> statement-breakpoint\nCREATE INDEX `session_event_v2_session_position_index` ON `session_event_v2` (`session_id`,`position`);"
-  },
-  {
-    "name": "0003_silky_ravenous.sql",
-    "sql": "DROP TABLE `session_event_v2`;"
-  },
-  {
-    "name": "0004_special_mathemanic.sql",
-    "sql": "DROP TABLE `deleted_acp_session`;--> statement-breakpoint\nALTER TABLE `acp_session` DROP COLUMN `last_terminal_command_id`;"
-  }
-];
-
 // src/schema/acp-session-store/acp-session.ts
 var acpSession = sqliteTable("acp_session", {
   sessionId: text("session_id").primaryKey(),
@@ -34285,6 +33948,216 @@ var acpSession = sqliteTable("acp_session", {
   updatedAt: text("updated_at").notNull()
 });
 
+// src/schema/session-event-cache/session-event-v2.ts
+var sessionEventV2 = sqliteTable(
+  "session_event_v2",
+  {
+    eventJson: text("event_json").notNull(),
+    generationId: text("generation_id").notNull(),
+    position: integer2("position").notNull(),
+    sessionId: text("session_id").notNull()
+  },
+  (table) => [
+    primaryKey({ columns: [table.generationId, table.sessionId, table.position] }),
+    index("session_event_v2_generation_session_position_index").on(
+      table.generationId,
+      table.sessionId,
+      table.position
+    )
+  ]
+);
+
+// src/acp/session-event-store-v2.ts
+var HOT_EVENT_HIGH_WATER_MARK = 256;
+var HOT_EVENT_RETENTION = 128;
+function eventPage(eventCount, eventLimit, cursor, read) {
+  const parsedCursor = cursor === null ? eventCount : Number(cursor);
+  if (!Number.isSafeInteger(parsedCursor) || parsedCursor < 0 || parsedCursor > eventCount) {
+    throw new Error("The native event cursor is invalid");
+  }
+  const endPosition = parsedCursor;
+  const startPosition = Math.max(0, endPosition - eventLimit);
+  return {
+    events: read(startPosition + 1, endPosition),
+    nextCursor: startPosition === 0 ? null : startPosition.toString(),
+    startPosition: startPosition + 1,
+    truncated: startPosition > 0
+  };
+}
+var MemoryAcpSessionEventStoreV2 = class {
+  generationId;
+  #events = /* @__PURE__ */ new Map();
+  constructor(generationId) {
+    this.generationId = generationId;
+  }
+  append = (sessionId, event) => {
+    const events = this.#events.get(sessionId) ?? [];
+    events.push(event);
+    this.#events.set(sessionId, events);
+    return events.length;
+  };
+  close = () => this.#events.clear();
+  page = (sessionId, eventLimit, cursor) => {
+    const events = this.#events.get(sessionId) ?? [];
+    return eventPage(
+      events.length,
+      eventLimit,
+      cursor,
+      (startPosition, endPosition) => events.slice(startPosition - 1, endPosition)
+    );
+  };
+  remove = (sessionId) => {
+    this.#events.delete(sessionId);
+  };
+  reset = this.remove;
+};
+var cachedEventRowSchema = external_exports.object({ eventJson: external_exports.string(), position: external_exports.number().int().positive() });
+function decodeCachedEvent(value) {
+  const payload = external_exports.record(external_exports.string(), external_exports.unknown()).parse(value);
+  const event = decodeSessionEventV2({
+    ...payload,
+    eventId: "cached-event",
+    position: "1",
+    provenance: { kind: "original" },
+    recordedAt: "1970-01-01T00:00:00.000Z",
+    sessionId: "cached-session"
+  });
+  return event.type === "acp" ? { payload: event.payload, type: event.type } : { payload: event.payload, type: event.type };
+}
+var CachedAcpSessionEventStoreV2 = class {
+  generationId;
+  #database;
+  #ignoredPersistedSessions = /* @__PURE__ */ new Set();
+  #localDatabase;
+  #sessions = /* @__PURE__ */ new Map();
+  #flushSchedule = { kind: "idle" };
+  #isLocalDBAvailable = true;
+  constructor(localDatabase, generationId) {
+    this.generationId = generationId;
+    this.#localDatabase = localDatabase;
+    this.#database = localDatabase.orm;
+    try {
+      this.#localDatabase.transaction(() => this.#database.delete(sessionEventV2).run());
+    } catch (error62) {
+      this.#localDatabase.close();
+      throw error62;
+    }
+  }
+  append = (sessionId, event) => {
+    if (this.#flushSchedule.kind === "closed") {
+      throw new Error("The V2 Session event store is closed");
+    }
+    const session = this.#sessions.get(sessionId) ?? { hot: [], nextPosition: 1 };
+    const position = session.nextPosition;
+    session.hot.push({ event, position });
+    session.nextPosition += 1;
+    this.#sessions.set(sessionId, session);
+    if (session.hot.length > HOT_EVENT_HIGH_WATER_MARK) {
+      this.#scheduleFlush();
+    }
+    return position;
+  };
+  #scheduleFlush = () => {
+    if (!this.#isLocalDBAvailable || this.#flushSchedule.kind !== "idle") {
+      return;
+    }
+    const handle = setImmediate(() => {
+      if (this.#flushSchedule.kind !== "scheduled" || this.#flushSchedule.handle !== handle) {
+        return;
+      }
+      this.#flushSchedule = { kind: "idle" };
+      this.#flush(false);
+    });
+    this.#flushSchedule = { handle, kind: "scheduled" };
+  };
+  #flush = (includeHotTail) => {
+    if (!this.#isLocalDBAvailable || this.#flushSchedule.kind === "closed") {
+      return;
+    }
+    const batches = [...this.#sessions.entries()].flatMap(([sessionId, session]) => {
+      const count = includeHotTail ? session.hot.length : Math.max(0, session.hot.length - HOT_EVENT_RETENTION);
+      return count === 0 ? [] : [{ count, events: session.hot.slice(0, count), sessionId }];
+    });
+    const values = batches.flatMap(
+      (batch) => batch.events.map(({ event, position }) => ({
+        eventJson: JSON.stringify(event),
+        generationId: this.generationId,
+        position,
+        sessionId: batch.sessionId
+      }))
+    );
+    if (values.length === 0) {
+      return;
+    }
+    try {
+      this.#localDatabase.transaction(() => {
+        for (let offset = 0; offset < values.length; offset += 200) {
+          this.#database.insert(sessionEventV2).values(values.slice(offset, offset + 200)).run();
+        }
+      });
+      for (const batch of batches) {
+        this.#sessions.get(batch.sessionId)?.hot.splice(0, batch.count);
+      }
+    } catch (cause) {
+      this.#isLocalDBAvailable = false;
+      console.warn("Mobius V2 Session event cache writes are unavailable; retaining events in memory", cause);
+    }
+  };
+  page = (sessionId, eventLimit, cursor) => {
+    const session = this.#sessions.get(sessionId);
+    const eventCount = (session?.nextPosition ?? 1) - 1;
+    return eventPage(eventCount, eventLimit, cursor, (startPosition, endPosition) => {
+      const persisted = this.#ignoredPersistedSessions.has(sessionId) ? [] : this.#database.select({ eventJson: sessionEventV2.eventJson, position: sessionEventV2.position }).from(sessionEventV2).where(
+        and(
+          eq(sessionEventV2.generationId, this.generationId),
+          eq(sessionEventV2.sessionId, sessionId),
+          gte(sessionEventV2.position, startPosition),
+          lte(sessionEventV2.position, endPosition)
+        )
+      ).orderBy(asc(sessionEventV2.position)).all().map((value) => {
+        const row = cachedEventRowSchema.parse(value);
+        return { event: decodeCachedEvent(JSON.parse(row.eventJson)), position: row.position };
+      });
+      const hot = (session?.hot ?? []).filter(
+        ({ position }) => position >= startPosition && position <= endPosition
+      );
+      return [...persisted, ...hot].toSorted((left, right) => left.position - right.position).map(({ event }) => event);
+    });
+  };
+  #deletePersisted = (sessionId) => {
+    if (!this.#isLocalDBAvailable) {
+      this.#ignoredPersistedSessions.add(sessionId);
+      return;
+    }
+    try {
+      this.#database.delete(sessionEventV2).where(and(eq(sessionEventV2.generationId, this.generationId), eq(sessionEventV2.sessionId, sessionId))).run();
+      this.#ignoredPersistedSessions.delete(sessionId);
+    } catch (cause) {
+      this.#isLocalDBAvailable = false;
+      this.#ignoredPersistedSessions.add(sessionId);
+      console.warn("Mobius V2 Session event cache writes are unavailable; retaining events in memory", cause);
+    }
+  };
+  remove = (sessionId) => {
+    this.#deletePersisted(sessionId);
+    this.#sessions.delete(sessionId);
+  };
+  reset = this.remove;
+  close = () => {
+    if (this.#flushSchedule.kind === "closed") {
+      return;
+    }
+    if (this.#flushSchedule.kind === "scheduled") {
+      clearImmediate(this.#flushSchedule.handle);
+    }
+    this.#flushSchedule = { kind: "idle" };
+    this.#flush(true);
+    this.#flushSchedule = { kind: "closed" };
+    this.#localDatabase.close();
+    this.#sessions.clear();
+  };
+};
+
 // src/acp/session-store.ts
 var AcpStoredSession = class {
   additionalDirectories;
@@ -34320,9 +34193,14 @@ var FoundAcpStoredSession = class extends AcpStoredSessionLookup {
   }
 };
 var MemoryAcpSessionStore = class {
+  eventsV2;
   #sessions = /* @__PURE__ */ new Map();
+  constructor(eventsV2 = new MemoryAcpSessionEventStoreV2(randomUUID())) {
+    this.eventsV2 = eventsV2;
+  }
   close = () => {
     this.#sessions.clear();
+    this.eventsV2.close();
   };
   findNative = (agentId, nativeSessionId) => [...this.#sessions.values()].filter(
     (session) => session.agentId === agentId && session.nativeSessionId === nativeSessionId
@@ -34334,6 +34212,7 @@ var MemoryAcpSessionStore = class {
   };
   remove = (sessionId) => {
     this.#sessions.delete(sessionId);
+    this.eventsV2.remove(sessionId);
   };
   write = (session) => {
     this.#sessions.set(session.sessionId, session);
@@ -34365,39 +34244,20 @@ function decodeStoredSession(value) {
   );
 }
 var SqliteAcpSessionStore = class {
+  eventsV2;
   #database;
-  #sqliteDatabase;
-  constructor(path2) {
-    mkdirSync(dirname3(path2), { mode: 448, recursive: true });
-    this.#sqliteDatabase = new DatabaseSync2(path2);
-    chmodSync(path2, 384);
-    this.#migrate();
-    this.#database = drizzle({ client: this.#sqliteDatabase });
+  #localDatabase;
+  constructor(localDatabase, eventsV2 = new MemoryAcpSessionEventStoreV2(randomUUID())) {
+    this.eventsV2 = eventsV2;
+    this.#localDatabase = localDatabase;
+    this.#database = localDatabase.orm;
   }
-  #migrate = () => {
-    const version2 = external_exports.object({ user_version: external_exports.number().int().nonnegative() }).parse(this.#sqliteDatabase.prepare("PRAGMA user_version").get()).user_version;
-    if (version2 > acpSessionStoreMigrations.length) {
-      this.#sqliteDatabase.close();
-      throw new Error("The ACP Session database was created by a newer Mobius version");
-    }
-    for (let index = version2; index < acpSessionStoreMigrations.length; index += 1) {
-      const migration = acpSessionStoreMigrations[index];
-      if (migration === void 0) {
-        throw new Error("The ACP Session migration is unavailable");
-      }
-      this.#sqliteDatabase.exec("BEGIN IMMEDIATE");
-      try {
-        this.#sqliteDatabase.exec(migration.sql);
-        this.#sqliteDatabase.exec(`PRAGMA user_version = ${index + 1}`);
-        this.#sqliteDatabase.exec("COMMIT");
-      } catch (error62) {
-        this.#sqliteDatabase.exec("ROLLBACK");
-        throw error62;
-      }
-    }
-  };
   close = () => {
-    this.#sqliteDatabase.close();
+    try {
+      this.#localDatabase.close();
+    } finally {
+      this.eventsV2.close();
+    }
   };
   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);
@@ -34407,6 +34267,7 @@ var SqliteAcpSessionStore = class {
   };
   remove = (sessionId) => {
     this.#database.delete(acpSession).where(eq(acpSession.sessionId, sessionId)).run();
+    this.eventsV2.remove(sessionId);
   };
   write = (session) => {
     const value = {
@@ -34432,7 +34293,7 @@ var RetryableAcpInitializationError = class extends AcpExecutionError {
   }
 };
 function arraysEqual(left, right) {
-  return left.length === right.length && left.every((value, index) => value === right[index]);
+  return left.length === right.length && left.every((value, index2) => value === right[index2]);
 }
 function recordsEqual(left, right) {
   const leftEntries = Object.entries(left);
@@ -34487,7 +34348,7 @@ var AgentSession = class _AgentSession {
       commandId: () => this.#turn.commandId,
       assertNativeSession: (sessionId) => this.assertNativeSession(sessionId),
       observer: getObserver,
-      recordSessionEventV2: this.#recordLifecycleEventV2
+      recordSessionEventV2: this.recordLifecycleEventV2
     });
     this.#connection = new AgentConnection(agent, cwd, this);
     this.#contentExternalizer = contentExternalizer;
@@ -34595,12 +34456,17 @@ var AgentSession = class _AgentSession {
       );
     }
     const history = await this.#completedHistory(signal, "ACP agent exited while loading history");
-    return history.eventPage(eventLimit, cursor, this.#turnHistory);
+    return history.eventPage(eventLimit, cursor);
   };
   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: {} };
+        this.#store.eventsV2.reset(this.#mobiusSessionId);
+        this.#sessionLoad = {
+          history: new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId),
+          kind: "loaded",
+          response: {}
+        };
       }
       if (this.#sessionLoad.kind === "loaded") {
         return this.#sessionLoad.history;
@@ -34615,7 +34481,8 @@ var AgentSession = class _AgentSession {
     if (this.#sessionLoad.kind === "capturing") {
       return await waitForSharedOperation(this.#sessionLoad.completion, signal);
     }
-    const history = new AcpHistoryReplay();
+    this.#store.eventsV2.reset(this.#mobiusSessionId);
+    const history = new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId);
     const completion = Promise.resolve().then(async () => {
       try {
         const response = await this.race(
@@ -35064,7 +34931,14 @@ var AgentSession = class _AgentSession {
     if (this.#turn.running) {
       throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
     }
-    const completedHistory = this.#capabilities.loadSession ? await this.#completedHistory(options.signal, "ACP agent exited while loading history before a prompt") : null;
+    if (!this.#capabilities.loadSession && this.#sessionLoad.kind === "not-requested") {
+      this.#sessionLoad = {
+        kind: "loaded",
+        history: new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId),
+        response: {}
+      };
+    }
+    const completedHistory = this.#capabilities.loadSession ? await this.#completedHistory(options.signal, "ACP agent exited while loading history before a prompt") : this.#sessionLoad.kind === "loaded" ? this.#sessionLoad.history : null;
     const prompt = this.buildPrompt(options);
     if (this.#sessionTitle === null || this.#sessionTitle.length === 0) {
       this.#sessionTitle = truncate(options.prompt, 500);
@@ -35090,14 +34964,19 @@ var AgentSession = class _AgentSession {
       this.prepareAgentContent
     );
     this.#turn = running;
-    this.#turnHistory = completedHistory === null ? null : new AcpHistoryReplay();
+    this.#turnHistory = completedHistory === null ? null : new AcpHistoryReplay(this.#store.eventsV2, this.#mobiusSessionId);
     const lifecycleV2 = options.lifecycleV2;
     if (lifecycleV2 !== void 0) {
-      await this.#recordLifecycleEventV2({
-        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+      await this.recordLifecycleEventV2({
+        payload: {
+          commandId: options.commandId,
+          content: lifecycleV2.content,
+          kind: "prompt.requested",
+          ...lifecycleV2.context === void 0 ? {} : { context: lifecycleV2.context }
+        },
         type: "lifecycle-metadata"
       });
-      await this.#recordLifecycleEventV2({
+      await this.recordLifecycleEventV2({
         payload: {
           attemptId: lifecycleV2.attemptId,
           commandId: options.commandId,
@@ -35160,7 +35039,7 @@ var AgentSession = class _AgentSession {
         )
       );
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
+        await this.recordLifecycleEventV2({
           payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: result.stopReason },
           type: "lifecycle-metadata"
         });
@@ -35170,8 +35049,8 @@ var AgentSession = class _AgentSession {
       await running.activities.finish();
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
-          payload: {
+        await this.recordLifecycleEventV2({
+          payload: options.cancellationRequested?.() === true ? { commandId: options.commandId, kind: "prompt.completed", stopReason: "cancelled" } : {
             attemptId: lifecycleV2.attemptId,
             code: failure2.code,
             commandId: options.commandId,
@@ -35207,11 +35086,16 @@ var AgentSession = class _AgentSession {
     const prompt = this.buildPrompt(options);
     const lifecycleV2 = options.lifecycleV2;
     if (lifecycleV2 !== void 0) {
-      await this.#recordLifecycleEventV2({
-        payload: { commandId: options.commandId, content: lifecycleV2.content, kind: "prompt.requested" },
+      await this.recordLifecycleEventV2({
+        payload: {
+          commandId: options.commandId,
+          content: lifecycleV2.content,
+          kind: "prompt.requested",
+          ...lifecycleV2.context === void 0 ? {} : { context: lifecycleV2.context }
+        },
         type: "lifecycle-metadata"
       });
-      await this.#recordLifecycleEventV2({
+      await this.recordLifecycleEventV2({
         payload: {
           attemptId: lifecycleV2.attemptId,
           commandId: options.commandId,
@@ -35241,7 +35125,7 @@ var AgentSession = class _AgentSession {
       const outcome = response["outcome"];
       if (outcome === "injected" || outcome === "startedNewTurn") {
         if (lifecycleV2 !== void 0) {
-          await this.#recordLifecycleEventV2({
+          await this.recordLifecycleEventV2({
             payload: { commandId: options.commandId, kind: "prompt.completed", stopReason: "steered" },
             type: "lifecycle-metadata"
           });
@@ -35266,7 +35150,7 @@ var AgentSession = class _AgentSession {
     } catch (error62) {
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
       if (lifecycleV2 !== void 0) {
-        await this.#recordLifecycleEventV2({
+        await this.recordLifecycleEventV2({
           payload: {
             attemptId: lifecycleV2.attemptId,
             code: failure2.code,
@@ -35299,11 +35183,18 @@ var AgentSession = class _AgentSession {
   onElicitation = (request, signal) => this.#interactions.onElicitation(request, signal);
   onElicitationComplete = (notification) => this.#interactions.onElicitationComplete(notification);
   onUpdate = (notification) => this.#updates.receive(notification);
-  #recordLifecycleEventV2 = async (event) => {
+  recordControlEventV2 = async (event) => {
+    if (this.#sessionLoad.kind !== "loaded") {
+      return false;
+    }
+    await this.recordLifecycleEventV2(event);
+    return true;
+  };
+  recordLifecycleEventV2 = async (event) => {
     if (event.type !== "lifecycle-metadata" || this.#sessionLoad.kind !== "loaded") {
       return;
     }
-    const position = this.#turnHistory === null ? this.#sessionLoad.history.recordLifecycle(event) : this.#sessionLoad.history.eventCount() + this.#turnHistory.recordLifecycle(event);
+    const position = this.#turnHistory === null ? this.#sessionLoad.history.recordLifecycle(event) : this.#turnHistory.recordLifecycle(event);
     await this.#getObserver().onSessionEventV2?.(this.#mobiusSessionId, event, position);
   };
   selectNativeSession = (sessionId) => {
@@ -35324,13 +35215,8 @@ var AgentSession = class _AgentSession {
     } else {
       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
-          );
+        await this.#turnHistory.record(update, rawUpdate, async (position) => {
+          await onSessionEventV2?.(this.#mobiusSessionId, { payload: rawUpdate, type: "acp" }, position);
         });
       } else if (this.#sessionLoad.kind === "loaded") {
         await this.#sessionLoad.history.record(update, rawUpdate, async (position) => {
@@ -35973,9 +35859,9 @@ var AcpContentExternalizer = class {
 };
 
 // src/external-content/local-external-content-store.ts
-import { createHash as createHash2, randomUUID } from "node:crypto";
+import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { lstat, mkdir as mkdir4, readdir as readdir2, realpath as realpath7, rename as rename3, rm as rm3, stat as stat6, utimes, writeFile as writeFile3 } from "node:fs/promises";
-import { dirname as dirname4, join as join15 } from "node:path";
+import { dirname as dirname3, join as join15 } from "node:path";
 var contentRequest = /^mobius-content:(image|audio|resource):([a-f0-9]{64})$/u;
 var CONTENT_LIFETIME_MILLISECONDS = 24 * 60 * 60 * 1e3;
 var metadataSchema2 = external_exports.strictObject({
@@ -35994,7 +35880,7 @@ var UnretainedExternalContentStore = class {
   };
 };
 async function atomicWrite(path2, bytes, signal) {
-  const temporary = `${path2}.${randomUUID()}.tmp`;
+  const temporary = `${path2}.${randomUUID2()}.tmp`;
   try {
     await writeFile3(temporary, bytes, { mode: 384, signal });
     signal.throwIfAborted();
@@ -36011,7 +35897,7 @@ var LocalExternalContentStore = class {
   #expirationTimer;
   #cleanup = Promise.resolve();
   constructor(stateDirectory) {
-    this.#root = join15(stateDirectory, "tmp", "session-content", randomUUID());
+    this.#root = join15(stateDirectory, "tmp", "session-content", randomUUID2());
     this.#expirationTimer = setInterval(() => {
       void this.#expire().catch(() => void 0);
     }, 6e4);
@@ -36022,11 +35908,11 @@ var LocalExternalContentStore = class {
       await mkdir4(this.#root, { mode: 448, recursive: true });
       const now = /* @__PURE__ */ new Date();
       await utimes(this.#root, now, now);
-      for (const directory of await readdir2(dirname4(this.#root), { withFileTypes: true })) {
+      for (const directory of await readdir2(dirname3(this.#root), { withFileTypes: true })) {
         if (!directory.isDirectory() || !/^[a-f0-9-]{36}$/u.test(directory.name)) {
           continue;
         }
-        const path2 = join15(dirname4(this.#root), directory.name);
+        const path2 = join15(dirname3(this.#root), directory.name);
         if (path2 === this.#root) {
           continue;
         }
@@ -36112,12 +35998,12 @@ var LocalExternalContentStore = class {
     }
     try {
       const [resolvedDirectory, resolvedPath, file2] = await Promise.all([
-        realpath7(dirname4(entry.path)),
+        realpath7(dirname3(entry.path)),
         realpath7(entry.path),
         lstat(entry.path)
       ]);
       signal.throwIfAborted();
-      if (!file2.isFile() || file2.isSymbolicLink() || dirname4(resolvedPath) !== resolvedDirectory) {
+      if (!file2.isFile() || file2.isSymbolicLink() || dirname3(resolvedPath) !== resolvedDirectory) {
         return null;
       }
       return { mediaType: entry.mediaType, name: entry.name, path: resolvedPath };
@@ -36194,9 +36080,9 @@ var AcpProcessCapacityLock = class {
       return await waiter.completion.promise;
     } finally {
       signal.removeEventListener("abort", waiter.cancel);
-      const index = this.#waiters.indexOf(waiter);
-      if (index >= 0) {
-        this.#waiters.splice(index, 1);
+      const index2 = this.#waiters.indexOf(waiter);
+      if (index2 >= 0) {
+        this.#waiters.splice(index2, 1);
       }
     }
   };
@@ -36367,6 +36253,13 @@ var AgentRuntimeManager = class {
     this.#contentExternalizer = contentExternalizer;
     this.#queryProcesses = new AgentQueryProcesses(this.#processes, contentExternalizer);
   }
+  recordLifecycleEventV2 = async (sessionId, event) => {
+    const runtime = this.#executionProcesses.get(sessionId);
+    if (runtime === void 0) {
+      return false;
+    }
+    return await runtime.recordControlEventV2(event);
+  };
   setObserver = (observer) => {
     this.#observer = observer;
   };
@@ -36696,7 +36589,10 @@ var AgentRuntimeManager = class {
         return { stopReason: "cancelled" };
       }
       try {
-        const result = await runtime.prompt(options2);
+        const result = await runtime.prompt({
+          ...options2,
+          cancellationRequested: () => this.#executions.cancellation(options2.sessionId) !== void 0
+        });
         return this.#executions.cancellation(options2.sessionId) !== void 0 ? { stopReason: "cancelled" } : result;
       } catch (error62) {
         if (this.#executions.cancellation(options2.sessionId) !== void 0) {
@@ -37556,7 +37452,7 @@ var FixedInstallationExecutor = class {
 // src/authorization/workspace-directory.ts
 import { readdir as readdir3, realpath as realpath8, stat as stat7 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { basename as basename3, dirname as dirname5, isAbsolute as isAbsolute9, join as join16, normalize as normalize3, relative as relative4 } from "node:path";
+import { basename as basename3, dirname as dirname4, isAbsolute as isAbsolute9, join as join16, normalize as normalize3, relative as relative4 } from "node:path";
 
 // src/authorization/local-authorization-error.ts
 var LocalAuthorizationError = class extends Error {
@@ -37695,7 +37591,7 @@ var WorkspaceDirectoryService = class {
         }
       }
       entries.sort((a, b) => a.name.localeCompare(b.name));
-      const parent = dirname5(target);
+      const parent = dirname4(target);
       return new WorkspaceDirectoryListing(
         id,
         this.label(target),
@@ -37720,7 +37616,7 @@ var WorkspaceDirectoryService = class {
 };
 
 // src/daemon-diagnostic-log.ts
-import { appendFileSync, mkdirSync as mkdirSync2, readFileSync as readFileSync2, renameSync, statSync as statSync3, writeFileSync } from "node:fs";
+import { appendFileSync, mkdirSync, readFileSync as readFileSync2, renameSync, statSync as statSync3, writeFileSync } from "node:fs";
 import { join as join17 } from "node:path";
 var MAXIMUM_DAEMON_LOG_BYTES = 1 * 1024 * 1024;
 var DaemonDiagnosticLog = class {
@@ -37736,7 +37632,7 @@ var DaemonDiagnosticLog = class {
     const encoded = `${diagnostic.replace(/[\r\n]+/gu, " ").trim()}
 `;
     const encodedBytes = Buffer.byteLength(encoded);
-    mkdirSync2(this.#directory, { mode: 448, recursive: true });
+    mkdirSync(this.#directory, { mode: 448, recursive: true });
     let existingBytes = 0;
     try {
       existingBytes = statSync3(this.#path).size;
@@ -37994,16 +37890,7 @@ function send(socket, message) {
   }
   socket.send(encodeDaemonToServiceMessage(message));
 }
-function reportFailure(publisher, command, code, message) {
-  publisher.publish(command.sessionId, {
-    code,
-    commandId: command.commandId,
-    kind: SESSION_FAILED_KIND,
-    message,
-    sessionId: command.sessionId
-  });
-}
-function settleAbandonedTurn(publisher, operations, audit, cancellation) {
+async function settleAbandonedTurn(eventLog, operations, audit, cancellation) {
   const attemptId = operations.findUnsettledAttemptId(cancellation.commandId, cancellation.sessionId);
   if (attemptId === null) {
     console.warn("Mobius daemon ignored cancellation for an inactive turn");
@@ -38014,13 +37901,14 @@ function settleAbandonedTurn(publisher, operations, audit, cancellation) {
     event: "session_abandoned_turn_settled",
     sessionId: cancellation.sessionId
   });
-  reportFailure(
-    publisher,
-    cancellation,
+  await eventLog.failed(
+    cancellation.sessionId,
+    cancellation.commandId,
     "agent_execution_abandoned",
     "The local Agent execution was abandoned before it completed"
   );
   operations.transitionExecution(cancellation.commandId, "failed");
+  eventLog.publishTerminal(cancellation.sessionId, cancellation.commandId);
 }
 function operationErrorCode(error62) {
   if (error62 instanceof AcpExecutionError || error62 instanceof LocalAuthorizationError || error62 instanceof LocalAgentCatalogError || error62 instanceof PromptArtifactError) {
@@ -38201,7 +38089,7 @@ var DaemonInstallationObserver = class {
 };
 
 // src/daemon-active-turn.ts
-import { randomUUID as randomUUID2 } from "node:crypto";
+import { randomUUID as randomUUID3 } from "node:crypto";
 function activeMessageCharacters(message) {
   return message.text.length + (message.role === "assistant" ? JSON.stringify(message.activities).length + JSON.stringify(message.content).length : 0);
 }
@@ -38209,8 +38097,8 @@ var ACTIVE_TURN_TEXT_CHUNK_LIMIT = Math.floor(SESSION_HISTORY_CHARACTER_LIMIT /
 function boundedRecoveryMessages(messages) {
   const selected = [];
   let remainingCharacters = SESSION_HISTORY_CHARACTER_LIMIT;
-  for (let index = messages.length - 1; index >= 0 && selected.length < SESSION_HISTORY_MESSAGE_LIMIT; index -= 1) {
-    const message = messages[index];
+  for (let index2 = messages.length - 1; index2 >= 0 && selected.length < SESSION_HISTORY_MESSAGE_LIMIT; index2 -= 1) {
+    const message = messages[index2];
     if (message === void 0) {
       break;
     }
@@ -38235,7 +38123,7 @@ var ActiveDaemonTurn = class {
   #timeline;
   #sequence = 0;
   #interaction = null;
-  #epoch = decodeIdentifier(randomUUID2());
+  #epoch = decodeIdentifier(randomUUID3());
   constructor(command, attemptId) {
     this.attemptId = attemptId;
     this.command = command;
@@ -38297,7 +38185,7 @@ var ActiveDaemonTurn = class {
       if (!this.#activities.has(event.activityId)) {
         this.#timeline = [
           ...this.#timeline,
-          { activityId: event.activityId, id: decodeIdentifier(randomUUID2()), kind: "activity" }
+          { activityId: event.activityId, id: decodeIdentifier(randomUUID3()), kind: "activity" }
         ];
       }
       this.#activities.set(event.activityId, {
@@ -38318,7 +38206,7 @@ var ActiveDaemonTurn = class {
       if (previous === void 0) {
         this.#timeline = [
           ...this.#timeline,
-          { activityId: event.activityId, id: decodeIdentifier(randomUUID2()), kind: "activity" }
+          { activityId: event.activityId, id: decodeIdentifier(randomUUID3()), kind: "activity" }
         ];
       }
       this.#activities.set(event.activityId, {
@@ -38343,7 +38231,7 @@ var ActiveDaemonTurn = class {
           ...this.#timeline,
           {
             content: /* @__PURE__ */ new Map([[event.contentId, event.content]]),
-            id: decodeIdentifier(randomUUID2()),
+            id: decodeIdentifier(randomUUID3()),
             kind: "message",
             sourceMessageId: event.messageId,
             text: ""
@@ -38351,7 +38239,7 @@ var ActiveDaemonTurn = class {
         ];
       } else {
         this.#timeline = this.#timeline.map(
-          (entry, index) => index === target && entry.kind === "message" ? { ...entry, content: new Map([...entry.content, [event.contentId, event.content]]) } : entry
+          (entry, index2) => index2 === target && entry.kind === "message" ? { ...entry, content: new Map([...entry.content, [event.contentId, event.content]]) } : entry
         );
       }
     } else if (event.kind === SESSION_PERMISSION_REQUESTED_KIND || event.kind === SESSION_ELICITATION_REQUESTED_KIND) {
@@ -38383,7 +38271,7 @@ var ActiveDaemonTurn = class {
         ...this.#timeline,
         {
           content: /* @__PURE__ */ new Map(),
-          id: decodeIdentifier(randomUUID2()),
+          id: decodeIdentifier(randomUUID3()),
           kind: "message",
           sourceMessageId: messageId,
           text: remaining.slice(0, ACTIVE_TURN_TEXT_CHUNK_LIMIT)
@@ -38654,6 +38542,202 @@ var DaemonTurnRegistry = class {
   };
 };
 
+// src/generated/acp-session-store-migrations.ts
+var acpSessionStoreMigrations = [
+  {
+    "name": "0000_slimy_captain_midlands.sql",
+    "sql": "CREATE TABLE `acp_session` (\n	`session_id` text PRIMARY KEY NOT NULL,\n	`agent_id` text NOT NULL,\n	`native_session_id` text NOT NULL,\n	`cwd` text NOT NULL,\n	`additional_directories` text NOT NULL,\n	`prompted` integer NOT NULL,\n	`title` text NOT NULL,\n	`updated_at` text NOT NULL\n);\n--> statement-breakpoint\nCREATE TABLE `deleted_acp_session` (\n	`session_id` text PRIMARY KEY NOT NULL\n);\n"
+  },
+  {
+    "name": "0001_regular_ultimates.sql",
+    "sql": "ALTER TABLE `acp_session` ADD `last_terminal_command_id` text;"
+  },
+  {
+    "name": "0002_equal_black_queen.sql",
+    "sql": "CREATE TABLE `session_event_v2` (\n	`event_id` text PRIMARY KEY NOT NULL,\n	`event_json` text NOT NULL,\n	`position` integer NOT NULL,\n	`session_id` text NOT NULL\n);\n--> statement-breakpoint\nCREATE UNIQUE INDEX `session_event_v2_session_position_unique` ON `session_event_v2` (`session_id`,`position`);--> statement-breakpoint\nCREATE INDEX `session_event_v2_session_position_index` ON `session_event_v2` (`session_id`,`position`);"
+  },
+  {
+    "name": "0003_silky_ravenous.sql",
+    "sql": "DROP TABLE `session_event_v2`;"
+  },
+  {
+    "name": "0004_special_mathemanic.sql",
+    "sql": "DROP TABLE `deleted_acp_session`;--> statement-breakpoint\nALTER TABLE `acp_session` DROP COLUMN `last_terminal_command_id`;"
+  }
+];
+
+// src/generated/session-event-cache-migrations.ts
+var sessionEventCacheMigrations = [
+  {
+    "name": "migration.sql",
+    "sql": "CREATE TABLE `session_event_v2` (\n	`event_json` text NOT NULL,\n	`generation_id` text NOT NULL,\n	`position` integer NOT NULL,\n	`session_id` text NOT NULL,\n	CONSTRAINT `session_event_v2_pk` PRIMARY KEY(`generation_id`, `session_id`, `position`)\n);\n--> statement-breakpoint\nCREATE INDEX `session_event_v2_generation_session_position_index` ON `session_event_v2` (`generation_id`,`session_id`,`position`);"
+  }
+];
+
+// src/infra/local-sqlite-database.ts
+import { chmodSync, mkdirSync as mkdirSync2 } from "node:fs";
+import { dirname as dirname5 } from "node:path";
+import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/node-sqlite/session.js
+var NodeSQLiteSession = class extends SQLiteAsyncSession {
+  static [entityKind] = "SQLJsSession";
+  logger;
+  constructor(client2, dialect, relations, options = {}) {
+    super(dialect, "sync");
+    this.client = client2;
+    this.relations = relations;
+    this.options = options;
+    this.logger = options.logger ?? new NoopLogger();
+  }
+  prepareQuery(query, mode, _prepare, executeMethod, mapper, queryMetadata) {
+    let stmt;
+    try {
+      stmt = this.client.prepare(query.sql);
+    } catch (e) {
+      throw new DrizzleQueryError(query.sql, query.params, e);
+    }
+    return new SQLiteAsyncPreparedQuery("sync", executeMethod, {
+      all: (params) => {
+        stmt.setReturnArrays(mode === "arrays");
+        const res = stmt.all(...params);
+        if (mode === "objects") return res.map((row) => ({ ...row }));
+        return res;
+      },
+      get: (params) => {
+        stmt.setReturnArrays(mode === "arrays");
+        const res = stmt.get(...params);
+        if (res && mode === "objects") return { ...res };
+        return res;
+      },
+      run: (params) => {
+        stmt.setReturnArrays(false);
+        return stmt.run(...params);
+      },
+      values: (params) => {
+        stmt.setReturnArrays(true);
+        return stmt.all(...params);
+      }
+    }, query, mapper, mode, this.logger, void 0, queryMetadata, void 0);
+  }
+  transaction(transaction, config2 = {}) {
+    const tx = new NodeSQLiteTransaction("sync", this.dialect, this, this.relations);
+    this.run(sql.raw(`begin${config2.behavior ? ` ${config2.behavior}` : ""}`));
+    try {
+      const result = transaction(tx);
+      this.run(sql`commit`);
+      return result;
+    } catch (err) {
+      this.run(sql`rollback`);
+      throw err;
+    }
+  }
+};
+var NodeSQLiteTransaction = class NodeSQLiteTransaction2 extends SQLiteAsyncTransaction {
+  static [entityKind] = "SQLJsTransaction";
+  transaction(transaction) {
+    const savepointName = `sp${this.nestedIndex + 1}`;
+    const tx = new NodeSQLiteTransaction2("sync", this.dialect, this.session, this._.relations, this.nestedIndex + 1);
+    tx.run(sql.raw(`savepoint ${savepointName}`));
+    try {
+      const result = transaction(tx);
+      tx.run(sql.raw(`release savepoint ${savepointName}`));
+      return result;
+    } catch (err) {
+      tx.run(sql.raw(`rollback to savepoint ${savepointName}`));
+      throw err;
+    }
+  }
+};
+
+// ../../node_modules/.pnpm/drizzle-orm@1.0.0-rc.4_@cloudflare+workers-types@5.20260918.1_@types+better-sqlite3@7.6_f872c171b7e1945bb1fa42180063dab2/node_modules/drizzle-orm/node-sqlite/driver.js
+import { DatabaseSync } from "node:sqlite";
+var NodeSQLiteDatabase = class extends SQLiteAsyncDatabase {
+  static [entityKind] = "NodeSQLiteDatabase";
+};
+function construct(client2, config2 = {}) {
+  const dialect = new SQLiteDialect({ useJitMappers: jitCompatCheck(config2.jit) });
+  let logger;
+  if (config2.logger === true) logger = new DefaultLogger();
+  else if (config2.logger !== false) logger = config2.logger;
+  const relations = config2.relations ?? {};
+  const db = new NodeSQLiteDatabase("sync", dialect, new NodeSQLiteSession(client2, dialect, relations, { logger }), relations);
+  db.$client = client2;
+  return db;
+}
+function drizzle(...params) {
+  if (params[0] === void 0 || typeof params[0] === "string") return construct(params[0] === void 0 ? new DatabaseSync(":memory:") : new DatabaseSync(params[0]), params[1]);
+  const { connection, client: client2, ...config2 } = params[0];
+  if (client2) return construct(client2, config2);
+  if (typeof connection === "object") {
+    const { path: path2, ...options } = connection;
+    return construct(new DatabaseSync(path2 ?? ":memory:", options), config2);
+  }
+  return construct(new DatabaseSync(connection ?? ":memory:"), config2);
+}
+(function(_drizzle) {
+  function mock(config2) {
+    return construct({}, config2);
+  }
+  _drizzle.mock = mock;
+})(drizzle || (drizzle = {}));
+
+// src/infra/local-sqlite-database.ts
+var LocalSqliteDatabase = class {
+  orm;
+  #sqlite;
+  constructor(path2, label, migrations, pragmas = []) {
+    mkdirSync2(dirname5(path2), { mode: 448, recursive: true });
+    this.#sqlite = new DatabaseSync2(path2);
+    chmodSync(path2, 384);
+    try {
+      for (const pragma of pragmas) {
+        this.#sqlite.exec(pragma);
+      }
+      this.#migrate(label, migrations);
+      this.orm = drizzle({ client: this.#sqlite });
+    } catch (error62) {
+      this.#sqlite.close();
+      throw error62;
+    }
+  }
+  #migrate = (label, migrations) => {
+    const version2 = external_exports.object({ user_version: external_exports.number().int().nonnegative() }).parse(this.#sqlite.prepare("PRAGMA user_version").get()).user_version;
+    if (version2 > migrations.length) {
+      throw new Error(`The ${label} was created by a newer Mobius version`);
+    }
+    for (let index2 = version2; index2 < migrations.length; index2 += 1) {
+      const migration = migrations[index2];
+      if (migration === void 0) {
+        throw new Error(`The ${label} migration is unavailable`);
+      }
+      this.transaction(() => {
+        this.#sqlite.exec(migration.sql);
+        this.#sqlite.exec(`PRAGMA user_version = ${index2 + 1}`);
+      });
+    }
+  };
+  transaction = (operation) => {
+    this.#sqlite.exec("BEGIN IMMEDIATE");
+    try {
+      const result = operation();
+      this.#sqlite.exec("COMMIT");
+      return result;
+    } catch (error62) {
+      this.#sqlite.exec("ROLLBACK");
+      throw error62;
+    }
+  };
+  close = () => this.#sqlite.close();
+};
+
+// src/local-databases.ts
+var openAcpSessionDatabase = (path2) => new LocalSqliteDatabase(path2, "ACP Session database", acpSessionStoreMigrations);
+var openSessionEventCacheV2Database = (path2) => new LocalSqliteDatabase(path2, "V2 Session event cache", sessionEventCacheMigrations, [
+  "PRAGMA journal_mode = WAL",
+  "PRAGMA synchronous = OFF"
+]);
+
 // src/native-sessions/codex-history.ts
 import { spawn as spawn5 } from "node:child_process";
 var responseSchema = external_exports.union([
@@ -39358,7 +39442,7 @@ var readCodexFullHistory = async (agent, cwd, nativeSessionId, signal, nativeTur
 });
 
 // src/native-sessions/service.ts
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 var NativeSessionService = class {
   #entries = /* @__PURE__ */ new Map();
   #cursors = /* @__PURE__ */ new Map();
@@ -39417,7 +39501,7 @@ var NativeSessionService = class {
       if (authorized === null) {
         return null;
       }
-      const entryId = decodeIdentifier(randomUUID3());
+      const entryId = decodeIdentifier(randomUUID4());
       if (this.#entries.size >= 5e3) {
         this.#entries.clear();
       }
@@ -39473,7 +39557,7 @@ var NativeSessionService = class {
             "invalid_native_session_response"
           );
         }
-        nextCursor = decodeIdentifier(randomUUID3());
+        nextCursor = decodeIdentifier(randomUUID4());
         if (this.#cursors.size >= 500) {
           this.#cursors.clear();
         }
@@ -39651,7 +39735,7 @@ var NativeSessionService = class {
   resolveTarget = async (command, options, selected) => {
     let cursor = null;
     const visited = /* @__PURE__ */ new Set();
-    for (let index = 0; index < 100; index += 1) {
+    for (let index2 = 0; index2 < 100; index2 += 1) {
       const page = await this.#sessions.listNativeSessions(options, cursor);
       const info = page.sessions.find((entry) => entry.sessionId === selected.nativeSessionId);
       if (info !== void 0) {
@@ -39659,7 +39743,7 @@ var NativeSessionService = class {
         if (target === null) {
           throw new LocalAuthorizationError("The selected native session is not authorized");
         }
-        if (target.cwd !== selected.cwd || target.additionalDirectories.length !== selected.additionalDirectories.length || target.additionalDirectories.some((path2, index2) => path2 !== selected.additionalDirectories[index2])) {
+        if (target.cwd !== selected.cwd || target.additionalDirectories.length !== selected.additionalDirectories.length || target.additionalDirectories.some((path2, index3) => path2 !== selected.additionalDirectories[index3])) {
           throw new AcpExecutionError(
             "This session's directory changed. Refresh the list before continuing.",
             {},
@@ -39698,7 +39782,7 @@ var NativeSessionService = class {
 };
 
 // src/relay-connection/daemon-operation-state.ts
-import { createHash as createHash4, randomUUID as randomUUID4 } from "node:crypto";
+import { createHash as createHash4, randomUUID as randomUUID5 } from "node:crypto";
 var MAX_TERMINAL_RECEIPTS = 1024;
 function isTerminal(state) {
   return state === "succeeded" || state === "failed" || state === "cancelled";
@@ -39715,7 +39799,7 @@ var DaemonOperationState = class {
       }
       return { attemptId: existing.attemptId, commandId, kind: "duplicate", state: existing.state };
     }
-    const attemptId = randomUUID4();
+    const attemptId = randomUUID5();
     this.#executions.set(commandId, { attemptId, commandHash, sessionId, state: "dispatching" });
     return { attemptId, commandId, kind: "accepted", state: "dispatching" };
   };
@@ -40679,7 +40763,7 @@ async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, dir
     const replay = await sessions.loadSessionEventsV2(loadOptions, command.eventLimit, command.cursor);
     signal.throwIfAborted();
     const events = replay.events.map(
-      (event, index) => eventLogV2.event(command.sessionId, replay.startPosition + index, event, "1970-01-01T00:00:00.000Z")
+      (event, index2) => eventLogV2.event(command.sessionId, replay.startPosition + index2, event, "1970-01-01T00:00:00.000Z")
     );
     const tailCursor = events.at(-1)?.eventId ?? "";
     audit.record({
@@ -40730,7 +40814,7 @@ async function executeSessionLiveHistoryV2PageLoad(socket, command, config2, dir
 }
 
 // src/acp/session-config/apply-session-configuration.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 function invalidSessionConfiguration(message) {
   return new AcpExecutionError(message, {}, "invalid_session_configuration");
 }
@@ -40871,7 +40955,7 @@ async function applySessionConfigurationSelection(sessions, audit, options, sele
     booleanValue: selection.booleanValue,
     configId: selection.configId,
     cwd,
-    requestId: `cfg_${randomUUID5()}`,
+    requestId: `cfg_${randomUUID6()}`,
     sessionId,
     signal,
     value: selection.value,
@@ -40913,112 +40997,6 @@ function warnIgnoredSetting(audit, event, commandId, sessionId, agentId, selecti
 `);
 }
 
-// src/relay-connection/coalescing-agent-event-publisher.ts
-var AGENT_EVENT_COALESCING_MILLISECONDS = 100;
-var AGENT_EVENT_TEXT_MAXIMUM_LENGTH = 1e5;
-var CoalescingAgentEventPublisher = class {
-  #entries = [];
-  #publish;
-  #publishedActivityIds = /* @__PURE__ */ new Set();
-  #scheduled = null;
-  #timer;
-  constructor(timer, publish) {
-    this.#publish = publish;
-    this.#timer = timer;
-  }
-  flush = () => {
-    this.#scheduled?.cancel();
-    this.#scheduled = null;
-    const entries = this.#entries;
-    this.#entries = [];
-    for (const entry of entries) {
-      this.#publish(entry);
-    }
-  };
-  recordActivity = (activity2) => {
-    const latest = this.#entries.at(-1);
-    this.#entries = latest?.kind === "activity" && latest.activity.activityId === activity2.activityId ? [...this.#entries.slice(0, -1), { activity: activity2, kind: "activity" }] : [...this.#entries, { activity: activity2, kind: "activity" }];
-    const first = !this.#publishedActivityIds.has(activity2.activityId);
-    this.#publishedActivityIds.add(activity2.activityId);
-    if (first || activity2.status !== "pending" && activity2.status !== "running") {
-      this.flush();
-    } else {
-      this.schedule();
-    }
-    return Promise.resolve();
-  };
-  recordNarration = (increment) => {
-    if (increment.text.length === 0) {
-      return Promise.resolve();
-    }
-    let remaining = increment.text;
-    while (remaining.length > 0) {
-      const latest = this.#entries.at(-1);
-      if (latest?.kind === "narration" && latest.increment.activityId === increment.activityId) {
-        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.increment.text.length;
-        if (available > 0) {
-          this.#entries = [
-            ...this.#entries.slice(0, -1),
-            {
-              increment: {
-                ...increment,
-                text: `${latest.increment.text}${remaining.slice(0, available)}`
-              },
-              kind: "narration"
-            }
-          ];
-          remaining = remaining.slice(available);
-          continue;
-        }
-      }
-      this.#entries = [
-        ...this.#entries,
-        {
-          increment: { ...increment, text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH) },
-          kind: "narration"
-        }
-      ];
-      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-    }
-    this.schedule();
-    return Promise.resolve();
-  };
-  recordText = (text2, messageId) => {
-    if (text2.length === 0) {
-      return Promise.resolve();
-    }
-    let remaining = text2;
-    while (remaining.length > 0) {
-      const latest = this.#entries.at(-1);
-      if (latest?.kind === "text" && latest.messageId === messageId) {
-        const available = AGENT_EVENT_TEXT_MAXIMUM_LENGTH - latest.text.length;
-        if (available > 0) {
-          this.#entries = [
-            ...this.#entries.slice(0, -1),
-            { ...latest, text: `${latest.text}${remaining.slice(0, available)}` }
-          ];
-          remaining = remaining.slice(available);
-          continue;
-        }
-      }
-      this.#entries = [
-        ...this.#entries,
-        {
-          kind: "text",
-          messageId,
-          text: remaining.slice(0, AGENT_EVENT_TEXT_MAXIMUM_LENGTH)
-        }
-      ];
-      remaining = remaining.slice(AGENT_EVENT_TEXT_MAXIMUM_LENGTH);
-    }
-    this.schedule();
-    return Promise.resolve();
-  };
-  schedule() {
-    this.#scheduled ??= this.#timer.schedule(this.flush, AGENT_EVENT_COALESCING_MILLISECONDS);
-  }
-};
-
 // src/daemon-prompt-executor.ts
 function daemonActivity(command, activity2) {
   return {
@@ -41041,7 +41019,6 @@ function daemonActivity(command, activity2) {
 }
 async function executePrompt({
   operations,
-  publisher,
   eventLogV2,
   command,
   config: config2,
@@ -41051,36 +41028,11 @@ async function executePrompt({
   attemptId,
   activateAttempt,
   waitForSessionAvailability,
-  timer,
   signal,
-  recordLiveEvent,
+  recordTurnEvent,
   recordSteeringPrompt,
   cancellationRequested
 }) {
-  const events = new CoalescingAgentEventPublisher(timer, (event) => {
-    if (event.kind === "text") {
-      publisher.publish(
-        command.sessionId,
-        recordLiveEvent({ kind: AGENT_MESSAGE_DELTA_KIND, messageId: event.messageId, text: event.text })
-      );
-      return;
-    }
-    if (event.kind === "narration") {
-      const recorded = {
-        activityId: event.increment.activityId,
-        activityType: event.increment.activityType,
-        commandId: command.commandId,
-        kind: AGENT_ACTIVITY_NARRATION_KIND,
-        sequence: event.increment.sequence,
-        sessionId: command.sessionId,
-        text: event.increment.text
-      };
-      publisher.publish(command.sessionId, recordLiveEvent(recorded));
-      return;
-    }
-    const activity2 = daemonActivity(command, event.activity);
-    publisher.publish(command.sessionId, recordLiveEvent(activity2));
-  });
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -41148,33 +41100,6 @@ async function executePrompt({
     }
     const stream = activateAttempt();
     const lifecycleV2 = eventLogV2.started(command.sessionId, command.commandId, attemptId, stream.epoch);
-    if (!prepared.prompted) {
-      const listing = await directories.list(config2.bindingId, command.directoryId, signal);
-      publisher.publish(command.sessionId, {
-        additionalDirectories: resolved.additionalDirectoryEntries,
-        agentId: command.agentId,
-        agentName: prepared.agentName,
-        agentVersion: prepared.agentVersion,
-        capabilities: prepared.capabilities,
-        commands: prepared.commands,
-        configOptions: prepared.configOptions,
-        directoryId: command.directoryId,
-        directoryLabel: listing.directoryLabel,
-        kind: SESSION_READY_KIND,
-        requestId: command.commandId,
-        restored: prepared.restored,
-        sessionId: command.sessionId
-      });
-    }
-    publisher.publish(command.sessionId, {
-      commandId: command.commandId,
-      epoch: stream.epoch,
-      kind: SESSION_STARTED_KIND,
-      attemptId,
-      prompt: command.prompt,
-      sequence: stream.sequence,
-      sessionId: command.sessionId
-    });
     const attachments = await resolvePromptArtifacts(config2, command, signal);
     let stopReason;
     if (availability.disposition === SessionPromptDisposition.Steer) {
@@ -41201,9 +41126,20 @@ async function executePrompt({
         disposition: availability.disposition,
         images: attachments.images,
         lifecycleV2,
-        onActivity: events.recordActivity,
-        onNarration: events.recordNarration,
-        onText: events.recordText,
+        onActivity: async (activity2) => {
+          recordTurnEvent(daemonActivity(command, activity2));
+        },
+        onNarration: async (increment) => {
+          recordTurnEvent({
+            ...increment,
+            commandId: command.commandId,
+            sessionId: command.sessionId,
+            kind: AGENT_ACTIVITY_NARRATION_KIND
+          });
+        },
+        onText: async (text2, messageId) => {
+          recordTurnEvent({ kind: AGENT_MESSAGE_DELTA_KIND, text: text2, messageId });
+        },
         prompt: command.prompt,
         resources: attachments.resources,
         sessionId: command.sessionId,
@@ -41212,14 +41148,7 @@ async function executePrompt({
       });
       stopReason = result.stopReason;
     }
-    events.flush();
-    publisher.publish(command.sessionId, {
-      commandId: command.commandId,
-      kind: SESSION_COMPLETED_KIND,
-      sessionId: command.sessionId,
-      stopReason
-    });
-    eventLogV2.completed(command.sessionId, command.commandId, stopReason);
+    await eventLogV2.completed(command.sessionId, command.commandId, stopReason);
     operations.transitionExecution(command.commandId, stopReason === "cancelled" ? "cancelled" : "succeeded");
     audit.record({
       commandId: command.commandId,
@@ -41227,15 +41156,8 @@ async function executePrompt({
       sessionId: command.sessionId
     });
   } catch (error62) {
-    events.flush();
     if (signal.aborted && cancellationRequested()) {
-      publisher.publish(command.sessionId, {
-        commandId: command.commandId,
-        kind: SESSION_COMPLETED_KIND,
-        sessionId: command.sessionId,
-        stopReason: "cancelled"
-      });
-      eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
+      await eventLogV2.completed(command.sessionId, command.commandId, "cancelled");
       operations.transitionExecution(command.commandId, "cancelled");
       audit.record({
         commandId: command.commandId,
@@ -41252,8 +41174,7 @@ async function executePrompt({
     const code = operationErrorCode(error62);
     const failureCode = code === "session_operation_failed" ? "agent_execution_failed" : code;
     const failureMessage = code === "session_operation_failed" ? "The local agent could not complete the request" : operationErrorMessage(error62);
-    eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
-    reportFailure(publisher, command, failureCode, failureMessage);
+    await eventLogV2.failed(command.sessionId, command.commandId, failureCode, failureMessage);
     operations.transitionExecution(command.commandId, "failed");
     console.error("Mobius daemon command failed", error62);
   }
@@ -41281,7 +41202,7 @@ async function executeWorkspaceList(socket, command, directories, audit, signal)
     reportOperationFailure(socket, command.requestId, "", error62);
   }
 }
-async function executeSessionPrepare(publisher, socket, command, config2, directories, audit, sessions, diagnostics, signal) {
+async function executeSessionPrepare(socket, command, config2, directories, audit, sessions, diagnostics, signal) {
   const metrics = new AccumulatingOperationMetrics();
   try {
     const readyEvent = await metrics.measure("prepare-total", async () => {
@@ -41331,12 +41252,6 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
           event: "session_configured",
           sessionId: command.sessionId
         });
-        publisher.publish(command.sessionId, {
-          configOptions,
-          kind: "session.config.updated",
-          requestId: command.requestId,
-          sessionId: command.sessionId
-        });
       }
       const event = {
         additionalDirectories: resolved.additionalDirectoryEntries,
@@ -41354,11 +41269,6 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
         sessionId: command.sessionId,
         runtimeTimings: metrics.snapshot()
       };
-      if (command.transient !== true) {
-        metrics.measureSync("readiness-commit", () => {
-          publisher.publish(command.sessionId, event);
-        });
-      }
       return event;
     });
     send(socket, {
@@ -41388,7 +41298,7 @@ async function executeSessionPrepare(publisher, socket, command, config2, direct
     reportOperationFailure(socket, command.requestId, command.sessionId, error62, metrics.snapshot());
   }
 }
-async function executeSessionConfigure(publisher, socket, command, config2, directories, audit, sessions, signal) {
+async function executeSessionConfigure(socket, command, config2, directories, audit, sessions, signal) {
   try {
     const resolved = await resolveSessionDirectories(
       directories,
@@ -41414,7 +41324,7 @@ async function executeSessionConfigure(publisher, socket, command, config2, dire
       event: "session_configured",
       sessionId: command.sessionId
     });
-    publisher.publish(command.sessionId, {
+    send(socket, {
       configOptions,
       kind: "session.config.updated",
       requestId: command.requestId,
@@ -41534,7 +41444,6 @@ function createDaemonCommandHandler({
   installations,
   nativeSessions,
   operations,
-  publisher,
   eventLogV2,
   externalContent,
   activeTurns,
@@ -41555,8 +41464,9 @@ function createDaemonCommandHandler({
     timer
   });
   const queueChanged = (sessionId) => {
-    publisher.publish(sessionId, { kind: "session.queue.changed", sessionId });
-    eventLogV2.queueChanged(sessionId);
+    void eventLogV2.queueChanged(sessionId).catch((error62) => {
+      console.error("Could not record queue change", error62);
+    });
   };
   const nativeRequestHandler = createNativeSessionRequestHandler({
     audit,
@@ -41625,7 +41535,9 @@ function createDaemonCommandHandler({
         const cancellation = message;
         const turn2 = activeTurns.get(cancellation.commandId);
         if (turn2 === void 0 || !turn2.matches(cancellation)) {
-          settleAbandonedTurn(publisher, operations, audit, cancellation);
+          void settleAbandonedTurn(eventLogV2, operations, audit, cancellation).catch((error62) => {
+            console.error("Could not settle abandoned turn", error62);
+          });
           return;
         }
         const cancellationState = turn2.requestCancellation();
@@ -41665,22 +41577,12 @@ function createDaemonCommandHandler({
       }
       if (kind === SESSION_PREPARE_KIND) {
         const command2 = message;
-        void executeSessionPrepare(
-          publisher,
-          socket,
-          command2,
-          config2,
-          directories,
-          audit,
-          sessions,
-          diagnostics,
-          signal
-        );
+        void executeSessionPrepare(socket, command2, config2, directories, audit, sessions, diagnostics, signal);
         return;
       }
       if (kind === SESSION_CONFIGURE_KIND) {
         const command2 = message;
-        void executeSessionConfigure(publisher, socket, command2, config2, directories, audit, sessions, signal);
+        void executeSessionConfigure(socket, command2, config2, directories, audit, sessions, signal);
         return;
       }
       if (kind === SESSION_LIST_KIND) {
@@ -41782,7 +41684,6 @@ function createDaemonCommandHandler({
       eventLogV2.requested(command);
       void executePrompt({
         operations,
-        publisher,
         eventLogV2,
         command,
         config: config2,
@@ -41799,15 +41700,15 @@ function createDaemonCommandHandler({
             sessionId: command.sessionId
           });
         }),
-        timer,
         signal: turn.signal,
-        recordLiveEvent: turn.recordEvent,
+        recordTurnEvent: turn.recordEvent,
         recordSteeringPrompt: () => activeTurns.recordSteeringPrompt(command),
         cancellationRequested: turn.cancellationRequested
       }).catch((error62) => {
         console.error("Mobius daemon turn failed", error62);
       }).finally(() => {
         activeTurns.finish(turn);
+        eventLogV2.publishTerminal(command.sessionId, command.commandId);
         if (command.disposition === SessionPromptDisposition.Queue) {
           queueChanged(command.sessionId);
         }
@@ -41941,7 +41842,7 @@ function connectRelay(url2, signal) {
 }
 
 // src/relay-connection/liveness.ts
-import { randomUUID as randomUUID6 } from "node:crypto";
+import { randomUUID as randomUUID7 } from "node:crypto";
 var HEARTBEAT_ACK_TIMEOUT_MILLISECONDS = 1e4;
 var HEARTBEAT_INTERVAL_MILLISECONDS = 2e4;
 var RelayLivenessState = class {
@@ -42030,7 +41931,7 @@ var RelayConnectionLiveness = class {
       }
       throw new Error("Heartbeat was scheduled in an invalid state");
     }
-    const heartbeatId = randomUUID6();
+    const heartbeatId = randomUUID7();
     this.#state = new AwaitingHeartbeatAckState(
       heartbeatId,
       this.#timer.schedule(this.#handleTimeout, HEARTBEAT_ACK_TIMEOUT_MILLISECONDS)
@@ -42091,7 +41992,6 @@ async function runRelayConnection({
     installations,
     nativeSessions,
     operations,
-    publisher,
     eventLogV2,
     externalContent,
     activeTurns,
@@ -42256,51 +42156,17 @@ var DaemonSessionEventPublisher = class {
   close = () => {
     this.#socket = null;
   };
-  publish = (sessionId, event) => {
-    const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
-      return;
-    }
-    const encoded = encodeDaemonToServiceMessage({
-      kind: SESSION_EVENT_KIND,
-      payload: encodeRecordedSessionEvent(event),
-      sessionId
-    });
-    if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
-      socket.close(1013, "Live event transport overloaded");
-      return;
-    }
-    try {
-      socket.send(encoded);
-    } catch {
-    }
-  };
-  publishBatch = (sessionId, events) => {
-    for (const event of events) {
-      this.publish(sessionId, event);
-    }
-  };
-  publishStatus = (event) => {
-    const socket = this.#socket;
-    if (socket === null || socket.readyState !== WebSocket8.OPEN) {
-      return;
-    }
-    const encoded = encodeDaemonToServiceMessage(event);
-    if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
-      socket.close(1013, "Live event transport overloaded");
-      return;
-    }
-    try {
-      socket.send(encoded);
-    } catch {
-    }
+  publishOperationFailure = (sessionId, requestId, code, message) => {
+    this.#send({ kind: "session.operation.failed", sessionId, requestId, code, message });
   };
-  publishV2 = (event) => {
+  publishStatus = (event) => this.#send(event);
+  publishV2 = (event) => this.#send({ event, kind: SESSION_EVENT_V2_KIND });
+  #send = (message) => {
     const socket = this.#socket;
     if (socket === null || socket.readyState !== WebSocket8.OPEN) {
       return;
     }
-    const encoded = encodeDaemonToServiceMessage({ event, kind: SESSION_EVENT_V2_KIND });
+    const encoded = encodeDaemonToServiceMessage(message);
     if (socket.bufferedAmount + Buffer.byteLength(encoded, "utf8") > MAX_BUFFERED_BYTES) {
       socket.close(1013, "Live event transport overloaded");
       return;
@@ -42322,7 +42188,7 @@ var SystemDaemonTimer = class {
 var systemDaemonTimer = new SystemDaemonTimer();
 
 // src/session-event-log-v2.ts
-import { createHash as createHash6, randomUUID as randomUUID7 } from "node:crypto";
+import { createHash as createHash6, randomUUID as randomUUID8 } from "node:crypto";
 function promptContent(command) {
   const content = [];
   if (command.prompt.length > 0) {
@@ -42346,7 +42212,7 @@ function promptContent(command) {
   }
   return content;
 }
-function sessionEventV2(daemonGenerationId, sessionId, position, event, recordedAt) {
+function sessionEventV22(daemonGenerationId, sessionId, position, event, recordedAt) {
   const sessionPrefix = createHash6("sha256").update(sessionId).digest("hex").slice(0, 16);
   return {
     eventId: `event-${daemonGenerationId}-${sessionPrefix}-${position.toString().padStart(16, "0")}`,
@@ -42358,46 +42224,116 @@ function sessionEventV2(daemonGenerationId, sessionId, position, event, recorded
   };
 }
 var DaemonSessionEventLogV2 = class {
-  daemonGenerationId = randomUUID7();
+  daemonGenerationId;
   #publisher;
+  #terminal = /* @__PURE__ */ new Map();
+  #publications = /* @__PURE__ */ new Map();
   #queued = /* @__PURE__ */ new Map();
-  constructor(publisher) {
+  #recordLifecycle;
+  constructor(publisher, recordLifecycle, daemonGenerationId = randomUUID8()) {
+    this.#recordLifecycle = recordLifecycle;
     this.#publisher = publisher;
+    this.daemonGenerationId = daemonGenerationId;
   }
   requested = (command) => {
     this.#queued.set(command.commandId, {
       commandId: command.commandId,
       content: promptContent(command),
+      context: {
+        agentId: command.agentId,
+        directoryId: command.directoryId,
+        additionalDirectoryIds: command.additionalDirectoryIds
+      },
+      phase: "queued",
       sessionId: command.sessionId
     });
   };
   started = (sessionId, commandId, attemptId, epoch) => {
     const request = this.#queued.get(commandId);
     if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
-      return { attemptId, content: request.content, epoch };
+      this.#queued.set(commandId, { ...request, phase: "running" });
+      return { attemptId, content: request.content, epoch, context: request.context };
     }
     throw new Error("The executing prompt was not registered in the V2 queue");
   };
   record = (sessionId, event, position) => {
-    this.#publisher.publishV2(this.event(sessionId, position, event, (/* @__PURE__ */ new Date()).toISOString()));
+    const recorded = this.event(sessionId, position, event, (/* @__PURE__ */ new Date()).toISOString());
+    if (event.type === "lifecycle-metadata" && (event.payload.kind === "prompt.completed" || event.payload.kind === "prompt.failed" || event.payload.kind === "prompt.failed-before-start")) {
+      this.#terminal.set(event.payload.commandId, recorded);
+      const pending2 = this.#publications.get(sessionId) ?? [];
+      pending2.push(recorded);
+      this.#publications.set(sessionId, pending2);
+      return;
+    }
+    const pending = this.#publications.get(sessionId);
+    if (pending !== void 0) {
+      pending.push(recorded);
+    } else {
+      this.#publisher.publishV2(recorded);
+    }
+  };
+  publishTerminal = (sessionId, commandId) => {
+    const event = this.#terminal.get(commandId);
+    if (event?.sessionId === sessionId) {
+      this.#terminal.delete(commandId);
+      const pending = this.#publications.get(sessionId) ?? [];
+      while (pending.length > 0) {
+        const next = pending[0];
+        if (next === void 0) {
+          break;
+        }
+        if (next.type === "lifecycle-metadata" && "commandId" in next.payload && this.#terminal.has(next.payload.commandId)) {
+          break;
+        }
+        pending.shift();
+        this.#publisher.publishV2(next);
+      }
+      if (pending.length === 0) {
+        this.#publications.delete(sessionId);
+      }
+    }
+    this.#queued.delete(commandId);
   };
-  event = (sessionId, position, event, recordedAt) => sessionEventV2(this.daemonGenerationId, sessionId, position, event, recordedAt);
-  queueChanged = (_sessionId) => void 0;
-  completed = (sessionId, commandId, _stopReason) => {
+  event = (sessionId, position, event, recordedAt) => sessionEventV22(this.daemonGenerationId, sessionId, position, event, recordedAt);
+  queueChanged = async (sessionId) => {
+    await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "session.queue.changed" }
+    });
+  };
+  completed = async (sessionId, commandId, stopReason) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
+    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+      return;
+    }
+    const recorded = await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "prompt.completed", commandId, stopReason }
+    });
+    if (!recorded) {
+      this.#publisher.publishOperationFailure(
+        sessionId,
+        commandId,
+        "cancelled",
+        "The prompt was cancelled before execution"
+      );
     }
   };
-  failed = (sessionId, commandId, _code, _message) => {
+  failed = async (sessionId, commandId, code, message) => {
     const request = this.#queued.get(commandId);
-    if (request?.sessionId === sessionId) {
-      this.#queued.delete(commandId);
+    if (request?.sessionId !== sessionId || this.#terminal.has(commandId)) {
+      return;
+    }
+    const recorded = await this.#recordLifecycle(sessionId, {
+      type: "lifecycle-metadata",
+      payload: { kind: "prompt.failed-before-start", commandId, code, message }
+    });
+    if (!recorded) {
+      this.#publisher.publishOperationFailure(sessionId, commandId, code, message);
     }
   };
   promptRequestRecovery = (sessionId) => ({
-    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId).map(({ commandId, content }) => ({ commandId, content }))
+    queuedPromptRequests: [...this.#queued.values()].filter((request) => request.sessionId === sessionId && request.phase === "queued").map(({ commandId, content }) => ({ commandId, content }))
   });
 };
 
@@ -42449,7 +42385,7 @@ async function installDetectedAgentIntegrations(config2, installations, signal)
       {
         agentId: agent.id,
         kind: AGENT_INSTALL_REQUEST_KIND,
-        requestId: `automatic-integration-${randomUUID8()}`
+        requestId: `automatic-integration-${randomUUID9()}`
       },
       signal
     );
@@ -42467,19 +42403,33 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
     publishCatalog: async (installationSignal) => await publishAgentCatalog(config2, installationSignal),
     stateDirectory
   });
-  const sessionStore = new SqliteAcpSessionStore(
-    join18(stateDirectory, "sessions", `${createHash7("sha256").update(config2.channelId).digest("hex")}.sqlite`)
-  );
+  const channelHash = createHash7("sha256").update(config2.channelId).digest("hex");
+  const daemonGenerationId = randomUUID9();
+  const sessionDatabase = openAcpSessionDatabase(join18(stateDirectory, "sessions", `${channelHash}.sqlite`));
+  let eventsV2;
+  try {
+    eventsV2 = new CachedAcpSessionEventStoreV2(
+      openSessionEventCacheV2Database(join18(stateDirectory, "sessions", `${channelHash}.events.sqlite`)),
+      daemonGenerationId
+    );
+  } catch (error62) {
+    sessionDatabase.close();
+    throw error62;
+  }
+  const sessionStore = new SqliteAcpSessionStore(sessionDatabase, eventsV2);
   await using externalContent = new LocalExternalContentStore(stateDirectory);
   const operations = new DaemonOperationState();
   const publisher = new DaemonSessionEventPublisher();
-  const eventLogV2 = new DaemonSessionEventLogV2(publisher);
+  const eventLogV2 = new DaemonSessionEventLogV2(
+    publisher,
+    (sessionId, event) => agentRuntime.recordLifecycleEventV2(sessionId, event),
+    daemonGenerationId
+  );
   const activeTurns = new DaemonTurnRegistry(operations);
-  const recordSessionEvent = (sessionId, event) => {
-    publisher.publish(sessionId, activeTurns.recordEvent(event));
-  };
   const agentRuntime = new AgentRuntimeManager(
-    new DaemonAcpObserver(recordSessionEvent, eventLogV2.record),
+    new DaemonAcpObserver((_sessionId, event) => {
+      activeTurns.recordEvent(event);
+    }, eventLogV2.record),
     sessionStore,
     {
       read: async (options2, nativeSessionId, nativeTurn) => options2.agent.id === "codex" ? (await readCodexFullHistory(
@@ -42519,7 +42469,7 @@ async function runDaemon(config2, audit, signal, timer = systemDaemonTimer, opti
           options2.signal
         );
         return cwd === options2.cwd && additionalDirectories.length === options2.additionalDirectories.length && additionalDirectories.every(
-          (directory, index) => directory === options2.additionalDirectories[index]
+          (directory, index2) => directory === options2.additionalDirectories[index2]
         );
       });
     }
@@ -42664,7 +42614,7 @@ import { basename as basename6, resolve as resolve7 } from "node:path";
 import { fetch as fetch4 } from "undici";
 
 // src/storage/runtime-installation-store.ts
-import { createHash as createHash8, randomUUID as randomUUID9 } from "node:crypto";
+import { createHash as createHash8, randomUUID as randomUUID10 } from "node:crypto";
 import { mkdir as mkdir5, open as open5, readdir as readdir4, rename as rename4, unlink, writeFile as writeFile4 } from "node:fs/promises";
 import { dirname as dirname6, join as join19, resolve as resolve6 } from "node:path";
 var APPLICATION_ID_PATTERN = /^[a-z][a-z0-9]*(?:[.-][a-z0-9]+){1,31}$/;
@@ -42794,10 +42744,10 @@ function parseRelayOrigin(value) {
   return origin;
 }
 function connectionId() {
-  return `mcn_${randomUUID9().replaceAll("-", "")}`;
+  return `mcn_${randomUUID10().replaceAll("-", "")}`;
 }
 function installationId() {
-  return `min_${randomUUID9().replaceAll("-", "")}`;
+  return `min_${randomUUID10().replaceAll("-", "")}`;
 }
 function channelIndexFileName(channelId) {
   return `mci_${createHash8("sha256").update(channelId).digest("hex")}.json`;
@@ -42909,7 +42859,7 @@ async function readJsonFile(path2, signal, missingCode) {
 async function writeJsonAtomically(path2, value, signal) {
   signal.throwIfAborted();
   const directory = dirname6(path2);
-  const temporaryPath = join19(directory, `.${randomUUID9()}.tmp`);
+  const temporaryPath = join19(directory, `.${randomUUID10()}.tmp`);
   try {
     await mkdir5(directory, { mode: 448, recursive: true });
     signal.throwIfAborted();
@@ -42986,16 +42936,16 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
   };
   #readConnectionForChannel = async (channelId, signal) => {
     const normalizedChannelId = validateIdentifier(channelId, "invalid_channel_id");
-    const index = decodeChannelIndex(
+    const index2 = decodeChannelIndex(
       await readJsonFile(this.channelIndexPath(normalizedChannelId), signal, "connection_not_found")
     );
-    if (index.applicationId !== this.applicationId || index.installationId !== this.installationId || index.channelId !== normalizedChannelId) {
+    if (index2.applicationId !== this.applicationId || index2.installationId !== this.installationId || index2.channelId !== normalizedChannelId) {
       throw new RuntimeInstallationStoreError(
         "connection_owner_mismatch",
         "The saved Runtime connection belongs to another installation"
       );
     }
-    return await this.readConnection(index.connectionId, signal);
+    return await this.readConnection(index2.connectionId, signal);
   };
   saveConnection = async (input2, signal) => {
     const stored = new VerifiedRuntimeConnection(