@tryarcanist/cli 0.1.79 → 0.1.80

package/dist/index.js

@@ -392,7 +392,15 @@ function sleep(ms) {
 var MIN_WATCH_POLL_INTERVAL_MS = 1;
 var DEFAULT_WATCH_POLL_INTERVAL_MS = 1e3;
 var WATCH_REPLAY_PAGE_SIZE = 200;
-var WATCH_TERMINAL_STATUSES = /* @__PURE__ */ new Set(["idle", "stopped", "archived"]);
+var WATCH_TERMINAL_STATUSES = /* @__PURE__ */ new Set([
+  "idle",
+  "completed",
+  "blocked",
+  "failed",
+  "stopped",
+  "stopped_resumable",
+  "archived"
+]);
 
 // src/uploads.ts
 import { readFile } from "fs/promises";
@@ -708,11 +716,17 @@ function getRawSessionEventData(event) {
   }
 }
 function normalizeRawSessionEvent(event) {
+  const data = getRawSessionEventData(event);
   return {
+    raw: event,
     type: getRawSessionEventKind(event),
-    data: getRawSessionEventData(event)
+    data,
+    promptId: getRawSessionEventPromptId(event)
   };
 }
+function normalizeRawSessionEvents(events) {
+  return events.map((event) => normalizeRawSessionEvent(event));
+}
 function shouldAppendTextDelta(existingText, incomingText) {
   if (!incomingText) return false;
   if (incomingText.length < DUPLICATE_TEXT_DELTA_MIN_CHARS) return true;
@@ -1106,8 +1120,7 @@ function applyTodoUpdate(data, state) {
 }
 function flattenSessionEvents(raw) {
   const state = createFlattenState();
-  for (const event of raw) {
-    const normalized = normalizeRawSessionEvent(event);
+  for (const normalized of normalizeRawSessionEvents(raw)) {
     const { type } = normalized;
     const data = normalized.data;
     switch (type) {
@@ -1184,47 +1197,47 @@ function partitionEventsByPrompt(allEvents, promptIds) {
   const promptSet = new Set(promptIds);
   const buckets = new Map(promptIds.map((id) => [id, []]));
   let currentPromptId = null;
-  for (const event of allEvents) {
-    const eventPromptId = getRawSessionEventPromptId(event);
+  for (const event of normalizeRawSessionEvents(allEvents)) {
+    const eventPromptId = event.promptId;
     const explicitPromptId = typeof eventPromptId === "string" && promptSet.has(eventPromptId) ? eventPromptId : null;
-    if (getRawSessionEventKind(event) === "prompt_processing") {
+    if (event.type === "prompt_processing") {
       currentPromptId = explicitPromptId;
     }
     const targetPromptId = explicitPromptId ?? currentPromptId;
     if (targetPromptId) {
       const bucket = buckets.get(targetPromptId);
-      if (bucket) bucket.push(event);
+      if (bucket) bucket.push(event.raw);
     }
   }
   return buckets;
 }
-function getEmbeddedTerminalHistory(raw) {
-  for (let index = raw.length - 1; index >= 0; index--) {
-    const event = raw[index];
-    const eventType = getRawSessionEventKind(event);
-    if (eventType !== "prompt_completed" && eventType !== "prompt_failed") continue;
-    const history = getRawSessionEventData(event)?.history;
+function getEmbeddedTerminalHistoryFromNormalized(normalizedEvents) {
+  for (let index = normalizedEvents.length - 1; index >= 0; index--) {
+    const event = normalizedEvents[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 promptActivityKey(event) {
-  const data = getRawSessionEventData(event);
+  const data = event.data;
   return [
-    getRawSessionEventPromptId(event) ?? "",
+    event.promptId ?? "",
     typeof data?.phase === "string" ? data.phase : "",
     typeof data?.detail === "string" ? data.detail : ""
   ].join("\0");
 }
 function agentProgressKey(event) {
-  const data = getRawSessionEventData(event);
-  return [getRawSessionEventPromptId(event) ?? "", typeof data?.step === "string" ? data.step : ""].join("\0");
+  const data = event.data;
+  return [event.promptId ?? "", typeof data?.step === "string" ? data.step : ""].join("\0");
 }
 function resolveAuthoritativePromptEventsWithDiagnostics(raw) {
-  const embeddedHistory = getEmbeddedTerminalHistory(raw);
-  const durablePromptActivity = raw.filter((event) => getRawSessionEventKind(event) === "prompt_activity");
-  const durableAgentProgress = raw.filter((event) => getRawSessionEventKind(event) === "agent_progress");
+  const normalizedRaw = normalizeRawSessionEvents(raw);
+  const embeddedHistory = getEmbeddedTerminalHistoryFromNormalized(normalizedRaw);
+  const durablePromptActivity = normalizedRaw.filter((event) => event.type === "prompt_activity");
+  const durableAgentProgress = normalizedRaw.filter((event) => event.type === "agent_progress");
   if (!embeddedHistory) {
     return {
       events: raw,
@@ -1241,8 +1254,9 @@ function resolveAuthoritativePromptEventsWithDiagnostics(raw) {
       }
     };
   }
-  const embeddedPromptActivity = embeddedHistory.filter((event) => getRawSessionEventKind(event) === "prompt_activity");
-  const embeddedAgentProgress = embeddedHistory.filter((event) => getRawSessionEventKind(event) === "agent_progress");
+  const normalizedEmbeddedHistory = normalizeRawSessionEvents(embeddedHistory);
+  const embeddedPromptActivity = normalizedEmbeddedHistory.filter((event) => event.type === "prompt_activity");
+  const embeddedAgentProgress = normalizedEmbeddedHistory.filter((event) => event.type === "agent_progress");
   const embeddedPromptActivityKeys = new Set(embeddedPromptActivity.map(promptActivityKey));
   const embeddedAgentProgressKeys = new Set(embeddedAgentProgress.map(agentProgressKey));
   const embeddedPromptActivityCount = embeddedPromptActivity.length;
@@ -1267,7 +1281,9 @@ function resolveAuthoritativePromptEventsWithDiagnostics(raw) {
     embeddedAgentProgressKeys.add(key);
     return true;
   });
-  const missingDurableSideChannelEvents = [...missingDurablePromptActivity, ...missingDurableAgentProgress];
+  const missingDurableSideChannelEvents = [...missingDurablePromptActivity, ...missingDurableAgentProgress].map(
+    (event) => event.raw
+  );
   return {
     events: missingDurableSideChannelEvents.length > 0 ? [...missingDurableSideChannelEvents, ...embeddedHistory] : embeddedHistory,
     diagnostics: {
@@ -1847,7 +1863,7 @@ async function waitForCreatedPrompt(sessionId, promptId, sessionUrl, pollInterva
     createdPrompt = await fetchCreatedPromptStatus(config, sessionId, promptId);
   }
   if (!createdPrompt) {
-    throw new CliError("server", `Prompt status was unavailable after session ${sessionId} became idle.`, {
+    throw new CliError("server", `Prompt status was unavailable after session ${sessionId} reached a terminal state.`, {
       hint: `Inspect with: arcanist sessions transcript ${sessionId}`
     });
   }
@@ -1857,7 +1873,7 @@ async function waitForCreatedPrompt(sessionId, promptId, sessionUrl, pollInterva
   if (createdPrompt.status !== "completed") {
     throw new CliError(
       "server",
-      `Prompt ${createdPrompt.promptId} did not reach a terminal success state before session ${sessionId} became idle (status: ${createdPrompt.status}).`,
+      `Prompt ${createdPrompt.promptId} did not reach a terminal success state before session ${sessionId} reached a terminal state (status: ${createdPrompt.status}).`,
       {
         hint: `Inspect with: arcanist sessions transcript ${sessionId}`
       }

package/package.json

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