@tryarcanist/cli 0.1.28 → 0.1.30

package/dist/index.js

@@ -405,6 +405,175 @@ var RAW_OPENCODE_NOISE = /* @__PURE__ */ new Set([
   "lsp.updated",
   "lsp.client.diagnostics"
 ]);
+function isCanonicalRawSessionEvent(event) {
+  return "phase" in event && typeof event.phase === "string";
+}
+function compatPayload(event) {
+  return event.payload;
+}
+function compatBridgeData(event) {
+  const bridgeData = compatPayload(event).bridgeData;
+  return isRecord(bridgeData) ? { ...bridgeData } : {};
+}
+function compatBridgeEventType(event) {
+  const bridgeEventType = compatPayload(event).bridgeEventType;
+  return typeof bridgeEventType === "string" && bridgeEventType.length > 0 ? bridgeEventType : void 0;
+}
+function canonicalPromptId(event) {
+  if (typeof event.promptId === "string" && event.promptId.length > 0) {
+    return event.promptId;
+  }
+  const bridgeData = compatBridgeData(event);
+  if (typeof bridgeData.promptId === "string" && bridgeData.promptId.length > 0) {
+    return bridgeData.promptId;
+  }
+  return typeof bridgeData.messageId === "string" && bridgeData.messageId.length > 0 ? bridgeData.messageId : void 0;
+}
+function withPromptId(event, data) {
+  const promptId = canonicalPromptId(event);
+  return promptId && data.promptId === void 0 ? { ...data, promptId } : data;
+}
+function normalizeBridgeCompatEventData(event, bridgeEventType, bridgeData) {
+  switch (bridgeEventType) {
+    case "tool_call":
+      return withPromptId(event, {
+        ...bridgeData,
+        ...typeof bridgeData.callId === "string" && bridgeData.callId.length > 0 && !(typeof bridgeData.id === "string" && bridgeData.id.length > 0) ? { id: bridgeData.callId } : {},
+        ...isRecord(bridgeData.args) && bridgeData.input === void 0 ? { input: bridgeData.args } : {}
+      });
+    case "tool_update":
+      return withPromptId(event, {
+        ...bridgeData,
+        ...typeof bridgeData.callId === "string" && bridgeData.callId.length > 0 && !(typeof bridgeData.id === "string" && bridgeData.id.length > 0) ? { id: bridgeData.callId } : {}
+      });
+    default:
+      return withPromptId(event, bridgeData);
+  }
+}
+function getRawSessionEventPromptId(event) {
+  if (isCanonicalRawSessionEvent(event)) {
+    return canonicalPromptId(event);
+  }
+  return typeof event.data?.promptId === "string" && event.data.promptId.length > 0 ? event.data.promptId : void 0;
+}
+function getRawSessionEventKind(event) {
+  if (!isCanonicalRawSessionEvent(event)) return event.type;
+  const payload = compatPayload(event);
+  const bridgeEventType = compatBridgeEventType(event);
+  switch (event.phase) {
+    case "text.delta":
+      return payload.channel === "reasoning" ? "reasoning" : "text";
+    case "tool.call":
+      return "tool_call";
+    case "tool.result":
+      return "tool_update";
+    case "prompt.enqueue":
+      return "prompt_enqueued";
+    case "prompt.dispatch":
+      return "prompt_processing";
+    case "prompt.complete":
+      return payload.success === false ? "prompt_failed" : "prompt_completed";
+    case "user_question":
+      return "question";
+    case "error":
+      return "session_error";
+    case "bridge.event":
+      return bridgeEventType ?? event.phase;
+    case "idle":
+      return bridgeEventType ?? "session_idle";
+    case "opencode.session.create":
+    case "git.push":
+    case "pr.open":
+    case "session.create":
+    case "sandbox.spawn":
+    case "bridge.connect":
+      return bridgeEventType ?? event.phase;
+    default:
+      return bridgeEventType ?? event.phase;
+  }
+}
+function getRawSessionEventData(event) {
+  if (!isCanonicalRawSessionEvent(event)) {
+    return isRecord(event.data) ? event.data : void 0;
+  }
+  const payload = compatPayload(event);
+  const bridgeEventType = compatBridgeEventType(event);
+  const base = withPromptId(event, compatBridgeData(event));
+  switch (event.phase) {
+    case "text.delta":
+      return withPromptId(event, {
+        ...base,
+        ...typeof payload.partId === "string" && payload.partId.length > 0 ? { id: payload.partId } : {},
+        text: payload.text
+      });
+    case "tool.call":
+      return withPromptId(event, {
+        ...base,
+        id: payload.callId,
+        tool: payload.tool,
+        input: isRecord(payload.args) ? payload.args : {},
+        summary: typeof payload.summary === "string" ? payload.summary : ""
+      });
+    case "tool.result":
+      return withPromptId(event, {
+        ...base,
+        id: payload.callId,
+        status: typeof base.status === "string" ? base.status : payload.ok ? "completed" : "error"
+      });
+    case "prompt.enqueue":
+      return withPromptId(event, {
+        ...base,
+        source: payload.source,
+        ...payload.actorUserId !== void 0 ? { actorUserId: payload.actorUserId } : {},
+        ...typeof payload.agent === "string" ? { agent: payload.agent } : {},
+        ...payload.model !== void 0 ? { model: payload.model } : {}
+      });
+    case "prompt.dispatch":
+      return withPromptId(event, {
+        ...base,
+        ...payload.startupAttemptId !== void 0 ? { startupAttemptId: payload.startupAttemptId } : {}
+      });
+    case "prompt.complete":
+      return withPromptId(event, {
+        ...base,
+        success: payload.success,
+        ...typeof payload.error === "string" ? { error: payload.error } : {},
+        ...typeof payload.errorCode === "string" ? { code: payload.errorCode } : {},
+        ...payload.errorDetails !== void 0 ? { errorDetails: payload.errorDetails } : {}
+      });
+    case "user_question":
+      return withPromptId(event, {
+        ...base,
+        id: payload.questionId,
+        question: payload.question,
+        ...Array.isArray(payload.options) ? { options: payload.options } : {}
+      });
+    case "error":
+      return withPromptId(event, {
+        ...base,
+        error: payload.message,
+        ...typeof payload.code === "string" ? { code: payload.code } : {},
+        ...payload.details !== void 0 ? { errorDetails: payload.details } : {}
+      });
+    case "bridge.event":
+      return normalizeBridgeCompatEventData(event, bridgeEventType, base);
+    case "idle":
+      return withPromptId(event, {
+        ...base,
+        ...typeof payload.taskType === "string" ? { taskType: payload.taskType } : {},
+        ...typeof payload.sessionEditCount === "number" ? { sessionEditCount: payload.sessionEditCount } : {},
+        ...typeof payload.sessionPromptCount === "number" ? { sessionPromptCount: payload.sessionPromptCount } : {}
+      });
+    default:
+      return withPromptId(event, base);
+  }
+}
+function normalizeRawSessionEvent(event) {
+  return {
+    type: getRawSessionEventKind(event),
+    data: getRawSessionEventData(event)
+  };
+}
 function shouldAppendTextDelta(existingText, incomingText) {
   if (!incomingText) return false;
   if (incomingText.length < DUPLICATE_TEXT_DELTA_MIN_CHARS) return true;
@@ -452,8 +621,10 @@ function flattenSessionEvents(raw) {
   const toolCallIndexById = /* @__PURE__ */ new Map();
   const questionIndexById = /* @__PURE__ */ new Map();
   for (const event of raw) {
-    const data = isRecord(event.data) ? event.data : void 0;
-    if (event.type === "sandbox_compaction_start") {
+    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}`,
@@ -462,7 +633,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "sandbox_compaction_complete") {
+    if (type === "sandbox_compaction_complete") {
       merged.push({
         type: "compaction_complete",
         id: `cc-${data?.timestamp ?? merged.length}`,
@@ -472,7 +643,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "sandbox_context_fill_warning") {
+    if (type === "sandbox_context_fill_warning") {
       merged.push({
         type: "context_fill_warning",
         id: `cfw-${data?.timestamp ?? merged.length}`,
@@ -483,7 +654,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "sandbox_tool_truncated") {
+    if (type === "sandbox_tool_truncated") {
       merged.push({
         type: "tool_truncated",
         id: typeof data?.callId === "string" ? data.callId : String(merged.length),
@@ -492,7 +663,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "retry_status") {
+    if (type === "retry_status") {
       merged.push({
         type: "retry_status",
         id: `rs-${data?.timestamp ?? merged.length}`,
@@ -509,7 +680,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "branch_changed") {
+    if (type === "branch_changed") {
       merged.push({
         type: "branch_changed",
         id: `bc-${data?.timestamp ?? merged.length}`,
@@ -518,7 +689,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "session_error") {
+    if (type === "session_error") {
       merged.push({
         type: "session_error",
         id: resolveEventId(data, "err", merged.length),
@@ -528,7 +699,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "raw_opencode") {
+    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;
@@ -543,7 +714,7 @@ function flattenSessionEvents(raw) {
       });
       continue;
     }
-    if (event.type === "reasoning") {
+    if (type === "reasoning") {
       const streamId = resolveEventId(data, "reasoning", merged.length);
       const key = streamableKey("reasoning", streamId);
       const text = resolveTextValue(data);
@@ -574,7 +745,7 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type === "patch") {
+    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 });
@@ -585,7 +756,7 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type === "todo_update") {
+    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--) {
@@ -598,7 +769,7 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type === "answer") {
+    if (type === "answer") {
       const questionId = typeof data?.id === "string" ? data.id : void 0;
       if (!questionId) continue;
       const existingIdx = questionIndexById.get(questionId);
@@ -613,10 +784,10 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type !== "text" && event.type !== "tool_call" && event.type !== "tool_update" && event.type !== "question") {
+    if (type !== "text" && type !== "tool_call" && type !== "tool_update" && type !== "question") {
       continue;
     }
-    if (event.type === "text") {
+    if (type === "text") {
       const streamId = resolveEventId(data, "text", merged.length);
       const key = streamableKey("text", streamId);
       const text = resolveTextValue(data);
@@ -647,7 +818,7 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type === "tool_call") {
+    if (type === "tool_call") {
       const id = resolveEventId(data, "tool", merged.length);
       const nextEntry = {
         type: "tool_call",
@@ -674,7 +845,7 @@ function flattenSessionEvents(raw) {
       }
       continue;
     }
-    if (event.type === "tool_update") {
+    if (type === "tool_update") {
       const id = typeof data?.id === "string" ? data.id : "";
       const existingIdx = toolCallIndexById.get(id);
       if (existingIdx !== void 0) {
@@ -709,8 +880,9 @@ 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 eventPromptId = getRawSessionEventPromptId(event);
+    const explicitPromptId = typeof eventPromptId === "string" && promptSet.has(eventPromptId) ? eventPromptId : null;
+    if (getRawSessionEventKind(event) === "prompt_processing") {
       currentPromptId = explicitPromptId;
     }
     const targetPromptId = explicitPromptId ?? currentPromptId;
@@ -724,8 +896,9 @@ function partitionEventsByPrompt(allEvents, promptIds) {
 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;
+    const eventType = getRawSessionEventKind(event);
+    if (eventType !== "prompt_completed" && eventType !== "prompt_failed") continue;
+    const history = getRawSessionEventData(event)?.history;
     if (!Array.isArray(history) || history.length === 0) return null;
     return history;
   }
@@ -741,16 +914,17 @@ function extractSubagentInfo(raw) {
     toolToChildSessions: /* @__PURE__ */ new Map(),
     subagentUsage: /* @__PURE__ */ new Map()
   };
-  if (!raw.some((event) => SUBAGENT_EVENT_TYPES.has(event.type))) return empty;
+  if (!raw.some((event) => SUBAGENT_EVENT_TYPES.has(getRawSessionEventKind(event)))) return empty;
   const { names, activity, toolToChildSessions, subagentUsage } = empty;
   for (const event of raw) {
-    const data = event.data;
+    const type = getRawSessionEventKind(event);
+    const data = getRawSessionEventData(event);
     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") {
+    if (type === "subagent_start" || type === "subagent_complete") {
       const name = typeof data.name === "string" ? data.name : "";
       if (name) names.set(key, name);
       if (parentToolId && childSessionId) {
@@ -758,7 +932,7 @@ function extractSubagentInfo(raw) {
         if (!existing.includes(childSessionId)) existing.push(childSessionId);
         toolToChildSessions.set(parentToolId, existing);
       }
-      if (event.type === "subagent_complete" && isRecord(data.tokenUsage)) {
+      if (type === "subagent_complete" && isRecord(data.tokenUsage)) {
         subagentUsage.set(key, {
           input: Number(data.tokenUsage.input ?? 0),
           output: Number(data.tokenUsage.output ?? 0),
@@ -768,7 +942,7 @@ function extractSubagentInfo(raw) {
       }
       continue;
     }
-    if (event.type === "subagent_tool_call") {
+    if (type === "subagent_tool_call") {
       const items = activity.get(key) ?? [];
       items.push({
         type: "tool",
@@ -778,7 +952,7 @@ function extractSubagentInfo(raw) {
       activity.set(key, items);
       continue;
     }
-    if (event.type === "subagent_text") {
+    if (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) ?? [];
@@ -1500,7 +1674,10 @@ async function sessionEventsCommand(sessionId, options, command) {
   const state = { promptLabels, toolCalls: /* @__PURE__ */ new Map() };
   let textOpen = false;
   for (const event of payload.events) {
-    const rendered = renderWatchEvent(event, state);
+    const rendered = renderWatchEvent({
+      type: getRawSessionEventKind(event),
+      data: getRawSessionEventData(event) ?? {}
+    }, state);
     if (rendered?.kind === "line") {
       if (textOpen) {
         process.stdout.write("\n");

package/package.json

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