@tryarcanist/cli 0.1.22 → 0.1.24

package/dist/index.js

@@ -272,158 +272,16 @@ async function whoamiCommand(options, command) {
   if (payload.tokenScope) console.log(`Token scope: ${String(payload.tokenScope)}`);
 }
 
-// src/commands/create.ts
-var REPO_URL_PATTERNS = [
-  /^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/,
-  /^git@[^:]+:[^/]+\/[^/]+?(?:\.git)?$/,
-  /^https?:\/\/github\.com\/[^/]+\/[^/]+?(?:\.git)?\/?$/
-];
-function validateRepoUrl(url) {
-  if (REPO_URL_PATTERNS.some((pattern) => pattern.test(url))) return null;
-  return `Invalid repo URL: "${url}". Expected a GitHub URL (https://github.com/owner/repo) or owner/repo shorthand.`;
-}
-async function createCommand(repoUrl, promptArg, options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const prompt = await resolvePromptInput(promptArg, options);
-  const repoError = validateRepoUrl(repoUrl);
-  if (repoError) {
-    throw new CliError("user", repoError);
-  }
-  const idempotencyKey = options.idempotencyKey ?? randomIdempotencyKey();
-  const sessionIdempotencyKey = `${idempotencyKey}:session`;
-  const promptIdempotencyKey = `${idempotencyKey}:prompt`;
-  const sessionData = await apiFetch(config, "/api/sessions", {
-    method: "POST",
-    headers: { "Idempotency-Key": sessionIdempotencyKey },
-    body: JSON.stringify({
-      context: { repoUrl },
-      ...options.model ? { model: options.model } : {}
-    })
-  });
-  const sessionId = sessionData.sessionId;
-  try {
-    const promptData = await apiFetch(config, `/api/sessions/${sessionId}/prompts`, {
-      method: "POST",
-      headers: { "Idempotency-Key": promptIdempotencyKey },
-      body: JSON.stringify({ prompt })
-    });
-    const promptId = promptData.prompt?.promptId ?? promptData.prompt?.id;
-    if (isJson(command, options)) {
-      writeJson({
-        sessionId,
-        ...sessionData.sessionUrl ? { sessionUrl: sessionData.sessionUrl } : {},
-        repoUrl,
-        ...options.model ? { model: options.model } : {},
-        ...promptId ? { promptId } : {}
-      });
-      return;
-    }
-  } catch (err) {
-    throw new CliError(err instanceof CliError ? err.code : "server", `Session created (${sessionId}) but prompt failed: ${err instanceof Error ? err.message : String(err)}`, {
-      exitCode: err instanceof CliError ? err.exitCode : void 0,
-      hint: `Retry with: arcanist sessions send ${sessionId} --prompt-stdin`,
-      requestId: err instanceof CliError ? err.requestId : void 0
-    });
-  }
-  console.log(`Session: ${sessionId}`);
-  if (sessionData.sessionUrl) console.log(`URL: ${sessionData.sessionUrl}`);
-}
-
-// src/commands/login.ts
-import { createInterface as createInterface2 } from "readline";
-async function loginCommand(options, command) {
-  const runtime = getRuntimeOptions(command, options);
-  let token;
-  if (options.tokenStdin) {
-    token = await readStdinTrimmed();
-  } else if (runtime.token) {
-    token = runtime.token;
-  } else {
-    token = await promptHidden("Enter your CLI token: ");
-  }
-  if (!token) {
-    throw new CliError("user", "No token provided.");
-  }
-  if (!token.startsWith("arc_")) {
-    throw new CliError("user", "Invalid token format. Token must start with 'arc_'.");
-  }
-  if (runtime.apiUrl) {
-    const urlError = validateApiUrl(runtime.apiUrl);
-    if (urlError) {
-      throw new CliError("user", urlError);
-    }
-  }
-  const apiUrl = normalizeBaseUrl(resolveLoginApiUrl(runtime.apiUrl));
-  saveConfig({ apiUrl, token });
-  if (runtime.json) {
-    writeJson({ ok: true, apiUrl });
-  } else if (!runtime.quiet) {
-    console.log(`Logged in. API: ${apiUrl}`);
-  }
-  try {
-    const res = await fetch(`${apiUrl}/api/cli-tokens`, {
-      headers: { Authorization: `Bearer ${token}`, "User-Agent": CLI_USER_AGENT }
-    });
-    if (res.ok && !runtime.json && !runtime.quiet) {
-      console.log("Token verified.");
-    } else if (res.status === 401 && !runtime.json && !runtime.quiet) {
-      console.warn("Warning: Token could not be verified (401). It may be invalid or expired.");
-    }
-  } catch {
-    if (!runtime.json && !runtime.quiet) console.warn("Warning: Could not reach API to verify token.");
-  }
-}
-function promptHidden(prompt) {
-  if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    return Promise.reject(new CliError("user", "No interactive terminal available. Re-run with --token-stdin or set ARCANIST_TOKEN."));
-  }
-  return new Promise((resolve, reject) => {
-    const rl = createInterface2({ input: process.stdin, output: process.stdout });
-    process.stdout.write(prompt);
-    const stdin = process.stdin;
-    if (stdin.isTTY) stdin.setRawMode(true);
-    let input = "";
-    const onData = (char) => {
-      const c = char.toString();
-      if (c === "\n" || c === "\r") {
-        if (stdin.isTTY) stdin.setRawMode(false);
-        stdin.removeListener("data", onData);
-        process.stdout.write("\n");
-        rl.close();
-        resolve(input);
-      } else if (c === "") {
-        if (stdin.isTTY) stdin.setRawMode(false);
-        stdin.removeListener("data", onData);
-        rl.close();
-        reject(new CliError("user", "Interrupted.", { exitCode: 130 }));
-      } else if (c === "\x7F" || c === "\b") {
-        input = input.slice(0, -1);
-      } else {
-        input += c;
-      }
-    };
-    stdin.on("data", onData);
-  });
+// ../../shared/utils/timing.ts
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-// src/commands/message.ts
-async function messageCommand(sessionId, promptArg, options = {}, command) {
-  const runtime = getRuntimeOptions(command, options);
-  const config = requireConfig(runtime);
-  const prompt = await resolvePromptInput(promptArg, options);
-  const response = await apiFetch(config, `/api/sessions/${sessionId}/prompts`, {
-    method: "POST",
-    headers: { "Idempotency-Key": options.idempotencyKey ?? randomIdempotencyKey() },
-    body: JSON.stringify({ prompt })
-  });
-  const promptId = response.prompt?.promptId ?? response.prompt?.id;
-  if (isJson(command, options)) {
-    writeJson({ sessionId, ...promptId ? { promptId } : {} });
-    return;
-  }
-  console.log(`Message sent to session ${sessionId}.`);
-}
+// src/constants/watch.ts
+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"]);
 
 // ../../shared/utils/type-guards.ts
 function isRecord(value) {
@@ -1178,16 +1036,6 @@ function renderWatchEvent(event, state) {
   }
 }
 
-// ../../shared/utils/timing.ts
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-// src/constants/watch.ts
-var DEFAULT_WATCH_POLL_INTERVAL_MS = 1e3;
-var WATCH_REPLAY_PAGE_SIZE = 200;
-var WATCH_TERMINAL_STATUSES = /* @__PURE__ */ new Set(["idle", "archived"]);
-
 // src/commands/watch.ts
 function parsePollInterval(raw) {
   if (!raw) return DEFAULT_WATCH_POLL_INTERVAL_MS;
@@ -1213,10 +1061,26 @@ async function fetchPromptLabels(config, sessionId) {
   const data = await apiFetch(config, `/api/sessions/${sessionId}/prompts`);
   return buildPromptLabelMap(data.prompts);
 }
+function extractSessionStatus(payload) {
+  const session = payload.session;
+  if (session && typeof session === "object" && typeof session.status === "string") {
+    return String(session.status);
+  }
+  return typeof payload.status === "string" ? payload.status : "unknown";
+}
+async function waitForSessionToBecomeIdle(config, sessionId, pollIntervalMs) {
+  const effectivePollIntervalMs = Math.max(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
+  while (true) {
+    const payload = await apiFetch(config, `/api/sessions/${sessionId}`);
+    if (WATCH_TERMINAL_STATUSES.has(extractSessionStatus(payload))) return;
+    await sleep(effectivePollIntervalMs);
+  }
+}
 async function watchCommand(sessionId, options, command) {
   const runtime = getRuntimeOptions(command, options);
   const config = requireConfig(runtime);
   const pollIntervalMs = parsePollInterval(options.pollInterval);
+  const effectivePollIntervalMs = Math.max(pollIntervalMs, MIN_WATCH_POLL_INTERVAL_MS);
   const initialAfterSequence = parseNonNegativeInteger(options.afterSequence, "--after-sequence", 0);
   const pageSize = parseNonNegativeInteger(options.limit, "--limit", WATCH_REPLAY_PAGE_SIZE);
   if (pageSize === 0) {
@@ -1285,15 +1149,214 @@ async function watchCommand(sessionId, options, command) {
       }
       if (receivedFullPage) continue;
       if (parsed.status?.status && WATCH_TERMINAL_STATUSES.has(parsed.status.status)) break;
-      if (pollIntervalMs > 0) {
-        await sleep(pollIntervalMs);
-      }
+      await sleep(effectivePollIntervalMs);
     }
   } finally {
     if (textOpen) process.stdout.write("\n");
   }
 }
 
+// src/commands/create.ts
+var REPO_URL_PATTERNS = [
+  /^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/,
+  /^git@[^:]+:[^/]+\/[^/]+?(?:\.git)?$/,
+  /^https?:\/\/github\.com\/[^/]+\/[^/]+?(?:\.git)?\/?$/
+];
+function validateRepoUrl(url) {
+  if (REPO_URL_PATTERNS.some((pattern) => pattern.test(url))) return null;
+  return `Invalid repo URL: "${url}". Expected a GitHub URL (https://github.com/owner/repo) or owner/repo shorthand.`;
+}
+function selectCreatedPrompt(prompts, promptId) {
+  if (prompts.length === 0) return null;
+  if (promptId) {
+    return prompts.find((prompt) => prompt.promptId === promptId) ?? null;
+  }
+  return prompts[prompts.length - 1] ?? null;
+}
+function buildPromptFailureError(sessionId, prompt, sessionUrl) {
+  const baseMessage = prompt.error?.trim() || "Prompt execution failed.";
+  const location = sessionUrl ? ` ${sessionUrl}` : "";
+  return new CliError("user", `Prompt failed in session ${sessionId}: ${baseMessage}${location}`, {
+    hint: `Inspect with: arcanist sessions transcript ${sessionId}`
+  });
+}
+async function waitForCreatedPrompt(sessionId, promptId, sessionUrl, pollIntervalMs, runtime, command) {
+  const config = requireConfig(runtime);
+  const jsonMode = isJson(command, runtime);
+  if (jsonMode) {
+    await waitForSessionToBecomeIdle(config, sessionId, pollIntervalMs);
+  } else {
+    await watchCommand(sessionId, { ...runtime, pollInterval: String(pollIntervalMs) }, command);
+  }
+  const promptList = await apiFetch(config, `/api/sessions/${sessionId}/prompts`);
+  const createdPrompt = selectCreatedPrompt(promptList.prompts, promptId);
+  if (!createdPrompt) {
+    throw new CliError("server", `Prompt status was unavailable after session ${sessionId} became idle.`, {
+      hint: `Inspect with: arcanist sessions transcript ${sessionId}`
+    });
+  }
+  if (createdPrompt.status === "failed") {
+    throw buildPromptFailureError(sessionId, createdPrompt, sessionUrl);
+  }
+  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}).`, {
+      hint: `Inspect with: arcanist sessions transcript ${sessionId}`
+    });
+  }
+}
+async function createCommand(repoUrl, promptArg, options, command) {
+  const runtime = getRuntimeOptions(command, options);
+  const config = requireConfig(runtime);
+  const prompt = await resolvePromptInput(promptArg, options);
+  const waitPollIntervalMs = options.wait ? parsePollInterval(options.pollInterval) : null;
+  const repoError = validateRepoUrl(repoUrl);
+  if (repoError) {
+    throw new CliError("user", repoError);
+  }
+  const idempotencyKey = options.idempotencyKey ?? randomIdempotencyKey();
+  const sessionIdempotencyKey = `${idempotencyKey}:session`;
+  const promptIdempotencyKey = `${idempotencyKey}:prompt`;
+  const sessionData = await apiFetch(config, "/api/sessions", {
+    method: "POST",
+    headers: { "Idempotency-Key": sessionIdempotencyKey },
+    body: JSON.stringify({
+      context: { repoUrl },
+      ...options.model ? { model: options.model } : {}
+    })
+  });
+  const sessionId = sessionData.sessionId;
+  let promptId;
+  try {
+    const promptData = await apiFetch(config, `/api/sessions/${sessionId}/prompts`, {
+      method: "POST",
+      headers: { "Idempotency-Key": promptIdempotencyKey },
+      body: JSON.stringify({ prompt })
+    });
+    promptId = promptData.prompt?.promptId ?? promptData.prompt?.id;
+  } catch (err) {
+    throw new CliError(err instanceof CliError ? err.code : "server", `Session created (${sessionId}) but prompt failed: ${err instanceof Error ? err.message : String(err)}`, {
+      exitCode: err instanceof CliError ? err.exitCode : void 0,
+      hint: `Retry with: arcanist sessions send ${sessionId} --prompt-stdin`,
+      requestId: err instanceof CliError ? err.requestId : void 0
+    });
+  }
+  if (options.wait) {
+    if (!isJson(command, options)) {
+      console.log(`Session: ${sessionId}`);
+      if (sessionData.sessionUrl) console.log(`URL: ${sessionData.sessionUrl}`);
+    }
+    await waitForCreatedPrompt(sessionId, promptId, sessionData.sessionUrl, waitPollIntervalMs, runtime, command);
+  }
+  if (isJson(command, options)) {
+    writeJson({
+      sessionId,
+      ...sessionData.sessionUrl ? { sessionUrl: sessionData.sessionUrl } : {},
+      repoUrl,
+      ...options.model ? { model: options.model } : {},
+      ...promptId ? { promptId } : {}
+    });
+    return;
+  }
+  if (options.wait) return;
+  console.log(`Session: ${sessionId}`);
+  if (sessionData.sessionUrl) console.log(`URL: ${sessionData.sessionUrl}`);
+}
+
+// src/commands/login.ts
+import { createInterface as createInterface2 } from "readline";
+async function loginCommand(options, command) {
+  const runtime = getRuntimeOptions(command, options);
+  let token;
+  if (options.tokenStdin) {
+    token = await readStdinTrimmed();
+  } else if (runtime.token) {
+    token = runtime.token;
+  } else {
+    token = await promptHidden("Enter your CLI token: ");
+  }
+  if (!token) {
+    throw new CliError("user", "No token provided.");
+  }
+  if (!token.startsWith("arc_")) {
+    throw new CliError("user", "Invalid token format. Token must start with 'arc_'.");
+  }
+  if (runtime.apiUrl) {
+    const urlError = validateApiUrl(runtime.apiUrl);
+    if (urlError) {
+      throw new CliError("user", urlError);
+    }
+  }
+  const apiUrl = normalizeBaseUrl(resolveLoginApiUrl(runtime.apiUrl));
+  saveConfig({ apiUrl, token });
+  if (runtime.json) {
+    writeJson({ ok: true, apiUrl });
+  } else if (!runtime.quiet) {
+    console.log(`Logged in. API: ${apiUrl}`);
+  }
+  try {
+    const res = await fetch(`${apiUrl}/api/cli-tokens`, {
+      headers: { Authorization: `Bearer ${token}`, "User-Agent": CLI_USER_AGENT }
+    });
+    if (res.ok && !runtime.json && !runtime.quiet) {
+      console.log("Token verified.");
+    } else if (res.status === 401 && !runtime.json && !runtime.quiet) {
+      console.warn("Warning: Token could not be verified (401). It may be invalid or expired.");
+    }
+  } catch {
+    if (!runtime.json && !runtime.quiet) console.warn("Warning: Could not reach API to verify token.");
+  }
+}
+function promptHidden(prompt) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    return Promise.reject(new CliError("user", "No interactive terminal available. Re-run with --token-stdin or set ARCANIST_TOKEN."));
+  }
+  return new Promise((resolve, reject) => {
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    process.stdout.write(prompt);
+    const stdin = process.stdin;
+    if (stdin.isTTY) stdin.setRawMode(true);
+    let input = "";
+    const onData = (char) => {
+      const c = char.toString();
+      if (c === "\n" || c === "\r") {
+        if (stdin.isTTY) stdin.setRawMode(false);
+        stdin.removeListener("data", onData);
+        process.stdout.write("\n");
+        rl.close();
+        resolve(input);
+      } else if (c === "") {
+        if (stdin.isTTY) stdin.setRawMode(false);
+        stdin.removeListener("data", onData);
+        rl.close();
+        reject(new CliError("user", "Interrupted.", { exitCode: 130 }));
+      } else if (c === "\x7F" || c === "\b") {
+        input = input.slice(0, -1);
+      } else {
+        input += c;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
+
+// src/commands/message.ts
+async function messageCommand(sessionId, promptArg, options = {}, command) {
+  const runtime = getRuntimeOptions(command, options);
+  const config = requireConfig(runtime);
+  const prompt = await resolvePromptInput(promptArg, options);
+  const response = await apiFetch(config, `/api/sessions/${sessionId}/prompts`, {
+    method: "POST",
+    headers: { "Idempotency-Key": options.idempotencyKey ?? randomIdempotencyKey() },
+    body: JSON.stringify({ prompt })
+  });
+  const promptId = response.prompt?.promptId ?? response.prompt?.id;
+  if (isJson(command, options)) {
+    writeJson({ sessionId, ...promptId ? { promptId } : {} });
+    return;
+  }
+  console.log(`Message sent to session ${sessionId}.`);
+}
+
 // src/commands/sessions.ts
 async function listSessionsCommand(options, command) {
   const runtime = getRuntimeOptions(command, options);
@@ -1501,10 +1564,11 @@ program.hook("preAction", (_thisCommand, actionCommand) => {
   applyColorEnvironment(getRuntimeOptions(actionCommand));
 });
 function addCreateOptions(cmd) {
-  return cmd.argument("<repo-url>", "Repository URL").argument("[prompt]", "Prompt to send, or '-' to read stdin").option("--model <model>", "Model to use").option("--prompt-stdin", "Read prompt from stdin").option("--idempotency-key <uuid>", "Request idempotency key for safe manual retries").addHelpText("after", `
+  return cmd.argument("<repo-url>", "Repository URL").argument("[prompt]", "Prompt to send, or '-' to read stdin").option("--model <model>", "Model to use").option("--prompt-stdin", "Read prompt from stdin").option("--wait", "Wait for the created prompt to finish and exit non-zero if it fails").option("--poll-interval <ms>", "Polling interval in milliseconds while waiting", String(DEFAULT_WATCH_POLL_INTERVAL_MS)).option("--idempotency-key <uuid>", "Request idempotency key for safe manual retries").addHelpText("after", `
 Examples:
   arcanist sessions create https://github.com/org/repo "fix bug"
   printf "fix bug" | arcanist sessions create https://github.com/org/repo --prompt-stdin --json
+  printf "fix bug" | arcanist sessions create https://github.com/org/repo --prompt-stdin --wait
   arcanist sessions create https://github.com/org/repo - --json | jq -r .sessionId | xargs -I{} arcanist sessions events {} --follow --json
 `);
 }

package/package.json

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