落地陆运群内协同：按填写样例拉群并只列本单协同项，进群把私聊已抽到的字段带上。

Co-authored-by: Cursor <cursoragent@cursor.com>

inquiry-agent/agent/schema/field_validate.py

@@ -64,6 +64,90 @@ AIR_COLLAB_FIELDS = ("是否含电", "是否含磁")
 SEA_COLLAB_DISPLAY = {
     "HS编码": "商品海关编码",
 }
+# 陆运摘要标题：海关编码，不要写成海运的商品海关编码。
+LAND_COLLAB_DISPLAY = {
+    "HS编码": "海关编码",
+}
+# 填写样例允许拉群的类型+线路 → 协同内部键（顺序与规格一致）。
+_LAND_COLLAB_BY_PAIR: dict[tuple[str, str], tuple[str, ...]] = {
+    ("国内运输拼车", "国内长途/零担"): (
+        "客户名称",
+        "包装方式",
+        "货值",
+        "是否为危险品",
+    ),
+    ("国内运输拼车", "国内城配/拖车/打包"): (
+        "客户名称",
+        "包装方式",
+        "货值",
+        "是否为危险品",
+    ),
+    ("国内运输整车", "国内长途/零担"): (
+        "客户名称",
+        "货值",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("国内运输整车", "国内城配/拖车/打包"): (
+        "客户名称",
+        "货值",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("跨境集拼", "中港/中亚/中欧"): (
+        "客户名称",
+        "HS编码",
+        "贸易条款",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("跨境集拼", "东南亚"): (
+        "客户名称",
+        "HS编码",
+        "贸易条款",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("跨境整车", "中港/中亚/中欧"): (
+        "客户名称",
+        "HS编码",
+        "贸易条款",
+        "货值",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("跨境整车", "东南亚"): (
+        "客户名称",
+        "HS编码",
+        "贸易条款",
+        "货值",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("中港整车", "中港/中亚/中欧"): (
+        "客户名称",
+        "HS编码",
+        "车型/数量",
+        "贸易条款",
+        "货值",
+        "包装方式",
+        "是否为危险品",
+    ),
+    ("中港零担/集拼", "中港/中亚/中欧"): (
+        "客户名称",
+        "HS编码",
+        "贸易条款",
+        "包装方式",
+        "是否为危险品",
+    ),
+}
+# 意图分类用：海运六项 ∪ 陆运全部协同键。
+ALL_COLLAB_KEYS = tuple(
+    dict.fromkeys(
+        list(SEA_COLLAB_FIELDS)
+        + ["客户名称", "包装方式", "货值", "是否为危险品", "车型/数量"]
+    )
+)
 
 # 口语里已经带上 TMS 文档规定的单位时，补进空字段。
 # 只认「数字+单位」，不猜港口，不把长宽高换算成立方。
@@ -102,6 +186,9 @@ _ALIASES = {
     "HS CODE": "HS编码",
     "商品海关编码": "HS编码",
     "海关编码": "HS编码",
+    "客户名称": "客户名称",
+    "货值": "货值",
+    "是否为危险品": "是否为危险品",
 }
 
 
@@ -224,11 +311,75 @@ def harvest_oral_measures(text: str, facts: dict[str, str] | None = None) -> dic
     return harvest_named_air_route(raw, merged)
 
 
+def land_collab_fields(land_type: str, route: str) -> tuple[str, ...]:
+    """
+    本单陆运协同内部键，顺序与规格一致。
+
+    对不上填写样例返回空元组，调用方不得按海运六项去列。
+    海关编码内部仍是 HS编码。副作用：无。
+    """
+    from agent.schema.land_options import canonicalize_route, canonicalize_transport_type
+
+    t = canonicalize_transport_type(land_type) or (land_type or "").strip()
+    r = canonicalize_route(route) or (route or "").strip()
+    return _LAND_COLLAB_BY_PAIR.get((t, r), ())
+
+
+def collab_fields_for_ticket(facts: dict[str, str] | None, business_line: str) -> tuple[str, ...]:
+    """
+    按业务线取出群摘要 / 写入允许的协同键。
+
+    LAND 看事实里的运输类型+线路类别；SEA/AIR 用固定名单。
+    """
+    line = (business_line or "").strip().upper()
+    if line == "AIR":
+        return AIR_COLLAB_FIELDS
+    if line == "LAND":
+        src = dict(facts or {})
+        return land_collab_fields(
+            str(src.get("运输类型") or ""),
+            str(src.get("线路类别") or ""),
+        )
+    return SEA_COLLAB_FIELDS
+
+
+def collab_display_name(key: str, business_line: str) -> str:
+    """协同项对外标题。陆运 HS编码 → 海关编码；海运 → 商品海关编码。"""
+    line = (business_line or "").strip().upper()
+    if line == "LAND":
+        return LAND_COLLAB_DISPLAY.get(key, key)
+    return SEA_COLLAB_DISPLAY.get(key, key)
+
+
+def pick_collab_from_facts(
+    facts: dict[str, str] | None,
+    keys: tuple[str, ...],
+) -> dict[str, str]:
+    """
+    从私聊事实里取出已有协同键，供进群预填。
+
+    只取 keys 里非空值。海关编码/商品海关编码经 normalize 折成 HS编码。
+    不在 keys 的询价项（如跨境整车车型/数量）不会被取出。
+    不覆盖调用方已有协同值；本函数只返回候选。
+    """
+    allowed = set(keys or ())
+    if not allowed:
+        return {}
+    src = normalize_facts(facts)
+    out: dict[str, str] = {}
+    for key in keys:
+        val = (src.get(key) or "").strip()
+        if val:
+            out[key] = val
+    return out
+
+
 def harvest_oral_collab(text: str) -> dict[str, str]:
     """
-    群里口语协同三项：含油/含电/含磁、货好时间。
+    群里口语协同：含油/含电/含磁、货好时间、是否为危险品。
 
-    只认原话里已经说死的词（不含电、随时可提），不猜贸易条款和海关编码。
+    只认原话里已经说死的词（不含电、随时可提、普货），不猜贸易条款和海关编码。
+    危险品：否词（不是危险品/非危/普货）先于是词，避免「不是危险品」收成是。
     """
     raw = text or ""
     out: dict[str, str] = {}
@@ -236,6 +387,11 @@ def harvest_oral_collab(text: str) -> dict[str, str]:
         ("是否含电", ("不含电", "不带电", "无电"), ("含电", "带电")),
         ("是否含油", ("不含油", "不带油", "无油"), ("含油", "带油")),
         ("是否含磁", ("不含磁", "不带磁", "无磁"), ("含磁", "带磁")),
+        (
+            "是否为危险品",
+            ("不是危险品", "非危险品", "非危", "普货"),
+            ("危险品", "有危", "含危"),
+        ),
     )
     for key, no_words, yes_words in yes_no:
         if any(w in raw for w in no_words):
@@ -279,7 +435,8 @@ def _pricing_required_keys(
     land_subtype: str,
     facts: dict[str, str] | None = None,
 ) -> list[str]:
-    """当前激活的首次查价内部键列表。中港再按装载方式收窄。"""
+    """当前激活的首次查价内部键列表。中港整车/零担是两个运输类型。"""
+    _ = facts
     line = (business_line or "").strip().upper()
     pricing = contract.get("pricing_required") or {}
     if line == "SEA":
@@ -291,14 +448,6 @@ def _pricing_required_keys(
         block = land.get(land_subtype) or {}
         if not block:
             return []
-        if land_subtype == "中港":
-            from agent.schema.land_options import canonicalize_hk_load
-
-            load = canonicalize_hk_load(str((facts or {}).get("中港装载方式") or ""))
-            by_load = block.get("by_hk_load") or {}
-            picked = by_load.get(load) if load else None
-            if isinstance(picked, list):
-                return list(picked)
         return list(block.get("always") or [])
     return []