@tryarcanist/cli 0.1.195 → 0.1.196

package/dist/index.js

@@ -17,6 +17,36 @@ function normalizeBaseUrl(url) {
   return url.replace(/\/+$/, "");
 }
 
+// src/utils/api-error.ts
+function parseApiErrorBody(body) {
+  try {
+    const parsed = JSON.parse(body);
+    if (!parsed || typeof parsed !== "object") return null;
+    const record = parsed;
+    const topLevelMessage = typeof record.message === "string" && record.message ? record.message : void 0;
+    if (typeof record.error === "string" && record.error) {
+      return {
+        serverCode: typeof record.code === "string" && record.code ? record.code : record.error,
+        rawError: record.error,
+        message: topLevelMessage ?? record.error
+      };
+    }
+    if (record.error && typeof record.error === "object") {
+      const error = record.error;
+      const message = typeof error.message === "string" && error.message ? error.message : topLevelMessage;
+      const serverCode = typeof error.code === "string" && error.code ? error.code : void 0;
+      return message || serverCode ? {
+        ...message ? { message } : {},
+        ...serverCode ? { serverCode } : {},
+        ...serverCode ? { rawError: serverCode } : {}
+      } : null;
+    }
+    return topLevelMessage ? { message: topLevelMessage } : null;
+  } catch {
+    return null;
+  }
+}
+
 // src/errors.ts
 var EXIT_CODE_INTERRUPTED = 130;
 var CliError = class extends Error {
@@ -82,33 +112,6 @@ function messageForApiError(status, body, parsed = parseApiErrorBody(body)) {
   if (parsed?.serverCode) return parsed.serverCode;
   return body ? `API error ${status}: ${body}` : `API error ${status}`;
 }
-function parseApiErrorBody(body) {
-  try {
-    const parsed = JSON.parse(body);
-    if (!parsed || typeof parsed !== "object") return null;
-    const error = parsed.error;
-    if (typeof error === "string" && error.length > 0) {
-      const message2 = parsed.message;
-      const code = parsed.code;
-      return {
-        serverCode: typeof code === "string" && code ? code : error,
-        ...typeof message2 === "string" && message2 ? { message: message2 } : { message: error }
-      };
-    }
-    if (error && typeof error === "object") {
-      const code = error.code;
-      const message2 = error.message;
-      return {
-        ...typeof message2 === "string" && message2 ? { message: message2 } : {},
-        ...typeof code === "string" && code ? { serverCode: code } : {}
-      };
-    }
-    const message = parsed.message;
-    return typeof message === "string" && message.length > 0 ? { message } : null;
-  } catch {
-    return null;
-  }
-}
 function hintForHttpStatus(status, resourceNoun) {
   if (status === 401 || status === 403) return "Run `arcanist auth login` or set `ARCANIST_TOKEN`.";
   if (status === 404) {
@@ -1206,27 +1209,14 @@ function mapAutomationApiError(err) {
   if (!(err instanceof ApiError)) {
     return err instanceof CliError ? err : new CliError("server", stringifyError(err));
   }
-  const parsed = parseApiErrorBody2(err.body);
-  const serverCode = parsed?.error;
+  const parsed = parseApiErrorBody(err.body);
+  const serverCode = parsed?.rawError ?? parsed?.serverCode;
   return new CliError(codeForHttpStatus(err.status), parsed?.message || serverCode || err.message, {
     exitCode: err.exitCode,
     hint: serverCode ? AUTOMATION_ERROR_HINTS[serverCode] : void 0,
     requestId: err.requestId
   });
 }
-function parseApiErrorBody2(body) {
-  try {
-    const parsed = JSON.parse(body);
-    if (!parsed || typeof parsed !== "object") return null;
-    const record = parsed;
-    return {
-      error: typeof record.error === "string" ? record.error : void 0,
-      message: typeof record.message === "string" ? record.message : void 0
-    };
-  } catch {
-    return null;
-  }
-}
 function printAutomationRule(rule) {
   console.log(`ID: ${rule.id}`);
   console.log(`Repo: ${rule.repoOwner}/${rule.repoName}`);
@@ -1578,6 +1568,11 @@ function normalizeUploadedFileOptions(files) {
   return Array.isArray(files) ? files : [files];
 }
 
+// src/utils/poll-interval.ts
+function clampPollInterval(ms, minimum) {
+  return Math.max(ms, minimum);
+}
+
 // ../../shared/session/no-change-outcome.ts
 function isNoChangesPromptResult(result) {
   return typeof result === "object" && result !== null && "noChanges" in result && result.noChanges === true;
@@ -3003,6 +2998,11 @@ function renderWatchEvent(event, state) {
   }
 }
 
+// src/utils/session-payload.ts
+function unwrapSessionState(payload) {
+  return payload.session && typeof payload.session === "object" ? payload.session : payload;
+}
+
 // src/commands/model-options.ts
 function resolveModelAndBackend(options) {
   let agentRuntimeBackend = CODEX_AGENT_RUNTIME_BACKEND;
@@ -3246,7 +3246,7 @@ async function fetchCreatedPromptStatus(config, sessionId, promptId) {
   return selectCreatedPrompt(promptList.prompts, promptId);
 }
 async function waitForCreatedPromptToSettle(config, sessionId, promptId, pollIntervalMs) {
-  const effectivePollIntervalMs = Math.max(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
+  const effectivePollIntervalMs = clampPollInterval(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
   while (true) {
     const createdPrompt = await fetchCreatedPromptStatus(config, sessionId, promptId);
     if (createdPrompt && PROMPT_TERMINAL_STATUSES.has(createdPrompt.status)) {
@@ -3288,15 +3288,12 @@ async function waitForCreatedPrompt(sessionId, promptId, sessionUrl, pollInterva
     );
   }
 }
-function unwrapSessionState(payload) {
-  return payload.session && typeof payload.session === "object" ? payload.session : payload;
-}
 async function fetchSessionResultFields(config, sessionId) {
   const sessionPayload = await apiFetch(config, `/api/sessions/${sessionId}`);
   return extractSessionResultFields(unwrapSessionState(sessionPayload));
 }
 async function fetchSettledSessionResultFields(config, sessionId, pollIntervalMs) {
-  const effectivePollIntervalMs = Math.max(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
+  const effectivePollIntervalMs = clampPollInterval(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
   let latest = {};
   for (let attempt = 0; attempt < RESULT_FETCH_ATTEMPTS; attempt++) {
     latest = await fetchSessionResultFields(config, sessionId);
@@ -3607,9 +3604,6 @@ async function loginCommand(options, command) {
 }
 
 // src/commands/message.ts
-function unwrapSessionState2(payload) {
-  return payload.session && typeof payload.session === "object" ? payload.session : payload;
-}
 async function messageCommand(sessionId, promptArg, options = {}, command) {
   const runtime = getRuntimeOptions(command, options);
   assertArcanistSessionMutationAllowed("send");
@@ -3641,7 +3635,7 @@ async function messageCommand(sessionId, promptArg, options = {}, command) {
     }
     try {
       const sessionPayload = await apiFetch(config, `/api/sessions/${sessionId}`);
-      const resultLine = formatSessionResult(unwrapSessionState2(sessionPayload));
+      const resultLine = formatSessionResult(unwrapSessionState(sessionPayload));
       if (resultLine) console.log(resultLine);
     } catch {
     }

package/package.json

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