更新多個文件的功能和修復

- 修復 app.py 中的問題
- 更新 geocode_tool.py 的地理編碼功能
- 優化 ai_service.py 的 AI 服務邏輯

app.py

@@ -858,6 +858,26 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                         from geohash2 import encode as gh_encode
                         geohash7 = gh_encode(lat, lon, precision=7) if (lat is not None and lon is not None) else None
                         heading_cardinal = _heading_to_cardinal(heading_deg) if heading_deg is not None else None
+                        city = message_data.get("city")
+                        admin = message_data.get("admin")
+                        country_code = message_data.get("country_code")
+                        address_display = message_data.get("address_display")
+                        # 若前端未提供城市資訊，嘗試透過 MCP reverse_geocode 取得
+                        if (not city) and lat is not None and lon is not None:
+                            try:
+                                feature_router: MCPAgentBridge = app.state.feature_router
+                                reverse_tool = feature_router.mcp_server.tools.get("reverse_geocode")
+                                if reverse_tool and reverse_tool.handler:
+                                    geo_res = await reverse_tool.handler({"lat": lat, "lon": lon})
+                                    if isinstance(geo_res, dict) and geo_res.get("success"):
+                                        payload = geo_res.get("data") or geo_res
+                                        city = payload.get("city") or city
+                                        admin = payload.get("admin") or admin
+                                        country_code = payload.get("country_code") or country_code
+                                        address_display = payload.get("display_name") or payload.get("label") or address_display
+                            except Exception as ge:
+                                logger.debug(f"反地理查詢失敗: {ge}")
+
                         env_payload = {
                             "lat": lat,
                             "lon": lon,
@@ -868,6 +888,10 @@ async def websocket_endpoint_with_jwt(websocket: WebSocket, token: str = Query(N
                             "locale": locale,
                             "device": device,
                             "geohash_7": geohash7,
+                            "city": city,
+                            "admin": admin,
+                            "country_code": country_code,
+                            "address_display": address_display,
                         }
 
                         # 更新會話暫存

features/mcp/tools/geocode_tool.py

@@ -57,7 +57,7 @@ class ReverseGeocodeTool(MCPTool):
         cached = await db_cache.get_geo_cached(geokey)
         if cached:
             return cls.create_success_response(
-                content=f"{cached.get('city')}, {cached.get('admin')}",
+                content=cached.get("display_name") or f"{cached.get('city')}, {cached.get('admin')}",
                 data=cached
             )
 
@@ -66,7 +66,7 @@ class ReverseGeocodeTool(MCPTool):
         if db_cached:
             await db_cache.set_geo_cache(geokey, db_cached)
             return cls.create_success_response(
-                content=f"{db_cached.get('city')}, {db_cached.get('admin')}",
+                content=db_cached.get("display_name") or f"{db_cached.get('city')}, {db_cached.get('admin')}",
                 data=db_cached
             )
 
@@ -92,11 +92,35 @@ class ReverseGeocodeTool(MCPTool):
                 city = addr.get("city") or addr.get("town") or addr.get("village") or addr.get("county")
                 admin = addr.get("state") or addr.get("county") or ""
                 country_code = (addr.get("country_code") or "").upper()
-                payload = {"city": city or "", "admin": admin or "", "country_code": country_code}
+                display_name = data.get("display_name") or ""
+                road = addr.get("road") or addr.get("pedestrian") or addr.get("footway") or ""
+                house_number = addr.get("house_number") or ""
+                suburb = addr.get("suburb") or addr.get("neighbourhood") or ""
+                label_parts = []
+                if road and house_number:
+                    label_parts.append(f"{road}{house_number}")
+                elif road:
+                    label_parts.append(road)
+                if suburb:
+                    label_parts.append(suburb)
+                if city:
+                    label_parts.append(city)
+                if admin:
+                    label_parts.append(admin)
+                label = ", ".join(label_parts)
+                payload = {
+                    "city": city or "",
+                    "admin": admin or "",
+                    "country_code": country_code,
+                    "display_name": display_name,
+                    "label": label or display_name,
+                    "road": road,
+                    "house_number": house_number,
+                    "suburb": suburb,
+                }
 
         # 回寫快取
         await db_cache.set_geo_cache(geokey, payload)
         await set_geo_cache(geokey, payload)
 
-        return cls.create_success_response(content=f"{payload['city']}, {payload['admin']}", data=payload)
-
+        return cls.create_success_response(content=payload.get("label") or f"{payload['city']}, {payload['admin']}", data=payload)

services/ai_service.py

@@ -198,6 +198,10 @@ def _format_env_context(ctx: Dict[str, Any]) -> str:
     if device:
         parts.append(f"裝置: {device}")
 
+    address_display = (ctx.get("address_display") or "").strip()
+    if address_display:
+        parts.append(f"地點: {address_display}")
+
     return "\n".join(parts)