@tryarcanist/cli 0.1.2 → 0.1.4

package/dist/index.js

@@ -73,13 +73,13 @@ function validateApiUrl(url) {
 }
 
 // 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) {
-  const shorthand = /^[a-zA-Z0-9_.-]+\/[a-zA-Z0-9_.-]+$/.test(url);
-  if (shorthand) return null;
-  const ssh = /^git@[^:]+:[^/]+\/[^/]+?(?:\.git)?$/.test(url);
-  if (ssh) return null;
-  const https = /^https?:\/\/github\.com\/[^/]+\/[^/]+?(?:\.git)?\/?$/.test(url);
-  if (https) return null;
+  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, prompt, options) {
@@ -139,7 +139,6 @@ async function loginCommand(options) {
     console.error("Error: Invalid token format. Token must start with 'arc_'.");
     process.exit(1);
   }
-  const apiUrl = options.apiUrl ?? loadConfig()?.apiUrl ?? "https://app.tryarcanist.com";
   if (options.apiUrl) {
     const urlError = validateApiUrl(options.apiUrl);
     if (urlError) {
@@ -147,6 +146,7 @@ async function loginCommand(options) {
       process.exit(1);
     }
   }
+  const apiUrl = options.apiUrl ?? loadConfig()?.apiUrl ?? "https://app.tryarcanist.com";
   saveConfig({ apiUrl, token });
   console.log(`Logged in. API: ${apiUrl}`);
   try {
@@ -222,24 +222,32 @@ async function stopCommand(sessionId) {
 // src/utils/session-output.ts
 function flattenSessionEvents(raw) {
   const merged = [];
-  const textIndexById = /* @__PURE__ */ new Map();
+  const streamableIndexById = /* @__PURE__ */ new Map();
   const toolCallIndexById = /* @__PURE__ */ new Map();
   for (const event of raw) {
     const data = event.data ?? {};
     if (event.type === "sandbox_compaction_start") {
-      merged.push({ type: "compaction_start", id: `cs-${data.timestamp ?? merged.length}` });
+      const entry2 = { type: "compaction_start", id: `cs-${data.timestamp ?? merged.length}` };
+      if (data.contextTokens != null) entry2.contextTokens = data.contextTokens;
+      merged.push(entry2);
       continue;
     }
     if (event.type === "sandbox_compaction_complete") {
-      merged.push({ type: "compaction_complete", id: `cc-${data.timestamp ?? merged.length}` });
+      const entry2 = { type: "compaction_complete", id: `cc-${data.timestamp ?? merged.length}` };
+      if (data.contextTokensBefore != null) entry2.contextTokensBefore = data.contextTokensBefore;
+      if (data.contextTokensAfter != null) entry2.contextTokensAfter = data.contextTokensAfter;
+      merged.push(entry2);
       continue;
     }
     if (event.type === "sandbox_context_fill_warning") {
-      merged.push({
+      const entry2 = {
         type: "context_fill_warning",
         id: `cfw-${data.timestamp ?? merged.length}`,
         fillPercent: Number(data.fillPercent ?? 0)
-      });
+      };
+      if (data.contextTokens != null) entry2.contextTokens = data.contextTokens;
+      if (data.contextWindow != null) entry2.contextWindow = data.contextWindow;
+      merged.push(entry2);
       continue;
     }
     if (event.type === "sandbox_tool_truncated") {
@@ -255,12 +263,13 @@ function flattenSessionEvents(raw) {
       continue;
     }
     if (event.type === "session_error") {
-      merged.push({
+      const entry2 = {
         type: "session_error",
         id: String(data.id ?? `err-${merged.length}`),
-        error: String(data.error ?? "Unknown error"),
-        ...data.code ? { code: String(data.code) } : {}
-      });
+        error: String(data.error ?? "Unknown error")
+      };
+      if (data.code) entry2.code = String(data.code);
+      merged.push(entry2);
       continue;
     }
     if (event.type === "raw_opencode") {
@@ -270,12 +279,12 @@ function flattenSessionEvents(raw) {
     if (event.type === "reasoning") {
       const id = String(data.id ?? `reasoning-${merged.length}`);
       const text = String(data.text ?? "");
-      const existingIdx = textIndexById.get(id);
+      const existingIdx = streamableIndexById.get(id);
       if (existingIdx !== void 0) {
         const existing = merged[existingIdx];
         if (existing.type === "reasoning") existing.text += text;
       } else {
-        textIndexById.set(id, merged.length);
+        streamableIndexById.set(id, merged.length);
         merged.push({ type: "reasoning", id, text });
       }
       continue;
@@ -304,32 +313,35 @@ function flattenSessionEvents(raw) {
     if (event.type === "text") {
       const id = String(data.id ?? `text-${merged.length}`);
       const text = String(data.text ?? "");
-      const existingIdx = textIndexById.get(id);
+      const existingIdx = streamableIndexById.get(id);
       if (existingIdx !== void 0) {
         const existing = merged[existingIdx];
         if (existing.type === "text") existing.text += text;
       } else {
-        textIndexById.set(id, merged.length);
+        streamableIndexById.set(id, merged.length);
         merged.push({ type: "text", id, text });
       }
       continue;
     }
     if (event.type === "tool_call") {
       const id = String(data.id ?? `tool-${merged.length}`);
-      const nextEvent = {
+      const entry2 = {
         type: "tool_call",
         id,
         tool: String(data.tool ?? "unknown"),
-        summary: String(data.summary ?? ""),
-        ...data.input && typeof data.input === "object" ? { input: data.input } : {}
+        summary: String(data.summary ?? "")
       };
+      if (data.input && typeof data.input === "object") entry2.input = data.input;
       const existingIdx = toolCallIndexById.get(id);
       if (existingIdx !== void 0) {
         const prev = merged[existingIdx];
-        if (prev.type === "tool_call") merged[existingIdx] = { ...nextEvent, ...prev.toolStatus ? { toolStatus: prev.toolStatus } : {} };
+        if (prev.type === "tool_call") {
+          if (prev.toolStatus) entry2.toolStatus = prev.toolStatus;
+          merged[existingIdx] = entry2;
+        }
       } else {
         toolCallIndexById.set(id, merged.length);
-        merged.push(nextEvent);
+        merged.push(entry2);
       }
       continue;
     }
@@ -338,19 +350,20 @@ function flattenSessionEvents(raw) {
       const existingIdx = toolCallIndexById.get(id);
       if (existingIdx !== void 0) {
         const prev = merged[existingIdx];
-        if (prev.type === "tool_call") {
-          merged[existingIdx] = { ...prev, ...data.status ? { toolStatus: String(data.status) } : {} };
+        if (prev.type === "tool_call" && data.status) {
+          prev.toolStatus = String(data.status);
         }
       }
       continue;
     }
-    merged.push({
+    const entry = {
       type: "question",
       id: String(data.id ?? `question-${merged.length}`),
       question: String(data.question ?? ""),
-      answer: data.answer == null ? null : String(data.answer),
-      ...Array.isArray(data.options) ? { options: data.options } : {}
-    });
+      answer: data.answer == null ? null : String(data.answer)
+    };
+    if (Array.isArray(data.options)) entry.options = data.options;
+    merged.push(entry);
   }
   return merged;
 }
@@ -396,11 +409,17 @@ ${event.text}
 ${event.answer ? `**Answer:** ${event.answer}
 ` : ""}`;
     case "compaction_start":
-      return "*[context compacted]*\n";
+      return event.contextTokens ? `*[compacting context at ${Math.round(event.contextTokens / 1e3)}k tokens]*
+` : "*[compacting context]*\n";
     case "compaction_complete":
-      return "";
+      if (event.contextTokensBefore && event.contextTokensAfter && event.contextTokensBefore > 0) {
+        const savedPct = Math.round((1 - event.contextTokensAfter / event.contextTokensBefore) * 100);
+        return `*[context compacted: ${Math.round(event.contextTokensBefore / 1e3)}k \u2192 ${Math.round(event.contextTokensAfter / 1e3)}k (${savedPct}% saved)]*
+`;
+      }
+      return "*[context compacted]*\n";
     case "context_fill_warning":
-      return `*[context ${event.fillPercent}% full]*
+      return `*[context ${Math.round(event.fillPercent * 100)}% full]*
 `;
     case "tool_truncated":
       return `*[${event.tool} output truncated]*
@@ -481,7 +500,9 @@ function parseSsePayload(payload) {
   let currentData = [];
   function flush() {
     if (currentData.length === 0 && currentId === void 0 && currentEvent === "message") return;
-    messages.push({ event: currentEvent, ...currentId !== void 0 ? { id: currentId } : {}, data: currentData.join("\n") });
+    const msg = { event: currentEvent, data: currentData.join("\n") };
+    if (currentId !== void 0) msg.id = currentId;
+    messages.push(msg);
     currentEvent = "message";
     currentId = void 0;
     currentData = [];
@@ -511,11 +532,14 @@ function parseSsePayload(payload) {
   for (const message of messages) {
     const data = message.data ? parseJsonObject(message.data) : {};
     if (message.event === "status") {
-      status = {
-        status: typeof data.status === "string" ? data.status : "unknown",
-        ...typeof data.title === "string" ? { title: data.title } : {},
-        ...typeof data.spawnDurationMs === "number" || data.spawnDurationMs === null ? { spawnDurationMs: data.spawnDurationMs } : {}
+      const entry = {
+        status: typeof data.status === "string" ? data.status : "unknown"
       };
+      if (typeof data.title === "string") entry.title = data.title;
+      if (typeof data.spawnDurationMs === "number" || data.spawnDurationMs === null) {
+        entry.spawnDurationMs = data.spawnDurationMs;
+      }
+      status = entry;
       continue;
     }
     events.push({
@@ -656,13 +680,7 @@ async function fetchPromptLabels(config, sessionId) {
 }
 async function watchCommand(sessionId, options) {
   const config = requireConfig();
-  let pollIntervalMs;
-  try {
-    pollIntervalMs = parsePollInterval(options.pollInterval);
-  } catch (err) {
-    console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-    process.exit(1);
-  }
+  const pollIntervalMs = parsePollInterval(options.pollInterval);
   let promptLabels = /* @__PURE__ */ new Map();
   try {
     promptLabels = await fetchPromptLabels(config, sessionId);
@@ -683,7 +701,7 @@ async function watchCommand(sessionId, options) {
         afterSequence: String(afterSequence),
         limit: String(WATCH_REPLAY_PAGE_SIZE)
       });
-      const payload = await apiFetchText(config, `/api/sessions/${sessionId}/events?${query.toString()}`);
+      const payload = await apiFetchText(config, `/api/sessions/${sessionId}/events?${query}`);
       const parsed = parseSsePayload(payload);
       const receivedFullPage = parsed.events.length >= WATCH_REPLAY_PAGE_SIZE;
       if (parsed.status) {

package/package.json

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