fix(rescript-tea): resolve committed merge-conflicts; canonical src/tea builds green

ReScript 12.2.0 toolchain installed (~/dev/tools/languages/rescript).

Integrity defects found + fixed (botched merge 992e4b4 left committed
git conflict markers in JSON config — package was unbuildable):
- rescript.json: <<<<<<< HEAD/=======/>>>>>>> resolved to canonical
  src/tea structure; sources narrowed to [src/tea] (canonical HEAD)
- package.json: same conflict resolved to canonical identity
  (v1.0.0, @rescript/core, github repo); merged in build/test scripts
- no .res/.resi carried conflict markers (config-only defect)

Validation: `rescript build` -> Parsed/Compiled 75 modules, exit 0.

Source-only brought-forward content does not compile vs the canonical
API; preserved losslessly in rescript-tea/reconcile/ (NOT in sources),
each with a concrete port task (see reconcile/README.adoc):
- Tea_Layout.{res,resi} ~750 LOC -> needs-reactdom-to-core-port/
  (ReactDOM-coupled; canonical pkg dropped @rescript/react)
- test/Tea_{Cmd,Json}_test.res + examples/{02_http,03_swot_dashboard}
  -> needs-canonical-api-port/ (written vs standalone repo's diverged API)
- pre-existing broken examples/SafeDOMExample.res -> quarantined

All moves are git renames (history preserved). MIGRATION.adoc exit
criteria updated. Standalone repo retirement still deferred (reversible,
post-#69-merge).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Author: hyperpolymath

rescript-ecosystem/MIGRATION.adoc

@@ -95,14 +95,41 @@ Source-only governance/metadata forms (`.machines_readable/6scm/*.scm`,
 old `.adoc` duplicates) are **intentionally not** carried forward — the
 canonical RSR/a2ml scaffold here supersedes them (SCM→a2ml policy).
 
+=== Build validation (2026-05-17, ReScript 12.2.0 + @rescript/core 1.6.1)
+
+Toolchain installed at `~/dev/tools/languages/rescript/current`
+(PATH-per-use). Two **committed git merge-conflict markers** were found
+and fixed (botched merge `992e4b4`): `rescript.json` and `package.json`
+each had `<<<<<<< HEAD … ======= … >>>>>>>` blocks (HEAD = canonical
+`src/tea` / `@rescript/core`; other = old flat `src` / `@rescript/react`).
+Resolved to the canonical side. No `.res/.resi` carried conflict markers.
+
+**Canonical package now builds green:** `rescript build` →
+`Parsed 75 source files / Compiled 75 modules`, exit 0, sources
+`[{"dir":"src/tea"}]`.
+
+Brought-forward source-only content does **not** compile against the
+canonical API and is preserved losslessly in
+`rescript-tea/reconcile/` (NOT in `sources`), each with a concrete port
+task — see `rescript-tea/reconcile/README.adoc`:
+
+* `Tea_Layout.{res,resi}` (~750 LOC) — `ReactDOM`-coupled; canonical
+  package dropped `@rescript/react`. Port off ReactDOM.
+* `test/Tea_{Cmd,Json}_test.res`, `examples/{02_http,03_swot_dashboard}`
+  — written against the standalone repo's diverged API
+  (`Tea_Json.decodeValue` absent here; `Tea_Cmd.batch` list-vs-array).
+
 === Exit criteria for retiring the standalone rescript-tea repo
 
-. Per-module semantic merge of the diverged `src/*` (toolchain-validated).
-. Brought-forward tests/examples compile against the canonical modules.
+. ✅ Canonical `src/tea` builds green (toolchain-validated).
+. ✅ Config integrity defects (conflict markers) resolved.
+. Port `reconcile/` items to the canonical API; empty that directory.
+. Per-module semantic merge of the diverged `src/*` (e.g. `Tea_Sub`
+  405↔201) against the standalone source — needs side-by-side review.
 . Resolve the `rescript-tea` ↔ `packages/web/tea` duplication.
 . Then, and only then: per-repo retirement of
   https://github.com/hyperpolymath/rescript-tea (reversible until that PR
-  merges).
+  merges, and only after developer-ecosystem#69 merges).
 
 == Go-forward: affinescript-tea
 

…rescript-tea/examples/SafeDOMExample.res …_precedent_broken/SafeDOMExample.res.txtrescript-ecosystem/rescript-tea/examples/SafeDOMExample.res renamed to rescript-ecosystem/rescript-tea/examples/_quarantine_precedent_broken/SafeDOMExample.res.txt rescript-ecosystem/rescript-tea/examples/SafeDOMExample.res renamed to rescript-ecosystem/rescript-tea/examples/_quarantine_precedent_broken/SafeDOMExample.res.txt

@@ -1,51 +1,26 @@
 {
   "name": "rescript-tea",
-<<<<<<< HEAD
   "version": "1.0.0",
   "description": "The Elm Architecture for ReScript — comprehensive TEA with keyed diffing, HTTP, JSON decoders, SSR, time-travel debugger",
+  "type": "module",
   "main": "src/tea/Tea.res.js",
   "author": "Jonathan D.A. Jewell <j.d.a.jewell@open.ac.uk>",
   "license": "SEE LICENSE IN LICENSE",
-  "peerDependencies": {
-    "rescript": "^12.0.0",
-    "@rescript/core": "^1.0.0"
-  },
-  "keywords": ["rescript", "elm", "tea", "virtual-dom", "keyed-diffing", "ssr", "http", "json-decoders"]
-=======
-  "version": "0.1.0",
-  "description": "The Elm Architecture for ReScript",
-  "keywords": [
-    "rescript",
-    "elm",
-    "tea",
-    "react",
-    "architecture",
-    "functional"
-  ],
-  "author": "Jonathan D.A. Jewell",
-  "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://gitlab.com/hyperpolymath/rescript-tea"
+    "url": "https://github.com/hyperpolymath/rescript-tea"
   },
-  "main": "src/Tea.res.mjs",
+  "keywords": ["rescript", "elm", "tea", "virtual-dom", "keyed-diffing", "ssr", "http", "json-decoders"],
   "scripts": {
     "build": "rescript",
     "clean": "rescript clean",
     "dev": "rescript -w",
-    "test": "node --test lib/es6/test/*.mjs"
+    "test": "node --test test/*.res.js"
   },
-  "peerDependencies": {
-    "@rescript/react": ">=0.12.0",
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "rescript": ">=11.0.0"
+  "dependencies": {
+    "@rescript/core": "^1.0.0"
   },
-  "devDependencies": {
-    "@rescript/react": "^0.13.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "rescript": "^11.1.0"
+  "peerDependencies": {
+    "rescript": "^12.0.0"
   }
->>>>>>> 992e4b4 (feat: initial implementation of rescript-tea)
 }

rescript-ecosystem/rescript-tea/package.json

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: PMPL-1.0-or-later
+= rescript-tea — reconciliation holding area
+:toc:
+
+Source-only content brought forward from the standalone repo
+`github.com/hyperpolymath/rescript-tea` that does **not** compile against
+the canonical consolidated package. Preserved here losslessly — **not** in
+`rescript.json` sources — each with a concrete port task. The canonical
+package (`src/tea/`, pure `@rescript/core`) builds green:
+`rescript build` → 75 modules, exit 0 (ReScript 12.2.0).
+
+See ../MIGRATION.adoc "rescript-tea" section for the origin/divergence
+record.
+
+== needs-reactdom-to-core-port/
+
+* `Tea_Layout.{res,resi}` (~750 LOC) — depends on `ReactDOM.Style.t`.
+  The canonical package deliberately dropped `@rescript/react` (it is a
+  pure `@rescript/core` TEA). **Port task:** replace the `ReactDOM`
+  flex/grid style builders with a plain record or `@rescript/core`
+  `Dict`, then move back to `src/tea/`.
+
+== needs-canonical-api-port/
+
+These were written against the *standalone source repo's* API, which has
+diverged from the canonical modules (the documented two-way divergence):
+
+* `test/Tea_Cmd_test.res` — calls `Tea_Cmd.batch([])` (array); canonical
+  `Tea_Cmd.batch` takes `list<Tea_Cmd.t<_>>`. Port to the canonical API.
+* `test/Tea_Json_test.res` — calls `Tea_Json.decodeValue`, absent in the
+  canonical `Tea_Json`. Map to the canonical decoder entrypoint.
+* `examples/02_http/` (`HttpExample.res`) — validate against canonical
+  `Tea_Http`/`Tea_App`; port API drift.
+* `examples/03_swot_dashboard/` (`SwotDashboard.res`) — same.
+
+Once ported, tests/examples can be re-added to `rescript.json` `sources`
+as `type:"dev"` entries and this directory emptied.
+
+== Disposition rule
+
+Nothing here is deleted. Items graduate back into the canonical package
+only after they compile against it. Only when this directory is empty AND
+the per-module source↔canonical merge is complete may the standalone
+`github.com/hyperpolymath/rescript-tea` repo be retired (per-repo PR,
+reversible until merge) — see ../MIGRATION.adoc exit criteria.