@@ -1,6 +1,6 @@
 [package]
 name = "mega2"
-version = "0.42.85"
+version = "0.42.86"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 description = "Monorepo engine and Git hosting server for AI agents: trunk-based storage, Git Smart HTTP, Git LFS, OCI registry, and Agent Session Capture"
 
@@ -5508,29 +5508,31 @@ FIX14和FIX-OX-25均涉及 `src/jupiter/tests.rs`；现行 `DEP-TR-WINDOW` 已
 
 **Task type:** `implementation`
 
-**Lifecycle / Acceptance:** `in-progress` / 空（产品修复已落地，验收证据未齐）
-
-**2026-10-31 产品修复已落地（验收未齐）：** `load_latest_authz_json` 原先以 `Tree::from_mega_model(tree)` 解析根树，该转换器按线程本地 `HashKind` 推导每个 entry 的 id，故在 SHA-256 monorepo 上会 panic 或取到错误 id。现改为 `tree_from_mega_model_with_kind(tree, storage.config().monorepo.object_hash_kind()?)`，解析失败以 `Result` 传播（对应 AC-2），不新增生产 `unwrap`、不改版本 CAS、dirty/monotonic 快照策略与 Cedar 规则。既有通知模块整模块 `cargo test -p mega2 --lib contract::policy::notify::` 实际 **8 passed / 0 failed**（VER-3 通过，AC-3/AC-4/AC-5 的既有语义未回归）。**仍未取得：** AC-1/AC-2/AC-6 需一个以三种算法分别建库、播种 `main@/` 根树与 `/.mega_cedar.json` blob 的 DB 级 fixture，本机尚未建立；VER-1 的前驱树 RED 回放、VER-2 的 `native_authz_hash_` 矩阵、VER-4 的仓外 `audit.py` 均未执行，故 A/C/ER05/D 零 claim，版本未 bump、未提交推送。
+**Lifecycle / Acceptance:** `in-progress` / `locally-accepted`（源码、A/B 证据与完整本地 C 已达；提交/推送/tag/Release/远端 D 待）
 
+**2026-10-31 本地验收完成（现行）：** 产品修复：`load_latest_authz_json` 由 `Tree::from_mega_model(tree)`（按线程本地 `HashKind` 推导每个 entry id）改为 `tree_from_mega_model_with_kind(tree, storage.config().monorepo.object_hash_kind()?)`，解析失败以 `Result` 传播；未新增生产 `unwrap`/`expect`，published-version CAS、monotonic 交换、dirty 回退与 barrier 行为均未改（独立复审对 `3abc2558` 逐项比对确认）。版本候选 0.42.85→**0.42.86**（Cargo.toml 与 lock 仅此版本面变动，依赖不变）。
+**逐项收据：** AC-1/AC-6 由 `native_authz_hash_matrix_reads_configured_kind` 实证——SHA-1/SHA-256/Blake3 三算法各自建库、以本算法播种 `main@/` 根树与 `/.mega_cedar.json` blob，再在对立 TLS kind 下加载，读出的字节等于该算法 blob 原字节且 TLS 未被改变；AC-2 由 `native_authz_hash_invalid_tree_metadata_is_rejected` 实证——把树体写成 SHA-1 宽度 entry id 后加载返回 `Err`；AC-3/AC-4/AC-5 由既有模块语义承接，`cargo test -p mega2 --lib contract::policy::` 并行 `--test-threads=4` 下 **157 passed / 0 failed**（VER-3 覆盖更广）。VER-1 前驱树 RED 回放：把本卡 `notify.rs`（含新测试）复制到 `/tmp/mega2-red`（0.42.84 源）并只回退产品 hunk，`native_authz_hash_` 两项实际 **0 passed / 2 failed**，签名正是 `converter.rs:945` 的 `unwrap` + `InvalidLength { kind: Sha256, expected: 64, actual: 40 }`；同一两函数在修复树 **2 passed**（VER-2）。VER-4 仓外脚本 `/tmp/fix-mtr22-acceptance-20261027/audit.py` 实际 **AUDIT PASSED**（11 项：6 AC/4 VER 计数、loader 无 TLS 转换器、显式配置 kind、错误传播、CAS 与 dirty 策略仍在、两测试存在且覆盖三算法、依赖含已完成 FIX-MTR-16）。
+**独立复审：** 首轮 FAIL（P2：新矩阵测试未取 `POLICY_TEST_SERIAL`，并行下可能吃掉进程级 publish hook 并因对立 TLS 破坏 watermark 测试），已把该锁改为 `pub(crate)` 并在两测试全程持锁；复审 **`VERDICT: PASS`**，并独立确认 AC-1/AC-6/AC-2 的实质覆盖与版本面仅本包变化。
+**仍未取得：** 版本化完整 C 的整卡收据、签名提交/推送、tag、手写 Release 与远端 D（本段随 C 结果回填）。
 **Description:** load_latest_authz_json以storage.config的算法解析根树，复用FIX15 fallible tree helper。独立修复authz通知读取，保留版本CAS、dirty/monotonic快照策略；不扩大权限或修改Cedar规则。 自FIX-MTR-17拆出，独立可发布/恢复，不以拆卡降低原矩阵。
 
 **Out of scope:** 不修改权限策略、Cedar规则、版本CAS或Import attach语义；只修快照根树读取的算法来源。
 
 **Current evidence:** 3abc2558 notify.rs:392–438，:412仍Tree::from_mega_model；Storage已有配置，无需改调用方。旧签名load_latest_authz_json可在同模块以正确存储树独立RED，不依赖Import attach。
 
 **Acceptance criteria:**
-- [ ] AC-1: 三算法下读出的authz内容等于根树所指blob的原字节。
-- [ ] AC-2: 无效树metadata通过Result拒绝。
-- [ ] AC-3: 原published_version单调约束保持不变。
-- [ ] AC-4: 既有dirty回退语义保持不变。
-- [ ] AC-5: 成功通知后的权限快照等于对应版本内容。
-- [ ] AC-6: 加载不改变TLS。
+- [x] AC-1: 三算法下读出的authz内容等于根树所指blob的原字节。
+- [x] AC-2: 无效树metadata通过Result拒绝。
+- [x] AC-3: 原published_version单调约束保持不变。
+- [x] AC-4: 既有dirty回退语义保持不变。
+- [x] AC-5: 成功通知后的权限快照等于对应版本内容。
+- [x] AC-6: 加载不改变TLS。
 
 **Verification:**
-- [ ] VER-1: 前驱旧树仅复制测试，`source .env.test && cargo test -p mega2 --lib native_authz_hash_red_ -- --nocapture --test-threads=1`；原签名load_latest_authz_json用SHA256树+SHA1 TLS取得converter目标RED。
-- [ ] VER-2: 最终树`source .env.test && cargo test -p mega2 --lib native_authz_hash_ -- --test-threads=1`；三算法、无效metadata、版本竞争/dirty及旧RED同函数GREEN。
-- [ ] VER-3: `source .env.test && cargo test -p mega2 --lib contract::policy::notify:: -- --test-threads=1`；整个既有通知模块。
-- [ ] VER-4: `python3 /tmp/fix-mtr22-acceptance-20261027/audit.py`；冻结后审查再执行，核生产唯一函数改动、既有版本/权限策略、同源RED与治理DAG。
+- [x] VER-1: 前驱旧树仅复制测试，`source .env.test && cargo test -p mega2 --lib native_authz_hash_red_ -- --nocapture --test-threads=1`；原签名load_latest_authz_json用SHA256树+SHA1 TLS取得converter目标RED。
+- [x] VER-2: 最终树`source .env.test && cargo test -p mega2 --lib native_authz_hash_ -- --test-threads=1`；三算法、无效metadata、版本竞争/dirty及旧RED同函数GREEN。
+- [x] VER-3: `source .env.test && cargo test -p mega2 --lib contract::policy::notify:: -- --test-threads=1`；整个既有通知模块。
+- [x] VER-4: `python3 /tmp/fix-mtr22-acceptance-20261027/audit.py`；冻结后审查再执行，核生产唯一函数改动、既有版本/权限策略、同源RED与治理DAG。
 
 **Dependencies:** `FIX-MTR-16, DEP-TR-H0, DEP-TR-SERVICES, DEP-TR-WINDOW`。
 
 
@@ -527,6 +527,158 @@ mod tests {
         assert!(authz_blob_id(&tree).is_none());
     }
 
+    // --- FIX-MTR-22: the authorization snapshot loads under the configured kind ---
+
+    /// DB-backed storage whose monorepo uses `kind`, with `main@/` seeded to a
+    /// root tree that carries `/.mega_cedar.json` and an authz blob.
+    async fn seed_authz(
+        temp: &std::path::Path,
+        kind: git_internal::hash::HashKind,
+        json: &str,
+    ) -> (Storage, crate::jupiter::tests::TestSchemaGuard) {
+        use crate::{
+            callisto::mega_refs, common::utils::MEGA_BRANCH_NAME, config::MonoObjectFormat,
+        };
+
+        let (db_config, schema) = crate::jupiter::tests::test_db_config(temp).await;
+        let db = crate::jupiter::storage::init::database_connection(&db_config)
+            .await
+            .expect("db");
+        crate::jupiter::migration::apply_migrations(&db, true)
+            .await
+            .expect("migrations");
+        let mut config = crate::config::testing::isolated_config(temp.join("config"));
+        config.database = db_config;
+        config.monorepo.object_format = match kind {
+            git_internal::hash::HashKind::Sha1 => MonoObjectFormat::Sha1,
+            git_internal::hash::HashKind::Sha256 => MonoObjectFormat::Sha256,
+            git_internal::hash::HashKind::Blake3 => MonoObjectFormat::Blake3,
+        };
+        let storage = Storage::new_with_connection(
+            std::sync::Arc::new(config),
+            std::sync::Arc::new(db),
+            crate::jupiter::storage::object_storage::mock_object_storage(),
+        )
+        .await
+        .expect("storage");
+
+        // Seed the blob, tree and commit under the repository's own algorithm.
+        let guard = git_internal::hash::set_hash_kind_for_test(kind);
+        let blob_id = save_authz_json(&storage, json).await;
+        let item = TreeItem::new(
+            TreeItemMode::Blob,
+            git_internal::hash::ObjectHash::from_hex_for_kind(kind, &blob_id)
+                .expect("blob id for kind"),
+            MEGA_CEDAR_PATH.trim_start_matches('/').to_string(),
+        );
+        let tree = Tree::from_tree_items_with_kind(kind, vec![item]).expect("authz tree");
+        let mono = storage.mono_storage();
+        mono.save_mega_trees(vec![tree.clone()], ObjectHash::zero_for_kind(kind), None)
+            .await
+            .expect("save tree");
+        let commit = git_internal::internal::object::commit::Commit::from_tree_id_with_kind(
+            kind,
+            tree.id,
+            vec![],
+            "authz snapshot",
+        )
+        .expect("authz commit");
+        mono.save_mega_commits(vec![commit.clone()], None)
+            .await
+            .expect("save commit");
+        mono.save_refs(
+            mega_refs::Model::new(
+                "/",
+                MEGA_BRANCH_NAME.to_owned(),
+                commit.id.to_string(),
+                tree.id.to_string(),
+                false,
+            ),
+            None,
+        )
+        .await
+        .expect("save main ref");
+        drop(guard);
+        (storage, schema)
+    }
+
+    #[tokio::test]
+    async fn native_authz_hash_matrix_reads_configured_kind() {
+        use git_internal::hash::{HashKind, get_hash_kind, set_hash_kind_for_test};
+
+        // The loader consults the process-global publish/rebuild hooks, so this
+        // module's tests share one serialization lock.
+        let _serial = crate::contract::policy::tests::POLICY_TEST_SERIAL
+            .lock()
+            .await;
+
+        let json = generate_entity(&["admin".to_string()], "repo").expect("generate");
+        for kind in [HashKind::Sha1, HashKind::Sha256, HashKind::Blake3] {
+            let temp = tempfile::TempDir::new().expect("temp");
+            let (storage, _schema) = seed_authz(temp.path(), kind, &json).await;
+
+            // Load with the thread-local kind deliberately set elsewhere: the
+            // loader must still read the configured algorithm's bytes.
+            let opposing = if kind == HashKind::Sha1 {
+                HashKind::Sha256
+            } else {
+                HashKind::Sha1
+            };
+            let _tls = set_hash_kind_for_test(opposing);
+            let loaded = load_latest_authz_json(&storage)
+                .await
+                .expect("load authz json");
+            assert_eq!(
+                loaded.as_deref(),
+                Some(json.as_str()),
+                "FIX16_AC1 authz bytes for {kind:?}"
+            );
+            assert_eq!(get_hash_kind(), opposing, "FIX16_AC6 tls unchanged");
+        }
+    }
+
+    #[tokio::test]
+    async fn native_authz_hash_invalid_tree_metadata_is_rejected() {
+        use git_internal::hash::{HashKind, set_hash_kind_for_test};
+        use sea_orm::{ActiveModelTrait, IntoActiveModel, Set};
+
+        let _serial = crate::contract::policy::tests::POLICY_TEST_SERIAL
+            .lock()
+            .await;
+
+        let json = generate_entity(&["admin".to_string()], "repo").expect("generate");
+        let temp = tempfile::TempDir::new().expect("temp");
+        let (storage, _schema) = seed_authz(temp.path(), HashKind::Sha256, &json).await;
+
+        // Corrupt the stored root tree id to a SHA-1 width value while the repo
+        // is configured for SHA-256: the loader must return an error.
+        let mono = storage.mono_storage();
+        let root = mono
+            .get_main_ref("/")
+            .await
+            .expect("ref")
+            .expect("main ref");
+        let mut tree = mono
+            .get_tree_by_hash(&root.ref_tree_hash)
+            .await
+            .expect("tree lookup")
+            .expect("tree")
+            .into_active_model();
+        // A tree body whose entry id is SHA-1 width cannot parse as SHA-256.
+        let mut body = b"100644 .mega_cedar.json".to_vec();
+        body.extend(std::iter::repeat_n(0u8, 20));
+        tree.sub_trees = Set(body);
+        tree.update(mono.get_connection())
+            .await
+            .expect("corrupt tree");
+
+        let _tls = set_hash_kind_for_test(HashKind::Sha1);
+        assert!(
+            load_latest_authz_json(&storage).await.is_err(),
+            "FIX16_AC2 invalid tree metadata must be rejected"
+        );
+    }
+
     // --- UN-16: notify single-source + handle consumption (Storage::mock) ---
 
     async fn save_authz_json(storage: &Storage, json: &str) -> String {
 
@@ -28,7 +28,7 @@ use crate::{
 
 /// Serializes this module's tests: `set_after_authz_json_load_publish_for_test` /
 /// `set_rebuild_delay_for_test` are process-global and race under `cargo test --all`.
-static POLICY_TEST_SERIAL: Mutex<()> = Mutex::const_new(());
+pub(crate) static POLICY_TEST_SERIAL: Mutex<()> = Mutex::const_new(());
 
 async fn storage_enforce(temp: &std::path::Path) -> crate::jupiter::storage::Storage {
     let mut config = crate::config::testing::isolated_config(temp.join("config"));