@@ -59,10 +59,21 @@ under the License.
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Doris shaded Hive MetaStore client (includes Thrift, DLF, Glue) -->
+        <!-- Slim Hive metastore-client shade — replaces the fat org.apache.doris:hive-catalog-shade
+             (122MB). Bundles hive-standalone-metastore (metastore api + client), HiveConf, hive-serde,
+             hive-storage-api, iceberg-hive-metastore's HiveCatalog and libthrift/libfb303 0.9.3, all with
+             org.apache.thrift relocated to shade.doris.hive.org.apache.thrift so the old-package HMS
+             client does not collide with the host doris-gen thrift 0.16. compile scope (no <scope>):
+             propagates transitively to the plugins that reuse this shared plain-HMS client —
+             fe-connector-hive, fe-connector-hudi, fe-connector-iceberg. The vendored version-aware patch
+             HiveMetaStoreClient stays in THIS module (its bytecode already references the relocated thrift
+             prefix; it overlays the unpatched client inside the shade because fe-connector-hms-*.jar sorts
+             before fe-connector-hms-hive-shade-*.jar in the plugin lib). See
+             plan-doc/fe-connector-hive-shade-localization/design.md. -->
         <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>hive-catalog-shade</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>fe-connector-hms-hive-shade</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Hadoop client for Configuration and auth -->
 
@@ -97,8 +97,9 @@ under the License.
              org.apache.parquet.avro.AvroSchemaConverter for hudi's FE-side schema read: TableSchemaResolver
              reads a data file's parquet footer to resolve the table Avro schema
              (ParquetUtils.readAvroSchema -> readSchema -> ParquetFileReader.readFooter(Configuration, Path),
-             then converts the parquet MessageType to Avro). hudi-common bundles NO parquet, and the
-             hive-catalog-shade jar carries only a RELOCATED (org.apache.paimon.shade.*) parquet — so the
+             then converts the parquet MessageType to Avro). hudi-common bundles NO parquet, and no other
+             jar in this plugin (the fe-connector-hms-hive-shade slim shade carries none either) provides an
+             un-relocated org.apache.parquet.hadoop.* — so the
              un-relocated ParquetFileReader would otherwise resolve from the parent 'app' loader while
              ParquetUtils and Configuration come from the child (org.apache.hadoop is child-first here, from the
              bundled hadoop-common) — readFooter's Configuration parameter then splits across two loaders and the
 
@@ -61,8 +61,8 @@ under the License.
         </dependency>
 
         <!-- Shared HMS module: supplies Doris's version-aware org.apache.hadoop.hive.metastore.HiveMetaStoreClient
-             (bundled in fe-connector-hms-*.jar, which sorts before hive-catalog-shade-*.jar in the plugin lib so
-             it shadows the shaded, unpatched client). Required for the hms flavor: without it, iceberg's
+             (bundled in fe-connector-hms-*.jar, which sorts before fe-connector-hms-hive-shade-*.jar in the
+             plugin lib so it shadows the shaded, unpatched client). Required for the hms flavor: without it, iceberg's
              HiveCatalog uses the Hive-3 "@cat#" db-name marker that a Hive-1/2 metastore rejects, so list/get
              database return empty (see HiveMetaStoreClient header). Same module fe-connector-hive reuses. -->
         <dependency>
@@ -127,6 +127,21 @@ under the License.
             <version>2.9.3</version>
         </dependency>
 
+        <!-- iceberg-bundled-guava: needed on the COMPILE classpath for the vendored split-package
+             org.apache.iceberg.DeleteFileIndex (T08), which imports iceberg's relocated guava
+             (org.apache.iceberg.relocated.com.google.common.base/collect). iceberg-core brings this
+             artifact only at RUNTIME scope (so it is in the plugin-zip), and runtime-scoped transitives
+             are not on the compile classpath — the same treatment as caffeine above. Until the fe-connector
+             closure moved off the fat hive-catalog-shade, that shade jar carried these relocated-guava
+             classes at compile scope; the slim fe-connector-hms-hive-shade deliberately excludes
+             iceberg-bundled-guava (iceberg-core already ships it, avoiding a duplicate), so declare it here
+             at compile scope. Same version as iceberg-core, deduped at runtime. -->
+        <dependency>
+            <groupId>org.apache.iceberg</groupId>
+            <artifactId>iceberg-bundled-guava</artifactId>
+            <version>${iceberg.version}</version>
+        </dependency>
+
         <!-- Iceberg AWS integration: the glue flavor's org.apache.iceberg.aws.glue.GlueCatalog + S3FileIO.
              Needs the AWS SDK v2 modules below at runtime. -->
         <dependency>
@@ -135,18 +150,15 @@ under the License.
             <version>${iceberg.version}</version>
         </dependency>
 
-        <!-- Doris shaded Hive MetaStore client (D-059 Q1: DLF port-now). Supplies the hms flavor's
-             org.apache.iceberg.hive.HiveCatalog AND the dlf flavor's reflectively-loaded
-             com.aliyun.datalake.metastore.hive2.ProxyMetaStoreClient, both at their original package wired
-             to a relocated thrift (shade.doris.hive.org.apache.thrift) so the old-package HMS client does
-             NOT collide with the host fe-thrift 0.16. Same dependency fe-connector-hive/hms use; version
-             managed (${doris.hive.catalog.shade.version}). plugin-zip.xml excludes fe-thrift/libthrift so
-             no original-package thrift lands in the plugin (the relocated copy inside the shade is
-             self-contained). -->
-        <dependency>
-            <groupId>org.apache.doris</groupId>
-            <artifactId>hive-catalog-shade</artifactId>
-        </dependency>
+        <!-- The hms-flavor org.apache.iceberg.hive.HiveCatalog is NOT a direct dependency here: it is
+             bundled (with the shared relocated thrift shade.doris.hive.org.apache.thrift) inside
+             fe-connector-hms-hive-shade and reaches this plugin transitively via fe-connector-hms above —
+             the same slim shade that supplies the plain-HMS client, so HiveCatalog and the client link
+             against one identical relocated thrift + metastore-api. The old direct
+             org.apache.doris:hive-catalog-shade dependency (and the dead dlf-flavor ProxyMetaStoreClient
+             it carried) was removed atomically with the hms cutover off the fat shade — see
+             plan-doc/fe-connector-hive-shade-localization/design.md. plugin-zip.xml still excludes
+             fe-thrift/libthrift so no original-package thrift lands in the plugin. -->
 
         <!-- Hadoop for HadoopCatalog and Configuration -->
         <dependency>
 
@@ -46,8 +46,9 @@ under the License.
                 <exclude>org.apache.doris:fe-connector-spi</exclude>
                 <exclude>org.apache.doris:fe-extension-spi</exclude>
                 <exclude>org.apache.doris:fe-filesystem-api</exclude>
-                <!-- Host thrift wins: hive-catalog-shade carries its own relocated thrift, so keep
-                     original-package fe-thrift / libthrift out of the plugin (same as fe-connector-hive). -->
+                <!-- Host thrift wins: the fe-connector-hms-hive-shade slim shade carries its own
+                     relocated thrift (shade.doris.hive.org.apache.thrift), so keep original-package
+                     fe-thrift / libthrift out of the plugin (same as fe-connector-hive). -->
                 <exclude>org.apache.doris:fe-thrift</exclude>
                 <exclude>org.apache.thrift:libthrift</exclude>
                 <!-- QUIC natives are unused: netty-bom force-manages the classifier jars to
 
@@ -52,6 +52,10 @@ under the License.
         <module>fe-connector-trino</module>
         <module>fe-connector-maxcompute</module>
         <module>fe-connector-jdbc</module>
+        <!-- Slim HMS metastore-client shade (relocates org.apache.thrift to
+             shade.doris.hive.org.apache.thrift); MUST build before fe-connector-hms which depends on
+             it. Replaces the fat org.apache.doris:hive-catalog-shade for the fe-connector closure. -->
+        <module>fe-connector-hms-hive-shade</module>
         <module>fe-connector-hms</module>
         <module>fe-connector-hive</module>
         <!-- FIX-C: paimon HMS-thrift shade (relocates org.apache.thrift to a paimon-private
 
@@ -844,6 +844,10 @@ under the License.
                     </exclusion>
                 </exclusions>
             </dependency>
+            <!-- The fat hive-catalog-shade is no longer consumed by any fe/fe-connector module (the plain-HMS
+                 client + iceberg HiveCatalog moved to the slim fe-connector-hms-hive-shade). This version pin
+                 is kept because be-java-extensions (avro-scanner, java-udf) still depend on hive-catalog-shade
+                 — do NOT delete it. -->
             <dependency>
                 <groupId>org.apache.doris</groupId>
                 <artifactId>hive-catalog-shade</artifactId>
 
@@ -0,0 +1,38 @@
+# 🤝 Session Handoff — `fe/fe-connector` 剥离 `hive-catalog-shade`
+
+> **滚动文档**：每次 session 结束**覆盖式更新**，只保留下一个 session 必须的上下文。
+> 完成明细**不落这里**（在 `git log` + [`progress.md`](./progress.md)）。
+> 空间索引 [`README.md`](./README.md) · 设计 [`design.md`](./design.md) · 清单 [`tasklist.md`](./tasklist.md)
+
+---
+
+# ✅ Phase 1+2+3 完成（建精简 shade + 切 hms/iceberg + 静态&打包闸门全绿） → 🆕 下一个 session = **Phase 4：e2e（唯一真闸门）**
+
+> 分支 `catalog-spi-hive-shade-12`。行号信 HEAD 不信文档。代码改动已 commit（见 git log 最新一条）。
+
+## 现状（一句话）
+`fe/fe-connector/` 已整体脱离 122MB 胖 `hive-catalog-shade`，改用自建 15MB 精简 shade 模块 `fe-connector-hms-hive-shade`（只装 Hive 元数据客户端闭包，重定位 thrift→`shade.doris.hive.org.apache.thrift`）。build+UT（197 测试类全绿）、静态闸门（19 模块 dependency:tree 全空）、打包闸门（三插件 zip 无胖 shade、精简 shade 各 1 份、关键类无重复）、多 agent 对抗 review（零 confirmed）**均已过**。**唯一没做的是 e2e。**
+
+## 第一件事（按顺序）
+1. **读** `progress.md` 末段（2026-07-16 Phase 1+2+3 结论，含闸门证据 + 两处现补的缺类）+ `design.md §4`（决策速查）。
+2. **动码/跑测前探并发**（`pgrep -af maven|grep wt-catalog-spi` + 近 90s mtime）。
+3. **重新构建部署产物**跑 e2e（精简 shade 需重打包插件重部署；旧部署目录可能还是胖 shade）。
+
+## 🎯 Phase 4 要做的（`tasklist.md` FCL-40/41/42）
+- **异构 HMS docker 套件**：① 普通 hive catalog 读+写；② **iceberg-on-HMS** INSERT/DELETE/MERGE/read，断言与独立 iceberg 目录同表同结果；③ hudi-on-HMS 读。
+- **🔴 TCCL 不回归**（memory `catalog-spi-plugin-tccl-classloader-gotcha` / D5）：`test_string_dict_filter` 类用例 + MetaStoreFilterHook/URIResolverHook 按名反射路径 + kerberos HMS（若环境有）；FE 启动 + 缓存（MetaCache/StatisticsCache/FileSystemCache）冒烟。
+- **专项**：storage-api **2.7.0** 的 write/ACID 路径（本轮从胖 shade 的 2.8.1 换回 3.1.3 原生 2.7.0，review 判无回退但要 e2e 兜底）。
+- 结果（含 CI 编号）追加 `progress.md`。
+
+## ⚠️ 白名单 shade 的运行时缺类（Phase 4 可能再遇，按此法补）
+精简 shade 用 **白名单 `<includes>`**，只装列出的 hive 客户端闭包；运行时其余靠各插件自带 hadoop-common 闭包/宿主 parent-first 提供。**跑到才暴露的缺类**本轮已补两处（老 Jackson `ObjectMapper`、iceberg `bundled-guava`）；e2e 若再报 `NoClassDefFoundError`（尤其 kerberos/filter-hook 路径），**按同法补**：查是哪个 artifact 的类 → 加进 `fe-connector-hms-hive-shade/pom.xml` 的 `<dependency>`(必要时显式 `<scope>compile</scope>` 覆盖 fe/pom.xml 里的 test-scope 管理) + artifactSet `<include>`。**别退回黑名单 excludes**（那会把 122MB junk 又拉回来）。
+
+## ⚙️ 构建/验证坑（本轮实证，直接复用）
+- `-pl` 选精简 shade 模块用 **`:fe-connector-hms-hive-shade`**（冒号 artifactId 选择器），裸名 maven 报 "Could not find the selected project"。
+- 后台跑 maven **别** `nohup ... &` 套在 `run_in_background` Bash 里 → 脱离 harness 跟踪、误报秒完成；用 `tail --pid=<mvnpid>` 阻塞等真 `BUILD SUCCESS/FAILURE`。
+- 依赖 shade 的模块**跑到 `package`**（`test-compile` 假报缺类）；`-am` 必填；`-Dmaven.build.cache.enabled=false` 且数 `Running org.apache.doris` 行；`mvn|tail` 后 `$?` 是 tail 的（重定向到文件读 BUILD 行）。
+- maven 用绝对 `-f /mnt/disk1/yy/git/wt-catalog-spi/fe/pom.xml`。
+- `git add` 用 path-whitelist，**严禁 `-A`**（工作树大量非本线程 scratch）。
+
+## ✅ 每个 Phase 收尾
+commit（英文）+ 覆盖本 HANDOFF + `progress.md` 追加一行 + 勾 `tasklist.md`。