bplatz · Oct 6, 2026 · Sep 30, 2026 · Sep 30, 2026 · Sep 30, 2026 · Sep 30, 2026
diff --git a/BENCHMARKING.md b/BENCHMARKING.md
@@ -86,8 +86,6 @@ this table, so it is the one that rots. Add a row when you add a bench file.
 | `fluree-db-api` | `query_hot_property_path.rs` | Hot-cache SPARQL property paths, one scenario per execution mode of the operator (`*` closure, sequence, `?`, …) |
 | `fluree-db-api` | `query_hot_whole_graph_agg.rs` | Cypher aggregate folds from `fast_whole_graph_agg` (whole-graph + class scalars, histograms) against a linear-cost pipeline baseline |
 | `fluree-db-api` | `query_overlay_matrix.rs` | The same query shapes at four ledger conditions — base / overlay / cached / novelty — so the columnar+novelty merge lane and a cached handle's steady state after background indexing have coverage |
-| `fluree-db-api` | `annotation_hydration.rs` | `inject_annotations` hydration cost: index scan vs sealed annotation arena |
-| `fluree-db-api` | `annotation_planner.rs` | Planner direction for `f:reifies*` edge-annotation queries: arena-informed row counts vs HLL-only stats |
 | `fluree-db-query` | `vector_math.rs` | SIMD vs scalar dot/L2/cosine micro-bench |
 | `fluree-db-spatial` | `spatial_bench.rs` | S2 covering build + within/intersects/radius latency |
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/audit/burn-down/sparql12-wave2-triple-terms.md b/docs/audit/burn-down/sparql12-wave2-triple-terms.md
@@ -349,9 +349,13 @@ schedule the eval epic. Verified against the core:
   triple term a single `Sid`/`u64` arena handle inside `FlakeValue`/`Binding` so
   the row width and cache footprint of the scan/join path don't grow. Guard with
   `query_hot_bsbm` / `query_hot_bsbm_bi`.
-- **`Opst` (object-leading index) is documented refs-only**
-  (`comparator.rs:30,79-83`). Looking up a triple-term object by value needs
-  index-selection work too.
+- **`Opst` (object-leading index) holds every object type**, segmented by
+  `o_type` (`fluree-db-core/src/comparator.rs`, module doc). `IndexType::for_query`
+  gates OPST on `o_is_ref` as a conservative default only; `BinaryScanOperator`
+  already takes OPST for any constant object. A triple-term object therefore
+  needs its own `o_type` partition and index-selection work, not a refs-only
+  exception. (An earlier revision of this memo called OPST refs-only; that was
+  stale.)
 
 **Net:** comparator functions are largely safe (raw-byte compare); the cost and
 risk are in the **enum/encoder/decoder/hash/Display arms + a new arena + enum

diff --git a/docs/cli/export.md b/docs/cli/export.md
@@ -22,7 +22,7 @@ fluree export [LEDGER] [OPTIONS]
 | `--all-graphs` | Export the default graph plus every named graph (dataset export). Requires `--format trig` or `--format nquads`. The ledger's system graphs are excluded — see `--system-graphs`. |
 | `--system-graphs` | Also emit the ledger's system graphs (`#txn-meta`, `#config`) under `--all-graphs`. Diagnostic only. |
 | `--graph <IRI>` | Export a specific named graph by IRI. Mutually exclusive with `--all-graphs`. |
-| `--raw-reifies` | Emit edge annotations as raw `f:reifies*` system triples instead of RDF 1.2 annotation syntax (pre-4.2 output). |
+| `--raw-reifies` | Write each edge annotation as its stored link, `r rdf:reifies <<( s p o )>>`, instead of annotation syntax on the base edge. JSON-LD keeps `@annotation`. |
 | `--context <JSON>` | JSON-LD context for prefix declarations. Overrides the ledger's default context. |
 | `--context-file <FILE>` | Read context from a JSON file. Overrides the ledger's default context. |
 | `--at <TIME>` | Export data as of a specific point in time. `t:<N>` (transaction number), `t:latest` or `latest`, `time:<ISO-8601>` (commit event time), `recorded:<ISO-8601>` (the wall-clock time the commit was recorded), or `commit:<hex-prefix>`. A bare transaction number, ISO-8601 timestamp or commit prefix also works; a commit prefix must be at least 6 characters in either spelling; a bare integer is read as a transaction number, so use `commit:<prefix>` to force an all-digit prefix. If omitted, exports at the latest committed time (including data committed but not yet persisted to index). |
@@ -61,9 +61,9 @@ Every ledger has two system graphs, `urn:fluree:<ledger>:main#txn-meta` (commit
 
 ### Edge annotations (RDF 1.2)
 
-An edge annotation attaches a reifier to one specific triple: `ex:alice ex:knows ex:bob ~ ex:claim1 {| ex:confidence 0.8 |}`. Fluree stores that as seven reserved `f:reifies*` system facts plus the reifier's own properties. Export used to emit those system facts verbatim — output no other RDF 1.2 tool understands, and which Fluree's own insert and update surfaces reject as system-controlled predicates.
+An edge annotation attaches a reifier to one specific triple: `ex:alice ex:knows ex:bob ~ ex:claim1 {| ex:confidence 0.8 |}`. Fluree stores that as the RDF 1.2 link `ex:claim1 rdf:reifies <<( ex:alice ex:knows ex:bob )>>` plus the reifier's own properties.
 
-Export now emits annotation syntax by default:
+Export emits annotation syntax by default:
 
 | Format | Output |
 |---|---|
@@ -80,19 +80,17 @@ ex:claim1
     ex:confidence "0.8"^^xsd:decimal .
 ```
 
-`--raw-reifies` restores the pre-4.2 output. That output only re-imports through `fluree create --from`; the insert and update surfaces reject hand-written `f:reifies*` triples.
+`--raw-reifies` writes the links as triples instead — `ex:claim1 rdf:reifies <<( ex:alice ex:knows ex:bob )>> .` in every RDF format — which also re-imports identically.
 
-A ledger that has never carried an annotation pays nothing for any of this: export reads one flag on the snapshot and runs the scan it always ran.
+A ledger that has never carried an annotation pays nothing for any of this: export reads one flag on the snapshot and runs the scan it always ran. One that has reads its links once, up front, so the markers can be written as the scan reaches each base edge.
 
-**Known limit.** Annotations written *inside a named graph* are resolved correctly when export reads them from the sealed annotation arena or from the novelty overlay. They are dropped when export falls back to the **base-index scan**, which is blind to them — the fallback taken by a ledger whose index reports annotations but for which no arena was sealed. SPARQL reads them in every case. Export says so rather than dropping them quietly:
+Export reports a link it suppressed for annotation syntax without writing the matching `~ <r>` marker, rather than dropping it quietly:
 
 ```
   warning: 1 edge annotations could not be resolved and are NOT in the output;
-           re-run with --raw-reifies to emit them as f:reifies* triples
+           re-run with --raw-reifies to emit them as rdf:reifies triples
 ```
 
-`FLUREE_EXPORT_ANNOTATION_SCAN=1` forces the base-index scan in place of the sealed annotation arena — how to compare the two sources without rebuilding an index. They agree except on annotations inside a named graph, which the arena resolves and the scan cannot see; forcing the scan on such a ledger produces the warning above.
-
 ### Prefixes / Context
 
 Turtle, TriG, and JSON-LD output use prefix compaction to produce compact, readable output. The prefix map is resolved in this order:

diff --git a/docs/cli/info.md b/docs/cli/info.md
@@ -29,6 +29,7 @@ For ledgers, displays:
 - Ledger ID, branch, and type
 - Current transaction number (t)
 - Commit and index details
+- A warning when the ledger holds edge annotations and its index was built by a release before RDF 1.2 triple-term links: those annotations cannot be read until [`fluree reindex`](reindex.md). The `ledger-info` JSON carries `"needs-link-reindex": true` in its `ledger` block for the same case.
 
 For graph sources (Iceberg, R2RML, BM25, etc.), displays:
 - Name, branch, and type

diff --git a/docs/cli/server-integration.md b/docs/cli/server-integration.md
@@ -1099,7 +1099,7 @@ non-zero, so a clean export carries none of them.
 | Header | Meaning |
 |--------|---------|
 | `x-fluree-export-named-graphs-omitted` | User-visible named graphs the ledger holds that this export did not cover — set when a dataset format ran without `all_graphs`. |
-| `x-fluree-export-annotations-unresolved` | Edge annotations that could not be represented and are **not** in the body. Re-request with `raw_reifies` to get them as `f:reifies*` triples. |
+| `x-fluree-export-annotations-unresolved` | Edge annotations that could not be represented and are **not** in the body. Re-request with `raw_reifies` to get them as `rdf:reifies` triples. |
 | `x-fluree-export-annotations-out-of-scope` | Reifiers the body names with a `~ <r>` marker whose own properties this export does not contain. The annotation is usable only against a wider export. |
 | `x-fluree-export-rows-skipped` | Rows the writer could not represent (unresolvable predicate id, or a value that decoded to null). |
 
@@ -2111,14 +2111,14 @@ Content-Type: application/json
 | `format` | string | No | `"turtle"` | One of: `turtle`/`ttl`, `ntriples`/`nt`, `nquads`/`n-quads`, `trig`, `jsonld`/`json-ld`/`json`. Case-insensitive. |
 | `all_graphs` | bool | No | `false` | Export every user-visible named graph as a dataset. Requires `format` ∈ `trig` / `nquads`. Mutually exclusive with `graph`. The ledger's system graphs (`#txn-meta`, `#config`) are excluded. |
 | `system_graphs` | bool | No | `false` | Also emit the system graphs under `all_graphs`. Diagnostic only — the result is named for the source ledger and does not re-import cleanly. |
-| `raw_reifies` | bool | No | `false` | Emit edge annotations as raw `f:reifies*` triples instead of RDF 1.2 annotation syntax. The escape hatch the `x-fluree-export-annotations-unresolved` header points at, and the way to keep pre-4.2 bytes. |
+| `raw_reifies` | bool | No | `false` | Write each edge annotation as its stored link, `r rdf:reifies <<( s p o )>>`, instead of annotation syntax on the base edge; JSON-LD keeps `@annotation`. The escape hatch the `x-fluree-export-annotations-unresolved` header points at. |
 | `graph` | string | No | — | IRI of a single named graph to export. Mutually exclusive with `all_graphs`. |
 | `context` | object | No | ledger default | Prefix map for Turtle/TriG/JSON-LD output. Either a bare object (`{ "ex": "..." }`) or `{ "@context": {...} }`. Falls back to the ledger's stored default context when absent. |
 | `at` | string | No | latest | Time spec — `t:<N>` (transaction number), `t:latest` or `latest`, `time:<ISO-8601>` (commit event time; `iso:<ISO-8601>` is an alias, and the spelling the CLI sends), `recorded:<ISO-8601>` (the wall-clock time the commit was recorded), or `commit:<hex-prefix>`. A bare transaction number, ISO-8601 timestamp or commit prefix also works; a commit prefix must be at least 6 characters in either spelling; a bare integer is read as a transaction number, so use `commit:<prefix>` to force an all-digit prefix. Identical to the local `--at` flag. |
 
 An empty body is accepted and treated as all-default (Turtle export at HEAD).
 
-**Breaking change in 4.2.** Response bodies now carry RDF 1.2 annotation syntax for edge annotations — `s p o ~ <r>` in Turtle and TriG, a triple term under `rdf:reifies` in N-Triples and N-Quads, `@annotation` in JSON-LD — where previous versions emitted the underlying `f:reifies*` triples. A consumer that parsed those triples directly will not find them. Set `raw_reifies` to keep the old bytes.
+**Breaking change in 4.2.** Response bodies now carry RDF 1.2 annotation syntax for edge annotations — `s p o ~ <r>` in Turtle and TriG, a triple term under `rdf:reifies` in N-Triples and N-Quads, `@annotation` in JSON-LD — where previous versions emitted the underlying `f:reifies*` triples. A consumer that parsed those triples directly will not find them; `raw_reifies` writes the `rdf:reifies` links as triples instead.
 
 ### Auth