@tryarcanist/cli 0.1.13 → 0.1.14

package/dist/index.js

@@ -427,6 +427,7 @@ async function messageCommand(sessionId, promptArg, options = {}, command) {
 
 // ../../shared/transcript/projector.ts
 var DUPLICATE_TEXT_DELTA_MIN_CHARS = 24;
+var SUBAGENT_EVENT_TYPES = /* @__PURE__ */ new Set(["subagent_start", "subagent_complete", "subagent_tool_call", "subagent_text"]);
 var RAW_OPENCODE_NOISE = /* @__PURE__ */ new Set([
   "session.updated",
   "session.diff",
@@ -440,6 +441,12 @@ function shouldAppendTextDelta(existingText, incomingText) {
   if (incomingText.length < DUPLICATE_TEXT_DELTA_MIN_CHARS) return true;
   return !existingText.endsWith(incomingText);
 }
+function streamableKey(type, streamId) {
+  return `${type}:${streamId}`;
+}
+function resolveSegmentId(streamId, segmentOrdinal) {
+  return segmentOrdinal === 0 ? streamId : `${streamId}#${segmentOrdinal}`;
+}
 function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -474,6 +481,8 @@ function normalizeToolStatus(value) {
 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) {
@@ -526,7 +535,11 @@ function flattenSessionEvents(raw) {
         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?.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;
     }
@@ -565,21 +578,30 @@ function flattenSessionEvents(raw) {
       continue;
     }
     if (event.type === "reasoning") {
-      const id = resolveEventId(data, "reasoning", merged.length);
+      const streamId = resolveEventId(data, "reasoning", merged.length);
+      const key = streamableKey("reasoning", streamId);
       const text = resolveTextValue(data);
       const promptId = resolvePromptId(data);
-      const existingIdx = streamableIndexById.get(id);
-      if (existingIdx !== void 0) {
+      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(existing.text, text)) {
+        if (existing.type === "reasoning" && shouldAppendTextDelta(existingText, text)) {
           existing.text += text;
+          concatByStreamId.set(key, existingText + text);
           if (!existing.promptId && promptId) existing.promptId = promptId;
         }
       } else {
-        streamableIndexById.set(id, merged.length);
+        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,
+          id: resolveSegmentId(streamId, segmentOrdinal),
+          ...segmentOrdinal > 0 ? { streamId } : {},
           text,
           ...promptId ? { promptId } : {}
         });
@@ -629,21 +651,30 @@ function flattenSessionEvents(raw) {
       continue;
     }
     if (event.type === "text") {
-      const id = resolveEventId(data, "text", merged.length);
+      const streamId = resolveEventId(data, "text", merged.length);
+      const key = streamableKey("text", streamId);
       const text = resolveTextValue(data);
       const promptId = resolvePromptId(data);
-      const existingIdx = streamableIndexById.get(id);
-      if (existingIdx !== void 0) {
+      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(existing.text, text)) {
+        if (existing.type === "text" && shouldAppendTextDelta(existingText, text)) {
           existing.text += text;
+          concatByStreamId.set(key, existingText + text);
           if (!existing.promptId && promptId) existing.promptId = promptId;
         }
       } else {
-        streamableIndexById.set(id, merged.length);
+        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,
+          id: resolveSegmentId(streamId, segmentOrdinal),
+          ...segmentOrdinal > 0 ? { streamId } : {},
           text,
           ...promptId ? { promptId } : {}
         });
@@ -737,6 +768,65 @@ function getEmbeddedTerminalHistory(raw) {
 function resolveAuthoritativePromptEvents(raw) {
   return getEmbeddedTerminalHistory(raw) ?? raw;
 }
+function extractSubagentInfo(raw) {
+  const empty = {
+    names: /* @__PURE__ */ new Map(),
+    activity: /* @__PURE__ */ new Map(),
+    toolToChildSessions: /* @__PURE__ */ new Map(),
+    subagentUsage: /* @__PURE__ */ new Map()
+  };
+  if (!raw.some((event) => SUBAGENT_EVENT_TYPES.has(event.type))) return empty;
+  const { names, activity, toolToChildSessions, subagentUsage } = empty;
+  for (const event of raw) {
+    const data = event.data;
+    if (!data) continue;
+    const childSessionId = typeof data.childSessionId === "string" ? data.childSessionId : void 0;
+    const parentToolId = typeof data.parentToolId === "string" ? data.parentToolId : void 0;
+    const key = childSessionId || parentToolId;
+    if (!key) continue;
+    if (event.type === "subagent_start" || event.type === "subagent_complete") {
+      const name = typeof data.name === "string" ? data.name : "";
+      if (name) names.set(key, name);
+      if (parentToolId && childSessionId) {
+        const existing = toolToChildSessions.get(parentToolId) ?? [];
+        if (!existing.includes(childSessionId)) existing.push(childSessionId);
+        toolToChildSessions.set(parentToolId, existing);
+      }
+      if (event.type === "subagent_complete" && isRecord(data.tokenUsage)) {
+        subagentUsage.set(key, {
+          input: Number(data.tokenUsage.input ?? 0),
+          output: Number(data.tokenUsage.output ?? 0),
+          cacheRead: Number(data.tokenUsage.cacheRead ?? 0),
+          cacheWrite: Number(data.tokenUsage.cacheWrite ?? 0)
+        });
+      }
+      continue;
+    }
+    if (event.type === "subagent_tool_call") {
+      const items = activity.get(key) ?? [];
+      items.push({
+        type: "tool",
+        tool: typeof data.tool === "string" ? data.tool : "unknown",
+        summary: typeof data.summary === "string" ? data.summary : ""
+      });
+      activity.set(key, items);
+      continue;
+    }
+    if (event.type === "subagent_text") {
+      const delta = typeof data.delta === "string" ? data.delta : typeof data.text === "string" ? data.text : "";
+      if (!delta) continue;
+      const items = activity.get(key) ?? [];
+      const last = items[items.length - 1];
+      if (last?.type === "text") {
+        items[items.length - 1] = { ...last, text: last.text + delta };
+      } else {
+        items.push({ type: "text", text: delta });
+      }
+      activity.set(key, items);
+    }
+  }
+  return { names, activity, toolToChildSessions, subagentUsage };
+}
 
 // src/utils/session-output.ts
 function formatDate(value) {
@@ -744,13 +834,33 @@ function formatDate(value) {
   if (Number.isNaN(date.getTime())) return value;
   return date.toISOString().replace("T", " ").replace(/\.\d+Z$/, " UTC");
 }
-function renderTranscriptEvent(event) {
+function renderSubagentActivityItem(item) {
+  if (item.type === "text") return `    - ${item.text}
+`;
+  return `    - **Tool:** ${item.tool}${item.summary ? ` - ${item.summary}` : ""}
+`;
+}
+function renderSubagentActivityForTool(toolId, subagents) {
+  const childSessionIds = subagents.toolToChildSessions.get(toolId) ?? [];
+  if (childSessionIds.length === 0) return "";
+  const lines = [];
+  for (const childSessionId of childSessionIds) {
+    const name = subagents.names.get(childSessionId);
+    lines.push(`  - **Subagent:** ${name ?? childSessionId}`);
+    for (const item of subagents.activity.get(childSessionId) ?? []) {
+      lines.push(renderSubagentActivityItem(item).trimEnd());
+    }
+  }
+  return `${lines.join("\n")}
+`;
+}
+function renderTranscriptEvent(event, subagents) {
   switch (event.type) {
     case "text":
       return event.text;
     case "tool_call":
       return `**Tool call:** ${event.tool}${event.summary ? ` - ${event.summary}` : ""}${event.toolStatus ? ` (${event.toolStatus})` : ""}
-`;
+${subagents ? renderSubagentActivityForTool(event.id, subagents) : ""}`;
     case "reasoning":
       return `<details><summary>Reasoning</summary>
 
@@ -813,7 +923,9 @@ 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(resolveAuthoritativePromptEvents(rawEvents));
+    const authoritativeEvents = resolveAuthoritativePromptEvents(rawEvents);
+    const events = flattenSessionEvents(authoritativeEvents);
+    const subagents = extractSubagentInfo(authoritativeEvents);
     lines.push("---\n");
     lines.push(`## Turn ${i + 1}
 `);
@@ -827,7 +939,7 @@ function renderSessionTranscript(exportData) {
       lines.push("**Assistant:**\n");
       let pendingText = "";
       for (const event of events) {
-        const rendered = renderTranscriptEvent(event);
+        const rendered = renderTranscriptEvent(event, subagents);
         if (!rendered) continue;
         if (event.type === "text") {
           pendingText += rendered;

package/package.json

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