落地空运群内协同与锁舱出站。

群里按 BOT 通道激活当前工单、航线报价和成交跟进；没有 TMS 报价编号时用工单字段补齐仍调锁舱，避免被本地规则拦住。

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

inquiry-agent/agent/channel/aibot/__init__.py

@@ -26,8 +26,8 @@ router = APIRouter(prefix="/internal/aibot", tags=["aibot"])
 class AibotInboundBody(BaseModel):
     """桥转发的归一字段（桥侧已解析，智能体不再调企微换 ID）。"""
 
-    sender_id: str = Field(description="企微 userid，必须来自 AIBOT 报文")
-    message_id: str
+    sender_id: str = Field(default="", description="企微 userid，必须来自 AIBOT 报文")
+    message_id: str = ""
     content: str = ""
     msg_type: str = "text"
     chat_id: str = ""
@@ -38,6 +38,38 @@ class AibotInboundBody(BaseModel):
     raw: dict[str, Any] = Field(default_factory=dict)
 
 
+def normalize_aibot_payload(body: dict[str, Any]) -> AibotInboundBody:
+    """
+    同时吃两套入站：智能体骨架字段，以及现网官方桥转发的企微 body
+    （msgid/chatid/from.userid/text.content）。
+    """
+    data = dict(body or {})
+    from_user = data.get("from") if isinstance(data.get("from"), dict) else {}
+    text_obj = data.get("text") if isinstance(data.get("text"), dict) else {}
+    sender = str(data.get("sender_id") or from_user.get("userid") or "").strip()
+    mid = str(data.get("message_id") or data.get("msgid") or "").strip()
+    content = str(data.get("content") or text_obj.get("content") or "")
+    chat_id = str(data.get("chat_id") or data.get("chatid") or "").strip()
+    chattype = str(data.get("chat_type") or data.get("chattype") or "group").strip().lower()
+    chat_type = "c2c" if chattype in {"single", "c2c", "private"} else "group"
+    raw = dict(data.get("raw") or {})
+    raw.setdefault("source", "aibot")
+    if data.get("response_url"):
+        raw.setdefault("response_url", data.get("response_url"))
+    return AibotInboundBody(
+        sender_id=sender,
+        message_id=mid,
+        content=content,
+        msg_type=str(data.get("msg_type") or data.get("msgtype") or "text"),
+        chat_id=chat_id,
+        chat_type=chat_type,
+        agent_id=str(data.get("agent_id") or data.get("aibotid") or ""),
+        create_time=int(data.get("create_time") or 0),
+        media=dict(data.get("media") or {}),
+        raw=raw,
+    )
+
+
 def _check_bridge_token(x_token: Optional[str]) -> None:
     s = get_settings()
     expected = (getattr(s, "wecom_aibot_bridge_token", None) or "").strip()
@@ -57,26 +89,32 @@ def aibot_ping() -> dict[str, str]:
 
 @router.post("/inbound")
 def aibot_inbound(
-    body: AibotInboundBody,
+    body: dict[str, Any],
     x_aibot_bridge_token: Optional[str] = Header(
         default=None, alias="X-Aibot-Bridge-Token"
     ),
+    x_ytd_aibot_bridge_token: Optional[str] = Header(
+        default=None, alias="X-Ytd-Aibot-Bridge-Token"
+    ),
 ) -> dict[str, Any]:
     """
     接收桥转发入站：无 sender_id 拒绝；其余入 inbox。
     """
-    _check_bridge_token(x_aibot_bridge_token)
+    _check_bridge_token(x_aibot_bridge_token or x_ytd_aibot_bridge_token)
+    parsed = normalize_aibot_payload(body)
+    raw = dict(parsed.raw or {})
+    raw.setdefault("source", "aibot")
     msg = InboundMessage(
-        sender_id=body.sender_id.strip(),
-        message_id=body.message_id.strip(),
-        content=body.content or "",
-        msg_type=body.msg_type or "text",
-        chat_id=body.chat_id or "",
-        chat_type=body.chat_type or "group",
-        agent_id=body.agent_id or "",
-        create_time=int(body.create_time or 0),
-        media=body.media or {},
-        raw=body.raw or {},
+        sender_id=parsed.sender_id.strip(),
+        message_id=parsed.message_id.strip(),
+        content=parsed.content or "",
+        msg_type=parsed.msg_type or "text",
+        chat_id=parsed.chat_id or "",
+        chat_type=parsed.chat_type or "group",
+        agent_id=parsed.agent_id or "",
+        create_time=int(parsed.create_time or 0),
+        media=parsed.media or {},
+        raw=raw,
     )
     if not msg.has_sender():
         raise HTTPException(status_code=400, detail="missing_sender_id")