@dench.com/cli 2.1.0 → 2.1.1

package/crm.ts

@@ -94,6 +94,32 @@ type CrmCliContext = {
 // don't need to change their try/catch shape.
 class CrmCliError extends Error {}
 
+function userFacingConvexErrorMessage(error: unknown): string | null {
+  if (!error || typeof error !== "object") return null;
+  const data = (error as { data?: unknown }).data;
+  if (typeof data === "string" && data.trim().length > 0) {
+    return data.trim();
+  }
+  if (data && typeof data === "object" && !Array.isArray(data)) {
+    const record = data as Record<string, unknown>;
+    for (const key of ["message", "error", "reason"]) {
+      const value = record[key];
+      if (typeof value === "string" && value.trim().length > 0) {
+        return value.trim();
+      }
+    }
+  }
+  return null;
+}
+
+function normalizeRpcError(error: unknown): Error {
+  if (error instanceof CrmCliError) return error;
+  return new CrmCliError(
+    userFacingConvexErrorMessage(error) ??
+      (error instanceof Error ? error.message : String(error)),
+  );
+}
+
 function shift(args: string[], expected: string): string {
   try {
     return shiftRaw(args, expected);
@@ -279,10 +305,14 @@ async function callQuery(
   fn: Parameters<ConvexHttpClient["query"]>[0],
   args: Record<string, unknown> = {},
 ): Promise<unknown> {
-  return ctx.convex.query(fn, {
-    ...args,
-    ...(ctx.sessionToken ? { sessionToken: ctx.sessionToken } : {}),
-  } as never);
+  try {
+    return await ctx.convex.query(fn, {
+      ...args,
+      ...(ctx.sessionToken ? { sessionToken: ctx.sessionToken } : {}),
+    } as never);
+  } catch (error) {
+    throw normalizeRpcError(error);
+  }
 }
 
 async function callMutation(
@@ -290,10 +320,14 @@ async function callMutation(
   fn: Parameters<ConvexHttpClient["mutation"]>[0],
   args: Record<string, unknown> = {},
 ): Promise<unknown> {
-  return ctx.convex.mutation(fn, {
-    ...args,
-    ...(ctx.sessionToken ? { sessionToken: ctx.sessionToken } : {}),
-  } as never);
+  try {
+    return await ctx.convex.mutation(fn, {
+      ...args,
+      ...(ctx.sessionToken ? { sessionToken: ctx.sessionToken } : {}),
+    } as never);
+  } catch (error) {
+    throw normalizeRpcError(error);
+  }
 }
 
 function out(ctx: CrmCliContext, value: unknown): void {
@@ -743,7 +777,9 @@ async function runFieldsCommand(ctx: CrmCliContext): Promise<void> {
       const color = getFlag(ctx.args, "--color");
       const positionStr = getFlag(ctx.args, "--position");
       const position =
-        positionStr !== undefined ? Number.parseInt(positionStr, 10) : undefined;
+        positionStr !== undefined
+          ? Number.parseInt(positionStr, 10)
+          : undefined;
       if (position !== undefined && !Number.isFinite(position)) {
         throw new CrmCliError(
           `--position must be an integer, got "${positionStr}"`,
@@ -1902,14 +1938,22 @@ async function callEnrichmentGatewayForEntry(args: {
 
 const PEOPLE_FULL_NAME_FIELDS = ["Name", "Full Name", "Person Name"] as const;
 const PEOPLE_FIRST_NAME_FIELDS = ["First Name", "Given Name"] as const;
-const PEOPLE_LAST_NAME_FIELDS = ["Last Name", "Family Name", "Surname"] as const;
+const PEOPLE_LAST_NAME_FIELDS = [
+  "Last Name",
+  "Family Name",
+  "Surname",
+] as const;
 const PEOPLE_EMAIL_FIELDS = [
   "Email",
   "Email Address",
   "Work Email",
   "Personal Email",
 ] as const;
-const PEOPLE_LINKEDIN_FIELDS = ["LinkedIn URL", "LinkedIn", "Linkedin URL"] as const;
+const PEOPLE_LINKEDIN_FIELDS = [
+  "LinkedIn URL",
+  "LinkedIn",
+  "Linkedin URL",
+] as const;
 const PEOPLE_DOMAIN_FIELDS = ["Domain", "Company Domain"] as const;
 
 const COMPANY_WEBSITE_FIELDS = ["Website", "Domain", "URL", "Site"] as const;
@@ -2012,6 +2056,7 @@ async function enrichOneEntry(
     entry: CrmEntryForEnrichment;
   },
 ): Promise<Record<string, unknown>> {
+  let value: unknown;
   try {
     const payload = await callEnrichmentGatewayForEntry({
       target: args.target,
@@ -2019,32 +2064,7 @@ async function enrichOneEntry(
       provider: args.provider,
       gateway: ctx.enrichmentGateway,
     });
-    const value = extractEnrichmentValue(payload, args.target.column);
-    if (value === null) {
-      return {
-        entryId: args.entry.id,
-        ok: false,
-        reason: "value_not_found",
-      };
-    }
-    const writeResult = (await callMutation(
-      ctx,
-      api.enrich.applyCellEnrichmentResult,
-      {
-        objectName: args.objectName,
-        entryId: args.entry.id,
-        fieldName: args.fieldName,
-        value,
-        provider: args.provider ?? "gateway",
-        overwrite: args.overwrite,
-      },
-    )) as Record<string, unknown>;
-    return {
-      entryId: args.entry.id,
-      ok: writeResult.ok === true,
-      value,
-      ...writeResult,
-    };
+    value = extractEnrichmentValue(payload, args.target.column);
   } catch (error) {
     if (
       error instanceof EnrichmentGatewayError ||
@@ -2062,6 +2082,31 @@ async function enrichOneEntry(
     }
     throw error;
   }
+  if (value === null) {
+    return {
+      entryId: args.entry.id,
+      ok: false,
+      reason: "value_not_found",
+    };
+  }
+  const writeResult = (await callMutation(
+    ctx,
+    api.enrich.applyCellEnrichmentResult,
+    {
+      objectName: args.objectName,
+      entryId: args.entry.id,
+      fieldName: args.fieldName,
+      value,
+      provider: args.provider ?? "gateway",
+      overwrite: args.overwrite,
+    },
+  )) as Record<string, unknown>;
+  return {
+    entryId: args.entry.id,
+    ok: writeResult.ok === true,
+    value,
+    ...writeResult,
+  };
 }
 
 async function enrichCellThroughGateway(

package/lib/enrichment-gateway.ts

@@ -1280,6 +1280,28 @@ async function buildGatewayError(
       code: code ?? "not_found",
     });
   }
+  if (
+    response.status === 401 ||
+    code === "invalid_api_key" ||
+    code === "unauthorized"
+  ) {
+    return new EnrichmentGatewayError(
+      upstreamMessage ?? "Unauthorized gateway request",
+      { status: response.status, code: "unauthorized" },
+    );
+  }
+  if (response.status === 403 || code === "forbidden") {
+    return new EnrichmentGatewayError(
+      upstreamMessage ?? "Forbidden gateway request",
+      { status: response.status, code: "forbidden" },
+    );
+  }
+  if (code === "aviato_unauthorized") {
+    return new EnrichmentGatewayError(
+      upstreamMessage ?? "Aviato provider unauthorized",
+      { status: response.status || 401, code: "aviato_unauthorized" },
+    );
+  }
   if (response.status === 503 || code === "provider_unavailable") {
     return new EnrichmentGatewayError("Gateway providers unavailable", {
       status: response.status,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dench.com/cli",
-  "version": "2.1.0",
+  "version": "2.1.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": {