@tryarcanist/cli 0.1.345 → 0.1.347

package/README.md

@@ -266,9 +266,11 @@ arcanist sessions events abc123 --after-sequence 50 --limit 250 --json
 arcanist sessions events abc123 --before-sequence 100 --poll-interval 500 --json
 arcanist sessions events abc123 --prompt-id p-123 --json
 arcanist sessions events abc123 --follow --json
+arcanist sessions events abc123 --follow --timeout 60000 --json
 ```
 
 `--after` and `--before` are aliases for `--after-sequence` and `--before-sequence`.
+`--timeout` bounds `--follow`; omit it or pass `0` for unbounded follow. Process exit is a terminal phase, not `session_idle`.
 
 JSON mode without `--follow` returns one JSON object from `/events/history`: `{events: [...], ...}`. Canonical events carry `phase`.
 

package/dist/index.js

@@ -7409,7 +7409,7 @@ function isTerminalPhase(phase, _sessionKind) {
 // package.json
 var package_default = {
   name: "@tryarcanist/cli",
-  version: "0.1.345",
+  version: "0.1.347",
   description: "Command-line interface for Arcanist: inspect sessions, prepare Zeus environments, and trigger reviews",
   type: "module",
   bin: {
@@ -7659,17 +7659,27 @@ function timeoutError(timeoutMs) {
     hint: `Increase ${HTTP_TIMEOUT_ENV} for slow links, or check the API connection.`
   });
 }
+function resolveApiTimeoutMs(init) {
+  const httpTimeout = parseHttpTimeoutMs();
+  if (!init) return { fetchInit: void 0, timeoutMs: httpTimeout };
+  const { timeoutMs: requestedTimeoutMs, ...fetchInit } = init;
+  if (requestedTimeoutMs === void 0) return { fetchInit, timeoutMs: httpTimeout };
+  if (!Number.isFinite(requestedTimeoutMs) || requestedTimeoutMs <= 0) {
+    return { fetchInit, timeoutMs: 1 };
+  }
+  return { fetchInit, timeoutMs: Math.max(1, Math.min(httpTimeout, requestedTimeoutMs)) };
+}
 async function apiRequest(connection, path, init, read) {
-  const timeoutMs = parseHttpTimeoutMs();
+  const { fetchInit, timeoutMs } = resolveApiTimeoutMs(init);
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), timeoutMs);
   try {
-    const headers = new Headers(init?.headers);
+    const headers = new Headers(fetchInit?.headers);
     headers.set("Content-Type", "application/json");
     headers.set("User-Agent", CLI_USER_AGENT);
     if (connection.token) headers.set("Authorization", `Bearer ${connection.token}`);
     const res = await fetch(`${normalizeBaseUrl(connection.apiUrl)}${path}`, {
-      ...init,
+      ...fetchInit,
       headers,
       signal: controller.signal
     });
@@ -24727,10 +24737,14 @@ async function drainTerminalBuildLogs(config2, businessId, buildId, options) {
   }
 }
 async function waitForBuild(config2, businessId, buildId, options) {
-  let afterSequence;
+  let afterSequence = options.afterSequence;
   for (; ; ) {
     if (options.follow) {
-      const result = await fetchAndEmitBuildLogs(config2, businessId, buildId, { afterSequence, json: options.json });
+      const result = await fetchAndEmitBuildLogs(config2, businessId, buildId, {
+        afterSequence,
+        limit: options.limit,
+        json: options.json
+      });
       afterSequence = result.afterSequence;
     }
     const status = sandboxLayerCliBuildRequestResponseSchema.parse(
@@ -25009,24 +25023,29 @@ async function sandboxLogsCommand(buildId, options = {}, command) {
   if (limit != null && (!Number.isInteger(limit) || limit < 1)) {
     throw new CliError("user", "--limit must be a positive integer.");
   }
-  for (; ; ) {
-    const payload = sandboxLayerCliBuildLogsResponseSchema.parse(
-      await apiFetch(config2, buildLogsPath(businessId, buildId, { afterSequence, limit }))
-    );
-    if (payload.logs.length > 0 || !options.follow) {
-      if (isJson(command, options)) writeJson(options.follow ? { type: "logs", logs: payload.logs } : payload);
-      else printLogs(payload.logs);
-    }
-    if (!options.follow) return;
-    if (payload.logs.length > 0) afterSequence = payload.logs[payload.logs.length - 1].sequence;
-    await sleep(
-      parsePollInterval(options.pollInterval, {
+  const json2 = isJson(command, options);
+  if (options.follow) {
+    const finalBuild = await waitForBuild(config2, businessId, buildId, {
+      follow: true,
+      pollIntervalMs: parsePollInterval(options.pollInterval, {
         defaultMs: DEFAULT_POLL_INTERVAL_MS,
         minMs: MIN_POLL_INTERVAL_MS,
         maxMs: null
-      })
-    );
+      }),
+      json: json2,
+      afterSequence,
+      limit
+    });
+    if (json2) writeJson({ type: "build", buildRequest: finalBuild });
+    else printTerminalBuildSummary(finalBuild);
+    if (finalBuild.status !== "completed") process.exitCode = 1;
+    return;
   }
+  const payload = sandboxLayerCliBuildLogsResponseSchema.parse(
+    await apiFetch(config2, buildLogsPath(businessId, buildId, { afterSequence, limit }))
+  );
+  if (json2) writeJson(payload);
+  else printLogs(payload.logs);
 }
 async function sandboxAssignDefaultCommand(sourceRepoArg, options = {}, command) {
   const { config: config2 } = resolveBusinessContext(command, options);
@@ -26640,7 +26659,20 @@ function parseNonNegativeInteger(raw, name, defaultValue) {
   if (!/^\d+$/.test(raw)) {
     throw new CliError("user", `${name} must be a non-negative integer.`);
   }
-  return Number(raw);
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value)) {
+    throw new CliError("user", `${name} must be a non-negative integer.`);
+  }
+  return value;
+}
+function throwIfFollowTimedOut(deadline) {
+  if (deadline !== null && Date.now() >= deadline) {
+    throw new CliError("server", "Timed out waiting for session events.");
+  }
+}
+function remainingFollowMs(deadline) {
+  if (deadline === null) return void 0;
+  return Math.max(0, deadline - Date.now());
 }
 function formatStatusLine(status) {
   const label = status.phase ?? "unknown";
@@ -26690,6 +26722,8 @@ async function watchCommand(sessionId, options, command) {
   const pollIntervalMs = parsePollInterval(options.pollInterval);
   const initialAfterSequence = parseNonNegativeInteger(options.afterSequence, "--after-sequence", 0);
   const pageSize = parseNonNegativeInteger(options.limit, "--limit", WATCH_REPLAY_PAGE_SIZE);
+  const timeoutMs = parseNonNegativeInteger(options.timeout, "--timeout", 0);
+  const deadline = timeoutMs > 0 ? Date.now() + timeoutMs : null;
   if (pageSize === 0) {
     throw new CliError("user", "--limit must be greater than 0.");
   }
@@ -26714,11 +26748,23 @@ async function watchCommand(sessionId, options, command) {
   if (!json2) console.log(`Watching session ${sessionId}...`);
   try {
     while (true) {
+      throwIfFollowTimedOut(deadline);
       const query = new URLSearchParams({
         afterSequence: String(afterSequence),
         limit: String(pageSize)
       });
-      const payload = await apiFetchText(config2, `/api/sessions/${sessionId}/events?${query}`);
+      const remainingMs = remainingFollowMs(deadline);
+      let payload;
+      try {
+        payload = await apiFetchText(
+          config2,
+          `/api/sessions/${sessionId}/events?${query}`,
+          remainingMs === void 0 ? void 0 : { timeoutMs: remainingMs }
+        );
+      } catch (err) {
+        throwIfFollowTimedOut(deadline);
+        throw err;
+      }
       const parsed = parseSsePayload(payload);
       const receivedFullPage = parsed.events.length >= pageSize;
       if (!json2 && parsed.status) {
@@ -26759,7 +26805,10 @@ async function watchCommand(sessionId, options, command) {
         }
         console.log(rendered.line);
       }
-      if (receivedFullPage) continue;
+      if (receivedFullPage) {
+        throwIfFollowTimedOut(deadline);
+        continue;
+      }
       if (parsed.status?.phase && isWatchTerminal(parsed.status.phase)) {
         if (!json2 && parsed.status.phase === "completed") {
           if (textOpen) {
@@ -26770,7 +26819,10 @@ async function watchCommand(sessionId, options, command) {
         }
         break;
       }
-      await sleep(pollIntervalMs);
+      throwIfFollowTimedOut(deadline);
+      const sleepMs = remainingFollowMs(deadline);
+      await sleep(sleepMs === void 0 ? pollIntervalMs : Math.min(pollIntervalMs, sleepMs));
+      throwIfFollowTimedOut(deadline);
     }
   } finally {
     if (textOpen) process.stdout.write("\n");
@@ -27565,7 +27617,7 @@ JSON:
 JSON mode returns {sessions, nextCursor}. --all follows cursors until nextCursor is null.
 `
 ).action((options, command) => listSessionsCommand(options, command));
-sessions.command("events").description("Read or follow session replay events").argument("<session-id>", "Session ID").option("--after-sequence <n>", "Return events after this sequence").option("--after <n>", "Alias for --after-sequence").option("--before-sequence <n>", "Return events before this sequence").option("--before <n>", "Alias for --before-sequence").option("--prompt-id <id>", "Filter events by prompt ID").option("--limit <n>", "Maximum events to return").option("--follow", "Follow events until a terminal phase").option("--poll-interval <ms>", "Polling interval in milliseconds", String(DEFAULT_WATCH_POLL_INTERVAL_MS)).addHelpText(
+sessions.command("events").description("Read or follow session replay events").argument("<session-id>", "Session ID").option("--after-sequence <n>", "Return events after this sequence").option("--after <n>", "Alias for --after-sequence").option("--before-sequence <n>", "Return events before this sequence").option("--before <n>", "Alias for --before-sequence").option("--prompt-id <id>", "Filter events by prompt ID").option("--limit <n>", "Maximum events to return").option("--follow", "Follow events until a terminal phase").option("--poll-interval <ms>", "Polling interval in milliseconds", String(DEFAULT_WATCH_POLL_INTERVAL_MS)).option("--timeout <ms>", "Stop following after this many milliseconds; 0 or omitted means unbounded").addHelpText(
   "after",
   `
 Examples:
@@ -27573,10 +27625,12 @@ Examples:
   arcanist sessions events <session-id> --after-sequence 540 --limit 250 --json
   arcanist sessions events <session-id> --after 540 --limit 250 --json
   arcanist sessions events <session-id> --follow --json
+  arcanist sessions events <session-id> --follow --timeout 60000 --json
 
 JSON:
 JSON mode without --follow returns one JSON object from /events/history: {events: [...], ...}; canonical events carry phase.
 --follow --json emits NDJSON, one {sequence, type, data} object per line, until a terminal phase: ${formatTerminalPhaseHelpList(TERMINAL_PHASES_ARRAY)}.
+--timeout bounds follow; 0 or omitted means unbounded. Process exit is a terminal phase, not session_idle.
 Actionable follow types are NDJSON signals, not process-exit conditions: pr_created/pr_updated use data.prUrl; question uses data.question; prompt_completed, prompt_failed, and session_idle do not exit the process.
 `
 ).action((sessionId, options, command) => sessionEventsCommand(sessionId, options, command));
@@ -27683,7 +27737,7 @@ sandbox.command("logs").description("Print sandbox layer build logs").argument("
   `
 JSON:
   Without --follow, --json prints one object: {ok, logs}
-  With --follow, --json emits NDJSON lines for non-empty batches: {type:"logs", logs:[...]}
+  With --follow, --json emits {type:"logs"} lines, then a terminal {type:"build"} line, and exits.
 `
 ).action((buildId, options, command) => sandboxLogsCommand(buildId, options, command));
 sandbox.command("rebuild-stale").description("Create stale sandbox template rebuild campaigns").option("--business <id>", "Business ID to scan; defaults to authenticated user's business").option("--all", "Scan all businesses").option("--dry-run", "Preview stale rebuilds without queueing provider builds").option("--yes", "Start a rebuild campaign").option("--follow", "Follow campaign progress").action((options, command) => sandboxRebuildStaleCommand(options, command));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryarcanist/cli",
-  "version": "0.1.345",
+  "version": "0.1.347",
   "description": "Command-line interface for Arcanist: inspect sessions, prepare Zeus environments, and trigger reviews",
   "type": "module",
   "bin": {