magpie-gemini-web 0.5.6 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,61 @@
1
+ diff --git a/internal/app/admin_cookies.go b/internal/app/admin_cookies.go
2
+ index f17a675..c90f08a 100644
3
+ --- a/internal/app/admin_cookies.go
4
+ +++ b/internal/app/admin_cookies.go
5
+ @@ -85,9 +85,10 @@ func handleAdminCookies(w http.ResponseWriter, r *http.Request) {
6
+ })
7
+ case http.MethodPost:
8
+ var p struct {
9
+ - Label string `json:"label"`
10
+ - Cookie string `json:"cookie"`
11
+ - Note string `json:"note"`
12
+ + Label string `json:"label"`
13
+ + Cookie string `json:"cookie"`
14
+ + Note string `json:"note"`
15
+ + ProxyID *int64 `json:"proxy_id"`
16
+ }
17
+ body, _ := io.ReadAll(r.Body)
18
+ if err := json.Unmarshal(body, &p); err != nil {
19
+ @@ -99,6 +100,9 @@ func handleAdminCookies(w http.ResponseWriter, r *http.Request) {
20
+ writeJSON(w, 400, map[string]string{"error": err.Error()})
21
+ return
22
+ }
23
+ + if p.ProxyID != nil && *p.ProxyID >= 0 {
24
+ + bindAccountProxy(id, *p.ProxyID)
25
+ + }
26
+ logf("[cookies] 新增账号 #%d label=%q", id, strings.TrimSpace(p.Label))
27
+ writeJSON(w, 200, map[string]interface{}{"id": id})
28
+ default:
29
+ @@ -189,9 +193,10 @@ func handleAdminCookieItem(w http.ResponseWriter, r *http.Request) {
30
+ writeJSON(w, 200, map[string]interface{}{"status": next})
31
+ case http.MethodPatch:
32
+ var p struct {
33
+ - Label *string `json:"label"`
34
+ - Note *string `json:"note"`
35
+ - Status *string `json:"status"`
36
+ + Label *string `json:"label"`
37
+ + Note *string `json:"note"`
38
+ + Status *string `json:"status"`
39
+ + ProxyID *int64 `json:"proxy_id"`
40
+ }
41
+ body, _ := io.ReadAll(r.Body)
42
+ if err := json.Unmarshal(body, &p); err != nil {
43
+ @@ -204,6 +209,9 @@ func handleAdminCookieItem(w http.ResponseWriter, r *http.Request) {
44
+ return
45
+ }
46
+ }
47
+ + if p.ProxyID != nil && *p.ProxyID >= 0 {
48
+ + bindAccountProxy(id, *p.ProxyID)
49
+ + }
50
+ if p.Label != nil || p.Note != nil {
51
+ // 只改传了的字段:没传的沿用当前值。
52
+ var curLabel, curNote string
1
53
  diff --git a/internal/app/argon.go b/internal/app/argon.go
2
54
  new file mode 100644
3
- index 0000000..98944ac
55
+ index 0000000..a2a5e77
4
56
  --- /dev/null
5
57
  +++ b/internal/app/argon.go
6
- @@ -0,0 +1,174 @@
58
+ @@ -0,0 +1,172 @@
7
59
  +package app
8
60
  +
9
61
  +import (
@@ -15,13 +67,25 @@ index 0000000..98944ac
15
67
  + "time"
16
68
  +)
17
69
  +
70
+ +type argonIdentityError struct {
71
+ + name string
72
+ + id string
73
+ +}
74
+ +
75
+ +func (e *argonIdentityError) Error() string {
76
+ + return fmt.Sprintf("Argon model mismatch: upstream reported %q (%s)", e.name, e.id)
77
+ +}
78
+ +
18
79
  +// argonDisplayNames 是上游对 Argon 各思考档位自报的显示名:普通档 "4 Argon",
19
- +// 扩展思考(think=2,上游叫 High)"4 Argon High"。按请求的档位只认对应名字,
20
- +// 档位被静默换掉也算身份不符。
80
+ +// 扩展思考(think=2,上游叫 High)"4 Argon High",中档(think=4)自报 "4 Argon" 或 "4 Argon Medium"。
81
+ +// 按请求的档位只认对应名字,档位被静默换掉也算身份不符。
21
82
  +func argonDisplayNames(think int) []string {
22
83
  + if think == thinkingExtended {
23
84
  + return []string{"4 Argon High", "Gemini 4 Argon High"}
24
85
  + }
86
+ + if think == thinkingMedium {
87
+ + return []string{"4 Argon", "Gemini 4 Argon", "4 Argon Medium", "Gemini 4 Argon Medium"}
88
+ + }
25
89
  + return []string{"4 Argon", "Gemini 4 Argon"}
26
90
  +}
27
91
  +
@@ -37,6 +101,8 @@ index 0000000..98944ac
37
101
  +
38
102
  +// argonIdentityInLine 检查单行 wrb.fr 帧里的模型身份。
39
103
  +// 返回 found=true 表示这行带有 names 之一的 Argon 身份;err 非 nil 表示这行报的是别的模型或档位。
104
+ +// 注意:2026-10 起上游在响应帧的 hex 槽位可能固定回 cf41b0e0dd7d53e5(hexFlashLite 占位),
105
+ +// 只有紧随其后的显示名槽位反映真实模型,因此 hex 槽位接受 hexArgon4 或 hexFlashLite 占位,同时严格核对显示名。
40
106
  +func argonIdentityInLine(line string, names []string) (found bool, err error) {
41
107
  + var rows [][]json.RawMessage
42
108
  + if json.Unmarshal([]byte(line), &rows) != nil {
@@ -71,8 +137,8 @@ index 0000000..98944ac
71
137
  + if !validHex || !ok {
72
138
  + continue
73
139
  + }
74
- + if id != hexArgon4 || !slices.Contains(names, name) {
75
- + return false, fmt.Errorf("Argon model mismatch: upstream reported %q (%s)", name, id)
140
+ + if (id != hexArgon4 && id != hexFlashLite) || !slices.Contains(names, name) {
141
+ + return false, &argonIdentityError{name: name, id: id}
76
142
  + }
77
143
  + found = true
78
144
  + }
@@ -110,7 +176,7 @@ index 0000000..98944ac
110
176
  +// 所以放行时机就是首字时机,不再要等上游整段生成完。
111
177
  +//
112
178
  +// onLine 为 nil(非流式)时没有转发,照旧读完整段再校验。
113
- +func readModelCheckedBody(r io.Reader, onLine func(string), start time.Time, status int, modelHeader string) ([]byte, int64, error) {
179
+ +func readModelCheckedBody(r io.Reader, onLine func(string) error, start time.Time, status int, modelHeader string) ([]byte, int64, error) {
114
180
  + var h []any
115
181
  + isArgon := json.Unmarshal([]byte(modelHeader), &h) == nil && len(h) > 4 && h[4] == hexArgon4
116
182
  + if !isArgon {
@@ -127,36 +193,33 @@ index 0000000..98944ac
127
193
  +
128
194
  + var pending []string
129
195
  + verified := false
130
- + var identityErr error
131
- + raw, ttfb, err := readBody(identityGuardReader{r, &identityErr}, func(line string) {
132
- + if identityErr != nil {
133
- + return
134
- + }
196
+ + raw, ttfb, err := readBody(r, func(line string) error {
135
197
  + ok, lerr := argonIdentityInLine(line, names)
136
198
  + if lerr != nil {
137
- + identityErr = lerr
138
- + return
199
+ + return lerr
139
200
  + }
140
201
  + if !verified {
141
202
  + if !ok {
142
203
  + if line != "" {
143
204
  + pending = append(pending, line)
144
205
  + }
145
- + return
206
+ + return nil
146
207
  + }
147
208
  + verified = true
148
209
  + for _, p := range pending {
149
- + onLine(p)
210
+ + if cerr := onLine(p); cerr != nil {
211
+ + return cerr
212
+ + }
150
213
  + }
151
214
  + pending = nil
152
215
  + }
153
216
  + if line != "" {
154
- + onLine(line)
217
+ + if cerr := onLine(line); cerr != nil {
218
+ + return cerr
219
+ + }
155
220
  + }
221
+ + return nil
156
222
  + }, start)
157
- + if identityErr != nil {
158
- + return raw, ttfb, identityErr
159
- + }
160
223
  + if err != nil {
161
224
  + return raw, ttfb, err
162
225
  + }
@@ -165,19 +228,6 @@ index 0000000..98944ac
165
228
  + }
166
229
  + return raw, ttfb, nil
167
230
  +}
168
- +
169
- +// identityGuardReader 在身份校验失败后让下一次 Read 返回 EOF,不再读上游。
170
- +type identityGuardReader struct {
171
- + r io.Reader
172
- + err *error
173
- +}
174
- +
175
- +func (g identityGuardReader) Read(p []byte) (int, error) {
176
- + if *g.err != nil {
177
- + return 0, io.EOF
178
- + }
179
- + return g.r.Read(p)
180
- +}
181
231
  diff --git a/internal/app/argon_probe_test.go b/internal/app/argon_probe_test.go
182
232
  new file mode 100644
183
233
  index 0000000..dd9e687
@@ -239,10 +289,10 @@ index 0000000..dd9e687
239
289
  +}
240
290
  diff --git a/internal/app/argon_test.go b/internal/app/argon_test.go
241
291
  new file mode 100644
242
- index 0000000..3e62433
292
+ index 0000000..2f0b8cd
243
293
  --- /dev/null
244
294
  +++ b/internal/app/argon_test.go
245
- @@ -0,0 +1,266 @@
295
+ @@ -0,0 +1,453 @@
246
296
  +package app
247
297
  +
248
298
  +import (
@@ -251,6 +301,8 @@ index 0000000..3e62433
251
301
  + "errors"
252
302
  + "fmt"
253
303
  + "io"
304
+ + "net/http"
305
+ + "net/http/httptest"
254
306
  + "strings"
255
307
  + "testing"
256
308
  + "time"
@@ -275,7 +327,7 @@ index 0000000..3e62433
275
327
  +}
276
328
  +
277
329
  +func TestArgonValidateIdentity(t *testing.T) {
278
- + // 1. Correct hex and name passes
330
+ + // 1. Correct hex and name passes (including upstream's hexFlashLite placeholder slot with Argon name)
279
331
  + validFrame1 := makeSyntheticArgonFrame(hexArgon4, "4 Argon", "ARGON_OK")
280
332
  + if err := validateArgonIdentity(validFrame1, argonDisplayNames(thinkingNormal)); err != nil {
281
333
  + t.Fatalf("expected valid Argon frame to pass, got: %v", err)
@@ -286,12 +338,22 @@ index 0000000..3e62433
286
338
  + t.Fatalf("expected valid Gemini 4 Argon frame to pass, got: %v", err)
287
339
  + }
288
340
  +
341
+ + validPlaceholderHex := makeSyntheticArgonFrame(hexFlashLite, "4 Argon", "ARGON_OK")
342
+ + if err := validateArgonIdentity(validPlaceholderHex, argonDisplayNames(thinkingNormal)); err != nil {
343
+ + t.Fatalf("expected valid Argon frame with placeholder hex to pass, got: %v", err)
344
+ + }
345
+ +
289
346
  + // 2. Flash hex/name fails with mismatch
290
347
  + flashFrame := makeSyntheticArgonFrame(hexFlash36, "3.6 Flash", "FLASH")
291
348
  + if err := validateArgonIdentity(flashFrame, argonDisplayNames(thinkingNormal)); err == nil || !strings.Contains(err.Error(), "Argon model mismatch") {
292
349
  + t.Fatalf("expected Argon model mismatch for Flash frame, got: %v", err)
293
350
  + }
294
351
  +
352
+ + downgradedLiteFrame := makeSyntheticArgonFrame(hexFlashLite, "3.5 Flash-Lite", "LITE")
353
+ + if err := validateArgonIdentity(downgradedLiteFrame, argonDisplayNames(thinkingNormal)); err == nil || !strings.Contains(err.Error(), "Argon model mismatch") {
354
+ + t.Fatalf("expected Argon model mismatch for 3.5 Flash-Lite frame, got: %v", err)
355
+ + }
356
+ +
295
357
  + // 3. Missing metadata fails
296
358
  + emptyFields := make([]any, 10)
297
359
  + pBytes, _ := json.Marshal(emptyFields)
@@ -367,8 +429,9 @@ index 0000000..3e62433
367
429
  + // 1. Valid Argon delivers callbacks
368
430
  + validFrame := makeSyntheticArgonFrame(hexArgon4, "4 Argon", "OK")
369
431
  + var callbacks []string
370
- + raw, _, err := readModelCheckedBody(bytes.NewReader(validFrame), func(line string) {
432
+ + raw, _, err := readModelCheckedBody(bytes.NewReader(validFrame), func(line string) error {
371
433
  + callbacks = append(callbacks, line)
434
+ + return nil
372
435
  + }, time.Now(), 200, argonHeader)
373
436
  +
374
437
  + if err != nil {
@@ -384,8 +447,9 @@ index 0000000..3e62433
384
447
  + // 2. Mismatch/missing -> err and zero callbacks
385
448
  + flashFrame := makeSyntheticArgonFrame(hexFlash36, "3.6 Flash", "OK")
386
449
  + callbacks = nil
387
- + _, _, err = readModelCheckedBody(bytes.NewReader(flashFrame), func(line string) {
450
+ + _, _, err = readModelCheckedBody(bytes.NewReader(flashFrame), func(line string) error {
388
451
  + callbacks = append(callbacks, line)
452
+ + return nil
389
453
  + }, time.Now(), 200, argonHeader)
390
454
  +
391
455
  + if err == nil {
@@ -398,8 +462,9 @@ index 0000000..3e62433
398
462
  + // 3. Non-200 Argon preserves status-body read with zero callbacks, no identity error
399
463
  + errorBody := []byte(`{"error":"bad request"}` + "\n")
400
464
  + callbacks = nil
401
- + rawErr, _, err := readModelCheckedBody(bytes.NewReader(errorBody), func(line string) {
465
+ + rawErr, _, err := readModelCheckedBody(bytes.NewReader(errorBody), func(line string) error {
402
466
  + callbacks = append(callbacks, line)
467
+ + return nil
403
468
  + }, time.Now(), 400, argonHeader)
404
469
  +
405
470
  + if err != nil {
@@ -423,8 +488,9 @@ index 0000000..3e62433
423
488
  + callbacksCalled: &callbackCount,
424
489
  + }
425
490
  +
426
- + rawOrd, _, err := readModelCheckedBody(incReader, func(line string) {
491
+ + rawOrd, _, err := readModelCheckedBody(incReader, func(line string) error {
427
492
  + callbackCount++
493
+ + return nil
428
494
  + }, time.Now(), 200, flashHeader)
429
495
  +
430
496
  + if err != nil {
@@ -440,8 +506,9 @@ index 0000000..3e62433
440
506
  + // 5. Truncated reader errors, no Argon callbacks
441
507
  + callbacks = nil
442
508
  + trunc := &truncatedReader{}
443
- + _, _, err = readModelCheckedBody(trunc, func(line string) {
509
+ + _, _, err = readModelCheckedBody(trunc, func(line string) error {
444
510
  + callbacks = append(callbacks, line)
511
+ + return nil
445
512
  + }, time.Now(), 200, argonHeader)
446
513
  +
447
514
  + if !errors.Is(err, io.ErrUnexpectedEOF) {
@@ -477,11 +544,13 @@ index 0000000..3e62433
477
544
  +// 档位被静默换掉(要 High 回了普通档,或反过来)同样报身份不符。
478
545
  +func TestArgonIdentityByThinkTier(t *testing.T) {
479
546
  + low := Models["gemini-4-argon"]
547
+ + med := Models["gemini-4-argon-thinking-medium"]
480
548
  + high := Models["gemini-4-argon-thinking"]
481
- + if low.Thinking || !high.Thinking || high.HexID != hexArgon4 || high.Mode != 8 {
482
- + t.Fatalf("unexpected Argon model table: low=%+v high=%+v", low, high)
549
+ + if low.Thinking || !high.Thinking || high.HexID != hexArgon4 || high.Mode != 8 || med.ThinkWire != thinkingMedium {
550
+ + t.Fatalf("unexpected Argon model table: low=%+v med=%+v high=%+v", low, med, high)
483
551
  + }
484
552
  + lowHeader := buildModelHeader(low.HexID, low.Mode, thinkingNormal, "uuid-x")
553
+ + medHeader := buildModelHeader(med.HexID, med.Mode, thinkingMedium, "uuid-x")
485
554
  + highHeader := buildModelHeader(high.HexID, high.Mode, thinkingExtended, "uuid-x")
486
555
  +
487
556
  + cases := []struct {
@@ -489,15 +558,21 @@ index 0000000..3e62433
489
558
  + ok bool
490
559
  + }{
491
560
  + {lowHeader, "4 Argon", true},
561
+ + {medHeader, "4 Argon", true},
562
+ + {medHeader, "4 Argon Medium", true},
492
563
  + {highHeader, "4 Argon High", true},
493
564
  + {highHeader, "Gemini 4 Argon High", true},
494
565
  + {lowHeader, "4 Argon High", false},
566
+ + {medHeader, "4 Argon High", false},
495
567
  + {highHeader, "4 Argon", false},
496
568
  + }
497
569
  + for _, c := range cases {
498
570
  + frame := makeSyntheticArgonFrame(hexArgon4, c.name, "ok")
499
571
  + var got []string
500
- + _, _, err := readModelCheckedBody(bytes.NewReader(frame), func(l string) { got = append(got, l) }, time.Now(), 200, c.header)
572
+ + _, _, err := readModelCheckedBody(bytes.NewReader(frame), func(l string) error {
573
+ + got = append(got, l)
574
+ + return nil
575
+ + }, time.Now(), 200, c.header)
501
576
  + if c.ok && (err != nil || len(got) == 0) {
502
577
  + t.Errorf("%q with header %s: want pass, err=%v lines=%d", c.name, c.header, err, len(got))
503
578
  + }
@@ -509,12 +584,174 @@ index 0000000..3e62433
509
584
  + }
510
585
  + }
511
586
  +}
587
+ +
588
+ +func TestArgonIdentityWithStrictModel(t *testing.T) {
589
+ + setStrictModel(t, true)
590
+ + low := Models["gemini-4-argon"]
591
+ + med := Models["gemini-4-argon-thinking-medium"]
592
+ + high := Models["gemini-4-argon-thinking"]
593
+ +
594
+ + type tc struct {
595
+ + mc ModelConfig
596
+ + name string
597
+ + wantPass bool
598
+ + wantDowngraded bool
599
+ + }
600
+ + cases := []tc{
601
+ + {low, "4 Argon", true, false},
602
+ + {low, "Gemini 4 Argon", true, false},
603
+ + {med, "4 Argon", true, false},
604
+ + {med, "Gemini 4 Argon", true, false},
605
+ + {med, "4 Argon Medium", true, false},
606
+ + {med, "Gemini 4 Argon Medium", true, false},
607
+ + {high, "4 Argon High", true, false},
608
+ + {high, "Gemini 4 Argon High", true, false},
609
+ + // Tier mismatch within Argon: rejected by Argon identity check, NOT classified as model downgrade cooldown.
610
+ + {low, "4 Argon High", false, false},
611
+ + {low, "Gemini 4 Argon High", false, false},
612
+ + {med, "4 Argon High", false, false},
613
+ + {med, "Gemini 4 Argon High", false, false},
614
+ + {high, "4 Argon", false, false},
615
+ + {high, "Gemini 4 Argon", false, false},
616
+ + // Silent downgrade to another model family: rejected and converted to ModelDowngradedError under strict_model.
617
+ + {low, "3.5 Flash-Lite", false, true},
618
+ + {low, "Gemini 3.5 Flash-Lite", false, true},
619
+ + {med, "3.5 Flash-Lite", false, true},
620
+ + {high, "3.6 Flash", false, true},
621
+ + }
622
+ +
623
+ + for _, c := range cases {
624
+ + header := buildModelHeader(c.mc.HexID, c.mc.Mode, c.mc.thinkWire(), "uuid-x")
625
+ + frame := makeSyntheticArgonFrame(hexFlashLite, c.name, "ok")
626
+ +
627
+ + // Check both the streamGenerateOnce (newLineHandler) and streamGenerateConv (lineCB) pipelines.
628
+ + for _, mode := range []string{"once", "conv"} {
629
+ + strictCheck := strictLineCheck(c.mc, func() int64 { return 42 })
630
+ + var cb func(string) error
631
+ + if mode == "once" {
632
+ + lh := newLineHandler(nil, nil, nil, strictCheck)
633
+ + cb = lh.cb
634
+ + } else {
635
+ + cb = func(line string) error {
636
+ + if strictCheck != nil {
637
+ + if err := strictCheck(line); err != nil {
638
+ + return err
639
+ + }
640
+ + }
641
+ + return nil
642
+ + }
643
+ + }
644
+ +
645
+ + _, _, err := readModelCheckedBody(bytes.NewReader(frame), cb, time.Now(), 200, header)
646
+ + var aie *argonIdentityError
647
+ + if strictCheck != nil && errors.As(err, &aie) && modelDowngraded(c.mc, aie.name) {
648
+ + err = &ModelDowngradedError{Requested: c.mc.Upstream, Reported: aie.name, AccountID: 42}
649
+ + }
650
+ +
651
+ + if c.wantPass {
652
+ + if err != nil {
653
+ + t.Errorf("[%s] %q (think=%d): expected pass under strict_model, got %v", mode, c.name, c.mc.thinkWire(), err)
654
+ + }
655
+ + continue
656
+ + }
657
+ + if err == nil {
658
+ + t.Errorf("[%s] %q (think=%d): expected error under strict_model, got nil", mode, c.name, c.mc.thinkWire())
659
+ + continue
660
+ + }
661
+ + var mde *ModelDowngradedError
662
+ + isDowngraded := errors.As(err, &mde)
663
+ + if isDowngraded != c.wantDowngraded {
664
+ + t.Errorf("[%s] %q (think=%d): wantDowngraded=%v, got err=%T (%v)", mode, c.name, c.mc.thinkWire(), c.wantDowngraded, err, err)
665
+ + }
666
+ + }
667
+ + }
668
+ +}
669
+ +
670
+ +func TestTokenizerLoaderTimeout(t *testing.T) {
671
+ + t.Setenv("TIKTOKEN_CACHE_DIR", t.TempDir())
672
+ + prevTimeout := tokenizerHTTPTimeout
673
+ + tokenizerHTTPTimeout = 80 * time.Millisecond
674
+ + defer func() { tokenizerHTTPTimeout = prevTimeout }()
675
+ +
676
+ + unblock := make(chan struct{})
677
+ + srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
678
+ + <-unblock
679
+ + }))
680
+ + defer func() {
681
+ + close(unblock)
682
+ + srv.Close()
683
+ + }()
684
+ +
685
+ + loader := &boundedBpeLoader{}
686
+ + start := time.Now()
687
+ + _, err := loader.LoadTiktokenBpe(srv.URL + "/cl100k_base.tiktoken")
688
+ + elapsed := time.Since(start)
689
+ + if err == nil {
690
+ + t.Fatal("expected timeout error from hanging tokenizer download")
691
+ + }
692
+ + if elapsed > 1500*time.Millisecond {
693
+ + t.Fatalf("tokenizer download took %v, expected bounded timeout", elapsed)
694
+ + }
695
+ +}
696
+ +
697
+ +func TestAdminCookiesBindProxyBeforeCheck(t *testing.T) {
698
+ + getDB()
699
+ + _, _ = getDB().Exec(`DELETE FROM proxies`)
700
+ + _, _ = getDB().Exec(`DELETE FROM accounts`)
701
+ + t.Cleanup(func() {
702
+ + _, _ = getDB().Exec(`DELETE FROM proxies`)
703
+ + _, _ = getDB().Exec(`DELETE FROM accounts`)
704
+ + loadProxies()
705
+ + })
706
+ +
707
+ + idA, err := proxyCreate("proxy-a", "http://127.0.0.1:18080", 1)
708
+ + if err != nil {
709
+ + t.Fatalf("proxyCreate A: %v", err)
710
+ + }
711
+ + idB, err := proxyCreate("proxy-b", "http://127.0.0.1:18081", 1)
712
+ + if err != nil {
713
+ + t.Fatalf("proxyCreate B: %v", err)
714
+ + }
715
+ +
716
+ + reqBody, _ := json.Marshal(map[string]any{
717
+ + "label": "Magpie",
718
+ + "cookie": "SID=s; HSID=h; SSID=ss; APISID=a; SAPISID=sap; __Secure-1PSID=p",
719
+ + "note": "Added by Magpie",
720
+ + "proxy_id": idB,
721
+ + })
722
+ + req := httptest.NewRequest(http.MethodPost, "/admin/api/cookies", bytes.NewReader(reqBody))
723
+ + rec := httptest.NewRecorder()
724
+ + handleAdminCookies(rec, req)
725
+ + if rec.Code != 200 {
726
+ + t.Fatalf("POST /admin/api/cookies status=%d body=%s", rec.Code, rec.Body.String())
727
+ + }
728
+ + var added struct {
729
+ + ID int64 `json:"id"`
730
+ + }
731
+ + if err := json.Unmarshal(rec.Body.Bytes(), &added); err != nil || added.ID <= 0 {
732
+ + t.Fatalf("unexpected response: %s", rec.Body.String())
733
+ + }
734
+ +
735
+ + accts := accountList()
736
+ + if len(accts) != 1 || accts[0].ProxyID != idB {
737
+ + t.Fatalf("expected account bound to proxy B (%d), got %+v (proxy A=%d)", idB, accts, idA)
738
+ + }
739
+ +
740
+ + picked, ok, err := acquireSlot(accts[0].ProxyID)
741
+ + if !ok || err != nil {
742
+ + t.Fatalf("acquireSlot failed: ok=%v err=%v", ok, err)
743
+ + }
744
+ + slotRelease(picked.ID)
745
+ + if picked.ID != idB {
746
+ + t.Fatalf("first check slot picked proxy %d (%s), want proxy B %d", picked.ID, picked.Name, idB)
747
+ + }
748
+ +}
512
749
  diff --git a/internal/app/argon_timing_probe_test.go b/internal/app/argon_timing_probe_test.go
513
750
  new file mode 100644
514
- index 0000000..4ee5a3e
751
+ index 0000000..ae43ef4
515
752
  --- /dev/null
516
753
  +++ b/internal/app/argon_timing_probe_test.go
517
- @@ -0,0 +1,73 @@
754
+ @@ -0,0 +1,74 @@
518
755
  +package app
519
756
  +
520
757
  +import (
@@ -572,7 +809,7 @@ index 0000000..4ee5a3e
572
809
  + firstIdentity,firstText,firstReasoning,lastText:=int64(-1),int64(-1),int64(-1),int64(-1)
573
810
  + lineCount,textFrames:=0,0
574
811
  + lastContent:=""
575
- + raw,firstLine,err:=readBody(resp.Body,func(line string){
812
+ + raw,firstLine,err:=readBody(resp.Body,func(line string) error {
576
813
  + lineCount++;ms:=time.Since(start).Milliseconds()
577
814
  + if firstIdentity<0 && validateArgonIdentity([]byte(line), argonDisplayNames(thinkingNormal))==nil{firstIdentity=ms}
578
815
  + if firstReasoning<0 && reasoningInLine(line)!=""{firstReasoning=ms}
@@ -581,6 +818,7 @@ index 0000000..4ee5a3e
581
818
  + lastContent=strings.Join(texts,"\n");textFrames++;lastText=ms
582
819
  + if firstText<0{firstText=ms}
583
820
  + }
821
+ + return nil
584
822
  + },start)
585
823
  + t.Logf("TIMING first_line_ms=%d first_identity_ms=%d first_text_ms=%d first_reasoning_ms=%d last_text_ms=%d complete_ms=%d lines=%d text_updates=%d",firstLine,firstIdentity,firstText,firstReasoning,lastText,time.Since(start).Milliseconds(),lineCount,textFrames)
586
824
  + if err!=nil {t.Fatalf("generation transport failed (%T)",err)}
@@ -590,10 +828,10 @@ index 0000000..4ee5a3e
590
828
  +}
591
829
  diff --git a/internal/app/cancel_test.go b/internal/app/cancel_test.go
592
830
  new file mode 100644
593
- index 0000000..e5f1b6f
831
+ index 0000000..f36c700
594
832
  --- /dev/null
595
833
  +++ b/internal/app/cancel_test.go
596
- @@ -0,0 +1,105 @@
834
+ @@ -0,0 +1,106 @@
597
835
  +package app
598
836
  +
599
837
  +import (
@@ -628,10 +866,11 @@ index 0000000..e5f1b6f
628
866
  + defer cancel()
629
867
  + start := time.Now()
630
868
  + _, _, _, _, err := doGeminiRequestStop(ctx, "http://upstream.invalid/StreamGenerate", "f.req=x",
631
- + map[string]string{}, srv.URL, func(line string) {
869
+ + map[string]string{}, srv.URL, func(line string) error {
632
870
  + if line == "first frame" {
633
871
  + cancel() // 客户端在收到首帧后走了
634
872
  + }
873
+ + return nil
635
874
  + }, nil)
636
875
  + if err == nil {
637
876
  + t.Fatal("取消后应返回错误")
@@ -700,23 +939,13 @@ index 0000000..e5f1b6f
700
939
  + t.Fatal("没有记录这次请求")
701
940
  +}
702
941
  diff --git a/internal/app/client.go b/internal/app/client.go
703
- index 1750391..e613956 100644
942
+ index c63b3a9..de635f7 100644
704
943
  --- a/internal/app/client.go
705
944
  +++ b/internal/app/client.go
706
- @@ -154,17 +154,32 @@ func makeSAPISIDHash(sapisid string) string {
707
- return fmt.Sprintf("SAPISIDHASH %d_%s", ts, hex.EncodeToString(h[:]))
945
+ @@ -200,6 +200,37 @@ func currentBrowserUA() string {
946
+ return ChromeUA
708
947
  }
709
948
 
710
- -// ChromeUA 是给 stdlib 走代理时用的 Chrome 146 真实 UA 模板。
711
- +// ChromeUA 是 Chrome 146 的真实 UA 模板。
712
- const ChromeUA = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36"
713
-
714
- -// applyChromeHeaders 给 stdlib 请求填上模拟 Chrome 146 的应用层 header。
715
- -// utls 那层做 TLS/HTTP2 指纹我们做不到(走代理),但 header 一定要齐。
716
- +// chromeHeaders 是模拟 Chrome 146 的应用层 header,两条传输路径都要带齐:
717
- +// 走代理时 utls 那层的 TLS/HTTP2 指纹我们做不到(stdlib),但 header 一定要齐;
718
- +// 直连时 tls-client 只管指纹、不填 header,什么都不带的话 UA 是 Go-http-client/2.0,
719
- +// 跟 Chrome 的握手对不上,同一个账号也会因为走没走代理而呈现两种客户端。
720
949
  +var chromeHeaders = [][2]string{
721
950
  + {"User-Agent", ChromeUA},
722
951
  + {"Sec-CH-UA", `"Chromium";v="146", "Google Chrome";v="146", "Not?A_Brand";v="24"`},
@@ -727,16 +956,44 @@ index 1750391..e613956 100644
727
956
  + {"Sec-Fetch-Site", "same-origin"},
728
957
  +}
729
958
  +
730
- +// setChromeHeaders 把 chromeHeaders 填进 net/http 或 fhttp 的 Header(两者都有 Set)。
959
+ +// setChromeHeaders 把对应 impersonate 配置的应用层 header 填进 net/http 或 fhttp 的 Header。
731
960
  +// 调用方之后再写自己的 header,同名的以调用方为准。
732
- +func setChromeHeaders(h interface{ Set(key, value string) }) {
961
+ +func setChromeHeaders(h interface {
962
+ + Set(key, value string)
963
+ + Del(key string)
964
+ +}) {
965
+ + if isFirefoxProfile() {
966
+ + h.Set("User-Agent", FirefoxUA)
967
+ + h.Del("Sec-CH-UA")
968
+ + h.Del("Sec-CH-UA-Mobile")
969
+ + h.Del("Sec-CH-UA-Platform")
970
+ + h.Set("Sec-Fetch-Dest", "empty")
971
+ + h.Set("Sec-Fetch-Mode", "cors")
972
+ + h.Set("Sec-Fetch-Site", "same-origin")
973
+ + return
974
+ + }
733
975
  + for _, kv := range chromeHeaders {
734
976
  + h.Set(kv[0], kv[1])
735
977
  + }
736
978
  +}
737
979
  +
738
- +// applyChromeHeaders 给 stdlib 请求填上 chromeHeaders。
980
+ // applyChromeHeaders 给 stdlib 请求填上应用层 header(根据 impersonate 配置自动适配 Chrome 或 Firefox)。
739
981
  func applyChromeHeaders(req *http.Request) {
982
+ applyBrowserHeaders(req)
983
+ @@ -207,21 +238,5 @@ func applyChromeHeaders(req *http.Request) {
984
+
985
+ // applyBrowserHeaders 给 stdlib 请求填上对应 impersonate 配置的应用层 header。
986
+ func applyBrowserHeaders(req *http.Request) {
987
+ - if isFirefoxProfile() {
988
+ - req.Header.Set("User-Agent", FirefoxUA)
989
+ - req.Header.Del("Sec-CH-UA")
990
+ - req.Header.Del("Sec-CH-UA-Mobile")
991
+ - req.Header.Del("Sec-CH-UA-Platform")
992
+ - req.Header.Set("Sec-Fetch-Dest", "empty")
993
+ - req.Header.Set("Sec-Fetch-Mode", "cors")
994
+ - req.Header.Set("Sec-Fetch-Site", "same-origin")
995
+ - return
996
+ - }
740
997
  - req.Header.Set("User-Agent", ChromeUA)
741
998
  - req.Header.Set("Sec-CH-UA", `"Chromium";v="146", "Google Chrome";v="146", "Not?A_Brand";v="24"`)
742
999
  - req.Header.Set("Sec-CH-UA-Mobile", "?0")
@@ -826,7 +1083,7 @@ index bfc577b..cb60661 100644
826
1083
  + return promptParts{body: parts}.join()
827
1084
  }
828
1085
  diff --git a/internal/app/conversation.go b/internal/app/conversation.go
829
- index aef12eb..8ba963f 100644
1086
+ index 74df391..401482e 100644
830
1087
  --- a/internal/app/conversation.go
831
1088
  +++ b/internal/app/conversation.go
832
1089
  @@ -1,6 +1,7 @@
@@ -837,16 +1094,16 @@ index aef12eb..8ba963f 100644
837
1094
  "crypto/sha256"
838
1095
  "encoding/hex"
839
1096
  "encoding/json"
840
- @@ -205,7 +206,7 @@ func getAnonSession(proxyURL string) (string, error) {
1097
+ @@ -206,7 +207,7 @@ func getAnonSession(proxyURL string) (string, error) {
841
1098
  if err != nil {
842
1099
  return nil, nil, nil, err
843
1100
  }
844
- - r.Header.Set("User-Agent", webUA)
1101
+ - r.Header.Set("User-Agent", currentBrowserUA())
845
1102
  + setChromeHeaders(r.Header)
846
1103
  resp, err := getTLSClient().Do(r)
847
1104
  if err != nil {
848
1105
  return nil, nil, nil, err
849
- @@ -237,15 +238,14 @@ func getAnonSession(proxyURL string) (string, error) {
1106
+ @@ -238,15 +239,14 @@ func getAnonSession(proxyURL string) (string, error) {
850
1107
  return strings.Join(pairs, "; "), nil
851
1108
  }
852
1109
 
@@ -866,7 +1123,7 @@ index aef12eb..8ba963f 100644
866
1123
  p, slotOK, slotErr := acquireSlot(conv.proxyID)
867
1124
  if !slotOK {
868
1125
  return &StreamResult{}, slotErr
869
- @@ -365,13 +365,19 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
1126
+ @@ -369,12 +369,19 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
870
1127
  t0 := time.Now()
871
1128
  var lastErr error
872
1129
  for attempt := 0; attempt < rtCfg().RetryAttempts; attempt++ {
@@ -880,6 +1137,16 @@ index aef12eb..8ba963f 100644
880
1137
  conv.cookie = merged
881
1138
  }
882
1139
  }
1140
+ + var aie *argonIdentityError
1141
+ + if strictCheck != nil && errors.As(err, &aie) && modelDowngraded(mc, aie.name) {
1142
+ + err = &ModelDowngradedError{Requested: mc.Upstream, Reported: aie.name, AccountID: conv.accountID}
1143
+ + }
1144
+ // 降级:同一个号重试还是降级,直接交给上层(见 gemini.go 同一处)。
1145
+ var mde *ModelDowngradedError
1146
+ if errors.As(err, &mde) {
1147
+ @@ -383,6 +390,9 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
1148
+ Emitted: tracker.emitted, EmittedReasoning: rtracker.emitted}, err
1149
+ }
883
1150
  if err != nil || statusCode != 200 || !hasContentFrame(string(raw)) {
884
1151
  + if cerr := ctx.Err(); cerr != nil {
885
1152
  + return &StreamResult{ProxyID: p.ID, ProxyName: p.Name, AccountID: conv.accountID}, cerr
@@ -887,7 +1154,7 @@ index aef12eb..8ba963f 100644
887
1154
  if err == nil && statusCode == 200 {
888
1155
  lastErr = fmt.Errorf("续接无内容帧(会话可能已失效,raw %d 字节)", len(raw))
889
1156
  } else if err != nil {
890
- @@ -386,7 +392,9 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
1157
+ @@ -397,7 +407,9 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
891
1158
  break
892
1159
  }
893
1160
  if attempt < rtCfg().RetryAttempts-1 {
@@ -898,7 +1165,7 @@ index aef12eb..8ba963f 100644
898
1165
  }
899
1166
  continue
900
1167
  }
901
- @@ -427,7 +435,7 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
1168
+ @@ -438,7 +450,7 @@ func streamGenerateConv(prompt string, mc ModelConfig, conv *convState,
902
1169
  // - 没命中 → 新建会话,首轮发全量拼接的历史(含 tools 指令,把当前上下文交给服务端)。
903
1170
  //
904
1171
  // 支持 tools(续接里也解析 ```tool_call``` 围栏);图片走原单轮路径(callGemini)。
@@ -907,17 +1174,31 @@ index aef12eb..8ba963f 100644
907
1174
  tools []map[string]interface{}, toolChoice interface{},
908
1175
  onDelta, onReasoning func(string)) (string, []ToolCall, *StreamResult, error) {
909
1176
  parentKey := convParentKey(messages)
910
- @@ -462,7 +470,7 @@ func callGeminiConv(messages []map[string]interface{}, mc ModelConfig,
911
- logf("[conv] 续接命中 turn=%d,只发 %d 字节(历史留服务端)", conv.turn, len(prompt))
1177
+ @@ -488,7 +500,7 @@ func callGeminiConv(messages []map[string]interface{}, mc ModelConfig,
1178
+ }
1179
+ }
1180
+ }
1181
+ - res, err = streamGenerateConv(prompt, mc, conv, onDelta, onReasoning)
1182
+ + res, err = streamGenerateConv(ctx, prompt, mc, conv, onDelta, onReasoning)
1183
+ if !retryOnAnotherAccount(res, err, mc, exclude) || !fresh {
1184
+ break
1185
+ }
1186
+ diff --git a/internal/app/cookie_pool.go b/internal/app/cookie_pool.go
1187
+ index 6a88ac2..dc828d6 100644
1188
+ --- a/internal/app/cookie_pool.go
1189
+ +++ b/internal/app/cookie_pool.go
1190
+ @@ -546,6 +546,9 @@ func checkAccountCookie(a CookieAccount) CookieCheck {
1191
+ return CookieCheck{Detail: explainCookieFailure(err), ProxyName: name, TookMs: took}
912
1192
  }
913
-
914
- - res, err := streamGenerateConv(prompt, mc, conv, onDelta, onReasoning)
915
- + res, err := streamGenerateConv(ctx, prompt, mc, conv, onDelta, onReasoning)
916
- if err != nil {
917
- if !fresh {
918
- // 续接失败:这路会话作废,客户端重试时会当新会话全量重发。
1193
+ markAccountResult(a.ID, true, "")
1194
+ + if picked.ID > 0 && a.ProxyID != picked.ID {
1195
+ + bindAccountProxy(a.ID, picked.ID)
1196
+ + }
1197
+ detail := "登录态有效"
1198
+ if extractSAPISID(a.Cookie) == "" {
1199
+ detail += ",但缺 SAPISID(算不出授权头,部分接口会被当匿名)"
919
1200
  diff --git a/internal/app/gemini.go b/internal/app/gemini.go
920
- index 723725f..150b022 100644
1201
+ index 7c9186f..a6b0213 100644
921
1202
  --- a/internal/app/gemini.go
922
1203
  +++ b/internal/app/gemini.go
923
1204
  @@ -3,6 +3,7 @@ package app
@@ -926,9 +1207,9 @@ index 723725f..150b022 100644
926
1207
  "bytes"
927
1208
  + "context"
928
1209
  "encoding/json"
1210
+ "errors"
929
1211
  "fmt"
930
- "io"
931
- @@ -10,6 +11,7 @@ import (
1212
+ @@ -11,6 +12,7 @@ import (
932
1213
  "net/url"
933
1214
  "regexp"
934
1215
  "strings"
@@ -936,7 +1217,7 @@ index 723725f..150b022 100644
936
1217
  "time"
937
1218
 
938
1219
  fhttp "github.com/bogdanfinn/fhttp"
939
- @@ -311,7 +313,7 @@ func (d *deltaTracker) Push(fullText string) string {
1220
+ @@ -373,7 +375,7 @@ func (e *pinnedAccountError) Unwrap() error { return e.Err }
940
1221
  // 自己做。一旦已经吐过内容就不再重试——重试会让客户端收到重复文本。
941
1222
  func streamGenerate(prompt, latest string, mc ModelConfig,
942
1223
  onDelta, onReasoning func(string)) (*StreamResult, error) {
@@ -945,7 +1226,7 @@ index 723725f..150b022 100644
945
1226
  }
946
1227
 
947
1228
  // fileRef 是一个已上传附件的引用。
948
- @@ -326,8 +328,16 @@ type fileRef struct {
1229
+ @@ -388,15 +390,23 @@ type fileRef struct {
949
1230
  //
950
1231
  // 附件填 inner[0][3],形状 [[[ref, 1], "文件名"], …]。附件只在登录态可用:
951
1232
  // 匿名能把文件传上去,但对话里一引用就被服务端回 1100。
@@ -961,10 +1242,29 @@ index 723725f..150b022 100644
961
1242
  +// 取消导致的失败不记进代理 / cookie 健康度,那不是它们的错。
962
1243
  +func streamGenerateWithFiles(ctx context.Context, prompt string, pc promptCtx, mc ModelConfig, pending []pendingUpload,
963
1244
  + onDelta, onReasoning func(string), stopWhen func(string) bool) (*StreamResult, error) {
1245
+ // strict_model 换号:被降级的号记冷却、本次排除,换下一个号重来。上限跟 XSRF 换号
1246
+ // 一样是 maxCookieTries——连着几个号都降级,说明池子整体见底,不是撞上个别号。
1247
+ exclude := map[int64]bool{}
1248
+ var res *StreamResult
1249
+ var err error
1250
+ for try := 0; try < maxCookieTries; try++ {
1251
+ - next, nextErr := streamGenerateOnce(prompt, latest, mc, pending, onDelta, onReasoning, exclude)
1252
+ + next, nextErr := streamGenerateOnce(ctx, prompt, pc, mc, pending, onDelta, onReasoning, stopWhen, exclude)
1253
+ var exhausted *ModelDowngradedError
1254
+ if try > 0 && errors.As(nextErr, &exhausted) && exhausted.Reported == "" {
1255
+ // 换号时已经没号可挑:报上一个号真实的降级(带自报模型名),补上解冻时间
1256
+ @@ -414,8 +424,8 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1257
+ return res, err
1258
+ }
1259
+
1260
+ -func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pendingUpload,
1261
+ - onDelta, onReasoning func(string), exclude map[int64]bool) (*StreamResult, error) {
1262
+ +func streamGenerateOnce(ctx context.Context, prompt string, pc promptCtx, mc ModelConfig, pending []pendingUpload,
1263
+ + onDelta, onReasoning func(string), stopWhen func(string) bool, exclude map[int64]bool) (*StreamResult, error) {
964
1264
  var files []fileRef
965
1265
 
966
1266
  // 先挑号,再按它上次绑的出口挑代理 —— 同一个账号要尽量固定从同一个 IP 出去,
967
- @@ -337,6 +347,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1267
+ @@ -425,6 +435,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
968
1268
  // 不发请求,真正发请求的是下面的 getXSRF,它在拿到 slot 之后。
969
1269
  // #20 匿名优先:不需要登录态能力时不占用 cookie 账号,走匿名省额度(见 anonFirstEligible)。
970
1270
  // 带附件(图/视频)时不能走匿名——下面 uploadBytes 那段会因 cookieStr=="" 直接报错。
@@ -972,9 +1272,9 @@ index 723725f..150b022 100644
972
1272
  + return nil, err
973
1273
  + }
974
1274
  var acct *CookieAccount
975
- if !anonFirstEligible(mc, len(pending) > 0) {
976
- if a, ok := pickCookieAccount(); ok {
977
- @@ -392,6 +405,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1275
+ skip := exclude
1276
+ if mc.PinAccountID > 0 {
1277
+ @@ -489,6 +502,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
978
1278
  // 每个号只给一次「轮转后重试」的机会,避免在一个请求里反复打 accounts.google.com
979
1279
  rotatedOnce := map[int64]bool{}
980
1280
  for acct != nil && len(tried) < maxCookieTries {
@@ -984,16 +1284,7 @@ index 723725f..150b022 100644
984
1284
  tried[acct.ID] = true
985
1285
  // 归属先记上:这一轮失败了也留痕,面板上看得出是哪个号在坏
986
1286
  cookieID, cookieLabel = acct.ID, accountDisplayName(acct)
987
- @@ -419,6 +435,8 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
988
- rotatedOnce[acct.ID] = true
989
- if _, _, rerr := rotateAccount(*acct); rerr == nil {
990
- if fresh := accountByID(acct.ID); fresh != nil {
991
- + // rotateAccount 成功改了 cookie 时已经用新 cookie 重取过 token
992
- + // (失败则作废了缓存),所以这里命中的缓存就是刚验证过的。
993
- if tok2, err2 := getXSRF(fresh.Cookie, proxyURL); err2 == nil {
994
- logf("[cookie] 账号 #%d 轮转后恢复可用", acct.ID)
995
- acct = fresh
996
- @@ -458,7 +476,10 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1287
+ @@ -569,7 +585,10 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
997
1288
  }
998
1289
  nImg, nVid := 0, 0
999
1290
  for _, u := range pending {
@@ -1005,7 +1296,7 @@ index 723725f..150b022 100644
1005
1296
  if uerr != nil {
1006
1297
  return attrib(fmt.Errorf("上传附件 %s 失败: %w", u.Name, uerr))
1007
1298
  }
1008
- @@ -475,7 +496,10 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1299
+ @@ -586,7 +605,10 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1009
1300
  // prompt 超长时转成文本附件。要等挑完号和出口才能做:上传要 cookie,
1010
1301
  // 而且必须走跟正式请求同一个出口。
1011
1302
  budget := rtCfg().MaxPromptBytes
@@ -1017,15 +1308,21 @@ index 723725f..150b022 100644
1017
1308
  return attrib(ferr)
1018
1309
  } else if used {
1019
1310
  prompt = p
1020
- @@ -596,32 +620,18 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1311
+ @@ -713,45 +735,29 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1021
1312
  xsrfRetried := false // XSRF 自愈只做一次,避免死循环
1022
1313
  t0 := time.Now()
1023
1314
 
1024
1315
  - tracker := &deltaTracker{}
1025
1316
  - rtracker := &deltaTracker{}
1026
- - var lineCB func(string)
1027
- - if onDelta != nil || onReasoning != nil {
1028
- - lineCB = func(line string) {
1317
+ strictCheck := strictLineCheck(mc, func() int64 { return cookieID })
1318
+ - var lineCB func(string) error
1319
+ - if onDelta != nil || onReasoning != nil || strictCheck != nil {
1320
+ - lineCB = func(line string) error {
1321
+ - if strictCheck != nil {
1322
+ - if err := strictCheck(line); err != nil {
1323
+ - return err
1324
+ - }
1325
+ - }
1029
1326
  - // 思考链先推完才轮到正文,所以先处理它,客户端拿到的顺序才对。
1030
1327
  - if onReasoning != nil {
1031
1328
  - if r := reasoningInLine(line); r != "" {
@@ -1035,15 +1332,16 @@ index 723725f..150b022 100644
1035
1332
  - }
1036
1333
  - }
1037
1334
  - if onDelta == nil {
1038
- - return
1335
+ - return nil
1039
1336
  - }
1040
1337
  - for _, t := range textsInLine(line) {
1041
1338
  - if d := tracker.Push(t); d != "" {
1042
1339
  - onDelta(d)
1043
1340
  - }
1044
1341
  - }
1342
+ - return nil
1045
1343
  - }
1046
- + lh := newLineHandler(onDelta, onReasoning, stopWhen)
1344
+ + lh := newLineHandler(onDelta, onReasoning, stopWhen, strictCheck)
1047
1345
  + tracker, rtracker := lh.tracker, lh.rtracker
1048
1346
  +
1049
1347
  + retryWait := func() error {
@@ -1059,9 +1357,19 @@ index 723725f..150b022 100644
1059
1357
  if len(setCookie) > 0 && cookieID > 0 {
1060
1358
  if merged := mergeSetCookie(cookieStr, setCookie); merged != cookieStr {
1061
1359
  cookieStr = merged
1062
- @@ -629,6 +639,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1360
+ updateAccountCookie(cookieID, merged)
1063
1361
  }
1064
1362
  }
1363
+ + var aie *argonIdentityError
1364
+ + if strictCheck != nil && errors.As(err, &aie) && modelDowngraded(mc, aie.name) {
1365
+ + err = &ModelDowngradedError{Requested: mc.Upstream, Reported: aie.name, AccountID: cookieID}
1366
+ + }
1367
+ // 降级不是出口或 cookie 的错,也不该重试:同一个号再发一次还是降级。
1368
+ var mde *ModelDowngradedError
1369
+ if errors.As(err, &mde) {
1370
+ @@ -763,6 +769,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1371
+ return res, err
1372
+ }
1065
1373
  if err != nil {
1066
1374
  + if cerr := ctx.Err(); cerr != nil {
1067
1375
  + return attrib(cerr) // 客户端断开,不是出口的错
@@ -1069,7 +1377,7 @@ index 723725f..150b022 100644
1069
1377
  lastErr = err
1070
1378
  if pickedOK {
1071
1379
  recordProxyResult(picked.ID, false, err.Error())
1072
- @@ -639,7 +652,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1380
+ @@ -773,7 +782,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1073
1381
  }
1074
1382
  if attempt < rtCfg().RetryAttempts-1 {
1075
1383
  logf("retry %d/%d: %v", attempt+1, rtCfg().RetryAttempts, err)
@@ -1080,7 +1388,7 @@ index 723725f..150b022 100644
1080
1388
  }
1081
1389
  continue
1082
1390
  }
1083
- @@ -667,7 +682,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1391
+ @@ -801,7 +812,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1084
1392
  break
1085
1393
  }
1086
1394
  if attempt < rtCfg().RetryAttempts-1 {
@@ -1091,7 +1399,7 @@ index 723725f..150b022 100644
1091
1399
  }
1092
1400
  continue
1093
1401
  }
1094
- @@ -690,7 +707,9 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1402
+ @@ -829,7 +842,9 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1095
1403
  }
1096
1404
  if attempt < rtCfg().RetryAttempts-1 {
1097
1405
  logf("retry %d/%d: 空响应(无内容帧,%d 字节)", attempt+1, rtCfg().RetryAttempts, len(raw))
@@ -1102,7 +1410,7 @@ index 723725f..150b022 100644
1102
1410
  }
1103
1411
  continue
1104
1412
  }
1105
- @@ -750,6 +769,54 @@ func streamGenerateWithFiles(prompt, latest string, mc ModelConfig, pending []pe
1413
+ @@ -895,6 +910,60 @@ func streamGenerateOnce(prompt, latest string, mc ModelConfig, pending []pending
1106
1414
  return attrib(lastErr)
1107
1415
  }
1108
1416
 
@@ -1114,19 +1422,24 @@ index 723725f..150b022 100644
1114
1422
  +type lineHandler struct {
1115
1423
  + tracker, rtracker *deltaTracker
1116
1424
  + stop atomic.Bool
1117
- + cb func(string) // nil 表示不需要逐行处理
1425
+ + cb func(string) error // nil 表示不需要逐行处理
1118
1426
  +}
1119
1427
  +
1120
- +func newLineHandler(onDelta, onReasoning func(string), stopWhen func(string) bool) *lineHandler {
1428
+ +func newLineHandler(onDelta, onReasoning func(string), stopWhen func(string) bool, check func(string) error) *lineHandler {
1121
1429
  + lh := &lineHandler{tracker: &deltaTracker{}, rtracker: &deltaTracker{}}
1122
- + if onDelta == nil && onReasoning == nil && stopWhen == nil {
1430
+ + if onDelta == nil && onReasoning == nil && stopWhen == nil && check == nil {
1123
1431
  + return lh
1124
1432
  + }
1125
1433
  + watch := lh.tracker
1126
1434
  + if onDelta == nil {
1127
1435
  + watch = &deltaTracker{}
1128
1436
  + }
1129
- + lh.cb = func(line string) {
1437
+ + lh.cb = func(line string) error {
1438
+ + if check != nil {
1439
+ + if err := check(line); err != nil {
1440
+ + return err
1441
+ + }
1442
+ + }
1130
1443
  + // 思考链先推完才轮到正文,所以先处理它,客户端拿到的顺序才对。
1131
1444
  + if onReasoning != nil {
1132
1445
  + if r := reasoningInLine(line); r != "" {
@@ -1136,7 +1449,7 @@ index 723725f..150b022 100644
1136
1449
  + }
1137
1450
  + }
1138
1451
  + if onDelta == nil && stopWhen == nil {
1139
- + return
1452
+ + return nil
1140
1453
  + }
1141
1454
  + grew := false
1142
1455
  + for _, t := range textsInLine(line) {
@@ -1150,6 +1463,7 @@ index 723725f..150b022 100644
1150
1463
  + if grew && stopWhen != nil && stopWhen(watch.emitted) {
1151
1464
  + lh.stop.Store(true)
1152
1465
  + }
1466
+ + return nil
1153
1467
  + }
1154
1468
  + return lh
1155
1469
  +}
@@ -1157,10 +1471,10 @@ index 723725f..150b022 100644
1157
1471
  // upstreamModelRe 匹配响应帧里服务端自报的模型显示名(帧的 [42] 位)。
1158
1472
  // 形如 ...,"fbb127bbb056c959",null,null,"3.6 Flash",true,...
1159
1473
  var upstreamModelRe = regexp.MustCompile(`\\"[0-9a-f]{16}\\",null,null,\\"([^"\\]{1,40})\\"`)
1160
- @@ -819,10 +886,43 @@ func buildGeminiHeaders(cookieStr, sapisid, hexID string) map[string]string {
1474
+ @@ -964,10 +1033,43 @@ func buildGeminiHeaders(cookieStr, sapisid, hexID string) map[string]string {
1161
1475
  // 实测号活一两小时就失效 —— 所以这些必须收下来并写回账号。
1162
1476
  func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL string,
1163
- onLine func(string)) (int, []byte, int64, []string, error) {
1477
+ onLine func(string) error) (int, []byte, int64, []string, error) {
1164
1478
  + return doGeminiRequestStop(context.Background(), endpoint, body, headers, proxyURL, onLine, nil)
1165
1479
  +}
1166
1480
  +
@@ -1193,7 +1507,7 @@ index 723725f..150b022 100644
1193
1507
  +// doGeminiRequestStop 同 doGeminiRequest,stop 置位后提前结束读取(见 stopReader),
1194
1508
  +// ctx 结束时中止连接和读取。
1195
1509
  +func doGeminiRequestStop(ctx context.Context, endpoint, body string, headers map[string]string, proxyURL string,
1196
- + onLine func(string), stop *atomic.Bool) (int, []byte, int64, []string, error) {
1510
+ + onLine func(string) error, stop *atomic.Bool) (int, []byte, int64, []string, error) {
1197
1511
  sendAt := time.Now()
1198
1512
  if proxyURL != "" {
1199
1513
  // 走 stdlib 的 http.ProxyURL,已知能过 socks5/socks5h。
@@ -1202,7 +1516,7 @@ index 723725f..150b022 100644
1202
1516
  if err != nil {
1203
1517
  return 0, nil, 0, nil, err
1204
1518
  }
1205
- @@ -836,7 +936,7 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1519
+ @@ -981,7 +1083,7 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1206
1520
  return 0, nil, 0, nil, err
1207
1521
  }
1208
1522
  defer resp.Body.Close()
@@ -1211,7 +1525,7 @@ index 723725f..150b022 100644
1211
1525
  if err != nil {
1212
1526
  return resp.StatusCode, nil, ttfb, resp.Header.Values("Set-Cookie"), err
1213
1527
  }
1214
- @@ -844,10 +944,11 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1528
+ @@ -989,10 +1091,11 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1215
1529
  }
1216
1530
 
1217
1531
  // 直连 → tls-client,保留 chrome146 TLS/HTTP2 真指纹
@@ -1224,7 +1538,7 @@ index 723725f..150b022 100644
1224
1538
  for k, v := range headers {
1225
1539
  req.Header.Set(k, v)
1226
1540
  }
1227
- @@ -857,7 +958,7 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1541
+ @@ -1002,7 +1105,7 @@ func doGeminiRequest(endpoint, body string, headers map[string]string, proxyURL
1228
1542
  return 0, nil, 0, nil, err
1229
1543
  }
1230
1544
  defer resp.Body.Close()
@@ -1233,7 +1547,7 @@ index 723725f..150b022 100644
1233
1547
  if err != nil {
1234
1548
  return resp.StatusCode, nil, ttfb, resp.Header.Values("Set-Cookie"), err
1235
1549
  }
1236
- @@ -1159,6 +1260,7 @@ func probeGemini(prompt, proxyURL string) ProbeResult {
1550
+ @@ -1313,6 +1416,7 @@ func probeGemini(prompt, proxyURL string) ProbeResult {
1237
1551
  res.Diagnostic = "构建请求失败: " + e.Error()
1238
1552
  return res
1239
1553
  }
@@ -1241,6 +1555,82 @@ index 723725f..150b022 100644
1241
1555
  for k, v := range headers {
1242
1556
  req.Header.Set(k, v)
1243
1557
  }
1558
+ diff --git a/internal/app/gemini_api.go b/internal/app/gemini_api.go
1559
+ index 3721e44..d5950ab 100644
1560
+ --- a/internal/app/gemini_api.go
1561
+ +++ b/internal/app/gemini_api.go
1562
+ @@ -1,6 +1,7 @@
1563
+ package app
1564
+
1565
+ import (
1566
+ + "context"
1567
+ "encoding/base64"
1568
+ "encoding/json"
1569
+ "fmt"
1570
+ @@ -458,6 +459,7 @@ func geminiCandidate(parts []interface{}, finish string) map[string]interface{}
1571
+ // prepareGemini 是 generateContent / streamGenerateContent 共用的前半段:
1572
+ // 解析、选模型、收图、拼 prompt。出错时已经写好响应。
1573
+ type geminiCall struct {
1574
+ + ctx context.Context
1575
+ req *geminiAPIRequest
1576
+ modelName string
1577
+ modelCfg ModelConfig
1578
+ @@ -466,7 +468,7 @@ type geminiCall struct {
1579
+ toolChoice interface{}
1580
+ images []pendingUpload
1581
+ prompt string
1582
+ - latest string
1583
+ + pc promptCtx
1584
+ }
1585
+
1586
+ func prepareGemini(w http.ResponseWriter, r *http.Request, model string) (*geminiCall, bool) {
1587
+ @@ -492,21 +494,21 @@ func prepareGemini(w http.ResponseWriter, r *http.Request, model string) (*gemin
1588
+ writeGeminiError(w, 400, err.Error())
1589
+ return nil, false
1590
+ }
1591
+ - prompt, latest := messagesToPrompt(messages, tools, toolChoice)
1592
+ + prompt, pc := messagesToPrompt(messages, tools, toolChoice)
1593
+ if strings.TrimSpace(prompt) == "" && len(images) == 0 {
1594
+ writeGeminiError(w, 400, "contents is empty")
1595
+ return nil, false
1596
+ }
1597
+ - return &geminiCall{req: req, modelName: modelName, modelCfg: modelCfg, messages: messages,
1598
+ - tools: tools, toolChoice: toolChoice, images: images, prompt: prompt, latest: latest}, true
1599
+ + return &geminiCall{ctx: r.Context(), req: req, modelName: modelName, modelCfg: modelCfg, messages: messages,
1600
+ + tools: tools, toolChoice: toolChoice, images: images, prompt: prompt, pc: pc}, true
1601
+ }
1602
+
1603
+ // run 调上游;多轮开关的分流跟 /v1/chat/completions 一致。
1604
+ func (g *geminiCall) run(onDelta, onReasoning func(string)) (string, []ToolCall, *StreamResult, error) {
1605
+ if rtCfg().MultiTurn && len(g.images) == 0 && g.modelCfg.Tool == 0 {
1606
+ - return callGeminiConv(g.messages, g.modelCfg, g.tools, g.toolChoice, onDelta, onReasoning)
1607
+ + return callGeminiConv(g.ctx, g.messages, g.modelCfg, g.tools, g.toolChoice, onDelta, onReasoning)
1608
+ }
1609
+ - return callGemini(g.prompt, g.latest, g.modelCfg, g.tools, g.images, onDelta, onReasoning)
1610
+ + return callGemini(g.ctx, g.prompt, g.pc, g.modelCfg, g.tools, g.images, onDelta, onReasoning)
1611
+ }
1612
+
1613
+ // runGeminiCall 是调上游那一步,测试里替换成桩。
1614
+ @@ -521,6 +523,9 @@ func handleGenerateContent(w http.ResponseWriter, r *http.Request, model string)
1615
+ }
1616
+ text, calls, res, err := runGeminiCall(g, nil, nil)
1617
+ if err != nil {
1618
+ + if clientGone(r, "gemini.generateContent", g.modelName, g.prompt, res, false) {
1619
+ + return
1620
+ + }
1621
+ status := 502
1622
+ if _, ok := err.(*ModelDowngradedError); ok {
1623
+ status = 429
1624
+ @@ -656,6 +661,9 @@ func handleStreamGenerateContent(w http.ResponseWriter, r *http.Request, model s
1625
+
1626
+ text, calls, res, err := runGeminiCall(g, onDelta, onReasoning)
1627
+ if err != nil {
1628
+ + if clientGone(r, "gemini.streamGenerateContent", g.modelName, g.prompt, res, true) {
1629
+ + return
1630
+ + }
1631
+ status := 502
1632
+ if _, ok := err.(*ModelDowngradedError); ok {
1633
+ status = 429
1244
1634
  diff --git a/internal/app/gemini_test.go b/internal/app/gemini_test.go
1245
1635
  index 00eb305..2b4c6ca 100644
1246
1636
  --- a/internal/app/gemini_test.go
@@ -1255,14 +1645,15 @@ index 00eb305..2b4c6ca 100644
1255
1645
  name, mc, err := resolveModel(c.name)
1256
1646
  diff --git a/internal/app/headers_test.go b/internal/app/headers_test.go
1257
1647
  new file mode 100644
1258
- index 0000000..b80a9fa
1648
+ index 0000000..9613045
1259
1649
  --- /dev/null
1260
1650
  +++ b/internal/app/headers_test.go
1261
- @@ -0,0 +1,96 @@
1651
+ @@ -0,0 +1,98 @@
1262
1652
  +package app
1263
1653
  +
1264
1654
  +import (
1265
1655
  + "context"
1656
+ + "fmt"
1266
1657
  + "net/http"
1267
1658
  + "net/http/httptest"
1268
1659
  + "testing"
@@ -1290,9 +1681,10 @@ index 0000000..b80a9fa
1290
1681
  + proxy := httptest.NewServer(record("proxy"))
1291
1682
  + defer proxy.Close()
1292
1683
  +
1293
- + key := rtCfg().Impersonate
1684
+ + imp := effectiveImpersonate()
1685
+ + key := fmt.Sprintf("%s|%d", imp, rtCfg().RequestTimeout)
1294
1686
  + insecure, err := tls_client.NewHttpClient(tls_client.NewNoopLogger(),
1295
- + tls_client.WithClientProfile(resolveProfile(key)),
1687
+ + tls_client.WithClientProfile(resolveProfile(imp)),
1296
1688
  + tls_client.WithInsecureSkipVerify(),
1297
1689
  + tls_client.WithNotFollowRedirects())
1298
1690
  + if err != nil {
@@ -1357,10 +1749,10 @@ index 0000000..b80a9fa
1357
1749
  +}
1358
1750
  diff --git a/internal/app/latency_test.go b/internal/app/latency_test.go
1359
1751
  new file mode 100644
1360
- index 0000000..b30336f
1752
+ index 0000000..236a51d
1361
1753
  --- /dev/null
1362
1754
  +++ b/internal/app/latency_test.go
1363
- @@ -0,0 +1,297 @@
1755
+ @@ -0,0 +1,310 @@
1364
1756
  +package app
1365
1757
  +
1366
1758
  +import (
@@ -1518,11 +1910,12 @@ index 0000000..b30336f
1518
1910
  + src := &countingReader{chunks: [][]byte{[]byte("a\n"), []byte("b\n"), []byte("c\n"), []byte("d\n")}}
1519
1911
  + var stop atomic.Bool
1520
1912
  + var got []string
1521
- + _, _, err := readBody(stopReader{src, &stop}, func(line string) {
1913
+ + _, _, err := readBody(stopReader{src, &stop}, func(line string) error {
1522
1914
  + got = append(got, line)
1523
1915
  + if line == "b" {
1524
1916
  + stop.Store(true)
1525
1917
  + }
1918
+ + return nil
1526
1919
  + }, time.Now())
1527
1920
  + if err != nil {
1528
1921
  + t.Fatal(err)
@@ -1543,7 +1936,10 @@ index 0000000..b30336f
1543
1936
  + // 身份晚到:之前的帧先扣住,确认后按原顺序放行。
1544
1937
  + var got []string
1545
1938
  + body := bytes.Join([][]byte{[]byte(")]}'\n"), noID, argonLine(hexArgon4, "4 Argon", "ok")}, nil)
1546
- + _, _, err := readModelCheckedBody(bytes.NewReader(body), func(l string) { got = append(got, l) }, time.Now(), 200, header)
1939
+ + _, _, err := readModelCheckedBody(bytes.NewReader(body), func(l string) error {
1940
+ + got = append(got, l)
1941
+ + return nil
1942
+ + }, time.Now(), 200, header)
1547
1943
  + if err != nil || len(got) != 3 || got[0] != ")]}'" {
1548
1944
  + t.Fatalf("晚到身份: err=%v lines=%d", err, len(got))
1549
1945
  + }
@@ -1554,7 +1950,10 @@ index 0000000..b30336f
1554
1950
  + chunks: [][]byte{argonLine(hexArgon4, "4 Argon", "a"), argonLine(hexArgon4, "4 Argon", "ab"), noID},
1555
1951
  + callbacksCalled: &calls,
1556
1952
  + }
1557
- + if _, _, err := readModelCheckedBody(inc, func(string) { calls++ }, time.Now(), 200, header); err != nil || calls != 3 {
1953
+ + if _, _, err := readModelCheckedBody(inc, func(string) error {
1954
+ + calls++
1955
+ + return nil
1956
+ + }, time.Now(), 200, header); err != nil || calls != 3 {
1558
1957
  + t.Fatalf("确认后未增量转发: err=%v calls=%d", err, calls)
1559
1958
  + }
1560
1959
  +
@@ -1565,14 +1964,20 @@ index 0000000..b30336f
1565
1964
  + argonLine(hexFlash36, "3.6 Flash", "b"),
1566
1965
  + argonLine(hexArgon4, "4 Argon", "c"),
1567
1966
  + }}
1568
- + _, _, err = readModelCheckedBody(src, func(l string) { got = append(got, l) }, time.Now(), 200, header)
1967
+ + _, _, err = readModelCheckedBody(src, func(l string) error {
1968
+ + got = append(got, l)
1969
+ + return nil
1970
+ + }, time.Now(), 200, header)
1569
1971
  + if err == nil || !strings.Contains(err.Error(), "mismatch") || len(got) != 1 || src.reads != 2 {
1570
1972
  + t.Fatalf("先对后错: err=%v lines=%d reads=%d", err, len(got), src.reads)
1571
1973
  + }
1572
1974
  +
1573
1975
  + // 始终没有身份:一行都不放行。
1574
1976
  + got = nil
1575
- + _, _, err = readModelCheckedBody(bytes.NewReader(bytes.Repeat(noID, 3)), func(l string) { got = append(got, l) }, time.Now(), 200, header)
1977
+ + _, _, err = readModelCheckedBody(bytes.NewReader(bytes.Repeat(noID, 3)), func(l string) error {
1978
+ + got = append(got, l)
1979
+ + return nil
1980
+ + }, time.Now(), 200, header)
1576
1981
  + if err == nil || !strings.Contains(err.Error(), "identity missing") || len(got) != 0 {
1577
1982
  + t.Fatalf("无身份: err=%v lines=%d", err, len(got))
1578
1983
  + }
@@ -1629,7 +2034,7 @@ index 0000000..b30336f
1629
2034
  + src := &countingReader{chunks: frames}
1630
2035
  + var sent strings.Builder
1631
2036
  + gate := newToolFenceGate(func(s string) { sent.WriteString(s) })
1632
- + lh := newLineHandler(gate.Push, nil, toolCallComplete(toolsFixture("bash")))
2037
+ + lh := newLineHandler(gate.Push, nil, toolCallComplete(toolsFixture("bash")), nil)
1633
2038
  +
1634
2039
  + raw, _, err := readModelCheckedBody(stopReader{src, &lh.stop}, lh.cb, time.Now(), 200,
1635
2040
  + fmt.Sprintf(`[1,null,null,null,"%s"]`, hexID))
@@ -1650,7 +2055,7 @@ index 0000000..b30336f
1650
2055
  +
1651
2056
  + // 非流式(onDelta 为 nil)同样提前收尾,但不能把 tracker 记成「已发给客户端」,否则失败时不能重试。
1652
2057
  + src := &countingReader{chunks: [][]byte{genFrame("好的\n"+call, false), genFrame("好的\n"+call, false)}}
1653
- + lh := newLineHandler(nil, nil, toolCallComplete(toolsFixture("bash")))
2058
+ + lh := newLineHandler(nil, nil, toolCallComplete(toolsFixture("bash")), nil)
1654
2059
  + if _, _, err := readModelCheckedBody(stopReader{src, &lh.stop}, lh.cb, time.Now(), 200, `[1,null,null,null,"x"]`); err != nil {
1655
2060
  + t.Fatal(err)
1656
2061
  + }
@@ -1658,11 +2063,32 @@ index 0000000..b30336f
1658
2063
  + t.Fatalf("非流式: stop=%v reads=%d tracker=%q", lh.stop.Load(), src.reads, lh.tracker.emitted)
1659
2064
  + }
1660
2065
  +}
2066
+ diff --git a/internal/app/mcp_media.go b/internal/app/mcp_media.go
2067
+ index acb1131..a8bab02 100644
2068
+ --- a/internal/app/mcp_media.go
2069
+ +++ b/internal/app/mcp_media.go
2070
+ @@ -1,6 +1,7 @@
2071
+ package app
2072
+
2073
+ import (
2074
+ + "context"
2075
+ "encoding/base64"
2076
+ "encoding/json"
2077
+ "fmt"
2078
+ @@ -71,7 +72,7 @@ func mcpGenerateMedia(model, prompt string, refs []string) (map[string]interface
2079
+ }
2080
+ images = append(images, img)
2081
+ }
2082
+ - _, _, res, err := callGemini(prompt, prompt, mc, nil, images, nil, nil)
2083
+ + _, _, res, err := callGemini(context.Background(), prompt, promptCtx{Latest: prompt}, mc, nil, images, nil, nil)
2084
+ if err != nil {
2085
+ return nil, err
2086
+ }
1661
2087
  diff --git a/internal/app/media.go b/internal/app/media.go
1662
- index 9844778..03610f9 100644
2088
+ index 23d09b8..060df77 100644
1663
2089
  --- a/internal/app/media.go
1664
2090
  +++ b/internal/app/media.go
1665
- @@ -505,6 +505,7 @@ func mediaGetOnce(rawURL string, headers map[string]string, proxyURL string) (in
2091
+ @@ -748,6 +748,7 @@ func mediaGetOnce(rawURL string, headers map[string]string, proxyURL string) (in
1666
2092
  if err != nil {
1667
2093
  return 0, nil, nil, err
1668
2094
  }
@@ -1868,7 +2294,7 @@ index 376171f..87b91fe 100644
1868
2294
  // 返回 (mode, forcedName):mode ∈ {"auto","none","required"};
1869
2295
  // forcedName 非空表示客户端点名了某个函数。
1870
2296
  diff --git a/internal/app/server.go b/internal/app/server.go
1871
- index c3a7df1..eb02909 100644
2297
+ index b451d12..b0dbbd3 100644
1872
2298
  --- a/internal/app/server.go
1873
2299
  +++ b/internal/app/server.go
1874
2300
  @@ -1,6 +1,7 @@
@@ -1877,18 +2303,26 @@ index c3a7df1..eb02909 100644
1877
2303
  import (
1878
2304
  + "context"
1879
2305
  "encoding/json"
2306
+ "errors"
1880
2307
  "fmt"
1881
- "io"
1882
- @@ -9,7 +10,7 @@ import (
2308
+ @@ -10,7 +11,7 @@ import (
1883
2309
  "time"
1884
2310
  )
1885
2311
 
1886
- -const Version = "4.22.0"
1887
- +const Version = "4.22.0-argon.1"
2312
+ -const Version = "4.26.0"
2313
+ +const Version = "4.26.0-magpie.1"
1888
2314
 
1889
2315
  func writeJSON(w http.ResponseWriter, status int, data interface{}) {
1890
2316
  body, _ := json.Marshal(data)
1891
- @@ -129,9 +130,9 @@ func rejectUnsupported(req map[string]interface{}, messages []map[string]interfa
2317
+ @@ -43,6 +44,7 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
2318
+ writeJSON(w, 200, map[string]interface{}{
2319
+ "status": "ok",
2320
+ "version": Version,
2321
+ "models": modelNames,
2322
+ + "capabilities": map[string]bool{"account_proxy_binding": true},
2323
+ })
2324
+ }
2325
+ @@ -130,9 +131,9 @@ func rejectUnsupported(req map[string]interface{}, messages []map[string]interfa
1892
2326
  return nil
1893
2327
  }
1894
2328
 
@@ -1900,7 +2334,7 @@ index c3a7df1..eb02909 100644
1900
2334
  if err != nil {
1901
2335
  // res 非 nil:失败时它只带归属(哪个号 / 哪个出口),给 recordRequest 用
1902
2336
  return "", nil, res, err
1903
- @@ -267,7 +268,7 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
2337
+ @@ -268,7 +269,7 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
1904
2338
  return
1905
2339
  }
1906
2340
 
@@ -1909,7 +2343,7 @@ index c3a7df1..eb02909 100644
1909
2343
  if strings.TrimSpace(prompt) == "" && len(images) == 0 {
1910
2344
  writeJSON(w, 400, map[string]interface{}{"error": map[string]string{"message": "empty prompt"}})
1911
2345
  return
1912
- @@ -304,11 +305,14 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
2346
+ @@ -305,11 +306,14 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
1913
2347
  var res *StreamResult
1914
2348
  if rtCfg().MultiTurn && len(images) == 0 && modelCfg.Tool == 0 {
1915
2349
  // 多轮:按历史前缀识别续接,命中就只发新消息、历史留服务端。带 tools 也走这条。
@@ -1923,10 +2357,10 @@ index c3a7df1..eb02909 100644
1923
2357
  + if clientGone(r, "chat.completions", modelName, prompt, res, stream) {
1924
2358
  + return
1925
2359
  + }
1926
- recordRequest("chat.completions", modelName, prompt, "", res, 502, err.Error(), stream)
1927
- if sse != nil && sse.Started() {
1928
- sse.Fail(err) // 已经开流,HTTP 状态码改不了了
1929
- @@ -390,6 +394,21 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
2360
+ mde, downgraded := err.(*ModelDowngradedError)
2361
+ status := 502
2362
+ if downgraded {
2363
+ @@ -400,6 +404,21 @@ func handleChatCompletions(w http.ResponseWriter, r *http.Request) {
1930
2364
  })
1931
2365
  }
1932
2366
 
@@ -1948,7 +2382,7 @@ index c3a7df1..eb02909 100644
1948
2382
  // usageOf 是 buildUsageWithReasoning 的便捷包装,res 可能为 nil。
1949
2383
  func usageOf(prompt, text string, res *StreamResult) map[string]int {
1950
2384
  r := ""
1951
- @@ -565,7 +584,7 @@ func handleResponses(w http.ResponseWriter, r *http.Request) {
2385
+ @@ -575,7 +594,7 @@ func handleResponses(w http.ResponseWriter, r *http.Request) {
1952
2386
  return
1953
2387
  }
1954
2388
 
@@ -1957,7 +2391,7 @@ index c3a7df1..eb02909 100644
1957
2391
  if strings.TrimSpace(prompt) == "" && len(images) == 0 {
1958
2392
  writeJSON(w, 400, map[string]interface{}{"error": map[string]string{"message": "empty input"}})
1959
2393
  return
1960
- @@ -659,11 +678,14 @@ func handleResponses(w http.ResponseWriter, r *http.Request) {
2394
+ @@ -669,11 +688,14 @@ func handleResponses(w http.ResponseWriter, r *http.Request) {
1961
2395
  var toolCalls []ToolCall
1962
2396
  var res *StreamResult
1963
2397
  if rtCfg().MultiTurn && len(images) == 0 && modelCfg.Tool == 0 {
@@ -1971,9 +2405,158 @@ index c3a7df1..eb02909 100644
1971
2405
  + if clientGone(r, "responses", modelName, prompt, res, stream) {
1972
2406
  + return
1973
2407
  + }
1974
- recordRequest("responses", modelName, prompt, "", res, 502, err.Error(), stream)
1975
- if stream {
1976
- writeEvent("response.failed", map[string]interface{}{
2408
+ mde, downgraded := err.(*ModelDowngradedError)
2409
+ status := 502
2410
+ if downgraded {
2411
+ diff --git a/internal/app/strict_model.go b/internal/app/strict_model.go
2412
+ index ecc17ac..88267c5 100644
2413
+ --- a/internal/app/strict_model.go
2414
+ +++ b/internal/app/strict_model.go
2415
+ @@ -150,7 +150,8 @@ func strictLineCheck(mc ModelConfig, accountID func() int64) func(line string) e
2416
+ var modelNameFoldRe = regexp.MustCompile(`[^a-z0-9.]+`)
2417
+
2418
+ func foldModelName(s string) string {
2419
+ - return strings.TrimSpace(modelNameFoldRe.ReplaceAllString(strings.ToLower(s), " "))
2420
+ + folded := strings.TrimSpace(modelNameFoldRe.ReplaceAllString(strings.ToLower(s), " "))
2421
+ + return strings.TrimPrefix(folded, "gemini ")
2422
+ }
2423
+
2424
+ // modelDowngraded 判断服务端自报的显示名是不是请求的那个模型。
2425
+ diff --git a/internal/app/tokenizer.go b/internal/app/tokenizer.go
2426
+ index 634f3b7..399057e 100644
2427
+ --- a/internal/app/tokenizer.go
2428
+ +++ b/internal/app/tokenizer.go
2429
+ @@ -1,9 +1,17 @@
2430
+ package app
2431
+
2432
+ import (
2433
+ + "crypto/sha1"
2434
+ + "encoding/base64"
2435
+ "fmt"
2436
+ + "io"
2437
+ + "net/http"
2438
+ "os"
2439
+ + "path/filepath"
2440
+ + "strconv"
2441
+ + "strings"
2442
+ "sync"
2443
+ + "time"
2444
+
2445
+ "github.com/pkoukk/tiktoken-go"
2446
+ )
2447
+ @@ -13,16 +21,108 @@ import (
2448
+ //
2449
+ // 加载一次到内存(~5MB),后续 Encode 每次 ~微秒级。
2450
+ var (
2451
+ - tokenizer *tiktoken.Tiktoken
2452
+ - tokenizerOnce sync.Once
2453
+ - tokenizerOK bool
2454
+ + tokenizer *tiktoken.Tiktoken
2455
+ + tokenizerOnce sync.Once
2456
+ + tokenizerOK bool
2457
+ + tokenizerHTTPTimeout = 2 * time.Second
2458
+ )
2459
+
2460
+ +type boundedBpeLoader struct{}
2461
+ +
2462
+ +func tokenizerCacheDir() string {
2463
+ + if d := strings.TrimSpace(os.Getenv("TIKTOKEN_CACHE_DIR")); d != "" {
2464
+ + return d
2465
+ + }
2466
+ + if d := strings.TrimSpace(os.Getenv("DATA_GYM_CACHE_DIR")); d != "" {
2467
+ + return d
2468
+ + }
2469
+ + return filepath.Join(os.TempDir(), "data-gym-cache")
2470
+ +}
2471
+ +
2472
+ +func parseTiktokenBpe(contents []byte) (map[string]int, error) {
2473
+ + bpeRanks := make(map[string]int)
2474
+ + for _, line := range strings.Split(string(contents), "\n") {
2475
+ + line = strings.TrimSpace(line)
2476
+ + if line == "" {
2477
+ + continue
2478
+ + }
2479
+ + parts := strings.Split(line, " ")
2480
+ + if len(parts) != 2 {
2481
+ + return nil, fmt.Errorf("invalid tiktoken bpe line")
2482
+ + }
2483
+ + token, err := base64.StdEncoding.DecodeString(parts[0])
2484
+ + if err != nil {
2485
+ + return nil, err
2486
+ + }
2487
+ + rank, err := strconv.Atoi(parts[1])
2488
+ + if err != nil {
2489
+ + return nil, err
2490
+ + }
2491
+ + bpeRanks[string(token)] = rank
2492
+ + }
2493
+ + if len(bpeRanks) == 0 {
2494
+ + return nil, fmt.Errorf("empty tiktoken bpe file")
2495
+ + }
2496
+ + return bpeRanks, nil
2497
+ +}
2498
+ +
2499
+ +func (l *boundedBpeLoader) LoadTiktokenBpe(tiktokenBpeFile string) (map[string]int, error) {
2500
+ + if tiktokenBpeFile == "" {
2501
+ + return nil, fmt.Errorf("blobpath cannot be empty")
2502
+ + }
2503
+ + if !strings.HasPrefix(tiktokenBpeFile, "http://") && !strings.HasPrefix(tiktokenBpeFile, "https://") {
2504
+ + contents, err := os.ReadFile(tiktokenBpeFile)
2505
+ + if err != nil {
2506
+ + return nil, err
2507
+ + }
2508
+ + return parseTiktokenBpe(contents)
2509
+ + }
2510
+ +
2511
+ + cacheDir := tokenizerCacheDir()
2512
+ + cacheKey := fmt.Sprintf("%x", sha1.Sum([]byte(tiktokenBpeFile)))
2513
+ + cachePath := filepath.Join(cacheDir, cacheKey)
2514
+ + if contents, err := os.ReadFile(cachePath); err == nil {
2515
+ + if ranks, err := parseTiktokenBpe(contents); err == nil {
2516
+ + return ranks, nil
2517
+ + }
2518
+ + }
2519
+ +
2520
+ + client := &http.Client{Timeout: tokenizerHTTPTimeout}
2521
+ + resp, err := client.Get(tiktokenBpeFile)
2522
+ + if err != nil {
2523
+ + return nil, err
2524
+ + }
2525
+ + defer resp.Body.Close()
2526
+ + if resp.StatusCode != http.StatusOK {
2527
+ + return nil, fmt.Errorf("unexpected HTTP %d fetching tokenizer", resp.StatusCode)
2528
+ + }
2529
+ + contents, err := io.ReadAll(resp.Body)
2530
+ + if err != nil {
2531
+ + return nil, err
2532
+ + }
2533
+ + ranks, err := parseTiktokenBpe(contents)
2534
+ + if err != nil {
2535
+ + return nil, err
2536
+ + }
2537
+ +
2538
+ + if err := os.MkdirAll(cacheDir, 0o755); err == nil {
2539
+ + tmp := fmt.Sprintf("%s.%d.tmp", cachePath, time.Now().UnixNano())
2540
+ + if err := os.WriteFile(tmp, contents, 0o644); err == nil {
2541
+ + if err := os.Rename(tmp, cachePath); err != nil {
2542
+ + _ = os.Remove(tmp)
2543
+ + }
2544
+ + }
2545
+ + }
2546
+ + return ranks, nil
2547
+ +}
2548
+ +
2549
+ func initTokenizer() {
2550
+ tokenizerOnce.Do(func() {
2551
+ // tiktoken-go 第一次加载会从远端下 cl100k_base.tiktoken (~3MB),
2552
+ // 缓存到 ${TIKTOKEN_CACHE_DIR} 或 ${HOME}/.cache/tiktoken。
2553
+ - // docker 镜像里建议预先 docker build 时缓存。
2554
+ + // 默认 loader 使用无超时的 http.DefaultClient,黑洞代理下会卡住启动;
2555
+ + // 这里改用带超时的 boundedBpeLoader,超时后立即回退到 chars/4。
2556
+ + tiktoken.SetBpeLoader(&boundedBpeLoader{})
2557
+ t, err := tiktoken.GetEncoding("cl100k_base")
2558
+ if err != nil {
2559
+ fmt.Fprintf(os.Stderr, "[tokenizer] init failed (will fall back to chars/4): %v\n", err)
1977
2560
  diff --git a/internal/app/upload.go b/internal/app/upload.go
1978
2561
  index 7747a72..2753f93 100644
1979
2562
  --- a/internal/app/upload.go
@@ -2045,8 +2628,29 @@ index 7747a72..2753f93 100644
2045
2628
  for k, v := range headers {
2046
2629
  req.Header.Set(k, v)
2047
2630
  }
2631
+ diff --git a/internal/app/video_cooldown_test.go b/internal/app/video_cooldown_test.go
2632
+ index 8eda49e..cf64828 100644
2633
+ --- a/internal/app/video_cooldown_test.go
2634
+ +++ b/internal/app/video_cooldown_test.go
2635
+ @@ -2,6 +2,7 @@ package app
2636
+
2637
+ import (
2638
+ "bytes"
2639
+ + "context"
2640
+ "encoding/json"
2641
+ "errors"
2642
+ "fmt"
2643
+ @@ -24,7 +25,7 @@ func withVideoAccounts(t *testing.T, n int, call func(mc ModelConfig) (*StreamRe
2644
+ ids = append(ids, id)
2645
+ }
2646
+ prevCall := videoCall
2647
+ - videoCall = func(_, _ string, mc ModelConfig, _ []map[string]interface{}, _ []pendingUpload, _, _ func(string)) (string, []ToolCall, *StreamResult, error) {
2648
+ + videoCall = func(_ context.Context, _ string, _ promptCtx, mc ModelConfig, _ []map[string]interface{}, _ []pendingUpload, _, _ func(string)) (string, []ToolCall, *StreamResult, error) {
2649
+ res, err := call(mc)
2650
+ return "", nil, res, err
2651
+ }
2048
2652
  diff --git a/internal/app/videos.go b/internal/app/videos.go
2049
- index 390b580..0365a78 100644
2653
+ index 4ea7ac6..861f72e 100644
2050
2654
  --- a/internal/app/videos.go
2051
2655
  +++ b/internal/app/videos.go
2052
2656
  @@ -10,6 +10,7 @@ package app
@@ -2055,17 +2659,26 @@ index 390b580..0365a78 100644
2055
2659
  import (
2056
2660
  + "context"
2057
2661
  "encoding/json"
2058
- "net/http"
2059
- "strings"
2060
- @@ -105,7 +106,7 @@ func runVideoJob(j *videoJob) {
2061
- finishVideoJob(j, nil, "", err.Error())
2062
- return
2063
- }
2064
- - _, _, res, err := callGemini(j.Prompt, j.Prompt, mc, nil, nil, nil, nil)
2065
- + _, _, res, err := callGemini(context.Background(), j.Prompt, promptCtx{Latest: j.Prompt}, mc, nil, nil, nil, nil)
2066
- if err != nil {
2067
- recordRequest("videos", j.Model, j.Prompt, "", res, 502, err.Error(), false)
2068
- finishVideoJob(j, nil, "", err.Error())
2662
+ "errors"
2663
+ "fmt"
2664
+ @@ -233,7 +234,7 @@ func runVideoJobWith(j *videoJob, images []pendingUpload, pin int64, cont *ConvR
2665
+ // An extension stays on the account and conversation of its parent; an exhausted
2666
+ // account is still remembered so new videos skip it.
2667
+ mc.PinAccountID = pin
2668
+ - _, _, res, err = videoCall(j.Prompt, j.Prompt, mc, nil, images, nil, nil)
2669
+ + _, _, res, err = videoCall(context.Background(), j.Prompt, promptCtx{Latest: j.Prompt}, mc, nil, images, nil, nil)
2670
+ if errors.Is(err, errVideoQuotaUsed) {
2671
+ markVideoExhausted(pin, videoQuotaReset(err))
2672
+ }
2673
+ @@ -283,7 +284,7 @@ func callOnVideoAccount(j *videoJob, mc ModelConfig, images []pendingUpload) (*S
2674
+ }
2675
+ skip[acct.ID] = true
2676
+ mc.PinAccountID = acct.ID
2677
+ - _, _, res, err = videoCall(j.Prompt, j.Prompt, mc, nil, images, nil, nil)
2678
+ + _, _, res, err = videoCall(context.Background(), j.Prompt, promptCtx{Latest: j.Prompt}, mc, nil, images, nil, nil)
2679
+ if err == nil {
2680
+ return res, nil
2681
+ }
2069
2682
  diff --git a/internal/app/vision.go b/internal/app/vision.go
2070
2683
  index b0c9724..b1ca7cb 100644
2071
2684
  --- a/internal/app/vision.go