coding-proxy 0.2.1a2__py3-none-any.whl → 0.2.2__py3-none-any.whl

coding/proxy/cli/__init__.py

@@ -216,16 +216,50 @@ async def _run_usage(
 @app.command()
 def reset(
     port: int = typer.Option(8046, "--port", "-p", help="代理服务端口"),
+    vendor: str | None = typer.Option(
+        None,
+        "--vendor",
+        "-v",
+        help="提升/重排序 vendor 优先级（单个或逗号分隔多个）",
+    ),
 ) -> None:
-    """重置所有层级的熔断器和配额守卫（恢复使用最高优先级供应商）."""
+    """重置所有层级的熔断器和配额守卫.
+
+    可通过 -v 指定运行时 N-tier 链路重排序：
+
+    \b
+      -v zhipu               提升 zhipu 到最高优先级
+      -v zhipu,anthropic     替换整个 N-tier 链路顺序
+    """
     import httpx
 
+    # 构建请求 body
+    json_body: dict | None = None
+    if vendor:
+        parts = [v.strip() for v in vendor.split(",") if v.strip()]
+        if parts:
+            json_body = {"vendors": parts}
+
     try:
-        resp = httpx.post(f"http://127.0.0.1:{port}/api/reset", timeout=5)
+        resp = httpx.post(
+            f"http://127.0.0.1:{port}/api/reset",
+            json=json_body,
+            timeout=5,
+        )
         if resp.status_code == 200:
+            data = resp.json()
             console.print("[green]所有层级的熔断器和配额守卫已重置[/green]")
+            tier_order = data.get("tier_order")
+            if tier_order:
+                order_str = " → ".join(tier_order)
+                console.print(f"[cyan]当前链路顺序:[/] {order_str}")
         else:
-            console.print(f"[red]重置失败: {resp.status_code}[/red]")
+            try:
+                err = resp.json()
+                msg = err.get("error", {}).get("message", resp.text)
+            except Exception:
+                msg = resp.text
+            console.print(f"[red]重置失败: {msg}[/red]")
     except httpx.ConnectError:
         console.print("[red]代理服务未运行[/red]")
 

coding/proxy/config/config.default.yaml

@@ -111,7 +111,7 @@ vendors:
     # 不配置 circuit_breaker → 自动成为终端层，不触发向下故障转移
     circuit_breaker:
       failure_threshold: 3
-      recovery_timeout_seconds: 300
+      recovery_timeout_seconds: 30
       success_threshold: 2
     quota_guard:
       enabled: true # 启用后按 Premium Requests 配额管理
@@ -421,6 +421,11 @@ pricing:
     input_cost_per_mtok: ¥0.80
     output_cost_per_mtok: ¥2.00
     cache_read_cost_per_mtok: ¥0.16
+  - vendor: zhipu
+    model: glm-4.7 # 待区分长短上下文定价
+    input_cost_per_mtok: ¥2.00
+    output_cost_per_mtok: ¥8.00
+    cache_read_cost_per_mtok: ¥0.40
   - vendor: zhipu
     model: glm-5v-turbo # 待区分长短上下文定价
     input_cost_per_mtok: ¥5.00

coding/proxy/logging/__init__.py

@@ -1,6 +1,6 @@
 """日志模块.
 
-提供 uvicorn 兼容的 dictConfig 构建、JSON 结构化格式化器、
+提供 uvicorn 兼容的 dictConfig 构建、文件日志字符串格式化器、
 以及 gzip 压缩轮转支持。
 """
 
@@ -12,7 +12,7 @@ import logging.handlers
 import os
 from pathlib import Path
 
-from .formatters import JsonFormatter
+from .formatters import FileFormatter
 
 # ── 常量 ────────────────────────────────────────────────────────
 
@@ -83,7 +83,7 @@ def build_log_config(
 
     双写行为：
         - 控制台：人类可读格式，级别由 ``level`` 参数控制（handler 级别过滤）
-        - 文件：JSON 结构化格式，固定 DEBUG 级别（捕获所有日志）
+        - 文件：字符串格式（与控制台风格一致），固定 DEBUG 级别（捕获所有日志）
         - 当 ``file_path`` 为 ``None`` 或空字符串时，退化为纯控制台模式（向后兼容）
     """
     config: dict = {
@@ -118,7 +118,11 @@ def build_log_config(
         },
         "loggers": {
             "uvicorn": {"handlers": ["default"], "level": level, "propagate": False},
-            "uvicorn.error": {"level": level},
+            "uvicorn.error": {
+                "handlers": ["default"],
+                "level": level,
+                "propagate": False,
+            },
             "uvicorn.access": {
                 "handlers": ["access"],
                 "level": "INFO",
@@ -138,16 +142,16 @@ def build_log_config(
         log_file = Path(file_path)
         log_file.parent.mkdir(parents=True, exist_ok=True)
 
-        # 注入 JSON formatter
-        config["formatters"]["json"] = {
-            "()": "coding.proxy.logging.formatters.JsonFormatter",
+        # 注入文件日志字符串 formatter
+        config["formatters"]["file_fmt"] = {
+            "()": "coding.proxy.logging.formatters.FileFormatter",
         }
 
         # 注入 RotatingFileHandler（gzip 压缩轮转）
         # 使用工厂函数（而非 class + namer/rotator kwargs），
         # 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
         config["handlers"]["file"] = {
-            "formatter": "json",
+            "formatter": "file_fmt",
             "()": "coding.proxy.logging._create_rotating_file_handler",
             "filename": str(log_file.resolve()),
             "maxBytes": max_bytes,
@@ -182,7 +186,7 @@ def build_log_config(
 
 __all__ = [
     "build_log_config",
-    "JsonFormatter",
+    "FileFormatter",
     "_gzip_namer",
     "_gzip_rotator",
 ]

coding/proxy/logging/formatters.py

@@ -1,49 +1,27 @@
-"""结构化日志格式化器（JSON 输出）.
+"""文件日志格式化器（字符串输出）.
 
-为文件日志提供机器可读的 JSON 格式输出，
-与控制台的人类可读格式形成正交双写。
+为文件日志提供人类可读的字符串格式输出，
+与控制台输出风格一致，便于人工阅读和 grep 检索。
 """
 
 from __future__ import annotations
 
-import json
 import logging
-from datetime import UTC, datetime
 
 
-class JsonFormatter(logging.Formatter):
-    """将 LogRecord 格式化为单行 JSON 字符串.
+class FileFormatter(logging.Formatter):
+    """将 LogRecord 格式化为单行可读字符串.
 
-    输出字段：
-    - ``timestamp``: ISO 8601 UTC 时间戳
-    - ``level``: 日志级别名称（DEBUG/INFO/WARNING/ERROR）
-    - ``logger``: logger 名称（如 ``coding.proxy.routing.executor``）
-    - ``message``: 格式化后的日志消息
-    - ``exception``: 异常堆栈（仅当存在时）
+    输出格式：``2026-04-11 16:51:13 INFO  ModelCall: vendor=zhipu ...``
 
     设计要点：
-    - 使用 ``ensure_ascii=False`` 支持中文日志内容
-    - 异常信息（exc_info）序列化为 ``exception`` 字段
-    - 时间戳统一使用 UTC ISO 格式，便于跨时区聚合分析
-    - ``sort_keys=True`` 保证输出确定性，便于日志聚合工具处理
+    - 时间戳使用 ``yyyy-MM-dd HH:mm:ss`` 格式（与控制台一致）
+    - 日志级别左对齐 5 字符宽度，保证多行对齐美观
+    - 无 ANSI 颜色码（文件输出不需要终端转义）
     """
 
-    def format(self, record: logging.LogRecord) -> str:
-        """将 LogRecord 序列化为 JSON 行."""
-        message = record.getMessage()
-
-        exception: str | None = None
-        if record.exc_info and record.exc_info[0] is not None:
-            exception = self.formatException(record.exc_info)
-
-        log_entry: dict[str, object] = {
-            "timestamp": datetime.fromtimestamp(record.created, tz=UTC).isoformat(),
-            "level": record.levelname,
-            "logger": record.name,
-            "message": message,
-        }
-
-        if exception:
-            log_entry["exception"] = exception
-
-        return json.dumps(log_entry, ensure_ascii=False, sort_keys=True)
+    def __init__(self) -> None:
+        super().__init__(
+            fmt="%(asctime)s %(levelname)-5s %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S",
+        )

coding/proxy/routing/circuit_breaker.py

@@ -32,11 +32,14 @@ class CircuitBreaker:
         recovery_timeout_seconds: int = 300,
         success_threshold: int = 2,
         max_recovery_seconds: int = 3600,
+        *,
+        vendor_name: str = "",
     ) -> None:
         self._failure_threshold = failure_threshold
         self._recovery_timeout = recovery_timeout_seconds
         self._success_threshold = success_threshold
         self._max_recovery = max_recovery_seconds
+        self._vendor_label = f" [{vendor_name}]" if vendor_name else ""
 
         self._state = CircuitState.CLOSED
         self._failure_count = 0
@@ -65,7 +68,13 @@ class CircuitBreaker:
                 self._success_count += 1
                 if self._success_count >= self._success_threshold:
                     self._transition_to(CircuitState.CLOSED)
-                    logger.info("Circuit breaker: HALF_OPEN → CLOSED (recovered)")
+                    logger.info(
+                        "Circuit breaker%s: HALF_OPEN → CLOSED "
+                        "(recovered, %d/%d consecutive successes)",
+                        self._vendor_label,
+                        self._success_count,
+                        self._success_threshold,
+                    )
             elif self._state == CircuitState.CLOSED:
                 # 正常状态下成功，无需操作
                 pass
@@ -94,7 +103,10 @@ class CircuitBreaker:
                 self._transition_to(CircuitState.OPEN)
                 self._backoff_recovery(hint_seconds=retry_after_seconds)
                 logger.warning(
-                    "Circuit breaker: HALF_OPEN → OPEN (recovery failed, next retry in %ds)",
+                    "Circuit breaker%s: HALF_OPEN → OPEN "
+                    "(recovery probe failed, backoff %ds → next retry in %ds)",
+                    self._vendor_label,
+                    self._current_recovery,
                     self._current_recovery,
                 )
             elif self._state == CircuitState.CLOSED:
@@ -117,14 +129,17 @@ class CircuitBreaker:
                         )
                     if force_open:
                         logger.warning(
-                            "Circuit breaker: CLOSED → OPEN "
-                            "(forced, rate-limited, next retry in %ds)",
+                            "Circuit breaker%s: CLOSED → OPEN "
+                            "(forced, rate-limited, retry-after=%ss → next retry in %ds)",
+                            self._vendor_label,
+                            retry_after_seconds or "N/A",
                             self._current_recovery,
                         )
                     else:
                         logger.warning(
-                            "Circuit breaker: CLOSED → OPEN "
+                            "Circuit breaker%s: CLOSED → OPEN "
                             "(%d consecutive failures, next retry in %ds)",
+                            self._vendor_label,
                             self._failure_count,
                             self._current_recovery,
                         )
@@ -134,7 +149,9 @@ class CircuitBreaker:
         with self._lock:
             self._transition_to(CircuitState.CLOSED)
             self._current_recovery = self._recovery_timeout
-            logger.info("Circuit breaker: manually reset to CLOSED")
+            logger.info(
+                "Circuit breaker%s: manually reset to CLOSED", self._vendor_label
+            )
 
     def get_info(self) -> dict:
         """获取熔断器状态信息."""
@@ -157,7 +174,13 @@ class CircuitBreaker:
         elapsed = time.monotonic() - self._last_failure_time
         if elapsed >= self._current_recovery:
             self._transition_to(CircuitState.HALF_OPEN)
-            logger.info("Circuit breaker: OPEN → HALF_OPEN (recovery timeout)")
+            elapsed_s = int(elapsed)
+            logger.info(
+                "Circuit breaker%s: OPEN → HALF_OPEN (recovery timeout, waited %ds/%ds)",
+                self._vendor_label,
+                elapsed_s,
+                self._current_recovery,
+            )
 
     def _transition_to(self, new_state: CircuitState) -> None:
         self._state = new_state

coding/proxy/routing/executor.py

@@ -48,9 +48,13 @@ logger = logging.getLogger(__name__)
 
 
 def _log_http_error_detail(
-    tier_name: str, exc: Exception, *, is_stream: bool = False
+    tier_name: str,
+    exc: Exception,
+    *,
+    is_stream: bool = False,
+    tier: VendorTier | None = None,
 ) -> None:
-    """记录 HTTP 错误的详细信息（状态码 / 响应体摘要 / 异常类型）.
+    """记录 HTTP 错误的详细信息（状态码 / 响应体摘要 / 异常类型 / 熔断器快照）.
 
     替代原先单行 ``logger.warning("Tier %s stream failed: %s", ...)``，
     在非 200 响应时输出更丰富的诊断上下文，便于跟踪上游故障根因。
@@ -78,6 +82,14 @@ def _log_http_error_detail(
                 detail_parts.append(f"  error_msg={err.get('message', 'N/A')[:200]}")
     else:
         detail_parts.append(f"  message={str(exc)[:300]}")
+    # 熔断器状态快照
+    if tier and tier.circuit_breaker:
+        cb = tier.circuit_breaker
+        cb_info = cb.get_info()
+        detail_parts.append(
+            f"  circuit_breaker={cb_info['state']} "
+            f"(failures={cb_info['failure_count']}/{cb._failure_threshold})"
+        )
     logger.warning("\n".join(detail_parts))
 
 
@@ -268,6 +280,12 @@ class _RouteExecutor:
                 duration = int((time.monotonic() - start) * 1000)
                 model = body.get("model", "unknown")
                 model_served = usage.get("model_served") or tier.vendor.map_model(model)
+                if failed_tier_name is not None:
+                    logger.info(
+                        "Tier %s stream succeeded (took over from failed tier: %s)",
+                        tier.name,
+                        failed_tier_name,
+                    )
                 self._recorder.log_model_call(
                     vendor=tier.name,
                     model_requested=model,
@@ -310,7 +328,7 @@ class _RouteExecutor:
                 httpx.ConnectError,
                 httpx.ReadError,
             ) as exc:
-                _log_http_error_detail(tier.name, exc, is_stream=True)
+                _log_http_error_detail(tier.name, exc, is_stream=True, tier=tier)
                 (
                     should_continue,
                     failed_tier_name,
@@ -325,6 +343,7 @@ class _RouteExecutor:
                     request_body=body,
                 )
                 if should_continue:
+                    self._log_failover_transition(tier, exc, self._tiers, i)
                     continue
                 if is_last:
                     raise
@@ -399,6 +418,12 @@ class _RouteExecutor:
                     duration = int((time.monotonic() - start) * 1000)
                     model = body.get("model", "unknown")
                     model_served = resp.model_served or tier.vendor.map_model(model)
+                    if failed_tier_name is not None:
+                        logger.info(
+                            "Tier %s message succeeded (took over from failed tier: %s)",
+                            tier.name,
+                            failed_tier_name,
+                        )
                     self._recorder.log_model_call(
                         vendor=tier.name,
                         model_requested=model,
@@ -469,10 +494,15 @@ class _RouteExecutor:
                         rate_limit_deadline=compute_rate_limit_deadline(rl_info),
                     )
                     if not is_last:
+                        next_tier = (
+                            self._tiers[i + 1] if i + 1 < len(self._tiers) else None
+                        )
+                        next_info = f" → next: {next_tier.name}" if next_tier else ""
                         logger.warning(
-                            "Tier %s error %d, failing over",
+                            "Tier %s error %d, failing over%s",
                             tier.name,
                             resp.status_code,
+                            next_info,
                         )
                         failed_tier_name = tier.name
                         continue
@@ -513,7 +543,7 @@ class _RouteExecutor:
                 continue
 
             except (httpx.TimeoutException, httpx.ConnectError, httpx.ReadError) as exc:
-                _log_http_error_detail(tier.name, exc, is_stream=False)
+                _log_http_error_detail(tier.name, exc, is_stream=False, tier=tier)
                 tier.record_failure()
                 failed_tier_name = tier.name
                 if is_last:
@@ -694,6 +724,30 @@ class _RouteExecutor:
 
         return False, tier.name, exc
 
+    @staticmethod
+    def _log_failover_transition(
+        current_tier: VendorTier,
+        exc: Exception,
+        tiers: list[VendorTier],
+        current_index: int,
+    ) -> None:
+        """记录 vendor 轮转摘要日志（谁 → 谁，原因）."""
+        next_tier = tiers[current_index + 1] if current_index + 1 < len(tiers) else None
+        if next_tier is None:
+            return
+
+        # 提取错误摘要
+        reason = type(exc).__name__
+        if isinstance(exc, httpx.HTTPStatusError) and exc.response is not None:
+            reason = f"HTTP {exc.response.status_code}"
+
+        logger.info(
+            "Failover: %s → %s (reason: %s)",
+            current_tier.name,
+            next_tier.name,
+            reason,
+        )
+
     @staticmethod
     def _is_cap_error(resp: VendorResponse) -> bool:
         """判断是否为订阅用量上限错误."""

coding/proxy/routing/router.py

@@ -68,6 +68,66 @@ class RequestRouter:
         """当前活跃供应商名称（由 Executor 在成功响应时写入）."""
         return self._active_vendor_name
 
+    # ── 运行时 N-tier 链路重排序 ─────────────────────────────
+
+    def get_vendor_names(self) -> list[str]:
+        """返回当前 tiers 的供应商名称列表（按优先级顺序）."""
+        return [t.name for t in self._tiers]
+
+    def reorder_tiers(self, vendor_names: list[str]) -> None:
+        """原地重排序 N-tier 链路.
+
+        使用切片赋值保持列表引用同一性，使 ``_RouteExecutor`` 立即可见。
+
+        Args:
+            vendor_names: 新的供应商名称顺序（必须包含所有当前 tier）。
+
+        Raises:
+            ValueError: 名称不存在、有重复、或未覆盖所有 tier。
+        """
+        name_to_tier = {t.name: t for t in self._tiers}
+        current_names = set(name_to_tier)
+
+        # 校验：重复
+        if len(vendor_names) != len(set(vendor_names)):
+            seen: set[str] = set()
+            dups = [n for n in vendor_names if n in seen or seen.add(n)]  # type: ignore[func-returns-value]
+            raise ValueError(f"vendor 名称重复: {', '.join(dups)}")
+
+        # 校验：名称存在性
+        unknown = [n for n in vendor_names if n not in current_names]
+        if unknown:
+            raise ValueError(
+                f"未知 vendor: {', '.join(unknown)}; "
+                f"可用: {', '.join(sorted(current_names))}"
+            )
+
+        # 校验：全量覆盖
+        provided = set(vendor_names)
+        if provided != current_names:
+            missing = current_names - provided
+            raise ValueError(f"缺少 vendor: {', '.join(sorted(missing))}")
+
+        self._tiers[:] = [name_to_tier[n] for n in vendor_names]
+
+    def promote_vendor(self, vendor_name: str) -> None:
+        """将指定 vendor 提升至最高优先级，其余保持相对顺序.
+
+        Args:
+            vendor_name: 要提升的供应商名称。
+
+        Raises:
+            ValueError: 名称不存在。
+        """
+        current_names = self.get_vendor_names()
+        if vendor_name not in current_names:
+            available = sorted(t.name for t in self._tiers)
+            raise ValueError(
+                f"未知 vendor: {vendor_name}; 可用: {', '.join(available)}"
+            )
+        new_order = [vendor_name] + [n for n in current_names if n != vendor_name]
+        self.reorder_tiers(new_order)
+
     # ── 公开路由接口（委托给 _RouteExecutor）───────────────
 
     async def route_stream(

coding/proxy/routing/tier.py

@@ -155,11 +155,33 @@ class VendorTier:
         if not is_probe_scenario:
             return cb_allows and qg_allows and wqg_allows
 
+        # 构建探测上下文摘要
+        probe_context_parts: list[str] = []
+        if self.circuit_breaker:
+            cb_info = self.circuit_breaker.get_info()
+            probe_context_parts.append(
+                f"circuit_breaker={cb_info['state']}, "
+                f"failures={cb_info['failure_count']}"
+            )
+        if self._rate_limit_deadline > 0:
+            waited = int(time.monotonic() - self._rate_limit_deadline)
+            probe_context_parts.append(f"rate_limit_waited={waited}s")
+        probe_context = (
+            " (" + ", ".join(probe_context_parts) + ")" if probe_context_parts else ""
+        )
+
         # ── 第二层: Health Check 门控 ──
-        logger.info("Tier %s: probe scenario, running health check", self.name)
+        logger.info(
+            "Tier %s: probe scenario%s, running health check",
+            self.name,
+            probe_context,
+        )
         healthy = await self.vendor.check_health()
         if not healthy:
-            logger.warning("Tier %s: health check failed, staying degraded", self.name)
+            logger.warning(
+                "Tier %s: health check failed, staying degraded",
+                self.name,
+            )
             self.record_failure()
             return False
 

coding/proxy/server/app.py

@@ -106,7 +106,9 @@ def create_app(config: ProxyConfig | None = None) -> FastAPI:
             vendor_cfg, config.failover, mapper, token_store
         )
         cb = (
-            _build_circuit_breaker(vendor_cfg.circuit_breaker)
+            _build_circuit_breaker(
+                vendor_cfg.circuit_breaker, vendor_name=vendor_cfg.vendor
+            )
             if vendor_cfg.circuit_breaker
             else None
         )

coding/proxy/server/factory.py

@@ -91,13 +91,16 @@ def _find_copilot_vendor(router: Any) -> CopilotVendor | None:
     return None
 
 
-def _build_circuit_breaker(cfg: CircuitBreakerConfig) -> CircuitBreaker:
+def _build_circuit_breaker(
+    cfg: CircuitBreakerConfig, *, vendor_name: str = ""
+) -> CircuitBreaker:
     """从配置构建熔断器实例."""
     return CircuitBreaker(
         failure_threshold=cfg.failure_threshold,
         recovery_timeout_seconds=cfg.recovery_timeout_seconds,
         success_threshold=cfg.success_threshold,
         max_recovery_seconds=cfg.max_recovery_seconds,
+        vendor_name=vendor_name,
     )
 
 

coding/proxy/server/routes.py

@@ -261,7 +261,40 @@ def register_admin_routes(app: Any, router: Any) -> None:
     """注册管理操作路由（重置等）."""
 
     @app.post("/api/reset")
-    async def reset_circuit() -> dict:
+    async def reset_circuit(request: Request) -> Response:
+        """重置所有层级的熔断器/配额守卫/rate limit.
+
+        可选 JSON body ``{"vendors": ["v1", "v2", ...]}`` 支持运行时重排序：
+        - 单个 vendor → 提升至最高优先级，其余保持相对顺序
+        - 多个 vendor → 替换整个 N-tier 链路顺序（需覆盖所有 vendor）
+        """
+        # 解析可选 body
+        vendor_names: list[str] | None = None
+        try:
+            body = await request.json()
+            if isinstance(body, dict):
+                raw = body.get("vendors")
+                if isinstance(raw, list) and raw:
+                    vendor_names = [str(v) for v in raw]
+        except Exception:
+            # 无 body 或非 JSON → 仅 reset（向后兼容）
+            pass
+
+        # 重排序（如果指定）
+        if vendor_names is not None:
+            try:
+                if len(vendor_names) == 1:
+                    router.promote_vendor(vendor_names[0])
+                else:
+                    router.reorder_tiers(vendor_names)
+            except ValueError as exc:
+                return json_error_response(
+                    400,
+                    error_type="invalid_request_error",
+                    message=str(exc),
+                )
+
+        # 全量 reset
         for tier in router.tiers:
             if tier.circuit_breaker:
                 tier.circuit_breaker.reset()
@@ -270,7 +303,16 @@ def register_admin_routes(app: Any, router: Any) -> None:
             if tier.weekly_quota_guard:
                 tier.weekly_quota_guard.reset()
             tier.reset_rate_limit()
-        return {"status": "ok"}
+
+        result: dict[str, Any] = {"status": "ok"}
+        if vendor_names is not None:
+            result["tier_order"] = router.get_vendor_names()
+
+        return Response(
+            content=json.dumps(result, ensure_ascii=False).encode(),
+            status_code=200,
+            media_type="application/json",
+        )
 
 
 def register_reauth_routes(app: Any, reauth_coordinator: Any) -> None:

coding/proxy/vendors/antigravity.py

@@ -37,6 +37,9 @@ _V1INTERNAL_USER_AGENT = (
     "Antigravity/4.1.31 (Macintosh; Intel Mac OS X 10_15_7) "
     "Chrome/132.0.6834.160 Electron/39.2.3"
 )
+# Cloud Resource Manager API（用于自动发现 GCP project_id）
+_CRM_PROJECTS_URL = "https://cloudresourcemanager.googleapis.com/v1/projects"
+_V1INTERNAL_BASE_URL = "https://cloudcode-pa.googleapis.com/v1internal"
 
 
 # ── Google OAuth2 Token 管理器（原 antigravity_token_manager.py） ──
@@ -148,13 +151,119 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
         self._project_id: str = config.project_id
         self._session_id: str = uuid.uuid4().hex[:16]
         self._message_count: int = 0
+        # project_id 自动发现状态
+        self._project_id_discovered: str = ""
+        self._project_discovery_attempted: bool = False
 
     def get_name(self) -> str:
         return "antigravity"
 
     def _is_v1internal_mode(self) -> bool:
         """检测是否启用 v1internal 协议模式（与 Antigravity-Manager 对齐）."""
-        return bool(self._project_id) and "v1internal" in self._base_url
+        return bool(self._effective_project_id) and "v1internal" in self._base_url
+
+    @property
+    def _effective_project_id(self) -> str:
+        """返回有效的 project_id：显式配置优先，否则使用自动发现的值."""
+        return self._project_id or self._project_id_discovered
+
+    async def _discover_project_id(self, access_token: str) -> str:
+        """通过 Cloud Resource Manager API 自动发现用户的 GCP project_id.
+
+        利用已有的 cloud-platform OAuth scope 调用 CRM API 列出用户有权限的项目，
+        选择合适的 project_id 后自动切换至 v1internal 模式。
+
+        Args:
+            access_token: 当前有效的 Google OAuth access_token
+
+        Returns:
+            发现到的 project_id；失败返回空字符串
+        """
+        if self._project_discovery_attempted:
+            return self._project_id_discovered
+
+        # 已手动配置则跳过
+        if self._project_id:
+            self._project_discovery_attempted = True
+            return ""
+
+        self._project_discovery_attempted = True
+        client = self._get_client()
+        try:
+            response = await client.get(
+                _CRM_PROJECTS_URL,
+                headers={"authorization": f"Bearer {access_token}"},
+            )
+            response.raise_for_status()
+
+            data = response.json()
+            projects = data.get("projects", [])
+
+            if not projects:
+                logger.warning(
+                    "GCP 项目自动发现完成但未找到任何项目，"
+                    "回退至标准 GLA 模式。请手动配置 project_id 或确认账号已关联 GCP 项目。"
+                )
+                return ""
+
+            # 选择策略：优先 ACTIVE 状态的项目
+            selected = None
+            for p in projects:
+                if p.get("lifecycleState", "") == "ACTIVE":
+                    selected = p
+                    break
+            if selected is None:
+                for p in projects:
+                    if p.get("lifecycleState", "") != "DELETE_REQUESTED":
+                        selected = p
+                        break
+            if selected is None:
+                selected = projects[0]
+
+            project_id = selected.get("projectId", "")
+            if not project_id:
+                logger.warning(
+                    "GCP 项目 '%s' 缺少 projectId 字段，跳过。",
+                    selected.get("name", "unknown"),
+                )
+                return ""
+
+            # 发现成功：原子性切换到 v1internal 模式
+            self._base_url = _V1INTERNAL_BASE_URL
+            self._project_id_discovered = project_id
+
+            # 重建 HTTP 客户端（base_url 是初始化参数）
+            if self._client is not None and not self._client.is_closed:
+                await self._client.aclose()
+                self._client = None
+
+            logger.info(
+                "GCP 项目自动发现成功: project_id=%s, name=%s, "
+                "已自动切换至 v1internal 协议模式",
+                project_id,
+                selected.get("name", "unknown"),
+            )
+            return project_id
+
+        except httpx.HTTPStatusError as exc:
+            logger.error(
+                "GCP 项目自动发现 API 错误 (HTTP %d)，回退至标准 GLA 模式。%s",
+                exc.response.status_code,
+                exc,
+            )
+            return ""
+        except (httpx.TimeoutException, httpx.ConnectError) as exc:
+            logger.warning(
+                "GCP 项目自动发现网络异常，回退至标准 GLA 模式。%s",
+                exc,
+            )
+            return ""
+        except Exception as exc:
+            logger.error(
+                "GCP 项目自动发现未知异常，回退至标准 GLA 模式。%s",
+                exc,
+            )
+            return ""
 
     def get_capabilities(self) -> VendorCapabilities:
         return VendorCapabilities(
@@ -230,6 +339,19 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
         self._last_request_adaptations = converted.adaptations
         token = await self._token_manager.get_token()
 
+        # 懒加载：未配置 project_id 时自动发现并切换 v1internal 模式
+        if not self._project_id and not self._project_discovery_attempted:
+            discovered = await self._discover_project_id(token)
+            if discovered:
+                logger.info(
+                    "已自动启用 v1internal 协议模式（project_id=%s）", discovered
+                )
+            else:
+                logger.info(
+                    "无法自动发现 GCP project_id，继续使用标准 GLA 模式。"
+                    "如需启用 v1internal 协议，请在配置中手动指定 project_id。"
+                )
+
         if self._is_v1internal_mode():
             return self._prepare_v1internal_request(gemini_body, resolved_model, token)
 
@@ -259,7 +381,7 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
         """
         self._message_count += 1
         envelope = {
-            "project": self._project_id,
+            "project": self._effective_project_id,
             "requestId": f"agent/antigravity/{self._session_id}/{self._message_count}",
             "request": gemini_body,
             "model": resolved_model,
@@ -277,7 +399,7 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
             "_prepare_v1internal_request: model=%s -> %s, project=%s, requestId=%s",
             resolved_model,
             resolved_model,
-            self._project_id,
+            self._effective_project_id,
             envelope["requestId"],
         )
         return envelope, new_headers
@@ -308,6 +430,15 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
             result["resolved_model"] = self._last_resolved_model
         if self._last_model_resolution_reason:
             result["model_resolution_reason"] = self._last_model_resolution_reason
+        # project_id 发现诊断
+        result["project_id_source"] = (
+            "configured"
+            if self._project_id
+            else ("discovered" if self._project_id_discovered else "none")
+        )
+        if self._project_id_discovered:
+            result["discovered_project_id"] = self._project_id_discovered
+        result["is_v1internal_mode"] = self._is_v1internal_mode()
         return result
 
     async def send_message(

{coding_proxy-0.2.1a2.dist-info → coding_proxy-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.2.1a2
+Version: 0.2.2
 Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao...
 Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
 Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md
@@ -56,7 +56,7 @@ When you're deeply immersed in your coding "zone" with **Claude Code** (or any A
 
 ## 🌟 Core Features
 
-- **⛓️ N-tier Chained Failover**: Automatically downgrades from official Claude Plans, gracefully falling back to GitHub Copilot, then Google Antigravity, with Zhipu GLM acting as the ultimate safety net.
+- **⛓️ N-tier Chained Failover**: Autonomous descending sequence, supporting Claude's official plans, as well as Coding Plans from GitHub Copilot, Z AI, MiniMax, Alibaba Qwen, Xiaomi, Kimi, Doubao, etc.
 - **🛡️ Smart Resilience & Quota Guardians**: Every single vendor node comes fully armed with an independent **Circuit Breaker** and **Quota Guard** to proactively dodge avalanches without breaking a sweat.
 - **👻 Phantom-like Transparency**: **100% transparent** to the client! No code tweaks required. Overwrite `ANTHROPIC_BASE_URL` with a single line, and you're good to go.
 - **🔄 Universal Alchemy (Formats & Models)**: Native support for two-way request/streaming (SSE) translations between Anthropic ←→ Gemini. Plus, auto/DIY model name mapping (e.g., effortlessly morphing `claude-*` into `glm-*`).

{coding_proxy-0.2.1a2.dist-info → coding_proxy-0.2.2.dist-info}/RECORD

@@ -9,7 +9,7 @@ coding/proxy/auth/providers/__init__.py,sha256=hnGL_aSHcMxiZHK6HKPWD0_tWSPcwuxwQ
 coding/proxy/auth/providers/base.py,sha256=TOtCi2b81-UBdEoWMv7HbYSmRxAjGSvnF1yBxazqai0,1092
 coding/proxy/auth/providers/github.py,sha256=xH6yygAzt8vI-MXV8EHl2tg4RcOmLaLBns93PBCyVG8,4835
 coding/proxy/auth/providers/google.py,sha256=MhbM5PXmgwQBgWCMDkhK_7GYyvS-IdPV4ATxKYH6WXM,8402
-coding/proxy/cli/__init__.py,sha256=glGVFdTj8fMLYSSWNtFGU4u9D2AoYBTLNgaSkjyQEnM,7911
+coding/proxy/cli/__init__.py,sha256=wkec3lIOglEOMN44ssGPzixCJ2hiTZ2wYL4_JtBc4Nw,8911
 coding/proxy/cli/auth_commands.py,sha256=tN5jWJo8sJP8jgoN4WH5iTl9rhi4xWPLMptgeTHIFpE,9212
 coding/proxy/cli/banner.py,sha256=gat7QGpfocL0wiAw3-MSUsCviyc59Sf-XswOp7Pg6LI,1694
 coding/proxy/compat/__init__.py,sha256=-msRszArsk2YJJtOeaidYDd1tAQEzeE91LvCi1CyMis,721
@@ -17,7 +17,7 @@ coding/proxy/compat/canonical.py,sha256=-zcuEwZ402xeH3C545RmuYRkT2HDuvFloyFydDv8
 coding/proxy/compat/session_store.py,sha256=B9IFjjQJnHMg1244m__jG9gnqGWi26-JyEtwopEri6Q,5244
 coding/proxy/config/__init__.py,sha256=hzgU5noJGecjj13UY38cC_p6jpWO3GO7okSW-A2XkJ0,127
 coding/proxy/config/auth_schema.py,sha256=LYrJQU_fgW-6AoQdjXt4-MgPJjXjv9HrghlCcZwotnA,696
-coding/proxy/config/config.default.yaml,sha256=UjtM6b4FNAJvilCm2fgjNvN5hPfDHt0EYKLlvL_0UDU,16404
+coding/proxy/config/config.default.yaml,sha256=WT5wK3T9h3ODyz7ydicieC4PGZTHq-419FV__dxdj4M,16575
 coding/proxy/config/loader.py,sha256=1J_RBJgjuC8RwB2mwewLMS7vy9WEhUqttZG2igeDm-w,8984
 coding/proxy/config/resiliency.py,sha256=GnzY-LoyfFqXFM1l6xEru418v-cKlv97-HM0noGPdks,1308
 coding/proxy/config/routing.py,sha256=aJMhfCRyoZIvemM3Q2_KV9rpWxUsFnoY0ZdCr4TwSs8,11765
@@ -30,9 +30,9 @@ coding/proxy/convert/anthropic_to_openai.py,sha256=crE8gi780Tr-dI58hce75BiaKzlh_
 coding/proxy/convert/gemini_sse_adapter.py,sha256=b7zQ9wBBn1bbG46WpLrAYOl0ExpyMTzpTorxoTadWaM,7395
 coding/proxy/convert/gemini_to_anthropic.py,sha256=EE_rUsLmWTsF2QSYWqIYzsjyk1mKXFp2sziqj_S2W5U,3446
 coding/proxy/convert/openai_to_anthropic.py,sha256=8rg8NZs_1up27MixrXRJAfmSiYrOkh_lkAJuytDGZow,3694
-coding/proxy/logging/__init__.py,sha256=VQ0GTb95cER0yIIrwfPTGEbRdUW4d2pnTv4NClmuG_o,6591
+coding/proxy/logging/__init__.py,sha256=6zEh2CELMJ5aZvM6PNCOFlZ55De8xoC6QNyMAa9WeCA,6755
 coding/proxy/logging/db.py,sha256=uARNaaAXWxemwfyybp660ujpi6UikNtFokG0pzXYwR8,19058
-coding/proxy/logging/formatters.py,sha256=au9fsFvm6x5JLUyx-UVKq24yOcGOJhxgyTf9QBWcfns,1677
+coding/proxy/logging/formatters.py,sha256=8LDqiNAxGcfn9fsHqZzdK9TKGqOGNAOls75B1byBjnM,823
 coding/proxy/logging/stats.py,sha256=JlhJC4a2RmuCjbaseSUONScbcgn41KNR_sNsZ0OScbw,9203
 coding/proxy/model/__init__.py,sha256=E8E59yabP-CF5GIwHE4OEGPLiJj3yTLjFWmCorkQTxc,3947
 coding/proxy/model/auth.py,sha256=NiiIPdLdxPtuHNrsGoxFASUXwJU5pkDuVRorQe_1Z-Q,934
@@ -42,30 +42,30 @@ coding/proxy/model/pricing.py,sha256=KHYsLQJJkEEuAeX8iB182znfpfSPTf9KI1hPchphqnc
 coding/proxy/model/token.py,sha256=yCh-66_nFDAk7wKbYy-9ymdgae3SaJ47-fkYfYLO3Oo,1818
 coding/proxy/model/vendor.py,sha256=Yg4AYN7tgjHaGWRGEccCs3AdO8vBc-KxIelnqRowpyo,7898
 coding/proxy/routing/__init__.py,sha256=2Tpc6MQ5Oy_w-YlEWQVDSgcSgiHp3OwKOABIjj5kfHA,1595
-coding/proxy/routing/circuit_breaker.py,sha256=fKodIYxJ-3hhil2rEjsGqvyHTspliN_eS8QyL3BFI8s,7189
+coding/proxy/routing/circuit_breaker.py,sha256=hOyoY_RWB5dTVbipyuiWfAelnva3cZRLbXrSmSn8KTs,8096
 coding/proxy/routing/error_classifier.py,sha256=oDxp69sCb-pdfe1hWce29A9tsN3jAbhqfl2fRECBtCo,3747
-coding/proxy/routing/executor.py,sha256=xQw3rtHd00n3BBgUHzqAli1GUoFNOxc0odKEaq-Dw7A,28206
+coding/proxy/routing/executor.py,sha256=vnXmmaWw0w49HhKsNine37Hnye04NSZ0vc9ghMzqLdQ,30268
 coding/proxy/routing/model_mapper.py,sha256=b72CGRdusLAwoq7p8-8TWAv9-Zv8BozssiZC8XnNTx4,3574
 coding/proxy/routing/quota_guard.py,sha256=TRJs3mjdRMc_u0HCw-hZn--osha_m11dEtAUxOO2P5A,6806
 coding/proxy/routing/rate_limit.py,sha256=i2cCqtbmXrP6wjRUTWXLP4DdYwVj0C4o59QdYGkPQj0,5122
 coding/proxy/routing/retry.py,sha256=KEYVToBkBOtXdqY7He70RrtVWFqIpnOQf2VVksdLrlk,2386
-coding/proxy/routing/router.py,sha256=bXaglxuT-5qYzrSMk7ZE4mpQynP4Z6F2pm9hnCbdG90,3440
+coding/proxy/routing/router.py,sha256=x5x6cjL5BOnRXZZuzK3GCnNtaMVjw75xw2OQ-DoO9_s,5830
 coding/proxy/routing/session_manager.py,sha256=kpEPCo67CdsELX71hoe6G7sb2dcda7gTNL0FtpgRK7I,2950
-coding/proxy/routing/tier.py,sha256=U12Mw0eTE1AO5RuHNpoOuXDdujz_Hkx_iyIrqkZbtyA,7024
+coding/proxy/routing/tier.py,sha256=OBrJiMxfLCxXvZfARD5oNmuhpYASKnyrW9sOCHLdQ1g,7777
 coding/proxy/routing/usage_parser.py,sha256=j4G0ArFduQ2D4Yeuad94DVlwdc-JvSh7SJLVzc-hLcs,8480
 coding/proxy/routing/usage_recorder.py,sha256=pObOrX2yIITTiyojl1fJcqO0yWWpbP4KqsJvFdmlt04,6273
 coding/proxy/server/__init__.py,sha256=KeH7mEu36v9v27m3VgeSxSeFz9sLTJrxS_EVATJ7Vks,20
-coding/proxy/server/app.py,sha256=ITCbtDrweNMp-l4_uNN-8wQ33BXpjvCk6p2dn8E0424,5538
-coding/proxy/server/factory.py,sha256=I4asjFw_1ET49DC-xkCpfV7oyfSv4G6xUB_Z5N_SHY8,9920
+coding/proxy/server/app.py,sha256=kRGgb772dZu8200LPnn7Nt0IU5oagcbBf_Vc5ynxxzE,5599
+coding/proxy/server/factory.py,sha256=w8VFvxoogw9K9sO8MlT6bIP7xM7mR6sCohrZle9y_Gg,9985
 coding/proxy/server/request_normalizer.py,sha256=F_mgxxuA3i7cN1CEWlto7Mm9VT_QG2QNspiUWeYVBpM,10511
 coding/proxy/server/responses.py,sha256=i0ugnLRNOdRYGHEWxkwsxR35ChmdMQsSaD8AjRluTn4,2167
-coding/proxy/server/routes.py,sha256=QeEsYczjvPfVhOrED2qe1V6CpwVBZbQHs8dP0OGdGXQ,11734
+coding/proxy/server/routes.py,sha256=_CkeOEcnMe21RcLZ-raxgknUbdclV-Uf9f_B2Xz9_a8,13325
 coding/proxy/streaming/__init__.py,sha256=0al5TC-zJt8Bz0CibTmd8WPza-Cs-qcuZWvT2fKPqHI,23
 coding/proxy/streaming/anthropic_compat.py,sha256=cycYiJ-glN88OmfLTR7FroHRethONlEcK0PT78KqGbA,21202
 coding/proxy/vendors/__init__.py,sha256=fehSpQ2-kUlZY6N8cNMGVJYMXspQmi3V4e0FgC4Ay4k,1011
 coding/proxy/vendors/alibaba.py,sha256=vYhvk8hZEeOpqUrtGT-uaK89y6uolrDUAT2BvTD_IQY,876
 coding/proxy/vendors/anthropic.py,sha256=KA_fvOxagGBggH2pc3l9Zoyl_XYUyRdfR8bI-eVj_e4,6328
-coding/proxy/vendors/antigravity.py,sha256=byFa64uUmPJv0CnoseF6dEkgYhPC_Jlrw3h0H43vkZ8,16164
+coding/proxy/vendors/antigravity.py,sha256=sz2-TSIUe9YDVen7A4d9K6lmhyh4jGWN3dppfabSJg0,21431
 coding/proxy/vendors/base.py,sha256=vrAaI_4uLtzaFcPWtBStVMHU5AgkCWTNLEgVeoHHgLE,14781
 coding/proxy/vendors/copilot.py,sha256=qAFTO2xMqnawaFlvZS2a9-7f_UEkfODIFfDlgOBiQl4,29590
 coding/proxy/vendors/copilot_models.py,sha256=UckIQYA4qLyNwEA09koQGBOZ65Nxhuo3ytUuDNqtzRU,15514
@@ -79,8 +79,8 @@ coding/proxy/vendors/native_anthropic.py,sha256=SxtM71PDci0gqLqiwCrFnT410SnSoD7F
 coding/proxy/vendors/token_manager.py,sha256=s10t4Com0jNnKGkPyJ_HpG5SjHrCEJvfArEOAaPKA_k,4189
 coding/proxy/vendors/xiaomi.py,sha256=E-GcmJBZh7GOtDFonxZmlf0hKRhrlrXzL0IxHFRYcRo,860
 coding/proxy/vendors/zhipu.py,sha256=3j_rqNFu1CX-B5ugtrL6Y1OeWSy9yiqsVa9Bi1ssaAA,1062
-coding_proxy-0.2.1a2.dist-info/METADATA,sha256=-xhbcbCthQVTX7CN4d3XQTPLRWhpLN2TH130IKN3Awo,10821
-coding_proxy-0.2.1a2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-coding_proxy-0.2.1a2.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
-coding_proxy-0.2.1a2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-coding_proxy-0.2.1a2.dist-info/RECORD,,
+coding_proxy-0.2.2.dist-info/METADATA,sha256=4eYTzmULjk3sHv87lB4NnGv4RQ2I_VNADAeLVJGB9mQ,10817
+coding_proxy-0.2.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+coding_proxy-0.2.2.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
+coding_proxy-0.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+coding_proxy-0.2.2.dist-info/RECORD,,