@tryarcanist/cli 0.1.6 → 0.1.8

package/dist/index.js

@@ -219,151 +219,285 @@ async function stopCommand(sessionId) {
   }
 }
 
-// src/utils/session-output.ts
+// ../../shared/transcript/projector.ts
+var DUPLICATE_TEXT_DELTA_MIN_CHARS = 24;
+var RAW_OPENCODE_NOISE = /* @__PURE__ */ new Set([
+  "session.updated",
+  "session.diff",
+  "server.heartbeat",
+  "session.idle",
+  "lsp.updated",
+  "lsp.client.diagnostics"
+]);
+function shouldAppendTextDelta(existingText, incomingText) {
+  if (!incomingText) return false;
+  if (incomingText.length < DUPLICATE_TEXT_DELTA_MIN_CHARS) return true;
+  return !existingText.endsWith(incomingText);
+}
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function resolveEventId(data, prefix, index) {
+  return typeof data?.id === "string" ? data.id : `${prefix}-${index}`;
+}
+function resolveTextValue(data) {
+  const text = data?.text;
+  if (typeof text === "string") return text;
+  const content = data?.content;
+  return typeof content === "string" ? content : "";
+}
+function resolvePromptId(data) {
+  return typeof data?.promptId === "string" ? data.promptId : void 0;
+}
+function mergeToolCall(previous, incoming) {
+  return {
+    ...incoming,
+    ...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 } : {},
+    ...incoming.truncated === void 0 && previous.truncated !== void 0 ? { truncated: previous.truncated } : {},
+    ...incoming.inputEstimatedTokens === void 0 && previous.inputEstimatedTokens !== void 0 ? { inputEstimatedTokens: previous.inputEstimatedTokens } : {},
+    ...incoming.outputEstimatedTokens === void 0 && previous.outputEstimatedTokens !== void 0 ? { outputEstimatedTokens: previous.outputEstimatedTokens } : {},
+    ...incoming.outputChars === void 0 && previous.outputChars !== void 0 ? { outputChars: previous.outputChars } : {},
+    ...incoming.duplicateCount === void 0 && previous.duplicateCount !== void 0 ? { duplicateCount: previous.duplicateCount } : {}
+  };
+}
+function normalizeToolStatus(value) {
+  return value === "running" || value === "completed" || value === "error" ? value : void 0;
+}
 function flattenSessionEvents(raw) {
   const merged = [];
   const streamableIndexById = /* @__PURE__ */ new Map();
   const toolCallIndexById = /* @__PURE__ */ new Map();
+  const questionIndexById = /* @__PURE__ */ new Map();
   for (const event of raw) {
-    const data = event.data ?? {};
+    const data = isRecord(event.data) ? event.data : void 0;
     if (event.type === "sandbox_compaction_start") {
-      const entry2 = { type: "compaction_start", id: `cs-${data.timestamp ?? merged.length}` };
-      if (data.contextTokens != null) entry2.contextTokens = data.contextTokens;
-      merged.push(entry2);
+      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 (event.type === "sandbox_compaction_complete") {
-      const entry2 = { type: "compaction_complete", id: `cc-${data.timestamp ?? merged.length}` };
-      if (data.contextTokensBefore != null) entry2.contextTokensBefore = data.contextTokensBefore;
-      if (data.contextTokensAfter != null) entry2.contextTokensAfter = data.contextTokensAfter;
-      merged.push(entry2);
+      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 (event.type === "sandbox_context_fill_warning") {
-      const entry2 = {
+      merged.push({
         type: "context_fill_warning",
-        id: `cfw-${data.timestamp ?? merged.length}`,
-        fillPercent: Number(data.fillPercent ?? 0)
-      };
-      if (data.contextTokens != null) entry2.contextTokens = data.contextTokens;
-      if (data.contextWindow != null) entry2.contextWindow = data.contextWindow;
-      merged.push(entry2);
+        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 (event.type === "sandbox_tool_truncated") {
       merged.push({
         type: "tool_truncated",
-        id: String(data.callId ?? merged.length),
-        tool: String(data.tool ?? "")
+        id: typeof data?.callId === "string" ? data.callId : String(merged.length),
+        tool: typeof data?.tool === "string" ? data.tool : "",
+        ...resolvePromptId(data) ? { promptId: resolvePromptId(data) } : {}
+      });
+      continue;
+    }
+    if (event.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 } : {}
       });
       continue;
     }
     if (event.type === "branch_changed") {
-      merged.push({ type: "branch_changed", id: `bc-${data.timestamp ?? merged.length}`, branch: String(data.branch ?? "") });
+      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 (event.type === "session_error") {
-      const entry2 = {
+      merged.push({
         type: "session_error",
-        id: String(data.id ?? `err-${merged.length}`),
-        error: String(data.error ?? "Unknown error")
-      };
-      if (data.code) entry2.code = String(data.code);
-      merged.push(entry2);
+        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 (event.type === "raw_opencode") {
-      merged.push({ type: "raw_opencode", id: String(data.id ?? `raw-${merged.length}`), data });
+      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 (event.type === "reasoning") {
-      const id = String(data.id ?? `reasoning-${merged.length}`);
-      const text = String(data.text ?? "");
+      const id = resolveEventId(data, "reasoning", merged.length);
+      const text = resolveTextValue(data);
+      const promptId = resolvePromptId(data);
       const existingIdx = streamableIndexById.get(id);
       if (existingIdx !== void 0) {
         const existing = merged[existingIdx];
-        if (existing.type === "reasoning") existing.text += text;
+        if (existing.type === "reasoning" && shouldAppendTextDelta(existing.text, text)) {
+          existing.text += text;
+          if (!existing.promptId && promptId) existing.promptId = promptId;
+        }
       } else {
         streamableIndexById.set(id, merged.length);
-        merged.push({ type: "reasoning", id, text });
+        merged.push({
+          type: "reasoning",
+          id,
+          text,
+          ...promptId ? { promptId } : {}
+        });
       }
       continue;
     }
     if (event.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 });
+      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 (event.type === "todo_update") {
-      const todos = Array.isArray(data.todos) ? data.todos : [];
+      const todos = Array.isArray(data?.todos) ? data.todos : [];
       if (todos.length > 0) {
-        for (let i = merged.length - 1; i >= 0; i--) {
-          const existing = merged[i];
+        for (let index = merged.length - 1; index >= 0; index--) {
+          const existing = merged[index];
           if (existing.type === "tool_call" && existing.tool.toLowerCase() === "todowrite") {
-            existing.input = { ...existing.input, todos };
+            merged[index] = { ...existing, input: { ...existing.input, todos } };
             break;
           }
         }
       }
       continue;
     }
+    if (event.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 (event.type !== "text" && event.type !== "tool_call" && event.type !== "tool_update" && event.type !== "question") {
       continue;
     }
     if (event.type === "text") {
-      const id = String(data.id ?? `text-${merged.length}`);
-      const text = String(data.text ?? "");
+      const id = resolveEventId(data, "text", merged.length);
+      const text = resolveTextValue(data);
+      const promptId = resolvePromptId(data);
       const existingIdx = streamableIndexById.get(id);
       if (existingIdx !== void 0) {
         const existing = merged[existingIdx];
-        if (existing.type === "text") existing.text += text;
+        if (existing.type === "text" && shouldAppendTextDelta(existing.text, text)) {
+          existing.text += text;
+          if (!existing.promptId && promptId) existing.promptId = promptId;
+        }
       } else {
         streamableIndexById.set(id, merged.length);
-        merged.push({ type: "text", id, text });
+        merged.push({
+          type: "text",
+          id,
+          text,
+          ...promptId ? { promptId } : {}
+        });
       }
       continue;
     }
     if (event.type === "tool_call") {
-      const id = String(data.id ?? `tool-${merged.length}`);
-      const entry2 = {
+      const id = resolveEventId(data, "tool", merged.length);
+      const nextEntry = {
         type: "tool_call",
         id,
-        tool: String(data.tool ?? "unknown"),
-        summary: String(data.summary ?? "")
+        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) } : {},
+        ...isRecord(data?.input) ? { input: data.input } : {},
+        ...normalizeToolStatus(data?.toolStatus) ? { toolStatus: normalizeToolStatus(data?.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 } : {}
       };
-      if (data.input && typeof data.input === "object") entry2.input = data.input;
       const existingIdx = toolCallIndexById.get(id);
       if (existingIdx !== void 0) {
-        const prev = merged[existingIdx];
-        if (prev.type === "tool_call") {
-          if (prev.toolStatus) entry2.toolStatus = prev.toolStatus;
-          merged[existingIdx] = entry2;
+        const previous = merged[existingIdx];
+        if (previous.type === "tool_call") {
+          merged[existingIdx] = mergeToolCall(previous, nextEntry);
         }
       } else {
         toolCallIndexById.set(id, merged.length);
-        merged.push(entry2);
+        merged.push(nextEntry);
       }
       continue;
     }
     if (event.type === "tool_update") {
-      const id = String(data.id ?? "");
+      const id = typeof data?.id === "string" ? data.id : "";
       const existingIdx = toolCallIndexById.get(id);
       if (existingIdx !== void 0) {
-        const prev = merged[existingIdx];
-        if (prev.type === "tool_call" && data.status) {
-          prev.toolStatus = String(data.status);
+        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 entry = {
+    const question = {
       type: "question",
-      id: String(data.id ?? `question-${merged.length}`),
-      question: String(data.question ?? ""),
-      answer: data.answer == null ? null : String(data.answer)
+      id: resolveEventId(data, "question", 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 } : {}
     };
-    if (Array.isArray(data.options)) entry.options = data.options;
-    merged.push(entry);
+    questionIndexById.set(question.id, merged.length);
+    merged.push(question);
   }
   return merged;
 }
@@ -372,17 +506,39 @@ function partitionEventsByPrompt(allEvents, promptIds) {
   const buckets = new Map(promptIds.map((id) => [id, []]));
   let currentPromptId = null;
   for (const event of allEvents) {
+    const explicitPromptId = typeof event.data?.promptId === "string" && promptSet.has(event.data.promptId) ? event.data.promptId : null;
     if (event.type === "prompt_processing") {
-      const promptId = typeof event.data?.promptId === "string" ? event.data.promptId : null;
-      currentPromptId = promptId && promptSet.has(promptId) ? promptId : null;
+      currentPromptId = explicitPromptId;
     }
-    if (currentPromptId) {
-      const bucket = buckets.get(currentPromptId);
+    const targetPromptId = explicitPromptId ?? currentPromptId;
+    if (targetPromptId) {
+      const bucket = buckets.get(targetPromptId);
       if (bucket) bucket.push(event);
     }
   }
   return buckets;
 }
+function getEmbeddedTerminalHistory(raw) {
+  for (let index = raw.length - 1; index >= 0; index--) {
+    const event = raw[index];
+    if (event.type !== "prompt_completed" && event.type !== "prompt_failed") continue;
+    const history = event.data?.history;
+    if (!Array.isArray(history) || history.length === 0) return null;
+    return history;
+  }
+  return null;
+}
+function resolveAuthoritativePromptEvents(raw) {
+  return getEmbeddedTerminalHistory(raw) ?? raw;
+}
+
+// src/utils/session-output.ts
+function flattenSessionEvents2(raw) {
+  return flattenSessionEvents(raw);
+}
+function partitionEventsByPrompt2(allEvents, promptIds) {
+  return partitionEventsByPrompt(allEvents, promptIds);
+}
 function formatDate(value) {
   const date = new Date(value);
   if (Number.isNaN(date.getTime())) return value;
@@ -408,6 +564,9 @@ ${event.text}
       return `**Question:** ${event.question}
 ${event.answer ? `**Answer:** ${event.answer}
 ` : ""}`;
+    case "retry_status":
+      return `*[retry ${event.attempt}: ${event.message}]*
+`;
     case "compaction_start":
       return event.contextTokens ? `*[compacting context at ${Math.round(event.contextTokens / 1e3)}k tokens]*
 ` : "*[compacting context]*\n";
@@ -440,7 +599,7 @@ function formatNumber(value) {
 function renderSessionTranscript(exportData) {
   const lines = [];
   const promptIds = exportData.prompts.map((prompt) => prompt.id);
-  const eventBuckets = partitionEventsByPrompt(exportData.events, promptIds);
+  const eventBuckets = partitionEventsByPrompt2(exportData.events, promptIds);
   lines.push("# Session transcript\n");
   if (exportData.session.repoUrl) lines.push(`**Repo:** ${exportData.session.repoUrl}  `);
   lines.push(`**Session:** ${exportData.session.id.slice(0, 8)}  `);
@@ -454,7 +613,7 @@ function renderSessionTranscript(exportData) {
   for (let i = 0; i < exportData.prompts.length; i++) {
     const prompt = exportData.prompts[i];
     const rawEvents = eventBuckets.get(prompt.id) ?? [];
-    const events = flattenSessionEvents(rawEvents);
+    const events = flattenSessionEvents2(resolveAuthoritativePromptEvents(rawEvents));
     lines.push("---\n");
     lines.push(`## Turn ${i + 1}
 `);

package/package.json

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