@ansible-flow/core 0.85.0 → 0.86.0

package/README.md

@@ -2,7 +2,7 @@
 
 Ansible Flow Designer core: the flow model, commands, validation and playbook generation, for any JavaScript host.
 
-Built from [Ansible Flow Designer](https://github.com/ChistokhinSV/ansible-flow-designer) 0.85.0
+Built from [Ansible Flow Designer](https://github.com/ChistokhinSV/ansible-flow-designer) 0.86.0
 and released with it. Modules are imported by their path in the source tree, for example
 `@ansible-flow/core/ai/contributions`.
 

package/dist/ai/handlers.js

@@ -2,10 +2,10 @@ import {
   generatedDirOf,
   paged,
   sourceOutline
-} from "../chunks/chunk-2HMLC2AO.js";
+} from "../chunks/chunk-TPRZZHXA.js";
 import {
   readPlaybook
-} from "../chunks/chunk-QMIXDOU6.js";
+} from "../chunks/chunk-5XGAGNH5.js";
 import {
   newFlowText
 } from "../chunks/chunk-CFNYFH2A.js";
@@ -32,14 +32,14 @@ import {
   scenarioProblemLines,
   scenariosLine,
   scenariosTool
-} from "../chunks/chunk-22D2NC2L.js";
+} from "../chunks/chunk-DHU774ES.js";
+import "../chunks/chunk-FTJ6VOQL.js";
+import "../chunks/chunk-2PSB652B.js";
 import {
   checkLive
 } from "../chunks/chunk-CM23ODBB.js";
 import "../chunks/chunk-7GLSXIZ3.js";
 import "../chunks/chunk-23ISDYUS.js";
-import "../chunks/chunk-FTJ6VOQL.js";
-import "../chunks/chunk-2PSB652B.js";
 import "../chunks/chunk-TH6ICGA5.js";
 import "../chunks/chunk-KOG6OURH.js";
 import "../chunks/chunk-CXVJWFGT.js";
@@ -50,13 +50,13 @@ import "../chunks/chunk-ZAYNYPCX.js";
 import "../chunks/chunk-56VTJ6YF.js";
 import {
   importWorkflow
-} from "../chunks/chunk-V2SPY2EI.js";
+} from "../chunks/chunk-NT62IE3Y.js";
 import {
   importPlaybook
-} from "../chunks/chunk-6M3OG3E4.js";
+} from "../chunks/chunk-H7Z2FBRD.js";
+import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-5CD65KH3.js";
 import "../chunks/chunk-6L43PFIN.js";
-import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-PDUQ3KMW.js";
 import {
   checksum

package/dist/ai/scenarios.js

@@ -3,12 +3,12 @@ import {
   scenarioProblemLines,
   scenariosLine,
   scenariosTool
-} from "../chunks/chunk-22D2NC2L.js";
+} from "../chunks/chunk-DHU774ES.js";
+import "../chunks/chunk-FTJ6VOQL.js";
+import "../chunks/chunk-2PSB652B.js";
 import "../chunks/chunk-CM23ODBB.js";
 import "../chunks/chunk-7GLSXIZ3.js";
 import "../chunks/chunk-23ISDYUS.js";
-import "../chunks/chunk-FTJ6VOQL.js";
-import "../chunks/chunk-2PSB652B.js";
 import "../chunks/chunk-TH6ICGA5.js";
 import "../chunks/chunk-KOG6OURH.js";
 import "../chunks/chunk-CXVJWFGT.js";

package/dist/awx/import.js

@@ -1,11 +1,11 @@
 import {
   expandable,
   importWorkflow
-} from "../chunks/chunk-V2SPY2EI.js";
-import "../chunks/chunk-6M3OG3E4.js";
+} from "../chunks/chunk-NT62IE3Y.js";
+import "../chunks/chunk-H7Z2FBRD.js";
+import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-5CD65KH3.js";
 import "../chunks/chunk-6L43PFIN.js";
-import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-PDUQ3KMW.js";
 import "../chunks/chunk-BAZIS67B.js";
 import "../chunks/chunk-TC7FOG4T.js";

package/dist/chunks/{chunk-QMIXDOU6.js → chunk-5XGAGNH5.js}

@@ -1,3 +1,7 @@
+import {
+  builtinFqcn,
+  shortName
+} from "./chunk-LNFMYJUJ.js";
 import {
   basename,
   dirname,
@@ -12,10 +16,6 @@ import {
   parseConfig,
   toValue
 } from "./chunk-6L43PFIN.js";
-import {
-  builtinFqcn,
-  shortName
-} from "./chunk-LNFMYJUJ.js";
 import {
   isAllowedKeyword
 } from "./chunk-OEQXGULI.js";
@@ -833,4 +833,4 @@ export {
   readPlaybook,
   scanFolder
 };
-//# sourceMappingURL=chunk-QMIXDOU6.js.map
+//# sourceMappingURL=chunk-5XGAGNH5.js.map

package/dist/chunks/{chunk-22D2NC2L.js → chunk-DHU774ES.js}

@@ -1,7 +1,3 @@
-import {
-  checkLive,
-  simulatedEnds
-} from "./chunk-CM23ODBB.js";
 import {
   endWords,
   scenarioMisses
@@ -10,6 +6,10 @@ import {
   ScenarioEditError,
   planScenarioEdit
 } from "./chunk-2PSB652B.js";
+import {
+  checkLive,
+  simulatedEnds
+} from "./chunk-CM23ODBB.js";
 import {
   blocking,
   checkScenarios,
@@ -218,4 +218,4 @@ export {
   scenarioProblemLines,
   scenariosTool
 };
-//# sourceMappingURL=chunk-22D2NC2L.js.map
+//# sourceMappingURL=chunk-DHU774ES.js.map

package/dist/chunks/{chunk-6M3OG3E4.js → chunk-H7Z2FBRD.js}

@@ -1,3 +1,6 @@
+import {
+  shortName
+} from "./chunk-LNFMYJUJ.js";
 import {
   fromRoot,
   localize
@@ -6,9 +9,6 @@ import {
   basename,
   dirname
 } from "./chunk-6L43PFIN.js";
-import {
-  shortName
-} from "./chunk-LNFMYJUJ.js";
 import {
   LevelBuilder,
   importedFlow
@@ -989,4 +989,4 @@ export {
   flatPlays,
   importPlaybook
 };
-//# sourceMappingURL=chunk-6M3OG3E4.js.map
+//# sourceMappingURL=chunk-H7Z2FBRD.js.map

package/dist/chunks/{chunk-V2SPY2EI.js → chunk-NT62IE3Y.js}

@@ -1,7 +1,7 @@
 import {
   flatPlays,
   importPlaybook
-} from "./chunk-6M3OG3E4.js";
+} from "./chunk-H7Z2FBRD.js";
 import {
   LevelBuilder,
   importedFlow
@@ -405,4 +405,4 @@ export {
   expandable,
   importWorkflow
 };
-//# sourceMappingURL=chunk-V2SPY2EI.js.map
+//# sourceMappingURL=chunk-NT62IE3Y.js.map

package/dist/chunks/{chunk-2HMLC2AO.js → chunk-TPRZZHXA.js}

@@ -1,7 +1,7 @@
 import {
   readPlaybook,
   scanFolder
-} from "./chunk-QMIXDOU6.js";
+} from "./chunk-5XGAGNH5.js";
 import {
   exportTemplates,
   jobTemplateFromExport,
@@ -10,7 +10,7 @@ import {
 } from "./chunk-IYVI5MSS.js";
 import {
   importPlaybook
-} from "./chunk-6M3OG3E4.js";
+} from "./chunk-H7Z2FBRD.js";
 import {
   fromRoot,
   localize
@@ -455,4 +455,4 @@ export {
   paged,
   sourceOutline
 };
-//# sourceMappingURL=chunk-2HMLC2AO.js.map
+//# sourceMappingURL=chunk-TPRZZHXA.js.map

package/dist/flow/merge.d.ts

@@ -0,0 +1,27 @@
+import type { FlowDocument, Ulid } from './types';
+export type MergeSide = 'ours' | 'theirs';
+export interface MergeConflict {
+    /** Stable across merges of the same versions: choices are given by it. */
+    id: string;
+    kind: 'value' | 'removed' | 'wire' | 'format';
+    /** Where and what, in words: "Say hello: settings.timeout". */
+    label: string;
+    node?: Ulid;
+    annotation?: Ulid;
+    edge?: Ulid;
+    /** The field, dotted (`settings.timeout`); absent for a whole step, wire or the format. */
+    field?: string;
+    base?: unknown;
+    ours?: unknown;
+    theirs?: unknown;
+}
+export interface FlowMerge {
+    /** The merged flow, each conflict as its choice says (ours until chosen). */
+    doc: FlowDocument;
+    conflicts: MergeConflict[];
+}
+/**
+ * Merges what `ours` and `theirs` changed since `base`. `choices` settle conflicts by id (ours
+ * when not given). Flows without IDs are matched by the IDs their keys give (Complete IDs).
+ */
+export declare function mergeFlows(baseDoc: FlowDocument, oursDoc: FlowDocument, theirsDoc: FlowDocument, choices?: Record<string, MergeSide>): FlowMerge;

package/dist/flow/merge.js

@@ -0,0 +1,422 @@
+import {
+  canonical
+} from "../chunks/chunk-TG3C3GIL.js";
+import {
+  withIds
+} from "../chunks/chunk-XRGZNPPO.js";
+import "../chunks/chunk-VG3RKETK.js";
+import "../chunks/chunk-TS4N2EIO.js";
+import "../chunks/chunk-BCX7P6SV.js";
+import "../chunks/chunk-3Z2U3LN7.js";
+import "../chunks/chunk-GHG3VINX.js";
+import "../chunks/chunk-5TUAMVIV.js";
+import "../chunks/chunk-45CE2RUH.js";
+import "../chunks/chunk-E2YZJWO7.js";
+import "../chunks/chunk-ZP5LQ4XC.js";
+import {
+  ROOT
+} from "../chunks/chunk-2OD7UZ7V.js";
+import "../chunks/chunk-AGWQ3ANE.js";
+
+// src/core/flow/merge.ts
+function flatten(doc) {
+  const flat = {
+    doc,
+    nodes: /* @__PURE__ */ new Map(),
+    edges: /* @__PURE__ */ new Map(),
+    annotations: /* @__PURE__ */ new Map(),
+    rootKeys: ["annotations", "layout", "decisions"].filter((k) => k in doc)
+  };
+  const visit = (level, nodes, edges, annotations, layout) => {
+    for (const node of nodes ?? []) {
+      if (!node?.id) continue;
+      const { subflow, ...own } = node;
+      flat.nodes.set(node.id, {
+        level,
+        own,
+        ...subflow ? {
+          body: {
+            ...subflow.boundary ? { boundary: subflow.boundary } : {},
+            keys: Object.keys(subflow)
+          }
+        } : {},
+        ...layout?.[node.id] ? { position: layout[node.id] } : {}
+      });
+      if (subflow)
+        visit(node.id, subflow.nodes, subflow.edges, subflow.annotations, subflow.layout);
+    }
+    for (const edge of edges ?? []) if (edge?.id) flat.edges.set(edge.id, { level, edge });
+    for (const a of annotations ?? [])
+      if (a?.id) flat.annotations.set(a.id, { level, annotation: a });
+  };
+  visit(ROOT, doc.nodes, doc.edges, doc.annotations, doc.layout);
+  return flat;
+}
+var same = (a, b) => JSON.stringify(canonical(a)) === JSON.stringify(canonical(b));
+var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var Merger = class {
+  constructor(choices) {
+    this.choices = choices;
+  }
+  choices;
+  conflicts = [];
+  pick(id) {
+    return this.choices[id] ?? "ours";
+  }
+  conflict(c) {
+    this.conflicts.push(c);
+    return this.pick(c.id);
+  }
+  /**
+   * One value, three ways. Records are merged key by key `depth` levels down; a value both sides
+   * changed differently is a conflict named by `id` (`<owner>:<field>`).
+   */
+  value(base, ours, theirs, at, depth) {
+    if (same(ours, theirs)) return ours;
+    if (same(base, ours)) return theirs;
+    if (same(base, theirs)) return ours;
+    if (depth > 0 && isRecord(ours) && isRecord(theirs) && (base === void 0 || isRecord(base))) {
+      const out = {};
+      for (const key of /* @__PURE__ */ new Set([...Object.keys(ours), ...Object.keys(theirs)])) {
+        const v = this.value(
+          base?.[key],
+          ours[key],
+          theirs[key],
+          {
+            ...at,
+            id: `${at.id}.${key}`,
+            field: at.field ? `${at.field}.${key}` : key
+          },
+          depth - 1
+        );
+        if (v !== void 0) out[key] = v;
+      }
+      return out;
+    }
+    const side = this.conflict({
+      ...at.owner,
+      id: at.id,
+      kind: "value",
+      label: at.field ? `${at.label}: ${at.field}` : at.label,
+      ...at.field ? { field: at.field } : {},
+      base,
+      ours,
+      theirs
+    });
+    return side === "ours" ? ours : theirs;
+  }
+  /** The fields of a record, each merged on its own (`depth` levels down inside each). */
+  fields(base, ours, theirs, at, depth) {
+    const out = {};
+    for (const key of /* @__PURE__ */ new Set([...Object.keys(ours), ...Object.keys(theirs)])) {
+      const v = this.value(
+        base?.[key],
+        ours[key],
+        theirs[key],
+        { ...at, id: `${at.id}:${key}`, field: key },
+        depth
+      );
+      if (v !== void 0) out[key] = v;
+    }
+    return out;
+  }
+};
+function quiet(base, ours, theirs) {
+  return same(base, ours) ? theirs : ours;
+}
+function mergeFlows(baseDoc, oursDoc, theirsDoc, choices = {}) {
+  const m = new Merger(choices);
+  if (oursDoc.schema_version !== theirsDoc.schema_version) {
+    const side = m.conflict({
+      id: "format",
+      kind: "format",
+      label: `The flow's format: ${oursDoc.schema_version} here, ${theirsDoc.schema_version} in theirs (upgrade both first)`,
+      ours: oursDoc.schema_version,
+      theirs: theirsDoc.schema_version
+    });
+    return { doc: side === "ours" ? oursDoc : theirsDoc, conflicts: m.conflicts };
+  }
+  const base = flatten(withIds(baseDoc));
+  const ours = flatten(withIds(oursDoc));
+  const theirs = flatten(withIds(theirsDoc));
+  const titleOf = (id) => (ours.nodes.get(id) ?? theirs.nodes.get(id) ?? base.nodes.get(id))?.own.title ?? id;
+  const touched = (side, id, seen = /* @__PURE__ */ new Set()) => {
+    if (seen.has(id)) return false;
+    seen.add(id);
+    const now = side.nodes.get(id);
+    const was = base.nodes.get(id);
+    if (!now) return false;
+    if (!was || !same(now.own, was.own) || now.level !== was.level || !same(now.body, was.body))
+      return true;
+    for (const [eid, e] of side.edges)
+      if ((e.edge.from.node === id || e.edge.to.node === id) && !same(e, base.edges.get(eid)))
+        return true;
+    for (const [aid, a] of side.annotations)
+      if ((a.annotation.on === id || a.level === id) && !same(a, base.annotations.get(aid)))
+        return true;
+    for (const [cid, c] of side.nodes) if (c.level === id && touched(side, cid, seen)) return true;
+    return false;
+  };
+  const order = (key) => [
+    .../* @__PURE__ */ new Set([...ours[key].keys(), ...theirs[key].keys(), ...base[key].keys()])
+  ];
+  const nodes = /* @__PURE__ */ new Map();
+  for (const id of order("nodes")) {
+    const b = base.nodes.get(id);
+    const o = ours.nodes.get(id);
+    const t = theirs.nodes.get(id);
+    if (!o && !t) continue;
+    if (b && (!o || !t)) {
+      const kept = o ?? t;
+      if (!touched(o ? ours : theirs, id)) continue;
+      const side = m.conflict({
+        id: `node:${id}`,
+        kind: "removed",
+        node: id,
+        label: `${titleOf(id)}: removed ${o ? "in theirs" : "here"}, changed ${o ? "here" : "in theirs"}`,
+        ours: o ? "changed" : "removed",
+        theirs: o ? "removed" : "changed"
+      });
+      if (side === "ours" === !!o) nodes.set(id, kept);
+      continue;
+    }
+    if (!o || !t) {
+      nodes.set(id, o ?? t);
+      continue;
+    }
+    const owner = { node: id };
+    const label = titleOf(id);
+    const own = m.fields(
+      b?.own,
+      o.own,
+      t.own,
+      { id: `node:${id}`, label, owner },
+      3
+    );
+    const level2 = m.value(
+      b?.level,
+      o.level,
+      t.level,
+      { id: `node:${id}:level`, label, field: "level (moved into another subflow)", owner },
+      0
+    );
+    let body;
+    const hasBody = m.value(
+      !!b?.body,
+      !!o.body,
+      !!t.body,
+      { id: `node:${id}:subflow`, label, field: "subflow", owner },
+      0
+    );
+    if (hasBody) {
+      const boundary = m.value(
+        b?.body?.boundary,
+        o.body?.boundary,
+        t.body?.boundary,
+        { id: `node:${id}:boundary`, label, field: "boundary", owner },
+        2
+      );
+      body = {
+        ...boundary ? { boundary } : {},
+        keys: [.../* @__PURE__ */ new Set([...o.body?.keys ?? [], ...t.body?.keys ?? []])]
+      };
+    }
+    const position = quiet(b?.position, o.position, t.position);
+    nodes.set(id, {
+      level: level2,
+      own,
+      ...body ? { body } : {},
+      ...position ? { position } : {}
+    });
+  }
+  for (let again = true; again; ) {
+    again = false;
+    for (const [id, n] of nodes)
+      if (n.level !== ROOT && !nodes.get(n.level)?.body) {
+        nodes.delete(id);
+        again = true;
+      }
+  }
+  const edges = /* @__PURE__ */ new Map();
+  for (const id of order("edges")) {
+    const b = base.edges.get(id);
+    const o = ours.edges.get(id);
+    const t = theirs.edges.get(id);
+    if (!o && !t) continue;
+    if (b && (!o || !t)) {
+      const kept = o ?? t;
+      if (same(kept, b)) continue;
+      const side = m.conflict({
+        id: `wire:${id}`,
+        kind: "wire",
+        edge: id,
+        label: `The wire from ${titleOf(kept.edge.from.node)} (${kept.edge.from.port}): removed ${o ? "in theirs" : "here"}, changed ${o ? "here" : "in theirs"}`,
+        ours: o ? kept.edge : void 0,
+        theirs: o ? void 0 : kept.edge
+      });
+      if (side === "ours" === !!o) edges.set(id, { ...kept, from: o ? "ours" : "theirs" });
+      continue;
+    }
+    if (!o || !t) {
+      edges.set(id, { ...o ?? t, from: o ? "ours" : "theirs" });
+      continue;
+    }
+    const merged = m.value(
+      b,
+      o,
+      t,
+      {
+        id: `wire:${id}`,
+        label: `The wire from ${titleOf(o.edge.from.node)} (${o.edge.from.port})`,
+        field: "",
+        owner: { edge: id }
+      },
+      0
+    );
+    edges.set(id, { ...merged, from: "both" });
+  }
+  const ends = /* @__PURE__ */ new Set();
+  for (const [id, e] of edges) {
+    const a = nodes.get(e.edge.from.node);
+    const z = nodes.get(e.edge.to.node);
+    const key = `${e.level}|${e.edge.from.node}.${e.edge.from.port}>${e.edge.to.node}.${e.edge.to.port}`;
+    if (!a || !z || a.level !== e.level || z.level !== e.level || ends.has(key)) edges.delete(id);
+    else ends.add(key);
+  }
+  const byPort = /* @__PURE__ */ new Map();
+  for (const [id, e] of edges) {
+    const key = `${e.edge.from.node}|${e.edge.from.port}`;
+    byPort.set(key, [...byPort.get(key) ?? [], id]);
+  }
+  for (const [key, ids] of byPort) {
+    if (ids.length < 2) continue;
+    const sides = new Set(ids.map((id) => edges.get(id)?.from));
+    if (!sides.has("ours") && !sides.has("theirs")) continue;
+    const [node = "", port = ""] = key.split("|");
+    const target = (s) => ids.filter((id) => (s === "ours" ? ours : theirs).edges.has(id)).map((id) => titleOf(edges.get(id)?.edge.to.node ?? "")).join(", ");
+    const side = m.conflict({
+      id: `port:${node}.${port}`,
+      kind: "wire",
+      node,
+      label: `${titleOf(node)}: port ${port} wired to ${target("ours") || "nothing"} here, to ${target("theirs") || "nothing"} in theirs`,
+      field: `ports.${port}`,
+      ours: target("ours"),
+      theirs: target("theirs")
+    });
+    const keep = side === "ours" ? ours : theirs;
+    for (const id of ids) if (!keep.edges.has(id)) edges.delete(id);
+  }
+  const annotations = /* @__PURE__ */ new Map();
+  const PLACE = ["x", "y", "width", "height"];
+  for (const id of order("annotations")) {
+    const b = base.annotations.get(id);
+    const o = ours.annotations.get(id);
+    const t = theirs.annotations.get(id);
+    if (!o && !t) continue;
+    if (b && (!o || !t)) {
+      const kept = o ?? t;
+      if (same(kept, b)) continue;
+      const side = m.conflict({
+        id: `note:${id}`,
+        kind: "removed",
+        annotation: id,
+        label: `The note "${kept.annotation.text.split("\n")[0]}": removed ${o ? "in theirs" : "here"}, changed ${o ? "here" : "in theirs"}`,
+        ours: o ? "changed" : "removed",
+        theirs: o ? "removed" : "changed"
+      });
+      if (side === "ours" === !!o) annotations.set(id, kept);
+      continue;
+    }
+    if (!o || !t) {
+      annotations.set(id, o ?? t);
+      continue;
+    }
+    const strip = (a) => a && Object.fromEntries(Object.entries(a).filter(([k]) => !PLACE.includes(k)));
+    const label = `The note "${o.annotation.text.split("\n")[0]}"`;
+    const fields = m.fields(
+      strip(b?.annotation),
+      strip(o.annotation),
+      strip(t.annotation),
+      { id: `note:${id}`, label, owner: { annotation: id } },
+      1
+    );
+    const place = {};
+    for (const k of PLACE) {
+      const v = quiet(
+        b?.annotation?.[k],
+        o.annotation[k],
+        t.annotation[k]
+      );
+      if (v !== void 0) place[k] = v;
+    }
+    const level2 = quiet(b?.level, o.level, t.level) ?? o.level;
+    annotations.set(id, { level: level2, annotation: { ...fields, ...place } });
+  }
+  for (const [id, a] of annotations)
+    if (a.level !== ROOT && !nodes.get(a.level)?.body || a.annotation.on && !nodes.has(a.annotation.on))
+      annotations.delete(id);
+  const { version: vb, ...hb } = base.doc.flow;
+  const { version: vo, ...ho } = ours.doc.flow;
+  const { version: vt, ...ht } = theirs.doc.flow;
+  const header = m.fields(
+    hb,
+    ho,
+    ht,
+    { id: "flow", label: "The flow", owner: {} },
+    2
+  );
+  const version = vo === vt ? vo : vo === vb ? vt : vt === vb ? vo : Math.max(vo, vt) + 1;
+  const ident = (d) => JSON.stringify(canonical(d));
+  const baseDecisions = new Set((base.doc.decisions ?? []).map(ident));
+  const theirsDecisions = new Set((theirs.doc.decisions ?? []).map(ident));
+  const decisions = [
+    ...(ours.doc.decisions ?? []).filter(
+      (d) => !baseDecisions.has(ident(d)) || theirsDecisions.has(ident(d))
+    ),
+    ...(theirs.doc.decisions ?? []).filter(
+      (d) => !baseDecisions.has(ident(d)) && !(ours.doc.decisions ?? []).some((x) => ident(x) === ident(d))
+    )
+  ];
+  const level = (id) => {
+    const levelNodes = [];
+    const layout = {};
+    for (const [nid, n] of nodes) {
+      if (n.level !== id) continue;
+      const node = { ...n.own };
+      if (n.body) {
+        const inner = level(nid);
+        const keys2 = new Set(n.body.keys);
+        const body = { nodes: inner.nodes, edges: inner.edges };
+        if (inner.annotations.length || keys2.has("annotations"))
+          body.annotations = inner.annotations;
+        if (Object.keys(inner.layout).length || keys2.has("layout")) body.layout = inner.layout;
+        if (n.body.boundary) body.boundary = n.body.boundary;
+        node.subflow = body;
+      }
+      levelNodes.push(node);
+      if (n.position) layout[nid] = n.position;
+    }
+    return {
+      nodes: levelNodes,
+      edges: [...edges.values()].filter((e) => e.level === id).map((e) => e.edge),
+      annotations: [...annotations.values()].filter((a) => a.level === id).map((a) => a.annotation),
+      layout
+    };
+  };
+  const top = level(ROOT);
+  const keys = /* @__PURE__ */ new Set([...ours.rootKeys, ...theirs.rootKeys]);
+  const doc = {
+    schema_version: oursDoc.schema_version,
+    flow: { ...header, version },
+    nodes: top.nodes,
+    edges: top.edges,
+    ...top.annotations.length || keys.has("annotations") ? { annotations: top.annotations } : {},
+    ...Object.keys(top.layout).length || keys.has("layout") ? { layout: top.layout } : {},
+    ...decisions.length || keys.has("decisions") ? { decisions } : {}
+  };
+  return { doc, conflicts: m.conflicts };
+}
+export {
+  mergeFlows
+};
+//# sourceMappingURL=merge.js.map

package/dist/flow/merge.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/core/flow/merge.ts"],
+  "sourcesContent": ["// AFD-283: a three-way merge of a flow, by the nodes' IDs rather than the YAML's lines. Two people\n// change one flow apart (two clones, a push through the server, a live session whose branch moved\n// on); what they changed in different places comes together on its own, and what they changed in\n// the same place is a conflict with both sides named. Pure: the merge driver, the designer and\n// the server call it with the three versions and the choices made so far.\n//\n// The flow is taken apart into its nodes, wires and Notes with the level each is on, so a step\n// one side moved into a subflow is still the same step. Fields are merged one by one (records a\n// few levels deep: a step's settings, inputs, its binding's parameters); a value both sides\n// changed differently is a conflict, kept as \"ours\" until someone chooses. Positions never\n// conflict: ours wins. Rules a merge could break on its own are conflicts too: a step one side\n// removed and the other changed or wired, and two wires on one output port.\nimport { withIds } from './completeIds';\nimport { ROOT } from './model';\nimport { canonical } from './semantic';\nimport type {\n  Annotation,\n  Decision,\n  Edge,\n  FlowDocument,\n  FlowHeader,\n  FlowNode,\n  Position,\n  SubflowBody,\n  Ulid,\n} from './types';\n\nexport type MergeSide = 'ours' | 'theirs';\n\nexport interface MergeConflict {\n  /** Stable across merges of the same versions: choices are given by it. */\n  id: string;\n  kind: 'value' | 'removed' | 'wire' | 'format';\n  /** Where and what, in words: \"Say hello: settings.timeout\". */\n  label: string;\n  node?: Ulid;\n  annotation?: Ulid;\n  edge?: Ulid;\n  /** The field, dotted (`settings.timeout`); absent for a whole step, wire or the format. */\n  field?: string;\n  base?: unknown;\n  ours?: unknown;\n  theirs?: unknown;\n}\n\nexport interface FlowMerge {\n  /** The merged flow, each conflict as its choice says (ours until chosen). */\n  doc: FlowDocument;\n  conflicts: MergeConflict[];\n}\n\n// --- taking a flow apart\n\ninterface FlatNode {\n  level: string;\n  /** The node without its inner level. */\n  own: Omit<FlowNode, 'subflow'>;\n  /** Present for a subflow: its boundary, and which keys its body had (kept as they were). */\n  body?: { boundary?: SubflowBody['boundary']; keys: string[] };\n  position?: Position;\n}\ninterface FlatEdge {\n  level: string;\n  edge: Edge;\n}\ninterface FlatAnnotation {\n  level: string;\n  annotation: Annotation;\n}\ninterface Flat {\n  doc: FlowDocument;\n  nodes: Map<Ulid, FlatNode>;\n  edges: Map<Ulid, FlatEdge>;\n  annotations: Map<Ulid, FlatAnnotation>;\n  /** Which optional keys the top level had (kept as they were). */\n  rootKeys: string[];\n}\n\nfunction flatten(doc: FlowDocument): Flat {\n  const flat: Flat = {\n    doc,\n    nodes: new Map(),\n    edges: new Map(),\n    annotations: new Map(),\n    rootKeys: ['annotations', 'layout', 'decisions'].filter((k) => k in doc),\n  };\n  const visit = (\n    level: string,\n    nodes: FlowNode[] | undefined,\n    edges: Edge[] | undefined,\n    annotations: Annotation[] | undefined,\n    layout: Record<string, Position> | undefined,\n  ) => {\n    for (const node of nodes ?? []) {\n      if (!node?.id) continue;\n      const { subflow, ...own } = node;\n      flat.nodes.set(node.id, {\n        level,\n        own,\n        ...(subflow\n          ? {\n              body: {\n                ...(subflow.boundary ? { boundary: subflow.boundary } : {}),\n                keys: Object.keys(subflow),\n              },\n            }\n          : {}),\n        ...(layout?.[node.id] ? { position: layout[node.id] } : {}),\n      });\n      if (subflow)\n        visit(node.id, subflow.nodes, subflow.edges, subflow.annotations, subflow.layout);\n    }\n    for (const edge of edges ?? []) if (edge?.id) flat.edges.set(edge.id, { level, edge });\n    for (const a of annotations ?? [])\n      if (a?.id) flat.annotations.set(a.id, { level, annotation: a });\n  };\n  visit(ROOT, doc.nodes, doc.edges, doc.annotations, doc.layout);\n  return flat;\n}\n\n// --- merging values\n\nconst same = (a: unknown, b: unknown) =>\n  JSON.stringify(canonical(a)) === JSON.stringify(canonical(b));\nconst isRecord = (v: unknown): v is Record<string, unknown> =>\n  typeof v === 'object' && v !== null && !Array.isArray(v);\n\nclass Merger {\n  readonly conflicts: MergeConflict[] = [];\n  constructor(private readonly choices: Record<string, MergeSide>) {}\n\n  pick(id: string): MergeSide {\n    return this.choices[id] ?? 'ours';\n  }\n\n  conflict(c: MergeConflict): MergeSide {\n    this.conflicts.push(c);\n    return this.pick(c.id);\n  }\n\n  /**\n   * One value, three ways. Records are merged key by key `depth` levels down; a value both sides\n   * changed differently is a conflict named by `id` (`<owner>:<field>`).\n   */\n  value(\n    base: unknown,\n    ours: unknown,\n    theirs: unknown,\n    at: { id: string; label: string; field: string; owner: Partial<MergeConflict> },\n    depth: number,\n  ): unknown {\n    if (same(ours, theirs)) return ours;\n    if (same(base, ours)) return theirs;\n    if (same(base, theirs)) return ours;\n    if (depth > 0 && isRecord(ours) && isRecord(theirs) && (base === undefined || isRecord(base))) {\n      const out: Record<string, unknown> = {};\n      for (const key of new Set([...Object.keys(ours), ...Object.keys(theirs)])) {\n        const v = this.value(\n          (base as Record<string, unknown> | undefined)?.[key],\n          ours[key],\n          theirs[key],\n          {\n            ...at,\n            id: `${at.id}.${key}`,\n            field: at.field ? `${at.field}.${key}` : key,\n          },\n          depth - 1,\n        );\n        if (v !== undefined) out[key] = v;\n      }\n      return out;\n    }\n    const side = this.conflict({\n      ...at.owner,\n      id: at.id,\n      kind: 'value',\n      label: at.field ? `${at.label}: ${at.field}` : at.label,\n      ...(at.field ? { field: at.field } : {}),\n      base,\n      ours,\n      theirs,\n    });\n    return side === 'ours' ? ours : theirs;\n  }\n\n  /** The fields of a record, each merged on its own (`depth` levels down inside each). */\n  fields(\n    base: Record<string, unknown> | undefined,\n    ours: Record<string, unknown>,\n    theirs: Record<string, unknown>,\n    at: { id: string; label: string; owner: Partial<MergeConflict> },\n    depth: number,\n  ): Record<string, unknown> {\n    const out: Record<string, unknown> = {};\n    for (const key of new Set([...Object.keys(ours), ...Object.keys(theirs)])) {\n      const v = this.value(\n        base?.[key],\n        ours[key],\n        theirs[key],\n        { ...at, id: `${at.id}:${key}`, field: key },\n        depth,\n      );\n      if (v !== undefined) out[key] = v;\n    }\n    return out;\n  }\n}\n\n/** A position, or another value that never conflicts: the side that moved it, else ours. */\nfunction quiet<T>(base: T | undefined, ours: T | undefined, theirs: T | undefined): T | undefined {\n  return same(base, ours) ? theirs : ours;\n}\n\n// --- the merge\n\n/**\n * Merges what `ours` and `theirs` changed since `base`. `choices` settle conflicts by id (ours\n * when not given). Flows without IDs are matched by the IDs their keys give (Complete IDs).\n */\nexport function mergeFlows(\n  baseDoc: FlowDocument,\n  oursDoc: FlowDocument,\n  theirsDoc: FlowDocument,\n  choices: Record<string, MergeSide> = {},\n): FlowMerge {\n  const m = new Merger(choices);\n  if (oursDoc.schema_version !== theirsDoc.schema_version) {\n    const side = m.conflict({\n      id: 'format',\n      kind: 'format',\n      label: `The flow's format: ${oursDoc.schema_version} here, ${theirsDoc.schema_version} in theirs (upgrade both first)`,\n      ours: oursDoc.schema_version,\n      theirs: theirsDoc.schema_version,\n    });\n    return { doc: side === 'ours' ? oursDoc : theirsDoc, conflicts: m.conflicts };\n  }\n  const base = flatten(withIds(baseDoc));\n  const ours = flatten(withIds(oursDoc));\n  const theirs = flatten(withIds(theirsDoc));\n  const titleOf = (id: Ulid) =>\n    (ours.nodes.get(id) ?? theirs.nodes.get(id) ?? base.nodes.get(id))?.own.title ?? id;\n\n  // What a side did to a step, its wires, or anything inside it: a removal by the other side then\n  // loses work and is a conflict.\n  const touched = (side: Flat, id: Ulid, seen = new Set<Ulid>()): boolean => {\n    if (seen.has(id)) return false;\n    seen.add(id);\n    const now = side.nodes.get(id);\n    const was = base.nodes.get(id);\n    if (!now) return false;\n    if (!was || !same(now.own, was.own) || now.level !== was.level || !same(now.body, was.body))\n      return true;\n    for (const [eid, e] of side.edges)\n      if ((e.edge.from.node === id || e.edge.to.node === id) && !same(e, base.edges.get(eid)))\n        return true;\n    for (const [aid, a] of side.annotations)\n      if ((a.annotation.on === id || a.level === id) && !same(a, base.annotations.get(aid)))\n        return true;\n    for (const [cid, c] of side.nodes) if (c.level === id && touched(side, cid, seen)) return true;\n    return false;\n  };\n\n  // Steps.\n  const order = (key: 'nodes' | 'edges' | 'annotations') => [\n    ...new Set([...ours[key].keys(), ...theirs[key].keys(), ...base[key].keys()]),\n  ];\n  const nodes = new Map<Ulid, FlatNode>();\n  for (const id of order('nodes')) {\n    const b = base.nodes.get(id);\n    const o = ours.nodes.get(id);\n    const t = theirs.nodes.get(id);\n    if (!o && !t) continue;\n    if (b && (!o || !t)) {\n      // One side removed it: gone, unless the other side changed it meanwhile.\n      const kept = (o ?? t) as FlatNode;\n      if (!touched(o ? ours : theirs, id)) continue;\n      const side = m.conflict({\n        id: `node:${id}`,\n        kind: 'removed',\n        node: id,\n        label: `${titleOf(id)}: removed ${o ? 'in theirs' : 'here'}, changed ${o ? 'here' : 'in theirs'}`,\n        ours: o ? 'changed' : 'removed',\n        theirs: o ? 'removed' : 'changed',\n      });\n      if ((side === 'ours') === !!o) nodes.set(id, kept);\n      continue;\n    }\n    if (!o || !t) {\n      nodes.set(id, (o ?? t) as FlatNode);\n      continue;\n    }\n    const owner = { node: id };\n    const label = titleOf(id);\n    const own = m.fields(\n      b?.own as Record<string, unknown> | undefined,\n      o.own as Record<string, unknown>,\n      t.own as Record<string, unknown>,\n      { id: `node:${id}`, label, owner },\n      3,\n    ) as FlatNode['own'];\n    const level = m.value(\n      b?.level,\n      o.level,\n      t.level,\n      { id: `node:${id}:level`, label, field: 'level (moved into another subflow)', owner },\n      0,\n    ) as string;\n    let body: FlatNode['body'];\n    const hasBody = m.value(\n      !!b?.body,\n      !!o.body,\n      !!t.body,\n      { id: `node:${id}:subflow`, label, field: 'subflow', owner },\n      0,\n    );\n    if (hasBody) {\n      const boundary = m.value(\n        b?.body?.boundary,\n        o.body?.boundary,\n        t.body?.boundary,\n        { id: `node:${id}:boundary`, label, field: 'boundary', owner },\n        2,\n      ) as SubflowBody['boundary'];\n      body = {\n        ...(boundary ? { boundary } : {}),\n        keys: [...new Set([...(o.body?.keys ?? []), ...(t.body?.keys ?? [])])],\n      };\n    }\n    const position = quiet(b?.position, o.position, t.position);\n    nodes.set(id, {\n      level,\n      own,\n      ...(body ? { body } : {}),\n      ...(position ? { position } : {}),\n    });\n  }\n  // A step whose subflow is gone goes with it.\n  for (let again = true; again; ) {\n    again = false;\n    for (const [id, n] of nodes)\n      if (n.level !== ROOT && !nodes.get(n.level)?.body) {\n        nodes.delete(id);\n        again = true;\n      }\n  }\n\n  // Wires.\n  const edges = new Map<Ulid, FlatEdge & { from: MergeSide | 'both' }>();\n  for (const id of order('edges')) {\n    const b = base.edges.get(id);\n    const o = ours.edges.get(id);\n    const t = theirs.edges.get(id);\n    if (!o && !t) continue;\n    if (b && (!o || !t)) {\n      const kept = (o ?? t) as FlatEdge;\n      if (same(kept, b)) continue;\n      // Removed on one side, rewired on the other.\n      const side = m.conflict({\n        id: `wire:${id}`,\n        kind: 'wire',\n        edge: id,\n        label: `The wire from ${titleOf(kept.edge.from.node)} (${kept.edge.from.port}): removed ${o ? 'in theirs' : 'here'}, changed ${o ? 'here' : 'in theirs'}`,\n        ours: o ? kept.edge : undefined,\n        theirs: o ? undefined : kept.edge,\n      });\n      if ((side === 'ours') === !!o) edges.set(id, { ...kept, from: o ? 'ours' : 'theirs' });\n      continue;\n    }\n    if (!o || !t) {\n      edges.set(id, { ...((o ?? t) as FlatEdge), from: o ? 'ours' : 'theirs' });\n      continue;\n    }\n    const merged = m.value(\n      b,\n      o,\n      t,\n      {\n        id: `wire:${id}`,\n        label: `The wire from ${titleOf(o.edge.from.node)} (${o.edge.from.port})`,\n        field: '',\n        owner: { edge: id },\n      },\n      0,\n    ) as FlatEdge;\n    edges.set(id, { ...merged, from: 'both' });\n  }\n  // Wires whose ends are gone or now on another level go; the same wire added twice is one.\n  const ends = new Set<string>();\n  for (const [id, e] of edges) {\n    const a = nodes.get(e.edge.from.node);\n    const z = nodes.get(e.edge.to.node);\n    const key = `${e.level}|${e.edge.from.node}.${e.edge.from.port}>${e.edge.to.node}.${e.edge.to.port}`;\n    if (!a || !z || a.level !== e.level || z.level !== e.level || ends.has(key)) edges.delete(id);\n    else ends.add(key);\n  }\n  // One wire per output port: two from different sides are a conflict.\n  const byPort = new Map<string, Ulid[]>();\n  for (const [id, e] of edges) {\n    const key = `${e.edge.from.node}|${e.edge.from.port}`;\n    byPort.set(key, [...(byPort.get(key) ?? []), id]);\n  }\n  for (const [key, ids] of byPort) {\n    if (ids.length < 2) continue;\n    const sides = new Set(ids.map((id) => edges.get(id)?.from));\n    if (!sides.has('ours') && !sides.has('theirs')) continue;\n    const [node = '', port = ''] = key.split('|');\n    const target = (s: MergeSide) =>\n      ids\n        .filter((id) => (s === 'ours' ? ours : theirs).edges.has(id))\n        .map((id) => titleOf(edges.get(id)?.edge.to.node ?? ''))\n        .join(', ');\n    const side = m.conflict({\n      id: `port:${node}.${port}`,\n      kind: 'wire',\n      node,\n      label: `${titleOf(node)}: port ${port} wired to ${target('ours') || 'nothing'} here, to ${target('theirs') || 'nothing'} in theirs`,\n      field: `ports.${port}`,\n      ours: target('ours'),\n      theirs: target('theirs'),\n    });\n    const keep = side === 'ours' ? ours : theirs;\n    for (const id of ids) if (!keep.edges.has(id)) edges.delete(id);\n  }\n\n  // Notes, Sections and Text.\n  const annotations = new Map<Ulid, FlatAnnotation>();\n  const PLACE = ['x', 'y', 'width', 'height'];\n  for (const id of order('annotations')) {\n    const b = base.annotations.get(id);\n    const o = ours.annotations.get(id);\n    const t = theirs.annotations.get(id);\n    if (!o && !t) continue;\n    if (b && (!o || !t)) {\n      const kept = (o ?? t) as FlatAnnotation;\n      if (same(kept, b)) continue;\n      const side = m.conflict({\n        id: `note:${id}`,\n        kind: 'removed',\n        annotation: id,\n        label: `The note \"${kept.annotation.text.split('\\n')[0]}\": removed ${o ? 'in theirs' : 'here'}, changed ${o ? 'here' : 'in theirs'}`,\n        ours: o ? 'changed' : 'removed',\n        theirs: o ? 'removed' : 'changed',\n      });\n      if ((side === 'ours') === !!o) annotations.set(id, kept);\n      continue;\n    }\n    if (!o || !t) {\n      annotations.set(id, (o ?? t) as FlatAnnotation);\n      continue;\n    }\n    const strip = (a?: Annotation) =>\n      a && Object.fromEntries(Object.entries(a).filter(([k]) => !PLACE.includes(k)));\n    const label = `The note \"${o.annotation.text.split('\\n')[0]}\"`;\n    const fields = m.fields(\n      strip(b?.annotation),\n      strip(o.annotation) as Record<string, unknown>,\n      strip(t.annotation) as Record<string, unknown>,\n      { id: `note:${id}`, label, owner: { annotation: id } },\n      1,\n    );\n    const place: Record<string, unknown> = {};\n    for (const k of PLACE) {\n      const v = quiet(\n        (b?.annotation as unknown as Record<string, unknown> | undefined)?.[k],\n        (o.annotation as unknown as Record<string, unknown>)[k],\n        (t.annotation as unknown as Record<string, unknown>)[k],\n      );\n      if (v !== undefined) place[k] = v;\n    }\n    const level = quiet(b?.level, o.level, t.level) ?? o.level;\n    annotations.set(id, { level, annotation: { ...fields, ...place } as unknown as Annotation });\n  }\n  for (const [id, a] of annotations)\n    if (\n      (a.level !== ROOT && !nodes.get(a.level)?.body) ||\n      (a.annotation.on && !nodes.has(a.annotation.on))\n    )\n      annotations.delete(id);\n\n  // The flow itself: its fields; its version moves on when both sides moved it.\n  const { version: vb, ...hb } = base.doc.flow;\n  const { version: vo, ...ho } = ours.doc.flow;\n  const { version: vt, ...ht } = theirs.doc.flow;\n  const header = m.fields(\n    hb as Record<string, unknown>,\n    ho as Record<string, unknown>,\n    ht as Record<string, unknown>,\n    { id: 'flow', label: 'The flow', owner: {} },\n    2,\n  ) as Omit<FlowHeader, 'version'>;\n  const version = vo === vt ? vo : vo === vb ? vt : vt === vb ? vo : Math.max(vo, vt) + 1;\n\n  // Decisions: a set; what a side added is in, what a side took out is out.\n  const ident = (d: Decision) => JSON.stringify(canonical(d));\n  const baseDecisions = new Set((base.doc.decisions ?? []).map(ident));\n  const theirsDecisions = new Set((theirs.doc.decisions ?? []).map(ident));\n  const decisions = [\n    ...(ours.doc.decisions ?? []).filter(\n      (d) => !baseDecisions.has(ident(d)) || theirsDecisions.has(ident(d)),\n    ),\n    ...(theirs.doc.decisions ?? []).filter(\n      (d) =>\n        !baseDecisions.has(ident(d)) &&\n        !(ours.doc.decisions ?? []).some((x) => ident(x) === ident(d)),\n    ),\n  ];\n\n  // Put it back together, level by level, in ours's order with theirs's new parts after.\n  const level = (id: string) => {\n    const levelNodes: FlowNode[] = [];\n    const layout: Record<string, Position> = {};\n    for (const [nid, n] of nodes) {\n      if (n.level !== id) continue;\n      const node = { ...n.own } as FlowNode;\n      if (n.body) {\n        const inner = level(nid);\n        const keys = new Set(n.body.keys);\n        const body: SubflowBody = { nodes: inner.nodes, edges: inner.edges };\n        if (inner.annotations.length || keys.has('annotations'))\n          body.annotations = inner.annotations;\n        if (Object.keys(inner.layout).length || keys.has('layout')) body.layout = inner.layout;\n        if (n.body.boundary) body.boundary = n.body.boundary;\n        node.subflow = body;\n      }\n      levelNodes.push(node);\n      if (n.position) layout[nid] = n.position;\n    }\n    return {\n      nodes: levelNodes,\n      edges: [...edges.values()].filter((e) => e.level === id).map((e) => e.edge),\n      annotations: [...annotations.values()].filter((a) => a.level === id).map((a) => a.annotation),\n      layout,\n    };\n  };\n  const top = level(ROOT);\n  const keys = new Set([...ours.rootKeys, ...theirs.rootKeys]);\n  const doc: FlowDocument = {\n    schema_version: oursDoc.schema_version,\n    flow: { ...header, version } as FlowHeader,\n    nodes: top.nodes,\n    edges: top.edges,\n    ...(top.annotations.length || keys.has('annotations') ? { annotations: top.annotations } : {}),\n    ...(Object.keys(top.layout).length || keys.has('layout') ? { layout: top.layout } : {}),\n    ...(decisions.length || keys.has('decisions') ? { decisions } : {}),\n  };\n  return { doc, conflicts: m.conflicts };\n}\n"],
+  "mappings": "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",
+  "names": ["level", "keys"]
+}

package/dist/flow/mergeText.d.ts

@@ -0,0 +1,3 @@
+import type { FlowDocument } from './types';
+/** `text` (ours) rewritten to say `doc`. */
+export declare function writeMergedFlow(text: string, doc: FlowDocument): string;

package/dist/flow/mergeText.js

@@ -0,0 +1,71 @@
+import {
+  canonical
+} from "../chunks/chunk-TG3C3GIL.js";
+import "../chunks/chunk-VG3RKETK.js";
+import {
+  YamlTransaction
+} from "../chunks/chunk-3Z2U3LN7.js";
+import "../chunks/chunk-GHG3VINX.js";
+import {
+  deleteKey,
+  insertItem,
+  removeItem,
+  setIn
+} from "../chunks/chunk-5TUAMVIV.js";
+import {
+  parseYaml
+} from "../chunks/chunk-45CE2RUH.js";
+import "../chunks/chunk-E2YZJWO7.js";
+import "../chunks/chunk-AGWQ3ANE.js";
+
+// src/core/flow/mergeText.ts
+var same = (a, b) => JSON.stringify(canonical(a)) === JSON.stringify(canonical(b));
+var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+var idOf = (v) => isRecord(v) && typeof v.id === "string" ? v.id : void 0;
+var byId = (list) => list.length > 0 && list.every((v) => idOf(v) !== void 0);
+function writeMergedFlow(text, doc) {
+  const tx = new YamlTransaction(text);
+  const current = parseYaml(text).doc.toJS();
+  sync(tx, [], current, doc);
+  return tx.text;
+}
+function sync(tx, path, was, now) {
+  if (same(was, now)) return;
+  if (isRecord(was) && isRecord(now)) {
+    for (const key of Object.keys(was))
+      if (!(key in now) || now[key] === void 0) tx.apply((f) => deleteKey(f, path, key));
+    for (const [key, value] of Object.entries(now)) {
+      if (value === void 0) continue;
+      if (key in was) sync(tx, [...path, key], was[key], value);
+      else tx.apply((f) => setIn(f, [...path, key], value));
+    }
+    return;
+  }
+  if (Array.isArray(was) && Array.isArray(now) && byId(was) && byId(now)) {
+    const wanted = new Set(now.map(idOf));
+    const list = [...was];
+    for (let i = list.length - 1; i >= 0; i--)
+      if (!wanted.has(idOf(list[i]))) {
+        tx.apply((f) => removeItem(f, path, i));
+        list.splice(i, 1);
+      }
+    now.forEach((item, i) => {
+      const at = list.findIndex((x) => idOf(x) === idOf(item));
+      if (at >= 0) {
+        sync(tx, [...path, at], list[at], item);
+        return;
+      }
+      const index = Math.min(i, list.length);
+      tx.apply(
+        (f) => insertItem(f, path, index === list.length ? "end" : index, item)
+      );
+      list.splice(index, 0, item);
+    });
+    return;
+  }
+  tx.apply((f) => setIn(f, path, now));
+}
+export {
+  writeMergedFlow
+};
+//# sourceMappingURL=mergeText.js.map

package/dist/flow/mergeText.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/core/flow/mergeText.ts"],
+  "sourcesContent": ["// AFD-283: a merged flow written over \"ours\" text with the fewest edits, so its comments, quoting\n// and order stay where they were and the file's diff shows only what the merge brought in. Lists\n// of things with IDs (steps, wires, notes) are matched by ID; anything else changed is replaced.\n\nimport { deleteKey, insertItem, removeItem, setIn } from '../yaml/ops';\nimport { type Path, parseYaml } from '../yaml/parse';\nimport type { YamlValue } from '../yaml/render';\nimport { YamlTransaction } from '../yaml/transaction';\nimport { canonical } from './semantic';\nimport type { FlowDocument } from './types';\n\nconst same = (a: unknown, b: unknown) =>\n  JSON.stringify(canonical(a)) === JSON.stringify(canonical(b));\nconst isRecord = (v: unknown): v is Record<string, unknown> =>\n  typeof v === 'object' && v !== null && !Array.isArray(v);\nconst idOf = (v: unknown) => (isRecord(v) && typeof v.id === 'string' ? v.id : undefined);\nconst byId = (list: unknown[]) => list.length > 0 && list.every((v) => idOf(v) !== undefined);\n\n/** `text` (ours) rewritten to say `doc`. */\nexport function writeMergedFlow(text: string, doc: FlowDocument): string {\n  const tx = new YamlTransaction(text);\n  const current = parseYaml(text).doc.toJS() as unknown;\n  sync(tx, [], current, doc);\n  return tx.text;\n}\n\nfunction sync(tx: YamlTransaction, path: Path, was: unknown, now: unknown): void {\n  if (same(was, now)) return;\n  if (isRecord(was) && isRecord(now)) {\n    for (const key of Object.keys(was))\n      if (!(key in now) || now[key] === undefined) tx.apply((f) => deleteKey(f, path, key));\n    for (const [key, value] of Object.entries(now)) {\n      if (value === undefined) continue;\n      if (key in was) sync(tx, [...path, key], was[key], value);\n      else tx.apply((f) => setIn(f, [...path, key], value as YamlValue));\n    }\n    return;\n  }\n  if (Array.isArray(was) && Array.isArray(now) && byId(was) && byId(now)) {\n    const wanted = new Set(now.map(idOf));\n    // Removals first, from the end, so the earlier indexes hold.\n    const list = [...was];\n    for (let i = list.length - 1; i >= 0; i--)\n      if (!wanted.has(idOf(list[i]))) {\n        tx.apply((f) => removeItem(f, path, i));\n        list.splice(i, 1);\n      }\n    now.forEach((item, i) => {\n      const at = list.findIndex((x) => idOf(x) === idOf(item));\n      if (at >= 0) {\n        sync(tx, [...path, at], list[at], item);\n        return;\n      }\n      const index = Math.min(i, list.length);\n      tx.apply((f) =>\n        insertItem(f, path, index === list.length ? 'end' : index, item as YamlValue),\n      );\n      list.splice(index, 0, item);\n    });\n    return;\n  }\n  tx.apply((f) => setIn(f, path, now as YamlValue));\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;AAWA,IAAM,OAAO,CAAC,GAAY,MACxB,KAAK,UAAU,UAAU,CAAC,CAAC,MAAM,KAAK,UAAU,UAAU,CAAC,CAAC;AAC9D,IAAM,WAAW,CAAC,MAChB,OAAO,MAAM,YAAY,MAAM,QAAQ,CAAC,MAAM,QAAQ,CAAC;AACzD,IAAM,OAAO,CAAC,MAAgB,SAAS,CAAC,KAAK,OAAO,EAAE,OAAO,WAAW,EAAE,KAAK;AAC/E,IAAM,OAAO,CAAC,SAAoB,KAAK,SAAS,KAAK,KAAK,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,MAAS;AAGrF,SAAS,gBAAgB,MAAc,KAA2B;AACvE,QAAM,KAAK,IAAI,gBAAgB,IAAI;AACnC,QAAM,UAAU,UAAU,IAAI,EAAE,IAAI,KAAK;AACzC,OAAK,IAAI,CAAC,GAAG,SAAS,GAAG;AACzB,SAAO,GAAG;AACZ;AAEA,SAAS,KAAK,IAAqB,MAAY,KAAc,KAAoB;AAC/E,MAAI,KAAK,KAAK,GAAG,EAAG;AACpB,MAAI,SAAS,GAAG,KAAK,SAAS,GAAG,GAAG;AAClC,eAAW,OAAO,OAAO,KAAK,GAAG;AAC/B,UAAI,EAAE,OAAO,QAAQ,IAAI,GAAG,MAAM,OAAW,IAAG,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC;AACtF,eAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,GAAG,GAAG;AAC9C,UAAI,UAAU,OAAW;AACzB,UAAI,OAAO,IAAK,MAAK,IAAI,CAAC,GAAG,MAAM,GAAG,GAAG,IAAI,GAAG,GAAG,KAAK;AAAA,UACnD,IAAG,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,GAAG,MAAM,GAAG,GAAG,KAAkB,CAAC;AAAA,IACnE;AACA;AAAA,EACF;AACA,MAAI,MAAM,QAAQ,GAAG,KAAK,MAAM,QAAQ,GAAG,KAAK,KAAK,GAAG,KAAK,KAAK,GAAG,GAAG;AACtE,UAAM,SAAS,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC;AAEpC,UAAM,OAAO,CAAC,GAAG,GAAG;AACpB,aAAS,IAAI,KAAK,SAAS,GAAG,KAAK,GAAG;AACpC,UAAI,CAAC,OAAO,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG;AAC9B,WAAG,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC;AACtC,aAAK,OAAO,GAAG,CAAC;AAAA,MAClB;AACF,QAAI,QAAQ,CAAC,MAAM,MAAM;AACvB,YAAM,KAAK,KAAK,UAAU,CAAC,MAAM,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC;AACvD,UAAI,MAAM,GAAG;AACX,aAAK,IAAI,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK,EAAE,GAAG,IAAI;AACtC;AAAA,MACF;AACA,YAAM,QAAQ,KAAK,IAAI,GAAG,KAAK,MAAM;AACrC,SAAG;AAAA,QAAM,CAAC,MACR,WAAW,GAAG,MAAM,UAAU,KAAK,SAAS,QAAQ,OAAO,IAAiB;AAAA,MAC9E;AACA,WAAK,OAAO,OAAO,GAAG,IAAI;AAAA,IAC5B,CAAC;AACD;AAAA,EACF;AACA,KAAG,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,GAAgB,CAAC;AAClD;",
+  "names": []
+}

package/dist/flow/valueText.d.ts

@@ -0,0 +1,6 @@
+/** What a typed line means: a list or map in YAML flow syntax, else its text. */
+export declare function valueOfText(text: string): unknown;
+/** The same value, whatever the text: a field keeps what was typed while it means this. */
+export declare function sameValue(a: unknown, b: unknown): boolean;
+/** The line that means `value` again in `valueOfText`, or undefined when it needs several lines. */
+export declare function textOfValue(value: unknown): string | undefined;

package/dist/flow/valueText.js

@@ -0,0 +1,56 @@
+// src/core/flow/valueText.ts
+import { parse, stringify } from "yaml";
+var TEMPLATE = /^\s*\{[{%]/;
+var QUOTED = /^(".*"|'.*')$/s;
+var isRecord = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
+function yaml(text) {
+  try {
+    return parse(text);
+  } catch {
+    return void 0;
+  }
+}
+function valueOfText(text) {
+  const t = text.trim();
+  if (TEMPLATE.test(t)) return text;
+  if (t.startsWith("[") || t.startsWith("{")) {
+    const v = yaml(t);
+    if (Array.isArray(v) || isRecord(v)) return v;
+    return text;
+  }
+  if (QUOTED.test(t)) {
+    const v = yaml(t);
+    if (typeof v === "string" && needsQuotes(v.trim())) return v;
+  }
+  return text;
+}
+function needsQuotes(t) {
+  if (QUOTED.test(t)) return /^.\s*[[{]/.test(t);
+  if (TEMPLATE.test(t) || !/^[[{]/.test(t)) return false;
+  const v = yaml(t);
+  return Array.isArray(v) || isRecord(v);
+}
+function sameValue(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+function textOfValue(value) {
+  if (value === void 0 || value === null) return "";
+  if (typeof value === "string") {
+    return needsQuotes(value.trim()) ? JSON.stringify(value) : value;
+  }
+  if (Array.isArray(value) || isRecord(value)) {
+    const line = stringify(value, {
+      collectionStyle: "flow",
+      flowCollectionPadding: false,
+      lineWidth: 0
+    }).trim();
+    return line.includes("\n") ? void 0 : line;
+  }
+  return String(value);
+}
+export {
+  sameValue,
+  textOfValue,
+  valueOfText
+};
+//# sourceMappingURL=valueText.js.map

package/dist/flow/valueText.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../../src/core/flow/valueText.ts"],
+  "sourcesContent": ["// AFD-286: a value typed in a one-line field, read the way YAML (and so Ansible) reads it, and\n// shown back so it reads the same again. Unquoted `[a, b]` is a list and `{k: v}` a map; a quoted\n// value is the text inside the quotes; `{{ ... }}` and `{% ... %}` stay templates. Anything else\n// is text, as the field always kept it (numbers too: Ansible converts where it needs).\nimport { parse, stringify } from 'yaml';\n\nconst TEMPLATE = /^\\s*\\{[{%]/;\nconst QUOTED = /^(\".*\"|'.*')$/s;\nconst isRecord = (v: unknown): v is Record<string, unknown> =>\n  typeof v === 'object' && v !== null && !Array.isArray(v);\n\nfunction yaml(text: string): unknown {\n  try {\n    return parse(text);\n  } catch {\n    return undefined;\n  }\n}\n\n/** What a typed line means: a list or map in YAML flow syntax, else its text. */\nexport function valueOfText(text: string): unknown {\n  const t = text.trim();\n  if (TEMPLATE.test(t)) return text;\n  if (t.startsWith('[') || t.startsWith('{')) {\n    const v = yaml(t);\n    if (Array.isArray(v) || isRecord(v)) return v;\n    return text;\n  }\n  // A quoted list or map is the text inside the quotes: the way to keep \"[a, b]\" as text. Other\n  // quotes stay as typed (they always did).\n  if (QUOTED.test(t)) {\n    const v = yaml(t);\n    if (typeof v === 'string' && needsQuotes(v.trim())) return v;\n  }\n  return text;\n}\n\n/** Text that `valueOfText` would not give back as it is: quoted so it reads as text again. */\nfunction needsQuotes(t: string): boolean {\n  if (QUOTED.test(t)) return /^.\\s*[[{]/.test(t);\n  if (TEMPLATE.test(t) || !/^[[{]/.test(t)) return false;\n  const v = yaml(t);\n  return Array.isArray(v) || isRecord(v);\n}\n\n/** The same value, whatever the text: a field keeps what was typed while it means this. */\nexport function sameValue(a: unknown, b: unknown): boolean {\n  return JSON.stringify(a) === JSON.stringify(b);\n}\n\n/** The line that means `value` again in `valueOfText`, or undefined when it needs several lines. */\nexport function textOfValue(value: unknown): string | undefined {\n  if (value === undefined || value === null) return '';\n  if (typeof value === 'string') {\n    return needsQuotes(value.trim()) ? JSON.stringify(value) : value;\n  }\n  if (Array.isArray(value) || isRecord(value)) {\n    const line = stringify(value, {\n      collectionStyle: 'flow',\n      flowCollectionPadding: false,\n      lineWidth: 0,\n    }).trim();\n    return line.includes('\\n') ? undefined : line;\n  }\n  return String(value);\n}\n"],
+  "mappings": ";AAIA,SAAS,OAAO,iBAAiB;AAEjC,IAAM,WAAW;AACjB,IAAM,SAAS;AACf,IAAM,WAAW,CAAC,MAChB,OAAO,MAAM,YAAY,MAAM,QAAQ,CAAC,MAAM,QAAQ,CAAC;AAEzD,SAAS,KAAK,MAAuB;AACnC,MAAI;AACF,WAAO,MAAM,IAAI;AAAA,EACnB,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAGO,SAAS,YAAY,MAAuB;AACjD,QAAM,IAAI,KAAK,KAAK;AACpB,MAAI,SAAS,KAAK,CAAC,EAAG,QAAO;AAC7B,MAAI,EAAE,WAAW,GAAG,KAAK,EAAE,WAAW,GAAG,GAAG;AAC1C,UAAM,IAAI,KAAK,CAAC;AAChB,QAAI,MAAM,QAAQ,CAAC,KAAK,SAAS,CAAC,EAAG,QAAO;AAC5C,WAAO;AAAA,EACT;AAGA,MAAI,OAAO,KAAK,CAAC,GAAG;AAClB,UAAM,IAAI,KAAK,CAAC;AAChB,QAAI,OAAO,MAAM,YAAY,YAAY,EAAE,KAAK,CAAC,EAAG,QAAO;AAAA,EAC7D;AACA,SAAO;AACT;AAGA,SAAS,YAAY,GAAoB;AACvC,MAAI,OAAO,KAAK,CAAC,EAAG,QAAO,YAAY,KAAK,CAAC;AAC7C,MAAI,SAAS,KAAK,CAAC,KAAK,CAAC,QAAQ,KAAK,CAAC,EAAG,QAAO;AACjD,QAAM,IAAI,KAAK,CAAC;AAChB,SAAO,MAAM,QAAQ,CAAC,KAAK,SAAS,CAAC;AACvC;AAGO,SAAS,UAAU,GAAY,GAAqB;AACzD,SAAO,KAAK,UAAU,CAAC,MAAM,KAAK,UAAU,CAAC;AAC/C;AAGO,SAAS,YAAY,OAAoC;AAC9D,MAAI,UAAU,UAAa,UAAU,KAAM,QAAO;AAClD,MAAI,OAAO,UAAU,UAAU;AAC7B,WAAO,YAAY,MAAM,KAAK,CAAC,IAAI,KAAK,UAAU,KAAK,IAAI;AAAA,EAC7D;AACA,MAAI,MAAM,QAAQ,KAAK,KAAK,SAAS,KAAK,GAAG;AAC3C,UAAM,OAAO,UAAU,OAAO;AAAA,MAC5B,iBAAiB;AAAA,MACjB,uBAAuB;AAAA,MACvB,WAAW;AAAA,IACb,CAAC,EAAE,KAAK;AACR,WAAO,KAAK,SAAS,IAAI,IAAI,SAAY;AAAA,EAC3C;AACA,SAAO,OAAO,KAAK;AACrB;",
+  "names": []
+}

package/dist/import/outline.js

@@ -4,13 +4,13 @@ import {
   paged,
   sourceOutline,
   taskBinding
-} from "../chunks/chunk-2HMLC2AO.js";
-import "../chunks/chunk-QMIXDOU6.js";
+} from "../chunks/chunk-TPRZZHXA.js";
+import "../chunks/chunk-5XGAGNH5.js";
 import "../chunks/chunk-IYVI5MSS.js";
-import "../chunks/chunk-6M3OG3E4.js";
+import "../chunks/chunk-H7Z2FBRD.js";
+import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-5CD65KH3.js";
 import "../chunks/chunk-6L43PFIN.js";
-import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-PDUQ3KMW.js";
 import "../chunks/chunk-BAZIS67B.js";
 import "../chunks/chunk-TC7FOG4T.js";

package/dist/import/playbook.js

@@ -3,10 +3,10 @@ import {
   flatPlays,
   importPlaybook,
   mainPlay
-} from "../chunks/chunk-6M3OG3E4.js";
+} from "../chunks/chunk-H7Z2FBRD.js";
+import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-5CD65KH3.js";
 import "../chunks/chunk-6L43PFIN.js";
-import "../chunks/chunk-LNFMYJUJ.js";
 import "../chunks/chunk-PDUQ3KMW.js";
 import "../chunks/chunk-BAZIS67B.js";
 import "../chunks/chunk-TC7FOG4T.js";

package/dist/import/source.js

@@ -2,9 +2,9 @@ import {
   parseKv,
   readPlaybook,
   scanFolder
-} from "../chunks/chunk-QMIXDOU6.js";
-import "../chunks/chunk-6L43PFIN.js";
+} from "../chunks/chunk-5XGAGNH5.js";
 import "../chunks/chunk-LNFMYJUJ.js";
+import "../chunks/chunk-6L43PFIN.js";
 import "../chunks/chunk-TC7FOG4T.js";
 import "../chunks/chunk-OEQXGULI.js";
 import "../chunks/chunk-VHCA4A7K.js";

package/dist/lens/index.js

@@ -1,16 +1,6 @@
-import {
-  dataLens
-} from "../chunks/chunk-BXHI5EQM.js";
 import {
   timingLens
 } from "../chunks/chunk-VEYR53BH.js";
-import {
-  accessLens
-} from "../chunks/chunk-WS52COFG.js";
-import {
-  declaredTarget,
-  inventoryLens
-} from "../chunks/chunk-KWEFZFLC.js";
 import {
   LENSES
 } from "../chunks/chunk-XOPGOWNQ.js";
@@ -20,6 +10,16 @@ import {
 import {
   codeLens
 } from "../chunks/chunk-4N3AN5CJ.js";
+import {
+  dataLens
+} from "../chunks/chunk-BXHI5EQM.js";
+import {
+  accessLens
+} from "../chunks/chunk-WS52COFG.js";
+import {
+  declaredTarget,
+  inventoryLens
+} from "../chunks/chunk-KWEFZFLC.js";
 import {
   incoming,
   title

package/dist/messageCheck.js

@@ -35,6 +35,8 @@ function messageProblem(m) {
       return isMap(m.request) ? void 0 : "scenarioEdit: bad request";
     case "runScenarios":
       return strList(m.names) ? void 0 : "runScenarios: bad names";
+    case "mergeChoose":
+      return str(m.id, 500) && (m.side === "ours" || m.side === "theirs") ? void 0 : "mergeChoose: bad choice";
     case "lens":
       return m.lens === null || str(m.lens, 64) ? void 0 : "lens: bad lens";
     default:

package/dist/messageCheck.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/core/messageCheck.ts"],
-  "sourcesContent": ["// AFD-165: the host checks what a designer webview sends before acting on it. The webview runs\n// under a strict CSP with no HTML sinks, so a compromised page is unlikely; these checks keep one\n// from turning a message into a git option, a file outside the workspace or a probe argument.\n// Shape only: what a value means (a known ref, a path inside the folder) is checked where it is\n// used.\n\nconst isMap = (v: unknown): v is Record<string, unknown> =>\n  !!v && typeof v === 'object' && !Array.isArray(v);\n\nconst str = (v: unknown, max = 4096): v is string => typeof v === 'string' && v.length <= max;\nconst optNum = (v: unknown) => v === undefined || (typeof v === 'number' && Number.isFinite(v));\nconst strList = (v: unknown) =>\n  v === undefined || (Array.isArray(v) && v.every((x) => str(x, 200)));\n\n/** A plugin name the probe looks up: dotted words, no option or path syntax. */\nexport const PLUGIN_NAME = /^[A-Za-z0-9_][A-Za-z0-9_.]{0,199}$/;\n\n/** A git revision a designer may ask to compare with: never an option (`-\u2026`), no spaces. */\nexport const GIT_REF = /^[A-Za-z0-9_][A-Za-z0-9_./@{}^~-]{0,199}$/;\n\nconst CATALOG_OPS = new Set(['search', 'doc', 'roles', 'playbooks', 'rebuild']);\n\nfunction catalogProblem(r: unknown): string | undefined {\n  if (!isMap(r) || !CATALOG_OPS.has(String(r.op))) return 'catalog: unknown request';\n  if (r.op === 'search' && (!str(r.query, 500) || !strList(r.types))) return 'catalog: bad search';\n  if (r.op === 'doc' && (!str(r.fqcn) || !PLUGIN_NAME.test(r.fqcn)))\n    return 'catalog: not a plugin name';\n  return undefined;\n}\n\n/** Why a message from the webview is refused, or undefined when its shape is right. */\nexport function messageProblem(m: unknown): string | undefined {\n  if (!isMap(m) || !str(m.type, 64)) return 'not a designer message';\n  if ('reqId' in m && !optNum(m.reqId)) return `${m.type}: bad reqId`;\n  switch (m.type) {\n    case 'openCode':\n      return str(m.path) && m.path !== '' && optNum(m.line) ? undefined : 'openCode: bad path';\n    case 'openText':\n      return m.path === undefined ||\n        (Array.isArray(m.path) &&\n          m.path.every((p) => str(p, 1000) || (typeof p === 'number' && Number.isInteger(p))))\n        ? undefined\n        : 'openText: bad path';\n    case 'compareWith':\n      return str(m.ref, 200) && GIT_REF.test(m.ref) ? undefined : 'compareWith: bad ref';\n    case 'catalog':\n      return catalogProblem(m.request);\n    case 'openLink':\n      return str(m.url) ? undefined : 'openLink: bad url';\n    case 'copyText':\n      return str(m.text, 10_000_000) && optNum(m.count) ? undefined : 'copyText: bad text';\n    case 'command':\n      return isMap(m.command) && str(m.command.kind, 64) ? undefined : 'command: bad command';\n    case 'scenarioEdit':\n      return isMap(m.request) ? undefined : 'scenarioEdit: bad request';\n    case 'runScenarios':\n      return strList(m.names) ? undefined : 'runScenarios: bad names';\n    case 'lens':\n      return m.lens === null || str(m.lens, 64) ? undefined : 'lens: bad lens';\n    default:\n      return undefined;\n  }\n}\n"],
-  "mappings": ";AAMA,IAAM,QAAQ,CAAC,MACb,CAAC,CAAC,KAAK,OAAO,MAAM,YAAY,CAAC,MAAM,QAAQ,CAAC;AAElD,IAAM,MAAM,CAAC,GAAY,MAAM,SAAsB,OAAO,MAAM,YAAY,EAAE,UAAU;AAC1F,IAAM,SAAS,CAAC,MAAe,MAAM,UAAc,OAAO,MAAM,YAAY,OAAO,SAAS,CAAC;AAC7F,IAAM,UAAU,CAAC,MACf,MAAM,UAAc,MAAM,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAC;AAG7D,IAAM,cAAc;AAGpB,IAAM,UAAU;AAEvB,IAAM,cAAc,oBAAI,IAAI,CAAC,UAAU,OAAO,SAAS,aAAa,SAAS,CAAC;AAE9E,SAAS,eAAe,GAAgC;AACtD,MAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,OAAO,EAAE,EAAE,CAAC,EAAG,QAAO;AACxD,MAAI,EAAE,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAI,QAAO;AAC3E,MAAI,EAAE,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,YAAY,KAAK,EAAE,IAAI;AAC7D,WAAO;AACT,SAAO;AACT;AAGO,SAAS,eAAe,GAAgC;AAC7D,MAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAG,QAAO;AAC1C,MAAI,WAAW,KAAK,CAAC,OAAO,EAAE,KAAK,EAAG,QAAO,GAAG,EAAE,IAAI;AACtD,UAAQ,EAAE,MAAM;AAAA,IACd,KAAK;AACH,aAAO,IAAI,EAAE,IAAI,KAAK,EAAE,SAAS,MAAM,OAAO,EAAE,IAAI,IAAI,SAAY;AAAA,IACtE,KAAK;AACH,aAAO,EAAE,SAAS,UACf,MAAM,QAAQ,EAAE,IAAI,KACnB,EAAE,KAAK,MAAM,CAAC,MAAM,IAAI,GAAG,GAAI,KAAM,OAAO,MAAM,YAAY,OAAO,UAAU,CAAC,CAAE,IAClF,SACA;AAAA,IACN,KAAK;AACH,aAAO,IAAI,EAAE,KAAK,GAAG,KAAK,QAAQ,KAAK,EAAE,GAAG,IAAI,SAAY;AAAA,IAC9D,KAAK;AACH,aAAO,eAAe,EAAE,OAAO;AAAA,IACjC,KAAK;AACH,aAAO,IAAI,EAAE,GAAG,IAAI,SAAY;AAAA,IAClC,KAAK;AACH,aAAO,IAAI,EAAE,MAAM,GAAU,KAAK,OAAO,EAAE,KAAK,IAAI,SAAY;AAAA,IAClE,KAAK;AACH,aAAO,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,QAAQ,MAAM,EAAE,IAAI,SAAY;AAAA,IACnE,KAAK;AACH,aAAO,MAAM,EAAE,OAAO,IAAI,SAAY;AAAA,IACxC,KAAK;AACH,aAAO,QAAQ,EAAE,KAAK,IAAI,SAAY;AAAA,IACxC,KAAK;AACH,aAAO,EAAE,SAAS,QAAQ,IAAI,EAAE,MAAM,EAAE,IAAI,SAAY;AAAA,IAC1D;AACE,aAAO;AAAA,EACX;AACF;",
+  "sourcesContent": ["// AFD-165: the host checks what a designer webview sends before acting on it. The webview runs\n// under a strict CSP with no HTML sinks, so a compromised page is unlikely; these checks keep one\n// from turning a message into a git option, a file outside the workspace or a probe argument.\n// Shape only: what a value means (a known ref, a path inside the folder) is checked where it is\n// used.\n\nconst isMap = (v: unknown): v is Record<string, unknown> =>\n  !!v && typeof v === 'object' && !Array.isArray(v);\n\nconst str = (v: unknown, max = 4096): v is string => typeof v === 'string' && v.length <= max;\nconst optNum = (v: unknown) => v === undefined || (typeof v === 'number' && Number.isFinite(v));\nconst strList = (v: unknown) =>\n  v === undefined || (Array.isArray(v) && v.every((x) => str(x, 200)));\n\n/** A plugin name the probe looks up: dotted words, no option or path syntax. */\nexport const PLUGIN_NAME = /^[A-Za-z0-9_][A-Za-z0-9_.]{0,199}$/;\n\n/** A git revision a designer may ask to compare with: never an option (`-\u2026`), no spaces. */\nexport const GIT_REF = /^[A-Za-z0-9_][A-Za-z0-9_./@{}^~-]{0,199}$/;\n\nconst CATALOG_OPS = new Set(['search', 'doc', 'roles', 'playbooks', 'rebuild']);\n\nfunction catalogProblem(r: unknown): string | undefined {\n  if (!isMap(r) || !CATALOG_OPS.has(String(r.op))) return 'catalog: unknown request';\n  if (r.op === 'search' && (!str(r.query, 500) || !strList(r.types))) return 'catalog: bad search';\n  if (r.op === 'doc' && (!str(r.fqcn) || !PLUGIN_NAME.test(r.fqcn)))\n    return 'catalog: not a plugin name';\n  return undefined;\n}\n\n/** Why a message from the webview is refused, or undefined when its shape is right. */\nexport function messageProblem(m: unknown): string | undefined {\n  if (!isMap(m) || !str(m.type, 64)) return 'not a designer message';\n  if ('reqId' in m && !optNum(m.reqId)) return `${m.type}: bad reqId`;\n  switch (m.type) {\n    case 'openCode':\n      return str(m.path) && m.path !== '' && optNum(m.line) ? undefined : 'openCode: bad path';\n    case 'openText':\n      return m.path === undefined ||\n        (Array.isArray(m.path) &&\n          m.path.every((p) => str(p, 1000) || (typeof p === 'number' && Number.isInteger(p))))\n        ? undefined\n        : 'openText: bad path';\n    case 'compareWith':\n      return str(m.ref, 200) && GIT_REF.test(m.ref) ? undefined : 'compareWith: bad ref';\n    case 'catalog':\n      return catalogProblem(m.request);\n    case 'openLink':\n      return str(m.url) ? undefined : 'openLink: bad url';\n    case 'copyText':\n      return str(m.text, 10_000_000) && optNum(m.count) ? undefined : 'copyText: bad text';\n    case 'command':\n      return isMap(m.command) && str(m.command.kind, 64) ? undefined : 'command: bad command';\n    case 'scenarioEdit':\n      return isMap(m.request) ? undefined : 'scenarioEdit: bad request';\n    case 'runScenarios':\n      return strList(m.names) ? undefined : 'runScenarios: bad names';\n    case 'mergeChoose':\n      return str(m.id, 500) && (m.side === 'ours' || m.side === 'theirs')\n        ? undefined\n        : 'mergeChoose: bad choice';\n    case 'lens':\n      return m.lens === null || str(m.lens, 64) ? undefined : 'lens: bad lens';\n    default:\n      return undefined;\n  }\n}\n"],
+  "mappings": ";AAMA,IAAM,QAAQ,CAAC,MACb,CAAC,CAAC,KAAK,OAAO,MAAM,YAAY,CAAC,MAAM,QAAQ,CAAC;AAElD,IAAM,MAAM,CAAC,GAAY,MAAM,SAAsB,OAAO,MAAM,YAAY,EAAE,UAAU;AAC1F,IAAM,SAAS,CAAC,MAAe,MAAM,UAAc,OAAO,MAAM,YAAY,OAAO,SAAS,CAAC;AAC7F,IAAM,UAAU,CAAC,MACf,MAAM,UAAc,MAAM,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,IAAI,GAAG,GAAG,CAAC;AAG7D,IAAM,cAAc;AAGpB,IAAM,UAAU;AAEvB,IAAM,cAAc,oBAAI,IAAI,CAAC,UAAU,OAAO,SAAS,aAAa,SAAS,CAAC;AAE9E,SAAS,eAAe,GAAgC;AACtD,MAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,OAAO,EAAE,EAAE,CAAC,EAAG,QAAO;AACxD,MAAI,EAAE,OAAO,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,GAAI,QAAO;AAC3E,MAAI,EAAE,OAAO,UAAU,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC,YAAY,KAAK,EAAE,IAAI;AAC7D,WAAO;AACT,SAAO;AACT;AAGO,SAAS,eAAe,GAAgC;AAC7D,MAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAG,QAAO;AAC1C,MAAI,WAAW,KAAK,CAAC,OAAO,EAAE,KAAK,EAAG,QAAO,GAAG,EAAE,IAAI;AACtD,UAAQ,EAAE,MAAM;AAAA,IACd,KAAK;AACH,aAAO,IAAI,EAAE,IAAI,KAAK,EAAE,SAAS,MAAM,OAAO,EAAE,IAAI,IAAI,SAAY;AAAA,IACtE,KAAK;AACH,aAAO,EAAE,SAAS,UACf,MAAM,QAAQ,EAAE,IAAI,KACnB,EAAE,KAAK,MAAM,CAAC,MAAM,IAAI,GAAG,GAAI,KAAM,OAAO,MAAM,YAAY,OAAO,UAAU,CAAC,CAAE,IAClF,SACA;AAAA,IACN,KAAK;AACH,aAAO,IAAI,EAAE,KAAK,GAAG,KAAK,QAAQ,KAAK,EAAE,GAAG,IAAI,SAAY;AAAA,IAC9D,KAAK;AACH,aAAO,eAAe,EAAE,OAAO;AAAA,IACjC,KAAK;AACH,aAAO,IAAI,EAAE,GAAG,IAAI,SAAY;AAAA,IAClC,KAAK;AACH,aAAO,IAAI,EAAE,MAAM,GAAU,KAAK,OAAO,EAAE,KAAK,IAAI,SAAY;AAAA,IAClE,KAAK;AACH,aAAO,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,QAAQ,MAAM,EAAE,IAAI,SAAY;AAAA,IACnE,KAAK;AACH,aAAO,MAAM,EAAE,OAAO,IAAI,SAAY;AAAA,IACxC,KAAK;AACH,aAAO,QAAQ,EAAE,KAAK,IAAI,SAAY;AAAA,IACxC,KAAK;AACH,aAAO,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,SAAS,UAAU,EAAE,SAAS,YACtD,SACA;AAAA,IACN,KAAK;AACH,aAAO,EAAE,SAAS,QAAQ,IAAI,EAAE,MAAM,EAAE,IAAI,SAAY;AAAA,IAC1D;AACE,aAAO;AAAA,EACX;AACF;",
   "names": []
 }

package/dist/protocol.d.ts

@@ -1,6 +1,7 @@
 import type { CatalogOption, CatalogPlugin, PluginType, SearchHit } from './catalog/types';
 import type { CodeScan, DriftAction } from './drift/types';
 import type { FlowCommand } from './flow/commands';
+import type { MergeConflict, MergeSide } from './flow/merge';
 import type { OpenPort } from './flow/openPorts';
 import type { FlowDocument, Position, Ulid } from './flow/types';
 import type { Finding } from './flow/validate';
@@ -347,6 +348,11 @@ export type HostMessage = {
     type: 'outsideMarks';
     marks: OutsideMarks | null;
 }
+/** AFD-283: a merge of this flow waiting for choices (git left it to the designer); null: none. */
+ | {
+    type: 'mergeConflicts';
+    merge: MergeView | null;
+}
 /** AFD-93: the workspace's flows at a glance, for the flow panel's line. */
  | {
     type: 'repoState';
@@ -489,6 +495,16 @@ export type WebviewMessage = {
  | {
     type: 'clearOutside';
 }
+/** AFD-283: a side chosen for one conflict of the waiting merge. */
+ | {
+    type: 'mergeChoose';
+    id: string;
+    side: MergeSide;
+}
+/** AFD-283: the waiting merge is done: the file is taken as merged. */
+ | {
+    type: 'mergeFinish';
+}
 /** AFD-65: a link in an annotation; the host opens web links this flow's annotations hold. */
  | {
     type: 'openLink';
@@ -646,6 +662,8 @@ export interface DomSummary {
     banner: number | null;
     /** AFD-19: items the written-by-hand banner says need IDs (null: no banner). */
     idGaps: number | null;
+    /** AFD-283: conflicts the Merge note lists (null: no note). */
+    merge?: number | null;
     /** Inside a subflow: frame ports shown (enabled ones) and boundary wires drawn. */
     frame: {
         ports: string[];
@@ -666,3 +684,13 @@ export interface DomSummary {
         card: string[];
     };
 }
+/** AFD-283: a merge git left to the designer: its conflicts with what is chosen for each. */
+export interface MergeView {
+    /** The file's path in the repository. */
+    file: string;
+    conflicts: (MergeConflict & {
+        chosen: MergeSide;
+    })[];
+    /** Rules the merged flow breaks that neither side broke. */
+    broken: string[];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ansible-flow/core",
-  "version": "0.85.0",
+  "version": "0.86.0",
   "description": "Ansible Flow Designer core: the flow model, commands, validation and playbook generation, for any JavaScript host.",
   "license": "MIT",
   "homepage": "https://github.com/ChistokhinSV/ansible-flow-designer/blob/main/docs/packages.md",