@eide/foir-cli 0.10.2 → 0.11.0

package/dist/cli.js

@@ -1188,7 +1188,8 @@ function createAppsMethods(client) {
           sourceMappings: params.sourceMappings ?? {},
           sinkMappings: params.sinkMappings ?? {},
           settings: params.settings,
-          placementFieldChoices: params.placementFieldChoices ?? {}
+          placementFieldChoices: params.placementFieldChoices ?? {},
+          updatePushSnapshot: params.updatePushSnapshot ?? false
         })
       );
       return resp.app;
@@ -1222,7 +1223,9 @@ function createAppsMethods(client) {
           name: params.name,
           sourceMappings: params.sourceMappings ?? {},
           sinkMappings: params.sinkMappings ?? {},
-          placementFieldChoices: params.placementFieldChoices ?? {}
+          placementFieldChoices: params.placementFieldChoices ?? {},
+          updatePushSnapshot: params.updatePushSnapshot ?? false,
+          snapshotOnly: params.snapshotOnly ?? false
         })
       );
       return resp.app;
@@ -1347,7 +1350,8 @@ function createModelsMethods(client) {
           name: params.name,
           fields: params.fields.map(jsFieldToProto),
           config: params.config ? jsConfigToProto(params.config) : void 0,
-          configId: params.configId
+          configId: params.configId,
+          updatePushSnapshot: params.updatePushSnapshot ?? false
         })
       );
       return resp.model ?? null;
@@ -1360,7 +1364,9 @@ function createModelsMethods(client) {
           updateFields: params.fields != null,
           fields: params.fields?.map(jsFieldToProto) ?? [],
           config: params.config ? jsConfigToProto(params.config) : void 0,
-          changeDescription: params.changeDescription
+          changeDescription: params.changeDescription,
+          updatePushSnapshot: params.updatePushSnapshot ?? false,
+          snapshotOnly: params.snapshotOnly ?? false
         })
       );
       return resp.model ?? null;
@@ -4866,6 +4872,93 @@ import { resolve as resolve4 } from "path";
 function zeroCounts() {
   return { created: 0, updated: 0, deleted: 0 };
 }
+var PushConflictError = class extends Error {
+  conflicts;
+  constructor(conflicts) {
+    super(
+      `Push conflicts with admin-UI changes on ${conflicts.length} field${conflicts.length === 1 ? "" : "s"}. Run \`foir pull\` to sync, or re-run with --force to overwrite.`
+    );
+    this.name = "PushConflictError";
+    this.conflicts = conflicts;
+  }
+};
+function canonicalize(v) {
+  if (v === void 0) return "undefined";
+  if (v === null || typeof v !== "object") return JSON.stringify(v);
+  if (Array.isArray(v)) return "[" + v.map(canonicalize).join(",") + "]";
+  const obj = v;
+  const keys = Object.keys(obj).sort();
+  return "{" + keys.map((k) => JSON.stringify(k) + ":" + canonicalize(obj[k])).join(",") + "}";
+}
+function deepEqual(a, b) {
+  return canonicalize(a) === canonicalize(b);
+}
+function indexByKey(items) {
+  const out = /* @__PURE__ */ new Map();
+  for (const it of items ?? []) {
+    if (it && it.key) out.set(it.key, it);
+  }
+  return out;
+}
+function threeWayMergeKeyed(config2, platform, snapshot, parentLabel) {
+  const conflicts = [];
+  const merged = [];
+  const keys = /* @__PURE__ */ new Set([
+    ...config2.keys(),
+    ...platform.keys(),
+    ...snapshot ? snapshot.keys() : []
+  ]);
+  const noSnapshot = snapshot === null;
+  for (const key of keys) {
+    const inC = config2.has(key);
+    const inP = platform.has(key);
+    const inS = snapshot ? snapshot.has(key) : false;
+    const c = config2.get(key);
+    const p = platform.get(key);
+    const s = snapshot ? snapshot.get(key) : void 0;
+    if (noSnapshot) {
+      if (inC) merged.push(c);
+      else if (inP) merged.push(p);
+      continue;
+    }
+    if (inC && inP && inS) {
+      if (deepEqual(p, s)) {
+        merged.push(c);
+      } else if (deepEqual(c, s)) {
+        merged.push(p);
+      } else if (deepEqual(c, p)) {
+        merged.push(c);
+      } else {
+        conflicts.push({ fieldKey: key, snapshot: s, platform: p, config: c, kind: "modified-both" });
+        merged.push(p);
+      }
+    } else if (inC && !inS && !inP) {
+      merged.push(c);
+    } else if (inC && inS && !inP) {
+      if (deepEqual(c, s)) {
+        continue;
+      }
+      conflicts.push({ fieldKey: key, snapshot: s, platform: void 0, config: c, kind: "deleted-remotely-modified-locally" });
+    } else if (!inC && inS && inP) {
+      if (deepEqual(p, s)) {
+        continue;
+      }
+      conflicts.push({ fieldKey: key, snapshot: s, platform: p, config: void 0, kind: "deleted-locally-modified-remotely" });
+      merged.push(p);
+    } else if (!inC && !inS && inP) {
+      merged.push(p);
+    } else if (inC && !inS && inP) {
+      if (deepEqual(c, p)) {
+        merged.push(c);
+      } else {
+        conflicts.push({ fieldKey: key, snapshot: void 0, platform: p, config: c, kind: "modified-both" });
+        merged.push(p);
+      }
+    }
+  }
+  void parentLabel;
+  return { merged, conflicts };
+}
 async function reconcileConfig(client, configId, manifest, options = {}) {
   const summary = {
     models: zeroCounts(),
@@ -4880,7 +4973,9 @@ async function reconcileConfig(client, configId, manifest, options = {}) {
     apps: zeroCounts()
   };
   const operationBaseUrl = manifest.operationBaseUrl ?? "";
-  await reconcileModels(client, configId, manifest.models ?? [], summary);
+  const modelConflicts = [];
+  const mappingConflicts = [];
+  await reconcileModels(client, configId, manifest.models ?? [], summary, options.force ?? false, modelConflicts);
   await reconcileOperations(client, configId, manifest.operations ?? [], operationBaseUrl, summary);
   await reconcileHooks(client, configId, manifest.hooks ?? [], summary);
   await reconcileSegments(client, configId, manifest.segments ?? [], summary);
@@ -4900,11 +4995,17 @@ async function reconcileConfig(client, configId, manifest, options = {}) {
     options.tenantId,
     options.projectId,
     manifest.apps ?? {},
-    summary
+    summary,
+    options.force ?? false,
+    mappingConflicts
   );
+  const allConflicts = [...modelConflicts, ...mappingConflicts];
+  if (allConflicts.length > 0 && !options.force) {
+    throw new PushConflictError(allConflicts);
+  }
   return summary;
 }
-async function reconcileModels(client, configId, models, summary) {
+async function reconcileModels(client, configId, models, summary, force, conflictOut) {
   const existing = await client.models.listModels({ limit: 200 });
   const allByKey = new Map(
     existing.items.map((m) => [m.key, m])
@@ -4913,6 +5014,7 @@ async function reconcileModels(client, configId, models, summary) {
     existing.items.filter((m) => m.configId === configId).map((m) => [m.key, m])
   );
   const manifestKeys = /* @__PURE__ */ new Set();
+  const plans = [];
   for (const m of models) {
     if (!m.key || !m.name) continue;
     manifestKeys.add(m.key);
@@ -4921,30 +5023,77 @@ async function reconcileModels(client, configId, models, summary) {
     if (m.pluralKey) config2.pluralKey = m.pluralKey;
     if (m.description) config2.description = m.description;
     const ex = allByKey.get(m.key);
-    if (ex) {
-      await client.models.updateModel({
-        id: ex.id,
-        name: m.name,
-        fields: m.fields,
-        config: config2
+    if (!ex) {
+      plans.push({ kind: "create", model: m, config: config2 });
+      continue;
+    }
+    const cfgFields = m.fields ?? [];
+    const platFields = ex.fields ?? [];
+    const snapFields = ex.lastPushedFields;
+    const hasSnapshot = snapFields !== void 0 && snapFields !== null;
+    const { merged, conflicts } = threeWayMergeKeyed(
+      indexByKey(cfgFields),
+      indexByKey(platFields),
+      hasSnapshot ? indexByKey(snapFields) : null,
+      `model "${m.key}"`
+    );
+    for (const c of conflicts) {
+      conflictOut.push({ modelKey: m.key, ...c });
+    }
+    plans.push({
+      kind: "update",
+      id: ex.id,
+      name: m.name,
+      mergedFields: merged,
+      config: config2,
+      // The snapshot we persist is the config fields the CLI pushed —
+      // so a re-push with the same config is a no-op.
+      pushSnapshotFields: cfgFields
+    });
+  }
+  for (const [key, ex] of configOwnedByKey) {
+    if (manifestKeys.has(key)) continue;
+    const platFields = ex.fields ?? [];
+    const snapFields = ex.lastPushedFields;
+    if (snapFields !== void 0 && !deepEqual(platFields, snapFields)) {
+      conflictOut.push({
+        modelKey: key,
+        fieldKey: "<model>",
+        snapshot: snapFields,
+        platform: platFields,
+        config: void 0,
+        kind: "deleted-locally-modified-remotely"
       });
-      summary.models.updated++;
-    } else {
+      if (!force) continue;
+    }
+    plans.push({ kind: "delete", id: ex.id });
+  }
+  if (conflictOut.length > 0 && !force) {
+    throw new PushConflictError(conflictOut);
+  }
+  for (const p of plans) {
+    if (p.kind === "create") {
       await client.models.createModel({
-        key: m.key,
-        name: m.name,
-        fields: m.fields,
-        config: config2,
-        configId
+        key: p.model.key,
+        name: p.model.name,
+        fields: p.model.fields,
+        config: p.config,
+        configId,
+        updatePushSnapshot: true
       });
       summary.models.created++;
-    }
-  }
-  for (const [key, ex] of configOwnedByKey) {
-    if (!manifestKeys.has(key)) {
-      await client.models.deleteModel(
-        ex.id
-      );
+    } else if (p.kind === "update") {
+      const fieldsToWrite = force ? p.pushSnapshotFields : p.mergedFields;
+      await client.models.updateModel({
+        id: p.id,
+        name: p.name,
+        fields: fieldsToWrite,
+        config: p.config,
+        updatePushSnapshot: true
+      });
+      summary.models.updated++;
+    } else {
+      await client.models.deleteModel(p.id);
       summary.models.deleted++;
     }
   }
@@ -5303,7 +5452,7 @@ async function reconcileApiKeys(client, configKey, apiKeys, summary, rotateKeys)
     }
   }
 }
-async function reconcileApps(client, tenantId, projectId, apps, summary) {
+async function reconcileApps(client, tenantId, projectId, apps, summary, force, conflictOut) {
   const entries = Object.entries(apps);
   if (entries.length === 0) return;
   if (!tenantId || !projectId) {
@@ -5314,11 +5463,11 @@ async function reconcileApps(client, tenantId, projectId, apps, summary) {
   }
   const existingList = await client.apps.listApps(tenantId, projectId);
   const existingByName = new Map(existingList.map((a) => [a.name, a]));
+  const plans = [];
   for (const [name, input] of entries) {
     const existing = existingByName.get(name);
     if (!existing) {
-      await installApp(client, tenantId, projectId, name, input);
-      summary.apps.created += 1;
+      plans.push({ kind: "install", name, input });
       continue;
     }
     if (existing.manifestUrl !== input.source) {
@@ -5327,17 +5476,82 @@ async function reconcileApps(client, tenantId, projectId, apps, summary) {
       );
       continue;
     }
-    await client.apps.setAppMapping({
-      tenantId,
-      projectId,
+    const toBag = (v) => {
+      if (!v || typeof v !== "object") return { sources: {}, sinks: {}, placement_fields: {} };
+      const m = v;
+      return {
+        sources: m.sources ?? {},
+        sinks: m.sinks ?? {},
+        placement_fields: m.placement_fields ?? {}
+      };
+    };
+    const platformBag = toBag(existing.mappings);
+    const snapshotRaw = existing.lastPushedMappings;
+    const hasSnapshot = snapshotRaw !== void 0 && snapshotRaw !== null;
+    const snapshotBag = hasSnapshot ? toBag(snapshotRaw) : null;
+    const configSources = input.mappings?.sources ?? {};
+    const configSinks = input.mappings?.sinks ?? {};
+    const configPlacements = input.mappings?.placementFields ?? {};
+    const mergeBag = (cfg, plat, snap, label) => {
+      const cMap = new Map(Object.entries(cfg));
+      const pMap = new Map(Object.entries(plat));
+      const sMap = snap ? new Map(Object.entries(snap)) : null;
+      const { merged, conflicts } = threeWayMergeKeyed(
+        // The merge helper expects items to have a .key; wrap values.
+        new Map(Array.from(cMap, ([k, v]) => [k, { key: k, value: v }])),
+        new Map(Array.from(pMap, ([k, v]) => [k, { key: k, value: v }])),
+        sMap ? new Map(Array.from(sMap, ([k, v]) => [k, { key: k, value: v }])) : null,
+        `${name} ${label}`
+      );
+      for (const c of conflicts) {
+        conflictOut.push({ modelKey: `app:${name}`, ...c, fieldKey: `${label}.${c.fieldKey}` });
+      }
+      const out = {};
+      for (const item of merged) {
+        out[item.key] = item.value;
+      }
+      return out;
+    };
+    const mergedSources = mergeBag(configSources, platformBag.sources, snapshotBag?.sources ?? null, "sources");
+    const mergedSinks = mergeBag(configSinks, platformBag.sinks, snapshotBag?.sinks ?? null, "sinks");
+    const mergedPlacements = mergeBag(configPlacements, platformBag.placement_fields, snapshotBag?.placement_fields ?? null, "placementFields");
+    plans.push({
+      kind: "setMapping",
       name,
-      sourceMappings: toSourceMappings(input.mappings?.sources ?? {}),
-      sinkMappings: toSinkMappings(input.mappings?.sinks ?? {}),
-      placementFieldChoices: toPlacementFieldChoices(
-        input.mappings?.placementFields ?? {}
-      )
+      mergedSources,
+      mergedSinks,
+      mergedPlacements,
+      configMappings: {
+        sources: configSources,
+        sinks: configSinks,
+        placementFields: configPlacements
+      }
     });
-    summary.apps.updated += 1;
+  }
+  if (conflictOut.length > 0 && !force) {
+    throw new PushConflictError(conflictOut);
+  }
+  for (const p of plans) {
+    if (p.kind === "install") {
+      await installApp(client, tenantId, projectId, p.name, p.input);
+      summary.apps.created += 1;
+    } else if (p.kind === "setMapping") {
+      const write = force ? p.configMappings : {
+        sources: p.mergedSources,
+        sinks: p.mergedSinks,
+        placementFields: p.mergedPlacements
+      };
+      await client.apps.setAppMapping({
+        tenantId,
+        projectId,
+        name: p.name,
+        sourceMappings: toSourceMappings(write.sources),
+        sinkMappings: toSinkMappings(write.sinks),
+        placementFieldChoices: toPlacementFieldChoices(write.placementFields),
+        updatePushSnapshot: true
+      });
+      summary.apps.updated += 1;
+    }
   }
 }
 async function installApp(client, tenantId, projectId, name, input) {
@@ -5376,7 +5590,8 @@ async function installApp(client, tenantId, projectId, name, input) {
     settings: input.settings,
     placementFieldChoices: toPlacementFieldChoices(
       input.mappings?.placementFields ?? {}
-    )
+    ),
+    updatePushSnapshot: true
   });
 }
 function toSourceMappings(input) {
@@ -5466,7 +5681,11 @@ function printSummary(summary) {
   }
 }
 function registerPushCommand(program2, globalOpts) {
-  program2.command("push").description("Push foir.config.ts to the platform").option("--config <path>", "Path to config file (default: auto-discover)").option("--force", "Force reinstall (delete and recreate)", false).option(
+  program2.command("push").description("Push foir.config.ts to the platform").option("--config <path>", "Path to config file (default: auto-discover)").option(
+    "--force",
+    "Overwrite platform state on three-way-merge conflicts with admin-UI edits. Without this flag, conflicts abort the push.",
+    false
+  ).option(
     "--rotate-keys",
     "Rotate existing API keys and rewrite their values in .env",
     false
@@ -5507,11 +5726,38 @@ function registerPushCommand(program2, globalOpts) {
         }
         const configId = applyResult.id;
         console.log(chalk6.dim("Reconciling resources..."));
-        const summary = await reconcileConfig(client, configId, config2, {
-          rotateKeys: opts.rotateKeys ?? false,
-          tenantId: resolved?.project.tenantId,
-          projectId: resolved?.project.id
-        });
+        let summary;
+        try {
+          summary = await reconcileConfig(client, configId, config2, {
+            rotateKeys: opts.rotateKeys ?? false,
+            tenantId: resolved?.project.tenantId,
+            projectId: resolved?.project.id,
+            force: opts.force ?? false
+          });
+        } catch (e) {
+          if (e instanceof PushConflictError) {
+            console.error();
+            console.error(chalk6.red("\u2716 Push aborted \u2014 three-way-merge conflicts detected"));
+            console.error();
+            console.error(
+              chalk6.dim(
+                "  An admin-UI edit landed on the platform since the last `foir push`, and\n  the local config changes the same field. Accepting either side would\n  silently discard the other.\n"
+              )
+            );
+            for (const c of e.conflicts) {
+              console.error(chalk6.yellow(`  ${c.modelKey} \xB7 ${c.fieldKey}`) + chalk6.dim(` (${c.kind})`));
+              console.error(chalk6.dim("    snapshot:  ") + JSON.stringify(c.snapshot));
+              console.error(chalk6.dim("    platform:  ") + JSON.stringify(c.platform));
+              console.error(chalk6.dim("    config:    ") + JSON.stringify(c.config));
+            }
+            console.error();
+            console.error(chalk6.dim("  Resolution:"));
+            console.error(chalk6.dim("    1. `foir pull` to sync platform state into local config, OR"));
+            console.error(chalk6.dim("    2. re-run with --force to overwrite platform with local config"));
+            process.exit(1);
+          }
+          throw e;
+        }
         console.log();
         console.log(chalk6.green("\u2713 Config applied successfully"));
         console.log(`  Config ID:  ${chalk6.cyan(configId)}`);
@@ -5671,6 +5917,39 @@ export default defineConfig(${jsonContent});
         }
         writeFileSync3(outPath, formatted, "utf-8");
         console.log(chalk7.green(`\u2713 Exported to ${outPath}`));
+        try {
+          const { items: platformModels } = await client.models.listModels({ limit: 200 });
+          for (const pm of platformModels) {
+            await client.models.updateModel({
+              id: pm.id,
+              fields: pm.fields ?? [],
+              snapshotOnly: true,
+              updatePushSnapshot: true
+            });
+          }
+          if (resolved && apps) {
+            const tenantId = resolved.project.tenantId;
+            const projectId = resolved.project.id;
+            for (const [name, input] of Object.entries(apps)) {
+              await client.apps.setAppMapping({
+                tenantId,
+                projectId,
+                name,
+                sourceMappings: input.mappings?.sources ?? {},
+                sinkMappings: input.mappings?.sinks ?? {},
+                placementFieldChoices: input.mappings?.placementFields ?? {},
+                snapshotOnly: true
+              });
+            }
+          }
+          console.log(chalk7.dim("  Synced push snapshots; next push will be a no-op."));
+        } catch (e) {
+          console.warn(
+            chalk7.yellow(
+              `  Warning: failed to refresh push snapshots (${e.message}). Next push may flag spurious conflicts; re-run with --force if needed.`
+            )
+          );
+        }
         const models = configData.models ?? [];
         const operations = configData.operations ?? [];
         const hooks = configData.hooks ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eide/foir-cli",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Universal platform CLI for Foir platform",
   "type": "module",
   "publishConfig": {
@@ -50,7 +50,7 @@
     "@bufbuild/protovalidate": "^1.1.1",
     "@connectrpc/connect": "^2.0.0",
     "@connectrpc/connect-node": "^2.0.0",
-    "@eide/foir-proto-ts": "^0.23.0",
+    "@eide/foir-proto-ts": "^0.26.0",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",