@elevasis/sdk 1.20.2 → 1.21.0

package/dist/test-utils/index.js

@@ -6622,188 +6622,327 @@ DisplayMetadataSchema.extend({
   id: ModelIdSchema,
   resourceId: z.string().trim().min(1).max(255),
   resourceType: z.enum(["workflow", "agent", "trigger", "integration", "external", "human_checkpoint"]),
-  featureIds: ReferenceIdsSchema,
+  systemIds: ReferenceIdsSchema,
   entityIds: ReferenceIdsSchema,
   surfaceIds: ReferenceIdsSchema,
-  capabilityIds: ReferenceIdsSchema,
+  actionIds: ReferenceIdsSchema,
   /** Optional tech-stack metadata for external-SaaS integrations. */
   techStack: TechStackEntrySchema.optional()
 });
 
-// ../core/src/organization-model/domains/sales.ts
-var SalesStageSemanticClassSchema = z.enum(["open", "active", "nurturing", "closed_won", "closed_lost"]);
-var SalesStageSchema = DisplayMetadataSchema.extend({
-  id: ModelIdSchema,
-  order: z.number().int().min(0),
-  semanticClass: SalesStageSemanticClassSchema,
-  surfaceIds: ReferenceIdsSchema,
-  resourceIds: ReferenceIdsSchema
+// ../core/src/organization-model/domains/entities.ts
+var EntityIdSchema = ModelIdSchema;
+var EntityLinkKindSchema = z.enum(["belongs-to", "has-many", "has-one", "many-to-many"]).meta({ label: "Link kind" });
+var EntityLinkSchema = z.object({
+  toEntity: EntityIdSchema.meta({ ref: "entity" }),
+  kind: EntityLinkKindSchema,
+  via: z.string().trim().min(1).max(255).optional(),
+  label: LabelSchema.optional()
 });
-var SalesPipelineSchema = z.object({
-  id: ModelIdSchema,
-  label: z.string().trim().min(1).max(120),
+var EntitySchema = z.object({
+  id: EntityIdSchema,
+  /** Domain-map iteration order. Convention: multiples of 10 (10, 20, 30, ...) to allow easy insertion. */
+  order: z.number(),
+  label: LabelSchema,
   description: DescriptionSchema.optional(),
-  entityId: ModelIdSchema,
-  stages: z.array(SalesStageSchema).min(1)
+  ownedBySystemId: ModelIdSchema.meta({ ref: "system" }),
+  table: z.string().trim().min(1).max(255).optional(),
+  rowSchema: ModelIdSchema.optional(),
+  stateCatalogId: ModelIdSchema.optional(),
+  links: z.array(EntityLinkSchema).optional()
 });
+z.record(z.string(), EntitySchema).refine((record) => Object.entries(record).every(([key, entry]) => entry.id === key), {
+  message: "Each entity entry id must match its map key"
+}).default({});
+var ENTITY_ENTRY_INPUTS = [
+  {
+    id: "crm.deal",
+    order: 10,
+    label: "Deal",
+    description: "A CRM opportunity or sales pipeline record.",
+    ownedBySystemId: "sales.crm",
+    table: "crm_deals",
+    stateCatalogId: "crm.pipeline",
+    links: [{ toEntity: "crm.contact", kind: "has-many", via: "deal_contacts", label: "contacts" }]
+  },
+  {
+    id: "crm.contact",
+    order: 20,
+    label: "CRM Contact",
+    description: "A person associated with a CRM relationship or deal.",
+    ownedBySystemId: "sales.crm",
+    table: "crm_contacts"
+  },
+  {
+    id: "leadgen.list",
+    order: 30,
+    label: "Lead List",
+    description: "A prospecting list that groups companies and contacts for acquisition workflows.",
+    ownedBySystemId: "sales.lead-gen",
+    table: "acq_lists",
+    links: [
+      { toEntity: "leadgen.company", kind: "has-many", via: "acq_list_companies", label: "companies" },
+      { toEntity: "leadgen.contact", kind: "has-many", via: "acq_list_members", label: "contacts" }
+    ]
+  },
+  {
+    id: "leadgen.company",
+    order: 40,
+    label: "Lead Company",
+    description: "A company record sourced, enriched, and qualified during prospecting.",
+    ownedBySystemId: "sales.lead-gen",
+    table: "acq_list_companies",
+    stateCatalogId: "lead-gen.company",
+    links: [
+      { toEntity: "leadgen.list", kind: "belongs-to", via: "list_id", label: "list" },
+      { toEntity: "leadgen.contact", kind: "has-many", via: "company_id", label: "contacts" }
+    ]
+  },
+  {
+    id: "leadgen.contact",
+    order: 50,
+    label: "Lead Contact",
+    description: "A prospect contact discovered or enriched during lead generation.",
+    ownedBySystemId: "sales.lead-gen",
+    table: "acq_list_members",
+    stateCatalogId: "lead-gen.contact",
+    links: [
+      { toEntity: "leadgen.list", kind: "belongs-to", via: "list_id", label: "list" },
+      { toEntity: "leadgen.company", kind: "belongs-to", via: "company_id", label: "company" }
+    ]
+  },
+  {
+    id: "delivery.project",
+    order: 60,
+    label: "Project",
+    description: "A client delivery project.",
+    ownedBySystemId: "projects",
+    table: "projects",
+    links: [
+      { toEntity: "delivery.milestone", kind: "has-many", via: "project_id", label: "milestones" },
+      { toEntity: "delivery.task", kind: "has-many", via: "project_id", label: "tasks" }
+    ]
+  },
+  {
+    id: "delivery.milestone",
+    order: 70,
+    label: "Milestone",
+    description: "A delivery checkpoint within a project.",
+    ownedBySystemId: "projects",
+    table: "project_milestones",
+    links: [
+      { toEntity: "delivery.project", kind: "belongs-to", via: "project_id", label: "project" },
+      { toEntity: "delivery.task", kind: "has-many", via: "milestone_id", label: "tasks" }
+    ]
+  },
+  {
+    id: "delivery.task",
+    order: 80,
+    label: "Task",
+    description: "A delivery task that can move through the task status catalog.",
+    ownedBySystemId: "projects",
+    table: "project_tasks",
+    stateCatalogId: "delivery.task",
+    links: [
+      { toEntity: "delivery.project", kind: "belongs-to", via: "project_id", label: "project" },
+      { toEntity: "delivery.milestone", kind: "belongs-to", via: "milestone_id", label: "milestone" }
+    ]
+  }
+];
+Object.fromEntries(
+  ENTITY_ENTRY_INPUTS.map((entity) => {
+    const parsed = EntitySchema.parse(entity);
+    return [parsed.id, parsed];
+  })
+);
+
+// ../core/src/organization-model/domains/actions.ts
+var ActionResourceIdSchema = z.string().trim().min(1).max(255).regex(/^[A-Za-z0-9]+(?:[-._][A-Za-z0-9]+)*$/, "Resource IDs must use letters, numbers, -, _, or . separators");
+z.enum(["slash-command", "mcp-tool", "api-endpoint", "script-execution"]).meta({ label: "Invocation kind" });
+var ActionIdSchema = ModelIdSchema;
+var ActionScopeSchema = z.union([
+  z.literal("global"),
+  z.object({
+    domain: ModelIdSchema
+  })
+]);
 z.object({
-  entityId: ModelIdSchema,
-  defaultPipelineId: ModelIdSchema,
-  pipelines: z.array(SalesPipelineSchema).min(1)
+  actionId: ActionIdSchema.meta({ ref: "action" }),
+  intent: z.enum(["exposes", "consumes"]).meta({ label: "Intent" })
 });
-var CRM_DISCOVERY_REPLIED_STATE = {
-  stateKey: "discovery_replied",
-  label: "Discovery Replied"
-};
-var CRM_DISCOVERY_LINK_SENT_STATE = {
-  stateKey: "discovery_link_sent",
-  label: "Discovery Link Sent"
-};
-var CRM_DISCOVERY_NUDGING_STATE = {
-  stateKey: "discovery_nudging",
-  label: "Discovery Nudging"
-};
-var CRM_DISCOVERY_BOOKING_CANCELLED_STATE = {
-  stateKey: "discovery_booking_cancelled",
-  label: "Discovery Booking Cancelled"
-};
-var CRM_REPLY_SENT_STATE = {
-  stateKey: "reply_sent",
-  label: "Reply Sent"
-};
-var CRM_FOLLOWUP_1_SENT_STATE = {
-  stateKey: "followup_1_sent",
-  label: "Follow-up 1 Sent"
-};
-var CRM_FOLLOWUP_2_SENT_STATE = {
-  stateKey: "followup_2_sent",
-  label: "Follow-up 2 Sent"
-};
-var CRM_FOLLOWUP_3_SENT_STATE = {
-  stateKey: "followup_3_sent",
-  label: "Follow-up 3 Sent"
-};
-var CRM_PIPELINE_DEFINITION = {
-  pipelineKey: "crm",
-  stages: [
-    {
-      stageKey: "interested",
-      label: "Interested",
-      color: "blue",
-      states: [
-        CRM_DISCOVERY_REPLIED_STATE,
-        CRM_DISCOVERY_LINK_SENT_STATE,
-        CRM_DISCOVERY_NUDGING_STATE,
-        CRM_DISCOVERY_BOOKING_CANCELLED_STATE,
-        CRM_REPLY_SENT_STATE,
-        CRM_FOLLOWUP_1_SENT_STATE,
-        CRM_FOLLOWUP_2_SENT_STATE,
-        CRM_FOLLOWUP_3_SENT_STATE
-      ]
-    },
-    { stageKey: "proposal", label: "Proposal", color: "yellow", states: [] },
-    { stageKey: "closing", label: "Closing", color: "orange", states: [] },
-    { stageKey: "closed_won", label: "Closed Won", color: "green", states: [] },
-    { stageKey: "closed_lost", label: "Closed Lost", color: "red", states: [] },
-    { stageKey: "nurturing", label: "Nurturing", color: "grape", states: [] }
-  ]
-};
-var LEAD_GEN_STAGE_CATALOG = {
-  // Prospecting — company population
-  scraped: {
-    key: "scraped",
-    label: "Scraped",
-    description: "Company was scraped from a source directory (Apify actor run).",
-    order: 1,
-    entity: "company"
+var SlashCommandInvocationSchema = z.object({
+  kind: z.literal("slash-command"),
+  command: z.string().trim().min(1).max(200).regex(/^\/[^\s].*$/, "Slash commands must start with /"),
+  toolFactory: ModelIdSchema.optional()
+});
+var McpToolInvocationSchema = z.object({
+  kind: z.literal("mcp-tool"),
+  server: ModelIdSchema,
+  name: ModelIdSchema
+});
+var ApiEndpointInvocationSchema = z.object({
+  kind: z.literal("api-endpoint"),
+  method: z.enum(["GET", "POST", "PATCH", "DELETE"]).meta({ label: "HTTP method" }),
+  path: z.string().trim().startsWith("/").max(500),
+  requestSchema: ModelIdSchema.optional(),
+  responseSchema: ModelIdSchema.optional()
+});
+var ScriptExecutionInvocationSchema = z.object({
+  kind: z.literal("script-execution"),
+  resourceId: ActionResourceIdSchema
+});
+var ActionInvocationSchema = z.discriminatedUnion("kind", [
+  SlashCommandInvocationSchema,
+  McpToolInvocationSchema,
+  ApiEndpointInvocationSchema,
+  ScriptExecutionInvocationSchema
+]);
+var ActionSchema = z.object({
+  id: ActionIdSchema,
+  /** Domain-map iteration order. Convention: multiples of 10 (10, 20, 30, ...) to allow easy insertion. */
+  order: z.number(),
+  label: LabelSchema,
+  description: DescriptionSchema.optional(),
+  scope: ActionScopeSchema.default("global"),
+  resourceId: ActionResourceIdSchema.optional(),
+  affects: z.array(EntityIdSchema.meta({ ref: "entity" })).optional(),
+  invocations: z.array(ActionInvocationSchema).default([]),
+  knowledge: z.array(ModelIdSchema.meta({ ref: "knowledge" })).default([]).optional(),
+  lifecycle: z.enum(["draft", "beta", "active", "deprecated", "archived"]).meta({ label: "Lifecycle", color: "teal" }).default("active")
+});
+z.record(z.string(), ActionSchema).refine((record) => Object.entries(record).every(([key, entry]) => entry.id === key), {
+  message: "Each action entry id must match its map key"
+}).default({});
+var LEAD_GEN_ACTION_ENTRY_INPUTS = [
+  {
+    id: "lead-gen.company.source",
+    order: 10,
+    label: "Source companies",
+    description: "Import source companies from a list provider.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-import-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/source" }]
   },
-  populated: {
-    key: "populated",
-    label: "Companies found",
-    description: "Companies have been found and added to the lead-gen list.",
-    order: 2,
-    entity: "company"
+  {
+    id: "lead-gen.company.apollo-import",
+    order: 20,
+    label: "Import from Apollo",
+    description: "Pull companies and seed contact data from an Apollo search or list.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-01c-apollo-import-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/apollo-import" }]
   },
-  crawled: {
-    key: "crawled",
-    label: "Websites crawled",
-    description: "Company websites have been crawled (e.g. via Apify) and raw page content stored for downstream LLM analysis.",
-    order: 2.5,
-    entity: "company"
+  {
+    id: "lead-gen.contact.discover",
+    order: 30,
+    label: "Discover contact emails",
+    description: "Find email addresses for contacts at qualified companies.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-04-email-discovery-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/contacts/discover" }]
   },
-  extracted: {
-    key: "extracted",
-    label: "Websites analyzed",
-    description: "Company websites have been analyzed for business signals.",
-    order: 3,
-    entity: "company"
+  {
+    id: "lead-gen.contact.verify-email",
+    order: 40,
+    label: "Verify emails",
+    description: "Check email deliverability before outreach.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-05-email-verification-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/contacts/verify-email" }]
   },
-  enriched: {
-    key: "enriched",
-    label: "Enriched",
-    description: "Company or contact enriched with third-party data (e.g. Tomba, Anymailfinder).",
-    order: 4,
-    entity: "company"
+  {
+    id: "lead-gen.company.apify-crawl",
+    order: 50,
+    label: "Crawl websites",
+    description: "Crawl company websites via Apify and store raw page markdown in enrichmentData.websiteCrawl.pages for downstream LLM analysis.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-02a-apify-website-crawl-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/apify-crawl" }]
   },
-  "decision-makers-enriched": {
-    key: "decision-makers-enriched",
-    label: "Decision-makers found",
-    description: "Decision-maker contacts discovered and attached to a qualified company.",
-    order: 6,
-    entity: "company",
-    recordEntity: "contact",
-    recordStageKey: "discovered"
+  {
+    id: "lead-gen.company.website-extract",
+    order: 60,
+    label: "Extract website signals",
+    description: "Scrape and analyze company websites for qualification signals.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-02-website-extract-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/website-extract" }]
   },
-  // Prospecting — contact discovery
-  discovered: {
-    key: "discovered",
-    label: "Decision-makers found",
-    description: "Decision-maker contact details have been found.",
-    order: 5,
-    entity: "contact"
+  {
+    id: "lead-gen.company.qualify",
+    order: 70,
+    label: "Qualify companies",
+    description: "Score and filter companies against the ICP rubric.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-03-company-qualification-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/qualify" }]
   },
-  verified: {
-    key: "verified",
-    label: "Emails verified",
-    description: "Contact email addresses have been checked for deliverability.",
-    order: 7,
-    entity: "contact"
+  {
+    id: "lead-gen.company.dtc-subscription-qualify",
+    order: 80,
+    label: "Qualify DTC subscription fit",
+    description: "Classify subscription potential and consumable-product fit for DTC brands.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-03b-dtc-subscription-score-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/dtc-subscription-qualify" }]
   },
-  // Qualification
-  qualified: {
-    key: "qualified",
-    label: "Companies qualified",
-    description: "Companies have been scored against the qualification criteria.",
-    order: 8,
-    entity: "company"
+  {
+    id: "lead-gen.contact.apollo-decision-maker-enrich",
+    order: 90,
+    label: "Enrich decision-makers",
+    description: "Find and enrich qualified contacts at qualified companies via Apollo.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-04b-apollo-decision-maker-enrich-workflow",
+    invocations: [
+      { kind: "api-endpoint", method: "POST", path: "/api/prospecting/contacts/apollo-decision-maker-enrich" }
+    ]
   },
-  // Outreach
-  personalized: {
-    key: "personalized",
-    label: "Personalized",
-    description: "Outreach message personalized for the contact (Instantly personalization workflow).",
-    order: 9,
-    entity: "contact"
+  {
+    id: "lead-gen.contact.personalize",
+    order: 100,
+    label: "Personalize outreach",
+    description: "Generate personalized opening lines for each contact.",
+    scope: { domain: "sales" },
+    resourceId: "ist-personalization-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/contacts/personalize" }]
   },
-  uploaded: {
-    key: "uploaded",
-    label: "Reviewed and exported",
-    description: "Approved records have been reviewed and exported for handoff.",
-    order: 10,
-    entity: "company",
-    additionalEntities: ["contact"]
+  {
+    id: "lead-gen.review.outreach-ready",
+    order: 110,
+    label: "Upload to outreach",
+    description: "Upload approved contacts to the outreach sequence after QC review.",
+    scope: { domain: "sales" },
+    resourceId: "ist-upload-contacts-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/review/outreach-ready" }]
   },
-  interested: {
-    key: "interested",
-    label: "Interested",
-    description: "Contact replied with a positive signal (Instantly reply-handler transition).",
-    order: 11,
-    entity: "contact"
+  {
+    id: "lead-gen.export.list",
+    order: 120,
+    label: "Export lead list",
+    description: "Export approved leads as a downloadable lead list.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-06-export-list-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/export/list" }]
+  },
+  {
+    id: "lead-gen.company.cleanup",
+    order: 130,
+    label: "Clean up companies",
+    description: "Remove disqualified or duplicate companies from the list.",
+    scope: { domain: "sales" },
+    resourceId: "lgn-company-cleanup-workflow",
+    invocations: [{ kind: "api-endpoint", method: "POST", path: "/api/prospecting/companies/cleanup" }]
   }
-};
+];
+var LEAD_GEN_ACTION_ENTRIES = Object.fromEntries(
+  LEAD_GEN_ACTION_ENTRY_INPUTS.map((action) => {
+    const parsed = ActionSchema.parse(action);
+    return [parsed.id, parsed];
+  })
+);
 
 // ../core/src/organization-model/domains/prospecting.ts
-var ProspectingLifecycleStageSchema = DisplayMetadataSchema.extend({
+DisplayMetadataSchema.extend({
   id: ModelIdSchema,
   order: z.number().min(0)
 });
@@ -6841,7 +6980,7 @@ var ProspectingBuildTemplateStepSchema = DisplayMetadataSchema.extend({
   recordSourceStageKey: ModelIdSchema.optional(),
   dependsOn: z.array(ModelIdSchema).optional(),
   dependencyMode: z.literal("per-record-eligibility"),
-  capabilityKey: ModelIdSchema,
+  actionKey: ModelIdSchema,
   defaultBatchSize: z.number().int().positive(),
   maxBatchSize: z.number().int().positive(),
   recordColumns: RecordColumnsConfigSchema.optional(),
@@ -6850,7 +6989,7 @@ var ProspectingBuildTemplateStepSchema = DisplayMetadataSchema.extend({
   message: "defaultBatchSize must be less than or equal to maxBatchSize",
   path: ["defaultBatchSize"]
 });
-var ProspectingBuildTemplateSchema = DisplayMetadataSchema.extend({
+DisplayMetadataSchema.extend({
   id: ModelIdSchema,
   steps: z.array(ProspectingBuildTemplateStepSchema).min(1)
 });
@@ -6862,140 +7001,84 @@ var DTC_RECORD_COLUMNS = {
       { key: "employee-count", label: "Employees", path: "company.numEmployees", renderType: "count" },
       { key: "apollo-industry", label: "Apollo industry", path: "company.category" },
       { key: "location", label: "Location", path: "company.locationState" }
-    ]
-  },
-  crawled: {
-    company: [
-      { key: "name", label: "Company", path: "company.name" },
-      { key: "domain", label: "Domain", path: "company.domain" },
-      { key: "page-count", label: "Pages", path: "company.enrichmentData.websiteCrawl.pageCount", renderType: "count" },
-      { key: "crawl-status", label: "Crawl status", path: "processingState.crawled.status", renderType: "badge" }
-    ]
-  },
-  extracted: {
-    company: [
-      { key: "name", label: "Company", path: "company.name" },
-      { key: "domain", label: "Domain", path: "company.domain" },
-      { key: "description", label: "Description", path: "company.enrichmentData.websiteCrawl.companyDescription" },
-      { key: "services", label: "Services", path: "company.enrichmentData.websiteCrawl.services", renderType: "json" },
-      { key: "automation-gaps", label: "Automation gaps", path: "company.enrichmentData.websiteCrawl.automationGaps", renderType: "json" },
-      { key: "contact-count", label: "Contacts", path: "company.enrichmentData.websiteCrawl.emailCount", renderType: "count" }
-    ]
-  },
-  qualified: {
-    company: [
-      { key: "name", label: "Company", path: "company.name" },
-      { key: "domain", label: "Domain", path: "company.domain" },
-      { key: "score", label: "Score", path: "company.qualificationScore", renderType: "badge", badgeColor: "green" },
-      { key: "signals", label: "Signals", path: "company.qualificationSignals", renderType: "json" },
-      { key: "disqualified-reason", label: "Disqualified reason", path: "processingState.qualified.data.disqualifiedReason" }
-    ]
-  },
-  decisionMakers: {
-    contact: [
-      { key: "name", label: "Name", path: "contact.name" },
-      { key: "title", label: "Title", path: "contact.title" },
-      { key: "email", label: "Email", path: "contact.email" },
-      { key: "linkedin", label: "LinkedIn", path: "contact.linkedinUrl" },
-      { key: "priority-score", label: "Priority", path: "contact.enrichmentData.apollo.priorityScore", renderType: "badge" }
-    ]
-  },
-  uploaded: {
-    company: [
-      { key: "name", label: "Company", path: "company.name" },
-      { key: "domain", label: "Domain", path: "company.domain" },
-      { key: "contacts", label: "Contacts", path: "company.enrichmentData.approvedLeadListExport.contacts", renderType: "json" },
-      { key: "score", label: "Score", path: "company.qualificationScore", renderType: "badge", badgeColor: "green" },
-      { key: "approval", label: "Approval", path: "company.enrichmentData.approvedLeadListExport.approvalStatus", renderType: "badge" }
-    ]
-  }
-};
-z.object({
-  id: ModelIdSchema,
-  label: z.string(),
-  description: z.string(),
-  resourceId: ModelIdSchema
-});
-var CAPABILITY_REGISTRY = [
-  {
-    id: "lead-gen.company.source",
-    label: "Source companies",
-    description: "Import source companies from a list provider.",
-    resourceId: "lgn-import-workflow"
-  },
-  {
-    id: "lead-gen.company.apollo-import",
-    label: "Import from Apollo",
-    description: "Pull companies and seed contact data from an Apollo search or list.",
-    resourceId: "lgn-01c-apollo-import-workflow"
-  },
-  {
-    id: "lead-gen.contact.discover",
-    label: "Discover contact emails",
-    description: "Find email addresses for contacts at qualified companies.",
-    resourceId: "lgn-04-email-discovery-workflow"
-  },
-  {
-    id: "lead-gen.contact.verify-email",
-    label: "Verify emails",
-    description: "Check email deliverability before outreach.",
-    resourceId: "lgn-05-email-verification-workflow"
-  },
-  {
-    id: "lead-gen.company.apify-crawl",
-    label: "Crawl websites",
-    description: "Crawl company websites via Apify and store raw page markdown in enrichmentData.websiteCrawl.pages for downstream LLM analysis.",
-    resourceId: "lgn-02a-apify-website-crawl-workflow"
-  },
-  {
-    id: "lead-gen.company.website-extract",
-    label: "Extract website signals",
-    description: "Scrape and analyze company websites for qualification signals.",
-    resourceId: "lgn-02-website-extract-workflow"
-  },
-  {
-    id: "lead-gen.company.qualify",
-    label: "Qualify companies",
-    description: "Score and filter companies against the ICP rubric.",
-    resourceId: "lgn-03-company-qualification-workflow"
-  },
-  {
-    id: "lead-gen.company.dtc-subscription-qualify",
-    label: "Qualify DTC subscription fit",
-    description: "Classify subscription potential and consumable-product fit for DTC brands.",
-    resourceId: "lgn-03b-dtc-subscription-score-workflow"
+    ]
   },
-  {
-    id: "lead-gen.contact.apollo-decision-maker-enrich",
-    label: "Enrich decision-makers",
-    description: "Find and enrich qualified contacts at qualified companies via Apollo.",
-    resourceId: "lgn-04b-apollo-decision-maker-enrich-workflow"
+  crawled: {
+    company: [
+      { key: "name", label: "Company", path: "company.name" },
+      { key: "domain", label: "Domain", path: "company.domain" },
+      { key: "page-count", label: "Pages", path: "company.enrichmentData.websiteCrawl.pageCount", renderType: "count" },
+      { key: "crawl-status", label: "Crawl status", path: "processingState.crawled.status", renderType: "badge" }
+    ]
   },
-  {
-    id: "lead-gen.contact.personalize",
-    label: "Personalize outreach",
-    description: "Generate personalized opening lines for each contact.",
-    resourceId: "ist-personalization-workflow"
+  extracted: {
+    company: [
+      { key: "name", label: "Company", path: "company.name" },
+      { key: "domain", label: "Domain", path: "company.domain" },
+      { key: "description", label: "Description", path: "company.enrichmentData.websiteCrawl.companyDescription" },
+      { key: "services", label: "Services", path: "company.enrichmentData.websiteCrawl.services", renderType: "json" },
+      {
+        key: "automation-gaps",
+        label: "Automation gaps",
+        path: "company.enrichmentData.websiteCrawl.automationGaps",
+        renderType: "json"
+      },
+      {
+        key: "contact-count",
+        label: "Contacts",
+        path: "company.enrichmentData.websiteCrawl.emailCount",
+        renderType: "count"
+      }
+    ]
   },
-  {
-    id: "lead-gen.review.outreach-ready",
-    label: "Upload to outreach",
-    description: "Upload approved contacts to the outreach sequence after QC review.",
-    resourceId: "ist-upload-contacts-workflow"
+  qualified: {
+    company: [
+      { key: "name", label: "Company", path: "company.name" },
+      { key: "domain", label: "Domain", path: "company.domain" },
+      { key: "score", label: "Score", path: "company.qualificationScore", renderType: "badge", badgeColor: "green" },
+      { key: "signals", label: "Signals", path: "company.qualificationSignals", renderType: "json" },
+      {
+        key: "disqualified-reason",
+        label: "Disqualified reason",
+        path: "processingState.qualified.data.disqualifiedReason"
+      }
+    ]
   },
-  {
-    id: "lead-gen.export.list",
-    label: "Export lead list",
-    description: "Export approved leads as a downloadable lead list.",
-    resourceId: "lgn-06-export-list-workflow"
+  decisionMakers: {
+    contact: [
+      { key: "name", label: "Name", path: "contact.name" },
+      { key: "title", label: "Title", path: "contact.title" },
+      { key: "email", label: "Email", path: "contact.email" },
+      { key: "linkedin", label: "LinkedIn", path: "contact.linkedinUrl" },
+      {
+        key: "priority-score",
+        label: "Priority",
+        path: "contact.enrichmentData.apollo.priorityScore",
+        renderType: "badge"
+      }
+    ]
   },
-  {
-    id: "lead-gen.company.cleanup",
-    label: "Clean up companies",
-    description: "Remove disqualified or duplicate companies from the list.",
-    resourceId: "lgn-company-cleanup-workflow"
+  uploaded: {
+    company: [
+      { key: "name", label: "Company", path: "company.name" },
+      { key: "domain", label: "Domain", path: "company.domain" },
+      {
+        key: "contacts",
+        label: "Contacts",
+        path: "company.enrichmentData.approvedLeadListExport.contacts",
+        renderType: "json"
+      },
+      { key: "score", label: "Score", path: "company.qualificationScore", renderType: "badge", badgeColor: "green" },
+      {
+        key: "approval",
+        label: "Approval",
+        path: "company.enrichmentData.approvedLeadListExport.approvalStatus",
+        renderType: "badge"
+      }
+    ]
   }
-];
+};
+var ACTION_REGISTRY = Object.values(LEAD_GEN_ACTION_ENTRIES);
 var PROSPECTING_STEPS = {
   localServices: {
     sourceCompanies: {
@@ -7005,7 +7088,7 @@ var PROSPECTING_STEPS = {
       outputs: ["company"],
       stageKey: "populated",
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.source",
+      actionKey: "lead-gen.company.source",
       defaultBatchSize: 100,
       maxBatchSize: 250
     },
@@ -7017,7 +7100,7 @@ var PROSPECTING_STEPS = {
       stageKey: "extracted",
       dependsOn: ["source-companies"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.website-extract",
+      actionKey: "lead-gen.company.website-extract",
       defaultBatchSize: 50,
       maxBatchSize: 100
     },
@@ -7029,7 +7112,7 @@ var PROSPECTING_STEPS = {
       stageKey: "qualified",
       dependsOn: ["analyze-websites"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.qualify",
+      actionKey: "lead-gen.company.qualify",
       defaultBatchSize: 100,
       maxBatchSize: 250
     },
@@ -7041,7 +7124,7 @@ var PROSPECTING_STEPS = {
       stageKey: "discovered",
       dependsOn: ["qualify-companies"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.contact.discover",
+      actionKey: "lead-gen.contact.discover",
       defaultBatchSize: 50,
       maxBatchSize: 100
     },
@@ -7053,7 +7136,7 @@ var PROSPECTING_STEPS = {
       stageKey: "verified",
       dependsOn: ["find-contacts"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.contact.verify-email",
+      actionKey: "lead-gen.contact.verify-email",
       defaultBatchSize: 100,
       maxBatchSize: 500
     },
@@ -7065,7 +7148,7 @@ var PROSPECTING_STEPS = {
       stageKey: "personalized",
       dependsOn: ["verify-emails"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.contact.personalize",
+      actionKey: "lead-gen.contact.personalize",
       defaultBatchSize: 25,
       maxBatchSize: 100
     },
@@ -7077,7 +7160,7 @@ var PROSPECTING_STEPS = {
       stageKey: "uploaded",
       dependsOn: ["personalize"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.review.outreach-ready",
+      actionKey: "lead-gen.review.outreach-ready",
       defaultBatchSize: 25,
       maxBatchSize: 100
     }
@@ -7091,7 +7174,7 @@ var PROSPECTING_STEPS = {
       outputs: ["company", "contact"],
       stageKey: "populated",
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.apollo-import",
+      actionKey: "lead-gen.company.apollo-import",
       defaultBatchSize: 250,
       maxBatchSize: 1e3,
       recordColumns: DTC_RECORD_COLUMNS.populated,
@@ -7116,7 +7199,7 @@ var PROSPECTING_STEPS = {
       stageKey: "crawled",
       dependsOn: ["import-apollo-search"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.apify-crawl",
+      actionKey: "lead-gen.company.apify-crawl",
       defaultBatchSize: 50,
       maxBatchSize: 100,
       recordColumns: DTC_RECORD_COLUMNS.crawled,
@@ -7142,7 +7225,7 @@ var PROSPECTING_STEPS = {
       stageKey: "extracted",
       dependsOn: ["apify-crawl"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.website-extract",
+      actionKey: "lead-gen.company.website-extract",
       defaultBatchSize: 50,
       maxBatchSize: 100,
       recordColumns: DTC_RECORD_COLUMNS.extracted
@@ -7156,7 +7239,7 @@ var PROSPECTING_STEPS = {
       stageKey: "qualified",
       dependsOn: ["analyze-websites"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.company.dtc-subscription-qualify",
+      actionKey: "lead-gen.company.dtc-subscription-qualify",
       defaultBatchSize: 100,
       maxBatchSize: 250,
       recordColumns: DTC_RECORD_COLUMNS.qualified
@@ -7171,7 +7254,7 @@ var PROSPECTING_STEPS = {
       recordEntity: "contact",
       dependsOn: ["score-dtc-fit"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.contact.apollo-decision-maker-enrich",
+      actionKey: "lead-gen.contact.apollo-decision-maker-enrich",
       defaultBatchSize: 100,
       maxBatchSize: 250,
       recordColumns: DTC_RECORD_COLUMNS.decisionMakers,
@@ -7198,7 +7281,7 @@ var PROSPECTING_STEPS = {
       recordSourceStageKey: "qualified",
       dependsOn: ["enrich-decision-makers"],
       dependencyMode: "per-record-eligibility",
-      capabilityKey: "lead-gen.export.list",
+      actionKey: "lead-gen.export.list",
       defaultBatchSize: 100,
       maxBatchSize: 250,
       recordColumns: DTC_RECORD_COLUMNS.uploaded,
@@ -7217,77 +7300,207 @@ var PROSPECTING_STEPS = {
     }
   }
 };
+
+// ../core/src/business/acquisition/build-templates.ts
+var BUILD_TEMPLATE_CATALOG = [
+  {
+    id: "local-services",
+    label: "Local Services",
+    description: "Source, analyze, qualify, and personalize local service businesses for outreach.",
+    steps: Object.values(PROSPECTING_STEPS.localServices)
+  },
+  {
+    id: "dtc-subscription-apollo-clickup",
+    label: "DTC Subscription (Apollo + ClickUp)",
+    description: "Import DTC brand leads from Apollo, crawl their websites, score fit, enrich contacts, and export via ClickUp.",
+    steps: Object.values(PROSPECTING_STEPS.dtcApolloClickup)
+  }
+];
+var PROSPECTING_BUILD_TEMPLATE_OPTIONS = BUILD_TEMPLATE_CATALOG.map(({ id, label, description }) => ({
+  id,
+  label,
+  description
+}));
+function isProspectingBuildTemplateId(value) {
+  return PROSPECTING_BUILD_TEMPLATE_OPTIONS.some((template) => template.id === value);
+}
+
+// ../core/src/organization-model/catalogs/lead-gen.ts
+var LEAD_GEN_STAGE_CATALOG = {
+  // Prospecting - company population
+  scraped: {
+    key: "scraped",
+    label: "Scraped",
+    description: "Company was scraped from a source directory (Apify actor run).",
+    order: 1,
+    entity: "company"
+  },
+  populated: {
+    key: "populated",
+    label: "Companies found",
+    description: "Companies have been found and added to the lead-gen list.",
+    order: 2,
+    entity: "company"
+  },
+  crawled: {
+    key: "crawled",
+    label: "Websites crawled",
+    description: "Company websites have been crawled (e.g. via Apify) and raw page content stored for downstream LLM analysis.",
+    order: 2.5,
+    entity: "company"
+  },
+  extracted: {
+    key: "extracted",
+    label: "Websites analyzed",
+    description: "Company websites have been analyzed for business signals.",
+    order: 3,
+    entity: "company"
+  },
+  enriched: {
+    key: "enriched",
+    label: "Enriched",
+    description: "Company or contact enriched with third-party data (e.g. Tomba, Anymailfinder).",
+    order: 4,
+    entity: "company"
+  },
+  "decision-makers-enriched": {
+    key: "decision-makers-enriched",
+    label: "Decision-makers found",
+    description: "Decision-maker contacts discovered and attached to a qualified company.",
+    order: 6,
+    entity: "company",
+    recordEntity: "contact",
+    recordStageKey: "discovered"
+  },
+  // Prospecting - contact discovery
+  discovered: {
+    key: "discovered",
+    label: "Decision-makers found",
+    description: "Decision-maker contact details have been found.",
+    order: 5,
+    entity: "contact"
+  },
+  verified: {
+    key: "verified",
+    label: "Emails verified",
+    description: "Contact email addresses have been checked for deliverability.",
+    order: 7,
+    entity: "contact"
+  },
+  // Qualification
+  qualified: {
+    key: "qualified",
+    label: "Companies qualified",
+    description: "Companies have been scored against the qualification criteria.",
+    order: 8,
+    entity: "company"
+  },
+  // Outreach
+  personalized: {
+    key: "personalized",
+    label: "Personalized",
+    description: "Outreach message personalized for the contact (Instantly personalization workflow).",
+    order: 9,
+    entity: "contact"
+  },
+  uploaded: {
+    key: "uploaded",
+    label: "Reviewed and exported",
+    description: "Approved records have been reviewed and exported for handoff.",
+    order: 10,
+    entity: "company",
+    additionalEntities: ["contact"]
+  },
+  interested: {
+    key: "interested",
+    label: "Interested",
+    description: "Contact replied with a positive signal (Instantly reply-handler transition).",
+    order: 11,
+    entity: "contact"
+  }
+};
+
+// ../core/src/organization-model/domains/sales.ts
+var SalesStageSemanticClassSchema = z.enum(["open", "active", "nurturing", "closed_won", "closed_lost"]);
+var SalesStageSchema = DisplayMetadataSchema.extend({
+  id: ModelIdSchema,
+  order: z.number().int().min(0),
+  semanticClass: SalesStageSemanticClassSchema,
+  surfaceIds: ReferenceIdsSchema,
+  resourceIds: ReferenceIdsSchema
+});
 z.object({
-  listEntityId: ModelIdSchema,
-  companyEntityId: ModelIdSchema,
-  contactEntityId: ModelIdSchema,
+  id: ModelIdSchema,
+  label: z.string().trim().min(1).max(120),
   description: DescriptionSchema.optional(),
-  companyStages: z.array(ProspectingLifecycleStageSchema).min(1),
-  contactStages: z.array(ProspectingLifecycleStageSchema).min(1),
-  defaultBuildTemplateId: ModelIdSchema,
-  buildTemplates: z.array(ProspectingBuildTemplateSchema).min(1)
+  entityId: ModelIdSchema,
+  stages: z.array(SalesStageSchema).min(1)
 });
-function toProspectingLifecycleStage(stage) {
-  return {
-    id: stage.key,
-    label: stage.label,
-    order: stage.order
-  };
-}
-function leadGenStagesForEntity(entity) {
-  return Object.values(LEAD_GEN_STAGE_CATALOG).filter((stage) => stage.entity === entity || stage.additionalEntities?.includes(entity)).sort((a3, b2) => a3.order - b2.order).map(toProspectingLifecycleStage);
-}
-var DEFAULT_ORGANIZATION_MODEL_PROSPECTING = {
-  companyStages: leadGenStagesForEntity("company"),
-  contactStages: leadGenStagesForEntity("contact"),
-  buildTemplates: [
+var CRM_DISCOVERY_REPLIED_STATE = {
+  stateKey: "discovery_replied",
+  label: "Discovery Replied"
+};
+var CRM_DISCOVERY_LINK_SENT_STATE = {
+  stateKey: "discovery_link_sent",
+  label: "Discovery Link Sent"
+};
+var CRM_DISCOVERY_NUDGING_STATE = {
+  stateKey: "discovery_nudging",
+  label: "Discovery Nudging"
+};
+var CRM_DISCOVERY_BOOKING_CANCELLED_STATE = {
+  stateKey: "discovery_booking_cancelled",
+  label: "Discovery Booking Cancelled"
+};
+var CRM_REPLY_SENT_STATE = {
+  stateKey: "reply_sent",
+  label: "Reply Sent"
+};
+var CRM_FOLLOWUP_1_SENT_STATE = {
+  stateKey: "followup_1_sent",
+  label: "Follow-up 1 Sent"
+};
+var CRM_FOLLOWUP_2_SENT_STATE = {
+  stateKey: "followup_2_sent",
+  label: "Follow-up 2 Sent"
+};
+var CRM_FOLLOWUP_3_SENT_STATE = {
+  stateKey: "followup_3_sent",
+  label: "Follow-up 3 Sent"
+};
+var CRM_PIPELINE_DEFINITION = {
+  pipelineKey: "crm",
+  stages: [
     {
-      id: "local-services",
-      label: "Local Services Prospecting",
-      description: "Curated local-services list build using company sourcing, website analysis, qualification, contact discovery, verification, personalization, and review.",
-      steps: [
-        PROSPECTING_STEPS.localServices.sourceCompanies,
-        PROSPECTING_STEPS.localServices.analyzeWebsites,
-        PROSPECTING_STEPS.localServices.qualifyCompanies,
-        PROSPECTING_STEPS.localServices.findContacts,
-        PROSPECTING_STEPS.localServices.verifyEmails,
-        PROSPECTING_STEPS.localServices.personalize,
-        PROSPECTING_STEPS.localServices.review
+      stageKey: "interested",
+      label: "Interested",
+      color: "blue",
+      states: [
+        CRM_DISCOVERY_REPLIED_STATE,
+        CRM_DISCOVERY_LINK_SENT_STATE,
+        CRM_DISCOVERY_NUDGING_STATE,
+        CRM_DISCOVERY_BOOKING_CANCELLED_STATE,
+        CRM_REPLY_SENT_STATE,
+        CRM_FOLLOWUP_1_SENT_STATE,
+        CRM_FOLLOWUP_2_SENT_STATE,
+        CRM_FOLLOWUP_3_SENT_STATE
       ]
     },
-    {
-      id: "dtc-subscription-apollo-clickup",
-      label: "DTC Subscription Apollo Export",
-      description: "Prospecting pipeline for DTC subscription or subscription-ready brands where Apollo is the source and contact-enrichment layer, Elevasis handles company research and fit scoring, and approved leads export as an approved lead list.",
-      steps: [
-        PROSPECTING_STEPS.dtcApolloClickup.importApolloSearch,
-        PROSPECTING_STEPS.dtcApolloClickup.apifyCrawl,
-        PROSPECTING_STEPS.dtcApolloClickup.analyzeWebsites,
-        PROSPECTING_STEPS.dtcApolloClickup.scoreDtcFit,
-        PROSPECTING_STEPS.dtcApolloClickup.enrichDecisionMakers,
-        PROSPECTING_STEPS.dtcApolloClickup.reviewAndExport
-      ]
-    }
+    { stageKey: "proposal", label: "Proposal", color: "yellow", states: [] },
+    { stageKey: "closing", label: "Closing", color: "orange", states: [] },
+    { stageKey: "closed_won", label: "Closed Won", color: "green", states: [] },
+    { stageKey: "closed_lost", label: "Closed Lost", color: "red", states: [] },
+    { stageKey: "nurturing", label: "Nurturing", color: "grape", states: [] }
   ]
 };
 
-// ../core/src/business/acquisition/build-templates.ts
-var PROSPECTING_BUILD_TEMPLATE_OPTIONS = DEFAULT_ORGANIZATION_MODEL_PROSPECTING.buildTemplates.map(
-  ({ id, label, description }) => ({
-    id,
-    label,
-    description
-  })
-);
-function isProspectingBuildTemplateId(value) {
-  return PROSPECTING_BUILD_TEMPLATE_OPTIONS.some((template) => template.id === value);
-}
+// ../core/src/business/acquisition/api-schemas.ts
 var ProcessingStageStatusSchema = z.enum(["success", "no_result", "skipped", "error"]);
 var LeadGenStageKeySchema = z.string().refine((value) => Object.prototype.hasOwnProperty.call(LEAD_GEN_STAGE_CATALOG, value), {
   message: "processing state key must match LEAD_GEN_STAGE_CATALOG"
 });
-var LeadGenCapabilityKeySchema = z.string().refine((value) => CAPABILITY_REGISTRY.some((c) => c.id === value), {
-  message: "capabilityKey must match CAPABILITY_REGISTRY"
+var LeadGenActionKeySchema = z.string().refine((value) => ACTION_REGISTRY.some((c) => c.id === value), {
+  message: "actionKey must match ACTION_REGISTRY"
 });
 var crmStageKeys = CRM_PIPELINE_DEFINITION.stages.map((stage) => stage.stageKey);
 var crmStateKeys = CRM_PIPELINE_DEFINITION.stages.flatMap((stage) => stage.states.map((state) => state.stateKey));
@@ -7567,7 +7780,7 @@ var BuildPlanSnapshotStepSchema = z.object({
   recordSourceStageKey: LeadGenStageKeySchema.optional(),
   dependsOn: z.array(z.string().trim().min(1).max(100)).optional(),
   dependencyMode: z.literal("per-record-eligibility"),
-  capabilityKey: LeadGenCapabilityKeySchema,
+  actionKey: LeadGenActionKeySchema,
   defaultBatchSize: z.number().int().positive(),
   maxBatchSize: z.number().int().positive(),
   recordColumns: z.object({
@@ -8484,6 +8697,22 @@ createAdapter("execution", ["trigger", "triggerAsync"]);
 // src/worker/adapters/email.ts
 createAdapter("email", ["send"]);
 
+// ../core/src/organization-model/helpers.ts
+function listAllSystems(model) {
+  const results = [];
+  function walk(map2, prefix) {
+    for (const [localId, system] of Object.entries(map2)) {
+      const fullPath = prefix ? `${prefix}.${localId}` : localId;
+      results.push({ path: fullPath, system });
+      if (system.subsystems) {
+        walk(system.subsystems, fullPath);
+      }
+    }
+  }
+  walk(model.systems, "");
+  return results;
+}
+
 // ../core/src/platform/registry/validation.ts
 var RegistryValidationError = class extends Error {
   constructor(orgName, resourceId, field, message) {
@@ -8539,25 +8768,27 @@ function getRuntimeResources(resources) {
 }
 function validateResourceGovernance(orgName, deployment, organizationModel = deployment.organizationModel, options = {}) {
   const mode = getResourceValidatorMode(options.mode);
-  const omResources = organizationModel?.resources?.entries;
-  const omSystems = organizationModel?.systems?.systems;
+  const omResourcesMap = organizationModel?.resources;
+  const omSystemsMap = organizationModel?.systems;
   const issues = [];
-  if (!omResources || !omSystems) {
+  if (!omResourcesMap || !omSystemsMap) {
     return { valid: true, mode, issues };
   }
-  const systemsById = new Map(omSystems.map((system) => [system.id, system]));
-  const activeOmResources = omResources.filter((resource) => resource.status === "active");
+  const systemsById = new Map(
+    listAllSystems({ systems: omSystemsMap }).map(({ path, system }) => [path, system])
+  );
+  const activeOmResources = Object.values(omResourcesMap).filter((resource) => resource.status === "active");
   const omResourcesById = new Map(activeOmResources.map((resource) => [resource.id, resource]));
   const runtimeResources = getRuntimeResources(deployment);
   const runtimeResourcesById = new Map(runtimeResources.map((resource) => [resource.resourceId, resource]));
   for (const resource of activeOmResources) {
-    if (!systemsById.has(resource.systemId)) {
+    if (!systemsById.has(resource.systemPath)) {
       addGovernanceIssue(
         issues,
         "missing-om-system",
         orgName,
         resource.id,
-        `[${orgName}] OM resource '${resource.id}' references missing System '${resource.systemId}'.`
+        `[${orgName}] OM resource '${resource.id}' references missing system path '${resource.systemPath}'.`
       );
     }
     const runtimeResource = runtimeResourcesById.get(resource.id);
@@ -8580,13 +8811,13 @@ function validateResourceGovernance(orgName, deployment, organizationModel = dep
         `[${orgName}] Resource '${resource.id}' type mismatch: code has '${runtimeResource.type}', OM has '${resource.kind}'.`
       );
     }
-    if (runtimeResource.descriptor && runtimeResource.descriptor.systemId !== resource.systemId) {
+    if (runtimeResource.descriptor && runtimeResource.descriptor.systemPath !== resource.systemPath) {
       addGovernanceIssue(
         issues,
         "system-mismatch",
         orgName,
         resource.id,
-        `[${orgName}] Resource '${resource.id}' system mismatch: code descriptor has '${runtimeResource.descriptor.systemId}', OM has '${resource.systemId}'.`
+        `[${orgName}] Resource '${resource.id}' system mismatch: code descriptor has '${runtimeResource.descriptor.systemPath}', OM has '${resource.systemPath}'.`
       );
     }
   }