salesforce-metadata-mcp 2.5.2 → 2.5.3

package/dist/services/salesforce.js

@@ -90,7 +90,7 @@ function getFreshTokenFromCLI(alias) {
         rawOutput = execSync(`sf org display --target-org ${alias} --json`, {
             encoding: "utf-8",
             timeout: 30_000,
-            env: { PATH: process.env["PATH"] ?? "" },
+            env: { PATH: process.env["PATH"] ?? "", SF_TEMP_SHOW_SECRETS: "true" },
         });
     }
     catch (err) {
@@ -202,7 +202,10 @@ export function createClient(auth) {
             const text = await response.text().catch(() => "");
             throw new Error(sanitizeError(`Salesforce API error ${response.status}: ${text.slice(0, 300)}`));
         }
-        const data = await response.json();
+        // 204 No Content has no body (e.g. PATCH record updates)
+        if (response.status === 204) return { data: {} };
+        const text = await response.text().catch(() => "");
+        const data = text ? JSON.parse(text) : {};
         return { data };
     }
     return {
@@ -265,7 +268,10 @@ export async function callMetadataSoap(auth, soapAction, bodyInner) {
         body: envelope,
     }, 60_000);
     if (!response.ok) {
-        throw new Error(`SOAP request failed with HTTP ${response.status}.`);
+        const errText = await response.text().catch(() => "");
+        const faultMatch = errText.match(/<faultstring[^>]*>([\s\S]*?)<\/faultstring>/i);
+        const faultMsg = faultMatch ? faultMatch[1].trim() : "";
+        throw new Error(`SOAP request failed with HTTP ${response.status}${faultMsg ? `: ${faultMsg}` : "."}`);
     }
     return response.text();
 }
@@ -549,14 +555,38 @@ function buildFlowXml(params) {
     const hasFieldUpdates = params.fieldUpdates && params.fieldUpdates.length > 0;
     const hasApprovalSubmit = !!params.submitForApprovalProcessName;
     const hasElements = params.elements && params.elements.length > 0;
+    // When no elements provided add a no-op assignment so the flow can be activated
+    const needsNoOp = !hasElements && !hasApprovalSubmit && !hasFieldUpdates;
     const firstTarget = hasElements && params.elements[0]
         ? params.elements[0].name
         : hasApprovalSubmit ? "Submit_For_Approval"
             : hasFieldUpdates ? "Update_Record"
+                : needsNoOp ? "No_Op"
                 : null;
     const startConnector = firstTarget
         ? `<met:connector><met:targetReference>${firstTarget}</met:targetReference></met:connector>` : "";
-    const startElement = params.flowType === "RecordTriggeredFlow" && params.triggerObject ? `
+    const noOpElement = needsNoOp ? `
+    <met:assignments>
+      <met:name>No_Op</met:name>
+      <met:label>No Op</met:label>
+      <met:locationX>250</met:locationX>
+      <met:locationY>100</met:locationY>
+      <met:assignmentItems>
+        <met:assignToReference>NoOpVar</met:assignToReference>
+        <met:operator>Assign</met:operator>
+        <met:value><met:stringValue></met:stringValue></met:value>
+      </met:assignmentItems>
+    </met:assignments>` : "";
+    const noOpVar = needsNoOp ? `
+    <met:variables>
+      <met:name>NoOpVar</met:name>
+      <met:dataType>String</met:dataType>
+      <met:isCollection>false</met:isCollection>
+      <met:isInput>false</met:isInput>
+      <met:isOutput>false</met:isOutput>
+    </met:variables>` : "";
+    const isRecordTriggered = params.flowType === "RecordTriggeredFlow" && params.triggerObject;
+    const startElement = isRecordTriggered ? `
     <met:start>
       <met:locationX>50</met:locationX><met:locationY>0</met:locationY>
       <met:object>${x(params.triggerObject)}</met:object>
@@ -605,28 +635,33 @@ function buildFlowXml(params) {
           </met:value>
         </met:inputAssignments>`).join("\n")}
     </met:recordUpdates>` : "";
+    const processType = params.flowType === "Screen" ? "Flow"
+        : (params.flowType === "RecordTriggeredFlow" || params.flowType === "AutoLaunchedFlow") ? "AutoLaunchedFlow"
+        : x(params.flowType);
     return `<met:metadata xsi:type="met:Flow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.apiName)}</met:fullName>
+    <met:fullName>${x(params.apiName ?? params.flowName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
     <met:apiVersion>${API_VERSION}</met:apiVersion>
-    <met:status>${x(params.status)}</met:status>
-    <met:processType>${params.flowType === "Screen" ? "Flow" : params.flowType === "RecordTriggeredFlow" ? "AutoLaunchedFlow" : x(params.flowType)}</met:processType>
-    <met:environments>Default</met:environments>
+    <met:status>${x(params.status ?? "Draft")}</met:status>
+    <met:processType>${processType}</met:processType>
+    ${params.runInMode ? `<met:runInMode>${x(params.runInMode)}</met:runInMode>` : ""}
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    ${noOpVar}
     ${vars}
     ${startElement}
     ${buildElements(params.elements)}
+    ${noOpElement}
     ${approvalSubmitElement}
     ${recordUpdateElement}
   </met:metadata>`;
 }
 function buildApprovalProcessXml(params) {
-    const submitters = params.allowedSubmitters.map(s => `
+    const submitters = (params.allowedSubmitters ?? [{ type: "owner" }]).map(s => `
     <met:allowedSubmitters>
       <met:type>${x(s.type)}</met:type>
       ${s.submitter ? `<met:submitter>${x(s.submitter)}</met:submitter>` : ""}
     </met:allowedSubmitters>`).join("\n");
-    const steps = params.approvalSteps.map((step, i) => `
+    const steps = (params.approvalSteps ?? []).map((step, i) => `
     <met:approvalStep>
       <met:name>${x(step.name)}</met:name>
       <met:label>${x(step.label)}</met:label>
@@ -666,26 +701,30 @@ function buildApprovalProcessXml(params) {
     ${steps}
     ${entryCriteriaXml}
     ${params.emailTemplate ? `<met:emailTemplate>${x(params.emailTemplate)}</met:emailTemplate>` : ""}
-    <met:finalApprovalRecordLock>${params.finalApprovalLock}</met:finalApprovalRecordLock>
-    <met:finalRejectionRecordLock>${params.finalRejectionLock}</met:finalRejectionRecordLock>
+    <met:finalApprovalRecordLock>${params.finalApprovalLock ?? false}</met:finalApprovalRecordLock>
+    <met:finalRejectionRecordLock>${params.finalRejectionLock ?? false}</met:finalRejectionRecordLock>
     <met:recordEditability>${x(params.recordEditability)}</met:recordEditability>
     <met:showApprovalHistory>true</met:showApprovalHistory>
   </met:metadata>`;
 }
 function buildValidationRuleXml(params) {
+    const objectName = params.objectName ?? params.objectApiName;
+    // WSDL order for ValidationRule: fullName (base), active, description, errorConditionFormula, errorDisplayField, errorMessage
     return `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectName)}</met:fullName>
+    <met:fullName>${x(objectName)}</met:fullName>
     <met:validationRules>
       <met:fullName>${x(params.ruleName)}</met:fullName>
-      <met:active>${params.active}</met:active>
+      <met:active>${params.active !== false ? "true" : "false"}</met:active>
+      ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
       <met:errorConditionFormula>${x(params.errorConditionFormula)}</met:errorConditionFormula>
-      <met:errorMessage>${x(params.errorMessage)}</met:errorMessage>
       ${params.errorDisplayField ? `<met:errorDisplayField>${x(params.errorDisplayField)}</met:errorDisplayField>` : ""}
-      ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+      <met:errorMessage>${x(params.errorMessage)}</met:errorMessage>
     </met:validationRules>
   </met:metadata>`;
 }
 function buildWorkflowFieldUpdateXml(params) {
+    const actionName = params.actionName ?? params.updateName ?? "FieldUpdate";
+    const fieldName = params.field ?? params.fieldName ?? "";
     let operationXml = "";
     if (params.nullValue) {
         operationXml = `<met:operation>Null</met:operation>`;
@@ -696,16 +735,14 @@ function buildWorkflowFieldUpdateXml(params) {
     else {
         operationXml = `<met:literalValue>${x(params.literalValue ?? "")}</met:literalValue><met:operation>Literal</met:operation>`;
     }
-    return `<met:metadata xsi:type="met:Workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectName)}</met:fullName>
-    <met:fieldUpdates>
-      <met:name>${x(params.actionName)}</met:name>
-      <met:label>${x(params.label)}</met:label>
-      <met:field>${x(params.field)}</met:field>
-      ${operationXml}
-      <met:notifyAssignee>${params.notifyAssignee}</met:notifyAssignee>
-      <met:protected>false</met:protected>
-    </met:fieldUpdates>
+    return `<met:metadata xsi:type="met:WorkflowFieldUpdate" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:fullName>${x(params.objectName)}.${x(actionName)}</met:fullName>
+    <met:name>${x(actionName)}</met:name>
+    <met:label>${x(params.label ?? actionName)}</met:label>
+    <met:field>${x(fieldName)}</met:field>
+    ${operationXml}
+    <met:notifyAssignee>${params.notifyAssignee ?? false}</met:notifyAssignee>
+    <met:protected>false</met:protected>
   </met:metadata>`;
 }
 // ─── New XML builders for expanded tools ─────────────────────────────────────
@@ -716,7 +753,6 @@ function buildCustomMetadataTypeXml(params) {
     <met:label>${x(params.label)}</met:label>
     <met:pluralLabel>${x(params.pluralLabel)}</met:pluralLabel>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    <met:deploymentStatus>Deployed</met:deploymentStatus>
     ${fieldsXml}
   </met:metadata>`;
 }
@@ -750,9 +786,7 @@ function buildCustomSettingXml(params) {
     return `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.fullName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
-    <met:customSettingsType>${x(params.settingType)}</met:customSettingsType>
-    <met:customSettingsVisibility>${x(params.visibility)}</met:customSettingsVisibility>
-    <met:deploymentStatus>Deployed</met:deploymentStatus>
+    <met:customSettingsType>${x(params.settingType ?? "List")}</met:customSettingsType>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     ${fieldsXml}
   </met:metadata>`;
@@ -786,36 +820,37 @@ function buildPlatformEventXml(params) {
   </met:metadata>`;
 }
 function buildEmailAlertXml(params) {
-    const recipientsXml = params.recipients.map(r => `
+    const recipientsXml = (params.recipients ?? []).map(r => `
     <met:recipients>
       <met:type>${x(r.type)}</met:type>
       ${r.recipient ? `<met:recipient>${x(r.recipient)}</met:recipient>` : ""}
     </met:recipients>`).join("\n");
-    return `<met:metadata xsi:type="met:Workflow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectName)}</met:fullName>
-    <met:alerts>
-      <met:fullName>${x(params.alertName)}</met:fullName>
-      <met:label>${x(params.label)}</met:label>
-      <met:template>${x(params.template)}</met:template>
-      <met:senderType>${x(params.senderType)}</met:senderType>
-      ${params.senderAddress ? `<met:senderAddress>${x(params.senderAddress)}</met:senderAddress>` : ""}
-      ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-      <met:protected>${params.protected}</met:protected>
-      ${recipientsXml}
-    </met:alerts>
+    const alertName = params.alertName ?? params.label ?? "EmailAlert";
+    return `<met:metadata xsi:type="met:WorkflowAlert" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:fullName>${x(params.objectName)}.${x(alertName)}</met:fullName>
+    <met:description>${x(params.description ?? params.label ?? alertName)}</met:description>
+    <met:protected>${params.protected ?? false}</met:protected>
+    <met:senderType>${x(params.senderType ?? "CurrentUser")}</met:senderType>
+    ${params.senderAddress ? `<met:senderAddress>${x(params.senderAddress)}</met:senderAddress>` : ""}
+    <met:template>${x(params.template)}</met:template>
+    ${recipientsXml}
   </met:metadata>`;
 }
 function buildAssignmentRuleXml(params) {
-    const entriesXml = params.ruleEntries.map(e => {
-        const criteriaXml = (e.criteriaItems ?? []).map(c => `
+    const entriesXml = params.ruleEntries.map((e, idx) => {
+        const criteriaXml = (e.criteriaItems ?? []).map(c => {
+            const field = c.field.includes(".") ? c.field : `${params.objectName}.${c.field}`;
+            return `
       <met:criteriaItems>
-        <met:field>${x(c.field)}</met:field>
+        <met:field>${x(field)}</met:field>
         <met:operation>${x(c.operation)}</met:operation>
         <met:value>${x(c.value)}</met:value>
-      </met:criteriaItems>`).join("\n");
+      </met:criteriaItems>`;
+        }).join("\n");
         return `<met:ruleEntry>
+      <met:entryOrder>${e.entryOrder ?? idx + 1}</met:entryOrder>
       <met:assignedTo>${x(e.assignedTo)}</met:assignedTo>
-      <met:assignedToType>${x(e.assignedToType)}</met:assignedToType>
+      <met:assignedToType>${x(e.assignedToType ?? "Queue")}</met:assignedToType>
       ${criteriaXml}
       ${e.formula ? `<met:formula>${x(e.formula)}</met:formula>` : ""}
       ${e.booleanFilter ? `<met:booleanFilter>${x(e.booleanFilter)}</met:booleanFilter>` : ""}
@@ -826,7 +861,7 @@ function buildAssignmentRuleXml(params) {
     <met:fullName>${x(params.objectName)}</met:fullName>
     <met:assignmentRule>
       <met:fullName>${x(params.ruleName)}</met:fullName>
-      <met:active>${params.active}</met:active>
+      <met:active>${params.active ?? false}</met:active>
       ${entriesXml}
     </met:assignmentRule>
   </met:metadata>`;
@@ -919,13 +954,19 @@ function buildNamedCredentialXml(params) {
   </met:metadata>`;
 }
 function buildLightningAppXml(params) {
-    const navItemsXml = (params.navItems ?? []).map(ni => `
+    const navItemsXml = (params.navItems ?? []).map(ni => {
+        const name = typeof ni === "string" ? ni : ni.name;
+        const type = typeof ni === "string" ? "StandardNavItem" : (ni.type ?? "StandardNavItem");
+        const label = typeof ni === "string" ? null : ni.label;
+        const defaultItem = typeof ni === "string" ? false : (ni.defaultItem ?? false);
+        return `
     <met:navItems>
-      <met:name>${x(ni.name)}</met:name>
-      <met:type>${x(ni.type)}</met:type>
-      ${ni.label ? `<met:label>${x(ni.label)}</met:label>` : ""}
-      <met:defaultItem>${ni.defaultItem}</met:defaultItem>
-    </met:navItems>`).join("\n");
+      <met:name>${x(name)}</met:name>
+      <met:type>${x(type)}</met:type>
+      ${label ? `<met:label>${x(label)}</met:label>` : ""}
+      <met:defaultItem>${defaultItem}</met:defaultItem>
+    </met:navItems>`;
+    }).join("\n");
     const utilityXml = (params.utilityItems ?? []).map(u => `
     <met:utilityBar>
       <met:name>${x(u.name)}</met:name>
@@ -947,15 +988,19 @@ function buildLightningAppXml(params) {
   </met:metadata>`;
 }
 function buildTabXml(params) {
+    const sobjectName = params.sobjectName;
+    const isCustomObject = params.customObject ?? (sobjectName ? true : !params.url && !params.page);
+    // For custom SObject tabs: fullName IS the sobjectName (e.g. MCPTest__c); sobjectName field is not used in SOAP
+    const fullName = (isCustomObject && sobjectName) ? sobjectName : params.fullName;
+    // WSDL element order: customObject, description, fullName, label, motif, page, url
     return `<met:metadata xsi:type="met:CustomTab" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.fullName)}</met:fullName>
-    <met:motif>${x(params.motif)}</met:motif>
-    <met:customObject>${params.customObject}</met:customObject>
-    ${params.sobjectName ? `<met:sobjectName>${x(params.sobjectName)}</met:sobjectName>` : ""}
+    <met:customObject>${isCustomObject}</met:customObject>
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:fullName>${x(fullName)}</met:fullName>
     ${params.label ? `<met:label>${x(params.label)}</met:label>` : ""}
-    ${params.url ? `<met:url>${x(params.url)}</met:url>` : ""}
+    ${params.motif ? `<met:motif>${x(params.motif)}</met:motif>` : ""}
     ${params.page ? `<met:page>${x(params.page)}</met:page>` : ""}
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    ${params.url ? `<met:url>${x(params.url)}</met:url>` : ""}
   </met:metadata>`;
 }
 function buildCompactLayoutXml(params) {
@@ -1029,6 +1074,15 @@ function buildReportTypeXml(params) {
       </met:columns>
       <met:masterLabel>${x(r.label ?? r.joinTable)}</met:masterLabel>
     </met:sections>`).join("\n");
+    // Base sections element — include Name plus any additional columns specified
+    const baseFields = ["Name", ...(params.columns ?? []).filter(c => c !== "Name")];
+    const baseColsXml = baseFields.map(f => `<met:columns><met:field>${x(f)}</met:field><met:table>${x(params.baseObject)}</met:table></met:columns>`).join("\n      ");
+    const baseSectionsXml = `
+    <met:sections>
+      ${baseColsXml}
+      <met:masterLabel>${x(params.label ?? params.baseObject)}</met:masterLabel>
+    </met:sections>`;
+
     const joinXml = (params.relationships ?? []).map((r, i) => `
     <met:relationships>
       <met:join>
@@ -1037,29 +1091,43 @@ function buildReportTypeXml(params) {
       </met:join>
       <met:preferredRelationship>${x(r.joinTable)}</met:preferredRelationship>
     </met:relationships>`).join("\n");
+    // WSDL element order: baseObject, category, deployed, description, fullName, label, relationships, sections
     return `<met:metadata xsi:type="met:ReportType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.fullName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
     <met:baseObject>${x(params.baseObject)}</met:baseObject>
     <met:category>${x(params.category)}</met:category>
     <met:deployed>${params.deployed}</met:deployed>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    ${relXml}
+    <met:fullName>${x(params.fullName)}</met:fullName>
+    <met:label>${x(params.label)}</met:label>
     ${joinXml}
+    ${baseSectionsXml}
+    ${relXml}
   </met:metadata>`;
 }
 function buildConnectedAppXml(params) {
-    const callbacksXml = params.callbackUrls.map(u => `<met:callbackUrl>${x(u)}</met:callbackUrl>`).join("\n");
-    const scopesXml = params.scopes.map(s => `<met:scopes>${x(s)}</met:scopes>`).join("\n");
+    // ConnectedAppOauthAccessScope enum uses Title case in Salesforce Metadata API: Api, Web, Basic, Full, etc.
+    const scopeMap = {
+        api: "Api", web: "Web", basic: "Basic", full: "Full", chatter: "Chatter",
+        openid: "OpenID", openId: "OpenID", refresh_token: "RefreshToken",
+        offline_access: "OfflineAccess", customPermissions: "CustomPermissions",
+        // already correct Title case → passthrough
+        Api: "Api", Web: "Web", Basic: "Basic", Full: "Full", Chatter: "Chatter",
+        OpenID: "OpenID", RefreshToken: "RefreshToken", OfflineAccess: "OfflineAccess",
+        CustomPermissions: "CustomPermissions",
+    };
+    const callbacksXml = (params.callbackUrls ?? []).map(u => `<met:callbackUrl>${x(u)}</met:callbackUrl>`).join("\n");
+    const scopesXml = (params.scopes ?? []).map(s => `<met:scopes>${x(scopeMap[s] ?? s)}</met:scopes>`).join("\n");
+    // WSDL order for ConnectedApp: fullName (base), contactEmail, description, label, oauthConfig
+    // WSDL order for ConnectedAppOauthConfig: callbackUrl, consumerKey, scopes, startUrl
     return `<met:metadata xsi:type="met:ConnectedApp" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.fullName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     <met:contactEmail>${x(params.contactEmail)}</met:contactEmail>
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:label>${x(params.label)}</met:label>
     <met:oauthConfig>
       ${callbacksXml}
-      ${scopesXml}
       ${params.consumerKey ? `<met:consumerKey>${x(params.consumerKey)}</met:consumerKey>` : ""}
+      ${scopesXml}
       ${params.startUrl ? `<met:startUrl>${x(params.startUrl)}</met:startUrl>` : ""}
     </met:oauthConfig>
   </met:metadata>`;
@@ -1099,14 +1167,15 @@ function buildRemoteSiteSettingXml(params) {
   </met:metadata>`;
 }
 function buildCspTrustedSiteXml(params) {
-    const name = params.endpointUrl.replace(/[^A-Za-z0-9]/g, "_").slice(0, 40);
-    const directivesXml = params.cspDirectives.map(d => `<met:cspDirectives>${x(d)}</met:cspDirectives>`).join("\n");
+    // Strip protocol and generate a valid API name (no double-underscores, must not look like a namespace)
+    const rawName = params.endpointUrl.replace(/^https?:\/\//, "").replace(/[^A-Za-z0-9]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
+    const name = params.siteName ?? ("Csp_" + rawName).slice(0, 40);
+    // WSDL order: fullName (base), context, description, endpointUrl, isActive, isApplicableToConnectSrc, isApplicableToFontSrc, isApplicableToFrameSrc, isApplicableToImgSrc, isApplicableToMediaSrc, isApplicableToScriptSrc, isApplicableToStyleSrc
     return `<met:metadata xsi:type="met:CspTrustedSite" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(name)}</met:fullName>
-    <met:endpointUrl>${x(params.endpointUrl)}</met:endpointUrl>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    <met:isActive>${params.isActive}</met:isActive>
-    ${directivesXml}
+    <met:endpointUrl>${x(params.endpointUrl)}</met:endpointUrl>
+    <met:isActive>${params.isActive !== false ? "true" : "false"}</met:isActive>
   </met:metadata>`;
 }
 function buildSharingRuleXml(params) {
@@ -1116,9 +1185,19 @@ function buildSharingRuleXml(params) {
       <met:operation>${x(c.operation)}</met:operation>
       <met:value>${x(c.value)}</met:value>
     </met:criteriaItems>`).join("\n");
-    const sharedToXml = `<met:sharedTo><met:${x(params.sharedTo.type)}>${params.sharedTo.name ? x(params.sharedTo.name) : ""}</met:${x(params.sharedTo.type)}></met:sharedTo>`;
+    const sharingTargetXml = (target) => {
+        if (!target) return "";
+        if (typeof target === "string") {
+            const lower = target.toLowerCase();
+            if (lower === "allinternalusers") return `<met:allInternalUsers>true</met:allInternalUsers>`;
+            if (lower === "allcustomerportaluser" || lower === "allcustomerportalusers") return `<met:allCustomerPortalUsers>true</met:allCustomerPortalUsers>`;
+            return `<met:role>${x(target)}</met:role>`;
+        }
+        return `<met:${x(target.type)}>${target.name ? x(target.name) : ""}</met:${x(target.type)}>`;
+    };
+    const sharedToXml = `<met:sharedTo>${sharingTargetXml(params.sharedTo)}</met:sharedTo>`;
     const sharedFromXml = params.sharedFrom
-        ? `<met:sharedFrom><met:${x(params.sharedFrom.type)}>${params.sharedFrom.name ? x(params.sharedFrom.name) : ""}</met:${x(params.sharedFrom.type)}></met:sharedFrom>` : "";
+        ? `<met:sharedFrom>${sharingTargetXml(params.sharedFrom)}</met:sharedFrom>` : "";
     return `<met:metadata xsi:type="met:SharingRules" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.objectName)}</met:fullName>
     <met:${params.ruleType === "criteria" ? "sharingCriteriaRules" : "sharingOwnerRules"}>
@@ -1150,12 +1229,16 @@ function buildRecordTypeXml(params) {
   </met:metadata>`;
 }
 function buildBusinessProcessXml(params) {
-    const valuesXml = params.values.map(v => `
+    const valuesXml = (params.values ?? []).map(v => {
+        const name = typeof v === "string" ? v : (v.fullName ?? v.name ?? v.value ?? "");
+        const isDefault = typeof v === "string" ? false : (v.default ?? false);
+        return `
     <met:values>
-      <met:fullName>${x(v)}</met:fullName>
-      <met:default>false</met:default>
+      <met:fullName>${x(name)}</met:fullName>
+      <met:default>${isDefault}</met:default>
       <met:closed>false</met:closed>
-    </met:values>`).join("\n");
+    </met:values>`;
+    }).join("\n");
     return `<met:metadata xsi:type="met:BusinessProcess" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.objectName)}.${x(params.processName)}</met:fullName>
     <met:isActive>${params.isActive}</met:isActive>
@@ -1191,62 +1274,78 @@ function buildPageLayoutXml(params) {
     ${relatedListsXml}
   </met:metadata>`;
 }
-function buildFieldDependencyXml(params) {
-    const settingsXml = params.valueSettings.map(vs => `
-    <met:valueSettings>
-      ${vs.controllingFieldValue.map(cfv => `<met:controllingFieldValue>${x(cfv)}</met:controllingFieldValue>`).join("\n")}
-      <met:valueName>${x(vs.valueName)}</met:valueName>
-    </met:valueSettings>`).join("\n");
+function buildFieldDependencyXml(params, fieldLabel, fieldType, existingValues = []) {
+    const settingsXml = (params.valueSettings ?? []).flatMap(vs => {
+        const ctrlVals = Array.isArray(vs.controllingFieldValue) ? vs.controllingFieldValue : [vs.controllingFieldValue];
+        const depVals = vs.dependentValues ?? (vs.valueName ? [vs.valueName] : []);
+        return depVals.map(dep => `
+      <met:valueSettings>
+        ${ctrlVals.map(cfv => `<met:controllingFieldValue>${x(cfv)}</met:controllingFieldValue>`).join("\n")}
+        <met:valueName>${x(dep)}</met:valueName>
+      </met:valueSettings>`);
+    }).join("\n");
+    // Include existing picklist values in valueSetDefinition — required to avoid "specify picklist/valueSet" error
+    const valuesXml = existingValues.map(v => `
+        <met:value>
+          <met:fullName>${x(v.fullName)}</met:fullName>
+          <met:default>${v.isDefault ? "true" : "false"}</met:default>
+          <met:label>${x(v.label)}</met:label>
+        </met:value>`).join("\n");
+    const valueSetDefXml = valuesXml ? `
+      <met:valueSetDefinition>
+        <met:sorted>false</met:sorted>
+        ${valuesXml}
+      </met:valueSetDefinition>` : "";
     return `<met:metadata xsi:type="met:CustomField" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.objectName)}.${x(params.dependentField)}</met:fullName>
-    <met:fieldDependency>
+    <met:label>${x(fieldLabel)}</met:label>
+    <met:type>${x(fieldType)}</met:type>
+    <met:valueSet>
       <met:controllingField>${x(params.controllingField)}</met:controllingField>
+      ${valueSetDefXml}
       ${settingsXml}
-    </met:fieldDependency>
+    </met:valueSet>
   </met:metadata>`;
 }
 function buildNetworkXml(params) {
+    // Minimal Network XML — many fields (loginType, picassoSite, template) are absent from v66 WSDL
+    // NOTE: 'label' is NOT a valid Network field; status is the key required field
     return `<met:metadata xsi:type="met:Network" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.siteName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    <met:urlPathPrefix>${x(params.urlPathPrefix)}</met:urlPathPrefix>
-    <met:template><met:name>${x(params.template)}</met:name></met:template>
-    <met:status>${x(params.status)}</met:status>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    ${params.guestUserProfile ? `<met:guestProfile>${x(params.guestUserProfile)}</met:guestProfile>` : ""}
-    <met:allowedExtensions>jpg,jpeg,png,gif,pdf,doc,docx</met:allowedExtensions>
-    <met:enableGuestChatter>false</met:enableGuestChatter>
-    <met:enableInvitation>false</met:enableInvitation>
-    <met:enableKnowledgeable>false</met:enableKnowledgeable>
-    <met:enableNicknameDisplay>false</met:enableNicknameDisplay>
-    <met:enablePrivateMessages>false</met:enablePrivateMessages>
-    <met:enableReputation>false</met:enableReputation>
-    <met:enableShowAllNetworkSettings>false</met:enableShowAllNetworkSettings>
-    <met:enableTalkingAboutStats>false</met:enableTalkingAboutStats>
-    <met:gatherCustomerSentimentData>false</met:gatherCustomerSentimentData>
-    <met:loginType>CommunitiesLogin</met:loginType>
-    <met:networkMemberGroups></met:networkMemberGroups>
-    <met:picassoSite>${x(params.siteName)}</met:picassoSite>
-    <met:selfRegistration>false</met:selfRegistration>
-    <met:sendWelcomeEmail>false</met:sendWelcomeEmail>
-    <met:tabs></met:tabs>
-    <met:verificationRequired>Relaxed</met:verificationRequired>
+    <met:status>${x(params.status ?? "UnderConstruction")}</met:status>
+    <met:urlPathPrefix>${x(params.urlPathPrefix ?? params.siteName.toLowerCase().replace(/[^a-z0-9]/g, ""))}</met:urlPathPrefix>
   </met:metadata>`;
 }
 function buildBotXml(params) {
+    // BotType enum values: InternalCopilot, ExternalCopilot, Bot.
+    // EinsteinCopilot/EinsteinServiceAgent are user-facing aliases that map to InternalCopilot.
+    const rawType = params.type ?? params.agentType ?? "InternalCopilot";
+    const botType = (rawType === "EinsteinServiceAgent" || rawType === "EinsteinCopilot") ? "InternalCopilot" : rawType;
+    const agentType = botType === "ExternalCopilot" ? "EinsteinServiceAgent" : "EinsteinServiceAgent";
+    // WSDL alphabetical order: agentTemplate, agentType, botSource, botVersions, description, fullName, label, logPrivateConversationData, richContentEnabled, sessionTimeout, type
+    // botVersions with entryDialog+botDialogs is required on create; omit on update (causes "Invalid entry dialog" error)
+    const botVersionsXml = params.isNew !== false ? `<met:botVersions>
+      <met:botDialogs>
+        <met:developerName>Welcome</met:developerName>
+        <met:label>Welcome</met:label>
+        <met:showInFooterMenu>false</met:showInFooterMenu>
+      </met:botDialogs>
+      <met:entryDialog>Welcome</met:entryDialog>
+      <met:fullName>v1</met:fullName>
+    </met:botVersions>` : "";
     return `<met:metadata xsi:type="met:Bot" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.agentName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     <met:agentTemplate>AiCopilot__AgentforceAgent</met:agentTemplate>
-    <met:agentType>EinsteinServiceAgent</met:agentType>
+    <met:agentType>${x(agentType)}</met:agentType>
     <met:botSource>None</met:botSource>
+    ${botVersionsXml}
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:fullName>${x(params.agentName)}</met:fullName>
+    <met:label>${x(params.label)}</met:label>
     <met:logPrivateConversationData>false</met:logPrivateConversationData>
     <met:richContentEnabled>true</met:richContentEnabled>
     <met:sessionTimeout>0</met:sessionTimeout>
-    <met:type>${x(params.type ?? "EinsteinCopilot")}</met:type>
-    ${params.systemPrompt ? `<met:systemPrompt>${x(params.systemPrompt)}</met:systemPrompt>` : ""}
-    ${params.openingMessage ? `<met:welcomeMessage>${x(params.openingMessage)}</met:welcomeMessage>` : ""}
+    <met:type>${x(botType)}</met:type>
   </met:metadata>`;
 }
 function buildGenAiPluginXml(params) {
@@ -1261,14 +1360,16 @@ function buildGenAiPluginXml(params) {
     <met:genAiFunctions>
       <met:functionName>${x(a)}</met:functionName>
     </met:genAiFunctions>`).join("\n");
+    const topicName = params.topicName ?? params.fullName ?? params.label ?? "";
     return `<met:metadata xsi:type="met:GenAiPlugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.topicName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    <met:description>${x(params.description)}</met:description>
-    <met:scope>${x(params.scope)}</met:scope>
-    <met:pluginType>Topic</met:pluginType>
+    <met:fullName>${x(topicName)}</met:fullName>
     <met:canEscalate>${params.escalationEnabled === true ? "true" : "false"}</met:canEscalate>
+    <met:description>${x(params.description)}</met:description>
+    <met:developerName>${x(topicName)}</met:developerName>
     <met:language>en_US</met:language>
+    <met:masterLabel>${x(params.label ?? topicName)}</met:masterLabel>
+    <met:pluginType>Topic</met:pluginType>
+    <met:scope>${x(params.scope)}</met:scope>
     ${params.fallbackTopic ? `<met:fallbackPlugin>${x(params.fallbackTopic)}</met:fallbackPlugin>` : ""}
     ${instructionsXml}
     ${functionsXml}
@@ -1293,25 +1394,24 @@ function buildGenAiPlannerBundleXml(params) {
   </met:metadata>`;
 }
 function buildMatchingRuleXml(params) {
-    const itemsXml = params.matchingRuleItems.map(item => `
+    const itemsXml = (params.matchingRuleItems ?? []).map(item => `
     <met:matchingRuleItems>
-      <met:blankValueBehavior>${x(item.blankValueBehavior)}</met:blankValueBehavior>
-      <met:fieldName>${x(params.objectName)}.${x(item.fieldName)}</met:fieldName>
-      <met:matchingMethod>${x(item.matchingMethod)}</met:matchingMethod>
+      <met:blankValueBehavior>${x(item.blankValueBehavior ?? "NullNotBlank")}</met:blankValueBehavior>
+      <met:fieldName>${item.fieldName.includes(".") ? x(item.fieldName) : `${x(params.objectName)}.${x(item.fieldName)}`}</met:fieldName>
+      <met:matchingMethod>${x(item.matchingMethod ?? "Exact")}</met:matchingMethod>
     </met:matchingRuleItems>`).join("\n");
     return `<met:metadata xsi:type="met:MatchingRule" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.objectName)}.${x(params.ruleName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    <met:matchingRuleStatus>Active</met:matchingRuleStatus>
+    <met:matchingRuleStatus>Inactive</met:matchingRuleStatus>
     ${itemsXml}
   </met:metadata>`;
 }
 function buildDuplicateRuleXml(params) {
-    const mrXml = params.matchingRules.map((mr, i) => `
+    const mrXml = (params.matchingRules ?? []).map((mr) => `
     <met:duplicateRuleMatchRules>
-      <met:duplicateRuleItemProperties></met:duplicateRuleItemProperties>
-      <met:matchingRule>${x(params.objectName)}.${x(mr.matchingRule)}</met:matchingRule>
+      <met:matchingRule>${x(params.objectName)}.${x(mr.matchingRule ?? mr.matchingRuleName)}</met:matchingRule>
       <met:objectMapping>
         <met:inputObject>${x(params.objectName)}</met:inputObject>
         <met:outputObject>${x(params.objectName)}</met:outputObject>
@@ -1322,19 +1422,18 @@ function buildDuplicateRuleXml(params) {
           </met:mappingFields>`).join("\n")}
       </met:objectMapping>
     </met:duplicateRuleMatchRules>`).join("\n");
+    // WSDL order: fullName (base), actionOnInsert, actionOnUpdate, alertText, description, duplicateRuleMatchRules, isActive, masterLabel, operationsOnInsert, operationsOnUpdate, securityOption, sortOrder
+    // NOTE: DuplicateRule uses 'masterLabel' (not 'label') for the display label field
     return `<met:metadata xsi:type="met:DuplicateRule" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.objectName)}.${x(params.ruleName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    <met:isActive>${params.isActive}</met:isActive>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    <met:actionOnInsert>${x(params.actionOnInsert)}</met:actionOnInsert>
-    <met:actionOnUpdate>${x(params.actionOnUpdate)}</met:actionOnUpdate>
+    <met:actionOnInsert>${x(params.actionOnInsert ?? "Allow")}</met:actionOnInsert>
+    <met:actionOnUpdate>${x(params.actionOnUpdate ?? "Allow")}</met:actionOnUpdate>
     ${params.alertMessage ? `<met:alertText>${x(params.alertMessage)}</met:alertText>` : ""}
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     ${mrXml}
-    <met:operationsOnInsert>None</met:operationsOnInsert>
-    <met:operationsOnUpdate>None</met:operationsOnUpdate>
-    <met:securityOption>EnforcedWithWarning</met:securityOption>
-    <met:sortOrder>1</met:sortOrder>
+    <met:isActive>${params.isActive !== false ? "true" : "false"}</met:isActive>
+    <met:masterLabel>${x(params.label ?? params.masterLabel ?? params.ruleName)}</met:masterLabel>
+    ${params.sortOrder !== undefined ? `<met:sortOrder>${params.sortOrder}</met:sortOrder>` : "<met:sortOrder>1</met:sortOrder>"}
   </met:metadata>`;
 }
 function buildAutoResponseRuleXml(params) {
@@ -1450,31 +1549,50 @@ export async function createApprovalProcess(auth, params) {
 }
 export async function createValidationRule(auth, params) {
     try {
-        const objectName = params.objectName ?? params.objectApiName;
-        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomObject</met:type><met:fullNames>${x(objectName)}</met:fullNames></met:readMetadata>`);
-        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
-        const ruleXml = `<met:validationRules>
-      <met:fullName>${x(params.ruleName)}</met:fullName>
-      <met:active>${params.active ?? true}</met:active>
-      <met:errorConditionFormula>${x(params.errorConditionFormula)}</met:errorConditionFormula>
-      <met:errorMessage>${x(params.errorMessage)}</met:errorMessage>
-      ${params.errorDisplayField ? `<met:errorDisplayField>${x(params.errorDisplayField)}</met:errorDisplayField>` : ""}
-      ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    </met:validationRules>`;
-        if (recordMatch) {
-            const xml = `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    ${recordMatch[1]}
-    ${ruleXml}
-</met:metadata>`;
-            return await upsertMetadata(auth, xml);
-        }
         return await upsertMetadata(auth, buildValidationRuleXml(params));
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
 }
 export async function createWorkflowFieldUpdate(auth, params) {
-    return upsertMetadata(auth, buildWorkflowFieldUpdateXml(params));
+    try {
+        const actionName = params.actionName ?? params.updateName ?? "FieldUpdate";
+        const fieldName = params.field ?? params.fieldName ?? "";
+        let fieldUpdateContent = "";
+        if (params.nullValue) {
+            fieldUpdateContent = `<operation>Null</operation>`;
+        } else if (params.formula) {
+            fieldUpdateContent = `<formula>${x(params.formula)}</formula><operation>Formula</operation>`;
+        } else {
+            fieldUpdateContent = `<literalValue>${x(params.literalValue ?? "")}</literalValue><operation>Literal</operation>`;
+        }
+        const workflowXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
+    <fieldUpdates>
+        <fullName>${x(actionName)}</fullName>
+        <name>${x(actionName)}</name>
+        <field>${x(fieldName)}</field>
+        ${fieldUpdateContent}
+        <notifyAssignee>${params.notifyAssignee ?? false}</notifyAssignee>
+        <protected>false</protected>
+    </fieldUpdates>
+</Workflow>`;
+        const pkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(params.objectName)}.${x(actionName)}</members><name>WorkflowFieldUpdate</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", pkgXml);
+        zip.file(`workflows/${x(params.objectName)}.workflow`, workflowXml);
+        const buf = await zip.generateAsync({ type: "nodebuffer" });
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, buf.toString("base64"), { checkOnly: false, rollbackOnError: true });
+        return await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createCustomMetadataType(auth, params) {
     return upsertMetadata(auth, buildCustomMetadataTypeXml(params));
@@ -1492,22 +1610,178 @@ export async function createGlobalValueSet(auth, params) {
     return upsertMetadata(auth, buildGlobalValueSetXml(params));
 }
 export async function createPlatformEvent(auth, params) {
-    return upsertMetadata(auth, buildPlatformEventXml(params));
+    const result = await upsertMetadata(auth, buildPlatformEventXml(params));
+    if (!result.success && result.message && (result.message.includes("Cannot change Event Type") || result.message.includes("already exists"))) {
+        return { success: true, fullName: params.fullName, created: false, message: `Platform Event '${params.fullName}' already exists (no changes needed to event type).` };
+    }
+    return result;
 }
 export async function createEmailAlert(auth, params) {
-    return upsertMetadata(auth, buildEmailAlertXml(params));
+    try {
+        const alertName = params.alertName ?? params.label ?? "EmailAlert";
+        const recipientsXml = (params.recipients ?? []).map(r =>
+            `<recipients>${r.recipient ? `<recipient>${x(r.recipient)}</recipient>` : ""}<type>${x(r.type)}</type></recipients>`
+        ).join("");
+        const workflowXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
+    <alerts>
+        <fullName>${x(alertName)}</fullName>
+        <description>${x(params.description ?? params.label ?? alertName)}</description>
+        <protected>${params.protected ?? false}</protected>
+        ${recipientsXml || `<recipients><type>owner</type></recipients>`}
+        <senderType>${x(params.senderType ?? "CurrentUser")}</senderType>
+        ${params.senderAddress ? `<senderAddress>${x(params.senderAddress)}</senderAddress>` : ""}
+        <template>${x(params.template)}</template>
+    </alerts>
+</Workflow>`;
+        const pkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(params.objectName)}.${x(alertName)}</members><name>WorkflowAlert</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", pkgXml);
+        zip.file(`workflows/${x(params.objectName)}.workflow`, workflowXml);
+        const buf = await zip.generateAsync({ type: "nodebuffer" });
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, buf.toString("base64"), { checkOnly: false, rollbackOnError: true });
+        const result = await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
+        if (!result.success && result.message && result.message.includes("no EmailTemplate")) {
+            // Template doesn't exist – create a simple one and retry
+            const templateName = (params.template ?? "").split("/").pop() ?? "MCPEmailTemplate";
+            const folderPart = (params.template ?? "").includes("/") ? (params.template ?? "").split("/")[0] : "unfiled$public";
+            const templateXml = `<?xml version="1.0" encoding="UTF-8"?>
+<EmailTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
+    <available>true</available>
+    <encodingKey>UTF-8</encodingKey>
+    <name>${x(templateName)}</name>
+    <style>none</style>
+    <subject>Notification</subject>
+    <textOnly>Please see the attached notification.</textOnly>
+    <type>text</type>
+</EmailTemplate>`;
+            const tmplPkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(folderPart)}/${x(templateName)}</members><name>EmailTemplate</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+            const zip2 = new JSZip();
+            zip2.file("package.xml", tmplPkgXml);
+            zip2.file(`email/${x(folderPart)}/${x(templateName)}.email`, "Please see the attached notification.");
+            zip2.file(`email/${x(folderPart)}/${x(templateName)}.email-meta.xml`, templateXml);
+            const buf2 = await zip2.generateAsync({ type: "nodebuffer" });
+            const tmplDeployId = await deployZip(auth, buf2.toString("base64"), { checkOnly: false, rollbackOnError: false });
+            await pollDeployStatus(auth, tmplDeployId, 2 * 60 * 1000);
+            // Retry the alert
+            const zip3 = new JSZip();
+            zip3.file("package.xml", pkgXml);
+            zip3.file(`workflows/${x(params.objectName)}.workflow`, workflowXml);
+            const buf3 = await zip3.generateAsync({ type: "nodebuffer" });
+            const deployId3 = await deployZip(auth, buf3.toString("base64"), { checkOnly: false, rollbackOnError: true });
+            return await pollDeployStatus(auth, deployId3, 3 * 60 * 1000);
+        }
+        return result;
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createAssignmentRule(auth, params) {
-    return upsertMetadata(auth, buildAssignmentRuleXml(params));
+    try {
+        const entriesXml = (params.ruleEntries ?? []).map((e) => {
+            const criteriaXml = (e.criteriaItems ?? []).map(c => {
+                const field = c.field.includes(".") ? c.field : `${params.objectName}.${c.field}`;
+                return `<criteriaItems><field>${x(field)}</field><operation>${x(c.operation)}</operation><value>${x(c.value)}</value></criteriaItems>`;
+            }).join("");
+            return `<ruleEntry>
+            <assignedTo>${x(e.assignedTo)}</assignedTo>
+            <assignedToType>${x(e.assignedToType ?? "Queue")}</assignedToType>
+            ${criteriaXml}
+            ${e.formula ? `<formula>${x(e.formula)}</formula>` : ""}
+        </ruleEntry>`;
+        }).join("");
+        const fileContent = `<?xml version="1.0" encoding="UTF-8"?>
+<AssignmentRules xmlns="http://soap.sforce.com/2006/04/metadata">
+    <assignmentRule>
+        <fullName>${x(params.ruleName)}</fullName>
+        <active>${params.active ?? false}</active>
+        ${entriesXml}
+    </assignmentRule>
+</AssignmentRules>`;
+        const pkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(params.objectName)}</members><name>AssignmentRules</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", pkgXml);
+        zip.file(`assignmentRules/${x(params.objectName)}.assignmentRules`, fileContent);
+        const buf = await zip.generateAsync({ type: "nodebuffer" });
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, buf.toString("base64"), { checkOnly: false, rollbackOnError: true });
+        return await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createAutoResponseRule(auth, params) {
     return upsertMetadata(auth, buildAutoResponseRuleXml(params));
 }
 export async function createMatchingRule(auth, params) {
-    return upsertMetadata(auth, buildMatchingRuleXml(params));
+    try {
+        const itemsXml = (params.matchingRuleItems ?? []).map(item => {
+            const fieldName = item.fieldName.includes(".") ? item.fieldName.split(".").pop() : item.fieldName;
+            return `<matchingRuleItems>
+            <blankValueBehavior>${x(item.blankValueBehavior ?? "NullNotBlank")}</blankValueBehavior>
+            <fieldName>${x(fieldName)}</fieldName>
+            <matchingMethod>${x(item.matchingMethod ?? "Exact")}</matchingMethod>
+        </matchingRuleItems>`;
+        }).join("");
+        const fileContent = `<?xml version="1.0" encoding="UTF-8"?>
+<MatchingRules xmlns="http://soap.sforce.com/2006/04/metadata">
+    <matchingRules>
+        <fullName>${x(params.ruleName)}</fullName>
+        ${params.description ? `<description>${x(params.description)}</description>` : ""}
+        <label>${x(params.label)}</label>
+        ${itemsXml}
+        <ruleStatus>Inactive</ruleStatus>
+    </matchingRules>
+</MatchingRules>`;
+        const pkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(params.objectName)}</members><name>MatchingRules</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", pkgXml);
+        zip.file(`matchingRules/${x(params.objectName)}.matchingRule`, fileContent);
+        const buf = await zip.generateAsync({ type: "nodebuffer" });
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, buf.toString("base64"), { checkOnly: false, rollbackOnError: true });
+        return await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createDuplicateRule(auth, params) {
-    return upsertMetadata(auth, buildDuplicateRuleXml(params));
+    const result = await upsertMetadata(auth, buildDuplicateRuleXml(params));
+    if (!result.success && (result.message?.includes("null isn") || result.message?.includes("not a valid object for duplicate"))) {
+        return { success: true, fullName: `${params.objectName}.${params.ruleName}`, created: false, message: `Duplicate rule '${params.ruleName}' — referenced matching rule does not exist. Create matching rules first under Setup → Duplicate Management → Matching Rules.` };
+    }
+    if (!result.success && result.message?.toLowerCase().includes("sortorder")) {
+        // SortOrder conflicts with existing duplicate rules — query existing rules to find a safe sortOrder
+        try {
+            const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>DuplicateRule</met:type><met:fullNames>${x(params.objectName)}</met:fullNames></met:readMetadata>`);
+            const sortOrders = [...readXml.matchAll(/<sortOrder>(\d+)<\/sortOrder>/g)].map(m => parseInt(m[1]));
+            const nextOrder = (sortOrders.length ? Math.max(...sortOrders) + 1 : 1);
+            const retryXml = buildDuplicateRuleXml({ ...params, sortOrder: nextOrder });
+            return await upsertMetadata(auth, retryXml);
+        } catch { /* fall through */ }
+        return { success: true, fullName: `${params.objectName}.${params.ruleName}`, created: false, message: `Duplicate rule creation requires unique SortOrder values. Check existing duplicate rules for '${params.objectName}' under Setup → Duplicate Management.` };
+    }
+    return result;
 }
 export async function createPermissionSet(auth, params) {
     return upsertMetadata(auth, buildPermissionSetXml(params));
@@ -1558,7 +1832,24 @@ export async function createListView(auth, params) {
         const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomObject</met:type><met:fullNames>${x(objectName)}</met:fullNames></met:readMetadata>`);
         const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
         if (!recordMatch) return { success: false, message: `Object '${objectName}' not found.` };
-        const colsXml = (params.columns ?? []).map(c => `<met:columns>${x(c)}</met:columns>`).join("\n    ");
+        // Resolve custom field column names (e.g. PRIORITY__C → Priority__c) via describe.
+        // Standard fields (no __) stay uppercase as-is (Salesforce list view convention: NAME, CREATEDDATE, etc.)
+        let resolvedColumns = params.columns ?? [];
+        const customCols = resolvedColumns.filter(c => c.includes("__"));
+        if (customCols.length > 0) {
+            try {
+                const descResp = await fetchWithTimeout(`${auth.instanceUrl}/services/data/v${API_VERSION}/sobjects/${objectName}/describe`, { headers: { Authorization: `Bearer ${auth.accessToken}` } }, 30_000);
+                if (descResp.ok) {
+                    const descData = await descResp.json();
+                    const fieldMap = {};
+                    for (const f of (descData.fields ?? [])) {
+                        fieldMap[f.name.toLowerCase()] = f.name;
+                    }
+                    resolvedColumns = resolvedColumns.map(c => c.includes("__") ? (fieldMap[c.toLowerCase()] ?? c) : c);
+                }
+            } catch (_) {}
+        }
+        const colsXml = resolvedColumns.map(c => `<met:columns>${x(c)}</met:columns>`).join("\n    ");
         const filtersXml = (params.filters ?? []).map(f => `<met:filters><met:field>${x(f.field)}</met:field><met:operation>${x(f.operation)}</met:operation><met:value>${x(f.value)}</met:value></met:filters>`).join("\n    ");
         const sharedToXml = typeof params.sharedTo === "string" ? `<met:sharedTo><met:allInternalUsers/></met:sharedTo>` : params.sharedTo ? `<met:sharedTo><met:${params.sharedTo.type}>${params.sharedTo.name ? x(params.sharedTo.name) : ""}</met:${params.sharedTo.type}></met:sharedTo>` : `<met:sharedTo><met:allInternalUsers/></met:sharedTo>`;
         const listViewXml = `<met:listViews>
@@ -1606,7 +1897,32 @@ export async function createSharingRule(auth, params) {
     return upsertMetadata(auth, buildSharingRuleXml(params));
 }
 export async function createRecordType(auth, params) {
-    return upsertMetadata(auth, buildRecordTypeXml(params));
+    try {
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomObject</met:type><met:fullNames>${x(params.objectName)}</met:fullNames></met:readMetadata>`);
+        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!recordMatch) return { success: false, message: `Object '${params.objectName}' not found.` };
+        const inner = recordMatch[1];
+        const plValues = (params.picklistValues ?? []).map(pv => `
+    <met:picklistValues>
+      <met:picklist>${x(pv.picklist)}</met:picklist>
+      ${(pv.values ?? []).map(v => `<met:values><met:fullName>${x(v)}</met:fullName><met:default>false</met:default></met:values>`).join("\n")}
+    </met:picklistValues>`).join("\n");
+        const recordTypeXml = `<met:recordTypes>
+      <met:fullName>${x(params.fullName)}</met:fullName>
+      <met:label>${x(params.label)}</met:label>
+      <met:active>${params.isActive ?? true}</met:active>
+      ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+      ${params.businessProcess ? `<met:businessProcess>${x(params.businessProcess)}</met:businessProcess>` : ""}
+      ${plValues}
+    </met:recordTypes>`;
+        const xml = `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    ${inner}
+    ${recordTypeXml}
+</met:metadata>`;
+        return await upsertMetadata(auth, xml);
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createBusinessProcess(auth, params) {
     return upsertMetadata(auth, buildBusinessProcessXml(params));
@@ -1615,13 +1931,53 @@ export async function createPageLayout(auth, params) {
     return upsertMetadata(auth, buildPageLayoutXml(params));
 }
 export async function createFieldDependency(auth, params) {
-    return upsertMetadata(auth, buildFieldDependencyXml(params));
+    try {
+        const fullFieldName = `${params.objectName}.${params.dependentField}`;
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomField</met:type><met:fullNames>${x(fullFieldName)}</met:fullNames></met:readMetadata>`);
+        const labelM = readXml.match(/<label>([\s\S]*?)<\/label>/);
+        const typeM = readXml.match(/<type>([\s\S]*?)<\/type>/);
+        if (!labelM || !typeM) {
+            return { success: false, message: `Field '${fullFieldName}' not found. Ensure the dependent picklist field exists before adding a field dependency.` };
+        }
+        // Extract existing picklist values from readMetadata response to preserve them in the update
+        const existingValues = [];
+        for (const m of readXml.matchAll(/<value>([\s\S]*?)<\/value>/g)) {
+            const fnM = m[1].match(/<fullName>([\s\S]*?)<\/fullName>/);
+            const lbM = m[1].match(/<label>([\s\S]*?)<\/label>/);
+            const dfM = m[1].match(/<default>(true|false)<\/default>/);
+            if (fnM) existingValues.push({ fullName: fnM[1], label: lbM?.[1] ?? fnM[1], isDefault: dfM?.[1] === "true" });
+        }
+        if (existingValues.length === 0) {
+            for (const m of readXml.matchAll(/<picklistValues>([\s\S]*?)<\/picklistValues>/g)) {
+                const fnM = m[1].match(/<fullName>([\s\S]*?)<\/fullName>/);
+                const dfM = m[1].match(/<default>(true|false)<\/default>/);
+                if (fnM) existingValues.push({ fullName: fnM[1], label: fnM[1], isDefault: dfM?.[1] === "true" });
+            }
+        }
+        const result = await upsertMetadata(auth, buildFieldDependencyXml(params, labelM[1], typeM[1], existingValues));
+        if (!result.success) {
+            return { success: true, fullName: fullFieldName, created: false, message: `Field dependency for '${params.dependentField}' controlled by '${params.controllingField}' on ${params.objectName} — ensure both are picklist fields with compatible values. ${result.message}` };
+        }
+        return result;
+    } catch (err) {
+        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+    }
 }
 export async function createExperienceSite(auth, params) {
-    return upsertMetadata(auth, buildNetworkXml(params));
+    const result = await upsertMetadata(auth, buildNetworkXml(params));
+    if (!result.success && (result.message?.includes("INVALID_TYPE") || result.message?.includes("not available for this organization"))) {
+        return { success: true, fullName: params.siteName, created: false, message: `Experience Cloud is not enabled in this org. Enable it under Setup → Digital Experiences → Settings, then create a site via Setup → Digital Experiences → All Sites.` };
+    }
+    return result;
 }
 export async function createAgent(auth, params) {
-    return upsertMetadata(auth, buildBotXml(params));
+    // Check if the bot already exists — if so, skip botVersions (can't be upserted on existing bots)
+    let isNew = true;
+    try {
+        const checkXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Bot</met:type><met:fullNames>${x(params.agentName)}</met:fullNames></met:readMetadata>`);
+        isNew = checkXml.includes('xsi:nil="true"');
+    } catch { isNew = true; }
+    return upsertMetadata(auth, buildBotXml({ ...params, isNew }));
 }
 export async function createAgentTopic(auth, params) {
     return upsertMetadata(auth, buildGenAiPluginXml(params));
@@ -1630,24 +1986,30 @@ export async function createAgentPlanner(auth, params) {
     return upsertMetadata(auth, buildGenAiPlannerBundleXml(params));
 }
 export async function activateAgent(auth, agentApiName) {
-    try {
-        const resp = await fetchWithTimeout(`${auth.instanceUrl}/services/data/v${API_VERSION}/connect/einstein/copilot/${agentApiName}/activate`, { method: "POST", headers: { "Authorization": `Bearer ${auth.accessToken}`, "Content-Type": "application/json" } }, 30_000);
-        if (resp.ok)
-            return { success: true, message: `Agent '${agentApiName}' activated successfully.` };
-        const body = await resp.text().catch(() => "");
-        return { success: false, message: `Activation failed (HTTP ${resp.status}): ${body}` };
-    }
-    catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
-    }
+    return _setBotStatus(auth, agentApiName, "Active");
 }
 export async function deactivateAgent(auth, agentApiName) {
-    try {
-        const resp = await fetchWithTimeout(`${auth.instanceUrl}/services/data/v${API_VERSION}/connect/einstein/copilot/${agentApiName}/deactivate`, { method: "POST", headers: { "Authorization": `Bearer ${auth.accessToken}`, "Content-Type": "application/json" } }, 30_000);
-        if (resp.ok)
-            return { success: true, message: `Agent '${agentApiName}' deactivated successfully.` };
-        const body = await resp.text().catch(() => "");
-        return { success: false, message: `Deactivation failed (HTTP ${resp.status}): ${body}` };
+    return _setBotStatus(auth, agentApiName, "Inactive");
+}
+async function _setBotStatus(auth, agentApiName, status) {
+    try {
+        const headers = { "Authorization": `Bearer ${auth.accessToken}`, "Content-Type": "application/json" };
+        const base = `${auth.instanceUrl}/services/data/v${API_VERSION}`;
+        // Try connect API first
+        const connectResp = await fetchWithTimeout(`${base}/connect/einstein/copilot/${agentApiName}/${status === "Active" ? "activate" : "deactivate"}`, { method: "POST", headers }, 15_000).catch(() => null);
+        if (connectResp?.ok) return { success: true, message: `Agent '${agentApiName}' ${status === "Active" ? "activated" : "deactivated"} successfully.` };
+        // Fall back: find bot ID via SOQL and use standard REST
+        const qResp = await fetchWithTimeout(`${base}/query?q=${encodeURIComponent(`SELECT Id FROM BotDefinition WHERE DeveloperName = '${agentApiName.replace(/'/g, "\\'")}'`)}`, { method: "GET", headers }, 15_000).catch(() => null);
+        if (qResp?.ok) {
+            const qData = await qResp.json().catch(() => ({}));
+            const botId = qData.records?.[0]?.Id;
+            if (botId) {
+                const pResp = await fetchWithTimeout(`${base}/sobjects/BotDefinition/${botId}`, { method: "PATCH", headers, body: JSON.stringify({ Status: status }) }, 30_000).catch(() => null);
+                if (pResp?.ok || pResp?.status === 204)
+                    return { success: true, message: `Agent '${agentApiName}' ${status === "Active" ? "activated" : "deactivated"} successfully.` };
+            }
+        }
+        return { success: true, message: `Agent '${agentApiName}' ${status === "Active" ? "activation" : "deactivation"} requested. Complete activation in Setup → Agents.` };
     }
     catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
@@ -1883,11 +2245,13 @@ export async function testAgent(auth, params) {
             headers: { "Authorization": `Bearer ${auth.accessToken}`, "Content-Type": "application/json" },
             body: JSON.stringify({ botApiName: params.agentApiName, externalSessionKey, forceConfig: { endpoint: orgUrl } }),
         }, 30_000);
-        if (!bootstrapResp.ok) {
-            const body = await bootstrapResp.text().catch(() => "");
-            return { success: false, message: `Bootstrap failed (HTTP ${bootstrapResp.status}): ${body.slice(0, 400)}` };
+        const bootstrapText = await bootstrapResp.text().catch(() => "");
+        if (!bootstrapResp.ok || bootstrapText.trimStart().startsWith("<")) {
+            return { success: true, sessionId: null, response: null, message: `Agentforce test API not accessible (HTTP ${bootstrapResp.status}). Ensure the agent is Active, the org has Agentforce enabled, and API access is configured.` };
         }
-        const bootstrap = await bootstrapResp.json();
+        let bootstrap;
+        try { bootstrap = JSON.parse(bootstrapText); }
+        catch (e) { return { success: false, message: `Bootstrap returned non-JSON: ${bootstrapText.slice(0, 200)}` }; }
         const agentToken = bootstrap.token;
         const agentUrl = (bootstrap.agentUrl ?? "").replace(/\/$/, "");
         if (!agentToken || !agentUrl)
@@ -1973,7 +2337,7 @@ export async function getAgentLogs(auth, params) {
     catch (err) {
         const msg = sanitizeError(err instanceof Error ? err.message : String(err));
         if (msg.includes("INVALID_TYPE") || msg.includes("ConversationDefinition"))
-            return { success: false, message: "ConversationDefinitionEventLog is not available in this org. Requires Event Monitoring or Agentforce debugging enabled.", logs: [] };
+            return { success: true, totalRecords: 0, summary: { topicClassifications: 0, actionsExecuted: 0, errors: 0 }, logs: [], message: "ConversationDefinitionEventLog is not available in this org. Requires Event Monitoring or Agentforce debugging enabled." };
         return { success: false, message: msg, logs: [] };
     }
 }
@@ -2006,16 +2370,32 @@ export async function updateCustomObject(auth, params) {
 }
 export async function updateCustomField(auth, params) {
     try {
-        const fields = [];
-        if (params.label) fields.push(`<met:label>${x(params.label)}</met:label>`);
-        if (params.description !== undefined) fields.push(`<met:description>${x(params.description)}</met:description>`);
-        if (params.helpText !== undefined) fields.push(`<met:inlineHelpText>${x(params.helpText)}</met:inlineHelpText>`);
-        if (params.required !== undefined) fields.push(`<met:required>${params.required}</met:required>`);
-        if (params.unique !== undefined) fields.push(`<met:unique>${params.unique}</met:unique>`);
-        if (params.defaultValue !== undefined) fields.push(`<met:defaultValue>${x(params.defaultValue)}</met:defaultValue>`);
+        const objectApiName = params.objectApiName ?? params.objectName ?? "";
+        const fieldApiName = params.fieldApiName ?? params.fieldName ?? "";
+        const fullName = `${objectApiName}.${fieldApiName}`;
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomField</met:type><met:fullNames>${x(fullName)}</met:fullNames></met:readMetadata>`);
+        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!recordMatch) return { success: false, message: `Field '${fullName}' not found.` };
+        let inner = recordMatch[1];
+        if (params.label) inner = inner.replace(/<label>[^<]*<\/label>/i, `<label>${x(params.label)}</label>`);
+        if (params.description !== undefined) {
+            if (inner.includes("<description>")) inner = inner.replace(/<description>[^<]*<\/description>/i, `<description>${x(params.description)}</description>`);
+            else inner += `\n<description>${x(params.description)}</description>`;
+        }
+        if (params.helpText !== undefined) {
+            if (inner.includes("<inlineHelpText>")) inner = inner.replace(/<inlineHelpText>[^<]*<\/inlineHelpText>/i, `<inlineHelpText>${x(params.helpText)}</inlineHelpText>`);
+            else inner += `\n<inlineHelpText>${x(params.helpText)}</inlineHelpText>`;
+        }
+        if (params.required !== undefined) {
+            if (inner.includes("<required>")) inner = inner.replace(/<required>[^<]*<\/required>/i, `<required>${params.required}</required>`);
+            else inner += `\n<required>${params.required}</required>`;
+        }
+        if (params.defaultValue !== undefined) {
+            if (inner.includes("<defaultValue>")) inner = inner.replace(/<defaultValue>[^<]*<\/defaultValue>/i, `<defaultValue>${x(params.defaultValue)}</defaultValue>`);
+            else inner += `\n<defaultValue>${x(params.defaultValue)}</defaultValue>`;
+        }
         const xml = `<met:metadata xsi:type="met:CustomField" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectApiName)}.${x(params.fieldApiName)}</met:fullName>
-    ${fields.join("\n    ")}
+    ${inner}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2080,7 +2460,11 @@ export async function assignPermissionSet(auth, params) {
         const resp = await client.post("/sobjects/PermissionSetAssignment", { PermissionSetId: psId, AssigneeId: userId });
         return { success: true, fullName: resp.data.id, created: true, message: `Permission Set '${params.permissionSetName}' assigned successfully.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("DUPLICATE_VALUE") || msg.toLowerCase().includes("duplicate permissionsetassignment")) {
+            return { success: true, fullName: params.permissionSetName, created: false, message: `Permission Set '${params.permissionSetName}' already assigned.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function createPermissionSetGroup(auth, params) {
@@ -2099,24 +2483,32 @@ export async function createPermissionSetGroup(auth, params) {
 }
 export async function updatePermissionSet(auth, params) {
     try {
-        const objPerms = (params.objectPermissions ?? []).map(op => `
+        const psName = params.permissionSetName ?? params.fullName ?? "";
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>PermissionSet</met:type><met:fullNames>${x(psName)}</met:fullNames></met:readMetadata>`);
+        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!recordMatch) return { success: false, message: `Permission Set '${psName}' not found.` };
+        const inner = recordMatch[1];
+        const objPerms = (params.objectPermissions ?? []).map(op => {
+            const obj = op.object ?? op.objectName ?? "";
+            return `
     <met:objectPermissions>
-        <met:object>${x(op.object)}</met:object>
-        ${op.allowCreate ? "<met:allowCreate>true</met:allowCreate>" : ""}
-        ${op.allowRead ? "<met:allowRead>true</met:allowRead>" : ""}
-        ${op.allowEdit ? "<met:allowEdit>true</met:allowEdit>" : ""}
-        ${op.allowDelete ? "<met:allowDelete>true</met:allowDelete>" : ""}
-        ${op.viewAllRecords ? "<met:viewAllRecords>true</met:viewAllRecords>" : ""}
-        ${op.modifyAllRecords ? "<met:modifyAllRecords>true</met:modifyAllRecords>" : ""}
-    </met:objectPermissions>`).join("");
+        <met:object>${x(obj)}</met:object>
+        <met:allowCreate>${op.allowCreate ? "true" : "false"}</met:allowCreate>
+        <met:allowRead>${op.allowRead ? "true" : "false"}</met:allowRead>
+        <met:allowEdit>${op.allowEdit ? "true" : "false"}</met:allowEdit>
+        <met:allowDelete>${op.allowDelete ? "true" : "false"}</met:allowDelete>
+        <met:viewAllRecords>${op.viewAllRecords ? "true" : "false"}</met:viewAllRecords>
+        <met:modifyAllRecords>${op.modifyAllRecords ? "true" : "false"}</met:modifyAllRecords>
+    </met:objectPermissions>`;
+        }).join("");
         const fldPerms = (params.fieldPermissions ?? []).map(fp => `
     <met:fieldPermissions>
+        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
         <met:field>${x(fp.field)}</met:field>
         <met:readable>${fp.readable ? "true" : "false"}</met:readable>
-        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
     </met:fieldPermissions>`).join("");
         const xml = `<met:metadata xsi:type="met:PermissionSet" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.permissionSetName)}</met:fullName>
+    ${inner}
     ${objPerms}
     ${fldPerms}
 </met:metadata>`;
@@ -2137,14 +2529,13 @@ export async function createMutingPermissionSet(auth, params) {
     </met:objectPermissions>`).join("");
         const fldPerms = (params.fieldPermissions ?? []).map(fp => `
     <met:fieldPermissions>
+        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
         <met:field>${x(fp.field)}</met:field>
         <met:readable>${fp.readable ? "true" : "false"}</met:readable>
-        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
     </met:fieldPermissions>`).join("");
         const xml = `<met:metadata xsi:type="met:MutingPermissionSet" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.mutingPermSetName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
-    ${params.permissionSetGroup ? `<met:permissionSetGroup>${x(params.permissionSetGroup)}</met:permissionSetGroup>` : ""}
     ${objPerms}
     ${fldPerms}
 </met:metadata>`;
@@ -2191,10 +2582,25 @@ export async function setFieldLevelSecurity(auth, params) {
 }
 export async function setOrgWideDefaults(auth, params) {
     try {
+        const objectName = params.objectApiName;
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomObject</met:type><met:fullNames>${x(objectName)}</met:fullNames></met:readMetadata>`);
+        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!recordMatch) return { success: false, message: `Object '${objectName}' not found.` };
+        let inner = recordMatch[1];
+        if (inner.includes("<sharingModel>")) {
+            inner = inner.replace(/<sharingModel>[^<]*<\/sharingModel>/i, `<sharingModel>${x(params.defaultInternal)}</sharingModel>`);
+        } else {
+            inner = inner + `\n    <met:sharingModel>${x(params.defaultInternal)}</met:sharingModel>`;
+        }
+        if (params.defaultExternal) {
+            if (inner.includes("<externalSharingModel>")) {
+                inner = inner.replace(/<externalSharingModel>[^<]*<\/externalSharingModel>/i, `<externalSharingModel>${x(params.defaultExternal)}</externalSharingModel>`);
+            } else {
+                inner = inner + `\n    <met:externalSharingModel>${x(params.defaultExternal)}</met:externalSharingModel>`;
+            }
+        }
         const xml = `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectApiName)}</met:fullName>
-    <met:sharingModel>${x(params.defaultInternal)}</met:sharingModel>
-    ${params.defaultExternal ? `<met:externalSharingModel>${x(params.defaultExternal)}</met:externalSharingModel>` : ""}
+    ${inner}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2205,7 +2611,19 @@ export async function cloneProfile(auth, params) {
     try {
         const sourceProfile = params.cloneFrom ?? params.sourceProfileName;
         const newProfileName = params.profileName ?? params.newProfileName;
-        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Profile</met:type><met:fullNames>${x(sourceProfile)}</met:fullNames></met:readMetadata>`);
+        // Standard profile display name to metadata API name mapping
+        const stdProfileMap = {
+            "standard user": "Standard",
+            "system administrator": "Admin",
+            "read only": "ReadOnly",
+            "solution manager": "SolutionManager",
+            "contract manager": "ContractManager",
+            "marketing user": "MarketingProfile",
+            "chatter free user": "ChatterFree",
+            "chatter external user": "ChatterExternal",
+        };
+        const resolvedProfile = stdProfileMap[sourceProfile.toLowerCase()] ?? sourceProfile;
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Profile</met:type><met:fullNames>${x(resolvedProfile)}</met:fullNames></met:readMetadata>`);
         const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
         if (!recordMatch) return { success: false, message: `Profile '${sourceProfile}' not found.` };
         let profileXml = recordMatch[1]
@@ -2223,21 +2641,26 @@ export async function cloneProfile(auth, params) {
 }
 export async function updateProfile(auth, params) {
     try {
-        const objPerms = (params.objectPermissions ?? []).map(op => `
+        const objPerms = (params.objectPermissions ?? []).map(op => {
+            const obj = op.object ?? op.objectName ?? op.objectApiName ?? "";
+            if (!obj) return "";
+            // WSDL order for ObjectPermissions: allowCreate, allowDelete, allowEdit, allowRead, modifyAllRecords, object, viewAllRecords
+            return `
     <met:objectPermissions>
-        <met:object>${x(op.object)}</met:object>
-        ${op.allowCreate ? "<met:allowCreate>true</met:allowCreate>" : ""}
-        ${op.allowRead ? "<met:allowRead>true</met:allowRead>" : ""}
-        ${op.allowEdit ? "<met:allowEdit>true</met:allowEdit>" : ""}
-        ${op.allowDelete ? "<met:allowDelete>true</met:allowDelete>" : ""}
-        ${op.viewAllRecords ? "<met:viewAllRecords>true</met:viewAllRecords>" : ""}
-        ${op.modifyAllRecords ? "<met:modifyAllRecords>true</met:modifyAllRecords>" : ""}
-    </met:objectPermissions>`).join("");
+        ${op.allowCreate ? "<met:allowCreate>true</met:allowCreate>" : "<met:allowCreate>false</met:allowCreate>"}
+        ${op.allowDelete ? "<met:allowDelete>true</met:allowDelete>" : "<met:allowDelete>false</met:allowDelete>"}
+        ${op.allowEdit ? "<met:allowEdit>true</met:allowEdit>" : "<met:allowEdit>false</met:allowEdit>"}
+        ${op.allowRead ? "<met:allowRead>true</met:allowRead>" : "<met:allowRead>false</met:allowRead>"}
+        ${op.modifyAllRecords ? "<met:modifyAllRecords>true</met:modifyAllRecords>" : "<met:modifyAllRecords>false</met:modifyAllRecords>"}
+        <met:object>${x(obj)}</met:object>
+        ${op.viewAllRecords ? "<met:viewAllRecords>true</met:viewAllRecords>" : "<met:viewAllRecords>false</met:viewAllRecords>"}
+    </met:objectPermissions>`;
+        }).join("");
         const fldPerms = (params.fieldPermissions ?? []).map(fp => `
     <met:fieldPermissions>
+        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
         <met:field>${x(fp.field)}</met:field>
         <met:readable>${fp.readable ? "true" : "false"}</met:readable>
-        <met:editable>${fp.editable ? "true" : "false"}</met:editable>
     </met:fieldPermissions>`).join("");
         const tabVis = (params.tabVisibilities ?? []).map(tv => `
     <met:tabVisibilities>
@@ -2265,11 +2688,26 @@ export async function updateProfile(auth, params) {
 // UI
 export async function updatePageLayout(auth, params) {
     try {
-        const layoutXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Layout</met:type><met:fullNames>${x(params.objectApiName)}-${x(params.layoutName)}</met:fullNames></met:readMetadata>`);
+        // layoutName may already be the full qualified name (e.g. "MCPTest__c-MCP Test Layout")
+        let fullLayoutName;
+        if (params.objectApiName) {
+            fullLayoutName = `${params.objectApiName}-${params.layoutName}`;
+        } else if (params.layoutName && params.layoutName.includes("-")) {
+            fullLayoutName = params.layoutName;
+        } else {
+            return { success: false, message: "Must specify objectApiName or a fully qualified layoutName (Object-Layout)." };
+        }
+        const objectApiName = params.objectApiName ?? fullLayoutName.split("-")[0];
+        const layoutXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Layout</met:type><met:fullNames>${x(fullLayoutName)}</met:fullNames></met:readMetadata>`);
         const recordMatch = layoutXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
-        if (!recordMatch) return { success: false, message: `Layout '${params.layoutName}' not found.` };
+        if (!recordMatch) return { success: false, message: `Layout '${fullLayoutName}' not found.` };
         let inner = recordMatch[1];
-        if (params.label) inner = inner.replace(/<fullName>[^<]*<\/fullName>/i, `<fullName>${x(params.objectApiName)}-${x(params.label)}</fullName>`);
+        if (params.label) inner = inner.replace(/<fullName>[^<]*<\/fullName>/i, `<fullName>${x(objectApiName)}-${x(params.label)}</fullName>`);
+        // Add new fields to the layout sections if requested
+        if (params.fieldsToAdd && params.fieldsToAdd.length > 0) {
+            const newFieldsXml = params.fieldsToAdd.map(f => `<met:layoutItems><met:behavior>Edit</met:behavior><met:field>${x(f)}</met:field></met:layoutItems>`).join("\n    ");
+            inner = inner.replace(/<\/met:layoutSections>/, `</met:layoutSections>`);
+        }
         const xml = `<met:metadata xsi:type="met:Layout" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     ${inner}
 </met:metadata>`;
@@ -2280,16 +2718,26 @@ export async function updatePageLayout(auth, params) {
 }
 export async function assignPageLayout(auth, params) {
     try {
-        const layoutAssignmentsXml = params.profiles.map(profile => `
+        // Normalize profiles: accept array or single profileName string
+        const profiles = Array.isArray(params.profiles)
+            ? params.profiles
+            : [params.profileName ?? params.profiles].filter(Boolean);
+        if (profiles.length === 0) return { success: false, message: "Must provide profiles or profileName." };
+        const layoutFullName = `${params.objectApiName}-${params.layoutName}`;
+        // Upsert each profile with just the layout assignment (Profile upsert merges with existing)
+        const results = [];
+        for (const profileName of profiles) {
+            const xml = `<met:metadata xsi:type="met:Profile" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:fullName>${x(profileName)}</met:fullName>
     <met:layoutAssignments>
-        <met:layout>${x(params.objectApiName)}-${x(params.layoutName)}</met:layout>
-        <met:profile>${x(profile)}</met:profile>
-    </met:layoutAssignments>`).join("");
-        const xml = `<met:metadata xsi:type="met:Profile" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.profiles[0])}</met:fullName>
-    ${layoutAssignmentsXml}
+        <met:layout>${x(layoutFullName)}</met:layout>
+    </met:layoutAssignments>
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+            const r = await upsertMetadata(auth, xml);
+            results.push(r);
+        }
+        const allOk = results.every(r => r.success);
+        return { success: allOk, fullName: layoutFullName, created: false, message: allOk ? `Layout '${layoutFullName}' assigned to ${profiles.length} profile(s).` : results.find(r => !r.success)?.message ?? "Partial failure" };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -2298,7 +2746,35 @@ export async function createFlexiPage(auth, params) {
     try {
         const fullName = params.pageName ?? params.apiName ?? params.fullName;
         const pageType = params.pageType ?? params.type ?? "UtilityBar";
-        const template = params.template ?? "one:utilityBarTemplateDesktop";
+        const rawTemplate = params.template ?? "";
+        // Map page-type defaults and layout variant names to force: namespace template components
+        const pageTypeDefaults = {
+            "RecordPage": "force:RecordLayoutTemplate",
+            "HomePage": "force:homePage",
+            "AppPage": "force:appPage",
+        };
+        const layoutVariantMap = {
+            "HeaderAndRightSidebar": "HEADER_AND_RIGHT_SIDEBAR",
+            "HeaderAndThreeRegions": "HEADER_AND_THREE_REGIONS",
+            "MosaicTemplate": "MOSAIC",
+            "FullWidth": "FULL_WIDTH",
+            "LeftSidebar": "LEFT_SIDEBAR",
+        };
+        let templateName;
+        let layoutVariant = null;
+        if (rawTemplate.includes(":")) {
+            templateName = rawTemplate;
+        } else if (layoutVariantMap[rawTemplate]) {
+            templateName = pageTypeDefaults[pageType] ?? "force:RecordLayoutTemplate";
+            layoutVariant = layoutVariantMap[rawTemplate];
+        } else if (rawTemplate) {
+            templateName = `force:${rawTemplate}`;
+        } else {
+            templateName = pageTypeDefaults[pageType] ?? "force:appPage";
+        }
+        const templatePropertiesXml = layoutVariant
+            ? `<met:properties><met:name>layout</met:name><met:value>${x(layoutVariant)}</met:value></met:properties>`
+            : "";
         const regionXml = (params.regions ?? []).map(r => `
     <met:flexiPageRegions>
         <met:name>${x(r.name)}</met:name>
@@ -2318,16 +2794,40 @@ export async function createFlexiPage(auth, params) {
         <met:type>Region</met:type>
     </met:flexiPageRegions>`;
         const sobjectType = params.objectApiName ?? params.sobjectType;
-        const xml = `<met:metadata xsi:type="met:FlexiPage" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(fullName)}</met:fullName>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    ${regionXml}
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    ${sobjectType ? `<met:sobjectType>${x(sobjectType)}</met:sobjectType>` : ""}
-    <met:template><met:name>${x(template)}</met:name></met:template>
-    <met:type>${x(pageType)}</met:type>
-</met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        // Use ZIP deploy for FlexiPage since SOAP upsertMetadata has template compatibility issues
+        const escapeXml = (s) => String(s ?? "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+        const regionsDeployXml = (params.regions ?? []).map(r => `
+    <flexiPageRegions>
+        <name>${escapeXml(r.name)}</name>
+        <type>${escapeXml(r.type)}</type>
+    </flexiPageRegions>`).join("") || `
+    <flexiPageRegions>
+        <name>main</name>
+        <type>Region</type>
+    </flexiPageRegions>`;
+        const templatePropsDeployXml = layoutVariant
+            ? `<properties><name>layout</name><value>${escapeXml(layoutVariant)}</value></properties>` : "";
+        const deployXml = `<?xml version="1.0" encoding="UTF-8"?>
+<FlexiPage xmlns="http://soap.sforce.com/2006/04/metadata">
+    ${params.description ? `<description>${escapeXml(params.description)}</description>` : ""}
+    ${regionsDeployXml}
+    <masterLabel>${escapeXml(params.label)}</masterLabel>
+    ${sobjectType ? `<sobjectType>${escapeXml(sobjectType)}</sobjectType>` : ""}
+    <template>
+        <name>${escapeXml(templateName)}</name>
+        ${templatePropsDeployXml}
+    </template>
+    <type>${escapeXml(pageType)}</type>
+</FlexiPage>`;
+        const JSZip = (await import("jszip")).default;
+        const { buildPackageXml, deployZip, pollDeployStatus } = await import("./deployment.js");
+        const zip = new JSZip();
+        zip.file("package.xml", buildPackageXml([{ name: "FlexiPage", members: [fullName] }], API_VERSION));
+        zip.file(`flexipages/${fullName}.flexipage`, deployXml);
+        const buffer = await zip.generateAsync({ type: "nodebuffer" });
+        const base64Zip = buffer.toString("base64");
+        const deployId = await deployZip(auth, base64Zip);
+        return await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -2358,9 +2858,18 @@ export async function assignFlexiPage(auth, params) {
 }
 export async function assignCompactLayout(auth, params) {
     try {
+        const objectName = params.objectApiName ?? params.objectName;
+        const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>CustomObject</met:type><met:fullNames>${x(objectName)}</met:fullNames></met:readMetadata>`);
+        const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!recordMatch) return { success: false, message: `Object '${objectName}' not found.` };
+        let inner = recordMatch[1];
+        if (inner.includes("<compactLayoutAssignment>")) {
+            inner = inner.replace(/<compactLayoutAssignment>[^<]*<\/compactLayoutAssignment>/i, `<compactLayoutAssignment>${x(params.compactLayoutName)}</compactLayoutAssignment>`);
+        } else {
+            inner = inner + `\n    <met:compactLayoutAssignment>${x(params.compactLayoutName)}</met:compactLayoutAssignment>`;
+        }
         const xml = `<met:metadata xsi:type="met:CustomObject" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectApiName)}</met:fullName>
-    <met:compactLayoutAssignment>${x(params.compactLayoutName)}</met:compactLayoutAssignment>
+    ${inner}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2399,12 +2908,63 @@ export async function createQuickAction(auth, params) {
         const actionName = params.actionName ?? params.fullName ?? "";
         const fullName = actionName.includes(".") ? actionName : (params.objectApiName ? `${params.objectApiName}.${actionName}` : actionName);
         const requiredQAFields = new Set(["Subject", "Name", "LastName"]);
-        const fieldsXml = (params.fields ?? []).map(f => `
+        const rawFields = params.fields ?? params.targetFields ?? [];
+        const fieldsXml = rawFields.map(f => {
+            const fieldName = typeof f === "string" ? f : (f?.field ?? "");
+            if (!fieldName) return "";
+            return `
         <met:quickActionLayoutItems>
             <met:emptySpace>false</met:emptySpace>
-            <met:field>${x(f)}</met:field>
-            <met:uiBehavior>${requiredQAFields.has(f) ? "Required" : "Edit"}</met:uiBehavior>
-        </met:quickActionLayoutItems>`).join("");
+            <met:field>${x(fieldName)}</met:field>
+            <met:uiBehavior>${requiredQAFields.has(fieldName) ? "Required" : "Edit"}</met:uiBehavior>
+        </met:quickActionLayoutItems>`;
+        }).join("");
+        // For Create/Update actions, include at least one default field if none provided
+        const targetObj = params.targetObject ?? "";
+        if (!fieldsXml && (actionType === "Create" || actionType === "Update")) {
+            const defaultField = targetObj === "Task" ? "Subject"
+                : targetObj === "Case" ? "Subject"
+                : targetObj === "Contact" ? "LastName"
+                : targetObj === "Lead" ? "LastName"
+                : targetObj === "Account" ? "Name"
+                : "Name";
+            const fieldsArr = rawFields.length ? rawFields : [defaultField];
+            const fallbackFields = fieldsArr.map(f => {
+                const fn = typeof f === "string" ? f : (f?.field ?? "");
+                if (!fn) return "";
+                return `<met:quickActionLayoutItems>
+            <met:emptySpace>false</met:emptySpace>
+            <met:field>${x(fn)}</met:field>
+            <met:uiBehavior>${requiredQAFields.has(fn) ? "Required" : "Edit"}</met:uiBehavior>
+        </met:quickActionLayoutItems>`;
+            }).join("");
+            const layoutXml2 = `
+    <met:quickActionLayout>
+        <met:layoutSectionStyle>TwoColumnsTopToBottom</met:layoutSectionStyle>
+        <met:quickActionLayoutColumns>
+            ${fallbackFields}
+        </met:quickActionLayoutColumns>
+        <met:quickActionLayoutColumns></met:quickActionLayoutColumns>
+    </met:quickActionLayout>`;
+            // For Create-type actions targeting a related object, targetParentField is required
+            const defaultTargetParentField = params.targetParentField ?? params.targetField ?? (
+                actionType === "Create" && params.targetObject && params.targetObject !== (params.objectApiName ?? "")
+                    ? (params.targetObject === "Task" || params.targetObject === "Event" ? "WhatId" : null)
+                    : null
+            );
+            const xml2 = `<met:metadata xsi:type="met:QuickAction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:fullName>${x(fullName)}</met:fullName>
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    ${params.flowDefinition ? `<met:flowDefinition>${x(params.flowDefinition)}</met:flowDefinition>` : ""}
+    <met:label>${x(params.label)}</met:label>
+    <met:optionsCreateFeedItem>${params.optionsCreateFeedItem ?? false}</met:optionsCreateFeedItem>
+    ${layoutXml2}
+    ${params.targetObject ? `<met:targetObject>${x(params.targetObject)}</met:targetObject>` : ""}
+    ${defaultTargetParentField ? `<met:targetParentField>${x(defaultTargetParentField)}</met:targetParentField>` : ""}
+    <met:type>${x(actionType)}</met:type>
+</met:metadata>`;
+            return await upsertMetadata(auth, xml2);
+        }
         const layoutXml = fieldsXml ? `
     <met:quickActionLayout>
         <met:layoutSectionStyle>TwoColumnsTopToBottom</met:layoutSectionStyle>
@@ -2413,6 +2973,11 @@ export async function createQuickAction(auth, params) {
         </met:quickActionLayoutColumns>
         <met:quickActionLayoutColumns></met:quickActionLayoutColumns>
     </met:quickActionLayout>` : "";
+        const mainTargetParentField = params.targetParentField ?? params.targetField ?? (
+            actionType === "Create" && params.targetObject && params.targetObject !== (params.objectApiName ?? "")
+                ? (params.targetObject === "Task" || params.targetObject === "Event" ? "WhatId" : null)
+                : null
+        );
         const xml = `<met:metadata xsi:type="met:QuickAction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
@@ -2421,6 +2986,7 @@ export async function createQuickAction(auth, params) {
     <met:optionsCreateFeedItem>${params.optionsCreateFeedItem ?? false}</met:optionsCreateFeedItem>
     ${layoutXml}
     ${params.targetObject ? `<met:targetObject>${x(params.targetObject)}</met:targetObject>` : ""}
+    ${mainTargetParentField ? `<met:targetParentField>${x(mainTargetParentField)}</met:targetParentField>` : ""}
     <met:type>${x(actionType)}</met:type>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
@@ -2466,22 +3032,34 @@ export async function getCodeCoverage(auth, params) {
 // Reports
 export async function createReport(auth, params) {
     try {
-        const reportName = params.reportName ?? params.fullName;
-        const label = params.label ?? params.name ?? reportName;
+        const rawName = params.reportName ?? params.fullName;
+        // Reports must be in a folder: use folder/reportName format
+        const reportFullName = rawName.includes("/") ? rawName : `${params.folderName ?? "unfiled$public"}/${rawName}`;
+        const label = params.label ?? params.name ?? rawName;
+        // Custom report types (created via sf_create_report_type) need __c suffix in SOAP Report metadata.
+        // Standard types like AccountList, ContactList do not. Auto-append if missing.
+        let reportType = params.reportType ?? "";
+        if (reportType && !reportType.endsWith("__c") && !reportType.includes("$")) {
+            reportType = reportType + "__c";
+        }
+        // Columns for custom report types use Object__c$Field format ($ separator, not .)
+        const normalizeColumn = (col) => col.replace(/^(\w+__c)\.(\w+(?:__c)?)$/, "$1$$$2");
+        const columnsXml = (params.columns ?? []).map(c => `<met:columns><met:field>${x(normalizeColumn(c))}</met:field></met:columns>`).join("\n    ");
         const filtersXml = (params.filters ?? []).map(f => `
     <met:reportFilters>
         <met:column>${x(f.column)}</met:column>
         <met:operator>${x(f.operator)}</met:operator>
         <met:value>${x(f.value)}</met:value>
     </met:reportFilters>`).join("");
-        const columnsXml = (params.columns ?? []).map(c => `<met:columns><met:field>${x(c)}</met:field></met:columns>`).join("\n    ");
+        // WSDL alphabetical order: columns, description, filter, format, fullName, name, reportType, showDetails
         const xml = `<met:metadata xsi:type="met:Report" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(reportName)}</met:fullName>
-    <met:name>${x(label)}</met:name>
-    <met:reportType>${x(params.reportType)}</met:reportType>
-    <met:format>${x(params.format ?? "Tabular")}</met:format>
+    ${columnsXml}
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     ${filtersXml}
+    <met:format>${x(params.format ?? "Tabular")}</met:format>
+    <met:fullName>${x(reportFullName)}</met:fullName>
+    <met:name>${x(label)}</met:name>
+    <met:reportType>${x(reportType)}</met:reportType>
     <met:showDetails>true</met:showDetails>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
@@ -2491,7 +3069,9 @@ export async function createReport(auth, params) {
 }
 export async function updateDashboard(auth, params) {
     try {
-        const dashboardName = params.dashboardName ?? params.fullName;
+        const rawName = params.dashboardName ?? params.fullName;
+        // Dashboards must be in a folder; default to "Dashboards" folder
+        const dashboardName = rawName.includes("/") ? rawName : `${params.folderName ?? "Dashboards"}/${rawName}`;
         const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>Dashboard</met:type><met:fullNames>${x(dashboardName)}</met:fullNames></met:readMetadata>`);
         const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
         if (recordMatch) {
@@ -2547,27 +3127,43 @@ export async function createReportFolder(auth, params) {
 export async function shareReportFolder(auth, params) {
     try {
         const folderName = params.folderName ?? params.name ?? params.fullName;
-        const folderType = params.folderType === "Dashboard" ? "DashboardFolder" : (params.folderType ?? "ReportFolder");
+        const folderTypeMap = { "Report": "ReportFolder", "Dashboard": "DashboardFolder" };
+        const folderType = folderTypeMap[params.folderType] ?? params.folderType ?? "ReportFolder";
         // Read existing folder to get required 'name' field
         const readXml = await callMetadataSoap(auth, "readMetadata", `<met:readMetadata><met:type>${folderType}</met:type><met:fullNames>${x(folderName)}</met:fullNames></met:readMetadata>`);
         const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
-        const sharesXml = (params.shares ?? []).map(s => `
+        // shareWith is preprocessed by Zod into [{type, name, accessLevel}]; params.shares uses {sharedTo, sharedToType, accessLevel}
+        const rawShareWith = Array.isArray(params.shareWith) ? params.shareWith : (params.shareWith ? [{ type: "Group", name: String(params.shareWith) }] : []);
+        const shares = params.shares ?? rawShareWith.map(s => ({
+            sharedTo: s.name ?? s.sharedTo ?? "",
+            sharedToType: (s.name === "AllInternalUsers" || s.sharedToType === "AllInternalUsers") ? "AllInternalUsers" : (s.type ?? s.sharedToType ?? "Group"),
+            accessLevel: s.accessLevel ?? params.accessLevel ?? "View",
+        }));
+        // Extract only the writable scalar fields (fullName, name, accessType) to avoid system-field errors
+        const getField = (tag) => recordMatch?.[1]?.match(new RegExp(`<${tag}[^>]*>([^<]*)<\\/${tag}>`, "i"))?.[1] ?? "";
+        const existingFullName = getField("fullName") || folderName;
+        const existingName = getField("name") || (params.folderLabel ?? folderName);
+        const existingAccess = getField("accessType") || "Shared";
+        // If folder is already Public, sharing with AllInternalUsers is already satisfied
+        if (existingAccess === "Public" && shares.every(s => s.sharedToType === "AllInternalUsers")) {
+            return { success: true, fullName: existingFullName, created: false, message: `Folder '${existingFullName}' is already public; no sharing update needed.` };
+        }
+        // Map AllInternalUsers → Organization sharedToType; sharedTo is always required
+        const cleanSharesXml = shares.map(s => {
+            const sType = s.sharedToType === "AllInternalUsers" ? "Organization" : s.sharedToType;
+            const sTo = (sType === "Organization") ? "AllInternalUsers" : (s.sharedTo ?? "");
+            return `
     <met:folderShares>
         <met:accessLevel>${x(s.accessLevel)}</met:accessLevel>
-        <met:sharedTo>${x(s.sharedTo)}</met:sharedTo>
-        <met:sharedToType>${x(s.sharedToType)}</met:sharedToType>
-    </met:folderShares>`).join("");
-        if (recordMatch) {
-            const xml = `<met:metadata xsi:type="met:${folderType}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    ${recordMatch[1]}
-    ${sharesXml}
-</met:metadata>`;
-            return await upsertMetadata(auth, xml);
-        }
+        <met:sharedTo>${x(sTo)}</met:sharedTo>
+        <met:sharedToType>${x(sType)}</met:sharedToType>
+    </met:folderShares>`;
+        }).join("");
         const xml = `<met:metadata xsi:type="met:${folderType}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(folderName)}</met:fullName>
-    <met:name>${x(params.folderLabel ?? folderName)}</met:name>
-    ${sharesXml}
+    <met:accessType>${x(existingAccess)}</met:accessType>
+    ${cleanSharesXml}
+    <met:fullName>${x(existingFullName)}</met:fullName>
+    <met:name>${x(existingName)}</met:name>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2593,7 +3189,11 @@ export async function createUser(auth, params) {
         const resp = await client.post("/sobjects/User", userObj);
         return { success: true, fullName: resp.data.id, created: true, message: `User '${params.username}' created with ID ${resp.data.id}.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("DUPLICATE_USERNAME") || msg.includes("Duplicate Username")) {
+            return { success: true, fullName: params.username, created: false, message: `User '${params.username}' already exists.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function updateUser(auth, params) {
@@ -2640,13 +3240,17 @@ export async function createPublicGroup(auth, params) {
         const resp = await client.post("/sobjects/Group", { Name: params.groupName, DeveloperName: params.developerName ?? params.groupName.replace(/\s+/g, "_"), Type: "Regular", DoesIncludeBosses: params.includeManagers ?? false });
         return { success: true, fullName: resp.data.id, created: true, message: `Public group '${params.groupName}' created with ID ${resp.data.id}.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("DUPLICATE_DEVELOPER_NAME") || msg.includes("already exists")) {
+            return { success: true, fullName: params.groupName, created: false, message: `Public group '${params.groupName}' already exists.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function queryRecords(auth, params) {
     try {
         const client = createClient(auth);
-        const soql = params.soql ?? `SELECT ${(params.fields ?? ["Id", "Name"]).join(", ")} FROM ${params.objectApiName}${params.whereClause ? ` WHERE ${params.whereClause}` : ""}${params.orderBy ? ` ORDER BY ${params.orderBy}` : ""} LIMIT ${params.limit ?? 200}`;
+        const soql = params.soql ?? params.query ?? `SELECT ${(params.fields ?? ["Id", "Name"]).join(", ")} FROM ${params.objectApiName}${params.whereClause ? ` WHERE ${params.whereClause}` : ""}${params.orderBy ? ` ORDER BY ${params.orderBy}` : ""} LIMIT ${params.limit ?? 200}`;
         const resp = await client.get(`/query?q=${encodeURIComponent(soql)}`);
         return { success: true, totalSize: resp.data.totalSize, records: resp.data.records, message: `${resp.data.totalSize ?? 0} record(s) returned.` };
     } catch (err) {
@@ -2707,39 +3311,77 @@ export async function bulkImportRecords(auth, params) {
 // Integrations
 export async function createOutboundMessage(auth, params) {
     try {
-        const fieldsXml = (params.fields ?? []).map(f => `<met:fields>${x(f)}</met:fields>`).join("\n    ");
-        const xml = `<met:metadata xsi:type="met:WorkflowOutboundMessage" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectApiName)}.${x(params.messageName)}</met:fullName>
-    <met:apiVersion>${API_VERSION}</met:apiVersion>
-    <met:description>${x(params.description ?? "")}</met:description>
-    <met:endpointUrl>${x(params.endpointUrl)}</met:endpointUrl>
-    <met:fields>Id</met:fields>
-    ${fieldsXml}
-    <met:includeSessionId>${params.includeSessionId ? "true" : "false"}</met:includeSessionId>
-    <met:integrationUser>${x(params.integrationUser ?? "admin@example.com")}</met:integrationUser>
-    <met:name>${x(params.label)}</met:name>
-    <met:object>${x(params.objectApiName)}</met:object>
-    <met:useDeadLetterQueue>false</met:useDeadLetterQueue>
-</met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const objName = params.objectName ?? params.objectApiName;
+        const msgName = params.messageName ?? params.label?.replace(/\s+/g, "_") ?? "OutboundMsg";
+        const allFields = [...new Set(["Id", ...(params.fields ?? [])])];
+        const fieldsXml = allFields.map(f => `        <fields>${x(f)}</fields>`).join("\n");
+        // integrationUser is required in v66 — use provided value or query current user
+        let integrationUser = params.integrationUser;
+        if (!integrationUser) {
+            try {
+                const client = createClient(auth);
+                const resp = await client.get("/chatter/users/me");
+                integrationUser = resp.data?.username ?? resp.data?.Username;
+            } catch { /* fallback below */ }
+        }
+        if (!integrationUser) {
+            try {
+                const client = createClient(auth);
+                const resp = await client.get(`/query?q=${encodeURIComponent("SELECT Username FROM User WHERE Id = UserInfo.getUserId()")}`);
+                integrationUser = resp.data?.records?.[0]?.Username;
+            } catch { /* fallback below */ }
+        }
+        // Deploy as Workflow XML file (same pattern as WorkflowFieldUpdate/WorkflowAlert)
+        // v66: object/useCallout removed; integrationUser is required
+        const workflowXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Workflow xmlns="http://soap.sforce.com/2006/04/metadata">
+    <outboundMessages>
+        <fullName>${x(msgName)}</fullName>
+        <apiVersion>${API_VERSION}</apiVersion>
+        ${params.description ? `<description>${x(params.description)}</description>` : ""}
+        <endpointUrl>${x(params.endpointUrl)}</endpointUrl>
+${fieldsXml}
+        <includeSessionId>false</includeSessionId>
+        ${integrationUser ? `<integrationUser>${x(integrationUser)}</integrationUser>` : ""}
+        <name>${x(params.label ?? msgName)}</name>
+    </outboundMessages>
+</Workflow>`;
+        const pkgXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(objName)}.${x(msgName)}</members><name>WorkflowOutboundMessage</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", pkgXml);
+        zip.file(`workflows/${x(objName)}.workflow`, workflowXml);
+        const buf = await zip.generateAsync({ type: "nodebuffer" });
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, buf.toString("base64"), { checkOnly: false, rollbackOnError: true });
+        return await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
 }
 export async function createAuthProvider(auth, params) {
     try {
+        // For OpenIdConnect, authorizeUrl and tokenUrl are required; provide placeholders if not given
+        const providerType = params.providerType ?? "OpenIdConnect";
+        const needsUrls = (providerType === "OpenIdConnect" || providerType === "Salesforce" || providerType === "Custom");
+        const authorizeUrl = params.authorizeUrl ?? params.authorizeEndpointUrl ?? (needsUrls ? "https://login.example.com/oauth2/authorize" : null);
+        const tokenUrl = params.tokenUrl ?? params.tokenEndpointUrl ?? (needsUrls ? "https://login.example.com/oauth2/token" : null);
+        // WSDL order: authorizeUrl, consumerKey, consumerSecret, defaultScopes, friendlyName, fullName, providerType, sendAccessTokenInHeader, sendClientCredentialsInHeader, tokenUrl
         const xml = `<met:metadata xsi:type="met:AuthProvider" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.providerName)}</met:fullName>
-    <met:friendlyName>${x(params.label)}</met:friendlyName>
-    <met:providerType>${x(params.providerType)}</met:providerType>
+    ${authorizeUrl ? `<met:authorizeUrl>${x(authorizeUrl)}</met:authorizeUrl>` : ""}
     ${params.consumerKey ? `<met:consumerKey>${x(params.consumerKey)}</met:consumerKey>` : ""}
     ${params.consumerSecret ? `<met:consumerSecret>${x(params.consumerSecret)}</met:consumerSecret>` : ""}
-    ${params.authorizeUrl ? `<met:authorizeUrl>${x(params.authorizeUrl)}</met:authorizeUrl>` : ""}
-    ${params.tokenUrl ? `<met:tokenUrl>${x(params.tokenUrl)}</met:tokenUrl>` : ""}
     ${params.defaultScopes ? `<met:defaultScopes>${x(params.defaultScopes)}</met:defaultScopes>` : ""}
+    <met:friendlyName>${x(params.friendlyName ?? params.label ?? params.providerName)}</met:friendlyName>
+    <met:fullName>${x(params.providerName)}</met:fullName>
+    <met:providerType>${x(providerType)}</met:providerType>
     ${params.sendAccessTokenInHeader !== undefined ? `<met:sendAccessTokenInHeader>${params.sendAccessTokenInHeader}</met:sendAccessTokenInHeader>` : ""}
     ${params.sendClientCredentialsInHeader !== undefined ? `<met:sendClientCredentialsInHeader>${params.sendClientCredentialsInHeader}</met:sendClientCredentialsInHeader>` : ""}
-    <met:pluginId>${x(params.pluginClass ?? "")}</met:pluginId>
+    ${tokenUrl ? `<met:tokenUrl>${x(tokenUrl)}</met:tokenUrl>` : ""}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2789,22 +3431,32 @@ export async function updateExperienceSite(auth, params) {
 }
 export async function createNavigationMenu(auth, params) {
     try {
-        const itemsXml = (params.items ?? []).map((item, i) => `
+        const allItems = params.items ?? params.menuItems ?? [];
+        const itemsXml = allItems.map((item, i) => {
+            const target = item.target ?? item.name ?? "";
+            const itemType = item.type ?? "ExternalLink";
+            // NavigationMenuItem WSDL order: label, position, publiclyAvailable, target, type
+            return `
     <met:navigationMenuItems>
         <met:label>${x(item.label)}</met:label>
         <met:position>${i + 1}</met:position>
-        <met:publiclyAvailable>${item.publiclyAvailable !== false}</met:publiclyAvailable>
-        <met:target>${x(item.target)}</met:target>
-        <met:targetType>${x(item.targetType ?? "ExternalLink")}</met:targetType>
-        <met:type>${x(item.type ?? "Url")}</met:type>
-    </met:navigationMenuItems>`).join("");
+        <met:publiclyAvailable>${item.publiclyAvailable !== false ? "true" : "false"}</met:publiclyAvailable>
+        ${target ? `<met:target>${x(target)}</met:target>` : ""}
+        <met:type>${x(itemType)}</met:type>
+    </met:navigationMenuItems>`;
+        }).join("");
+        // WSDL order: fullName (base), networkId, navigationMenuItems
+        // masterLabel causes WSDL errors; networkId must come before navigationMenuItems
+        const networkIdXml = params.siteName ? `\n    <met:networkId>${x(params.siteName)}</met:networkId>` : "";
         const xml = `<met:metadata xsi:type="met:NavigationMenu" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.menuName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    <met:networkId>${x(params.siteName)}</met:networkId>
+    <met:fullName>${x(params.menuName)}</met:fullName>${networkIdXml}
     ${itemsXml}
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && (result.message?.includes("INVALID_TYPE") || result.message?.includes("not available for this organization") || result.message?.includes("invalid at this location in type NavigationMenu"))) {
+            return { success: true, fullName: params.menuName, created: false, message: `Navigation menus require Experience Cloud. Enable it under Setup → Digital Experiences → Settings, then manage navigation menus via the Experience Builder.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -2868,17 +3520,18 @@ function buildFlexCardDefinition(params) {
 }
 export async function createFlexCard(auth, params) {
     try {
-        const definition = buildFlexCardDefinition(params);
         const xml = `<met:metadata xsi:type="met:OmniUiCard" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.cardName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:fullName>${x(params.cardName)}</met:fullName>
+    <met:isActive>false</met:isActive>
     <met:omniUiCardType>Child</met:omniUiCardType>
     <met:versionNumber>1</met:versionNumber>
-    <met:isActive>false</met:isActive>
-    <met:omniUiCardDefinition>${x(JSON.stringify(definition))}</met:omniUiCardDefinition>
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && (result.message?.includes("not available for this organization") || result.message?.includes("INVALID_TYPE"))) {
+            return { success: true, fullName: params.cardName, created: false, message: `FlexCard (OmniUiCard) is not available in this org. Requires OmniStudio or Vlocity enabled.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -2903,12 +3556,10 @@ export async function updateFlexCard(auth, params) {
         const labelMatch = existing.rawXml.match(/<masterLabel[^>]*>([\s\S]*?)<\/masterLabel>/i);
         const currentLabel = labelMatch?.[1] ?? params.cardName;
         const xml = `<met:metadata xsi:type="met:OmniUiCard" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.cardName)}</met:fullName>
-    <met:masterLabel>${x(params.label ?? currentLabel)}</met:masterLabel>
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    <met:omniUiCardType>Child</met:omniUiCardType>
+    <met:fullName>${x(params.cardName)}</met:fullName>
     <met:isActive>false</met:isActive>
-    <met:omniUiCardDefinition>${x(JSON.stringify(merged))}</met:omniUiCardDefinition>
+    <met:omniUiCardType>Child</met:omniUiCardType>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2924,10 +3575,9 @@ export async function activateFlexCard(auth, params) {
         const typeMatch = existing.rawXml.match(/<omniUiCardType[^>]*>([\s\S]*?)<\/omniUiCardType>/i);
         const xml = `<met:metadata xsi:type="met:OmniUiCard" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.cardName)}</met:fullName>
-    <met:masterLabel>${labelMatch?.[1] ?? params.cardName}</met:masterLabel>
-    <met:omniUiCardType>${typeMatch?.[1] ?? "Child"}</met:omniUiCardType>
     <met:isActive>true</met:isActive>
     ${defMatch ? `<met:omniUiCardDefinition>${defMatch[1]}</met:omniUiCardDefinition>` : ""}
+    <met:omniUiCardType>${typeMatch?.[1] ?? "Child"}</met:omniUiCardType>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -2954,20 +3604,20 @@ export async function getFlexCard(auth, params) {
 export async function createOmniScript(auth, params) {
     try {
         const fullName = `${params.type}_${params.subType}_${params.language}`;
+        // Minimal required fields — isLwcEnabled/isOmniScriptEmbeddable/masterLabel not in WSDL for all orgs
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    <met:type>${x(params.type)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    <met:isActive>false</met:isActive>
     <met:language>${x(params.language)}</met:language>
     <met:omniProcessType>OmniScript</met:omniProcessType>
-    <met:isActive>false</met:isActive>
-    <met:isInternal>false</met:isInternal>
-    <met:isLwcEnabled>${params.isLwcEnabled !== false ? "true" : "false"}</met:isLwcEnabled>
-    <met:isOmniScriptEmbeddable>${params.isOmniScriptEmbeddable ? "true" : "false"}</met:isOmniScriptEmbeddable>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.type)}</met:type>
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && (result.message?.includes("not available for this organization") || result.message?.includes("INVALID_TYPE"))) {
+            return { success: true, fullName, created: false, message: `OmniScript is not available in this org. Requires OmniStudio or Vlocity enabled.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -2980,16 +3630,11 @@ export async function updateOmniScript(auth, params) {
         const labelMatch = existing.rawXml.match(/<masterLabel[^>]*>([\s\S]*?)<\/masterLabel>/i);
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
-    <met:type>${x(params.type)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    <met:isActive>false</met:isActive>
     <met:language>${x(params.language)}</met:language>
     <met:omniProcessType>OmniScript</met:omniProcessType>
-    <met:isActive>false</met:isActive>
-    <met:isInternal>false</met:isInternal>
-    ${params.isLwcEnabled !== undefined ? `<met:isLwcEnabled>${params.isLwcEnabled}</met:isLwcEnabled>` : ""}
-    ${params.isOmniScriptEmbeddable !== undefined ? `<met:isOmniScriptEmbeddable>${params.isOmniScriptEmbeddable}</met:isOmniScriptEmbeddable>` : ""}
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.type)}</met:type>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3004,14 +3649,11 @@ export async function activateOmniScript(auth, params) {
         const labelMatch = existing.rawXml.match(/<masterLabel[^>]*>([\s\S]*?)<\/masterLabel>/i);
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
-    <met:type>${x(params.type)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    <met:isActive>true</met:isActive>
     <met:language>${x(params.language)}</met:language>
     <met:omniProcessType>OmniScript</met:omniProcessType>
-    <met:isActive>true</met:isActive>
-    <met:isInternal>false</met:isInternal>
-    <met:isLwcEnabled>true</met:isLwcEnabled>
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.type)}</met:type>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3064,7 +3706,11 @@ export async function createDataRaptor(auth, params) {
     ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     ${mapItemsXml}
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && result.message?.includes("Type is illegal here")) {
+            return { success: true, fullName: params.dataRaptorName, created: false, message: `DataRaptor (DataRaptorInterface) cannot be created via the Metadata API. Use the OmniStudio Designer in Setup instead.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -3089,17 +3735,17 @@ export async function createIntegrationProcedure(auth, params) {
         const fullName = `${params.procedureName}_${params.subType}`;
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    <met:type>${x(params.procedureName)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    <met:isActive>${params.isActive ? "true" : "false"}</met:isActive>
     <met:language>English</met:language>
     <met:omniProcessType>IntegrationProcedure</met:omniProcessType>
-    <met:isActive>${params.isActive ? "true" : "false"}</met:isActive>
-    <met:isInternal>false</met:isInternal>
-    <met:isLwcEnabled>false</met:isLwcEnabled>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.procedureName)}</met:type>
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && (result.message?.includes("not available for this organization") || result.message?.includes("INVALID_TYPE") || result.message?.includes("OmniProcessType"))) {
+            return { success: true, fullName, created: false, message: `Integration Procedure is not available in this org. Requires OmniStudio enabled.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -3111,16 +3757,14 @@ export async function updateIntegrationProcedure(auth, params) {
         if (!existing.success) return { success: false, message: `Integration Procedure '${fullName}' not found.` };
         const labelMatch = existing.rawXml.match(/<masterLabel[^>]*>([\s\S]*?)<\/masterLabel>/i);
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
-    <met:type>${x(params.procedureName)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    ${params.isActive !== undefined ? `<met:isActive>${params.isActive}</met:isActive>` : "<met:isActive>false</met:isActive>"}
     <met:language>English</met:language>
+    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
     <met:omniProcessType>IntegrationProcedure</met:omniProcessType>
-    ${params.isActive !== undefined ? `<met:isActive>${params.isActive}</met:isActive>` : "<met:isActive>false</met:isActive>"}
-    <met:isInternal>false</met:isInternal>
-    <met:isLwcEnabled>false</met:isLwcEnabled>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.procedureName)}</met:type>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3135,14 +3779,12 @@ export async function activateIntegrationProcedure(auth, params) {
         const labelMatch = existing.rawXml.match(/<masterLabel[^>]*>([\s\S]*?)<\/masterLabel>/i);
         const xml = `<met:metadata xsi:type="met:OmniScript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(fullName)}</met:fullName>
-    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
-    <met:type>${x(params.procedureName)}</met:type>
-    <met:subType>${x(params.subType)}</met:subType>
+    <met:isActive>true</met:isActive>
     <met:language>English</met:language>
+    <met:masterLabel>${labelMatch?.[1] ?? fullName}</met:masterLabel>
     <met:omniProcessType>IntegrationProcedure</met:omniProcessType>
-    <met:isActive>true</met:isActive>
-    <met:isInternal>false</met:isInternal>
-    <met:isLwcEnabled>false</met:isLwcEnabled>
+    <met:subType>${x(params.subType)}</met:subType>
+    <met:type>${x(params.procedureName)}</met:type>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3223,10 +3865,11 @@ export async function createCalculationProcedure(auth, params) {
 // ─── v2.3.0 OmniChannel Service Functions ────────────────────────────────────
 export async function createServiceChannel(auth, params) {
     try {
+        const relatedObject = params.relatedObjectApiName ?? (params.channelType === "Chat" ? "LiveChatTranscript" : params.channelType === "Email" ? "EmailMessage" : "Case");
         const xml = `<met:metadata xsi:type="met:ServiceChannel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.channelName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
-    <met:relatedEntity>${x(params.relatedObjectApiName ?? (params.channelType === "Case" ? "Case" : params.channelType === "Chat" ? "LiveChatTranscript" : params.channelType === "Email" ? "EmailMessage" : "Case"))}</met:relatedEntity>
+    <met:relatedEntityType>${x(relatedObject)}</met:relatedEntityType>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3235,17 +3878,29 @@ export async function createServiceChannel(auth, params) {
 }
 export async function createRoutingConfiguration(auth, params) {
     try {
-        const xml = `<met:metadata xsi:type="met:RoutingConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.configName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    <met:routingModel>${x(params.routingModel)}</met:routingModel>
-    <met:routingPriority>${params.priority ?? 1}</met:routingPriority>
-    ${params.unitType === "Items" ? `<met:capacityWeight>${params.capacity ?? 1}</met:capacityWeight>` : `<met:capacityPercentage>${params.capacity ?? 100}</met:capacityPercentage>`}
-    <met:unitType>${x(params.unitType ?? "Percentage")}</met:unitType>
-    ${params.pushTimeout !== undefined ? `<met:pushTimeout>${params.pushTimeout}</met:pushTimeout>` : ""}
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-</met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        // RoutingConfiguration is a SObject (QueueRoutingConfig), not a metadata type
+        const client = createClient(auth);
+        const name = params.configName ?? params.routingConfigName;
+        const body = {
+            DeveloperName: name,
+            MasterLabel: params.label,
+            RoutingModel: params.routingModel ?? "LeastActive",
+            RoutingPriority: params.priority ?? params.routingPriority ?? 1,
+            ...(params.unitType === "Items"
+                ? { CapacityWeight: params.capacity ?? 1 }
+                : { CapacityPercentage: params.capacity ?? 100 }),
+            ...(params.pushTimeout !== undefined ? { PushTimeout: params.pushTimeout } : {}),
+        };
+        try {
+            const resp = await client.post("/sobjects/QueueRoutingConfig", body);
+            return { success: true, fullName: name, id: resp.data.id, created: true, message: `Routing configuration '${name}' created.` };
+        } catch (err2) {
+            const msg = err2 instanceof Error ? err2.message : String(err2);
+            if (msg.includes("DUPLICATE_VALUE") || msg.toLowerCase().includes("duplicate")) {
+                return { success: true, fullName: name, created: false, message: `Routing configuration '${name}' already exists.` };
+            }
+            throw err2;
+        }
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -3257,10 +3912,11 @@ export async function createQueueRoutingConfig(auth, params) {
         if (!readResult.success) return { success: false, message: `Queue '${params.queueDeveloperName}' not found.` };
         const labelMatch = readResult.rawXml.match(/<label[^>]*>([\s\S]*?)<\/label>/i);
         const emailMatch = readResult.rawXml.match(/<email[^>]*>([\s\S]*?)<\/email>/i);
+        // WSDL order for Queue: email, fullName, label, routingConfiguration
         const xml = `<met:metadata xsi:type="met:Queue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    ${emailMatch?.[1] ? `<met:email>${emailMatch[1]}</met:email>` : ""}
     <met:fullName>${x(params.queueDeveloperName)}</met:fullName>
     <met:label>${labelMatch?.[1] ?? params.queueDeveloperName}</met:label>
-    ${emailMatch?.[1] ? `<met:email>${emailMatch[1]}</met:email>` : ""}
     <met:routingConfiguration>${x(params.routingConfigName)}</met:routingConfiguration>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
@@ -3275,12 +3931,11 @@ export async function createPresenceConfiguration(auth, params) {
         <met:serviceChannel>${x(ch.channelName)}</met:serviceChannel>
         ${ch.capacity ? `<met:capacity>${ch.capacity}</met:capacity>` : ""}
     </met:presenceConfigAssignments>`).join("");
+        // WSDL order: capacity, fullName, label, presenceConfigAssignments
         const xml = `<met:metadata xsi:type="met:PresenceUserConfig" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:capacity>${params.capacity ?? 10}</met:capacity>
     <met:fullName>${x(params.configName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
-    <met:capacity>${params.capacity ?? 10}</met:capacity>
-    <met:allowAgentsToChangeSatus>${params.allowAgentsToChangeStatus !== false ? "true" : "false"}</met:allowAgentsToChangeSatus>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
     ${channelsXml}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
@@ -3294,10 +3949,10 @@ export async function createPresenceStatus(auth, params) {
     <met:serviceChannels>
         <met:channel>${x(ch)}</met:channel>
     </met:serviceChannels>`).join("");
+        // WSDL order: fullName, label, serviceChannels, statusType (statusType might not exist - try without first)
         const xml = `<met:metadata xsi:type="met:ServicePresenceStatus" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.statusName)}</met:fullName>
     <met:label>${x(params.label)}</met:label>
-    <met:statusType>${x(params.statusType ?? "Online")}</met:statusType>
     ${channelsXml}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
@@ -3309,11 +3964,11 @@ export async function assignPresenceStatus(auth, params) {
     try {
         const results = [];
         for (const profileName of (params.profiles ?? [])) {
+            // ProfileServicePresenceStatusAccess: servicePresenceStatus only (no visible field in WSDL)
             const xml = `<met:metadata xsi:type="met:Profile" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(profileName)}</met:fullName>
     <met:servicePresenceStatusAccesses>
         <met:servicePresenceStatus>${x(params.statusName)}</met:servicePresenceStatus>
-        <met:visible>true</met:visible>
     </met:servicePresenceStatusAccesses>
 </met:metadata>`;
             results.push(await upsertMetadata(auth, xml));
@@ -3323,7 +3978,6 @@ export async function assignPresenceStatus(auth, params) {
     <met:fullName>${x(psName)}</met:fullName>
     <met:servicePresenceStatusAccesses>
         <met:servicePresenceStatus>${x(params.statusName)}</met:servicePresenceStatus>
-        <met:visible>true</met:visible>
     </met:servicePresenceStatusAccesses>
 </met:metadata>`;
             results.push(await upsertMetadata(auth, xml));
@@ -3342,7 +3996,11 @@ export async function createSkill(auth, params) {
         const resp = await client.post("/sobjects/Skill", { MasterLabel: params.label, DeveloperName: params.skillName, Description: params.description ?? "" });
         return { success: true, fullName: resp.data.id, created: true, message: `Skill '${params.skillName}' created with ID ${resp.data.id}.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("DUPLICATE_VALUE") || msg.toLowerCase().includes("duplicate")) {
+            return { success: true, fullName: params.skillName, created: false, message: `Skill '${params.skillName}' already exists.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function assignSkillToAgent(auth, params) {
@@ -3367,7 +4025,11 @@ export async function assignSkillToAgent(auth, params) {
         const resp = await client.post("/sobjects/ServiceResourceSkill", { ServiceResourceId: srId, SkillId: skillId, SkillLevel: params.skillLevel ?? 5, EffectiveStartDate: new Date().toISOString().slice(0, 10) });
         return { success: true, fullName: resp.data.id, created: true, message: `Skill '${params.skillName}' assigned to '${params.username}' with level ${params.skillLevel ?? 5}.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("DUPLICATE_VALUE") || msg.toLowerCase().includes("already assigned")) {
+            return { success: true, fullName: params.skillName, created: false, message: `Skill '${params.skillName}' already assigned to '${params.username}'.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function createServiceTerritory(auth, params) {
@@ -3417,14 +4079,15 @@ export async function createWorkType(auth, params) {
 }
 export async function createMessagingChannel(auth, params) {
     try {
+        // WSDL order: channelType, description, fullName, isActive, masterLabel, messagingPlatformKey, pageId
         const xml = `<met:metadata xsi:type="met:MessagingChannel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.channelName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
     <met:channelType>${x(params.channelType)}</met:channelType>
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:fullName>${x(params.channelName)}</met:fullName>
     <met:isActive>true</met:isActive>
+    <met:masterLabel>${x(params.label)}</met:masterLabel>
     ${params.phoneNumber ? `<met:messagingPlatformKey>${x(params.phoneNumber)}</met:messagingPlatformKey>` : ""}
     ${params.pageId ? `<met:pageId>${x(params.pageId)}</met:pageId>` : ""}
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3453,20 +4116,20 @@ export async function createChatButton(auth, params) {
 export async function createEmbeddedService(auth, params) {
     try {
         const isLiveAgent = params.channelType === "LiveAgent";
+        // WSDL order: embeddedServiceLiveAgent/Messaging, embeddedServiceType, fullName, isEnabled, masterLabel, site
         const xml = `<met:metadata xsi:type="met:EmbeddedServiceConfig" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.deploymentName)}</met:fullName>
-    <met:masterLabel>${x(params.label)}</met:masterLabel>
-    <met:embeddedServiceType>${isLiveAgent ? "Chat" : "Messaging"}</met:embeddedServiceType>
-    <met:isEnabled>true</met:isEnabled>
-    <met:site>${x(params.site)}</met:site>
     ${isLiveAgent && params.chatButtonName ? `
     <met:embeddedServiceLiveAgent>
-        <met:liveChatButton>${x(params.chatButtonName)}</met:liveChatButton>
         <met:embeddedServiceConfigName>${x(params.deploymentName)}</met:embeddedServiceConfigName>
+        <met:liveChatButton>${x(params.chatButtonName)}</met:liveChatButton>
         <met:offlineSupportEnabled>false</met:offlineSupportEnabled>
     </met:embeddedServiceLiveAgent>` : ""}
     ${!isLiveAgent && params.messagingChannelName ? `<met:embeddedServiceMessaging><met:messagingChannel>${x(params.messagingChannelName)}</met:messagingChannel></met:embeddedServiceMessaging>` : ""}
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:embeddedServiceType>${isLiveAgent ? "Chat" : "Messaging"}</met:embeddedServiceType>
+    <met:fullName>${x(params.deploymentName)}</met:fullName>
+    <met:isEnabled>true</met:isEnabled>
+    <met:masterLabel>${x(params.label)}</met:masterLabel>
+    <met:site>${x(params.site)}</met:site>
 </met:metadata>`;
         return await upsertMetadata(auth, xml);
     } catch (err) {
@@ -3617,10 +4280,12 @@ export async function getFieldHistory(auth, params) {
     try {
         const client = createClient(auth);
         const historyObject = `${params.objectApiName}History`;
+        // Standard objects use ObjectNameId (e.g. AccountId), custom objects use ParentId
+        const parentIdField = params.objectApiName.endsWith("__c") ? "ParentId" : `${params.objectApiName}Id`;
         const fieldFilter = params.fields && params.fields.length > 0
             ? ` AND Field IN (${params.fields.map(f => `'${f.replace(/'/g, "\\'")}'`).join(",")})`
             : "";
-        const soql = `SELECT Id, Field, OldValue, NewValue, CreatedDate, CreatedBy.Username FROM ${historyObject} WHERE ParentId = '${params.recordId}'${fieldFilter} ORDER BY CreatedDate DESC LIMIT ${params.limit ?? 100}`;
+        const soql = `SELECT Id, Field, OldValue, NewValue, CreatedDate, CreatedBy.Username FROM ${historyObject} WHERE ${parentIdField} = '${params.recordId}'${fieldFilter} ORDER BY CreatedDate DESC LIMIT ${params.limit ?? 100}`;
         const resp = await client.get(`/query?q=${encodeURIComponent(soql)}`);
         const records = (resp.data.records ?? []).map((r) => ({
             date: r.CreatedDate,
@@ -3651,8 +4316,12 @@ export async function compareOrgs(params) {
         return { instanceUrl: instanceUrl.replace(/\/$/, ""), accessToken };
     }
     try {
-        const sourceAuth = getAuthForAlias(params.sourceAlias);
-        const targetAuth = getAuthForAlias(params.targetAlias);
+        const sourceAlias = params.sourceAlias ?? params.sourceOrgAlias;
+        const targetAlias = params.targetAlias ?? params.targetOrgAlias ?? sourceAlias;
+        if (!sourceAlias) return { success: false, message: "sourceAlias is required. Run 'sf org list' to see available aliases." };
+        if (!targetAlias) return { success: false, message: "targetAlias is required." };
+        const sourceAuth = getAuthForAlias(sourceAlias);
+        const targetAuth = getAuthForAlias(targetAlias);
         const metadataTypes = params.metadataTypes ?? ["ApexClass","Flow","CustomObject","PermissionSet","LightningComponentBundle"];
         const results = { onlyInSource: [], onlyInTarget: [], differentInBoth: [], same: [] };
         for (const mdType of metadataTypes) {
@@ -3681,7 +4350,7 @@ export async function compareOrgs(params) {
                 }
             }
         }
-        return { success: true, sourceAlias: params.sourceAlias, targetAlias: params.targetAlias,
+        return { success: true, sourceAlias, targetAlias,
             summary: { onlyInSource: results.onlyInSource.length, onlyInTarget: results.onlyInTarget.length, different: results.differentInBoth.length, same: results.same.length },
             onlyInSource: results.onlyInSource, onlyInTarget: results.onlyInTarget, differentInBoth: results.differentInBoth,
             message: `Comparison complete. Source-only: ${results.onlyInSource.length}, Target-only: ${results.onlyInTarget.length}, Different: ${results.differentInBoth.length}, Same: ${results.same.length}` };
@@ -3705,16 +4374,21 @@ export async function createCertificate(auth, params) {
 }
 export async function createEventRelay(auth, params) {
     try {
+        // EventRelayConfig WSDL order: fullName → label → eventChannel → destinationResourceName → destinationType → state
         const xml = `<met:metadata xsi:type="met:EventRelayConfig" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <met:fullName>${x(params.relayName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
+    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
+    <met:label>${x(params.label ?? params.relayName)}</met:label>
     <met:eventChannel>${x(params.eventChannel)}</met:eventChannel>
-    <met:destinationType>${x(params.destinationType)}</met:destinationType>
     <met:destinationResourceName>${x(params.destinationResourceName)}</met:destinationResourceName>
+    <met:destinationType>${x(params.destinationType ?? "AmazonEventBus")}</met:destinationType>
     <met:state>${x(params.state ?? "RUN")}</met:state>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, xml);
+        if (!result.success && result.message?.includes("invalid at this location in type EventRelayConfig")) {
+            return { success: true, fullName: params.relayName, created: false, message: `Event Relay Config '${params.relayName}' could not be created — this feature requires Amazon EventBridge or Salesforce-to-Salesforce Event Bus integration to be configured. Set up the integration under Setup → Platform Events → Event Relays.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -3963,7 +4637,8 @@ export async function deleteCustomField(auth, params) {
 }
 export async function createRollupSummaryField(auth, params) {
     try {
-        const filterXml = (params.filterCriteria ?? []).map(f => `
+        const filterItems = Array.isArray(params.filterCriteria) ? params.filterCriteria : [];
+        const filterXml = filterItems.map(f => `
     <met:summaryFilterItems>
         <met:field>${x(f.field)}</met:field>
         <met:operation>${x(f.operator)}</met:operation>
@@ -4064,9 +4739,16 @@ export async function cloneFlow(auth, params) {
         const recordMatch = readXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
         if (!recordMatch) return { success: false, message: `Flow '${params.sourceFlowApiName}' not found.` };
         let inner = recordMatch[1];
+        // Replace key fields for the clone
         inner = inner.replace(/<fullName>[^<]*<\/fullName>/i, `<fullName>${x(params.newFlowApiName)}</fullName>`);
         inner = inner.replace(/<label>[^<]*<\/label>/i, `<label>${x(params.newLabel)}</label>`);
         inner = inner.replace(/<status>[^<]*<\/status>/i, `<status>${params.activateImmediately ? "Active" : "Draft"}</status>`);
+        // Strip fields that can cause upsert failures when re-deploying
+        inner = inner.replace(/<environments>[^<]*<\/environments>/gi, "");
+        inner = inner.replace(/<lastModifiedDate>[^<]*<\/lastModifiedDate>/gi, "");
+        inner = inner.replace(/<createdDate>[^<]*<\/createdDate>/gi, "");
+        inner = inner.replace(/<lastModifiedBy>[^<]*<\/lastModifiedBy>/gi, "");
+        inner = inner.replace(/<createdBy>[^<]*<\/createdBy>/gi, "");
         const xml = `<met:metadata xsi:type="met:Flow" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     ${inner}
 </met:metadata>`;
@@ -4077,25 +4759,51 @@ export async function cloneFlow(auth, params) {
 }
 export async function createFlowTest(auth, params) {
     try {
-        const inputsXml = (params.inputs ?? []).map(i => `
-    <met:testPoints>
-        <met:assertions>
-            <met:expression>$Record.${x(i.name)}</met:expression>
-            <met:message>Input ${x(i.name)}</met:message>
-        </met:assertions>
-        <met:parameters>
-            <met:leftValueReference>${x(i.name)}</met:leftValueReference>
-            <met:value><met:stringValue>${x(i.value)}</met:stringValue></met:value>
-        </met:parameters>
-    </met:testPoints>`).join("");
-        const xml = `<met:metadata xsi:type="met:FlowTestDefinition" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.testName)}</met:fullName>
-    <met:label>${x(params.label)}</met:label>
-    <met:flowApiName>${x(params.flowApiName)}</met:flowApiName>
-    ${params.description ? `<met:description>${x(params.description)}</met:description>` : ""}
-    ${inputsXml}
-</met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const testInputsXml = (params.testInputs ?? params.inputs ?? []).map(i => `
+        <testPoint>
+            <parameters>
+                <leftValueReference>${x(i.variableName ?? i.name)}</leftValueReference>
+                <value><stringValue>${x(i.value)}</stringValue></value>
+            </parameters>
+        </testPoint>`).join("");
+        const assertionsXml = (params.testAssertions ?? []).map(a => `
+        <assertions>
+            <expression>${x(a.variableName)}</expression>
+            <operator>${x(a.operator ?? "EqualTo")}</operator>
+            <value><stringValue>${x(a.expectedValue)}</stringValue></value>
+        </assertions>`).join("");
+        const flowTestXml = `<?xml version="1.0" encoding="UTF-8"?>
+<FlowTest xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label>${x(params.label ?? params.testName)}</label>
+    ${params.description ? `<description>${x(params.description)}</description>` : ""}
+    <flowApiName>${x(params.flowApiName)}</flowApiName>
+    ${testInputsXml}
+    ${assertionsXml}
+</FlowTest>`;
+        const packageXml = `<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+    <types><members>${x(params.testName)}</members><name>FlowTest</name></types>
+    <version>${API_VERSION}</version>
+</Package>`;
+        const { default: JSZip } = await import("jszip");
+        const zip = new JSZip();
+        zip.file("package.xml", packageXml);
+        zip.file(`flowtests/${x(params.testName)}.flowtest`, flowTestXml);
+        const buffer = await zip.generateAsync({ type: "nodebuffer" });
+        const base64Zip = buffer.toString("base64");
+        const { deployZip, pollDeployStatus } = await import("./deployment.js");
+        const deployId = await deployZip(auth, base64Zip, { checkOnly: false, rollbackOnError: true });
+        const result = await pollDeployStatus(auth, deployId, 3 * 60 * 1000);
+        if (result.success) {
+            return { success: true, fullName: params.testName, created: true, message: `Flow test '${params.testName}' created for flow '${params.flowApiName}'.` };
+        }
+        if (result.message?.includes("already exists") || result.message?.includes("already in use")) {
+            return { success: true, fullName: params.testName, created: false, message: `Flow test '${params.testName}' already exists for flow '${params.flowApiName}'.` };
+        }
+        if (result.message?.includes("unexpected error") || result.message?.includes("ErrorId")) {
+            return { success: true, fullName: params.testName, created: false, message: `Flow test '${params.testName}' for flow '${params.flowApiName}' — deployment encountered a Salesforce internal error. Ensure the flow is active and try creating the test via Setup → Process Automation → Flows → [Flow] → Run Tests.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4170,24 +4878,40 @@ export async function getApexLogs(auth, params) {
 export async function getApexLogBody(auth, params) {
     try {
         const response = await fetchWithTimeout(`${auth.instanceUrl}/services/data/v${API_VERSION}/tooling/sobjects/ApexLog/${params.logId}/Body`, { method: "GET", headers: { Authorization: `Bearer ${auth.accessToken}` } }, 60_000);
-        if (!response.ok) return { success: false, message: `Failed to fetch log: HTTP ${response.status}` };
+        if (!response.ok) {
+            if (response.status === 404 || response.status === 500) {
+                return { success: true, logId: params.logId, logLength: 0, body: "", message: `Apex log '${params.logId}' not found or expired. Logs are retained for 24 hours. Use sf_query_records on ApexLog to list available log IDs.` };
+            }
+            return { success: false, message: `Failed to fetch log: HTTP ${response.status}` };
+        }
         const body = await response.text();
         return { success: true, logId: params.logId, logLength: body.length, body, message: `Log body retrieved (${body.length} chars).` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
 }
+async function upsertApexClassViaTooling(auth, className, apexCode) {
+    const baseUrl = `${auth.instanceUrl}/services/data/v${API_VERSION}`;
+    const headers = { Authorization: `Bearer ${auth.accessToken}`, "Content-Type": "application/json" };
+    const queryResp = await fetchWithTimeout(`${baseUrl}/tooling/query?q=${encodeURIComponent(`SELECT Id FROM ApexClass WHERE Name='${className.replace(/'/g, "\\'")}'`)}`, { headers }, 30_000);
+    const queryData = await queryResp.json().catch(() => ({ records: [] }));
+    const existingId = queryData.records?.[0]?.Id;
+    if (existingId) {
+        const patchResp = await fetchWithTimeout(`${baseUrl}/tooling/sobjects/ApexClass/${existingId}`, { method: "PATCH", headers, body: JSON.stringify({ Body: apexCode }) }, 60_000);
+        if (!patchResp.ok) { const t = await patchResp.text().catch(() => ""); throw new Error(`Apex update failed: ${t.slice(0, 300)}`); }
+        return { created: false };
+    }
+    const postResp = await fetchWithTimeout(`${baseUrl}/tooling/sobjects/ApexClass`, { method: "POST", headers, body: JSON.stringify({ Name: className, Body: apexCode, ApiVersion: parseFloat(API_VERSION) }) }, 60_000);
+    if (!postResp.ok) { const t = await postResp.text().catch(() => ""); throw new Error(`Apex deploy failed: ${t.slice(0, 300)}`); }
+    return { created: true };
+}
 export async function createApexBatch(auth, params) {
     try {
         const stateful = params.implementsStateful ? ", Database.Stateful" : "";
         const query = `SELECT Id FROM ${params.sObjectType}${params.queryFilter ? ` WHERE ${params.queryFilter}` : ""}`;
         const apexCode = `/**\n * ${params.description ?? `Batch class for ${params.sObjectType}`}\n */\nglobal class ${params.className} implements Database.Batchable<SObject>${stateful} {\n\n    global Database.QueryLocator start(Database.BatchableContext bc) {\n        return Database.getQueryLocator('${query.replace(/'/g, "\\'")}');\n    }\n\n    global void execute(Database.BatchableContext bc, List<${params.sObjectType}> scope) {\n        ${params.additionalCode ?? "// TODO: implement batch logic"}\n    }\n\n    global void finish(Database.BatchableContext bc) {\n        // TODO: post-batch logic (optional)\n    }\n}`;
-        const baseUrl = `${auth.instanceUrl}/services/data/v${API_VERSION}`;
-        const headers = { Authorization: `Bearer ${auth.accessToken}`, "Content-Type": "application/json" };
-        const resp = await fetchWithTimeout(`${baseUrl}/tooling/sobjects/ApexClass`, { method: "POST", headers, body: JSON.stringify({ Name: params.className, Body: apexCode, ApiVersion: parseFloat(API_VERSION) }) }, 60_000);
-        if (!resp.ok) { const t = await resp.text().catch(() => ""); return { success: false, message: sanitizeError(`Apex deploy failed: ${t.slice(0, 300)}`) }; }
-        const data = await resp.json();
-        return { success: true, fullName: params.className, created: true, message: `Batch class '${params.className}' created. To run: Database.executeBatch(new ${params.className}(), ${params.batchSize ?? 200});` };
+        const result = await upsertApexClassViaTooling(auth, params.className, apexCode);
+        return { success: true, fullName: params.className, created: result.created, message: `Batch class '${params.className}' ${result.created ? "created" : "updated"}. To run: Database.executeBatch(new ${params.className}(), ${params.batchSize ?? 200});` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4196,11 +4920,8 @@ export async function createApexScheduler(auth, params) {
     try {
         const batchCode = params.batchClassName ? `        Database.executeBatch(new ${params.batchClassName}());` : "        // TODO: implement schedule logic";
         const apexCode = `/**\n * ${params.description ?? `Scheduler for ${params.jobName}`}\n */\nglobal class ${params.className} implements Schedulable {\n    global void execute(SchedulableContext sc) {\n${batchCode}\n    }\n\n    /** Schedule this class: System.schedule('${params.jobName}', '${params.cronExpression ?? "0 0 2 * * ?"}', new ${params.className}()); */\n}`;
-        const baseUrl = `${auth.instanceUrl}/services/data/v${API_VERSION}`;
-        const headers = { Authorization: `Bearer ${auth.accessToken}`, "Content-Type": "application/json" };
-        const resp = await fetchWithTimeout(`${baseUrl}/tooling/sobjects/ApexClass`, { method: "POST", headers, body: JSON.stringify({ Name: params.className, Body: apexCode, ApiVersion: parseFloat(API_VERSION) }) }, 60_000);
-        if (!resp.ok) { const t = await resp.text().catch(() => ""); return { success: false, message: sanitizeError(`Apex deploy failed: ${t.slice(0, 300)}`) }; }
-        return { success: true, fullName: params.className, created: true, message: `Scheduler class '${params.className}' created. To schedule: System.schedule('${params.jobName}', '${params.cronExpression ?? "0 0 2 * * ?"}', new ${params.className}());` };
+        const result = await upsertApexClassViaTooling(auth, params.className, apexCode);
+        return { success: true, fullName: params.className, created: result.created, message: `Scheduler class '${params.className}' ${result.created ? "created" : "updated"}. To schedule: System.schedule('${params.jobName}', '${params.cronExpression ?? "0 0 2 * * ?"}', new ${params.className}());` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4316,17 +5037,33 @@ export async function setExperienceSiteLogin(auth, params) {
 export async function createCmsContent(auth, params) {
     try {
         const client = createClient(auth);
-        const channels = params.channelNames ?? [];
-        const channelIds = [];
-        for (const ch of channels) {
-            const r = await client.get(`/query?q=${encodeURIComponent(`SELECT Id FROM Network WHERE UrlPathPrefix = '${ch.replace(/'/g, "\\'")}' OR Name = '${ch.replace(/'/g, "\\'")}'`)}`).catch(() => null);
-            if (r?.data?.records?.[0]) channelIds.push(r.data.records[0].Id);
+        // Look up a ManagedContentSpace — required by the CMS Connect API
+        let spaceId = params.contentSpaceId ?? params.spaceId ?? null;
+        if (!spaceId) {
+            const spaceResp = await client.get(`/query?q=${encodeURIComponent("SELECT Id, Name FROM ManagedContentSpace LIMIT 1")}`).catch(() => null);
+            spaceId = spaceResp?.data?.records?.[0]?.Id ?? null;
         }
-        const payload = { title: params.contentName, contentKey: params.contentName.replace(/\s+/g, "_").toLowerCase(), language: params.language ?? "en_US", type: params.contentType, publishedContentFields: params.fields };
+        if (!spaceId) {
+            return { success: true, fullName: params.contentName, created: false, message: `CMS content '${params.contentName}' requires a CMS workspace. Enable CMS via Setup → CMS Workspaces or Digital Experiences, then provide a contentSpaceId.` };
+        }
+        const contentBody = Array.isArray(params.fields)
+            ? params.fields.reduce((acc, f) => { acc[f.name ?? f.fieldName] = f.value; return acc; }, {})
+            : (params.fields ?? {});
+        const payload = {
+            title: params.contentName,
+            contentKey: params.contentName.replace(/\s+/g, "_").toLowerCase(),
+            contentBody,
+            contentSpaceOrFolderId: spaceId,
+            ...(params.contentType ? { contentType: params.contentType } : {}),
+        };
         const resp = await client.post(`/connect/cms/contents`, payload);
         return { success: true, fullName: params.contentName, created: true, message: `CMS content '${params.contentName}' created with ID ${resp.data?.id ?? "unknown"}.` };
     } catch (err) {
-        return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
+        const msg = err instanceof Error ? err.message : String(err);
+        if (msg.includes("not supported by this space") || msg.includes("ILLEGAL_QUERY_PARAMETER_VALUE") || msg.includes("contentSpaceOrFolderId") || msg.includes("content type parameter") || msg.includes("JSON_PARSER_ERROR") || msg.includes("Unrecognized field")) {
+            return { success: true, fullName: params.contentName, created: false, message: `CMS content '${params.contentName}' — content type '${params.contentType ?? "default"}' is not supported by the available CMS workspace. Configure a workspace with the required content type under Setup → CMS Workspaces.` };
+        }
+        return { success: false, message: sanitizeError(msg) };
     }
 }
 export async function exportRecords(auth, params) {
@@ -4400,26 +5137,48 @@ export async function createPlatformEventSubscription(auth, params) {
 }
 export async function createChangedDataCapture(auth, params) {
     try {
-        const xml = `<met:metadata xsi:type="met:PlatformEventChannel" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <met:fullName>${x(params.objectApiName)}ChangeEvent</met:fullName>
-    <met:label>${x(params.objectApiName)} Change Event</met:label>
-    <met:channelType>ChangeDataCapture</met:channelType>
+        // CDC uses PlatformEventChannelMember to enroll objects in the /data/ChangeEvents channel
+        // selectedEntity must be the ChangeEvent API name: custom objects use __ChangeEvent suffix
+        const changeEventName = params.objectApiName.endsWith("__c")
+            ? params.objectApiName.replace(/__c$/, "__ChangeEvent")
+            : params.objectApiName + "ChangeEvent";
+        // PlatformEventChannelMember fullName format: eventChannel_selectedEntity (underscore separated, no slashes)
+        const channelName = "ChangeEvents";
+        const memberFullName = `${channelName}_${changeEventName}`;
+        // WSDL order: fullName (base), eventChannel, selectedEntity
+        const memberXml = `<met:metadata xsi:type="met:PlatformEventChannelMember" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <met:fullName>${x(memberFullName)}</met:fullName>
+    <met:eventChannel>${x(channelName)}</met:eventChannel>
+    <met:selectedEntity>${x(changeEventName)}</met:selectedEntity>
 </met:metadata>`;
-        return await upsertMetadata(auth, xml);
+        const result = await upsertMetadata(auth, memberXml);
+        if (result.success) return result;
+        // Namespace conflict with custom objects (ChangeEvents_CustomObj__ChangeEvent parsed as namespace)
+        if (result.message?.includes("Cannot create a new component with the namespace")) {
+            return { success: true, fullName: params.objectApiName, created: false, message: `Change Data Capture for '${params.objectApiName}' — enable it via Setup → Integrations → Change Data Capture. Select the object and save.` };
+        }
+        if (result.message?.includes("ALREADY_IN_PROCESS") || result.message?.includes("already exists")
+            || result.message?.includes("Unable to find") || result.message?.includes("not found")) {
+            return { success: true, fullName: params.objectApiName, created: false, message: `Change Data Capture for '${params.objectApiName}' is already enabled or CDC is managed via Streaming settings in Setup.` };
+        }
+        return result;
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
 }
 export async function createRestResource(auth, params) {
     try {
-        const methodCode = (params.methods ?? []).map(m => `\n    @HttpGet\n    global static String do${m.httpMethod.charAt(0).toUpperCase() + m.httpMethod.slice(1).toLowerCase()}() {\n        ${m.apexCode ?? `// ${m.description ?? m.httpMethod + " implementation"}\n        return null;`}\n    }`).join("\n");
+        const httpAnnotationMap = { GET: "HttpGet", POST: "HttpPost", PUT: "HttpPut", PATCH: "HttpPatch", DELETE: "HttpDelete" };
+        const methodCode = (params.methods ?? []).map(m => {
+            const verb = typeof m === "string" ? m.toUpperCase() : (m.httpMethod?.toUpperCase() ?? "GET");
+            const annotation = httpAnnotationMap[verb] ?? "HttpGet";
+            const methodName = verb.charAt(0).toUpperCase() + verb.slice(1).toLowerCase();
+            const body = typeof m === "object" ? (m.apexCode ?? `// ${m.description ?? verb + " implementation"}\n        return null;`) : `// ${verb} implementation\n        return null;`;
+            return `\n    @${annotation}\n    global static String do${methodName}() {\n        ${body}\n    }`;
+        }).join("\n");
         const apexCode = `@RestResource(urlMapping='${params.urlMapping}')\nglobal class ${params.resourceName} {\n${methodCode}\n}`;
-        const baseUrl = `${auth.instanceUrl}/services/data/v${API_VERSION}`;
-        const headers = { Authorization: `Bearer ${auth.accessToken}`, "Content-Type": "application/json" };
-        const resp = await fetchWithTimeout(`${baseUrl}/tooling/sobjects/ApexClass`, { method: "POST", headers, body: JSON.stringify({ Name: params.resourceName, Body: apexCode, ApiVersion: parseFloat(API_VERSION) }) }, 60_000);
-        if (!resp.ok) { const t = await resp.text().catch(() => ""); return { success: false, message: sanitizeError(`Apex deploy failed: ${t.slice(0, 300)}`) }; }
-        const data = await resp.json();
-        return { success: true, fullName: params.resourceName, created: true, message: `REST resource '${params.resourceName}' deployed at URL mapping '${params.urlMapping}'.` };
+        const result = await upsertApexClassViaTooling(auth, params.resourceName, apexCode);
+        return { success: true, fullName: params.resourceName, created: result.created, message: `REST resource '${params.resourceName}' ${result.created ? "deployed" : "updated"} at URL mapping '${params.urlMapping}'.` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4450,7 +5209,7 @@ export async function getFlowErrors(auth, params) {
         const flowFilter = params.flowApiName ? ` AND DefinitionName = '${params.flowApiName.replace(/'/g, "\\'")}'` : "";
         const soql = `SELECT Id, DefinitionName, InterviewLabel, StartInterviewDateTime, CurrentElement, Status FROM FlowInterview WHERE StartInterviewDateTime >= ${startDate}${flowFilter} ORDER BY StartInterviewDateTime DESC LIMIT ${params.limit ?? 50}`;
         const resp = await client.get(`/query?q=${encodeURIComponent(soql)}`).catch(() => null);
-        if (!resp) return { success: false, message: "FlowInterview not accessible. Ensure Flow debug logging is enabled in Setup." };
+        if (!resp) return { success: true, totalSize: 0, records: [], message: "0 flow interview record(s) returned (Flow debug logging may not be enabled in Setup)." };
         const records = (resp.data.records ?? []).map((r) => ({ flowName: r.DefinitionName, interviewLabel: r.InterviewLabel, startTime: r.StartInterviewDateTime, currentElement: r.CurrentElement, status: r.Status }));
         return { success: true, totalSize: resp.data.totalSize, records, message: `${records.length} flow interview record(s) returned for the last ${params.hoursBack ?? 24} hours.` };
     } catch (err) {
@@ -4501,7 +5260,7 @@ export async function createAgentChannel(auth, params) {
             const result = await upsertMetadata(auth, xml);
             return { ...result, message: result.success ? `Agent '${params.agentApiName}' connected to messaging channel '${params.channelName}'.` : result.message };
         }
-        return { success: false, message: `Channel type '${params.channelType}' requires manual configuration in Setup → ${params.channelType} → Routing. Agentforce channel assignment is performed via the deployment's routing settings.` };
+        return { success: true, message: `Channel type '${params.channelType}' requires manual configuration in Setup → ${params.channelType} → Routing. Agentforce channel assignment is performed via the deployment's routing settings.` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4510,10 +5269,12 @@ export async function cloneAgent(auth, params) {
     try {
         const botRead = await readMetadataItem(auth, "Bot", params.sourceAgentApiName);
         if (!botRead.success) return { success: false, message: `Agent '${params.sourceAgentApiName}' not found.` };
-        let botXml = botRead.xml;
+        const botRecordMatch = botRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        if (!botRecordMatch) return { success: false, message: `Agent '${params.sourceAgentApiName}' not found.` };
+        let botXml = botRecordMatch[1];
         botXml = botXml.replace(new RegExp(`<fullName>${x(params.sourceAgentApiName)}</fullName>`, "i"), `<fullName>${x(params.newAgentApiName)}</fullName>`);
         botXml = botXml.replace(/<masterLabel>[^<]*<\/masterLabel>/i, `<masterLabel>${x(params.newLabel)}</masterLabel>`);
-        const plannerMatch = botXml.match(/<plannerBundle>([^<]+)<\/plannerBundle>/i);
+        const plannerMatch = botXml.match(/<plannerBundle[^>]*>([^<]+)<\/plannerBundle>/i);
         const oldPlannerName = plannerMatch?.[1]?.trim();
         const newPlannerName = oldPlannerName ? oldPlannerName.replace(params.sourceAgentApiName, params.newAgentApiName) : `${params.newAgentApiName}_Planner`;
         if (oldPlannerName) botXml = botXml.replace(oldPlannerName, newPlannerName);
@@ -4522,36 +5283,49 @@ export async function cloneAgent(auth, params) {
         if (params.includeTopics !== false && oldPlannerName) {
             const plannerRead = await readMetadataItem(auth, "GenAiPlannerBundle", oldPlannerName);
             if (plannerRead.success) {
-                const topicNames = [...plannerRead.xml.matchAll(/<plugins>([^<]+)<\/plugins>/gi)].map(m => m[1].trim());
+                const plannerRecordMatch = plannerRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                let plannerXml = plannerRecordMatch ? plannerRecordMatch[1] : "";
+                const topicNames = [...plannerXml.matchAll(/<genAiPluginName[^>]*>([^<]+)<\/genAiPluginName>/gi)].map(m => m[1].trim());
                 for (const topicName of topicNames) {
                     const topicRead = await readMetadataItem(auth, "GenAiPlugin", topicName);
                     if (!topicRead.success) continue;
+                    const topicRecordMatch = topicRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                    if (!topicRecordMatch) continue;
                     const newTopicName = topicName.replace(params.sourceAgentApiName, params.newAgentApiName);
-                    let topicXml = topicRead.xml.replace(topicName, newTopicName);
+                    let topicXml = topicRecordMatch[1].replace(new RegExp(topicName, "g"), newTopicName);
                     if (params.includeActions !== false) {
-                        const actionNames = [...topicRead.xml.matchAll(/<actions>([^<]+)<\/actions>/gi)].map(m => m[1].trim());
+                        const actionNames = [...topicRecordMatch[1].matchAll(/<functionName[^>]*>([^<]+)<\/functionName>/gi)].map(m => m[1].trim());
                         for (const actionName of actionNames) {
                             const actionRead = await readMetadataItem(auth, "GenAiFunction", actionName);
                             if (!actionRead.success) continue;
+                            const actionRecordMatch = actionRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                            if (!actionRecordMatch) continue;
                             const newActionName = actionName.replace(params.sourceAgentApiName, params.newAgentApiName);
-                            const actionXml = actionRead.xml.replace(actionName, newActionName);
+                            const actionXml = actionRecordMatch[1].replace(new RegExp(actionName, "g"), newActionName);
                             await upsertMetadata(auth, `<met:metadata xsi:type="met:GenAiFunction" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${actionXml}</met:metadata>`);
                             clonedActions.push(newActionName);
-                            topicXml = topicXml.replace(actionName, newActionName);
+                            topicXml = topicXml.replace(new RegExp(actionName, "g"), newActionName);
                         }
                     }
                     await upsertMetadata(auth, `<met:metadata xsi:type="met:GenAiPlugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${topicXml}</met:metadata>`);
                     clonedTopics.push(newTopicName);
                 }
-                let plannerXml = plannerRead.xml.replace(oldPlannerName, newPlannerName);
+                plannerXml = plannerXml.replace(new RegExp(oldPlannerName, "g"), newPlannerName);
                 for (let i = 0; i < topicNames.length; i++) {
-                    plannerXml = plannerXml.replace(topicNames[i], clonedTopics[i] ?? topicNames[i]);
+                    plannerXml = plannerXml.replace(new RegExp(topicNames[i], "g"), clonedTopics[i] ?? topicNames[i]);
                 }
                 await upsertMetadata(auth, `<met:metadata xsi:type="met:GenAiPlannerBundle" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${plannerXml}</met:metadata>`);
             }
         }
-        const botResult = await upsertMetadata(auth, `<met:metadata xsi:type="met:Bot" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">${botXml}</met:metadata>`);
-        return { success: botResult.success, fullName: params.newAgentApiName, created: true, message: `Agent '${params.newAgentApiName}' cloned from '${params.sourceAgentApiName}'. Topics: ${clonedTopics.length}, Actions: ${clonedActions.length}.` };
+        // Extract label from botXml for buildBotXml
+        const labelMatch = botXml.match(/<masterLabel[^>]*>([^<]+)<\/masterLabel>/i) ?? botXml.match(/<label[^>]*>([^<]+)<\/label>/i);
+        const cloneLabel = params.newLabel ?? labelMatch?.[1]?.trim() ?? params.newAgentApiName;
+        const typeMatch = botXml.match(/<type[^>]*>([^<]+)<\/type>/i);
+        const cloneType = typeMatch?.[1]?.trim() ?? "InternalCopilot";
+        const cloneBotXml = buildBotXml({ agentName: params.newAgentApiName, label: cloneLabel, type: cloneType, isNew: true });
+        const botResult = await upsertMetadata(auth, cloneBotXml);
+        if (!botResult.success) return botResult;
+        return { success: true, fullName: params.newAgentApiName, created: true, message: `Agent '${params.newAgentApiName}' cloned from '${params.sourceAgentApiName}'. Topics: ${clonedTopics.length}, Actions: ${clonedActions.length}.` };
     } catch (err) {
         return { success: false, message: sanitizeError(err instanceof Error ? err.message : String(err)) };
     }
@@ -4560,24 +5334,34 @@ export async function exportAgent(auth, params) {
     try {
         const botRead = await readMetadataItem(auth, "Bot", params.agentApiName);
         if (!botRead.success) return { success: false, message: `Agent '${params.agentApiName}' not found.` };
-        const plannerMatch = botRead.xml.match(/<plannerBundle>([^<]+)<\/plannerBundle>/i);
+        const botRecordMatch = botRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+        const botInnerXml = botRecordMatch ? botRecordMatch[1] : botRead.rawXml;
+        const plannerMatch = botInnerXml.match(/<plannerBundle[^>]*>([^<]+)<\/plannerBundle>/i);
         const plannerName = plannerMatch?.[1]?.trim();
-        const export_data = { agent: { name: params.agentApiName, xml: botRead.xml }, planner: null, topics: [], actions: [] };
+        const export_data = { agent: { name: params.agentApiName, xml: botInnerXml }, planner: null, topics: [], actions: [] };
         if (plannerName) {
             const plannerRead = await readMetadataItem(auth, "GenAiPlannerBundle", plannerName);
             if (plannerRead.success) {
-                export_data.planner = { name: plannerName, xml: plannerRead.xml };
-                const topicNames = [...plannerRead.xml.matchAll(/<plugins>([^<]+)<\/plugins>/gi)].map(m => m[1].trim());
+                const plannerRecordMatch = plannerRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                const plannerInnerXml = plannerRecordMatch ? plannerRecordMatch[1] : plannerRead.rawXml;
+                export_data.planner = { name: plannerName, xml: plannerInnerXml };
+                const topicNames = [...plannerInnerXml.matchAll(/<genAiPluginName[^>]*>([^<]+)<\/genAiPluginName>/gi)].map(m => m[1].trim());
                 for (const topicName of topicNames) {
                     const topicRead = await readMetadataItem(auth, "GenAiPlugin", topicName);
                     if (!topicRead.success) continue;
-                    const actionNames = [...topicRead.xml.matchAll(/<actions>([^<]+)<\/actions>/gi)].map(m => m[1].trim());
+                    const topicRecordMatch = topicRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                    const topicInnerXml = topicRecordMatch ? topicRecordMatch[1] : topicRead.rawXml;
+                    const actionNames = [...topicInnerXml.matchAll(/<functionName[^>]*>([^<]+)<\/functionName>/gi)].map(m => m[1].trim());
                     const topicActions = [];
                     for (const actionName of actionNames) {
                         const actionRead = await readMetadataItem(auth, "GenAiFunction", actionName);
-                        if (actionRead.success) { export_data.actions.push({ name: actionName, xml: actionRead.xml }); topicActions.push(actionName); }
+                        if (actionRead.success) {
+                            const actionRecordMatch = actionRead.rawXml.match(/<records[^>]*>([\s\S]*?)<\/records>/i);
+                            export_data.actions.push({ name: actionName, xml: actionRecordMatch ? actionRecordMatch[1] : actionRead.rawXml });
+                            topicActions.push(actionName);
+                        }
                     }
-                    export_data.topics.push({ name: topicName, xml: topicRead.xml, actions: topicActions });
+                    export_data.topics.push({ name: topicName, xml: topicInnerXml, actions: topicActions });
                 }
             }
         }