@morty-build/cli 0.4.29 → 0.4.31

package/dist/{chunk-MNUDTG5G.js → chunk-M7MJMWZ4.js}

@@ -3,7 +3,7 @@ import {
   __export,
   __using,
   package_default
-} from "./chunk-SIONM2MQ.js";
+} from "./chunk-VVUR5KEG.js";
 
 // src/engine/runtime/relay/runtime-revocation.ts
 var runtimeRevocationCloseCode = 1008;
@@ -20853,7 +20853,14 @@ var sharedSessionEventFields = {
   sessionId: identifierStringSchema
 };
 var sessionLiveEventFields = { ...sharedSessionEventFields, position: positionSchema };
-var sessionEventSchema = external_exports.object({ ...sharedSessionEventFields, payload: acpSessionUpdateSchema, type: external_exports.literal("acp") }).readonly();
+var sessionEventSchema = external_exports.discriminatedUnion("type", [
+  external_exports.object({ ...sharedSessionEventFields, payload: acpSessionUpdateSchema, type: external_exports.literal("acp") }).readonly(),
+  external_exports.object({
+    ...sharedSessionEventFields,
+    payload: lifecycleMetadataSchema,
+    type: external_exports.literal("lifecycle-metadata")
+  }).readonly()
+]);
 var sessionLiveEventSchema = external_exports.discriminatedUnion("type", [
   external_exports.object({ ...sessionLiveEventFields, payload: acpSessionUpdateSchema, type: external_exports.literal("acp") }).readonly(),
   external_exports.object({
@@ -20899,15 +20906,9 @@ function isRecord2(value) {
 var sessionEventBatchSchema = external_exports.array(sessionEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
 var sessionLiveEventBatchSchema = external_exports.array(sessionLiveEventSchema).min(1).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
 var sessionEventEnvelopeSchema = external_exports.object({ events: sessionLiveEventBatchSchema, kind: external_exports.literal(SESSION_EVENT_KIND) }).readonly();
-var promptMessageOutcomeSchema = external_exports.object({
-  payload: external_exports.discriminatedUnion("kind", [promptCompletedSchema, promptFailedSchema]),
-  recordedAt: external_exports.iso.datetime({ offset: true })
-}).readonly();
 var sessionEventLogPageSchema = external_exports.object({
   events: external_exports.array(sessionEventSchema).max(MAX_EVENT_COUNT).readonly(),
   nextCursor: external_exports.string().min(1).max(512).nullable(),
-  // Retained settled prompts whose user message is on this page; empty outside Session history.
-  promptOutcomes: external_exports.array(promptMessageOutcomeSchema).max(MAX_EVENT_COUNT).readonly(),
   sessionGenerationId: identifierStringSchema,
   tailCursor: external_exports.string().max(512),
   // The generation-scoped live position covered by this snapshot, including
@@ -20980,8 +20981,7 @@ function sanitizeConsumableSessionEventLogPage(value) {
   const input2 = inputValue(value);
   return isRecord2(input2) ? {
     ...input2,
-    events: decodedEntries(input2["events"], sessionEventSchema, MAX_EVENT_COUNT),
-    promptOutcomes: decodedEntries(input2["promptOutcomes"], promptMessageOutcomeSchema, MAX_EVENT_COUNT)
+    events: decodedEntries(input2["events"], sessionEventSchema, MAX_EVENT_COUNT)
   } : input2;
 }
 var knownSessionLiveEventBatchSchema = external_exports.array(sessionLiveEventSchema).max(SESSION_EVENT_BATCH_MAX_SIZE).readonly();
@@ -72898,19 +72898,19 @@ function presentToolItem(item) {
   }
   return null;
 }
-function toolCallUpdate(item, lifecycle) {
+function toolCallUpdate(item, lifecycle2) {
   const presentation = presentToolItem(item);
   if (presentation === null) {
     return null;
   }
   return {
-    content: item.type === "imageView" && lifecycle === "started" ? [] : [...presentation.content],
+    content: item.type === "imageView" && lifecycle2 === "started" ? [] : [...presentation.content],
     kind: presentation.kind,
     locations: [...presentation.locations],
     rawInput: presentation.rawInput,
     rawOutput: presentation.rawOutput,
     ...item.type === "collabAgentToolCall" ? { name: item.tool === "spawnAgent" ? "spawn_agent" : "wait_agent" } : item.type === "subAgentActivity" ? { name: "spawn_agent" } : {},
-    status: item.type === "imageView" && lifecycle === "started" ? "in_progress" : lifecycle === "completed" && presentation.status === "in_progress" ? "completed" : presentation.status,
+    status: item.type === "imageView" && lifecycle2 === "started" ? "in_progress" : lifecycle2 === "completed" && presentation.status === "in_progress" ? "completed" : presentation.status,
     title: presentation.title,
     toolCallId: item.id
   };
@@ -80237,8 +80237,8 @@ function normalizeConfigOptions(value, modes) {
   return normalized.slice(0, MAXIMUM_CONFIG_OPTIONS);
 }
 function normalizeStandardLifecycle(response) {
-  const lifecycle = isRecord7(response) ? response : {};
-  return normalizeConfigOptions(lifecycle["configOptions"], lifecycle["modes"]);
+  const lifecycle2 = isRecord7(response) ? response : {};
+  return normalizeConfigOptions(lifecycle2["configOptions"], lifecycle2["modes"]);
 }
 function replaceStandardConfigOptions(current, value) {
   const next = normalizeConfigOptions(value, void 0);
@@ -81256,6 +81256,10 @@ function projectNewEvent(liveEvent2, eventId) {
   }
   return { ...event, eventId };
 }
+function projectLifecycleEvent(liveEvent2) {
+  const { position: _position, ...event } = liveEvent2;
+  return event;
+}
 function replaceAcpPayload(event, payload) {
   return { ...event, payload };
 }
@@ -81326,11 +81330,13 @@ function mergeTextChunk(previous, incoming) {
 }
 var SessionEventHistoryProjection = class {
   #toolCallEventIds = /* @__PURE__ */ new Map();
+  /** The turns this history holds: open until their ending is recorded, where the turn ended. */
+  #turns = /* @__PURE__ */ new Map();
   #latestEvent = null;
   apply = (liveEvent2, resolve19) => {
     if (liveEvent2.type === "lifecycle-metadata") {
       this.#latestEvent = null;
-      return { kind: "skip" };
+      return this.#turnLifecycle(liveEvent2);
     }
     if (liveEvent2.type === "acp" && liveEvent2.payload.sessionUpdate === "tool_call_update") {
       const targetEventId = this.#toolCallEventIds.get(liveEvent2.payload.toolCallId);
@@ -81369,6 +81375,40 @@ var SessionEventHistoryProjection = class {
     }
     return void 0;
   };
+  /**
+   * Keeps the lifecycle that delimits each turn, where it happened. A turn's ending is history only once, after its
+   * start: an ending restated for a client, or one for a turn this history does not hold, has no place in it.
+   * Interaction and queue changes are current state, not history.
+   */
+  #turnLifecycle = (liveEvent2) => {
+    const payload = liveEvent2.payload;
+    switch (payload.kind) {
+      case "prompt.requested":
+      case "prompt.started":
+      case "prompt.delegated":
+        if (this.#turns.get(payload.commandId) === "ended") {
+          return { kind: "skip" };
+        }
+        this.#turns.set(payload.commandId, "open");
+        return { events: [projectLifecycleEvent(liveEvent2)], kind: "append" };
+      case "prompt.completed":
+      case "prompt.failed":
+      case "prompt.failed-before-start":
+        if (this.#turns.get(payload.commandId) !== "open") {
+          return { kind: "skip" };
+        }
+        this.#turns.set(payload.commandId, "ended");
+        return { events: [projectLifecycleEvent(liveEvent2)], kind: "append" };
+      case "session.queue.changed":
+      case "session.permission.requested":
+      case "session.permission.resolved":
+      case "session.elicitation.requested":
+      case "session.elicitation.resolved":
+        return { kind: "skip" };
+      default:
+        return payload;
+    }
+  };
   #replace = (current, replacement) => {
     if (this.#latestEvent?.eventId === current.eventId) {
       this.#latestEvent = replacement;
@@ -89392,13 +89432,88 @@ var AgentSettingsSnapshot = class {
 };
 
 // src/engine/session/history/session-history.ts
+function lifecycle(payload) {
+  return { payload, type: "lifecycle-metadata" };
+}
+function turnStart(turn, content, steers) {
+  const { commandId } = turn.outcome;
+  const requested = content.sessionUpdate === "user_message_chunk" ? lifecycle({
+    commandId,
+    content: [content.content],
+    kind: "prompt.requested",
+    ...steers === null ? { disposition: "append" } : { disposition: "steer", targetCommandId: steers }
+  }) : null;
+  const started = lifecycle({ attemptId: turn.attemptId, commandId, epoch: turn.attemptId, kind: "prompt.started" });
+  return [
+    ...requested === null ? [] : [{ event: requested, recordedAt: turn.startedAt }],
+    { event: started, recordedAt: turn.startedAt }
+  ];
+}
+var turnEnd = (turn) => ({
+  event: lifecycle(turn.outcome),
+  recordedAt: turn.recordedAt
+});
+var ReplayedTurns = class {
+  #byMessage;
+  #open = null;
+  /** The user message the latest replayed event belongs to; undefined after any other event. */
+  #userMessage;
+  constructor(turns) {
+    this.#byMessage = new Map(turns.map((turn) => [turn.outcome.messageId, turn]));
+  }
+  /** The lifecycle that precedes `update` in history. */
+  before = (update) => {
+    if (update.sessionUpdate !== "user_message_chunk") {
+      this.#userMessage = void 0;
+      return [];
+    }
+    const messageId = update.messageId ?? null;
+    if (this.#userMessage?.messageId === messageId) {
+      return [];
+    }
+    this.#userMessage = { messageId };
+    const turn = messageId === null ? void 0 : this.#byMessage.get(messageId);
+    const steered = turn?.outcome.kind === "prompt.completed" && promptCompletion(turn.outcome).kind === "steered";
+    const open6 = this.#open;
+    if (turn !== void 0 && steered && open6 !== null) {
+      return [...turnStart(turn, update, open6.outcome.commandId), turnEnd(turn)];
+    }
+    const ended = this.end();
+    if (turn === void 0 || steered) {
+      return ended;
+    }
+    this.#open = turn;
+    return [...ended, ...turnStart(turn, update, null)];
+  };
+  /** The ending of the turn still open where the replay ends. */
+  end = () => {
+    const open6 = this.#open;
+    this.#open = null;
+    return open6 === null ? [] : [turnEnd(open6)];
+  };
+};
 var HistoryReplayCapture = class {
   #events;
   #sessionId;
-  constructor(events, sessionId) {
+  #replayed;
+  constructor(events, sessionId, settledTurns = []) {
     this.#events = events;
     this.#sessionId = sessionId;
+    this.#replayed = new ReplayedTurns(settledTurns);
   }
+  /** Records an update the Agent replays from its own history, with the lifecycle of the turn it belongs to. */
+  replay = (rawUpdate) => {
+    for (const { event, recordedAt } of this.#replayed.before(rawUpdate)) {
+      this.#events.append(this.#sessionId, event, recordedAt);
+    }
+    this.#events.append(this.#sessionId, { payload: rawUpdate, type: "acp" });
+  };
+  /** Ends the replay: the last replayed turn ends where the Agent's history does. */
+  finishReplay = () => {
+    for (const { event, recordedAt } of this.#replayed.end()) {
+      this.#events.append(this.#sessionId, event, recordedAt);
+    }
+  };
   record = async (rawUpdate, onRecorded = () => Promise.resolve()) => {
     const event = this.#events.append(this.#sessionId, { payload: rawUpdate, type: "acp" });
     await onRecorded(event);
@@ -90387,6 +90502,7 @@ var AgentSession = class _AgentSession {
   #environment;
   #getObserver;
   #agentCommand;
+  #settledTurns;
   #interactions;
   #mortySessionId;
   #metrics;
@@ -90406,8 +90522,9 @@ var AgentSession = class _AgentSession {
   #restored = false;
   #sessionTitle = null;
   #sessionUpdatedAt = "";
-  constructor(agent2, cwd, additionalDirectories, mortySessionId, getObserver, agentCommand, store, metrics, adapter, externalize) {
-    this.#agentCommand = () => agentCommand(this.#mortySessionId);
+  constructor(agent2, cwd, additionalDirectories, mortySessionId, getObserver, execution, store, metrics, adapter, externalize) {
+    this.#agentCommand = () => execution.agentCommand(this.#mortySessionId);
+    this.#settledTurns = () => execution.settledTurns(this.#mortySessionId);
     this.#additionalDirectories = [...additionalDirectories];
     this.#adapter = adapter;
     this.#agentId = agent2.id;
@@ -90466,7 +90583,7 @@ var AgentSession = class _AgentSession {
       }
     };
   }
-  static async #start(options, getObserver, agentCommand, store, initialize, metrics, adapter) {
+  static async #start(options, getObserver, execution, store, initialize, metrics, adapter) {
     for (let attempt = 1; attempt <= 2; attempt += 1) {
       await metrics.measure(
         "executable-validation",
@@ -90480,7 +90597,7 @@ var AgentSession = class _AgentSession {
           options.additionalDirectories,
           options.sessionId,
           getObserver,
-          agentCommand,
+          execution,
           store,
           metrics,
           adapter,
@@ -90507,10 +90624,10 @@ var AgentSession = class _AgentSession {
     }
     throw new AcpExecutionError("ACP agent initialization failed");
   }
-  static start = async (options, recovery, getObserver, agentCommand, store, metrics, adapter, capabilities = unsupportedSessionCapabilities()) => await _AgentSession.#start(
+  static start = async (options, recovery, getObserver, execution, store, metrics, adapter, capabilities = unsupportedSessionCapabilities()) => await _AgentSession.#start(
     options,
     getObserver,
-    agentCommand,
+    execution,
     store,
     async (runtime) => {
       runtime.#capabilities = capabilities;
@@ -90673,7 +90790,7 @@ var AgentSession = class _AgentSession {
       return await waitForSharedOperation(this.#sessionLoad.completion, signal);
     }
     this.#store.events.reset(this.#mortySessionId);
-    const history = new HistoryReplayCapture(this.#store.events, this.#mortySessionId);
+    const history = new HistoryReplayCapture(this.#store.events, this.#mortySessionId, this.#settledTurns());
     const completion = Promise.resolve().then(async () => {
       try {
         const opened = await this.#writeNativeHistory(
@@ -90684,6 +90801,7 @@ var AgentSession = class _AgentSession {
         );
         signal.throwIfAborted();
         this.#capabilities = opened.capabilities;
+        history.finishReplay();
         const loaded = { history, kind: "loaded", opened };
         this.#sessionLoad = loaded;
         return loaded;
@@ -90887,30 +91005,30 @@ var AgentSession = class _AgentSession {
     }
     this.#prompted = true;
     this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
-    const lifecycle = options.lifecycle;
-    if (lifecycle !== void 0) {
+    const lifecycle2 = options.lifecycle;
+    if (lifecycle2 !== void 0) {
       await this.recordLifecycleEvent({
         payload: {
           commandId: options.commandId,
-          content: lifecycle.content,
-          ...lifecycle.disposition === void 0 ? {} : { disposition: lifecycle.disposition },
+          content: lifecycle2.content,
+          ...lifecycle2.disposition === void 0 ? {} : { disposition: lifecycle2.disposition },
           kind: "prompt.requested",
-          ...lifecycle.context === void 0 ? {} : { context: lifecycle.context },
-          ...lifecycle.targetCommandId === void 0 ? {} : { targetCommandId: lifecycle.targetCommandId }
+          ...lifecycle2.context === void 0 ? {} : { context: lifecycle2.context },
+          ...lifecycle2.targetCommandId === void 0 ? {} : { targetCommandId: lifecycle2.targetCommandId }
         },
         type: "lifecycle-metadata"
       });
       await this.recordLifecycleEvent({
         payload: {
-          attemptId: lifecycle.attemptId,
+          attemptId: lifecycle2.attemptId,
           commandId: options.commandId,
-          epoch: lifecycle.epoch,
+          epoch: lifecycle2.epoch,
           kind: "prompt.started"
         },
         type: "lifecycle-metadata"
       });
     }
-    this.#delegableCommandId = lifecycle === void 0 ? null : options.commandId;
+    this.#delegableCommandId = lifecycle2 === void 0 ? null : options.commandId;
     try {
       const result = await this.#writeNativeHistory(async () => {
         try {
@@ -90920,7 +91038,7 @@ var AgentSession = class _AgentSession {
         }
       });
       this.writeStoredSession((/* @__PURE__ */ new Date()).toISOString());
-      if (lifecycle !== void 0) {
+      if (lifecycle2 !== void 0) {
         const messageId = result._meta?.messageId;
         await this.recordLifecycleEvent({
           payload: {
@@ -90935,7 +91053,7 @@ var AgentSession = class _AgentSession {
       return result;
     } catch (error62) {
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
-      if (lifecycle !== void 0) {
+      if (lifecycle2 !== void 0) {
         const message = failure2 instanceof AcpPromptExecutionError ? { messageId: failure2.messageId } : {};
         await this.recordLifecycleEvent({
           payload: options.cancellationRequested?.() === true ? {
@@ -90944,7 +91062,7 @@ var AgentSession = class _AgentSession {
             ...message,
             stopReason: "cancelled"
           } : {
-            attemptId: lifecycle.attemptId,
+            attemptId: lifecycle2.attemptId,
             code: failure2.code,
             commandId: options.commandId,
             kind: "prompt.failed",
@@ -90974,24 +91092,24 @@ var AgentSession = class _AgentSession {
     }
     validatePromptContent(options, this.#capabilities);
     options.signal.throwIfAborted();
-    const lifecycle = options.lifecycle;
-    if (lifecycle !== void 0) {
+    const lifecycle2 = options.lifecycle;
+    if (lifecycle2 !== void 0) {
       await this.recordLifecycleEvent({
         payload: {
           commandId: options.commandId,
-          content: lifecycle.content,
-          ...lifecycle.disposition === void 0 ? {} : { disposition: lifecycle.disposition },
+          content: lifecycle2.content,
+          ...lifecycle2.disposition === void 0 ? {} : { disposition: lifecycle2.disposition },
           kind: "prompt.requested",
-          ...lifecycle.context === void 0 ? {} : { context: lifecycle.context },
-          ...lifecycle.targetCommandId === void 0 ? {} : { targetCommandId: lifecycle.targetCommandId }
+          ...lifecycle2.context === void 0 ? {} : { context: lifecycle2.context },
+          ...lifecycle2.targetCommandId === void 0 ? {} : { targetCommandId: lifecycle2.targetCommandId }
         },
         type: "lifecycle-metadata"
       });
       await this.recordLifecycleEvent({
         payload: {
-          attemptId: lifecycle.attemptId,
+          attemptId: lifecycle2.attemptId,
           commandId: options.commandId,
-          epoch: lifecycle.epoch,
+          epoch: lifecycle2.epoch,
           kind: "prompt.started"
         },
         type: "lifecycle-metadata"
@@ -90999,7 +91117,7 @@ var AgentSession = class _AgentSession {
     }
     try {
       const outcome = await this.#adapter.steer({ ...this.#target(), content: options, signal: options.signal });
-      if (lifecycle !== void 0) {
+      if (lifecycle2 !== void 0) {
         await this.recordLifecycleEvent({
           payload: {
             commandId: options.commandId,
@@ -91014,10 +91132,10 @@ var AgentSession = class _AgentSession {
       return outcome.outcome;
     } catch (error62) {
       const failure2 = error62 instanceof AcpExecutionError ? error62 : new AcpExecutionError("ACP agent execution failed", { cause: error62 });
-      if (lifecycle !== void 0) {
+      if (lifecycle2 !== void 0) {
         await this.recordLifecycleEvent({
           payload: {
-            attemptId: lifecycle.attemptId,
+            attemptId: lifecycle2.attemptId,
             code: failure2.code,
             commandId: options.commandId,
             kind: "prompt.failed",
@@ -91081,7 +91199,7 @@ var AgentSession = class _AgentSession {
       this.#captureSelectedConfigurationValues();
     }
     if (this.#sessionLoad.kind === "capturing") {
-      await this.#sessionLoad.history.record(event.payload);
+      this.#sessionLoad.history.replay(event.payload);
     } else if (this.#sessionLoad.kind === "loaded" || this.#sessionLoad.kind === "execution-only") {
       await this.#sessionLoad.history.record(event.payload, async (liveEvent2) => {
         await this.#getObserver().onSessionEvent?.(liveEvent2);
@@ -91304,6 +91422,11 @@ var SessionManager2 = class {
     changed: () => this.#processes.notifyChanged()
   });
   #executions;
+  #settledTurns;
+  #executionRecord = {
+    agentCommand: (sessionId) => this.#executions.agentCommand(sessionId),
+    settledTurns: (sessionId) => this.#settledTurns(sessionId)
+  };
   #lastTurn;
   #agentSettingsObserver = new NullSessionObserver();
   #nativeOperations = /* @__PURE__ */ new Set();
@@ -91324,6 +91447,7 @@ var SessionManager2 = class {
     onSessionStatusChanged,
     onSessionClosed = () => void 0,
     lastTurn = () => void 0,
+    settledTurns = () => [],
     timer
   }) {
     this.#observer = observer;
@@ -91331,6 +91455,7 @@ var SessionManager2 = class {
     this.#store = store;
     this.#sessionIdentity = sessionIdentity;
     this.#lastTurn = lastTurn;
+    this.#settledTurns = settledTurns;
     this.#executions = new ActiveExecutions(
       (sessionId, status) => onSessionStatusChanged({
         kind: "session.status.changed",
@@ -91433,7 +91558,7 @@ var SessionManager2 = class {
           effectiveOptions,
           recovery,
           () => this.#observer,
-          this.#executions.agentCommand,
+          this.#executionRecord,
           this.#store,
           metrics,
           options.adapter,
@@ -91456,7 +91581,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
-          this.#executions.agentCommand,
+          this.#executionRecord,
           this.#store,
           metrics,
           options.adapter,
@@ -91476,7 +91601,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
-          this.#executions.agentCommand,
+          this.#executionRecord,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -91532,7 +91657,7 @@ var SessionManager2 = class {
           options,
           recovery,
           () => this.#observer,
-          this.#executions.agentCommand,
+          this.#executionRecord,
           this.#store,
           unmeasuredOperationMetrics,
           options.adapter,
@@ -91650,7 +91775,7 @@ var SessionManager2 = class {
         },
         { kind: "interactive-only" },
         () => this.#agentSettingsObserver,
-        () => void 0,
+        { agentCommand: () => void 0, settledTurns: () => [] },
         new MemorySessionStore(),
         unmeasuredOperationMetrics,
         options2.adapter
@@ -92792,8 +92917,6 @@ var PromptLifecycle = class {
       payload: this.#executions.hasStarted(commandId, sessionId) ? { kind: "prompt.failed", attemptId, commandId, code, message } : { kind: "prompt.failed-before-start", commandId, code, message }
     });
   };
-  /** The recorded terminal events of the Session's settled prompts that name the user message they recorded. */
-  promptOutcomes = (sessionId) => this.#executions.promptOutcomes(sessionId);
   promptRequestRecovery = (sessionId) => ({
     queuedPromptRequests: [...this.#queued.values()].filter(
       (request) => request.sessionId === sessionId && !this.#executions.hasStarted(request.commandId, sessionId)
@@ -93075,21 +93198,23 @@ var ExecutionReceipts = class {
     const command2 = this.#read(commandId);
     return command2?.sessionId === sessionId && command2.fate.kind === "started" ? command2.fate.startedAt : void 0;
   };
-  /**
-   * The recorded terminal events of the Session's settled prompts whose Agent reported the user message they
-   * recorded, while the ledger keeps their outcomes.
-   */
-  promptOutcomes = (sessionId) => {
-    const outcomes = [];
-    for (const command2 of this.#ledger.session(sessionId)) {
-      const outcome = this.restatedOutcome(command2.commandId);
-      const event = outcome?.event;
-      if (outcome?.recordedAt !== void 0 && event?.type === "lifecycle-metadata" && (event.payload.kind === "prompt.completed" || event.payload.kind === "prompt.failed") && event.payload.messageId !== void 0) {
-        outcomes.push({ payload: event.payload, recordedAt: outcome.recordedAt });
-      }
+  /** The Session's settled turns, in admission order, whose outcomes the ledger keeps with their user message. */
+  settledTurns = (sessionId) => this.#ledger.session(sessionId).flatMap((command2) => {
+    const outcome = this.restatedOutcome(command2.commandId);
+    const event = outcome?.event;
+    if (outcome?.recordedAt === void 0 || event?.type !== "lifecycle-metadata" || event.payload.kind !== "prompt.completed" && event.payload.kind !== "prompt.failed" || event.payload.messageId === void 0) {
+      return [];
     }
-    return outcomes;
-  };
+    const fate = this.#withShutdownSettlement(command2).fate;
+    return [
+      {
+        attemptId: command2.attemptId,
+        outcome: { ...event.payload, messageId: event.payload.messageId },
+        recordedAt: outcome.recordedAt,
+        startedAt: fate.kind === "settled-after-start" ? fate.startedAt : outcome.recordedAt
+      }
+    ];
+  });
   /** A command that started stays started after its outcome is no longer kept. */
   hasStarted = (commandId, sessionId) => {
     const standing = this.#standing(commandId, sessionId);
@@ -93912,6 +94037,7 @@ function buildSessionLayer(options) {
     onSessionStatusChanged: sink.publishStatus,
     onSessionClosed: sink.publishClosed,
     lastTurn: operations.lastTurn,
+    settledTurns: operations.settledTurns,
     timer
   });
   const eventProjection = new PromptLifecycle(
@@ -95576,15 +95702,6 @@ async function resolveSessionDirectories(directories, bindingId, directoryId, ad
 }
 
 // src/engine/runtime/command/registry/history.ts
-function onPage(outcomes, events) {
-  const messageIds = /* @__PURE__ */ new Set();
-  for (const event of events) {
-    if (event.type === "acp" && event.payload.sessionUpdate === "user_message_chunk" && event.payload.messageId !== void 0 && event.payload.messageId !== null) {
-      messageIds.add(event.payload.messageId);
-    }
-  }
-  return outcomes.filter(({ payload }) => payload.messageId !== void 0 && messageIds.has(payload.messageId));
-}
 async function loadHistoryPage(sessionId, eventLimit, initialCursor, queuedPromptRequests, load) {
   let cursor = initialCursor;
   let loaded = [];
@@ -95625,7 +95742,6 @@ async function loadHistoryPage(sessionId, eventLimit, initialCursor, queuedPromp
   return {
     events: {
       events: orderedEvents.map(({ event }) => event),
-      promptOutcomes: [],
       nextCursor,
       sessionGenerationId,
       tailCursor: orderedEvents.at(-1)?.event.eventId ?? "",
@@ -95659,7 +95775,6 @@ async function executeSessionHistoryPageLoad(socket, command2, config2, resolveA
       signal
     };
     const recovery = eventProjection.promptRequestRecovery(command2.sessionId);
-    const settled = eventProjection.promptOutcomes(command2.sessionId);
     const events = await loadHistoryPage(
       command2.sessionId,
       command2.eventLimit,
@@ -95669,13 +95784,7 @@ async function executeSessionHistoryPageLoad(socket, command2, config2, resolveA
     );
     signal.throwIfAborted();
     send(socket, {
-      events: {
-        ...events,
-        events: {
-          ...events.events,
-          promptOutcomes: onPage(settled, events.events.events)
-        }
-      },
+      events,
       kind: SESSION_HISTORY_PAGE_LOADED_KIND,
       requestId: command2.requestId,
       sessionId: command2.sessionId
@@ -96374,7 +96483,7 @@ async function executePrompt({
       prepared = await sessions.prepareExecutionSession(preparation);
     }
     signal.throwIfAborted();
-    const lifecycle = eventProjection.lifecycle(command2.sessionId, command2.commandId, attemptId, epoch, dispatch);
+    const lifecycle2 = eventProjection.lifecycle(command2.sessionId, command2.commandId, attemptId, epoch, dispatch);
     const attachments = await resolvePromptArtifacts(readArtifact, command2.attachments, signal);
     const skipped = command2.attachments.length - attachments.images.length - attachments.resources.length;
     if (skipped > 0) {
@@ -96393,7 +96502,7 @@ async function executePrompt({
         commandId: command2.commandId,
         cwd: resolved.cwd,
         images: attachments.images,
-        lifecycle,
+        lifecycle: lifecycle2,
         prompt: command2.prompt,
         resources: attachments.resources,
         sessionId: command2.sessionId,
@@ -96411,7 +96520,7 @@ async function executePrompt({
         commandId: command2.commandId,
         cwd: resolved.cwd,
         images: attachments.images,
-        lifecycle,
+        lifecycle: lifecycle2,
         prompt: command2.prompt,
         resources: attachments.resources,
         sessionId: command2.sessionId,
@@ -98296,4 +98405,4 @@ export {
   * MIT Licensed
   *)
 */
-//# sourceMappingURL=chunk-MNUDTG5G.js.map
+//# sourceMappingURL=chunk-M7MJMWZ4.js.map