feat: single console with dual bridge ports (CN 8963 + Global 8964)

The Global web console (3589) was unused while its bridge path was still
required. Merge both bridges into one console instance:

- add --global-port flag (default 8964, 0 disables); --instance=cn now
  starts console 3588 + bridge 8963 + bridge 8964 in one process
- 8964 runs a Global-only account pool so international models never
  land on a CN account; its cooldown state file is region-isolated
  (pool_state_global.json) so it cannot overwrite the main pool
- 8963 keeps the full pool and relies on existing per-model region
  routing for cross-region requests
- keep --instance=global as a standalone escape hatch (3589 + 8964 only)
- StopBridge now shuts down both servers

Verified: 8963 exposes 14 models incl. CN-only q37fmodel and no ultimate;
8964 exposes 15 models incl. ultimate and no q37fmodel; one console lists
all three accounts (2 cn + 1 global) and one-click check-in covers both.

Author: zys

main.go

@@ -31,21 +31,26 @@ var svc *Service
 
 func main() {
 	webPort := flag.Int("web-port", 3588, "web console port")
-	bridgePort := flag.Int("bridge-port", 8963, "bridge api port")
+	bridgePort := flag.Int("bridge-port", 8963, "bridge api port (CN 优先，内部按模型 region 自动路由)")
+	globalPort := flag.Int("global-port", 8964, "global bridge api port (强制 Global 账号池)；0=不启动")
 	bind := flag.String("bind", "0.0.0.0", "console bind address")
 	dataDir := flag.String("data-dir", "", "data root (default: $QODER2API_HOME or ~/.qoder2api)")
-	instance := flag.String("instance", "", "preset: cn (3588/8963) or global (3589/8964); sets ports if not overridden")
+	instance := flag.String("instance", "", "preset: cn (单控制台 3588 + 双桥 8963/8964) 或 global (旧版独立实例 3589/8964)")
 	flag.Parse()
 
-	// 实例预设：方便 CN / Global 双开
+	// 实例预设：默认 cn = 单控制台 + 双桥（CN 8963 / Global 8964）
+	// global 预设保留给「只跑海外」的场景（独立控制台 3589 + 单桥 8964）
 	switch strings.ToLower(strings.TrimSpace(*instance)) {
-	case "cn", "china":
+	case "cn", "china", "":
 		if !isFlagPassed("web-port") {
 			*webPort = 3588
 		}
 		if !isFlagPassed("bridge-port") {
 			*bridgePort = 8963
 		}
+		if !isFlagPassed("global-port") {
+			*globalPort = 8964
+		}
 		if *dataDir == "" && os.Getenv("QODER2API_HOME") == "" {
 			if home, err := os.UserHomeDir(); err == nil {
 				*dataDir = filepath.Join(home, ".qoder2api-cn")
@@ -58,6 +63,9 @@ func main() {
 		if !isFlagPassed("bridge-port") {
 			*bridgePort = 8964
 		}
+		if !isFlagPassed("global-port") {
+			*globalPort = 0 // 该模式只保留一个桥，8963 不启动
+		}
 		if *dataDir == "" && os.Getenv("QODER2API_HOME") == "" {
 			if home, err := os.UserHomeDir(); err == nil {
 				*dataDir = filepath.Join(home, ".qoder2api-global")
@@ -91,6 +99,9 @@ func main() {
 	if *bridgePort > 0 {
 		svc.bridgePort = *bridgePort
 	}
+	if *globalPort > 0 {
+		svc.globalPort = *globalPort
+	}
 
 	// cookie 按控制台端口隔离，避免 3588/3589 同 host 登录互踢
 	consoleWebPort = *webPort

service.go

@@ -32,8 +32,10 @@ type Service struct {
 	bridge      *bridge.Bridge
 	pool        *bridge.Pool
 	bridgeSrv   *http.Server
+	globalSrv   *http.Server // 8964：强制 Global 账号池
 	bridgeMu    sync.Mutex
 	bridgePort  int
+	globalPort  int
 	bridgeToken string
 	basePrompt  []byte
 }
@@ -176,14 +178,24 @@ func (s *Service) EnsureBridgeRunning() error {
 func (s *Service) StopBridge() error {
 	s.bridgeMu.Lock()
 	defer s.bridgeMu.Unlock()
+	var firstErr error
+	if s.globalSrv != nil {
+		if err := s.globalSrv.Close(); err != nil && firstErr == nil {
+			firstErr = err
+		}
+		s.globalSrv = nil
+	}
 	if s.bridgeSrv == nil {
-		return nil
+		return firstErr
 	}
 	err := s.bridgeSrv.Close()
 	s.bridgeSrv = nil
 	s.bridge = nil
 	s.pool = nil
-	return err
+	if err != nil {
+		return err
+	}
+	return firstErr
 }
 
 func (s *Service) restartBridge(acct *account.Account) error {
@@ -249,21 +261,60 @@ func (s *Service) startBridgeWithAccount(acct *account.Account) error {
 	// mux 外包鉴权中间件：同网络客户端必须携带有效 token 才能消耗账号配额
 	handler := s.authMiddleware(mux)
 
-	srv := &http.Server{
+	s.bridgeMu.Lock()
+	s.bridge = b
+	s.pool = pool
+	s.bridgeSrv = &http.Server{
 		Addr:    fmt.Sprintf("0.0.0.0:%d", s.bridgePort),
 		Handler: handler,
 	}
+	s.bridgeMu.Unlock()
+
+	logger.Info("Bridge started on port %d", s.bridgePort)
+	go func() {
+		if err := s.bridgeSrv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			logger.Error("bridge serve error: %v", err)
+		}
+	}()
+
+	// 8964：Global 专用桥，强制只走 Global 账号（跨区模型不能误打到国内号）
+	if s.globalPort > 0 && s.globalPort != s.bridgePort {
+		if err := s.startGlobalBridge(templateBase); err != nil {
+			// Global 池为空不应影响主桥，仅告警
+			logger.Info("global bridge (port %d) not started: %v", s.globalPort, err)
+		}
+	}
+	return nil
+}
+
+// startGlobalBridge 启动 8964 端口的 Global 专用桥。
+// 只纳入 region=global 的账号，避免国内账号被误用于国际模型请求。
+func (s *Service) startGlobalBridge(templateBase map[string]interface{}) error {
+	pool := s.buildRegionPool(account.RegionGlobal)
+	if pool.Size() == 0 {
+		return fmt.Errorf("no global account with usable secret")
+	}
+	b := bridge.NewPoolBridge(pool, templateBase)
+
+	mux := http.NewServeMux()
+	mux.HandleFunc("/v1/chat/completions", b.HandleChatCompletions)
+	mux.HandleFunc("/v1/messages", b.HandleClaudeMessages)
+	mux.HandleFunc("/v1/models", b.HandleListModels)
+	mux.HandleFunc("/v1/responses", b.HandleCodexResponses)
+
+	srv := &http.Server{
+		Addr:    fmt.Sprintf("0.0.0.0:%d", s.globalPort),
+		Handler: s.authMiddleware(mux),
+	}
 
 	s.bridgeMu.Lock()
-	s.bridge = b
-	s.pool = pool
-	s.bridgeSrv = srv
+	s.globalSrv = srv
 	s.bridgeMu.Unlock()
 
-	logger.Info("Bridge started on port %d", s.bridgePort)
+	logger.Info("Global bridge started on port %d (pool=%d global accounts)", s.globalPort, pool.Size())
 	go func() {
 		if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			logger.Error("bridge serve error: %v", err)
+			logger.Error("global bridge serve error: %v", err)
 		}
 	}()
 	return nil
@@ -300,6 +351,39 @@ func (s *Service) buildAccountPool() *bridge.Pool {
 	return pool
 }
 
+// buildRegionPool 只把指定区域的账号建成池（用于 8964 Global 专用桥）。
+// 状态文件按区域隔离，避免与主桥互相覆盖冷却记录。
+func (s *Service) buildRegionPool(region account.Region) *bridge.Pool {
+	pool := bridge.NewPoolWithState(filepath.Join(account.DataRoot(), "pool_state_"+string(region)+".json"))
+	accounts, err := account.List()
+	if err != nil {
+		logger.Error("buildRegionPool(%s): list accounts: %v", region, err)
+		return pool
+	}
+	for _, a := range accounts {
+		if a.Region != region {
+			continue
+		}
+		if !account.HasSecret(a.ID) {
+			continue
+		}
+		pat, err := account.GetSecret(a.ID)
+		if err != nil {
+			logger.Error("buildRegionPool(%s): get secret for %s: %v", region, a.Name, err)
+			continue
+		}
+		slot, err := bridge.NewSlotFromSecret(a.ID, a.Name, a.Region, pat)
+		if err != nil {
+			logger.Error("buildRegionPool(%s): account %s unusable, skipped: %v", region, a.Name, err)
+			continue
+		}
+		pool.Add(slot)
+		logger.Info("buildRegionPool(%s): added account %s", region, a.Name)
+	}
+	pool.LoadState()
+	return pool
+}
+
 // PoolStatus 返回账号池运行时状态（桥未启动时为空）。
 func (s *Service) PoolStatus() []bridge.SlotStatus {
 	s.bridgeMu.Lock()