sienge-ecbiesek-mcp 1.1.5__py3-none-any.whl → 1.2.0__py3-none-any.whl

sienge_mcp/server.py

@@ -2,14 +2,27 @@
 """
 SIENGE MCP COMPLETO - FastMCP com Autenticação Flexível
 Suporta Bearer Token e Basic Auth
+CORREÇÕES IMPLEMENTADAS:
+1. Separação entre camada MCP e camada de serviços
+2. Alias compatíveis com checklist
+3. Normalização de parâmetros (camelCase + arrays)
+4. Bulk-data assíncrono com polling
+5. Observabilidade mínima (X-Request-ID, cache, logs)
+6. Ajustes de compatibilidade pontuais
 """
 
 from fastmcp import FastMCP
 import httpx
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Optional, Any, Union
 import os
 from dotenv import load_dotenv
-from datetime import datetime
+from datetime import datetime, timedelta
+import uuid
+import asyncio
+import json
+import time
+import logging
+from functools import wraps
 
 # Carrega as variáveis de ambiente
 load_dotenv()
@@ -24,61 +37,273 @@ SIENGE_PASSWORD = os.getenv("SIENGE_PASSWORD", "")
 SIENGE_API_KEY = os.getenv("SIENGE_API_KEY", "")
 REQUEST_TIMEOUT = int(os.getenv("REQUEST_TIMEOUT", "30"))
 
+# Cache simples em memória
+_cache = {}
+CACHE_TTL = 300  # 5 minutos
+
+# Configurar logging estruturado
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+logger = logging.getLogger("sienge-mcp")
+
 
 class SiengeAPIError(Exception):
     """Exceção customizada para erros da API do Sienge"""
-
     pass
 
 
+# ============ HELPERS DE NORMALIZAÇÃO E OBSERVABILIDADE ============
+
+def _camel(s: str) -> str:
+    """Converte snake_case para camelCase"""
+    if '_' not in s:
+        return s
+    parts = s.split('_')
+    return parts[0] + ''.join(x.capitalize() for x in parts[1:])
+
+
+def to_query(params: dict) -> dict:
+    """
+    Converte parâmetros para query string normalizada:
+    - snake_case → camelCase
+    - listas/tuplas → CSV string
+    - booleanos → 'true'/'false' (minúsculo)
+    - remove valores None
+    """
+    if not params:
+        return {}
+    
+    out = {}
+    for k, v in params.items():
+        if v is None:
+            continue
+        key = _camel(k)
+        if isinstance(v, (list, tuple)):
+            out[key] = ','.join(map(str, v))
+        elif isinstance(v, bool):
+            out[key] = 'true' if v else 'false'
+        else:
+            out[key] = v
+    return out
+
+
+def to_camel_json(obj: Any) -> Any:
+    """
+    Normaliza payload JSON recursivamente:
+    - snake_case → camelCase nas chaves
+    - remove valores None
+    - mantém estrutura de listas e objetos aninhados
+    """
+    if isinstance(obj, dict):
+        return {_camel(k): to_camel_json(v) for k, v in obj.items() if v is not None}
+    elif isinstance(obj, list):
+        return [to_camel_json(x) for x in obj]
+    else:
+        return obj
+
+
+def _normalize_url(base_url: str, subdomain: str) -> str:
+    """Normaliza URL evitando //public/api quando subdomain está vazio"""
+    if not subdomain or subdomain.strip() == "":
+        return f"{base_url.rstrip('/')}/public/api"
+    return f"{base_url.rstrip('/')}/{subdomain.strip()}/public/api"
+
+
+def _parse_numeric_value(value: Any) -> float:
+    """Sanitiza valores numéricos, lidando com vírgulas decimais"""
+    if value is None:
+        return 0.0
+    
+    if isinstance(value, (int, float)):
+        return float(value)
+    
+    # Se for string, tentar converter
+    str_value = str(value).strip()
+    if not str_value:
+        return 0.0
+    
+    # Trocar vírgula por ponto decimal
+    str_value = str_value.replace(',', '.')
+    
+    try:
+        return float(str_value)
+    except (ValueError, TypeError):
+        logger.warning(f"Não foi possível converter '{value}' para número")
+        return 0.0
+
+
+def _get_cache_key(endpoint: str, params: dict = None) -> str:
+    """Gera chave de cache baseada no endpoint e parâmetros"""
+    cache_params = json.dumps(params or {}, sort_keys=True)
+    return f"{endpoint}:{hash(cache_params)}"
+
+
+def _set_cache(key: str, data: Any) -> None:
+    """Armazena dados no cache com TTL"""
+    _cache[key] = {
+        "data": data,
+        "timestamp": time.time(),
+        "ttl": CACHE_TTL
+    }
+
+
+def _get_cache(key: str) -> Optional[Dict]:
+    """Recupera dados do cache se ainda válidos - CORRIGIDO: mantém shape original"""
+    if key not in _cache:
+        return None
+    
+    cached = _cache[key]
+    if time.time() - cached["timestamp"] > cached["ttl"]:
+        del _cache[key]  # Remove cache expirado
+        return None
+    
+    # cached["data"] já é o "result" completo salvo em _set_cache
+    result = dict(cached["data"])  # cópia rasa
+    result["cache"] = {
+        "hit": True,
+        "ttl_s": cached["ttl"] - (time.time() - cached["timestamp"])
+    }
+    return result
+
+
+def _log_request(method: str, endpoint: str, status_code: int, latency: float, request_id: str) -> None:
+    """Log estruturado das requisições"""
+    logger.info(
+        f"HTTP {method} {endpoint} - Status: {status_code} - "
+        f"Latency: {latency:.3f}s - RequestID: {request_id}"
+    )
+
+
+def _extract_items_and_total(resp_data: Any) -> tuple:
+    """
+    Extrai items e total count de resposta padronizada da API Sienge
+    Retorna: (items_list, total_count)
+    """
+    items = resp_data.get("results", []) if isinstance(resp_data, dict) else (resp_data or [])
+    meta = resp_data.get("resultSetMetadata", {}) if isinstance(resp_data, dict) else {}
+    total = meta.get("count", len(items))
+    return items, total
+
+
 async def make_sienge_request(
-    method: str, endpoint: str, params: Optional[Dict] = None, json_data: Optional[Dict] = None
+    method: str, endpoint: str, params: Optional[Dict] = None, json_data: Optional[Dict] = None, use_cache: bool = True
 ) -> Dict:
     """
     Função auxiliar para fazer requisições à API do Sienge (v1)
     Suporta tanto Bearer Token quanto Basic Auth
+    MELHORADO: Observabilidade, cache, normalização de parâmetros
     """
+    start_time = time.time()
+    req_id = str(uuid.uuid4())
+    
     try:
+        # Normalizar parâmetros
+        normalized_params = to_query(params) if params else None
+        
+        # Verificar cache para operações GET
+        cache_key = None
+        if method.upper() == "GET" and use_cache and endpoint in ["/customer-types", "/creditors", "/customers"]:
+            cache_key = _get_cache_key(endpoint, normalized_params)
+            cached_result = _get_cache(cache_key)
+            if cached_result:
+                cached_result["request_id"] = req_id
+                return cached_result
+        
         async with httpx.AsyncClient(timeout=REQUEST_TIMEOUT) as client:
-            headers = {"Content-Type": "application/json", "Accept": "application/json"}
+            headers = {
+                "Content-Type": "application/json", 
+                "Accept": "application/json",
+                "X-Request-ID": req_id
+            }
 
-            # Configurar autenticação e URL
+            # Configurar autenticação e URL (corrigindo URLs duplas)
             auth = None
+            base_normalized = _normalize_url(SIENGE_BASE_URL, SIENGE_SUBDOMAIN)
 
             if SIENGE_API_KEY and SIENGE_API_KEY != "sua_api_key_aqui":
-                # Bearer Token (Recomendado)
                 headers["Authorization"] = f"Bearer {SIENGE_API_KEY}"
-                url = f"{SIENGE_BASE_URL}/{SIENGE_SUBDOMAIN}/public/api/v1{endpoint}"
+                url = f"{base_normalized}/v1{endpoint}"
             elif SIENGE_USERNAME and SIENGE_PASSWORD:
-                # Basic Auth usando httpx.BasicAuth
                 auth = httpx.BasicAuth(SIENGE_USERNAME, SIENGE_PASSWORD)
-                url = f"{SIENGE_BASE_URL}/{SIENGE_SUBDOMAIN}/public/api/v1{endpoint}"
+                url = f"{base_normalized}/v1{endpoint}"
             else:
                 return {
                     "success": False,
                     "error": "No Authentication",
                     "message": "Configure SIENGE_API_KEY ou SIENGE_USERNAME/PASSWORD no .env",
+                    "request_id": req_id
                 }
 
-            response = await client.request(method=method, url=url, headers=headers, params=params, json=json_data, auth=auth)
+            response = await client.request(
+                method=method, 
+                url=url, 
+                headers=headers, 
+                params=normalized_params, 
+                json=json_data, 
+                auth=auth
+            )
+            
+            latency = time.time() - start_time
+            _log_request(method, endpoint, response.status_code, latency, req_id)
 
             if response.status_code in [200, 201]:
                 try:
-                    return {"success": True, "data": response.json(), "status_code": response.status_code}
-                except BaseException:
-                    return {"success": True, "data": {"message": "Success"}, "status_code": response.status_code}
+                    data = response.json()
+                    result = {
+                        "success": True, 
+                        "data": data, 
+                        "status_code": response.status_code,
+                        "request_id": req_id,
+                        "latency_ms": round(latency * 1000, 2)
+                    }
+                    
+                    # Armazenar no cache se aplicável
+                    if cache_key and method.upper() == "GET":
+                        _set_cache(cache_key, result)
+                        result["cache"] = {"hit": False, "ttl_s": CACHE_TTL}
+                    
+                    return result
+                    
+                except Exception:
+                    return {
+                        "success": True, 
+                        "data": {"message": "Success"}, 
+                        "status_code": response.status_code,
+                        "request_id": req_id,
+                        "latency_ms": round(latency * 1000, 2)
+                    }
             else:
                 return {
                     "success": False,
                     "error": f"HTTP {response.status_code}",
                     "message": response.text,
                     "status_code": response.status_code,
+                    "request_id": req_id,
+                    "latency_ms": round(latency * 1000, 2)
                 }
 
     except httpx.TimeoutException:
-        return {"success": False, "error": "Timeout", "message": f"A requisição excedeu o tempo limite de {REQUEST_TIMEOUT}s"}
+        latency = time.time() - start_time
+        _log_request(method, endpoint, 408, latency, req_id)
+        return {
+            "success": False, 
+            "error": "Timeout", 
+            "message": f"A requisição excedeu o tempo limite de {REQUEST_TIMEOUT}s",
+            "request_id": req_id,
+            "latency_ms": round(latency * 1000, 2)
+        }
     except Exception as e:
-        return {"success": False, "error": str(e), "message": f"Erro na requisição: {str(e)}"}
+        latency = time.time() - start_time
+        _log_request(method, endpoint, 500, latency, req_id)
+        return {
+            "success": False, 
+            "error": str(e), 
+            "message": f"Erro na requisição: {str(e)}",
+            "request_id": req_id,
+            "latency_ms": round(latency * 1000, 2)
+        }
 
 
 async def make_sienge_bulk_request(
@@ -87,48 +312,348 @@ async def make_sienge_bulk_request(
     """
     Função auxiliar para fazer requisições à API bulk-data do Sienge
     Suporta tanto Bearer Token quanto Basic Auth
+    MELHORADO: Observabilidade e normalização de parâmetros
     """
+    start_time = time.time()
+    req_id = str(uuid.uuid4())
+    
     try:
+        # Normalizar parâmetros
+        normalized_params = to_query(params) if params else None
+        
         async with httpx.AsyncClient(timeout=REQUEST_TIMEOUT) as client:
-            headers = {"Content-Type": "application/json", "Accept": "application/json"}
+            headers = {
+                "Content-Type": "application/json", 
+                "Accept": "application/json",
+                "X-Request-ID": req_id
+            }
 
-            # Configurar autenticação e URL para bulk-data
+            # Configurar autenticação e URL para bulk-data (corrigindo URLs duplas)
             auth = None
+            base_normalized = _normalize_url(SIENGE_BASE_URL, SIENGE_SUBDOMAIN)
 
             if SIENGE_API_KEY and SIENGE_API_KEY != "sua_api_key_aqui":
-                # Bearer Token (Recomendado)
                 headers["Authorization"] = f"Bearer {SIENGE_API_KEY}"
-                url = f"{SIENGE_BASE_URL}/{SIENGE_SUBDOMAIN}/public/api/bulk-data/v1{endpoint}"
+                url = f"{base_normalized}/bulk-data/v1{endpoint}"
             elif SIENGE_USERNAME and SIENGE_PASSWORD:
-                # Basic Auth usando httpx.BasicAuth
                 auth = httpx.BasicAuth(SIENGE_USERNAME, SIENGE_PASSWORD)
-                url = f"{SIENGE_BASE_URL}/{SIENGE_SUBDOMAIN}/public/api/bulk-data/v1{endpoint}"
+                url = f"{base_normalized}/bulk-data/v1{endpoint}"
             else:
                 return {
                     "success": False,
                     "error": "No Authentication",
                     "message": "Configure SIENGE_API_KEY ou SIENGE_USERNAME/PASSWORD no .env",
+                    "request_id": req_id
                 }
 
-            response = await client.request(method=method, url=url, headers=headers, params=params, json=json_data, auth=auth)
+            response = await client.request(
+                method=method, 
+                url=url, 
+                headers=headers, 
+                params=normalized_params, 
+                json=json_data, 
+                auth=auth
+            )
+            
+            latency = time.time() - start_time
+            _log_request(method, f"bulk-data{endpoint}", response.status_code, latency, req_id)
 
-            if response.status_code in [200, 201]:
+            if response.status_code in [200, 201, 202]:
                 try:
-                    return {"success": True, "data": response.json(), "status_code": response.status_code}
-                except BaseException:
-                    return {"success": True, "data": {"message": "Success"}, "status_code": response.status_code}
+                    return {
+                        "success": True, 
+                        "data": response.json(), 
+                        "status_code": response.status_code,
+                        "request_id": req_id,
+                        "latency_ms": round(latency * 1000, 2)
+                    }
+                except Exception:
+                    return {
+                        "success": True, 
+                        "data": {"message": "Success"}, 
+                        "status_code": response.status_code,
+                        "request_id": req_id,
+                        "latency_ms": round(latency * 1000, 2)
+                    }
             else:
                 return {
                     "success": False,
                     "error": f"HTTP {response.status_code}",
                     "message": response.text,
                     "status_code": response.status_code,
+                    "request_id": req_id,
+                    "latency_ms": round(latency * 1000, 2)
                 }
 
     except httpx.TimeoutException:
-        return {"success": False, "error": "Timeout", "message": f"A requisição excedeu o tempo limite de {REQUEST_TIMEOUT}s"}
+        latency = time.time() - start_time
+        _log_request(method, f"bulk-data{endpoint}", 408, latency, req_id)
+        return {
+            "success": False, 
+            "error": "Timeout", 
+            "message": f"A requisição excedeu o tempo limite de {REQUEST_TIMEOUT}s",
+            "request_id": req_id,
+            "latency_ms": round(latency * 1000, 2)
+        }
     except Exception as e:
-        return {"success": False, "error": str(e), "message": f"Erro na requisição bulk-data: {str(e)}"}
+        latency = time.time() - start_time
+        _log_request(method, f"bulk-data{endpoint}", 500, latency, req_id)
+        return {
+            "success": False, 
+            "error": str(e), 
+            "message": f"Erro na requisição bulk-data: {str(e)}",
+            "request_id": req_id,
+            "latency_ms": round(latency * 1000, 2)
+        }
+
+
+async def _fetch_bulk_with_polling(method: str, endpoint: str, params: Optional[Dict] = None, json_data: Optional[Dict] = None) -> Dict:
+    """
+    Faz requisição bulk com polling automático para requests assíncronos (202)
+    """
+    correlation_id = str(uuid.uuid4())
+    
+    # Fazer requisição inicial
+    result = await make_sienge_bulk_request(method, endpoint, params, json_data)
+    
+    # Se não foi 202 ou não tem identifier, retornar resultado direto
+    if result.get("status_code") != 202:
+        return result
+    
+    data = result.get("data", {})
+    if not isinstance(data, dict) or not data.get("identifier"):
+        return result
+    
+    # Processar requisição assíncrona com polling
+    identifier = data["identifier"]
+    request_id = result.get("request_id")
+    
+    logger.info(f"Iniciando polling para bulk request - Identifier: {identifier} - RequestID: {request_id}")
+    
+    max_attempts = 30  # Máximo 5 minutos (30 * 10s)
+    attempt = 0
+    backoff_delay = 2  # Começar com 2 segundos
+    
+    while attempt < max_attempts:
+        attempt += 1
+        await asyncio.sleep(backoff_delay)
+        
+        # Verificar status do processamento
+        status_result = await make_sienge_bulk_request("GET", f"/async/{identifier}")
+        
+        if not status_result["success"]:
+            logger.error(f"Erro ao verificar status do bulk request {identifier}: {status_result.get('error')}")
+            break
+        
+        status_data = status_result.get("data", {})
+        status = status_data.get("status", "unknown")
+        
+        logger.info(f"Polling attempt {attempt} - Status: {status} - Identifier: {identifier}")
+        
+        if status == "completed":
+            # Buscar resultados finais
+            all_chunks = []
+            chunk_count = status_data.get("chunk_count", 1)
+            
+            chunks_downloaded = 0
+            for chunk_num in range(chunk_count):
+                try:
+                    # CORRIGIDO: endpoint aninhado sob /async
+                    chunk_result = await make_sienge_bulk_request("GET", f"/async/{identifier}/result/{chunk_num}")
+                    if chunk_result["success"]:
+                        chunk_data = chunk_result.get("data", {}).get("data", [])
+                        if isinstance(chunk_data, list):
+                            all_chunks.extend(chunk_data)
+                        chunks_downloaded += 1
+                except Exception as e:
+                    logger.warning(f"Erro ao buscar chunk {chunk_num}: {e}")
+            
+            return {
+                "success": True,
+                "data": all_chunks,
+                "async_identifier": identifier,
+                "correlation_id": correlation_id,
+                "chunks_downloaded": chunks_downloaded,
+                "rows_returned": len(all_chunks),
+                "polling_attempts": attempt,
+                "request_id": request_id
+            }
+        
+        elif status == "failed" or status == "error":
+            return {
+                "success": False,
+                "error": "Bulk processing failed",
+                "message": status_data.get("error_message", "Processamento bulk falhou"),
+                "async_identifier": identifier,
+                "correlation_id": correlation_id,
+                "polling_attempts": attempt,
+                "request_id": request_id
+            }
+        
+        # Aumentar delay progressivamente (backoff exponencial limitado)
+        backoff_delay = min(backoff_delay * 1.5, 10)  # Máximo 10 segundos
+    
+    # Timeout do polling
+    return {
+        "success": False,
+        "error": "Polling timeout",
+        "message": f"Processamento bulk não completou em {max_attempts} tentativas",
+        "async_identifier": identifier,
+        "correlation_id": correlation_id,
+        "polling_attempts": attempt,
+        "request_id": request_id
+    }
+
+
+# ============ CAMADA DE SERVIÇOS (FUNÇÕES INTERNAS) ============
+
+async def _svc_get_customer_types() -> Dict:
+    """Serviço interno: buscar tipos de clientes"""
+    return await make_sienge_request("GET", "/customer-types", use_cache=True)
+
+
+async def _svc_get_customers(*, limit: int = 50, offset: int = 0, search: str = None, customer_type_id: str = None) -> Dict:
+    """Serviço interno: buscar clientes"""
+    params = {"limit": min(limit or 50, 200), "offset": offset or 0}
+    if search:
+        params["search"] = search
+    if customer_type_id:
+        params["customer_type_id"] = customer_type_id
+    
+    return await make_sienge_request("GET", "/customers", params=params)
+
+
+async def _svc_get_creditors(*, limit: int = 50, offset: int = 0, search: str = None) -> Dict:
+    """Serviço interno: buscar credores/fornecedores"""
+    params = {"limit": min(limit or 50, 200), "offset": offset or 0}
+    if search:
+        params["search"] = search
+    
+    return await make_sienge_request("GET", "/creditors", params=params)
+
+
+async def _svc_get_creditor_bank_info(*, creditor_id: str) -> Dict:
+    """Serviço interno: informações bancárias de credor"""
+    return await make_sienge_request("GET", f"/creditors/{creditor_id}/bank-informations")
+
+
+async def _svc_get_projects(*, limit: int = 100, offset: int = 0, company_id: int = None, 
+                           enterprise_type: int = None, receivable_register: str = None,
+                           only_buildings_enabled: bool = False) -> Dict:
+    """Serviço interno: buscar empreendimentos/projetos"""
+    params = {"limit": min(limit or 100, 200), "offset": offset or 0}
+    
+    if company_id:
+        params["company_id"] = company_id
+    if enterprise_type:
+        params["type"] = enterprise_type
+    if receivable_register:
+        params["receivable_register"] = receivable_register
+    if only_buildings_enabled:
+        params["only_buildings_enabled_for_integration"] = only_buildings_enabled
+    
+    return await make_sienge_request("GET", "/enterprises", params=params)
+
+
+async def _svc_get_bills(*, start_date: str = None, end_date: str = None, creditor_id: str = None, 
+                        status: str = None, limit: int = 50) -> Dict:
+    """Serviço interno: buscar títulos a pagar"""
+    # Se start_date não fornecido, usar últimos 30 dias
+    if not start_date:
+        start_date = (datetime.now() - timedelta(days=30)).strftime("%Y-%m-%d")
+    
+    # Se end_date não fornecido, usar hoje
+    if not end_date:
+        end_date = datetime.now().strftime("%Y-%m-%d")
+    
+    params = {"start_date": start_date, "end_date": end_date, "limit": min(limit or 50, 200)}
+    
+    if creditor_id:
+        params["creditor_id"] = creditor_id
+    if status:
+        params["status"] = status
+    
+    return await make_sienge_request("GET", "/bills", params=params)
+
+
+async def _svc_get_accounts_receivable(*, start_date: str, end_date: str, selection_type: str = "D",
+                                      company_id: int = None, cost_centers_id: List[int] = None,
+                                      correction_indexer_id: int = None, correction_date: str = None,
+                                      change_start_date: str = None, completed_bills: str = None,
+                                      origins_ids: List[str] = None, bearers_id_in: List[int] = None,
+                                      bearers_id_not_in: List[int] = None) -> Dict:
+    """Serviço interno: buscar contas a receber via bulk-data"""
+    params = {"start_date": start_date, "end_date": end_date, "selection_type": selection_type}
+    
+    if company_id:
+        params["company_id"] = company_id
+    if cost_centers_id:
+        params["cost_centers_id"] = cost_centers_id
+    if correction_indexer_id:
+        params["correction_indexer_id"] = correction_indexer_id
+    if correction_date:
+        params["correction_date"] = correction_date
+    if change_start_date:
+        params["change_start_date"] = change_start_date
+    if completed_bills:
+        params["completed_bills"] = completed_bills
+    if origins_ids:
+        params["origins_ids"] = origins_ids
+    if bearers_id_in:
+        params["bearers_id_in"] = bearers_id_in
+    if bearers_id_not_in:
+        params["bearers_id_not_in"] = bearers_id_not_in
+    
+    return await _fetch_bulk_with_polling("GET", "/income", params=params)
+
+
+async def _svc_get_accounts_receivable_by_bills(*, bills_ids: List[int], correction_indexer_id: int = None,
+                                               correction_date: str = None) -> Dict:
+    """Serviço interno: buscar contas a receber por títulos específicos"""
+    params = {"bills_ids": bills_ids}
+    
+    if correction_indexer_id:
+        params["correction_indexer_id"] = correction_indexer_id
+    if correction_date:
+        params["correction_date"] = correction_date
+    
+    return await _fetch_bulk_with_polling("GET", "/income/by-bills", params=params)
+
+
+async def _svc_get_purchase_orders(*, purchase_order_id: str = None, status: str = None, 
+                                  date_from: str = None, limit: int = 50) -> Dict:
+    """Serviço interno: buscar pedidos de compra"""
+    if purchase_order_id:
+        return await make_sienge_request("GET", f"/purchase-orders/{purchase_order_id}")
+    
+    params = {"limit": min(limit or 50, 200)}
+    if status:
+        params["status"] = status
+    if date_from:
+        params["date_from"] = date_from
+    
+    return await make_sienge_request("GET", "/purchase-orders", params=params)
+
+
+async def _svc_get_purchase_requests(*, purchase_request_id: str = None, limit: int = 50, status: str = None) -> Dict:
+    """Serviço interno: buscar solicitações de compra"""
+    if purchase_request_id:
+        return await make_sienge_request("GET", f"/purchase-requests/{purchase_request_id}")
+    
+    params = {"limit": min(limit or 50, 200)}
+    if status:
+        params["status"] = status
+    
+    return await make_sienge_request("GET", "/purchase-requests", params=params)
+
+
+async def _svc_get_purchase_invoices(*, limit: int = 50, date_from: str = None) -> Dict:
+    """Serviço interno: listar notas fiscais de compra"""
+    params = {"limit": min(limit or 50, 200)}
+    if date_from:
+        params["date_from"] = date_from
+    
+    return await make_sienge_request("GET", "/purchase-invoices", params=params)
 
 
 # ============ CONEXÃO E TESTE ============
@@ -138,8 +663,8 @@ async def make_sienge_bulk_request(
 async def test_sienge_connection() -> Dict:
     """Testa a conexão com a API do Sienge"""
     try:
-        # Tentar endpoint mais simples primeiro
-        result = await make_sienge_request("GET", "/customer-types")
+        # Usar serviço interno
+        result = await _svc_get_customer_types()
 
         if result["success"]:
             auth_method = "Bearer Token" if SIENGE_API_KEY else "Basic Auth"
@@ -149,6 +674,9 @@ async def test_sienge_connection() -> Dict:
                 "api_status": "Online",
                 "auth_method": auth_method,
                 "timestamp": datetime.now().isoformat(),
+                "request_id": result.get("request_id"),
+                "latency_ms": result.get("latency_ms"),
+                "cache": result.get("cache")
             }
         else:
             return {
@@ -157,6 +685,7 @@ async def test_sienge_connection() -> Dict:
                 "error": result.get("error"),
                 "details": result.get("message"),
                 "timestamp": datetime.now().isoformat(),
+                "request_id": result.get("request_id")
             }
     except Exception as e:
         return {
@@ -183,14 +712,13 @@ async def get_sienge_customers(
         search: Buscar por nome ou documento
         customer_type_id: Filtrar por tipo de cliente
     """
-    params = {"limit": min(limit or 50, 200), "offset": offset or 0}
-
-    if search:
-        params["search"] = search
-    if customer_type_id:
-        params["customer_type_id"] = customer_type_id
-
-    result = await make_sienge_request("GET", "/customers", params=params)
+    # Usar serviço interno
+    result = await _svc_get_customers(
+        limit=limit or 50, 
+        offset=offset or 0, 
+        search=search, 
+        customer_type_id=customer_type_id
+    )
 
     if result["success"]:
         data = result["data"]
@@ -203,7 +731,13 @@ async def get_sienge_customers(
             "message": f"✅ Encontrados {len(customers)} clientes (total: {total_count})",
             "customers": customers,
             "count": len(customers),
-            "filters_applied": params,
+            "total_count": total_count,
+            "filters_applied": {
+                "limit": limit, "offset": offset, "search": search, "customer_type_id": customer_type_id
+            },
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
         }
 
     return {
@@ -211,13 +745,15 @@ async def get_sienge_customers(
         "message": "❌ Erro ao buscar clientes",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
 @mcp.tool
 async def get_sienge_customer_types() -> Dict:
     """Lista tipos de clientes disponíveis"""
-    result = await make_sienge_request("GET", "/customer-types")
+    # Usar serviço interno
+    result = await _svc_get_customer_types()
 
     if result["success"]:
         data = result["data"]
@@ -230,6 +766,10 @@ async def get_sienge_customer_types() -> Dict:
             "message": f"✅ Encontrados {len(customer_types)} tipos de clientes (total: {total_count})",
             "customer_types": customer_types,
             "count": len(customer_types),
+            "total_count": total_count,
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
         }
 
     return {
@@ -237,6 +777,193 @@ async def get_sienge_customer_types() -> Dict:
         "message": "❌ Erro ao buscar tipos de clientes",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
+    }
+
+
+# ============ ALIAS COMPATÍVEIS COM CHECKLIST ============
+
+@mcp.tool
+async def get_sienge_enterprises(
+    limit: int = 100, offset: int = 0, company_id: int = None, enterprise_type: int = None
+) -> Dict:
+    """
+    ALIAS: get_sienge_projects → get_sienge_enterprises
+    Busca empreendimentos/obras (compatibilidade com checklist)
+    """
+    return await get_sienge_projects(
+        limit=limit, 
+        offset=offset, 
+        company_id=company_id, 
+        enterprise_type=enterprise_type
+    )
+
+
+@mcp.tool
+async def get_sienge_suppliers(
+    limit: int = 50,
+    offset: int = 0,
+    search: str = None
+) -> Dict:
+    """
+    ALIAS: get_sienge_creditors → get_sienge_suppliers
+    Busca fornecedores (compatibilidade com checklist)
+    """
+    return await get_sienge_creditors(limit=limit, offset=offset, search=search)
+
+
+@mcp.tool
+async def search_sienge_finances(
+    period_start: str,
+    period_end: str,
+    account_type: Optional[str] = None,
+    cost_center: Optional[str] = None,   # ignorado por enquanto (não suportado na API atual)
+    amount_filter: Optional[str] = None,
+    customer_creditor: Optional[str] = None
+) -> Dict:
+    """
+    ALIAS: search_sienge_financial_data → search_sienge_finances
+    - account_type: receivable | payable | both
+    - amount_filter: "100..500", ">=1000", "<=500", ">100", "<200", "=750"
+    - customer_creditor: termo de busca (cliente/credor)
+    """
+    # 1) mapear tipo
+    search_type = (account_type or "both").lower()
+    if search_type not in {"receivable", "payable", "both"}:
+        search_type = "both"
+
+    # 2) parse de faixa de valores
+    amount_min = amount_max = None
+    if amount_filter:
+        s = amount_filter.replace(" ", "")
+        try:
+            if ".." in s:
+                lo, hi = s.split("..", 1)
+                amount_min = float(lo) if lo else None
+                amount_max = float(hi) if hi else None
+            elif s.startswith(">="):
+                amount_min = float(s[2:])
+            elif s.startswith("<="):
+                amount_max = float(s[2:])
+            elif s.startswith(">"):
+                # >x  → min = x (estrito não suportado; aproximamos)
+                amount_min = float(s[1:])
+            elif s.startswith("<"):
+                amount_max = float(s[1:])
+            elif s.startswith("="):
+                v = float(s[1:])
+                amount_min = v
+                amount_max = v
+            else:
+                # número puro → min
+                amount_min = float(s)
+        except ValueError:
+            # filtro inválido → ignora silenciosamente
+            amount_min = amount_max = None
+
+    return await search_sienge_financial_data(
+        period_start=period_start,
+        period_end=period_end,
+        search_type=search_type,
+        amount_min=amount_min,
+        amount_max=amount_max,
+        customer_creditor_search=customer_creditor
+    )
+
+
+@mcp.tool
+async def get_sienge_accounts_payable(
+    start_date: str = None, end_date: str = None, creditor_id: str = None, 
+    status: str = None, limit: int = 50
+) -> Dict:
+    """
+    ALIAS: get_sienge_bills → get_sienge_accounts_payable
+    Busca contas a pagar (compatibilidade com checklist)
+    """
+    return await get_sienge_bills(
+        start_date=start_date,
+        end_date=end_date,
+        creditor_id=creditor_id,
+        status=status,
+        limit=limit
+    )
+
+
+@mcp.tool
+async def list_sienge_purchase_invoices(limit: int = 50, date_from: str = None) -> Dict:
+    """
+    Lista notas fiscais de compra (versão list/plural esperada pelo checklist)
+    
+    Args:
+        limit: Máximo de registros (padrão: 50, máx: 200)
+        date_from: Data inicial (YYYY-MM-DD)
+    """
+    # Usar serviço interno
+    result = await _svc_get_purchase_invoices(limit=limit, date_from=date_from)
+    
+    if result["success"]:
+        data = result["data"]
+        invoices = data.get("results", []) if isinstance(data, dict) else data
+        metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
+        total_count = metadata.get("count", len(invoices))
+
+        return {
+            "success": True,
+            "message": f"✅ Encontradas {len(invoices)} notas fiscais de compra (total: {total_count})",
+            "purchase_invoices": invoices,
+            "count": len(invoices),
+            "total_count": total_count,
+            "filters_applied": {"limit": limit, "date_from": date_from},
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
+        }
+
+    return {
+        "success": False,
+        "message": "❌ Erro ao buscar notas fiscais de compra",
+        "error": result.get("error"),
+        "details": result.get("message"),
+        "request_id": result.get("request_id")
+    }
+
+
+@mcp.tool
+async def list_sienge_purchase_requests(limit: int = 50, status: str = None) -> Dict:
+    """
+    Lista solicitações de compra (versão list/plural esperada pelo checklist)
+    
+    Args:
+        limit: Máximo de registros (padrão: 50, máx: 200)
+        status: Status da solicitação
+    """
+    # Usar serviço interno
+    result = await _svc_get_purchase_requests(limit=limit, status=status)
+    
+    if result["success"]:
+        data = result["data"]
+        requests = data.get("results", []) if isinstance(data, dict) else data
+        metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
+        total_count = metadata.get("count", len(requests))
+
+        return {
+            "success": True,
+            "message": f"✅ Encontradas {len(requests)} solicitações de compra (total: {total_count})",
+            "purchase_requests": requests,
+            "count": len(requests),
+            "total_count": total_count,
+            "filters_applied": {"limit": limit, "status": status},
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
+        }
+
+    return {
+        "success": False,
+        "message": "❌ Erro ao buscar solicitações de compra",
+        "error": result.get("error"),
+        "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -253,11 +980,12 @@ async def get_sienge_creditors(limit: Optional[int] = 50, offset: Optional[int]
         offset: Pular registros (padrão: 0)
         search: Buscar por nome
     """
-    params = {"limit": min(limit or 50, 200), "offset": offset or 0}
-    if search:
-        params["search"] = search
-
-    result = await make_sienge_request("GET", "/creditors", params=params)
+    # Usar serviço interno
+    result = await _svc_get_creditors(
+        limit=limit or 50,
+        offset=offset or 0,
+        search=search
+    )
 
     if result["success"]:
         data = result["data"]
@@ -270,6 +998,11 @@ async def get_sienge_creditors(limit: Optional[int] = 50, offset: Optional[int]
             "message": f"✅ Encontrados {len(creditors)} credores (total: {total_count})",
             "creditors": creditors,
             "count": len(creditors),
+            "total_count": total_count,
+            "filters_applied": {"limit": limit, "offset": offset, "search": search},
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
         }
 
     return {
@@ -277,6 +1010,7 @@ async def get_sienge_creditors(limit: Optional[int] = 50, offset: Optional[int]
         "message": "❌ Erro ao buscar credores",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -288,7 +1022,8 @@ async def get_sienge_creditor_bank_info(creditor_id: str) -> Dict:
     Args:
         creditor_id: ID do credor (obrigatório)
     """
-    result = await make_sienge_request("GET", f"/creditors/{creditor_id}/bank-informations")
+    # Usar serviço interno
+    result = await _svc_get_creditor_bank_info(creditor_id=creditor_id)
 
     if result["success"]:
         return {
@@ -296,6 +1031,8 @@ async def get_sienge_creditor_bank_info(creditor_id: str) -> Dict:
             "message": f"✅ Informações bancárias do credor {creditor_id}",
             "creditor_id": creditor_id,
             "bank_info": result["data"],
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms")
         }
 
     return {
@@ -303,6 +1040,7 @@ async def get_sienge_creditor_bank_info(creditor_id: str) -> Dict:
         "message": f"❌ Erro ao buscar info bancária do credor {creditor_id}",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -326,6 +1064,7 @@ async def get_sienge_accounts_receivable(
 ) -> Dict:
     """
     Consulta parcelas do contas a receber via API bulk-data
+    MELHORADO: Suporte a polling assíncrono para requests 202
 
     Args:
         start_date: Data de início do período (YYYY-MM-DD) - OBRIGATÓRIO
@@ -341,48 +1080,61 @@ async def get_sienge_accounts_receivable(
         bearers_id_in: Filtrar parcelas com códigos de portador específicos
         bearers_id_not_in: Filtrar parcelas excluindo códigos de portador específicos
     """
-    params = {"startDate": start_date, "endDate": end_date, "selectionType": selection_type}
-
-    if company_id:
-        params["companyId"] = company_id
-    if cost_centers_id:
-        params["costCentersId"] = cost_centers_id
-    if correction_indexer_id:
-        params["correctionIndexerId"] = correction_indexer_id
-    if correction_date:
-        params["correctionDate"] = correction_date
-    if change_start_date:
-        params["changeStartDate"] = change_start_date
-    if completed_bills:
-        params["completedBills"] = completed_bills
-    if origins_ids:
-        params["originsIds"] = origins_ids
-    if bearers_id_in:
-        params["bearersIdIn"] = bearers_id_in
-    if bearers_id_not_in:
-        params["bearersIdNotIn"] = bearers_id_not_in
-
-    result = await make_sienge_bulk_request("GET", "/income", params=params)
+    # Usar serviço interno com polling assíncrono
+    result = await _svc_get_accounts_receivable(
+        start_date=start_date,
+        end_date=end_date,
+        selection_type=selection_type,
+        company_id=company_id,
+        cost_centers_id=cost_centers_id,
+        correction_indexer_id=correction_indexer_id,
+        correction_date=correction_date,
+        change_start_date=change_start_date,
+        completed_bills=completed_bills,
+        origins_ids=origins_ids,
+        bearers_id_in=bearers_id_in,
+        bearers_id_not_in=bearers_id_not_in
+    )
 
     if result["success"]:
-        data = result["data"]
-        income_data = data.get("data", []) if isinstance(data, dict) else data
-
-        return {
+        # Para requests normais (200) e assíncronos processados
+        income_data = result.get("data", [])
+        
+        response = {
             "success": True,
             "message": f"✅ Encontradas {len(income_data)} parcelas a receber",
             "income_data": income_data,
             "count": len(income_data),
             "period": f"{start_date} a {end_date}",
             "selection_type": selection_type,
-            "filters": params,
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms")
         }
+        
+        # Se foi processamento assíncrono, incluir informações extras
+        if result.get("async_identifier"):
+            response.update({
+                "async_processing": {
+                    "identifier": result.get("async_identifier"),
+                    "correlation_id": result.get("correlation_id"),
+                    "chunks_downloaded": result.get("chunks_downloaded"),
+                    "rows_returned": result.get("rows_returned"),
+                    "polling_attempts": result.get("polling_attempts")
+                }
+            })
+        
+        return response
 
     return {
         "success": False,
         "message": "❌ Erro ao buscar parcelas a receber",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id"),
+        "async_info": {
+            "identifier": result.get("async_identifier"),
+            "polling_attempts": result.get("polling_attempts")
+        } if result.get("async_identifier") else None
     }
 
 
@@ -392,39 +1144,57 @@ async def get_sienge_accounts_receivable_by_bills(
 ) -> Dict:
     """
     Consulta parcelas dos títulos informados via API bulk-data
+    MELHORADO: Suporte a polling assíncrono para requests 202
 
     Args:
         bills_ids: Lista de códigos dos títulos - OBRIGATÓRIO
         correction_indexer_id: Código do indexador de correção
         correction_date: Data para correção do indexador (YYYY-MM-DD)
     """
-    params = {"billsIds": bills_ids}
-
-    if correction_indexer_id:
-        params["correctionIndexerId"] = correction_indexer_id
-    if correction_date:
-        params["correctionDate"] = correction_date
-
-    result = await make_sienge_bulk_request("GET", "/income/by-bills", params=params)
+    # Usar serviço interno com polling assíncrono
+    result = await _svc_get_accounts_receivable_by_bills(
+        bills_ids=bills_ids,
+        correction_indexer_id=correction_indexer_id,
+        correction_date=correction_date
+    )
 
     if result["success"]:
-        data = result["data"]
-        income_data = data.get("data", []) if isinstance(data, dict) else data
-
-        return {
+        income_data = result.get("data", [])
+        
+        response = {
             "success": True,
             "message": f"✅ Encontradas {len(income_data)} parcelas dos títulos informados",
             "income_data": income_data,
             "count": len(income_data),
             "bills_consulted": bills_ids,
-            "filters": params,
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms")
         }
+        
+        # Se foi processamento assíncrono, incluir informações extras
+        if result.get("async_identifier"):
+            response.update({
+                "async_processing": {
+                    "identifier": result.get("async_identifier"),
+                    "correlation_id": result.get("correlation_id"),
+                    "chunks_downloaded": result.get("chunks_downloaded"),
+                    "rows_returned": result.get("rows_returned"),
+                    "polling_attempts": result.get("polling_attempts")
+                }
+            })
+        
+        return response
 
     return {
         "success": False,
         "message": "❌ Erro ao buscar parcelas dos títulos informados",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id"),
+        "async_info": {
+            "identifier": result.get("async_identifier"),
+            "polling_attempts": result.get("polling_attempts")
+        } if result.get("async_identifier") else None
     }
 
 
@@ -446,26 +1216,14 @@ async def get_sienge_bills(
         status: Status do título (ex: open, paid, cancelled)
         limit: Máximo de registros (padrão: 50, máx: 200)
     """
-    from datetime import datetime, timedelta
-
-    # Se start_date não fornecido, usar últimos 30 dias
-    if not start_date:
-        start_date = (datetime.now() - timedelta(days=30)).strftime("%Y-%m-%d")
-
-    # Se end_date não fornecido, usar hoje
-    if not end_date:
-        end_date = datetime.now().strftime("%Y-%m-%d")
-
-    # Parâmetros obrigatórios
-    params = {"startDate": start_date, "endDate": end_date, "limit": min(limit or 50, 200)}  # OBRIGATÓRIO pela API
-
-    # Parâmetros opcionais
-    if creditor_id:
-        params["creditor_id"] = creditor_id
-    if status:
-        params["status"] = status
-
-    result = await make_sienge_request("GET", "/bills", params=params)
+    # Usar serviço interno
+    result = await _svc_get_bills(
+        start_date=start_date,
+        end_date=end_date,
+        creditor_id=creditor_id,
+        status=status,
+        limit=limit or 50
+    )
 
     if result["success"]:
         data = result["data"]
@@ -473,14 +1231,33 @@ async def get_sienge_bills(
         metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
         total_count = metadata.get("count", len(bills))
 
+        # Aplicar parsing numérico nos valores
+        for bill in bills:
+            if "amount" in bill:
+                bill["amount"] = _parse_numeric_value(bill["amount"])
+            if "paid_amount" in bill:
+                bill["paid_amount"] = _parse_numeric_value(bill["paid_amount"])
+            if "remaining_amount" in bill:
+                bill["remaining_amount"] = _parse_numeric_value(bill["remaining_amount"])
+
+        # Usar datas padrão se não fornecidas
+        actual_start = start_date or (datetime.now() - timedelta(days=30)).strftime("%Y-%m-%d")
+        actual_end = end_date or datetime.now().strftime("%Y-%m-%d")
+
         return {
             "success": True,
-            "message": f"✅ Encontrados {len(bills)} títulos a pagar (total: {total_count}) - período: {start_date} a {end_date}",
+            "message": f"✅ Encontrados {len(bills)} títulos a pagar (total: {total_count}) - período: {actual_start} a {actual_end}",
             "bills": bills,
             "count": len(bills),
             "total_count": total_count,
-            "period": {"start_date": start_date, "end_date": end_date},
-            "filters": params,
+            "period": {"start_date": actual_start, "end_date": actual_end},
+            "filters_applied": {
+                "start_date": actual_start, "end_date": actual_end, 
+                "creditor_id": creditor_id, "status": status, "limit": limit
+            },
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
         }
 
     return {
@@ -488,6 +1265,7 @@ async def get_sienge_bills(
         "message": "❌ Erro ao buscar títulos a pagar",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -533,6 +1311,8 @@ async def get_sienge_purchase_orders(
             "message": f"✅ Encontrados {len(orders)} pedidos de compra",
             "purchase_orders": orders,
             "count": len(orders),
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms")
         }
 
     return {
@@ -540,6 +1320,8 @@ async def get_sienge_purchase_orders(
         "message": "❌ Erro ao buscar pedidos de compra",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id"),
+        "latency_ms": result.get("latency_ms")
     }
 
 
@@ -631,14 +1413,18 @@ async def create_sienge_purchase_request(description: str, project_id: str, item
         "date": datetime.now().strftime("%Y-%m-%d"),
     }
 
-    result = await make_sienge_request("POST", "/purchase-requests", json_data=request_data)
+    # CORRIGIDO: Normalizar JSON payload
+    json_data = to_camel_json(request_data)
+    result = await make_sienge_request("POST", "/purchase-requests", json_data=json_data)
 
     if result["success"]:
         return {
             "success": True,
             "message": "✅ Solicitação de compra criada com sucesso",
-            "request_id": result["data"].get("id"),
+            "request_id": result.get("request_id"),
+            "purchase_request_id": result["data"].get("id"),
             "data": result["data"],
+            "latency_ms": result.get("latency_ms")
         }
 
     return {
@@ -646,6 +1432,7 @@ async def create_sienge_purchase_request(description: str, project_id: str, item
         "message": "❌ Erro ao criar solicitação de compra",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -731,13 +1518,13 @@ async def create_sienge_purchase_invoice(
         notes: Observações (opcional)
     """
     invoice_data = {
-        "documentId": document_id,
+        "document_id": document_id,
         "number": number,
-        "supplierId": supplier_id,
-        "companyId": company_id,
-        "movementTypeId": movement_type_id,
-        "movementDate": movement_date,
-        "issueDate": issue_date,
+        "supplier_id": supplier_id,
+        "company_id": company_id,
+        "movement_type_id": movement_type_id,
+        "movement_date": movement_date,
+        "issue_date": issue_date,
     }
 
     if series:
@@ -745,7 +1532,7 @@ async def create_sienge_purchase_invoice(
     if notes:
         invoice_data["notes"] = notes
 
-    result = await make_sienge_request("POST", "/purchase-invoices", json_data=invoice_data)
+    result = await make_sienge_request("POST", "/purchase-invoices", json_data=to_camel_json(invoice_data))
 
     if result["success"]:
         return {"success": True, "message": f"✅ Nota fiscal {number} criada com sucesso", "invoice": result["data"]}
@@ -782,14 +1569,14 @@ async def add_items_to_purchase_invoice(
         copy_attachments_purchase_orders: Copiar anexos dos pedidos de compra
     """
     item_data = {
-        "deliveriesOrder": deliveries_order,
-        "copyNotesPurchaseOrders": copy_notes_purchase_orders,
-        "copyNotesResources": copy_notes_resources,
-        "copyAttachmentsPurchaseOrders": copy_attachments_purchase_orders,
+        "deliveries_order": deliveries_order,
+        "copy_notes_purchase_orders": copy_notes_purchase_orders,
+        "copy_notes_resources": copy_notes_resources,
+        "copy_attachments_purchase_orders": copy_attachments_purchase_orders,
     }
 
     result = await make_sienge_request(
-        "POST", f"/purchase-invoices/{sequential_number}/items/purchase-orders/delivery-schedules", json_data=item_data
+        "POST", f"/purchase-invoices/{sequential_number}/items/purchase-orders/delivery-schedules", json_data=to_camel_json(item_data)
     )
 
     if result["success"]:
@@ -950,6 +1737,7 @@ async def get_sienge_projects(
 ) -> Dict:
     """
     Busca empreendimentos/obras no Sienge
+    CORRIGIDO: Mapeamento correto da chave de resposta
 
     Args:
         limit: Máximo de registros (padrão: 100, máximo: 200)
@@ -959,31 +1747,39 @@ async def get_sienge_projects(
         receivable_register: Filtro de registro de recebíveis (B3, CERC)
         only_buildings_enabled: Retornar apenas obras habilitadas para integração orçamentária
     """
-    params = {"limit": min(limit or 100, 200), "offset": offset or 0}
-
-    if company_id:
-        params["companyId"] = company_id
-    if enterprise_type:
-        params["type"] = enterprise_type
-    if receivable_register:
-        params["receivableRegister"] = receivable_register
-    if only_buildings_enabled:
-        params["onlyBuildingsEnabledForIntegration"] = only_buildings_enabled
-
-    result = await make_sienge_request("GET", "/enterprises", params=params)
+    # Usar serviço interno
+    result = await _svc_get_projects(
+        limit=limit or 100,
+        offset=offset or 0,
+        company_id=company_id,
+        enterprise_type=enterprise_type,
+        receivable_register=receivable_register,
+        only_buildings_enabled=only_buildings_enabled or False
+    )
 
     if result["success"]:
         data = result["data"]
+        # CORREÇÃO: API retorna em "results", mas paginador espera em "enterprises"
         enterprises = data.get("results", []) if isinstance(data, dict) else data
         metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
+        total_count = metadata.get("count", len(enterprises))
 
         return {
             "success": True,
-            "message": f"✅ Encontrados {len(enterprises)} empreendimentos",
-            "enterprises": enterprises,
+            "message": f"✅ Encontrados {len(enterprises)} empreendimentos (total: {total_count})",
+            "enterprises": enterprises,  # Manter consistência para paginador
+            "projects": enterprises,     # Alias para compatibilidade
             "count": len(enterprises),
+            "total_count": total_count,
             "metadata": metadata,
-            "filters": params,
+            "filters_applied": {
+                "limit": limit, "offset": offset, "company_id": company_id,
+                "enterprise_type": enterprise_type, "receivable_register": receivable_register,
+                "only_buildings_enabled": only_buildings_enabled
+            },
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms"),
+            "cache": result.get("cache")
         }
 
     return {
@@ -991,6 +1787,7 @@ async def get_sienge_projects(
         "message": "❌ Erro ao buscar empreendimentos",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id")
     }
 
 
@@ -1065,6 +1862,9 @@ async def get_sienge_units(limit: Optional[int] = 50, offset: Optional[int] = 0)
             "message": f"✅ Encontradas {len(units)} unidades (total: {total_count})",
             "units": units,
             "count": len(units),
+            "total_count": total_count,
+            "request_id": result.get("request_id"),
+            "latency_ms": result.get("latency_ms")
         }
 
     return {
@@ -1072,6 +1872,8 @@ async def get_sienge_units(limit: Optional[int] = 50, offset: Optional[int] = 0)
         "message": "❌ Erro ao buscar unidades",
         "error": result.get("error"),
         "details": result.get("message"),
+        "request_id": result.get("request_id"),
+        "latency_ms": result.get("latency_ms")
     }
 
 
@@ -1210,35 +2012,44 @@ async def search_sienge_data(
 
 
 async def _search_specific_entity(entity_type: str, query: str, limit: int, filters: Dict) -> Dict:
-    """Função auxiliar para buscar em uma entidade específica"""
+    """
+    Função auxiliar para buscar em uma entidade específica
+    CORRIGIDO: Usa serviços internos, nunca outras tools
+    """
     
     if entity_type == "customers":
-        result = await get_sienge_customers(limit=limit, search=query)
+        result = await _svc_get_customers(limit=limit, search=query)
         if result["success"]:
+            data = result["data"]
+            customers = data.get("results", []) if isinstance(data, dict) else data
             return {
                 "success": True,
-                "data": result["customers"],
-                "count": result["count"],
+                "data": customers,
+                "count": len(customers),
                 "entity_type": "customers"
             }
     
     elif entity_type == "creditors":
-        result = await get_sienge_creditors(limit=limit, search=query)
+        result = await _svc_get_creditors(limit=limit, search=query)
         if result["success"]:
+            data = result["data"]
+            creditors = data.get("results", []) if isinstance(data, dict) else data
             return {
                 "success": True,
-                "data": result["creditors"],
-                "count": result["count"],
+                "data": creditors,
+                "count": len(creditors),
                 "entity_type": "creditors"
             }
     
     elif entity_type == "projects" or entity_type == "enterprises":
         # Para projetos, usar filtros mais específicos se disponível
         company_id = filters.get("company_id")
-        result = await get_sienge_projects(limit=limit, company_id=company_id)
+        result = await _svc_get_projects(limit=limit, company_id=company_id)
         if result["success"]:
+            data = result["data"]
+            projects = data.get("results", []) if isinstance(data, dict) else data
+            
             # Filtrar por query se fornecida
-            projects = result["enterprises"]
             if query:
                 projects = [
                     p for p in projects 
@@ -1257,23 +2068,27 @@ async def _search_specific_entity(entity_type: str, query: str, limit: int, filt
         # Para títulos, usar data padrão se não especificada
         start_date = filters.get("start_date")
         end_date = filters.get("end_date") 
-        result = await get_sienge_bills(
+        result = await _svc_get_bills(
             start_date=start_date, 
             end_date=end_date, 
             limit=limit
         )
         if result["success"]:
+            data = result["data"]
+            bills = data.get("results", []) if isinstance(data, dict) else data
             return {
                 "success": True,
-                "data": result["bills"],
-                "count": result["count"],
+                "data": bills,
+                "count": len(bills),
                 "entity_type": "bills"
             }
     
     elif entity_type == "purchase_orders":
-        result = await get_sienge_purchase_orders(limit=limit)
+        result = await _svc_get_purchase_orders(limit=limit)
         if result["success"]:
-            orders = result["purchase_orders"]
+            data = result["data"]
+            orders = data.get("results", []) if isinstance(data, dict) else data
+            
             # Filtrar por query se fornecida
             if query:
                 orders = [
@@ -1316,28 +2131,28 @@ async def list_sienge_entities() -> Dict:
             "name": "Credores/Fornecedores",
             "description": "Fornecedores e credores cadastrados",
             "search_fields": ["nome", "documento"],
-            "tools": ["get_sienge_creditors", "get_sienge_creditor_bank_info"]
+            "tools": ["get_sienge_creditors", "get_sienge_creditor_bank_info", "get_sienge_suppliers"]
         },
         {
             "type": "projects",
             "name": "Empreendimentos/Obras", 
             "description": "Projetos e obras cadastrados",
             "search_fields": ["código", "descrição", "nome"],
-            "tools": ["get_sienge_projects", "get_sienge_enterprise_by_id"]
+            "tools": ["get_sienge_projects", "get_sienge_enterprises", "get_sienge_enterprise_by_id"]
         },
         {
             "type": "bills",
             "name": "Títulos a Pagar",
             "description": "Contas a pagar e títulos financeiros",
             "search_fields": ["número", "credor", "valor"],
-            "tools": ["get_sienge_bills"]
+            "tools": ["get_sienge_bills", "get_sienge_accounts_payable"]
         },
         {
             "type": "purchase_orders",
             "name": "Pedidos de Compra",
             "description": "Pedidos de compra e solicitações",
             "search_fields": ["id", "descrição", "status"],
-            "tools": ["get_sienge_purchase_orders", "get_sienge_purchase_requests"]
+            "tools": ["get_sienge_purchase_orders", "get_sienge_purchase_requests", "list_sienge_purchase_requests"]
         },
         {
             "type": "invoices",
@@ -1358,7 +2173,14 @@ async def list_sienge_entities() -> Dict:
             "name": "Financeiro",
             "description": "Contas a receber e movimentações financeiras",
             "search_fields": ["período", "cliente", "valor"],
-            "tools": ["get_sienge_accounts_receivable"]
+            "tools": ["get_sienge_accounts_receivable", "search_sienge_financial_data", "search_sienge_finances"]
+        },
+        {
+            "type": "suppliers",
+            "name": "Fornecedores",
+            "description": "Fornecedores e credores cadastrados", 
+            "search_fields": ["código", "nome", "razão social"],
+            "tools": ["get_sienge_suppliers"]
         }
     ]
     
@@ -1401,41 +2223,70 @@ async def get_sienge_data_paginated(
     
     filters = filters or {}
     
-    # Mapear para os tools existentes com offset
+    # CORRIGIDO: Mapear para serviços internos, não tools
     if entity_type == "customers":
         search = filters.get("search")
         customer_type_id = filters.get("customer_type_id")
-        result = await get_sienge_customers(
+        result = await _svc_get_customers(
             limit=page_size,
             offset=offset, 
             search=search,
             customer_type_id=customer_type_id
         )
+        # CORRIGIDO: Extrair items e total corretamente
+        if result["success"]:
+            data = result["data"]
+            items, total = _extract_items_and_total(data)
+            result["customers"] = items
+            result["count"] = len(items)
+            result["total_count"] = total
         
     elif entity_type == "creditors":
         search = filters.get("search")
-        result = await get_sienge_creditors(
+        result = await _svc_get_creditors(
             limit=page_size,
             offset=offset,
             search=search
         )
+        # CORRIGIDO: Extrair items e total corretamente
+        if result["success"]:
+            data = result["data"]
+            items, total = _extract_items_and_total(data)
+            result["creditors"] = items
+            result["count"] = len(items)
+            result["total_count"] = total
         
     elif entity_type == "projects":
-        result = await get_sienge_projects(
+        result = await _svc_get_projects(
             limit=page_size,
             offset=offset,
             company_id=filters.get("company_id"),
             enterprise_type=filters.get("enterprise_type")
         )
+        # CORRIGIDO: Extrair items e total corretamente
+        if result["success"]:
+            data = result["data"]
+            items, total = _extract_items_and_total(data)
+            result["projects"] = items
+            result["enterprises"] = items  # Para compatibilidade
+            result["count"] = len(items)
+            result["total_count"] = total
         
     elif entity_type == "bills":
-        result = await get_sienge_bills(
+        result = await _svc_get_bills(
             start_date=filters.get("start_date"),
             end_date=filters.get("end_date"),
             creditor_id=filters.get("creditor_id"),
             status=filters.get("status"),
             limit=page_size
         )
+        # CORRIGIDO: Extrair items e total corretamente
+        if result["success"]:
+            data = result["data"]
+            items, total = _extract_items_and_total(data)
+            result["bills"] = items
+            result["count"] = len(items)
+            result["total_count"] = total
         
     else:
         return {
@@ -1499,20 +2350,21 @@ async def search_sienge_financial_data(
     # Buscar contas a receber
     if search_type in ["receivable", "both"]:
         try:
-            receivable_result = await get_sienge_accounts_receivable(
+            # CORRIGIDO: Usar serviço interno
+            receivable_result = await _svc_get_accounts_receivable(
                 start_date=period_start,
                 end_date=period_end,
                 selection_type="D"  # Por vencimento
             )
             
             if receivable_result["success"]:
-                receivable_data = receivable_result["income_data"]
+                receivable_data = receivable_result.get("data", [])
                 
-                # Aplicar filtros de valor se especificados
+                # CORRIGIDO: Aplicar filtros de valor usando _parse_numeric_value
                 if amount_min is not None or amount_max is not None:
                     filtered_data = []
                     for item in receivable_data:
-                        amount = float(item.get("amount", 0) or 0)
+                        amount = _parse_numeric_value(item.get("amount", 0))
                         if amount_min is not None and amount < amount_min:
                             continue
                         if amount_max is not None and amount > amount_max:
@@ -1545,20 +2397,22 @@ async def search_sienge_financial_data(
     # Buscar contas a pagar  
     if search_type in ["payable", "both"]:
         try:
-            payable_result = await get_sienge_bills(
+            # CORRIGIDO: Usar serviço interno
+            payable_result = await _svc_get_bills(
                 start_date=period_start,
                 end_date=period_end,
                 limit=100
             )
             
             if payable_result["success"]:
-                payable_data = payable_result["bills"]
+                data = payable_result["data"]
+                payable_data = data.get("results", []) if isinstance(data, dict) else data
                 
-                # Aplicar filtros de valor se especificados
+                # CORRIGIDO: Aplicar filtros de valor usando _parse_numeric_value
                 if amount_min is not None or amount_max is not None:
                     filtered_data = []
                     for item in payable_data:
-                        amount = float(item.get("amount", 0) or 0)
+                        amount = _parse_numeric_value(item.get("amount", 0))
                         if amount_min is not None and amount < amount_min:
                             continue
                         if amount_max is not None and amount > amount_max:
@@ -1650,23 +2504,26 @@ async def get_sienge_dashboard_summary() -> Dict:
     
     # 2. Contar clientes (amostra)
     try:
-        customers_result = await get_sienge_customers(limit=1)
-        if customers_result["success"]:
-            dashboard_data["customers_available"] = True
-        else:
-            dashboard_data["customers_available"] = False
+        # CORRIGIDO: Usar serviço interno
+        customers_result = await _svc_get_customers(limit=1)
+        dashboard_data["customers"] = {"available": customers_result["success"]}
     except Exception as e:
         errors.append(f"Clientes: {str(e)}")
-        dashboard_data["customers_available"] = False
+        dashboard_data["customers"] = {"available": False}
     
     # 3. Contar projetos (amostra)
     try:
-        projects_result = await get_sienge_projects(limit=5)
+        # CORRIGIDO: Usar serviço interno
+        projects_result = await _svc_get_projects(limit=5)
         if projects_result["success"]:
+            data = projects_result["data"]
+            enterprises = data.get("results", []) if isinstance(data, dict) else data
+            metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
+            
             dashboard_data["projects"] = {
                 "available": True,
-                "sample_count": len(projects_result["enterprises"]),
-                "total_count": projects_result.get("metadata", {}).get("count", "N/A")
+                "sample_count": len(enterprises),
+                "total_count": metadata.get("count", "N/A")
             }
         else:
             dashboard_data["projects"] = {"available": False}
@@ -1676,16 +2533,21 @@ async def get_sienge_dashboard_summary() -> Dict:
     
     # 4. Títulos a pagar do mês atual
     try:
-        bills_result = await get_sienge_bills(
+        # CORRIGIDO: Usar serviço interno
+        bills_result = await _svc_get_bills(
             start_date=current_month_start,
             end_date=current_month_end,
             limit=10
         )
         if bills_result["success"]:
+            data = bills_result["data"]
+            bills = data.get("results", []) if isinstance(data, dict) else data
+            metadata = data.get("resultSetMetadata", {}) if isinstance(data, dict) else {}
+            
             dashboard_data["monthly_bills"] = {
                 "available": True,
-                "count": len(bills_result["bills"]),
-                "total_count": bills_result.get("total_count", len(bills_result["bills"]))
+                "count": len(bills),
+                "total_count": metadata.get("count", len(bills))
             }
         else:
             dashboard_data["monthly_bills"] = {"available": False}
@@ -1695,11 +2557,15 @@ async def get_sienge_dashboard_summary() -> Dict:
     
     # 5. Tipos de clientes
     try:
-        customer_types_result = await get_sienge_customer_types()
+        # CORRIGIDO: Usar serviço interno
+        customer_types_result = await _svc_get_customer_types()
         if customer_types_result["success"]:
+            data = customer_types_result["data"]
+            customer_types = data.get("results", []) if isinstance(data, dict) else data
+            
             dashboard_data["customer_types"] = {
                 "available": True,
-                "count": len(customer_types_result["customer_types"])
+                "count": len(customer_types)
             }
         else:
             dashboard_data["customer_types"] = {"available": False}
@@ -1737,6 +2603,21 @@ def add(a: int, b: int) -> int:
     return a + b
 
 
+def _mask(s: str) -> str:
+    """Mascara dados sensíveis mantendo apenas o início e fim"""
+    if not s:
+        return None
+    if len(s) == 1:
+        return s + "*"
+    if len(s) == 2:
+        return s
+    if len(s) <= 4:
+        return s[:2] + "*" * (len(s) - 2)
+    # Para strings > 4: usar no máximo 4 asteriscos no meio
+    middle_asterisks = min(4, len(s) - 4)
+    return s[:2] + "*" * middle_asterisks + s[-2:]
+
+
 def _get_auth_info_internal() -> Dict:
     """Função interna para verificar configuração de autenticação"""
     if SIENGE_API_KEY and SIENGE_API_KEY != "sua_api_key_aqui":
@@ -1747,7 +2628,7 @@ def _get_auth_info_internal() -> Dict:
             "configured": True,
             "base_url": SIENGE_BASE_URL,
             "subdomain": SIENGE_SUBDOMAIN,
-            "username": SIENGE_USERNAME,
+            "username": _mask(SIENGE_USERNAME) if SIENGE_USERNAME else None,
         }
     else:
         return {