@1agh/maude 1.5.0 → 1.5.2

package/apps/studio/annotations/ai-write.ts

@@ -21,6 +21,7 @@
 import { anchorPoint, facingAnchor } from './elements/arrow.model.ts';
 import { compareOrder, keyBetween } from './fractional-index.ts';
 import { type ApplyResult, applyOps, type Op } from './ops.ts';
+import './ops-merge.ts';
 import { defOf, REGISTRY, specOf } from './registry.ts';
 import { Scene } from './scene.ts';
 import type { AnnotationElement, Box } from './types.ts';

package/apps/studio/annotations/ops-merge.ts

@@ -0,0 +1,15 @@
+/**
+ * @file       annotations/ops-merge.ts — wire the 3-way text merge into ops.ts
+ * @scope      apps/studio/annotations/ops-merge.ts
+ * @purpose    Side-effect import for SERVER entry points only (api, collab,
+ *             codec, ai-write, the hub's accepted lane). `sync/source-merge.ts`
+ *             needs the `diff` package, which the canvas iframe cannot resolve,
+ *             so ops.ts takes the merge by injection instead of importing it.
+ *             Never import this from anything in the canvas-lib graph —
+ *             `test/canvas-lib-graph.test.ts` fails if `diff` gets back in.
+ */
+
+import { mergeSource } from '../sync/source-merge.ts';
+import { setTextMerge } from './ops.ts';
+
+setTextMerge(mergeSource);

package/apps/studio/annotations/ops.ts

@@ -13,8 +13,9 @@
  *               • the same scalar field follows acceptance order (last wins —
  *                 DDR-241 §5);
  *               • the same TEXT field is merged 3-way at character level
- *                 against the patch's `expect` (sync/source-merge.ts), so two
- *                 people typing in one sticky both keep their words;
+ *                 against the patch's `expect` (sync/source-merge.ts, wired in
+ *                 by `ops-merge.ts` — see `setTextMerge`), so two people
+ *                 typing in one sticky both keep their words;
  *               • a patch on a missing element is rejected `gone` (the client
  *                 offers to restore — it never silently re-creates).
  *             A `strict` patch (undo) only touches fields that still hold the
@@ -26,7 +27,6 @@
  *             are not deleted with it (coordinates converted — they don't jump).
  */
 
-import { mergeSource } from '../sync/source-merge.ts';
 import { MAX_NESTING_DEPTH } from './constants.ts';
 import { DANGEROUS_KEYS, jsonEq } from './fields.ts';
 import { defOf, validateElement } from './registry.ts';
@@ -83,15 +83,40 @@ interface MergeBudget {
   left: number;
 }
 
+/** A 3-way text merge: `ok:false` means the edits touch (ours wins). */
+export type TextMerge = (
+  base: string,
+  ours: string,
+  theirs: string
+) => { ok: true; merged: string } | { ok: false };
+
+/**
+ * The character-level merge, injected rather than imported: it needs the
+ * `diff` package, and this module is in the canvas iframe's graph
+ * (`annotations-layer.tsx`), where only the prebuilt `/_canvas-runtime/`
+ * externals resolve — a static import broke every canvas build in v1.5.0.
+ * Server entry points import `ops-merge.ts`, which registers `mergeSource`;
+ * without it a same-field text race resolves by acceptance order (ours).
+ */
+let textMerge: TextMerge | null = null;
+
+export function setTextMerge(merge: TextMerge | null): void {
+  textMerge = merge;
+}
+
+export function hasTextMerge(): boolean {
+  return textMerge !== null;
+}
+
 /** Merge a text value: ours vs theirs against base. Overlap → ours (acceptance order). */
 function mergeText(base: unknown, ours: unknown, theirs: unknown, budget: MergeBudget): unknown {
   if (typeof base !== 'string' || typeof ours !== 'string' || typeof theirs !== 'string')
     return ours;
   if (theirs === base) return ours;
   if (ours === base) return theirs;
-  if (budget.left <= 0) return ours;
+  if (!textMerge || budget.left <= 0) return ours;
   budget.left--;
-  const m = mergeSource(base, ours, theirs);
+  const m = textMerge(base, ours, theirs);
   return m.ok ? m.merged : ours;
 }
 

package/apps/studio/api.ts

@@ -21,6 +21,7 @@ import {
   applyOps as applyAnnotationOpsPure,
   diffToOps,
 } from './annotations/ops.ts';
+import './annotations/ops-merge.ts';
 import { parseBoard, serializeBoard } from './annotations/schema.ts';
 import type { AnnotationElement } from './annotations/types.ts';
 import { createAssetMirror, s3ConfigFromEnv } from './assets-s3.ts';

package/apps/studio/collab/registry.ts

@@ -11,6 +11,7 @@ import type * as Y from 'yjs';
 
 import { canonicalAnnotations } from '../annotations/board-text.ts';
 import { type ApplyResult, applyOps, type Op } from '../annotations/ops.ts';
+import '../annotations/ops-merge.ts';
 import { readReplica, validActionId, writeReplica } from '../annotations/replica.ts';
 import { parseBoard, serializeBoard } from '../annotations/schema.ts';
 import { applyCommentsToDoc, stampAnnotationsEdit } from '../sync/codec.ts';