Add paired main/full content requirements for 530 frozen tasks (#6)

- Add paired main/full content requirements for 530 frozen tasks (9ddbdad2f6fd90921e31ba2db4902cbdd96772ec)
- Preserve v2.2.0 metadata and validate annotation cohorts separately (5f15e1e4cf6477b81395fee89ffeecb01fd5cdfb)
- Bind annotation publication to its uploaded source revision (0bb8b410a3836c605f5cf3828e0a30faa41a006c)
- fix: integrate v2.2.0 and remove duplicate annotation viewer (048b9962c11ee8518374133203275c306bedb888)
- fix: bind scope annotations to merged Webstone and register publication inputs (289f9011155d322adc68676e94839ac21448e530)
- fix: publish selectable paired content scope annotations (3feb3ff7d8cc8695edbd0a62979dd09e2231469f)
- docs: explain the frozen input default content scope (6ae0fc167a4f3c6228703e7ab75c574bd1accb34)
- Restore original suite order and link merged Webstone PR #268 (5bf15bc6200990c7ea852b54ee22ead190b9ab9f)

README.md

@@ -346,3 +346,24 @@ Cite Webstone and record the exact dataset revision used in your experiment. The
   url = {https://github.com/lexmount/webstone}
 }
 ```
+
+## Main and full content annotations
+
+`content-scopes-530` adds paired `main` and `full` acceptance profiles for the
+existing 530-task `primary-content-20261103` population. It is a separate suite
+selection; the released default population remains 550 tasks with its original
+requirements. Existing tasks, viewer configurations and reference inputs are retained.
+
+The cohort is scored by Webstone [`1287fdf8`](https://github.com/lexmount/webstone/commit/1287fdf859aaac56129933024abdf1246afbcfb7),
+merged from [Webstone PR #268](https://github.com/lexmount/webstone/pull/268).
+Export it with `lexbench-webfetch export --suite content-scopes-530 --source
+<approved-input-directory> --output <new-directory>`. The approved input directory
+must contain the frozen `dataset.json` bound by this suite's `source-inputs.json`.
+Public reference hashes do not replace those inputs.
+
+Use `webstone validate --dataset <exported-dataset.json>
+--content-scope main` or `--content-scope full` before a run. Each run selects one
+scope. The approved input bound by this cohort declares `main` as its default.
+An explicit option overrides a saved scope; annotated tasks without a saved scope
+fall back to `full`. Older suites keep their original rules. The existing manifest tooling pin still describes the
+released edition; the cohort's `implementation` field identifies its scoring code.

definitions.tar.gz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de2be0cf2ab2227b48744c6724c199de9f038b1609aff7c3221ecd4a0d833529
-size 6007006
+oid sha256:62e18ebeec769624fabe696d6d571746a66278657f67de64a03fbecdc6fb2a19
+size 6909656

definitions/evaluation/content-scopes-530/source-inputs.json

@@ -0,0 +1,13 @@
+{
+  "catalog": "dataset-catalog.json",
+  "catalog_sha256": "f3874d8508e4c2d0986c04bc631e17ffd53c1d9385dad1d8b4765e510410644b",
+  "dataset": "dataset.json",
+  "dataset_sha256": "d92958eb95352e72c3774e02df638c52b15b8f325d4713aa1a1eab2072b0e298",
+  "files": {
+    "dataset.json": "d92958eb95352e72c3774e02df638c52b15b8f325d4713aa1a1eab2072b0e298"
+  },
+  "id": "webfetch-content-scopes-530-d92958eb9535",
+  "kind": "frozen_reference_inputs",
+  "schema_version": 2,
+  "trees": {}
+}

definitions/registry.json

@@ -55,6 +55,26 @@
         "dataset-catalog.json": "8e413e683c309674abf3d297df3f378e76d65ead1e2aa343828e4b0e1d90764a",
         "source-inputs.json": "0d9c729f14dae8abb3323a2cf4734736c4733957c9d74d5484033d204642b91b"
       }
+    },
+    {
+      "id": "content-scopes-530",
+      "dataset_id": "webfetch-content-scopes-530",
+      "case_count": 530,
+      "directory": "evaluation/content-scopes-530",
+      "files": {
+        "annotation-provenance.json": "1d414d610700e737f492cf192b2202a1d9f5eeffc17904007e0aac0c644b3a20",
+        "dataset-catalog.json": "f3874d8508e4c2d0986c04bc631e17ffd53c1d9385dad1d8b4765e510410644b",
+        "source-inputs.json": "c76b829b994e8f9cc15cbc1a05018f2cb5135dee6e6f9144e5e3b014434fdbbc",
+        "tasks.json": "6ae76832f1594e410ab36371c7841a5bd6b4fa65dab39bd6496a8f07c5b22b85"
+      },
+      "kind": "annotation_cohort",
+      "source_population": "primary-content-20261103",
+      "implementation": {
+        "pull_request": 268,
+        "repository": "https://github.com/lexmount/webstone",
+        "revision": "1287fdf859aaac56129933024abdf1246afbcfb7",
+        "state": "merged"
+      }
     }
   ]
 }

manifest.json

@@ -1,8 +1,8 @@
 {
   "archive": {
     "path": "definitions.tar.gz",
-    "sha256": "de2be0cf2ab2227b48744c6724c199de9f038b1609aff7c3221ecd4a0d833529",
-    "size": 6007006
+    "sha256": "62e18ebeec769624fabe696d6d571746a66278657f67de64a03fbecdc6fb2a19",
+    "size": 6909656
   },
   "datasets": {
     "access-restrictions": {
@@ -15,6 +15,11 @@
       "path": "evaluation/articles/tasks.json",
       "sha256": "171241ea0bf3cb3f9482de14a7201885733fa717af56d7ea2b28d86a4516a3bb"
     },
+    "content-scopes-530": {
+      "count": 530,
+      "path": "evaluation/content-scopes-530/tasks.json",
+      "sha256": "6ae76832f1594e410ab36371c7841a5bd6b4fa65dab39bd6496a8f07c5b22b85"
+    },
     "dynamic-content": {
       "count": 100,
       "path": "evaluation/dynamic-content-100-moli-webfetch/tasks.json",
@@ -90,12 +95,12 @@
       "size": 43
     },
     "THIRD_PARTY.md": {
-      "sha256": "29b39660057fd164d2f16810b4daffdf4f0f576dc286634ac837cbd8606ddc8e",
-      "size": 2092
+      "sha256": "128f9a608d95e540b0d2d13b3e4bb07af6b67422902bb82355156c2a6c66c3a5",
+      "size": 2084
     },
     "VERSIONING.md": {
-      "sha256": "af4c9b2a2dad75c77272e2cceb39ee2b15c57846f1e353814289bff0b79bcc2e",
-      "size": 4925
+      "sha256": "6d17c2869b68ce7d433272ffa6cbcfeba5b8f56a1c358c4eef53cc4a74e4b121",
+      "size": 4913
     },
     "data/access-restrictions.jsonl": {
       "sha256": "fc4e0a67760198b3001e85ef8c47062e97243a7072c69a6fd34f96063fd2fca3",
@@ -193,6 +198,22 @@
       "sha256": "171241ea0bf3cb3f9482de14a7201885733fa717af56d7ea2b28d86a4516a3bb",
       "size": 1079224
     },
+    "definitions/evaluation/content-scopes-530/annotation-provenance.json": {
+      "sha256": "1d414d610700e737f492cf192b2202a1d9f5eeffc17904007e0aac0c644b3a20",
+      "size": 527178
+    },
+    "definitions/evaluation/content-scopes-530/dataset-catalog.json": {
+      "sha256": "f3874d8508e4c2d0986c04bc631e17ffd53c1d9385dad1d8b4765e510410644b",
+      "size": 419480
+    },
+    "definitions/evaluation/content-scopes-530/source-inputs.json": {
+      "sha256": "c76b829b994e8f9cc15cbc1a05018f2cb5135dee6e6f9144e5e3b014434fdbbc",
+      "size": 477
+    },
+    "definitions/evaluation/content-scopes-530/tasks.json": {
+      "sha256": "6ae76832f1594e410ab36371c7841a5bd6b4fa65dab39bd6496a8f07c5b22b85",
+      "size": 10045875
+    },
     "definitions/evaluation/dataset-catalog.json": {
       "sha256": "994fa53f7fc7c3170692a7bb493ebc5af9ad8ffb5b576c022fa123e6e6fb3838",
       "size": 100357
@@ -362,13 +383,13 @@
       "size": 50741
     },
     "definitions/registry.json": {
-      "sha256": "f3d1d2a38308b269cd06c4e2f408e8fcd211baae848581ce8532930cf3089a8b",
-      "size": 2411
+      "sha256": "da8a56b46c0419134fc954599bdf4bf6762a7459e1c94e24708b4ef1eaaec323",
+      "size": 3310
     }
   },
   "schema": "browser-eval-dataset-release/1",
   "source_repository": "https://huggingface.co/datasets/Lexmount/LexBench-Web-Fetch",
-  "source_revision": "6b3e1e526600eb91efbb7211c409742b1274888f",
+  "source_revision": "6ae0fc167a4f3c6228703e7ab75c574bd1accb34",
   "track": "webfetch",
   "viewer": {
     "configurations": [

tools/rebuild_publication.py

@@ -68,6 +68,19 @@ def publication_files(root):
     return files
 
 
+
+def dataset_bindings(root):
+    registry = json.loads((root / 'definitions/registry.json').read_text())
+    datasets = {}
+    for row in registry['suites']:
+        path = (Path(row['directory']) / 'tasks.json').as_posix()
+        raw = (root / 'definitions' / path).read_bytes()
+        if sha(raw) != row['files']['tasks.json'] or row['id'] in datasets:
+            raise ValueError('Invalid registry dataset bindings')
+        datasets[row['id']] = {'path': path, 'sha256': sha(raw), 'count': row['case_count']}
+    return datasets
+
+
 def rebuild(root, source_revision):
     if not re.fullmatch(r'[0-9a-f]{40}', source_revision):
         raise ValueError('Use a full uploaded source commit, not a local label')
@@ -80,6 +93,7 @@ def rebuild(root, source_revision):
     manifest['files'] = {name: {'sha256': sha(raw), 'size': len(raw)}
                          for name, raw in sorted(files.items())}
     manifest['source_revision'] = source_revision
+    manifest['datasets'] = dataset_bindings(root)
     # Restore the exact edition object after rebuilding hashes; never invent a tag.
     manifest['edition'] = edition
     buffer = io.BytesIO()
@@ -112,6 +126,8 @@ def check(root):
         raw = path.read_bytes()
         if sha(raw) != binding['sha256'] or len(raw) != binding['size']:
             raise ValueError('Changed publication file: ' + name)
+    if manifest.get('datasets') != dataset_bindings(root):
+        raise ValueError('Manifest dataset bindings differ from the registry')
     raw = (root / 'definitions.tar.gz').read_bytes()
     if sha(raw) != manifest['archive']['sha256'] or len(raw) != manifest['archive']['size']:
         raise ValueError('Changed definitions archive')

tools/test_content_scopes.py

@@ -0,0 +1,26 @@
+"""Annotation cohorts add acceptance scopes without changing the released population."""
+from pathlib import Path
+import json
+import unittest
+from test_review_scope import suite_dirs
+
+ROOT = Path(__file__).resolve().parents[1]
+
+class ContentScopesTests(unittest.TestCase):
+    def test_annotations_reuse_population_and_preserve_both_scopes(self):
+        tasks = json.loads((ROOT/'definitions/evaluation/content-scopes-530/tasks.json').read_text())['cases']
+        population = json.loads((ROOT/'definitions/populations/primary-content-20261103.json').read_text())
+        self.assertEqual(len(tasks), 530)
+        self.assertEqual({c['id'] for c in tasks}, {c['suite']+'--'+c['id'] for c in population['cases']})
+        for task in tasks:
+            self.assertEqual(set(task['content_scopes']) - {'version'}, {'main', 'full'})
+        self.assertNotIn('content-scopes-530', suite_dirs())
+        self.assertEqual(set(suite_dirs()), set(population['frozen_task_bindings']))
+
+    def test_annotation_registry_does_not_expand_edition(self):
+        manifest = json.loads((ROOT/'manifest.json').read_text())
+        self.assertEqual(manifest['edition']['task_count'], 550)
+        registry = json.loads((ROOT/'definitions/registry.json').read_text())
+        entry = next(s for s in registry['suites'] if s['id']=='content-scopes-530')
+        self.assertEqual(entry['kind'], 'annotation_cohort')
+        self.assertEqual(entry['source_population'], 'primary-content-20261103')

tools/test_rebuild_publication.py

@@ -14,6 +14,9 @@ class PublicationTests(unittest.TestCase):
         self.root = Path(self.temp.name)
         (self.root/'definitions').mkdir()
         (self.root/'definitions/tasks.json').write_text('{}\n')
+        registry = {'suites': [{'id': 'test', 'directory': '.', 'case_count': 1,
+                               'files': {'tasks.json': sha(b'{}\n')}}]}
+        (self.root/'definitions/registry.json').write_bytes(encoded(registry))
         for name in ['LICENSE','NOTICE','THIRD_PARTY.md','VERSIONING.md']:
             (self.root/name).write_text(name+'\n')
         (self.root/'data').mkdir()
@@ -83,3 +86,20 @@ class PublicationTests(unittest.TestCase):
 
 if __name__=='__main__':
     unittest.main()
+
+
+class AnnotationManifestTests(unittest.TestCase):
+    setUp = PublicationTests.setUp
+    def test_registered_annotation_is_selectable_without_expanding_edition(self):
+        manifest = rebuild(self.root, 'a' * 40)
+        self.assertEqual(manifest['edition']['task_count'], 1)
+        self.assertEqual(manifest['datasets'], {'test': {
+            'count': 1, 'path': 'tasks.json', 'sha256': sha(b'{}\n')}})
+
+    def test_stale_dataset_selection_is_rejected(self):
+        rebuild(self.root, 'a' * 40)
+        manifest = json.loads((self.root/'manifest.json').read_text())
+        manifest['datasets'] = {}
+        (self.root/'manifest.json').write_bytes(encoded(manifest))
+        with self.assertRaisesRegex(ValueError, 'dataset bindings'):
+            check(self.root)

tools/test_review_scope.py

@@ -18,7 +18,12 @@ QUANTA_NAV = {'Physics', 'Mathematics', 'Biology', 'Computer Science', 'Topics',
 
 def suite_dirs():
     registry = json.loads((ROOT / 'definitions/registry.json').read_text())
-    return {row['id']: ROOT / 'definitions' / row.get('directory', row['id']) for row in registry['suites']}
+    population = json.loads((ROOT / 'definitions/populations/primary-content-20261103.json').read_text())
+    parents = set(population['frozen_task_bindings'])
+    suites = {row['id']: ROOT / 'definitions' / row.get('directory', row['id']) for row in registry['suites']}
+    if not parents.issubset(suites):
+        raise ValueError('Frozen revision parent suite is missing')
+    return {name: suites[name] for name in parents}
 
 
 def cases(path):