完善空运锁舱与海运报价单单选回填，并增强模板预览与协同字段盖写。

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

inquiry-agent/agent/handlers/air_group_collab.py

@@ -269,12 +269,15 @@ def _handle_cabin(
             chat_id=chat_id,
             instruction=message.content or "",
         )
+    # 「WO…锁舱，锁AIR-OPT01 TH」要带上句中的舱位和航司，不能只靠报价里碰巧只有一条。
     return apply_air_lock(
         flow=engine,
         ticket=ticket,
         sender_id=message.sender_id,
         chat_id=chat_id,
         instruction=message.content or "",
+        option_no=_option_from_text(message.content or ""),
+        airline=_airline_from_text(message.content or ""),
     )
 
 
@@ -308,6 +311,7 @@ def _handle_bound(
                 chat_id=chat_id,
                 instruction=message.content or "",
                 option_no=option,
+                airline=_airline_from_text(message.content or ""),
             )
     if intent in {INTENT_DEAL, INTENT_LOST, INTENT_NEGOTIATE}:
         outcome = {
@@ -371,14 +375,25 @@ def _handle_bound(
 
 
 def _option_from_text(text: str) -> str:
-    blob = (text or "").replace(" ", "").upper()
-    if "AIR-OPT" in blob or "AIROPT" in blob:
-        start = blob.find("AIR")
-        token = []
-        for ch in blob[start:]:
-            if ch.isalnum() or ch == "-":
-                token.append(ch)
-            else:
-                break
-        return "".join(token)
+    """从「锁AIR-OPT01 TH」抽出舱位编号；不要把后面的航司码拼进 optionNo。"""
+    import re
+
+    m = re.search(r"AIR-?OPT-?\d+", (text or "").upper())
+    if not m:
+        return ""
+    raw = m.group(0)
+    # 统一成 TMS 常见写法 AIR-OPT01（中间可保留已有的第二根横杠）
+    if raw.startswith("AIROPT"):
+        return "AIR-OPT" + raw[6:]
+    return raw
+
+
+def _airline_from_text(text: str) -> str:
+    """从「AIR-OPT01 TH」抽出两位航司码；没有就不猜。"""
+    import re
+
+    blob = (text or "").upper()
+    m = re.search(r"AIR-?OPT-?\d+\s*([A-Z]{2})(?![A-Z0-9])", blob)
+    if m:
+        return m.group(1)
     return ""