sophhub 0.4.62 → 0.4.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sophhub",
-  "version": "0.4.62",
+  "version": "0.4.63",
   "description": "SophHub CLI - Manage and download AI Agent skills and agents",
   "type": "module",
   "bin": {

package/skills/flight-booking/skill.json

@@ -1,12 +1,23 @@
 {
   "name": "flight-booking",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "types": [
     "builtin"
   ],
   "displayName": "国内机票预定",
   "description": "国内机票查询、下单、出票、退票、改签全流程 skill",
   "changelog": [
+    {
+      "changes": [
+        "修复创建订单/改签时 estimated_total 未计入平台服务费（serviceFee）的Bug",
+        "修复验舱验价（check_price）返回 code=10301 时实时价格未更新到 estimated_total 的Bug",
+        "新增价格变动提示：验价后票价变动时输出 priceChanged + priceDiff，供 Agent 向用户展示新旧价格对比",
+        "cmd_change_order 同步应用上述修复",
+        "创建订单/改签输出优先使用 API 返回的 totalAmount"
+      ],
+      "date": "2026-07-23",
+      "version": "1.3.0"
+    },
     {
       "changes": [
         "search 取消前 15 条截断，返回当日全部航班并在表格末尾新增汇总行",
@@ -32,5 +43,5 @@
     }
   ],
   "createdAt": "2026-04-09",
-  "updatedAt": "2026-05-09"
+  "updatedAt": "2026-07-23"
 }

package/skills/flight-booking/src/SKILL.md

@@ -82,6 +82,41 @@ python3 {baseDir}/scripts/flight_booking.py create-order --flight-no CA1723 --ca
 - 输出：订单号 `orderNo`、PNR、超时取消时间、应付金额等；用于第三步。
 - **重要**：创建订单成功后**不要立即执行 pay-issue**。应先向用户展示上述信息，待用户确认后再执行第三步出票。
 
+### 价格变动提示
+
+创建订单时，验舱验价（`check_price`）可能发现实时票价与查询时不一致。脚本输出中的 `priceChanged` 字段标识是否发生价格变动：
+
+- **`priceChanged: false`**：价格未变动，按正常流程展示订单信息，等待用户确认出票。
+- **`priceChanged: true`**：价格已变动。`priceDiff` 字段包含新旧价格对比：
+
+| priceDiff 字段 | 说明 |
+|----------------|------|
+| `originalSalePrice` | 查询时的票价（search 缓存） |
+| `updatedSalePrice` | 实时票价（验价后） |
+| `salePriceDiff` | 票价差额（正数为涨价，负数为降价） |
+| `originalTotal` | 原订单总额（含税费服务费） |
+| `updatedTotal` | 新订单总额（含税费服务费） |
+| `totalDiff` | 总额差额 |
+| `message` | API 返回的价格变动说明原文 |
+
+**当 `priceChanged: true` 时，必须将价格变动明细以表格形式展示给用户**，例如：
+
+> ⚠️ **价格变动提示**
+>
+> 验舱验价时发现票价已变动：
+>
+> | 项目 | 查询时 | 实时 |
+> |------|--------|------|
+> | 票价 | ¥{originalSalePrice} | ¥{updatedSalePrice} |
+> | 差额 | | {salePriceDiff} |
+> | 订单总额 | ¥{originalTotal} | ¥{updatedTotal} |
+>
+> 是否按新价格继续下单？
+
+用户确认新价格后再进入第三步出票流程。若用户不接受新价格，可重新 search 选择其他航班。
+
+- **改签同样适用**：`change-order` 输出中同样包含 `priceChanged` 字段，处理方式一致。
+
 ## 第三步：支付前校验与申请出票
 
 **仅在用户明确确认要出票后再执行**（例如用户说「确认出票」「去支付」「可以出票了」等）。不得在创建订单后未经用户确认就自动执行本步骤。

package/skills/flight-booking/src/scripts/flight_booking.py

@@ -800,16 +800,53 @@ def cmd_create_order(args: argparse.Namespace) -> int:
         return 1
 
     verify_res = check_price(flight, cabin, from_city, to_city)
-    shopping_code = ""
-    price_info = None
-    if verify_res.get("code") == "0":
-        vdata = verify_res.get("data", {})
+    vdata = verify_res.get("data") or {}
+
+    # 从验价结果中提取实时价格。check_price 返回 code="0"（成功）或 code="10301"（价格变动）
+    # 只要 data 中有 salePrice，就使用验价后的实时数据，覆盖 search 缓存的旧价格
+    if vdata.get("salePrice") is not None:
+        sale_price = float(vdata["salePrice"])
+        dep_tax = float(vdata.get("departureTax", flight.get("departureTax", 0)))
+        fuel_tax = float(vdata.get("fuelTax", flight.get("fuelTax", 0)))
         shopping_code = vdata.get("shoppingCode", cabin.get("shoppingCode", ""))
         price_info = vdata.get("priceInfo")
     else:
+        # 验价失败且无价格数据，回退到 search 缓存值
+        sale_price = float(cabin.get("salePrice", 0))
+        dep_tax = float(flight.get("departureTax", 0))
+        fuel_tax = float(flight.get("fuelTax", 0))
         shopping_code = cabin.get("shoppingCode", "")
+        price_info = None
+
+    # 服务费来源：航班顶层 serviceFee 或舱位层级 serviceFee（两者值相同，优先取 flight）
+    service_fee = float(flight.get("serviceFee", 0) or cabin.get("serviceFee", 0) or 0)
+    estimated_total = sale_price + dep_tax + fuel_tax + service_fee
+
+    # 价格变动检测：当 check_price 返回 code=10301 或 isUpdatePrice=true 时，记录新旧价格对比
+    price_changed = (
+        verify_res.get("code") == "10301"
+        or vdata.get("isUpdatePrice") is True
+    )
+    price_diff = None
+    if price_changed:
+        orig_sale = float(cabin.get("salePrice", 0))
+        orig_total = orig_sale \
+            + float(flight.get("departureTax", 0)) \
+            + float(flight.get("fuelTax", 0)) \
+            + float(flight.get("serviceFee", 0) or cabin.get("serviceFee", 0) or 0)
+        price_diff = {
+            "originalSalePrice": orig_sale,
+            "updatedSalePrice": sale_price,
+            "salePriceDiff": round(sale_price - orig_sale, 2),
+            "originalTotal": round(orig_total, 2),
+            "updatedTotal": round(estimated_total, 2),
+            "totalDiff": round(estimated_total - orig_total, 2),
+            "departureTax": dep_tax,
+            "fuelTax": fuel_tax,
+            "serviceFee": service_fee,
+            "message": verify_res.get("msg", ""),
+        }
 
-    estimated_total = float(cabin.get("salePrice", 0)) + float(flight.get("departureTax", 0)) + float(flight.get("fuelTax", 0))
     order_res = create_order(
         flight_detail=flight,
         cabin=cabin,
@@ -829,13 +866,22 @@ def cmd_create_order(args: argparse.Namespace) -> int:
         }, ensure_ascii=False))
         return 1
     order_data = order_res.get("data", {})
-    print(json.dumps({
+
+    # 输出：优先使用 API 返回的 totalAmount，否则用自行计算的 estimated_total
+    api_total = order_data.get("totalAmount")
+    display_total = float(api_total) if api_total is not None else estimated_total
+
+    output = {
         "ok": True,
         "orderNo": str(order_data.get("orderNo", "")),
         "pnrCode": order_data.get("pnrCode"),
         "expireTime": order_data.get("expireTime"),
-        "paymentTotalAmount": estimated_total,
-    }, ensure_ascii=False, indent=2))
+        "paymentTotalAmount": display_total,
+        "priceChanged": price_changed,
+    }
+    if price_diff:
+        output["priceDiff"] = price_diff
+    print(json.dumps(output, ensure_ascii=False, indent=2))
     return 0
 
 
@@ -1067,16 +1113,49 @@ def cmd_change_order(args: argparse.Namespace) -> int:
         return 1
 
     verify_res = check_price(flight, cabin, from_city, to_city)
-    shopping_code = ""
-    price_info = None
-    if verify_res.get("code") == "0":
-        vdata = verify_res.get("data", {})
+    vdata = verify_res.get("data") or {}
+
+    # 从验价结果中提取实时价格。check_price 返回 code="0"（成功）或 code="10301"（价格变动）
+    if vdata.get("salePrice") is not None:
+        sale_price = float(vdata["salePrice"])
+        dep_tax = float(vdata.get("departureTax", flight.get("departureTax", 0)))
+        fuel_tax = float(vdata.get("fuelTax", flight.get("fuelTax", 0)))
         shopping_code = vdata.get("shoppingCode", cabin.get("shoppingCode", ""))
         price_info = vdata.get("priceInfo")
     else:
+        sale_price = float(cabin.get("salePrice", 0))
+        dep_tax = float(flight.get("departureTax", 0))
+        fuel_tax = float(flight.get("fuelTax", 0))
         shopping_code = cabin.get("shoppingCode", "")
+        price_info = None
+
+    service_fee = float(flight.get("serviceFee", 0) or cabin.get("serviceFee", 0) or 0)
+    estimated_total = sale_price + dep_tax + fuel_tax + service_fee
+
+    price_changed = (
+        verify_res.get("code") == "10301"
+        or vdata.get("isUpdatePrice") is True
+    )
+    price_diff = None
+    if price_changed:
+        orig_sale = float(cabin.get("salePrice", 0))
+        orig_total = orig_sale \
+            + float(flight.get("departureTax", 0)) \
+            + float(flight.get("fuelTax", 0)) \
+            + float(flight.get("serviceFee", 0) or cabin.get("serviceFee", 0) or 0)
+        price_diff = {
+            "originalSalePrice": orig_sale,
+            "updatedSalePrice": sale_price,
+            "salePriceDiff": round(sale_price - orig_sale, 2),
+            "originalTotal": round(orig_total, 2),
+            "updatedTotal": round(estimated_total, 2),
+            "totalDiff": round(estimated_total - orig_total, 2),
+            "departureTax": dep_tax,
+            "fuelTax": fuel_tax,
+            "serviceFee": service_fee,
+            "message": verify_res.get("msg", ""),
+        }
 
-    estimated_total = float(cabin.get("salePrice", 0)) + float(flight.get("departureTax", 0)) + float(flight.get("fuelTax", 0))
     change_res = order_change(
         original_order_no=original_order_no,
         flight_detail=flight,
@@ -1097,14 +1176,22 @@ def cmd_change_order(args: argparse.Namespace) -> int:
         }, ensure_ascii=False))
         return 1
     change_data = change_res.get("data", {})
-    print(json.dumps({
+
+    api_total = change_data.get("totalAmount")
+    display_total = float(api_total) if api_total is not None else estimated_total
+
+    output = {
         "ok": True,
         "changeOrderNo": str(change_data.get("orderNo", "")),
         "pnrCode": change_data.get("pnrCode"),
         "expireTime": change_data.get("expireTime"),
-        "paymentTotalAmount": estimated_total,
+        "paymentTotalAmount": display_total,
+        "priceChanged": price_changed,
         **rules,
-    }, ensure_ascii=False, indent=2))
+    }
+    if price_diff:
+        output["priceDiff"] = price_diff
+    print(json.dumps(output, ensure_ascii=False, indent=2))
     return 0