@ellipsis-dev/sdk 0.25.0 → 0.27.0

package/dist/store/index.js

@@ -62,11 +62,11 @@ function sandboxPhaseText(payload) {
       if (tier) parts.push(tier);
       const duration = durationLabel(payload.duration_ms);
       if (duration) parts.push(duration);
-      return parts.join(" \xB7 ");
+      return parts.join(", ");
     }
     case "failed": {
       const duration = durationLabel(payload.duration_ms);
-      return duration ? `${label} failed \xB7 ${duration}` : `${label} failed`;
+      return duration ? `${label} failed, ${duration}` : `${label} failed`;
     }
     default:
       return label;
@@ -76,7 +76,7 @@ function lifecycleText(recordType, payload) {
   switch (recordType) {
     case "session_scheduled": {
       const config = typeof payload.config_name === "string" ? payload.config_name : null;
-      return config ? `Session scheduled \xB7 ${config}` : "Session scheduled";
+      return config ? `Session scheduled, ${config}` : "Session scheduled";
     }
     case "session_starting": {
       const attempt = typeof payload.attempt === "number" ? payload.attempt : 0;
@@ -85,14 +85,14 @@ function lifecycleText(recordType, payload) {
       return wakeIndex > 0 ? "Waking the session\u2026" : "Session starting\u2026";
     }
     case "session_retrying":
-      return typeof payload.reason === "string" && payload.reason ? `Retrying \xB7 ${payload.reason}` : "Retrying after a transient error\u2026";
+      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)} \xB7 ${last}` : null;
+      return last ? `${sandboxOutputStep(payload)}, ${last}` : null;
     }
     case "sandbox_ready": {
       const repos = Array.isArray(payload.repositories) ? payload.repositories.filter(
@@ -102,7 +102,7 @@ function lifecycleText(recordType, payload) {
       if (repos.length) parts.push(repos.join(", "));
       const tier = cacheTierLabel(payload.cache_tier);
       if (tier) parts.push(tier);
-      return parts.join(" \xB7 ");
+      return parts.join(", ");
     }
     case "session_resumed":
       return "Resumed the conversation";
@@ -112,7 +112,7 @@ function lifecycleText(recordType, payload) {
       return "Conversation closed";
     case "session_cancelled": {
       const reason = typeof payload.reason === "string" ? payload.reason : null;
-      return reason ? `Session cancelled \xB7 ${reason}` : "Session cancelled";
+      return reason ? `Session cancelled, ${reason}` : "Session cancelled";
     }
     default:
       return null;
@@ -182,7 +182,7 @@ function eventToItems(event, keyBase, options = {}) {
     const label = event.is_error ? "turn ended with an error" : "turn complete";
     push({
       kind: "summary",
-      text: bits.length ? `${label} \xB7 ${bits.join(" \xB7 ")}` : label,
+      text: bits.length ? `${label}, ${bits.join(", ")}` : label,
       spaceBefore: true,
       isError: event.is_error
     });
@@ -196,7 +196,7 @@ function eventToItems(event, keyBase, options = {}) {
     if (typeof data.cwd === "string") bits.push(data.cwd);
     push({
       kind: "system",
-      text: bits.length ? `session started \xB7 ${bits.join(" \xB7 ")}` : "session started",
+      text: bits.length ? `session started, ${bits.join(", ")}` : "session started",
       spaceBefore: true
     });
     return items;
@@ -386,42 +386,55 @@ function pendingToolCalls(items) {
   }
   return pending;
 }
-function collapseToolRuns(items) {
+function isFoldable(item) {
+  return item.kind === "tool" || item.kind === "tool_result" || item.kind === "thinking";
+}
+function foldLabel(group, settled) {
+  const work = group.filter((i) => i.kind !== "thinking");
+  if (work.length === 0) return settled ? "Thinking\u2026" : "Thinking";
+  const names = [
+    ...new Set(work.filter((i) => i.kind === "tool").map((i) => i.text))
+  ];
+  const n = work.filter((i) => i.kind === "tool").length || work.length;
+  const plural = n === 1 ? "" : "s";
+  if (names.length === 1 && names[0] === "Bash")
+    return `Ran ${n} shell command${plural}`;
+  if (names.length === 1 && names[0] === "Read")
+    return `Read ${n} file${plural}`;
+  if (names.length === 1)
+    return n === 1 ? `Ran ${names[0]}` : `Ran ${names[0]} ${n} times`;
+  if (names.length === 0) return `Ran ${n} tool call${plural}`;
+  const shown = names.slice(0, 3).join(", ") + (names.length > 3 ? ", \u2026" : "");
+  return `Ran ${n} tool call${plural} (${shown})`;
+}
+function foldRun(group, loading) {
+  return {
+    key: `grp:${group[0].key}`,
+    kind: "notice",
+    text: foldLabel(group, !loading),
+    spaceBefore: true,
+    ...loading ? { loading } : {}
+  };
+}
+function collapseToolRuns(items, { working = false } = {}) {
   const out = [];
   let group = [];
-  const flush = () => {
+  const flush = (trailing) => {
     if (group.length === 0) return;
-    const names = [
-      ...new Set(group.filter((i) => i.kind === "tool").map((i) => i.text))
-    ];
-    const n = group.filter((i) => i.kind === "tool").length || group.length;
-    const plural = n === 1 ? "" : "s";
-    let label;
-    if (names.length === 1 && names[0] === "Bash")
-      label = `Ran ${n} shell command${plural}`;
-    else if (names.length === 1 && names[0] === "Read")
-      label = `Read ${n} file${plural}`;
-    else if (names.length === 0) label = `Ran ${n} tool call${plural}`;
-    else {
-      const shown = names.slice(0, 3).join(", ") + (names.length > 3 ? ", \u2026" : "");
-      label = `Ran ${n} tool call${plural} (${shown})`;
-    }
-    out.push({
-      key: `grp:${group[0].key}`,
-      kind: "notice",
-      text: label,
-      spaceBefore: true
-    });
+    const pending = pendingToolCalls(group).length > 0;
+    const thinkingOnly = group.every((i) => i.kind === "thinking");
+    const loading = pending || trailing && working && thinkingOnly;
+    out.push(foldRun(group, loading));
     group = [];
   };
   for (const item of items) {
-    if (item.kind === "tool" || item.kind === "tool_result") group.push(item);
+    if (isFoldable(item)) group.push(item);
     else {
-      flush();
+      flush(false);
       out.push(item);
     }
   }
-  flush();
+  flush(true);
   return out;
 }
 function clampLines(text, maxLines) {
@@ -471,6 +484,8 @@ var SANDBOX_RECORD_TYPES = /* @__PURE__ */ new Set([
 function groupRecordsToChatTurns(records) {
   const turns = [];
   const toolNodeByUseId = /* @__PURE__ */ new Map();
+  const userTurnByMessageId = /* @__PURE__ */ new Map();
+  const messageIdByTurnId = /* @__PURE__ */ new Map();
   let seq = 0;
   const nextKey = (base) => `${base}:${seq++}`;
   let openIdx = -1;
@@ -497,6 +512,38 @@ function groupRecordsToChatTurns(records) {
   };
   for (const record of records) {
     if (record.record_format === "ellipsis_lifecycle@1") {
+      const messageId = typeof record.payload.message_id === "string" ? record.payload.message_id : null;
+      if (record.record_type === "message_received" && messageId) {
+        const body = typeof record.payload.body === "string" ? record.payload.body : "";
+        if (!body.trim() || userTurnByMessageId.has(messageId)) continue;
+        const turn2 = {
+          resumed: false,
+          isError: false,
+          key: `msg:${messageId}`,
+          role: "user",
+          nodes: [{ key: `msg:${messageId}`, kind: "user", text: body.trim() }],
+          startedAt: record.created_at,
+          completedAt: record.created_at,
+          durationMs: null,
+          costUsd: null,
+          tokens: null
+        };
+        userTurnByMessageId.set(messageId, turn2);
+        turns.push(turn2);
+        continue;
+      }
+      if (record.record_type === "message_delivered" && messageId) {
+        if (typeof record.payload.turn_id === "string")
+          messageIdByTurnId.set(record.payload.turn_id, messageId);
+        continue;
+      }
+      if (record.record_type === "turn_failed") {
+        const turnId = typeof record.payload.turn_id === "string" ? record.payload.turn_id : null;
+        const owner = turnId ? messageIdByTurnId.get(turnId) : void 0;
+        const userTurn = owner ? userTurnByMessageId.get(owner) : void 0;
+        if (userTurn) userTurn.isError = true;
+        continue;
+      }
       const text = lifecycleText(record.record_type, record.payload);
       if (!text) continue;
       const isSandbox = SANDBOX_RECORD_TYPES.has(record.record_type);
@@ -598,6 +645,8 @@ function groupRecordsToChatTurns(records) {
       if (typeof content === "string") {
         if (content.trim()) {
           openIdx = -1;
+          if (record.session_message_id != null && userTurnByMessageId.has(record.session_message_id))
+            continue;
           turns.push({
             resumed: false,
             isError: false,
@@ -801,6 +850,7 @@ 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) {
@@ -810,14 +860,14 @@ function sessionLogText(recordType, payload) {
       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 ? "Waking the session\u2026" : null;
+      return wake > 0 ? SESSION_WAKING : null;
     }
     case "session_retrying":
-      return typeof p.reason === "string" && p.reason ? `Retrying \xB7 ${p.reason}` : "Retrying after a transient error\u2026";
+      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 ? ` \xB7 ${p.reason}` : "";
+      const reason = typeof p.reason === "string" && p.reason ? `, ${p.reason}` : "";
       return `Session cancelled${reason}`;
     }
     default:
@@ -879,6 +929,7 @@ function deliveredUnechoedSends(records) {
   }
   return out;
 }
+var STARTING_SANDBOX = "Starting sandbox\u2026";
 function msLabel(ms) {
   if (typeof ms !== "number" || !isFinite(ms) || ms < 0) return null;
   return humanDuration(ms / 1e3);
@@ -920,7 +971,7 @@ function stepLabel(phase, step) {
 }
 function deriveSandboxState(records, minFeedSeq) {
   let seen = false;
-  let headline = "Starting cloud agent\u2026";
+  let headline = STARTING_SANDBOX;
   let done = false;
   let sandboxDone = false;
   let readySeconds = null;
@@ -955,7 +1006,7 @@ function deriveSandboxState(records, minFeedSeq) {
       case "session_retrying": {
         seen = true;
         const text = lifecycleText(record.record_type, p);
-        headline = !text || text === "Session starting\u2026" ? "Starting cloud agent\u2026" : text;
+        headline = !text || text === "Session starting\u2026" ? STARTING_SANDBOX : text;
         done = false;
         readySeconds = null;
         reset();
@@ -970,7 +1021,6 @@ function deriveSandboxState(records, minFeedSeq) {
       case "sandbox_starting": {
         seen = true;
         reset();
-        push(record, "step", "Starting sandbox\u2026");
         break;
       }
       case "sandbox_phase": {
@@ -989,7 +1039,7 @@ function deriveSandboxState(records, minFeedSeq) {
             base,
             ...tier ? [tier] : [],
             ...dur ? [dur] : []
-          ].join(" \xB7 ");
+          ].join(", ");
           const line = open.get(key);
           if (line) {
             line.kind = failed ? "failed" : "done";
@@ -1025,7 +1075,7 @@ function deriveSandboxState(records, minFeedSeq) {
             "Sandbox ready",
             ...tier ? [tier] : [],
             ...totalSeconds > 0 ? [humanDuration(totalSeconds)] : []
-          ].join(" \xB7 ")
+          ].join(", ")
         );
         sandboxDone = true;
         readySeconds = totalSeconds > 0 ? totalSeconds : null;
@@ -1036,6 +1086,8 @@ function deriveSandboxState(records, minFeedSeq) {
         break;
     }
   }
+  const openLines = [...open.values()];
+  if (openLines.length) openLines[openLines.length - 1].loading = true;
   const full = configName ? [
     {
       key: "config",
@@ -1054,6 +1106,14 @@ function deriveSandboxState(records, minFeedSeq) {
     log: full
   } : null;
 }
+function startupSettled(sandbox, status) {
+  return (sandbox?.done ?? false) && statusActivityText(status) == null;
+}
+function startupHeadline(sandbox, status) {
+  const activity = statusActivityText(status);
+  const text = !sandbox || sandbox.done ? activity ?? STARTING_SANDBOX : sandbox.headline;
+  return `${text.replace(/…$/, "")}\u2026`;
+}
 function sandboxSummary(sandbox) {
   const seconds = sandbox?.readySeconds ?? null;
   return seconds ? `Sandbox ready in ${humanDuration(seconds)}` : "Sandbox started";
@@ -1081,20 +1141,33 @@ var SANDBOX_RECORD_TYPES2 = /* @__PURE__ */ new Set([
 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" && wakeAt >= 0) {
-          items[wakeAt] = { ...items[wakeAt], text: "Session awake" };
-          wakeAt = -1;
+        if (node.recordType === "session_resumed") {
+          settleWake();
           continue;
         }
         const text = sessionLogText(node.recordType, node.payload ?? {});
         if (!text) continue;
-        items.push({ key: node.key, kind: "notice", text, spaceBefore: true });
-        wakeAt = text === "Waking the session\u2026" ? items.length - 1 : -1;
+        const waking = text === SESSION_WAKING;
+        items.push({
+          key: node.key,
+          kind: "notice",
+          text,
+          spaceBefore: true,
+          ...waking ? { loading: true } : {}
+        });
+        wakeAt = waking ? items.length - 1 : -1;
       }
       continue;
     }
@@ -1105,7 +1178,8 @@ function chatTurnsToItems(turns) {
             key: node.key,
             kind: "user",
             text: node.text,
-            spaceBefore: true
+            spaceBefore: true,
+            ...turn.isError ? { isError: true } : {}
           });
         }
       }
@@ -1170,21 +1244,8 @@ function isToolFold(item) {
 function isToolActivity(item) {
   return item.kind === "tool" || item.kind === "tool_result" || isToolFold(item);
 }
-function isAgentSpeech(item) {
-  return item.kind === "assistant" || item.kind === "thinking";
-}
 function layOutItems(items) {
-  const out = [];
-  let nestUnder = false;
-  for (const item of items) {
-    if (!isToolActivity(item)) {
-      out.push({ item, nested: false, attach: false });
-      nestUnder = isAgentSpeech(item);
-      continue;
-    }
-    out.push({ item, nested: nestUnder, attach: nestUnder });
-  }
-  return out;
+  return items.map((item) => ({ item, nested: false, attach: false }));
 }
 function foldGutter(nested) {
   return nested ? BRANCH_GLYPH : "\u25CF";
@@ -1205,13 +1266,118 @@ function toolRunMembers(items) {
     group = [];
   };
   for (const item of items) {
-    if (item.kind === "tool" || item.kind === "tool_result") group.push(item);
+    if (isFoldable(item)) group.push(item);
     else flush();
   }
   flush();
   return out;
 }
 
+// src/store/ledger.ts
+function splitLedger(turns) {
+  const preamble = [];
+  const entries = [];
+  for (const turn of turns) {
+    if (turn.role === "user") {
+      const node = turn.nodes.find((n) => n.kind === "user");
+      entries.push({
+        key: turn.key,
+        prompt: node?.text ?? "",
+        cancelled: turn.isError,
+        turns: []
+      });
+      continue;
+    }
+    const last = entries[entries.length - 1];
+    if (last) last.turns.push(turn);
+    else preamble.push(turn);
+  }
+  return { preamble, entries };
+}
+function entrySeconds(entry, now) {
+  let ms = 0;
+  for (const turn of entry.turns) {
+    if (turn.role !== "assistant" || turn.startedAt == null) continue;
+    if (turn.durationMs != null) ms += turn.durationMs;
+    else {
+      const end = turn.completedAt != null ? Date.parse(turn.completedAt) : now;
+      ms += Math.max(0, end - Date.parse(turn.startedAt));
+    }
+  }
+  return ms / 1e3;
+}
+function foldToolTurn(raw, live, members) {
+  const items = [];
+  let run = [];
+  const flush = () => {
+    if (run.length === 0) return;
+    const fold = foldRun(run, live && pendingToolCalls(run).length > 0);
+    members.set(fold.key, run);
+    items.push(fold);
+    run = [];
+  };
+  for (const item of raw) {
+    if (item.kind === "tool" || item.kind === "tool_result") run.push(item);
+    else {
+      flush();
+      items.push(item);
+    }
+  }
+  flush();
+  return items;
+}
+function entryBody(entry, {
+  live,
+  now,
+  liveText = ""
+}) {
+  const raw = chatTurnsToItems(entry.turns);
+  const members = /* @__PURE__ */ new Map();
+  const toolRan = raw.some((i) => i.kind === "tool");
+  let items;
+  if (toolRan) {
+    items = foldToolTurn(raw, live, members);
+  } else {
+    const thoughts = raw.filter((i) => i.kind === "thinking");
+    items = raw.filter((i) => i.kind !== "thinking");
+    const key = `grp:thought:${entry.key}`;
+    if (thoughts.length) members.set(key, thoughts);
+    if (live && liveText === "") {
+      items.push({ key, kind: "notice", text: "Thinking", spaceBefore: true });
+    } else if (!live && thoughts.length) {
+      items.push({
+        key,
+        kind: "notice",
+        text: `Thought for ${humanDuration(entrySeconds(entry, now))}`,
+        spaceBefore: true
+      });
+    }
+  }
+  if (live && liveText !== "") {
+    items.push({
+      key: `live:${entry.key}`,
+      kind: "assistant",
+      text: liveText,
+      spaceBefore: true
+    });
+  }
+  const chosen = live ? liveRow(items, members) : -1;
+  items = items.map((item, i) => {
+    const { loading: _, ...rest } = item;
+    return i === chosen ? { ...rest, loading: true } : rest;
+  });
+  return { items, members };
+}
+function liveRow(items, members) {
+  if (items.length === 0) return -1;
+  const running = items.findIndex((item) => {
+    const run = members.get(item.key);
+    return run != null && pendingToolCalls(run).length > 0;
+  });
+  if (running >= 0) return running;
+  return items.length - 1;
+}
+
 // src/store/index.ts
 var TERMINAL_SESSION_STATUSES = /* @__PURE__ */ new Set([
   "completed",
@@ -1418,6 +1584,7 @@ var SessionTranscriptStore = class {
 export {
   BRANCH_GLYPH,
   LIVE_GLYPH,
+  SESSION_WAKING,
   SessionTranscriptStore,
   USER_BAR,
   awaitingAgentPhase,
@@ -1431,17 +1598,20 @@ export {
   deliveredUnechoedSends,
   deriveSandboxState,
   emptySessionTranscriptSnapshot,
+  entryBody,
+  entrySeconds,
   eventToItems,
   foldCosts,
   foldGutter,
+  foldRun,
   formatDuration,
   groupRecordsToChatTurns,
   gutterFor,
   hookPhrase,
   humanDuration,
-  isAgentSpeech,
   isConnectVisibleRecord,
   isConversationOver,
+  isFoldable,
   isToolActivity,
   isToolFold,
   lastLines,
@@ -1459,6 +1629,9 @@ export {
   sandboxSummary,
   seedTranscriptStore,
   sessionLogText,
+  splitLedger,
+  startupHeadline,
+  startupSettled,
   statusActivityText,
   summarizeToolInput,
   tailLines,

package/dist/stream/index.d.ts

@@ -1,4 +1,4 @@
-import { a4 as StreamFrame, J as Session } from '../types-DJzmFABi.js';
+import { a4 as StreamFrame, J as Session } from '../types-ClEF_IA9.js';
 
 declare const SESSION_STREAM_PROTOCOL_VERSION = 3;
 declare const WS_CLOSE_NORMAL = 1000;