@metaobjectsdev/metadata 0.7.0-rc.9 → 0.8.0-rc.1

package/dist/super-resolve.d.ts

@@ -26,9 +26,10 @@ export interface DeferredSuperFailure {
  * have been parsed with deferSuperResolution: true. Unresolved refs are
  * collected and returned — caller decides whether to throw or warn.
  *
- * Tracks an inherited context package while walking so children whose own
- * `package` is unset (e.g., fields inside an object) still resolve against
- * the parent's package — matching the parser's eager-resolution semantics.
+ * The referrer's context package (for bare/same-package shorthand refs) comes
+ * from the node's own `package`, else the file-default package captured at
+ * PARSE time (`fileDefaultPackage`). Both are order- and merge-independent, so
+ * resolution does not depend on the post-merge tree shape.
  *
  * Idempotent: nodes that already have superResolved set are skipped.
  */

package/dist/super-resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"super-resolve.d.ts","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwBtD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,QAAQ,GACb,QAAQ,GAAG,SAAS,CAsCtB;AAMD,MAAM,WAAW,oBAAoB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC;CAC3C;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,EAAE,CAkB5E"}
+{"version":3,"file":"super-resolve.d.ts","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAyCtD;;;;;;;;;;;GAWG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,IAAI,EAAE,QAAQ,GACb,QAAQ,GAAG,SAAS,CAsCtB;AAMD,MAAM,WAAW,oBAAoB;IACnC,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,oDAAoD;IACpD,GAAG,EAAE,MAAM,CAAC;IACZ,mEAAmE;IACnE,MAAM,EAAE,OAAO,aAAa,EAAE,WAAW,CAAC;CAC3C;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,QAAQ,GAAG,oBAAoB,EAAE,CAkB5E"}

package/dist/super-resolve.js

@@ -15,12 +15,29 @@ import { PACKAGE_SEPARATOR, PACKAGE_PARENT } from "./shared/structural.js";
 // Tree search helper
 // ---------------------------------------------------------------------------
 /**
- * Recursively searches the tree for a node whose fqn() matches.
- * Returns the first match, or undefined.
+ * Recursively searches the tree for a node whose qualified name matches `fqn`.
+ *
+ * A node is matched by its own `fqn()` (covers the explicit-package and
+ * no-package-at-all cases) OR by its EFFECTIVE qualified key
+ * `<fileDefaultPackage>::<name>` (`MetaData.resolutionKey()`) — the
+ * file-default package captured at PARSE time. This mirrors Java, where
+ * `BaseMetaDataParser` folds the file-default package into the registered name
+ * at parse time (so an object `BaseEntity` declared under `package: acme` is
+ * registered as `acme::BaseEntity` and a fully-qualified `extends:
+ * acme::BaseEntity` resolves) — even though TS keeps object `fqn()` bare for
+ * the FR5d referrer-envelope cross-port contract.
+ *
+ * Because the resolution key is captured at parse time (not derived from the
+ * post-merge tree), this is independent of load order AND of whether the base
+ * node's file-default package differs from the referrer's — the cross-PACKAGE
+ * cross-file case. No package is threaded down the walk anymore.
  */
 function findInTree(root, fqn) {
     if (root.fqn() === fqn)
         return root;
+    if (root.package === undefined && root.name !== "" && root.resolutionKey() === fqn) {
+        return root;
+    }
     for (const child of root.ownChildren()) {
         const found = findInTree(child, fqn);
         if (found !== undefined)
@@ -85,20 +102,21 @@ export function resolveSuperRef(ref, contextPackage, root) {
  * have been parsed with deferSuperResolution: true. Unresolved refs are
  * collected and returned — caller decides whether to throw or warn.
  *
- * Tracks an inherited context package while walking so children whose own
- * `package` is unset (e.g., fields inside an object) still resolve against
- * the parent's package — matching the parser's eager-resolution semantics.
+ * The referrer's context package (for bare/same-package shorthand refs) comes
+ * from the node's own `package`, else the file-default package captured at
+ * PARSE time (`fileDefaultPackage`). Both are order- and merge-independent, so
+ * resolution does not depend on the post-merge tree shape.
  *
  * Idempotent: nodes that already have superResolved set are skipped.
  */
 export function resolveDeferredSupers(root) {
     const failures = [];
-    walk(root, "", (node, ctxPkg) => {
+    walk(root, (node) => {
         if (node.superRef === undefined)
             return;
         if (node.superResolved !== undefined)
             return;
-        const effectivePkg = node.package ?? ctxPkg;
+        const effectivePkg = node.package ?? node.fileDefaultPackage ?? "";
         const target = resolveSuperRef(node.superRef, effectivePkg, root);
         if (target !== undefined) {
             try {
@@ -114,11 +132,10 @@ export function resolveDeferredSupers(root) {
     });
     return failures;
 }
-function walk(node, ctxPkg, visit) {
-    visit(node, ctxPkg);
-    const nextCtx = node.package ?? ctxPkg;
+function walk(node, visit) {
+    visit(node);
     for (const child of node.ownChildren()) {
-        walk(child, nextCtx, visit);
+        walk(child, visit);
     }
 }
 //# sourceMappingURL=super-resolve.js.map

package/dist/super-resolve.js.map

@@ -1 +1 @@
-{"version":3,"file":"super-resolve.js","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAC1D,EAAE;AACF,wDAAwD;AACxD,uFAAuF;AACvF,2EAA2E;AAC3E,yFAAyF;AACzF,wFAAwF;AACxF,4FAA4F;AAC5F,EAAE;AACF,kEAAkE;AAClE,2EAA2E;AAC3E,8DAA8D;AAG9D,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE3E,8EAA8E;AAC9E,qBAAqB;AACrB,8EAA8E;AAE9E;;;GAGG;AACH,SAAS,UAAU,CAAC,IAAc,EAAE,GAAW;IAC7C,IAAI,IAAI,CAAC,GAAG,EAAE,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;IACxC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,8EAA8E;AAC9E,iCAAiC;AACjC,8EAA8E;AAE9E;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,eAAe,CAC7B,GAAW,EACX,cAAsB,EACtB,IAAc;IAEd,4EAA4E;IAC5E,sCAAsC;IACtC,4EAA4E;IAC5E,IAAI,GAAG,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACxC,CAAC;IAED,4EAA4E;IAC5E,oDAAoD;IACpD,4EAA4E;IAC5E,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,GAAG,iBAAiB,CAAC,EAAE,CAAC;QACvD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QAC3C,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,OAAO,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,cAAc,EAAE,CAAC;YACjE,MAAM,EAAE,CAAC;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,cAAc,KAAK,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,QAAQ,CAAC,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;QAChF,OAAO,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,4EAA4E;IAC5E,uEAAuE;IACvE,0EAA0E;IAC1E,4EAA4E;IAC5E,IAAI,cAAc,KAAK,EAAE,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,EAAE,GAAG,cAAc,GAAG,iBAAiB,GAAG,GAAG,EAAE,CAAC,CAAC;QAC9E,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,KAAK,CAAC;IACxC,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAeD;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAAc;IAClD,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;QAC9B,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;YAAE,OAAO;QACxC,IAAI,IAAI,CAAC,aAAa,KAAK,SAAS;YAAE,OAAO;QAC7C,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC;QAC5C,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QAClE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAChC,CAAC;YAAC,MAAM,CAAC;gBACP,4DAA4D;YAC9D,CAAC;QACH,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAClF,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,IAAI,CACX,IAAc,EACd,MAAc,EACd,KAAyC;IAEzC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
+{"version":3,"file":"super-resolve.js","sourceRoot":"","sources":["../src/super-resolve.ts"],"names":[],"mappings":"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"}

package/dist/template/template-constants.d.ts

@@ -16,4 +16,11 @@ export declare const TEMPLATE_ATTR_MODEL = "model";
 export declare const TEMPLATE_ATTR_TOOL_NAME = "toolName";
 export declare const TEMPLATE_FORMATS: readonly ["text", "html", "xml", "csv", "json", "markdown", "spreadsheet"];
 export type TemplateFormat = (typeof TEMPLATE_FORMATS)[number];
+export declare const TEMPLATE_ATTR_PROMPT_STYLE = "promptStyle";
+export declare const PROMPT_STYLE_GUIDE = "guide";
+export declare const PROMPT_STYLE_INLINE = "inline";
+export declare const PROMPT_STYLE_EXAMPLE_ONLY = "exampleOnly";
+export declare const PROMPT_STYLE_DEFAULT = "guide";
+export declare const PROMPT_STYLES: readonly ["guide", "inline", "exampleOnly"];
+export type PromptStyle = (typeof PROMPT_STYLES)[number];
 //# sourceMappingURL=template-constants.d.ts.map

package/dist/template/template-constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-constants.d.ts","sourceRoot":"","sources":["../../src/template/template-constants.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,yBAAyB,aAAa,CAAC;AAEpD,eAAO,MAAM,iBAAiB,mDAKpB,CAAC;AACX,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAIjE,eAAO,MAAM,yBAAyB,eAAe,CAAC;AACtD,eAAO,MAAM,sBAAsB,YAAY,CAAC;AAChD,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAClD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAC3C,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,eAAO,MAAM,2BAA2B,iBAAiB,CAAC;AAG1D,eAAO,MAAM,wBAAwB,cAAc,CAAC;AACpD,eAAO,MAAM,4BAA4B,kBAAkB,CAAC;AAC5D,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAU3C,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAIlD,eAAO,MAAM,gBAAgB,4EAQnB,CAAC;AACX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"template-constants.d.ts","sourceRoot":"","sources":["../../src/template/template-constants.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,yBAAyB,aAAa,CAAC;AAEpD,eAAO,MAAM,iBAAiB,mDAKpB,CAAC;AACX,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAIjE,eAAO,MAAM,yBAAyB,eAAe,CAAC;AACtD,eAAO,MAAM,sBAAsB,YAAY,CAAC;AAChD,eAAO,MAAM,oBAAoB,WAAW,CAAC;AAC7C,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAClD,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAC3C,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAI3C,eAAO,MAAM,2BAA2B,iBAAiB,CAAC;AAG1D,eAAO,MAAM,wBAAwB,cAAc,CAAC;AACpD,eAAO,MAAM,4BAA4B,kBAAkB,CAAC;AAC5D,eAAO,MAAM,mBAAmB,UAAU,CAAC;AAU3C,eAAO,MAAM,uBAAuB,aAAa,CAAC;AAIlD,eAAO,MAAM,gBAAgB,4EAQnB,CAAC;AACX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAK/D,eAAO,MAAM,0BAA0B,gBAAgB,CAAC;AACxD,eAAO,MAAM,kBAAkB,UAAU,CAAC;AAC1C,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAC5C,eAAO,MAAM,yBAAyB,gBAAgB,CAAC;AACvD,eAAO,MAAM,oBAAoB,UAAqB,CAAC;AAEvD,eAAO,MAAM,aAAa,6CAIhB,CAAC;AACX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC"}

package/dist/template/template-constants.js

@@ -59,4 +59,17 @@ export const TEMPLATE_FORMATS = [
     "markdown",
     "spreadsheet",
 ];
+// FR-010 artifact-1 prompt presentation style (template.output only). Closed enum;
+// guidance is NEVER carried in comments. Default "guide". Set project-wide via an
+// abstract template base + extends, with a render-time override on top.
+export const TEMPLATE_ATTR_PROMPT_STYLE = "promptStyle";
+export const PROMPT_STYLE_GUIDE = "guide";
+export const PROMPT_STYLE_INLINE = "inline";
+export const PROMPT_STYLE_EXAMPLE_ONLY = "exampleOnly";
+export const PROMPT_STYLE_DEFAULT = PROMPT_STYLE_GUIDE;
+export const PROMPT_STYLES = [
+    PROMPT_STYLE_GUIDE,
+    PROMPT_STYLE_INLINE,
+    PROMPT_STYLE_EXAMPLE_ONLY,
+];
 //# sourceMappingURL=template-constants.js.map

package/dist/template/template-constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-constants.js","sourceRoot":"","sources":["../../src/template/template-constants.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,EAAE;AACF,8EAA8E;AAC9E,uEAAuE;AACvE,kBAAkB;AAClB,8EAA8E;AAC9E,qDAAqD;AACrD,2EAA2E;AAC3E,qDAAqD;AACrD,6EAA6E;AAC7E,kFAAkF;AAClF,EAAE;AACF,4EAA4E;AAC5E,gFAAgF;AAChF,6DAA6D;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAChD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAChD,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,YAAY;IACZ,uBAAuB;IACvB,uBAAuB;IACvB,yBAAyB;CACjB,CAAC;AAGX,6EAA6E;AAC7E,+DAA+D;AAC/D,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAC;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAC;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAC7C,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAClD,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAC3C,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAC3C,mFAAmF;AACnF,+EAA+E;AAC/E,uDAAuD;AACvD,MAAM,CAAC,MAAM,2BAA2B,GAAG,cAAc,CAAC;AAE1D,+CAA+C;AAC/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC;AACpD,MAAM,CAAC,MAAM,4BAA4B,GAAG,eAAe,CAAC;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAE3C,4EAA4E;AAC5E,8EAA8E;AAC9E,8CAA8C;AAC9C,EAAE;AACF,8EAA8E;AAC9E,sEAAsE;AACtE,yEAAyE;AACzE,gBAAgB;AAChB,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAElD,4EAA4E;AAC5E,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,UAAU;IACV,aAAa;CACL,CAAC"}
+{"version":3,"file":"template-constants.js","sourceRoot":"","sources":["../../src/template/template-constants.ts"],"names":[],"mappings":"AAAA,mFAAmF;AACnF,EAAE;AACF,8EAA8E;AAC9E,uEAAuE;AACvE,kBAAkB;AAClB,8EAA8E;AAC9E,qDAAqD;AACrD,2EAA2E;AAC3E,qDAAqD;AACrD,6EAA6E;AAC7E,kFAAkF;AAClF,EAAE;AACF,4EAA4E;AAC5E,gFAAgF;AAChF,6DAA6D;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAChD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAAC;AAChD,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC;AAEpD,MAAM,CAAC,MAAM,iBAAiB,GAAG;IAC/B,YAAY;IACZ,uBAAuB;IACvB,uBAAuB;IACvB,yBAAyB;CACjB,CAAC;AAGX,6EAA6E;AAC7E,+DAA+D;AAC/D,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAC;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,SAAS,CAAC;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAAC;AAC7C,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAClD,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAC3C,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAC3C,mFAAmF;AACnF,+EAA+E;AAC/E,uDAAuD;AACvD,MAAM,CAAC,MAAM,2BAA2B,GAAG,cAAc,CAAC;AAE1D,+CAA+C;AAC/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,WAAW,CAAC;AACpD,MAAM,CAAC,MAAM,4BAA4B,GAAG,eAAe,CAAC;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,OAAO,CAAC;AAE3C,4EAA4E;AAC5E,8EAA8E;AAC9E,8CAA8C;AAC9C,EAAE;AACF,8EAA8E;AAC9E,sEAAsE;AACtE,yEAAyE;AACzE,gBAAgB;AAChB,MAAM,CAAC,MAAM,uBAAuB,GAAG,UAAU,CAAC;AAElD,4EAA4E;AAC5E,gDAAgD;AAChD,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,MAAM;IACN,MAAM;IACN,KAAK;IACL,KAAK;IACL,MAAM;IACN,UAAU;IACV,aAAa;CACL,CAAC;AAGX,mFAAmF;AACnF,kFAAkF;AAClF,wEAAwE;AACxE,MAAM,CAAC,MAAM,0BAA0B,GAAG,aAAa,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAC1C,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAC;AAC5C,MAAM,CAAC,MAAM,yBAAyB,GAAG,aAAa,CAAC;AACvD,MAAM,CAAC,MAAM,oBAAoB,GAAG,kBAAkB,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B,kBAAkB;IAClB,mBAAmB;IACnB,yBAAyB;CACjB,CAAC"}

package/dist/template/template-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template-schema.d.ts","sourceRoot":"","sources":["../../src/template/template-schema.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAuIjD,eAAO,MAAM,kBAAkB,2BAK7B,CAAC"}
+{"version":3,"file":"template-schema.d.ts","sourceRoot":"","sources":["../../src/template/template-schema.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAsJjD,eAAO,MAAM,kBAAkB,2BAK7B,CAAC"}

package/dist/template/template-schema.js

@@ -7,7 +7,7 @@
 // `verify` scope (Plan #3), not load-time validation.
 import { ATTR_SUBTYPE_STRING, ATTR_SUBTYPE_INT, ATTR_SUBTYPE_STRINGARRAY, } from "../core/attr/attr-constants.js";
 import { SUBTYPE_BASE } from "../shared/base-types.js";
-import { TEMPLATE_SUBTYPE_PROMPT, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_SUBTYPE_TOOLCALL, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_TEXT_REF, TEMPLATE_ATTR_FORMAT, TEMPLATE_ATTR_MAX_CHARS, TEMPLATE_ATTR_OWNER, TEMPLATE_ATTR_SINCE, TEMPLATE_ATTR_REQUIRED_TAGS, TEMPLATE_ATTR_MAX_TOKENS, TEMPLATE_ATTR_REQUIRED_SLOTS, TEMPLATE_ATTR_MODEL, TEMPLATE_ATTR_TOOL_NAME, TEMPLATE_FORMATS, } from "./template-constants.js";
+import { TEMPLATE_SUBTYPE_PROMPT, TEMPLATE_SUBTYPE_OUTPUT, TEMPLATE_SUBTYPE_TOOLCALL, TEMPLATE_ATTR_PAYLOAD_REF, TEMPLATE_ATTR_TEXT_REF, TEMPLATE_ATTR_FORMAT, TEMPLATE_ATTR_MAX_CHARS, TEMPLATE_ATTR_OWNER, TEMPLATE_ATTR_SINCE, TEMPLATE_ATTR_REQUIRED_TAGS, TEMPLATE_ATTR_MAX_TOKENS, TEMPLATE_ATTR_REQUIRED_SLOTS, TEMPLATE_ATTR_MODEL, TEMPLATE_ATTR_TOOL_NAME, TEMPLATE_FORMATS, TEMPLATE_ATTR_PROMPT_STYLE, PROMPT_STYLE_DEFAULT, PROMPT_STYLES, } from "./template-constants.js";
 // Generic attrs shared by template.prompt and template.output.
 const genericAttrs = [
     {
@@ -55,6 +55,16 @@ const genericAttrs = [
         description: "Output tags the rendered text must contain (drives the verify output-tag check).",
     },
 ];
+// FR-010 artifact-1: output-format prompt presentation style (template.output only).
+// Closed enum, enforced via allowedValues exactly like @format. Default "guide".
+const promptStyleAttr = {
+    name: TEMPLATE_ATTR_PROMPT_STYLE,
+    valueType: ATTR_SUBTYPE_STRING,
+    required: false,
+    default: PROMPT_STYLE_DEFAULT,
+    allowedValues: [...PROMPT_STYLES],
+    description: "FR-010 output-format prompt presentation: 'guide' (prose list + example), 'inline' (inline placeholders / enum choices), or 'exampleOnly' (filled skeleton). Guidance is never emitted as comments.",
+};
 // LLM-overlay attrs (template.prompt only).
 const promptOverlayAttrs = [
     {
@@ -118,7 +128,7 @@ const toolcallAttrs = [
 export const TEMPLATE_ATTRS_MAP = new Map([
     [SUBTYPE_BASE, []],
     [TEMPLATE_SUBTYPE_PROMPT, [...genericAttrs, ...promptOverlayAttrs]],
-    [TEMPLATE_SUBTYPE_OUTPUT, [...genericAttrs]],
+    [TEMPLATE_SUBTYPE_OUTPUT, [...genericAttrs, promptStyleAttr]],
     [TEMPLATE_SUBTYPE_TOOLCALL, [...toolcallAttrs]],
 ]);
 //# sourceMappingURL=template-schema.js.map

package/dist/template/template-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"template-schema.js","sourceRoot":"","sources":["../../src/template/template-schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"template-schema.js","sourceRoot":"","sources":["../../src/template/template-schema.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metaobjectsdev/metadata",
-  "version": "0.7.0-rc.9",
+  "version": "0.8.0-rc.1",
   "description": "Metamodel loader, types, and constants for the MetaObjects standard.",
   "type": "module",
   "main": "./dist/index.js",

package/src/core/field/field-constants.ts

@@ -117,3 +117,21 @@ export const FIELD_ATTR_VALUES = "values";
  * stored string with no name↔value divergence.
  */
 export const ENUM_MEMBER_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+
+/** FR-010: map of off-vocabulary token → canonical enum member, feeding the
+ *  tolerant recover alias-fold. `properties`-shaped; only on field.enum. */
+export const FIELD_ATTR_ENUM_ALIAS = "enumAlias";
+
+/** FR-010: map of enum member → human-readable description, shown per-member in
+ *  the 'guide'-style output-format prompt fragment. `properties`-shaped; only on field.enum. */
+export const FIELD_ATTR_ENUM_DOC = "enumDoc";
+
+// ---------------------------------------------------------------------------
+// FR-010 field-teaching attrs (on any field; drive the output-format prompt)
+// ---------------------------------------------------------------------------
+
+/** FR-010: an example value for this field, shown in the generated prompt fragment. */
+export const FIELD_ATTR_EXAMPLE = "example";
+
+/** FR-010: a short instruction for this field, shown in the generated prompt fragment. */
+export const FIELD_ATTR_INSTRUCTION = "instruction";

package/src/core/field/field-schema.ts

@@ -7,6 +7,7 @@ import {
   ATTR_SUBTYPE_INT,
   ATTR_SUBTYPE_BOOLEAN,
   ATTR_SUBTYPE_STRINGARRAY,
+  ATTR_SUBTYPE_PROPERTIES,
 } from "../attr/attr-constants.js";
 import { SORT_ORDER_VALUES } from "../query/query-constants.js";
 import {
@@ -27,6 +28,10 @@ import {
   FIELD_ATTR_AUTO_SET,
   AUTO_SET_VALUES,
   FIELD_ATTR_VALUES,
+  FIELD_ATTR_ENUM_ALIAS,
+  FIELD_ATTR_ENUM_DOC,
+  FIELD_ATTR_EXAMPLE,
+  FIELD_ATTR_INSTRUCTION,
 } from "./field-constants.js";
 
 /** Attrs common to every field subtype (codegen-ts column mapper + Project D filter/sort). */
@@ -124,6 +129,22 @@ export const commonFieldAttrs: AttrSchema[] = [
     description:
       "Auto-set semantics for timestamp-like fields: 'onCreate' stamps on insert, 'onUpdate' stamps on every write.",
   },
+  // FR-010 field-teaching attrs (any field): free-text shown in the generated
+  // output-format prompt fragment. Never carried in comments.
+  {
+    name: FIELD_ATTR_EXAMPLE,
+    valueType: ATTR_SUBTYPE_STRING,
+    required: false,
+    description:
+      "FR-010: an example value for this field, shown in the generated output-format prompt fragment.",
+  },
+  {
+    name: FIELD_ATTR_INSTRUCTION,
+    valueType: ATTR_SUBTYPE_STRING,
+    required: false,
+    description:
+      "FR-010: a short instruction for this field, shown in the generated output-format prompt fragment.",
+  },
 ];
 
 /** The @currency attr — only on field.currency. */
@@ -144,3 +165,23 @@ export const enumFieldAttr: AttrSchema = {
   description:
     "Member symbols of an enum-subtype field. Declaration order is significant; each is a legal identifier and its own stored string.",
 };
+
+/** The @enumAlias attr — only on field.enum. Map of off-vocabulary token → canonical
+ *  member, feeding the FR-010 tolerant recover alias-fold (runtime aliases win on conflict). */
+export const enumAliasAttr: AttrSchema = {
+  name: FIELD_ATTR_ENUM_ALIAS,
+  valueType: ATTR_SUBTYPE_PROPERTIES,
+  required: false,
+  description:
+    "Map of alternate/off-vocabulary tokens to canonical enum members; feeds the FR-010 tolerant recover alias-fold.",
+};
+
+/** The @enumDoc attr — only on field.enum. Map of member → human-readable description,
+ *  shown per-member in the FR-010 'guide'-style output-format prompt fragment. */
+export const enumDocAttr: AttrSchema = {
+  name: FIELD_ATTR_ENUM_DOC,
+  valueType: ATTR_SUBTYPE_PROPERTIES,
+  required: false,
+  description:
+    "Map of enum member to a human-readable description; shown per-member in the FR-010 'guide'-style prompt fragment.",
+};

package/src/core-types.ts

@@ -35,7 +35,7 @@ import { MetaRelationship } from "./core/relationship/meta-relationship.js";
 import { MetaLayout } from "./presentation/layout/meta-layout.js";
 import { MetaSource } from "./persistence/source/meta-source.js";
 import { MetaOrigin, MetaPassthroughOrigin, MetaAggregateOrigin, MetaCollectionOrigin } from "./persistence/origin/meta-origin.js";
-import { commonFieldAttrs, currencyFieldAttr, enumFieldAttr } from "./core/field/field-schema.js";
+import { commonFieldAttrs, currencyFieldAttr, enumFieldAttr, enumAliasAttr, enumDocAttr } from "./core/field/field-schema.js";
 import { objectAttrs } from "./core/object/object-schema.js";
 import { relationshipAttrs } from "./core/relationship/relationship-schema.js";
 import { identityFieldsAttr, IDENTITY_ATTRS_MAP } from "./core/identity/identity-schema.js";
@@ -202,7 +202,7 @@ function registerCoreTypeDefs(registry: TypeRegistry): void {
       subType === FIELD_SUBTYPE_CURRENCY
         ? [...commonFieldAttrs, { ...currencyFieldAttr }]
         : subType === FIELD_SUBTYPE_ENUM
-          ? [...commonFieldAttrs, { ...enumFieldAttr }]
+          ? [...commonFieldAttrs, { ...enumFieldAttr }, { ...enumAliasAttr }, { ...enumDocAttr }]
           : [...commonFieldAttrs];
     registry.register(
       def(TYPE_FIELD, subType, `Field of type ${subType}`, fieldRules, MetaField, fieldAttrs,

package/src/parser-core.ts

@@ -489,6 +489,17 @@ function parseNodeFresh(
   // is the only caller during loading; freeze runs in the loader after).
   populateNodeSource(model);
 
+  // --- Capture the file-default package at PARSE time (resolution-only) ---
+  // `inheritedContextPkg` is the package threaded down from the file's root
+  // `metadata.package` (the nearest packaged ancestor). Recording it here —
+  // when the declaring file's package is known — lets super-resolution match
+  // this node by its effective qualified key regardless of post-merge tree
+  // shape or load order. This does NOT touch the node's `package` or `fqn()`
+  // (objects stay bare per FR5d). Mirrors Java's parse-time getDefaultPackageName().
+  if (inheritedContextPkg !== "") {
+    model.setFileDefaultPackage(inheritedContextPkg);
+  }
+
   // --- Apply reserved keys (package, extends, abstract, isArray) ---
   applyReservedKeys(model, nodeData, strict, source, path, warnings, inheritedContextPkg);
 

package/src/serializer-json.ts

@@ -198,8 +198,10 @@ function sortAttrKeys(value: unknown): unknown {
       if (k === RESERVED_KEY_CHILDREN) continue;
       result[k] = sortAttrKeys(obj[k]);
     }
+    // @-attr values: an object-typed attr value (e.g. @enumDoc / @filter) gets
+    // the value-shape canonical-order treatment; everything else recurses normally.
     for (const k of attrKeys) {
-      result[k] = sortAttrKeys(obj[k]);
+      result[k] = sortAttrValue(obj[k]);
     }
     if (hasChildren) {
       result[RESERVED_KEY_CHILDREN] = sortAttrKeys(obj[RESERVED_KEY_CHILDREN]);
@@ -208,3 +210,37 @@ function sortAttrKeys(value: unknown): unknown {
   }
   return value;
 }
+
+/**
+ * Canonicalize an inline @-attr's value. The two object-typed attr subtypes need
+ * different key order in canonical form, and the serializer is schema-free — so
+ * distinguish by value shape, which exactly tracks the subtype:
+ *   • `properties` (e.g. @enumDoc / @enumAlias) is a flat scalar→scalar map → keys
+ *     sort ordinally (cross-port canonical form; matches the Java reference, whose
+ *     Properties is unordered and serializes sorted).
+ *   • `filter` maps a field to an operator object ({eq:…}/{in:[…]}) or carries
+ *     or/and arrays — at least one value is itself an object/array → declaration
+ *     order is preserved (significant). The filter desugar runs before serialization,
+ *     so a filter clause is never a bare scalar.
+ * Mirrors the C# AttrObjectToJsonNode value-shape heuristic.
+ */
+function sortAttrValue(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return value.map(sortAttrValue);
+  }
+  if (value !== null && typeof value === "object") {
+    const obj = value as Record<string, unknown>;
+    const keys = Object.keys(obj);
+    const allScalar = keys.every((k) => {
+      const v = obj[k];
+      return v === null || typeof v !== "object";
+    });
+    const orderedKeys = allScalar ? [...keys].sort() : keys;
+    const result: Record<string, unknown> = {};
+    for (const k of orderedKeys) {
+      result[k] = sortAttrValue(obj[k]);
+    }
+    return result;
+  }
+  return value;
+}

package/src/shared/meta-data.ts

@@ -24,6 +24,16 @@ export abstract class MetaData {
 
   // Identity / packaging
   package?: string;
+  // Resolution-only: the file-default package (the top-level `metadata.package`)
+  // of the FILE in which this node was declared, captured at PARSE time. This is
+  // NOT folded into fqn() (object fqn() stays BARE for the FR5d cross-port
+  // referrer-envelope contract) — it exists solely so super-resolution can match
+  // a node by its EFFECTIVE qualified key `<fileDefaultPackage>::<name>` even
+  // when the node carries no own `package`. Capturing it at parse time (when the
+  // declaring file's package is known) makes resolution independent of load
+  // order and post-merge tree shape. Mirrors Java's BaseMetaDataParser, which
+  // folds getDefaultPackageName() into the registered name at parse time.
+  fileDefaultPackage?: string;
   superRef?: string;         // raw super reference string, pre-resolution
   private _superData?: MetaData; // post-resolution pointer; set by setSuperResolved() after parsing
   isAbstract: boolean = false;
@@ -132,6 +142,31 @@ export abstract class MetaData {
     this.package = pkg;
   }
 
+  /**
+   * Loader-internal: record the file-default package captured at parse time.
+   * See the `fileDefaultPackage` field doc. Honors the frozen-guard.
+   * @internal
+   */
+  setFileDefaultPackage(pkg: string): void {
+    this._assertNotFrozen();
+    this.fileDefaultPackage = pkg;
+  }
+
+  /**
+   * The node's EFFECTIVE qualified key for super-resolution matching:
+   * `<pkg>::<name>` where pkg is the node's own package if set, else the
+   * file-default package captured at parse time. Returns the bare name when
+   * neither is available. Used by super-resolution ONLY — distinct from fqn(),
+   * which stays bare for objects per the FR5d cross-port contract.
+   */
+  resolutionKey(): string {
+    const pkg = this.package ?? this.fileDefaultPackage;
+    if (pkg !== undefined && pkg !== "") {
+      return `${pkg}${PACKAGE_SEPARATOR}${this.name}`;
+    }
+    return this.name;
+  }
+
   // ---------------------------------------------------------------------------
   // Super
   // ---------------------------------------------------------------------------

package/src/super-resolve.ts

@@ -19,11 +19,28 @@ import { PACKAGE_SEPARATOR, PACKAGE_PARENT } from "./shared/structural.js";
 // ---------------------------------------------------------------------------
 
 /**
- * Recursively searches the tree for a node whose fqn() matches.
- * Returns the first match, or undefined.
+ * Recursively searches the tree for a node whose qualified name matches `fqn`.
+ *
+ * A node is matched by its own `fqn()` (covers the explicit-package and
+ * no-package-at-all cases) OR by its EFFECTIVE qualified key
+ * `<fileDefaultPackage>::<name>` (`MetaData.resolutionKey()`) — the
+ * file-default package captured at PARSE time. This mirrors Java, where
+ * `BaseMetaDataParser` folds the file-default package into the registered name
+ * at parse time (so an object `BaseEntity` declared under `package: acme` is
+ * registered as `acme::BaseEntity` and a fully-qualified `extends:
+ * acme::BaseEntity` resolves) — even though TS keeps object `fqn()` bare for
+ * the FR5d referrer-envelope cross-port contract.
+ *
+ * Because the resolution key is captured at parse time (not derived from the
+ * post-merge tree), this is independent of load order AND of whether the base
+ * node's file-default package differs from the referrer's — the cross-PACKAGE
+ * cross-file case. No package is threaded down the walk anymore.
  */
 function findInTree(root: MetaData, fqn: string): MetaData | undefined {
   if (root.fqn() === fqn) return root;
+  if (root.package === undefined && root.name !== "" && root.resolutionKey() === fqn) {
+    return root;
+  }
   for (const child of root.ownChildren()) {
     const found = findInTree(child, fqn);
     if (found !== undefined) return found;
@@ -110,18 +127,19 @@ export interface DeferredSuperFailure {
  * have been parsed with deferSuperResolution: true. Unresolved refs are
  * collected and returned — caller decides whether to throw or warn.
  *
- * Tracks an inherited context package while walking so children whose own
- * `package` is unset (e.g., fields inside an object) still resolve against
- * the parent's package — matching the parser's eager-resolution semantics.
+ * The referrer's context package (for bare/same-package shorthand refs) comes
+ * from the node's own `package`, else the file-default package captured at
+ * PARSE time (`fileDefaultPackage`). Both are order- and merge-independent, so
+ * resolution does not depend on the post-merge tree shape.
  *
  * Idempotent: nodes that already have superResolved set are skipped.
  */
 export function resolveDeferredSupers(root: MetaData): DeferredSuperFailure[] {
   const failures: DeferredSuperFailure[] = [];
-  walk(root, "", (node, ctxPkg) => {
+  walk(root, (node) => {
     if (node.superRef === undefined) return;
     if (node.superResolved !== undefined) return;
-    const effectivePkg = node.package ?? ctxPkg;
+    const effectivePkg = node.package ?? node.fileDefaultPackage ?? "";
     const target = resolveSuperRef(node.superRef, effectivePkg, root);
     if (target !== undefined) {
       try {
@@ -136,14 +154,9 @@ export function resolveDeferredSupers(root: MetaData): DeferredSuperFailure[] {
   return failures;
 }
 
-function walk(
-  node: MetaData,
-  ctxPkg: string,
-  visit: (n: MetaData, ctx: string) => void,
-): void {
-  visit(node, ctxPkg);
-  const nextCtx = node.package ?? ctxPkg;
+function walk(node: MetaData, visit: (n: MetaData) => void): void {
+  visit(node);
   for (const child of node.ownChildren()) {
-    walk(child, nextCtx, visit);
+    walk(child, visit);
   }
 }

package/src/template/template-constants.ts

@@ -68,3 +68,19 @@ export const TEMPLATE_FORMATS = [
   "spreadsheet",
 ] as const;
 export type TemplateFormat = (typeof TEMPLATE_FORMATS)[number];
+
+// FR-010 artifact-1 prompt presentation style (template.output only). Closed enum;
+// guidance is NEVER carried in comments. Default "guide". Set project-wide via an
+// abstract template base + extends, with a render-time override on top.
+export const TEMPLATE_ATTR_PROMPT_STYLE = "promptStyle";
+export const PROMPT_STYLE_GUIDE = "guide";
+export const PROMPT_STYLE_INLINE = "inline";
+export const PROMPT_STYLE_EXAMPLE_ONLY = "exampleOnly";
+export const PROMPT_STYLE_DEFAULT = PROMPT_STYLE_GUIDE;
+
+export const PROMPT_STYLES = [
+  PROMPT_STYLE_GUIDE,
+  PROMPT_STYLE_INLINE,
+  PROMPT_STYLE_EXAMPLE_ONLY,
+] as const;
+export type PromptStyle = (typeof PROMPT_STYLES)[number];

package/src/template/template-schema.ts

@@ -29,6 +29,9 @@ import {
   TEMPLATE_ATTR_MODEL,
   TEMPLATE_ATTR_TOOL_NAME,
   TEMPLATE_FORMATS,
+  TEMPLATE_ATTR_PROMPT_STYLE,
+  PROMPT_STYLE_DEFAULT,
+  PROMPT_STYLES,
 } from "./template-constants.js";
 
 // Generic attrs shared by template.prompt and template.output.
@@ -79,6 +82,18 @@ const genericAttrs: AttrSchema[] = [
   },
 ];
 
+// FR-010 artifact-1: output-format prompt presentation style (template.output only).
+// Closed enum, enforced via allowedValues exactly like @format. Default "guide".
+const promptStyleAttr: AttrSchema = {
+  name: TEMPLATE_ATTR_PROMPT_STYLE,
+  valueType: ATTR_SUBTYPE_STRING,
+  required: false,
+  default: PROMPT_STYLE_DEFAULT,
+  allowedValues: [...PROMPT_STYLES],
+  description:
+    "FR-010 output-format prompt presentation: 'guide' (prose list + example), 'inline' (inline placeholders / enum choices), or 'exampleOnly' (filled skeleton). Guidance is never emitted as comments.",
+};
+
 // LLM-overlay attrs (template.prompt only).
 const promptOverlayAttrs: AttrSchema[] = [
   {
@@ -144,6 +159,6 @@ const toolcallAttrs: AttrSchema[] = [
 export const TEMPLATE_ATTRS_MAP = new Map<string, AttrSchema[]>([
   [SUBTYPE_BASE, []],
   [TEMPLATE_SUBTYPE_PROMPT, [...genericAttrs, ...promptOverlayAttrs]],
-  [TEMPLATE_SUBTYPE_OUTPUT, [...genericAttrs]],
+  [TEMPLATE_SUBTYPE_OUTPUT, [...genericAttrs, promptStyleAttr]],
   [TEMPLATE_SUBTYPE_TOOLCALL, [...toolcallAttrs]],
 ]);