@dench.com/cli 3.6.3-staging.372 → 3.6.5-staging.384

package/lib/app-sdk-catalog.generated.ts

@@ -106,6 +106,7 @@ export const APP_SDK_OPERATIONS: readonly AppSdkOperationInfo[] = [
   {"id":"auth.otp.start","group":"auth","summary":"Start the email OTP sign-in flow.","cli":"dench signin --email","method":"POST","path":"/auth/otp/start","permission":"auth:write","pathParams":[]},
   {"id":"auth.otp.verify","group":"auth","summary":"Verify an email OTP sign-in code.","cli":"dench signin --email","method":"POST","path":"/auth/otp/verify","permission":"auth:write","pathParams":[]},
   {"id":"auth.otp.finalize","group":"auth","summary":"Finalize an email OTP sign-in session.","cli":"dench signin --email","method":"POST","path":"/auth/otp/finalize","permission":"auth:write","pathParams":[]},
+  {"id":"workspace.context.sections","group":"workspace","summary":"Read selected scoped workspace documents and a compact context index without writes.","cli":"dench context --sections","method":"GET","path":"/context/sections","permission":"workspace:read","pathParams":[]},
   {"id":"workspace.context","group":"workspace","summary":"Return the current Dench workspace context for the bearer.","cli":"dench context","method":"GET","path":"/context","permission":"workspace:read","pathParams":[]},
   {"id":"workspace.instructions","group":"workspace","summary":"Return the current workspace's standing instructions for external agents.","cli":"dench context --instructions","method":"GET","path":"/context/instructions","permission":"workspace:read","pathParams":[]},
   {"id":"workspace.status","group":"workspace","summary":"Return workspace and agent status.","cli":"dench status","method":"GET","path":"/status","permission":"workspace:read","pathParams":[]},
@@ -314,6 +315,14 @@ export const APP_SDK_OPERATIONS: readonly AppSdkOperationInfo[] = [
   {"id":"email.identity.disable","group":"email","summary":"Soft-disable a sender (or every sender on a domain) for the workspace; sends are blocked until restored.","cli":"dench email identity disable","method":"POST","path":"/email/sending-identities/{identity}/disable","permission":"email:write","pathParams":["identity"]},
   {"id":"email.identity.restore","group":"email","summary":"Restore a previously disabled sender for the workspace.","cli":"dench email identity restore","method":"POST","path":"/email/sending-identities/{identity}/restore","permission":"email:write","pathParams":["identity"]},
   {"id":"email.identity.delete","group":"email","summary":"Permanently delete a sender (or every sender on a domain) from the workspace; re-adding it requires verification from scratch.","cli":"dench email identity delete","method":"DELETE","path":"/email/sending-identities/{identity}","permission":"email:write","pathParams":["identity"]},
+  {"id":"email.drafts.create","group":"email","summary":"Create an editable Dench email draft and synchronize its selected native mailbox asynchronously. Use a stable requestId for retries.","cli":"dench email draft create","method":"POST","path":"/email/drafts","permission":"email:write","pathParams":[]},
+  {"id":"email.drafts.get","group":"email","summary":"Read an email draft, eligible senders and provider sync status.","cli":"dench email draft show","method":"GET","path":"/email/drafts/{draftId}","permission":"email:read","pathParams":["draftId"]},
+  {"id":"email.drafts.senders","group":"email","summary":"List native mailboxes this caller may use.","cli":"dench email draft senders","method":"GET","path":"/email/drafts/senders","permission":"email:read","pathParams":[]},
+  {"id":"email.drafts.update","group":"email","summary":"Save draft content using expectedRevision; sender changes require a new draft after provider binding.","cli":"dench email draft update","method":"PATCH","path":"/email/drafts/{draftId}","permission":"email:write","pathParams":["draftId"]},
+  {"id":"email.drafts.send","group":"email","summary":"Send the current Dench draft revision through its native mailbox. Repeated requests share a durable receipt.","cli":"dench email draft send","method":"POST","path":"/email/drafts/{draftId}/send","permission":"email:write","pathParams":["draftId"]},
+  {"id":"email.drafts.upload","group":"email","summary":"Upload attachment bytes authorized against this draft before adding its storage reference.","cli":"dench email draft attach","method":"POST","path":"/email/drafts/{draftId}/attachments","permission":"email:write","pathParams":["draftId"]},
+  {"id":"email.drafts.signature","group":"email","summary":"Load the selected mailbox signature for explicit visible insertion.","cli":"dench email draft signature","method":"GET","path":"/email/drafts/{draftId}/signature","permission":"email:read","pathParams":["draftId"]},
+  {"id":"email.native.send","group":"email","summary":"Send through a native Gmail or Outlook mailbox with a durable request receipt. Only use for an explicit send request.","cli":"dench email send --mailbox","method":"POST","path":"/email/native/send","permission":"email:write","pathParams":[]},
   {"id":"email.send","group":"email","summary":"Send one raw email (no campaign): to/cc/bcc, custom from-name and reply-to, optional reply threading via replyToMessageId.","cli":"dench email send","method":"POST","path":"/email/send","permission":"email:write","pathParams":[]},
   {"id":"email.message.get","group":"email","summary":"Read a raw email message's status and open/click counters.","cli":"dench email message status","method":"GET","path":"/email/messages/{messageId}","permission":"email:read","pathParams":["messageId"]},
   {"id":"email.message.list","group":"email","summary":"List recent raw email messages for the workspace.","cli":"dench email message list","method":"GET","path":"/email/messages","permission":"email:read","pathParams":[]},
@@ -608,6 +617,14 @@ export const APP_SDK_METHODS: Readonly<Record<string, AppSdkMethodInfo>> = {
   "campaigns.campaignsForRecord": {"kind":"op","permission":"campaigns:read","op":"campaigns.people.forRecord","doc":"The campaigns a CRM record is in, with its status in each."},
   "campaigns.personTimeline": {"kind":"op","permission":"campaigns:read","op":"campaigns.people.timeline","doc":"Everything a campaign did for one person, step by step."},
   "campaigns.removePerson": {"kind":"op","permission":"campaigns:write","op":"campaigns.people.remove","doc":"Remove a never-contacted person from a draft campaign."},
+  "email.createDraft": {"kind":"op","permission":"email:write","op":"email.drafts.create","doc":"Create a native mailbox draft with a stable request receipt."},
+  "email.draft": {"kind":"op","permission":"email:read","op":"email.drafts.get","doc":"Read a native email draft and sync status."},
+  "email.updateDraft": {"kind":"op","permission":"email:write","op":"email.drafts.update","doc":"Save the next email draft revision."},
+  "email.sendDraft": {"kind":"op","permission":"email:write","op":"email.drafts.send","doc":"Send the frozen native email draft revision."},
+  "email.senders": {"kind":"op","permission":"email:read","op":"email.drafts.senders","doc":"List eligible native mailboxes."},
+  "email.uploadAttachment": {"kind":"op","permission":"email:write","op":"email.drafts.upload","doc":"Upload attachment bytes for a native draft."},
+  "email.signature": {"kind":"op","permission":"email:read","op":"email.drafts.signature","doc":"Load the selected mailbox signature for visible insertion."},
+  "email.sendFromMailbox": {"kind":"op","permission":"email:write","op":"email.native.send","doc":"Explicitly send through a native Gmail or Outlook mailbox."},
   "email.send": {"kind":"op","permission":"email:write","op":"email.send","doc":"Send one email from a verified identity."},
   "email.messages": {"kind":"op","permission":"email:read","op":"email.message.list","doc":"Sent messages."},
   "email.message": {"kind":"op","permission":"email:read","op":"email.message.get","doc":"One sent message with delivery events."},

package/lib/app-sdk-surface.ts

@@ -908,6 +908,55 @@ export const APP_SDK_SURFACE: AppSdkSurface = {
   },
 
   email: {
+    createDraft: {
+      op: "email.drafts.create",
+      doc: "Create a native mailbox draft with a stable request receipt.",
+      args: `draft: ${A("email.drafts.create")}`,
+      returns: R("email.drafts.create"),
+    },
+    draft: {
+      op: "email.drafts.get",
+      doc: "Read a native email draft and sync status.",
+      args: "draftId: string",
+      returns: R("email.drafts.get"),
+    },
+    updateDraft: {
+      op: "email.drafts.update",
+      doc: "Save the next email draft revision.",
+      args: `input: ${A("email.drafts.update")}`,
+      returns: R("email.drafts.update"),
+    },
+    sendDraft: {
+      op: "email.drafts.send",
+      doc: "Send the frozen native email draft revision.",
+      args: `input: ${A("email.drafts.send")}`,
+      returns: R("email.drafts.send"),
+    },
+    senders: {
+      op: "email.drafts.senders",
+      doc: "List eligible native mailboxes.",
+      args: `opts?: ${A("email.drafts.senders")}`,
+      returns: R("email.drafts.senders"),
+    },
+    uploadAttachment: {
+      op: "email.drafts.upload",
+      doc: "Upload attachment bytes for a native draft.",
+      args: `input: ${A("email.drafts.upload")}`,
+      returns: R("email.drafts.upload"),
+    },
+    signature: {
+      op: "email.drafts.signature",
+      doc: "Load the selected mailbox signature for visible insertion.",
+      args: "draftId: string",
+      returns: R("email.drafts.signature"),
+    },
+    sendFromMailbox: {
+      op: "email.native.send",
+      doc: "Explicitly send through a native Gmail or Outlook mailbox.",
+      args: `message: ${A("email.native.send")}`,
+      returns: R("email.native.send"),
+    },
+
     send: {
       op: "email.send",
       doc: "Send one email from a verified identity.",

package/lib/command-registry.ts

@@ -34,6 +34,9 @@ export type CustomOperation = {
     | "cronRunNow"
     | "connectionsList"
     | "toolDisconnect"
+    | "nativeToolSearch"
+    | "nativeToolRun"
+    | "nativeToolConnect"
     | "billingTopup"
     | "upgrade"
     | "filesMove"
@@ -468,6 +471,18 @@ const rawApiOperations = [
     backend: local("Backend selection is local CLI state."),
   }),
 
+  op({
+    id: "workspace.context.sections",
+    group: "workspace",
+    summary:
+      "Read selected scoped workspace documents and a compact context index without writes.",
+    cli: "dench context --sections",
+    method: "GET",
+    path: "/context/sections",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("query", "functions/agentConfig:workspaceContext"),
+  }),
   // Workspace orientation.
   op({
     id: "workspace.context",
@@ -3332,6 +3347,103 @@ const rawApiOperations = [
     responseSchema: anyResponse,
     backend: convex("mutation", "functions/emailCampaigns:deleteIdentity"),
   }),
+  op({
+    id: "email.drafts.create",
+    group: "email",
+    summary:
+      "Create an editable Dench email draft and synchronize its selected native mailbox asynchronously. Use a stable requestId for retries.",
+    cli: "dench email draft create",
+    method: "POST",
+    path: "/email/drafts",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("mutation", "functions/emailDrafts:create"),
+  }),
+  op({
+    id: "email.drafts.get",
+    group: "email",
+    summary: "Read an email draft, eligible senders and provider sync status.",
+    cli: "dench email draft show",
+    method: "GET",
+    path: "/email/drafts/{draftId}",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("query", "functions/emailDrafts:get"),
+  }),
+  op({
+    id: "email.drafts.senders",
+    group: "email",
+    summary: "List native mailboxes this caller may use.",
+    cli: "dench email draft senders",
+    method: "GET",
+    path: "/email/drafts/senders",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("query", "functions/emailDrafts:listSenders"),
+  }),
+  op({
+    id: "email.drafts.update",
+    group: "email",
+    summary:
+      "Save draft content using expectedRevision; sender changes require a new draft after provider binding.",
+    cli: "dench email draft update",
+    method: "PATCH",
+    path: "/email/drafts/{draftId}",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("mutation", "functions/emailDrafts:update"),
+  }),
+  op({
+    id: "email.drafts.send",
+    group: "email",
+    summary:
+      "Send the current Dench draft revision through its native mailbox. Repeated requests share a durable receipt.",
+    cli: "dench email draft send",
+    method: "POST",
+    path: "/email/drafts/{draftId}/send",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("mutation", "functions/emailDrafts:send"),
+  }),
+  op({
+    id: "email.drafts.upload",
+    group: "email",
+    summary:
+      "Upload attachment bytes authorized against this draft before adding its storage reference.",
+    cli: "dench email draft attach",
+    method: "POST",
+    path: "/email/drafts/{draftId}/attachments",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("action", "functions/emailDraftsNode:uploadAttachment"),
+  }),
+  op({
+    id: "email.drafts.signature",
+    group: "email",
+    summary:
+      "Load the selected mailbox signature for explicit visible insertion.",
+    cli: "dench email draft signature",
+    method: "GET",
+    path: "/email/drafts/{draftId}/signature",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: convex("action", "functions/emailDraftsNode:loadSignature"),
+  }),
+  op({
+    id: "email.native.send",
+    group: "email",
+    summary:
+      "Send through a native Gmail or Outlook mailbox with a durable request receipt. Only use for an explicit send request.",
+    cli: "dench email send --mailbox",
+    method: "POST",
+    path: "/email/native/send",
+    requestSchema: anyObject,
+    responseSchema: anyResponse,
+    backend: {
+      ...convex("mutation", "functions/emailDrafts:create"),
+      fixedArgs: { mode: "send" },
+    },
+  }),
   op({
     id: "email.send",
     group: "email",
@@ -4825,7 +4937,7 @@ const rawApiOperations = [
     path: "/tools/connections",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: gateway("POST", "/composio/connect"),
+    backend: custom("nativeToolConnect", "bearer"),
   }),
   op({
     id: "tool.search",
@@ -4836,7 +4948,7 @@ const rawApiOperations = [
     path: "/tools/search",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: gateway("POST", "/composio/tool-router/search"),
+    backend: custom("nativeToolSearch", "bearer"),
   }),
   op({
     id: "tool.run",
@@ -4852,7 +4964,7 @@ const rawApiOperations = [
     path: "/tools/run",
     requestSchema: anyObject,
     responseSchema: anyResponse,
-    backend: gateway("POST", "/composio/tool-router/execute"),
+    backend: custom("nativeToolRun", "bearer"),
   }),
   op({
     id: "tool.disconnect",

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),
+    },
+  };
+}