@cursor/july 0.1.26 → 0.1.28

package/src/internal/cli-ax.ts

@@ -9,7 +9,7 @@
 
 import { mkdir, mkdtemp, writeFile } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { join, resolve } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { Artifacts, JUnit } from "../evals/reporters.js";
 import type {
   EvalAssertionResult,
@@ -50,6 +50,7 @@ import {
 } from "./init-project.js";
 import { offerInstallCursorSkills } from "./install-cursor-skills.js";
 import { runLogsTail, sanitizeCustomerError } from "./logs-client.js";
+import { mapPool } from "./map-pool.js";
 import { openBrowser } from "./open-browser.js";
 import { startPlaygroundProxy } from "./playground-proxy.js";
 import {
@@ -59,6 +60,12 @@ import {
   resolveProdTarget,
 } from "./resolve-prod-target.js";
 import { runSession } from "./run-client.js";
+import {
+  buildSessionCostReport,
+  formatSessionCostText,
+  formatSessionsCostText,
+  type SessionCostRow,
+} from "./session-cost.js";
 import {
   fetchSessionEvents,
   formatSessionsTable,
@@ -115,6 +122,12 @@ export interface AxCliOptions {
   skipReport?: boolean;
   /** `eval`: override `evals.config.ts` `maxConcurrency`. */
   maxConcurrency?: number;
+  /**
+   * `eval` / `eval status <runId>`: also write the full results JSON to this
+   * path. `session`: write the raw NDJSON trace (same format as `run
+   * --events` and the playground download) to this path instead of printing.
+   */
+  out?: string;
   /** Scaffold target directory for `init`. */
   initTarget?: string;
   /** Tool name for `call`. */
@@ -787,6 +800,18 @@ export async function cmdEval(options: AxCliOptions): Promise<number> {
       return 2;
     }
   }
+  if (trimNonEmpty(options.out) !== undefined) {
+    if (options.list === true) {
+      process.stderr.write("--out and --list are mutually exclusive\n");
+      return 2;
+    }
+    if (options.noWait === true) {
+      process.stderr.write(
+        `--out needs the finished results; drop --no-wait, or poll later with ${CLI_COMMAND_NAME} eval status <evalId> --out <path>\n`
+      );
+      return 2;
+    }
+  }
 
   const filterIds =
     options.evalIds === undefined || options.evalIds.length === 0
@@ -881,7 +906,12 @@ export async function cmdEval(options: AxCliOptions): Promise<number> {
           process.stderr.write("No matching evals found.\n");
           return 2;
         }
-        return printEvalResults(results, options, undefined, artifactsDir);
+        return await printEvalResults(
+          results,
+          options,
+          undefined,
+          artifactsDir
+        );
       } finally {
         progress?.close();
       }
@@ -937,7 +967,7 @@ export async function cmdEval(options: AxCliOptions): Promise<number> {
         process.stderr.write("No matching evals found.\n");
         return 2;
       }
-      return printEvalResults(results, options, {
+      return await printEvalResults(results, options, {
         runId: snapshot.runId,
         status: snapshot.status,
         error: snapshot.error,
@@ -1042,8 +1072,8 @@ async function printEvalAccepted(
     agentUrl
   );
   if (options.json) {
-    console.log(
-      JSON.stringify(
+    process.stdout.write(
+      `${JSON.stringify(
         {
           ok: true,
           accepted: true,
@@ -1057,7 +1087,7 @@ async function printEvalAccepted(
         },
         null,
         2
-      )
+      )}\n`
     );
   } else {
     const durable = started.config.durableRuns === true ? " (persisted)" : "";
@@ -1161,7 +1191,7 @@ export async function cmdEvalCancel(
       fetchImpl: options.fetchImpl,
     });
     if (options.json) {
-      console.log(JSON.stringify(snap, null, 2));
+      process.stdout.write(`${JSON.stringify(snap, null, 2)}\n`);
     } else {
       process.stdout.write(
         `Cancelled Eval ID ${snap.runId} (${snap.summary.done}/${snap.summary.total} cases finalized)\n`
@@ -1207,6 +1237,13 @@ export async function cmdEvalStatus(
     process.stderr.write("eval status does not accept --list or --no-wait\n");
     return 2;
   }
+  if (
+    trimNonEmpty(options.out) !== undefined &&
+    (runId === undefined || runId === "")
+  ) {
+    process.stderr.write("eval status --out requires an eval id\n");
+    return 2;
+  }
 
   const target = await resolveEvalTarget(options);
   if (typeof target === "number") {
@@ -1225,7 +1262,9 @@ export async function cmdEvalStatus(
         fetchImpl: options.fetchImpl,
       });
       if (options.json) {
-        console.log(JSON.stringify({ runs, activeRunId }, null, 2));
+        process.stdout.write(
+          `${JSON.stringify({ runs, activeRunId }, null, 2)}\n`
+        );
       } else if (runs.length === 0) {
         process.stdout.write("No eval runs on this agent.\n");
       } else {
@@ -1245,8 +1284,12 @@ export async function cmdEvalStatus(
       auth,
       fetchImpl: options.fetchImpl,
     });
+    const outPath = await writeJsonOutFile(options.out, snap);
     if (options.json) {
-      console.log(JSON.stringify(snap, null, 2));
+      process.stdout.write(`${JSON.stringify(snap, null, 2)}\n`);
+      if (outPath !== undefined) {
+        process.stderr.write(`results: ${outPath}\n`);
+      }
     } else {
       process.stdout.write(`${formatEvalRunSummaryLine(snap)}\n`);
       if (snap.error !== undefined && snap.error !== "") {
@@ -1264,6 +1307,9 @@ export async function cmdEvalStatus(
           process.stdout.write(`    error: ${c.error}\n`);
         }
       }
+      if (outPath !== undefined) {
+        process.stdout.write(`results: ${outPath}\n`);
+      }
     }
     if (snap.status === "running") {
       return 3;
@@ -1326,7 +1372,7 @@ function printListedEvals(
   emptyMessage: string
 ): number {
   if (options.json) {
-    console.log(JSON.stringify(listed, null, 2));
+    process.stdout.write(`${JSON.stringify(listed, null, 2)}\n`);
   } else if (listed.length === 0) {
     process.stdout.write(`${emptyMessage}\n`);
   } else {
@@ -1431,7 +1477,7 @@ const EVAL_VERDICT_LABEL: Record<EvalVerdict, string> = {
   skipped: "SKIP",
 };
 
-function printEvalResults(
+async function printEvalResults(
   results: EvalRunResult[],
   options: AxCliOptions,
   batch?: {
@@ -1440,7 +1486,7 @@ function printEvalResults(
     error?: string;
   },
   artifactsDir?: string
-): number {
+): Promise<number> {
   const strict = options.strict === true;
   const counts = { passed: 0, failed: 0, scored: 0, skipped: 0 };
   for (const result of results) {
@@ -1455,28 +1501,29 @@ function printEvalResults(
     process.stderr.write(`eval run error: ${batch.error}\n`);
   }
 
+  const payload = {
+    ok,
+    passed: counts.passed,
+    failed: counts.failed,
+    scored: counts.scored,
+    skipped: counts.skipped,
+    strict,
+    results,
+    ...(artifactsDir === undefined ? {} : { artifactsDir }),
+    ...(batch?.runId === undefined ? {} : { runId: batch.runId }),
+    ...(batch?.status === undefined ? {} : { status: batch.status }),
+    ...(batch?.error === undefined || batch.error === ""
+      ? {}
+      : { error: batch.error }),
+  };
+  const outPath = await writeJsonOutFile(options.out, payload);
+
   if (options.json) {
-    console.log(
-      JSON.stringify(
-        {
-          ok,
-          passed: counts.passed,
-          failed: counts.failed,
-          scored: counts.scored,
-          skipped: counts.skipped,
-          strict,
-          results,
-          ...(artifactsDir === undefined ? {} : { artifactsDir }),
-          ...(batch?.runId === undefined ? {} : { runId: batch.runId }),
-          ...(batch?.status === undefined ? {} : { status: batch.status }),
-          ...(batch?.error === undefined || batch.error === ""
-            ? {}
-            : { error: batch.error }),
-        },
-        null,
-        2
-      )
-    );
+    process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+    if (outPath !== undefined) {
+      // stdout stays pure JSON; report the file on stderr.
+      process.stderr.write(`results: ${outPath}\n`);
+    }
   } else {
     for (const r of results) {
       const verdict = evalVerdictOf(r);
@@ -1525,10 +1572,31 @@ function printEvalResults(
     if (artifactsDir !== undefined) {
       process.stdout.write(`artifacts: ${artifactsDir}\n`);
     }
+    if (outPath !== undefined) {
+      process.stdout.write(`results: ${outPath}\n`);
+    }
   }
   return ok ? 0 : 1;
 }
 
+/**
+ * `--out <path>`: write a JSON payload (results / run snapshot), creating
+ * parent directories. Returns the resolved path, or undefined when unset.
+ */
+async function writeJsonOutFile(
+  out: string | undefined,
+  payload: unknown
+): Promise<string | undefined> {
+  const trimmed = trimNonEmpty(out);
+  if (trimmed === undefined) {
+    return undefined;
+  }
+  const target = resolve(trimmed);
+  await mkdir(dirname(target), { recursive: true });
+  await writeFile(target, `${JSON.stringify(payload, null, 2)}\n`, "utf8");
+  return target;
+}
+
 /**
  * One assertion line. Soft assertions read `~` rather than `✗` when they miss,
  * so a tracked score is visibly different from a failed gate.
@@ -1714,6 +1782,8 @@ export async function cmdSessions(options: AxCliOptions): Promise<number> {
 /**
  * `session <id>` — view a full session (trajectory text by default).
  * `--json` → trajectory JSON; `--events` (`rawEvents`) → raw event list.
+ * `--out <path>` → write the raw NDJSON trace to a file instead of printing
+ * (same format as `run --events` and the playground download).
  * Interactive reattach: `resume [id]` / `chat --resume` (or `chat --session`).
  */
 export async function cmdSession(
@@ -1722,7 +1792,7 @@ export async function cmdSession(
 ): Promise<number> {
   if (sessionId === undefined || sessionId.trim() === "") {
     process.stderr.write(
-      `Usage: ${CLI_COMMAND_NAME} session <sessionId> [--url | --prod] [--json | --text | --events]\n`
+      `Usage: ${CLI_COMMAND_NAME} session <sessionId> [--url | --prod] [--json | --text | --events] [--out <file.ndjson>]\n`
     );
     return 2;
   }
@@ -1747,6 +1817,19 @@ export async function cmdSession(
       fetchImpl: options.fetchImpl,
     });
 
+    const outPath = trimNonEmpty(options.out);
+    if (outPath !== undefined) {
+      const targetPath = resolve(outPath);
+      await mkdir(dirname(targetPath), { recursive: true });
+      await writeFile(
+        targetPath,
+        `${events.map((e) => JSON.stringify(e)).join("\n")}\n`,
+        "utf8"
+      );
+      process.stdout.write(`trace: ${targetPath} (${events.length} events)\n`);
+      return 0;
+    }
+
     if (options.rawEvents === true) {
       process.stdout.write(
         `${JSON.stringify({ sessionId, events }, null, 2)}\n`
@@ -1771,6 +1854,94 @@ export async function cmdSession(
   }
 }
 
+/** Sessions fetched concurrently when `cost` aggregates every session. */
+const COST_FETCH_CONCURRENCY = 4;
+
+/**
+ * `cost [sessionId]` — pull per-session cost metrics.
+ *
+ * With a session id: per-turn token usage + estimated cost for that session.
+ * Without one: one row per session (all sessions on the target) plus a
+ * total row. `--json` prints the underlying report(s); text is the default.
+ * Costs are the engine's recorded estimates on `turn.completed` events
+ * (see `model-pricing.ts`); turns persisted before cost tracking simply
+ * count as unpriced.
+ */
+export async function cmdCost(
+  sessionId: string | undefined,
+  options: AxCliOptions
+): Promise<number> {
+  const target = await resolveSessionTarget(options);
+  if (typeof target === "number") {
+    return target;
+  }
+  const auth = {
+    bearerToken: options.bearerToken,
+    headers: target.headers,
+  };
+
+  try {
+    const resolved = trimNonEmpty(sessionId);
+    if (resolved !== undefined) {
+      const events = await fetchSessionEvents({
+        baseUrl: target.agentUrl,
+        sessionId: resolved,
+        auth,
+        fetchImpl: options.fetchImpl,
+      });
+      const report = buildSessionCostReport(events);
+      if (report.sessionId === "") {
+        report.sessionId = resolved;
+      }
+      if (options.json === true) {
+        process.stdout.write(`${JSON.stringify(report, null, 2)}\n`);
+      } else {
+        process.stdout.write(formatSessionCostText(report));
+      }
+      return 0;
+    }
+
+    const listed = await listSessionsWithSource({
+      baseUrl: target.agentUrl,
+      auth,
+      fetchImpl: options.fetchImpl,
+    });
+    const rows = await mapPool(
+      listed.sessions,
+      COST_FETCH_CONCURRENCY,
+      async (session): Promise<SessionCostRow> => {
+        const events = await fetchSessionEvents({
+          baseUrl: target.agentUrl,
+          sessionId: session.sessionId,
+          auth,
+          fetchImpl: options.fetchImpl,
+        });
+        const report = buildSessionCostReport(events);
+        return {
+          sessionId: session.sessionId,
+          channelId: session.channelId,
+          title: session.title,
+          updatedAt: session.updatedAt,
+          totals: report.totals,
+        };
+      }
+    );
+    if (options.json === true) {
+      process.stdout.write(`${JSON.stringify({ sessions: rows }, null, 2)}\n`);
+    } else {
+      process.stdout.write(formatSessionsCostText(rows));
+    }
+    return 0;
+  } catch (error) {
+    process.stderr.write(
+      `${sanitizeCustomerError(
+        error instanceof Error ? error.message : String(error)
+      )}\n`
+    );
+    return 1;
+  }
+}
+
 /**
  * `playground` — open the web UI against local / `--url` / `--prod`.
  *

package/src/internal/cursor-slack-relay.ts

@@ -23,6 +23,8 @@ export interface CursorSlackAgentRegistration {
   name: string;
   iconUrl?: string;
   iconEmoji?: string;
+  /** Opt out of the default external-sender block. */
+  blockExternals?: boolean;
 }
 
 interface RegistrationResponse {
@@ -160,6 +162,7 @@ export class CursorSlackRelay {
             name: agent.name,
             iconUrl: agent.iconUrl,
             iconEmoji: agent.iconEmoji,
+            blockExternals: agent.blockExternals === false ? false : undefined,
           })),
         };
       },

package/src/internal/deploy-client.ts

@@ -148,6 +148,8 @@ export interface Deployment {
   engineGeneration?: number | null;
   publicId?: string;
   engineUrl?: string | null;
+  /** Anyrun pod id for the active engine, when coordinates are known. */
+  enginePodId?: string | null;
   lastError?: string | null;
   engineAlias: string;
   desiredUpdatedAt?: string;
@@ -259,6 +261,7 @@ const deploymentSchema = z.object({
   engineGeneration: z.number().nullable().optional(),
   publicId: z.string().optional(),
   engineUrl: z.string().nullable().optional(),
+  enginePodId: z.string().nullable().optional(),
   lastError: z.string().nullable().optional(),
   engineAlias: z.string(),
   desiredUpdatedAt: z.string().optional(),

package/src/internal/discovery.ts

@@ -2000,7 +2000,14 @@ function isModuleFile(fileName: string): boolean {
   if (fileName.endsWith(".d.ts") || fileName.startsWith(".")) {
     return false;
   }
-  return MODULE_EXTENSIONS.has(extname(fileName));
+  if (!MODULE_EXTENSIONS.has(extname(fileName))) {
+    return false;
+  }
+  // Colocated unit tests (Vitest/Jest convention) are not definitions.
+  // Without this, `channels/slack.test.ts` is scanned as a channel named
+  // "slack.test", fails NAME_PATTERN, and the whole agent refuses to serve.
+  const stem = moduleStem(fileName);
+  return !stem.endsWith(".test") && !stem.endsWith(".spec");
 }
 
 function moduleStem(fileName: string): string {