@agifyai/leadify-mcp 1.5.0 → 1.5.2

package/dist/tools/dataroom.js

@@ -1,97 +1,158 @@
 import { z } from "zod";
 import { getClient } from "../client.js";
 import { toolResult, toolError, handleToolError } from "../types.js";
-// ─── Mirrored backend constraints ──────────────────────────────────────────
+// ─── Mirror of the backend companyInfo v2 schema ───────────────────────────
 //
-// The companyInfo schema lives in the Leadify backend (apps/server/src/lib/
-// data-room-schemas.ts most likely). The MCP cannot import it directly, so
-// the constraints below are a hand-mirrored subset based on observed 422
-// responses + GET /api/data-room payload shapes. The mirror is INTENTIONALLY
-// strict on what we know and permissive (passthrough) on what we don't —
-// so callers get up-front guidance for the documented fields and the
-// backend still owns final validation for everything else.
+// SOURCE OF TRUTH:
+//   github.com/AgifyAI/leadify → apps/server/src/lib/data-room-schemas.ts
 //
-// Known constraints (source: observed 422 path/expected pairs):
-//   - products[].category   ∈ {saas, medical_device, service, mixed}
-//   - snapshot.stage        ∈ {early, growth, scaling, enterprise}
-//   - snapshot.constraints[].type ∈ {regulatory, brand, legal}
-//   - snapshot.constraints[].note  ≤ 150 chars
-//   - snapshot.pitchOneLiner       ≤ 200 chars
+// Keep in sync. The backend validates every PUT against the full v2 schema
+// and REPLACES companyInfo wholesale (no server-side merge). Every granular
+// patch tool below therefore fetches the current companyInfo, mutates the
+// target block, and PUTs the FULL merged object back.
 //
-// If you hit a 422 for a field/constraint not listed above, extend the
-// mirror here and republish. The asymmetric upstream Zod (.parse instead of
-// .safeParse) surfaces one error at a time — see TODO at the bottom of this
-// file re: requesting backend .safeParse cumulative errors.
+// The backend now returns ALL zod issues at once under `issues[]` in the
+// 422 body (see formatZodError in apps/server/src/lib/persona-schemas.ts).
+// handleToolError in ../types.ts surfaces that array in the tool error.
+const COMPANY_INFO_SCHEMA_VERSION = 2;
+const STAGES = ["early", "growth", "scaling", "enterprise"];
 const PRODUCT_CATEGORIES = ["saas", "medical_device", "service", "mixed"];
-const STAGE_VALUES = ["early", "growth", "scaling", "enterprise"];
+const CE_CLASSES = ["I", "IIa", "IIb", "III"];
+const REIMBURSEMENT_STATUSES = ["none", "in_progress", "local", "national"];
+const PRICING_MODELS = ["saas_per_site", "saas_per_exam", "capex", "service", "mixed"];
+const CURRENCIES = ["EUR", "USD"];
 const CONSTRAINT_TYPES = ["regulatory", "brand", "legal"];
-const productSchema = z
-    .object({
-    name: z.string().min(1).describe("Product name (required)."),
-    category: z
-        .enum(PRODUCT_CATEGORIES)
-        .describe("Product classification. One of: saas, medical_device, service, mixed."),
-    description: z.string().optional().describe("Short description."),
-    valueProposition: z.string().optional(),
-    targetCustomer: z.string().optional(),
-    pricing: z.string().optional(),
-})
-    .passthrough()
-    .describe("Single product entry. name + category are required (category is a strict enum).");
-const constraintSchema = z
-    .object({
-    type: z
-        .enum(CONSTRAINT_TYPES)
-        .describe("Constraint type. One of: regulatory, brand, legal."),
-    note: z
-        .string()
-        .max(150)
-        .describe("Short note describing the constraint. Max 150 chars."),
-})
-    .passthrough()
-    .describe("Single business constraint (regulatory / brand / legal). Note capped at 150 chars.");
-const snapshotSchema = z
-    .object({
-    stage: z
-        .enum(STAGE_VALUES)
-        .optional()
-        .describe("Company stage. One of: early, growth, scaling, enterprise."),
-    pitchOneLiner: z
-        .string()
-        .max(200)
-        .optional()
-        .describe("One-liner pitch. Max 200 chars."),
-    constraints: z
-        .array(constraintSchema)
-        .optional()
-        .describe("Business constraints. Each entry: {type ∈ regulatory|brand|legal, note ≤150 chars}."),
-})
-    .passthrough()
-    .describe("Snapshot block. stage + pitchOneLiner + constraints[] are validated; other keys pass through.");
-const senderSchema = z
+const GEO_REGIONS = [
+    "eu_western_fr",
+    "eu_western_others",
+    "eu_nordics",
+    "eu_central_eastern",
+    "north_america",
+    "apac",
+    "latam",
+    "mena_africa",
+];
+const CHAR_LIMITS = {
+    name: 200,
+    website: 500,
+    pitchOneLiner: 200,
+    marketSpecialty: 100,
+    constraintLabel: 150,
+    constraintNote: 150,
+    topUseCase: 150,
+    differentiator: 150,
+    notFor: 200,
+    triggerItem: 150,
+    defaultBaseline: 200,
+    keyMetric: 150,
+    miniStory: 300,
+    productName: 100,
+    categoryDetail: 150,
+    outcomeUser: 200,
+    outcomeBuyer: 200,
+    establishmentType: 150,
+    technicalPrereq: 200,
+    championRole: 150,
+    budgetDeciderRole: 150,
+    coDeciderRole: 100,
+    forbiddenWord: 100,
+};
+const PRODUCT_HARD_LIMIT = 5;
+// ─── Sub-schemas ───────────────────────────────────────────────────────────
+const constraintSchema = z.object({
+    label: z.string().max(CHAR_LIMITS.constraintLabel),
+    type: z.enum(CONSTRAINT_TYPES),
+    note: z.string().max(CHAR_LIMITS.constraintNote).optional(),
+});
+const geoSchema = z.object({
+    regions: z.array(z.enum(GEO_REGIONS)).default([]),
+    countriesIncluded: z.array(z.string().length(2)).default([]),
+    countriesExcluded: z.array(z.string().length(2)).default([]),
+});
+const snapshotSchema = z.object({
+    pitchOneLiner: z.string().max(CHAR_LIMITS.pitchOneLiner),
+    marketSpecialty: z.string().max(CHAR_LIMITS.marketSpecialty),
+    stage: z.enum(STAGES),
+    salesTeamSizeFR: z.number().int().min(0),
+    geo: geoSchema,
+    constraints: z.array(constraintSchema).max(10).default([]),
+});
+const regulatorySchema = z.object({
+    ceMarked: z.boolean(),
+    ceClass: z.enum(CE_CLASSES).nullable(),
+    reimbursementStatus: z.enum(REIMBURSEMENT_STATUSES),
+    aoRequired: z.boolean(),
+});
+const productSchema = z.object({
+    name: z.string().max(CHAR_LIMITS.productName),
+    category: z.enum(PRODUCT_CATEGORIES),
+    categoryDetail: z.string().max(CHAR_LIMITS.categoryDetail).optional(),
+    outcomeUser: z.string().max(CHAR_LIMITS.outcomeUser),
+    outcomeBuyer: z.string().max(CHAR_LIMITS.outcomeBuyer),
+    topUseCases: z.array(z.string().max(CHAR_LIMITS.topUseCase)).max(3).default([]),
+    differentiators: z.array(z.string().max(CHAR_LIMITS.differentiator)).max(3).default([]),
+    notFor: z.string().max(CHAR_LIMITS.notFor),
+    regulatory: regulatorySchema,
+});
+const economicsSchema = z
     .object({
-    name: z.string().describe("Default sender display name (required if sender is set)."),
-    title: z.string().optional(),
-    email: z.string().email().optional(),
-})
-    .passthrough();
-// Full companyInfo schema — exposed by describe_company_info_schema and
-// reused by the wholesale update_data_room escape hatch.
-const companyInfoSchema = z
+    pricingModel: z.enum(PRICING_MODELS),
+    ticketRange: z
+        .object({
+        min: z.number().min(0),
+        max: z.number().min(0),
+        currency: z.enum(CURRENCIES),
+    })
+        .refine((r) => r.min <= r.max, {
+        message: "ticketRange.min must be ≤ ticketRange.max",
+        path: ["min"],
+    }),
+    salesCycleMonths: z
+        .object({
+        min: z.number().int().min(0),
+        max: z.number().int().min(0),
+    })
+        .refine((r) => r.min <= r.max, {
+        message: "salesCycleMonths.min must be ≤ salesCycleMonths.max",
+        path: ["min"],
+    }),
+    triggers: z.array(z.string().max(CHAR_LIMITS.triggerItem)).max(5).default([]),
+    defaultBaseline: z.string().max(CHAR_LIMITS.defaultBaseline),
+});
+const productICPSchema = z.object({
+    productId: z.string().max(CHAR_LIMITS.productName),
+    establishmentType: z.string().max(CHAR_LIMITS.establishmentType),
+    technicalPrereqs: z.string().max(CHAR_LIMITS.technicalPrereq),
+    roles: z.object({
+        champion: z.string().max(CHAR_LIMITS.championRole),
+        budgetDecider: z.string().max(CHAR_LIMITS.budgetDeciderRole),
+        coDeciders: z.array(z.string().max(CHAR_LIMITS.coDeciderRole)).max(5).default([]),
+    }),
+});
+const proofWordingSchema = z.object({
+    keyMetrics: z.array(z.string().max(CHAR_LIMITS.keyMetric)).max(3).default([]),
+    miniStories: z.array(z.string().max(CHAR_LIMITS.miniStory)).max(2).default([]),
+    forbiddenWords: z.array(z.string().max(CHAR_LIMITS.forbiddenWord)).default([]),
+});
+const companyInfoV2Schema = z
     .object({
-    name: z.string().optional().describe("Company name."),
-    sector: z.string().optional().describe("Sector / industry."),
-    description: z.string().optional().describe("Company description."),
-    size: z.string().optional().describe("Company size (e.g. '10-50', '200+')."),
-    website: z.string().url().optional().describe("Company website URL."),
-    valueProposition: z.string().optional().describe("Top-level value prop."),
-    competitors: z.array(z.string()).optional().describe("Competitor names."),
-    targetRegions: z.array(z.string()).optional().describe("Geographic regions."),
-    sender: senderSchema.optional().describe("Default sender identity."),
-    products: z.array(productSchema).optional(),
-    snapshot: snapshotSchema.optional(),
+    schemaVersion: z.literal(COMPANY_INFO_SCHEMA_VERSION),
+    name: z.string().max(CHAR_LIMITS.name),
+    website: z.string().max(CHAR_LIMITS.website).optional(),
+    snapshot: snapshotSchema,
+    products: z.array(productSchema).max(PRODUCT_HARD_LIMIT).default([]),
+    economics: economicsSchema,
+    productICPs: z.array(productICPSchema).max(PRODUCT_HARD_LIMIT).default([]),
+    proofWording: proofWordingSchema,
 })
-    .passthrough();
+    .refine((data) => {
+    const productNames = new Set(data.products.map((p) => p.name).filter((n) => n.length > 0));
+    return data.productICPs.every((icp) => !icp.productId || productNames.has(icp.productId));
+}, {
+    message: "productICPs[].productId must reference an existing products[].name",
+    path: ["productICPs"],
+});
+// ─── Document schema (unchanged) ───────────────────────────────────────────
 const DOCUMENT_CATEGORIES = [
     "PRODUCT_CATALOG",
     "CONGRESS_LIST",
@@ -101,9 +162,10 @@ const DOCUMENT_CATEGORIES = [
     "CAMPAIGN_BRIEF",
     "OTHER",
 ];
+// ─── Common descriptions ───────────────────────────────────────────────────
 const ORG_ID_DESC = "Optional Clerk organization ID to target a specific org's data room. " +
     "Defaults to the caller's own org. Requires admin access for writes.";
-const DRY_RUN_DESC = "If true, validate the patch + return the merged preview WITHOUT writing to the API. " +
+const DRY_RUN_DESC = "If true, validate the merged payload + return the preview WITHOUT writing. " +
     "Use to dry-fit a change before persisting.";
 async function fetchDataRoom(organizationId) {
     const params = organizationId
@@ -112,47 +174,73 @@ async function fetchDataRoom(organizationId) {
     const data = (await getClient().get("/api/data-room", params));
     return data ?? {};
 }
+function currentCompanyInfo(state) {
+    const ci = state.companyInfo;
+    if (!ci || typeof ci !== "object" || Array.isArray(ci))
+        return {};
+    return ci;
+}
 async function putCompanyInfo(companyInfo, organizationId) {
     const body = { companyInfo };
     if (organizationId)
         body.organizationId = organizationId;
     return getClient().put("/api/data-room", body);
 }
-function currentCompanyInfo(state) {
-    const ci = state.companyInfo;
-    return ci && typeof ci === "object" && !Array.isArray(ci)
-        ? ci
-        : {};
+// Validate MCP-side against the mirrored v2 schema and surface ALL issues
+// at once (not just the first). Returns null if value passes, or a tool
+// error otherwise.
+function validateOrError(value, hint) {
+    const result = companyInfoV2Schema.safeParse(value);
+    if (result.success)
+        return null;
+    const issues = result.error.issues.map((i) => ({
+        path: i.path.map(String).join("."),
+        message: i.message,
+        code: i.code,
+    }));
+    return toolError(`MCP validation failed against companyInfo v2 schema (${issues.length} issue${issues.length === 1 ? "" : "s"}). ${hint}`, { issues });
 }
-function dryRunResult(patch, mergedCompanyInfo) {
+// Assert that the existing companyInfo is v2-valid. Granular patch tools
+// require a bootstrapped v2 payload to work — otherwise the merged result
+// will fail v2 validation server-side, since the backend replaces wholesale.
+function requireV2Bootstrap(ci) {
+    if (ci.schemaVersion !== COMPANY_INFO_SCHEMA_VERSION) {
+        return toolError(`Data room companyInfo is not v${COMPANY_INFO_SCHEMA_VERSION} (got schemaVersion=${JSON.stringify(ci.schemaVersion)}). ` +
+            "Bootstrap with update_data_room (passing a full v2 payload) before using granular patch tools. " +
+            "See describe_company_info_schema for the contract.");
+    }
+    return null;
+}
+function dryRunResult(merged) {
     return toolResult({
         ok: true,
         dry_run: true,
-        patch,
-        preview_company_info: mergedCompanyInfo,
+        preview_company_info: merged,
         note: "No write performed. Re-call without dry_run to persist.",
     });
 }
-// Validate a sub-schema MCP-side BEFORE calling the API. Returns a normalized
-// error result if invalid (collecting EVERY zod issue, not just the first),
-// or null if the value is OK to send.
-function validateOrError(schema, value, pathPrefix) {
-    const result = schema.safeParse(value);
-    if (result.success)
-        return null;
-    const issues = result.error.issues.map((i) => ({
-        path: [pathPrefix, ...i.path.map(String)].filter(Boolean).join("."),
-        message: i.message,
-        code: i.code,
-    }));
-    return toolError(`Validation failed (${issues.length} issue${issues.length === 1 ? "" : "s"}). ` +
-        "Fix all listed paths and retry — backend constraints mirrored in MCP.", { issues });
+// Run the full pipeline for a granular tool: fetch current, mutate via the
+// caller-provided patcher, validate, dry-run or persist.
+async function mergeAndPut(organizationId, dry_run, patcher, validationHint) {
+    const current = await fetchDataRoom(organizationId);
+    const ci = currentCompanyInfo(current);
+    const bootstrapErr = requireV2Bootstrap(ci);
+    if (bootstrapErr)
+        return bootstrapErr;
+    const merged = patcher(ci);
+    const validationErr = validateOrError(merged, validationHint);
+    if (validationErr)
+        return validationErr;
+    if (dry_run)
+        return dryRunResult(merged);
+    const data = await putCompanyInfo(merged, organizationId);
+    return toolResult(data);
 }
 // ─── Tool registrations ────────────────────────────────────────────────────
 export function registerDataRoomTools(server) {
     // ── get_data_room ──────────────────────────────────────────────────────
-    server.tool("get_data_room", "Retrieve the organization's full data room: company info, all documents, and every " +
-        "persona defined for the workspace. Use this as the entry point when you need to " +
+    server.tool("get_data_room", "Retrieve the organization's full data room: company info (v2 schema), all documents, and " +
+        "every persona defined for the workspace. Use this as the entry point when you need to " +
         "understand the company's context before writing campaigns or messages.", {
         organization_id: z.string().optional().describe(ORG_ID_DESC),
     }, async ({ organization_id }) => {
@@ -165,87 +253,95 @@ export function registerDataRoomTools(server) {
         }
     });
     // ── describe_company_info_schema ───────────────────────────────────────
-    // Read-only introspection. Lets agents fetch the contract without
-    // shooting in the dark or learning by 422.
-    server.tool("describe_company_info_schema", "Return the companyInfo schema documented at the MCP layer: known fields, enums, " +
-        "max-length constraints, and which keys pass through to the backend untouched. " +
-        "Call this BEFORE the first update of a session to know what the API will accept. " +
-        "The mirror is a subset of the backend schema — fields not listed here still pass " +
-        "through, but their constraints are enforced server-side and may surface as 422s.", {}, async () => {
+    server.tool("describe_company_info_schema", "Return the companyInfo v2 schema mirrored at the MCP layer: all sections, enums, " +
+        "max-length caps, required fields, and which patch tool owns each section. Call this " +
+        "BEFORE the first update of a session to know what the API will accept. The mirror " +
+        "tracks apps/server/src/lib/data-room-schemas.ts in the Leadify backend.", {}, async () => {
         try {
             return toolResult({
-                source: "MCP-mirrored subset of the backend companyInfo schema.",
-                known_fields: {
-                    name: { type: "string" },
-                    sector: { type: "string" },
-                    description: { type: "string" },
-                    size: { type: "string", note: "Free-form (e.g. '10-50', '200+')." },
-                    website: { type: "string", format: "url" },
-                    valueProposition: { type: "string" },
-                    competitors: { type: "array<string>" },
-                    targetRegions: { type: "array<string>" },
-                    sender: {
-                        type: "object",
-                        shape: {
-                            name: { type: "string", required: true },
-                            title: { type: "string" },
-                            email: { type: "string", format: "email" },
-                        },
+                schemaVersion: COMPANY_INFO_SCHEMA_VERSION,
+                source: "Mirror of apps/server/src/lib/data-room-schemas.ts in github.com/AgifyAI/leadify.",
+                enums: {
+                    stage: STAGES,
+                    product_category: PRODUCT_CATEGORIES,
+                    ce_class: CE_CLASSES,
+                    reimbursement_status: REIMBURSEMENT_STATUSES,
+                    pricing_model: PRICING_MODELS,
+                    currency: CURRENCIES,
+                    constraint_type: CONSTRAINT_TYPES,
+                    geo_region: GEO_REGIONS,
+                },
+                char_limits: CHAR_LIMITS,
+                hard_limits: {
+                    products_max: PRODUCT_HARD_LIMIT,
+                    productICPs_max: PRODUCT_HARD_LIMIT,
+                    constraints_max: 10,
+                    topUseCases_max_per_product: 3,
+                    differentiators_max_per_product: 3,
+                    triggers_max: 5,
+                    coDeciders_max: 5,
+                    keyMetrics_max: 3,
+                    miniStories_max: 2,
+                },
+                sections: {
+                    identity: {
+                        fields: ["name (required, ≤200)", "website (optional, ≤500)"],
+                        patch_tool: "update_company_info_identity",
+                    },
+                    snapshot: {
+                        fields: [
+                            "pitchOneLiner (required, ≤200)",
+                            "marketSpecialty (required, ≤100)",
+                            "stage (required, enum)",
+                            "salesTeamSizeFR (required, int ≥0)",
+                            "geo {regions[], countriesIncluded[2-letter codes], countriesExcluded[2-letter codes]}",
+                            "constraints[] (max 10, see update_company_info_constraint)",
+                        ],
+                        patch_tool: "update_company_info_snapshot",
                     },
                     products: {
-                        type: "array<object>",
-                        item_shape: {
-                            name: { type: "string", required: true },
-                            category: {
-                                type: "enum",
-                                values: PRODUCT_CATEGORIES,
-                                required: true,
-                            },
-                            description: { type: "string" },
-                            valueProposition: { type: "string" },
-                            targetCustomer: { type: "string" },
-                            pricing: { type: "string" },
-                        },
+                        note: "Up to 5 products. Each: {name ≤100, category enum, categoryDetail? ≤150, outcomeUser ≤200, outcomeBuyer ≤200, topUseCases[≤3, ≤150 each], differentiators[≤3, ≤150 each], notFor ≤200, regulatory {ceMarked, ceClass nullable enum, reimbursementStatus enum, aoRequired}}.",
                         patch_tool: "update_company_info_product",
                     },
-                    snapshot: {
-                        type: "object",
-                        shape: {
-                            stage: { type: "enum", values: STAGE_VALUES },
-                            pitchOneLiner: { type: "string", max_length: 200 },
-                            constraints: {
-                                type: "array<object>",
-                                item_shape: {
-                                    type: {
-                                        type: "enum",
-                                        values: CONSTRAINT_TYPES,
-                                        required: true,
-                                    },
-                                    note: {
-                                        type: "string",
-                                        max_length: 150,
-                                        required: true,
-                                    },
-                                },
-                                patch_tool: "update_company_info_constraint",
-                            },
-                        },
-                        patch_tool: "update_company_info_snapshot",
+                    economics: {
+                        fields: [
+                            "pricingModel (required, enum)",
+                            "ticketRange {min, max, currency} (min ≤ max)",
+                            "salesCycleMonths {min, max} (min ≤ max)",
+                            "triggers[] (max 5, each ≤150)",
+                            "defaultBaseline (required, ≤200)",
+                        ],
+                        patch_tool: "update_company_info_economics",
+                    },
+                    productICPs: {
+                        note: "Up to 5 ICPs. Each: {productId (must reference products[].name), establishmentType ≤150, technicalPrereqs ≤200, roles {champion ≤150, budgetDecider ≤150, coDeciders[≤5, ≤100 each]}}.",
+                        patch_tool: "update_company_info_product_icp",
                     },
+                    proofWording: {
+                        fields: [
+                            "keyMetrics[] (max 3, each ≤150)",
+                            "miniStories[] (max 2, each ≤300)",
+                            "forbiddenWords[] (each ≤100)",
+                        ],
+                        patch_tool: "update_company_info_proof_wording",
+                    },
+                },
+                escape_hatch: {
+                    tool: "update_data_room",
+                    note: "WHOLESALE replacement. Required for first-time bootstrap (no existing v2 payload).",
                 },
-                patch_tools: [
-                    "update_company_info_identity",
-                    "update_company_info_sender",
-                    "update_company_info_geo",
-                    "update_company_info_snapshot",
-                    "update_company_info_product",
-                    "update_company_info_constraint",
+                cross_field_invariants: [
+                    "productICPs[].productId must equal one of products[].name (or be empty).",
+                    "economics.ticketRange.min ≤ economics.ticketRange.max.",
+                    "economics.salesCycleMonths.min ≤ economics.salesCycleMonths.max.",
                 ],
-                escape_hatch: "update_data_room",
+                error_format: {
+                    shape: "{ error, path, issues: ZodIssue[] } — issues[] contains EVERY validation failure at once.",
+                    note: "Backend now returns all issues simultaneously. Fix all listed paths before retrying.",
+                },
                 notes: [
-                    "Unknown keys pass through to the backend (zod passthrough on companyInfo).",
-                    "Backend currently surfaces ONE zod issue per 422 — see TODO in MCP source.",
-                    "Prefer the granular patch tools over update_data_room to avoid wiping nested blocks.",
+                    "Backend replaces companyInfo wholesale on PUT. Granular tools fetch + merge + send the FULL v2 payload back.",
+                    "Granular tools require a v2-bootstrapped data room. Call update_data_room with a full v2 payload first if schemaVersion is absent or older.",
                 ],
             });
         }
@@ -254,29 +350,26 @@ export function registerDataRoomTools(server) {
         }
     });
     // ── update_data_room ───────────────────────────────────────────────────
-    // Escape hatch: full companyInfo replacement (top-level keys you pass).
-    // Validates against the MCP-mirrored schema BEFORE hitting the API so
-    // callers don't burn round-trips on enum / max-length mistakes.
-    server.tool("update_data_room", "WHOLESALE update of companyInfo (ESCAPE HATCH). For partial edits, ALWAYS prefer the " +
-        "granular update_company_info_* tools — they do safe read-modify-write merges. Top-level " +
-        "keys you pass here REPLACE their server-side counterparts (so passing snapshot={stage:'early'} " +
-        "wipes pitchOneLiner and constraints). MCP validates the payload against the mirrored schema " +
-        "before sending; backend may still reject unknown constraints with a 422.", {
+    // Escape hatch: WHOLESALE replacement. The only path for first-time
+    // bootstrap (no existing v2 companyInfo). Validates against v2 before
+    // hitting the API.
+    server.tool("update_data_room", "WHOLESALE update of companyInfo (ESCAPE HATCH). REPLACES the entire companyInfo with the " +
+        "payload you pass. Required for first-time bootstrap. For incremental edits on an " +
+        "existing v2 payload, ALWAYS prefer the granular update_company_info_* tools — they " +
+        "fetch + merge + write the full v2 payload back, so they can't accidentally drop " +
+        "required sections. MCP validates against the v2 schema before sending.", {
         company_info: z
             .record(z.unknown())
-            .describe("companyInfo payload. Known fields are validated against the mirrored schema " +
-            "(see describe_company_info_schema). Unknown fields pass through."),
+            .describe("Full v2 companyInfo payload (replaces the existing one). See describe_company_info_schema for the contract."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
     }, async ({ company_info, organization_id, dry_run }) => {
         try {
-            const validationError = validateOrError(companyInfoSchema, company_info, "company_info");
-            if (validationError)
-                return validationError;
+            const validationErr = validateOrError(company_info, "Pass a complete v2 payload — see describe_company_info_schema for the required fields.");
+            if (validationErr)
+                return validationErr;
             if (dry_run) {
-                const current = await fetchDataRoom(organization_id);
-                const merged = { ...currentCompanyInfo(current), ...company_info };
-                return dryRunResult(company_info, merged);
+                return dryRunResult(company_info);
             }
             const data = await putCompanyInfo(company_info, organization_id);
             return toolResult(data);
@@ -286,195 +379,180 @@ export function registerDataRoomTools(server) {
         }
     });
     // ── update_company_info_identity ───────────────────────────────────────
-    server.tool("update_company_info_identity", "Patch scalar identity fields of companyInfo (name, sector, description, size, " +
-        "website, valueProposition). Only the fields you pass are updated. Other companyInfo " +
-        "blocks (sender, products, snapshot, etc.) remain intact.", {
-        name: z.string().optional().describe("Company name."),
-        sector: z.string().optional().describe("Sector / industry."),
-        description: z.string().optional().describe("Company description."),
-        size: z.string().optional().describe("Company size (e.g. '10-50', '200+')."),
-        website: z.string().url().optional().describe("Company website URL."),
-        valueProposition: z.string().optional().describe("Top-level value proposition."),
-        organization_id: z.string().optional().describe(ORG_ID_DESC),
-        dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
-    }, async ({ name, sector, description, size, website, valueProposition, organization_id, dry_run, }) => {
-        try {
-            const patch = {};
-            if (name !== undefined)
-                patch.name = name;
-            if (sector !== undefined)
-                patch.sector = sector;
-            if (description !== undefined)
-                patch.description = description;
-            if (size !== undefined)
-                patch.size = size;
-            if (website !== undefined)
-                patch.website = website;
-            if (valueProposition !== undefined)
-                patch.valueProposition = valueProposition;
-            if (Object.keys(patch).length === 0) {
-                return toolError("Provide at least one of: name, sector, description, size, website, valueProposition.");
-            }
-            const current = await fetchDataRoom(organization_id);
-            const merged = { ...currentCompanyInfo(current), ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
-        }
-        catch (error) {
-            return handleToolError(error);
-        }
-    });
-    // ── update_company_info_sender ─────────────────────────────────────────
-    server.tool("update_company_info_sender", "Patch the sender block (default SDR identity). Reads current sender, shallow-merges " +
-        "the fields you pass, writes the whole sender object back. Pass set_to_null=true to " +
-        "clear the sender entirely.", {
-        name: z.string().optional().describe("Sender display name."),
-        title: z.string().optional().describe("Sender title / role."),
-        email: z.string().email().optional().describe("Sender email address."),
-        set_to_null: z
-            .boolean()
+    server.tool("update_company_info_identity", "Patch the top-level identity fields of companyInfo (name, website). Reads the current " +
+        "v2 payload, merges your patch, writes the full v2 payload back. Other sections " +
+        "(snapshot, products, economics, productICPs, proofWording) remain intact.", {
+        name: z
+            .string()
+            .max(CHAR_LIMITS.name)
+            .optional()
+            .describe("Company name (max 200)."),
+        website: z
+            .string()
+            .max(CHAR_LIMITS.website)
             .optional()
-            .describe("If true, clears the sender block entirely (mutually exclusive with name/title/email)."),
+            .describe("Company website URL (max 500)."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
-    }, async ({ name, title, email, set_to_null, organization_id, dry_run }) => {
+    }, async ({ name, website, organization_id, dry_run }) => {
         try {
-            const hasFields = name !== undefined || title !== undefined || email !== undefined;
-            if (!hasFields && !set_to_null) {
-                return toolError("Provide at least one of: name, title, email, set_to_null.");
-            }
-            if (set_to_null && hasFields) {
-                return toolError("'set_to_null' is mutually exclusive with name/title/email.");
-            }
-            const current = await fetchDataRoom(organization_id);
-            const ci = currentCompanyInfo(current);
-            const existingSender = ci.sender && typeof ci.sender === "object" && !Array.isArray(ci.sender)
-                ? ci.sender
-                : {};
-            let nextSender;
-            if (set_to_null) {
-                nextSender = null;
+            if (name === undefined && website === undefined) {
+                return toolError("Provide at least one of: name, website.");
             }
-            else {
-                nextSender = { ...existingSender };
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const out = { ...ci };
                 if (name !== undefined)
-                    nextSender.name = name;
-                if (title !== undefined)
-                    nextSender.title = title;
-                if (email !== undefined)
-                    nextSender.email = email;
-                const validationError = validateOrError(senderSchema, nextSender, "sender");
-                if (validationError)
-                    return validationError;
-            }
-            const patch = { sender: nextSender };
-            const merged = { ...ci, ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
+                    out.name = name;
+                if (website !== undefined)
+                    out.website = website;
+                return out;
+            }, "Identity patch failed against v2 schema.");
         }
         catch (error) {
             return handleToolError(error);
         }
     });
-    // ── update_company_info_geo ────────────────────────────────────────────
-    server.tool("update_company_info_geo", "Patch geo / competitive lists: targetRegions, competitors. Use 'replace' to overwrite " +
-        "wholesale, or 'add'/'remove' for incremental edits (deduped). Other companyInfo " +
-        "fields remain intact.", {
-        field: z
-            .enum(["targetRegions", "competitors"])
-            .describe("Which list to patch."),
-        action: z
-            .enum(["replace", "add", "remove"])
-            .describe("replace = overwrite wholesale; add = append (deduped); remove = drop entries."),
-        values: z
-            .array(z.string())
-            .min(1)
-            .describe("Values for the action. Must be non-empty."),
+    // ── update_company_info_snapshot ───────────────────────────────────────
+    server.tool("update_company_info_snapshot", "Patch the snapshot block. Reads the current v2 payload, shallow-merges the snapshot " +
+        "fields you pass, writes the full v2 payload back. geo is merged shallowly — pass any " +
+        "subset of regions/countriesIncluded/countriesExcluded. constraints[] is REPLACED " +
+        "wholesale when passed — use update_company_info_constraint for per-item edits.", {
+        pitchOneLiner: z
+            .string()
+            .max(CHAR_LIMITS.pitchOneLiner)
+            .optional()
+            .describe("One-liner pitch (max 200)."),
+        marketSpecialty: z
+            .string()
+            .max(CHAR_LIMITS.marketSpecialty)
+            .optional()
+            .describe("Market specialty (max 100)."),
+        stage: z
+            .enum(STAGES)
+            .optional()
+            .describe("Company stage enum: early | growth | scaling | enterprise."),
+        salesTeamSizeFR: z
+            .number()
+            .int()
+            .min(0)
+            .optional()
+            .describe("Sales team size in FR (non-negative integer)."),
+        geo: z
+            .object({
+            regions: z.array(z.enum(GEO_REGIONS)).optional(),
+            countriesIncluded: z.array(z.string().length(2)).optional(),
+            countriesExcluded: z.array(z.string().length(2)).optional(),
+        })
+            .optional()
+            .describe("Geo block (shallow-merged). regions enum: " +
+            GEO_REGIONS.join(", ") +
+            ". countries: ISO 3166-1 alpha-2 (2 letters)."),
+        constraints: z
+            .array(constraintSchema)
+            .max(10)
+            .optional()
+            .describe("Replaces constraints[] wholesale. For per-item edits use update_company_info_constraint."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
-    }, async ({ field, action, values, organization_id, dry_run }) => {
+    }, async ({ pitchOneLiner, marketSpecialty, stage, salesTeamSizeFR, geo, constraints, organization_id, dry_run, }) => {
         try {
-            const current = await fetchDataRoom(organization_id);
-            const ci = currentCompanyInfo(current);
-            const existing = Array.isArray(ci[field]) ? ci[field] : [];
-            let next;
-            if (action === "replace") {
-                next = [...new Set(values)];
-            }
-            else if (action === "add") {
-                next = [...new Set([...existing, ...values])];
+            if (pitchOneLiner === undefined &&
+                marketSpecialty === undefined &&
+                stage === undefined &&
+                salesTeamSizeFR === undefined &&
+                geo === undefined &&
+                constraints === undefined) {
+                return toolError("Provide at least one of: pitchOneLiner, marketSpecialty, stage, salesTeamSizeFR, geo, constraints.");
             }
-            else {
-                const removeSet = new Set(values);
-                next = existing.filter((v) => !removeSet.has(v));
-            }
-            const patch = { [field]: next };
-            const merged = { ...ci, ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const existingSnapshot = ci.snapshot && typeof ci.snapshot === "object" && !Array.isArray(ci.snapshot)
+                    ? ci.snapshot
+                    : {};
+                const nextSnapshot = { ...existingSnapshot };
+                if (pitchOneLiner !== undefined)
+                    nextSnapshot.pitchOneLiner = pitchOneLiner;
+                if (marketSpecialty !== undefined)
+                    nextSnapshot.marketSpecialty = marketSpecialty;
+                if (stage !== undefined)
+                    nextSnapshot.stage = stage;
+                if (salesTeamSizeFR !== undefined)
+                    nextSnapshot.salesTeamSizeFR = salesTeamSizeFR;
+                if (geo !== undefined) {
+                    const existingGeo = existingSnapshot.geo &&
+                        typeof existingSnapshot.geo === "object" &&
+                        !Array.isArray(existingSnapshot.geo)
+                        ? existingSnapshot.geo
+                        : {};
+                    nextSnapshot.geo = { ...existingGeo, ...geo };
+                }
+                if (constraints !== undefined)
+                    nextSnapshot.constraints = constraints;
+                return { ...ci, snapshot: nextSnapshot };
+            }, "Snapshot patch failed against v2 schema.");
         }
         catch (error) {
             return handleToolError(error);
         }
     });
-    // ── update_company_info_snapshot ───────────────────────────────────────
-    server.tool("update_company_info_snapshot", "Patch the snapshot block. Reads current snapshot, shallow-merges the fields you pass, " +
-        "writes the whole snapshot back. Constraints[] is REPLACED wholesale when passed — " +
-        "use update_company_info_constraint for per-item edits. stage and pitchOneLiner are " +
-        "validated MCP-side (enum + max-length) before the API call.", {
-        stage: z
-            .enum(STAGE_VALUES)
-            .optional()
-            .describe("Company stage. One of: early, growth, scaling, enterprise."),
-        pitchOneLiner: z
-            .string()
-            .max(200)
-            .optional()
-            .describe("One-liner pitch. Max 200 chars."),
-        constraints: z
-            .array(constraintSchema)
+    // ── update_company_info_constraint ─────────────────────────────────────
+    server.tool("update_company_info_constraint", "Add, replace, or remove a single business constraint in snapshot.constraints[] without " +
+        "re-sending the whole list. Constraints have no stable id — entries are addressed by " +
+        "zero-based index. Beware: indices shift after a remove. Cap is 10 constraints. " +
+        "Each constraint: {label ≤150, type ∈ regulatory|brand|legal, note? ≤150}.", {
+        action: z
+            .enum(["add", "replace", "remove"])
+            .describe("add = append; replace = overwrite at index; remove = delete at index."),
+        index: z
+            .number()
+            .int()
+            .nonnegative()
             .optional()
-            .describe("Full replacement of constraints[]. Use update_company_info_constraint for per-item edits."),
-        extra: z
-            .record(z.unknown())
+            .describe("Zero-based index. Required for 'replace' and 'remove'."),
+        constraint: constraintSchema
             .optional()
-            .describe("Escape hatch for additional snapshot keys not yet mirrored in the MCP."),
+            .describe("Constraint payload {label ≤150, type ∈ regulatory|brand|legal, note? ≤150}. Required for 'add' and 'replace'."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
-    }, async ({ stage, pitchOneLiner, constraints, extra, organization_id, dry_run }) => {
+    }, async ({ action, index, constraint, organization_id, dry_run }) => {
         try {
-            if (stage === undefined &&
-                pitchOneLiner === undefined &&
-                constraints === undefined &&
-                (extra === undefined || Object.keys(extra).length === 0)) {
-                return toolError("Provide at least one of: stage, pitchOneLiner, constraints, extra.");
+            if ((action === "add" || action === "replace") && !constraint) {
+                return toolError(`constraint is required for action '${action}'.`);
             }
-            const current = await fetchDataRoom(organization_id);
-            const ci = currentCompanyInfo(current);
-            const existingSnapshot = ci.snapshot && typeof ci.snapshot === "object" && !Array.isArray(ci.snapshot)
-                ? ci.snapshot
-                : {};
-            const nextSnapshot = { ...existingSnapshot };
-            if (stage !== undefined)
-                nextSnapshot.stage = stage;
-            if (pitchOneLiner !== undefined)
-                nextSnapshot.pitchOneLiner = pitchOneLiner;
-            if (constraints !== undefined)
-                nextSnapshot.constraints = constraints;
-            if (extra !== undefined)
-                Object.assign(nextSnapshot, extra);
-            const patch = { snapshot: nextSnapshot };
-            const merged = { ...ci, ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
+            if ((action === "replace" || action === "remove") && index === undefined) {
+                return toolError(`index is required for action '${action}'.`);
+            }
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const existingSnapshot = ci.snapshot && typeof ci.snapshot === "object" && !Array.isArray(ci.snapshot)
+                    ? ci.snapshot
+                    : {};
+                const list = Array.isArray(existingSnapshot.constraints)
+                    ? existingSnapshot.constraints.map((c) => ({
+                        ...c,
+                    }))
+                    : [];
+                if (action === "add") {
+                    if (list.length >= 10) {
+                        throw new Error("Constraints list is at cap (10). Remove one before adding.");
+                    }
+                    list.push(constraint);
+                }
+                else if (action === "replace") {
+                    if (index < 0 || index >= list.length) {
+                        throw new Error(`Index ${index} out of bounds (constraints list has ${list.length} entries).`);
+                    }
+                    list[index] = constraint;
+                }
+                else {
+                    if (index < 0 || index >= list.length) {
+                        throw new Error(`Index ${index} out of bounds (constraints list has ${list.length} entries).`);
+                    }
+                    list.splice(index, 1);
+                }
+                return {
+                    ...ci,
+                    snapshot: { ...existingSnapshot, constraints: list },
+                };
+            }, "Constraint patch failed against v2 schema.");
         }
         catch (error) {
             return handleToolError(error);
@@ -482,19 +560,22 @@ export function registerDataRoomTools(server) {
     });
     // ── update_company_info_product ────────────────────────────────────────
     server.tool("update_company_info_product", "Add, replace, or remove a single product in companyInfo.products[] without re-sending " +
-        "the whole array. Lookups are by product `name` (case-sensitive exact match). Reads " +
-        "the current products[], mutates the matched entry, writes the full array back. " +
-        "category is a strict enum (saas|medical_device|service|mixed) — validated MCP-side.", {
+        "the whole array. Lookups by product `name` (case-sensitive exact match). Cap is 5 " +
+        "products. Each product: {name ≤100, category enum, categoryDetail? ≤150, outcomeUser " +
+        "≤200, outcomeBuyer ≤200, topUseCases[≤3, ≤150 each], differentiators[≤3, ≤150 each], " +
+        "notFor ≤200, regulatory {ceMarked, ceClass nullable, reimbursementStatus enum, aoRequired}}. " +
+        "WARNING: if a productICP.productId references this product's name, removing/renaming " +
+        "will fail the cross-field refine — fix the ICP first.", {
         action: z
             .enum(["add", "replace", "remove"])
-            .describe("add = append (fails if name already exists); replace = overwrite by name; remove = delete by name."),
+            .describe("add = append (fails if name exists or list at cap 5); replace = overwrite by name; remove = delete by name."),
         name: z
             .string()
             .optional()
             .describe("Lookup key for replace/remove. Required for those actions. For 'add' the name comes from the product payload."),
         product: productSchema
             .optional()
-            .describe("Product payload. Required for 'add' and 'replace'. Shape: {name, category, description?, valueProposition?, targetCustomer?, pricing?}."),
+            .describe("Product payload. Required for 'add' and 'replace'."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
     }, async ({ action, name, product, organization_id, dry_run }) => {
@@ -505,105 +586,213 @@ export function registerDataRoomTools(server) {
             if ((action === "replace" || action === "remove") && !name) {
                 return toolError(`name is required for action '${action}'.`);
             }
-            const current = await fetchDataRoom(organization_id);
-            const ci = currentCompanyInfo(current);
-            const list = Array.isArray(ci.products)
-                ? ci.products.map((p) => ({ ...p }))
-                : [];
-            if (action === "add") {
-                const newName = product.name;
-                if (list.some((p) => p.name === newName)) {
-                    return toolError(`A product with name "${newName}" already exists. Use action 'replace' instead.`);
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const list = Array.isArray(ci.products)
+                    ? ci.products.map((p) => ({ ...p }))
+                    : [];
+                if (action === "add") {
+                    const newName = product.name;
+                    if (list.some((p) => p.name === newName)) {
+                        throw new Error(`A product with name "${newName}" already exists. Use action 'replace' instead.`);
+                    }
+                    if (list.length >= PRODUCT_HARD_LIMIT) {
+                        throw new Error(`Products list is at cap (${PRODUCT_HARD_LIMIT}). Remove one before adding.`);
+                    }
+                    list.push(product);
                 }
-                list.push(product);
-            }
-            else if (action === "replace") {
-                const idx = list.findIndex((p) => p.name === name);
-                if (idx === -1) {
-                    return toolError(`No product found with name "${name}".`);
+                else if (action === "replace") {
+                    const idx = list.findIndex((p) => p.name === name);
+                    if (idx === -1) {
+                        throw new Error(`No product found with name "${name}".`);
+                    }
+                    list[idx] = product;
                 }
-                list[idx] = product;
-            }
-            else {
-                const before = list.length;
-                const filtered = list.filter((p) => p.name !== name);
-                if (filtered.length === before) {
-                    return toolError(`No product found with name "${name}".`);
+                else {
+                    const before = list.length;
+                    const filtered = list.filter((p) => p.name !== name);
+                    if (filtered.length === before) {
+                        throw new Error(`No product found with name "${name}".`);
+                    }
+                    list.length = 0;
+                    list.push(...filtered);
                 }
-                list.length = 0;
-                list.push(...filtered);
+                return { ...ci, products: list };
+            }, "Product patch failed against v2 schema.");
+        }
+        catch (error) {
+            return handleToolError(error);
+        }
+    });
+    // ── update_company_info_economics ──────────────────────────────────────
+    server.tool("update_company_info_economics", "Patch the economics block. Reads current economics, shallow-merges your fields, writes " +
+        "back. ticketRange and salesCycleMonths are REPLACED wholesale when passed (their " +
+        "internal refine enforces min ≤ max). triggers[] is replaced wholesale.", {
+        pricingModel: z
+            .enum(PRICING_MODELS)
+            .optional()
+            .describe("Pricing model enum: saas_per_site | saas_per_exam | capex | service | mixed."),
+        ticketRange: z
+            .object({
+            min: z.number().min(0),
+            max: z.number().min(0),
+            currency: z.enum(CURRENCIES),
+        })
+            .optional()
+            .describe("Replaces ticketRange wholesale. min ≤ max enforced. currency ∈ EUR|USD."),
+        salesCycleMonths: z
+            .object({
+            min: z.number().int().min(0),
+            max: z.number().int().min(0),
+        })
+            .optional()
+            .describe("Replaces salesCycleMonths wholesale. min ≤ max enforced."),
+        triggers: z
+            .array(z.string().max(CHAR_LIMITS.triggerItem))
+            .max(5)
+            .optional()
+            .describe("Replaces triggers[] wholesale (max 5 items, each ≤150)."),
+        defaultBaseline: z
+            .string()
+            .max(CHAR_LIMITS.defaultBaseline)
+            .optional()
+            .describe("Default baseline (max 200)."),
+        organization_id: z.string().optional().describe(ORG_ID_DESC),
+        dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
+    }, async ({ pricingModel, ticketRange, salesCycleMonths, triggers, defaultBaseline, organization_id, dry_run, }) => {
+        try {
+            if (pricingModel === undefined &&
+                ticketRange === undefined &&
+                salesCycleMonths === undefined &&
+                triggers === undefined &&
+                defaultBaseline === undefined) {
+                return toolError("Provide at least one of: pricingModel, ticketRange, salesCycleMonths, triggers, defaultBaseline.");
             }
-            const patch = { products: list };
-            const merged = { ...ci, ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const existing = ci.economics && typeof ci.economics === "object" && !Array.isArray(ci.economics)
+                    ? ci.economics
+                    : {};
+                const next = { ...existing };
+                if (pricingModel !== undefined)
+                    next.pricingModel = pricingModel;
+                if (ticketRange !== undefined)
+                    next.ticketRange = ticketRange;
+                if (salesCycleMonths !== undefined)
+                    next.salesCycleMonths = salesCycleMonths;
+                if (triggers !== undefined)
+                    next.triggers = triggers;
+                if (defaultBaseline !== undefined)
+                    next.defaultBaseline = defaultBaseline;
+                return { ...ci, economics: next };
+            }, "Economics patch failed against v2 schema.");
         }
         catch (error) {
             return handleToolError(error);
         }
     });
-    // ── update_company_info_constraint ─────────────────────────────────────
-    server.tool("update_company_info_constraint", "Add, replace, or remove a single business constraint inside snapshot.constraints[] " +
-        "without re-sending the whole array. Constraints have no stable id — entries are " +
-        "addressed by zero-based index. Beware: indices shift after a remove, so re-fetch " +
-        "before chaining edits. type is a strict enum (regulatory|brand|legal), note is " +
-        "capped at 150 chars — validated MCP-side.", {
+    // ── update_company_info_product_icp ────────────────────────────────────
+    server.tool("update_company_info_product_icp", "Add, replace, or remove a single product ICP in companyInfo.productICPs[]. Lookups by " +
+        "`productId` (must match an existing products[].name). Cap is 5 ICPs. Each ICP: " +
+        "{productId, establishmentType ≤150, technicalPrereqs ≤200, roles {champion ≤150, " +
+        "budgetDecider ≤150, coDeciders[≤5, ≤100 each]}}.", {
         action: z
             .enum(["add", "replace", "remove"])
-            .describe("add = append; replace = overwrite at index; remove = delete at index."),
-        index: z
-            .number()
-            .int()
-            .nonnegative()
+            .describe("add = append (fails if productId exists or list at cap 5); replace = overwrite by productId; remove = delete by productId."),
+        productId: z
+            .string()
             .optional()
-            .describe("Zero-based index. Required for 'replace' and 'remove'."),
-        constraint: constraintSchema
+            .describe("Lookup key for replace/remove. For 'add' the productId comes from the icp payload."),
+        icp: productICPSchema
             .optional()
-            .describe("Constraint payload {type ∈ regulatory|brand|legal, note ≤150 chars}. Required for 'add' and 'replace'."),
+            .describe("ICP payload. Required for 'add' and 'replace'."),
         organization_id: z.string().optional().describe(ORG_ID_DESC),
         dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
-    }, async ({ action, index, constraint, organization_id, dry_run }) => {
+    }, async ({ action, productId, icp, organization_id, dry_run }) => {
         try {
-            if ((action === "add" || action === "replace") && !constraint) {
-                return toolError(`constraint is required for action '${action}'.`);
+            if ((action === "add" || action === "replace") && !icp) {
+                return toolError(`icp is required for action '${action}'.`);
             }
-            if ((action === "replace" || action === "remove") && index === undefined) {
-                return toolError(`index is required for action '${action}'.`);
-            }
-            const current = await fetchDataRoom(organization_id);
-            const ci = currentCompanyInfo(current);
-            const existingSnapshot = ci.snapshot && typeof ci.snapshot === "object" && !Array.isArray(ci.snapshot)
-                ? ci.snapshot
-                : {};
-            const list = Array.isArray(existingSnapshot.constraints)
-                ? existingSnapshot.constraints.map((c) => ({
-                    ...c,
-                }))
-                : [];
-            if (action === "add") {
-                list.push(constraint);
+            if ((action === "replace" || action === "remove") && !productId) {
+                return toolError(`productId is required for action '${action}'.`);
             }
-            else if (action === "replace") {
-                if (index < 0 || index >= list.length) {
-                    return toolError(`Index ${index} out of bounds (constraints list has ${list.length} entries).`);
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const list = Array.isArray(ci.productICPs)
+                    ? ci.productICPs.map((i) => ({ ...i }))
+                    : [];
+                if (action === "add") {
+                    const newId = icp.productId;
+                    if (list.some((i) => i.productId === newId)) {
+                        throw new Error(`An ICP for productId "${newId}" already exists. Use 'replace' instead.`);
+                    }
+                    if (list.length >= PRODUCT_HARD_LIMIT) {
+                        throw new Error(`ProductICPs list is at cap (${PRODUCT_HARD_LIMIT}). Remove one before adding.`);
+                    }
+                    list.push(icp);
                 }
-                list[index] = constraint;
-            }
-            else {
-                if (index < 0 || index >= list.length) {
-                    return toolError(`Index ${index} out of bounds (constraints list has ${list.length} entries).`);
+                else if (action === "replace") {
+                    const idx = list.findIndex((i) => i.productId === productId);
+                    if (idx === -1) {
+                        throw new Error(`No ICP found with productId "${productId}".`);
+                    }
+                    list[idx] = icp;
+                }
+                else {
+                    const before = list.length;
+                    const filtered = list.filter((i) => i.productId !== productId);
+                    if (filtered.length === before) {
+                        throw new Error(`No ICP found with productId "${productId}".`);
+                    }
+                    list.length = 0;
+                    list.push(...filtered);
                 }
-                list.splice(index, 1);
+                return { ...ci, productICPs: list };
+            }, "Product ICP patch failed against v2 schema.");
+        }
+        catch (error) {
+            return handleToolError(error);
+        }
+    });
+    // ── update_company_info_proof_wording ──────────────────────────────────
+    server.tool("update_company_info_proof_wording", "Patch the proofWording block (keyMetrics, miniStories, forbiddenWords). Each list is " +
+        "REPLACED wholesale when passed. keyMetrics max 3 (≤150 each), miniStories max 2 (≤300 " +
+        "each), forbiddenWords unbounded (≤100 each).", {
+        keyMetrics: z
+            .array(z.string().max(CHAR_LIMITS.keyMetric))
+            .max(3)
+            .optional()
+            .describe("Replaces keyMetrics[] wholesale (max 3, each ≤150)."),
+        miniStories: z
+            .array(z.string().max(CHAR_LIMITS.miniStory))
+            .max(2)
+            .optional()
+            .describe("Replaces miniStories[] wholesale (max 2, each ≤300)."),
+        forbiddenWords: z
+            .array(z.string().max(CHAR_LIMITS.forbiddenWord))
+            .optional()
+            .describe("Replaces forbiddenWords[] wholesale (each ≤100)."),
+        organization_id: z.string().optional().describe(ORG_ID_DESC),
+        dry_run: z.boolean().optional().describe(DRY_RUN_DESC),
+    }, async ({ keyMetrics, miniStories, forbiddenWords, organization_id, dry_run }) => {
+        try {
+            if (keyMetrics === undefined &&
+                miniStories === undefined &&
+                forbiddenWords === undefined) {
+                return toolError("Provide at least one of: keyMetrics, miniStories, forbiddenWords.");
             }
-            const nextSnapshot = { ...existingSnapshot, constraints: list };
-            const patch = { snapshot: nextSnapshot };
-            const merged = { ...ci, ...patch };
-            if (dry_run)
-                return dryRunResult(patch, merged);
-            const data = await putCompanyInfo(patch, organization_id);
-            return toolResult(data);
+            return await mergeAndPut(organization_id, dry_run, (ci) => {
+                const existing = ci.proofWording &&
+                    typeof ci.proofWording === "object" &&
+                    !Array.isArray(ci.proofWording)
+                    ? ci.proofWording
+                    : {};
+                const next = { ...existing };
+                if (keyMetrics !== undefined)
+                    next.keyMetrics = keyMetrics;
+                if (miniStories !== undefined)
+                    next.miniStories = miniStories;
+                if (forbiddenWords !== undefined)
+                    next.forbiddenWords = forbiddenWords;
+                return { ...ci, proofWording: next };
+            }, "Proof wording patch failed against v2 schema.");
         }
         catch (error) {
             return handleToolError(error);
@@ -637,20 +826,3 @@ export function registerDataRoomTools(server) {
         }
     });
 }
-// ─── Backend TODO ──────────────────────────────────────────────────────────
-// The Leadify backend currently runs the data-room companyInfo schema with
-// .parse(), so any payload with N validation errors only surfaces the FIRST
-// one as a 422. That forces clients (and LLMs) into a death loop of
-// "fix one field, retry, discover next error, retry…".
-//
-// Fix on the backend side (apps/server most likely):
-//   const result = companyInfoSchema.safeParse(input);
-//   if (!result.success) {
-//     return res.status(422).json({
-//       error: "Validation failed",
-//       issues: result.error.issues, // ALL of them, not just the first
-//     });
-//   }
-//
-// Once that ships, the MCP can pass the full issue list through verbatim
-// instead of relying on the mirror-side validation as a fallback.