@jsonstudio/rcc 0.90.109 → 0.90.137
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/commands/init.js +8 -2
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/restart.js +51 -2
- package/dist/cli/commands/restart.js.map +1 -1
- package/dist/cli/commands/start.js +115 -26
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/config/init-config.js +8 -2
- package/dist/cli/config/init-config.js.map +1 -1
- package/dist/cli/config/init-provider-catalog.js +19 -9
- package/dist/cli/config/init-provider-catalog.js.map +1 -1
- package/dist/configsamples/config.v1.quickstart.sanitized.json +27 -8
- package/dist/index.js +26 -0
- package/dist/index.js.map +1 -1
- 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/restart-handler.js +26 -0
- package/dist/server/runtime/http-server/daemon-admin/restart-handler.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 +2 -2
- package/scripts/ci/repo-sanity.mjs +3 -1
- package/scripts/install-global.sh +19 -1
- package/scripts/tests/anthropic-responses-roundtrip.mjs +75 -4
- package/scripts/verify-install-e2e.mjs +17 -1
|
@@ -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":"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"}
|
|
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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jsonstudio/rcc",
|
|
3
|
-
"version": "0.90.
|
|
3
|
+
"version": "0.90.137",
|
|
4
4
|
"description": "Multi-provider OpenAI proxy server with anthropic/responses/chat support (release)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -157,7 +157,7 @@
|
|
|
157
157
|
},
|
|
158
158
|
"dependencies": {
|
|
159
159
|
"@anthropic-ai/sdk": "^0.65.0",
|
|
160
|
-
"@jsonstudio/llms": "0.6.
|
|
160
|
+
"@jsonstudio/llms": "0.6.3405",
|
|
161
161
|
"@lmstudio/sdk": "^1.5.0",
|
|
162
162
|
"@radix-ui/react-switch": "^1.2.6",
|
|
163
163
|
"@types/socket.io": "^3.0.1",
|
|
@@ -27,7 +27,7 @@ function listRootEntries() {
|
|
|
27
27
|
|
|
28
28
|
function isForbiddenRootFile(p) {
|
|
29
29
|
const base = path.posix.basename(p);
|
|
30
|
-
const allow = new Set(['AGENTS.md', 'README.md', 'task.md']);
|
|
30
|
+
const allow = new Set(['AGENTS.md', 'README.md', 'MEMORY.md', 'task.md']);
|
|
31
31
|
if (allow.has(base)) return false;
|
|
32
32
|
if (/^test-.*\.(mjs|js|ts|py)$/i.test(base)) return true;
|
|
33
33
|
if (/^debug-.*\.(mjs|js|ts)$/i.test(base)) return true;
|
|
@@ -74,11 +74,13 @@ function checkRootLayout() {
|
|
|
74
74
|
'.gitignore',
|
|
75
75
|
'AGENTS.md',
|
|
76
76
|
'README.md',
|
|
77
|
+
'MEMORY.md',
|
|
77
78
|
'config',
|
|
78
79
|
'configsamples',
|
|
79
80
|
'dist',
|
|
80
81
|
'docs',
|
|
81
82
|
'jest.config.js',
|
|
83
|
+
'memory',
|
|
82
84
|
'node_modules',
|
|
83
85
|
'package',
|
|
84
86
|
'package-lock.json',
|
|
@@ -205,7 +205,7 @@ verify_server_health() {
|
|
|
205
205
|
local HEALTH_LOG="/tmp/routecodex-install-health-$(date +%s).log"
|
|
206
206
|
echo ""
|
|
207
207
|
echo "🩺 执行服务器健康&端到端检查 (chat + anthropic SSE)..."
|
|
208
|
-
if node scripts/verify-install-e2e.mjs >"$HEALTH_LOG" 2>&1; then
|
|
208
|
+
if env -u ROUTECODEX_BUILD_RESTART_ONLY -u RCC_BUILD_RESTART_ONLY node scripts/verify-install-e2e.mjs >"$HEALTH_LOG" 2>&1; then
|
|
209
209
|
echo "✅ 全局 CLI 端到端检查通过"
|
|
210
210
|
rm -f "$HEALTH_LOG" || true
|
|
211
211
|
return
|
|
@@ -215,6 +215,23 @@ verify_server_health() {
|
|
|
215
215
|
exit 1
|
|
216
216
|
}
|
|
217
217
|
|
|
218
|
+
restart_managed_dev_server_if_requested() {
|
|
219
|
+
local restart_only="${ROUTECODEX_BUILD_RESTART_ONLY:-${RCC_BUILD_RESTART_ONLY:-0}}"
|
|
220
|
+
if [ "$restart_only" != "1" ] && [ "$restart_only" != "true" ]; then
|
|
221
|
+
return
|
|
222
|
+
fi
|
|
223
|
+
|
|
224
|
+
local restart_port="${ROUTECODEX_DEV_RESTART_PORT:-${RCC_DEV_RESTART_PORT:-5555}}"
|
|
225
|
+
echo ""
|
|
226
|
+
echo "🔄 尝试通过服务端 restart 入口刷新现有 RouteCodex 服务 (port=${restart_port})..."
|
|
227
|
+
if ROUTECODEX_RESTART_HTTP_ONLY=1 routecodex restart --port "$restart_port"; then
|
|
228
|
+
echo "✅ 受管服务已重启: ${restart_port}"
|
|
229
|
+
return
|
|
230
|
+
fi
|
|
231
|
+
echo "ℹ ${restart_port} 当前服务尚未具备 server-managed restart 能力;为避免误杀旧服务,本次跳过自动重启。"
|
|
232
|
+
echo "ℹ 请手动重启一次该端口服务,之后后续 build 将可自动刷新。"
|
|
233
|
+
}
|
|
234
|
+
|
|
218
235
|
# 清理旧安装
|
|
219
236
|
cleanup_old_install() {
|
|
220
237
|
echo "🧹 检查并清理旧安装..."
|
|
@@ -256,6 +273,7 @@ main() {
|
|
|
256
273
|
link_global_llms_dev
|
|
257
274
|
verify_install
|
|
258
275
|
verify_server_health
|
|
276
|
+
restart_managed_dev_server_if_requested
|
|
259
277
|
node scripts/cleanup-stale-server-pids.mjs --quiet || true
|
|
260
278
|
|
|
261
279
|
echo ""
|
|
@@ -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);
|
|
@@ -134,6 +134,8 @@ async function main() {
|
|
|
134
134
|
const verifyConfigPath = customConfigPath || await writeVerifyConfig(mockServer.baseUrl, HOST, port);
|
|
135
135
|
const env = {
|
|
136
136
|
...process.env,
|
|
137
|
+
ROUTECODEX_BUILD_RESTART_ONLY: '0',
|
|
138
|
+
RCC_BUILD_RESTART_ONLY: '0',
|
|
137
139
|
ROUTECODEX_PORT: String(port),
|
|
138
140
|
RCC_PORT: String(port),
|
|
139
141
|
ROUTECODEX_HOST: HOST,
|
|
@@ -345,13 +347,16 @@ async function resolveVerifyPort(preferredPort, host) {
|
|
|
345
347
|
const port = basePort + offset;
|
|
346
348
|
// eslint-disable-next-line no-await-in-loop
|
|
347
349
|
if (await canListenOnPort(port, host)) {
|
|
350
|
+
if (port !== basePort) {
|
|
351
|
+
console.warn(`[verify-install] requested port ${basePort} occupied, shifted verification to ${port}`);
|
|
352
|
+
}
|
|
348
353
|
return port;
|
|
349
354
|
}
|
|
350
355
|
}
|
|
351
356
|
throw new Error(`No available verification port in range ${basePort}-${basePort + PORT_SEARCH_LIMIT - 1}`);
|
|
352
357
|
}
|
|
353
358
|
|
|
354
|
-
async function
|
|
359
|
+
async function canListenOnAddress(port, host) {
|
|
355
360
|
const probe = http.createServer();
|
|
356
361
|
try {
|
|
357
362
|
await new Promise((resolve, reject) => {
|
|
@@ -365,3 +370,14 @@ async function canListenOnPort(port, host) {
|
|
|
365
370
|
await new Promise((resolve) => probe.close(() => resolve(undefined))).catch(() => {});
|
|
366
371
|
}
|
|
367
372
|
}
|
|
373
|
+
|
|
374
|
+
async function canListenOnPort(port, host) {
|
|
375
|
+
const primary = await canListenOnAddress(port, host);
|
|
376
|
+
if (!primary) {
|
|
377
|
+
return false;
|
|
378
|
+
}
|
|
379
|
+
if (host === '0.0.0.0') {
|
|
380
|
+
return true;
|
|
381
|
+
}
|
|
382
|
+
return await canListenOnAddress(port, '0.0.0.0');
|
|
383
|
+
}
|