@tryarcanist/cli 0.1.45 → 0.1.46

package/dist/index.js

@@ -717,6 +717,13 @@ function shouldAppendTextDelta(existingText, incomingText) {
   if (incomingText.length < DUPLICATE_TEXT_DELTA_MIN_CHARS) return true;
   return !existingText.endsWith(incomingText);
 }
+function createStreamCoalescerState() {
+  return {
+    streamableIndexById: /* @__PURE__ */ new Map(),
+    segmentOrdinalByStreamId: /* @__PURE__ */ new Map(),
+    concatByStreamId: /* @__PURE__ */ new Map()
+  };
+}
 function streamableKey(type, streamId) {
   return `${type}:${streamId}`;
 }
@@ -735,9 +742,51 @@ function resolveTextValue(data) {
 function resolvePromptId(data) {
   return typeof data?.promptId === "string" ? data.promptId : void 0;
 }
+function coalesceStreamDelta(events, state, type, streamId, text, promptId) {
+  const key = streamableKey(type, streamId);
+  const existingText = state.concatByStreamId.get(key) ?? "";
+  const existingIdx = state.streamableIndexById.get(key);
+  if (existingIdx !== void 0 && existingIdx === events.length - 1) {
+    const existing = events[existingIdx];
+    if (existing.type === type && shouldAppendTextDelta(existingText, text)) {
+      existing.text += text;
+      state.concatByStreamId.set(key, existingText + text);
+      if (!existing.promptId && promptId) existing.promptId = promptId;
+      return true;
+    }
+    return false;
+  }
+  if (existingText && !shouldAppendTextDelta(existingText, text)) return false;
+  const previousOrdinal = state.segmentOrdinalByStreamId.get(key);
+  const segmentOrdinal = previousOrdinal === void 0 ? 0 : previousOrdinal + 1;
+  state.segmentOrdinalByStreamId.set(key, segmentOrdinal);
+  state.streamableIndexById.set(key, events.length);
+  state.concatByStreamId.set(key, existingText + text);
+  if (type === "text") {
+    events.push({
+      type: "text",
+      id: resolveSegmentId(streamId, segmentOrdinal),
+      ...segmentOrdinal > 0 ? { streamId } : {},
+      text,
+      ...promptId ? { promptId } : {}
+    });
+  } else {
+    events.push({
+      type: "reasoning",
+      id: resolveSegmentId(streamId, segmentOrdinal),
+      ...segmentOrdinal > 0 ? { streamId } : {},
+      text,
+      ...promptId ? { promptId } : {}
+    });
+  }
+  return true;
+}
 function mergeToolCall(previous, incoming) {
   return {
+    ...previous,
     ...incoming,
+    tool: incoming.tool ?? previous.tool,
+    summary: incoming.summary ?? previous.summary,
     ...incoming.promptId === void 0 && previous.promptId !== void 0 ? { promptId: previous.promptId } : {},
     ...incoming.input === void 0 && previous.input !== void 0 ? { input: previous.input } : {},
     ...incoming.toolStatus === void 0 && previous.toolStatus !== void 0 ? { toolStatus: previous.toolStatus } : {},
@@ -751,291 +800,302 @@ function mergeToolCall(previous, incoming) {
 function normalizeToolStatus(value) {
   return value === "running" || value === "completed" || value === "error" ? value : void 0;
 }
-function flattenSessionEvents(raw) {
-  const merged = [];
-  const streamableIndexById = /* @__PURE__ */ new Map();
-  const segmentOrdinalByStreamId = /* @__PURE__ */ new Map();
-  const concatByStreamId = /* @__PURE__ */ new Map();
-  const toolCallIndexById = /* @__PURE__ */ new Map();
-  const questionIndexById = /* @__PURE__ */ new Map();
-  for (const event of raw) {
-    const normalized = normalizeRawSessionEvent(event);
-    const { type } = normalized;
-    const data = normalized.data;
-    if (type === "sandbox_compaction_start") {
-      merged.push({
-        type: "compaction_start",
-        id: `cs-${data?.timestamp ?? merged.length}`,
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        ...typeof data?.contextTokens === "number" ? { contextTokens: data.contextTokens } : {}
-      });
-      continue;
-    }
-    if (type === "sandbox_compaction_complete") {
-      merged.push({
-        type: "compaction_complete",
-        id: `cc-${data?.timestamp ?? merged.length}`,
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        ...typeof data?.contextTokensBefore === "number" ? { contextTokensBefore: data.contextTokensBefore } : {},
-        ...typeof data?.contextTokensAfter === "number" ? { contextTokensAfter: data.contextTokensAfter } : {}
-      });
-      continue;
-    }
-    if (type === "sandbox_context_fill_warning") {
-      merged.push({
-        type: "context_fill_warning",
-        id: `cfw-${data?.timestamp ?? merged.length}`,
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        fillPercent: typeof data?.fillPercent === "number" ? data.fillPercent : Number(data?.fillPercent ?? 0),
-        ...typeof data?.contextTokens === "number" ? { contextTokens: data.contextTokens } : {},
-        ...typeof data?.contextWindow === "number" ? { contextWindow: data.contextWindow } : {}
-      });
-      continue;
-    }
-    if (type === "sandbox_tool_truncated") {
-      merged.push({
-        type: "tool_truncated",
-        id: typeof data?.callId === "string" ? data.callId : String(merged.length),
-        tool: typeof data?.tool === "string" ? data.tool : "",
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
-      });
-      continue;
-    }
-    if (type === "retry_status") {
-      merged.push({
-        type: "retry_status",
-        id: `rs-${data?.timestamp ?? merged.length}`,
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        attempt: typeof data?.attempt === "number" ? data.attempt : Number(data?.attempt ?? 0),
-        message: typeof data?.message === "string" ? data.message : "Retrying...",
-        ...typeof data?.nextRetryAt === "string" ? { nextRetryAt: data.nextRetryAt } : {},
-        ...typeof data?.provider === "string" ? { provider: data.provider } : {},
-        ...typeof data?.errorCode === "string" ? { errorCode: data.errorCode } : {},
-        ...typeof data?.scope === "string" ? { scope: data.scope } : {},
-        ...typeof data?.maxAttempts === "number" ? { maxAttempts: data.maxAttempts } : {},
-        ...typeof data?.reason === "string" ? { reason: data.reason } : {},
-        ...typeof data?.retryAfterMs === "number" ? { retryAfterMs: data.retryAfterMs } : {}
-      });
-      continue;
-    }
-    if (type === "branch_changed") {
-      merged.push({
-        type: "branch_changed",
-        id: `bc-${data?.timestamp ?? merged.length}`,
-        branch: typeof data?.branch === "string" ? data.branch : "",
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
-      });
-      continue;
-    }
-    if (type === "agent_timeline") {
-      merged.push({
-        type: "agent_timeline",
-        id: `atl-${merged.length}-${typeof data?.eventType === "string" ? data.eventType : "unknown"}`,
-        eventType: typeof data?.eventType === "string" ? data.eventType : "unknown",
-        source: typeof data?.source === "string" ? data.source : "observed",
-        observer: typeof data?.observer === "string" ? data.observer : "unknown",
-        summary: typeof data?.summary === "string" ? data.summary : "Observed agent timeline event.",
-        ...typeof data?.status === "string" ? { status: data.status } : {},
-        ...isRecord(data?.metadata) ? { metadata: data.metadata } : {},
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
-      });
-      continue;
-    }
-    if (type === "session_error") {
-      merged.push({
-        type: "session_error",
-        id: resolveEventId(data, "err", merged.length),
-        error: typeof data?.error === "string" ? data.error : "Unknown error",
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        ...typeof data?.code === "string" ? { code: data.code } : {}
-      });
-      continue;
-    }
-    if (type === "session_resumed_cold") {
-      merged.push({
-        type: "session_resumed_cold",
-        id: resolveEventId(data, "rescold", merged.length),
-        ...typeof data?.reason === "string" ? { reason: data.reason } : {},
-        ...typeof data?.lostSnapshotImageId === "string" ? { lostSnapshotImageId: data.lostSnapshotImageId } : data?.lostSnapshotImageId === null ? { lostSnapshotImageId: null } : {},
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
-      });
-      continue;
-    }
-    if (type === "raw_opencode") {
-      const partType = typeof data?.partType === "string" ? data.partType : void 0;
-      const eventType = typeof data?.eventType === "string" ? data.eventType : void 0;
-      if (partType === "text") continue;
-      if (eventType && RAW_OPENCODE_NOISE.has(eventType)) continue;
-      merged.push({
-        type: "raw_opencode",
-        id: resolveEventId(data, "raw", merged.length),
-        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        ...partType ? { partType } : {},
-        ...eventType ? { eventType } : {},
-        data: data ?? {}
-      });
-      continue;
-    }
-    if (type === "reasoning") {
-      const streamId = resolveEventId(data, "reasoning", merged.length);
-      const key = streamableKey("reasoning", streamId);
-      const text = resolveTextValue(data);
-      const promptId = resolvePromptId(data);
-      const existingText = concatByStreamId.get(key) ?? "";
-      const existingIdx = streamableIndexById.get(key);
-      if (existingIdx !== void 0 && existingIdx === merged.length - 1) {
-        const existing = merged[existingIdx];
-        if (existing.type === "reasoning" && shouldAppendTextDelta(existingText, text)) {
-          existing.text += text;
-          concatByStreamId.set(key, existingText + text);
-          if (!existing.promptId && promptId) existing.promptId = promptId;
-        }
-      } else {
-        if (existingText && !shouldAppendTextDelta(existingText, text)) continue;
-        const previousOrdinal = segmentOrdinalByStreamId.get(key);
-        const segmentOrdinal = previousOrdinal === void 0 ? 0 : previousOrdinal + 1;
-        segmentOrdinalByStreamId.set(key, segmentOrdinal);
-        streamableIndexById.set(key, merged.length);
-        concatByStreamId.set(key, existingText + text);
-        merged.push({
-          type: "reasoning",
-          id: resolveSegmentId(streamId, segmentOrdinal),
-          ...segmentOrdinal > 0 ? { streamId } : {},
-          text,
-          ...promptId ? { promptId } : {}
-        });
-      }
-      continue;
-    }
-    if (type === "patch") {
-      const files = Array.isArray(data?.files) ? data.files.filter((item) => typeof item === "string") : [];
-      if (files.length > 0) {
-        merged.push({ type: "patch", id: `patch-${merged.length}`, files });
-        if (resolvePromptId(data)) {
-          const last = merged[merged.length - 1];
-          if (last?.type === "patch") last.promptId = resolvePromptId(data);
-        }
-      }
-      continue;
-    }
-    if (type === "todo_update") {
-      const todos = Array.isArray(data?.todos) ? data.todos : [];
-      if (todos.length > 0) {
-        for (let index = merged.length - 1; index >= 0; index--) {
-          const existing = merged[index];
-          if (existing.type === "tool_call" && existing.tool.toLowerCase() === "todowrite") {
-            merged[index] = { ...existing, input: { ...existing.input, todos } };
-            break;
-          }
-        }
-      }
-      continue;
-    }
-    if (type === "answer") {
-      const questionId = typeof data?.id === "string" ? data.id : void 0;
-      if (!questionId) continue;
-      const existingIdx = questionIndexById.get(questionId);
-      if (existingIdx !== void 0) {
-        const existing = merged[existingIdx];
-        if (existing?.type === "question") {
-          merged[existingIdx] = {
-            ...existing,
-            answer: data?.answer == null ? null : String(data.answer)
-          };
-        }
-      }
-      continue;
-    }
-    if (type !== "text" && type !== "tool_call" && type !== "tool_update" && type !== "question") {
-      continue;
-    }
-    if (type === "text") {
-      const streamId = resolveEventId(data, "text", merged.length);
-      const key = streamableKey("text", streamId);
-      const text = resolveTextValue(data);
-      const promptId = resolvePromptId(data);
-      const existingText = concatByStreamId.get(key) ?? "";
-      const existingIdx = streamableIndexById.get(key);
-      if (existingIdx !== void 0 && existingIdx === merged.length - 1) {
-        const existing = merged[existingIdx];
-        if (existing.type === "text" && shouldAppendTextDelta(existingText, text)) {
-          existing.text += text;
-          concatByStreamId.set(key, existingText + text);
-          if (!existing.promptId && promptId) existing.promptId = promptId;
-        }
-      } else {
-        if (existingText && !shouldAppendTextDelta(existingText, text)) continue;
-        const previousOrdinal = segmentOrdinalByStreamId.get(key);
-        const segmentOrdinal = previousOrdinal === void 0 ? 0 : previousOrdinal + 1;
-        segmentOrdinalByStreamId.set(key, segmentOrdinal);
-        streamableIndexById.set(key, merged.length);
-        concatByStreamId.set(key, existingText + text);
-        merged.push({
-          type: "text",
-          id: resolveSegmentId(streamId, segmentOrdinal),
-          ...segmentOrdinal > 0 ? { streamId } : {},
-          text,
-          ...promptId ? { promptId } : {}
-        });
-      }
-      continue;
-    }
-    if (type === "tool_call") {
-      const id = resolveEventId(data, "tool", merged.length);
+function applyToolCallUpdate(previous, data) {
+  const toolStatus = normalizeToolStatus(data?.status);
+  return {
+    ...previous,
+    ...toolStatus ? { toolStatus } : {},
+    ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
+    ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {},
+    ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {}
+  };
+}
+function createFlattenState() {
+  return {
+    merged: [],
+    streams: createStreamCoalescerState(),
+    toolCallIndexById: /* @__PURE__ */ new Map(),
+    questionIndexById: /* @__PURE__ */ new Map()
+  };
+}
+function pushEvent(state, event) {
+  if (event) state.merged.push(event);
+}
+function projectCompactionStart(data, index) {
+  return {
+    type: "compaction_start",
+    id: `cs-${data?.timestamp ?? index}`,
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    ...typeof data?.contextTokens === "number" ? { contextTokens: data.contextTokens } : {}
+  };
+}
+function projectCompactionComplete(data, index) {
+  return {
+    type: "compaction_complete",
+    id: `cc-${data?.timestamp ?? index}`,
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    ...typeof data?.contextTokensBefore === "number" ? { contextTokensBefore: data.contextTokensBefore } : {},
+    ...typeof data?.contextTokensAfter === "number" ? { contextTokensAfter: data.contextTokensAfter } : {}
+  };
+}
+function projectContextFillWarning(data, index) {
+  return {
+    type: "context_fill_warning",
+    id: `cfw-${data?.timestamp ?? index}`,
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    fillPercent: typeof data?.fillPercent === "number" ? data.fillPercent : Number(data?.fillPercent ?? 0),
+    ...typeof data?.contextTokens === "number" ? { contextTokens: data.contextTokens } : {},
+    ...typeof data?.contextWindow === "number" ? { contextWindow: data.contextWindow } : {}
+  };
+}
+function projectToolTruncated(data, index) {
+  return {
+    type: "tool_truncated",
+    id: typeof data?.callId === "string" ? data.callId : String(index),
+    tool: typeof data?.tool === "string" ? data.tool : "",
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+  };
+}
+function projectRetryStatus(data, index) {
+  return {
+    type: "retry_status",
+    id: `rs-${data?.timestamp ?? index}`,
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    attempt: typeof data?.attempt === "number" ? data.attempt : Number(data?.attempt ?? 0),
+    message: typeof data?.message === "string" ? data.message : "Retrying...",
+    ...typeof data?.nextRetryAt === "string" ? { nextRetryAt: data.nextRetryAt } : {},
+    ...typeof data?.provider === "string" ? { provider: data.provider } : {},
+    ...typeof data?.errorCode === "string" ? { errorCode: data.errorCode } : {},
+    ...typeof data?.scope === "string" ? { scope: data.scope } : {},
+    ...typeof data?.maxAttempts === "number" ? { maxAttempts: data.maxAttempts } : {},
+    ...typeof data?.reason === "string" ? { reason: data.reason } : {},
+    ...typeof data?.retryAfterMs === "number" ? { retryAfterMs: data.retryAfterMs } : {}
+  };
+}
+function projectBranchChanged(data, index) {
+  return {
+    type: "branch_changed",
+    id: `bc-${data?.timestamp ?? index}`,
+    branch: typeof data?.branch === "string" ? data.branch : "",
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+  };
+}
+function projectAgentTimeline(data, index) {
+  return {
+    type: "agent_timeline",
+    id: `atl-${index}-${typeof data?.eventType === "string" ? data.eventType : "unknown"}`,
+    eventType: typeof data?.eventType === "string" ? data.eventType : "unknown",
+    source: typeof data?.source === "string" ? data.source : "observed",
+    observer: typeof data?.observer === "string" ? data.observer : "unknown",
+    summary: typeof data?.summary === "string" ? data.summary : "Observed agent timeline event.",
+    ...typeof data?.status === "string" ? { status: data.status } : {},
+    ...isRecord(data?.metadata) ? { metadata: data.metadata } : {},
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+  };
+}
+function projectSessionError(data, index) {
+  return {
+    type: "session_error",
+    id: resolveEventId(data, "err", index),
+    error: typeof data?.error === "string" ? data.error : "Unknown error",
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    ...typeof data?.code === "string" ? { code: data.code } : {}
+  };
+}
+function projectSessionResumedCold(data, index) {
+  return {
+    type: "session_resumed_cold",
+    id: resolveEventId(data, "rescold", index),
+    ...typeof data?.reason === "string" ? { reason: data.reason } : {},
+    ...typeof data?.lostSnapshotImageId === "string" ? { lostSnapshotImageId: data.lostSnapshotImageId } : data?.lostSnapshotImageId === null ? { lostSnapshotImageId: null } : {},
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+  };
+}
+function projectRawOpencode(data, index) {
+  const partType = typeof data?.partType === "string" ? data.partType : void 0;
+  const eventType = typeof data?.eventType === "string" ? data.eventType : void 0;
+  if (partType === "text") return null;
+  if (eventType && RAW_OPENCODE_NOISE.has(eventType)) return null;
+  return {
+    type: "raw_opencode",
+    id: resolveEventId(data, "raw", index),
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    ...partType ? { partType } : {},
+    ...eventType ? { eventType } : {},
+    data: data ?? {}
+  };
+}
+function projectPatch(data, index) {
+  const files = Array.isArray(data?.files) ? data.files.filter((item) => typeof item === "string") : [];
+  if (files.length === 0) return null;
+  return {
+    type: "patch",
+    id: `patch-${index}`,
+    files,
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+  };
+}
+function projectStream(type, data, state) {
+  coalesceStreamDelta(
+    state.merged,
+    state.streams,
+    type,
+    resolveEventId(data, type, state.merged.length),
+    resolveTextValue(data),
+    resolvePromptId(data)
+  );
+}
+function projectToolCall(data, state) {
+  const id = resolveEventId(data, "tool", state.merged.length);
+  const existingIdx = state.toolCallIndexById.get(id);
+  if (existingIdx !== void 0) {
+    const previous = state.merged[existingIdx];
+    if (previous.type === "tool_call") {
+      const toolStatus = normalizeToolStatus(data?.toolStatus);
+      const input = isRecord(data?.input) ? data.input : void 0;
       const nextEntry = {
         type: "tool_call",
         id,
-        tool: typeof data?.tool === "string" ? data.tool : typeof data?.toolName === "string" ? data.toolName : "unknown",
-        summary: typeof data?.summary === "string" ? data.summary : "",
+        ...typeof data?.tool === "string" ? { tool: data.tool } : typeof data?.toolName === "string" ? { tool: data.toolName } : {},
+        ...typeof data?.summary === "string" && data.summary.length > 0 ? { summary: data.summary } : {},
         ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-        ...isRecord(data?.input) ? { input: data.input } : {},
-        ...normalizeToolStatus(data?.toolStatus) ? { toolStatus: normalizeToolStatus(data?.toolStatus) } : {},
+        ...input && Object.keys(input).length > 0 ? { input } : {},
+        ...toolStatus ? { toolStatus } : {},
         ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {},
         ...typeof data?.inputEstimatedTokens === "number" ? { inputEstimatedTokens: data.inputEstimatedTokens } : {},
         ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
         ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {}
       };
-      const existingIdx = toolCallIndexById.get(id);
-      if (existingIdx !== void 0) {
-        const previous = merged[existingIdx];
-        if (previous.type === "tool_call") {
-          merged[existingIdx] = mergeToolCall(previous, nextEntry);
-        }
-      } else {
-        toolCallIndexById.set(id, merged.length);
-        merged.push(nextEntry);
-      }
-      continue;
+      state.merged[existingIdx] = mergeToolCall(previous, nextEntry);
     }
-    if (type === "tool_update") {
-      const id = typeof data?.id === "string" ? data.id : "";
-      const existingIdx = toolCallIndexById.get(id);
-      if (existingIdx !== void 0) {
-        const previous = merged[existingIdx];
-        if (previous.type === "tool_call") {
-          merged[existingIdx] = {
-            ...previous,
-            ...normalizeToolStatus(data?.status) ? { toolStatus: normalizeToolStatus(data?.status) } : {},
-            ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
-            ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {},
-            ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {}
-          };
-        }
-      }
-      continue;
-    }
-    const question = {
-      type: "question",
-      id: resolveEventId(data, "question", merged.length),
-      question: typeof data?.question === "string" ? data.question : "",
-      answer: data?.answer == null ? null : String(data.answer),
+  } else {
+    const toolStatus = normalizeToolStatus(data?.toolStatus);
+    const nextEntry = {
+      type: "tool_call",
+      id,
+      tool: typeof data?.tool === "string" ? data.tool : typeof data?.toolName === "string" ? data.toolName : "unknown",
+      summary: typeof data?.summary === "string" ? data.summary : "",
       ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
-      ...Array.isArray(data?.options) ? { options: data.options } : {}
+      ...isRecord(data?.input) ? { input: data.input } : {},
+      ...toolStatus ? { toolStatus } : {},
+      ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {},
+      ...typeof data?.inputEstimatedTokens === "number" ? { inputEstimatedTokens: data.inputEstimatedTokens } : {},
+      ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
+      ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {}
     };
-    questionIndexById.set(question.id, merged.length);
-    merged.push(question);
+    state.toolCallIndexById.set(id, state.merged.length);
+    state.merged.push(nextEntry);
+  }
+}
+function projectToolUpdate(data, state) {
+  const id = typeof data?.id === "string" ? data.id : "";
+  const existingIdx = state.toolCallIndexById.get(id);
+  if (existingIdx === void 0) return;
+  const previous = state.merged[existingIdx];
+  if (previous.type === "tool_call") {
+    state.merged[existingIdx] = applyToolCallUpdate(previous, data);
+  }
+}
+function projectQuestion(data, state) {
+  const question = {
+    type: "question",
+    id: resolveEventId(data, "question", state.merged.length),
+    question: typeof data?.question === "string" ? data.question : "",
+    answer: data?.answer == null ? null : String(data.answer),
+    ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {},
+    ...Array.isArray(data?.options) ? { options: data.options } : {}
+  };
+  state.questionIndexById.set(question.id, state.merged.length);
+  state.merged.push(question);
+}
+function applyAnswer(data, state) {
+  const questionId = typeof data?.id === "string" ? data.id : void 0;
+  if (!questionId) return;
+  const existingIdx = state.questionIndexById.get(questionId);
+  if (existingIdx === void 0) return;
+  const existing = state.merged[existingIdx];
+  if (existing?.type === "question") {
+    state.merged[existingIdx] = {
+      ...existing,
+      answer: data?.answer == null ? null : String(data.answer)
+    };
+  }
+}
+function applyTodoUpdate(data, state) {
+  const todos = Array.isArray(data?.todos) ? data.todos : [];
+  if (todos.length === 0) return;
+  for (let index = state.merged.length - 1; index >= 0; index--) {
+    const existing = state.merged[index];
+    if (existing.type === "tool_call" && existing.tool.toLowerCase() === "todowrite") {
+      state.merged[index] = { ...existing, input: { ...existing.input, todos } };
+      break;
+    }
+  }
+}
+function flattenSessionEvents(raw) {
+  const state = createFlattenState();
+  for (const event of raw) {
+    const normalized = normalizeRawSessionEvent(event);
+    const { type } = normalized;
+    const data = normalized.data;
+    switch (type) {
+      case "sandbox_compaction_start":
+        pushEvent(state, projectCompactionStart(data, state.merged.length));
+        break;
+      case "sandbox_compaction_complete":
+        pushEvent(state, projectCompactionComplete(data, state.merged.length));
+        break;
+      case "sandbox_context_fill_warning":
+        pushEvent(state, projectContextFillWarning(data, state.merged.length));
+        break;
+      case "sandbox_tool_truncated":
+        pushEvent(state, projectToolTruncated(data, state.merged.length));
+        break;
+      case "retry_status":
+        pushEvent(state, projectRetryStatus(data, state.merged.length));
+        break;
+      case "branch_changed":
+        pushEvent(state, projectBranchChanged(data, state.merged.length));
+        break;
+      case "agent_timeline":
+        pushEvent(state, projectAgentTimeline(data, state.merged.length));
+        break;
+      case "session_error":
+        pushEvent(state, projectSessionError(data, state.merged.length));
+        break;
+      case "session_resumed_cold":
+        pushEvent(state, projectSessionResumedCold(data, state.merged.length));
+        break;
+      case "raw_opencode":
+        pushEvent(state, projectRawOpencode(data, state.merged.length));
+        break;
+      case "reasoning":
+        projectStream("reasoning", data, state);
+        break;
+      case "text":
+        projectStream("text", data, state);
+        break;
+      case "patch":
+        pushEvent(state, projectPatch(data, state.merged.length));
+        break;
+      case "todo_update":
+        applyTodoUpdate(data, state);
+        break;
+      case "answer":
+        applyAnswer(data, state);
+        break;
+      case "tool_call":
+        projectToolCall(data, state);
+        break;
+      case "tool_update":
+        projectToolUpdate(data, state);
+        break;
+      case "question":
+        projectQuestion(data, state);
+        break;
+    }
   }
-  return merged;
+  return state.merged;
 }
 function partitionEventsByPrompt(allEvents, promptIds) {
   const promptSet = new Set(promptIds);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryarcanist/cli",
-  "version": "0.1.45",
+  "version": "0.1.46",
   "description": "CLI for Arcanist — create and manage coding agent sessions",
   "type": "module",
   "bin": {