@tryarcanist/cli 0.1.160 → 0.1.162

package/dist/index.js

@@ -138,6 +138,16 @@ async function apiFetchText(config, path, init) {
   const res = await apiRequest(config, path, init);
   return res.text();
 }
+async function resolveBusinessId(config, options) {
+  if (options.business && options.business.trim()) return options.business.trim();
+  const whoami = await apiFetch(config, "/api/auth/whoami");
+  if (whoami.businessId && whoami.businessId.trim()) return whoami.businessId;
+  throw new CliError("user", "--business is required when the authenticated token has no business context.");
+}
+
+// src/runtime.ts
+import { randomUUID } from "crypto";
+import { createInterface } from "readline/promises";
 
 // src/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
@@ -289,8 +299,6 @@ function isLoopbackHost(parsed) {
 }
 
 // src/runtime.ts
-import { randomUUID } from "crypto";
-import { createInterface } from "readline/promises";
 var ASCII_FIRST_PRINTABLE = 32;
 var ASCII_DELETE = 127;
 var ANSI_CONTROL_SEQUENCE = /\u001b\[[0-9:;<=>?]*[ -/]*[@-~]/g;
@@ -306,6 +314,17 @@ function writeJson(value) {
   process.stdout.write(`${JSON.stringify(value)}
 `);
 }
+function emit(command, options, payload, printer) {
+  if (isJson(command, options)) {
+    writeJson(payload);
+    return;
+  }
+  printer(payload);
+}
+function resolveBusinessContext(command, options = {}) {
+  const runtime = getRuntimeOptions(command, options);
+  return { runtime, config: requireConfig(runtime) };
+}
 async function readStdin() {
   const chunks = [];
   for await (const chunk of process.stdin) {
@@ -468,15 +487,12 @@ function isControlCharacter(char) {
 
 // src/commands/auth.ts
 async function whoamiCommand(options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const payload = await apiFetch(config, "/api/auth/whoami");
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`User: ${String(payload.email ?? payload.userId ?? "unknown")}`);
-  if (payload.tokenScope) console.log(`Token scope: ${String(payload.tokenScope)}`);
+  emit(command, options, payload, (whoami) => {
+    console.log(`User: ${String(whoami.email ?? whoami.userId ?? "unknown")}`);
+    if (whoami.tokenScope) console.log(`Token scope: ${String(whoami.tokenScope)}`);
+  });
 }
 
 // ../../shared/github/repo-url.ts
@@ -991,9 +1007,6 @@ function buildModelProviderGroups(models) {
 var SESSION_START_MODEL_ID_SET_ANY_BACKEND = new Set(
   AGENT_RUNTIME_BACKENDS.flatMap((backend) => [...SESSION_START_MODEL_IDS_BY_BACKEND[backend]])
 );
-var SESSION_START_MODEL_PROVIDER_GROUPS = buildModelProviderGroups(
-  MODEL_REGISTRY.filter((model) => SESSION_START_MODEL_ID_SET_ANY_BACKEND.has(model.id))
-);
 var PUBLIC_SESSION_START_MODEL_PROVIDER_GROUPS = buildModelProviderGroups(
   MODEL_REGISTRY.filter(
     (model) => SESSION_START_MODEL_ID_SET_ANY_BACKEND.has(model.id) && model.visibility !== "internal_probe"
@@ -1444,7 +1457,8 @@ function createStreamCoalescerState() {
   return {
     streamableIndexById: /* @__PURE__ */ new Map(),
     segmentOrdinalByStreamId: /* @__PURE__ */ new Map(),
-    concatByStreamId: /* @__PURE__ */ new Map()
+    concatByStreamId: /* @__PURE__ */ new Map(),
+    interstitialScanEndByStreamId: /* @__PURE__ */ new Map()
   };
 }
 function streamableKey(type, streamId) {
@@ -1462,6 +1476,27 @@ function resolveTextValue(data) {
   const content = data?.content;
   return typeof content === "string" ? content : "";
 }
+function isNonContentInterstitial(event) {
+  switch (event.type) {
+    case "agent_progress":
+    case "retry_status":
+    case "memory_usage":
+    case "memory_recall_usage":
+    case "agent_timeline":
+      return true;
+    default:
+      return false;
+  }
+}
+function canAppendAcrossNonContentInterstitials(events, state, key, existingIdx) {
+  if (existingIdx === events.length - 1) return true;
+  const scanStart = Math.max(existingIdx + 1, state.interstitialScanEndByStreamId.get(key) ?? existingIdx + 1);
+  for (let i = scanStart; i < events.length; i++) {
+    if (!isNonContentInterstitial(events[i])) return false;
+  }
+  state.interstitialScanEndByStreamId.set(key, events.length);
+  return true;
+}
 function resolvePromptId(data) {
   return typeof data?.promptId === "string" ? data.promptId : void 0;
 }
@@ -1469,22 +1504,24 @@ function coalesceStreamDelta(events, state, type, streamId, text, promptId) {
   const key = streamableKey(type, streamId);
   const existingText = state.concatByStreamId.get(key) ?? "";
   const existingIdx = state.streamableIndexById.get(key);
-  if (existingIdx !== void 0 && existingIdx === events.length - 1) {
+  const appendableText = shouldAppendTextDelta(existingText, text);
+  if (existingIdx !== void 0) {
     const existing = events[existingIdx];
-    if (existing.type === type && shouldAppendTextDelta(existingText, text)) {
+    if (existing.type === type && appendableText && canAppendAcrossNonContentInterstitials(events, state, key, existingIdx)) {
       existing.text += text;
       state.concatByStreamId.set(key, existingText + text);
       if (!existing.promptId && promptId) existing.promptId = promptId;
       return true;
     }
-    return false;
+    if (existingIdx === events.length - 1 || !appendableText) return false;
   }
-  if (existingText && !shouldAppendTextDelta(existingText, text)) return false;
+  if (existingText && !appendableText) return false;
   const previousOrdinal = state.segmentOrdinalByStreamId.get(key);
   const segmentOrdinal = previousOrdinal === void 0 ? 0 : previousOrdinal + 1;
   state.segmentOrdinalByStreamId.set(key, segmentOrdinal);
   state.streamableIndexById.set(key, events.length);
   state.concatByStreamId.set(key, existingText + text);
+  state.interstitialScanEndByStreamId.set(key, events.length + 1);
   if (type === "text") {
     events.push({
       type: "text",
@@ -1517,6 +1554,7 @@ function mergeToolCall(previous, incoming) {
     ...incoming.inputEstimatedTokens === void 0 && previous.inputEstimatedTokens !== void 0 ? { inputEstimatedTokens: previous.inputEstimatedTokens } : {},
     ...incoming.outputEstimatedTokens === void 0 && previous.outputEstimatedTokens !== void 0 ? { outputEstimatedTokens: previous.outputEstimatedTokens } : {},
     ...incoming.outputChars === void 0 && previous.outputChars !== void 0 ? { outputChars: previous.outputChars } : {},
+    ...incoming.failure === void 0 && previous.failure !== void 0 ? { failure: previous.failure } : {},
     ...incoming.duplicateCount === void 0 && previous.duplicateCount !== void 0 ? { duplicateCount: previous.duplicateCount } : {}
   };
 }
@@ -1530,6 +1568,7 @@ function applyToolCallUpdate(previous, data) {
     ...toolStatus ? { toolStatus } : {},
     ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
     ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {},
+    ...isRecord(data?.failure) ? { failure: data.failure } : {},
     ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {}
   };
 }
@@ -1800,7 +1839,8 @@ function projectToolCall(data, state) {
         ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {},
         ...typeof data?.inputEstimatedTokens === "number" ? { inputEstimatedTokens: data.inputEstimatedTokens } : {},
         ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
-        ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {}
+        ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {},
+        ...isRecord(data?.failure) ? { failure: data.failure } : {}
       };
       state.merged[existingIdx] = mergeToolCall(previous, nextEntry);
     }
@@ -1817,7 +1857,8 @@ function projectToolCall(data, state) {
       ...typeof data?.truncated === "boolean" ? { truncated: data.truncated } : {},
       ...typeof data?.inputEstimatedTokens === "number" ? { inputEstimatedTokens: data.inputEstimatedTokens } : {},
       ...typeof data?.outputEstimatedTokens === "number" ? { outputEstimatedTokens: data.outputEstimatedTokens } : {},
-      ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {}
+      ...typeof data?.outputChars === "number" ? { outputChars: data.outputChars } : {},
+      ...isRecord(data?.failure) ? { failure: data.failure } : {}
     };
     state.toolCallIndexById.set(id, state.merged.length);
     state.merged.push(nextEntry);
@@ -2972,105 +3013,88 @@ function parseRepoArg(value) {
   if (!owner || !repo || extra) throw new CliError("user", "repo must be owner/name or a GitHub URL");
   return { owner, repo };
 }
-function encodePathSegment(value) {
-  return encodeURIComponent(value);
-}
-async function resolveBusinessId(config, options) {
-  if (options.business && options.business.trim()) return options.business.trim();
-  const whoami = await apiFetch(config, "/api/auth/whoami");
-  if (whoami.businessId && whoami.businessId.trim()) return whoami.businessId;
-  throw new CliError("user", "--business is required when the authenticated token has no business context.");
-}
 async function egressSourceSetCommand(sourceRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const businessId = await resolveBusinessId(config, options);
   const source = parseRepoArg(sourceRepoArg);
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment(businessId)}/egress-allowlist/source`,
+    `/api/businesses/${encodeURIComponent(businessId)}/egress-allowlist/source`,
     {
       method: "PUT",
       body: JSON.stringify({ sourceRepoOwner: source.owner, sourceRepoName: source.repo })
     }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Set egress allowlist source to ${source.owner}/${source.repo}:${EGRESS_ALLOWLIST_SOURCE_PATH}.`);
+  emit(
+    command,
+    options,
+    payload,
+    () => console.log(`Set egress allowlist source to ${source.owner}/${source.repo}:${EGRESS_ALLOWLIST_SOURCE_PATH}.`)
+  );
 }
 async function egressSourceGetCommand(options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const businessId = await resolveBusinessId(config, options);
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment(businessId)}/egress-allowlist/source`
+    `/api/businesses/${encodeURIComponent(businessId)}/egress-allowlist/source`
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  if (!payload.source) {
-    console.log("No egress allowlist source configured.");
-    return;
-  }
-  console.log(
-    `${payload.source.sourceRepoOwner}/${payload.source.sourceRepoName}:${payload.path} (${payload.defaultBranch ?? "default branch"})`
-  );
-  console.log(`${payload.domains.length} ${payload.domains.length === 1 ? "domain" : "domains"}.`);
+  emit(command, options, payload, (sourcePayload) => {
+    if (!sourcePayload.source) {
+      console.log("No egress allowlist source configured.");
+      return;
+    }
+    console.log(
+      `${sourcePayload.source.sourceRepoOwner}/${sourcePayload.source.sourceRepoName}:${sourcePayload.path} (${sourcePayload.defaultBranch ?? "default branch"})`
+    );
+    console.log(`${sourcePayload.domains.length} ${sourcePayload.domains.length === 1 ? "domain" : "domains"}.`);
+  });
 }
 async function egressAddCommand(domains, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const businessId = await resolveBusinessId(config, options);
   const normalized = normalizeEgressDomains(domains, "domains");
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment(businessId)}/egress-allowlist/pull-request`,
+    `/api/businesses/${encodeURIComponent(businessId)}/egress-allowlist/pull-request`,
     {
       method: "POST",
       body: JSON.stringify({ domains: normalized, ...options.reason ? { reason: options.reason } : {} })
     }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  if (payload.status === "unchanged") {
-    console.log("All requested domains are already present in the source file.");
-    return;
-  }
-  console.log(`Egress allowlist PR ${payload.status}: ${payload.prUrl}`);
-  console.log(`Added: ${payload.addedDomains.join(", ")}`);
+  emit(command, options, payload, (addPayload) => {
+    if (addPayload.status === "unchanged") {
+      console.log("All requested domains are already present in the source file.");
+      return;
+    }
+    console.log(`Egress allowlist PR ${addPayload.status}: ${addPayload.prUrl}`);
+    console.log(`Added: ${addPayload.addedDomains.join(", ")}`);
+  });
 }
 async function egressSyncCommand(options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const businessId = await resolveBusinessId(config, options);
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment(businessId)}/egress-allowlist/sync`,
+    `/api/businesses/${encodeURIComponent(businessId)}/egress-allowlist/sync`,
     { method: "POST" }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(
-    `Applied ${payload.egressAllowlist.length} egress allowlist domains from ${payload.source.sourceRepoOwner}/${payload.source.sourceRepoName}:${payload.path}.`
+  emit(
+    command,
+    options,
+    payload,
+    (syncPayload) => console.log(
+      `Applied ${syncPayload.egressAllowlist.length} egress allowlist domains from ${syncPayload.source.sourceRepoOwner}/${syncPayload.source.sourceRepoName}:${syncPayload.path}.`
+    )
   );
 }
 async function egressValidateCommand(path = EGRESS_ALLOWLIST_SOURCE_PATH, options = {}, command) {
   const content = readFileSync2(path, "utf8");
   const domains = parseEgressAllowlistSourceFile(content, path);
-  if (isJson(command, options)) {
-    writeJson({ ok: true, path, domains });
-    return;
-  }
-  console.log(`Valid egress allowlist: ${path}`);
-  console.log(`${domains.length} ${domains.length === 1 ? "domain" : "domains"}.`);
+  emit(command, options, { ok: true, path, domains }, (payload) => {
+    console.log(`Valid egress allowlist: ${payload.path}`);
+    console.log(`${payload.domains.length} ${payload.domains.length === 1 ? "domain" : "domains"}.`);
+  });
 }
 
 // src/commands/login.ts
@@ -3714,15 +3738,6 @@ function parseRepoArg2(value, fallback) {
 function repoPath(repo) {
   return `${repo.owner}/${repo.repo}`;
 }
-function encodePathSegment2(value) {
-  return encodeURIComponent(value);
-}
-async function resolveBusinessId2(config, options) {
-  if (options.business && options.business.trim()) return options.business.trim();
-  const whoami = await apiFetch(config, "/api/auth/whoami");
-  if (whoami.businessId && whoami.businessId.trim()) return whoami.businessId;
-  throw new CliError("user", "--business is required when the authenticated token has no business context.");
-}
 function parsePollInterval2(value) {
   if (!value) return DEFAULT_POLL_INTERVAL_MS;
   const parsed = Number(value);
@@ -3731,9 +3746,6 @@ function parsePollInterval2(value) {
   }
   return parsed;
 }
-function sleep2(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function printBuildRequest(buildRequest) {
   console.log(
     [
@@ -3856,7 +3868,7 @@ function buildLogsPath(businessId, buildId, options = {}) {
   if (options.afterSequence != null) params.set("afterSequence", String(options.afterSequence));
   if (options.limit != null) params.set("limit", String(options.limit));
   const suffix = params.toString() ? `?${params.toString()}` : "";
-  return `/api/businesses/${encodePathSegment2(businessId)}/sandbox-layer/build-requests/${encodePathSegment2(
+  return `/api/businesses/${encodeURIComponent(businessId)}/sandbox-layer/build-requests/${encodeURIComponent(
     buildId
   )}/logs${suffix}`;
 }
@@ -3873,12 +3885,12 @@ async function waitForBuild(config, businessId, buildId, options) {
     }
     const status = await apiFetch(
       config,
-      `/api/businesses/${encodePathSegment2(businessId)}/sandbox-layer/build-requests/${encodePathSegment2(buildId)}`
+      `/api/businesses/${encodeURIComponent(businessId)}/sandbox-layer/build-requests/${encodeURIComponent(buildId)}`
     );
     if (TERMINAL_BUILD_STATUSES.has(status.buildRequest.status)) {
       return status.buildRequest;
     }
-    await sleep2(options.pollIntervalMs);
+    await sleep(options.pollIntervalMs);
   }
 }
 function formatValidationPayload(input) {
@@ -3953,11 +3965,7 @@ async function sandboxInitCommand(options = {}, command) {
     "utf8"
   );
   const payload = { ok: true, manifestPath: DEFAULT_MANIFEST_PATH, layerPath };
-  if (isJson(command, runtime)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Created ${DEFAULT_MANIFEST_PATH} and ${layerPath}`);
+  emit(command, runtime, payload, () => console.log(`Created ${DEFAULT_MANIFEST_PATH} and ${layerPath}`));
 }
 async function sandboxValidateCommand(options = {}, command) {
   const manifestPath = options.manifest ?? DEFAULT_MANIFEST_PATH;
@@ -3970,34 +3978,31 @@ async function sandboxValidateCommand(options = {}, command) {
     const layerText = readFileSync3(layerPath, "utf8");
     const parsed = await parseSandboxLayerSource({ manifestPath, manifestText, layerPath, layerText });
     const payload = formatValidationPayload({ manifestPath, layerPath, parsed });
-    if (isJson(command, options)) {
-      writeJson(payload);
-      return;
-    }
-    console.log("Valid sandbox template.");
-    console.log(`Manifest: ${payload.manifestPath}`);
-    console.log(`Layer: ${payload.layerPath}`);
-    console.log(`Normalized source hash: ${payload.normalizedSourceHash}`);
-    console.log(`Instructions: ${payload.instructionCount}`);
-    console.log(`Smoke commands: ${payload.smokeCommandCount}`);
-    console.log(`Next: ${nextBuildCommand(manifestPath)}`);
+    emit(command, options, payload, (validationPayload) => {
+      console.log("Valid sandbox template.");
+      console.log(`Manifest: ${validationPayload.manifestPath}`);
+      console.log(`Layer: ${validationPayload.layerPath}`);
+      console.log(`Normalized source hash: ${validationPayload.normalizedSourceHash}`);
+      console.log(`Instructions: ${validationPayload.instructionCount}`);
+      console.log(`Smoke commands: ${validationPayload.smokeCommandCount}`);
+      console.log(`Next: ${nextBuildCommand(manifestPath)}`);
+    });
   } catch (err) {
     handleValidationError(err, options, command);
   }
 }
 async function sandboxBuildCommand(sourceRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const manifestPath = options.manifest ?? DEFAULT_MANIFEST_PATH;
   assertManifestExists(manifestPath);
   if (!options.ref) assertCleanAndPushed();
   const sourceRepo = parseRepoArg2(sourceRepoArg, currentRepo);
   const targetRepo = options.targetRepo ? parseRepoArg2(options.targetRepo, currentRepo) : null;
-  const businessId = await resolveBusinessId2(config, options);
+  const businessId = await resolveBusinessId(config, options);
   const ref = options.ref ?? currentRef();
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/repos/${encodePathSegment2(sourceRepo.owner)}/${encodePathSegment2(
+    `/api/businesses/${encodeURIComponent(businessId)}/repos/${encodeURIComponent(sourceRepo.owner)}/${encodeURIComponent(
       sourceRepo.repo
     )}/sandbox-layer/build-requests`,
     {
@@ -4009,8 +4014,7 @@ async function sandboxBuildCommand(sourceRepoArg, options = {}, command) {
       })
     }
   );
-  if (isJson(command, options)) writeJson(payload);
-  else printBuildRequest(payload.buildRequest);
+  emit(command, options, payload, (buildPayload) => printBuildRequest(buildPayload.buildRequest));
   if (!options.wait && !options.follow) return;
   const json = isJson(command, options);
   const finalBuild = await waitForBuild(config, businessId, payload.buildRequest.id, {
@@ -4025,26 +4029,20 @@ async function sandboxBuildCommand(sourceRepoArg, options = {}, command) {
   }
 }
 async function sandboxStatusCommand(repoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   const repo = parseRepoArg2(repoArg, currentRepo);
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/repos/${encodePathSegment2(repo.owner)}/${encodePathSegment2(
+    `/api/businesses/${encodeURIComponent(businessId)}/repos/${encodeURIComponent(repo.owner)}/${encodeURIComponent(
       repo.repo
     )}/sandbox-layer/resolution`
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  printSandboxStatus(payload);
+  emit(command, options, payload, printSandboxStatus);
 }
 async function sandboxHistoryCommand(sourceRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   const sourceRepo = parseRepoArg2(sourceRepoArg, currentRepo);
   const params = new URLSearchParams({ sourceRepo: repoPath(sourceRepo) });
   if (options.targetRepo) params.set("targetRepo", repoPath(parseRepoArg2(options.targetRepo, currentRepo)));
@@ -4058,24 +4056,19 @@ async function sandboxHistoryCommand(sourceRepoArg, options = {}, command) {
   }
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/sandbox-layer/build-requests?${params.toString()}`
+    `/api/businesses/${encodeURIComponent(businessId)}/sandbox-layer/build-requests?${params.toString()}`
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  printBuildHistory(payload.builds);
+  emit(command, options, payload, (historyPayload) => printBuildHistory(historyPayload.builds));
 }
 async function sandboxRebuildStaleCommand(options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   if (!options.dryRun && !options.yes) {
     throw new CliError("user", "Use --dry-run to preview or --yes to start a rebuild campaign.");
   }
   if (options.all && options.business) {
     throw new CliError("user", "Use either --all or --business, not both.");
   }
-  const businessId = options.all ? null : await resolveBusinessId2(config, options);
+  const businessId = options.all ? null : await resolveBusinessId(config, options);
   let payload = await apiFetch(config, "/api/admin/sandbox-layer/rebuild-campaigns", {
     method: "POST",
     body: JSON.stringify({
@@ -4093,20 +4086,16 @@ async function sandboxRebuildStaleCommand(options = {}, command) {
   if (options.follow && !options.dryRun) {
     payload = await followRebuildCampaign(config, payload.campaign.id);
   }
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  printRebuildCampaign(payload);
+  emit(command, options, payload, printRebuildCampaign);
 }
 async function followRebuildCampaign(config, campaignId) {
   for (; ; ) {
     const payload = await apiFetch(
       config,
-      `/api/admin/sandbox-layer/rebuild-campaigns/${encodePathSegment2(campaignId)}`
+      `/api/admin/sandbox-layer/rebuild-campaigns/${encodeURIComponent(campaignId)}`
     );
     if (isCampaignTerminal(payload.campaign.status)) return payload;
-    await sleep2(DEFAULT_POLL_INTERVAL_MS);
+    await sleep(DEFAULT_POLL_INTERVAL_MS);
   }
 }
 function isCampaignTerminal(status) {
@@ -4130,9 +4119,8 @@ function printRebuildCampaign(payload) {
   }
 }
 async function sandboxLogsCommand(buildId, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   let afterSequence = options.afterSequence == null ? void 0 : Number(options.afterSequence);
   if (afterSequence != null && (!Number.isInteger(afterSequence) || afterSequence < 0)) {
     throw new CliError("user", "--after-sequence must be a non-negative integer.");
@@ -4150,88 +4138,72 @@ async function sandboxLogsCommand(buildId, options = {}, command) {
     else printLogs(payload.logs);
     if (!options.follow) return;
     if (payload.logs.length > 0) afterSequence = payload.logs[payload.logs.length - 1].sequence;
-    await sleep2(parsePollInterval2(options.pollInterval));
+    await sleep(parsePollInterval2(options.pollInterval));
   }
 }
 async function sandboxAssignDefaultCommand(sourceRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   const sourceRepo = parseRepoArg2(sourceRepoArg, currentRepo);
   const manifestPath = options.manifest ?? DEFAULT_MANIFEST_PATH;
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/sandbox-layer/default-source`,
+    `/api/businesses/${encodeURIComponent(businessId)}/sandbox-layer/default-source`,
     { method: "PUT", body: JSON.stringify(sourceBody(sourceRepo, manifestPath)) }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Set default sandbox layer source to ${repoPath(sourceRepo)}.`);
-  console.log(
-    `Build missing target coverage with: arcanist sandbox build ${repoPath(sourceRepo)} --business ${businessId}`
-  );
+  emit(command, options, payload, () => {
+    console.log(`Set default sandbox layer source to ${repoPath(sourceRepo)}.`);
+    console.log(
+      `Build missing target coverage with: arcanist sandbox build ${repoPath(sourceRepo)} --business ${businessId}`
+    );
+  });
 }
 async function sandboxAssignRepoCommand(targetRepoArg, sourceRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   const targetRepo = parseRepoArg2(targetRepoArg, currentRepo);
   const sourceRepo = parseRepoArg2(sourceRepoArg, currentRepo);
   const manifestPath = options.manifest ?? DEFAULT_MANIFEST_PATH;
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/repos/${encodePathSegment2(targetRepo.owner)}/${encodePathSegment2(
+    `/api/businesses/${encodeURIComponent(businessId)}/repos/${encodeURIComponent(targetRepo.owner)}/${encodeURIComponent(
       targetRepo.repo
     )}/sandbox-layer/assignment`,
     { method: "PUT", body: JSON.stringify(sourceBody(sourceRepo, manifestPath)) }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Assigned ${repoPath(sourceRepo)} as sandbox layer source for ${repoPath(targetRepo)}.`);
-  console.log(
-    `Build target coverage with: arcanist sandbox build ${repoPath(sourceRepo)} --target-repo ${repoPath(
-      targetRepo
-    )} --business ${businessId}`
-  );
+  emit(command, options, payload, () => {
+    console.log(`Assigned ${repoPath(sourceRepo)} as sandbox layer source for ${repoPath(targetRepo)}.`);
+    console.log(
+      `Build target coverage with: arcanist sandbox build ${repoPath(sourceRepo)} --target-repo ${repoPath(
+        targetRepo
+      )} --business ${businessId}`
+    );
+  });
 }
 async function sandboxUnassignDefaultCommand(options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   if (!options.yes) await confirmOrThrow("Clear the business default sandbox layer source?");
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/sandbox-layer/default-source`,
+    `/api/businesses/${encodeURIComponent(businessId)}/sandbox-layer/default-source`,
     { method: "DELETE" }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log("Cleared default sandbox layer source.");
+  emit(command, options, payload, () => console.log("Cleared default sandbox layer source."));
 }
 async function sandboxUnassignRepoCommand(targetRepoArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const businessId = await resolveBusinessId2(config, options);
+  const { config } = resolveBusinessContext(command, options);
+  const businessId = await resolveBusinessId(config, options);
   const targetRepo = parseRepoArg2(targetRepoArg, currentRepo);
   if (!options.yes) await confirmOrThrow(`Clear sandbox layer assignment for ${repoPath(targetRepo)}?`);
   const payload = await apiFetch(
     config,
-    `/api/businesses/${encodePathSegment2(businessId)}/repos/${encodePathSegment2(targetRepo.owner)}/${encodePathSegment2(
+    `/api/businesses/${encodeURIComponent(businessId)}/repos/${encodeURIComponent(targetRepo.owner)}/${encodeURIComponent(
       targetRepo.repo
     )}/sandbox-layer/assignment`,
     { method: "DELETE" }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Cleared sandbox layer assignment for ${repoPath(targetRepo)}.`);
+  emit(command, options, payload, () => console.log(`Cleared sandbox layer assignment for ${repoPath(targetRepo)}.`));
 }
 
 // src/commands/sessions.ts
@@ -4369,8 +4341,7 @@ async function usageCommand(sessionId, options, command) {
 
 // src/commands/stop.ts
 async function stopCommand(sessionId, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   let status;
   try {
     const response = await apiFetch(config, `/api/sessions/${sessionId}/stop`, {
@@ -4382,17 +4353,15 @@ async function stopCommand(sessionId, options = {}, command) {
     if (!parsed) throw err;
     status = parsed.reason;
   }
-  if (isJson(command, options)) {
-    writeJson({ sessionId, status });
-    return;
-  }
-  if (status === "already_stopped") {
-    console.log(`Session ${sessionId} is already stopped.`);
-  } else if (status === "stopping" || status === "stopped") {
-    console.log(`Stop requested for session ${sessionId}.`);
-  } else {
-    console.log(`Session ${sessionId} cannot be stopped from phase=${status}.`);
-  }
+  emit(command, options, { sessionId, status }, (payload) => {
+    if (payload.status === "already_stopped") {
+      console.log(`Session ${payload.sessionId} is already stopped.`);
+    } else if (payload.status === "stopping" || payload.status === "stopped") {
+      console.log(`Stop requested for session ${payload.sessionId}.`);
+    } else {
+      console.log(`Session ${payload.sessionId} cannot be stopped from phase=${payload.status}.`);
+    }
+  });
 }
 function parseStopBlocked(err) {
   if (!(err instanceof ApiError) || err.status !== 409) return null;
@@ -4428,26 +4397,22 @@ function readValue(options) {
   return raw.replace(/\r?\n$/, "");
 }
 async function listTestCredentialsCommand(repo, options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const repoArg = parseRepoArg3(repo);
   const payload = await apiFetch(config, basePath(options.business, repoArg));
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  if (payload.credentials.length === 0) {
-    console.log(`No test credentials configured for ${repoArg.owner}/${repoArg.name}.`);
-    return;
-  }
-  for (const cred of payload.credentials) {
-    const ts = new Date(cred.updatedAt).toISOString();
-    console.log(`${cred.name}	${ts}	${cred.rotatedByUserId ?? "-"}`);
-  }
+  emit(command, options, payload, (listPayload) => {
+    if (listPayload.credentials.length === 0) {
+      console.log(`No test credentials configured for ${repoArg.owner}/${repoArg.name}.`);
+      return;
+    }
+    for (const cred of listPayload.credentials) {
+      const ts = new Date(cred.updatedAt).toISOString();
+      console.log(`${cred.name}	${ts}	${cred.rotatedByUserId ?? "-"}`);
+    }
+  });
 }
 async function setTestCredentialCommand(repo, name, options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const repoArg = parseRepoArg3(repo);
   const value = readValue(options);
   const payload = await apiFetch(
@@ -4455,11 +4420,12 @@ async function setTestCredentialCommand(repo, name, options, command) {
     `${basePath(options.business, repoArg)}/${encodeURIComponent(name)}`,
     { method: "PUT", body: JSON.stringify({ value }) }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Set test credential '${name}' for ${repoArg.owner}/${repoArg.name}.`);
+  emit(
+    command,
+    options,
+    payload,
+    () => console.log(`Set test credential '${name}' for ${repoArg.owner}/${repoArg.name}.`)
+  );
 }
 async function deleteTestCredentialCommand(repo, name, options, command) {
   if (isJson(command, options) && options.yes !== true) {
@@ -4469,25 +4435,24 @@ async function deleteTestCredentialCommand(repo, name, options, command) {
     const repoArg2 = parseRepoArg3(repo);
     await confirmOrThrow(`Delete test credential '${name}' for ${repoArg2.owner}/${repoArg2.name}?`);
   }
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const repoArg = parseRepoArg3(repo);
   const payload = await apiFetch(
     config,
     `${basePath(options.business, repoArg)}/${encodeURIComponent(name)}`,
     { method: "DELETE" }
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Deleted test credential '${name}' for ${repoArg.owner}/${repoArg.name}.`);
+  emit(
+    command,
+    options,
+    payload,
+    () => console.log(`Deleted test credential '${name}' for ${repoArg.owner}/${repoArg.name}.`)
+  );
 }
 
 // src/commands/tokens.ts
 async function listTokensCommand(options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const query = new URLSearchParams();
   if (options.limit) query.set("limit", options.limit);
   if (options.cursor) query.set("cursor", options.cursor);
@@ -4495,24 +4460,21 @@ async function listTokensCommand(options, command) {
     config,
     `/api/cli-tokens${query.size ? `?${query.toString()}` : ""}`
   );
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  if (payload.data.length === 0) {
-    console.log("No CLI tokens found.");
-    return;
-  }
-  for (const token of payload.data) {
-    console.log(
-      `${String(token.id)}	${String(token.scope)}	${String(token.tokenPrefix)}	${String(token.revokedAt ? "revoked" : "active")}`
-    );
-  }
-  if (payload.nextCursor) console.log(`Next cursor: ${payload.nextCursor}`);
+  emit(command, options, payload, (listPayload) => {
+    if (listPayload.data.length === 0) {
+      console.log("No CLI tokens found.");
+      return;
+    }
+    for (const token of listPayload.data) {
+      console.log(
+        `${String(token.id)}	${String(token.scope)}	${String(token.tokenPrefix)}	${String(token.revokedAt ? "revoked" : "active")}`
+      );
+    }
+    if (listPayload.nextCursor) console.log(`Next cursor: ${listPayload.nextCursor}`);
+  });
 }
 async function createTokenCommand(options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const expiresInDays = options.expiresInDays === void 0 ? void 0 : Number(options.expiresInDays);
   if (expiresInDays !== void 0 && (!Number.isInteger(expiresInDays) || expiresInDays <= 0)) {
     throw new CliError("user", "expiresInDays must be a positive integer.");
@@ -4524,13 +4486,11 @@ async function createTokenCommand(options, command) {
       ...expiresInDays !== void 0 ? { expiresInDays } : {}
     })
   });
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Token: ${String(payload.token)}`);
-  console.log(`ID: ${String(payload.id)}`);
-  console.log(`Scope: ${String(payload.scope)}`);
+  emit(command, options, payload, (tokenPayload) => {
+    console.log(`Token: ${String(tokenPayload.token)}`);
+    console.log(`ID: ${String(tokenPayload.id)}`);
+    console.log(`Scope: ${String(tokenPayload.scope)}`);
+  });
 }
 async function revokeTokenCommand(tokenId, options, command) {
   if (isJson(command, options) && options.yes !== true) {
@@ -4539,28 +4499,18 @@ async function revokeTokenCommand(tokenId, options, command) {
   if (options.yes !== true) {
     await confirmOrThrow(`Revoke CLI token ${tokenId}?`);
   }
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const payload = await apiFetch(config, `/api/cli-tokens/${tokenId}/revoke`, {
     method: "POST"
   });
-  if (isJson(command, options)) {
-    writeJson(payload);
-    return;
-  }
-  console.log(`Revoked token ${tokenId}.`);
+  emit(command, options, payload, () => console.log(`Revoked token ${tokenId}.`));
 }
 
 // src/commands/transcript.ts
 async function transcriptCommand(sessionId, options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
+  const { config } = resolveBusinessContext(command, options);
   const exportData = await apiFetch(config, `/api/sessions/${sessionId}/export`);
-  if (isJson(command, options)) {
-    writeJson(exportData);
-    return;
-  }
-  console.log(renderSessionTranscript(exportData));
+  emit(command, options, exportData, (payload) => console.log(renderSessionTranscript(payload)));
 }
 
 // src/index.ts

package/package.json

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