@ellipsis-dev/sdk 0.30.0 → 0.31.0

package/dist/store/index.js

@@ -1,6 +1,6 @@
 import {
   SESSION_STREAM_PROTOCOL_VERSION
-} from "../chunk-K252XHLI.js";
+} from "../chunk-G2AEYZW2.js";
 
 // src/store/claude.ts
 function claudePayload(record) {
@@ -107,9 +107,8 @@ function codexAppServerContent(event) {
 // src/store/progress.ts
 function messageProgress(records) {
   const messages = /* @__PURE__ */ new Map();
-  const pending = /* @__PURE__ */ new Set();
+  const pending = /* @__PURE__ */ new Map();
   const turns = /* @__PURE__ */ new Map();
-  let starting = "queued";
   let ready = false;
   const getTurn = (id) => {
     let turn = turns.get(id);
@@ -123,9 +122,6 @@ function messageProgress(records) {
     }
     return turn;
   };
-  const updatePending = () => {
-    for (const id of pending) messages.get(id).phase = starting;
-  };
   const attach = (messageId, turnId) => {
     const message = messages.get(messageId);
     if (!message) return;
@@ -136,8 +132,12 @@ function messageProgress(records) {
     }
     pending.delete(messageId);
     message.phase = turn.phase;
-    starting = "queued";
-    updatePending();
+  };
+  const setPending = (turnId, phase) => {
+    for (const [id, turn] of pending) {
+      if (turnId == null || turn == null || turn === turnId)
+        messages.get(id).phase = phase;
+    }
   };
   for (const record of records) {
     if (record.kind === "platform") {
@@ -147,8 +147,9 @@ function messageProgress(records) {
       switch (record.record_type) {
         case "message_received":
           if (messageId && !messages.has(messageId)) {
-            messages.set(messageId, { phase: starting, turns: [] });
-            pending.add(messageId);
+            messages.set(messageId, { phase: "queued", turns: [] });
+            if (turnId && turns.has(turnId)) attach(messageId, turnId);
+            else pending.set(messageId, turnId ?? null);
           }
           break;
         case "message_delivered":
@@ -156,25 +157,29 @@ function messageProgress(records) {
           break;
         case "message_requeued":
           if (messageId && messages.has(messageId)) {
-            pending.add(messageId);
+            const requeued = typeof p.requeued_turn_id === "string" ? p.requeued_turn_id : null;
+            pending.set(messageId, requeued);
             messages.get(messageId).phase = "queued";
           }
           break;
-        case "session_starting":
-        case "session_retrying":
+        case "environment_phase":
+        case "environment_output":
           ready = false;
-          starting = typeof p.wake_index === "number" && p.wake_index > 0 ? "waking" : "starting";
-          updatePending();
+          setPending(turnId ?? null, "preparing");
           break;
-        case "session_resumed":
-          starting = "starting";
-          updatePending();
+        case "environment_ready":
+          ready = false;
+          setPending(turnId ?? null, "starting");
           break;
         case "turn_started":
-          if (turnId) getTurn(turnId).timing.startedAt = record.created_at;
+          if (turnId) {
+            getTurn(turnId).timing.startedAt = record.created_at;
+            for (const [id, turn] of pending) {
+              if (turn === turnId) attach(id, turnId);
+            }
+          }
           break;
-        case "turn_completed":
-        case "turn_failed":
+        case "turn_ended":
           if (turnId) {
             const turn = getTurn(turnId);
             turn.timing.completedAt = record.created_at;
@@ -182,15 +187,17 @@ function messageProgress(records) {
             for (const id of turn.messages) {
               if (!pending.has(id)) messages.get(id).phase = null;
             }
+            for (const [id, pendingTurn] of pending) {
+              if (pendingTurn === turnId) {
+                pending.delete(id);
+                messages.get(id).phase = null;
+              }
+            }
           }
-          starting = "queued";
           break;
-        case "session_idle":
         case "session_closed":
-        case "session_cancelled":
           ready = false;
-          starting = "queued";
-          for (const id of pending) messages.get(id).phase = null;
+          for (const id of pending.keys()) messages.get(id).phase = null;
           break;
       }
       continue;
@@ -216,17 +223,17 @@ function messageProgress(records) {
 }
 
 // src/store/lifecycle.ts
-function sandboxOutputStep(payload) {
+function environmentOutputStep(payload) {
   if (typeof payload.step === "string" && payload.step) return payload.step;
   return typeof payload.phase === "string" ? payload.phase : "setup";
 }
-function sandboxOutputLines(payload) {
+function environmentOutputLines(payload) {
   return Array.isArray(payload.lines) ? payload.lines.filter(
     (l) => typeof l === "string" && l.trim().length > 0
   ) : [];
 }
-function sandboxOutputLine(payload) {
-  const lines = sandboxOutputLines(payload);
+function environmentOutputLine(payload) {
+  const lines = environmentOutputLines(payload);
   return lines.length ? lines[lines.length - 1].trim() : null;
 }
 function cacheTierLabel(tier) {
@@ -241,7 +248,7 @@ function cacheTierLabel(tier) {
       return null;
   }
 }
-function sandboxPhaseLabel(phase) {
+function environmentPhaseLabel(phase) {
   switch (phase) {
     case "image":
       return "Preparing image";
@@ -263,8 +270,8 @@ function durationLabel(ms) {
   if (typeof ms !== "number" || !isFinite(ms) || ms < 0) return null;
   return ms >= 1e3 ? `${(ms / 1e3).toFixed(1)}s` : `${Math.round(ms)}ms`;
 }
-function sandboxPhaseText(payload) {
-  const label = sandboxPhaseLabel(payload.phase);
+function environmentPhaseText(payload) {
+  const label = environmentPhaseLabel(payload.phase);
   const detail = payload.detail && typeof payload.detail === "object" ? payload.detail : {};
   switch (payload.status) {
     case "started":
@@ -285,48 +292,34 @@ function sandboxPhaseText(payload) {
       return label;
   }
 }
+function turnEndedText(payload) {
+  const status = typeof payload.status === "string" ? payload.status : "";
+  if (!status || status === "completed") return null;
+  const detail = typeof payload.detail === "string" ? payload.detail.trim() : "";
+  return detail || `Turn ${status}`;
+}
 function lifecycleText(recordType, payload) {
   switch (recordType) {
-    case "session_scheduled": {
-      const config = typeof payload.config_name === "string" ? payload.config_name : null;
-      return config ? `Session scheduled, ${config}` : "Session scheduled";
-    }
-    case "session_starting": {
-      const attempt = typeof payload.attempt === "number" ? payload.attempt : 0;
-      if (attempt > 0) return "Retrying\u2026";
-      const wakeIndex = typeof payload.wake_index === "number" ? payload.wake_index : 0;
-      return wakeIndex > 0 ? "Waking the session\u2026" : "Session starting\u2026";
-    }
-    case "session_retrying":
-      return typeof payload.reason === "string" && payload.reason ? `Retrying, ${payload.reason}` : "Retrying after a transient error\u2026";
-    case "sandbox_starting":
-      return "Starting sandbox\u2026";
-    case "sandbox_phase":
-      return sandboxPhaseText(payload);
-    case "sandbox_output": {
-      const last = sandboxOutputLine(payload);
-      return last ? `${sandboxOutputStep(payload)}, ${last}` : null;
+    case "environment_phase":
+      return environmentPhaseText(payload);
+    case "environment_output": {
+      const last = environmentOutputLine(payload);
+      return last ? `${environmentOutputStep(payload)}, ${last}` : null;
     }
-    case "sandbox_ready": {
+    case "environment_ready": {
       const repos = Array.isArray(payload.repositories) ? payload.repositories.filter(
         (r) => typeof r === "string"
       ) : [];
-      const parts = ["Sandbox ready"];
+      const parts = ["Environment ready"];
       if (repos.length) parts.push(repos.join(", "));
-      const tier = cacheTierLabel(payload.cache_tier);
-      if (tier) parts.push(tier);
+      const duration = durationLabel(payload.duration_ms);
+      if (duration) parts.push(duration);
       return parts.join(", ");
     }
-    case "session_resumed":
-      return "Resumed the conversation";
-    case "session_idle":
-      return "Idle \u2014 your next message wakes it";
+    case "turn_ended":
+      return turnEndedText(payload);
     case "session_closed":
       return "Conversation closed";
-    case "session_cancelled": {
-      const reason = typeof payload.reason === "string" ? payload.reason : null;
-      return reason ? `Session cancelled, ${reason}` : "Session cancelled";
-    }
     default:
       return null;
   }
@@ -637,7 +630,7 @@ function recordToItems(record, keyBase, options = {}) {
   }
 }
 function isConnectVisibleRecord(record) {
-  return record.source !== "lifecycle" || record.record_type === "sandbox_ready";
+  return record.source !== "lifecycle" || record.record_type === "environment_ready";
 }
 function pendingToolCalls(items) {
   let pending = [];
@@ -726,12 +719,8 @@ function foldCosts(events) {
 }
 function statusActivityText(status) {
   switch (status) {
-    case "scheduled":
-      return "Waiting for a worker";
-    case "starting":
-      return "Starting sandbox";
-    case "retrying":
-      return "Retrying after a transient error";
+    case "pending":
+      return "Waiting to start";
     default:
       return null;
   }
@@ -739,18 +728,17 @@ function statusActivityText(status) {
 
 // src/store/chatTurns.ts
 var isInitEvent = (data) => data.kind === "system" && data.subtype === "init";
-var SANDBOX_RECORD_TYPES = /* @__PURE__ */ new Set([
-  "sandbox_starting",
-  "sandbox_phase",
-  "sandbox_output",
-  "sandbox_ready"
+var ENVIRONMENT_RECORD_TYPES = /* @__PURE__ */ new Set([
+  "environment_phase",
+  "environment_output",
+  "environment_ready"
 ]);
 function groupRecordsToChatTurns(records, session) {
   const turns = [];
   const toolNodeByUseId = /* @__PURE__ */ new Map();
   const userTurnByMessageId = /* @__PURE__ */ new Map();
-  const deliveredTurnByMessageId = /* @__PURE__ */ new Map();
-  const failedTurnIds = /* @__PURE__ */ new Set();
+  const turnByMessageId = /* @__PURE__ */ new Map();
+  const unansweredTurnIds = /* @__PURE__ */ new Set();
   const activeMessageByTurnId = /* @__PURE__ */ new Map();
   let lastDeliveredMessageId;
   let seq = 0;
@@ -787,6 +775,8 @@ function groupRecordsToChatTurns(records, session) {
     if (record.kind === "platform") {
       const messageId = typeof record.payload.message_id === "string" ? record.payload.message_id : null;
       if (record.record_type === "message_received" && messageId) {
+        if (typeof record.payload.turn_id === "string")
+          turnByMessageId.set(messageId, record.payload.turn_id);
         const body = typeof record.payload.body === "string" ? record.payload.body : "";
         if (!body.trim() || userTurnByMessageId.has(messageId)) continue;
         const turn2 = {
@@ -808,43 +798,43 @@ function groupRecordsToChatTurns(records, session) {
       }
       if (record.record_type === "message_delivered" && messageId) {
         if (typeof record.payload.turn_id === "string") {
-          deliveredTurnByMessageId.set(messageId, record.payload.turn_id);
+          turnByMessageId.set(messageId, record.payload.turn_id);
           activeMessageByTurnId.set(record.payload.turn_id, messageId);
           lastDeliveredMessageId = messageId;
         }
         continue;
       }
       if (record.record_type === "message_requeued" && messageId) {
-        deliveredTurnByMessageId.delete(messageId);
-        continue;
-      }
-      if (record.record_type === "turn_failed") {
-        if (typeof record.payload.turn_id === "string")
-          failedTurnIds.add(record.payload.turn_id);
+        if (typeof record.payload.requeued_turn_id === "string")
+          turnByMessageId.set(messageId, record.payload.requeued_turn_id);
+        else turnByMessageId.delete(messageId);
         continue;
       }
+      if (record.record_type === "turn_ended" && typeof record.payload.turn_id === "string" && record.payload.status !== "completed")
+        unansweredTurnIds.add(record.payload.turn_id);
       const text2 = lifecycleText(record.record_type, record.payload);
       if (!text2) continue;
-      const isSandbox = SANDBOX_RECORD_TYPES.has(record.record_type);
-      const isSandboxOutput = record.record_type === "sandbox_output";
-      const step = isSandboxOutput ? sandboxOutputStep(record.payload) : void 0;
-      const lines = isSandboxOutput ? sandboxOutputLines(record.payload) : void 0;
+      const isEnvironment = ENVIRONMENT_RECORD_TYPES.has(record.record_type);
+      const isOutput = record.record_type === "environment_output";
+      const step = isOutput ? environmentOutputStep(record.payload) : void 0;
+      const lines = isOutput ? environmentOutputLines(record.payload) : void 0;
+      const turnId = record.turn_id ?? void 0;
       let foldTarget = null;
-      if (isSandbox && record.record_type !== "sandbox_starting") {
+      if (isEnvironment) {
         for (let i = turns.length - 1; i >= 0; i--) {
           const candidate = turns[i];
           if (candidate.role !== "lifecycle") break;
           if (candidate.nodes.some(
-            (n) => n.kind === "lifecycle" && SANDBOX_RECORD_TYPES.has(n.recordType)
+            (n) => n.kind === "lifecycle" && ENVIRONMENT_RECORD_TYPES.has(n.recordType)
           )) {
-            foldTarget = candidate;
+            if (candidate.turnId === turnId) foldTarget = candidate;
             break;
           }
         }
       }
       if (foldTarget) {
         const last = foldTarget.nodes[foldTarget.nodes.length - 1];
-        if (isSandboxOutput && last && last.kind === "lifecycle" && last.recordType === "sandbox_output" && last.step === step) {
+        if (isOutput && last && last.kind === "lifecycle" && last.recordType === "environment_output" && last.step === step) {
           last.text = text2;
           last.lines = [...last.lines ?? [], ...lines ?? []];
         } else {
@@ -863,6 +853,7 @@ function groupRecordsToChatTurns(records, session) {
       }
       turns.push({
         key: nextKey(record.id),
+        turnId,
         role: "lifecycle",
         nodes: [
           {
@@ -1049,9 +1040,9 @@ function groupRecordsToChatTurns(records, session) {
       }
     }
   }
-  for (const [messageId, turnId] of deliveredTurnByMessageId) {
+  for (const [messageId, turnId] of turnByMessageId) {
     const turn = userTurnByMessageId.get(messageId);
-    if (turn) turn.isError = failedTurnIds.has(turnId);
+    if (turn) turn.isError = unansweredTurnIds.has(turnId);
   }
   for (const [messageId, progress] of messageProgress(records)) {
     const turn = userTurnByMessageId.get(messageId);
@@ -1060,34 +1051,34 @@ function groupRecordsToChatTurns(records, session) {
   const initialTurn = records.find(
     (r) => r.kind === "platform" && r.record_type === "turn_started" && r.payload.turn_index === 0
   );
-  const initialDelivery = initialTurn && records.find(
-    (r) => r.kind === "platform" && r.record_type === "message_delivered" && r.payload.turn_id === (initialTurn.turn_id ?? initialTurn.payload.turn_id)
+  const openingTurnId = initialTurn?.turn_id ?? initialTurn?.payload.turn_id ?? (session?.turn?.index === 0 ? session.turn.id : void 0);
+  const initialReceived = openingTurnId == null ? void 0 : records.find(
+    (r) => r.kind === "platform" && r.record_type === "message_received" && (r.turn_id === openingTurnId || r.payload.turn_id === openingTurnId)
   );
-  const initialReceived = initialTurn && records.find(
-    (r) => r.kind === "platform" && r.record_type === "message_received" && r.turn_id === (initialTurn.turn_id ?? initialTurn.payload.turn_id)
+  const initialDelivery = openingTurnId == null ? void 0 : records.find(
+    (r) => r.kind === "platform" && r.record_type === "message_delivered" && r.payload.turn_id === openingTurnId
   );
-  const initialMessage = initialReceived ?? initialDelivery;
-  const initialId = initialMessage?.kind === "platform" && typeof initialMessage.payload.message_id === "string" ? initialMessage.payload.message_id : void 0;
+  const initialId = (initialReceived ?? initialDelivery)?.payload.message_id;
   const opening = initialId ? userTurnByMessageId.get(initialId) : void 0;
-  const includesStart = records.length === 0 || records.some((r) => r.record_type === "session_scheduled");
+  const includesStart = records.length === 0 || initialTurn != null;
   const prompt = (session?.claude_code ?? session?.codex)?.prompt;
   if (prompt?.trim() && session && (opening || includesStart)) {
     const first = opening ?? {
       key: "prompt",
       role: "user",
       nodes: [{ key: "prompt", kind: "user", text: prompt }],
-      startedAt: session.lifecycle.timestamps.created_at,
-      completedAt: session.lifecycle.timestamps.created_at,
+      startedAt: session.created_at,
+      completedAt: session.created_at,
       durationMs: null,
       costUsd: null,
       tokens: null,
       resumed: false,
       isError: false,
-      progress: { phase: "starting", turns: [] }
+      progress: { phase: "preparing", turns: [] }
     };
     if (opening) turns.splice(turns.indexOf(opening), 1);
     first.key = "prompt";
-    first.startedAt = session.lifecycle.timestamps.created_at;
+    first.startedAt = session.created_at;
     turns.unshift(first);
     if (!opening) {
       for (const turn of turns) {
@@ -1205,6 +1196,10 @@ function codexEventIntoTurns(record, event, ops) {
 function recordSlice(records) {
   return records;
 }
+function turnOf(record) {
+  if (record.turn_id != null) return record.turn_id;
+  return typeof record.payload.turn_id === "string" ? record.payload.turn_id : null;
+}
 function humanDuration(seconds) {
   const clamped = Math.max(0, seconds);
   if (clamped === 0) return "0s";
@@ -1223,26 +1218,12 @@ function humanDuration(seconds) {
   if (s > 0 || bits.length === 0) bits.push(`${s}s`);
   return bits.join(" ");
 }
-var SESSION_WAKING = "Session waking";
 function sessionLogText(recordType, payload) {
-  const p = payload;
   switch (recordType) {
-    case "session_idle":
-      return "Session asleep";
-    case "session_starting": {
-      const wake = typeof p.wake_index === "number" ? p.wake_index : 0;
-      const attempt = typeof p.attempt === "number" ? p.attempt : 0;
-      if (attempt > 0) return "Restarting the sandbox after a transient error\u2026";
-      return wake > 0 ? SESSION_WAKING : null;
-    }
-    case "session_retrying":
-      return typeof p.reason === "string" && p.reason ? `Retrying, ${p.reason}` : "Retrying after a transient error\u2026";
-    case "session_resumed":
-      return "Session awake";
-    case "session_cancelled": {
-      const reason = typeof p.reason === "string" && p.reason ? `, ${p.reason}` : "";
-      return `Session cancelled${reason}`;
-    }
+    case "turn_ended":
+      return turnEndedText(payload);
+    case "session_closed":
+      return "Conversation closed";
     default:
       return null;
   }
@@ -1253,14 +1234,20 @@ function awaitingAgentPhase(records) {
   for (const r of records) {
     if (r.source !== "lifecycle") {
       sawAgent = true;
-    } else {
-      if (r.record_type === "turn_started") inFlight = true;
-      else if (r.record_type === "turn_completed" || r.record_type === "turn_failed") {
-        inFlight = false;
-      } else if (r.record_type === "session_starting" || r.record_type === "session_retrying") {
+      continue;
+    }
+    switch (r.record_type) {
+      case "turn_started":
+        inFlight = true;
+        break;
+      case "turn_ended":
         inFlight = false;
+        break;
+      case "environment_phase":
+      case "environment_output":
+      case "environment_ready":
         sawAgent = false;
-      }
+        break;
     }
   }
   if (!inFlight) return null;
@@ -1269,14 +1256,14 @@ function awaitingAgentPhase(records) {
 function deliveredUnechoedSends(records) {
   const received = /* @__PURE__ */ new Map();
   const delivered = /* @__PURE__ */ new Map();
-  const failedTurns = /* @__PURE__ */ new Set();
+  const unanswered = /* @__PURE__ */ new Set();
   const echoed = /* @__PURE__ */ new Set();
   for (const r of records) {
     if (r.session_message_id != null) echoed.add(r.session_message_id);
     if (r.source !== "lifecycle") continue;
-    if (r.record_type === "turn_failed") {
-      if (typeof r.payload.turn_id === "string")
-        failedTurns.add(r.payload.turn_id);
+    if (r.record_type === "turn_ended") {
+      if (typeof r.payload.turn_id === "string" && r.payload.status !== "completed")
+        unanswered.add(r.payload.turn_id);
       continue;
     }
     const id = typeof r.payload.message_id === "string" ? r.payload.message_id : null;
@@ -1298,11 +1285,11 @@ function deliveredUnechoedSends(records) {
   for (const [id, body] of received) {
     const turnId = delivered.get(id);
     if (turnId === void 0 || echoed.has(id)) continue;
-    out.push({ id, body, cancelled: failedTurns.has(turnId) });
+    out.push({ id, body, cancelled: unanswered.has(turnId) });
   }
   return out;
 }
-var STARTING_SANDBOX = "Starting sandbox\u2026";
+var PREPARING_ENVIRONMENT = "Preparing environment";
 function msLabel(ms) {
   if (typeof ms !== "number" || !isFinite(ms) || ms < 0) return null;
   return humanDuration(ms / 1e3);
@@ -1340,64 +1327,38 @@ function stepLabel(phase, step) {
     if (phase === "image") return imageStepLabel(step);
     return step;
   }
-  return sandboxPhaseLabel(phase);
+  return environmentPhaseLabel(phase);
 }
-function deriveSandboxState(records, minFeedSeq) {
+function deriveEnvironmentState(records, minFeedSeq) {
   let seen = false;
-  let headline = STARTING_SANDBOX;
   let done = false;
-  let sandboxDone = false;
   let readySeconds = null;
-  let configName = null;
-  let configCommitSha = null;
   let log = [];
   let open = /* @__PURE__ */ new Map();
+  let storyTurn = null;
   const push = (record, kind, text2) => {
     const entry = { key: `${record.feed_seq}:${log.length}`, kind, text: text2 };
     log.push(entry);
     return entry;
   };
-  const reset = () => {
-    log = [];
-    open = /* @__PURE__ */ new Map();
-    sandboxDone = false;
+  const begin = (record) => {
+    const turn = turnOf(record);
+    if (seen && turn !== storyTurn) {
+      log = [];
+      open = /* @__PURE__ */ new Map();
+      done = false;
+      readySeconds = null;
+    }
+    seen = true;
+    storyTurn = turn;
   };
   for (const record of records) {
     if (record.feed_seq <= minFeedSeq || record.source !== "lifecycle")
       continue;
     const p = record.payload;
     switch (record.record_type) {
-      case "session_scheduled": {
-        seen = true;
-        headline = "Session scheduled\u2026";
-        done = false;
-        configName = typeof p.config_name === "string" && p.config_name ? p.config_name : null;
-        configCommitSha = typeof p.config_commit_sha === "string" && p.config_commit_sha ? p.config_commit_sha : null;
-        break;
-      }
-      case "session_starting":
-      case "session_retrying": {
-        seen = true;
-        const text2 = lifecycleText(record.record_type, p);
-        headline = !text2 || text2 === "Session starting\u2026" ? STARTING_SANDBOX : text2;
-        done = false;
-        readySeconds = null;
-        reset();
-        break;
-      }
-      case "session_resumed":
-      case "session_idle": {
-        seen = true;
-        done = true;
-        break;
-      }
-      case "sandbox_starting": {
-        seen = true;
-        reset();
-        break;
-      }
-      case "sandbox_phase": {
-        seen = true;
+      case "environment_phase": {
+        begin(record);
         const phase = typeof p.phase === "string" && p.phase ? p.phase : "setup";
         const step = typeof p.step === "string" && p.step ? p.step : null;
         const key = step ? `${phase}:${step}` : phase;
@@ -1426,70 +1387,50 @@ function deriveSandboxState(records, minFeedSeq) {
         }
         break;
       }
-      case "sandbox_output": {
-        seen = true;
-        for (const l of sandboxOutputLines(p)) push(record, "output", l);
+      case "environment_output": {
+        begin(record);
+        for (const l of environmentOutputLines(p)) push(record, "output", l);
         break;
       }
-      case "sandbox_ready": {
-        seen = true;
+      case "environment_ready": {
+        begin(record);
         for (const [, line] of open) line.kind = "done";
         open = /* @__PURE__ */ new Map();
-        const timings = p.phase_timings && typeof p.phase_timings === "object" ? Object.values(p.phase_timings) : [];
-        const totalSeconds = timings.reduce(
-          (acc, v) => typeof v === "number" && isFinite(v) ? acc + v : acc,
-          0
-        );
-        const tier = cacheTierLabel(p.cache_tier);
+        const seconds = typeof p.duration_ms === "number" && isFinite(p.duration_ms) && p.duration_ms > 0 ? p.duration_ms / 1e3 : null;
         push(
           record,
           "done",
-          [
-            "Sandbox ready",
-            ...tier ? [tier] : [],
-            ...totalSeconds > 0 ? [humanDuration(totalSeconds)] : []
-          ].join(", ")
+          seconds == null ? "Environment ready" : `Environment ready, ${humanDuration(seconds)}`
         );
-        sandboxDone = true;
-        readySeconds = totalSeconds > 0 ? totalSeconds : null;
+        readySeconds = seconds;
         done = true;
         break;
       }
+      case "turn_started":
+      case "turn_ended":
+        if (seen && turnOf(record) === storyTurn) done = true;
+        break;
+      case "session_closed":
+        if (seen) done = true;
+        break;
       default:
         break;
     }
   }
   const openLines = [...open.values()];
   if (openLines.length) openLines[openLines.length - 1].loading = true;
-  const full = configName ? [
-    {
-      key: "config",
-      kind: "done",
-      text: `Using ${configName}${configCommitSha ? ` @ ${configCommitSha.slice(0, 7)}` : ""}`
-    },
-    ...log
-  ] : log;
-  return seen ? {
-    headline,
-    done,
-    readySeconds,
-    sandboxDone,
-    configName,
-    configCommitSha,
-    log: full
-  } : null;
-}
-function startupSettled(sandbox, status) {
-  return (sandbox?.done ?? false) && statusActivityText(status) == null;
-}
-function startupHeadline(sandbox, status) {
-  const activity = statusActivityText(status);
-  const text2 = !sandbox || sandbox.done ? activity ?? STARTING_SANDBOX : sandbox.headline;
-  return `${text2.replace(/…$/, "")}\u2026`;
-}
-function sandboxSummary(sandbox) {
-  const seconds = sandbox?.readySeconds ?? null;
-  return seconds ? `Sandbox ready in ${humanDuration(seconds)}` : "Sandbox started";
+  return seen ? { done, readySeconds, log } : null;
+}
+function startupSettled(environment, status) {
+  return (environment?.done ?? false) && statusActivityText(status) == null;
+}
+function startupHeadline(environment, status) {
+  const text2 = !environment || environment.done ? statusActivityText(status) ?? PREPARING_ENVIRONMENT : PREPARING_ENVIRONMENT;
+  return `${text2}\u2026`;
+}
+function environmentSummary(environment) {
+  const seconds = environment?.readySeconds ?? null;
+  return seconds ? `Environment ready in ${humanDuration(seconds)}` : "Environment ready";
 }
 function lastLines(log, max) {
   return log.length <= max ? [...log] : log.slice(log.length - max);
@@ -1505,42 +1446,21 @@ function gutterFor(item) {
   if (item.kind === "system" || item.kind === "notice") return "\u2726";
   return item.gutter ?? "";
 }
-var SANDBOX_RECORD_TYPES2 = /* @__PURE__ */ new Set([
-  "sandbox_starting",
-  "sandbox_phase",
-  "sandbox_output",
-  "sandbox_ready"
+var ENVIRONMENT_RECORD_TYPES2 = /* @__PURE__ */ new Set([
+  "environment_phase",
+  "environment_output",
+  "environment_ready"
 ]);
 function chatTurnsToItems(turns) {
   const items = [];
-  let wakeAt = -1;
-  const settleWake = () => {
-    if (wakeAt < 0) return;
-    const { loading: _, ...settled } = items[wakeAt];
-    items[wakeAt] = { ...settled, text: "Session awake" };
-    wakeAt = -1;
-  };
   for (const turn of turns) {
-    if (turn.role === "assistant") settleWake();
     if (turn.role === "lifecycle") {
       for (const node of turn.nodes) {
         if (node.kind !== "lifecycle") continue;
-        if (SANDBOX_RECORD_TYPES2.has(node.recordType)) continue;
-        if (node.recordType === "session_resumed") {
-          settleWake();
-          continue;
-        }
+        if (ENVIRONMENT_RECORD_TYPES2.has(node.recordType)) continue;
         const text2 = sessionLogText(node.recordType, node.payload ?? {});
         if (!text2) continue;
-        const waking = text2 === SESSION_WAKING;
-        items.push({
-          key: node.key,
-          kind: "notice",
-          text: text2,
-          spaceBefore: true,
-          ...waking ? { loading: true } : {}
-        });
-        wakeAt = waking ? items.length - 1 : -1;
+        items.push({ key: node.key, kind: "notice", text: text2, spaceBefore: true });
       }
       continue;
     }
@@ -1768,26 +1688,19 @@ function entryBody(entry, {
   const members = /* @__PURE__ */ new Map();
   const items = [];
   const work = [];
-  const wakeKeys = new Set(
-    entry.turns.flatMap(
-      (turn) => turn.nodes.flatMap(
-        (node) => node.kind === "lifecycle" && (node.recordType === "session_resumed" || node.recordType === "session_starting" && typeof node.payload?.wake_index === "number" && node.payload.wake_index > 0) ? [node.key] : []
-      )
-    )
-  );
   const phase = entry.progress?.phase;
   const seconds = entry.progress && !entry.progress.turns.some((turn) => turn.startedAt != null) ? null : entrySeconds(entry, now);
   const key = `work:${entry.key}`;
   const header = {
     key,
     kind: "summary",
-    text: live ? phase === "waking" ? "Waking session" : phase === "starting" ? "Starting agent" : phase === "queued" ? "Queued" : reasoningSummaryTitle(liveSummary) || "Working" : seconds == null ? "Session startup" : `Worked for ${humanDuration(seconds)}`,
+    text: live ? phase === "preparing" ? "Preparing environment" : phase === "starting" ? "Starting agent" : phase === "queued" ? "Queued" : reasoningSummaryTitle(liveSummary) || "Working" : seconds == null ? "Session startup" : `Worked for ${humanDuration(seconds)}`,
     spaceBefore: true,
     ...entry.cancelled || entry.turns.some((turn) => turn.isError) ? { isError: true } : {},
     ...live ? { loading: true } : {}
   };
   if (live && (phase === void 0 || phase === "working")) {
-    const visible = raw.filter((item) => !wakeKeys.has(item.key)).map(({ loading: _, ...item }) => item);
+    const visible = raw.map(({ loading: _, ...item }) => item);
     if (liveText !== "") {
       visible.push({
         key: `live:${entry.key}`,
@@ -1808,7 +1721,7 @@ function entryBody(entry, {
   };
   for (const item of raw) {
     const { loading: _, ...settled } = item;
-    if (!wakeKeys.has(item.key) && (replies.has(item.key) || !["assistant", "thinking", "tool", "tool_result"].includes(item.kind))) {
+    if (replies.has(item.key) || !["assistant", "thinking", "tool", "tool_result"].includes(item.kind)) {
       items.push(settled);
     } else {
       addWork(settled);
@@ -1946,7 +1859,7 @@ function activitySummary(activities) {
 
 // src/store/index.ts
 function isConversationOver(session) {
-  return session.lifecycle.conversation === "closed";
+  return session.conversation.state === "closed";
 }
 function seedTranscriptStore(store, seed) {
   store.ingest({
@@ -1994,7 +1907,6 @@ var SessionTranscriptStore = class {
   turnsSession = null;
   turnsCache = [];
   summaryTurnId = null;
-  summaryExecutionId = null;
   get cursor() {
     return this.cursorSeq;
   }
@@ -2038,7 +1950,8 @@ var SessionTranscriptStore = class {
           sender_attribution_id: typeof payload.sender_attribution_id === "string" ? payload.sender_attribution_id : null,
           created_at: record.created_at,
           delivered_at: null,
-          delivered_turn_id: null
+          images: [],
+          turn_id: typeof payload.turn_id === "string" ? payload.turn_id : null
         });
         return true;
       }
@@ -2049,7 +1962,7 @@ var SessionTranscriptStore = class {
           ...existing,
           status: "delivered",
           delivered_at: record.created_at,
-          delivered_turn_id: typeof payload.turn_id === "string" ? payload.turn_id : null
+          turn_id: typeof payload.turn_id === "string" ? payload.turn_id : existing.turn_id
         });
         return true;
       }
@@ -2060,7 +1973,7 @@ var SessionTranscriptStore = class {
           ...existing,
           status: "pending",
           delivered_at: null,
-          delivered_turn_id: null
+          turn_id: typeof payload.requeued_turn_id === "string" ? payload.requeued_turn_id : null
         });
         return true;
       }
@@ -2104,7 +2017,7 @@ var SessionTranscriptStore = class {
             acknowledgedNew = true;
           }
           if (record.source === "lifecycle") {
-            if (record.record_type === "turn_started" && (record.turn_id !== this.summaryTurnId || record.session_execution_id !== this.summaryExecutionId) || (record.record_type === "turn_completed" || record.record_type === "turn_failed") && record.turn_id === this.summaryTurnId && record.session_execution_id === this.summaryExecutionId)
+            if (record.record_type === "turn_started" && record.turn_id !== this.summaryTurnId || record.record_type === "turn_ended" && record.turn_id === this.summaryTurnId)
               next.liveSummary = "";
             inboxChanged = this.applyMessageRecord(record) || inboxChanged;
             if (record.record_type === "message_received" || record.record_type === "message_delivered") {
@@ -2127,7 +2040,7 @@ var SessionTranscriptStore = class {
       case "session": {
         next.session = frame.session;
         next.conversationOver = isConversationOver(frame.session);
-        if (next.conversationOver || frame.session.lifecycle.status === "idle") {
+        if (next.conversationOver || frame.session.turn?.status !== "running") {
           next.liveSummary = "";
         }
         break;
@@ -2136,7 +2049,6 @@ var SessionTranscriptStore = class {
         if (frame.kind === "thinking") {
           if (next.conversationOver) break;
           this.summaryTurnId = frame.turn_id;
-          this.summaryExecutionId = frame.session_execution_id;
           if (frame.text != null) next.liveSummary = frame.text;
           break;
         }
@@ -2168,7 +2080,6 @@ var SessionTranscriptStore = class {
 export {
   BRANCH_GLYPH,
   LIVE_GLYPH,
-  SESSION_WAKING,
   SessionTranscriptStore,
   USER_BAR,
   activitySummary,
@@ -2182,10 +2093,15 @@ export {
   codexMcpToolName,
   collapseToolRuns,
   deliveredUnechoedSends,
-  deriveSandboxState,
+  deriveEnvironmentState,
   emptySessionTranscriptSnapshot,
   entryBody,
   entrySeconds,
+  environmentOutputLine,
+  environmentOutputLines,
+  environmentOutputStep,
+  environmentPhaseLabel,
+  environmentSummary,
   eventToItems,
   foldCosts,
   foldGutter,
@@ -2210,11 +2126,6 @@ export {
   recordSlice,
   recordToItems,
   resultCostUsd,
-  sandboxOutputLine,
-  sandboxOutputLines,
-  sandboxOutputStep,
-  sandboxPhaseLabel,
-  sandboxSummary,
   seedTranscriptStore,
   sessionLogText,
   splitLedger,
@@ -2225,5 +2136,6 @@ export {
   tailLines,
   toolActivities,
   toolResultText,
-  toolRunMembers
+  toolRunMembers,
+  turnEndedText
 };