Merge remote-tracking branch 'origin/main'

dmealing · dmealing · commit e3969c9a25e8 · 2026-05-30T18:02:16.000-04:00
diff --git a/fixtures/conformance/error-enum-coerce-default-non-member/expected-errors.json b/fixtures/conformance/error-enum-coerce-default-non-member/expected-errors.json
@@ -0,0 +1,15 @@
+{
+  "errors": [
+    {
+      "code": "ERR_BAD_ATTR_VALUE",
+      "source": {
+        "format": "json",
+        "files": [
+          "meta.enums.json"
+        ],
+        "jsonPath": "$['metadata.root'].children[0]['object.entity'].children[1]['field.enum']"
+      }
+    }
+  ],
+  "warnings": []
+}
diff --git a/fixtures/conformance/error-enum-coerce-default-non-member/input/meta.enums.json b/fixtures/conformance/error-enum-coerce-default-non-member/input/meta.enums.json
@@ -0,0 +1,17 @@
+{
+  "metadata.root": {
+    "package": "acme",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Order",
+          "children": [
+            { "field.long": { "name": "id" } },
+            { "field.enum": { "name": "status", "@values": ["NEW", "DONE"], "@coerceDefault": "BOGUS" } },
+            { "identity.primary": { "@fields": "id" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/error-enum-default-non-member/expected-errors.json b/fixtures/conformance/error-enum-default-non-member/expected-errors.json
@@ -0,0 +1,15 @@
+{
+  "errors": [
+    {
+      "code": "ERR_BAD_ATTR_VALUE",
+      "source": {
+        "format": "json",
+        "files": [
+          "meta.enums.json"
+        ],
+        "jsonPath": "$['metadata.root'].children[0]['object.entity'].children[1]['field.enum']"
+      }
+    }
+  ],
+  "warnings": []
+}
diff --git a/fixtures/conformance/error-enum-default-non-member/input/meta.enums.json b/fixtures/conformance/error-enum-default-non-member/input/meta.enums.json
@@ -0,0 +1,17 @@
+{
+  "metadata.root": {
+    "package": "acme",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Order",
+          "children": [
+            { "field.long": { "name": "id" } },
+            { "field.enum": { "name": "status", "@values": ["NEW", "DONE"], "@default": "BOGUS" } },
+            { "identity.primary": { "@fields": "id" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/error-enum-normalize-bad-mode/expected-errors.json b/fixtures/conformance/error-enum-normalize-bad-mode/expected-errors.json
@@ -0,0 +1,15 @@
+{
+  "errors": [
+    {
+      "code": "ERR_BAD_ATTR_VALUE",
+      "source": {
+        "format": "json",
+        "files": [
+          "meta.enums.json"
+        ],
+        "jsonPath": "$['metadata.root'].children[0]['object.entity'].children[1]['field.enum']"
+      }
+    }
+  ],
+  "warnings": []
+}
diff --git a/fixtures/conformance/error-enum-normalize-bad-mode/input/meta.enums.json b/fixtures/conformance/error-enum-normalize-bad-mode/input/meta.enums.json
@@ -0,0 +1,17 @@
+{
+  "metadata.root": {
+    "package": "acme",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Order",
+          "children": [
+            { "field.long": { "name": "id" } },
+            { "field.enum": { "name": "status", "@values": ["NEW", "DONE"], "@normalize": "fuzzy" } },
+            { "identity.primary": { "@fields": "id" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/output-prompt-conformance/README.md b/fixtures/output-prompt-conformance/README.md
@@ -0,0 +1,35 @@
+# output-prompt-conformance
+
+Pins the FR-010 output-format prompt fragment (`OutputFormatRenderer`) byte-identically
+across all five ports. Each case directory holds:
+
+- `spec.json` — a unified field descriptor (the cross-port oracle input).
+- `expected.guide.txt`, `expected.inline.txt`, `expected.exampleOnly.txt` — byte-exact
+  rendered fragments for the three `@promptStyle` values.
+- `README.md` — what the case exercises.
+
+Every port: parse `spec.json` → build native `OutputFormatSpec` → `render(spec, style)` for
+each style → assert byte-equal to `expected.<style>.txt`. Zero-drift: no ledger; any
+divergence fails the build. For `spec.json` with `"roundTrip": true`, also build a
+`RecoverSchema` from the same descriptor and assert `recover(expected.exampleOnly.txt)`
+classifies every field cleanly (no MALFORMED / LOST_*).
+
+## `spec.json` schema
+
+{ format: "json"|"xml", rootName: string, roundTrip?: boolean,
+  fields: [ { name, kind: "STRING"|"INT"|"LONG"|"DOUBLE"|"BOOLEAN"|"ENUM"|"OBJECT",
+              required: bool, array?: bool, example?: string|null,
+              instruction?: string|null, enumValues?: string[]|null,
+              enumDoc?: {member:doc}|null, nested?: <spec.json>|null } ] }
+
+## No raw floats
+
+Example values are restricted to strings, integers, booleans, and dyadic decimals
+(e.g. 1.5, 0.125) only — never a raw float whose textual form differs across runtimes.
+This keeps zero-drift robust against cross-runtime float formatting.
+
+## Nested objects
+
+A field with `kind: "OBJECT"` renders as a flat `{name}` placeholder — the FR-010
+renderer does not expand nested objects (a documented deferral). Such cases use
+`roundTrip: false`; nested recovery is covered by the recover-conformance corpus.
diff --git a/fixtures/output-prompt-conformance/instruction-fallback/README.md b/fixtures/output-prompt-conformance/instruction-fallback/README.md
@@ -0,0 +1,3 @@
+# instruction-fallback
+
+A field with neither `@example` nor `@instruction` — guide-style fallback text.
diff --git a/fixtures/output-prompt-conformance/instruction-fallback/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/instruction-fallback/expected.exampleOnly.txt
@@ -0,0 +1,3 @@
+{
+  "value": "{value}"
+}
diff --git a/fixtures/output-prompt-conformance/instruction-fallback/expected.guide.txt b/fixtures/output-prompt-conformance/instruction-fallback/expected.guide.txt
@@ -0,0 +1,7 @@
+Fill in each field as described below:
+- value (required)
+
+Respond exactly like this:
+{
+  "value": "{value}"
+}
diff --git a/fixtures/output-prompt-conformance/instruction-fallback/expected.inline.txt b/fixtures/output-prompt-conformance/instruction-fallback/expected.inline.txt
@@ -0,0 +1,3 @@
+{
+  "value": "{value}"
+}
diff --git a/fixtures/output-prompt-conformance/instruction-fallback/spec.json b/fixtures/output-prompt-conformance/instruction-fallback/spec.json
@@ -0,0 +1,3 @@
+{ "format": "json", "rootName": "Bare", "roundTrip": false,
+  "fields": [
+    { "name": "value", "kind": "STRING", "required": true } ] }
diff --git a/fixtures/output-prompt-conformance/json-array/README.md b/fixtures/output-prompt-conformance/json-array/README.md
@@ -0,0 +1,3 @@
+# json-array
+
+JSON scalar array field (roundTrip off — array example shape not asserted here).
diff --git a/fixtures/output-prompt-conformance/json-array/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/json-array/expected.exampleOnly.txt
@@ -0,0 +1,3 @@
+{
+  "tags": "{tags}"
+}
diff --git a/fixtures/output-prompt-conformance/json-array/expected.guide.txt b/fixtures/output-prompt-conformance/json-array/expected.guide.txt
@@ -0,0 +1,7 @@
+Fill in each field as described below:
+- tags (required): Zero or more short labels.
+
+Respond exactly like this:
+{
+  "tags": "{tags}"
+}
diff --git a/fixtures/output-prompt-conformance/json-array/expected.inline.txt b/fixtures/output-prompt-conformance/json-array/expected.inline.txt
@@ -0,0 +1,3 @@
+{
+  "tags": "{Zero or more short labels.}"
+}
diff --git a/fixtures/output-prompt-conformance/json-array/spec.json b/fixtures/output-prompt-conformance/json-array/spec.json
@@ -0,0 +1,4 @@
+{ "format": "json", "rootName": "Tagging", "roundTrip": false,
+  "fields": [
+    { "name": "tags", "kind": "STRING", "required": true, "array": true,
+      "instruction": "Zero or more short labels." } ] }
diff --git a/fixtures/output-prompt-conformance/json-enum/README.md b/fixtures/output-prompt-conformance/json-enum/README.md
@@ -0,0 +1,3 @@
+# json-enum
+
+JSON enum with `@enumValues` + `@enumDoc` + `@example`.
diff --git a/fixtures/output-prompt-conformance/json-enum/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/json-enum/expected.exampleOnly.txt
@@ -0,0 +1,3 @@
+{
+  "priority": "HIGH"
+}
diff --git a/fixtures/output-prompt-conformance/json-enum/expected.guide.txt b/fixtures/output-prompt-conformance/json-enum/expected.guide.txt
@@ -0,0 +1,11 @@
+Fill in each field as described below:
+- priority (required): Pick one severity.
+    one of LOW, MEDIUM, HIGH
+      LOW = no urgency
+      HIGH = page on-call
+    e.g. HIGH
+
+Respond exactly like this:
+{
+  "priority": "HIGH"
+}
diff --git a/fixtures/output-prompt-conformance/json-enum/expected.inline.txt b/fixtures/output-prompt-conformance/json-enum/expected.inline.txt
@@ -0,0 +1,3 @@
+{
+  "priority": "LOW | MEDIUM | HIGH"
+}
diff --git a/fixtures/output-prompt-conformance/json-enum/spec.json b/fixtures/output-prompt-conformance/json-enum/spec.json
@@ -0,0 +1,6 @@
+{ "format": "json", "rootName": "Triage", "roundTrip": true,
+  "fields": [
+    { "name": "priority", "kind": "ENUM", "required": true,
+      "enumValues": ["LOW", "MEDIUM", "HIGH"],
+      "enumDoc": { "LOW": "no urgency", "HIGH": "page on-call" },
+      "example": "HIGH", "instruction": "Pick one severity." } ] }
diff --git a/fixtures/output-prompt-conformance/json-nested/README.md b/fixtures/output-prompt-conformance/json-nested/README.md
@@ -0,0 +1,7 @@
+# json-nested
+
+JSON with a nested OBJECT field. The FR-010 renderer does NOT expand nested
+objects — it emits a flat `"{name}"` placeholder (a documented bounded deferral
+that mirrors Java/C#). This case pins that placeholder behavior byte-identically
+across ports. `roundTrip: false` — a flat placeholder is not a recoverable nested
+object; nested *recovery* is covered by the recover-conformance corpus instead.
diff --git a/fixtures/output-prompt-conformance/json-nested/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/json-nested/expected.exampleOnly.txt
@@ -0,0 +1,4 @@
+{
+  "summary": "Solid work overall.",
+  "meta": "{meta}"
+}
diff --git a/fixtures/output-prompt-conformance/json-nested/expected.guide.txt b/fixtures/output-prompt-conformance/json-nested/expected.guide.txt
@@ -0,0 +1,10 @@
+Fill in each field as described below:
+- summary (required): One sentence.
+    e.g. Solid work overall.
+- meta (required)
+
+Respond exactly like this:
+{
+  "summary": "Solid work overall.",
+  "meta": "{meta}"
+}
diff --git a/fixtures/output-prompt-conformance/json-nested/expected.inline.txt b/fixtures/output-prompt-conformance/json-nested/expected.inline.txt
@@ -0,0 +1,4 @@
+{
+  "summary": "{One sentence.}",
+  "meta": "{meta}"
+}
diff --git a/fixtures/output-prompt-conformance/json-nested/spec.json b/fixtures/output-prompt-conformance/json-nested/spec.json
@@ -0,0 +1,8 @@
+{ "format": "json", "rootName": "Review", "roundTrip": false,
+  "fields": [
+    { "name": "summary", "kind": "STRING", "required": true,
+      "example": "Solid work overall.", "instruction": "One sentence." },
+    { "name": "meta", "kind": "OBJECT", "required": true, "array": false,
+      "nested": { "format": "json", "rootName": "Meta",
+        "fields": [
+          { "name": "score", "kind": "INT", "required": true, "example": "5", "instruction": "1-5." } ] } } ] }
diff --git a/fixtures/output-prompt-conformance/json-scalars/README.md b/fixtures/output-prompt-conformance/json-scalars/README.md
@@ -0,0 +1,4 @@
+# json-scalars
+
+JSON, all-required string/int/boolean scalars, each with `@example` + `@instruction`.
+`roundTrip: true` — the exampleOnly fragment must recover cleanly.
diff --git a/fixtures/output-prompt-conformance/json-scalars/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/json-scalars/expected.exampleOnly.txt
@@ -0,0 +1,5 @@
+{
+  "text": "Your refund will appear in 3-5 days.",
+  "confidence": 4,
+  "resolved": true
+}
diff --git a/fixtures/output-prompt-conformance/json-scalars/expected.guide.txt b/fixtures/output-prompt-conformance/json-scalars/expected.guide.txt
@@ -0,0 +1,14 @@
+Fill in each field as described below:
+- text (required): One or two sentences to the customer.
+    e.g. Your refund will appear in 3-5 days.
+- confidence (required): Integer 1-5.
+    e.g. 4
+- resolved (required): Whether the issue is fully resolved.
+    e.g. true
+
+Respond exactly like this:
+{
+  "text": "Your refund will appear in 3-5 days.",
+  "confidence": 4,
+  "resolved": true
+}
diff --git a/fixtures/output-prompt-conformance/json-scalars/expected.inline.txt b/fixtures/output-prompt-conformance/json-scalars/expected.inline.txt
@@ -0,0 +1,5 @@
+{
+  "text": "{One or two sentences to the customer.}",
+  "confidence": "{Integer 1-5.}",
+  "resolved": "true | false"
+}
diff --git a/fixtures/output-prompt-conformance/json-scalars/spec.json b/fixtures/output-prompt-conformance/json-scalars/spec.json
@@ -0,0 +1,14 @@
+{
+  "format": "json",
+  "rootName": "SupportAnswer",
+  "roundTrip": true,
+  "fields": [
+    { "name": "text", "kind": "STRING", "required": true, "array": false,
+      "example": "Your refund will appear in 3-5 days.",
+      "instruction": "One or two sentences to the customer." },
+    { "name": "confidence", "kind": "INT", "required": true, "array": false,
+      "example": "4", "instruction": "Integer 1-5." },
+    { "name": "resolved", "kind": "BOOLEAN", "required": true, "array": false,
+      "example": "true", "instruction": "Whether the issue is fully resolved." }
+  ]
+}
diff --git a/fixtures/output-prompt-conformance/optional-absent/README.md b/fixtures/output-prompt-conformance/optional-absent/README.md
@@ -0,0 +1,3 @@
+# optional-absent
+
+Optional field with no `@example`/`@instruction` — skeleton/sparsity behavior.
diff --git a/fixtures/output-prompt-conformance/optional-absent/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/optional-absent/expected.exampleOnly.txt
@@ -0,0 +1,4 @@
+{
+  "title": "Hello",
+  "subtitle": "{subtitle}"
+}
diff --git a/fixtures/output-prompt-conformance/optional-absent/expected.guide.txt b/fixtures/output-prompt-conformance/optional-absent/expected.guide.txt
@@ -0,0 +1,10 @@
+Fill in each field as described below:
+- title (required): Required.
+    e.g. Hello
+- subtitle (optional)
+
+Respond exactly like this:
+{
+  "title": "Hello",
+  "subtitle": "{subtitle}"
+}
diff --git a/fixtures/output-prompt-conformance/optional-absent/expected.inline.txt b/fixtures/output-prompt-conformance/optional-absent/expected.inline.txt
@@ -0,0 +1,4 @@
+{
+  "title": "{Required.}",
+  "subtitle": "{subtitle}"
+}
diff --git a/fixtures/output-prompt-conformance/optional-absent/spec.json b/fixtures/output-prompt-conformance/optional-absent/spec.json
@@ -0,0 +1,4 @@
+{ "format": "json", "rootName": "Partial", "roundTrip": false,
+  "fields": [
+    { "name": "title", "kind": "STRING", "required": true, "example": "Hello", "instruction": "Required." },
+    { "name": "subtitle", "kind": "STRING", "required": false } ] }
diff --git a/fixtures/output-prompt-conformance/unicode-example/README.md b/fixtures/output-prompt-conformance/unicode-example/README.md
@@ -0,0 +1,3 @@
+# unicode-example
+
+Multibyte `@example` value — byte-identity under UTF-8.
diff --git a/fixtures/output-prompt-conformance/unicode-example/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/unicode-example/expected.exampleOnly.txt
@@ -0,0 +1,3 @@
+{
+  "greeting": "こんにちは — café — 🚀"
+}
diff --git a/fixtures/output-prompt-conformance/unicode-example/expected.guide.txt b/fixtures/output-prompt-conformance/unicode-example/expected.guide.txt
@@ -0,0 +1,8 @@
+Fill in each field as described below:
+- greeting (required): A localized greeting.
+    e.g. こんにちは — café — 🚀
+
+Respond exactly like this:
+{
+  "greeting": "こんにちは — café — 🚀"
+}
diff --git a/fixtures/output-prompt-conformance/unicode-example/expected.inline.txt b/fixtures/output-prompt-conformance/unicode-example/expected.inline.txt
@@ -0,0 +1,3 @@
+{
+  "greeting": "{A localized greeting.}"
+}
diff --git a/fixtures/output-prompt-conformance/unicode-example/spec.json b/fixtures/output-prompt-conformance/unicode-example/spec.json
@@ -0,0 +1,4 @@
+{ "format": "json", "rootName": "I18n", "roundTrip": true,
+  "fields": [
+    { "name": "greeting", "kind": "STRING", "required": true,
+      "example": "こんにちは — café — 🚀", "instruction": "A localized greeting." } ] }
diff --git a/fixtures/output-prompt-conformance/xml-enum/README.md b/fixtures/output-prompt-conformance/xml-enum/README.md
@@ -0,0 +1,3 @@
+# xml-enum
+
+XML enum.
diff --git a/fixtures/output-prompt-conformance/xml-enum/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/xml-enum/expected.exampleOnly.txt
@@ -0,0 +1,3 @@
+<Triage>
+  <priority>HIGH</priority>
+</Triage>
diff --git a/fixtures/output-prompt-conformance/xml-enum/expected.guide.txt b/fixtures/output-prompt-conformance/xml-enum/expected.guide.txt
diff --git a/fixtures/output-prompt-conformance/xml-enum/expected.inline.txt b/fixtures/output-prompt-conformance/xml-enum/expected.inline.txt
diff --git a/fixtures/output-prompt-conformance/xml-enum/spec.json b/fixtures/output-prompt-conformance/xml-enum/spec.json
diff --git a/fixtures/output-prompt-conformance/xml-nested/README.md b/fixtures/output-prompt-conformance/xml-nested/README.md
diff --git a/fixtures/output-prompt-conformance/xml-nested/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/xml-nested/expected.exampleOnly.txt
diff --git a/fixtures/output-prompt-conformance/xml-nested/expected.guide.txt b/fixtures/output-prompt-conformance/xml-nested/expected.guide.txt
diff --git a/fixtures/output-prompt-conformance/xml-nested/expected.inline.txt b/fixtures/output-prompt-conformance/xml-nested/expected.inline.txt
diff --git a/fixtures/output-prompt-conformance/xml-nested/spec.json b/fixtures/output-prompt-conformance/xml-nested/spec.json
diff --git a/fixtures/output-prompt-conformance/xml-scalars/README.md b/fixtures/output-prompt-conformance/xml-scalars/README.md
diff --git a/fixtures/output-prompt-conformance/xml-scalars/expected.exampleOnly.txt b/fixtures/output-prompt-conformance/xml-scalars/expected.exampleOnly.txt
diff --git a/fixtures/output-prompt-conformance/xml-scalars/expected.guide.txt b/fixtures/output-prompt-conformance/xml-scalars/expected.guide.txt
diff --git a/fixtures/output-prompt-conformance/xml-scalars/expected.inline.txt b/fixtures/output-prompt-conformance/xml-scalars/expected.inline.txt
diff --git a/fixtures/output-prompt-conformance/xml-scalars/spec.json b/fixtures/output-prompt-conformance/xml-scalars/spec.json
diff --git a/server/csharp/MetaObjects.Render.Tests/OutputPromptConformanceTests.cs b/server/csharp/MetaObjects.Render.Tests/OutputPromptConformanceTests.cs
diff --git a/server/java/codegen-kotlin/pom.xml b/server/java/codegen-kotlin/pom.xml
diff --git a/server/java/codegen-kotlin/src/test/kotlin/com/metaobjects/generator/kotlin/OutputPromptConformanceTest.kt b/server/java/codegen-kotlin/src/test/kotlin/com/metaobjects/generator/kotlin/OutputPromptConformanceTest.kt
diff --git a/server/java/render/src/test/java/com/metaobjects/render/prompt/OutputPromptConformanceTest.java b/server/java/render/src/test/java/com/metaobjects/render/prompt/OutputPromptConformanceTest.java
diff --git a/server/python/src/metaobjects/loader/validation_passes.py b/server/python/src/metaobjects/loader/validation_passes.py
diff --git a/server/python/tests/render/test_output_prompt_conformance.py b/server/python/tests/render/test_output_prompt_conformance.py
diff --git a/server/typescript/packages/render/test/output-prompt-conformance.test.ts b/server/typescript/packages/render/test/output-prompt-conformance.test.ts
diff --git a/spec/roadmap.md b/spec/roadmap.md
