@dench.com/cli 3.6.3-staging.372 → 3.6.4-staging.377

package/crm.ts

@@ -450,6 +450,13 @@ function parseCreateManyRows(items: unknown[]): JsonRecord[] {
   );
 }
 
+function parseDedupeFieldFlag(raw: string | undefined): string | undefined {
+  if (raw !== undefined && !raw.trim()) {
+    throw new CrmCliError("--dedupe-key must name a non-empty CRM field");
+  }
+  return raw;
+}
+
 /**
  * Stable per-row dedupe key derived from a named column. Values are
  * normalized (String → trim → lowercase) so `" Jane@X.com"` and
@@ -464,6 +471,16 @@ function dedupeKeyFromColumn(opts: {
   command: string;
 }): string {
   const raw = opts.row[opts.column];
+  if (
+    raw !== null &&
+    raw !== undefined &&
+    typeof raw !== "string" &&
+    (typeof raw !== "number" || !Number.isFinite(raw))
+  ) {
+    throw new CrmCliError(
+      `${opts.command}: row ${opts.rowIndex + 1} must have a string or finite number for --dedupe-key column "${opts.column}"`,
+    );
+  }
   const normalized =
     raw === null || raw === undefined ? "" : String(raw).trim().toLowerCase();
   if (!normalized) {
@@ -571,6 +588,8 @@ export type CrmBatchOp =
       data: JsonRecord;
       /** Stable per-row dedupe key (server upserts on conflict). */
       seedKey?: string;
+      /** Match existing CRM entries by this scalar field before writing. */
+      matchField?: string;
       /** 1-based source row for server-side error messages. */
       rowIndex?: number;
     }
@@ -2638,10 +2657,18 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
       const objectName = shift(ctx.args, "object name");
       const dataRaw = getDataFlag(ctx.args);
       const idempotencyKey = getFlag(ctx.args, "--idempotency-key");
-      // Per-row idempotency: derive a stable seedKey from this column so
-      // re-running the same create-many cannot duplicate rows. Rows whose
-      // key already exists are skipped (`status: "already_existed"`).
-      const dedupeColumn = getFlag(ctx.args, "--dedupe-key");
+      // Match ordinary existing records by this field, retaining the
+      // stable seedKey for retry compatibility with earlier CLI versions.
+      const dedupeColumn = parseDedupeFieldFlag(
+        getFlag(ctx.args, "--dedupe-key"),
+      );
+      const onConflictFlag = getFlag(ctx.args, "--on-conflict");
+      const onConflict = parseOnConflictFlag(onConflictFlag);
+      if (onConflictFlag !== undefined && !dedupeColumn) {
+        throw new CrmCliError(
+          "crm entries create-many: --on-conflict requires --dedupe-key <field>",
+        );
+      }
       const allowUnknown = hasFlag(ctx.args, "--allow-unknown");
       const rows = parseCreateManyRows(
         await readJsonArrayInput({
@@ -2670,12 +2697,16 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
           objectName,
           data,
           ...(seedKeys
-            ? { seedKey: seedKeys[index], rowIndex: index + 1 }
+            ? {
+                seedKey: seedKeys[index],
+                matchField: dedupeColumn,
+                rowIndex: index + 1,
+              }
             : {}),
         })),
         idempotencyKey,
         allowUnknown,
-        seedKeys ? "skip" : undefined,
+        seedKeys ? onConflict : undefined,
       );
       // Only claim per-row links when we actually got a result per row. A
       // silently-empty `results` is indistinguishable from "this object has
@@ -2687,7 +2718,10 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
       out(ctx, {
         created: statusCounts ? statusCounts.created : rows.length,
         ...(statusCounts
-          ? { alreadyExisted: statusCounts.alreadyExisted }
+          ? {
+              alreadyExisted: statusCounts.alreadyExisted,
+              updated: statusCounts.updated,
+            }
           : {}),
         chunks,
         ...(linked > 0
@@ -2788,6 +2822,11 @@ async function runEntriesCommand(ctx: CrmCliContext): Promise<void> {
       const _objectName = shift(ctx.args, "object name");
       const entryId = shift(ctx.args, "entry id");
       assertNoUnknownFlags(ctx.args, "crm entries delete");
+      if (ctx.args.length > 0) {
+        throw new CrmCliError(
+          "crm entries delete accepts exactly one entry ID. For multiple entries, use dench crm entries bulk-delete <object> --ids id1,id2,... or crm batch with entries.delete operations.",
+        );
+      }
       out(
         ctx,
         await callMutation(ctx, api.entries.remove, {
@@ -3519,7 +3558,7 @@ async function runImportCommand(ctx: CrmCliContext): Promise<void> {
   const csvPath = getFlag(ctx.args, "--csv");
   const jsonlPath = getFlag(ctx.args, "--jsonl");
   const mapJson = getFlag(ctx.args, "--map");
-  const dedupeColumn = getFlag(ctx.args, "--dedupe-key");
+  const dedupeColumn = parseDedupeFieldFlag(getFlag(ctx.args, "--dedupe-key"));
   const onConflict = parseOnConflictFlag(getFlag(ctx.args, "--on-conflict"));
   assertNoUnknownFlags(ctx.args, "crm import");
   if (!csvPath && !jsonlPath) {
@@ -3557,10 +3596,11 @@ async function runImportCommand(ctx: CrmCliContext): Promise<void> {
       dedupeColumn,
       sha256,
     }),
+    ...(dedupeColumn ? { matchField: dedupeColumn } : {}),
     rowIndex: index + 1,
   }));
-  // batch.apply enforces the on-conflict policy per row against the
-  // (objectId, seedKey) index; chunking is handled by the shared helper.
+  // batch.apply matches the selected CRM field when supplied; otherwise
+  // seedKey protects exact reruns. The shared helper handles chunking.
   const { results } = await applyBatchOpsInChunks(
     ctx,
     ops,
@@ -4840,9 +4880,10 @@ Tasks (shortcuts over the protected 'task' object):
   dench crm entries create <object> --data '{"Field":"Value",...}'    (alias: --fields) [--allow-unknown] [--idempotency-key <key>]
       --idempotency-key upserts on (object, key): a retried create returns
       the existing row with alreadyExisted: true instead of duplicating it.
-  dench crm entries create-many <object> --data '[{"Field":"Value",...}]' [--file rows.json] [--idempotency-key <key>] [--dedupe-key <column>] [--allow-unknown]
-      --dedupe-key <column> makes each row idempotent by that column's
-      value; rows that already exist are skipped (status: already_existed).
+  dench crm entries create-many <object> --data '[{"Field":"Value",...}]' [--file rows.json] [--idempotency-key <key>] [--dedupe-key <field>] [--on-conflict skip|update|error] [--allow-unknown]
+      --dedupe-key <field> matches existing CRM rows by field value,
+      including rows created outside imports. --on-conflict requires it;
+      default skip leaves matches untouched, update merges, error aborts.
   dench crm entries update <object> <entryId> --data '{...}'           (alias: --fields) [--allow-unknown]
   dench crm entries update-many <object> --updates '[{"id":"...","data":{...}}]' [--file updates.json] [--idempotency-key <key>] [--allow-unknown]
   dench crm entries delete <object> <entryId>
@@ -4934,9 +4975,14 @@ Batch:
 Import / export:
   dench crm import <object> --csv leads.csv [--map '{"Email":"Email Address"}'] [--on-conflict skip|update|error] [--dedupe-key <column>]
   dench crm import <object> --jsonl rows.jsonl
-      Imports are idempotent: every row gets a stable dedupe key (content
-      hash, or --dedupe-key <column>), so re-running the same file skips /
-      updates / errors per --on-conflict instead of duplicating rows.
+      --dedupe-key names the CRM field AFTER --map. Values match existing
+      rows after trim + lowercase; supported fields are text, email, phone,
+      URL, single-select enum, or number. Blank/non-scalar values fail.
+      Number fields compare numeric values ("01" matches 1).
+      Multiple matches or an incomplete bounded lookup abort the current
+      batch without writes; earlier batches may already have committed.
+      Without --dedupe-key, a content-hash key protects exact reimports
+      only; it does not match ordinary existing records by field value.
   dench crm export <object> --format csv|jsonl [--limit N]
       Pages with a real cursor and verifies no duplicate ids before
       emitting; a summary (exportedCount/uniqueIds) is printed to stderr.

package/dench.ts

@@ -3550,7 +3550,8 @@ async function runFilesLs() {
   const rows = recursive
     ? await listConvexTreeRecursive(runtime, apiKey, target)
     : await listConvexTreeAt(runtime, apiKey, target);
-  if (hasFlag("--json")) {
+  // Inline handlers share the top-level flag; filteredArgs omits --json.
+  if (json) {
     print({
       ok: true,
       prefix: target,
@@ -3670,7 +3671,7 @@ async function runFilesRm() {
   );
   const self = parentRows.find((row) => row.path === target);
   if (!self) {
-    if (hasFlag("--json")) {
+    if (json) {
       print({ ok: true, path: target, removedFiles: 0, removedDirs: 0 });
     } else {
       process.stdout.write(
@@ -3772,7 +3773,7 @@ async function runFilesCat() {
     });
   }
 
-  if (hasFlag("--json")) {
+  if (json) {
     print({ ok: true, ...file });
     return;
   }
@@ -3822,7 +3823,7 @@ async function runFilesWrite() {
     } as never,
   )) as { path: string; contentHash: string };
 
-  if (hasFlag("--json")) {
+  if (json) {
     print({ ok: true, ...result, bytes: content.length });
     return;
   }
@@ -3850,7 +3851,7 @@ async function runFilesDownload() {
     );
   }
   const target = normalizeFilesPath(targetRaw);
-  const jsonOut = hasFlag("--json");
+  const jsonOut = json;
 
   if (hasFlag("--url")) {
     const url = (await runtime.client.action(

package/lib/enrichment-gateway.ts

@@ -1,3 +1,15 @@
+import {
+  type EnrichedCompanyUpsertLike,
+  type EnrichedPersonUpsertLike,
+  shapeCompanyToApolloEnvelope,
+  shapePersonToApolloEnvelope,
+} from "./enrichment-shapes";
+
+export type {
+  ApolloCompanyEnvelope,
+  ApolloPersonEnvelope,
+} from "./enrichment-shapes";
+
 import { extractDomain } from "./crm-enrichment";
 
 export type FetchLike = (
@@ -315,188 +327,6 @@ function mapRequiredFieldsToEnrichFields(rf?: string[]): EnrichField[] {
 // Apollo-shape envelope (preserves crm-enrichment catalog extraction paths)
 // ---------------------------------------------------------------------------
 
-export type ApolloPersonEnvelope = {
-  person: {
-    search_match?: {
-      derivedFields: string[];
-      basis: "current_title" | "employment_title";
-    };
-    name?: string;
-    first_name?: string;
-    last_name?: string;
-    email?: string;
-    work_email?: string;
-    personal_email?: string;
-    photo_url?: string;
-    linkedin_url?: string;
-    title?: string;
-    headline?: string;
-    location?: string;
-    organization?: {
-      name?: string;
-      domain?: string;
-      website_url?: string;
-    };
-    organization_name?: string;
-    contact: {
-      phone_numbers: Array<{
-        sanitized_number: string;
-        raw_number?: string;
-      }>;
-    };
-  };
-};
-
-type EnrichedPersonUpsertLike = {
-  avatarUrl?: string;
-  searchMatch?: {
-    derivedFields: string[];
-    basis: "current_title" | "employment_title";
-  };
-  fullName?: string;
-  firstName?: string;
-  lastName?: string;
-  headline?: string;
-  /** Structured title from the person's current role (distinct from headline). */
-  currentTitle?: string;
-  linkedinID?: string;
-  location?: string;
-  locationName?: string;
-  currentCompanyName?: string;
-  currentCompanyWebsite?: string;
-  emails?: Array<{
-    address?: string;
-    normalizedAddress?: string;
-    type?: string;
-  }>;
-  phones?: Array<{ number?: string; normalizedNumber?: string }>;
-};
-
-function shapePersonToApolloEnvelope(
-  u: EnrichedPersonUpsertLike,
-): ApolloPersonEnvelope {
-  const workEmail = u.emails?.find((e) => e.type === "work")?.address;
-  const personalEmail = u.emails?.find((e) => e.type === "personal")?.address;
-  const anyEmail = u.emails?.[0]?.address;
-  const companyName = u.currentCompanyName;
-  const companyWebsite = u.currentCompanyWebsite;
-  return {
-    person: {
-      ...(u.searchMatch ? { search_match: u.searchMatch } : {}),
-      name: u.fullName,
-      first_name: u.firstName,
-      last_name: u.lastName,
-      email: workEmail ?? anyEmail,
-      work_email: workEmail,
-      personal_email: personalEmail,
-      photo_url: u.avatarUrl,
-      linkedin_url: u.linkedinID
-        ? `https://www.linkedin.com/in/${u.linkedinID}`
-        : undefined,
-      title: u.currentTitle,
-      headline: u.headline,
-      location: u.location ?? u.locationName,
-      organization:
-        companyName || companyWebsite
-          ? {
-              name: companyName,
-              domain: companyWebsite,
-              website_url: companyWebsite,
-            }
-          : undefined,
-      organization_name: companyName,
-      contact: {
-        phone_numbers: (u.phones ?? []).map((p) => ({
-          sanitized_number: p.normalizedNumber ?? p.number ?? "",
-          raw_number: p.number,
-        })),
-      },
-    },
-  };
-}
-
-// ---------------------------------------------------------------------------
-// Organization-shape envelope (preserves COMPANY_ENRICHMENT_COLUMNS paths)
-// ---------------------------------------------------------------------------
-
-export type ApolloCompanyEnvelope = {
-  organization: {
-    name?: string;
-    domain?: string;
-    website_url?: string;
-    industry?: string;
-    industry_list?: string[];
-    specialties?: string[];
-    linkedin_url?: string;
-    founded_year?: number;
-    headcount?: number;
-    headcount_range?: string;
-    total_funding?: number;
-    description?: string;
-    hq_city?: string;
-    hq_country?: string;
-    hq_country_code?: string;
-    hq_location?: string;
-  };
-};
-
-type EnrichedCompanyUpsertLike = {
-  name?: string;
-  website?: string;
-  industry?: string;
-  industryList?: string[];
-  specialties?: string[];
-  linkedinUrl?: string;
-  founded?: number;
-  headcount?: number;
-  headcountRange?: string;
-  totalFunding?: number;
-  description?: string;
-  hqAddress?: {
-    line1?: string;
-    line2?: string;
-    city?: string;
-    region?: string;
-    country?: string;
-    countryCode?: string;
-  };
-};
-
-function shapeCompanyToApolloEnvelope(
-  c: EnrichedCompanyUpsertLike,
-): ApolloCompanyEnvelope {
-  const hq = c.hqAddress;
-  const city = hq?.city;
-  const country = hq?.country ?? hq?.countryCode;
-  const hqLocationParts = [city ?? hq?.line1, hq?.region, country].filter(
-    (v): v is string => typeof v === "string" && v.length > 0,
-  );
-  return {
-    organization: {
-      name: c.name,
-      domain: c.website,
-      website_url: c.website,
-      industry: c.industry,
-      industry_list: c.industryList,
-      specialties: c.specialties,
-      linkedin_url: c.linkedinUrl,
-      founded_year: c.founded,
-      headcount: c.headcount,
-      headcount_range: c.headcountRange,
-      total_funding: c.totalFunding,
-      description: c.description,
-      hq_city: city,
-      hq_country: hq?.country,
-      hq_country_code: hq?.countryCode,
-      hq_location:
-        hq?.line2?.trim() ||
-        (hqLocationParts.length > 0
-          ? [...new Set(hqLocationParts)].join(", ")
-          : undefined),
-    },
-  };
-}
-
 // ---------------------------------------------------------------------------
 // enrichPerson — calls POST /v1/enrichment/person/contact with block-and-poll
 // ---------------------------------------------------------------------------

package/lib/enrichment-shapes.ts

@@ -0,0 +1,182 @@
+/** Pure shared projection of gateway profiles into the existing entity-card contract. */
+export type ApolloPersonEnvelope = {
+  person: {
+    search_match?: {
+      derivedFields: string[];
+      basis: "current_title" | "employment_title";
+    };
+    name?: string;
+    first_name?: string;
+    last_name?: string;
+    email?: string;
+    work_email?: string;
+    personal_email?: string;
+    photo_url?: string;
+    linkedin_url?: string;
+    title?: string;
+    headline?: string;
+    location?: string;
+    organization?: {
+      name?: string;
+      domain?: string;
+      website_url?: string;
+    };
+    organization_name?: string;
+    contact: {
+      phone_numbers: Array<{
+        sanitized_number: string;
+        raw_number?: string;
+      }>;
+    };
+  };
+};
+
+export type EnrichedPersonUpsertLike = {
+  avatarUrl?: string;
+  searchMatch?: {
+    derivedFields: string[];
+    basis: "current_title" | "employment_title";
+  };
+  fullName?: string;
+  firstName?: string;
+  lastName?: string;
+  headline?: string;
+  /** Structured title from the person's current role (distinct from headline). */
+  currentTitle?: string;
+  linkedinID?: string;
+  location?: string;
+  locationName?: string;
+  currentCompanyName?: string;
+  currentCompanyWebsite?: string;
+  emails?: Array<{
+    address?: string;
+    normalizedAddress?: string;
+    type?: string;
+  }>;
+  phones?: Array<{ number?: string; normalizedNumber?: string }>;
+};
+
+export function shapePersonToApolloEnvelope(
+  u: EnrichedPersonUpsertLike,
+): ApolloPersonEnvelope {
+  const workEmail = u.emails?.find((e) => e.type === "work")?.address;
+  const personalEmail = u.emails?.find((e) => e.type === "personal")?.address;
+  const anyEmail = u.emails?.[0]?.address;
+  const companyName = u.currentCompanyName;
+  const companyWebsite = u.currentCompanyWebsite;
+  return {
+    person: {
+      ...(u.searchMatch ? { search_match: u.searchMatch } : {}),
+      name: u.fullName,
+      first_name: u.firstName,
+      last_name: u.lastName,
+      email: workEmail ?? anyEmail,
+      work_email: workEmail,
+      personal_email: personalEmail,
+      photo_url: u.avatarUrl,
+      linkedin_url: u.linkedinID
+        ? `https://www.linkedin.com/in/${u.linkedinID}`
+        : undefined,
+      title: u.currentTitle,
+      headline: u.headline,
+      location: u.location ?? u.locationName,
+      organization:
+        companyName || companyWebsite
+          ? {
+              name: companyName,
+              domain: companyWebsite,
+              website_url: companyWebsite,
+            }
+          : undefined,
+      organization_name: companyName,
+      contact: {
+        phone_numbers: (u.phones ?? []).map((p) => ({
+          sanitized_number: p.normalizedNumber ?? p.number ?? "",
+          raw_number: p.number,
+        })),
+      },
+    },
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Organization-shape envelope (preserves COMPANY_ENRICHMENT_COLUMNS paths)
+// ---------------------------------------------------------------------------
+
+export type ApolloCompanyEnvelope = {
+  organization: {
+    name?: string;
+    domain?: string;
+    website_url?: string;
+    industry?: string;
+    industry_list?: string[];
+    specialties?: string[];
+    linkedin_url?: string;
+    founded_year?: number;
+    headcount?: number;
+    headcount_range?: string;
+    total_funding?: number;
+    description?: string;
+    hq_city?: string;
+    hq_country?: string;
+    hq_country_code?: string;
+    hq_location?: string;
+  };
+};
+
+export type EnrichedCompanyUpsertLike = {
+  name?: string;
+  website?: string;
+  industry?: string;
+  industryList?: string[];
+  specialties?: string[];
+  linkedinUrl?: string;
+  founded?: number;
+  headcount?: number;
+  headcountRange?: string;
+  totalFunding?: number;
+  description?: string;
+  hqAddress?: {
+    line1?: string;
+    line2?: string;
+    city?: string;
+    region?: string;
+    country?: string;
+    countryCode?: string;
+  };
+};
+
+export function shapeCompanyToApolloEnvelope(
+  c: EnrichedCompanyUpsertLike,
+): ApolloCompanyEnvelope {
+  const hq = c.hqAddress;
+  const city = hq?.city;
+  const country = hq?.country ?? hq?.countryCode;
+  const hqLocationParts = [city ?? hq?.line1, hq?.region, country].filter(
+    (v): v is string => typeof v === "string" && v.length > 0,
+  );
+  return {
+    organization: {
+      name: c.name,
+      domain: c.website,
+      website_url: c.website,
+      industry: c.industry,
+      industry_list: c.industryList,
+      specialties: c.specialties,
+      linkedin_url: c.linkedinUrl,
+      founded_year: c.founded,
+      headcount: c.headcount,
+      headcount_range: c.headcountRange,
+      total_funding: c.totalFunding,
+      description: c.description,
+      hq_city: city,
+      hq_country: hq?.country,
+      hq_country_code: hq?.countryCode,
+      hq_location:
+        hq?.line2?.trim() ||
+        (hqLocationParts.length > 0
+          ? [...new Set(hqLocationParts)].join(", ")
+          : undefined),
+    },
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "3.6.3-staging.372",
+  "version": "3.6.4-staging.377",
   "description": "Dench agent workspace CLI.",
   "type": "module",
   "bin": {