@ellipsis-dev/sdk 0.14.0 → 0.15.1

package/dist/store/index.js

@@ -116,32 +116,6 @@ function lifecycleText(recordType, payload) {
 }
 
 // src/store/transcript.ts
-var LineBuffer = class {
-  buf = "";
-  push(chunk) {
-    this.buf += chunk;
-    const parts = this.buf.split("\n");
-    this.buf = parts.pop() ?? "";
-    return parts;
-  }
-  flush() {
-    const rest = this.buf.trim();
-    this.buf = "";
-    return rest ? [rest] : [];
-  }
-};
-function parseEventLine(line) {
-  const trimmed = line.trim();
-  if (!trimmed) return null;
-  try {
-    const value = JSON.parse(trimmed);
-    if (value && typeof value === "object" && !Array.isArray(value)) {
-      return value;
-    }
-  } catch {
-  }
-  return null;
-}
 function oneLine(text, max) {
   const collapsed = text.replace(/\s+/g, " ").trim();
   return collapsed.length <= max ? collapsed : `${collapsed.slice(0, max - 3)}...`;
@@ -176,35 +150,31 @@ function formatDuration(seconds) {
 }
 function blocksOf(content) {
   if (typeof content === "string") return [{ type: "text", text: content }];
-  if (Array.isArray(content)) return content;
-  return [];
+  return content;
 }
-function toolResultText(block) {
-  const c = block.content;
-  if (typeof c === "string") return c.trim();
-  if (Array.isArray(c)) {
+function toolResultText(content) {
+  if (typeof content === "string") return content.trim();
+  if (Array.isArray(content)) {
     const parts = [];
-    for (const inner of c) {
+    for (const inner of content) {
       if (typeof inner.text === "string") parts.push(inner.text);
       else parts.push(JSON.stringify(inner));
     }
     return parts.join("\n").trim();
   }
-  if (c === void 0 || c === null) return "";
-  return JSON.stringify(c);
+  if (content === void 0 || content === null) return "";
+  return JSON.stringify(content);
 }
 function eventToItems(event, keyBase, options = {}) {
   const items = [];
   const push = (item) => {
     items.push({ ...item, key: `${keyBase}:${items.length}` });
   };
-  const type = event.type;
-  if (type === "result") {
+  if (event.kind === "result") {
     const bits = [];
-    if (typeof event.duration_ms === "number")
-      bits.push(formatDuration(event.duration_ms / 1e3));
-    if (typeof event.total_cost_usd === "number")
-      bits.push(`$${event.total_cost_usd.toFixed(2)}`);
+    bits.push(formatDuration(event.duration_ms / 1e3));
+    if (typeof event.cost_usd === "number")
+      bits.push(`$${event.cost_usd.toFixed(2)}`);
     const label = event.is_error ? "turn ended with an error" : "turn complete";
     push({
       kind: "summary",
@@ -214,11 +184,12 @@ function eventToItems(event, keyBase, options = {}) {
     });
     return items;
   }
-  if (type === "system") {
+  if (event.kind === "system") {
     if (!options.systemInitLine || event.subtype !== "init") return items;
+    const data = event.data ?? {};
     const bits = [];
-    if (typeof event.model === "string") bits.push(event.model);
-    if (typeof event.cwd === "string") bits.push(event.cwd);
+    if (typeof data.model === "string") bits.push(data.model);
+    if (typeof data.cwd === "string") bits.push(data.cwd);
     push({
       kind: "system",
       text: bits.length ? `session started \xB7 ${bits.join(" \xB7 ")}` : "session started",
@@ -226,19 +197,20 @@ function eventToItems(event, keyBase, options = {}) {
     });
     return items;
   }
-  const blocks = blocksOf(event.message?.content);
-  if (type === "user") {
+  if (event.kind === "rate_limit") return items;
+  const blocks = blocksOf(event.content);
+  if (event.kind === "user") {
     for (const block of blocks) {
       if (block.type === "tool_result") {
-        const body = toolResultText(block);
+        const body = toolResultText(block.content);
         push({
           kind: "tool_result",
           gutter: "\u23BF",
           text: body || "(no output)",
           spaceBefore: false,
-          isError: block.is_error
+          isError: block.is_error ?? void 0
         });
-      } else if (typeof block.text === "string" && block.text.trim()) {
+      } else if (block.type === "text" && block.text.trim()) {
         push({
           kind: "user",
           gutter: "\u203A",
@@ -250,37 +222,153 @@ function eventToItems(event, keyBase, options = {}) {
     return items;
   }
   for (const block of blocks) {
-    if (block.type === "thinking" && typeof block.thinking === "string" && block.thinking.trim()) {
+    if (block.type === "thinking" && block.thinking.trim()) {
       push({
         kind: "thinking",
         gutter: "\u273B",
         text: block.thinking.trim(),
         spaceBefore: true
       });
-    } else if (block.type === "tool_use") {
-      const name = block.name ?? "tool";
-      const summary = summarizeToolInput(name, block.input);
+    } else if (block.type === "tool_use" || block.type === "server_tool_use") {
+      const summary = summarizeToolInput(block.name, block.input);
       push({
         kind: "tool",
         gutter: "\u25CF",
-        text: name,
+        text: block.name,
         detail: summary ? `(${summary})` : void 0,
         spaceBefore: true,
-        tool: { name, input: block.input }
+        tool: { name: block.name, input: block.input }
       });
-    } else if (typeof block.text === "string" && block.text.trim()) {
+    } else if (block.type === "text" && block.text.trim()) {
       push({ kind: "assistant", text: block.text.trim(), spaceBefore: true });
     }
   }
   return items;
 }
+function codexEventToItems(event, keyBase) {
+  const items = [];
+  const push = (item2) => {
+    items.push({ ...item2, key: `${keyBase}:${items.length}` });
+  };
+  if (event.type === "turn.failed") {
+    push({
+      kind: "summary",
+      text: "turn ended with an error",
+      spaceBefore: true,
+      isError: true
+    });
+    return items;
+  }
+  if (event.type === "error") {
+    push({
+      kind: "error",
+      text: event.message?.trim() || "error",
+      spaceBefore: true,
+      isError: true
+    });
+    return items;
+  }
+  if (event.type !== "item.completed") return items;
+  const item = event.item;
+  switch (item.type) {
+    case "agent_message": {
+      const text = item.text.trim();
+      if (text) push({ kind: "assistant", text, spaceBefore: true });
+      break;
+    }
+    case "reasoning": {
+      const r = item;
+      const text = (r.text ?? r.summary ?? "").trim();
+      if (text)
+        push({ kind: "thinking", gutter: "\u273B", text, spaceBefore: true });
+      break;
+    }
+    case "command_execution": {
+      const c = item;
+      const summary = oneLine(c.command, 100);
+      push({
+        kind: "tool",
+        gutter: "\u25CF",
+        text: "Bash",
+        detail: summary ? `(${summary})` : void 0,
+        spaceBefore: true,
+        tool: { name: "Bash", input: { command: c.command } }
+      });
+      const output = (c.aggregated_output ?? "").trim();
+      push({
+        kind: "tool_result",
+        gutter: "\u23BF",
+        text: output || "(no output)",
+        spaceBefore: false,
+        isError: typeof c.exit_code === "number" && c.exit_code !== 0
+      });
+      break;
+    }
+    case "file_change": {
+      const paths = codexChangedPaths(item);
+      push({
+        kind: "tool",
+        gutter: "\u25CF",
+        text: "Edit",
+        detail: paths.length ? `(${oneLine(paths.join(", "), 100)})` : void 0,
+        spaceBefore: true,
+        tool: { name: "Edit" }
+      });
+      break;
+    }
+    case "mcp_tool_call": {
+      const name = codexMcpToolName(item);
+      push({
+        kind: "tool",
+        gutter: "\u25CF",
+        text: name,
+        spaceBefore: true,
+        tool: { name }
+      });
+      break;
+    }
+    case "web_search": {
+      const query = item.query;
+      push({
+        kind: "tool",
+        gutter: "\u25CF",
+        text: "WebSearch",
+        detail: query ? `(${oneLine(query, 100)})` : void 0,
+        spaceBefore: true,
+        tool: { name: "WebSearch" }
+      });
+      break;
+    }
+    case "error":
+      push({
+        kind: "error",
+        text: item.message?.trim() || "error",
+        spaceBefore: true,
+        isError: true
+      });
+      break;
+  }
+  return items;
+}
+function codexChangedPaths(item) {
+  return (item.changes ?? []).map((c) => typeof c.path === "string" ? c.path : null).filter((p) => p !== null);
+}
+function codexMcpToolName(item) {
+  return item.server && item.tool ? `mcp__${item.server}__${item.tool}` : item.tool ?? "mcp_tool_call";
+}
 function recordToItems(record, keyBase, options = {}) {
-  if (record.source === "lifecycle") {
-    const text = lifecycleText(record.record_type, record.payload);
-    return text ? [{ key: keyBase, kind: "notice", text, spaceBefore: true }] : [];
+  switch (record.record_format) {
+    case "claude_sdk@1":
+      return eventToItems(record.payload, keyBase, options);
+    case "codex_jsonl@1":
+      return codexEventToItems(record.payload, keyBase);
+    case "ellipsis_lifecycle@1": {
+      const text = lifecycleText(record.record_type, record.payload);
+      return text ? [{ key: keyBase, kind: "notice", text, spaceBefore: true }] : [];
+    }
+    default:
+      return [];
   }
-  if (record.source !== "claude_code") return [];
-  return eventToItems(record.payload, keyBase, options);
 }
 function isConnectVisibleRecord(record) {
   return record.source !== "lifecycle" || record.record_type === "sandbox_ready";
@@ -341,19 +429,18 @@ function clampLines(text, maxLines) {
   };
 }
 function resultCostUsd(event) {
-  if (event.type !== "result") return null;
-  return typeof event.total_cost_usd === "number" ? event.total_cost_usd : null;
+  if (event.kind !== "result") return null;
+  return typeof event.cost_usd === "number" ? event.cost_usd : null;
 }
 function foldCosts(events) {
-  let prev = null;
   let total = null;
+  let lastStep = null;
   for (const event of events) {
     const cost = resultCostUsd(event);
     if (cost == null) continue;
-    prev = total;
-    total = cost;
+    total = (total ?? 0) + cost;
+    lastStep = cost;
   }
-  const lastStep = total != null && prev != null ? Math.max(0, total - prev) : total;
   return { total, lastStep };
 }
 function statusActivityText(status) {
@@ -370,36 +457,19 @@ function statusActivityText(status) {
 }
 
 // src/store/chatTurns.ts
-var isInitEvent = (data) => data.type === "system" && data.subtype === "init";
-var TOOL_USE_BLOCK_TYPES = /* @__PURE__ */ new Set([
-  "tool_use",
-  "server_tool_use",
-  "mcp_tool_use"
-]);
+var isInitEvent = (data) => data.kind === "system" && data.subtype === "init";
 var SANDBOX_RECORD_TYPES = /* @__PURE__ */ new Set([
   "sandbox_starting",
   "sandbox_phase",
   "sandbox_output",
   "sandbox_ready"
 ]);
-function toolResultText2(block) {
-  const c = block.content;
-  if (typeof c === "string") return c.trim();
-  if (Array.isArray(c)) {
-    return c.map(
-      (inner) => typeof inner.text === "string" ? inner.text : JSON.stringify(inner)
-    ).join("\n").trim();
-  }
-  if (c === void 0 || c === null) return "";
-  return JSON.stringify(c);
-}
 function groupRecordsToChatTurns(records) {
   const turns = [];
   const toolNodeByUseId = /* @__PURE__ */ new Map();
   let seq = 0;
   const nextKey = (base) => `${base}:${seq++}`;
   let openIdx = -1;
-  let prevCumulativeCostUsd = 0;
   let initCount = 0;
   let pendingResume = false;
   const openAgentTurn = (record) => {
@@ -421,7 +491,7 @@ function groupRecordsToChatTurns(records) {
     return turns[openIdx];
   };
   for (const record of records) {
-    if (record.source === "lifecycle") {
+    if (record.record_format === "ellipsis_lifecycle@1") {
       const text = lifecycleText(record.record_type, record.payload);
       if (!text) continue;
       const isSandbox = SANDBOX_RECORD_TYPES.has(record.record_type);
@@ -483,43 +553,49 @@ function groupRecordsToChatTurns(records) {
       });
       continue;
     }
-    if (record.source !== "claude_code") continue;
+    if (record.record_format === "codex_jsonl@1") {
+      codexEventIntoTurns(record, record.payload, {
+        openAgentTurn,
+        closeTurn: (completedAt) => {
+          if (openIdx >= 0) {
+            turns[openIdx].completedAt = completedAt;
+            openIdx = -1;
+          }
+        },
+        nextKey
+      });
+      continue;
+    }
     const data = record.payload;
-    if (data.type === "system") {
+    if (data.kind === "system") {
       if (isInitEvent(data)) {
         initCount += 1;
         if (initCount > 1) pendingResume = true;
       }
       continue;
     }
-    if (data.type === "result") {
+    if (data.kind === "result") {
       if (openIdx >= 0) {
         turns[openIdx].completedAt = record.created_at;
         turns[openIdx].durationMs = typeof data.duration_ms === "number" ? data.duration_ms : null;
-        if (typeof data.total_cost_usd === "number") {
-          turns[openIdx].costUsd = Math.max(
-            0,
-            data.total_cost_usd - prevCumulativeCostUsd
-          );
-          prevCumulativeCostUsd = data.total_cost_usd;
+        if (typeof data.cost_usd === "number") {
+          turns[openIdx].costUsd = data.cost_usd;
         }
         openIdx = -1;
       }
       continue;
     }
-    const message = data.message;
-    if (!message) continue;
-    if (data.type === "user") {
-      const content2 = message.content;
-      if (typeof content2 === "string") {
-        if (content2.trim()) {
+    if (data.kind === "user") {
+      const content = data.content;
+      if (typeof content === "string") {
+        if (content.trim()) {
           openIdx = -1;
           turns.push({
             resumed: false,
             key: nextKey(record.id),
             role: "user",
             nodes: [
-              { key: nextKey(record.id), kind: "user", text: content2.trim() }
+              { key: nextKey(record.id), kind: "user", text: content.trim() }
             ],
             startedAt: record.created_at,
             completedAt: record.created_at,
@@ -530,12 +606,11 @@ function groupRecordsToChatTurns(records) {
         }
         continue;
       }
-      if (!Array.isArray(content2)) continue;
-      for (const block of content2) {
+      for (const block of content) {
         if (block.type !== "tool_result") continue;
-        const body = toolResultText2(block) || "(no output)";
-        const useId = block.tool_use_id ?? void 0;
-        const node = useId != null ? toolNodeByUseId.get(useId) : void 0;
+        const body = toolResultText(block.content) || "(no output)";
+        const useId = block.tool_use_id;
+        const node = toolNodeByUseId.get(useId);
         if (node) {
           node.result = body;
           node.isError = !!block.is_error;
@@ -553,41 +628,38 @@ function groupRecordsToChatTurns(records) {
             completedAt: record.created_at
           };
           openAgentTurn(record).nodes.push(orphan);
-          if (useId != null) toolNodeByUseId.set(useId, orphan);
+          toolNodeByUseId.set(useId, orphan);
         }
       }
       continue;
     }
-    const content = message.content;
-    if (!Array.isArray(content)) continue;
+    if (data.kind !== "assistant") continue;
     const turn = openAgentTurn(record);
-    const usage = message.usage;
-    if (usage && typeof usage.output_tokens === "number") {
-      turn.tokens = (turn.tokens ?? 0) + usage.output_tokens;
+    if (data.usage && typeof data.usage.output_tokens === "number") {
+      turn.tokens = (turn.tokens ?? 0) + data.usage.output_tokens;
     }
-    for (const block of content) {
-      if ((block.type === "thinking" || block.type === "redacted_thinking") && typeof block.thinking === "string" && block.thinking.trim()) {
+    for (const block of data.content) {
+      if (block.type === "thinking" && block.thinking.trim()) {
         turn.nodes.push({
           key: nextKey(record.id),
           kind: "thinking",
           text: block.thinking.trim()
         });
-      } else if (block.type != null && TOOL_USE_BLOCK_TYPES.has(block.type)) {
-        const name = block.name ?? "tool";
+      } else if (block.type === "tool_use" || block.type === "server_tool_use") {
         const node = {
           key: nextKey(record.id),
           kind: "tool",
-          name,
-          input: block.input ?? null,
-          summary: summarizeToolInput(name, block.input ?? void 0),
+          name: block.name,
+          input: block.input,
+          summary: summarizeToolInput(block.name, block.input),
           result: null,
           isError: false,
           startedAt: record.created_at,
           completedAt: null
         };
         turn.nodes.push(node);
-        if (block.id) toolNodeByUseId.set(block.id, node);
-      } else if (block.type === "text" && typeof block.text === "string" && block.text.trim()) {
+        toolNodeByUseId.set(block.id, node);
+      } else if (block.type === "text" && block.text.trim()) {
         turn.nodes.push({
           key: nextKey(record.id),
           kind: "assistant",
@@ -598,6 +670,105 @@ function groupRecordsToChatTurns(records) {
   }
   return turns;
 }
+function codexEventIntoTurns(record, event, ops) {
+  if (event.type === "turn.completed" || event.type === "turn.failed") {
+    ops.closeTurn(record.created_at);
+    return;
+  }
+  if (event.type === "error") {
+    const turn2 = ops.openAgentTurn(record);
+    turn2.nodes.push({
+      key: ops.nextKey(record.id),
+      kind: "assistant",
+      text: event.message?.trim() || "error"
+    });
+    return;
+  }
+  if (event.type !== "item.completed") return;
+  const item = event.item;
+  const turn = () => ops.openAgentTurn(record);
+  switch (item.type) {
+    case "agent_message": {
+      const text = item.text.trim();
+      if (text)
+        turn().nodes.push({
+          key: ops.nextKey(record.id),
+          kind: "assistant",
+          text
+        });
+      break;
+    }
+    case "reasoning": {
+      const r = item;
+      const text = (r.text ?? r.summary ?? "").trim();
+      if (text)
+        turn().nodes.push({
+          key: ops.nextKey(record.id),
+          kind: "thinking",
+          text
+        });
+      break;
+    }
+    case "command_execution": {
+      const c = item;
+      turn().nodes.push({
+        key: ops.nextKey(record.id),
+        kind: "tool",
+        name: "Bash",
+        input: { command: c.command },
+        summary: oneLine(c.command, 100),
+        result: (c.aggregated_output ?? "").trim() || "(no output)",
+        isError: typeof c.exit_code === "number" && c.exit_code !== 0,
+        startedAt: record.created_at,
+        completedAt: record.created_at
+      });
+      break;
+    }
+    case "file_change": {
+      const paths = codexChangedPaths(item);
+      turn().nodes.push({
+        key: ops.nextKey(record.id),
+        kind: "tool",
+        name: "Edit",
+        input: null,
+        summary: paths.length ? oneLine(paths.join(", "), 100) : "",
+        result: null,
+        isError: false,
+        startedAt: record.created_at,
+        completedAt: record.created_at
+      });
+      break;
+    }
+    case "mcp_tool_call":
+      turn().nodes.push({
+        key: ops.nextKey(record.id),
+        kind: "tool",
+        name: codexMcpToolName(item),
+        input: null,
+        summary: "",
+        result: null,
+        isError: false,
+        startedAt: record.created_at,
+        completedAt: record.created_at
+      });
+      break;
+    case "web_search": {
+      const query = item.query;
+      turn().nodes.push({
+        key: ops.nextKey(record.id),
+        kind: "tool",
+        name: "WebSearch",
+        input: query ? { query } : null,
+        summary: query ? oneLine(query, 100) : "",
+        result: null,
+        isError: false,
+        startedAt: record.created_at,
+        completedAt: record.created_at
+      });
+      break;
+    }
+  }
+}
 
 // src/store/index.ts
 var TERMINAL_SESSION_STATUSES = /* @__PURE__ */ new Set([
@@ -791,10 +962,12 @@ var SessionTranscriptStore = class {
   };
 };
 export {
-  LineBuffer,
   SessionTranscriptStore,
   cacheTierLabel,
   clampLines,
+  codexChangedPaths,
+  codexEventToItems,
+  codexMcpToolName,
   collapseToolRuns,
   emptySessionTranscriptSnapshot,
   eventToItems,
@@ -805,7 +978,6 @@ export {
   isConversationOver,
   lifecycleText,
   oneLine,
-  parseEventLine,
   pendingToolCalls,
   recordToItems,
   resultCostUsd,
@@ -814,5 +986,6 @@ export {
   sandboxOutputStep,
   sandboxPhaseLabel,
   statusActivityText,
-  summarizeToolInput
+  summarizeToolInput,
+  toolResultText
 };

package/dist/stream/index.d.ts

@@ -1,4 +1,4 @@
-import { X as StreamFrame, r as Session } from '../types-egqnpL5C.js';
+import { a7 as StreamFrame, K as Session } from '../types-D9g-eZui.js';
 
 declare const SESSION_STREAM_PROTOCOL_VERSION = 3;
 declare const WS_CLOSE_NORMAL = 1000;