@xano/sdk 1.0.4 → 1.0.6

package/dist/{chunk-C4FHQA7R.js → chunk-IF4PEGVD.js}

@@ -3,19 +3,19 @@ import {
   ephemeralLandedOn,
   ephemeralStatePath,
   recordEphemeralLanding
-} from "./chunk-UKUIUS3E.js";
+} from "./chunk-U6MTGB46.js";
 import {
   contextFlags
-} from "./chunk-SEUCZZCP.js";
+} from "./chunk-N5I37JFB.js";
 import {
   backendDirIn
-} from "./chunk-E6H5ZEV3.js";
+} from "./chunk-TTEIDD5Q.js";
 import {
   forgetPrunedInLockFile,
   readLockFile,
   recordLandingInLockFile,
   writeLockFile
-} from "./chunk-VD32O6KZ.js";
+} from "./chunk-CJDPSCMX.js";
 import {
   destinationKey,
   isEphemeralDestinationKey,
@@ -23,15 +23,15 @@ import {
   landedOn,
   withStoredColumns,
   withoutLanding
-} from "./chunk-RX3EMQGN.js";
+} from "./chunk-MFWF2NZJ.js";
 import {
   displayPath,
   info,
   warn
-} from "./chunk-SBR2WZXG.js";
+} from "./chunk-D7BUMOKU.js";
 import {
   displayLockKey
-} from "./chunk-OOGXZL7Z.js";
+} from "./chunk-5KJBWIDZ.js";
 import {
   shellQuote
 } from "./chunk-5ZSO4T2G.js";
@@ -260,4 +260,4 @@ export {
   holdsLanding,
   forgetLanding
 };
-//# sourceMappingURL=chunk-C4FHQA7R.js.map
+//# sourceMappingURL=chunk-IF4PEGVD.js.map

package/dist/{chunk-WFG67AYS.js → chunk-IMELQ2I6.js}

@@ -1,10 +1,10 @@
 import {
   questionOrCancel
-} from "./chunk-4APOHK7Y.js";
+} from "./chunk-JXVJGF3Y.js";
 import {
   style,
   terminalText
-} from "./chunk-SBR2WZXG.js";
+} from "./chunk-D7BUMOKU.js";
 
 // src/emit/plugin-prompt.ts
 import { createInterface } from "readline/promises";
@@ -54,4 +54,4 @@ export {
   promptPluginQuestion,
   pluginPrompter
 };
-//# sourceMappingURL=chunk-WFG67AYS.js.map
+//# sourceMappingURL=chunk-IMELQ2I6.js.map

package/dist/{chunk-3P3HXN76.js → chunk-ITC2R2OT.js}

@@ -2,7 +2,7 @@ import {
   environmentKey,
   getEnvironment,
   readEphemeralState
-} from "./chunk-UKUIUS3E.js";
+} from "./chunk-U6MTGB46.js";
 import {
   andList
 } from "./chunk-622HUCZT.js";
@@ -12,20 +12,20 @@ import {
   credentialFileFlagFor,
   credentialFileOf,
   recordedByEnvCredential
-} from "./chunk-SEUCZZCP.js";
+} from "./chunk-N5I37JFB.js";
 import {
   loginCommand,
   profileAddCommand,
   recordedCredentialPath,
   recordedProfileStored
-} from "./chunk-I2BGYNHD.js";
+} from "./chunk-M5CSVB23.js";
 import {
   findPointerFile,
   readPointerFile
-} from "./chunk-FPBGAT5D.js";
+} from "./chunk-26MOFAJT.js";
 import {
   DEFAULT_PROFILE
-} from "./chunk-QXTKSOFI.js";
+} from "./chunk-MF4W6FHU.js";
 import {
   readEnvVar
 } from "./chunk-X2NL4KUO.js";
@@ -33,7 +33,7 @@ import {
   CliError,
   EXIT_SOURCE_UNRESOLVABLE,
   UsageError
-} from "./chunk-SBR2WZXG.js";
+} from "./chunk-D7BUMOKU.js";
 
 // src/emit/env-target.ts
 var ENV_CREDENTIAL_NAMES = ["XANO_INSTANCE_URL", "XANO_WORKSPACE_ID", "XANO_META_TOKEN", "XANO_REFRESH_TOKEN", "XANO_CLIENT_ID"];
@@ -58,7 +58,7 @@ async function resolveEphemeralName(auth, name, cwd = process.cwd()) {
     if (other !== void 0) throw await reachableFirst(other, auth);
     throw new CliError(
       "SDK_ERROR",
-      `No ephemeral environment to target. Name one with \`ephemeral:<name>\` (\`xanosdk ephemeral list${contextFlags()}\` shows the ones that exist), or run \`xanosdk deploy${contextFlags()}\` first \u2014 this project then remembers the env it deployed to, which is what bare \`ephemeral\` reads.`,
+      `No ephemeral environment to target. Name one with \`ephemeral:<name>\` (\`xanosdk ephemeral list${contextFlags()}\` shows the ones that exist), or run \`xanosdk deploy --ephemeral${contextFlags()}\` first \u2014 this project then remembers the env it deployed to, which is what bare \`ephemeral\` reads.`,
       { exitCode: EXIT_SOURCE_UNRESOLVABLE }
     );
   }
@@ -85,7 +85,7 @@ function otherCredentialRefusal(state, scope, tail, opts = {}) {
   const runFile = credentialFileOf();
   const known = files.length === 1 ? files[0] : void 0;
   const fileFlag = known !== void 0 && known !== runFile ? credentialFileFlagFor(known) : "";
-  const fileNote = known === void 0 && runFile !== void 0 && runFile !== "shared" ? ` (${profiles.length === 1 ? "it" : "they"} may live in another credential file than this run read \u2014 add that file's \`--config <path>\` if so)` : known === "shared" && runFile !== void 0 && runFile !== "shared" ? ` (without \`--config\`/\`--local\`: ${profiles.length === 1 ? "it lives" : "they live"} in this machine's shared credential file)` : "";
+  const fileNote = known === void 0 && runFile !== void 0 && runFile !== "shared" ? ` (${profiles.length === 1 ? "it" : "they"} may live in another credential file than this run read \u2014 add that file's \`--config <path>\` if so)` : known === "shared" && runFile !== void 0 && runFile !== "shared" ? ` (without \`--config\`/\`--local-auth\`: ${profiles.length === 1 ? "it lives" : "they live"} in this machine's shared credential file)` : "";
   const profileFlag = `${profiles.length === 1 ? `--profile ${profiles[0]}` : "--profile <name>"}${fileFlag}`;
   const goneKey = reachable.length === 1 ? reachable[0] : void 0;
   const goneTarget = {
@@ -126,7 +126,7 @@ function otherCredentialRefusal(state, scope, tail, opts = {}) {
   if (sameHost.length === 0) {
     const hosts = [...new Set(others.map((k) => hostOfKey(k)))].join(", ");
     return new UsageError(
-      `No ephemeral is tracked on ${here} \u2014 run \`xanosdk deploy${contextFlags()}\` to create one there, ${tail}. (This project's record is for ${hosts}.)`,
+      `No ephemeral is tracked on ${here} \u2014 run \`xanosdk deploy --ephemeral${contextFlags()}\` to create one there, ${tail}. (This project's record is for ${hosts}.)`,
       opts
     );
   }
@@ -142,7 +142,7 @@ var SENDS_ELSEWHERE = /* @__PURE__ */ new WeakSet();
 async function reachableFirst(refusal, auth) {
   if (!(refusal instanceof Error) || !SENDS_ELSEWHERE.has(refusal)) return refusal;
   if (auth === void 0 || !("access_token" in auth)) return refusal;
-  const { refuseUnreachableWorkspace } = await import("./workspace-binding-2TWZBHQY.js");
+  const { refuseUnreachableWorkspace } = await import("./workspace-binding-JE6YNDZJ.js");
   try {
     await refuseUnreachableWorkspace(auth);
   } catch (unreachable) {
@@ -167,4 +167,4 @@ export {
   otherCredentialRefusal,
   reachableFirst
 };
-//# sourceMappingURL=chunk-3P3HXN76.js.map
+//# sourceMappingURL=chunk-ITC2R2OT.js.map

package/dist/{chunk-W5ONYLOP.js → chunk-IXFJORNH.js}

@@ -1,15 +1,15 @@
 import {
   listTenants
-} from "./chunk-KCAL4QYP.js";
+} from "./chunk-VW4CWVYX.js";
 import {
   listEphemeral
-} from "./chunk-BUECLQXK.js";
+} from "./chunk-SPKA2LV6.js";
 import {
   shellWord
 } from "./chunk-FWD7AL6N.js";
 import {
   safeText
-} from "./chunk-SBR2WZXG.js";
+} from "./chunk-D7BUMOKU.js";
 
 // src/emit/display-name-hint.ts
 function isShared(owner) {
@@ -117,4 +117,4 @@ export {
   displayNameHint,
   selectorFix
 };
-//# sourceMappingURL=chunk-W5ONYLOP.js.map
+//# sourceMappingURL=chunk-IXFJORNH.js.map

package/dist/{chunk-HMLGM2MW.js → chunk-IYXL5NYU.js}

@@ -1,19 +1,243 @@
 import {
-  identityName,
-  isWorkspaceKeyAtDefault
-} from "./chunk-XXZZGXW2.js";
-import {
+  DEFAULT_DOCUMENTATION,
   DEFAULT_PREFERENCES,
-  DEFAULT_SETTINGS
+  DEFAULT_SETTINGS,
+  LEGACY_REALTIME
 } from "./chunk-6JAEMMZ7.js";
+import {
+  identityNamesByGuid,
+  lockNameForObject,
+  sdkKindName
+} from "./chunk-5KJBWIDZ.js";
 import {
   HOSTED_ICON_KINDS,
   isPrivateLibraryRow
-} from "./chunk-XNCP4KYO.js";
+} from "./chunk-VQPDATQT.js";
 import {
   deepEqual,
   normalize
-} from "./chunk-3HOGFGKG.js";
+} from "./chunk-D3KEPRRN.js";
+
+// src/codegen/omissions.ts
+function omissionSeverity(reason) {
+  return reason === "unmodeled" ? "warning" : "notice";
+}
+var UNSUPPORTED_SECTIONS = {
+  vault: {
+    label: "stored files",
+    reason: "stored-file",
+    detail: 'a file\'s bytes are not carried into the generated tree; to ship one from the project, put it in the repo and point the field at `hostedFile("./<file>", import.meta.url)`'
+  },
+  // These three were tagged `unmodeled`, which their own detail lines contradict:
+  // none of them is an object type the SDK failed to model. They are records of
+  // what was done to the workspace, owned by the instance that did it.
+  market_item: { label: "marketplace records", reason: "instance-owned", detail: "marketplace provenance is owned by the instance" },
+  run_install: { label: "install runs", reason: "instance-owned", detail: "install runs are instance history, not workspace source" },
+  action_package_install: {
+    label: "action-package installs",
+    reason: "instance-owned",
+    detail: "action-package installs are owned by the instance"
+  },
+  service: { label: "services", reason: "unmodeled", detail: "services are not modeled by this SDK" },
+  branch: { label: "branches", reason: "server-managed", detail: "branches are instance state, not workspace source" }
+};
+var WORKSPACE_OMITTED_KEYS = {
+  // --- private key material ---
+  iv: { label: "encryption material", reason: "secret", detail: "instance crypto material" },
+  salt: { label: "encryption salt", reason: "secret", detail: "instance crypto material" },
+  secret: { label: "encryption secret", reason: "secret", detail: "instance crypto material" },
+  crypto: { label: "encryption keys", reason: "secret", detail: "instance crypto material" },
+  mesh0: { label: "integration API keys", reason: "secret", detail: "integration API keys" },
+  git: { label: "git integration keys", reason: "secret", detail: "integration deploy keys" },
+  // --- assigned and owned by the instance ---
+  id: { label: "workspace id", reason: "server-managed", detail: "instance-assigned workspace id" },
+  guid: {
+    label: "workspace guid",
+    reason: "server-managed",
+    derived: true,
+    detail: "instance-assigned workspace guid; the generated tree re-derives its own from the workspace name rather than carrying it"
+  },
+  checksum: { label: "checksum", reason: "server-managed", detail: "derived by the engine on save" },
+  created_at: { label: "created time", reason: "server-managed", detail: "engine timestamp" },
+  updated_at: { label: "updated time", reason: "server-managed", detail: "engine timestamp" },
+  deleted_at: { label: "deleted time", reason: "server-managed", detail: "engine timestamp" },
+  domain_prefix: {
+    label: "routing prefix",
+    reason: "server-managed",
+    detail: "instance-assigned routing prefix; redeploying it to another tenant would claim its hostnames"
+  },
+  branch: { label: "current branch", reason: "server-managed", detail: "current-branch pointer, instance state" },
+  release: { label: "current release", reason: "server-managed", detail: "release pointer, instance state" },
+  user: { label: "owning user", reason: "server-managed", detail: "owning-user record" },
+  usage: { label: "usage counters", reason: "server-managed", detail: "usage counters, instance state" },
+  features: { label: "feature flags", reason: "server-managed", detail: "instance feature flags" },
+  installed_services: { label: "installed services", reason: "server-managed", detail: "per-branch installed service ids" },
+  provision: { label: "provisioning state", reason: "server-managed", detail: "provisioning progress, instance state" },
+  well_known: { label: "well-known records", reason: "server-managed", detail: "well-known hosting records, instance state" },
+  tailor_experience: { label: "onboarding answers", reason: "server-managed", detail: "onboarding survey answers" },
+  require_setup: { label: "setup state", reason: "server-managed", detail: "onboarding state" },
+  disabled: { label: "disable flag", reason: "server-managed", detail: "instance-level workspace disable flag" },
+  jumpstart: { label: "starter state", reason: "server-managed", detail: "onboarding state" },
+  sql_schema_name: { label: "database schema name", reason: "server-managed", detail: "physical schema name, instance-assigned" },
+  connect: { label: "connection state", reason: "server-managed", detail: "third-party connection state" },
+  // --- carried elsewhere in the bundle ---
+  env: {
+    label: "env vars",
+    reason: "relocated",
+    emptied: true,
+    detail: "workspace env vars are carried in the bundle's own env set, where the import reads them; they are verified there"
+  }
+};
+var WORKSPACE_DEFAULTED_KEYS = {
+  use_custom_names: (v) => v === false,
+  // The two blocks the wipe was expressible through. Omitting either emits
+  // no key, so both need recognising here for the same reason the four below do:
+  // the engine materializes them on save, so a stored default is ten lines
+  // nobody wrote — and verification reads this table, so a tree that leaves the
+  // default behind compares equal rather than reporting a loss.
+  documentation: isDefaultDocumentation,
+  realtime: isDefaultLegacyRealtime,
+  defaults: (v) => isRecord(v) && Object.keys(v).length === 1 && v.db_primary_key === "int",
+  datasources: (v) => Array.isArray(v) && v.length === 0,
+  datasource_live: (v) => isRecord(v) && Object.keys(v).length === 2 && v.color === "#008000" && v.show_banner === false,
+  middleware: (v) => isRecord(v) && Object.values(v).every((list) => Array.isArray(list) && list.length === 0),
+  history: isDefaultWorkspaceHistory
+};
+function isDefaultDocumentation(value) {
+  return matchesDefault(value, DEFAULT_DOCUMENTATION, { whitelist: isEmptyWhitelist });
+}
+function isEmptyWhitelist(value) {
+  if (Array.isArray(value)) return value.length === 0;
+  return isRecord(value) && Object.keys(value).length === 0;
+}
+function isDefaultLegacyRealtime(value) {
+  return matchesDefault(value, LEGACY_REALTIME, {
+    channels: (v) => Array.isArray(v) && v.length === 0
+  });
+}
+function matchesDefault(value, defaults, loose = {}) {
+  if (!isRecord(value)) return false;
+  return Object.entries(value).every(([key, member]) => {
+    if (!Object.hasOwn(defaults, key)) return false;
+    const predicate = Object.hasOwn(loose, key) ? loose[key] : void 0;
+    return predicate ? predicate(member) : deepEqualDefault(member, defaults[key]);
+  });
+}
+function deepEqualDefault(a, b) {
+  if (a === b) return true;
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return a.length === b.length && a.every((item, i) => deepEqualDefault(item, b[i]));
+  }
+  if (!isRecord(a) || !isRecord(b)) return false;
+  const keys = /* @__PURE__ */ new Set([...Object.keys(a), ...Object.keys(b)]);
+  return [...keys].every((k) => deepEqualDefault(a[k], b[k]));
+}
+function isRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function subtractDefaults(value, fallback) {
+  if (deepEqualDefault(value, fallback)) return void 0;
+  if (!isRecord(value) || !isRecord(fallback)) return value;
+  const out = {};
+  for (const [key, member] of Object.entries(value)) {
+    const kept = Object.hasOwn(fallback, key) ? subtractDefaults(member, fallback[key]) : member;
+    if (kept !== void 0) out[key] = kept;
+  }
+  return Object.keys(out).length === 0 ? void 0 : out;
+}
+var HISTORY_DEFAULT_OFF = /* @__PURE__ */ new Set(["function", "middleware", "trigger", "message"]);
+function isDefaultWorkspaceHistory(value) {
+  if (!isRecord(value)) return false;
+  return Object.entries(value).every(([key, member]) => {
+    const enabled = key.endsWith("_enabled");
+    if (!enabled && !key.endsWith("_limit")) return false;
+    const type = key.slice(0, key.lastIndexOf("_"));
+    return enabled ? member === !HISTORY_DEFAULT_OFF.has(type) : member === 100;
+  });
+}
+function isWorkspaceKeyAtDefault(key, value) {
+  const predicate = Object.hasOwn(WORKSPACE_DEFAULTED_KEYS, key) ? WORKSPACE_DEFAULTED_KEYS[key] : void 0;
+  return predicate !== void 0 && predicate(value);
+}
+function sectionOmission(key) {
+  return Object.hasOwn(UNSUPPORTED_SECTIONS, key) ? UNSUPPORTED_SECTIONS[key] : void 0;
+}
+function workspaceKeyOmission(key) {
+  return Object.hasOwn(WORKSPACE_OMITTED_KEYS, key) ? WORKSPACE_OMITTED_KEYS[key] : void 0;
+}
+
+// src/codegen/labels.ts
+var NOUNS = {
+  query: ["query", "queries"],
+  env: ["env var", "env vars"],
+  knowledge: ["knowledge item", "knowledge items"],
+  knowledge_file: ["knowledge file", "knowledge files"],
+  addon: ["addon", "addons"]
+};
+function countOf(n, singular, plural = `${singular}s`) {
+  return `${n} ${n === 1 ? singular : plural}`;
+}
+function decodedCounts(payload) {
+  const out = [];
+  for (const [key, section] of Object.entries(payload)) {
+    if (!Array.isArray(section) || section.length === 0) continue;
+    if (key === "toolset") {
+      const agents = section.filter((r) => r?.type === "agent").length;
+      if (agents > 0) out.push(["agent", countOf(agents, "agent")]);
+      if (section.length - agents > 0) out.push(["mcpServer", countOf(section.length - agents, "mcpServer")]);
+      continue;
+    }
+    const policy = sectionOmission(key);
+    if (policy !== void 0) {
+      out.push([policy.label, `${section.length} ${policy.label}`]);
+      continue;
+    }
+    const noun = Object.hasOwn(NOUNS, key) ? NOUNS[key] : void 0;
+    const kind = sdkKindName(key);
+    out.push([kind, noun !== void 0 ? countOf(section.length, noun[0], noun[1]) : countOf(section.length, kind)]);
+  }
+  return out.sort((a, b) => a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0).map(([, phrase]) => phrase);
+}
+var repeatedNames = /* @__PURE__ */ new WeakMap();
+function identityName(payload, payloadKey, stored) {
+  if (payloadKey === "knowledge_file") return knowledgeFileName(payload, stored);
+  const name = String(stored?.name ?? "");
+  let repeats = repeatedNames.get(payload);
+  if (repeats === void 0) {
+    repeats = /* @__PURE__ */ new Map();
+    for (const [key, section] of Object.entries(payload)) {
+      if (!Array.isArray(section)) continue;
+      const seen = /* @__PURE__ */ new Set();
+      const twice = /* @__PURE__ */ new Set();
+      for (const row of section) {
+        const n = String(row?.name ?? "");
+        if (seen.has(n)) twice.add(n);
+        seen.add(n);
+      }
+      repeats.set(key, twice);
+    }
+    repeatedNames.set(payload, repeats);
+  }
+  if (!repeats.get(payloadKey)?.has(name)) return name;
+  return lockNameForObject(payloadKey, stored, identityNamesByGuid(payload));
+}
+function knowledgeFileName(payload, stored) {
+  const { path, knowledge } = stored ?? {};
+  const items = Array.isArray(payload.knowledge) ? payload.knowledge : [];
+  const item = items.find((k) => k?.guid === knowledge?.id);
+  const rel = String(path ?? "").replace(/^knowledge-refs\/[^/]+\//, "");
+  return item?.name === void 0 ? rel : `${String(item.name)}/${rel}`;
+}
+var WORKSPACE_SETTINGS = "workspace settings";
+function reportObjectLabel(payloadKey, name) {
+  if (payloadKey === "workspace") {
+    const policy = workspaceKeyOmission(name);
+    return `${WORKSPACE_SETTINGS} (${policy?.label ?? name})`;
+  }
+  const section = sectionOmission(payloadKey);
+  if (section !== void 0) return `${section.label}: ${name}`;
+  return `${sdkKindName(payloadKey)}:${name}`;
+}
 
 // src/deploy/live-diff.ts
 function storedColumnsAfter(outgoing, live, prior, mode) {
@@ -681,27 +905,22 @@ var AGENT_SETTINGS_DEFAULTS = {
   model: isEmptyText,
   telemetry: telemetryOff
 };
-function withoutEngineDefaults(defaults, ours, theirs) {
-  if (defaults === void 0) return [ours, theirs];
-  const a = { ...ours };
-  const b = { ...theirs };
+function withoutEngineDefaults(defaults, row) {
+  if (defaults === void 0) return row;
+  const out = { ...row };
   for (const [key, isDefault] of Object.entries(defaults)) {
-    const atDefault = (row) => !Object.hasOwn(row, key) || isDefault(row[key]);
-    if (atDefault(a) && atDefault(b)) {
-      delete a[key];
-      delete b[key];
-    }
+    if (!Object.hasOwn(out, key) || isDefault(out[key])) delete out[key];
   }
-  if (defaults === ENGINE_FILLED_DEFAULTS.toolset && isPlainObject(a.agent_settings) && isPlainObject(b.agent_settings)) {
-    [a.agent_settings, b.agent_settings] = withoutEngineDefaults(AGENT_SETTINGS_DEFAULTS, a.agent_settings, b.agent_settings);
+  if (defaults === ENGINE_FILLED_DEFAULTS.toolset && isPlainObject(out.agent_settings)) {
+    out.agent_settings = withoutEngineDefaults(AGENT_SETTINGS_DEFAULTS, out.agent_settings);
   }
-  return [a, b];
+  return out;
 }
-function withoutNullColumnDefaults(table) {
+function withoutEmptyColumnDefaults(table) {
   const strip = (columns) => Array.isArray(columns) ? columns.map((col) => {
     if (!isPlainObject(col)) return col;
     const { default: d, ...rest } = col;
-    const out = d === null ? rest : col;
+    const out = d === null || d === "" || col.required === true ? rest : col;
     return Array.isArray(out.children) ? { ...out, children: strip(out.children) } : out;
   }) : columns;
   return Array.isArray(table.schema) ? { ...table, schema: strip(table.schema) } : table;
@@ -734,18 +953,17 @@ function withHostedIconIdentity(row) {
 }
 var INDEX_SET_KEY = "(indexes)";
 function comparable(section, oursIn, theirsIn, pinned) {
-  let [ours, theirs] = withoutEngineDefaults(Object.hasOwn(ENGINE_FILLED_DEFAULTS, section) ? ENGINE_FILLED_DEFAULTS[section] : void 0, oursIn, theirsIn);
+  return [canonicalRow(section, oursIn, pinned), canonicalRow(section, theirsIn, pinned)];
+}
+function canonicalRow(section, rowIn, pinned) {
+  let row = withoutEngineDefaults(Object.hasOwn(ENGINE_FILLED_DEFAULTS, section) ? ENGINE_FILLED_DEFAULTS[section] : void 0, rowIn);
   if (section === "dbo") {
-    [ours, theirs] = [withoutNullColumnDefaults(ours), withoutNullColumnDefaults(theirs)];
-    [ours, theirs] = [{ ...ours, [INDEX_SET_KEY]: indexKeysOf(oursIn) }, { ...theirs, [INDEX_SET_KEY]: indexKeysOf(theirsIn) }];
-  }
-  if (HOSTED_ICON_KINDS.includes(section)) [ours, theirs] = [withHostedIconIdentity(ours), withHostedIconIdentity(theirs)];
-  if (pinned || !("canonical" in ours || "canonical" in theirs)) {
-    return [normalize(ours), normalize(theirs)];
+    row = { ...withoutEmptyColumnDefaults(row), [INDEX_SET_KEY]: indexKeysOf(rowIn) };
   }
-  const { canonical: _a, ...oursRest } = ours;
-  const { canonical: _b, ...theirsRest } = theirs;
-  return [normalize(oursRest), normalize(theirsRest)];
+  if (HOSTED_ICON_KINDS.includes(section)) row = withHostedIconIdentity(row);
+  if (pinned || !("canonical" in row)) return normalize(row);
+  const { canonical: _slug, ...rest } = row;
+  return normalize(rest);
 }
 function pinsCanonical(key, record, pinnedKeys) {
   const name = typeof record.name === "string" ? record.name : void 0;
@@ -839,6 +1057,15 @@ function compareToLive(outgoing, live, pinnedKeys, opts = {}) {
 }
 
 export {
+  omissionSeverity,
+  UNSUPPORTED_SECTIONS,
+  subtractDefaults,
+  isWorkspaceKeyAtDefault,
+  sectionOmission,
+  workspaceKeyOmission,
+  decodedCounts,
+  identityName,
+  reportObjectLabel,
   storedColumnsAfter,
   uniqueIndexLabels,
   indexKeysOf,
@@ -857,6 +1084,7 @@ export {
   rowLabeler,
   declaredLabels,
   hostedIconIdentity,
+  canonicalRow,
   compareToLive
 };
-//# sourceMappingURL=chunk-HMLGM2MW.js.map
+//# sourceMappingURL=chunk-IYXL5NYU.js.map