销售侧汇总统一叫费用合计，并认准空运费的金额。

企微跳转改为账号密码登录，报价卡上的费用按原金额改回；航线按单价数量金额报价时不再记成海运费。

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

inquiry-agent/agent/llm/extract_text.py

@@ -671,6 +671,18 @@ _RE_FEE_CHANGE = re.compile(
     re.I,
 )
 _SKIP_FEE_NAMES = frozenset({"usd", "cny", "rmb", "美金", "美元", "人民币", "元"})
+# 航线常写「空运费 单价CNY99，数量100，金额CNY199」。单价和金额不是同一个数，必须认金额。
+_RE_FEE_PRICED = re.compile(
+    r"(?P<name>[\u4e00-\u9fffA-Za-z][\u4e00-\u9fffA-Za-z0-9/()（）+＋\-－]{0,24}费)"
+    r"\s*单价\s*"
+    r"(?:(?P<unit_ccy>USD|CNY|RMB|美金|美元|人民币)\s*)?"
+    r"(?P<unit>\d+(?:\.\d+)?)"
+    r"(?:\s*[，,、]\s*数量\s*(?P<qty>\d+(?:\.\d+)?))?"
+    r"(?:\s*[，,、]\s*金额\s*"
+    r"(?:(?P<amt_ccy>USD|CNY|RMB|美金|美元|人民币)\s*)?"
+    r"(?P<amount>\d+(?:\.\d+)?))?",
+    re.I,
+)
 _FULLWIDTH_NUM = str.maketrans("０１２３４５６７８９．", "0123456789.")
 
 
@@ -698,7 +710,7 @@ def _parse_fee_rows(text: str) -> list[dict[str, str]]:
     rows: list[dict[str, str]] = []
     seen: set[str] = set()
 
-    def _add(name: str, amount: str, ccy: str) -> None:
+    def _add(name: str, amount: str, ccy: str, **extra: str) -> None:
         if not name or not amount or name.lower() in _SKIP_FEE_NAMES:
             return
         # 「WO202609160001」会被 [A-Za-z]{2,10}+数字 抽成费用名 WO，群里发工单号不能当报价。
@@ -707,14 +719,27 @@ def _parse_fee_rows(text: str) -> list[dict[str, str]]:
         if name in seen:
             return
         seen.add(name)
-        rows.append(
-            {
-                "name": name,
-                "amount": amount,
-                "currency": _currency_of(raw, ccy),
-            }
-        )
+        row = {
+            "name": name,
+            "amount": amount,
+            "currency": _currency_of(raw, ccy),
+        }
+        for key, val in extra.items():
+            if val:
+                row[key] = val
+        rows.append(row)
 
+    for hit in _RE_FEE_PRICED.finditer(raw):
+        # 有「金额」用金额；只有单价时才用单价。禁止把单价误当成这一行的总金额。
+        amount = (hit.group("amount") or "").strip() or (hit.group("unit") or "").strip()
+        ccy = hit.group("amt_ccy") or hit.group("unit_ccy") or ""
+        _add(
+            (hit.group("name") or "").strip(),
+            _ascii_amount(amount),
+            ccy,
+            unit_price=_ascii_amount(hit.group("unit") or ""),
+            quantity=_ascii_amount(hit.group("qty") or ""),
+        )
     for hit in _RE_FEE_LINE.finditer(raw):
         _add(
             (hit.group("name") or "").strip(),
@@ -736,6 +761,7 @@ def extract_product_quote(text: str, *, injected: Optional[dict[str, Any]] = Non
 
     认不出价格返回空 dict，调用方回「没有识别到报价」。
     群里常见「码头操作费100CNY / 报关费改为300CNY」，不能只把第一笔数当成海运费。
+    「空运费 单价…金额…」必须保留空运费，金额用「金额」后面的数，不用单价。
     """
     if isinstance(injected, dict) and (injected.get("total") or injected.get("fee_rows")):
         out = dict(injected)
@@ -772,11 +798,19 @@ def extract_product_quote(text: str, *, injected: Optional[dict[str, Any]] = Non
     if not amount:
         return {}
     ccy = _currency_of(raw)
+    # 句里已经点了费用名（空运费）时，不能退回默认海运费。
+    named = re.search(
+        r"([\u4e00-\u9fffA-Za-z][\u4e00-\u9fffA-Za-z0-9/()（）+＋\-－]{0,24}费)",
+        raw,
+    )
+    fee_name = (named.group(1) if named else "") or "海运费"
+    if fee_name in {"费用"}:
+        fee_name = "海运费"
     return {
         "total": amount,
         "currency": ccy,
         "source_label": "产品报价",
         "raw_text": raw,
-        "fee_rows": [{"name": "海运费", "amount": amount, "currency": ccy}],
-        "fee_lines": [{"name": "海运费", "amount": amount, "currency": ccy}],
+        "fee_rows": [{"name": fee_name, "amount": amount, "currency": ccy}],
+        "fee_lines": [{"name": fee_name, "amount": amount, "currency": ccy}],
     }

inquiry-agent/agent/llm/mode_extract_adjust.py

@@ -114,7 +114,7 @@ def build_adjust_messages(text: str, fee_names: list[str]) -> list[dict[str, str
                 "必须调用 extract_quote_adjust。不要对销售说话，不要改价。"
                 "口令不写死：上升、上浮、往上抬、加一成、涨一点、改到某金额、在现有报价基础上调整都算调价。"
                 "没点名费用、只说报价：is_adjust=true，wants_total=false，items 为空。"
-                "只动总销售价/总成本价/合计/总价/汇总价：wants_total=true，items 仍要一条（fee_name 可空），带 kind/direction/value。"
+                "只动费用合计（销售也可能说总销售价、总成本价、合计、总价、汇总价）：wants_total=true，items 仍要一条（fee_name 可空），带 kind/direction/value。"
                 "kind 只能 percent 或 target；direction 只能 up/down/set。"
                 "value 必须来自原话数字；一成=10。禁止编造费用名和金额。"
                 "不是调价（问候、新询价、谢谢）时 is_adjust=false。"