@dench.com/cli 2.3.2 → 2.4.1

package/crm.ts

@@ -88,6 +88,7 @@ type CrmCliContext = {
    * organization context.
    */
   sessionToken?: string;
+  runId?: string;
   enrichmentGateway?: Pick<EnrichmentGatewayOptions, "apiKey" | "baseUrl">;
 };
 
@@ -296,6 +297,7 @@ async function applyBatchOpsInChunks(
     const chunkKey = chunkIdempotencyKey(idempotencyKey, chunkIndex);
     await callMutation(ctx, api.batch.apply, {
       ops: chunk,
+      ...runContextArgs(ctx),
       ...(chunkKey ? { idempotencyKey: chunkKey } : {}),
       ...(allowUnknown ? { allowUnknown: true } : {}),
     });
@@ -303,6 +305,10 @@ async function applyBatchOpsInChunks(
   return chunks.length;
 }
 
+function runContextArgs(ctx: CrmCliContext): Record<string, string> {
+  return ctx.runId ? { runId: ctx.runId } : {};
+}
+
 /**
  * Fetch the canonical field names for an object. Best-effort: returns
  * `null` (rather than throwing) on any failure so the caller falls back
@@ -574,6 +580,11 @@ const api = {
       "functions/crm/entries:bulkDelete",
     ),
   },
+  history: {
+    listForEntry: makeFunctionReference<"query">(
+      "functions/crm/history:listForEntry",
+    ),
+  },
   cells: {
     get: makeFunctionReference<"query">("functions/crm/cells:get"),
     set: makeFunctionReference<"mutation">("functions/crm/cells:set"),
@@ -641,6 +652,7 @@ export async function runCrmCommand(opts: {
     args,
     jsonOutput,
     sessionToken: opts.sessionToken,
+    runId: process.env.DENCH_RUN_ID?.trim() || undefined,
     enrichmentGateway: opts.enrichmentGateway,
   };
   const subcommand = args.shift();
@@ -657,6 +669,8 @@ export async function runCrmCommand(opts: {
       return await runFieldsCommand(ctx);
     case "entries":
       return await runEntriesCommand(ctx);
+    case "history":
+      return await runHistoryCommand(ctx);
     case "cells":
       return await runCellsCommand(ctx);
     case "query":
@@ -1335,6 +1349,7 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
         await callMutation(ctx, api.entries.create, {
           objectName,
           data,
+          ...runContextArgs(ctx),
           ...(allowUnknown ? { allowUnknown: true } : {}),
         }),
       );
@@ -1392,6 +1407,7 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
           objectName,
           entryId: entryId as any,
           data,
+          ...runContextArgs(ctx),
           ...(allowUnknown ? { allowUnknown: true } : {}),
         }),
       );
@@ -1438,6 +1454,7 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
         ctx,
         await callMutation(ctx, api.entries.remove, {
           entryId: entryId as any,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -1452,6 +1469,7 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
         ctx,
         await callMutation(ctx, api.entries.bulkDelete, {
           entryIds: entryIds as any,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -1461,6 +1479,27 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
   }
 }
 
+async function runHistoryCommand(ctx: CrmCliContext): Promise<void> {
+  const objectName = shift(ctx.args, "object name");
+  const entryId = shift(ctx.args, "entry id");
+  const includeSystem = hasFlag(ctx.args, "--include-system");
+  const limit = parseInt(getFlag(ctx.args, "--limit") ?? "50", 10);
+  const cursor = getFlag(ctx.args, "--cursor");
+  assertNoUnknownFlags(ctx.args, "crm history");
+  out(
+    ctx,
+    await callQuery(ctx, api.history.listForEntry, {
+      objectName,
+      entryId,
+      includeSystem,
+      paginationOpts: {
+        numItems: Number.isFinite(limit) ? Math.min(Math.max(limit, 1), 100) : 50,
+        cursor: cursor ?? null,
+      },
+    }),
+  );
+}
+
 async function runCellsCommand(ctx: CrmCliContext): Promise<void> {
   const verb = ctx.args.shift();
   switch (verb) {
@@ -1492,6 +1531,7 @@ async function runCellsCommand(ctx: CrmCliContext): Promise<void> {
           entryId: entryId as any,
           fieldName,
           value,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -1538,6 +1578,7 @@ async function runCellsCommand(ctx: CrmCliContext): Promise<void> {
           entryId: entryId as any,
           fieldName,
           value,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -1664,6 +1705,7 @@ async function runBatchCommand(ctx: CrmCliContext): Promise<void> {
     ctx,
     await callMutation(ctx, api.batch.apply, {
       ops: ops as any,
+      ...runContextArgs(ctx),
       ...(idempotencyKey ? { idempotencyKey } : {}),
     } as any),
   );
@@ -1804,6 +1846,7 @@ async function runTransactionCommand(ctx: CrmCliContext): Promise<void> {
         ctx,
         await callMutation(ctx, api.transaction.commit, {
           txnId: txnId as any,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -1859,6 +1902,7 @@ async function runTransactionCommand(ctx: CrmCliContext): Promise<void> {
           ctx,
           await callMutation(ctx, api.transaction.commit, {
             txnId: begun.txnId as any,
+            ...runContextArgs(ctx),
           }),
         );
       } else {
@@ -2637,6 +2681,7 @@ async function runPeopleCommand(ctx: CrmCliContext): Promise<void> {
         await callMutation(ctx, api.entries.create, {
           objectName: "people",
           data,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -2701,6 +2746,7 @@ async function runCompaniesCommand(ctx: CrmCliContext): Promise<void> {
         await callMutation(ctx, api.entries.create, {
           objectName: "company",
           data,
+          ...runContextArgs(ctx),
         }),
       );
       return;
@@ -2895,6 +2941,7 @@ Fields (columns):
 Entries (rows):
   dench crm entries list <object> [--limit N] [--with-meta] [--json]
   dench crm entries get <object> <entryId>
+  dench crm history <object> <entryId> [--include-system] [--limit N] [--cursor CURSOR] [--json]
   dench crm entries create <object> --data '{"Field":"Value",...}'    (alias: --fields) [--allow-unknown]
   dench crm entries create-many <object> --data '[{"Field":"Value",...}]' [--file rows.json] [--idempotency-key <key>] [--allow-unknown]
   dench crm entries update <object> <entryId> --data '{...}'           (alias: --fields) [--allow-unknown]

package/fs-daemon.ts

@@ -15,8 +15,10 @@
  *     `lastSyncedHash`, we download from Convex Storage to /workspace.
  *   • Per-path 300ms trailing debounce on uploads (batches tight write
  *     loops like editor saves).
- *   • Optimistic conflict via `expectedPreviousHash`. On 409, we fetch
- *     latest, write to `<path>.conflicted-<ts>`, surface in UI.
+ *   • Optimistic conflict via `expectedPreviousHash`. On 409, we stash the
+ *     local copy at the next free `<name> (N).<ext>` sibling (reusing an
+ *     existing sibling that already holds the same bytes), then re-pull the
+ *     latest canonical version. Surfaced in UI.
  *   • Per-path circuit breaker: if a path syncs >5 times in 10s, pause
  *     sync on that path and log loudly to stderr (the live state of
  *     active breakers is exposed via `dench fs status`).
@@ -58,7 +60,7 @@ import {
   unlink,
   writeFile,
 } from "node:fs/promises";
-import { dirname, relative } from "node:path";
+import { basename, dirname, extname, join, relative } from "node:path";
 import { ConvexClient, ConvexHttpClient } from "convex/browser";
 import { makeFunctionReference } from "convex/server";
 import { decodeInlineTextOrUndefined } from "./fs-daemon-binary";
@@ -149,6 +151,56 @@ function sha256(bytes: Uint8Array): string {
   return createHash("sha256").update(bytes).digest("hex");
 }
 
+// Stash a conflicting local copy at a sibling path, using an incrementing
+// suffix (`foo (1).txt`, `foo (2).txt`, …) instead of a timestamp so
+// repeated conflicts produce a clean, stable series rather than an
+// ever-growing pile of `.conflicted-<ts>` files. The file is written
+// locally; the daemon's normal watcher path syncs it to Convex like any
+// other file. Returns the local path written.
+//
+// Two properties keep the deterministic suffix safe:
+//   • Content-aware reuse — if a `(N)` slot already holds these exact bytes,
+//     the copy is already stashed, so we return it instead of minting yet
+//     another sibling. This is what keeps repeated conflicts on the same
+//     unsynced content from piling up (the whole point of the change), and
+//     it also means an unrelated remote `(N)` file mirrored to local disk is
+//     skipped rather than overwritten.
+//   • Atomic claim — otherwise we write with O_EXCL (`wx`), so two handlers
+//     racing for the same slot can't clobber each other; the loser gets
+//     EEXIST and advances to the next N.
+async function stashConflictCopy(args: {
+  absPath: string;
+  bytes: Uint8Array;
+  hash: string;
+}): Promise<string> {
+  const { absPath, bytes, hash } = args;
+  const dir = dirname(absPath);
+  const ext = extname(absPath);
+  const stem = basename(absPath, ext);
+  for (let i = 1; i <= 1000; i++) {
+    const candidate = join(dir, `${stem} (${i})${ext}`);
+    const existing = await readFile(candidate).catch(() => null);
+    if (existing) {
+      // Already holds our bytes → nothing to do. Different content → this
+      // slot belongs to something else, try the next one.
+      if (sha256(existing) === hash) return candidate;
+      continue;
+    }
+    try {
+      await writeFile(candidate, bytes, { flag: "wx" });
+      return candidate;
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code === "EEXIST") continue;
+      throw error;
+    }
+  }
+  // Every increment up to the cap is taken — fall back to a timestamp, which
+  // is effectively unique, so we still stash the bytes somewhere.
+  const fallback = join(dir, `${stem} (${Date.now()})${ext}`);
+  await writeFile(fallback, bytes);
+  return fallback;
+}
+
 function normalizePosixWorkspacePath(input: string): string {
   let cleaned = input.replace(/\\/g, "/").replace(/\/+/g, "/");
   if (cleaned.startsWith("/workspace/")) {
@@ -772,8 +824,7 @@ async function runDaemon(daemonArgs: Args): Promise<void> {
       if (result.versionConflict) {
         // Stash the local copy in a sibling file, then re-pull the remote
         // version into the canonical path.
-        const conflicted = `${absPath}.conflicted-${Date.now()}`;
-        await writeFile(conflicted, bytes);
+        const conflicted = await stashConflictCopy({ absPath, bytes, hash });
         console.warn(
           `[dench-fs-daemon] version conflict for ${posixPath}; local copy stashed at ${conflicted}`,
         );

package/lib/command-registry.ts

@@ -716,6 +716,37 @@ const rawApiOperations = [
     responseSchema: anyResponse,
     backend: convex("query", "functions/crm/entries:get"),
   }),
+  op({
+    id: "crm.entries.history",
+    group: "crm",
+    summary: "List a CRM entry's audit history.",
+    cli: "dench crm history",
+    method: "GET",
+    path: "/crm/objects/{objectName}/entries/{entryId}/history",
+    requestSchema: noBody,
+    responseSchema: anyResponse,
+    backend: {
+      ...convex("query", "functions/crm/history:listForEntry"),
+      transformArgs: (input) => {
+        const limit =
+          typeof input.limit === "number"
+            ? Math.min(Math.max(Math.floor(input.limit), 1), 100)
+            : 50;
+        return {
+          objectName: input.objectName,
+          entryId: input.entryId,
+          includeSystem: input.includeSystem === true,
+          paginationOpts: {
+            numItems: limit,
+            cursor:
+              typeof input.cursor === "string" && input.cursor.length > 0
+                ? input.cursor
+                : null,
+          },
+        };
+      },
+    },
+  }),
   op({
     id: "crm.entries.create",
     group: "crm",
@@ -725,7 +756,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/entries:create"),
+    backend: convex("mutation", "functions/crm/entries:create", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.entries.createMany",
@@ -736,7 +769,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/batch",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/entries:createMany"),
+    backend: convex("mutation", "functions/crm/entries:createMany", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.entries.update",
@@ -747,7 +782,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/{entryId}",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/entries:update"),
+    backend: convex("mutation", "functions/crm/entries:update", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.entries.updateMany",
@@ -758,7 +795,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/batch",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/batch:apply"),
+    backend: convex("mutation", "functions/crm/batch:apply", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.entries.delete",
@@ -769,7 +808,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/{entryId}",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/entries:remove"),
+    backend: convex("mutation", "functions/crm/entries:remove", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.entries.bulkDelete",
@@ -780,7 +821,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/delete",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/entries:bulkDelete"),
+    backend: convex("mutation", "functions/crm/entries:bulkDelete", "bearer", {
+      includeRunId: true,
+    }),
   }),
 
   op({
@@ -803,7 +846,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/{entryId}/fields/{fieldName}",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/cells:set"),
+    backend: convex("mutation", "functions/crm/cells:set", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.cells.setMany",
@@ -814,7 +859,9 @@ const rawApiOperations = [
     path: "/crm/cells/batch",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/cells:setMany"),
+    backend: convex("mutation", "functions/crm/cells:setMany", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.cells.append",
@@ -825,7 +872,9 @@ const rawApiOperations = [
     path: "/crm/objects/{objectName}/entries/{entryId}/fields/{fieldName}/append",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/cells:append"),
+    backend: convex("mutation", "functions/crm/cells:append", "bearer", {
+      includeRunId: true,
+    }),
   }),
 
   op({
@@ -903,7 +952,9 @@ const rawApiOperations = [
     path: "/crm/batch",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/batch:apply"),
+    backend: convex("mutation", "functions/crm/batch:apply", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.transaction.begin",
@@ -936,7 +987,9 @@ const rawApiOperations = [
     path: "/crm/transactions/{txnId}/commit",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: convex("mutation", "functions/crm/transaction:commit"),
+    backend: convex("mutation", "functions/crm/transaction:commit", "bearer", {
+      includeRunId: true,
+    }),
   }),
   op({
     id: "crm.transaction.abort",

package/lib/enrichment-gateway.ts

@@ -1325,6 +1325,17 @@ async function buildGatewayError(
       { status: response.status, code },
     );
   }
+  if (
+    response.status === 402 ||
+    code === "on_demand_disabled" ||
+    code === "insufficient_credits" ||
+    code === "spend_limit_reached"
+  ) {
+    return new EnrichmentGatewayError(
+      upstreamMessage ?? "AI credits exhausted.",
+      { status: response.status, code },
+    );
+  }
 
   const detail = upstreamMessage || rawText || response.statusText;
   const truncated = detail.length > 500 ? `${detail.slice(0, 500)}...` : detail;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "2.3.2",
+  "version": "2.4.1",
   "description": "Dench agent workspace CLI. v2 unifies auth behind `dench signin`; the legacy `dench login` / `dench onboard` / `dench setup` / `dench what-can-i-do` / `dench register` commands now error with a redirect.",
   "type": "module",
   "bin": {