@jsonstudio/rcc 0.90.109 → 0.90.128
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.
- package/configsamples/config.json +33 -10
- package/configsamples/config.v1.quickstart.sanitized.json +27 -8
- package/configsamples/provider/glm/config.v1.json +1 -1
- package/configsamples/provider/iflow/config.v1.json +22 -3
- package/configsamples/provider/qwen/config.v1.json +5 -1
- package/configsamples/provider/tabglm/config.v1.json +2 -1
- package/dist/build-info.js +2 -2
- package/dist/cli/config/init-provider-catalog.js +11 -5
- package/dist/cli/config/init-provider-catalog.js.map +1 -1
- package/dist/configsamples/config.v1.quickstart.sanitized.json +27 -8
- package/dist/manager/modules/quota/provider-quota-daemon.snapshot.js +3 -2
- package/dist/manager/modules/quota/provider-quota-daemon.snapshot.js.map +1 -1
- package/dist/manager/quota/provider-quota-store.d.ts +2 -0
- package/dist/manager/quota/provider-quota-store.js +59 -1
- package/dist/manager/quota/provider-quota-store.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin/auth-store.d.ts +9 -0
- package/dist/server/runtime/http-server/daemon-admin/auth-store.js +16 -0
- package/dist/server/runtime/http-server/daemon-admin/auth-store.js.map +1 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.js +9 -1
- package/dist/server/runtime/http-server/daemon-admin-routes.js.map +1 -1
- package/dist/server/runtime/http-server/middleware.js +19 -0
- package/dist/server/runtime/http-server/middleware.js.map +1 -1
- package/dist/server/runtime/http-server/request-executor.js +3 -0
- package/dist/server/runtime/http-server/request-executor.js.map +1 -1
- package/package.json +1 -1
- package/scripts/ci/repo-sanity.mjs +1 -0
- package/scripts/tests/anthropic-responses-roundtrip.mjs +75 -4
|
@@ -13,12 +13,12 @@
|
|
|
13
13
|
"baseURL": "https://open.bigmodel.cn/api/coding/paas/v4",
|
|
14
14
|
"compatibilityProfile": "chat:glm",
|
|
15
15
|
"models": {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
16
|
+
"glm-4.7": {
|
|
17
|
+
"maxTokens": 128000,
|
|
18
|
+
"maxContext": 202752,
|
|
19
|
+
"supportsThinking": true,
|
|
20
|
+
"supportsStreaming": true
|
|
21
|
+
},
|
|
22
22
|
"glm-4.6v": {
|
|
23
23
|
"maxTokens": 128000,
|
|
24
24
|
"maxContext": 200000,
|
|
@@ -47,7 +47,11 @@
|
|
|
47
47
|
"models": {
|
|
48
48
|
"qwen3-coder-plus": {
|
|
49
49
|
"maxTokens": 64000,
|
|
50
|
-
"maxContext":
|
|
50
|
+
"maxContext": 1000000,
|
|
51
|
+
"supportsStreaming": true
|
|
52
|
+
},
|
|
53
|
+
"qwen3.5-plus": {
|
|
54
|
+
"maxContext": 1000000,
|
|
51
55
|
"supportsStreaming": true
|
|
52
56
|
}
|
|
53
57
|
}
|
|
@@ -84,15 +88,31 @@
|
|
|
84
88
|
},
|
|
85
89
|
"models": {
|
|
86
90
|
"tstars2.0": {},
|
|
87
|
-
"qwen3-coder-plus": {
|
|
91
|
+
"qwen3-coder-plus": {
|
|
92
|
+
"maxContext": 1000000
|
|
93
|
+
},
|
|
88
94
|
"qwen3-coder": {},
|
|
95
|
+
"qwen3-coder-next": {
|
|
96
|
+
"maxContext": 262144
|
|
97
|
+
},
|
|
89
98
|
"qwen3-max": {},
|
|
99
|
+
"qwen3-max-2026-01-23": {
|
|
100
|
+
"maxContext": 262144
|
|
101
|
+
},
|
|
90
102
|
"qwen3-vl-plus": {},
|
|
91
103
|
"qwen3-max-preview": {},
|
|
92
104
|
"kimi-k2-0905": {},
|
|
93
105
|
"glm-4.6": {},
|
|
94
|
-
"glm-4.7": {
|
|
106
|
+
"glm-4.7": {
|
|
107
|
+
"maxContext": 202752
|
|
108
|
+
},
|
|
109
|
+
"glm-5": {
|
|
110
|
+
"maxContext": 202752
|
|
111
|
+
},
|
|
95
112
|
"kimi-k2": {},
|
|
113
|
+
"kimi-k2.5": {
|
|
114
|
+
"maxContext": 262144
|
|
115
|
+
},
|
|
96
116
|
"kimi-k2-thinking": {},
|
|
97
117
|
"deepseek-v3.2": {},
|
|
98
118
|
"deepseek-v3.1": {},
|
|
@@ -103,7 +123,10 @@
|
|
|
103
123
|
"qwen3-235b-a22b-instruct": {},
|
|
104
124
|
"qwen3-235b": {},
|
|
105
125
|
"minimax-m2": {},
|
|
106
|
-
"minimax-m2.1": {}
|
|
126
|
+
"minimax-m2.1": {},
|
|
127
|
+
"minimax-m2.5": {
|
|
128
|
+
"maxContext": 204800
|
|
129
|
+
}
|
|
107
130
|
}
|
|
108
131
|
},
|
|
109
132
|
"tab": {
|
|
@@ -623,7 +623,7 @@
|
|
|
623
623
|
"models": {
|
|
624
624
|
"glm-4.7": {
|
|
625
625
|
"maxTokens": 128000,
|
|
626
|
-
"maxContext":
|
|
626
|
+
"maxContext": 202752,
|
|
627
627
|
"supportsThinking": true,
|
|
628
628
|
"supportsStreaming": true
|
|
629
629
|
},
|
|
@@ -696,18 +696,30 @@
|
|
|
696
696
|
},
|
|
697
697
|
"models": {
|
|
698
698
|
"tstars2.0": {},
|
|
699
|
-
"qwen3-coder-plus": {
|
|
699
|
+
"qwen3-coder-plus": {
|
|
700
|
+
"maxContextTokens": 1000000
|
|
701
|
+
},
|
|
700
702
|
"qwen3-coder": {},
|
|
703
|
+
"qwen3-coder-next": {
|
|
704
|
+
"maxContextTokens": 262144
|
|
705
|
+
},
|
|
701
706
|
"qwen3-max": {},
|
|
707
|
+
"qwen3-max-2026-01-23": {
|
|
708
|
+
"maxContextTokens": 262144
|
|
709
|
+
},
|
|
702
710
|
"qwen3-vl-plus": {},
|
|
703
711
|
"qwen3-max-preview": {},
|
|
704
712
|
"kimi-k2.5": {
|
|
705
|
-
"maxContextTokens":
|
|
713
|
+
"maxContextTokens": 262144
|
|
706
714
|
},
|
|
707
715
|
"kimi-k2-0905": {},
|
|
708
716
|
"glm-4.6": {},
|
|
709
|
-
"glm-4.7": {
|
|
710
|
-
|
|
717
|
+
"glm-4.7": {
|
|
718
|
+
"maxContextTokens": 202752
|
|
719
|
+
},
|
|
720
|
+
"glm-5": {
|
|
721
|
+
"maxContextTokens": 202752
|
|
722
|
+
},
|
|
711
723
|
"backup": {},
|
|
712
724
|
"kimi-k2-thinking": {},
|
|
713
725
|
"deepseek-v3.2": {},
|
|
@@ -720,6 +732,9 @@
|
|
|
720
732
|
"qwen3-235b": {},
|
|
721
733
|
"minimax-m2": {},
|
|
722
734
|
"minimax-m2.1": {},
|
|
735
|
+
"minimax-m2.5": {
|
|
736
|
+
"maxContextTokens": 204800
|
|
737
|
+
},
|
|
723
738
|
"iFlow-ROME-30BA3B": {}
|
|
724
739
|
},
|
|
725
740
|
"aliases": {
|
|
@@ -878,7 +893,11 @@
|
|
|
878
893
|
"models": {
|
|
879
894
|
"qwen3-coder-plus": {
|
|
880
895
|
"maxTokens": 64000,
|
|
881
|
-
"maxContext":
|
|
896
|
+
"maxContext": 1000000,
|
|
897
|
+
"supportsStreaming": true
|
|
898
|
+
},
|
|
899
|
+
"qwen3.5-plus": {
|
|
900
|
+
"maxContext": 1000000,
|
|
882
901
|
"supportsStreaming": true
|
|
883
902
|
},
|
|
884
903
|
"qwen3-coder": {
|
|
@@ -918,13 +937,13 @@
|
|
|
918
937
|
"models": {
|
|
919
938
|
"glm-4.7": {
|
|
920
939
|
"maxTokens": 128000,
|
|
921
|
-
"maxContext":
|
|
940
|
+
"maxContext": 202752,
|
|
922
941
|
"supportsThinking": true,
|
|
923
942
|
"supportsStreaming": true
|
|
924
943
|
},
|
|
925
944
|
"glm-5": {
|
|
926
945
|
"maxTokens": 128000,
|
|
927
|
-
"maxContext":
|
|
946
|
+
"maxContext": 202752,
|
|
928
947
|
"supportsThinking": true,
|
|
929
948
|
"supportsStreaming": true
|
|
930
949
|
},
|
|
@@ -18,15 +18,31 @@
|
|
|
18
18
|
},
|
|
19
19
|
"models": {
|
|
20
20
|
"tstars2.0": {},
|
|
21
|
-
"qwen3-coder-plus": {
|
|
21
|
+
"qwen3-coder-plus": {
|
|
22
|
+
"maxContext": 1000000
|
|
23
|
+
},
|
|
22
24
|
"qwen3-coder": {},
|
|
25
|
+
"qwen3-coder-next": {
|
|
26
|
+
"maxContext": 262144
|
|
27
|
+
},
|
|
23
28
|
"qwen3-max": {},
|
|
29
|
+
"qwen3-max-2026-01-23": {
|
|
30
|
+
"maxContext": 262144
|
|
31
|
+
},
|
|
24
32
|
"qwen3-vl-plus": {},
|
|
25
33
|
"qwen3-max-preview": {},
|
|
26
34
|
"kimi-k2-0905": {},
|
|
27
35
|
"glm-4.6": {},
|
|
28
|
-
"glm-4.7": {
|
|
36
|
+
"glm-4.7": {
|
|
37
|
+
"maxContext": 202752
|
|
38
|
+
},
|
|
39
|
+
"glm-5": {
|
|
40
|
+
"maxContext": 202752
|
|
41
|
+
},
|
|
29
42
|
"kimi-k2": {},
|
|
43
|
+
"kimi-k2.5": {
|
|
44
|
+
"maxContext": 262144
|
|
45
|
+
},
|
|
30
46
|
"deepseek-v3.2": {},
|
|
31
47
|
"deepseek-v3.1": {},
|
|
32
48
|
"deepseek-r1": {},
|
|
@@ -36,7 +52,10 @@
|
|
|
36
52
|
"qwen3-235b-a22b-instruct": {},
|
|
37
53
|
"qwen3-235b": {},
|
|
38
54
|
"minimax-m2": {},
|
|
39
|
-
"minimax-m2.1": {}
|
|
55
|
+
"minimax-m2.1": {},
|
|
56
|
+
"minimax-m2.5": {
|
|
57
|
+
"maxContext": 204800
|
|
58
|
+
}
|
|
40
59
|
},
|
|
41
60
|
"compatibilityProfile": "chat:iflow"
|
|
42
61
|
}
|
package/dist/build-info.js
CHANGED
|
@@ -90,7 +90,7 @@ export function getInitProviderCatalog() {
|
|
|
90
90
|
compatibilityProfile: 'chat:glm',
|
|
91
91
|
auth: apikeyAuthEnv('GLM_API_KEY'),
|
|
92
92
|
models: {
|
|
93
|
-
'glm-4.7': { supportsStreaming: true },
|
|
93
|
+
'glm-4.7': { supportsStreaming: true, maxContext: 202752 },
|
|
94
94
|
'glm-4.6': { supportsStreaming: true }
|
|
95
95
|
}
|
|
96
96
|
},
|
|
@@ -177,8 +177,8 @@ export function getInitProviderCatalog() {
|
|
|
177
177
|
tokenFile: 'default'
|
|
178
178
|
},
|
|
179
179
|
models: {
|
|
180
|
-
'qwen3-coder-plus': { supportsStreaming: true },
|
|
181
|
-
'qwen3.5-plus': { supportsStreaming: true },
|
|
180
|
+
'qwen3-coder-plus': { supportsStreaming: true, maxContext: 1000000 },
|
|
181
|
+
'qwen3.5-plus': { supportsStreaming: true, maxContext: 1000000 },
|
|
182
182
|
'qwen3-vl-plus': { supportsStreaming: true }
|
|
183
183
|
}
|
|
184
184
|
},
|
|
@@ -199,8 +199,14 @@ export function getInitProviderCatalog() {
|
|
|
199
199
|
cookieFile: '~/.routecodex/auth/iflow-work.cookie'
|
|
200
200
|
},
|
|
201
201
|
models: {
|
|
202
|
-
'qwen3-coder-plus': { supportsStreaming: true },
|
|
203
|
-
'qwen3-
|
|
202
|
+
'qwen3-coder-plus': { supportsStreaming: true, maxContext: 1000000 },
|
|
203
|
+
'qwen3-coder-next': { supportsStreaming: true, maxContext: 262144 },
|
|
204
|
+
'qwen3-max-2026-01-23': { supportsStreaming: true, maxContext: 262144 },
|
|
205
|
+
'qwen3-vl-plus': { supportsStreaming: true },
|
|
206
|
+
'kimi-k2.5': { supportsStreaming: true, maxContext: 262144 },
|
|
207
|
+
'glm-4.7': { supportsStreaming: true, maxContext: 202752 },
|
|
208
|
+
'glm-5': { supportsStreaming: true, maxContext: 202752 },
|
|
209
|
+
'minimax-m2.5': { supportsStreaming: true, maxContext: 204800 }
|
|
204
210
|
}
|
|
205
211
|
},
|
|
206
212
|
defaultModel: 'qwen3-coder-plus'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-provider-catalog.js","sourceRoot":"","sources":["../../../src/cli/config/init-provider-catalog.ts"],"names":[],"mappings":"AAQA,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,MAAM,EAAE,MAAM,MAAM,GAAG;KACxB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO;QACL;YACE,EAAE,EAAE,QAAQ;YACZ,KAAK,EAAE,eAAe;YACtB,WAAW,EAAE,mDAAmD;YAChE,QAAQ,EAAE;gBACR,EAAE,EAAE,QAAQ;gBACZ,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,IAAI,EAAE,aAAa,CAAC,gBAAgB,CAAC;gBACrC,MAAM,EAAE;oBACN,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;oBACtC,eAAe,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBAC7C;aACF;YACD,YAAY,EAAE,SAAS;SACxB;QACD;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,iBAAiB;YACxB,WAAW,EAAE,sDAAsD;YACnE,QAAQ,EAAE;gBACR,EAAE,EAAE,KAAK;gBACT,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,+BAA+B;gBACxC,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;gBAClC,MAAM,EAAE;oBACN,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;oBACtC,eAAe,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBAC7C;gBACD,SAAS,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE;gBACnD,MAAM,EAAE,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;aAC/C;YACD,YAAY,EAAE,SAAS;SACxB;QACD;YACE,EAAE,EAAE,cAAc;YAClB,KAAK,EAAE,wBAAwB;YAC/B,WAAW,EAAE,iEAAiE;YAC9E,QAAQ,EAAE;gBACR,EAAE,EAAE,cAAc;gBAClB,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,2BAA2B;gBACpC,oBAAoB,EAAE,mBAAmB;gBACzC,IAAI,EAAE;oBACJ,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE;wBACP;4BACE,KAAK,EAAE,GAAG;4BACV,IAAI,EAAE,kBAAkB;4BACxB,SAAS,EAAE,4CAA4C;yBACxD;qBACF;iBACF;gBACD,QAAQ,EAAE;oBACR,kBAAkB,EAAE,IAAI;oBACxB,YAAY,EAAE,MAAM;oBACpB,YAAY,EAAE,KAAK;oBACnB,cAAc,EAAE,CAAC;oBACjB,iBAAiB,EAAE,OAAO;iBAC3B;gBACD,MAAM,EAAE;oBACN,eAAe,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;oBAC5C,mBAAmB,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;oBAChD,sBAAsB,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;oBACnD,0BAA0B,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;iBACxD;aACF;YACD,YAAY,EAAE,eAAe;SAC9B;QACD;YACE,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,2CAA2C;YACxD,QAAQ,EAAE;gBACR,EAAE,EAAE,KAAK;gBACT,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,sCAAsC;gBAC/C,oBAAoB,EAAE,UAAU;gBAChC,IAAI,EAAE,aAAa,CAAC,aAAa,CAAC;gBAClC,MAAM,EAAE;oBACN,SAAS,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"init-provider-catalog.js","sourceRoot":"","sources":["../../../src/cli/config/init-provider-catalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -623,7 +623,7 @@
|
|
|
623
623
|
"models": {
|
|
624
624
|
"glm-4.7": {
|
|
625
625
|
"maxTokens": 128000,
|
|
626
|
-
"maxContext":
|
|
626
|
+
"maxContext": 202752,
|
|
627
627
|
"supportsThinking": true,
|
|
628
628
|
"supportsStreaming": true
|
|
629
629
|
},
|
|
@@ -696,18 +696,30 @@
|
|
|
696
696
|
},
|
|
697
697
|
"models": {
|
|
698
698
|
"tstars2.0": {},
|
|
699
|
-
"qwen3-coder-plus": {
|
|
699
|
+
"qwen3-coder-plus": {
|
|
700
|
+
"maxContextTokens": 1000000
|
|
701
|
+
},
|
|
700
702
|
"qwen3-coder": {},
|
|
703
|
+
"qwen3-coder-next": {
|
|
704
|
+
"maxContextTokens": 262144
|
|
705
|
+
},
|
|
701
706
|
"qwen3-max": {},
|
|
707
|
+
"qwen3-max-2026-01-23": {
|
|
708
|
+
"maxContextTokens": 262144
|
|
709
|
+
},
|
|
702
710
|
"qwen3-vl-plus": {},
|
|
703
711
|
"qwen3-max-preview": {},
|
|
704
712
|
"kimi-k2.5": {
|
|
705
|
-
"maxContextTokens":
|
|
713
|
+
"maxContextTokens": 262144
|
|
706
714
|
},
|
|
707
715
|
"kimi-k2-0905": {},
|
|
708
716
|
"glm-4.6": {},
|
|
709
|
-
"glm-4.7": {
|
|
710
|
-
|
|
717
|
+
"glm-4.7": {
|
|
718
|
+
"maxContextTokens": 202752
|
|
719
|
+
},
|
|
720
|
+
"glm-5": {
|
|
721
|
+
"maxContextTokens": 202752
|
|
722
|
+
},
|
|
711
723
|
"backup": {},
|
|
712
724
|
"kimi-k2-thinking": {},
|
|
713
725
|
"deepseek-v3.2": {},
|
|
@@ -720,6 +732,9 @@
|
|
|
720
732
|
"qwen3-235b": {},
|
|
721
733
|
"minimax-m2": {},
|
|
722
734
|
"minimax-m2.1": {},
|
|
735
|
+
"minimax-m2.5": {
|
|
736
|
+
"maxContextTokens": 204800
|
|
737
|
+
},
|
|
723
738
|
"iFlow-ROME-30BA3B": {}
|
|
724
739
|
},
|
|
725
740
|
"aliases": {
|
|
@@ -878,7 +893,11 @@
|
|
|
878
893
|
"models": {
|
|
879
894
|
"qwen3-coder-plus": {
|
|
880
895
|
"maxTokens": 64000,
|
|
881
|
-
"maxContext":
|
|
896
|
+
"maxContext": 1000000,
|
|
897
|
+
"supportsStreaming": true
|
|
898
|
+
},
|
|
899
|
+
"qwen3.5-plus": {
|
|
900
|
+
"maxContext": 1000000,
|
|
882
901
|
"supportsStreaming": true
|
|
883
902
|
},
|
|
884
903
|
"qwen3-coder": {
|
|
@@ -918,13 +937,13 @@
|
|
|
918
937
|
"models": {
|
|
919
938
|
"glm-4.7": {
|
|
920
939
|
"maxTokens": 128000,
|
|
921
|
-
"maxContext":
|
|
940
|
+
"maxContext": 202752,
|
|
922
941
|
"supportsThinking": true,
|
|
923
942
|
"supportsStreaming": true
|
|
924
943
|
},
|
|
925
944
|
"glm-5": {
|
|
926
945
|
"maxTokens": 128000,
|
|
927
|
-
"maxContext":
|
|
946
|
+
"maxContext": 202752,
|
|
928
947
|
"supportsThinking": true,
|
|
929
948
|
"supportsStreaming": true
|
|
930
949
|
},
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createInitialQuotaState, tickQuotaStateTime } from '../../quota/provider-quota-center.js';
|
|
2
|
-
import { loadProviderQuotaSnapshot, saveProviderQuotaSnapshot } from '../../quota/provider-quota-store.js';
|
|
2
|
+
import { loadProviderQuotaSnapshot, saveProviderQuotaSnapshot, sanitizeQuotaStateForSnapshot } from '../../quota/provider-quota-store.js';
|
|
3
3
|
import { canonicalizeProviderKey, mergeQuotaStates } from './provider-key-normalization.js';
|
|
4
4
|
function normalizeLoadedQuotaState(providerKey, state) {
|
|
5
5
|
const key = typeof providerKey === 'string' && providerKey.trim() ? providerKey.trim() : state.providerKey;
|
|
@@ -14,7 +14,7 @@ function normalizeLoadedQuotaState(providerKey, state) {
|
|
|
14
14
|
? Math.max(typeof state.cooldownUntil === 'number' ? state.cooldownUntil : 0, typeof state.blacklistUntil === 'number' ? state.blacklistUntil : 0) || null
|
|
15
15
|
: state.cooldownUntil;
|
|
16
16
|
const blacklistUntil = state.reason === 'fatal' ? null : state.blacklistUntil;
|
|
17
|
-
|
|
17
|
+
const normalized = {
|
|
18
18
|
...state,
|
|
19
19
|
providerKey: key,
|
|
20
20
|
authType,
|
|
@@ -22,6 +22,7 @@ function normalizeLoadedQuotaState(providerKey, state) {
|
|
|
22
22
|
cooldownUntil,
|
|
23
23
|
blacklistUntil
|
|
24
24
|
};
|
|
25
|
+
return sanitizeQuotaStateForSnapshot(normalized);
|
|
25
26
|
}
|
|
26
27
|
export async function loadProviderQuotaStates(options) {
|
|
27
28
|
const quotaStates = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-quota-daemon.snapshot.js","sourceRoot":"","sources":["../../../../src/manager/modules/quota/provider-quota-daemon.snapshot.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,kBAAkB,EAInB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"provider-quota-daemon.snapshot.js","sourceRoot":"","sources":["../../../../src/manager/modules/quota/provider-quota-daemon.snapshot.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export interface ProviderErrorEventRecord {
|
|
|
12
12
|
message?: string;
|
|
13
13
|
details?: unknown;
|
|
14
14
|
}
|
|
15
|
+
declare function sanitizeQuotaStateForSnapshot(state: QuotaState): QuotaState;
|
|
16
|
+
export { sanitizeQuotaStateForSnapshot };
|
|
15
17
|
export declare function loadProviderQuotaSnapshot(): Promise<ProviderQuotaSnapshot | null>;
|
|
16
18
|
export declare function saveProviderQuotaSnapshot(providers: Record<string, QuotaState>, now?: Date): Promise<void>;
|
|
17
19
|
export declare function appendProviderErrorEvent(event: ProviderErrorEventRecord): Promise<void>;
|
|
@@ -1,6 +1,57 @@
|
|
|
1
1
|
import os from 'node:os';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import fs from 'node:fs/promises';
|
|
4
|
+
function parseHttpStatusFromCode(value) {
|
|
5
|
+
if (typeof value !== 'string') {
|
|
6
|
+
return null;
|
|
7
|
+
}
|
|
8
|
+
const raw = value.trim();
|
|
9
|
+
if (!raw) {
|
|
10
|
+
return null;
|
|
11
|
+
}
|
|
12
|
+
const match = raw.match(/HTTP[_\-\s]?(\d{3})/i) ||
|
|
13
|
+
raw.match(/STATUS[_\-\s]?(\d{3})/i);
|
|
14
|
+
if (!match) {
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
17
|
+
const parsed = Number(match[1]);
|
|
18
|
+
return Number.isFinite(parsed) ? parsed : null;
|
|
19
|
+
}
|
|
20
|
+
function shouldDropCooldownPersistence(state) {
|
|
21
|
+
if (!state || typeof state !== 'object') {
|
|
22
|
+
return false;
|
|
23
|
+
}
|
|
24
|
+
if (state.reason !== 'cooldown') {
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
if (state.lastErrorSeries === 'E5XX') {
|
|
28
|
+
return true;
|
|
29
|
+
}
|
|
30
|
+
if (state.lastErrorSeries === 'EOTHER') {
|
|
31
|
+
const status = parseHttpStatusFromCode(state.lastErrorCode);
|
|
32
|
+
if (typeof status === 'number' && status >= 400 && status < 600 && status !== 429) {
|
|
33
|
+
return true;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return false;
|
|
37
|
+
}
|
|
38
|
+
function sanitizeQuotaStateForSnapshot(state) {
|
|
39
|
+
if (!shouldDropCooldownPersistence(state)) {
|
|
40
|
+
return state;
|
|
41
|
+
}
|
|
42
|
+
return {
|
|
43
|
+
...state,
|
|
44
|
+
inPool: true,
|
|
45
|
+
reason: 'ok',
|
|
46
|
+
cooldownUntil: null,
|
|
47
|
+
lastErrorSeries: null,
|
|
48
|
+
lastErrorCode: null,
|
|
49
|
+
lastErrorAtMs: null,
|
|
50
|
+
consecutiveErrorCount: 0,
|
|
51
|
+
authIssue: null
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
export { sanitizeQuotaStateForSnapshot };
|
|
4
55
|
function resolveQuotaDir() {
|
|
5
56
|
const override = String(process.env.ROUTECODEX_QUOTA_DIR || process.env.RCC_QUOTA_DIR || '').trim();
|
|
6
57
|
if (override) {
|
|
@@ -36,10 +87,17 @@ export async function loadProviderQuotaSnapshot() {
|
|
|
36
87
|
export async function saveProviderQuotaSnapshot(providers, now = new Date()) {
|
|
37
88
|
const dir = resolveQuotaDir();
|
|
38
89
|
const filePath = resolveQuotaSnapshotPath();
|
|
90
|
+
const sanitizedProviders = {};
|
|
91
|
+
for (const [providerKey, state] of Object.entries(providers || {})) {
|
|
92
|
+
if (!state || typeof state !== 'object') {
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
sanitizedProviders[providerKey] = sanitizeQuotaStateForSnapshot(state);
|
|
96
|
+
}
|
|
39
97
|
const payload = {
|
|
40
98
|
version: 1,
|
|
41
99
|
updatedAt: now.toISOString(),
|
|
42
|
-
providers
|
|
100
|
+
providers: sanitizedProviders
|
|
43
101
|
};
|
|
44
102
|
try {
|
|
45
103
|
await fs.mkdir(dir, { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider-quota-store.js","sourceRoot":"","sources":["../../../src/manager/quota/provider-quota-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAkBlC,SAAS,eAAe;IACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpG,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtF,CAAC;IACD,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,wBAAwB;IAC/B,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,qBAAqB,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,mBAAmB;IAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,wBAAwB,CAAC,CAAC;AAChE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB;IAC7C,MAAM,QAAQ,GAAG,wBAAwB,EAAE,CAAC;IAC5C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAA0B,CAAC;QAC5D,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;YACvG,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,SAAqC,EACrC,MAAY,IAAI,IAAI,EAAE;IAEtB,MAAM,GAAG,GAAG,eAAe,EAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,wBAAwB,EAAE,CAAC;IAC5C,MAAM,OAAO,GAA0B;QACrC,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE;QAC5B,SAAS;
|
|
1
|
+
{"version":3,"file":"provider-quota-store.js","sourceRoot":"","sources":["../../../src/manager/quota/provider-quota-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export type DaemonLoginRecordV1 = {
|
|
|
6
6
|
createdAt: number;
|
|
7
7
|
};
|
|
8
8
|
export type DaemonLoginRecord = DaemonLoginRecordV1;
|
|
9
|
+
export declare const DEFAULT_DAEMON_LOGIN_PASSWORD = "webui";
|
|
9
10
|
export declare function resolveDaemonLoginFilePath(): string;
|
|
10
11
|
export declare function readDaemonLoginRecord(): Promise<{
|
|
11
12
|
ok: true;
|
|
@@ -16,3 +17,11 @@ export declare function readDaemonLoginRecord(): Promise<{
|
|
|
16
17
|
}>;
|
|
17
18
|
export declare function writeDaemonLoginRecord(password: string): Promise<DaemonLoginRecordV1>;
|
|
18
19
|
export declare function verifyDaemonPassword(password: string, record: DaemonLoginRecord): Promise<boolean>;
|
|
20
|
+
export declare function ensureDaemonLoginRecord(defaultPassword?: string): Promise<{
|
|
21
|
+
ok: true;
|
|
22
|
+
record: DaemonLoginRecord;
|
|
23
|
+
created: boolean;
|
|
24
|
+
} | {
|
|
25
|
+
ok: false;
|
|
26
|
+
error: Error;
|
|
27
|
+
}>;
|
|
@@ -2,6 +2,7 @@ import crypto from 'node:crypto';
|
|
|
2
2
|
import fs from 'node:fs/promises';
|
|
3
3
|
import os from 'node:os';
|
|
4
4
|
import path from 'node:path';
|
|
5
|
+
export const DEFAULT_DAEMON_LOGIN_PASSWORD = 'webui';
|
|
5
6
|
export function resolveDaemonLoginFilePath() {
|
|
6
7
|
const override = typeof process.env.ROUTECODEX_LOGIN_FILE === 'string' ? process.env.ROUTECODEX_LOGIN_FILE.trim() : '';
|
|
7
8
|
if (override) {
|
|
@@ -86,4 +87,19 @@ export async function verifyDaemonPassword(password, record) {
|
|
|
86
87
|
return false;
|
|
87
88
|
}
|
|
88
89
|
}
|
|
90
|
+
export async function ensureDaemonLoginRecord(defaultPassword = DEFAULT_DAEMON_LOGIN_PASSWORD) {
|
|
91
|
+
const loaded = await readDaemonLoginRecord();
|
|
92
|
+
if (!loaded.ok) {
|
|
93
|
+
return { ok: false, error: loaded.error };
|
|
94
|
+
}
|
|
95
|
+
if (loaded.record) {
|
|
96
|
+
return { ok: true, record: loaded.record, created: false };
|
|
97
|
+
}
|
|
98
|
+
const normalized = typeof defaultPassword === 'string' ? defaultPassword.trim() : '';
|
|
99
|
+
if (!normalized) {
|
|
100
|
+
return { ok: false, error: new Error('default daemon password is empty') };
|
|
101
|
+
}
|
|
102
|
+
const record = await writeDaemonLoginRecord(normalized);
|
|
103
|
+
return { ok: true, record, created: true };
|
|
104
|
+
}
|
|
89
105
|
//# sourceMappingURL=auth-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/daemon-admin/auth-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../../../../src/server/runtime/http-server/daemon-admin/auth-store.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAY7B,MAAM,CAAC,MAAM,6BAA6B,GAAG,OAAO,CAAC;AAErD,MAAM,UAAU,0BAA0B;IACxC,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,GAAG,CAAC,qBAAqB,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACvH,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB;IAGzC,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAC;IAC9C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACpC,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;QAC9C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,iCAAiC,CAAC,EAAE,CAAC;QAC5E,CAAC;QACD,MAAM,GAAG,GAAG,MAAsC,CAAC;QACnD,IACE,GAAG,CAAC,OAAO,KAAK,CAAC;eACd,GAAG,CAAC,GAAG,KAAK,QAAQ;eACpB,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;eAC/B,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAClC,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,sCAAsC,CAAC,EAAE,CAAC;QACjF,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAA0B,EAAE,CAAC;IAC1D,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACnE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;IACzF,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,QAAgB;IAC3D,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzC,MAAM,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzD,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;YAChF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,OAAO,CAAC,UAAoB,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAwB;QAClC,OAAO,EAAE,CAAC;QACV,GAAG,EAAE,QAAQ;QACb,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAChC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAChC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;KACtB,CAAC;IACF,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IACxG,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,QAAgB,EAAE,MAAyB;IACpF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC5D,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;YAC7F,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,GAAG,CAAC,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,OAAO,CAAC,UAAoB,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,kBAA0B,6BAA6B;IAEvD,MAAM,MAAM,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAC7C,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;IAC5C,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC7D,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACrF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,KAAK,CAAC,kCAAkC,CAAC,EAAE,CAAC;IAC7E,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACxD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC7C,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { registerRestartRoutes } from './daemon-admin/restart-handler.js';
|
|
|
7
7
|
import { registerStatsRoutes } from './daemon-admin/stats-handler.js';
|
|
8
8
|
import { registerControlRoutes } from './daemon-admin/control-handler.js';
|
|
9
9
|
import { isDaemonSessionAuthenticated } from './daemon-admin/auth-session.js';
|
|
10
|
+
import { ensureDaemonLoginRecord } from './daemon-admin/auth-store.js';
|
|
10
11
|
export function isLocalRequest(req) {
|
|
11
12
|
const ip = req.socket?.remoteAddress || '';
|
|
12
13
|
return ip === '127.0.0.1' || ip === '::1' || ip === '::ffff:127.0.0.1';
|
|
@@ -59,7 +60,14 @@ export function rejectNonLocalOrUnauthorizedAdmin(req, res) {
|
|
|
59
60
|
export function registerDaemonAdminRoutes(options) {
|
|
60
61
|
const { app } = options;
|
|
61
62
|
const bindHost = typeof options.getServerHost === 'function' ? options.getServerHost() : '';
|
|
62
|
-
|
|
63
|
+
const authRequired = !isLoopbackBindHost(bindHost);
|
|
64
|
+
setDaemonAdminAuthRequiredForApp(app, authRequired);
|
|
65
|
+
if (authRequired) {
|
|
66
|
+
void ensureDaemonLoginRecord().catch((error) => {
|
|
67
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
68
|
+
console.warn('[daemon-admin] failed to ensure default login password', message);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
63
71
|
// Daemon admin password auth (setup/login/logout/status)
|
|
64
72
|
registerDaemonAuthRoutes(app);
|
|
65
73
|
// Daemon / manager 状态
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-admin-routes.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/daemon-admin-routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-admin-routes.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/daemon-admin-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,6 +103,19 @@ function shouldTraceSessionScope(req) {
|
|
|
103
103
|
hasTurnMetadata: hasCodexTurnMetadata
|
|
104
104
|
});
|
|
105
105
|
}
|
|
106
|
+
function isRequestAbortedError(error) {
|
|
107
|
+
if (!error || typeof error !== 'object') {
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
const err = error;
|
|
111
|
+
const type = typeof err.type === 'string' ? err.type.toLowerCase() : '';
|
|
112
|
+
const code = typeof err.code === 'string' ? err.code.toUpperCase() : '';
|
|
113
|
+
const message = typeof err.message === 'string' ? err.message.toLowerCase() : '';
|
|
114
|
+
const name = typeof err.name === 'string' ? err.name : '';
|
|
115
|
+
return (type === 'request.aborted'
|
|
116
|
+
|| code === 'ECONNABORTED'
|
|
117
|
+
|| (name === 'BadRequestError' && message.includes('request aborted')));
|
|
118
|
+
}
|
|
106
119
|
function logSessionScopeParse(args) {
|
|
107
120
|
if (!shouldTraceSessionScope(args.req)) {
|
|
108
121
|
return;
|
|
@@ -212,6 +225,12 @@ export function registerDefaultMiddleware(app) {
|
|
|
212
225
|
try {
|
|
213
226
|
if (typeof express.json === 'function') {
|
|
214
227
|
app.use(express.json({ limit: '10mb' }));
|
|
228
|
+
app.use((error, _req, _res, next) => {
|
|
229
|
+
if (isRequestAbortedError(error)) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
next(error);
|
|
233
|
+
});
|
|
215
234
|
console.log('[RouteCodexHttpServer] Middleware: express.json enabled');
|
|
216
235
|
return;
|
|
217
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/middleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,9 @@ export class HubRequestExecutor {
|
|
|
55
55
|
let forcedRouteHint;
|
|
56
56
|
while (attempt < maxAttempts) {
|
|
57
57
|
attempt += 1;
|
|
58
|
+
// Ensure each attempt starts from the base requestId so pipeline snapshots
|
|
59
|
+
// don't inherit a provider-specific id from a previous attempt.
|
|
60
|
+
input.requestId = providerRequestId;
|
|
58
61
|
if (originalRequestSnapshot && typeof originalRequestSnapshot === 'object') {
|
|
59
62
|
const cloned = cloneRequestPayload(originalRequestSnapshot) ??
|
|
60
63
|
{ ...originalRequestSnapshot };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-executor.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/request-executor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,8DAA8D,CAAC;AAE7G,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,0BAA0B,EAC1B,4BAA4B,EAC5B,sBAAsB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,+BAA+B,IAAI,iCAAiC,EACrE,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE3E,sCAAsC;AACtC,OAAO,EACL,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,0BAA0B,EAC1B,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAEN,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAEL,8BAA8B,EAC9B,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,wBAAwB,EACxB,8BAA8B,EAC9B,wCAAwC,EACxC,yBAAyB,EACzB,qCAAqC,EACrC,mCAAmC,EACpC,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,4BAA4B,EAC5B,8BAA8B,EAC9B,yBAAyB,EACzB,0BAA0B,EAC3B,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAC;AACxF,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAgBlE,MAAM,6BAA6B,GAAG,CAAC,CAAC;AAIxC,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,IAAyB;QAAzB,SAAI,GAAJ,IAAI,CAAqB;IAAI,CAAC;IAE3D,KAAK,CAAC,OAAO,CAAC,KAA6B;QACzC,+EAA+E;QAC/E,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACpC,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAC/B,MAAM,aAAa,GAAG,CAAC,OAAmD,EAAE,EAAE;YAC5E,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC1D,kBAAkB,GAAG,IAAI,CAAC;QAC5B,CAAC,CAAC;QACF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAChE,MAAM,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACpD,8BAA8B,CAAC,eAAe,CAAC,CAAC;YAChD,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;YAChF,MAAM,iBAAiB,GAAG,KAAK,CAAC,SAAS,CAAC;YAC1C,MAAM,eAAe,GAAG,sBAAsB,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC;YAEnF,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,EAAE;gBACnD,QAAQ,EAAE,KAAK,CAAC,aAAa;gBAC7B,MAAM,EAAE,eAAe,CAAC,MAAM,KAAK,IAAI;aACxC,CAAC,CAAC;YAEH,MAAM,0BAA0B,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC,CAAC;YAE9E,MAAM,aAAa,GAAG,KAAK,CAAC;YAC5B,IAAI,eAAyC,CAAC;YAC9C,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;YAC/C,IAAI,WAAW,GAAG,0BAA0B,EAAE,CAAC;YAC/C,MAAM,uBAAuB,GAAG,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChE,IAAI,OAAO,GAAG,CAAC,CAAC;YAChB,IAAI,SAAkB,CAAC;YACvB,IAAI,gBAAgB,GAAoB,IAAI,CAAC;YAC7C,IAAI,sBAAsB,GAAkC,IAAI,CAAC;YACjE,IAAI,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;YAC7C,IAAI,eAAmC,CAAC;YAExC,OAAO,OAAO,GAAG,WAAW,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC,CAAC;gBACb,IAAI,uBAAuB,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE,CAAC;oBAC3E,MAAM,MAAM,GACV,mBAAmB,CAAC,uBAAuB,CAAC;wBAC3C,EAAE,GAAI,uBAAmD,EAA8B,CAAC;oBAC3F,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC;gBACtB,CAAC;gBACD,MAAM,kBAAkB,GAAG,0BAA0B,CAAC,eAAe,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBACtG,IAAI,eAAe,EAAE,CAAC;oBACpB,kBAAkB,CAAC,SAAS,GAAG,eAAe,CAAC;gBACjD,CAAC;gBACD,MAAM,uBAAuB,GAC3B,kBAAkB,CAAC,kBAAkB,EAAE,aAAa,CAAC,IAAI,oBAAoB,CAAC;gBAChF,IAAI,uBAAuB,EAAE,CAAC;oBAC5B,kBAAkB,CAAC,aAAa,GAAG,uBAAuB,CAAC;gBAC7D,CAAC;gBACD,kBAAkB,CAAC,eAAe,GAAG,eAAe,CAAC;gBACrD,4BAA4B,CAAC,kBAAkB,EAAE,sBAAsB,CAAC,CAAC;gBACzE,IAAI,CAAC,QAAQ,CAAC,GAAG,aAAa,QAAQ,EAAE,iBAAiB,EAAE;oBACzD,QAAQ,EAAE,KAAK,CAAC,aAAa;oBAC7B,MAAM,EAAE,kBAAkB,CAAC,MAAM;oBACjC,OAAO;iBACR,CAAC,CAAC;gBACH,IAAI,cAA0D,CAAC;gBAC/D,IAAI,CAAC;oBACH,cAAc,GAAG,MAAM,cAAc,CAAC,WAAW,EAAE,KAAK,EAAE,kBAAkB,CAAC,CAAC;gBAChF,CAAC;gBAAC,OAAO,aAAa,EAAE,CAAC;oBACvB,IAAI,4BAA4B,CAAC,aAAa,CAAC,EAAE,CAAC;wBAChD,MAAM,cAAc,GAAG,yBAAyB,CAAC,aAAa,CAAC,CAAC;wBAChE,IACE,cAAc;4BACd,OAAO,GAAG,WAAW;4BACrB,wBAAwB,IAAI,cAAc,EAC1C,CAAC;4BACD,IAAI,CAAC,QAAQ,CAAC,mCAAmC,EAAE,iBAAiB,EAAE;gCACpE,OAAO;gCACP,MAAM,EAAE,cAAc;gCACtB,YAAY,EAAE,wBAAwB;gCACtC,MAAM,EAAE,4BAA4B;6BACrC,CAAC,CAAC;4BACH,wBAAwB,IAAI,cAAc,CAAC;4BAC3C,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;4BACpE,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;4BACnC,SAAS;wBACX,CAAC;wBACD,IAAI,SAAS,EAAE,CAAC;4BACd,MAAM,SAAS,CAAC;wBAClB,CAAC;oBACH,CAAC;oBACD,MAAM,aAAa,CAAC;gBACtB,CAAC;gBACD,MAAM,gBAAgB,GAAG,cAAc,CAAC,QAAQ,IAAI,EAAE,CAAC;gBACvD,MAAM,cAAc,GAAG,8BAA8B,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;gBAC5F,MAAM,mBAAmB,GACvB,kBAAkB,CAAC,cAAc,EAAE,aAAa,CAAC,IAAI,uBAAuB,CAAC;gBAC/E,IAAI,mBAAmB,EAAE,CAAC;oBACxB,cAAc,CAAC,aAAa,GAAG,mBAAmB,CAAC;gBACrD,CAAC;gBACD,cAAc,CAAC,eAAe,GAAG,eAAe,CAAC;gBACjD,IAAI,CAAC,QAAQ,CAAC,GAAG,aAAa,YAAY,EAAE,iBAAiB,EAAE;oBAC7D,KAAK,EAAE,cAAc,CAAC,eAAe,EAAE,SAAS;oBAChD,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,WAAW;oBAC1C,OAAO;iBACR,CAAC,CAAC;gBACH,IAAI,CAAC,gBAAgB,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC;oBAC7E,gBAAgB,GAAG,CAAC,GAAG,cAAc,CAAC,eAAgB,CAAC,IAAI,CAAC,CAAC;gBAC/D,CAAC;gBAED,MAAM,eAAe,GAAG,cAAc,CAAC,eAAe,CAAC;gBACvD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;gBACrC,IAAI,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;oBAC7C,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,kDAAkD,CAAC,EAAE;wBACjF,IAAI,EAAE,wBAAwB;wBAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;qBAC3B,CAAC,CAAC;gBACL,CAAC;gBACD,kFAAkF;gBAClF,uFAAuF;gBACvF,8EAA8E;gBAC9E,cAAc,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC/B,IAAI,OAAO,MAAM,CAAC,oBAAoB,KAAK,QAAQ,IAAI,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC1F,cAAc,CAAC,oBAAoB,GAAG,MAAM,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC;gBAC3E,CAAC;qBAAM,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,EAAE,sBAAsB,CAAC,EAAE,CAAC;oBACxF,OAAO,cAAc,CAAC,oBAAoB,CAAC;gBAC7C,CAAC;gBAED,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,6BAA6B,CAAC;oBACjE,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,MAAM,EAAE;wBACN,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,eAAe,EAAE,MAAM,CAAE,MAAc,CAAC,eAAe,IAAI,EAAE,CAAC;wBAC9D,YAAY,EAAE,MAAM,CAAE,MAAc,CAAC,YAAY,IAAI,EAAE,CAAC;qBACzD;oBACD,SAAS,EAAE,cAAc,CAAC,eAAe,EAAE,SAAS;oBACpD,cAAc,EAAE,MAAM,CAAC,UAAU;oBACjC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc;oBACxC,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;iBAChD,CAAC,CAAC;gBAEH,MAAM,eAAe,GAAG,6BAA6B,CAAC;oBACpD,iBAAiB;oBACjB,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,MAAM,EAAE;wBACN,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,eAAe,EAAE,MAAM,CAAC,eAAmC;qBAC5D;oBACD,MAAM;oBACN,UAAU;oBACV,eAAe;oBACf,cAAc;iBACf,CAAC,CAAC;gBACH,IAAI,eAAe,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;oBAClD,KAAK,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC;gBAC9C,CAAC;gBACD,MAAM,EAAE,gBAAgB,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC;gBAC3E,IAAI,uBAAuB,EAAE,CAAC;oBAC5B,4BAA4B,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;gBACzE,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE;oBAC3C,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,KAAK,EAAE,aAAa;iBACrB,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,SAAS,EAAE;oBACjD,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,UAAU;oBACV,QAAQ,EAAE,gBAAgB;oBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,KAAK,EAAE,aAAa;oBACpB,aAAa;oBACb,OAAO;iBACR,CAAC,CAAC;gBAEH,6BAA6B,CAAC,eAAe,EAAE;oBAC7C,SAAS,EAAE,KAAK,CAAC,SAAS;oBAC1B,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,gBAAgB;oBAChB,UAAU,EAAE,MAAM,CAAC,WAAW;oBAC9B,SAAS,EAAE,cAAc,CAAC,eAAe,EAAE,SAAS;oBACpD,UAAU;oBACV,MAAM;oBACN,QAAQ,EAAE,cAAc;oBACxB,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;iBAClD,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,CAAC,SAAS,EAAE;oBACpD,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,UAAU;oBACV,QAAQ,EAAE,gBAAgB;oBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;oBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oBACrC,KAAK,EAAE,aAAa;oBACpB,aAAa;oBACb,OAAO;iBACR,CAAC,CAAC;gBAEH,IAAI,CAAC;oBACH,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;oBAChF,MAAM,cAAc,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;oBAC/D,IAAI,CAAC,QAAQ,CAAC,yBAAyB,EAAE,KAAK,CAAC,SAAS,EAAE;wBACxD,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,MAAM,EAAE,cAAc;wBACtB,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;wBACrC,KAAK,EAAE,aAAa;wBACpB,aAAa;wBACb,OAAO;qBACR,CAAC,CAAC;oBACH,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,aAAa,IAAI,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;oBACzF,MAAM,UAAU,GAAG,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;oBAC/D,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;oBAC7E,MAAM,gBAAgB,GAAG,uBAAuB,CAC9C,cAAc,CAAC,gBAAuD,EACtE,cAAc,CAAC,mBAA0D,CAC1E,CAAC;oBACF,MAAM,kBAAkB,GAAG,mBAAmB,EAAE,CAAC;oBACjD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC;wBAC3D,aAAa,EAAE,KAAK,CAAC,aAAa;wBAClC,gBAAgB;wBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,kBAAkB;wBAClB,WAAW,EAAE,eAAe;wBAC5B,eAAe,EAAE,uBAAuB;wBACxC,gBAAgB;wBAChB,WAAW,EAAE,cAAc,CAAC,WAAW;wBACvC,QAAQ,EAAE,UAAU;wBACpB,gBAAgB,EAAE,cAAc;qBACjC,CAAC,CAAC;oBACH,mEAAmE;oBACnE,qFAAqF;oBACrF,0FAA0F;oBAC1F,MAAM,eAAe,GAAG,OAAO,SAAS,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;oBAC5F,MAAM,oBAAoB,GAAG,eAAe,KAAK,GAAG,CAAC;oBACrD,MAAM,qBAAqB,GACzB,OAAO,eAAe,KAAK,QAAQ;wBACnC,eAAe,IAAI,GAAG;wBACtB,CAAC,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC;4BAC3C,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,IAAI,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;wBAC3F,gBAAgB,KAAK,aAAa,CAAC;oBAErC,IAAI,oBAAoB,IAAI,qBAAqB,EAAE,CAAC;wBAClD,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAE,SAAS,CAAC,IAAgC,CAAC,CAAC,CAAC,SAAS,CAAC;wBACpI,MAAM,MAAM,GACV,YAAY,IAAI,YAAY,CAAC,KAAK,IAAI,OAAO,YAAY,CAAC,KAAK,KAAK,QAAQ;4BAC1E,CAAC,CAAC,MAAM,CAAE,YAAY,CAAC,KAAa,CAAC,OAAO,IAAI,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC;4BACzE,CAAC,CAAC,EAAE,CAAC;wBACT,MAAM,UAAU,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC;wBAC/E,MAAM,YAAY,GAAQ,IAAI,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,UAAU,EAAE,CAAC,CAAC;wBACpG,YAAY,CAAC,UAAU,GAAG,UAAU,CAAC;wBACrC,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC;wBACjC,YAAY,CAAC,QAAQ,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;wBAC/C,IAAI,CAAC;4BACH,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,0DAA0D,CAAC,CAAC;4BACvG,iBAAiB,CAAC;gCAChB,KAAK,EAAE,YAAY;gCACnB,KAAK,EAAE,eAAe;gCACtB,OAAO,EAAE;oCACP,SAAS,EAAE,KAAK,CAAC,SAAS;oCAC1B,WAAW,EAAE,MAAM,CAAC,WAAW;oCAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;oCAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;oCACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oCACrC,gBAAgB;oCAChB,SAAS,EAAE,cAAc,CAAC,eAAe,EAAE,SAAS;oCACpD,UAAU,EAAE,MAAM,CAAC,WAAW;oCAC9B,MAAM;oCACN,UAAU;iCACX;gCACD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;gCAC/C,UAAU;gCACV,WAAW,EAAE,UAAU,KAAK,GAAG;gCAC/B,aAAa,EAAE,IAAI;gCACnB,OAAO,EAAE;oCACP,MAAM,EAAE,2BAA2B;oCACnC,eAAe,EAAE,UAAU;oCAC3B,oBAAoB,EAAE,IAAI;iCAC3B;6BACF,CAAC,CAAC;wBACL,CAAC;wBAAC,MAAM,CAAC;4BACP,+CAA+C;wBACjD,CAAC;wBACD,MAAM,YAAY,CAAC;oBACrB,CAAC;oBACD,MAAM,KAAK,GAAG,sBAAsB,CAAC,SAAS,EAAE,cAAc,CAAC,IAAI,iBAAiB,CAAC;oBACrF,eAAe,GAAG,iBAAiB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;oBAC5D,IAAI,SAAS,CAAC,IAAI,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACzD,MAAM,IAAI,GAAG,SAAS,CAAC,IAA+B,CAAC;wBACvD,IAAI,CAAC,CAAC,iBAAiB,IAAI,IAAI,CAAC,EAAE,CAAC;4BACjC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAC7B,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,EACzD,IAAI,CACL,CAAC;wBACJ,CAAC;oBACH,CAAC;oBAED,aAAa,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;oBACxD,eAAe,CAAC,KAAK,CAAC,SAAS,EAAE;wBAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,KAAK,EAAE,aAAa;wBACpB,KAAK,EAAE,eAAe;wBACtB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB;qBACzC,CAAC,CAAC;oBACH,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,eAAe,CAAC,CAAC;oBAC/F,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,CAAC,SAAS,EAAE;wBACpD,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,OAAO,EAAE,YAAY;wBACrB,YAAY,EAAE,MAAM,CAAC,YAAY;wBACjC,cAAc,EAAE,MAAM,CAAC,cAAc;wBACrC,KAAK,EAAE,aAAa;wBACpB,aAAa;wBACb,OAAO;qBACR,CAAC,CAAC;oBACH,SAAS,GAAG,KAAK,CAAC;oBAClB,IAAI,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;wBACjD,MAAM,SAAS,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;wBACpD,MAAM,WAAW,GACf,sBAAsB,IAAI,sBAAsB,CAAC,SAAS,KAAK,SAAS;4BACtE,CAAC,CAAC,sBAAsB,CAAC,WAAW,GAAG,CAAC;4BACxC,CAAC,CAAC,CAAC,CAAC;wBACR,sBAAsB,GAAG,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;oBACtD,CAAC;yBAAM,CAAC;wBACN,sBAAsB,GAAG,IAAI,CAAC;oBAChC,CAAC;oBACD,MAAM,MAAM,GAAG,0BAA0B,CAAC,KAAK,CAAC,CAAC;oBACjD,IAAI,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC;wBAC7C,IAAI,CAAC;4BACH,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,0DAA0D,CAAC,CAAC;4BACvG,iBAAiB,CAAC;gCAChB,KAAK;gCACL,KAAK,EAAE,qBAAqB;gCAC5B,OAAO,EAAE;oCACP,SAAS,EAAE,KAAK,CAAC,SAAS;oCAC1B,WAAW,EAAE,MAAM,CAAC,WAAW;oCAC/B,UAAU,EAAE,MAAM,CAAC,UAAU;oCAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;oCACjC,cAAc,EAAE,MAAM,CAAC,cAAc;oCACrC,gBAAgB;oCAChB,SAAS,EAAE,cAAc,CAAC,eAAe,EAAE,SAAS;oCACpD,UAAU,EAAE,MAAM,CAAC,WAAW;oCAC9B,MAAM;oCACN,UAAU;iCACX;gCACD,YAAY,EAAE,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE;gCAC/C,UAAU,EAAE,GAAG;gCACf,WAAW,EAAE,IAAI;gCACjB,aAAa,EAAE,IAAI;gCACnB,OAAO,EAAE;oCACP,MAAM,EAAE,uBAAuB;oCAC/B,SAAS,EAAE,OAAQ,KAAa,EAAE,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAE,KAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;oCAC7F,YAAY,EAAE,OAAQ,KAAa,EAAE,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAE,KAAa,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS;oCAChH,OAAO,EAAE,YAAY;iCACtB;6BACF,CAAC,CAAC;wBACL,CAAC;wBAAC,MAAM,CAAC;4BACP,+CAA+C;wBACjD,CAAC;oBACH,CAAC;oBACD,MAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,IAAI,wCAAwC,CAAC,KAAK,CAAC,CAAC;oBACnF,MAAM,QAAQ,GAAG,MAAM,KAAK,GAAG,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;oBACzE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;oBAClD,MAAM,WAAW,GACf,OAAO,GAAG,WAAW;wBACrB,CAAC,wBAAwB,CAAC,KAAK,CAAC;4BAC9B,CAAC,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC9E,IAAI,aAAa,IAAI,eAAe,KAAK,aAAa,EAAE,CAAC;wBACvD,eAAe,GAAG,aAAa,CAAC;oBAClC,CAAC;oBACD,IAAI,CAAC,WAAW,EAAE,CAAC;wBACjB,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;wBAC/B,MAAM,KAAK,CAAC;oBACd,CAAC;oBACD,+FAA+F;oBAC/F,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC/B,MAAM,kBAAkB,GACtB,OAAO,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,WAAW,CAAC,CAAC;oBAC3G,IAAI,kBAAkB,EAAE,CAAC;wBACvB,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;oBAC/B,CAAC;oBACD,IAAI,CAAC,kBAAkB,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;wBAC9C,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,CAAC;wBAC7B,IAAI,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,IAAI,KAAK,CAAC,EAAE,CAAC;4BACxE,2CAA2C;4BAC3C,mFAAmF;4BACnF,oFAAoF;4BACpF,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;4BAC7C,IAAI,sBAAsB,EAAE,CAAC;gCAC3B,sBAAsB,CAAC,eAAe,GAAG,IAAI,CAAC;4BAChD,CAAC;iCAAM,CAAC;gCACN,sBAAsB,GAAG,EAAE,SAAS,EAAE,0BAA0B,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC;4BACnH,CAAC;wBACH,CAAC;6BAAM,IAAI,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,QAAQ,EAAE,CAAC;4BACpE,yCAAyC;4BACzC,qEAAqE;4BACrE,4FAA4F;4BAC5F,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC/C,CAAC;6BAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAmC,CAAC,KAAK,CAAC,EAAE,CAAC;4BACvG,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC/C,CAAC;oBACH,CAAC;oBACD,IAAI,CAAC,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC,SAAS,EAAE;wBAC/C,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,OAAO;wBACP,WAAW,EAAE,OAAO,GAAG,CAAC;wBACxB,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC;wBAC1C,MAAM,EAAE,mBAAmB,CAAC,KAAK,CAAC;wBAClC,SAAS,EAAE,eAAe;qBAC3B,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;YACH,CAAC;YAED,MAAM,SAAS,IAAI,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC7E,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,4EAA4E;YAC5E,qDAAqD;YACrD,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACxB,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;YACjC,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IACO,QAAQ,CAAC,KAAa,EAAE,SAAiB,EAAE,OAAiC;QAClF,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,OAAuC;QACnF,OAAO,iCAAiC,CAAC,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC7J,CAAC;CAEF;AAED,MAAM,UAAU,qBAAqB,CAAC,IAAyB;IAC7D,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC"}
|
|
1
|
+
{"version":3,"file":"request-executor.js","sourceRoot":"","sources":["../../../../src/server/runtime/http-server/request-executor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -49,12 +49,39 @@ function bfsFindPayload(doc, predicate) {
|
|
|
49
49
|
return null;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
+
function listJsonFilesRecursive(dir) {
|
|
53
|
+
const out = [];
|
|
54
|
+
const stack = [dir];
|
|
55
|
+
while (stack.length) {
|
|
56
|
+
const current = stack.pop();
|
|
57
|
+
let entries = [];
|
|
58
|
+
try {
|
|
59
|
+
entries = fs.readdirSync(current, { withFileTypes: true });
|
|
60
|
+
} catch {
|
|
61
|
+
continue;
|
|
62
|
+
}
|
|
63
|
+
for (const ent of entries) {
|
|
64
|
+
const full = path.join(current, ent.name);
|
|
65
|
+
if (ent.isDirectory()) {
|
|
66
|
+
stack.push(full);
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
if (ent.isFile() && ent.name.toLowerCase().endsWith('.json')) {
|
|
70
|
+
out.push(full);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return out;
|
|
75
|
+
}
|
|
76
|
+
|
|
52
77
|
function loadCodexSample() {
|
|
53
78
|
for (const entry of SEARCH_PATHS) {
|
|
54
79
|
if (!fs.existsSync(entry.dir)) continue;
|
|
55
|
-
const files =
|
|
56
|
-
|
|
57
|
-
|
|
80
|
+
const files = listJsonFilesRecursive(entry.dir)
|
|
81
|
+
.map((file) => ({ file, mtime: (() => { try { return fs.statSync(file).mtimeMs; } catch { return 0; } })() }))
|
|
82
|
+
.sort((a, b) => b.mtime - a.mtime)
|
|
83
|
+
.map((f) => f.file);
|
|
84
|
+
for (const full of files) {
|
|
58
85
|
try {
|
|
59
86
|
const json = JSON.parse(fs.readFileSync(full, 'utf8'));
|
|
60
87
|
const payload = bfsFindPayload(json, entry.format === 'responses' ? looksResponsesPayload : looksAnthropicPayload);
|
|
@@ -96,13 +123,55 @@ async function loadConverters() {
|
|
|
96
123
|
};
|
|
97
124
|
}
|
|
98
125
|
|
|
126
|
+
function assertToolCallsWithoutIds(toolCalls, label) {
|
|
127
|
+
if (!Array.isArray(toolCalls) || toolCalls.length === 0) {
|
|
128
|
+
throw new Error(`[anthropic-roundtrip] ${label} expected tool_calls`);
|
|
129
|
+
}
|
|
130
|
+
for (const call of toolCalls) {
|
|
131
|
+
if (!call || typeof call !== 'object') continue;
|
|
132
|
+
if ('id' in call) {
|
|
133
|
+
throw new Error(`[anthropic-roundtrip] ${label} should not include id`);
|
|
134
|
+
}
|
|
135
|
+
if ('call_id' in call) {
|
|
136
|
+
throw new Error(`[anthropic-roundtrip] ${label} should not include call_id`);
|
|
137
|
+
}
|
|
138
|
+
if ('tool_call_id' in call) {
|
|
139
|
+
throw new Error(`[anthropic-roundtrip] ${label} should not include tool_call_id`);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
function runIncludeToolCallIdsRegression(converters) {
|
|
145
|
+
const payload = {
|
|
146
|
+
id: 'msg_tool_use_regression',
|
|
147
|
+
type: 'message',
|
|
148
|
+
role: 'assistant',
|
|
149
|
+
model: 'glm-4.6',
|
|
150
|
+
created: 1700000000,
|
|
151
|
+
stop_reason: 'tool_use',
|
|
152
|
+
content: [
|
|
153
|
+
{
|
|
154
|
+
type: 'tool_use',
|
|
155
|
+
id: 'call_regression_shell',
|
|
156
|
+
name: 'Bash',
|
|
157
|
+
input: { command: 'ls' }
|
|
158
|
+
}
|
|
159
|
+
]
|
|
160
|
+
};
|
|
161
|
+
const chat = converters.buildOpenAIChatFromAnthropicMessage(payload, { includeToolCallIds: false });
|
|
162
|
+
const toolCalls = chat?.choices?.[0]?.message?.tool_calls;
|
|
163
|
+
assertToolCallsWithoutIds(toolCalls, 'includeToolCallIds=false');
|
|
164
|
+
console.log('[anthropic-roundtrip] includeToolCallIds=false regression passed');
|
|
165
|
+
}
|
|
166
|
+
|
|
99
167
|
async function main() {
|
|
168
|
+
const converters = await loadConverters();
|
|
169
|
+
runIncludeToolCallIdsRegression(converters);
|
|
100
170
|
const sample = loadCodexSample();
|
|
101
171
|
if (!sample) {
|
|
102
172
|
console.log('[anthropic-roundtrip] codex samples 未找到，跳过验证（可运行 npm run replay:codex-sample 捕获样本）');
|
|
103
173
|
return;
|
|
104
174
|
}
|
|
105
|
-
const converters = await loadConverters();
|
|
106
175
|
console.log(`[anthropic-roundtrip] 使用样本 ${sample.file} (${sample.format})`);
|
|
107
176
|
|
|
108
177
|
let baseResponsesPayload;
|
|
@@ -111,6 +180,8 @@ async function main() {
|
|
|
111
180
|
} else {
|
|
112
181
|
const chatFromAnthropic = converters.buildOpenAIChatFromAnthropicMessage(sample.payload);
|
|
113
182
|
baseResponsesPayload = converters.buildResponsesPayloadFromChat(chatFromAnthropic);
|
|
183
|
+
const chatNoIds = converters.buildOpenAIChatFromAnthropicMessage(sample.payload, { includeToolCallIds: false });
|
|
184
|
+
assertToolCallsWithoutIds(chatNoIds?.choices?.[0]?.message?.tool_calls, 'sample includeToolCallIds=false');
|
|
114
185
|
}
|
|
115
186
|
|
|
116
187
|
const chatFromResponses = converters.buildChatResponseFromResponses(baseResponsesPayload);
|