feat: add multi-account support with load balancing and persistent conversation handling

Author: xiaozhou26

.dockerignore

@@ -8,3 +8,5 @@ captured
 .env
 .env.*
 README.tmp
+accounts.txt
+claude.ai.har

.gitignore

@@ -3,7 +3,7 @@
 .env.*
 captured/
 .claude/
-
+.workbuddy/
 # Binaries
 *.exe
 *.exe~

README.md

@@ -18,6 +18,9 @@
 - 支持非流式与 SSE 流式返回
 - 支持 `conversation_id` 持久会话模式，保持多轮对话连续性
 - 支持完整浏览器 Cookie 模式，更接近 claude.ai 浏览器请求环境
+- 支持 `accounts.txt` 多账号池，按当前活跃请求数进行最小负载分发
+- 账号级复用 TLS Client、CookieJar、浏览器身份和组织信息，避免每请求重复初始化
+- 持久会话按账号隔离，并串行化同一 `conversation_id` 的并发轮次，避免会话串扰
 - 支持 Bearer sessionKey 模式，便于本地简单调用
 - Bearer 模式下会自动生成可由前端生成的浏览器环境 Cookie/Header；签名或 Cloudflare 类 Cookie 不伪造、不传递
 - completion 请求会携带从真实浏览器请求逆向得到的 claude.ai web `tools` 字段
@@ -77,6 +80,15 @@ CLAUDE_SESSION_KEY='你的-sessionKey' PORT=8080 ./claude2api.exe
 CLAUDE_COOKIE='sessionKey=...; sessionKeyLC=...; anthropic-device-id=...; ...' PORT=8080 ./claude2api.exe
 ```
 
+使用多账号池：在工作目录创建 `accounts.txt`，每行放一个 sessionKey 或一条完整 Cookie，空行和 `#` 注释会被忽略：
+
+```text
+sk-ant-sid01-...
+sessionKey=sk-ant-sid02-...; sessionKeyLC=...; anthropic-device-id=...; ...
+```
+
+也可通过 `CLAUDE_ACCOUNTS_FILE` 指定其他账号文件。未显式携带认证 Header 的请求会从账号池选择当前活跃请求最少的账号；显式传入 `Authorization` 或 `X-Claude-Cookie` 时仍固定使用该账号。
+
 服务地址：
 
 ```text
@@ -179,6 +191,7 @@ CLAUDE_COOKIE='sessionKey=...; sessionKeyLC=...; anthropic-device-id=...; ...' d
 | `CLAUDE_BASE_URL` | `https://claude.ai` | claude.ai 上游地址。 |
 | `CLAUDE_SESSION_KEY` | 空 | claude.ai 的 `sessionKey`。配置后请求端可以不传 Bearer。 |
 | `CLAUDE_COOKIE` | 空 | 从浏览器复制的完整 claude.ai Cookie。推荐用于更接近浏览器环境。 |
+| `CLAUDE_ACCOUNTS_FILE` | `accounts.txt` | 多账号文件路径；每行一个 sessionKey 或完整 Cookie。 |
 | `CLAUDE_TIMEZONE` | `Asia/Singapore` | 发送给 claude.ai 的时区。 |
 | `CLAUDE_LOCALE` | `en-US` | 发送给 claude.ai 的语言区域。 |
 | `DEFAULT_MODEL` | `claude-sonnet-5` | 请求未指定模型时使用的默认模型。必须在支持模型列表内。 |
@@ -242,7 +255,7 @@ X-Claude-Cookie: <从 claude.ai 浏览器请求中复制的完整 Cookie>
 
 ## 注意事项
 
-- 每次 completion 请求都会创建一个临时 claude.ai 会话，请求结束后会尝试删除。
+- 未传 `conversation_id` 时，每次 completion 会创建临时 claude.ai 会话，并在响应完成后异步尝试删除。
 - `usage` 中的 token 数是近似值，目前主要根据输出文本长度估算。
 - 如果 Bearer sessionKey 模式和浏览器行为不一致，建议使用完整 Cookie 模式。
 - 如果上游返回 `429`，说明 claude.ai 当前账号或会话触发了速率限制。

README_EN.md

@@ -13,6 +13,9 @@ It reverse-proxies requests to `https://claude.ai` using a browser-like TLS/clie
 - Streaming and non-streaming responses
 - Persistent `conversation_id` mode for multi-turn conversation continuity
 - Browser Cookie mode to match a real claude.ai browser session
+- Multi-account pool via `accounts.txt`, routed by the lowest active request count
+- Account-scoped TLS client, CookieJar, browser identity, and organization cache reuse
+- Persistent conversations isolated by account, with concurrent turns serialized per `conversation_id`
 - Bearer session key mode for simple local use
 - Dedicated local `tlsclient` module wrapping the Chrome-profile `github.com/bogdanfinn/tls-client` client, CookieJar, and common browser headers
 - Completion requests include the claude.ai web `tools` payload reverse-engineered from a real browser request
@@ -64,6 +67,7 @@ The service is configured with environment variables.
 | `CLAUDE_BASE_URL` | `https://claude.ai` | Upstream claude.ai base URL. |
 | `CLAUDE_SESSION_KEY` | empty | Optional claude.ai `sessionKey`. If set, API requests do not need a Bearer token. |
 | `CLAUDE_COOKIE` | empty | Optional full browser Cookie header from claude.ai. Recommended when you want behavior closest to the browser. |
+| `CLAUDE_ACCOUNTS_FILE` | `accounts.txt` | Multi-account file; one session key or full Cookie header per line. |
 | `CLAUDE_TIMEZONE` | `Asia/Singapore` | Timezone sent to claude.ai completion requests. |
 | `CLAUDE_LOCALE` | `en-US` | Locale sent to claude.ai completion requests. |
 | `DEFAULT_MODEL` | `claude-sonnet-5` | Model used when a request omits `model`. Must be one of the supported models. |
@@ -104,6 +108,15 @@ Full browser Cookie mode:
 CLAUDE_COOKIE='sessionKey=...; sessionKeyLC=...; anthropic-device-id=...; ...' PORT=8080 ./claude2api.exe
 ```
 
+Multi-account mode: create `accounts.txt` in the working directory, with one session key or full Cookie header per line. Blank lines and `#` comments are ignored:
+
+```text
+sk-ant-sid01-...
+sessionKey=sk-ant-sid02-...; sessionKeyLC=...; anthropic-device-id=...; ...
+```
+
+Use `CLAUDE_ACCOUNTS_FILE` to select another path. Requests without explicit authentication headers are routed to the least-loaded configured account; requests with `Authorization` or `X-Claude-Cookie` remain pinned to those credentials.
+
 Then use the local base URL:
 
 ```text
@@ -188,7 +201,7 @@ See [API_EN.md](API_EN.md) for endpoint details and examples.
 
 ## Notes
 
-- The proxy creates a temporary claude.ai conversation for each completion and deletes it after the request.
+- Without `conversation_id`, the proxy creates a temporary claude.ai conversation for each completion and asynchronously deletes it after the response.
 - Token usage values are approximate and currently based on output text length.
 - If browser and Bearer modes behave differently, prefer full Cookie mode because it carries the same request environment as the browser.
 - A `429` response is returned by claude.ai when the upstream account/session is rate-limited.

claude/client.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"io"
 	"strings"
+	"sync"
 	"time"
 
 	"claude2api/models"
@@ -24,6 +25,7 @@ type Client struct {
 	baseURL           string
 	sessionKey        string
 	claudeCookie      string
+	orgMu             sync.Mutex
 	orgID             string // cached org UUID
 	deviceID          string // anthropic-device-id
 	sessionKeyLC      string
@@ -205,16 +207,15 @@ func (c *Client) doRequest(ctx context.Context, method, path string, body io.Rea
 		req.AddCookie(&http.Cookie{Name: "_gcl_au", Value: c.gclAU})
 		req.AddCookie(&http.Cookie{Name: "ion-vk", Value: c.ionVK})
 		req.AddCookie(&http.Cookie{Name: "_dd_s", Value: c.generatedDDSCookie()})
-		if c.orgID != "" {
-			req.AddCookie(&http.Cookie{Name: "lastActiveOrg", Value: c.orgID})
-		}
 	}
 
 	return c.httpClient.Do(req)
 }
 
 // GetOrganization fetches the user's organization UUID
 func (c *Client) GetOrganization(ctx context.Context) (string, error) {
+	c.orgMu.Lock()
+	defer c.orgMu.Unlock()
 	if c.orgID != "" {
 		return c.orgID, nil
 	}
@@ -328,7 +329,7 @@ func (c *Client) SendMessage(ctx context.Context, convID string, req *models.Cla
 		defer resp.Body.Close()
 
 		scanner := bufio.NewScanner(resp.Body)
-		scanner.Buffer(make([]byte, 2*1024*1024), 2*1024*1024)
+		scanner.Buffer(make([]byte, 64*1024), 2*1024*1024)
 
 		var eventType, data string
 		for scanner.Scan() {
@@ -342,7 +343,11 @@ func (c *Client) SendMessage(ctx context.Context, convID string, req *models.Cla
 
 			if line == "" {
 				if data != "" {
-					events <- parseCompletionEvent(eventType, data)
+					select {
+					case events <- parseCompletionEvent(eventType, data):
+					case <-ctx.Done():
+						return
+					}
 				}
 				eventType = ""
 				data = ""
@@ -361,7 +366,11 @@ func (c *Client) SendMessage(ctx context.Context, convID string, req *models.Cla
 		}
 
 		if data != "" {
-			events <- parseCompletionEvent(eventType, data)
+			select {
+			case events <- parseCompletionEvent(eventType, data):
+			case <-ctx.Done():
+				return
+			}
 		}
 	}()
 

config/config.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+	"bufio"
 	"encoding/json"
 	"os"
 	"strings"
@@ -17,6 +18,14 @@ type Config struct {
 	DefaultModel  string
 	Effort        string
 	Thinking      interface{}
+	Accounts      []Account
+}
+
+// Account contains credentials for one claude.ai account. Cookie may contain
+// the full browser Cookie header; SessionKey is used for Bearer-only mode.
+type Account struct {
+	SessionKey string
+	Cookie     string
 }
 
 // New creates a Config from environment variables with sane defaults
@@ -38,7 +47,7 @@ func New() *Config {
 
 	locale := os.Getenv("CLAUDE_LOCALE")
 	if locale == "" {
-	locale = "en-US"
+		locale = "en-US"
 	}
 
 	timezone := os.Getenv("CLAUDE_TIMEZONE")
@@ -62,17 +71,77 @@ func New() *Config {
 	thinkingRaw := os.Getenv("CLAUDE_THINKING")
 	thinking := parseThinkingEnv(thinkingRaw)
 
+	sessionKey := os.Getenv("CLAUDE_SESSION_KEY")
+	claudeCookie := os.Getenv("CLAUDE_COOKIE")
+	accounts := loadAccounts(os.Getenv("CLAUDE_ACCOUNTS_FILE"), sessionKey, claudeCookie)
+
 	return &Config{
 		Port:          port,
 		ClaudeBaseURL: baseURL,
-		SessionKey:    os.Getenv("CLAUDE_SESSION_KEY"),
-		ClaudeCookie:  os.Getenv("CLAUDE_COOKIE"),
+		SessionKey:    sessionKey,
+		ClaudeCookie:  claudeCookie,
 		Timezone:      timezone,
 		Locale:        locale,
 		DefaultModel:  model,
 		Effort:        effort,
 		Thinking:      thinking,
+		Accounts:      accounts,
+	}
+}
+
+func loadAccounts(path, fallbackSessionKey, fallbackCookie string) []Account {
+	if strings.TrimSpace(path) == "" {
+		path = "accounts.txt"
+	}
+
+	accounts := make([]Account, 0)
+	seen := make(map[string]struct{})
+	add := func(account Account) {
+		account.SessionKey = strings.TrimSpace(account.SessionKey)
+		account.Cookie = strings.TrimSpace(account.Cookie)
+		if account.SessionKey == "" {
+			account.SessionKey = sessionKeyFromCookie(account.Cookie)
+		}
+		if account.SessionKey == "" {
+			return
+		}
+		key := account.SessionKey + "\x00" + account.Cookie
+		if _, ok := seen[key]; ok {
+			return
+		}
+		seen[key] = struct{}{}
+		accounts = append(accounts, account)
+	}
+
+	if f, err := os.Open(path); err == nil {
+		defer f.Close()
+		scanner := bufio.NewScanner(f)
+		scanner.Buffer(make([]byte, 64*1024), 1024*1024)
+		for scanner.Scan() {
+			line := strings.TrimSpace(scanner.Text())
+			if line == "" || strings.HasPrefix(line, "#") {
+				continue
+			}
+			if strings.Contains(line, "sessionKey=") {
+				add(Account{Cookie: line})
+			} else {
+				add(Account{SessionKey: line})
+			}
+		}
+	}
+
+	add(Account{SessionKey: fallbackSessionKey, Cookie: fallbackCookie})
+	return accounts
+}
+
+func sessionKeyFromCookie(cookie string) string {
+	for _, part := range strings.Split(cookie, ";") {
+		kv := strings.SplitN(strings.TrimSpace(part), "=", 2)
+		if len(kv) == 2 && kv[0] == "sessionKey" {
+			return kv[1]
+		}
 	}
+	return ""
 }
 
 // parseThinkingEnv parses the CLAUDE_THINKING env var into a value suitable for

config/config_test.go

@@ -0,0 +1,26 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestLoadAccounts(t *testing.T) {
+	path := filepath.Join(t.TempDir(), "accounts.txt")
+	contents := "# comment\naccount-a\n\nsessionKey=account-b; anthropic-device-id=device-b\naccount-a\n"
+	if err := os.WriteFile(path, []byte(contents), 0o600); err != nil {
+		t.Fatalf("write accounts: %v", err)
+	}
+
+	accounts := loadAccounts(path, "account-c", "")
+	if len(accounts) != 3 {
+		t.Fatalf("expected 3 unique accounts, got %d: %#v", len(accounts), accounts)
+	}
+	if accounts[0].SessionKey != "account-a" || accounts[1].SessionKey != "account-b" || accounts[2].SessionKey != "account-c" {
+		t.Fatalf("unexpected accounts: %#v", accounts)
+	}
+	if accounts[1].Cookie == "" {
+		t.Fatal("full Cookie line was not preserved")
+	}
+}

docker-compose.yml

@@ -6,11 +6,14 @@ services:
     restart: unless-stopped
     ports:
       - "${PORT:-8080}:8080"
+    volumes:
+      - "${CLAUDE_ACCOUNTS_FILE:-./accounts.txt}:/app/accounts.txt:ro"
     environment:
       PORT: "8080"
       CLAUDE_BASE_URL: "${CLAUDE_BASE_URL:-https://claude.ai}"
       CLAUDE_SESSION_KEY: "${CLAUDE_SESSION_KEY:-}"
       CLAUDE_COOKIE: "${CLAUDE_COOKIE:-}"
+      CLAUDE_ACCOUNTS_FILE: "/app/accounts.txt"
       CLAUDE_TIMEZONE: "${CLAUDE_TIMEZONE:-Asia/Singapore}"
       CLAUDE_LOCALE: "${CLAUDE_LOCALE:-en-US}"
       DEFAULT_MODEL: "${DEFAULT_MODEL:-claude-sonnet-5}"