From 72dd24910173d96b27a9c373b7c086f2f61959cc Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 03:17:29 -0400
Subject: [PATCH 1/8] fix: close the rc.4 adopter findings for 1.1.0

Reporting, in every port:
- A bare entity name the path already fixes resolves in that entity's
  package: a dimension's @of after @via resolves in the package of the
  entity the @via reaches, and a report's @spine owner resolves in
  @from's package. Gated by reporting-cross-package-short-names.
- @agg any / all may omit @of and quantify the measure's @filter or
  @segment over the rows (bool_or / bool_and on Postgres, MAX / MIN of
  the condition on SQLite, D1 and MySQL, and in the Cube model). New
  loader rule M0 refuses an @of-less measure of any other @agg, and an
  @of-less any / all with no condition, with ERR_INVALID_MEASURE.

Tooling:
- meta gen no longer tells a docs-only run to wire a prompt generator,
  and claims emitted value objects only when an entity generator ran.
- agentDocsFile() warns when it skips agent/ui.md; includeUiTier is
  documented.
- meta init warns when a pre-release CLI writes generatedBy, and
  detect-prerelease-pins.sh fails on a pre-release generatedBy.
- prerelease-link keeps a pom's final-newline state, reports only real
  repins, and keeps its git exclude lines in a managed block that
  unlink removes.
---
 AGENTS.md                                     |   2 +-
 CHANGELOG.md                                  |  49 +++++++
 README.md                                     |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/typescript-docs.md             |   2 +-
 docs/CONFORMANCE.md                           |   6 +-
 .../migrations/docs-are-generators.md         |   9 +-
 docs/features/prerelease.md                   |  27 ++--
 docs/features/reporting.md                    |  42 ++++--
 examples/showcase/site-payload.json           |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/typescript-docs.md             |   2 +-
 .../references/declaring-reports.md           |   6 +-
 .../references/reporting.md                   |   2 +-
 .../references/typescript-docs.md             |   2 +-
 .../expected-errors.json                      |  15 ++
 .../input/meta.ops.json                       |  78 ++++++++++
 .../providers.json                            |   1 +
 .../expected-errors.json                      |  15 ++
 .../input/meta.ops.json                       |  81 +++++++++++
 .../providers.json                            |   1 +
 .../reporting-any-all-predicate/expected.json | 128 ++++++++++++++++
 .../input/meta.ops.json                       |  37 +++++
 .../providers.json                            |   1 +
 .../expected.json                             | 115 +++++++++++++++
 .../input/meta.play.json                      |  21 +++
 .../input/meta.reports.json                   |  19 +++
 .../input/meta.world.json                     |  18 +++
 .../providers.json                            |   1 +
 .../expected/model/cubes/Call.yml             |   3 +
 .../measure-boolean-mysql/meta.json           |  11 ++
 .../expected/model/cubes/Call.yml             |   3 +
 fixtures/cube-model/measure-boolean/meta.json |  11 ++
 .../metamodel-docs/expected/types/measure.md  |   4 +-
 .../expected-registry.json                    |   6 +-
 .../ReportRowCodegenTests.cs                  |  57 ++++++++
 .../ReportShapeTests.cs                       |  34 +++++
 .../MetaObjects/Core/Reporting/ReportShape.cs |  85 +++++++++--
 .../Core/Reporting/ReportingSchema.cs         |   7 +-
 .../Loader/ValidationPasses.Reporting.cs      |  45 ++++--
 .../MetaObjects/SpecMetamodel/reporting.json  |   4 +-
 .../loader/ReportingValidation.java           |  44 ++++--
 .../reporting/AggregateMeasure.java           |   4 +-
 .../metaobjects/reporting/ReportShape.java    |  76 ++++++++--
 .../reporting/ReportShapeTest.java            |  55 +++++++
 server/python/src/metaobjects/core_types.py   |   6 +-
 .../metaobjects/loader/validate_reporting.py  |  43 ++++--
 .../meta/core/reporting/report_shape.py       |  91 ++++++++++--
 .../metaobjects/spec_metamodel/reporting.json |   4 +-
 .../tests/codegen/test_report_router.py       |  31 ++++
 server/python/tests/test_report_shape.py      |  60 ++++++++
 .../packages/cli/src/commands/init.ts         |  16 +-
 .../packages/cli/src/lib/version.ts           |  11 ++
 .../packages/cli/test/unit/version.test.ts    |  40 +++++
 .../codegen-ts/src/cube/cube-members.ts       |  13 +-
 .../src/generators/agent-docs-file.ts         |  17 ++-
 .../src/projection/report-ddl-emit.ts         |   6 +
 .../src/projection/report-resolve.ts          |  16 +-
 .../codegen-ts/src/prompt-generator-gate.ts   |  22 ++-
 .../codegen-ts/src/reference/agent-docs.ts    |  17 ++-
 .../packages/codegen-ts/src/runner.ts         |   7 +-
 .../test/agent-docs-surface.test.ts           |  42 ++++++
 .../test/projection/report-ddl-emit.test.ts   |  69 +++++++++
 .../test/prompt-generator-gate.test.ts        |  51 ++++++-
 .../test/report-views-pg.test.ts              |  30 ++++
 .../test/report-views-sqlite.test.ts          |  34 +++++
 .../src/core/reporting/report-describe.ts     |   8 +-
 .../src/core/reporting/report-shape.ts        |  88 ++++++++++-
 .../reporting-definition.embedded.ts          |   6 +-
 .../typescript/packages/metadata/src/index.ts |   1 +
 .../src/loader/reporting-validation.ts        |  44 ++++--
 .../metadata/test/report-shape.test.ts        |  36 +++++
 site-reference/types/measure.html             |   6 +-
 spec/metamodel/reporting.json                 |   4 +-
 tools/prerelease/detect-prerelease-pins.sh    |  42 +++++-
 tools/prerelease/prerelease-link.sh           | 137 +++++++++++++++---
 tools/prerelease/test-prerelease-link.sh      | 115 ++++++++++++++-
 85 files changed, 2091 insertions(+), 195 deletions(-)
 create mode 100644 fixtures/conformance/error-measure-any-without-condition/expected-errors.json
 create mode 100644 fixtures/conformance/error-measure-any-without-condition/input/meta.ops.json
 create mode 100644 fixtures/conformance/error-measure-any-without-condition/providers.json
 create mode 100644 fixtures/conformance/error-measure-sum-without-of/expected-errors.json
 create mode 100644 fixtures/conformance/error-measure-sum-without-of/input/meta.ops.json
 create mode 100644 fixtures/conformance/error-measure-sum-without-of/providers.json
 create mode 100644 fixtures/conformance/reporting-any-all-predicate/expected.json
 create mode 100644 fixtures/conformance/reporting-any-all-predicate/input/meta.ops.json
 create mode 100644 fixtures/conformance/reporting-any-all-predicate/providers.json
 create mode 100644 fixtures/conformance/reporting-cross-package-short-names/expected.json
 create mode 100644 fixtures/conformance/reporting-cross-package-short-names/input/meta.play.json
 create mode 100644 fixtures/conformance/reporting-cross-package-short-names/input/meta.reports.json
 create mode 100644 fixtures/conformance/reporting-cross-package-short-names/input/meta.world.json
 create mode 100644 fixtures/conformance/reporting-cross-package-short-names/providers.json
 create mode 100644 server/typescript/packages/cli/test/unit/version.test.ts

diff --git a/AGENTS.md b/AGENTS.md
index 396cd39d7..1e010f5ed 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -72,7 +72,7 @@ PyPI has had no product change since `0.25.0` — nothing is broken.
 - **Kotlin** — `codegen-kotlin` (KotlinPoet on JVM): entity + Exposed table + Spring controller + payload + relations + filter allowlist + validator + stored-proc + output-parser generators. `integration-tests-kotlin` runs the persistence-conformance corpus through Exposed against Testcontainers Postgres.
 
 **Cross-port conformance corpora** (every port runs the shared corpus):
-- Metamodel: `fixtures/conformance/` (380 fixtures; 29 shared corpora in total — per-corpus counts + the corpus x port matrix live in `docs/CONFORMANCE.md`). TS / C# / Java / Python all green.
+- Metamodel: `fixtures/conformance/` (384 fixtures; 29 shared corpora in total — per-corpus counts + the corpus x port matrix live in `docs/CONFORMANCE.md`). TS / C# / Java / Python all green.
 - Render: `fixtures/render-conformance/`. TS / C# / Java / Kotlin / Python byte-identical.
 - Persistence: `fixtures/persistence-conformance/`. **Query** scenarios run on every port (TS / C# / Java / Kotlin / Python), each provisioning its test DB by executing the committed, TS-produced `canonical/schema.postgres.sql` (Postgres only — Derby dropped for the cross-port query corpus, ADR-0015; the FR-044 `report-*` scenarios also run on SQLite, MySQL and D1 where a port has the engine, see [docs/CONFORMANCE.md](docs/CONFORMANCE.md)). The **migration** scenarios are exercised by **TS only** (TS owns schema migrations). **The corpus now gates WRITES, not just reads (SP-H):** an `op: roundtrip` scenario type INSERTs through each port's runtime/ORM write codec (NOT raw SQL), reads the row back, and asserts the wire-normalized value. The `AllTypes` entity (`roundtrip-all-types.yaml`) carries one field of **every** persistable `field.*` subtype — string/int/long/double/float/decimal/boolean/date/time/timestamp(+tz)/currency/enum/uuid/object — plus an **array-of-VO** `field.object @isArray @storage:jsonb` column (`labels`, written as 2-element / empty-`[]` / single-element arrays across the three rows) — so every subtype write+read (incl. the array-of-value-object jsonb codec) round-trips through every port against Testcontainers PG. (`field.byte`/`field.short`/`field.class` were cut as non-functional registration-only stubs — the matrix tracks only genuinely-supported subtypes; see `fixtures/registry-conformance/README.md` → "Per-subtype write-round-trip matrix".)
 - API-contract: `fixtures/api-contract-conformance/`. TS / C# / Java / Kotlin / Python all green — each port runs **two lanes**: a hand-rolled reference server AND its **generated** API artifact booted over HTTP (the deployed controller/routes; TS+C# full-stack vs Testcontainers PG, Java/Kotlin/Python generated controller + in-memory repo behind the consumer seam). The generated fan-out found 10 real deployment bugs golden snapshots missed. Three sub-corpora run the **generated lane only, on all five ports** — `write-through/`, `projection/` (F22: a view-only `object.projection` serves GET list + GET by id and answers every write verb with `405 {"error": "method_not_allowed"}`) and `report/` (FR-044: a view-backed `object.report` serves GET list, answers `POST` with that same `405`, and mounts no `/{id}` route). That is deliberate, not a gap: what is under test is whether a port's GENERATOR emits those routes, and a hand-rolled reference server would answer every scenario by construction. The `m2m/` sub-corpus also gates **TPH x M:N together** (base-declared, subtype-declared, abstract-mid-declared, a non-subtype source onto a subtype TARGET, and the cross-subtype source id answering `200 []`) — the two corpora were originally built disjoint (`tph/` had no relationships, `m2m/` no discriminators), which is precisely how that defect class survived.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a20ccf233..4351919d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,8 +50,57 @@ database does not have.
   `<allowUnmetRequires>true</allowUnmetRequires>` runs such a list when the files are
   supplied another way. Every Java and Kotlin `requires` closure, and the skills' pom
   examples, are compiled over the fitness corpus in a test.
+- **`@agg: any` / `all` without `@of`, in every port.** A `measure.aggregate` with `@agg: any`
+  or `all` may omit `@of` and declare a `@filter` or `@segment` instead: it is then true when
+  some row (`any`) or every row (`all`) in the group passes that condition. `{ "name":
+  "hasError", "@agg": "any", "@filter": { "success": false } }` states "did any call fail"
+  (`bool_or(success = FALSE)`) over a `success` column, which a boolean `@of` could not. A row
+  whose condition is NULL is skipped, as `bool_or` skips one. It lowers
+  to `bool_or(<condition>)` / `bool_and(<condition>)` on Postgres and `MAX` / `MIN` of the
+  condition on SQLite, D1 and MySQL, and to the same SQL in the Cube model. The registry makes
+  `measure.aggregate` `@of` optional (`metamodelVersion` stays `1.1`), and a new loader rule M0
+  refuses, with `ERR_INVALID_MEASURE`, an `@of`-less measure whose `@agg` is not `any` or `all`
+  (it was `ERR_MISSING_REQUIRED_ATTR`) and an `@of`-less `any` / `all` with no condition.
+  Gated by the `reporting-any-all-predicate`, `error-measure-any-without-condition` and
+  `error-measure-sum-without-of` conformance fixtures. Found by an adopter on 1.1.0-rc.4.
 
 ### Fixed
+- **A bare entity name the path already fixes resolves in that entity's package, in every port.**
+  A dimension's `"@of": "Realm.name"` after a `@via` hop onto `world::Realm` was resolved in
+  the declaring entity's package and refused (`must name a field of 'world::Realm', the entity
+  @via ... reaches`), so a cross-package `@of` needed the full name. It now resolves in the
+  package of the entity the `@via` reaches, and the owner of a report's `@spine` resolves in
+  `@from`'s package rather than the report's. A fully-qualified name is unchanged. The loader and every port's report shape use
+  the one rule. Gated by the `reporting-cross-package-short-names` conformance fixture. Found
+  by an adopter on 1.1.0-rc.4.
+- **`meta gen` with only documentation generators no longer says to wire a prompt generator.**
+  A project whose `generators` lists only docs generators was told, for each `template.prompt`,
+  to add `promptRender()`, and that the payload value objects "were emitted regardless" when the
+  run had emitted no code. The advisory now fires only when the run lists a generator that
+  writes code, and it says the value objects were emitted only when `entityFile()` (or another
+  entity-module generator) ran. Found by an adopter on 1.1.0-rc.4.
+- **`agentDocsFile()` says when it skips `agent/ui.md`.** The page is written only when the run
+  lists a client UI generator or the generator is given `includeUiTier: true`, and before this
+  a project whose UI is generated by a separate config lost the page with no message. `meta
+  gen` now warns `agent/ui.md not written: no client UI generator in this run; set
+  includeUiTier: true if another config generates the UI.`, and the option is documented in
+  `docs/features/migrations/docs-are-generators.md`. Found by an adopter on 1.1.0-rc.4.
+- **A pre-release CLI's version in `.metaobjects/.agent-context.json` is caught.** `meta init`
+  stamps the running CLI's version into that committed file's `generatedBy`; run with a release
+  candidate, it recorded `1.1.0-rc.4` and `tools/prerelease/detect-prerelease-pins.sh` passed.
+  `meta init` now warns when it writes a pre-release `generatedBy`, and the detector fails on
+  one and names `meta init --refresh-docs --docs-only`, run with the release CLI, as the fix.
+  Found by an adopter on 1.1.0-rc.4.
+- **`prerelease-link` leaves a pom it did not change byte-identical, and reports only real
+  repins.** A `link` / `unlink` round trip added a final newline to a `pom.xml` that had none,
+  so `git status` showed it modified, and both commands said "repinned ... in `app/pom.xml`"
+  for a module pinned only through its parent's `${metaobjects.version}`. The rewrites keep a
+  file's final-newline state, and a repin is reported only for a file whose text changed.
+  Found by an adopter on 1.1.0-rc.4.
+- **`prerelease-link unlink` removes the git exclude lines `link` added.** `link` appended its
+  ignore rules as bare lines to the clone's shared `info/exclude`, and `unlink` left them there.
+  They now sit in one managed block, which `unlink` removes without touching a line the user
+  wrote, and a repeated `link` does not add them twice.
 - `verify --codegen` (Python, C#) says when the committed output was generated with another
   column rule, another table rule, or both, and names the `naming` setting that reproduces it,
   instead of advising a regeneration that would commit the wrong column or table names.
diff --git a/README.md b/README.md
index 411ba70bc..b918024df 100644
--- a/README.md
+++ b/README.md
@@ -263,7 +263,7 @@ metaobjects/
 ├── CLAUDE.md                       # project instructions for Claude
 ├── spec/                           # canonical metamodel docs, ADRs, roadmap
 ├── fixtures/                       # 25 cross-language conformance corpora — the oracle
-│   ├── conformance/                # metamodel (loader + serializer + navigation), 380 fixtures
+│   ├── conformance/                # metamodel (loader + serializer + navigation), 384 fixtures
 │   ├── yaml-conformance/           # YAML authoring desugar
 │   ├── render-conformance/         # FR-004 byte-identical render oracle
 │   ├── verify-conformance/         # FR-004 template-drift gate
diff --git a/agent-context/skills/metaobjects-authoring/references/declaring-reports.md b/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/agent-context/skills/metaobjects-authoring/references/reporting.md b/agent-context/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/agent-context/skills/metaobjects-authoring/references/reporting.md
+++ b/agent-context/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/agent-context/skills/metaobjects-codegen/references/typescript-docs.md b/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
index 2159716b4..07e6a361f 100644
--- a/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/docs/CONFORMANCE.md b/docs/CONFORMANCE.md
index bb8712188..ffd0ad379 100644
--- a/docs/CONFORMANCE.md
+++ b/docs/CONFORMANCE.md
@@ -26,7 +26,7 @@ regenerate with `ls -d fixtures/<corpus>/*/ | wc -l` for directory-shaped corpor
 
 | Corpus | Fixtures | TS | Java | Kotlin | C# | Python |
 |---|---|---|---|---|---|---|
-| [`fixtures/conformance/`](../fixtures/conformance/) (metamodel) | 380 | ✓ | ✓ | inherits via `metadata-ktx` | ✓ | ✓ |
+| [`fixtures/conformance/`](../fixtures/conformance/) (metamodel) | 384 | ✓ | ✓ | inherits via `metadata-ktx` | ✓ | ✓ |
 | [`fixtures/yaml-conformance/`](../fixtures/yaml-conformance/) | 16 | 16 / 16 | 15 / 16 (1 ledgered: `yaml-quoted-leading-zero` — Java pipeline strips quotes off `"007"`) | inherits via Java | 15 / 16 (1 ledgered: `error-yaml-coerced-hex-in-string` — YamlDotNet doesn't coerce `0xFF`) | 16 / 16 |
 | [`fixtures/verify-conformance/`](../fixtures/verify-conformance/) | 37 | ✓ | ✓ | inherits via Java | ✓ | ✓ |
 | [`fixtures/verify-strict-conformance/`](../fixtures/verify-strict-conformance/) | 1 | ✓ | — | — | — | ✓ |
@@ -267,7 +267,7 @@ unit-test runners (`bun test`, `dotnet test`, `pytest`, `mvn test`) pull Docker.
 
 ## Fixture-to-doc mapping
 
-### `fixtures/conformance/` — metamodel loader + canonical serializer (380)
+### `fixtures/conformance/` — metamodel loader + canonical serializer (384)
 
 | Fixture prefix | Feature doc |
 |---|---|
@@ -541,7 +541,7 @@ files into a real Cube.
 
 ## Orphaned fixtures (tested but not yet documented)
 
-The fixtures in the nine corpora mapped above (metamodel 380 + yaml 16 + verify 37
+The fixtures in the nine corpora mapped above (metamodel 384 + yaml 16 + verify 37
 + render 16 + persistence 54 + api-contract 91 + source-resolution 25 + scope 10 +
 dependency 23) each map to a feature doc, and so do the two requirement corpora and the
 `cube-model` corpus, whose case lists live in their own READMEs. None are orphaned today. The remaining
diff --git a/docs/features/migrations/docs-are-generators.md b/docs/features/migrations/docs-are-generators.md
index 4c307f00a..6c1d7b3db 100644
--- a/docs/features/migrations/docs-are-generators.md
+++ b/docs/features/migrations/docs-are-generators.md
@@ -145,7 +145,7 @@ them only if you ran those flags.
 |---|---|
 | `docs.outDir`, `--out` (default `./docs/generated`) | `targets.docs.outDir` |
 | `docs.layout`, `--layout` | `targets.docs.outputLayout` (falls back to the top-level `outputLayout`, as 1.0 did) |
-| `docs.surfaces`, `--model` / `--api` / `--requirements` / `--agent` | which factories you list: `docsFile()`, `apiDocsFile()`, `requirementsFile()`, `agentDocsFile()` |
+| `docs.surfaces`, `--model` / `--api` / `--requirements` / `--agent` | which factories you list: `docsFile()`, `apiDocsFile()`, `requirementsFile()`, `agentDocsFile()`. `--agent` wrote all three agent pages unconditionally; `agentDocsFile()` writes `agent/ui.md` only when the run also lists a client UI generator (a form, a hook, a grid or its columns) or the config sets `includeUiTier: true` — see "Things that are different in 1.1.0" |
 | `docs.apiSurfaces` | `docsFile({ apiSurfaces })`, same shape. Leave it out when the only api pages are this project's own: the model pages then link to whatever `apiDocsFile()` writes to the same target |
 | the `subDir` of the `ts` entry in `docs.apiSurfaces` (default `api`) | `apiDocsFile({ subDir })`, same default |
 | `docs.baseUrl`, `--base-url` | none: 1.0 read it nowhere. To link each api page to model pages hosted elsewhere, use `apiDocsFile({ modelBaseUrl })` |
@@ -173,6 +173,13 @@ them only if you ran those flags.
   generated pages count as foreign files, so in a shared directory each port's
   `verify --codegen` reports the other ports' pages as drift.
 - The site loads the same metadata `meta gen` loads, from the project's declared sources.
+- `agentDocsFile()` writes `agent/ui.md` only when this run also lists a client UI
+  generator (`formFile()`, a TanStack hook/grid, an Angular form/grid/service), because
+  whether a UI is emitted is a generator fact, not a metadata one. A **docs-only** config
+  — one whose own `generators` lists no UI generator because a separate config generates
+  the UI — never sees that generator, so set `includeUiTier: true` to write the page
+  anyway. When the model has a UI surface but the page is skipped, `meta gen` prints an
+  advisory naming `includeUiTier: true` rather than exiting silently.
 
 **Scripts and CI.** Replace `meta docs` with `meta gen`, and `meta verify --docs` with
 `meta verify --codegen`. To write only the documentation, name the docs entries:
diff --git a/docs/features/prerelease.md b/docs/features/prerelease.md
index e356ba482..dd915c4b5 100644
--- a/docs/features/prerelease.md
+++ b/docs/features/prerelease.md
@@ -167,10 +167,13 @@ Everything it writes is delimited by managed markers, so `unlink` removes exactl
 | Maven | `pom.xml` `<repositories>` | plus `.mvn/settings.xml` when the registry is plain `http` (see below) |
 
 Files that are not normally tracked (`.npmrc`, `NuGet.config`, `.mvn/*`) are also added to
-the project's `.git/info/exclude`, which is local and not committed. Files that *are*
-tracked by definition (`pyproject.toml`, `pom.xml`) get a loud warning instead — there is
-no way to make an edit to a tracked file uncommittable, which is precisely why the detector
-in §5 exists.
+the project's `.git/info/exclude`, which is local and not committed — in a linked git
+worktree this is the *shared* exclude file in the clone's common dir (git has no
+per-worktree exclude), so the paths `link` adds there live inside their own managed block
+too: `unlink` removes exactly that block, never a line a user added to the file by hand,
+and a repeated `link` does not duplicate it. Files that *are* tracked by definition
+(`pyproject.toml`, `pom.xml`) get a loud warning instead — there is no way to make an edit
+to a tracked file uncommittable, which is precisely why the detector in §5 exists.
 
 After `link`:
 
@@ -247,7 +250,7 @@ top of it. Treat a failure as a build break.
    default (§7), since this file ships into adopter repositories. Unset, this one check
    **announces that it did not run** rather than passing in silence, because a guard that
    is quiet when it skips cannot be told apart from a guard that looked and found nothing.
-   `link` passes the address through, so the linked consumer gets it; the other four
+   `link` passes the address through, so the linked consumer gets it; the other five
    checks are host-independent and always run — check 3 in particular catches a
    pre-release pin no matter where it came from;
 2. any private-network or loopback host **declared as a package source** (someone else's
@@ -274,11 +277,15 @@ top of it. Treat a failure as a build break.
    would flag a third-party `rc`/`beta` that merely happens to sit near a vendor entry;
 4. an npm dependency declared as a bare dist-tag, which floats;
 5. a Maven pom pinning a pre-release in a `<dependency>` or `<properties>` block — the
-   project's own `1.0.0-SNAPSHOT` version is normal and is deliberately not flagged.
-
-It scans **dependency declarations only** — manifests and lockfiles. A source file that
-binds a test server to `127.0.0.1`, or a design doc quoting an old `-SNAPSHOT`, is not a
-dependency on anything, and a check that cries wolf is a check people learn to ignore.
+   project's own `1.0.0-SNAPSHOT` version is normal and is deliberately not flagged;
+6. a pre-release `generatedBy` in `.metaobjects/.agent-context.json`. `meta init` stamps the
+   running CLI's version there, so agent context refreshed with a release candidate says so
+   in a committed file. Refresh it with the release CLI (`meta init --refresh-docs
+   --docs-only`) and commit the result. `meta init` also warns when it writes one.
+
+It scans **dependency declarations only** (manifests and lockfiles), plus that one
+agent-context file. A source file that binds a test server to `127.0.0.1`, or a design doc
+quoting an old `-SNAPSHOT`, is not a dependency on anything, and a check that cries wolf is a check people learn to ignore.
 
 ### In this repo: `scripts/check-no-prerelease-versions.sh`
 
diff --git a/docs/features/reporting.md b/docs/features/reporting.md
index f52185c75..40b638ee1 100644
--- a/docs/features/reporting.md
+++ b/docs/features/reporting.md
@@ -165,8 +165,10 @@ What each piece means:
   `origin.aggregate`, whose `count` is always distinct as a join-inflation guard: a measure
   aggregates its own entity's rows and a dimension reaches only to-one paths, so no join
   inflates it. `@filter` and `@segment` scope the rows and combine by AND.
-- **`@agg: any` / `all`** are boolean OR and AND over a `field.boolean` `@of`, and the measure
-  is a `boolean`: `hasError` is `any` of `failed`. See [Boolean measures](#boolean-measures-any-and-all).
+- **`@agg: any` / `all`** are boolean OR and AND, and the measure is a `boolean`: over a
+  `field.boolean` `@of` (`hasError` is `any` of `failed`), or with no `@of`, over the measure's
+  own `@filter` / `@segment` (`hasError` is `any` row where `success` is false). See
+  [Boolean measures](#boolean-measures-any-and-all).
 - **`measure.ratio`** is `numerator / NULLIF(denominator, 0)`, typed decimal. A zero
   denominator yields null, unless the ratio declares `@default`. Both operands are
   `measure.aggregate` siblings (a ratio of ratios is not supported), and each must be a
@@ -313,8 +315,8 @@ applied. The aggregates:
   64-bit integer on every engine (Postgres casts it to `BIGINT`, MySQL to `SIGNED`, and SQLite's
   integer `SUM` already is one).
 - **`avg`, `min`, `max`** are the engine's own.
-- **`any`, `all`** are a boolean OR and AND over a boolean column. See
-  [Boolean measures](#boolean-measures-any-and-all).
+- **`any`, `all`** are a boolean OR and AND over a boolean column, or with no `@of` over the
+  measure's row condition. See [Boolean measures](#boolean-measures-any-and-all).
 - **`measure.ratio`** is `numerator / NULLIF(denominator, 0)`: a zero denominator is **null**
   (or the ratio's `@default`), never an error. Each operand is repeated inline with its own
   conditions and its own `@default`, so an operand need not be listed in `@measures`.
@@ -362,8 +364,12 @@ program.
   program was published is legal, the month of a purchase is not.
 - **Package names in a cross-package model.** A bare entity name inside a member resolves in the
   package of the entity that **declares** the member, never in `@from`'s package: that is
-  `@of` and `@via`. The owner of `@spine`, and the qualifier of a dotted `@measures` item,
-  resolve in the **report's** package. When the entity you name lives in another package, write it with its package
+  `@via`, and `@of` without `@via`. Two owners are already fixed by the path, so a bare name
+  resolves in the package of the entity it must be: a dimension's `@of` after `@via` resolves
+  in the package of the entity the `@via` reaches (`"@of": "Realm.name"` after a hop onto
+  `world::Realm` names `world::Realm`), and the owner of `@spine` resolves in `@from`'s package.
+  The qualifier of a dotted `@measures` item resolves in the **report's** package. When the
+  entity you name lives in another package, write it with its package
   (`acme::session::SessionHealthSnapshot.fkSessionId`), or the load fails with `must start at
   <@from>`: the bare name found nothing in that package, or found a different entity of the same
   name.
@@ -461,6 +467,19 @@ and MySQL first.
 true when every row with a value has a true `@of`. They are SQL's `bool_or` and `bool_and`,
 and the measure is a `boolean` in every port: `true` or `false` on the wire, never `0` or `1`.
 
+Without `@of`, `any` and `all` ask the question of the measure's own row condition instead of
+a column: `any` is true when some row in the group passes the `@filter` (and `@segment`), and
+`all` is true when every row does. This states "did any call fail" over a `success` column,
+with no `failed` column to aggregate:
+
+```jsonc
+{ "field.boolean":      { "name": "success", "@required": true } },
+{ "measure.aggregate":  { "name": "hasError", "@agg": "any", "@filter": { "success": false } } }
+```
+
+A measure with no `@of` must declare a `@filter` or a `@segment` (rule M0); every other
+`@agg` needs `@of`.
+
 ```jsonc
 { "field.boolean":      { "name": "failed" } },
 { "field.boolean":      { "name": "succeeded" } },
@@ -468,7 +487,7 @@ and the measure is a `boolean` in every port: `true` or `false` on the wire, nev
 { "measure.aggregate":  { "name": "allSucceeded", "@agg": "all", "@of": "Call.succeeded", "@default": 1 } }
 ```
 
-- **Only over a `field.boolean`.** `@of` names one boolean field; anything else is refused by
+- **Only over a `field.boolean`.** An `@of` names one boolean field; anything else is refused by
   rule M4. `min` and `max` still refuse a boolean, so `any` and `all` are the way to write it.
   `@filter` and `@segment` scope the rows as for any measure, and `@distinct` stays a `count`
   modifier.
@@ -488,7 +507,9 @@ and the measure is a `boolean` in every port: `true` or `false` on the wire, nev
 - **How it lowers.** Postgres writes `bool_or(x)` / `bool_and(x)`, with `FILTER (WHERE …)`
   for a condition. SQLite and MySQL have no boolean aggregate, and a boolean there is `0` or
   `1`, so they write `MAX(x)` for `any` and `MIN(x)` for `all` (`MAX(CASE WHEN … THEN x END)`
-  for a condition). The runtime reads the column as the boolean it is typed as. A default is
+  for a condition). Without `@of` the condition is the aggregated value: `bool_or(<condition>)`
+  on Postgres and `MAX(<condition>)` elsewhere, where a comparison is `0`, `1` or null. A row
+  whose condition is null (a null `success`) is skipped, as a null `@of` is. The runtime reads the column as the boolean it is typed as. A default is
   `COALESCE(<the aggregate>, FALSE)` on Postgres and `COALESCE(<the aggregate>, 0)` elsewhere.
 - **Cube.** The export writes a `type: boolean` measure holding the same aggregate, see
   [cube-export.md](cube-export.md).
@@ -790,7 +811,7 @@ a rule differently fails the corpus.
 
 | Rule | Refused |
 |---|---|
-| **D1** | An `@of` that is not `Entity.field`, that names the wrong entity, or whose field does not exist. Without `@via`, `Entity` is the owning entity; with `@via`, it is the `@via` terminal. |
+| **D1** | An `@of` that is not `Entity.field`, that names the wrong entity, or whose field does not exist. Without `@via`, `Entity` is the owning entity; with `@via`, it is the `@via` terminal, and a bare `Entity` resolves in the terminal's package. |
 | **D2** | An `@via` that is not `Owner.hop[.hop...]` starting at the owning entity, or that crosses a hop which is not a `relationship.*` with `@cardinality: one` or an `identity.reference`, or a hop whose target resolves to no object. |
 | **D3** | A `dimension.time` whose `@of` is not a `field.date` or `field.timestamp`. |
 | **D4** | A `dimension.time` over a `field.date` that declares `hour` (a date has no hour). |
@@ -808,6 +829,7 @@ row, and a `SUM` over the result would double-count. A to-one hop cannot fan out
 
 | Rule | Refused |
 |---|---|
+| **M0** | A `measure.aggregate` with no `@of` whose `@agg` is not `any` or `all`, or an `any` or `all` with no `@of` that declares neither `@filter` nor `@segment`. |
 | **M1** | An `@of` item that is not `Entity.field`, names an entity other than the owning one (or one it extends), or names a field that does not exist. A measure aggregates its own entity's rows. |
 | **M2** | More than one `@of` item without both `@agg: count` and `@distinct: true`. |
 | **M3** | `@distinct: true` with any `@agg` other than `count`. |
@@ -842,7 +864,7 @@ this only. The message and two edge cases differ by port: see [Known limits](#kn
 | **R5** | `ERR_INVALID_REPORT` | A report `source.*` that is writable. A report's source, if present, must have a read-only `@kind` (`view`, `materializedView`, `storedProc`, `tableFunction`); a writable `@kind: table` is refused. |
 | **R6** | `ERR_INVALID_REPORT` | Two derived field names that collide: a dimension `revenue` with a measure `revenue`, or dimension `purchasedAt` at grain `day` with a measure named `purchasedAtDay`. A measure listed twice gets the same code with its own message ("lists 'x' more than once"). A repeated dimension item is reported under R2, not R6. |
 | **R7** | `ERR_INVALID_REPORT` | A report `@segment` that names no segment of `@from`. |
-| **R8** | `ERR_INVALID_REPORT` | A `@spine` that is not `Owner.hop[.hop...]` with `Owner` resolving to `@from` or an entity it extends (in the report's package), or that crosses a hop which is not a `relationship.*` with `@cardinality: one` or an `identity.reference`, or a hop whose target resolves to no object. This is D2's walk, started at `@from`. |
+| **R8** | `ERR_INVALID_REPORT` | A `@spine` that is not `Owner.hop[.hop...]` with `Owner` resolving to `@from` or an entity it extends (a bare `Owner` resolves in `@from`'s package), or that crosses a hop which is not a `relationship.*` with `@cardinality: one` or an `identity.reference`, or a hop whose target resolves to no object. This is D2's walk, started at `@from`. |
 | **R9** | `ERR_INVALID_REPORT` | A `@spine` report with no dimension, or a listed dimension whose `@via` does not begin with the spine's hops (no `@via` at all included). Hop names are compared as written; the owner segment is not. |
 
 `purchasedAt:day` and `purchasedAt:week` together are legal, since they derive different
diff --git a/examples/showcase/site-payload.json b/examples/showcase/site-payload.json
index c3ffe072c..c315df099 100644
--- a/examples/showcase/site-payload.json
+++ b/examples/showcase/site-payload.json
@@ -7,7 +7,7 @@
     "metamodel": "1.1"
   },
   "counts": {
-    "fixtures": 380,
+    "fixtures": 384,
     "corpora": 29,
     "baseTypes": 17
   },
diff --git a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
+++ b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/reporting.md b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/reporting.md
+++ b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/reporting.md b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/reporting.md
+++ b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
+++ b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
index 2159716b4..07e6a361f 100644
--- a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index 289368316..ba19b0d33 100644
--- a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -14,7 +14,9 @@ and an `object.report` combines them by name. Four node kinds:
 - `dimension.attribute` / `dimension.time` — what to group by (`@of: Entity.field`; a time
   dimension lists the `@grains` it supports: `hour`, `day`, `week`, `month`, `quarter`, `year`);
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
-  (`@numerator` / `@denominator`, both measures of the entity);
+  (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
+  `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
@@ -63,6 +65,8 @@ Three rules an author trips on:
    a `sum`. The view joins the hop through an `identity.reference` between the two entities
    (`{ "identity.reference": { "name": "fkProgram", "@fields": ["programId"], "@references":
    "Program" } }`); a relationship with none behind it loads and then fails `meta migrate`.
+   After `@via`, a bare entity name in `@of` resolves in the package of the entity the `@via`
+   reaches (`"@of": "Realm.name"` after a hop onto `world::Realm`).
 3. **A report declares no fields.** Its columns are derived: one per dimension, then one per
    measure (a time dimension at a grain is `<name><Grain>`, so `purchasedAt:day` is
    `purchasedAtDay`). A `field.*` or `identity.*` child on a report is an error.
diff --git a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/reporting.md b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/reporting.md
index 37fa747e2..31489594b 100644
--- a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/reporting.md
+++ b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/reporting.md
@@ -47,7 +47,7 @@ A report declares no fields. Its columns are one per `@dimensions` item in liste
 | `avg` of `int`, `long`, `currency`, `decimal` | the measure's name | `decimal` | no |
 | `avg` of `double` / `float` | the measure's name | `double` | no |
 | `min` / `max` | the measure's name | the `@of` field's type | no |
-| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; `@of` must be a `field.boolean`) | the measure's name | `boolean` | no |
+| `any` / `all` (boolean OR / AND, `bool_or` / `bool_and`; over a `field.boolean` `@of`, or with no `@of` over the measure's `@filter` / `@segment`) | the measure's name | `boolean` | no |
 | `measure.ratio` | the measure's name | `decimal` | no |
 | any measure above except `count`, declaring `@default` | the measure's name | as above | yes: it reads the default instead of null |
 | in a `@spine` report, a dimension over a column of the spine entity | the dimension's name | the `@of` field's type | yes when the field is `@required` or in that entity's `identity.primary`; no for a dimension beyond the spine entity |
diff --git a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
index 2159716b4..07e6a361f 100644
--- a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/fixtures/conformance/error-measure-any-without-condition/expected-errors.json b/fixtures/conformance/error-measure-any-without-condition/expected-errors.json
new file mode 100644
index 000000000..a46a2d027
--- /dev/null
+++ b/fixtures/conformance/error-measure-any-without-condition/expected-errors.json
@@ -0,0 +1,15 @@
+{
+  "errors": [
+    {
+      "code": "ERR_INVALID_MEASURE",
+      "source": {
+        "format": "json",
+        "files": [
+          "meta.ops.json"
+        ],
+        "jsonPath": "$['metadata.root'].children[0]['object.entity'].children[9]['measure.aggregate']"
+      }
+    }
+  ],
+  "warnings": []
+}
diff --git a/fixtures/conformance/error-measure-any-without-condition/input/meta.ops.json b/fixtures/conformance/error-measure-any-without-condition/input/meta.ops.json
new file mode 100644
index 000000000..f3b49b6e3
--- /dev/null
+++ b/fixtures/conformance/error-measure-any-without-condition/input/meta.ops.json
@@ -0,0 +1,78 @@
+{
+  "metadata.root": {
+    "package": "acme::ops",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Call",
+          "children": [
+            {
+              "source.rdb": {
+                "@table": "calls"
+              }
+            },
+            {
+              "field.long": {
+                "name": "id"
+              }
+            },
+            {
+              "field.long": {
+                "name": "gameId",
+                "@required": true
+              }
+            },
+            {
+              "field.boolean": {
+                "name": "success",
+                "@required": true
+              }
+            },
+            {
+              "field.long": {
+                "name": "latencyMs"
+              }
+            },
+            {
+              "identity.primary": {
+                "name": "id",
+                "@fields": [
+                  "id"
+                ]
+              }
+            },
+            {
+              "segment.filter": {
+                "name": "slow",
+                "@filter": {
+                  "latencyMs": {
+                    "gt": 1000
+                  }
+                }
+              }
+            },
+            {
+              "dimension.attribute": {
+                "name": "game",
+                "@of": "Call.gameId"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "calls",
+                "@agg": "count",
+                "@of": "Call.id"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "hasError",
+                "@agg": "any"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/fixtures/conformance/error-measure-any-without-condition/providers.json b/fixtures/conformance/error-measure-any-without-condition/providers.json
new file mode 100644
index 000000000..aefa027b6
--- /dev/null
+++ b/fixtures/conformance/error-measure-any-without-condition/providers.json
@@ -0,0 +1 @@
+["metaobjects-core-types", "metaobjects-db"]
diff --git a/fixtures/conformance/error-measure-sum-without-of/expected-errors.json b/fixtures/conformance/error-measure-sum-without-of/expected-errors.json
new file mode 100644
index 000000000..a46a2d027
--- /dev/null
+++ b/fixtures/conformance/error-measure-sum-without-of/expected-errors.json
@@ -0,0 +1,15 @@
+{
+  "errors": [
+    {
+      "code": "ERR_INVALID_MEASURE",
+      "source": {
+        "format": "json",
+        "files": [
+          "meta.ops.json"
+        ],
+        "jsonPath": "$['metadata.root'].children[0]['object.entity'].children[9]['measure.aggregate']"
+      }
+    }
+  ],
+  "warnings": []
+}
diff --git a/fixtures/conformance/error-measure-sum-without-of/input/meta.ops.json b/fixtures/conformance/error-measure-sum-without-of/input/meta.ops.json
new file mode 100644
index 000000000..f4e00b746
--- /dev/null
+++ b/fixtures/conformance/error-measure-sum-without-of/input/meta.ops.json
@@ -0,0 +1,81 @@
+{
+  "metadata.root": {
+    "package": "acme::ops",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Call",
+          "children": [
+            {
+              "source.rdb": {
+                "@table": "calls"
+              }
+            },
+            {
+              "field.long": {
+                "name": "id"
+              }
+            },
+            {
+              "field.long": {
+                "name": "gameId",
+                "@required": true
+              }
+            },
+            {
+              "field.boolean": {
+                "name": "success",
+                "@required": true
+              }
+            },
+            {
+              "field.long": {
+                "name": "latencyMs"
+              }
+            },
+            {
+              "identity.primary": {
+                "name": "id",
+                "@fields": [
+                  "id"
+                ]
+              }
+            },
+            {
+              "segment.filter": {
+                "name": "slow",
+                "@filter": {
+                  "latencyMs": {
+                    "gt": 1000
+                  }
+                }
+              }
+            },
+            {
+              "dimension.attribute": {
+                "name": "game",
+                "@of": "Call.gameId"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "calls",
+                "@agg": "count",
+                "@of": "Call.id"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "totalLatency",
+                "@agg": "sum",
+                "@filter": {
+                  "success": false
+                }
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/fixtures/conformance/error-measure-sum-without-of/providers.json b/fixtures/conformance/error-measure-sum-without-of/providers.json
new file mode 100644
index 000000000..aefa027b6
--- /dev/null
+++ b/fixtures/conformance/error-measure-sum-without-of/providers.json
@@ -0,0 +1 @@
+["metaobjects-core-types", "metaobjects-db"]
diff --git a/fixtures/conformance/reporting-any-all-predicate/expected.json b/fixtures/conformance/reporting-any-all-predicate/expected.json
new file mode 100644
index 000000000..e6205b950
--- /dev/null
+++ b/fixtures/conformance/reporting-any-all-predicate/expected.json
@@ -0,0 +1,128 @@
+{
+  "metadata.root": {
+    "package": "acme::ops",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Call",
+          "children": [
+            {
+              "source.rdb": {
+                "@table": "calls"
+              }
+            },
+            {
+              "field.long": {
+                "name": "id"
+              }
+            },
+            {
+              "field.long": {
+                "name": "gameId",
+                "@required": true
+              }
+            },
+            {
+              "field.boolean": {
+                "name": "success",
+                "@required": true
+              }
+            },
+            {
+              "field.long": {
+                "name": "latencyMs"
+              }
+            },
+            {
+              "identity.primary": {
+                "name": "id",
+                "@fields": [
+                  "id"
+                ]
+              }
+            },
+            {
+              "segment.filter": {
+                "name": "slow",
+                "@filter": {
+                  "latencyMs": {
+                    "gt": 1000
+                  }
+                }
+              }
+            },
+            {
+              "dimension.attribute": {
+                "name": "game",
+                "@of": "Call.gameId"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "calls",
+                "@agg": "count",
+                "@of": [
+                  "Call.id"
+                ]
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "hasError",
+                "@agg": "any",
+                "@filter": {
+                  "success": {
+                    "eq": false
+                  }
+                }
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "allSlow",
+                "@agg": "all",
+                "@default": 0,
+                "@segment": "slow"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "anySlowFailure",
+                "@agg": "any",
+                "@filter": {
+                  "success": {
+                    "eq": false
+                  }
+                },
+                "@segment": "slow"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "object.report": {
+          "name": "CallsByGame",
+          "@dimensions": [
+            "game"
+          ],
+          "@from": "Call",
+          "@measures": [
+            "calls",
+            "hasError",
+            "allSlow",
+            "anySlowFailure"
+          ],
+          "children": [
+            {
+              "source.rdb": {
+                "@kind": "view",
+                "@view": "v_calls_by_game"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-any-all-predicate/input/meta.ops.json b/fixtures/conformance/reporting-any-all-predicate/input/meta.ops.json
new file mode 100644
index 000000000..27591409e
--- /dev/null
+++ b/fixtures/conformance/reporting-any-all-predicate/input/meta.ops.json
@@ -0,0 +1,37 @@
+{
+  "metadata.root": {
+    "package": "acme::ops",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Call",
+          "children": [
+            { "source.rdb": { "@table": "calls" } },
+            { "field.long": { "name": "id" } },
+            { "field.long": { "name": "gameId", "@required": true } },
+            { "field.boolean": { "name": "success", "@required": true } },
+            { "field.long": { "name": "latencyMs" } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } },
+            { "segment.filter": { "name": "slow", "@filter": { "latencyMs": { "gt": 1000 } } } },
+            { "dimension.attribute": { "name": "game", "@of": "Call.gameId" } },
+            { "measure.aggregate": { "name": "calls", "@agg": "count", "@of": "Call.id" } },
+            { "measure.aggregate": { "name": "hasError", "@agg": "any", "@filter": { "success": false } } },
+            { "measure.aggregate": { "name": "allSlow", "@agg": "all", "@segment": "slow", "@default": 0 } },
+            { "measure.aggregate": { "name": "anySlowFailure", "@agg": "any", "@segment": "slow", "@filter": { "success": false } } }
+          ]
+        }
+      },
+      {
+        "object.report": {
+          "name": "CallsByGame",
+          "@from": "Call",
+          "@dimensions": ["game"],
+          "@measures": ["calls", "hasError", "allSlow", "anySlowFailure"],
+          "children": [
+            { "source.rdb": { "@kind": "view", "@view": "v_calls_by_game" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-any-all-predicate/providers.json b/fixtures/conformance/reporting-any-all-predicate/providers.json
new file mode 100644
index 000000000..aefa027b6
--- /dev/null
+++ b/fixtures/conformance/reporting-any-all-predicate/providers.json
@@ -0,0 +1 @@
+["metaobjects-core-types", "metaobjects-db"]
diff --git a/fixtures/conformance/reporting-cross-package-short-names/expected.json b/fixtures/conformance/reporting-cross-package-short-names/expected.json
new file mode 100644
index 000000000..4f1bd7b94
--- /dev/null
+++ b/fixtures/conformance/reporting-cross-package-short-names/expected.json
@@ -0,0 +1,115 @@
+{
+  "metadata.root": {
+    "package": "acme::play",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Game",
+          "children": [
+            {
+              "source.rdb": {
+                "@table": "games"
+              }
+            },
+            {
+              "field.long": {
+                "name": "id"
+              }
+            },
+            {
+              "field.long": {
+                "name": "realmId",
+                "@required": true
+              }
+            },
+            {
+              "identity.primary": {
+                "name": "id",
+                "@fields": [
+                  "id"
+                ]
+              }
+            },
+            {
+              "identity.reference": {
+                "name": "fkRealm",
+                "@fields": [
+                  "realmId"
+                ],
+                "@references": "acme::world::Realm"
+              }
+            },
+            {
+              "dimension.attribute": {
+                "name": "realmName",
+                "@of": "Realm.name",
+                "@via": "Game.fkRealm"
+              }
+            },
+            {
+              "measure.aggregate": {
+                "name": "games",
+                "@agg": "count",
+                "@of": [
+                  "Game.id"
+                ]
+              }
+            }
+          ]
+        }
+      },
+      {
+        "object.report": {
+          "name": "GamesByRealm",
+          "@dimensions": [
+            "realmName"
+          ],
+          "@from": "acme::play::Game",
+          "@measures": [
+            "games"
+          ],
+          "@spine": "Game.fkRealm",
+          "children": [
+            {
+              "source.rdb": {
+                "@kind": "view",
+                "@view": "v_games_by_realm"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "object.entity": {
+          "name": "Realm",
+          "children": [
+            {
+              "source.rdb": {
+                "@table": "realms"
+              }
+            },
+            {
+              "field.long": {
+                "name": "id"
+              }
+            },
+            {
+              "field.string": {
+                "name": "name",
+                "@required": true
+              }
+            },
+            {
+              "identity.primary": {
+                "name": "id",
+                "@fields": [
+                  "id"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-cross-package-short-names/input/meta.play.json b/fixtures/conformance/reporting-cross-package-short-names/input/meta.play.json
new file mode 100644
index 000000000..011733165
--- /dev/null
+++ b/fixtures/conformance/reporting-cross-package-short-names/input/meta.play.json
@@ -0,0 +1,21 @@
+{
+  "metadata.root": {
+    "package": "acme::play",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Game",
+          "children": [
+            { "source.rdb": { "@table": "games" } },
+            { "field.long": { "name": "id" } },
+            { "field.long": { "name": "realmId", "@required": true } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } },
+            { "identity.reference": { "name": "fkRealm", "@references": "acme::world::Realm", "@fields": ["realmId"] } },
+            { "dimension.attribute": { "name": "realmName", "@of": "Realm.name", "@via": "Game.fkRealm" } },
+            { "measure.aggregate": { "name": "games", "@agg": "count", "@of": "Game.id" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-cross-package-short-names/input/meta.reports.json b/fixtures/conformance/reporting-cross-package-short-names/input/meta.reports.json
new file mode 100644
index 000000000..bc7d21bfb
--- /dev/null
+++ b/fixtures/conformance/reporting-cross-package-short-names/input/meta.reports.json
@@ -0,0 +1,19 @@
+{
+  "metadata.root": {
+    "package": "acme::reports",
+    "children": [
+      {
+        "object.report": {
+          "name": "GamesByRealm",
+          "@from": "acme::play::Game",
+          "@spine": "Game.fkRealm",
+          "@dimensions": ["realmName"],
+          "@measures": ["games"],
+          "children": [
+            { "source.rdb": { "@kind": "view", "@view": "v_games_by_realm" } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-cross-package-short-names/input/meta.world.json b/fixtures/conformance/reporting-cross-package-short-names/input/meta.world.json
new file mode 100644
index 000000000..c95d1eaab
--- /dev/null
+++ b/fixtures/conformance/reporting-cross-package-short-names/input/meta.world.json
@@ -0,0 +1,18 @@
+{
+  "metadata.root": {
+    "package": "acme::world",
+    "children": [
+      {
+        "object.entity": {
+          "name": "Realm",
+          "children": [
+            { "source.rdb": { "@table": "realms" } },
+            { "field.long": { "name": "id" } },
+            { "field.string": { "name": "name", "@required": true } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } }
+          ]
+        }
+      }
+    ]
+  }
+}
diff --git a/fixtures/conformance/reporting-cross-package-short-names/providers.json b/fixtures/conformance/reporting-cross-package-short-names/providers.json
new file mode 100644
index 000000000..aefa027b6
--- /dev/null
+++ b/fixtures/conformance/reporting-cross-package-short-names/providers.json
@@ -0,0 +1 @@
+["metaobjects-core-types", "metaobjects-db"]
diff --git a/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml b/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
index ade6e9fe6..543677240 100644
--- a/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
+++ b/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
@@ -17,6 +17,9 @@ cubes:
       - name: anySlowFailed
         sql: 'MAX(CASE WHEN {CUBE}.`duration_ms` >= 1000 THEN {CUBE}.`failed` END)'
         type: boolean
+      - name: anyFastCall
+        sql: 'MAX({CUBE}.`duration_ms` < 100)'
+        type: boolean
       - name: anyFailedOrFalseRaw
         sql: 'MAX({CUBE}.`failed`)'
         type: boolean
diff --git a/fixtures/cube-model/measure-boolean-mysql/meta.json b/fixtures/cube-model/measure-boolean-mysql/meta.json
index 46f756afa..e96bd60f6 100644
--- a/fixtures/cube-model/measure-boolean-mysql/meta.json
+++ b/fixtures/cube-model/measure-boolean-mysql/meta.json
@@ -58,6 +58,17 @@
                 }
               }
             },
+            {
+              "measure.aggregate": {
+                "name": "anyFastCall",
+                "@agg": "any",
+                "@filter": {
+                  "durationMs": {
+                    "lt": 100
+                  }
+                }
+              }
+            },
             {
               "measure.aggregate": {
                 "name": "anyFailedOrFalse",
diff --git a/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml b/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
index 60627dcd7..274f0a5c3 100644
--- a/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
+++ b/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
@@ -17,6 +17,9 @@ cubes:
       - name: anySlowFailed
         sql: 'bool_or({CUBE}."failed") FILTER (WHERE {CUBE}."duration_ms" >= 1000)'
         type: boolean
+      - name: anyFastCall
+        sql: 'bool_or({CUBE}."duration_ms" < 100)'
+        type: boolean
       - name: anyFailedOrFalseRaw
         sql: 'bool_or({CUBE}."failed")'
         type: boolean
diff --git a/fixtures/cube-model/measure-boolean/meta.json b/fixtures/cube-model/measure-boolean/meta.json
index 46f756afa..e96bd60f6 100644
--- a/fixtures/cube-model/measure-boolean/meta.json
+++ b/fixtures/cube-model/measure-boolean/meta.json
@@ -58,6 +58,17 @@
                 }
               }
             },
+            {
+              "measure.aggregate": {
+                "name": "anyFastCall",
+                "@agg": "any",
+                "@filter": {
+                  "durationMs": {
+                    "lt": 100
+                  }
+                }
+              }
+            },
             {
               "measure.aggregate": {
                 "name": "anyFailedOrFalse",
diff --git a/fixtures/metamodel-docs/expected/types/measure.md b/fixtures/metamodel-docs/expected/types/measure.md
index ede3c48c9..885b81d28 100644
--- a/fixtures/metamodel-docs/expected/types/measure.md
+++ b/fixtures/metamodel-docs/expected/types/measure.md
@@ -20,11 +20,11 @@ A named aggregate over the declaring entity's own rows (FR-044). @agg count with
 
 | Attribute | Type | Required | Default | Allowed values | Provider | Description |
 | --- | --- | --- | --- | --- | --- | --- |
-| `@agg` | string | yes |  | `count`, `sum`, `avg`, `min`, `max`, `any`, `all` | — | The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean. |
+| `@agg` | string | yes |  | `count`, `sum`, `avg`, `min`, `max`, `any`, `all` | — | The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment. |
 | `@default` | int | no |  |  | — | Optional integer the measure reads when it would otherwise be null: nothing matched, every matched value is null, or (a ratio) the denominator is zero or null. The derived report field is then never null. Refused on @agg: count (a count is never null), on min/max over a field that is not numeric, and on @agg any/all unless it is 0 (false) or 1 (true). A ratio's operand carries its own @default into the ratio. |
 | `@distinct` | boolean | no |  |  | — | Count distinct values. Legal only with @agg: count. |
 | `@filter` | filter | no |  |  | — | Optional row scope (a portable attr.filter over the declaring entity's fields). May use relative-date values ({ now: "-P7D" }). Combines with @segment by AND. |
-| `@of` | string[] | yes |  |  | — | Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. |
+| `@of` | string[] | no |  |  | — | Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows. |
 | `@segment` | string | no |  |  | — | Optional name of a segment declared on the same entity. Combines with @filter by AND. |
 
 **Allowed children**
diff --git a/fixtures/registry-conformance/expected-registry.json b/fixtures/registry-conformance/expected-registry.json
index ce27d0aa9..8c3c8fec6 100644
--- a/fixtures/registry-conformance/expected-registry.json
+++ b/fixtures/registry-conformance/expected-registry.json
@@ -3145,7 +3145,7 @@
             "any",
             "all"
           ],
-          "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean."
+          "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment."
         },
         {
           "name": "default",
@@ -3172,8 +3172,8 @@
           "name": "of",
           "valueType": "string",
           "isArray": true,
-          "required": true,
-          "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true."
+          "required": false,
+          "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows."
         },
         {
           "name": "segment",
diff --git a/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs b/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
index 37c83f20e..d5d5434c3 100644
--- a/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
+++ b/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
@@ -440,6 +440,63 @@ public void A_derived_field_has_the_type_and_nullability_of_its_Table_B_row(stri
         Assert.Contains("    " + property + "\n", RowOf(Cube()).ReplaceLineEndings("\n"));
     }
 
+    // ---------------------------------------------------------------------
+    // R6 (loader rule M0) — an any/all measure with no @of, quantifying its own @filter or
+    // @segment over the group. The row still carries a plain nullable bool column: M0 only
+    // widens what a measure may omit, DeriveMeasure already typed any/all boolean
+    // unconditionally (it never reads @of for them), so no generator change is needed here —
+    // this test is the regression guard that OfColumns()[0]/ofField reads elsewhere do not
+    // crash when @of is absent.
+    // ---------------------------------------------------------------------
+
+    private const string AnyMeasureModel =
+        """
+        { "metadata.root": { "package": "acme::ops", "children": [
+          { "object.entity": { "name": "Call", "children": [
+            { "source.rdb": { "@table": "calls" } },
+            { "field.long": { "name": "id" } },
+            { "field.boolean": { "name": "success", "@required": true } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } },
+            { "segment.filter": { "name": "slow", "@filter": { "id": { "gt": 1000 } } } },
+            { "measure.aggregate": { "name": "calls", "@agg": "count", "@of": "Call.id" } },
+            { "measure.aggregate": { "name": "hasError", "@agg": "any",
+                "@filter": { "success": { "eq": false } } } },
+            { "measure.aggregate": { "name": "allSlowOrTrue", "@agg": "all", "@default": 1, "@segment": "slow" } }
+          ] } },
+          { "object.report": { "name": "CallTotals", "@from": "Call",
+              "@measures": ["calls", "hasError", "allSlowOrTrue"],
+              "children": [ { "source.rdb": { "@kind": "view", "@view": "v_call_totals" } } ] } }
+        ] } }
+        """;
+
+    private static MetaRoot LoadAnyMeasureModel()
+    {
+        var result = new MetaDataLoader().Load([new InMemoryStringSource(AnyMeasureModel, id: "meta.ops.json")]);
+        Assert.True(result.Errors.Count == 0,
+            "model did not load:\n" + string.Join("\n", result.Errors.Select(e => $"  {e.Code}: {e.Message}")));
+        return result.Root;
+    }
+
+    [Fact]
+    public void A_report_row_from_an_any_measure_with_no_of_is_a_plain_nullable_bool()
+    {
+        string row = Emit(RunnerContext(LoadAnyMeasureModel()), new EntityGenerator())["CallTotals.g.cs"]
+            .ReplaceLineEndings("\n");
+        Assert.Contains("    public long Calls { get; set; }\n", row);              // count, as elsewhere
+        Assert.Contains("    public bool? HasError { get; set; }\n", row);          // any, no @of, no @default
+        Assert.Contains("    public bool AllSlowOrTrue { get; set; }\n", row);      // all, no @of, @default: 1
+    }
+
+    [Fact]
+    public void An_any_measure_with_no_of_still_compiles_through_the_real_compiler()
+    {
+        var files = EmitAll(RunnerContext(LoadAnyMeasureModel()));
+        Assert.True(files.ContainsKey("CallTotals.g.cs"));
+        var tree = CSharpSyntaxTree.ParseText(files["CallTotals.g.cs"]);
+        var diagnostics = tree.GetDiagnostics().Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
+        Assert.Empty(diagnostics);
+    }
+
     // ---------------------------------------------------------------------
     // Table C / Table F (FR-044 @spine and measure @default): no generator change. The
     // shape marks a spine key and a defaulted measure required, and the row types a
diff --git a/server/csharp/MetaObjects.Conformance.Tests/ReportShapeTests.cs b/server/csharp/MetaObjects.Conformance.Tests/ReportShapeTests.cs
index f070fd45e..735969c40 100644
--- a/server/csharp/MetaObjects.Conformance.Tests/ReportShapeTests.cs
+++ b/server/csharp/MetaObjects.Conformance.Tests/ReportShapeTests.cs
@@ -37,6 +37,19 @@ private static MetaRoot LoadCanonical()
     private static ReportShape Shape(MetaRoot root, string report) =>
         ReportShapes.Of(root.Objects().Single(o => o.Name == report), root);
 
+    /// <summary>Loads every <c>input/*.json</c> file of a conformance-corpus fixture (shared
+    /// with <see cref="ConformanceTests"/>, read-only here) as one model.</summary>
+    private static MetaRoot LoadFixture(string name)
+    {
+        string inputDir = Path.Combine(CorpusRoot.Path, name, "input");
+        var sources = Directory.GetFiles(inputDir, "*.json").OrderBy(f => f, StringComparer.Ordinal)
+            .Select(f => (IMetaDataSource)new FileSource(f)).ToList();
+        var result = new MetaDataLoader().Load(sources);
+        Assert.True(result.Errors.Count == 0,
+            $"fixture '{name}' failed to load: " + string.Join("; ", result.Errors.Select(e => e.ToString())));
+        return result.Root;
+    }
+
     [Fact]
     public void Derived_shapes_byte_match_the_committed_artifact()
     {
@@ -624,4 +637,25 @@ public void A_to_one_relationship_hop_follows_the_reference_it_crosses()
         // LEFT whatever that key and the target field require.
         Assert.False(related["stampLabel"]);
     }
+
+    // R5(c) — a via dimension's bare @of owner resolves in the package of the entity @via
+    // reaches, not the declaring entity's. fixtures/conformance/reporting-cross-package-short-names
+    // declares three packages: acme::play (Game, the dimension's declaring entity),
+    // acme::world (Realm, the @via's terminal) and acme::reports (the report). The dimension
+    // `realmName` is `@of: "Realm.name"` `@via: "Game.fkRealm"` — a bare "Realm" that must
+    // resolve in acme::world, not acme::play (where there is no "Realm" at all) or
+    // acme::reports.
+    [Fact]
+    public void A_via_dimensions_bare_of_owner_resolves_in_the_via_terminals_package()
+    {
+        var root = LoadFixture("reporting-cross-package-short-names");
+        var shape = Shape(root, "GamesByRealm");
+        var realmName = shape.Fields.Single(f => f.Name == "realmName");
+        Assert.Equal(ReportFieldRole.Dimension, realmName.Role);
+        Assert.Equal(FIELD_SUBTYPE_STRING, realmName.SubType);
+        Assert.Equal("acme::world::Realm", realmName.TypeSource?.Parent?.ResolutionKey());
+        Assert.Equal("name", realmName.TypeSource?.Name);
+        // Reached through the spine, over a @required field of the spine entity: not null.
+        Assert.True(realmName.Required);
+    }
 }
diff --git a/server/csharp/MetaObjects/Core/Reporting/ReportShape.cs b/server/csharp/MetaObjects/Core/Reporting/ReportShape.cs
index a66898ada..cef88eea9 100644
--- a/server/csharp/MetaObjects/Core/Reporting/ReportShape.cs
+++ b/server/csharp/MetaObjects/Core/Reporting/ReportShape.cs
@@ -77,8 +77,10 @@ public static class ReportShapes
     /// reference is about the <c>@from</c> entity's own rows) the named entity must be
     /// <paramref name="host"/> or an entity it extends, and the field is read from
     /// <paramref name="host"/>, so a field it redeclares wins.</item>
-    /// <item>Without <paramref name="host"/> (a dimension with <c>@via</c>) the field is read
-    /// from the named entity.</item>
+    /// <item>Without <paramref name="host"/> the field is read from the named entity. A
+    /// dimension with <c>@via</c> passes the entity its <c>@via</c> reaches as both
+    /// <paramref name="declaring"/> and <paramref name="host"/> (see
+    /// <see cref="ResolveDimensionOf"/>).</item>
     /// </list>
     /// Null when any step fails.
     /// </summary>
@@ -105,6 +107,60 @@ private static (MetaObject Named, MetaField Field)? ResolveReportingFieldRefName
         return field is null ? null : (named, field);
     }
 
+    /// <summary>
+    /// A dimension's <c>@of</c> field, read as the loader's rule D1 reads it. Without
+    /// <c>@via</c> it is <see cref="ResolveReportingFieldRef"/> with <paramref name="from"/> as
+    /// the host. With <c>@via</c> the host is the entity the <c>@via</c> reaches, and a bare
+    /// entity name in <c>@of</c> resolves in THAT entity's package: the path already fixes the
+    /// entity, so <c>Realm.name</c> after a hop onto <c>world::Realm</c> names
+    /// <c>world::Realm</c>. The field is read from the reached entity, so a field it redeclares
+    /// wins. Null when the <c>@via</c> or the <c>@of</c> does not resolve.
+    /// </summary>
+    public static (MetaObject Named, MetaField Field)? ResolveDimensionOf(MetaDimension dim, MetaObject from, MetaRoot root)
+    {
+        string of = dim.Of() ?? "";
+        string? via = dim.Via();
+        if (via is null) return ResolveReportingFieldRefNamed(of, ReportingMemberOwner(dim, from), root, from);
+        if (ReportingViaTerminal(via, ReportingMemberOwner(dim, from), from, root) is not MetaObject terminal)
+            return null;
+        return ResolveReportingFieldRefNamed(of, terminal, root, terminal);
+    }
+
+    /// <summary>
+    /// The target entity of one hop of a <c>@via</c>/<c>@spine</c> path, walked as the loader
+    /// walks it: the <c>relationship.*</c> (through its <c>@objectRef</c>) or
+    /// <c>identity.reference</c> (through its <c>@references</c>) of <paramref name="current"/>
+    /// named <paramref name="hopName"/>, resolved in <paramref name="current"/>'s package. Null
+    /// for a hop that is neither, or whose target does not resolve.
+    /// </summary>
+    private static MetaObject? ResolveViaHopTarget(MetaObject current, string hopName, MetaRoot root)
+    {
+        // ADR-0039: resolving Relationships()/ReferenceIdentities(), so an inherited hop is found.
+        var rel = current.Relationships().FirstOrDefault(r => r.Name == hopName);
+        var refNode = rel is null ? current.ReferenceIdentities().FirstOrDefault(r => r.Name == hopName) : null;
+        string? targetRef = rel is not null ? rel.ObjectRef : refNode?.ReferencesRaw;
+        if (string.IsNullOrEmpty(targetRef)) return null;
+        return NamingRefs.ResolveObjectRef(root, targetRef, NamingRefs.EffectivePackage(current)) as MetaObject;
+    }
+
+    /// <summary>
+    /// The entity at the end of a <c>@via</c> walked from <paramref name="from"/> (hops as
+    /// <see cref="ReportingViaHops"/> reads them, each target resolved by
+    /// <see cref="ResolveViaHopTarget"/>). Null when any hop does not resolve.
+    /// </summary>
+    private static MetaObject? ReportingViaTerminal(string via, MetaData declaring, MetaObject from, MetaRoot root)
+    {
+        var hops = ReportingViaHops(via, declaring, from, root);
+        if (hops is null) return null;
+        MetaObject current = from;
+        foreach (string hop in hops)
+        {
+            if (ResolveViaHopTarget(current, hop, root) is not MetaObject target) return null;
+            current = target;
+        }
+        return current;
+    }
+
     /// <summary>
     /// The hop names of a dimension's <c>@via</c> (<c>Owner.hop[.hop...]</c>), read as the
     /// loader reads it (<c>ValidateReporting</c> rule D2): <c>Owner</c> resolves in the package
@@ -133,18 +189,20 @@ private static InvalidOperationException Unresolved(string reportName, string wh
 
     /// <summary>
     /// The hop names of a report's <c>@spine</c> (<c>Owner.hop[.hop...]</c>), read as
-    /// <see cref="ReportingViaHops"/> reads a <c>@via</c>, the owner resolving in the REPORT's
-    /// package (loader rule R8). Null when the report declares no <c>@spine</c>. Throws
-    /// <see cref="InvalidOperationException"/> naming the report when a declared <c>@spine</c>
-    /// does not resolve (a report that passed <c>ValidateReporting</c> always resolves):
-    /// reading it as "no spine" would claim a column non-null that a spine row with no facts
-    /// leaves null.
+    /// <see cref="ReportingViaHops"/> reads a <c>@via</c>, the owner resolving in
+    /// <paramref name="from"/>'s package (loader rule R8): Owner must be <paramref name="from"/>
+    /// or an entity it extends, so a bare name means <paramref name="from"/>'s package even
+    /// when the report lives in another one. Null when the report declares no <c>@spine</c>.
+    /// Throws <see cref="InvalidOperationException"/> naming the report when a declared
+    /// <c>@spine</c> does not resolve (a report that passed <c>ValidateReporting</c> always
+    /// resolves): reading it as "no spine" would claim a column non-null that a spine row with
+    /// no facts leaves null.
     /// </summary>
     public static string[]? ReportSpineHops(MetaObject report, MetaObject from, MetaRoot root)
     {
         string? spine = ReportAccessors.ReportSpine(report);
         if (spine is null) return null;
-        return ReportingViaHops(spine, report, from, root) ?? throw Unresolved(report.Name, $"@spine '{spine}'");
+        return ReportingViaHops(spine, from, from, root) ?? throw Unresolved(report.Name, $"@spine '{spine}'");
     }
 
     /// <summary>True when <paramref name="field"/> is one of the <c>@fields</c> of <paramref name="entity"/>'s <c>identity.primary</c>.</summary>
@@ -231,8 +289,13 @@ private static ReportField DimensionField(
     {
         var dim = DeclaredMember<MetaDimension>(from, TYPE_DIMENSION, item.Name)
             ?? throw Unresolved(reportName, $"dimension '{item.Name}' on '{from.Name}'");
-        bool vialess = dim.Via() is null;
-        var (named, of) = ResolveReportingFieldRefNamed(dim.Of() ?? "", ReportingMemberOwner(dim, from), root, vialess ? from : null)
+        // A @via that does not walk is the @via's error, not the @of's (the @of resolves at its end).
+        string? via = dim.Via();
+        if (via is not null && ReportingViaTerminal(via, ReportingMemberOwner(dim, from), from, root) is null)
+        {
+            throw Unresolved(reportName, $"dimension '{dim.Name}' @via '{via}'");
+        }
+        var (named, of) = ResolveDimensionOf(dim, from, root)
             ?? throw Unresolved(reportName, $"dimension '{item.Name}' @of");
         string name = ReportAccessors.ReportDerivedFieldName(item);
         bool required = DimensionRequired(dim, named, of, from, root, spine, reportName);
diff --git a/server/csharp/MetaObjects/Core/Reporting/ReportingSchema.cs b/server/csharp/MetaObjects/Core/Reporting/ReportingSchema.cs
index 8d27cd256..635f3746f 100644
--- a/server/csharp/MetaObjects/Core/Reporting/ReportingSchema.cs
+++ b/server/csharp/MetaObjects/Core/Reporting/ReportingSchema.cs
@@ -44,13 +44,14 @@ private static AttrSchema MeasureDefault() =>
             allowedValues: [.. ReportingConstants.TIME_GRAINS]),
     ];
 
-    /// <summary>measure.aggregate — @agg (closed set), @of (isArray; a bare string is one column),
-    /// @distinct, @filter, @segment, @default.</summary>
+    /// <summary>measure.aggregate — @agg (closed set), @of (isArray; a bare string is one
+    /// column; optional — M0 requires it for every @agg except any/all, which may omit it to
+    /// quantify @filter/@segment over the group), @distinct, @filter, @segment, @default.</summary>
     private static readonly IReadOnlyList<AttrSchema> MeasureAggregateAttrs =
     [
         Str(ReportingConstants.REPORTING_ATTR_AGG, required: true,
             allowedValues: [.. ReportingConstants.MEASURE_AGGS]),
-        Str(ReportingConstants.REPORTING_ATTR_OF, required: true, isArray: true),
+        Str(ReportingConstants.REPORTING_ATTR_OF, required: false, isArray: true),
         new(Name: ReportingConstants.REPORTING_ATTR_DISTINCT, ValueType: AttrConstants.ATTR_SUBTYPE_BOOLEAN,
             Required: false),
         Filter(ReportingConstants.REPORTING_ATTR_FILTER, required: false),
diff --git a/server/csharp/MetaObjects/Loader/ValidationPasses.Reporting.cs b/server/csharp/MetaObjects/Loader/ValidationPasses.Reporting.cs
index 69b79e9c9..b808d4cb6 100644
--- a/server/csharp/MetaObjects/Loader/ValidationPasses.Reporting.cs
+++ b/server/csharp/MetaObjects/Loader/ValidationPasses.Reporting.cs
@@ -9,7 +9,7 @@
 // Two design rules hold throughout, so one broken rule yields exactly one error:
 //   - No cascades. A member that fails a structural rule is not checked further
 //     (a dimension whose @via fails D2 skips D1/D3/D4; a measure that fails one
-//     of M1–M4, or whose @default is a fraction, skips M7/M8; a report whose
+//     of M0–M4, or whose @default is a fraction, skips M7/M8; a report whose
 //     @from fails R1 skips R2/R3/R6/R7, R8/R9 and its @filter; a report whose
 //     @spine fails R8 skips R9, and R9 skips a dimension whose @via fails D2; an
 //     invalid @dimensions/@measures item derives no report field for R6).
@@ -331,7 +331,11 @@ void Err(string message) =>
             Err($"@of '{of}' must be Entity.field.");
             return;
         }
-        var named = NamingRefs.ResolveObjectRef(ctx.Root, parts.Value.Owner, NamingRefs.EffectivePackage(ctx.Declaring));
+        // D1 — after @via, a bare Owner resolves in the package of the entity @via reaches:
+        // the path already fixes the entity, so `Realm.name` after a hop onto `world::Realm`
+        // names it. Without @via it resolves in the declaring entity's package.
+        string ownerPkg = via is null ? NamingRefs.EffectivePackage(ctx.Declaring) : NamingRefs.EffectivePackage(ofEntity);
+        var named = NamingRefs.ResolveObjectRef(ctx.Root, parts.Value.Owner, ownerPkg);
         if (!IsSelfOrAncestor(named, ofEntity))
         {
             if (via is null)
@@ -374,7 +378,7 @@ void Err(string message) =>
     /// port copies one explicit rule.
     /// </summary>
     /// <param name="Attr">The attribute holding the path: <c>via</c> (D2) or <c>spine</c> (R8).</param>
-    /// <param name="OwnerPkg">The package Owner resolves in (ADR-0042): the declaring entity's (D2) or the report's (R8).</param>
+    /// <param name="OwnerPkg">The package Owner resolves in (ADR-0042): the declaring entity's (D2) or @from's (R8).</param>
     /// <param name="HostName">The FQN named for the walk's first entity: the declaring entity (D2) or @from (R8).</param>
     /// <param name="Start">What Owner must be: <c>the owning entity '&lt;FQN&gt;'</c> (D2) or <c>@from '&lt;FQN&gt;'</c> (R8).</param>
     /// <param name="StartShort">The same, in the malformed-path message: <c>the owning entity</c> (D2) or <c>@from '&lt;FQN&gt;'</c> (R8).</param>
@@ -397,11 +401,12 @@ private static ToOneWalk D2Walk(MetaData declaring)
                 "can never multiply the measured rows.");
     }
 
-    /// <summary>R8 — a report's @spine, started at @from (<paramref name="fromKey"/>); Owner resolves in the report's package.</summary>
-    private static ToOneWalk SpineWalk(MetaData report, string fromKey) =>
+    /// <summary>R8 — a report's @spine, started at @from; Owner resolves in @from's package
+    /// (it must be @from or an entity @from extends), whatever package the report is in.</summary>
+    private static ToOneWalk SpineWalk(MetaData from, string fromKey) =>
         new(
             Attr: OBJECT_REPORT_ATTR_SPINE,
-            OwnerPkg: NamingRefs.EffectivePackage(report),
+            OwnerPkg: NamingRefs.EffectivePackage(from),
             HostName: fromKey,
             Start: $"@from '{fromKey}'",
             StartShort: $"@from '{fromKey}'",
@@ -490,7 +495,7 @@ void Err(string message) =>
 
         bool clean = CheckAggregateColumns(ctx, measure, Err, out var ofField);
 
-        // M7 / M8 — where a @default can apply. Only when M1–M4 passed and the @default is
+        // M7 / M8 — where a @default can apply. Only when M0–M4 passed and the @default is
         // not a fraction: one mistake, one error. The presence test reads the raw attribute,
         // so a non-number value on a count still reports M7 beside the attribute type error.
         if (clean && !fractionalDefault && declaredDefault is not null)
@@ -533,9 +538,9 @@ ofField is not null &&
     }
 
     /// <summary>
-    /// M1–M4, in order; the first failure stops the chain (no M2+M3 double report).
+    /// M0–M4, in order; the first failure stops the chain (no M2+M3 double report).
     /// Returns false when one of them fired; otherwise <paramref name="field"/> is the single
-    /// resolved @of field (null for a tuple), for M7/M8.
+    /// resolved @of field (null for a tuple, or for any/all with no @of), for M7/M8.
     /// </summary>
     private static bool CheckAggregateColumns(MemberCtx ctx, MetaMeasure measure, Action<string> err, out MetaData? field)
     {
@@ -543,6 +548,26 @@ private static bool CheckAggregateColumns(MemberCtx ctx, MetaMeasure measure, Ac
         string? agg = measure.Agg();
         var columns = measure.OfColumns();
 
+        // M0 — @of names the column aggregated. Only any / all may omit it: they then
+        // quantify the measure's row condition (@filter AND @segment) over the group, "some
+        // row (every row) passes", so they need a condition to quantify.
+        if (columns.Count == 0 && agg is not null)
+        {
+            if (agg != AGG_ANY && agg != AGG_ALL)
+            {
+                err($"@agg '{agg}' needs @of, the column it aggregates. Only @agg any / all may omit @of, to ask " +
+                    "whether some row (any) or every row (all) passes the measure's @filter or @segment.");
+                return false;
+            }
+            if (measure.Filter() is null && measure.SegmentName() is null)
+            {
+                err($"@agg '{agg}' without @of quantifies the measure's row condition, but it declares neither " +
+                    "@filter nor @segment. Name a field.boolean in @of, or add the condition.");
+                return false;
+            }
+            return true;
+        }
+
         // M1 — every @of item is a field of the owning entity.
         var fields = new List<MetaData>();
         foreach (string item in columns)
@@ -861,7 +886,7 @@ void Claim(string fieldName, string what)
         string? spine = ReportAccessors.ReportSpine(report);
         if (spine is not null)
         {
-            var terminal = WalkToOneVia(root, from, spine, m => Err($": {m}"), SpineWalk(report, fromKey));
+            var terminal = WalkToOneVia(root, from, spine, m => Err($": {m}"), SpineWalk(from, fromKey));
             // R9 — every listed dimension is reached through the spine. Skipped when R8 failed.
             if (terminal is not null)
             {
diff --git a/server/csharp/MetaObjects/SpecMetamodel/reporting.json b/server/csharp/MetaObjects/SpecMetamodel/reporting.json
index 67f998e83..98c0bd24f 100644
--- a/server/csharp/MetaObjects/SpecMetamodel/reporting.json
+++ b/server/csharp/MetaObjects/SpecMetamodel/reporting.json
@@ -20,8 +20,8 @@
       "description": "A named aggregate over the declaring entity's own rows (FR-044). @agg count without @distinct counts rows; with @distinct it counts distinct values of @of (a list in @of is a distinct count of the tuple). Unlike origin.aggregate, count is NOT distinct by default: a measure aggregates its own rows and dimensions reach only to-one paths, so no join inflates it.",
       "whenToUse": "A number a dashboard shows: revenue, purchases, distinct buyers, last activity.",
       "children": [
-        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean." },
-        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 1, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true." },
+        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment." },
+        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 0, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows." },
         { "type": "attr", "subType": "boolean", "name": "distinct", "min": 0, "max": 1, "description": "Count distinct values. Legal only with @agg: count." },
         { "type": "attr", "subType": "filter", "name": "filter", "min": 0, "max": 1, "description": "Optional row scope (a portable attr.filter over the declaring entity's fields). May use relative-date values ({ now: \"-P7D\" }). Combines with @segment by AND." },
         { "type": "attr", "subType": "string", "name": "segment", "min": 0, "max": 1, "description": "Optional name of a segment declared on the same entity. Combines with @filter by AND." },
diff --git a/server/java/metadata/src/main/java/com/metaobjects/loader/ReportingValidation.java b/server/java/metadata/src/main/java/com/metaobjects/loader/ReportingValidation.java
index 4207883d3..0aefcf92e 100644
--- a/server/java/metadata/src/main/java/com/metaobjects/loader/ReportingValidation.java
+++ b/server/java/metadata/src/main/java/com/metaobjects/loader/ReportingValidation.java
@@ -72,7 +72,7 @@
  * <ul>
  *   <li>No cascades. A member that fails a structural rule is not checked further (a
  *       dimension whose {@code @via} fails D2 skips D1/D3/D4; a measure that fails one of
- *       M1–M4, or whose {@code @default} is a fraction, skips M7/M8; a report whose
+ *       M0–M4, or whose {@code @default} is a fraction, skips M7/M8; a report whose
  *       {@code @from} fails R1 skips R2/R3/R6/R7, R8/R9 and its {@code @filter}; a report
  *       whose {@code @spine} fails R8 skips R9, and R9 skips a dimension whose {@code @via}
  *       fails D2; an invalid {@code @dimensions}/{@code @measures} item derives no report
@@ -428,7 +428,11 @@ private static void checkDimension(MemberCtx ctx, MetaDimension dim) {
             err.accept("@of '" + of + "' must be Entity.field.");
             return;
         }
-        MetaData named = ValidationPhase.resolveRootObject(ctx.root(), parts.owner(), pkgOf(ctx.declaring()));
+        // D1 — after @via, a bare Owner resolves in the package of the entity @via reaches: the
+        // path already fixes the entity, so `Realm.name` after a hop onto `world::Realm` names
+        // it. Without @via it resolves in the declaring entity's package.
+        String ownerPkg = via == null ? pkgOf(ctx.declaring()) : pkgOf(ofEntity);
+        MetaData named = ValidationPhase.resolveRootObject(ctx.root(), parts.owner(), ownerPkg);
         if (!isSelfOrAncestor(named, ofEntity)) {
             if (via == null) {
                 err.accept("@of '" + of + "' must name a field of the owning entity '" + ctx.declaring().getName()
@@ -468,7 +472,7 @@ private static void checkDimension(MemberCtx ctx, MetaDimension dim) {
      *
      * @param attr        the attribute holding the path: {@code via} (D2) or {@code spine} (R8)
      * @param ownerPkg    the package Owner resolves in (ADR-0042): the declaring entity's (D2)
-     *                    or the report's (R8)
+     *                    or @from's (R8)
      * @param hostName    the FQN named for the walk's first entity: the declaring entity (D2)
      *                    or {@code @from} (R8)
      * @param start       what Owner must be: {@code the owning entity '<FQN>'} (D2) or
@@ -495,12 +499,13 @@ private static ToOneWalk d2Walk(MetaData declaring) {
                         + "can never multiply the measured rows.");
     }
 
-    /** R8 — a report's {@code @spine}, started at {@code @from} ({@code fromKey}); Owner resolves
-     *  in the report's package. */
-    private static ToOneWalk spineWalk(MetaData report, String fromKey) {
+    /** R8 — a report's {@code @spine}, started at {@code @from}; Owner resolves in
+     *  {@code @from}'s package (it must be {@code @from} or an entity {@code @from} extends),
+     *  whatever package the report is in. */
+    private static ToOneWalk spineWalk(MetaData from, String fromKey) {
         return new ToOneWalk(
                 MetaObject.ATTR_REPORT_SPINE,
-                pkgOf(report),
+                pkgOf(from),
                 fromKey,
                 "@from '" + fromKey + "'",
                 "@from '" + fromKey + "'",
@@ -598,7 +603,7 @@ private static void checkMeasure(MemberCtx ctx, MetaMeasure measure) {
 
         AggregateColumns checked = checkAggregateColumns(ctx, measure, err);
 
-        // M7 / M8 — where a @default can apply. Only when M1–M4 passed and the @default is
+        // M7 / M8 — where a @default can apply. Only when M0–M4 passed and the @default is
         // not a fraction: one mistake, one error. The presence test reads the raw attribute,
         // as the reference does (in a lenient load an unparsed value is still a declared one).
         if (checked != null && !fractionalDefault && declaresDefault) {
@@ -639,14 +644,31 @@ private record AggregateColumns(MetaData field) {
     }
 
     /**
-     * M1–M4, in order; the first failure stops the chain (no M2+M3 double report). Returns
+     * M0–M4, in order; the first failure stops the chain (no M2+M3 double report). Returns
      * {@code null} when one of them fired; otherwise its {@code field} is the single resolved
-     * {@code @of} field ({@code null} for a tuple), for M7/M8.
+     * {@code @of} field ({@code null} for a tuple or an any/all with no {@code @of}), for M7/M8.
      */
     private static AggregateColumns checkAggregateColumns(MemberCtx ctx, MetaMeasure measure, Consumer<String> err) {
         String agg = measure.getAgg();
         List<String> columns = measure.getOfColumns();
 
+        // M0 — @of names the column aggregated. Only any / all may omit it: they then
+        // quantify the measure's row condition (@filter AND @segment) over the group, "some
+        // row (every row) passes", so they need a condition to quantify.
+        if (columns.isEmpty() && agg != null) {
+            if (!ReportingConstants.AGG_ANY.equals(agg) && !ReportingConstants.AGG_ALL.equals(agg)) {
+                err.accept("@agg '" + agg + "' needs @of, the column it aggregates. Only @agg any / all may omit "
+                        + "@of, to ask whether some row (any) or every row (all) passes the measure's @filter or @segment.");
+                return null;
+            }
+            if (measure.getFilter() == null && measure.getSegmentName() == null) {
+                err.accept("@agg '" + agg + "' without @of quantifies the measure's row condition, but it declares "
+                        + "neither @filter nor @segment. Name a field.boolean in @of, or add the condition.");
+                return null;
+            }
+            return new AggregateColumns(null);
+        }
+
         // M1 — every @of item is a field of the owning entity.
         List<MetaData> fields = new ArrayList<>();
         for (String item : columns) {
@@ -946,7 +968,7 @@ private static void checkSpine(MetaRoot root, MetaObject report, MetaObject from
         String fromKey = from.getName();
         Consumer<String> err = message -> sink.push(report, ErrorCode.ERR_INVALID_REPORT, label, message);
         MetaData terminal = walkToOneVia(root, from, spine, message -> err.accept(": " + message),
-                spineWalk(report, fromKey));
+                spineWalk(from, fromKey));
         // R9 — every listed dimension is reached through the spine. Skipped when R8 failed.
         if (terminal == null) return;
         Dotted spineParts = splitDotted(spine);
diff --git a/server/java/metadata/src/main/java/com/metaobjects/reporting/AggregateMeasure.java b/server/java/metadata/src/main/java/com/metaobjects/reporting/AggregateMeasure.java
index b41ea7541..7fbbebad4 100644
--- a/server/java/metadata/src/main/java/com/metaobjects/reporting/AggregateMeasure.java
+++ b/server/java/metadata/src/main/java/com/metaobjects/reporting/AggregateMeasure.java
@@ -45,7 +45,9 @@ public static void registerTypes(MetaDataRegistry registry) {
                .inheritsFrom(MetaData.TYPE_METADATA, MetaData.SUBTYPE_BASE);
             def.requiredAttributeWithConstraints(ReportingConstants.ATTR_AGG)
                .ofType(StringAttribute.SUBTYPE_STRING).asSingle();
-            def.requiredAttributeWithConstraints(ReportingConstants.ATTR_OF)
+            // R6 — optional: @agg any/all may omit @of to quantify @filter/@segment over the
+            // group (loader rule M0 enforces it for every other @agg).
+            def.optionalAttributeWithConstraints(ReportingConstants.ATTR_OF)
                .ofType(StringAttribute.SUBTYPE_STRING).asArray();
             def.optionalAttributeWithConstraints(ReportingConstants.ATTR_DISTINCT)
                .ofType(BooleanAttribute.SUBTYPE_BOOLEAN).asSingle();
diff --git a/server/java/metadata/src/main/java/com/metaobjects/reporting/ReportShape.java b/server/java/metadata/src/main/java/com/metaobjects/reporting/ReportShape.java
index 32aba78bd..6f839b3c6 100644
--- a/server/java/metadata/src/main/java/com/metaobjects/reporting/ReportShape.java
+++ b/server/java/metadata/src/main/java/com/metaobjects/reporting/ReportShape.java
@@ -158,16 +158,19 @@ public List<Field> fields() {
      * The entity a derived field's {@code @of} field is READ from, by the rule that derived
      * the field ({@link #resolveFieldRef}): the {@code @from} entity for a measure or a
      * dimension without {@code @via}, and the entity the {@code @of} reference names for a
-     * dimension with {@code @via}. {@code null} when that entity does not resolve, which a
-     * shape derived from a loaded model cannot reach.
+     * dimension with {@code @via} — resolved in the package of the entity the {@code @via}
+     * reaches (the terminal), not the declaring entity's package (D1). {@code null} when that
+     * entity does not resolve, which a shape derived from a loaded model cannot reach.
      *
      * <p>It is the entity whose generated artifacts describe the field (a Kotlin enum class,
      * say), which for an inherited field is not the object that declares it.</p>
      */
     public MetaObject ofEntity(Field field) {
         MetaDimension dim = field.dimension();
-        if (dim == null || dim.getVia() == null) return from;
-        return resolveFieldRefEntity(dim.getOf(), memberOwner(dim, from), root);
+        String via = dim == null ? null : dim.getVia();
+        if (via == null) return from;
+        MetaObject terminal = reportingViaTerminal(via, memberOwner(dim, from), from, root);
+        return terminal == null ? null : resolveFieldRefEntity(dim.getOf(), terminal, root);
     }
 
     /**
@@ -317,8 +320,10 @@ public static List<String> reportingViaHops(String via, MetaData declaring, Meta
 
     /**
      * The hop names of a report's {@code @spine} ({@code Owner.hop[.hop...]}), read as
-     * {@link #reportingViaHops} reads a {@code @via}, the owner resolving in the REPORT's
-     * package (loader rule R8). {@code null} when the report declares no {@code @spine}.
+     * {@link #reportingViaHops} reads a {@code @via}, the owner resolving in {@code @from}'s
+     * package (loader rule R8): Owner must be {@code @from} or an entity it extends, so a
+     * bare name means {@code @from}'s package even when the report lives in another one.
+     * {@code null} when the report declares no {@code @spine}.
      *
      * @throws MetaDataException naming the report, when a declared {@code @spine} does not
      *                           resolve (a report that passed the loader's reporting validation
@@ -328,7 +333,7 @@ public static List<String> reportingViaHops(String via, MetaData declaring, Meta
     public static List<String> reportSpineHops(MetaObject report, MetaObject from, MetaRoot root) {
         String spine = ReportAccessors.reportSpine(report);
         if (spine == null) return null;
-        List<String> hops = reportingViaHops(spine, report, from, root);
+        List<String> hops = reportingViaHops(spine, from, from, root);
         if (hops == null) throw unresolved(report, "@spine '" + spine + "'");
         return hops;
     }
@@ -418,6 +423,44 @@ private static boolean dimensionRequired(MetaDimension dim, MetaObject named, Me
         return hops.equals(spine) && (ofRequired || isPrimaryKeyField(named, of));
     }
 
+    /**
+     * The entity at the end of a dimension's {@code @via}, walked from {@code from} (hop
+     * names as {@link #reportingViaHops} reads them — Owner resolving in the package of
+     * {@code declaring}, the entity that declares the dimension). {@code null} when the
+     * owner or any hop does not resolve: the loader's D2 rule has already validated a model
+     * that reaches {@link #of(MetaObject, MetaRoot)}, so this path is reached only by a tree
+     * built in code. Same hop-resolution rule as {@link #viaJoinsInner} (relationship or
+     * identity.reference, target resolved in the package of the entity declaring the hop),
+     * without the required-ness check that rule also makes.
+     */
+    private static MetaObject reportingViaTerminal(String via, MetaData declaring, MetaObject from, MetaRoot root) {
+        List<String> hops = reportingViaHops(via, declaring, from, root);
+        if (hops == null) return null;
+        MetaObject current = from;
+        for (String hopName : hops) {
+            // ADR-0039: resolving getRelationships()/getIdentities(), so an inherited hop is found.
+            MetaRelationship rel = null;
+            for (MetaRelationship r : current.getRelationships()) {
+                if (hopName.equals(r.getShortName())) { rel = r; break; }
+            }
+            ReferenceIdentity refNode = null;
+            if (rel == null) {
+                for (MetaIdentity id : current.getIdentities()) {
+                    if (id instanceof ReferenceIdentity && hopName.equals(id.getShortName())) {
+                        refNode = (ReferenceIdentity) id;
+                        break;
+                    }
+                }
+            }
+            String targetRef = rel != null ? rel.getObjectRef() : refNode != null ? refNode.getTargetEntity() : null;
+            if (targetRef == null || targetRef.isEmpty()) return null;
+            MetaObject target = ValidationPhase.resolveRootObject(root, targetRef, packageOf(current));
+            if (target == null) return null;
+            current = target;
+        }
+        return current;
+    }
+
     /** True when {@code candidate} is {@code entity} or an entity it extends (the super chain). */
     private static boolean isSelfOrAncestor(MetaData candidate, MetaData entity) {
         Set<MetaData> visited = Collections.newSetFromMap(new IdentityHashMap<>());
@@ -432,14 +475,25 @@ private static Field dimensionField(ReportDimensionItem item, MetaObject from, M
                                         List<String> spine) {
         MetaDimension dim = declaredMember(from, MetaDimension.class, item.name());
         if (dim == null) throw unresolved(report, "dimension '" + item.name() + "' on '" + from.getShortName() + "'");
-        boolean vialess = dim.getVia() == null;
         MetaData declaring = memberOwner(dim, from);
-        MetaField<?> of = dim.getOf() == null ? null
-                : resolveFieldRef(dim.getOf(), declaring, root, vialess ? from : null);
+        String via = dim.getVia();
+        // D1 — after @via, @of resolves (owner package + host) against the entity the @via
+        // reaches, not the declaring entity. A @via that does not walk is the @via's error,
+        // not the @of's: it is reported as such, instead of falling through to a generic
+        // "@of does not resolve" below.
+        MetaData ofDeclaring = declaring;
+        MetaObject ofHost = from;
+        if (via != null) {
+            MetaObject terminal = reportingViaTerminal(via, declaring, from, root);
+            if (terminal == null) throw unresolved(report, "dimension '" + item.name() + "' @via '" + via + "'");
+            ofDeclaring = terminal;
+            ofHost = terminal;
+        }
+        MetaField<?> of = dim.getOf() == null ? null : resolveFieldRef(dim.getOf(), ofDeclaring, root, ofHost);
         if (of == null) throw unresolved(report, "dimension '" + item.name() + "' @of");
         // The entity @of names (with a host, it may be an ancestor of the entity the field is
         // read from); Table C reads its primary identity. Non-null: resolveFieldRef resolved it.
-        MetaObject named = resolveFieldRefEntity(dim.getOf(), declaring, root);
+        MetaObject named = resolveFieldRefEntity(dim.getOf(), ofDeclaring, root);
 
         String name = ReportAccessors.reportDerivedFieldName(item);
         boolean required = dimensionRequired(dim, named, of, from, root, spine, report);
diff --git a/server/java/metadata/src/test/java/com/metaobjects/reporting/ReportShapeTest.java b/server/java/metadata/src/test/java/com/metaobjects/reporting/ReportShapeTest.java
index 25bef70be..9d623a602 100644
--- a/server/java/metadata/src/test/java/com/metaobjects/reporting/ReportShapeTest.java
+++ b/server/java/metadata/src/test/java/com/metaobjects/reporting/ReportShapeTest.java
@@ -820,4 +820,59 @@ public void toOneRelationshipHopFollowsTheReferenceItCrosses() {
         // A Snap with no Stamp has no match, so the join is LEFT whatever that key and the target field require.
         assertFalse("the other entity holds the foreign key", field(related, "stampLabel").required());
     }
+
+    // ---------------------------------------------------------------------------
+    // D1 (ADR-0042 Amendment) — a @via dimension's bare @of Owner resolves in the
+    // package of the entity @via reaches (the terminal), not the declaring entity's.
+    // Mirrors fixtures/conformance/reporting-cross-package-short-names.
+    // ---------------------------------------------------------------------------
+
+    private static final String CROSS_PKG_WORLD = """
+        { "metadata.root": { "package": "acme::world", "children": [
+          { "object.entity": { "name": "Realm", "children": [
+            { "source.rdb": { "@table": "realms" } },
+            { "field.long": { "name": "id" } },
+            { "field.string": { "name": "name", "@required": true } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } }
+          ] } }
+        ] } }
+        """;
+
+    private static final String CROSS_PKG_PLAY = """
+        { "metadata.root": { "package": "acme::play", "children": [
+          { "object.entity": { "name": "Game", "children": [
+            { "source.rdb": { "@table": "games" } },
+            { "field.long": { "name": "id" } },
+            { "field.long": { "name": "realmId", "@required": true } },
+            { "identity.primary": { "name": "id", "@fields": ["id"] } },
+            { "identity.reference": { "name": "fkRealm", "@references": "acme::world::Realm", "@fields": ["realmId"] } },
+            { "dimension.attribute": { "name": "realmName", "@of": "Realm.name", "@via": "Game.fkRealm" } },
+            { "measure.aggregate": { "name": "games", "@agg": "count", "@of": "Game.id" } }
+          ] } }
+        ] } }
+        """;
+
+    private static final String CROSS_PKG_REPORTS = """
+        { "metadata.root": { "package": "acme::reports", "children": [
+          { "object.report": { "name": "GamesByRealm", "@from": "acme::play::Game", "@spine": "Game.fkRealm",
+              "@dimensions": ["realmName"], "@measures": ["games"],
+              "children": [ { "source.rdb": { "@kind": "view", "@view": "v_games_by_realm" } } ] } }
+        ] } }
+        """;
+
+    @Test
+    public void aViaDimensionsBareCrossPackageOfDerivesTheTerminalsFieldType() {
+        MetaRoot root = loadJson(CROSS_PKG_WORLD, CROSS_PKG_PLAY, CROSS_PKG_REPORTS);
+        ReportShape shape = ReportShape.of(object(root, "GamesByRealm"), root);
+        ReportShape.Field realmName = field(shape, "realmName");
+        // D1: the bare "Realm" in @of "Realm.name" resolves in acme::world (the @via terminal's
+        // package), not acme::play (the declaring Game's package) — there is no "Realm" in
+        // acme::play, so resolving in the declaring package would leave this unresolved.
+        assertEquals("string", realmName.subType());
+        assertEquals("acme::world::Realm.name", realmName.typeSourceKey());
+        assertTrue("Realm.name is @required and the @via equals the report's @spine",
+                realmName.required());
+        assertSame("ofEntity resolves in the terminal's package too",
+                object(root, "Realm"), shape.ofEntity(realmName));
+    }
 }
diff --git a/server/python/src/metaobjects/core_types.py b/server/python/src/metaobjects/core_types.py
index 8a0d1fbb3..5a00288a4 100644
--- a/server/python/src/metaobjects/core_types.py
+++ b/server/python/src/metaobjects/core_types.py
@@ -421,11 +421,13 @@ def _register_subtypes(
                 allowed_values=MEASURE_AGGS,
             ),
             # isArray: a bare string coerces to a one-element list (the tuple form
-            # is a distinct count, M2).
+            # is a distinct count, M2). Optional (M0): only @agg any/all may omit
+            # it, to quantify their @filter/@segment over the rows instead of
+            # aggregating a column.
             AttrSchema(
                 name=REPORTING_ATTR_OF,
                 value_type=ATTR_SUBTYPE_STRING,
-                required=True,
+                required=False,
                 is_array=True,
             ),
             AttrSchema(name=REPORTING_ATTR_DISTINCT, value_type=ATTR_SUBTYPE_BOOLEAN, required=False),
diff --git a/server/python/src/metaobjects/loader/validate_reporting.py b/server/python/src/metaobjects/loader/validate_reporting.py
index 5b2ab91f1..cc8f1db24 100644
--- a/server/python/src/metaobjects/loader/validate_reporting.py
+++ b/server/python/src/metaobjects/loader/validate_reporting.py
@@ -10,7 +10,7 @@
 Two design rules hold throughout, so one broken rule yields exactly one error:
 
 - No cascades. A member that fails a structural rule is not checked further (a
-  dimension whose @via fails D2 skips D1/D3/D4; a measure that fails one of M1–M4, or
+  dimension whose @via fails D2 skips D1/D3/D4; a measure that fails one of M0–M4, or
   whose @default is a fraction, skips M7/M8; a report whose @from fails R1 skips
   R2/R3/R6/R7, R8/R9 and its @filter; a report whose @spine fails R8 skips R9, and R9
   skips a dimension whose @via fails D2; an invalid @dimensions/@measures item derives
@@ -450,7 +450,11 @@ def err(message: str) -> None:
     if parts is None or len(parts.path) != 1:
         err(f"@of '{of}' must be Entity.field.")
         return
-    named = resolve_object_ref(ctx.root, parts.owner, _pkg_of(ctx.declaring))
+    # D1 — after @via, a bare Owner resolves in the package of the entity @via reaches: the path
+    # already fixes the entity, so `Realm.name` after a hop onto `world::Realm` names it. Without
+    # @via it resolves in the declaring entity's package.
+    owner_pkg = _pkg_of(ctx.declaring) if via is None else _pkg_of(of_entity)
+    named = resolve_object_ref(ctx.root, parts.owner, owner_pkg)
     if not _is_self_or_ancestor(named, of_entity):
         if via is None:
             err(
@@ -489,7 +493,7 @@ class _ToOneWalk:
 
     #: The attribute holding the path: ``via`` (D2) or ``spine`` (R8).
     attr: str
-    #: The package Owner resolves in (ADR-0042): the declaring entity's (D2) or the report's (R8).
+    #: The package Owner resolves in (ADR-0042): the declaring entity's (D2) or @from's (R8).
     owner_pkg: str
     #: The FQN named for the walk's first entity: the declaring entity (D2) or @from (R8).
     host_name: str
@@ -517,11 +521,12 @@ def _d2_walk(declaring: MetaData) -> _ToOneWalk:
     )
 
 
-def _spine_walk(report: MetaData, from_key: str) -> _ToOneWalk:
-    """R8 — a report's @spine, started at @from (``from_key``); Owner resolves in the report's package."""
+def _spine_walk(from_: MetaData, from_key: str) -> _ToOneWalk:
+    """R8 — a report's @spine, started at @from; Owner resolves in @from's package (it must be
+    @from or an entity @from extends), whatever package the report is in."""
     return _ToOneWalk(
         attr=OBJECT_REPORT_ATTR_SPINE,
-        owner_pkg=_pkg_of(report),
+        owner_pkg=_pkg_of(from_),
         host_name=from_key,
         start=f"@from '{from_key}'",
         start_short=f"@from '{from_key}'",
@@ -617,7 +622,7 @@ def err(message: str) -> None:
 
     checked = _check_aggregate_columns(ctx, measure, err)
 
-    # M7 / M8 — where a @default can apply. Only when M1–M4 passed and the @default is
+    # M7 / M8 — where a @default can apply. Only when M0–M4 passed and the @default is
     # not a fraction: one mistake, one error. The presence test reads the raw attribute,
     # so a non-number value on a count still reports M7 beside the attribute type error.
     if checked is not None and not fractional_default and declared_default is not None:
@@ -657,7 +662,7 @@ def err(message: str) -> None:
 
 @dataclass(frozen=True)
 class _CheckedColumns:
-    """M1–M4 passed. ``field`` is the single resolved @of field (``None`` for a tuple), for M7/M8."""
+    """M0–M4 passed. ``field`` is the single resolved @of field (``None`` for a tuple), for M7/M8."""
 
     field: MetaData | None
 
@@ -665,11 +670,29 @@ class _CheckedColumns:
 def _check_aggregate_columns(
     ctx: _MemberCtx, measure: MetaMeasure, err: Callable[[str], None]
 ) -> _CheckedColumns | None:
-    """M1–M4, in order; the first failure stops the chain (no M2+M3 double report).
+    """M0–M4, in order; the first failure stops the chain (no M2+M3 double report).
     Returns ``None`` when one of them fired."""
     agg = measure.agg()
     columns = measure.of_columns()
 
+    # M0 — @of names the column aggregated. Only any / all may omit it: they then quantify the
+    # measure's row condition (@filter AND @segment) over the group, "some row (every row)
+    # passes", so they need a condition to quantify.
+    if len(columns) == 0 and agg is not None:
+        if agg not in (AGG_ANY, AGG_ALL):
+            err(
+                f"@agg '{agg}' needs @of, the column it aggregates. Only @agg any / all may omit @of, to ask "
+                f"whether some row (any) or every row (all) passes the measure's @filter or @segment."
+            )
+            return None
+        if measure.filter() is None and measure.segment_name() is None:
+            err(
+                f"@agg '{agg}' without @of quantifies the measure's row condition, but it declares neither "
+                f"@filter nor @segment. Name a field.boolean in @of, or add the condition."
+            )
+            return None
+        return _CheckedColumns(field=None)
+
     # M1 — every @of item is a field of the owning entity.
     fields: list[MetaData] = []
     for item in columns:
@@ -938,7 +961,7 @@ def claim(field_name: str, what: str) -> None:
     spine = report_spine(report)
     if spine is not None:
         terminal = _walk_to_one_via(
-            root, from_, spine, lambda message: err(f": {message}"), _spine_walk(report, from_key)
+            root, from_, spine, lambda message: err(f": {message}"), _spine_walk(from_, from_key)
         )
         # R9 — every listed dimension is reached through the spine. Skipped when R8 failed.
         if terminal is not None:
diff --git a/server/python/src/metaobjects/meta/core/reporting/report_shape.py b/server/python/src/metaobjects/meta/core/reporting/report_shape.py
index e8f38d28e..1d2689620 100644
--- a/server/python/src/metaobjects/meta/core/reporting/report_shape.py
+++ b/server/python/src/metaobjects/meta/core/reporting/report_shape.py
@@ -14,6 +14,7 @@
 from dataclasses import dataclass
 
 from ....naming_refs import CHILD_REF_SEP, resolve_object_ref
+from ....shared.base_types import TYPE_IDENTITY, TYPE_RELATIONSHIP
 from ....shared.separators import PACKAGE_SEP
 from ...meta_data import MetaData
 from ...meta_root import MetaRoot
@@ -137,7 +138,9 @@ def resolve_reporting_field_ref(
     2. With ``host`` (a measure, or a dimension without ``@via``: the reference is about
        the ``@from`` entity's own rows) the named entity must be ``host`` or an entity it
        extends, and the field is read from ``host``, so a field ``host`` redeclares wins.
-    3. Without ``host`` (a dimension with ``@via``) the field is read from the named entity.
+    3. Without ``host`` the field is read from the named entity. A dimension with ``@via``
+       passes the entity its ``@via`` reaches as both ``declaring`` and ``host``
+       (:func:`resolve_dimension_of`).
 
     ``None`` when any step fails.
     """
@@ -166,6 +169,68 @@ def _resolve_reporting_field_ref_named(
     return None if field is None else (named, field)
 
 
+def resolve_dimension_of(
+    dim: MetaDimension, from_: MetaObject, root: MetaRoot
+) -> tuple[MetaObject, MetaField] | None:
+    """A dimension's ``@of`` field, read as the loader's rule D1 reads it. Without ``@via``
+    it is :func:`resolve_reporting_field_ref` with ``from_`` as the host. With ``@via`` the
+    host is the entity the ``@via`` reaches, and a bare entity name in ``@of`` resolves in
+    THAT entity's package: the path already fixes the entity, so ``Realm.name`` after a hop
+    onto ``world::Realm`` names ``world::Realm``. The field is read from the reached entity,
+    so a field it redeclares wins. ``None`` when the ``@via`` or the ``@of`` does not resolve."""
+    of = dim.of() or ""
+    via = dim.via()
+    if via is None:
+        return _resolve_reporting_field_ref_named(of, reporting_member_owner(dim, from_), root, from_)
+    terminal = _reporting_via_terminal(via, reporting_member_owner(dim, from_), from_, root)
+    if terminal is None:
+        return None
+    return _resolve_reporting_field_ref_named(of, terminal, root, terminal)
+
+
+def _resolve_via_hop(current: MetaObject, hop_name: str, root: MetaRoot) -> MetaObject | None:
+    """The target of one hop of a ``@via``/``@spine`` path, as the loader's rule R8 walks it:
+    the ``relationship.*`` (through its ``@objectRef``) or ``identity.reference`` (through
+    its ``@references``) of ``current`` named ``hop_name``, with its target resolved in
+    ``current``'s package (ADR-0042). ``None`` for an unresolvable hop or a ref attr that is
+    not a string / does not reach a metadata object (TS ``resolveViaHop``, target only)."""
+    rel = next((c for c in current.children() if c.type == TYPE_RELATIONSHIP and c.name == hop_name), None)
+    is_reference = rel is None
+    hop = rel
+    if hop is None:
+        hop = next(
+            (
+                c
+                for c in current.children()
+                if c.type == TYPE_IDENTITY and c.sub_type == IDENTITY_SUBTYPE_REFERENCE and c.name == hop_name
+            ),
+            None,
+        )
+    if hop is None:
+        return None
+    ref = hop.get_meta_attr(IDENTITY_REFERENCE_ATTR_REFERENCES if is_reference else RELATIONSHIP_ATTR_OBJECT_REF)
+    target = resolve_object_ref(root, ref, _package_of_key(current.resolution_key())) if isinstance(ref, str) else None
+    return target if isinstance(target, MetaObject) else None
+
+
+def _reporting_via_terminal(
+    via: str, declaring: MetaData, from_: MetaObject, root: MetaRoot
+) -> MetaObject | None:
+    """The entity at the end of a ``@via`` walked from ``from_`` (hops as
+    :func:`reporting_via_hops` reads them, each target as :func:`_resolve_via_hop` resolves
+    it). ``None`` when any hop does not resolve."""
+    hops = reporting_via_hops(via, declaring, from_, root)
+    if hops is None:
+        return None
+    current: MetaObject = from_
+    for hop in hops:
+        target = _resolve_via_hop(current, hop, root)
+        if target is None:
+            return None
+        current = target
+    return current
+
+
 def reporting_via_hops(via: str, declaring: MetaData, from_: MetaObject, root: MetaRoot) -> list[str] | None:
     """The hop names of a dimension's ``@via`` (``Owner.hop[.hop...]``), the owner resolving
     in the package of ``declaring`` and required to be ``from_`` or an entity it extends,
@@ -192,15 +257,17 @@ def _unresolved(report_name: str, what: str) -> ValueError:
 
 def report_spine_hops(report: MetaObject, from_: MetaObject, root: MetaRoot) -> list[str] | None:
     """The hop names of a report's ``@spine`` (``Owner.hop[.hop...]``), read as
-    :func:`reporting_via_hops` reads a ``@via``, the owner resolving in the REPORT's package
-    (loader rule R8). ``None`` when the report declares no ``@spine``. Raises a
-    ``ValueError`` naming the report when a declared ``@spine`` does not resolve (a report
-    that passed ``validate_reporting`` always resolves): reading it as "no spine" would
-    claim a column non-null that a spine row with no facts leaves null."""
+    :func:`reporting_via_hops` reads a ``@via``, the owner resolving in ``from_``'s package
+    (loader rule R8): Owner must be ``from_`` or an entity it extends, so a bare name means
+    ``from_``'s package even when the report lives in another one. ``None`` when the report
+    declares no ``@spine``. Raises a ``ValueError`` naming the report when a declared
+    ``@spine`` does not resolve (a report that passed ``validate_reporting`` always
+    resolves): reading it as "no spine" would claim a column non-null that a spine row with
+    no facts leaves null."""
     spine = report_spine(report)
     if spine is None:
         return None
-    hops = reporting_via_hops(spine, report, from_, root)
+    hops = reporting_via_hops(spine, from_, from_, root)
     if hops is None:
         raise _unresolved(report.name, f"@spine '{spine}'")
     return hops
@@ -273,6 +340,7 @@ def _via_joins_inner(hops: list[str], from_: MetaObject, root: MetaRoot) -> bool
             return False
         # The reference the hop crosses, as the lowering resolves it. A has-many hop, whose
         # FK sits on the child, matches none of the current entity's own references.
+        reference: MetaData | None
         if ref_node is not None:
             reference = ref_node
         else:
@@ -339,10 +407,11 @@ def _dimension_field(
     dim = _declared_member(from_, TYPE_DIMENSION, item.name, MetaDimension)
     if not isinstance(dim, MetaDimension):
         raise _unresolved(report_name, f"dimension '{item.name}' on '{from_.name}'")
-    vialess = dim.via() is None
-    ref = _resolve_reporting_field_ref_named(
-        dim.of() or "", reporting_member_owner(dim, from_), root, from_ if vialess else None
-    )
+    via = dim.via()
+    # A @via that does not walk is the @via's error, not the @of's (the @of resolves at its end).
+    if via is not None and _reporting_via_terminal(via, reporting_member_owner(dim, from_), from_, root) is None:
+        raise _unresolved(report_name, f"dimension '{dim.name}' @via '{via}'")
+    ref = resolve_dimension_of(dim, from_, root)
     if ref is None:
         raise _unresolved(report_name, f"dimension '{item.name}' @of")
     named, of = ref
diff --git a/server/python/src/metaobjects/spec_metamodel/reporting.json b/server/python/src/metaobjects/spec_metamodel/reporting.json
index 67f998e83..98c0bd24f 100644
--- a/server/python/src/metaobjects/spec_metamodel/reporting.json
+++ b/server/python/src/metaobjects/spec_metamodel/reporting.json
@@ -20,8 +20,8 @@
       "description": "A named aggregate over the declaring entity's own rows (FR-044). @agg count without @distinct counts rows; with @distinct it counts distinct values of @of (a list in @of is a distinct count of the tuple). Unlike origin.aggregate, count is NOT distinct by default: a measure aggregates its own rows and dimensions reach only to-one paths, so no join inflates it.",
       "whenToUse": "A number a dashboard shows: revenue, purchases, distinct buyers, last activity.",
       "children": [
-        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean." },
-        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 1, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true." },
+        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment." },
+        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 0, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows." },
         { "type": "attr", "subType": "boolean", "name": "distinct", "min": 0, "max": 1, "description": "Count distinct values. Legal only with @agg: count." },
         { "type": "attr", "subType": "filter", "name": "filter", "min": 0, "max": 1, "description": "Optional row scope (a portable attr.filter over the declaring entity's fields). May use relative-date values ({ now: \"-P7D\" }). Combines with @segment by AND." },
         { "type": "attr", "subType": "string", "name": "segment", "min": 0, "max": 1, "description": "Optional name of a segment declared on the same entity. Combines with @filter by AND." },
diff --git a/server/python/tests/codegen/test_report_router.py b/server/python/tests/codegen/test_report_router.py
index 990c67bac..d90ed6b1d 100644
--- a/server/python/tests/codegen/test_report_router.py
+++ b/server/python/tests/codegen/test_report_router.py
@@ -234,3 +234,34 @@ def test_the_spine_key_and_a_defaulted_measure_are_not_optional() -> None:
         "revenueCents: int | None = None",
         "revenueOrZero: int",
     ]
+
+
+# ---------------------------------------------------------------------------
+# R6 — @agg any / all without @of: codegen of the derived row. Same model as
+# fixtures/conformance/reporting-any-all-predicate (shared with report-shape's own R6
+# test); here it is the ENTITY-MODEL generator's Pydantic row that is pinned.
+# ---------------------------------------------------------------------------
+
+_ANY_ALL_FIXTURE = (
+    Path(__file__).parents[3].parent / "fixtures" / "conformance" / "reporting-any-all-predicate" / "input" / "meta.ops.json"
+)
+
+
+def test_codegen_of_an_any_measure_without_of_is_a_plain_nullable_bool_row() -> None:
+    """``hasError``/``anySlowFailure`` (``@agg: any``, no ``@of``, no ``@default``) render as
+    a bare, optional ``bool`` field — exactly the shape any other optional boolean measure
+    gets, with no generator change needed for the @of-less case. ``allSlow`` (``@agg: all``,
+    ``@default: 0``) is not optional, per Table C's `@default` rule."""
+    result = MetaDataLoader.from_string(_ANY_ALL_FIXTURE.read_text(encoding="utf-8"), strict=True)
+    assert not result.errors, [e.message for e in result.errors]
+    report = next(c for c in result.root.children() if c.type == TYPE_OBJECT and c.name == "CallsByGame")
+    model = report_read_model(report, result.root)
+    src = render_entity_model(model)
+    body = src.split("class CallsByGame(BaseModel):\n", 1)[1]
+    assert [ln.strip() for ln in body.splitlines() if ln.strip()] == [
+        "game: int",
+        "calls: int",
+        "hasError: bool | None = None",
+        "allSlow: bool",
+        "anySlowFailure: bool | None = None",
+    ]
diff --git a/server/python/tests/test_report_shape.py b/server/python/tests/test_report_shape.py
index 1b7015602..7d44edbc6 100644
--- a/server/python/tests/test_report_shape.py
+++ b/server/python/tests/test_report_shape.py
@@ -817,3 +817,63 @@ def test_a_to_one_relationship_hop_follows_the_reference_it_crosses() -> None:
     # The other entity holds the foreign key: a Snap with no Stamp has no match, so the join is
     # LEFT whatever that key and the target field require.
     assert req["stampLabel"] is False
+
+
+# ---------------------------------------------------------------------------
+# R5 — bare owners the path already fixes: a via dimension's @of resolves in the
+# TERMINAL's package; a @spine's owner resolves in @from's package. The same models
+# and expectations as the TypeScript report-shape.test.ts "R5" describe block.
+# ---------------------------------------------------------------------------
+
+_CROSS_PACKAGE_FIXTURE = (
+    Path(__file__).parents[3] / "fixtures" / "conformance" / "reporting-cross-package-short-names" / "input"
+)
+
+
+def _load_cross_package_fixture() -> MetaRoot:
+    result = MetaDataLoader().load(
+        [
+            InMemoryStringSource((_CROSS_PACKAGE_FIXTURE / name).read_text(encoding="utf-8"), name)
+            for name in ("meta.world.json", "meta.play.json", "meta.reports.json")
+        ]
+    )
+    assert result.errors == [], [e.message for e in result.errors]
+    return cast(MetaRoot, result.root)
+
+
+def test_a_via_dimensions_bare_of_resolves_in_the_terminal_package() -> None:
+    """``realmName``'s ``@of`` is the bare ``Realm.name``, declared on ``acme::play::Game``
+    (whose own package is NOT ``Realm``'s). The ``@via`` reaches ``acme::world::Realm``
+    first, so the bare owner resolves in THAT package, not the declaring entity's — and the
+    field is read from the reached entity, deriving its type (a required string)."""
+    root = _load_cross_package_fixture()
+    report = _object(root, "GamesByRealm")
+    shape = report_shape(report, root)
+    assert [(f.name, f.role, f.sub_type, f.required) for f in shape.fields] == [
+        ("realmName", "dimension", "string", True),
+        ("games", "measure", "long", True),
+    ]
+    # R5b: the report's own package (acme::reports) is not where @spine's bare owner
+    # ("Game") resolves — it resolves in @from's package (acme::play) instead.
+    assert report_spine_hops(report, shape.from_, root) == ["fkRealm"]
+
+
+# ---------------------------------------------------------------------------
+# R6 — @agg any / all may omit @of to quantify their row condition over the group.
+# The same model and expectations as the TypeScript report-shape.test.ts "R6" block.
+# ---------------------------------------------------------------------------
+
+
+def test_agg_any_all_without_of_derive_nullable_boolean_rows_unless_defaulted() -> None:
+    fixture = Path(__file__).parents[3] / "fixtures" / "conformance" / "reporting-any-all-predicate" / "input" / "meta.ops.json"
+    result = MetaDataLoader().load([InMemoryStringSource(fixture.read_text(encoding="utf-8"), "meta.ops.json")])
+    assert result.errors == [], [e.message for e in result.errors]
+    root = cast(MetaRoot, result.root)
+    shape = report_shape(_object(root, "CallsByGame"), root)
+    assert [(f.name, f.sub_type, f.required) for f in shape.fields] == [
+        ("game", "long", True),
+        ("calls", "long", True),
+        ("hasError", "boolean", False),
+        ("allSlow", "boolean", True),
+        ("anySlowFailure", "boolean", False),
+    ]
diff --git a/server/typescript/packages/cli/src/commands/init.ts b/server/typescript/packages/cli/src/commands/init.ts
index 4db4fbc46..64a4f7037 100644
--- a/server/typescript/packages/cli/src/commands/init.ts
+++ b/server/typescript/packages/cli/src/commands/init.ts
@@ -11,7 +11,7 @@ import { assertKnownStackValues, resolveStack } from "../lib/detect-stack.js";
 import { reportIgnoredScaffold } from "../lib/ignored-scaffold-check.js";
 import { parseInitArgs } from "../lib/args.js";
 import { log } from "../lib/log.js";
-import { cliVersion } from "../lib/version.js";
+import { cliVersion, isPrereleaseVersion } from "../lib/version.js";
 import { findWranglerConfig, parseWranglerConfig } from "@metaobjectsdev/migrate-ts";
 import { DEFAULT_DOCS_DIR } from "@metaobjectsdev/codegen-ts";
 import { describeError } from "../lib/error-text.js";
@@ -314,14 +314,26 @@ async function writeAgentContext(opts: InitOptions, result: InitResult): Promise
   let assembled = assemble({ contentRoot: resolveAgentContextRoot(), stack });
   if (opts.noSkills) assembled = assembled.filter((f) => !f.path.startsWith(".claude/skills/"));
 
+  const generatedBy = cliVersion();
   const decision = planScaffold({
     stack, assembled, prior,
     readCurrent: (rel) => {
       const abs = join(opts.cwd, rel);
       return existsSyncWrap(abs) ? readFileSyncWrap(abs, "utf8") : undefined;
     },
-    generatedBy: cliVersion(),
+    generatedBy,
   });
+  // A pre-release CLI stamps its own pre-release version into the committed
+  // .metaobjects/.agent-context.json ("generatedBy") and the skills/docs it scaffolds may
+  // differ from the eventual release's. tools/prerelease/detect-prerelease-pins.sh now
+  // flags that on the tree side; this is the other half — say so at the moment it is
+  // written, not only when someone later runs the detector.
+  if (isPrereleaseVersion(generatedBy)) {
+    result.warnings.push(
+      `agent context generated by pre-release CLI ${generatedBy} — refresh it again with ` +
+        `the release CLI before merging ('meta init --refresh-docs --docs-only').`,
+    );
+  }
 
   // --force: overwrite hand-edited docs in place rather than parking the fresh copy
   // at <path>.new (issue #163 — a forced (re)scaffold means "I mean it"; applies to
diff --git a/server/typescript/packages/cli/src/lib/version.ts b/server/typescript/packages/cli/src/lib/version.ts
index 06baa6ad7..b75d69856 100644
--- a/server/typescript/packages/cli/src/lib/version.ts
+++ b/server/typescript/packages/cli/src/lib/version.ts
@@ -26,6 +26,17 @@ export function cliVersion(): string {
   return "0.0.0";
 }
 
+/**
+ * True when `version` carries a semver prerelease identifier (`-rc.4`, `-alpha.1`,
+ * `-beta`, `-SNAPSHOT`, …) — the same shape `tools/prerelease/detect-prerelease-pins.sh`'s
+ * `PRERELEASE_RE` matches. Used to warn when a pre-release CLI is about to stamp its own
+ * version into committed state (`.metaobjects/.agent-context.json`'s `generatedBy`),
+ * which that detector now also flags on the tree side.
+ */
+export function isPrereleaseVersion(version: string): boolean {
+  return /^\d+\.\d+\.\d+-[0-9A-Za-z.-]+$/.test(version.trim());
+}
+
 /** The three spellings that print the bare version: `--version`, `-v` and `-V`. */
 const VERSION_FLAGS: readonly string[] = ["--version", "-v", "-V"];
 
diff --git a/server/typescript/packages/cli/test/unit/version.test.ts b/server/typescript/packages/cli/test/unit/version.test.ts
new file mode 100644
index 000000000..b1881e262
--- /dev/null
+++ b/server/typescript/packages/cli/test/unit/version.test.ts
@@ -0,0 +1,40 @@
+// A pre-release CLI stamped its own version ("1.1.0-rc.4") into the committed
+// .metaobjects/.agent-context.json ("generatedBy") with no warning at write time, and
+// tools/prerelease/detect-prerelease-pins.sh said nothing about it either. This pins the
+// predicate both sides key off: `isPrereleaseVersion`, used by `meta init` (see
+// commands/init.ts) to decide whether to warn.
+import { describe, test, expect } from "bun:test";
+import { isPrereleaseVersion } from "../../src/lib/version.js";
+
+describe("isPrereleaseVersion", () => {
+  test("a plain release version is not a prerelease", () => {
+    expect(isPrereleaseVersion("1.1.0")).toBe(false);
+    expect(isPrereleaseVersion("0.24.5")).toBe(false);
+    expect(isPrereleaseVersion("10.0.13")).toBe(false);
+  });
+
+  test("npm/NuGet/Maven-style prerelease suffixes are flagged", () => {
+    expect(isPrereleaseVersion("1.1.0-rc.4")).toBe(true);
+    expect(isPrereleaseVersion("1.1.0-alpha.1")).toBe(true);
+    expect(isPrereleaseVersion("1.1.0-beta")).toBe(true);
+    expect(isPrereleaseVersion("8.1.0-rc.9")).toBe(true);
+  });
+
+  test("Maven SNAPSHOT is flagged", () => {
+    expect(isPrereleaseVersion("8.1.0-SNAPSHOT")).toBe(true);
+  });
+
+  test("the project's own 0.0.0 unresolved-version sentinel is not flagged", () => {
+    expect(isPrereleaseVersion("0.0.0")).toBe(false);
+  });
+
+  test("whitespace around the version does not change the verdict", () => {
+    expect(isPrereleaseVersion("  1.1.0-rc.4  ")).toBe(true);
+    expect(isPrereleaseVersion("  1.1.0  ")).toBe(false);
+  });
+
+  test("a two-part or malformed version is not flagged (not this predicate's job)", () => {
+    expect(isPrereleaseVersion("1.1")).toBe(false);
+    expect(isPrereleaseVersion("not-a-version")).toBe(false);
+  });
+});
diff --git a/server/typescript/packages/codegen-ts/src/cube/cube-members.ts b/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
index e10ee05e8..5e57469c9 100644
--- a/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
+++ b/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
@@ -218,8 +218,9 @@ function aggregateSpec(
   // The view's own resolution: @of read from the cube's entity, then its condition.
   const { agg, distinct, fields, condition } = resolveAggregate(m, entity, mc.root, CUBE_SELF, mc.extract, where);
   const cols = fields.map((f) => cubeColumn(sourceColumnNameFor(f, mc.extract), d, renderer));
-  if (cols.length === 0) throw new Error(`${where}: has no @of.`);
   const c = condition === undefined ? undefined : cond(condition, d, renderer);
+  // Only @agg any / all may omit @of (rule M0); they are handled below.
+  if (cols.length === 0 && agg !== AGG_ANY && agg !== AGG_ALL) throw new Error(`${where}: has no @of.`);
   if (cols.length > 1) {
     if (agg !== AGG_COUNT || !distinct) throw new Error(`${where}: a column tuple needs @agg: count with @distinct.`);
     if (d === "mysql") {
@@ -239,12 +240,16 @@ function aggregateSpec(
     // A boolean OR / AND, written as the view writes it (report-ddl-emit.ts) and typed `boolean`.
     // Cube's min/max cannot take a boolean column (Postgres has no MAX(boolean)), and the
     // condition travels in the SQL: the aggregate is Cube's `boolean` type, which takes none.
-    const col = cols[0]!;
+    const col = cols[0];
+    const fn = d === "postgres" ? (agg === AGG_ANY ? "bool_or" : "bool_and") : agg === AGG_ANY ? "MAX" : "MIN";
+    // No @of (rule M0): the condition is the quantified predicate, as in the view.
+    if (col === undefined) {
+      if (c === undefined) throw new Error(`${where}: @agg '${agg}' has neither @of nor a condition.`);
+      return { sql: `${fn}(${c})`, type: "boolean" };
+    }
     if (d === "postgres") {
-      const fn = agg === AGG_ANY ? "bool_or" : "bool_and";
       return { sql: c === undefined ? `${fn}(${col})` : `${fn}(${col}) FILTER (WHERE ${c})`, type: "boolean" };
     }
-    const fn = agg === AGG_ANY ? "MAX" : "MIN";
     return { sql: `${fn}(${c === undefined ? col : `CASE WHEN ${c} THEN ${col} END`})`, type: "boolean" };
   }
   const type: CubeMeasureType = agg === AGG_COUNT ? (distinct ? "count_distinct" : "count") : agg;
diff --git a/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts b/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
index 723e28081..b330abe04 100644
--- a/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
+++ b/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
@@ -309,9 +309,22 @@ export const agentDocsFile = function agentDocsFile(opts?: AgentDocsFileOpts): G
       // same value `routes-file.ts` emits as the SERVER mount prefix. Without it the page
       // names an address nothing serves. (The client descriptor no longer carries it: a
       // browser's base URL is supplied at runtime by the provider's `baseUrl`.)
-      if (ctx.config.includeUiTier === true) {
+      {
         const ui = renderAgentUiPage(ctx.loadedRoot, ctx.renderContext?.apiPrefix ?? "");
-        if (ui !== "") files.push({ path: `${dir}/ui.md`, content: ui });
+        if (ui !== "") {
+          if (ctx.config.includeUiTier === true) {
+            files.push({ path: `${dir}/ui.md`, content: ui });
+          } else {
+            // The model HAS a UI surface (renderAgentUiPage returned content) but this
+            // run has no client UI generator and no `includeUiTier: true` override, so the
+            // page is skipped. Before this, that was silent: `meta gen` exited 0 and listed
+            // only the pages it wrote, and a docs-only project (its own config generates no
+            // UI; a SEPARATE config does) lost `agent/ui.md` with no signal at all.
+            ctx.warn(
+              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI.`,
+            );
+          }
+        }
       }
 
       // ---- requirements.md
diff --git a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
index 478a3fb36..e6d42f9a2 100644
--- a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
+++ b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
@@ -68,6 +68,12 @@ function aggregate(a: ReportAggregate, d: ReportDialect): string {
         sql = mysqlTupleCount(refs, c);
         break;
     }
+  } else if (refs.length === 0) {
+    // @agg any / all with no @of (rule M0): the condition IS the quantified predicate, "some row
+    // (every row) passes". A comparison is a boolean on Postgres and 0 / 1 / NULL elsewhere, so
+    // MAX / MIN of it is the OR / AND, and a row whose predicate is NULL is skipped as bool_or skips it.
+    if (c === undefined) throw new Error(`report-ddl-emit: @agg '${a.agg}' has neither @of nor a condition.`);
+    sql = `${fn}(${c})`;
   } else {
     const x = refs[0]!;
     const distinct = a.distinct ? "DISTINCT " : "";
diff --git a/server/typescript/packages/codegen-ts/src/projection/report-resolve.ts b/server/typescript/packages/codegen-ts/src/projection/report-resolve.ts
index 281e6770a..0c855a527 100644
--- a/server/typescript/packages/codegen-ts/src/projection/report-resolve.ts
+++ b/server/typescript/packages/codegen-ts/src/projection/report-resolve.ts
@@ -13,6 +13,7 @@ import {
   TYPE_RELATIONSHIP,
   reportingMemberOwner,
   reportingViaHops,
+  resolveDimensionOf,
   resolveObjectRef,
   resolveReportingFieldRef,
   type MeasureAgg,
@@ -28,17 +29,14 @@ import { andOf, declared, resolveReportFilter, segmentClause } from "./report-sq
 import type { ViewFilterClause } from "./view-spec.js";
 
 /**
- * A dimension's `@of` field. Without `@via` the dimension is about `from`'s own rows, so the
- * field is read from `from` (a field `from` redeclares wins); with `@via` it is read from the
- * entity `@of` names. The entity half resolves in the DECLARING entity's package.
+ * A dimension's `@of` field, by the loader's rule D1 ({@link resolveDimensionOf}). Without
+ * `@via` the dimension is about `from`'s own rows, so the field is read from `from` (a field
+ * `from` redeclares wins) and the entity half resolves in the DECLARING entity's package; with
+ * `@via` it is read from the entity the `@via` reaches, and a bare entity half resolves in that
+ * entity's package.
  */
 export function dimensionOfField(dim: MetaDimension, from: MetaObject, root: MetaRoot): MetaField | undefined {
-  return resolveReportingFieldRef(
-    dim.of() ?? "",
-    reportingMemberOwner(dim, from),
-    root,
-    dim.via() === undefined ? from : undefined,
-  );
+  return resolveDimensionOf(dim, from, root)?.field;
 }
 
 /**
diff --git a/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts b/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
index 15223d7a7..4d4340c9b 100644
--- a/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
+++ b/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
@@ -40,8 +40,16 @@ const PROMPT_GENERATOR_NAMES: ReadonlySet<string> = new Set([
 export function warnMissingPromptGenerators(
   root: MetaData,
   generators: readonly Generator[],
+  isDocsTarget: (g: Generator) => boolean,
   warn: (msg: string) => void,
 ): void {
+  // A run that lists no generator at all, or where every listed generator writes
+  // documentation (its RESOLVED output target — the same per-generator signal
+  // runner.ts's targetOf() uses to place output, not a name match), emitted no code of
+  // any kind. There is nothing for a prompt generator to be missing FROM: telling such a
+  // run to add promptRender() is wrong advice (it would add TypeScript render code to a
+  // project that only writes documentation), so the gate does not fire.
+  if (generators.length === 0 || generators.every(isDocsTarget)) return;
   if (generators.some((g) => PROMPT_GENERATOR_NAMES.has(g.name))) return;
 
   // ADR-0039: resolving children — a template may arrive through an overlay or extends.
@@ -62,12 +70,20 @@ export function warnMissingPromptGenerators(
         `add outputParser().`
       : "";
 
+  // The claim that the payload value objects "were emitted regardless" is only true when
+  // a generator that actually emits entity/value-object modules ran (`emitsEntityModule`,
+  // e.g. entityFile()) — a run with code generators but none of THOSE emitted nothing
+  // either, so the claim is dropped rather than stated falsely.
+  const emittedValueObjects = generators.some((g) => g.emitsEntityModule === true);
+  const valueObjectsClaim = emittedValueObjects
+    ? ` The payload value objects were emitted regardless — those are object.value nodes, ` +
+      `which is why this looked like it had worked.`
+    : "";
+
   warn(
     `${templates.length} declared template.prompt (${names}) generated no prompt code: ` +
       `no prompt generator is wired, so there is no render function to send one and nothing ` +
       `read a reply. Add promptRender() to \`generators\` in metaobjects.config.ts ` +
-      `(import it from "@metaobjectsdev/codegen-ts/generators").${receiveHalf} ` +
-      `The payload value objects were emitted regardless — those are object.value nodes, ` +
-      `which is why this looked like it had worked.`,
+      `(import it from "@metaobjectsdev/codegen-ts/generators").${receiveHalf}${valueObjectsClaim}`,
   );
 }
diff --git a/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts b/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
index 9dbd4fafe..173cdd2b3 100644
--- a/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
+++ b/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
@@ -320,9 +320,22 @@ export const agentDocsFile = function agentDocsFile(opts?: AgentDocsFileOpts): G
       // same value `routes-file.ts` emits as the SERVER mount prefix. Without it the page
       // names an address nothing serves. (The client descriptor no longer carries it: a
       // browser's base URL is supplied at runtime by the provider's `baseUrl`.)
-      if (ctx.config.includeUiTier === true) {
+      {
         const ui = renderAgentUiPage(ctx.loadedRoot, ctx.renderContext?.apiPrefix ?? "");
-        if (ui !== "") files.push({ path: `${dir}/ui.md`, content: ui });
+        if (ui !== "") {
+          if (ctx.config.includeUiTier === true) {
+            files.push({ path: `${dir}/ui.md`, content: ui });
+          } else {
+            // The model HAS a UI surface (renderAgentUiPage returned content) but this
+            // run has no client UI generator and no `includeUiTier: true` override, so the
+            // page is skipped. Before this, that was silent: `meta gen` exited 0 and listed
+            // only the pages it wrote, and a docs-only project (its own config generates no
+            // UI; a SEPARATE config does) lost `agent/ui.md` with no signal at all.
+            ctx.warn(
+              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI.`,
+            );
+          }
+        }
       }
 
       // ---- requirements.md
diff --git a/server/typescript/packages/codegen-ts/src/runner.ts b/server/typescript/packages/codegen-ts/src/runner.ts
index 66c2ac50e..8d67a1f5e 100644
--- a/server/typescript/packages/codegen-ts/src/runner.ts
+++ b/server/typescript/packages/codegen-ts/src/runner.ts
@@ -676,7 +676,12 @@ export async function runGen(opts: RunGenOpts): Promise<RunGenResult> {
   // A declared template.prompt with no prompt generator wired emits nothing and, before
   // this, said nothing — while `meta verify` reported the template "clean". See
   // prompt-generator-gate.ts. Self-extinguishing; warning only.
-  warnMissingPromptGenerators(root, config.generators, (m) => warnings.push(m));
+  //
+  // `(g) => targetOf(g).name === DOCS_TARGET_NAME` is the same per-generator signal
+  // targetOf() itself resolves output against — not a name match — so a docs-only run
+  // (every listed generator resolving to the `docs` target) is correctly read as having
+  // emitted no code at all.
+  warnMissingPromptGenerators(root, config.generators, (g) => targetOf(g).name === DOCS_TARGET_NAME, (m) => warnings.push(m));
   warnUnmarkedUiGenerators(config.generators, (m) => warnings.push(m));
 
   // Codegen is opt-in, so `meta gen` is the post-selection audit: the two ways a legal
diff --git a/server/typescript/packages/codegen-ts/test/agent-docs-surface.test.ts b/server/typescript/packages/codegen-ts/test/agent-docs-surface.test.ts
index 343169f08..2ee6d5c7e 100644
--- a/server/typescript/packages/codegen-ts/test/agent-docs-surface.test.ts
+++ b/server/typescript/packages/codegen-ts/test/agent-docs-surface.test.ts
@@ -798,3 +798,45 @@ describe("agent/ui.md — gated on the run, not the metadata", () => {
     expect(without.length).toBeGreaterThan(0);
   });
 });
+
+// A docs-only project (its own config generates no UI; a SEPARATE config generates
+// it) lost `agent/ui.md` with no signal at all: `meta gen` exited 0 and listed only the
+// pages it wrote. `agentDocsFile()` now advises through `ctx.warn` whenever the model has
+// a UI surface (renderAgentUiPage would have written something) but the run skips it.
+describe("agent/ui.md not written: advisory through ctx.warn", () => {
+  test("warns once when the model has a UI surface but includeUiTier is off", async () => {
+    const root = await load(MODEL);
+    const warnings: string[] = [];
+    const ctx: GenContext = { ...makeCtx(root, "", false), warn: (m) => warnings.push(m) };
+    const files = await agentDocsFile().generate(ctx);
+    expect(files.some((f) => f.path === "agent/ui.md")).toBe(false);
+    expect(warnings).toHaveLength(1);
+    expect(warnings[0]).toContain("agent/ui.md not written");
+    expect(warnings[0]).toContain("includeUiTier: true");
+  });
+
+  test("does not warn when includeUiTier is on — the page is written instead", async () => {
+    const root = await load(MODEL);
+    const warnings: string[] = [];
+    const ctx: GenContext = { ...makeCtx(root, "", true), warn: (m) => warnings.push(m) };
+    const files = await agentDocsFile().generate(ctx);
+    expect(files.some((f) => f.path === "agent/ui.md")).toBe(true);
+    expect(warnings).toEqual([]);
+  });
+
+  test("does not warn when the model has no UI surface at all — nothing was skipped", async () => {
+    const noUiModel = {
+      "metadata.root": {
+        package: "acme::ai",
+        children: [
+          { "object.value": { name: "Payload", children: [{ "field.string": { name: "q" } }] } },
+        ],
+      },
+    };
+    const root = await load(noUiModel);
+    const warnings: string[] = [];
+    const ctx: GenContext = { ...makeCtx(root, "", false), warn: (m) => warnings.push(m) };
+    await agentDocsFile().generate(ctx);
+    expect(warnings).toEqual([]);
+  });
+});
diff --git a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
index 32ebcf17f..4e2618940 100644
--- a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
+++ b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
@@ -937,3 +937,72 @@ describe("Table D: the spine chain, end to end", () => {
     expect(v["v_by_tier_plain"]).toContain(`  LEFT OUTER JOIN "profiles" p ON p."accountId" = a."id"`);
   });
 });
+
+// ── @agg any / all with no @of (rule M0): the row condition is the quantified predicate ─────
+
+describe("@agg any / all without @of, end to end", () => {
+  // An adopter's "did any call in this game fail": bool_or(NOT success), with no failure column.
+  const calls = (): Json[] => [
+    ent("Call", [
+      tableSrc("calls"),
+      field("long", "id"),
+      field("long", "gameId", { "@required": true }),
+      field("boolean", "success", { "@required": true }),
+      field("long", "latencyMs"),
+      idPk,
+      { "segment.filter": { name: "slow", "@filter": { latencyMs: { gt: 1000 } } } },
+      { "dimension.attribute": { name: "game", "@of": "Call.gameId" } },
+      { "measure.aggregate": { name: "hasError", "@agg": "any", "@filter": { success: false } } },
+      { "measure.aggregate": { name: "allSlow", "@agg": "all", "@segment": "slow", "@default": 0 } },
+    ]),
+    rpt("CallsByGame", { "@from": "Call", "@dimensions": ["game"], "@measures": ["hasError", "allSlow"] }, "v_calls_by_game"),
+  ];
+
+  test("postgres: bool_or / bool_and of the condition, with no FILTER", async () => {
+    const sql = (await viewsOf(calls(), "postgres"))["v_calls_by_game"];
+    expect(sql).toContain(`    bool_or(c."success" = FALSE) AS "hasError",`);
+    expect(sql).toContain(`    COALESCE(bool_and(c."latencyMs" > 1000), FALSE) AS "allSlow"`);
+    expect(sql).not.toContain("FILTER");
+  });
+
+  test("sqlite, d1 and mysql: MAX / MIN of the condition, which is 0 / 1 / NULL there", async () => {
+    for (const dialect of ["sqlite", "d1"] as const) {
+      const sql = (await viewsOf(calls(), dialect))["v_calls_by_game"];
+      expect(sql).toContain(`MAX(c."success" = 0) AS "hasError"`);
+      expect(sql).toContain(`COALESCE(MIN(c."latencyMs" > 1000), 0) AS "allSlow"`);
+    }
+    const my = (await viewsOf(calls(), "mysql"))["v_calls_by_game"];
+    expect(my).toContain("MAX(c.`success` = FALSE) AS `hasError`");
+    expect(my).toContain("COALESCE(MIN(c.`latencyMs` > 1000), 0) AS `allSlow`");
+  });
+});
+
+// ── A bare @of owner after @via resolves in the package of the entity @via reaches ─────
+
+describe("a via dimension's bare @of owner across packages", () => {
+  test("Realm.name after a hop onto world::Realm groups by realms.name", async () => {
+    const world = { "metadata.root": { package: "world", children: [
+      ent("Realm", [tableSrc("realms"), field("long", "id"), field("string", "name", { "@required": true }), idPk]),
+    ] } };
+    const play = { "metadata.root": { package: "play", children: [
+      ent("Game", [
+        tableSrc("games"),
+        field("long", "id"),
+        field("long", "realmId", { "@required": true }),
+        idPk,
+        { "identity.reference": { name: "fkRealm", "@references": "world::Realm", "@fields": ["realmId"] } },
+        { "dimension.attribute": { name: "realmName", "@of": "Realm.name", "@via": "Game.fkRealm" } },
+        { "measure.aggregate": { name: "games", "@agg": "count", "@of": "Game.id" } },
+      ]),
+      rpt("GamesByRealm", { "@from": "Game", "@dimensions": ["realmName"], "@measures": ["games"] }, "v_games_by_realm"),
+    ] } };
+    const { root, errors } = await new MetaDataLoader().load([
+      new InMemoryStringSource(JSON.stringify(world)),
+      new InMemoryStringSource(JSON.stringify(play)),
+    ]);
+    expect(errors).toEqual([]);
+    const [view] = buildReportViews(literalColumns(root), { dialect: "postgres" });
+    expect(view?.sql).toContain(`"name" AS "realmName"`);
+    expect(view?.sql).toContain(`INNER JOIN "realms"`);
+  });
+});
diff --git a/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts b/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
index 7761d812b..f433fb505 100644
--- a/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
+++ b/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
@@ -59,11 +59,17 @@ async function loadRoot(doc: unknown = MODEL) {
   return res.root;
 }
 
-const gen = (name: string): Generator => ({ name, generate: () => [] });
+const gen = (name: string, opts?: Partial<Generator>): Generator => ({ name, generate: () => [], ...opts });
 
-function collect(root: Awaited<ReturnType<typeof loadRoot>>, generators: Generator[]): string[] {
+function collect(
+  root: Awaited<ReturnType<typeof loadRoot>>,
+  generators: Generator[],
+  // Defaults to "nothing in this suite writes to the docs target" — the behaviour of
+  // every pre-R1 test, none of which modeled a docs-only run.
+  isDocsTarget: (g: Generator) => boolean = () => false,
+): string[] {
   const out: string[] = [];
-  warnMissingPromptGenerators(root, generators, (m) => out.push(m));
+  warnMissingPromptGenerators(root, generators, isDocsTarget, (m) => out.push(m));
   return out;
 }
 
@@ -111,4 +117,43 @@ describe("A3 — declared prompts with no prompt generator wired", () => {
     });
     expect(collect(root, [gen("entity-file")])).toEqual([]);
   });
+
+  // A docs-only project (its `generators` lists only docs generators, e.g.
+  // `docsFile()`) was told to "Add promptRender()" and that its payload value objects
+  // "were emitted regardless", though the run emitted no code of any kind — only docs.
+  test("silent when the run lists no generator at all", async () => {
+    expect(collect(await loadRoot(), [])).toEqual([]);
+  });
+
+  test("silent when every listed generator resolves to the docs target", async () => {
+    const warnings = collect(
+      await loadRoot(),
+      [gen("docs-file"), gen("agent-docs")],
+      () => true, // every generator in this run is docs-target
+    );
+    expect(warnings).toEqual([]);
+  });
+
+  test("still warns when a docs generator is mixed with a code generator", async () => {
+    const warnings = collect(
+      await loadRoot(),
+      [gen("docs-file"), gen("entity-file")],
+      (g) => g.name === "docs-file",
+    );
+    expect(warnings).toHaveLength(1);
+    expect(warnings[0]).toContain("promptRender()");
+  });
+
+  // The "payload value objects were emitted regardless" claim is only true when a
+  // generator that actually emits entity/value-object modules (`emitsEntityModule`)
+  // ran in this suite.
+  test("drops the value-objects claim when no generator emits entity modules", async () => {
+    const warnings = collect(await loadRoot(), [gen("queries-file")]);
+    expect(warnings[0]).not.toContain("were emitted regardless");
+  });
+
+  test("keeps the value-objects claim when the entity generator is wired", async () => {
+    const warnings = collect(await loadRoot(), [gen("entity-file", { emitsEntityModule: true })]);
+    expect(warnings[0]).toContain("were emitted regardless");
+  });
 });
diff --git a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
index df3f3ea60..29395029b 100644
--- a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
@@ -767,4 +767,34 @@ describe("report views — inline models on real Postgres", () => {
     expect(Number(row!.scoreTotal)).toBe(3.75);
     expect(Number(row!.ratioTotal)).toBe(0.75);
   }, 60_000);
+
+  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition is skipped", async () => {
+    const root = await loadInline(JSON.stringify({ "metadata.root": { package: "acme", children: [
+      { "object.entity": { name: "Call", children: [
+        { "source.rdb": { "@table": "calls" } },
+        { "field.long": { name: "id" } },
+        { "field.long": { name: "gameId", "@required": true } },
+        { "field.boolean": { name: "success" } },
+        { "identity.primary": { name: "id", "@fields": "id", "@generation": "increment" } },
+        { "dimension.attribute": { name: "game", "@of": "Call.gameId" } },
+        { "measure.aggregate": { name: "hasError", "@agg": "any", "@filter": { success: false } } },
+        { "measure.aggregate": { name: "allSucceeded", "@agg": "all", "@filter": { success: true } } },
+      ] } },
+      { "object.report": { name: "CallsByGame", "@from": "Call", "@dimensions": ["game"],
+        "@measures": ["hasError", "allSucceeded"], children: [
+        { "source.rdb": { "@kind": "view", "@view": "v_calls_by_game" } } ] } },
+    ]}}));
+    expect(viewSql(root, "v_calls_by_game")).toContain(`bool_or(c."success" = FALSE) AS "hasError"`);
+    const { expected } = await migrate(root);
+    await assertConverged(expected);
+    await applyRaw(`
+      INSERT INTO "calls" ("gameId","success") VALUES
+        (1, TRUE), (1, FALSE), (2, TRUE), (2, TRUE), (3, TRUE), (3, NULL), (4, NULL)`);
+    expect(await select(`SELECT * FROM "v_calls_by_game" ORDER BY "game"`)).toEqual([
+      { game: "1", hasError: "t", allSucceeded: "f" },
+      { game: "2", hasError: "f", allSucceeded: "t" },
+      { game: "3", hasError: "f", allSucceeded: "t" },
+      { game: "4", hasError: null, allSucceeded: null },
+    ]);
+  }, 60_000);
 });
diff --git a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
index faa584514..030133710 100644
--- a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
@@ -602,4 +602,38 @@ describe("report views — inline model on real SQLite", () => {
       { dayYear: "2027-01-01", stamps: 1 },
     ]);
   });
+
+  /** @agg any / all with no @of (rule M0): the measure's condition is the quantified predicate. */
+  const CALL_MODEL = JSON.stringify({ "metadata.root": { package: "acme", children: [
+    { "object.entity": { name: "Call", children: [
+      { "source.rdb": { "@table": "calls" } },
+      { "field.long": { name: "id" } },
+      { "field.long": { name: "gameId", "@required": true } },
+      { "field.boolean": { name: "success" } },
+      { "identity.primary": { name: "id", "@fields": "id", "@generation": "increment" } },
+      { "dimension.attribute": { name: "game", "@of": "Call.gameId" } },
+      { "measure.aggregate": { name: "hasError", "@agg": "any", "@filter": { success: false } } },
+      { "measure.aggregate": { name: "allSucceeded", "@agg": "all", "@filter": { success: true } } },
+    ] } },
+    { "object.report": { name: "CallsByGame", "@from": "Call", "@dimensions": ["game"],
+      "@measures": ["hasError", "allSucceeded"], children: [
+      { "source.rdb": { "@kind": "view", "@view": "v_calls_by_game" } } ] } },
+  ]}});
+
+  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition is skipped", async () => {
+    const root = await loadInline(CALL_MODEL);
+    expect(viewSql(root, "v_calls_by_game")).toContain(`MAX(c."success" = 0) AS "hasError"`);
+    const { expected } = await migrate(root);
+    await assertConverged(expected);
+    // Game 1 has a failure; game 2 only successes; game 3 a success and an unknown; game 4 only an unknown.
+    await applyRaw(`
+      INSERT INTO "calls" ("gameId","success") VALUES
+        (1, 1), (1, 0), (2, 1), (2, 1), (3, 1), (3, NULL), (4, NULL)`);
+    expect(await select(`SELECT * FROM "v_calls_by_game" ORDER BY "game"`)).toEqual([
+      { game: 1, hasError: 1, allSucceeded: 0 },
+      { game: 2, hasError: 0, allSucceeded: 1 },
+      { game: 3, hasError: 0, allSucceeded: 1 },
+      { game: 4, hasError: null, allSucceeded: null },
+    ]);
+  });
 });
diff --git a/server/typescript/packages/metadata/src/core/reporting/report-describe.ts b/server/typescript/packages/metadata/src/core/reporting/report-describe.ts
index 9c035affa..3c2f09108 100644
--- a/server/typescript/packages/metadata/src/core/reporting/report-describe.ts
+++ b/server/typescript/packages/metadata/src/core/reporting/report-describe.ts
@@ -16,6 +16,7 @@ import type { MetaData } from "../../shared/meta-data.js";
 import type { MetaRoot } from "../../shared/meta-root.js";
 import { TYPE_DIMENSION, TYPE_MEASURE, TYPE_SEGMENT } from "../../shared/base-types.js";
 import { SOURCE_KIND_VIEW } from "../../persistence/source/source-constants.js";
+import { AGG_ALL } from "../../persistence/origin/origin-constants.js";
 import type { MetaObject } from "../object/meta-object.js";
 import { OBJECT_REPORT_ATTR_FILTER, OBJECT_REPORT_ATTR_SEGMENT } from "../object/object-constants.js";
 import {
@@ -115,9 +116,14 @@ export function describeMeasure(measure: MetaData): string {
     return fallback !== "" ? `${quotient}${fallback}` : `${quotient}, null when the denominator is 0`;
   }
   const columns = stringList(measure.attr(REPORTING_ATTR_OF)).map(tick);
+  const scope = describeRowScope(measure.attr(REPORTING_ATTR_SEGMENT), measure.attr(REPORTING_ATTR_FILTER));
+  if (columns.length === 0) {
+    // @agg any / all with no @of (loader rule M0): the row condition is the quantified predicate.
+    const quantifier = measure.attr(REPORTING_ATTR_AGG) === AGG_ALL ? "every row" : "some row";
+    return `true when ${quantifier} has ${scope ?? ""}${fallback}`;
+  }
   const of = columns.length === 1 ? columns[0]! : `(${columns.join(", ")})`;
   const distinct = measure.attr(REPORTING_ATTR_DISTINCT) === true ? "distinct " : "";
-  const scope = describeRowScope(measure.attr(REPORTING_ATTR_SEGMENT), measure.attr(REPORTING_ATTR_FILTER));
   return `${String(measure.attr(REPORTING_ATTR_AGG) ?? "")} of ${distinct}${of}${scope !== undefined ? ` where ${scope}` : ""}${fallback}`;
 }
 
diff --git a/server/typescript/packages/metadata/src/core/reporting/report-shape.ts b/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
index dd2545172..bc0388da5 100644
--- a/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
+++ b/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
@@ -111,7 +111,9 @@ export function reportingMemberOwner(member: MetaData, from: MetaObject): MetaDa
  *  2. With `host` (a measure, or a dimension without `@via`: the reference is about the
  *     `@from` entity's own rows) the named entity must be `host` or an entity it extends,
  *     and the field is read from `host`, so a field `host` redeclares wins.
- *  3. Without `host` (a dimension with `@via`) the field is read from the named entity.
+ *  3. Without `host` the field is read from the named entity. A dimension with `@via` passes
+ *     the entity its `@via` reaches as both `declaring` and `host`
+ *     ({@link resolveDimensionOf}).
  *
  * Undefined when any step fails.
  */
@@ -124,6 +126,68 @@ export function resolveReportingFieldRef(
   return resolveReportingFieldRefNamed(ref, declaring, root, host)?.field;
 }
 
+/**
+ * A dimension's `@of` field, read as the loader's rule D1 reads it. Without `@via` it is
+ * {@link resolveReportingFieldRef} with `from` as the host. With `@via` the host is the
+ * entity the `@via` reaches, and a bare entity name in `@of` resolves in THAT entity's
+ * package: the path already fixes the entity, so `Realm.name` after a hop onto
+ * `world::Realm` names `world::Realm`. The field is read from the reached entity, so a field
+ * it redeclares wins. Undefined when the `@via` or the `@of` does not resolve.
+ */
+export function resolveDimensionOf(
+  dim: MetaDimension,
+  from: MetaObject,
+  root: MetaRoot,
+): { readonly named: MetaObject; readonly field: MetaField } | undefined {
+  const of = dim.of() ?? "";
+  const via = dim.via();
+  if (via === undefined) return resolveReportingFieldRefNamed(of, reportingMemberOwner(dim, from), root, from);
+  const terminal = reportingViaTerminal(via, reportingMemberOwner(dim, from), from, root);
+  if (terminal === undefined) return undefined;
+  return resolveReportingFieldRefNamed(of, terminal, root, terminal);
+}
+
+/**
+ * The entity at the end of a `@via` walked from `from` (hops as {@link reportingViaHops}
+ * reads them, each target as {@link resolveViaHop} resolves it). Undefined when any hop does
+ * not resolve.
+ */
+function reportingViaTerminal(
+  via: string,
+  declaring: MetaData,
+  from: MetaObject,
+  root: MetaRoot,
+): MetaObject | undefined {
+  const walk = walkReportingVia(via, declaring, from, root);
+  return walk !== undefined && "terminal" in walk ? walk.terminal : undefined;
+}
+
+/**
+ * {@link reportingViaTerminal}, saying where a walk stopped: `undefined` when the owner does
+ * not resolve, else the terminal entity or the hop that failed, the entity it was looked up
+ * on and why.
+ */
+function walkReportingVia(
+  via: string,
+  declaring: MetaData,
+  from: MetaObject,
+  root: MetaRoot,
+): { terminal: MetaObject } | { hop: string; at: MetaObject; reason: string } | undefined {
+  const hops = reportingViaHops(via, declaring, from, root);
+  if (hops === undefined) return undefined;
+  let current: MetaObject = from;
+  for (const hop of hops) {
+    const step = resolveViaHop(current, hop, root);
+    if (step === undefined) return { hop, at: current, reason: "it names no relationship or identity.reference of that entity" };
+    if (step.target === undefined) {
+      const ref = step.hop.attr(step.isReference ? IDENTITY_REFERENCE_ATTR_REFERENCES : RELATIONSHIP_ATTR_OBJECT_REF);
+      return { hop, at: current, reason: `its target '${String(ref ?? "")}' does not resolve to an object` };
+    }
+    current = step.target;
+  }
+  return { terminal: current };
+}
+
 /**
  * {@link resolveReportingFieldRef}, also returning `named`: the entity the reference's
  * entity half names (which, with `host`, may be an ancestor of the entity `field` is read
@@ -177,8 +241,9 @@ function unresolved(reportName: string, what: string): Error {
 
 /**
  * The hop names of a report's `@spine` (`Owner.hop[.hop...]`), read as
- * {@link reportingViaHops} reads a `@via`, the owner resolving in the REPORT's package
- * (loader rule R8). Undefined when the report declares no `@spine`. Throws a plain Error
+ * {@link reportingViaHops} reads a `@via`, the owner resolving in `from`'s package (loader
+ * rule R8): Owner must be `from` or an entity it extends, so a bare name means `from`'s
+ * package even when the report lives in another one. Undefined when the report declares no `@spine`. Throws a plain Error
  * naming the report when a declared `@spine` does not resolve (a report that passed
  * `validateReporting` always resolves): reading it as "no spine" would claim a column
  * non-null that a spine row with no facts leaves null.
@@ -186,7 +251,7 @@ function unresolved(reportName: string, what: string): Error {
 export function reportSpineHops(report: MetaObject, from: MetaObject, root: MetaRoot): string[] | undefined {
   const spine = reportSpine(report);
   if (spine === undefined) return undefined;
-  const hops = reportingViaHops(spine, report, from, root);
+  const hops = reportingViaHops(spine, from, from, root);
   if (hops === undefined) throw unresolved(report.name, `@spine '${spine}'`);
   return hops;
 }
@@ -335,8 +400,19 @@ function dimensionField(
 ): ReportField {
   const dim = declaredMember(from, TYPE_DIMENSION, item.name, MetaDimension);
   if (dim === undefined) throw unresolved(reportName, `dimension '${item.name}' on '${from.name}'`);
-  const vialess = dim.via() === undefined;
-  const ref = resolveReportingFieldRefNamed(dim.of() ?? "", reportingMemberOwner(dim, from), root, vialess ? from : undefined);
+  const via = dim.via();
+  // A @via that does not walk is the @via's error, not the @of's (the @of resolves at its end).
+  if (via !== undefined) {
+    const walk = walkReportingVia(via, reportingMemberOwner(dim, from), from, root);
+    if (walk === undefined) throw unresolved(reportName, `dimension '${dim.name}' @via '${via}'`);
+    if (!("terminal" in walk)) {
+      throw new Error(
+        `report '${reportName}': dimension '${dim.name}' @via '${via}' cannot be joined at hop '${walk.hop}' ` +
+          `on '${walk.at.resolutionKey()}': ${walk.reason}.`,
+      );
+    }
+  }
+  const ref = resolveDimensionOf(dim, from, root);
   if (ref === undefined) throw unresolved(reportName, `dimension '${item.name}' @of`);
   const of = ref.field;
   const name = reportDerivedFieldName(item);
diff --git a/server/typescript/packages/metadata/src/core/reporting/reporting-definition.embedded.ts b/server/typescript/packages/metadata/src/core/reporting/reporting-definition.embedded.ts
index d5c938470..f8c9c5b39 100644
--- a/server/typescript/packages/metadata/src/core/reporting/reporting-definition.embedded.ts
+++ b/server/typescript/packages/metadata/src/core/reporting/reporting-definition.embedded.ts
@@ -95,16 +95,16 @@ export const REPORTING_DEFINITION: ProviderDefinition = {
             "any",
             "all"
           ],
-          "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean."
+          "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment."
         },
         {
           "type": "attr",
           "subType": "string",
           "name": "of",
           "isArray": true,
-          "min": 1,
+          "min": 0,
           "max": 1,
-          "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true."
+          "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows."
         },
         {
           "type": "attr",
diff --git a/server/typescript/packages/metadata/src/index.ts b/server/typescript/packages/metadata/src/index.ts
index 07d6c15d4..542d63db9 100644
--- a/server/typescript/packages/metadata/src/index.ts
+++ b/server/typescript/packages/metadata/src/index.ts
@@ -64,6 +64,7 @@ export {
   reportingMemberOwner,
   reportingViaHops,
   resolveReportingFieldRef,
+  resolveDimensionOf,
   type ReportField,
   type ReportFieldRole,
   type ReportShape,
diff --git a/server/typescript/packages/metadata/src/loader/reporting-validation.ts b/server/typescript/packages/metadata/src/loader/reporting-validation.ts
index 07512eafe..8a3908d96 100644
--- a/server/typescript/packages/metadata/src/loader/reporting-validation.ts
+++ b/server/typescript/packages/metadata/src/loader/reporting-validation.ts
@@ -7,7 +7,7 @@
 // Two design rules hold throughout, so one broken rule yields exactly one error:
 //   - No cascades. A member that fails a structural rule is not checked further
 //     (a dimension whose @via fails D2 skips D1/D3/D4; a measure that fails one
-//     of M1–M4, or whose @default is a fraction, skips M7/M8; a report whose
+//     of M0–M4, or whose @default is a fraction, skips M7/M8; a report whose
 //     @from fails R1 skips R2/R3/R6/R7, R8/R9 and its @filter; a report whose
 //     @spine fails R8 skips R9, and R9
 //     skips a dimension whose @via fails D2; an invalid @dimensions/@measures
@@ -375,7 +375,11 @@ function checkDimension(ctx: MemberCtx, dim: MetaDimension): void {
     err(`@of '${of}' must be Entity.field.`);
     return;
   }
-  const named = resolveObjectRef(ctx.root, parts.owner, pkgOf(ctx.declaring)).node;
+  // D1 — after @via, a bare Owner resolves in the package of the entity @via reaches: the path
+  // already fixes the entity, so `Realm.name` after a hop onto `world::Realm` names it. Without
+  // @via it resolves in the declaring entity's package.
+  const ownerPkg = via === undefined ? pkgOf(ctx.declaring) : pkgOf(ofEntity);
+  const named = resolveObjectRef(ctx.root, parts.owner, ownerPkg).node;
   if (!isSelfOrAncestor(named, ofEntity)) {
     if (via === undefined) {
       err(
@@ -417,7 +421,7 @@ function checkDimension(ctx: MemberCtx, dim: MetaDimension): void {
 interface ToOneWalk {
   /** The attribute holding the path: `via` (D2) or `spine` (R8). */
   readonly attr: string;
-  /** The package Owner resolves in (ADR-0042): the declaring entity's (D2) or the report's (R8). */
+  /** The package Owner resolves in (ADR-0042): the declaring entity's (D2) or @from's (R8). */
   readonly ownerPkg: string;
   /** The FQN named for the walk's first entity: the declaring entity (D2) or @from (R8). */
   readonly hostName: string;
@@ -444,11 +448,12 @@ function d2Walk(declaring: MetaData): ToOneWalk {
   };
 }
 
-/** R8 — a report's @spine, started at @from (`fromKey`); Owner resolves in the report's package. */
-function spineWalk(report: MetaData, fromKey: string): ToOneWalk {
+/** R8 — a report's @spine, started at @from; Owner resolves in @from's package (it must be
+ *  @from or an entity @from extends), whatever package the report is in. */
+function spineWalk(from: MetaData, fromKey: string): ToOneWalk {
   return {
     attr: OBJECT_REPORT_ATTR_SPINE,
-    ownerPkg: pkgOf(report),
+    ownerPkg: pkgOf(from),
     hostName: fromKey,
     start: `@from '${fromKey}'`,
     startShort: `@from '${fromKey}'`,
@@ -548,7 +553,7 @@ function checkMeasure(ctx: MemberCtx, measure: MetaMeasure): void {
   const clean = checked !== undefined;
   const ofField = checked?.field;
 
-  // M7 / M8 — where a @default can apply. Only when M1–M4 passed and the @default is
+  // M7 / M8 — where a @default can apply. Only when M0–M4 passed and the @default is
   // not a fraction: one mistake, one error. The presence test reads the raw attribute,
   // so a non-number value on a count still reports M7 beside the attribute type error.
   if (clean && !fractionalDefault && declaredDefault !== undefined) {
@@ -594,7 +599,7 @@ function checkMeasure(ctx: MemberCtx, measure: MetaMeasure): void {
 }
 
 /**
- * M1–M4, in order; the first failure stops the chain (no M2+M3 double report).
+ * M0–M4, in order; the first failure stops the chain (no M2+M3 double report).
  * Returns undefined when one of them fired; otherwise `field` is the single
  * resolved @of field (undefined for a tuple), for M7/M8.
  */
@@ -606,6 +611,27 @@ function checkAggregateColumns(
   const agg = measure.agg();
   const columns = measure.ofColumns();
 
+  // M0 — @of names the column aggregated. Only any / all may omit it: they then quantify the
+  // measure's row condition (@filter AND @segment) over the group, "some row (every row)
+  // passes", so they need a condition to quantify.
+  if (columns.length === 0 && agg !== undefined) {
+    if (agg !== AGG_ANY && agg !== AGG_ALL) {
+      err(
+        `@agg '${agg}' needs @of, the column it aggregates. Only @agg any / all may omit @of, to ask ` +
+          `whether some row (any) or every row (all) passes the measure's @filter or @segment.`,
+      );
+      return undefined;
+    }
+    if (measure.filter() === undefined && measure.segmentName() === undefined) {
+      err(
+        `@agg '${agg}' without @of quantifies the measure's row condition, but it declares neither ` +
+          `@filter nor @segment. Name a field.boolean in @of, or add the condition.`,
+      );
+      return undefined;
+    }
+    return { field: undefined };
+  }
+
   // M1 — every @of item is a field of the owning entity.
   const fields: MetaData[] = [];
   for (const item of columns) {
@@ -901,7 +927,7 @@ function checkReport(root: MetaData, report: MetaData, sink: ErrorSink): void {
   // R8 — @spine is a to-one path from @from: rule D2's walk, started at @from.
   const spine = reportSpine(report);
   if (spine !== undefined) {
-    const terminal = walkToOneVia(root, from, spine, (message) => err(`: ${message}`), spineWalk(report, fromKey));
+    const terminal = walkToOneVia(root, from, spine, (message) => err(`: ${message}`), spineWalk(from, fromKey));
     // R9 — every listed dimension is reached through the spine. Skipped when R8 failed.
     if (terminal !== undefined) {
       const spineHops = splitDotted(spine)?.path ?? [];
diff --git a/server/typescript/packages/metadata/test/report-shape.test.ts b/server/typescript/packages/metadata/test/report-shape.test.ts
index 291aac5d3..2e2069fd2 100644
--- a/server/typescript/packages/metadata/test/report-shape.test.ts
+++ b/server/typescript/packages/metadata/test/report-shape.test.ts
@@ -683,3 +683,39 @@ describe("reportShape required of a dimension reached through @via", () => {
     expect(req["sessionRealmId"]).toBe(true);   // on the spine, a required field
   });
 });
+
+describe("reportShape: bare owners the path already fixes (R5)", () => {
+  const FIXTURE = join(REPO_ROOT, "fixtures", "conformance", "reporting-cross-package-short-names", "input");
+
+  test("a via dimension's bare @of resolves in the reached entity's package; a @spine in @from's", async () => {
+    const result = await loadUris(
+      ["meta.world.json", "meta.play.json", "meta.reports.json"].map((f) => pathToFileURL(join(FIXTURE, f)).href),
+    );
+    expect(result.errors).toEqual([]);
+    const root = result.root;
+    const shape = reportShape(report(root, "GamesByRealm"), root);
+    // realmName is Realm.name (required string): on the spine, over a required field.
+    expect(shape.fields.map((f) => [f.name, f.role, f.subType, f.required])).toEqual([
+      ["realmName", "dimension", "string", true],
+      ["games", "measure", "long", true],
+    ]);
+    expect(reportSpineHops(report(root, "GamesByRealm"), shape.from, root)).toEqual(["fkRealm"]);
+    expect(reportSpineEntity(report(root, "GamesByRealm"), shape.from, root)?.resolutionKey()).toBe("acme::world::Realm");
+  });
+});
+
+describe("reportShape: @agg any / all without @of (R6)", () => {
+  test("is a boolean measure, nullable without @default", async () => {
+    const MODEL_R6 = join(REPO_ROOT, "fixtures", "conformance", "reporting-any-all-predicate", "input", "meta.ops.json");
+    const result = await loadUris([pathToFileURL(MODEL_R6).href]);
+    expect(result.errors).toEqual([]);
+    const shape = reportShape(report(result.root, "CallsByGame"), result.root);
+    expect(shape.fields.map((f) => [f.name, f.subType, f.required])).toEqual([
+      ["game", "long", true],
+      ["calls", "long", true],
+      ["hasError", "boolean", false],
+      ["allSlow", "boolean", true],
+      ["anySlowFailure", "boolean", false],
+    ]);
+  });
+});
diff --git a/site-reference/types/measure.html b/site-reference/types/measure.html
index 8abf6ed9b..70e4064c4 100644
--- a/site-reference/types/measure.html
+++ b/site-reference/types/measure.html
@@ -73,7 +73,7 @@ <h3>measure.aggregate</h3>
 <td></td>
 <td><code>count</code>, <code>sum</code>, <code>avg</code>, <code>min</code>, <code>max</code>, <code>any</code>, <code>all</code></td>
 <td>—</td>
-<td>The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean.</td>
+<td>The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure&#39;s @filter / @segment.</td>
 </tr>
 <tr>
 <td><code>@default</code></td>
@@ -105,11 +105,11 @@ <h3>measure.aggregate</h3>
 <tr>
 <td><code>@of</code></td>
 <td>string[]</td>
-<td>yes</td>
+<td>no</td>
 <td></td>
 <td></td>
 <td>—</td>
-<td>Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true.</td>
+<td>Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows.</td>
 </tr>
 <tr>
 <td><code>@segment</code></td>
diff --git a/spec/metamodel/reporting.json b/spec/metamodel/reporting.json
index 67f998e83..98c0bd24f 100644
--- a/spec/metamodel/reporting.json
+++ b/spec/metamodel/reporting.json
@@ -20,8 +20,8 @@
       "description": "A named aggregate over the declaring entity's own rows (FR-044). @agg count without @distinct counts rows; with @distinct it counts distinct values of @of (a list in @of is a distinct count of the tuple). Unlike origin.aggregate, count is NOT distinct by default: a measure aggregates its own rows and dimensions reach only to-one paths, so no join inflates it.",
       "whenToUse": "A number a dashboard shows: revenue, purchases, distinct buyers, last activity.",
       "children": [
-        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) need a field.boolean and type the measure boolean." },
-        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 1, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true." },
+        { "type": "attr", "subType": "string", "name": "agg", "min": 1, "max": 1, "allowedValues": ["count", "sum", "avg", "min", "max", "any", "all"], "description": "The aggregate function. sum/avg need a numeric field; min/max refuse boolean, object and map fields; any/all (boolean OR / AND, Postgres bool_or / bool_and) type the measure boolean and take either a field.boolean in @of or no @of, when they ask whether some row (any) or every row (all) passes the measure's @filter / @segment." },
+        { "type": "attr", "subType": "string", "name": "of", "isArray": true, "min": 0, "max": 1, "description": "Dotted Entity.field reference(s) on the declaring entity. A bare string is one column; more than one requires @agg: count and @distinct: true. Required for every @agg except any/all, which may omit it to quantify their @filter / @segment over the rows." },
         { "type": "attr", "subType": "boolean", "name": "distinct", "min": 0, "max": 1, "description": "Count distinct values. Legal only with @agg: count." },
         { "type": "attr", "subType": "filter", "name": "filter", "min": 0, "max": 1, "description": "Optional row scope (a portable attr.filter over the declaring entity's fields). May use relative-date values ({ now: \"-P7D\" }). Combines with @segment by AND." },
         { "type": "attr", "subType": "string", "name": "segment", "min": 0, "max": 1, "description": "Optional name of a segment declared on the same entity. Combines with @filter by AND." },
diff --git a/tools/prerelease/detect-prerelease-pins.sh b/tools/prerelease/detect-prerelease-pins.sh
index 556e434bf..da382a2f5 100755
--- a/tools/prerelease/detect-prerelease-pins.sh
+++ b/tools/prerelease/detect-prerelease-pins.sh
@@ -157,7 +157,13 @@ EXCLUDES=(
 )
 
 fail=0
-hit() { echo "  ✖ $1" >&2; fail=1; }
+# Set when anything OTHER than check 6 (the agent-context staleness check below) fires,
+# so the two failure messages at the bottom stay on-topic: the private-registry/pin
+# message talks about unlinking a registry, which is the wrong fix for a stale agent
+# context and would send the reader to the wrong command.
+other_hit=0
+agent_context_hit=0
+hit() { echo "  ✖ $1" >&2; fail=1; other_hit=1; }
 
 scan() {  # scan <label> <grep-args...>
   local label="$1"; shift
@@ -364,8 +370,26 @@ while IFS= read -r pom; do
   fi
 done < <(grep -rIl --exclude-dir=.git --include=pom.xml 'com\.metaobjects' "$ROOT" 2>/dev/null)
 
+# 6 — the generated agent context records which CLI version wrote it. `meta init
+# --refresh-docs` (and `meta init` generally) stamp the running CLI's own version into
+# `"generatedBy"` in `.metaobjects/.agent-context.json`, a file meant to be committed and
+# tracked alongside `.metaobjects/AGENTS.md`, `.metaobjects/CLAUDE.md` and the
+# `.claude/skills/metaobjects-*` files it governs. Run with a pre-release CLI, that stamp
+# is a pre-release version, and a branch tested on a release candidate could otherwise
+# merge a file that says so — with skills content that may differ from the final release.
+# A literal string match, like check 4's dist-tag check: no toolchain, no JSON parser.
+out=$(grep -rInE --binary-files=without-match --include=.agent-context.json "${EXCLUDES[@]}" \
+        -- "\"generatedBy\"[[:space:]]*:[[:space:]]*\"$PRERELEASE_RE\"" "$ROOT" 2>/dev/null) || true
+if [ -n "$out" ]; then
+  echo "  ✖ agent context was generated by a pre-release CLI" >&2
+  printf '%s\n' "$out" | sed 's/^/      /' >&2
+  fail=1
+  agent_context_hit=1
+fi
+
 if [ "$fail" -ne 0 ]; then
-  cat >&2 <<'MSG'
+  if [ "$other_hit" -ne 0 ]; then
+    cat >&2 <<'MSG'
 
 This project depends on artifacts from a private pre-release registry.
 Those artifacts do not exist publicly: anyone else's build will fail, and there is no
@@ -383,6 +407,20 @@ repinning cannot clear them: reconcile with your project's own install command
 (`npm install` / `uv sync` / `dotnet restore --force-evaluate`) and run `check` again.
 `unlink` names the offending lockfiles and the exact command for them.
 MSG
+  fi
+  if [ "$agent_context_hit" -ne 0 ]; then
+    cat >&2 <<'MSG2'
+
+.metaobjects/.agent-context.json (and the generated files it governs — AGENTS.md,
+CLAUDE.md, the .claude/skills/metaobjects-* files) names the CLI version that wrote it.
+A pre-release `generatedBy` means those files were refreshed with a release candidate,
+not the release: refresh them again with the RELEASE CLI before merging —
+
+    meta init --refresh-docs --docs-only
+
+— and commit the result, so `generatedBy` names a released version.
+MSG2
+  fi
   exit 1
 fi
 echo "detect-prerelease-pins: ✓ no private-registry config and no pre-release pin"
diff --git a/tools/prerelease/prerelease-link.sh b/tools/prerelease/prerelease-link.sh
index e1dadc6b6..6798d47bb 100755
--- a/tools/prerelease/prerelease-link.sh
+++ b/tools/prerelease/prerelease-link.sh
@@ -164,30 +164,95 @@ detected() {
   echo "${d[@]}"
 }
 
+# Does <file> end in a newline? Absent/empty counts as "yes" — there is nothing to preserve,
+# and a freshly written file's own trailing newline is intentional, not a byte this check
+# exists to protect.
+ends_in_newline() {  # ends_in_newline <file>
+  [ -s "$1" ] || return 0
+  [ "$(tail -c1 "$1" | wc -l)" -eq 1 ]
+}
+
+# `ends_in_newline`, captured into a variable BEFORE a rewrite so `finish_rewrite` can restore
+# it afterward (a plain `&&`/`||` can't survive being stored and read back later).
+had_newline() { ends_in_newline "$1" && echo 1 || echo 0; }
+
+# Every in-place rewrite in this script writes to a tmp file and moves it over the original.
+# awk's `print` unconditionally terminates the last line with a newline, even when the file
+# being rewritten had none — so a no-op "link, then unlink" round trip left every pom.xml that
+# lacked a trailing newline with one, which `git status` then reported as modified. sed
+# does not have this problem (verified: `sed -i` preserves a missing trailing newline whether
+# or not anything matched), so only the awk call sites route through this. <had> is
+# `had_newline` captured on <file> immediately before the awk call that produced <tmpfile>; a
+# caller that already knows nothing needs preserving can pass "1", which is a no-op here.
+finish_rewrite() {  # finish_rewrite <file> <tmpfile> <had 0|1>
+  local f="$1" tmp="$2" had="$3"
+  mv "$tmp" "$f"
+  [ "$had" = 1 ] && return 0
+  [ -s "$f" ] || return 0
+  # `&&` as a function's own LAST statement would make a false test here (nothing to trim)
+  # the function's own return status, aborting the caller under `set -e` — the same trap
+  # `repin_pom` hit below. The explicit `if` + trailing `return 0` is this fixup's whole job:
+  # best-effort, never a reason to fail the rewrite it is cleaning up after.
+  if ends_in_newline "$f"; then truncate -s -1 "$f"; fi
+  return 0
+}
+
 # Remove a managed block from a file, leaving the rest byte-identical.
 strip_block() {  # strip_block <file> <begin> <end>
-  local f="$1" b="$2" e="$3"
+  local f="$1" b="$2" e="$3" had
   [ -f "$f" ] || return 0
+  had="$(had_newline "$f")"
   awk -v b="$b" -v e="$e" '
     index($0,b) { skip=1 } !skip { print } index($0,e) { skip=0 }
-  ' "$f" > "$f.tmp" && mv "$f.tmp" "$f"
+  ' "$f" > "$f.tmp" && finish_rewrite "$f" "$f.tmp" "$had"
   # a file that is now empty (or only blank lines) was entirely ours
   if [ ! -s "$f" ] || ! grep -q '[^[:space:]]' "$f"; then rm -f "$f"; fi
 }
 
-# Keep an untracked managed file out of commits without touching the shared .gitignore.
-local_exclude() {  # local_exclude <relative-path>
-  local rel="$1" ex prefix
-  # --git-path, not --git-dir: in a linked worktree the git dir is a private directory, and the
-  # exclude file git READS is the shared one in the common dir. The answer is relative to the
-  # directory git ran in, or absolute when the git dir is elsewhere; joining an absolute one onto
-  # $PROJECT is what once wrote a stray `home/.../info/exclude` tree into the work tree.
+# The shared exclude file `local_exclude` writes to — the clone's common-dir info/exclude.
+# --git-path, not --git-dir: in a linked worktree the git dir is a private directory, and the
+# exclude file git READS is the shared one in the common dir, used by every worktree of this
+# clone — git has no per-worktree exclude file, so there is nowhere else for a local-only
+# ignore rule to go. `local_exclude` keeps its footprint exact instead. The answer is relative to the directory git
+# ran in, or absolute when the git dir is elsewhere; joining an absolute one onto $PROJECT is
+# what once wrote a stray `home/.../info/exclude` tree into the work tree.
+exclude_file() {
+  local ex
   ex="$(git -C "$PROJECT" rev-parse --git-path info/exclude 2>/dev/null)" || return 0
-  case "$ex" in /*) ;; *) ex="$PROJECT/$ex" ;; esac
+  case "$ex" in /*) echo "$ex" ;; *) echo "$PROJECT/$ex" ;; esac
+}
+
+# The paths `local_exclude` currently manages, one per line — read back out of its own block
+# so a later call can add to it without re-stating what earlier calls already put there, and
+# so `unlink` can remove the whole block by identity rather than line by line.
+exclude_block_lines() {  # exclude_block_lines <file>
+  awk -v b="$BEGIN" -v e="$END" '
+    index($0,b) { skip=1; next } index($0,e) { skip=0; next } skip { print }
+  ' "$1" 2>/dev/null
+}
+
+# Keep an untracked managed file out of commits without touching the shared .gitignore or any
+# line a user put in info/exclude themselves. Everything this adds lives in one managed block:
+# `unlink` removes exactly that block via `strip_block`, never a line it did not add,
+# and a repeated `link` is idempotent — a path already in the block is left alone no matter
+# how many install roots or `link` runs ask for it.
+local_exclude() {  # local_exclude <relative-path>
+  local rel="$1" ex prefix line linesfile
+  ex="$(exclude_file)"
+  [ -n "$ex" ] || return 0
   # Exclude patterns are relative to the repository root, and $PROJECT may be a subdirectory.
   prefix="$(git -C "$PROJECT" rev-parse --show-prefix 2>/dev/null || true)"
   mkdir -p "$(dirname "$ex")"
-  grep -qxF "$prefix$rel" "$ex" 2>/dev/null || echo "$prefix$rel" >> "$ex"
+  [ -f "$ex" ] || : > "$ex"
+  line="$prefix$rel"
+  exclude_block_lines "$ex" | grep -qxF "$line" && return 0
+  linesfile="$(mktemp)"
+  { exclude_block_lines "$ex"; printf '%s\n' "$line"; } > "$linesfile"
+  strip_block "$ex" "$BEGIN" "$END"
+  { [ -s "$ex" ] && { cat "$ex"; ends_in_newline "$ex" || echo; }
+    echo "$BEGIN"; cat "$linesfile"; echo "$END"
+  } > "$ex.tmp" && mv "$ex.tmp" "$ex"
+  rm -f "$linesfile"
 }
 
 # Refuse to report success while a file this script wrote could still be committed. The managed
@@ -351,8 +416,13 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
   # rewrite ONLY that: expanding ${metaobjects.version} into a literal would silently
   # destroy the indirection the project chose, and unlink would never put it back.
   if grep -q '<metaobjects\.version>' "$pom"; then
+    local before after
+    before="$(cat "$pom")"
     sed -i -E "s|(<metaobjects\\.version>)[^<]*(</metaobjects\\.version>)|\\1${mv}\\2|g" "$pom"
-    say "repinned $MVN_GROUP dependencies to $mv in $rel (via <metaobjects.version>)"
+    after="$(cat "$pom")"
+    # Only when the property's value actually changed — a second `link` at the same version
+    # (or a pom already pinned to $mv) must not claim a repin that did not happen.
+    [ "$before" != "$after" ] && say "repinned $MVN_GROUP dependencies to $mv in $rel (via <metaobjects.version>)"
     return 0
   fi
   grep -q "$MVN_GROUP" "$pom" || return 0
@@ -361,10 +431,19 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
   # inside its <configuration>, <executions>, <dependencies> or <exclusions> belongs to something
   # else, and Maven does not fix where among its children an element puts <version>, so the
   # whole element is read before deciding.
-  awk -v grp="$MVN_GROUP" -v ver="$mv" '
+  #
+  # A module pom that only REFERENCES the parent's ${metaobjects.version} (no literal <version>
+  # of its own) matches `grp` above because the groupId appears on some line, but this loop's
+  # own property-reference guard, just below, means it never gsubs anything — `rep` is the
+  # actual substitution count, not "did this pom mention com.metaobjects at all", so "repinned"
+  # is reported only when something really changed (a module pinned entirely through its
+  # parent's property was once reported as repinned with nothing in the file touched).
+  local had rep
+  had="$(had_newline "$pom")"
+  rep="$(awk -v grp="$MVN_GROUP" -v ver="$mv" '
     { L[NR] = $0 }
     END {
-      sp = 0
+      sp = 0; rep = 0
       for (i = 1; i <= NR; i++) {
         s = L[i]
         if (s ~ /<(dependency|plugin)>/) { sp++; ours[sp] = 0; nest[sp] = 0; vline[sp] = 0; continue }
@@ -373,8 +452,9 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
           # A property reference (${metaobjects.version}, inherited from a parent pom) is the
           # indirection the property branch above preserves: rewriting it to a literal would
           # cut the module off from its parent, and unlink would never put it back.
-          if (ours[sp] && vline[sp] && L[vline[sp]] !~ /<version>[[:space:]]*\$\{/)
-            gsub(/<version>[^<]*<\/version>/, "<version>" ver "</version>", L[vline[sp]])
+          if (ours[sp] && vline[sp] && L[vline[sp]] !~ /<version>[[:space:]]*\$\{/) {
+            if (gsub(/<version>[^<]*<\/version>/, "<version>" ver "</version>", L[vline[sp]])) rep++
+          }
           sp--; continue
         }
         if (nest[sp] == 0) {
@@ -385,9 +465,15 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
         if (s ~ /<\/(dependencies|configuration|executions|exclusions)>/) nest[sp]--
       }
       for (i = 1; i <= NR; i++) print L[i]
+      print rep > "/dev/stderr"
     }
-  ' "$pom" > "$pom.tmp" && mv "$pom.tmp" "$pom"
-  say "repinned $MVN_GROUP dependencies to $mv in $rel"
+  ' "$pom" 2>&1 1>"$pom.tmp")"
+  finish_rewrite "$pom" "$pom.tmp" "$had"
+  # `&&` as the function's own last statement would make a zero `rep` (nothing changed — the
+  # case this whole fix is about) the function's return status, aborting the caller under
+  # `set -e`.
+  if [ "${rep:-0}" -gt 0 ]; then say "repinned $MVN_GROUP dependencies to $mv in $rel"; fi
+  return 0
 }
 
 # Which package manager owns a root, from the lockfile it keeps. Decides the command we
@@ -550,7 +636,11 @@ link_npm() {
   while IFS= read -r root; do
     f="$root/.npmrc"
     strip_block "$f" "$BEGIN" "$END"
-    { [ -f "$f" ] && cat "$f"; echo "$BEGIN"
+    # A pre-existing .npmrc without its own trailing newline would otherwise run its last
+    # line straight into the BEGIN marker text (`cat` and `echo "$BEGIN"` land on the same
+    # line) — not just a cosmetic newline difference but real content corruption.
+    { if [ -f "$f" ]; then cat "$f"; ends_in_newline "$f" || echo; fi
+      echo "$BEGIN"
       echo "$NPM_SCOPE:registry=$BASE/api/packages/$OWNER/npm/"
       [ -n "$auth" ] && echo "$auth"
       echo "$END"; } > "$f.tmp" && mv "$f.tmp" "$f"
@@ -640,8 +730,9 @@ XML
 }
 
 link_mvn_root() {  # link_mvn_root <dir holding an independent pom.xml>
-  local dir="$1" f="$1/pom.xml"
+  local dir="$1" f="$1/pom.xml" had
   strip_block "$f" "$XBEGIN" "$XEND"
+  had="$(had_newline "$f")"
   awk -v b="$XBEGIN" -v e="$XEND" -v url="$BASE/api/packages/$OWNER/maven" '
     /<\/project>/ && !done {
       print "  " b
@@ -669,7 +760,7 @@ link_mvn_root() {  # link_mvn_root <dir holding an independent pom.xml>
       done=1
     }
     { print }
-  ' "$f" > "$f.tmp" && mv "$f.tmp" "$f"
+  ' "$f" > "$f.tmp" && finish_rewrite "$f" "$f.tmp" "$had"
   say "linked ${f#"$PROJECT"/}"
 
   # Maven 3.8.1+ ships a built-in `maven-default-http-blocker` mirror that refuses EVERY
@@ -736,6 +827,10 @@ run_detector() {
 
 # ── unlink ────────────────────────────────────────────────────────────────────────────
 unlink_all() {
+  # The git-exclude block link() wrote — removed by identity, same as every other
+  # managed block, so a line a user added to info/exclude by hand survives untouched.
+  local ex; ex="$(exclude_file)"
+  [ -n "$ex" ] && strip_block "$ex" "$BEGIN" "$END"
   # Every root `link` could have written to, or a sub-project keeps a managed block
   # pointing at a registry that will not serve it once the pre-release is gone.
   local root
diff --git a/tools/prerelease/test-prerelease-link.sh b/tools/prerelease/test-prerelease-link.sh
index 78323e9e7..534991e9b 100755
--- a/tools/prerelease/test-prerelease-link.sh
+++ b/tools/prerelease/test-prerelease-link.sh
@@ -7,7 +7,13 @@
 # D9  the Maven pin is npm major + 7 (1.1.0-rc.N is 8.1.0-rc.N), not a hardcoded 7.
 # D11 in a linked git worktree the exclude file is the shared one in the common dir, nothing
 #     stray is written into the work tree, and `link` refuses to report success while a written
-#     .npmrc (which can hold a registry credential) is not ignored.
+#     .npmrc (which can hold a registry credential) is not ignored. The exclude entries `link`
+#     adds live in one managed block, so `unlink` removes exactly that block (and nothing a
+#     user put in the file by hand), and a repeated `link` does not duplicate it.
+# R3  a link/unlink round trip leaves a pom.xml that lacked a trailing newline byte-identical
+#     (the previous awk-based rewrites unconditionally added one), and `link`/`unlink` report
+#     "repinned ... in <file>" only for a pom whose own text actually changed — not a module
+#     pom that is pinned entirely through its parent's ${metaobjects.version} property.
 # P4  a polyglot repository with one project per port and no root project files: every Maven
 #     and Python project is linked and repinned, and the .NET local tool manifest too.
 set -euo pipefail
@@ -91,6 +97,22 @@ check "the exclude entry is in the shared exclude file" 'grep -qxF .npmrc "$comm
 leading="$(printf '%s' "$WORK" | cut -d/ -f2)"
 check "no stray exclude tree in the work tree" '[ ! -e "$WORK/wt/$leading" ]'
 check "the dependency is pinned to the candidate" 'grep -q "1.1.0-rc.9" "$WORK/wt/package.json"'
+check "the exclude entry is inside a managed block" 'grep -q "metaobjects prerelease (managed)" "$common/info/exclude"'
+
+# D11: a second `link` in the same worktree must not duplicate the entry or the block.
+if link "$WORK/wt"; then pass "a second link in the same worktree succeeds"; else fail "second link failed: $(tail -5 "$WORK/out")"; fi
+check "the exclude entry still appears exactly once" '[ "$(grep -cxF .npmrc "$common/info/exclude")" = 1 ]'
+check "the managed block still appears exactly once (one BEGIN line, one END line)" \
+  '[ "$(grep -c "metaobjects prerelease (managed)" "$common/info/exclude")" = 2 ]'
+
+# D11: `unlink` must remove exactly the block `link` added, and nothing a user put in the
+# shared exclude file by hand.
+printf 'a-users-own-rule\n' >> "$common/info/exclude"
+MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
+  bash "$LINK" unlink --project "$WORK/wt" --to 1.0.13 >"$WORK/out" 2>&1 || true
+check "unlink removes the managed block from the shared exclude file" '! grep -q "metaobjects prerelease (managed)" "$common/info/exclude"'
+check "unlink removes the .npmrc entry it added" '! grep -qxF .npmrc "$common/info/exclude"'
+check "unlink leaves a user's own exclude rule alone" 'grep -qxF a-users-own-rule "$common/info/exclude"'
 
 # The assertion: an .npmrc git does not ignore makes link fail.
 git -C "$WORK/main" worktree add -q "$WORK/wt2" -b linked2
@@ -232,5 +254,96 @@ check "unlink repins every pom" 'grep -q "8.0.13" "$poly/ports/java/pom.xml" &&
 check "unlink repins the local tool" 'grep -q "\"metaobjects.cli\": { \"version\": \"1.0.13\"" "$poly/.config/dotnet-tools.json"'
 check "unlink removes every .mvn workaround" '[ ! -e "$poly/ports/java/.mvn" ] && [ ! -e "$poly/ports/kotlin/.mvn" ]'
 
+# ── R3: a pom.xml round trip is byte-identical when the pom lacked a trailing newline, and
+# `link`/`unlink` only report "repinned" for a pom whose own text actually changed ─────────
+# The parent declares the <metaobjects.version> property; the module only ever REFERENCES it
+# via ${metaobjects.version} — nothing in the module's own text should ever be rewritten, and
+# neither file ends in a newline (the shape an adopter's six real poms were in).
+mvnproj="$WORK/mvnproj"
+mkdir -p "$mvnproj/app"
+printf '%s' '<project>
+  <packaging>pom</packaging>
+  <modules><module>app</module></modules>
+  <properties><metaobjects.version>8.0.10</metaobjects.version></properties>
+</project>' > "$mvnproj/pom.xml"
+printf '%s' '<project>
+  <dependencies>
+    <dependency>
+      <groupId>com.metaobjects</groupId>
+      <artifactId>metaobjects-om</artifactId>
+      <version>${metaobjects.version}</version>
+    </dependency>
+  </dependencies>
+</project>' > "$mvnproj/app/pom.xml"
+check "the fixture poms have no trailing newline" \
+  '[ "$(tail -c1 "$mvnproj/pom.xml" | wc -l)" = 0 ] && [ "$(tail -c1 "$mvnproj/app/pom.xml" | wc -l)" = 0 ]'
+git init -q "$mvnproj"
+git -C "$mvnproj" add -A && git -C "$mvnproj" commit -q -m init
+cp "$mvnproj/pom.xml" "$WORK/pom.xml.orig"
+cp "$mvnproj/app/pom.xml" "$WORK/app-pom.xml.orig"
+
+if MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
+     bash "$LINK" link --project "$mvnproj" --version 1.1.0-rc.4 >"$WORK/out" 2>&1
+then pass "link succeeds on the no-trailing-newline pom fixture"
+else fail "link failed: $(tail -5 "$WORK/out")"
+fi
+check "link reports the root pom (its property changed) as repinned" \
+  'grep -q "repinned com.metaobjects dependencies to 8.1.0-rc.4 in pom.xml (via <metaobjects.version>)" "$WORK/out"'
+check "link does NOT report the module pom as repinned (only its parent's property changed)" \
+  '! grep -q "in app/pom.xml" "$WORK/out"'
+
+MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
+  bash "$LINK" unlink --project "$mvnproj" --to 1.0.10 >"$WORK/out" 2>&1 || true
+check "unlink does NOT report the module pom as repinned either" '! grep -q "in app/pom.xml" "$WORK/out"'
+check "the round trip leaves the root pom byte-identical" 'cmp -s "$WORK/pom.xml.orig" "$mvnproj/pom.xml"'
+check "the round trip leaves the module pom byte-identical" 'cmp -s "$WORK/app-pom.xml.orig" "$mvnproj/app/pom.xml"'
+check "git status on the poms is clean after the round trip" \
+  '[ -z "$(git -C "$mvnproj" status --porcelain -- pom.xml app/pom.xml)" ]'
+
+# ── R4: detect-prerelease-pins.sh flags a stale pre-release agent context ──────────────
+# `meta init --refresh-docs` (and `meta init` generally) stamp the running CLI's own
+# version into "generatedBy" in .metaobjects/.agent-context.json, a file meant to be
+# committed and tracked. Run with a pre-release CLI, that stamp is a pre-release
+# version, and before this fix the detector said nothing about it at all: "no
+# private-registry config and no pre-release pin" on a tree that plainly had one.
+DETECT="$WORK/tool/detect-prerelease-pins.sh"
+ctxproj="$WORK/agent-context-proj"
+mkdir -p "$ctxproj/.metaobjects"
+cat > "$ctxproj/.metaobjects/.agent-context.json" <<'JSON'
+{
+  "version": 1,
+  "generatedBy": "1.1.0-rc.4",
+  "servers": ["java"],
+  "clients": [],
+  "files": {}
+}
+JSON
+if bash "$DETECT" "$ctxproj" >"$WORK/ctx-out" 2>&1; then
+  fail "detect-prerelease-pins passes a tree whose agent context was generated by a pre-release CLI"
+else
+  pass "detect-prerelease-pins fails a tree whose agent context was generated by a pre-release CLI"
+fi
+check "it names the pre-release agent-context check" 'grep -q "agent context was generated by a pre-release CLI" "$WORK/ctx-out"'
+check "it names the stamped version" 'grep -q "1.1.0-rc.4" "$WORK/ctx-out"'
+check "it points at the release-CLI refresh command, not the registry unlink command" \
+  'grep -q "meta init --refresh-docs --docs-only" "$WORK/ctx-out" && ! grep -q "prerelease-link.sh unlink" "$WORK/ctx-out"'
+
+# A RELEASED generatedBy must not be flagged — the check is on the pre-release suffix,
+# never on the key's mere presence.
+cat > "$ctxproj/.metaobjects/.agent-context.json" <<'JSON'
+{
+  "version": 1,
+  "generatedBy": "1.1.0",
+  "servers": ["java"],
+  "clients": [],
+  "files": {}
+}
+JSON
+if bash "$DETECT" "$ctxproj" >"$WORK/ctx-out-release" 2>&1; then
+  pass "detect-prerelease-pins passes a tree whose agent context was generated by a RELEASE CLI"
+else
+  fail "detect-prerelease-pins failed a release-generated agent context: $(tail -5 "$WORK/ctx-out-release")"
+fi
+
 [ "$fails" -eq 0 ] || { echo "$fails failure(s)" >&2; exit 1; }
 echo "all prerelease-link tests passed"

From 3a43b743d027d4f109fdfbb69be91adf6628ef2b Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 03:31:12 -0400
Subject: [PATCH 2/8] no-mistakes(review): Fix docs-only prompt gate, ui.md
 opt-out, shared-exclude unlink

---
 CHANGELOG.md                                  | 14 +++--
 .../references/typescript-docs.md             |  2 +-
 .../migrations/docs-are-generators.md         |  8 ++-
 docs/features/prerelease.md                   |  4 +-
 .../references/typescript-docs.md             |  2 +-
 .../references/typescript-docs.md             |  2 +-
 .../src/generators/agent-docs-file.ts         | 14 +++--
 .../codegen-ts/src/metaobjects-config.ts      |  7 ++-
 .../codegen-ts/src/prompt-generator-gate.ts   | 14 ++---
 .../codegen-ts/src/reference/agent-docs.ts    | 14 +++--
 .../packages/codegen-ts/src/runner.ts         | 25 ++++++---
 .../test/metaobjects-config.test.ts           |  2 +-
 .../test/prompt-generator-gate.test.ts        | 46 +++++++++++++++-
 .../test/runner-docs-generators.test.ts       | 34 ++++++++++++
 tools/prerelease/prerelease-link.sh           | 55 +++++++++++++++----
 tools/prerelease/test-prerelease-link.sh      | 36 ++++++++++--
 16 files changed, 218 insertions(+), 61 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4351919d7..957c13373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,10 +80,12 @@ database does not have.
   writes code, and it says the value objects were emitted only when `entityFile()` (or another
   entity-module generator) ran. Found by an adopter on 1.1.0-rc.4.
 - **`agentDocsFile()` says when it skips `agent/ui.md`.** The page is written only when the run
-  lists a client UI generator or the generator is given `includeUiTier: true`, and before this
-  a project whose UI is generated by a separate config lost the page with no message. `meta
-  gen` now warns `agent/ui.md not written: no client UI generator in this run; set
-  includeUiTier: true if another config generates the UI.`, and the option is documented in
+  lists a client UI generator or the config sets `includeUiTier: true`, and before this a
+  project whose UI is generated by a separate config lost the page with no message. When the
+  config leaves `includeUiTier` unset, `meta gen` now warns `agent/ui.md not written: no client
+  UI generator in this run; set includeUiTier: true if another config generates the UI, or
+  includeUiTier: false if there is no UI.` A project with no UI anywhere sets `includeUiTier:
+  false`, which skips the page without the warning. Both settings are documented in
   `docs/features/migrations/docs-are-generators.md`. Found by an adopter on 1.1.0-rc.4.
 - **A pre-release CLI's version in `.metaobjects/.agent-context.json` is caught.** `meta init`
   stamps the running CLI's version into that committed file's `generatedBy`; run with a release
@@ -100,7 +102,9 @@ database does not have.
 - **`prerelease-link unlink` removes the git exclude lines `link` added.** `link` appended its
   ignore rules as bare lines to the clone's shared `info/exclude`, and `unlink` left them there.
   They now sit in one managed block, which `unlink` removes without touching a line the user
-  wrote, and a repeated `link` does not add them twice.
+  wrote, and a repeated `link` does not add them twice. The file is shared by every worktree
+  of the clone, so an entry another linked worktree still needs stays until that worktree is
+  unlinked.
 - `verify --codegen` (Python, C#) says when the committed output was generated with another
   column rule, another table rule, or both, and names the `naming` setting that reproduces it,
   instead of advising a regeneration that would commit the wrong column or table names.
diff --git a/agent-context/skills/metaobjects-codegen/references/typescript-docs.md b/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
index 07e6a361f..477959e31 100644
--- a/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/agent-context/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model and `includeUiTier` unset prints an advisory naming `includeUiTier`; `includeUiTier: false` says there is no UI anywhere and skips it without one) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/docs/features/migrations/docs-are-generators.md b/docs/features/migrations/docs-are-generators.md
index 6c1d7b3db..496069d91 100644
--- a/docs/features/migrations/docs-are-generators.md
+++ b/docs/features/migrations/docs-are-generators.md
@@ -145,7 +145,7 @@ them only if you ran those flags.
 |---|---|
 | `docs.outDir`, `--out` (default `./docs/generated`) | `targets.docs.outDir` |
 | `docs.layout`, `--layout` | `targets.docs.outputLayout` (falls back to the top-level `outputLayout`, as 1.0 did) |
-| `docs.surfaces`, `--model` / `--api` / `--requirements` / `--agent` | which factories you list: `docsFile()`, `apiDocsFile()`, `requirementsFile()`, `agentDocsFile()`. `--agent` wrote all three agent pages unconditionally; `agentDocsFile()` writes `agent/ui.md` only when the run also lists a client UI generator (a form, a hook, a grid or its columns) or the config sets `includeUiTier: true` — see "Things that are different in 1.1.0" |
+| `docs.surfaces`, `--model` / `--api` / `--requirements` / `--agent` | which factories you list: `docsFile()`, `apiDocsFile()`, `requirementsFile()`, `agentDocsFile()`. `--agent` wrote all three agent pages unconditionally; `agentDocsFile()` writes `agent/ui.md` only when the run also lists a client UI generator (a form, a hook, a grid or its columns) or the config sets `includeUiTier: true`; with `includeUiTier` unset it warns when it skips the page, and `includeUiTier: false` (no UI anywhere) skips it quietly — see "Things that are different in 1.1.0" |
 | `docs.apiSurfaces` | `docsFile({ apiSurfaces })`, same shape. Leave it out when the only api pages are this project's own: the model pages then link to whatever `apiDocsFile()` writes to the same target |
 | the `subDir` of the `ts` entry in `docs.apiSurfaces` (default `api`) | `apiDocsFile({ subDir })`, same default |
 | `docs.baseUrl`, `--base-url` | none: 1.0 read it nowhere. To link each api page to model pages hosted elsewhere, use `apiDocsFile({ modelBaseUrl })` |
@@ -178,8 +178,10 @@ them only if you ran those flags.
   whether a UI is emitted is a generator fact, not a metadata one. A **docs-only** config
   — one whose own `generators` lists no UI generator because a separate config generates
   the UI — never sees that generator, so set `includeUiTier: true` to write the page
-  anyway. When the model has a UI surface but the page is skipped, `meta gen` prints an
-  advisory naming `includeUiTier: true` rather than exiting silently.
+  anyway. When the model has a UI surface, the page is skipped and the config leaves
+  `includeUiTier` unset, `meta gen` prints an advisory naming `includeUiTier: true` rather
+  than exiting silently. A project with no UI anywhere (a server-only backend) sets
+  `includeUiTier: false`, which skips the page without the advisory.
 
 **Scripts and CI.** Replace `meta docs` with `meta gen`, and `meta verify --docs` with
 `meta verify --codegen`. To write only the documentation, name the docs entries:
diff --git a/docs/features/prerelease.md b/docs/features/prerelease.md
index dd915c4b5..21faecaff 100644
--- a/docs/features/prerelease.md
+++ b/docs/features/prerelease.md
@@ -171,7 +171,9 @@ the project's `.git/info/exclude`, which is local and not committed — in a lin
 worktree this is the *shared* exclude file in the clone's common dir (git has no
 per-worktree exclude), so the paths `link` adds there live inside their own managed block
 too: `unlink` removes exactly that block, never a line a user added to the file by hand,
-and a repeated `link` does not duplicate it. Files that *are* tracked by definition
+and a repeated `link` does not duplicate it. An entry that another worktree of the same
+clone still needs, because its own managed file is still linked, stays until that worktree
+is unlinked too. Files that *are* tracked by definition
 (`pyproject.toml`, `pom.xml`) get a loud warning instead — there is no way to make an edit
 to a tracked file uncommittable, which is precisely why the detector in §5 exists.
 
diff --git a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
index 07e6a361f..477959e31 100644
--- a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model and `includeUiTier` unset prints an advisory naming `includeUiTier`; `includeUiTier: false` says there is no UI anywhere and skips it without one) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
index 07e6a361f..477959e31 100644
--- a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
+++ b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-codegen/references/typescript-docs.md
@@ -21,7 +21,7 @@ generate, docs included). Each factory is an ordinary entry in `generators`, fro
 | `docsFile()` | `docs` | the neutral model surface — one page per entity and per template (`<Entity>.md`, `<Template>.md`), plus an overview with the whole-model ER diagram. Options: `apiSurfaces`, `templates`. |
 | `apiDocsFile()` | `api-docs` | the api reference — `api/<Entity>.md`, `api/README.md`, `api/AGENT-API.md`: the concrete imports, signatures, payload field shapes and runnable examples for THIS project's generated code. Options: `subDir` (default `api`), `modelBaseUrl`. |
 | `requirementsFile()` | `requirements` | the declared `requirement.*` ledger, each entry headed by its dotted path and `title`. Writes nothing for a model with no `requirement.*` node. |
-| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model prints an advisory naming `includeUiTier`) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
+| `agentDocsFile()` | `agent-docs` | `agent/schema.md`, `agent/ui.md` (only when the run also lists a client-tier generator, OR the config sets `includeUiTier: true` — the escape hatch for a docs-only config whose UI is generated by a separate config; skipping it with a UI surface in the model and `includeUiTier` unset prints an advisory naming `includeUiTier`; `includeUiTier: false` says there is no UI anywhere and skips it without one) and `agent/requirements.md` — the three `agent/` pages the always-on pointer reads before touching a tier. |
 | `metamodelDocsFile()` | `metamodel-docs` | the built-in vocabulary reference, under `metamodel/` (was `meta docs --metamodel`). |
 | `docsSiteFile()` | `docs-site` | an HTML site under `site/` (was `meta docs --site`). Option: `prompts`. `meta eject docs-site` copies its templates and assets to `codegen/docs-site/` (was `meta docs --scaffold-site`). |
 
diff --git a/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts b/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
index b330abe04..e4a6a42d9 100644
--- a/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
+++ b/server/typescript/packages/codegen-ts/src/generators/agent-docs-file.ts
@@ -314,14 +314,16 @@ export const agentDocsFile = function agentDocsFile(opts?: AgentDocsFileOpts): G
         if (ui !== "") {
           if (ctx.config.includeUiTier === true) {
             files.push({ path: `${dir}/ui.md`, content: ui });
-          } else {
+          } else if (ctx.config.includeUiTierExplicit !== true) {
             // The model HAS a UI surface (renderAgentUiPage returned content) but this
-            // run has no client UI generator and no `includeUiTier: true` override, so the
-            // page is skipped. Before this, that was silent: `meta gen` exited 0 and listed
-            // only the pages it wrote, and a docs-only project (its own config generates no
-            // UI; a SEPARATE config does) lost `agent/ui.md` with no signal at all.
+            // run has no client UI generator and the config left `includeUiTier` unset, so
+            // the page is skipped. Before this, that was silent: `meta gen` exited 0 and
+            // listed only the pages it wrote, and a docs-only project (its own config
+            // generates no UI; a SEPARATE config does) lost `agent/ui.md` with no signal at
+            // all. An explicit `includeUiTier: false` says there is no UI anywhere, so a
+            // server-only project has a way to say so and is not advised on every run.
             ctx.warn(
-              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI.`,
+              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI, or includeUiTier: false if there is no UI.`,
             );
           }
         }
diff --git a/server/typescript/packages/codegen-ts/src/metaobjects-config.ts b/server/typescript/packages/codegen-ts/src/metaobjects-config.ts
index 67b937891..995951f78 100644
--- a/server/typescript/packages/codegen-ts/src/metaobjects-config.ts
+++ b/server/typescript/packages/codegen-ts/src/metaobjects-config.ts
@@ -77,6 +77,11 @@ export interface ResolvedGenConfig {
    *  `agent/ui.md` reads this to decide whether a UI tier exists to describe;
    *  a metadata predicate can only say a UI *could* be generated. Undefined ⇒ false. */
   includeUiTier?: boolean;
+  /** Whether `includeUiTier` came from the config rather than from the marker
+   *  aggregation. An explicit `false` means "no UI anywhere", so `agent/ui.md` skips the
+   *  page without advising; an unset key that resolved to `false` still advises.
+   *  Set by the runner only. Undefined ⇒ false. */
+  includeUiTierExplicit?: boolean;
   /**
    * FR-019 / ADR-0026: the module specifier from which an externally-PROVIDED
    * shared enum (`@provided: true` on an abstract package-level `field.enum`) is
@@ -104,7 +109,7 @@ export const DEFAULT_EXT_STYLE: ExtStyle = "js";
  * fills inert defaults when they are absent AND the model emits no DB artifacts, and
  * throws a clear error when they are absent but the model DOES emit DB code (#194).
  */
-export interface MetaobjectsGenConfig extends Omit<ResolvedGenConfig, "dbImport" | "dialect" | "extStyle" | "routesExpose"> {
+export interface MetaobjectsGenConfig extends Omit<ResolvedGenConfig, "dbImport" | "dialect" | "extStyle" | "routesExpose" | "includeUiTierExplicit"> {
   dbImport?: string;
   dialect?: Dialect;
   /** Import-specifier suffix in generated code. Defaults to `"js"` (`./x.js`), which is
diff --git a/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts b/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
index 4d4340c9b..e33161fd3 100644
--- a/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
+++ b/server/typescript/packages/codegen-ts/src/prompt-generator-gate.ts
@@ -40,16 +40,16 @@ const PROMPT_GENERATOR_NAMES: ReadonlySet<string> = new Set([
 export function warnMissingPromptGenerators(
   root: MetaData,
   generators: readonly Generator[],
-  isDocsTarget: (g: Generator) => boolean,
+  writesDocs: (g: Generator) => boolean,
   warn: (msg: string) => void,
 ): void {
   // A run that lists no generator at all, or where every listed generator writes
-  // documentation (its RESOLVED output target — the same per-generator signal
-  // runner.ts's targetOf() uses to place output, not a name match), emitted no code of
-  // any kind. There is nothing for a prompt generator to be missing FROM: telling such a
-  // run to add promptRender() is wrong advice (it would add TypeScript render code to a
-  // project that only writes documentation), so the gate does not fire.
-  if (generators.length === 0 || generators.every(isDocsTarget)) return;
+  // documentation (runner.ts decides that from the generator's registry layer, so a docs
+  // generator on a custom target still counts), emitted no code of any kind. There is
+  // nothing for a prompt generator to be missing FROM: telling such a run to add
+  // promptRender() is wrong advice (it would add TypeScript render code to a project that
+  // only writes documentation), so the gate does not fire.
+  if (generators.length === 0 || generators.every(writesDocs)) return;
   if (generators.some((g) => PROMPT_GENERATOR_NAMES.has(g.name))) return;
 
   // ADR-0039: resolving children — a template may arrive through an overlay or extends.
diff --git a/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts b/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
index 173cdd2b3..ec7d6c7d5 100644
--- a/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
+++ b/server/typescript/packages/codegen-ts/src/reference/agent-docs.ts
@@ -325,14 +325,16 @@ export const agentDocsFile = function agentDocsFile(opts?: AgentDocsFileOpts): G
         if (ui !== "") {
           if (ctx.config.includeUiTier === true) {
             files.push({ path: `${dir}/ui.md`, content: ui });
-          } else {
+          } else if (ctx.config.includeUiTierExplicit !== true) {
             // The model HAS a UI surface (renderAgentUiPage returned content) but this
-            // run has no client UI generator and no `includeUiTier: true` override, so the
-            // page is skipped. Before this, that was silent: `meta gen` exited 0 and listed
-            // only the pages it wrote, and a docs-only project (its own config generates no
-            // UI; a SEPARATE config does) lost `agent/ui.md` with no signal at all.
+            // run has no client UI generator and the config left `includeUiTier` unset, so
+            // the page is skipped. Before this, that was silent: `meta gen` exited 0 and
+            // listed only the pages it wrote, and a docs-only project (its own config
+            // generates no UI; a SEPARATE config does) lost `agent/ui.md` with no signal at
+            // all. An explicit `includeUiTier: false` says there is no UI anywhere, so a
+            // server-only project has a way to say so and is not advised on every run.
             ctx.warn(
-              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI.`,
+              `${dir}/ui.md not written: no client UI generator in this run; set includeUiTier: true if another config generates the UI, or includeUiTier: false if there is no UI.`,
             );
           }
         }
diff --git a/server/typescript/packages/codegen-ts/src/runner.ts b/server/typescript/packages/codegen-ts/src/runner.ts
index 8d67a1f5e..ce6eadc2f 100644
--- a/server/typescript/packages/codegen-ts/src/runner.ts
+++ b/server/typescript/packages/codegen-ts/src/runner.ts
@@ -549,11 +549,12 @@ export async function runGen(opts: RunGenOpts): Promise<RunGenResult> {
   const catalog = opts.catalog ?? generatorRegistry;
   const stableNames = stableNameIndex(catalog);
   const targets = config.targets;
+  // A documentation generator is known by its registry layer, so an owned copy that sets
+  // no `target` (a 1.0 copy) writes to the `docs` target as the packaged factory does.
+  const isDocsGenerator = (g: Generator): boolean =>
+    catalog[stableNames.get(g.name) ?? ""]?.layer === "docs";
   const targetOf = (g: Generator): ResolvedTarget => {
-    // A documentation generator is known by its registry layer, so an owned copy that sets
-    // no `target` (a 1.0 copy) writes to the `docs` target as the packaged factory does.
-    const isDocs = catalog[stableNames.get(g.name) ?? ""]?.layer === "docs";
-    const name = g.target ?? (isDocs ? DOCS_TARGET_NAME : DEFAULT_TARGET_NAME);
+    const name = g.target ?? (isDocsGenerator(g) ? DOCS_TARGET_NAME : DEFAULT_TARGET_NAME);
     const t = targets[name];
     if (!t && name === DOCS_TARGET_NAME) {
       // ADR-0034 Amendment 9: documentation is never written into the code's output
@@ -650,6 +651,7 @@ export async function runGen(opts: RunGenOpts): Promise<RunGenResult> {
   // includeHonoRoutes — the page asks "is this surface in the run?", never "does it
   // land in my target?".
   const includeUiTier = config.includeUiTier ?? runEmitsUiTier(config.generators);
+  const includeUiTierExplicit = config.includeUiTier !== undefined;
 
   // The `expose` option each routes surface was built with, so the api reference lists only
   // the verbs the routes files mount. Run-scoped, read off the whole declared list.
@@ -677,11 +679,15 @@ export async function runGen(opts: RunGenOpts): Promise<RunGenResult> {
   // this, said nothing — while `meta verify` reported the template "clean". See
   // prompt-generator-gate.ts. Self-extinguishing; warning only.
   //
-  // `(g) => targetOf(g).name === DOCS_TARGET_NAME` is the same per-generator signal
-  // targetOf() itself resolves output against — not a name match — so a docs-only run
-  // (every listed generator resolving to the `docs` target) is correctly read as having
-  // emitted no code at all.
-  warnMissingPromptGenerators(root, config.generators, (g) => targetOf(g).name === DOCS_TARGET_NAME, (m) => warnings.push(m));
+  // A generator writes documentation when its registry layer says so, wherever its
+  // `target` points (`docsFile({ target: "site" })` is still documentation), or when it
+  // writes to the `docs` target. A run of only those emitted no code at all.
+  warnMissingPromptGenerators(
+    root,
+    config.generators,
+    (g) => isDocsGenerator(g) || targetOf(g).name === DOCS_TARGET_NAME,
+    (m) => warnings.push(m),
+  );
   warnUnmarkedUiGenerators(config.generators, (m) => warnings.push(m));
 
   // Codegen is opt-in, so `meta gen` is the post-selection audit: the two ways a legal
@@ -822,6 +828,7 @@ export async function runGen(opts: RunGenOpts): Promise<RunGenResult> {
         includeHonoRoutes,
         includeNames: namesTargets.has(selfTarget.name),
         includeUiTier,
+        includeUiTierExplicit,
         ...(routesExpose !== undefined && { routesExpose }),
       },
       renderContext,
diff --git a/server/typescript/packages/codegen-ts/test/metaobjects-config.test.ts b/server/typescript/packages/codegen-ts/test/metaobjects-config.test.ts
index df3e483d2..7ce4198ce 100644
--- a/server/typescript/packages/codegen-ts/test/metaobjects-config.test.ts
+++ b/server/typescript/packages/codegen-ts/test/metaobjects-config.test.ts
@@ -70,7 +70,7 @@ describe("defineConfig", () => {
   test("type-level: MetaobjectsGenConfig embeds ResolvedGenConfig's non-DB fields exactly (#194 — dbImport/dialect are OPTIONAL here, filled by the runner)", () => {
     // Everything except dbImport/dialect matches ResolvedGenConfig field-for-field.
     expectTypeOf<Pick<MetaobjectsGenConfig, "outDir" | "outputLayout" | "includeHonoRoutes" | "includeNames" | "includeUiTier" | "providedEnumModule">>()
-      .toEqualTypeOf<Omit<ResolvedGenConfig, "dbImport" | "dialect" | "extStyle" | "routesExpose">>();
+      .toEqualTypeOf<Omit<ResolvedGenConfig, "dbImport" | "dialect" | "extStyle" | "routesExpose" | "includeUiTierExplicit">>();
     // extStyle is OPTIONAL too: the config `meta init` scaffolds omits it and must still
     // typecheck; the runner fills DEFAULT_EXT_STYLE.
     expectTypeOf<MetaobjectsGenConfig["extStyle"]>().toEqualTypeOf<ExtStyle | undefined>();
diff --git a/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts b/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
index f433fb505..661f03610 100644
--- a/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
+++ b/server/typescript/packages/codegen-ts/test/prompt-generator-gate.test.ts
@@ -13,10 +13,15 @@
 // Follows the `layout.dataGrid` precedent (#287): tell the adopter at `meta gen` time,
 // warning only, and self-extinguishing so a deliberate choice is never nagged.
 
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect, beforeEach, afterEach } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { MetaDataLoader, InMemoryStringSource } from "@metaobjectsdev/metadata";
 import type { Generator } from "../src/generator.js";
 import { warnMissingPromptGenerators } from "../src/prompt-generator-gate.js";
+import { runGen } from "../src/runner.js";
+import { docsFile } from "../src/generators/index.js";
 
 const MODEL = {
   "metadata.root": {
@@ -66,10 +71,10 @@ function collect(
   generators: Generator[],
   // Defaults to "nothing in this suite writes to the docs target" — the behaviour of
   // every pre-R1 test, none of which modeled a docs-only run.
-  isDocsTarget: (g: Generator) => boolean = () => false,
+  writesDocs: (g: Generator) => boolean = () => false,
 ): string[] {
   const out: string[] = [];
-  warnMissingPromptGenerators(root, generators, isDocsTarget, (m) => out.push(m));
+  warnMissingPromptGenerators(root, generators, writesDocs, (m) => out.push(m));
   return out;
 }
 
@@ -157,3 +162,38 @@ describe("A3 — declared prompts with no prompt generator wired", () => {
     expect(warnings[0]).toContain("were emitted regardless");
   });
 });
+
+// The runner decides which generators write documentation. A docs-only config is silent
+// whether its docs generator writes to the default `docs` target or to one the project
+// named itself, because `docsFile()` emits documentation either way.
+describe("A3 — the runner reads a docs-only config as emitting no code", () => {
+  let tmp: string;
+  beforeEach(() => { tmp = mkdtempSync(join(tmpdir(), "prompt-gate-docs-only-")); });
+  afterEach(() => { rmSync(tmp, { recursive: true, force: true }); });
+
+  async function promptWarnings(generators: Generator[], targetName: string): Promise<string[]> {
+    const result = await runGen({
+      config: {
+        outDir: join(tmp, "src"), extStyle: "none", dbImport: "../db", dialect: "sqlite",
+        targets: { [targetName]: { outDir: join(tmp, targetName) } },
+        generators,
+      },
+      metadata: await loadRoot(),
+      projectRoot: tmp,
+    });
+    return result.warnings.filter((w) => w.includes("promptRender()"));
+  }
+
+  test("silent for docsFile() on the default docs target", async () => {
+    expect(await promptWarnings([docsFile()], "docs")).toEqual([]);
+  });
+
+  test("silent for docsFile() on a custom-named target", async () => {
+    expect(await promptWarnings([docsFile({ target: "site" })], "site")).toEqual([]);
+  });
+
+  test("still warns when a code generator writes to the default target beside it", async () => {
+    const warnings = await promptWarnings([docsFile({ target: "site" }), gen("entity-file")], "site");
+    expect(warnings).toHaveLength(1);
+  });
+});
diff --git a/server/typescript/packages/codegen-ts/test/runner-docs-generators.test.ts b/server/typescript/packages/codegen-ts/test/runner-docs-generators.test.ts
index f927c6807..5638e49ef 100644
--- a/server/typescript/packages/codegen-ts/test/runner-docs-generators.test.ts
+++ b/server/typescript/packages/codegen-ts/test/runner-docs-generators.test.ts
@@ -129,3 +129,37 @@ describe("documentation generators under meta gen (ADR-0034 Amendment 9)", () =>
     expect(DEFAULT_DOCS_DIR).toBe("./docs/generated");
   });
 });
+
+// R2: `agent/ui.md` is written when the run has a client UI generator or the config sets
+// `includeUiTier: true`. Otherwise it is skipped, and the skip is never silent unless the
+// config says there is no UI anywhere (`includeUiTier: false`), which a server-only
+// project needs so it is not advised on every run.
+describe("agent/ui.md and the includeUiTier key under meta gen", () => {
+  async function agentRun(includeUiTier?: boolean): Promise<{ written: boolean; advised: string[] }> {
+    const result = await runGen({
+      config: { ...base([agentDocsFile()]), ...(includeUiTier !== undefined && { includeUiTier }) },
+      metadata: root,
+      projectRoot: tmp,
+    });
+    return {
+      written: filesUnder(join(tmp, "docs")).includes("agent/ui.md"),
+      advised: result.warnings.filter((w) => w.includes("ui.md not written")),
+    };
+  }
+
+  test("unset with no UI generator: the page is skipped and the run says so", async () => {
+    const { written, advised } = await agentRun();
+    expect(written).toBe(false);
+    expect(advised).toHaveLength(1);
+    expect(advised[0]).toContain("includeUiTier: true");
+    expect(advised[0]).toContain("includeUiTier: false");
+  });
+
+  test("true: the page is written and nothing is advised", async () => {
+    expect(await agentRun(true)).toEqual({ written: true, advised: [] });
+  });
+
+  test("false: no page, and nothing is advised", async () => {
+    expect(await agentRun(false)).toEqual({ written: false, advised: [] });
+  });
+});
diff --git a/tools/prerelease/prerelease-link.sh b/tools/prerelease/prerelease-link.sh
index 6798d47bb..69e0fbc37 100755
--- a/tools/prerelease/prerelease-link.sh
+++ b/tools/prerelease/prerelease-link.sh
@@ -237,7 +237,7 @@ exclude_block_lines() {  # exclude_block_lines <file>
 # and a repeated `link` is idempotent — a path already in the block is left alone no matter
 # how many install roots or `link` runs ask for it.
 local_exclude() {  # local_exclude <relative-path>
-  local rel="$1" ex prefix line linesfile
+  local rel="$1" ex prefix line
   ex="$(exclude_file)"
   [ -n "$ex" ] || return 0
   # Exclude patterns are relative to the repository root, and $PROJECT may be a subdirectory.
@@ -246,13 +246,34 @@ local_exclude() {  # local_exclude <relative-path>
   [ -f "$ex" ] || : > "$ex"
   line="$prefix$rel"
   exclude_block_lines "$ex" | grep -qxF "$line" && return 0
-  linesfile="$(mktemp)"
-  { exclude_block_lines "$ex"; printf '%s\n' "$line"; } > "$linesfile"
+  set_exclude_block "$ex" "$(exclude_block_lines "$ex"; printf '%s\n' "$line")"
+}
+
+# Replace the managed block in the exclude file with these lines, one per line; with none,
+# the block is removed and nothing is written in its place.
+set_exclude_block() {  # set_exclude_block <exclude-file> <lines>
+  local ex="$1" lines="$2"
   strip_block "$ex" "$BEGIN" "$END"
+  [ -n "$lines" ] || return 0
   { [ -s "$ex" ] && { cat "$ex"; ends_in_newline "$ex" || echo; }
-    echo "$BEGIN"; cat "$linesfile"; echo "$END"
+    echo "$BEGIN"; printf '%s\n' "$lines"; echo "$END"
   } > "$ex.tmp" && mv "$ex.tmp" "$ex"
-  rm -f "$linesfile"
+}
+
+# The OTHER work trees of this clone, one path per line. They read the same exclude file, so
+# an entry one of them still needs must outlive this work tree's `unlink`.
+other_worktrees() {
+  local self
+  self="$(git -C "$PROJECT" rev-parse --show-toplevel 2>/dev/null)" || return 0
+  git -C "$PROJECT" worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p' | grep -vxF -- "$self" || true
+}
+
+# Whether a file is one `link` wrote and has not removed: it carries a managed marker, or, for
+# .mvn/maven.config, which has no room for one, the settings.xml written beside it does.
+is_managed_file() {  # is_managed_file <path>
+  local f="$1"
+  case "$f" in */.mvn/maven.config) f="${f%maven.config}settings.xml" ;; esac
+  [ -f "$f" ] && grep -qF -e "$BEGIN" -e "$XBEGIN" "$f"
 }
 
 # Refuse to report success while a file this script wrote could still be committed. The managed
@@ -437,7 +458,8 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
   # own property-reference guard, just below, means it never gsubs anything — `rep` is the
   # actual substitution count, not "did this pom mention com.metaobjects at all", so "repinned"
   # is reported only when something really changed (a module pinned entirely through its
-  # parent's property was once reported as repinned with nothing in the file touched).
+  # parent's property was once reported as repinned with nothing in the file touched). A line
+  # already at $mv is not counted either: the substitution matches it but leaves it unchanged.
   local had rep
   had="$(had_newline "$pom")"
   rep="$(awk -v grp="$MVN_GROUP" -v ver="$mv" '
@@ -453,7 +475,9 @@ repin_pom() {  # repin_pom <pom.xml> <maven version>
           # indirection the property branch above preserves: rewriting it to a literal would
           # cut the module off from its parent, and unlink would never put it back.
           if (ours[sp] && vline[sp] && L[vline[sp]] !~ /<version>[[:space:]]*\$\{/) {
-            if (gsub(/<version>[^<]*<\/version>/, "<version>" ver "</version>", L[vline[sp]])) rep++
+            was = L[vline[sp]]
+            gsub(/<version>[^<]*<\/version>/, "<version>" ver "</version>", L[vline[sp]])
+            if (L[vline[sp]] != was) rep++
           }
           sp--; continue
         }
@@ -828,9 +852,20 @@ run_detector() {
 # ── unlink ────────────────────────────────────────────────────────────────────────────
 unlink_all() {
   # The git-exclude block link() wrote — removed by identity, same as every other
-  # managed block, so a line a user added to info/exclude by hand survives untouched.
-  local ex; ex="$(exclude_file)"
-  [ -n "$ex" ] && strip_block "$ex" "$BEGIN" "$END"
+  # managed block, so a line a user added to info/exclude by hand survives untouched. The
+  # file is shared by every work tree of the clone, so an entry another work tree's managed
+  # file still needs stays: dropping it would let `git add -A` there stage an .npmrc that can
+  # hold a registry credential.
+  local ex line wt keep=""
+  ex="$(exclude_file)"
+  if [ -n "$ex" ]; then
+    while IFS= read -r line; do
+      while IFS= read -r wt; do
+        if is_managed_file "$wt/$line"; then keep+="$line"$'\n'; break; fi
+      done < <(other_worktrees)
+    done < <(exclude_block_lines "$ex")
+    set_exclude_block "$ex" "${keep%$'\n'}"
+  fi
   # Every root `link` could have written to, or a sub-project keeps a managed block
   # pointing at a registry that will not serve it once the pre-release is gone.
   local root
diff --git a/tools/prerelease/test-prerelease-link.sh b/tools/prerelease/test-prerelease-link.sh
index 534991e9b..f16328692 100755
--- a/tools/prerelease/test-prerelease-link.sh
+++ b/tools/prerelease/test-prerelease-link.sh
@@ -9,11 +9,13 @@
 #     stray is written into the work tree, and `link` refuses to report success while a written
 #     .npmrc (which can hold a registry credential) is not ignored. The exclude entries `link`
 #     adds live in one managed block, so `unlink` removes exactly that block (and nothing a
-#     user put in the file by hand), and a repeated `link` does not duplicate it.
+#     user put in the file by hand), and a repeated `link` does not duplicate it. Unlinking one
+#     worktree keeps an entry another linked worktree of the same clone still needs.
 # R3  a link/unlink round trip leaves a pom.xml that lacked a trailing newline byte-identical
 #     (the previous awk-based rewrites unconditionally added one), and `link`/`unlink` report
 #     "repinned ... in <file>" only for a pom whose own text actually changed — not a module
-#     pom that is pinned entirely through its parent's ${metaobjects.version} property.
+#     pom that is pinned entirely through its parent's ${metaobjects.version} property, nor for a
+#     literal-pinned pom that a second `link` at the same version leaves unchanged.
 # P4  a polyglot repository with one project per port and no root project files: every Maven
 #     and Python project is linked and repinned, and the .NET local tool manifest too.
 set -euo pipefail
@@ -105,11 +107,28 @@ check "the exclude entry still appears exactly once" '[ "$(grep -cxF .npmrc "$co
 check "the managed block still appears exactly once (one BEGIN line, one END line)" \
   '[ "$(grep -c "metaobjects prerelease (managed)" "$common/info/exclude")" = 2 ]'
 
-# D11: `unlink` must remove exactly the block `link` added, and nothing a user put in the
-# shared exclude file by hand.
+unlink_project() {  # unlink_project <project> -> runs unlink, output in $WORK/out
+  MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
+    bash "$LINK" unlink --project "$1" --to 1.0.13 >"$WORK/out" 2>&1 || true
+}
+
+# D11: the exclude file is shared by every work tree of the clone. Unlinking one work tree
+# while another is still linked must keep the entry the other one's .npmrc (which can hold a
+# registry credential) relies on.
+git -C "$WORK/main" worktree add -q "$WORK/wt3" -b linked3
+if link "$WORK/wt3"; then pass "link succeeds in a second linked worktree"; else fail "link in wt3 failed: $(tail -5 "$WORK/out")"; fi
+unlink_project "$WORK/wt"
+check "unlinking one worktree removes its own .npmrc" '[ ! -f "$WORK/wt/.npmrc" ]'
+check "the other worktree's .npmrc is still written" '[ -f "$WORK/wt3/.npmrc" ]'
+check "the other worktree's .npmrc is still ignored by git" 'git -C "$WORK/wt3" check-ignore -q -- .npmrc'
+check "git status in the other worktree shows no .npmrc" '! git -C "$WORK/wt3" status --porcelain | grep -q "\.npmrc"'
+check "the entry stays once, inside the managed block" \
+  '[ "$(grep -cxF .npmrc "$common/info/exclude")" = 1 ] && [ "$(grep -c "metaobjects prerelease (managed)" "$common/info/exclude")" = 2 ]'
+
+# D11: `unlink` of the last linked work tree must remove exactly the block `link` added, and
+# nothing a user put in the shared exclude file by hand.
 printf 'a-users-own-rule\n' >> "$common/info/exclude"
-MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
-  bash "$LINK" unlink --project "$WORK/wt" --to 1.0.13 >"$WORK/out" 2>&1 || true
+unlink_project "$WORK/wt3"
 check "unlink removes the managed block from the shared exclude file" '! grep -q "metaobjects prerelease (managed)" "$common/info/exclude"'
 check "unlink removes the .npmrc entry it added" '! grep -qxF .npmrc "$common/info/exclude"'
 check "unlink leaves a user's own exclude rule alone" 'grep -qxF a-users-own-rule "$common/info/exclude"'
@@ -244,6 +263,11 @@ check "every metaobjects version in the pom is repinned, a plugin's after its co
 check "the package reference is repinned" 'grep -q "Version=\"1.1.0-rc.9\"" "$poly/ports/csharp/App.csproj"'
 check "the local tool manifest is repinned" 'grep -q "\"metaobjects.cli\": { \"version\": \"1.1.0-rc.9\"" "$poly/.config/dotnet-tools.json"'
 check "another tool in the manifest is left alone" 'grep -q "\"dotnet-ef\": { \"version\": \"8.0.0\"" "$poly/.config/dotnet-tools.json"'
+# R3: a second `link` at the same version changes no pom, so it reports no repin, a pom pinned
+# by a literal <version> included.
+if link "$poly"; then pass "a second polyglot link at the same version succeeds"; else fail "second polyglot link failed: $(tail -5 "$WORK/out")"; fi
+check "a second link at the same version reports no literal pom as repinned" \
+  '! grep -q "in ports/java/module/pom.xml" "$WORK/out" && ! grep -q "in ports/kotlin/pom.xml" "$WORK/out"'
 
 MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TOKEN="" \
   bash "$LINK" unlink --project "$poly" --to 1.0.13 >"$WORK/out" 2>&1 || true

From ece2f4d80c8ae0a574e0128c87a8676e2cd30344 Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 03:41:45 -0400
Subject: [PATCH 3/8] no-mistakes(review): Harden prerelease-link unlink and
 simplify report @via walk

---
 CHANGELOG.md                                  |  8 ++-
 docs/features/prerelease.md                   |  4 +-
 .../projection/extract-report-spec.test.ts    |  2 +-
 .../src/core/reporting/report-shape.ts        | 38 ++--------
 tools/prerelease/prerelease-link.sh           | 69 +++++++++++--------
 tools/prerelease/test-prerelease-link.sh      | 29 +++++++-
 6 files changed, 84 insertions(+), 66 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 957c13373..a200b75b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -97,14 +97,16 @@ database does not have.
   repins.** A `link` / `unlink` round trip added a final newline to a `pom.xml` that had none,
   so `git status` showed it modified, and both commands said "repinned ... in `app/pom.xml`"
   for a module pinned only through its parent's `${metaobjects.version}`. The rewrites keep a
-  file's final-newline state, and a repin is reported only for a file whose text changed.
+  file's final-newline state (`pom.xml`, and the blocks appended to `pyproject.toml` and
+  `.npmrc`), and a repin is reported only for a file whose text changed.
   Found by an adopter on 1.1.0-rc.4.
 - **`prerelease-link unlink` removes the git exclude lines `link` added.** `link` appended its
   ignore rules as bare lines to the clone's shared `info/exclude`, and `unlink` left them there.
   They now sit in one managed block, which `unlink` removes without touching a line the user
   wrote, and a repeated `link` does not add them twice. The file is shared by every worktree
-  of the clone, so an entry another linked worktree still needs stays until that worktree is
-  unlinked.
+  of the clone, so an entry that another linked worktree, or another project linked in the same
+  worktree, still needs stays until that one is unlinked. A `NuGet.config` that `link` wrote is
+  removed on `unlink` rather than left as a bare XML declaration.
 - `verify --codegen` (Python, C#) says when the committed output was generated with another
   column rule, another table rule, or both, and names the `naming` setting that reproduces it,
   instead of advising a regeneration that would commit the wrong column or table names.
diff --git a/docs/features/prerelease.md b/docs/features/prerelease.md
index 21faecaff..ecc18db0f 100644
--- a/docs/features/prerelease.md
+++ b/docs/features/prerelease.md
@@ -172,8 +172,8 @@ worktree this is the *shared* exclude file in the clone's common dir (git has no
 per-worktree exclude), so the paths `link` adds there live inside their own managed block
 too: `unlink` removes exactly that block, never a line a user added to the file by hand,
 and a repeated `link` does not duplicate it. An entry that another worktree of the same
-clone still needs, because its own managed file is still linked, stays until that worktree
-is unlinked too. Files that *are* tracked by definition
+clone, or another project linked in the same worktree, still needs stays until that one is
+unlinked too. Files that *are* tracked by definition
 (`pyproject.toml`, `pom.xml`) get a loud warning instead — there is no way to make an edit
 to a tracked file uncommittable, which is precisely why the detector in §5 exists.
 
diff --git a/server/typescript/packages/codegen-ts/test/projection/extract-report-spec.test.ts b/server/typescript/packages/codegen-ts/test/projection/extract-report-spec.test.ts
index ba9fc4314..de399d659 100644
--- a/server/typescript/packages/codegen-ts/test/projection/extract-report-spec.test.ts
+++ b/server/typescript/packages/codegen-ts/test/projection/extract-report-spec.test.ts
@@ -591,7 +591,7 @@ describe("extractReportSpec: refusals that name what is wrong", () => {
       value: () => root.objects().map((c) => (c.resolutionKey() === fromKey ? fromStub : c)),
     });
     expect(() => extractReportSpec(titles, rootStub, CTX)).toThrow(
-      /report 'ProgramTitles': dimension 'programTitle' @via 'Purchase.program.nowhere' cannot be joined at hop 'nowhere' on 'acme::shop::Program': it names no relationship or identity.reference/,
+      "report 'ProgramTitles': dimension 'programTitle' @via 'Purchase.program.nowhere' does not resolve.",
     );
   });
 
diff --git a/server/typescript/packages/metadata/src/core/reporting/report-shape.ts b/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
index bc0388da5..bede23a95 100644
--- a/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
+++ b/server/typescript/packages/metadata/src/core/reporting/report-shape.ts
@@ -158,34 +158,15 @@ function reportingViaTerminal(
   from: MetaObject,
   root: MetaRoot,
 ): MetaObject | undefined {
-  const walk = walkReportingVia(via, declaring, from, root);
-  return walk !== undefined && "terminal" in walk ? walk.terminal : undefined;
-}
-
-/**
- * {@link reportingViaTerminal}, saying where a walk stopped: `undefined` when the owner does
- * not resolve, else the terminal entity or the hop that failed, the entity it was looked up
- * on and why.
- */
-function walkReportingVia(
-  via: string,
-  declaring: MetaData,
-  from: MetaObject,
-  root: MetaRoot,
-): { terminal: MetaObject } | { hop: string; at: MetaObject; reason: string } | undefined {
   const hops = reportingViaHops(via, declaring, from, root);
   if (hops === undefined) return undefined;
   let current: MetaObject = from;
   for (const hop of hops) {
-    const step = resolveViaHop(current, hop, root);
-    if (step === undefined) return { hop, at: current, reason: "it names no relationship or identity.reference of that entity" };
-    if (step.target === undefined) {
-      const ref = step.hop.attr(step.isReference ? IDENTITY_REFERENCE_ATTR_REFERENCES : RELATIONSHIP_ATTR_OBJECT_REF);
-      return { hop, at: current, reason: `its target '${String(ref ?? "")}' does not resolve to an object` };
-    }
-    current = step.target;
+    const target = resolveViaHop(current, hop, root)?.target;
+    if (target === undefined) return undefined;
+    current = target;
   }
-  return { terminal: current };
+  return current;
 }
 
 /**
@@ -402,15 +383,8 @@ function dimensionField(
   if (dim === undefined) throw unresolved(reportName, `dimension '${item.name}' on '${from.name}'`);
   const via = dim.via();
   // A @via that does not walk is the @via's error, not the @of's (the @of resolves at its end).
-  if (via !== undefined) {
-    const walk = walkReportingVia(via, reportingMemberOwner(dim, from), from, root);
-    if (walk === undefined) throw unresolved(reportName, `dimension '${dim.name}' @via '${via}'`);
-    if (!("terminal" in walk)) {
-      throw new Error(
-        `report '${reportName}': dimension '${dim.name}' @via '${via}' cannot be joined at hop '${walk.hop}' ` +
-          `on '${walk.at.resolutionKey()}': ${walk.reason}.`,
-      );
-    }
+  if (via !== undefined && reportingViaTerminal(via, reportingMemberOwner(dim, from), from, root) === undefined) {
+    throw unresolved(reportName, `dimension '${dim.name}' @via '${via}'`);
   }
   const ref = resolveDimensionOf(dim, from, root);
   if (ref === undefined) throw unresolved(reportName, `dimension '${item.name}' @of`);
diff --git a/tools/prerelease/prerelease-link.sh b/tools/prerelease/prerelease-link.sh
index 69e0fbc37..f6f8aa824 100755
--- a/tools/prerelease/prerelease-link.sh
+++ b/tools/prerelease/prerelease-link.sh
@@ -197,6 +197,14 @@ finish_rewrite() {  # finish_rewrite <file> <tmpfile> <had 0|1>
   return 0
 }
 
+# The END marker of a block appended to a file, ending in a newline only when the file did
+# before the block was added (<had>, from `had_newline`). The newline that separates the
+# file's last line from the block is the one the block's END would otherwise carry, so
+# `strip_block` hands the file back with its own final-newline state.
+end_block() {  # end_block <had 0|1>
+  if [ "$1" = 1 ]; then echo "$END"; else printf '%s' "$END"; fi
+}
+
 # Remove a managed block from a file, leaving the rest byte-identical.
 strip_block() {  # strip_block <file> <begin> <end>
   local f="$1" b="$2" e="$3" had
@@ -260,12 +268,10 @@ set_exclude_block() {  # set_exclude_block <exclude-file> <lines>
   } > "$ex.tmp" && mv "$ex.tmp" "$ex"
 }
 
-# The OTHER work trees of this clone, one path per line. They read the same exclude file, so
-# an entry one of them still needs must outlive this work tree's `unlink`.
-other_worktrees() {
-  local self
-  self="$(git -C "$PROJECT" rev-parse --show-toplevel 2>/dev/null)" || return 0
-  git -C "$PROJECT" worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p' | grep -vxF -- "$self" || true
+# Every work tree of this clone, this one included, one path per line. They all read the same
+# exclude file, so an entry any of them still needs must outlive an `unlink`.
+worktrees() {
+  git -C "$PROJECT" worktree list --porcelain 2>/dev/null | sed -n 's/^worktree //p' || true
 }
 
 # Whether a file is one `link` wrote and has not removed: it carries a managed marker, or, for
@@ -656,18 +662,19 @@ link_npm() {
   # pre-release pin and no registry to resolve it from — `link` reported success and the
   # breakage surfaced later as `notarget` inside that sub-project. `check` already walked
   # nested roots; that asymmetry was the bug.
-  local wrote=0 root rel f written=()
+  local wrote=0 root rel f had written=()
   while IFS= read -r root; do
     f="$root/.npmrc"
     strip_block "$f" "$BEGIN" "$END"
     # A pre-existing .npmrc without its own trailing newline would otherwise run its last
     # line straight into the BEGIN marker text (`cat` and `echo "$BEGIN"` land on the same
     # line) — not just a cosmetic newline difference but real content corruption.
-    { if [ -f "$f" ]; then cat "$f"; ends_in_newline "$f" || echo; fi
+    had="$(had_newline "$f")"
+    { if [ -f "$f" ]; then cat "$f"; [ "$had" = 1 ] || echo; fi
       echo "$BEGIN"
       echo "$NPM_SCOPE:registry=$BASE/api/packages/$OWNER/npm/"
       [ -n "$auth" ] && echo "$auth"
-      echo "$END"; } > "$f.tmp" && mv "$f.tmp" "$f"
+      end_block "$had"; } > "$f.tmp" && mv "$f.tmp" "$f"
     rel="${f#"$PROJECT"/}"; [ "$rel" = "$f" ] && rel=".npmrc"
     if tracked "$rel"; then
       warn "$rel is TRACKED in this project — the managed block is committable. Remove it with 'unlink' before pushing."
@@ -697,14 +704,15 @@ link_npm() {
 }
 
 link_py() {
-  local root f n=0
+  local root f had n=0
   while IFS= read -r root; do
     f="$root/pyproject.toml"; n=$((n + 1))
     strip_block "$f" "$BEGIN" "$END"
+    had="$(had_newline "$f")"
     # `explicit = true` + [tool.uv.sources] is per-package index pinning: nothing resolves
     # from this index unless a source names it, so the rest of PyPI is untouched. pip's
     # --extra-index-url has no equivalent, which is why uv is the documented path.
-    { cat "$f"; echo; echo "$BEGIN"
+    { cat "$f"; [ "$had" = 1 ] || echo; echo "$BEGIN"
       echo '[[tool.uv.index]]'
       echo 'name = "metaobjects-prerelease"'
       echo "url = \"$BASE/api/packages/$OWNER/pypi/simple\""
@@ -712,7 +720,7 @@ link_py() {
       echo
       echo '[tool.uv.sources]'
       echo "$PY_DIST = { index = \"metaobjects-prerelease\" }"
-      echo "$END"; } > "$f.tmp" && mv "$f.tmp" "$f"
+      end_block "$had"; } > "$f.tmp" && mv "$f.tmp" "$f"
     say "linked ${f#"$PROJECT"/}"
   done < <(py_roots)
   if [ "$n" -eq 0 ]; then warn "no pyproject.toml — configure pip manually, or add one"; return 0; fi
@@ -851,27 +859,18 @@ run_detector() {
 
 # ── unlink ────────────────────────────────────────────────────────────────────────────
 unlink_all() {
-  # The git-exclude block link() wrote — removed by identity, same as every other
-  # managed block, so a line a user added to info/exclude by hand survives untouched. The
-  # file is shared by every work tree of the clone, so an entry another work tree's managed
-  # file still needs stays: dropping it would let `git add -A` there stage an .npmrc that can
-  # hold a registry credential.
-  local ex line wt keep=""
-  ex="$(exclude_file)"
-  if [ -n "$ex" ]; then
-    while IFS= read -r line; do
-      while IFS= read -r wt; do
-        if is_managed_file "$wt/$line"; then keep+="$line"$'\n'; break; fi
-      done < <(other_worktrees)
-    done < <(exclude_block_lines "$ex")
-    set_exclude_block "$ex" "${keep%$'\n'}"
-  fi
   # Every root `link` could have written to, or a sub-project keeps a managed block
   # pointing at a registry that will not serve it once the pre-release is gone.
   local root
   while IFS= read -r root; do strip_block "$root/.npmrc" "$BEGIN" "$END"; done < <(npm_install_roots)
   while IFS= read -r root; do strip_block "$root/pyproject.toml" "$BEGIN" "$END"; done < <(py_roots)
   strip_block "$PROJECT/NuGet.config"  "$XBEGIN" "$XEND"
+  # A NuGet.config `link` wrote is the XML declaration and the managed block, nothing else;
+  # what the strip leaves of it is not a valid config, so it goes. A user's own file, with a
+  # block added by hand, keeps everything outside the block.
+  if [ -f "$PROJECT/NuGet.config" ] && ! grep -v '^<?xml [^>]*?>$' "$PROJECT/NuGet.config" | grep -q '[^[:space:]]'; then
+    rm -f "$PROJECT/NuGet.config"
+  fi
   while IFS= read -r root; do
     strip_block "$root/pom.xml" "$XBEGIN" "$XEND"
     # The http-blocker workaround is a whole file we authored, not a block inside someone
@@ -887,6 +886,22 @@ unlink_all() {
       say "removed the .mvn http-blocker workaround in ${root#"$PROJECT"}"
     fi
   done < <(mvn_roots)
+  # The git-exclude block link() wrote — removed by identity, same as every other
+  # managed block, so a line a user added to info/exclude by hand survives untouched. The
+  # file is shared by every work tree of the clone and names paths from the repository root,
+  # so an entry a managed file still needs stays: one another work tree holds, or another
+  # project linked in this one. Dropping it would let `git add -A` stage an .npmrc that can
+  # hold a registry credential. This runs last, once this project's own files are gone.
+  local ex line wt keep=""
+  ex="$(exclude_file)"
+  if [ -n "$ex" ]; then
+    while IFS= read -r line; do
+      while IFS= read -r wt; do
+        if is_managed_file "$wt/$line"; then keep+="$line"$'\n'; break; fi
+      done < <(worktrees)
+    done < <(exclude_block_lines "$ex")
+    set_exclude_block "$ex" "${keep%$'\n'}"
+  fi
   say "removed managed registry config"
 }
 
diff --git a/tools/prerelease/test-prerelease-link.sh b/tools/prerelease/test-prerelease-link.sh
index f16328692..5a2f4ccee 100755
--- a/tools/prerelease/test-prerelease-link.sh
+++ b/tools/prerelease/test-prerelease-link.sh
@@ -10,7 +10,7 @@
 #     .npmrc (which can hold a registry credential) is not ignored. The exclude entries `link`
 #     adds live in one managed block, so `unlink` removes exactly that block (and nothing a
 #     user put in the file by hand), and a repeated `link` does not duplicate it. Unlinking one
-#     worktree keeps an entry another linked worktree of the same clone still needs.
+#     worktree or project keeps an entry another linked worktree or project still needs.
 # R3  a link/unlink round trip leaves a pom.xml that lacked a trailing newline byte-identical
 #     (the previous awk-based rewrites unconditionally added one), and `link`/`unlink` report
 #     "repinned ... in <file>" only for a pom whose own text actually changed — not a module
@@ -133,6 +133,27 @@ check "unlink removes the managed block from the shared exclude file" '! grep -q
 check "unlink removes the .npmrc entry it added" '! grep -qxF .npmrc "$common/info/exclude"'
 check "unlink leaves a user's own exclude rule alone" 'grep -qxF a-users-own-rule "$common/info/exclude"'
 
+# D11: two projects linked in ONE work tree share the block too, each entry named from the
+# repository root. Unlinking one keeps the entry the other's .npmrc still needs.
+multi="$WORK/multi"
+git init -q "$multi"
+mkdir -p "$multi/apps/web" "$multi/apps/api"
+for app in web api; do
+  printf '{ "name": "%s", "version": "1.0.0", "dependencies": { "@metaobjectsdev/metadata": "^1.0.0" } }\n' "$app" \
+    > "$multi/apps/$app/package.json"
+done
+git -C "$multi" add -A && git -C "$multi" commit -q -m init
+mcommon="$(git -C "$multi" rev-parse --git-common-dir)"
+case "$mcommon" in /*) ;; *) mcommon="$multi/$mcommon" ;; esac
+if link "$multi/apps/web" && link "$multi/apps/api"; then pass "link succeeds for two projects of one worktree"; else fail "link of two subprojects failed: $(tail -5 "$WORK/out")"; fi
+unlink_project "$multi/apps/web"
+check "unlinking one subproject removes its own .npmrc" '[ ! -f "$multi/apps/web/.npmrc" ]'
+check "unlinking one subproject drops its own exclude entry" '! grep -qxF apps/web/.npmrc "$mcommon/info/exclude"'
+check "the other subproject's .npmrc is still ignored by git" 'git -C "$multi" check-ignore -q -- apps/api/.npmrc'
+check "git status shows no .npmrc after one subproject is unlinked" '! git -C "$multi" status --porcelain | grep -q "\.npmrc"'
+unlink_project "$multi/apps/api"
+check "unlinking the last subproject removes the managed block" '! grep -q "metaobjects prerelease (managed)" "$mcommon/info/exclude"'
+
 # The assertion: an .npmrc git does not ignore makes link fail.
 git -C "$WORK/main" worktree add -q "$WORK/wt2" -b linked2
 # A global excludes file is not what we control, so defeat the ignore by negating it in .gitignore.
@@ -247,9 +268,11 @@ cat > "$poly/ports/csharp/.config/dotnet-tools.json" <<'JSON'
 { "version": 1, "isRoot": true, "tools": { "metaobjects.cli": { "commands": ["dotnet-meta"] } } }
 JSON
 git -C "$poly" add -A && git -C "$poly" commit -q -m init
+cp "$poly/ports/python/pyproject.toml" "$WORK/poly-pyproject.toml.orig"
 if link "$poly"; then pass "link succeeds in a polyglot repository"; else fail "polyglot link failed: $(tail -5 "$WORK/out")"; fi
 check "a manifest with no tool version reports that nothing was pinned" 'grep -q "ports/csharp/.config/dotnet-tools.json names MetaObjects.Cli but no version for it was found: nothing pinned" "$WORK/out" && ! grep -q "repinned MetaObjects.Cli to 1.1.0-rc.9 in ports/csharp/" "$WORK/out"'
 check "a repinned manifest is reported as repinned" 'grep -q "repinned MetaObjects.Cli to 1.1.0-rc.9 in .config/dotnet-tools.json" "$WORK/out"'
+check "link writes a NuGet.config at the root" 'grep -qF "metaobjects-prerelease" "$poly/NuGet.config"'
 check "the nested python project is linked" 'grep -q "metaobjects-prerelease" "$poly/ports/python/pyproject.toml"'
 check "the nested python project is repinned" 'grep -q "metaobjects==1.1.0rc9" "$poly/ports/python/pyproject.toml"'
 check "each independent pom gets the repositories" 'grep -q "<pluginRepositories>" "$poly/ports/java/pom.xml" && grep -q "<pluginRepositories>" "$poly/ports/kotlin/pom.xml"'
@@ -273,6 +296,10 @@ MO_REGISTRY_BASE="http://127.0.0.1:$PORT" MO_REGISTRY_OWNER=owner MO_REGISTRY_TO
   bash "$LINK" unlink --project "$poly" --to 1.0.13 >"$WORK/out" 2>&1 || true
 check "an inherited version property survives link and unlink" 'grep -q "<version>\${metaobjects.version}</version>" "$poly/ports/java/inherits/pom.xml" && ! grep -q "<version>8" "$poly/ports/java/inherits/pom.xml"'
 check "unlink removes every managed block" '! grep -rq "metaobjects prerelease (managed)" "$poly/ports"'
+check "the round trip leaves the pyproject.toml byte-identical (repin aside)" \
+  'sed "s/metaobjects==1.0.13/metaobjects==1.0.9/" "$poly/ports/python/pyproject.toml" | cmp -s - "$WORK/poly-pyproject.toml.orig"'
+check "unlink removes the NuGet.config link wrote" '[ ! -e "$poly/NuGet.config" ]'
+check "git status shows no NuGet.config after the round trip" '! git -C "$poly" status --porcelain | grep -q "NuGet.config"'
 check "unlink repins the nested python project" 'grep -q "metaobjects==1.0.13" "$poly/ports/python/pyproject.toml"'
 check "unlink repins every pom" 'grep -q "8.0.13" "$poly/ports/java/pom.xml" && grep -q "8.0.13" "$poly/ports/java/module/pom.xml" && [ "$(grep -c "<version>8.0.13</version>" "$poly/ports/kotlin/pom.xml")" = 3 ]'
 check "unlink repins the local tool" 'grep -q "\"metaobjects.cli\": { \"version\": \"1.0.13\"" "$poly/.config/dotnet-tools.json"'

From 17d000e71f585f7670a20ce0e9aa148c8bdd31cc Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 03:51:18 -0400
Subject: [PATCH 4/8] no-mistakes(review): Guard spine any/all on fact rows;
 compile C# test

---
 .../ReportRowCodegenTests.cs                  | 24 ++++++++++---
 .../src/projection/report-ddl-emit.ts         | 28 ++++++++++-----
 .../test/projection/report-ddl-emit.test.ts   | 35 +++++++++++++++++++
 .../test/report-views-pg.test.ts              | 12 ++++---
 .../test/report-views-sqlite.test.ts          | 12 ++++---
 5 files changed, 88 insertions(+), 23 deletions(-)

diff --git a/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs b/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
index d5d5434c3..4ca613601 100644
--- a/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
+++ b/server/csharp/MetaObjects.Codegen.Tests/ReportRowCodegenTests.cs
@@ -490,11 +490,25 @@ public void A_report_row_from_an_any_measure_with_no_of_is_a_plain_nullable_bool
     [Fact]
     public void An_any_measure_with_no_of_still_compiles_through_the_real_compiler()
     {
-        var files = EmitAll(RunnerContext(LoadAnyMeasureModel()));
-        Assert.True(files.ContainsKey("CallTotals.g.cs"));
-        var tree = CSharpSyntaxTree.ParseText(files["CallTotals.g.cs"]);
-        var diagnostics = tree.GetDiagnostics().Where(d => d.Severity == DiagnosticSeverity.Error).ToList();
-        Assert.Empty(diagnostics);
+        var ctx = RunnerContext(LoadAnyMeasureModel(), Config(includeNames: true));
+        var files = new IGenerator[]
+            {
+                new EntityGenerator(), new DbContextGenerator(), new FilterAllowlistGenerator(), new NamesGenerator(),
+            }
+            .SelectMany(g => g.Generate(ctx)).ToList();
+        Assert.Contains(files, f => f.Path == "CallTotals.g.cs");
+        var trees = files
+            .Select(f => CSharpSyntaxTree.ParseText(f.Content, new CSharpParseOptions(LanguageVersion.CSharp12), path: f.Path))
+            .ToList();
+        var comp = CSharpCompilation.Create(
+            "report_any_rows_" + Guid.NewGuid().ToString("N"), trees,
+            DbContextCompileTests.BuildReferences(),
+            new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary));
+        var errors = comp.GetDiagnostics()
+            .Where(d => d.Severity == DiagnosticSeverity.Error)
+            .Select(d => $"{d.Location.GetLineSpan().Path}: {d.Id}: {d.GetMessage()}")
+            .ToList();
+        Assert.True(errors.Count == 0, string.Join("\n", errors));
     }
 
     // ---------------------------------------------------------------------
diff --git a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
index e6d42f9a2..f27995e59 100644
--- a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
+++ b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
@@ -46,8 +46,9 @@ function aggFunction(agg: ReportAggregate["agg"], d: ReportDialect): string {
 }
 
 /** One aggregate (Table C): the bare aggregate, the condition by dialect, the cast, then the
- *  Table D default around all of it. */
-function aggregate(a: ReportAggregate, d: ReportDialect): string {
+ *  Table D default around all of it. `factRef` is set under `@spine`: a column of @from that is
+ *  null only on the padding row a spine row with no facts gets. */
+function aggregate(a: ReportAggregate, d: ReportDialect, factRef?: string): string {
   const refs = a.refs.map((r) => ref(r, d));
   const c = a.filter === undefined ? undefined : cond(a.filter, d);
   const fn = aggFunction(a.agg, d);
@@ -73,7 +74,11 @@ function aggregate(a: ReportAggregate, d: ReportDialect): string {
     // (every row) passes". A comparison is a boolean on Postgres and 0 / 1 / NULL elsewhere, so
     // MAX / MIN of it is the OR / AND, and a row whose predicate is NULL is skipped as bool_or skips it.
     if (c === undefined) throw new Error(`report-ddl-emit: @agg '${a.agg}' has neither @of nor a condition.`);
-    sql = `${fn}(${c})`;
+    // Under @spine the padding row's condition can still be true (`col IS NULL`), so only fact
+    // rows are aggregated, and a spine row with no facts reads null as every other measure does.
+    if (factRef === undefined) sql = `${fn}(${c})`;
+    else if (d === "postgres") sql = `${fn}(${c}) FILTER (WHERE ${ref(factRef, d)} IS NOT NULL)`;
+    else sql = `${fn}(CASE WHEN ${ref(factRef, d)} IS NOT NULL THEN ${c} END)`;
   } else {
     const x = refs[0]!;
     const distinct = a.distinct ? "DISTINCT " : "";
@@ -92,7 +97,7 @@ interface RenderedColumn {
   readonly grouped: boolean;
 }
 
-function column(c: ReportColumn, d: ReportDialect): RenderedColumn {
+function column(c: ReportColumn, d: ReportDialect, factRef: string | undefined): RenderedColumn {
   const alias = q(c.dbColAlias, d);
   switch (c.kind) {
     case "dimension":
@@ -100,12 +105,12 @@ function column(c: ReportColumn, d: ReportDialect): RenderedColumn {
     case "timeDimension":
       return { expr: truncateToGrain(ref(c.ref, d), c.grain, c.temporal, d), alias, grouped: true };
     case "aggregate":
-      return { expr: aggregate(c.aggregate, d), alias, grouped: false };
+      return { expr: aggregate(c.aggregate, d, factRef), alias, grouped: false };
     case "ratio": {
       // Each operand is its FULL Table C expression (condition and cast included), and its own
       // Table D default; the ratio's default wraps the whole quotient, which is always real.
-      const num = aggregate(c.numerator, d);
-      const den = aggregate(c.denominator, d);
+      const num = aggregate(c.numerator, d, factRef);
+      const den = aggregate(c.denominator, d, factRef);
       const top = d === "postgres" ? "NUMERIC" : d === "sqlite" ? "REAL" : undefined;
       const quotient = `${top === undefined ? num : `CAST(${num} AS ${top})`} / NULLIF(${den}, 0)`;
       const dv = c.defaultValue === undefined ? undefined : { value: c.defaultValue, real: true };
@@ -180,8 +185,15 @@ function spineFrom(spec: ReportViewSpec, depth: number, options: ReportEmitOptio
 
 export function emitReportViewDdl(spec: ReportViewSpec, options: ReportEmitOptions): string {
   const d = options.dialect;
+  // Under @spine, @from's side of the first hop's ON equality: non-null on every fact row the
+  // join keeps, null on the padding row of a spine row with no facts.
+  const first = spec.spineDepth === undefined ? undefined : spec.joinTree.joins[0];
+  const factRef =
+    first === undefined
+      ? undefined
+      : `${spec.joinTree.baseAlias}.${first.referenceHolder === "source" ? first.fkColumn : first.pkColumn}`;
   // Rendered once: a dimension's SELECT expression is its GROUP BY term, so they cannot differ.
-  const cols = spec.columns.map((c) => column(c, d));
+  const cols = spec.columns.map((c) => column(c, d, factRef));
   const select = cols.map((c) => `    ${c.expr} AS ${c.alias}`).join(",\n");
   const groupBy = cols.filter((c) => c.grouped).map((c) => c.expr);
 
diff --git a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
index 4e2618940..7363071c3 100644
--- a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
+++ b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
@@ -977,6 +977,41 @@ describe("@agg any / all without @of, end to end", () => {
   });
 });
 
+describe("@agg any / all without @of under @spine", () => {
+  // A program with no weeks gets one padding row whose `label` is null, so `label IS NULL` is
+  // true on it: only fact rows are aggregated, so that program reads null, not true.
+  const unlabelled = (): Json[] => fitness([
+    rpt("AnyUnlabelled", {
+      "@from": "Week", "@spine": "Week.fkProgram", "@dimensions": ["programKey"], "@measures": ["anyUnlabelled", "allUnlabelled"],
+    }, "v_any_unlabelled"),
+  ], [], [
+    { "measure.aggregate": { name: "anyUnlabelled", "@agg": "any", "@filter": { label: { isNull: true } } } },
+    { "measure.aggregate": { name: "allUnlabelled", "@agg": "all", "@filter": { label: { isNull: true } } } },
+  ]);
+
+  test("postgres: the condition is aggregated over the fact rows only", async () => {
+    const sql = (await viewsOf(unlabelled(), "postgres"))["v_any_unlabelled"];
+    expect(sql).toContain(`    bool_or(w."label" IS NULL) FILTER (WHERE w."programId" IS NOT NULL) AS "anyUnlabelled",`);
+    expect(sql).toContain(`    bool_and(w."label" IS NULL) FILTER (WHERE w."programId" IS NOT NULL) AS "allUnlabelled"`);
+  });
+
+  test("sqlite and mysql: the padding row's condition is NULL, which MAX / MIN skip", async () => {
+    const lite = (await viewsOf(unlabelled(), "sqlite"))["v_any_unlabelled"];
+    expect(lite).toContain(`MAX(CASE WHEN w."programId" IS NOT NULL THEN w."label" IS NULL END) AS "anyUnlabelled"`);
+    expect(lite).toContain(`MIN(CASE WHEN w."programId" IS NOT NULL THEN w."label" IS NULL END) AS "allUnlabelled"`);
+    const my = (await viewsOf(unlabelled(), "mysql"))["v_any_unlabelled"];
+    expect(my).toContain("MAX(CASE WHEN w.`programId` IS NOT NULL THEN w.`label` IS NULL END) AS `anyUnlabelled`");
+  });
+
+  test("without @spine the SQL is unchanged", async () => {
+    const plain = fitness([
+      rpt("AnyUnlabelledPlain", { "@from": "Week", "@dimensions": ["programKey"], "@measures": ["anyUnlabelled"] }, "v_any_unlabelled_plain"),
+    ], [], [{ "measure.aggregate": { name: "anyUnlabelled", "@agg": "any", "@filter": { label: { isNull: true } } } }]);
+    const sql = (await viewsOf(plain, "postgres"))["v_any_unlabelled_plain"];
+    expect(sql).toContain(`    bool_or(w."label" IS NULL) AS "anyUnlabelled"`);
+  });
+});
+
 // ── A bare @of owner after @via resolves in the package of the entity @via reaches ─────
 
 describe("a via dimension's bare @of owner across packages", () => {
diff --git a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
index 29395029b..568fd5944 100644
--- a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
@@ -450,9 +450,10 @@ const UNLABELLED_MODEL = JSON.stringify({ "metadata.root": { package: "acme", ch
     { "dimension.attribute": { name: "programKey", "@of": "Program.id", "@via": "Week.fkProgram" } },
     { "measure.aggregate": { name: "unlabelled", "@agg": "count", "@of": "Week.id", "@filter": { label: { isNull: true } } } },
     { "measure.aggregate": { name: "unlabelledMinutes", "@agg": "sum", "@of": "Week.durationMinutes", "@filter": { label: { isNull: true } } } },
+    { "measure.aggregate": { name: "anyUnlabelled", "@agg": "any", "@filter": { label: { isNull: true } } } },
   ] } },
   { "object.report": { name: "UnlabelledWeeks", "@from": "Week", "@spine": "Week.fkProgram",
-    "@dimensions": ["programKey"], "@measures": ["unlabelled", "unlabelledMinutes"], children: [
+    "@dimensions": ["programKey"], "@measures": ["unlabelled", "unlabelledMinutes", "anyUnlabelled"], children: [
     { "source.rdb": { "@kind": "view", "@view": "v_unlabelled_weeks" } } ] } },
 ]}});
 
@@ -619,11 +620,12 @@ describe("report views — inline models on real Postgres", () => {
 
     await applyRaw(UNLABELLED_ROWS);
     // Program 3's null-extended row has a null label, and the count still reads 0: it counts
-    // the fact's id, which is null there too. The sum of nothing is null (no @default).
+    // the fact's id, which is null there too. The sum of nothing is null (no @default), and so
+    // is an `any` over no facts, though `label IS NULL` holds on the null-extended row.
     expect(await select(`SELECT * FROM "v_unlabelled_weeks" ORDER BY "programKey"`)).toEqual([
-      { programKey: "1", unlabelled: "1", unlabelledMinutes: "60" },
-      { programKey: "2", unlabelled: "0", unlabelledMinutes: null },
-      { programKey: "3", unlabelled: "0", unlabelledMinutes: null },
+      { programKey: "1", unlabelled: "1", unlabelledMinutes: "60", anyUnlabelled: "t" },
+      { programKey: "2", unlabelled: "0", unlabelledMinutes: null, anyUnlabelled: "f" },
+      { programKey: "3", unlabelled: "0", unlabelledMinutes: null, anyUnlabelled: null },
     ]);
   }, 60_000);
 
diff --git a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
index 030133710..4051a8aa0 100644
--- a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
@@ -417,9 +417,10 @@ const UNLABELLED_MODEL = JSON.stringify({ "metadata.root": { package: "acme", ch
     { "dimension.attribute": { name: "programKey", "@of": "Program.id", "@via": "Week.fkProgram" } },
     { "measure.aggregate": { name: "unlabelled", "@agg": "count", "@of": "Week.id", "@filter": { label: { isNull: true } } } },
     { "measure.aggregate": { name: "unlabelledMinutes", "@agg": "sum", "@of": "Week.durationMinutes", "@filter": { label: { isNull: true } } } },
+    { "measure.aggregate": { name: "anyUnlabelled", "@agg": "any", "@filter": { label: { isNull: true } } } },
   ] } },
   { "object.report": { name: "UnlabelledWeeks", "@from": "Week", "@spine": "Week.fkProgram",
-    "@dimensions": ["programKey"], "@measures": ["unlabelled", "unlabelledMinutes"], children: [
+    "@dimensions": ["programKey"], "@measures": ["unlabelled", "unlabelledMinutes", "anyUnlabelled"], children: [
     { "source.rdb": { "@kind": "view", "@view": "v_unlabelled_weeks" } } ] } },
 ]}});
 
@@ -544,11 +545,12 @@ describe("report views — inline model on real SQLite", () => {
         (10, 1, 'Week 1', 30), (11, 1, 'Week 2', 60), (12, 1, 'Week 2', 90), (13, 1, NULL, 60),
         (20, 2, 'Solo', 45)`);
     // Program 3's null-extended row has a null label, and the count still reads 0: it counts
-    // the fact's id, which is null there too. The sum of nothing is null (no @default).
+    // the fact's id, which is null there too. The sum of nothing is null (no @default), and so
+    // is an `any` over no facts, though `label IS NULL` holds on the null-extended row.
     expect(await select(`SELECT * FROM "v_unlabelled_weeks" ORDER BY "programKey"`)).toEqual([
-      { programKey: 1, unlabelled: 1, unlabelledMinutes: 60 },
-      { programKey: 2, unlabelled: 0, unlabelledMinutes: null },
-      { programKey: 3, unlabelled: 0, unlabelledMinutes: null },
+      { programKey: 1, unlabelled: 1, unlabelledMinutes: 60, anyUnlabelled: 1 },
+      { programKey: 2, unlabelled: 0, unlabelledMinutes: null, anyUnlabelled: 0 },
+      { programKey: 3, unlabelled: 0, unlabelledMinutes: null, anyUnlabelled: null },
     ]);
   });
 

From 92a2334606ff6fedf266e8b7fe17cacb6a4d1ad2 Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 04:56:12 -0400
Subject: [PATCH 5/8] no-mistakes(document): Document no-@of any/all in
 reporting and Cube docs

---
 docs/features/cube-export.md | 2 +-
 docs/features/reporting.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/features/cube-export.md b/docs/features/cube-export.md
index e6d1d86db..f6ce6e9b5 100644
--- a/docs/features/cube-export.md
+++ b/docs/features/cube-export.md
@@ -322,7 +322,7 @@ somewhere to go: an `identity.reference` onto an entity that is not a cube makes
 | `count` with `@distinct` | `type: count_distinct`, `sql: x` |
 | `count` with `@distinct` over a tuple `x1, x2` | Postgres: `type: count_distinct`, `sql: 'ROW(x1, x2)'`, with one `filters` entry `x1 IS NOT NULL AND x2 IS NOT NULL`, so a tuple with a null component is not counted, as in the view. MySQL: the view's own `COUNT(DISTINCT x1, x2)` as a `type: number` measure (a condition `c` makes it `COUNT(DISTINCT CASE WHEN c THEN x1 END, x2)`); MySQL's multi-argument form skips a tuple with a null component and compares by the columns' collation, which a `JSON_ARRAY(x1, x2)` key does not: on mysql:8.4 under the default `utf8mb4_0900_ai_ci` it counted `'abc'` and `'ABC'` as two tuples where the view counts one |
 | `sum`, `avg`, `min`, `max` | `type: sum`, `avg`, `min`, `max`, `sql: x` |
-| `any`, `all` | `type: boolean`. Postgres: `sql: 'bool_or(x)'` / `'bool_and(x)'`, a condition `c` as `bool_or(x) FILTER (WHERE c)`. MySQL: `sql: 'MAX(x)'` / `'MIN(x)'`, a condition as `MAX(CASE WHEN c THEN x END)`. The aggregate is the view's own, written in `sql` because Postgres has no `MAX(boolean)` and the condition cannot ride in `filters`. |
+| `any`, `all` | `type: boolean`. Postgres: `sql: 'bool_or(x)'` / `'bool_and(x)'`, a condition `c` as `bool_or(x) FILTER (WHERE c)`. MySQL: `sql: 'MAX(x)'` / `'MIN(x)'`, a condition as `MAX(CASE WHEN c THEN x END)`. The aggregate is the view's own, written in `sql` because Postgres has no `MAX(boolean)` and the condition cannot ride in `filters`. With no `@of`, the condition is the aggregated value: `bool_or(c)` / `bool_and(c)`, `MAX(c)` / `MIN(c)` on MySQL. |
 | any of the above with a condition `c` | the same, with one `filters` entry `c`. For a Postgres tuple, `c` is ANDed after the not-null terms in that one entry. |
 | `measure.ratio` | `type: number`. Postgres: `CAST({num} AS NUMERIC) / NULLIF({den}, 0)`. MySQL: `{num} / NULLIF({den}, 0)`. |
 | a `measure.aggregate` with `@default: n` | two members. `<m>Raw` is the aggregate as the rows above write it (its `type`, `sql` and `filters`), with `public: false`. `<m>` is `type: number` (`type: boolean` for an `any` or `all`, where `n` is written `TRUE` / `FALSE` on Postgres and `1` / `0` on MySQL), `sql: 'COALESCE({<m>Raw}, n)'`, and carries the measure's `title` and `description`. |
diff --git a/docs/features/reporting.md b/docs/features/reporting.md
index 40b638ee1..7ac998392 100644
--- a/docs/features/reporting.md
+++ b/docs/features/reporting.md
@@ -54,7 +54,7 @@ FR-037 R5's arithmetic wave and will need its own agreement):
 |---|---|---|
 | `dimension.attribute` | `object.entity` | `@of` (required), `@via` |
 | `dimension.time` | `object.entity` | `@of` (required), `@via`, `@grains` (required, array) |
-| `measure.aggregate` | `object.entity` | `@agg` (required), `@of` (required, array), `@distinct`, `@filter`, `@segment`, `@default` |
+| `measure.aggregate` | `object.entity` | `@agg` (required), `@of` (required, array, except `any` / `all`), `@distinct`, `@filter`, `@segment`, `@default` |
 | `measure.ratio` | `object.entity` | `@numerator` (required), `@denominator` (required), `@default` |
 | `segment.filter` | `object.entity` | `@filter` (required) |
 | `object.report` | root | `@from` (required), `@dimensions` (array), `@measures` (required, array), `@segment`, `@filter`, `@spine` |

From ab75670f382b0e075e80de527b2523cc2aef76c9 Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 06:05:16 -0400
Subject: [PATCH 6/8] no-mistakes(review): Count NULL any/all conditions as
 failing; flag legacy excludes

---
 CHANGELOG.md                                  |  9 ++--
 .../references/declaring-reports.md           |  3 +-
 docs/features/cube-export.md                  |  2 +-
 docs/features/prerelease.md                   |  6 ++-
 docs/features/reporting.md                    |  8 ++--
 .../references/declaring-reports.md           |  3 +-
 .../references/declaring-reports.md           |  3 +-
 .../references/declaring-reports.md           |  3 +-
 .../references/declaring-reports.md           |  3 +-
 .../references/declaring-reports.md           |  3 +-
 .../expected/model/cubes/Call.yml             |  2 +-
 .../expected/model/cubes/Call.yml             |  2 +-
 .../codegen-ts/src/cube/cube-members.ts       |  2 +-
 .../src/projection/report-ddl-emit.ts         | 10 +++--
 .../test/projection/report-ddl-emit.test.ts   | 28 ++++++-------
 .../test/report-views-pg.test.ts              |  8 ++--
 .../test/report-views-sqlite.test.ts          |  8 ++--
 tools/prerelease/prerelease-link.sh           | 42 +++++++++++++++++++
 tools/prerelease/test-prerelease-link.sh      | 28 ++++++++++++-
 19 files changed, 128 insertions(+), 45 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09c864624..8374bd3a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -126,10 +126,11 @@ generator catalog and the Atlas evaluation are 1.2 work.
   or `all` may omit `@of` and declare a `@filter` or `@segment` instead: it is then true when
   some row (`any`) or every row (`all`) in the group passes that condition. `{ "name":
   "hasError", "@agg": "any", "@filter": { "success": false } }` states "did any call fail"
-  (`bool_or(success = FALSE)`) over a `success` column, which a boolean `@of` could not. A row
-  whose condition is NULL is skipped, as `bool_or` skips one. It lowers
-  to `bool_or(<condition>)` / `bool_and(<condition>)` on Postgres and `MAX` / `MIN` of the
-  condition on SQLite, D1 and MySQL, and to the same SQL in the Cube model. The registry makes
+  over a `success` column, which a boolean `@of` could not. A row whose condition is NULL
+  counts as not passing, as a `WHERE` drops it, so only a group with no rows reads NULL. It
+  lowers to `bool_or(COALESCE(<condition>, FALSE))` / `bool_and(...)` on Postgres and `MAX` /
+  `MIN` of `COALESCE(<condition>, 0)` on SQLite, D1 and MySQL, and to the same SQL in the Cube
+  model. The registry makes
   `measure.aggregate` `@of` optional (`metamodelVersion` stays `1.1`), and a new loader rule M0
   refuses, with `ERR_INVALID_MEASURE`, an `@of`-less measure whose `@agg` is not `any` or `all`
   (it was `ERR_MISSING_REQUIRED_ATTR`) and an `@of`-less `any` / `all` with no condition.
diff --git a/agent-context/skills/metaobjects-authoring/references/declaring-reports.md b/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/agent-context/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/docs/features/cube-export.md b/docs/features/cube-export.md
index f6ce6e9b5..db0280cd2 100644
--- a/docs/features/cube-export.md
+++ b/docs/features/cube-export.md
@@ -322,7 +322,7 @@ somewhere to go: an `identity.reference` onto an entity that is not a cube makes
 | `count` with `@distinct` | `type: count_distinct`, `sql: x` |
 | `count` with `@distinct` over a tuple `x1, x2` | Postgres: `type: count_distinct`, `sql: 'ROW(x1, x2)'`, with one `filters` entry `x1 IS NOT NULL AND x2 IS NOT NULL`, so a tuple with a null component is not counted, as in the view. MySQL: the view's own `COUNT(DISTINCT x1, x2)` as a `type: number` measure (a condition `c` makes it `COUNT(DISTINCT CASE WHEN c THEN x1 END, x2)`); MySQL's multi-argument form skips a tuple with a null component and compares by the columns' collation, which a `JSON_ARRAY(x1, x2)` key does not: on mysql:8.4 under the default `utf8mb4_0900_ai_ci` it counted `'abc'` and `'ABC'` as two tuples where the view counts one |
 | `sum`, `avg`, `min`, `max` | `type: sum`, `avg`, `min`, `max`, `sql: x` |
-| `any`, `all` | `type: boolean`. Postgres: `sql: 'bool_or(x)'` / `'bool_and(x)'`, a condition `c` as `bool_or(x) FILTER (WHERE c)`. MySQL: `sql: 'MAX(x)'` / `'MIN(x)'`, a condition as `MAX(CASE WHEN c THEN x END)`. The aggregate is the view's own, written in `sql` because Postgres has no `MAX(boolean)` and the condition cannot ride in `filters`. With no `@of`, the condition is the aggregated value: `bool_or(c)` / `bool_and(c)`, `MAX(c)` / `MIN(c)` on MySQL. |
+| `any`, `all` | `type: boolean`. Postgres: `sql: 'bool_or(x)'` / `'bool_and(x)'`, a condition `c` as `bool_or(x) FILTER (WHERE c)`. MySQL: `sql: 'MAX(x)'` / `'MIN(x)'`, a condition as `MAX(CASE WHEN c THEN x END)`. The aggregate is the view's own, written in `sql` because Postgres has no `MAX(boolean)` and the condition cannot ride in `filters`. With no `@of`, the condition is the aggregated value, a null condition counting as not passing: `bool_or(COALESCE(c, FALSE))` / `bool_and(COALESCE(c, FALSE))`, `MAX(COALESCE(c, 0))` / `MIN(COALESCE(c, 0))` on MySQL. |
 | any of the above with a condition `c` | the same, with one `filters` entry `c`. For a Postgres tuple, `c` is ANDed after the not-null terms in that one entry. |
 | `measure.ratio` | `type: number`. Postgres: `CAST({num} AS NUMERIC) / NULLIF({den}, 0)`. MySQL: `{num} / NULLIF({den}, 0)`. |
 | a `measure.aggregate` with `@default: n` | two members. `<m>Raw` is the aggregate as the rows above write it (its `type`, `sql` and `filters`), with `public: false`. `<m>` is `type: number` (`type: boolean` for an `any` or `all`, where `n` is written `TRUE` / `FALSE` on Postgres and `1` / `0` on MySQL), `sql: 'COALESCE({<m>Raw}, n)'`, and carries the measure's `title` and `description`. |
diff --git a/docs/features/prerelease.md b/docs/features/prerelease.md
index ecc18db0f..b1db4c10b 100644
--- a/docs/features/prerelease.md
+++ b/docs/features/prerelease.md
@@ -173,7 +173,11 @@ per-worktree exclude), so the paths `link` adds there live inside their own mana
 too: `unlink` removes exactly that block, never a line a user added to the file by hand,
 and a repeated `link` does not duplicate it. An entry that another worktree of the same
 clone, or another project linked in the same worktree, still needs stays until that one is
-unlinked too. Files that *are* tracked by definition
+unlinked too. A clone linked by an earlier version of the script holds those entries as bare
+lines outside any block, which `unlink` cannot tell from a line a user added. `link` and
+`unlink` name such lines and print the one command that removes them, and leave them in
+place; `link` does not add a second copy inside the block while one is there. Run that
+command once no worktree of the clone is linked. Files that *are* tracked by definition
 (`pyproject.toml`, `pom.xml`) get a loud warning instead — there is no way to make an edit
 to a tracked file uncommittable, which is precisely why the detector in §5 exists.
 
diff --git a/docs/features/reporting.md b/docs/features/reporting.md
index 7ac998392..148c984f7 100644
--- a/docs/features/reporting.md
+++ b/docs/features/reporting.md
@@ -507,9 +507,11 @@ A measure with no `@of` must declare a `@filter` or a `@segment` (rule M0); ever
 - **How it lowers.** Postgres writes `bool_or(x)` / `bool_and(x)`, with `FILTER (WHERE …)`
   for a condition. SQLite and MySQL have no boolean aggregate, and a boolean there is `0` or
   `1`, so they write `MAX(x)` for `any` and `MIN(x)` for `all` (`MAX(CASE WHEN … THEN x END)`
-  for a condition). Without `@of` the condition is the aggregated value: `bool_or(<condition>)`
-  on Postgres and `MAX(<condition>)` elsewhere, where a comparison is `0`, `1` or null. A row
-  whose condition is null (a null `success`) is skipped, as a null `@of` is. The runtime reads the column as the boolean it is typed as. A default is
+  for a condition). Without `@of` the condition is the aggregated value:
+  `bool_or(COALESCE(<condition>, FALSE))` on Postgres and `MAX(COALESCE(<condition>, 0))`
+  elsewhere, where a comparison is `0`, `1` or null. A row whose condition is null (a null
+  `success`) counts as not passing, as a `WHERE` drops it, so `all` over `true, null` is `false`
+  and only a group with no rows reads null. The runtime reads the column as the boolean it is typed as. A default is
   `COALESCE(<the aggregate>, FALSE)` on Postgres and `COALESCE(<the aggregate>, 0)` elsewhere.
 - **Cube.** The export writes a `type: boolean` measure holding the same aggregate, see
   [cube-export.md](cube-export.md).
diff --git a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/java-kotlin-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/java-react/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/python/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/ts-react-tanstack/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
index ba19b0d33..544a7fbe6 100644
--- a/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
+++ b/fixtures/agent-context-conformance/ts-requirements/expected/.claude/skills/metaobjects-authoring/references/declaring-reports.md
@@ -16,7 +16,8 @@ and an `object.report` combines them by name. Four node kinds:
 - `measure.aggregate` (`@agg`: `count`, `sum`, `avg`, `min`, `max`, `any`, `all`) and `measure.ratio`
   (`@numerator` / `@denominator`, both measures of the entity). `any` / `all` take a
   `field.boolean` `@of`, or no `@of` and a `@filter` or `@segment`: `{ "name": "hasError",
-  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false";
+  "@agg": "any", "@filter": { "success": false } }` is "some row has `success` false" (a row
+  whose condition is null does not pass);
 - `segment.filter` — a named, reusable `@filter` ("active purchase");
 - `object.report` — a top-level object: `@from` an entity, `@dimensions` (`name` or
   `name:grain`), `@measures`.
diff --git a/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml b/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
index 543677240..086e545de 100644
--- a/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
+++ b/fixtures/cube-model/measure-boolean-mysql/expected/model/cubes/Call.yml
@@ -18,7 +18,7 @@ cubes:
         sql: 'MAX(CASE WHEN {CUBE}.`duration_ms` >= 1000 THEN {CUBE}.`failed` END)'
         type: boolean
       - name: anyFastCall
-        sql: 'MAX({CUBE}.`duration_ms` < 100)'
+        sql: 'MAX(COALESCE({CUBE}.`duration_ms` < 100, 0))'
         type: boolean
       - name: anyFailedOrFalseRaw
         sql: 'MAX({CUBE}.`failed`)'
diff --git a/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml b/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
index 274f0a5c3..6f740d331 100644
--- a/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
+++ b/fixtures/cube-model/measure-boolean/expected/model/cubes/Call.yml
@@ -18,7 +18,7 @@ cubes:
         sql: 'bool_or({CUBE}."failed") FILTER (WHERE {CUBE}."duration_ms" >= 1000)'
         type: boolean
       - name: anyFastCall
-        sql: 'bool_or({CUBE}."duration_ms" < 100)'
+        sql: 'bool_or(COALESCE({CUBE}."duration_ms" < 100, FALSE))'
         type: boolean
       - name: anyFailedOrFalseRaw
         sql: 'bool_or({CUBE}."failed")'
diff --git a/server/typescript/packages/codegen-ts/src/cube/cube-members.ts b/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
index 5e57469c9..e61f3b4f1 100644
--- a/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
+++ b/server/typescript/packages/codegen-ts/src/cube/cube-members.ts
@@ -245,7 +245,7 @@ function aggregateSpec(
     // No @of (rule M0): the condition is the quantified predicate, as in the view.
     if (col === undefined) {
       if (c === undefined) throw new Error(`${where}: @agg '${agg}' has neither @of nor a condition.`);
-      return { sql: `${fn}(${c})`, type: "boolean" };
+      return { sql: `${fn}(COALESCE(${c}, ${d === "postgres" ? "FALSE" : "0"}))`, type: "boolean" };
     }
     if (d === "postgres") {
       return { sql: c === undefined ? `${fn}(${col})` : `${fn}(${col}) FILTER (WHERE ${c})`, type: "boolean" };
diff --git a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
index f27995e59..c85ec24c4 100644
--- a/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
+++ b/server/typescript/packages/codegen-ts/src/projection/report-ddl-emit.ts
@@ -72,13 +72,15 @@ function aggregate(a: ReportAggregate, d: ReportDialect, factRef?: string): stri
   } else if (refs.length === 0) {
     // @agg any / all with no @of (rule M0): the condition IS the quantified predicate, "some row
     // (every row) passes". A comparison is a boolean on Postgres and 0 / 1 / NULL elsewhere, so
-    // MAX / MIN of it is the OR / AND, and a row whose predicate is NULL is skipped as bool_or skips it.
+    // MAX / MIN of it is the OR / AND. A row whose predicate is NULL does not pass, as WHERE would
+    // drop it, so the predicate is COALESCEd to false and only an empty group reads NULL.
     if (c === undefined) throw new Error(`report-ddl-emit: @agg '${a.agg}' has neither @of nor a condition.`);
+    const passes = `COALESCE(${c}, ${d === "postgres" ? "FALSE" : "0"})`;
     // Under @spine the padding row's condition can still be true (`col IS NULL`), so only fact
     // rows are aggregated, and a spine row with no facts reads null as every other measure does.
-    if (factRef === undefined) sql = `${fn}(${c})`;
-    else if (d === "postgres") sql = `${fn}(${c}) FILTER (WHERE ${ref(factRef, d)} IS NOT NULL)`;
-    else sql = `${fn}(CASE WHEN ${ref(factRef, d)} IS NOT NULL THEN ${c} END)`;
+    if (factRef === undefined) sql = `${fn}(${passes})`;
+    else if (d === "postgres") sql = `${fn}(${passes}) FILTER (WHERE ${ref(factRef, d)} IS NOT NULL)`;
+    else sql = `${fn}(CASE WHEN ${ref(factRef, d)} IS NOT NULL THEN ${passes} END)`;
   } else {
     const x = refs[0]!;
     const distinct = a.distinct ? "DISTINCT " : "";
diff --git a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
index 7363071c3..d99becc06 100644
--- a/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
+++ b/server/typescript/packages/codegen-ts/test/projection/report-ddl-emit.test.ts
@@ -958,22 +958,22 @@ describe("@agg any / all without @of, end to end", () => {
     rpt("CallsByGame", { "@from": "Call", "@dimensions": ["game"], "@measures": ["hasError", "allSlow"] }, "v_calls_by_game"),
   ];
 
-  test("postgres: bool_or / bool_and of the condition, with no FILTER", async () => {
+  test("postgres: bool_or / bool_and of the condition, a NULL condition not passing, with no FILTER", async () => {
     const sql = (await viewsOf(calls(), "postgres"))["v_calls_by_game"];
-    expect(sql).toContain(`    bool_or(c."success" = FALSE) AS "hasError",`);
-    expect(sql).toContain(`    COALESCE(bool_and(c."latencyMs" > 1000), FALSE) AS "allSlow"`);
+    expect(sql).toContain(`    bool_or(COALESCE(c."success" = FALSE, FALSE)) AS "hasError",`);
+    expect(sql).toContain(`    COALESCE(bool_and(COALESCE(c."latencyMs" > 1000, FALSE)), FALSE) AS "allSlow"`);
     expect(sql).not.toContain("FILTER");
   });
 
   test("sqlite, d1 and mysql: MAX / MIN of the condition, which is 0 / 1 / NULL there", async () => {
     for (const dialect of ["sqlite", "d1"] as const) {
       const sql = (await viewsOf(calls(), dialect))["v_calls_by_game"];
-      expect(sql).toContain(`MAX(c."success" = 0) AS "hasError"`);
-      expect(sql).toContain(`COALESCE(MIN(c."latencyMs" > 1000), 0) AS "allSlow"`);
+      expect(sql).toContain(`MAX(COALESCE(c."success" = 0, 0)) AS "hasError"`);
+      expect(sql).toContain(`COALESCE(MIN(COALESCE(c."latencyMs" > 1000, 0)), 0) AS "allSlow"`);
     }
     const my = (await viewsOf(calls(), "mysql"))["v_calls_by_game"];
-    expect(my).toContain("MAX(c.`success` = FALSE) AS `hasError`");
-    expect(my).toContain("COALESCE(MIN(c.`latencyMs` > 1000), 0) AS `allSlow`");
+    expect(my).toContain("MAX(COALESCE(c.`success` = FALSE, 0)) AS `hasError`");
+    expect(my).toContain("COALESCE(MIN(COALESCE(c.`latencyMs` > 1000, 0)), 0) AS `allSlow`");
   });
 });
 
@@ -991,24 +991,24 @@ describe("@agg any / all without @of under @spine", () => {
 
   test("postgres: the condition is aggregated over the fact rows only", async () => {
     const sql = (await viewsOf(unlabelled(), "postgres"))["v_any_unlabelled"];
-    expect(sql).toContain(`    bool_or(w."label" IS NULL) FILTER (WHERE w."programId" IS NOT NULL) AS "anyUnlabelled",`);
-    expect(sql).toContain(`    bool_and(w."label" IS NULL) FILTER (WHERE w."programId" IS NOT NULL) AS "allUnlabelled"`);
+    expect(sql).toContain(`    bool_or(COALESCE(w."label" IS NULL, FALSE)) FILTER (WHERE w."programId" IS NOT NULL) AS "anyUnlabelled",`);
+    expect(sql).toContain(`    bool_and(COALESCE(w."label" IS NULL, FALSE)) FILTER (WHERE w."programId" IS NOT NULL) AS "allUnlabelled"`);
   });
 
   test("sqlite and mysql: the padding row's condition is NULL, which MAX / MIN skip", async () => {
     const lite = (await viewsOf(unlabelled(), "sqlite"))["v_any_unlabelled"];
-    expect(lite).toContain(`MAX(CASE WHEN w."programId" IS NOT NULL THEN w."label" IS NULL END) AS "anyUnlabelled"`);
-    expect(lite).toContain(`MIN(CASE WHEN w."programId" IS NOT NULL THEN w."label" IS NULL END) AS "allUnlabelled"`);
+    expect(lite).toContain(`MAX(CASE WHEN w."programId" IS NOT NULL THEN COALESCE(w."label" IS NULL, 0) END) AS "anyUnlabelled"`);
+    expect(lite).toContain(`MIN(CASE WHEN w."programId" IS NOT NULL THEN COALESCE(w."label" IS NULL, 0) END) AS "allUnlabelled"`);
     const my = (await viewsOf(unlabelled(), "mysql"))["v_any_unlabelled"];
-    expect(my).toContain("MAX(CASE WHEN w.`programId` IS NOT NULL THEN w.`label` IS NULL END) AS `anyUnlabelled`");
+    expect(my).toContain("MAX(CASE WHEN w.`programId` IS NOT NULL THEN COALESCE(w.`label` IS NULL, 0) END) AS `anyUnlabelled`");
   });
 
-  test("without @spine the SQL is unchanged", async () => {
+  test("without @spine there is no fact-row FILTER", async () => {
     const plain = fitness([
       rpt("AnyUnlabelledPlain", { "@from": "Week", "@dimensions": ["programKey"], "@measures": ["anyUnlabelled"] }, "v_any_unlabelled_plain"),
     ], [], [{ "measure.aggregate": { name: "anyUnlabelled", "@agg": "any", "@filter": { label: { isNull: true } } } }]);
     const sql = (await viewsOf(plain, "postgres"))["v_any_unlabelled_plain"];
-    expect(sql).toContain(`    bool_or(w."label" IS NULL) AS "anyUnlabelled"`);
+    expect(sql).toContain(`    bool_or(COALESCE(w."label" IS NULL, FALSE)) AS "anyUnlabelled"`);
   });
 });
 
diff --git a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
index 568fd5944..80c7f2a76 100644
--- a/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-pg.test.ts
@@ -770,7 +770,7 @@ describe("report views — inline models on real Postgres", () => {
     expect(Number(row!.ratioTotal)).toBe(0.75);
   }, 60_000);
 
-  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition is skipped", async () => {
+  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition does not pass", async () => {
     const root = await loadInline(JSON.stringify({ "metadata.root": { package: "acme", children: [
       { "object.entity": { name: "Call", children: [
         { "source.rdb": { "@table": "calls" } },
@@ -786,7 +786,7 @@ describe("report views — inline models on real Postgres", () => {
         "@measures": ["hasError", "allSucceeded"], children: [
         { "source.rdb": { "@kind": "view", "@view": "v_calls_by_game" } } ] } },
     ]}}));
-    expect(viewSql(root, "v_calls_by_game")).toContain(`bool_or(c."success" = FALSE) AS "hasError"`);
+    expect(viewSql(root, "v_calls_by_game")).toContain(`bool_or(COALESCE(c."success" = FALSE, FALSE)) AS "hasError"`);
     const { expected } = await migrate(root);
     await assertConverged(expected);
     await applyRaw(`
@@ -795,8 +795,8 @@ describe("report views — inline models on real Postgres", () => {
     expect(await select(`SELECT * FROM "v_calls_by_game" ORDER BY "game"`)).toEqual([
       { game: "1", hasError: "t", allSucceeded: "f" },
       { game: "2", hasError: "f", allSucceeded: "t" },
-      { game: "3", hasError: "f", allSucceeded: "t" },
-      { game: "4", hasError: null, allSucceeded: null },
+      { game: "3", hasError: "f", allSucceeded: "f" },
+      { game: "4", hasError: "f", allSucceeded: "f" },
     ]);
   }, 60_000);
 });
diff --git a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
index 4051a8aa0..e8ebcab2b 100644
--- a/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
+++ b/server/typescript/packages/integration-tests/test/report-views-sqlite.test.ts
@@ -622,9 +622,9 @@ describe("report views — inline model on real SQLite", () => {
       { "source.rdb": { "@kind": "view", "@view": "v_calls_by_game" } } ] } },
   ]}});
 
-  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition is skipped", async () => {
+  test("@agg any / all without @of: some row / every row passes the condition; a NULL condition does not pass", async () => {
     const root = await loadInline(CALL_MODEL);
-    expect(viewSql(root, "v_calls_by_game")).toContain(`MAX(c."success" = 0) AS "hasError"`);
+    expect(viewSql(root, "v_calls_by_game")).toContain(`MAX(COALESCE(c."success" = 0, 0)) AS "hasError"`);
     const { expected } = await migrate(root);
     await assertConverged(expected);
     // Game 1 has a failure; game 2 only successes; game 3 a success and an unknown; game 4 only an unknown.
@@ -634,8 +634,8 @@ describe("report views — inline model on real SQLite", () => {
     expect(await select(`SELECT * FROM "v_calls_by_game" ORDER BY "game"`)).toEqual([
       { game: 1, hasError: 1, allSucceeded: 0 },
       { game: 2, hasError: 0, allSucceeded: 1 },
-      { game: 3, hasError: 0, allSucceeded: 1 },
-      { game: 4, hasError: null, allSucceeded: null },
+      { game: 3, hasError: 0, allSucceeded: 0 },
+      { game: 4, hasError: 0, allSucceeded: 0 },
     ]);
   });
 });
diff --git a/tools/prerelease/prerelease-link.sh b/tools/prerelease/prerelease-link.sh
index f6f8aa824..d673ccae9 100755
--- a/tools/prerelease/prerelease-link.sh
+++ b/tools/prerelease/prerelease-link.sh
@@ -239,6 +239,45 @@ exclude_block_lines() {  # exclude_block_lines <file>
   ' "$1" 2>/dev/null
 }
 
+# The lines of the exclude file outside the managed block: a user's own rules, and the bare
+# entries an earlier version of this script wrote before it kept them in a block.
+exclude_outside_lines() {  # exclude_outside_lines <file>
+  awk -v b="$BEGIN" -v e="$END" '
+    index($0,b) { skip=1; next } index($0,e) { skip=0; next } !skip { print }
+  ' "$1" 2>/dev/null
+}
+
+# Every exclude entry `link` writes for this project, named from the repository root.
+written_exclude_paths() {
+  local prefix root rel
+  prefix="$(git -C "$PROJECT" rev-parse --show-prefix 2>/dev/null || true)"
+  while IFS= read -r root; do echo "$prefix$(rel_prefix "$root").npmrc"; done < <(npm_install_roots)
+  if has_nuget; then echo "${prefix}NuGet.config"; fi
+  while IFS= read -r root; do
+    rel="$(rel_prefix "$root")"
+    echo "$prefix${rel}.mvn/settings.xml"; echo "$prefix${rel}.mvn/maven.config"
+  done < <(mvn_roots)
+}
+
+# An earlier version of this script wrote its exclude entries as bare lines, outside any block.
+# They are indistinguishable from a line a user added, so they are named, never removed.
+legacy_exclude_notice() {
+  local ex stale p cmd
+  ex="$(exclude_file)"
+  [ -n "$ex" ] && [ -f "$ex" ] || return 0
+  stale="$(written_exclude_paths | sort -u | grep -xF -f <(exclude_outside_lines "$ex") || true)"
+  [ -n "$stale" ] || return 0
+  warn "$ex holds entries outside the managed block that name files this script writes"
+  warn "(left by an earlier version of it); unlink never removes a line it did not put in its block:"
+  cmd="grep -vxF"
+  while IFS= read -r p; do
+    printf '    %s\n' "$p"
+    cmd+=" -e $(printf '%q' "$p")"
+  done <<< "$stale"
+  say "once no work tree of this clone is linked, remove them with:"
+  say "  $cmd $(printf '%q' "$ex") > $(printf '%q' "$ex.tmp") && mv $(printf '%q' "$ex.tmp") $(printf '%q' "$ex")"
+}
+
 # Keep an untracked managed file out of commits without touching the shared .gitignore or any
 # line a user put in info/exclude themselves. Everything this adds lives in one managed block:
 # `unlink` removes exactly that block via `strip_block`, never a line it did not add,
@@ -254,6 +293,7 @@ local_exclude() {  # local_exclude <relative-path>
   [ -f "$ex" ] || : > "$ex"
   line="$prefix$rel"
   exclude_block_lines "$ex" | grep -qxF "$line" && return 0
+  exclude_outside_lines "$ex" | grep -qxF "$line" && return 0
   set_exclude_block "$ex" "$(exclude_block_lines "$ex"; printf '%s\n' "$line")"
 }
 
@@ -921,6 +961,7 @@ case "$ACTION" in
         maven)  link_mvn ;;
       esac
     done
+    legacy_exclude_notice
     install_detector
     drop_lockfiles
     echo
@@ -946,6 +987,7 @@ case "$ACTION" in
     echo
     echo "── unlinking $PROJECT → public registries @ $TO ──"
     unlink_all
+    legacy_exclude_notice
     has_npm   && repin_npm   "$TO"
     has_py    && repin_py    "$TO"
     has_nuget && repin_nuget "$TO"
diff --git a/tools/prerelease/test-prerelease-link.sh b/tools/prerelease/test-prerelease-link.sh
index 5a2f4ccee..002665eea 100755
--- a/tools/prerelease/test-prerelease-link.sh
+++ b/tools/prerelease/test-prerelease-link.sh
@@ -10,7 +10,9 @@
 #     .npmrc (which can hold a registry credential) is not ignored. The exclude entries `link`
 #     adds live in one managed block, so `unlink` removes exactly that block (and nothing a
 #     user put in the file by hand), and a repeated `link` does not duplicate it. Unlinking one
-#     worktree or project keeps an entry another linked worktree or project still needs.
+#     worktree or project keeps an entry another linked worktree or project still needs. A bare
+#     entry an earlier version wrote outside the block is named with its cleanup command, never
+#     removed, and never duplicated inside the block.
 # R3  a link/unlink round trip leaves a pom.xml that lacked a trailing newline byte-identical
 #     (the previous awk-based rewrites unconditionally added one), and `link`/`unlink` report
 #     "repinned ... in <file>" only for a pom whose own text actually changed — not a module
@@ -154,6 +156,30 @@ check "git status shows no .npmrc after one subproject is unlinked" '! git -C "$
 unlink_project "$multi/apps/api"
 check "unlinking the last subproject removes the managed block" '! grep -q "metaobjects prerelease (managed)" "$mcommon/info/exclude"'
 
+# D11: a clone linked by an earlier version of the script holds a bare `.npmrc` line outside any
+# block. `link` must not add a duplicate of it inside the block, and both `link` and `unlink`
+# name it with the command that removes it, while leaving the line itself alone.
+legacy="$WORK/legacy"
+git init -q "$legacy"
+cp "$WORK/main/package.json" "$legacy/package.json"
+git -C "$legacy" add -A && git -C "$legacy" commit -q -m init
+lcommon="$(git -C "$legacy" rev-parse --git-common-dir)"
+case "$lcommon" in /*) ;; *) lcommon="$legacy/$lcommon" ;; esac
+printf '.npmrc\n' >> "$lcommon/info/exclude"
+if link "$legacy"; then pass "link succeeds over a bare legacy exclude line"; else fail "link over a legacy line failed: $(tail -5 "$WORK/out")"; fi
+check "link adds no duplicate of the bare legacy line" '[ "$(grep -cxF .npmrc "$lcommon/info/exclude")" = 1 ]'
+check "the .npmrc stays ignored by git through the legacy line" 'git -C "$legacy" check-ignore -q -- .npmrc'
+check "link names the legacy line" 'grep -q "entries outside the managed block" "$WORK/out" && grep -qx "    .npmrc" "$WORK/out"'
+unlink_project "$legacy"
+check "unlink names the legacy line" 'grep -q "entries outside the managed block" "$WORK/out" && grep -qx "    .npmrc" "$WORK/out"'
+check "unlink leaves the legacy line in place" 'grep -qxF .npmrc "$lcommon/info/exclude"'
+cleanup_cmd="$(sed -n 's/^    grep -vxF /grep -vxF /p' "$WORK/out")"
+check "the notice carries one cleanup command" '[ "$(printf "%s\n" "$cleanup_cmd" | grep -c .)" = 1 ]'
+eval "$cleanup_cmd"
+check "the printed cleanup command removes the legacy line" '! grep -qxF .npmrc "$lcommon/info/exclude"'
+unlink_project "$legacy"
+check "with no legacy line left, unlink prints no notice" '! grep -q "entries outside the managed block" "$WORK/out"'
+
 # The assertion: an .npmrc git does not ignore makes link fail.
 git -C "$WORK/main" worktree add -q "$WORK/wt2" -b linked2
 # A global excludes file is not what we control, so defeat the ignore by negating it in .gitignore.

From 8919e763a4ebf1ba3592ba2fa8a88350a7ee9dd6 Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 06:10:06 -0400
Subject: [PATCH 7/8] no-mistakes(review): Make legacy-exclude cleanup command
 robust and hedge notice

---
 docs/features/prerelease.md              |  3 ++-
 tools/prerelease/prerelease-link.sh      |  7 ++++---
 tools/prerelease/test-prerelease-link.sh | 21 ++++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/docs/features/prerelease.md b/docs/features/prerelease.md
index b1db4c10b..2131f79d6 100644
--- a/docs/features/prerelease.md
+++ b/docs/features/prerelease.md
@@ -177,7 +177,8 @@ unlinked too. A clone linked by an earlier version of the script holds those ent
 lines outside any block, which `unlink` cannot tell from a line a user added. `link` and
 `unlink` name such lines and print the one command that removes them, and leave them in
 place; `link` does not add a second copy inside the block while one is there. Run that
-command once no worktree of the clone is linked. Files that *are* tracked by definition
+command once no worktree of the clone is linked, after taking out of it any line you added
+yourself. Files that *are* tracked by definition
 (`pyproject.toml`, `pom.xml`) get a loud warning instead — there is no way to make an edit
 to a tracked file uncommittable, which is precisely why the detector in §5 exists.
 
diff --git a/tools/prerelease/prerelease-link.sh b/tools/prerelease/prerelease-link.sh
index d673ccae9..9e19558d3 100755
--- a/tools/prerelease/prerelease-link.sh
+++ b/tools/prerelease/prerelease-link.sh
@@ -267,15 +267,16 @@ legacy_exclude_notice() {
   [ -n "$ex" ] && [ -f "$ex" ] || return 0
   stale="$(written_exclude_paths | sort -u | grep -xF -f <(exclude_outside_lines "$ex") || true)"
   [ -n "$stale" ] || return 0
-  warn "$ex holds entries outside the managed block that name files this script writes"
-  warn "(left by an earlier version of it); unlink never removes a line it did not put in its block:"
+  warn "$ex holds entries outside the managed block that name files this script writes."
+  warn "They may have been left by an earlier version of this script; keep any you added yourself."
+  warn "unlink never removes a line it did not put in its block:"
   cmd="grep -vxF"
   while IFS= read -r p; do
     printf '    %s\n' "$p"
     cmd+=" -e $(printf '%q' "$p")"
   done <<< "$stale"
   say "once no work tree of this clone is linked, remove them with:"
-  say "  $cmd $(printf '%q' "$ex") > $(printf '%q' "$ex.tmp") && mv $(printf '%q' "$ex.tmp") $(printf '%q' "$ex")"
+  say "  { $cmd $(printf '%q' "$ex") || [ \$? -eq 1 ]; } > $(printf '%q' "$ex.tmp") && mv $(printf '%q' "$ex.tmp") $(printf '%q' "$ex")"
 }
 
 # Keep an untracked managed file out of commits without touching the shared .gitignore or any
diff --git a/tools/prerelease/test-prerelease-link.sh b/tools/prerelease/test-prerelease-link.sh
index 002665eea..040b5dbfb 100755
--- a/tools/prerelease/test-prerelease-link.sh
+++ b/tools/prerelease/test-prerelease-link.sh
@@ -173,13 +173,32 @@ check "link names the legacy line" 'grep -q "entries outside the managed block"
 unlink_project "$legacy"
 check "unlink names the legacy line" 'grep -q "entries outside the managed block" "$WORK/out" && grep -qx "    .npmrc" "$WORK/out"'
 check "unlink leaves the legacy line in place" 'grep -qxF .npmrc "$lcommon/info/exclude"'
-cleanup_cmd="$(sed -n 's/^    grep -vxF /grep -vxF /p' "$WORK/out")"
+cleanup_command() { sed -n 's/^    { grep -vxF /{ grep -vxF /p' "$WORK/out"; }
+cleanup_cmd="$(cleanup_command)"
 check "the notice carries one cleanup command" '[ "$(printf "%s\n" "$cleanup_cmd" | grep -c .)" = 1 ]'
 eval "$cleanup_cmd"
 check "the printed cleanup command removes the legacy line" '! grep -qxF .npmrc "$lcommon/info/exclude"'
 unlink_project "$legacy"
 check "with no legacy line left, unlink prints no notice" '! grep -q "entries outside the managed block" "$WORK/out"'
 
+# A clone made without git's templates had its exclude file created by the earlier script, so
+# the legacy line is all it holds. The printed command must still remove it: `grep -v` that
+# selects nothing exits 1, which is not a failure here.
+bare="$WORK/bare-legacy"
+git init -q "$bare"
+cp "$WORK/main/package.json" "$bare/package.json"
+git -C "$bare" add -A && git -C "$bare" commit -q -m init
+bcommon="$(git -C "$bare" rev-parse --git-common-dir)"
+case "$bcommon" in /*) ;; *) bcommon="$bare/$bcommon" ;; esac
+printf '.npmrc\n' > "$bcommon/info/exclude"
+link "$bare" || fail "link over an exclude file holding only the legacy line failed: $(tail -5 "$WORK/out")"
+unlink_project "$bare"
+cleanup_cmd="$(cleanup_command)"
+check "the notice names a cleanup command when the legacy line is the whole file" '[ -n "$cleanup_cmd" ]'
+eval "$cleanup_cmd" || fail "the printed cleanup command failed on an exclude file holding only the legacy line"
+check "the cleanup command removes a legacy line that is the whole file" '! grep -qxF .npmrc "$bcommon/info/exclude"'
+check "the cleanup command leaves no temporary file behind" '[ ! -e "$bcommon/info/exclude.tmp" ]'
+
 # The assertion: an .npmrc git does not ignore makes link fail.
 git -C "$WORK/main" worktree add -q "$WORK/wt2" -b linked2
 # A global excludes file is not what we control, so defeat the ignore by negating it in .gitignore.

From d0a7a3d1609eb2328aa0d4132facbafa23a67dc9 Mon Sep 17 00:00:00 2001
From: Doug Mealing <doug@dougmealing.com>
Date: Sat, 17 Oct 2026 06:40:30 -0400
Subject: [PATCH 8/8] no-mistakes(document): docs: align detector check count
 with generatedBy check

---
 tools/prerelease/detect-prerelease-pins.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/prerelease/detect-prerelease-pins.sh b/tools/prerelease/detect-prerelease-pins.sh
index da382a2f5..4b86d7b53 100755
--- a/tools/prerelease/detect-prerelease-pins.sh
+++ b/tools/prerelease/detect-prerelease-pins.sh
@@ -33,6 +33,8 @@
 #    groupId and the version live on different lines (or behind a property), so a
 #    same-line match cannot see it. The project's OWN 1.0.0-SNAPSHOT version is normal
 #    and is deliberately not flagged.
+# 6. A pre-release `generatedBy` in .metaobjects/.agent-context.json, a committed file
+#    that `meta init` stamps with the running CLI's version.
 #
 # Pure text scan: no network, no package manager, no toolchain.
 set -uo pipefail
@@ -50,7 +52,7 @@ NS_RE='@metaobjectsdev/|com\.metaobjects|(^|[^A-Za-z])MetaObjects(\.|"|<|$)|(^|[
 # Without it, check 1 cannot run. It is announced rather than skipped in silence — a
 # guard that says nothing when it does not run is indistinguishable from one that ran and
 # found nothing, which is the failure mode this whole script exists to prevent. The other
-# four checks are host-independent and still run; check 3 in particular catches a
+# five checks are host-independent and still run; check 3 in particular catches a
 # pre-release PIN regardless of where it came from.
 CFG="$(cd "$(dirname "$0")" && pwd)/registry.env"
 # shellcheck source=/dev/null