@wayai/cli 0.3.226 → 0.3.228

package/dist/index.js

@@ -22250,7 +22250,7 @@ function renderDiff(diff) {
   for (const kind of ENTITY_KINDS) {
     const b = bucket(diff, kind);
     if (!b || isEmptyBucket(b)) continue;
-    lines.push(`${BOLD}${LABELS[kind]}s${RESET}`);
+    lines.push(`${BOLD}${ENTITY_LABELS[kind]}s${RESET}`);
     for (const e of b.added) lines.push(`${GREEN}  + ${sanitizeTerminalText(e.id)}${RESET}`);
     for (const m of b.modified) lines.push(`${YELLOW}  ~ ${sanitizeTerminalText(m.after.id)}${RESET}`);
     for (const e of b.removed) {
@@ -22271,14 +22271,14 @@ function renderDiff(diff) {
   }
   return lines.join("\n");
 }
-var LABELS, GREEN, YELLOW, RED, BOLD, RESET;
+var ENTITY_LABELS, GREEN, YELLOW, RED, BOLD, RESET;
 var init_diff_format = __esm({
   "src/data/config-as-code/diff-format.ts"() {
     "use strict";
     init_terminal_output();
     init_base_id();
     init_types2();
-    LABELS = {
+    ENTITY_LABELS = {
       record_types: "record type",
       relationship_types: "relationship type",
       file_types: "file type",
@@ -34590,7 +34590,7 @@ function sameFileType(remote, spec) {
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function promotionProblems(result, ids, section = "file_types") {
+function promotionProblems(result, ids, { section = "file_types", createOnly = false } = {}) {
   const answer = isObject(result) ? result : {};
   const problems2 = [];
   for (const [kind, bucket2] of Object.entries(isObject(answer.diff) ? answer.diff : {})) {
@@ -34599,7 +34599,15 @@ function promotionProblems(result, ids, section = "file_types") {
       for (const entry of Array.isArray(bucket2[change]) ? bucket2[change] : []) {
         const row = isObject(entry) ? isObject(entry.after) ? entry.after : entry : {};
         const id = typeof row.id === "string" ? row.id : JSON.stringify(row).slice(0, 80);
-        if (kind === section && change !== "removed" && ids.has(id)) continue;
+        if (kind === section && ids.has(id)) {
+          if (change === "added" || change === "modified" && !createOnly) continue;
+          if (change === "modified") {
+            problems2.push(
+              `${ENTITY_LABELS[section]} "${id}" was created in production while the migration ran, and differs from the one it would promote, so the production one is kept`
+            );
+            continue;
+          }
+        }
         problems2.push(`it would also apply ${kind} ${change}: "${id}"`);
       }
     }
@@ -34762,7 +34770,7 @@ Dry run: nothing written (${writes === 0 ? "nothing to write" : `${writes} write
   for (const spec of toWrite) await kb.putFileType(preview, spec);
   if (toPromote.length > 0) {
     const ids = toPromote.map((s) => s.id);
-    const problems2 = promotionProblems(await kb.promoteFileTypes(productionId, preview, ids, true), new Set(ids));
+    const problems2 = promotionProblems(await kb.promoteFileTypes(productionId, preview, ids, true), new Set(ids), { createOnly: true });
     if (problems2.length > 0) {
       throw expected(
         `The promotion into "${safe(productionId)}" would not apply as planned (${problems2.map(safe).join("; ")}). Its file types are written in "${safe(preview)}"; nothing reached production.`
@@ -34797,6 +34805,7 @@ var init_migrate2 = __esm({
     "use strict";
     init_resource_files();
     init_api_client();
+    init_diff_format();
     init_expected();
     init_terminal_output();
     init_utils();
@@ -35767,7 +35776,7 @@ Dry run: nothing written (${writes === 0 ? "nothing to write" : `${writes} write
   for (const spec of toolsetsToWrite) await kb.putToolset(preview, spec);
   if (toolsetsToPromote.length > 0) {
     const slugs = toolsetsToPromote.map((s) => s.id);
-    const problems2 = promotionProblems(await kb.promoteToolsets(production, preview, slugs, true), new Set(slugs), "toolsets");
+    const problems2 = promotionProblems(await kb.promoteToolsets(production, preview, slugs, true), new Set(slugs), { section: "toolsets" });
     if (problems2.length > 0) {
       throw expected(
         `The promotion into "${safe2(production)}" would not apply as planned (${problems2.map(safe2).join("; ")}). The toolsets are written in "${safe2(preview)}"; nothing reached production, and the hub's agents are unchanged.`
@@ -35964,7 +35973,9 @@ migrate: move knowledge resources into the organization's knowledge base.
   file type, its files keep their paths, and each described folder gains an _index.md. Files are
   written create-only: one created at its path while it runs is kept, and the run stops there,
   naming it. A re-run writes what is left once that file matches its source or is moved or
-  removed; until then it stops before any write, naming it.
+  removed; until then it stops before any write, naming it. A file type created in production at
+  an id it would add, after it read production, is kept too: unless it is already what the run
+  would promote, the run stops before promoting, naming it.
 
   --base       The knowledge base: its production base, or the preview its file types are
                written in. File types are written in the preview and promoted; files are