@qwen-code/arena-agent 0.0.3 → 0.0.5
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/.env.example +6 -0
- package/README.md +50 -8
- package/dist/agent.js +24 -1
- package/dist/agent.js.map +1 -1
- package/dist/anthropic.d.ts +16 -0
- package/dist/anthropic.js +391 -0
- package/dist/anthropic.js.map +1 -0
- package/dist/canonical-data.d.ts +2 -0
- package/dist/canonical-data.js +4 -0
- package/dist/canonical-data.js.map +1 -0
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/compaction.d.ts +2 -1
- package/dist/compaction.js +8 -2
- package/dist/compaction.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.js +13 -0
- package/dist/config.js.map +1 -1
- package/dist/history.d.ts +2 -2
- package/dist/history.js +4 -4
- package/dist/history.js.map +1 -1
- package/dist/mock.js +14 -0
- package/dist/mock.js.map +1 -1
- package/dist/protocol.d.ts +3 -2
- package/dist/protocol.js +9 -1
- package/dist/protocol.js.map +1 -1
- package/dist/provider.d.ts +4 -0
- package/dist/provider.js +145 -8
- package/dist/provider.js.map +1 -1
- package/dist/server.js +1 -1
- package/dist/server.js.map +1 -1
- package/dist/spec.js +3 -6
- package/dist/spec.js.map +1 -1
- package/dist/tui.js +1 -1
- package/dist/tui.js.map +1 -1
- package/dist/types.d.ts +11 -0
- package/package.json +3 -1
- package/dist/web/app.d.ts +0 -1
package/dist/compaction.js
CHANGED
|
@@ -118,12 +118,15 @@ async function generateSummary(client, model, sourceMessages, maxTokens, signal)
|
|
|
118
118
|
signal,
|
|
119
119
|
};
|
|
120
120
|
const content = [];
|
|
121
|
+
let usage;
|
|
121
122
|
for await (const chunk of client.stream(request)) {
|
|
123
|
+
if (chunk.usage)
|
|
124
|
+
usage = chunk.usage;
|
|
122
125
|
const value = chunk.choices?.[0]?.delta?.content;
|
|
123
126
|
if (value)
|
|
124
127
|
content.push(String(value));
|
|
125
128
|
}
|
|
126
|
-
return safeSummary(content.join(""));
|
|
129
|
+
return { summary: safeSummary(content.join("")), usage };
|
|
127
130
|
}
|
|
128
131
|
export async function compactMessagesIfNeeded(messages, tools, client, model, settings, signal) {
|
|
129
132
|
const imageTokens = settings.imageTokenEstimate ?? 2048;
|
|
@@ -145,12 +148,13 @@ export async function compactMessagesIfNeeded(messages, tools, client, model, se
|
|
|
145
148
|
estimatedTokensAfter: before,
|
|
146
149
|
};
|
|
147
150
|
}
|
|
148
|
-
const summary = await generateSummary(client, model, messages.slice(1, currentTurnStart), Math.max(1, Math.floor(settings.summaryMaxTokens)), signal);
|
|
151
|
+
const { summary, usage } = await generateSummary(client, model, messages.slice(1, currentTurnStart), Math.max(1, Math.floor(settings.summaryMaxTokens)), signal);
|
|
149
152
|
if (!summary) {
|
|
150
153
|
return {
|
|
151
154
|
compacted: false,
|
|
152
155
|
estimatedTokensBefore: before,
|
|
153
156
|
estimatedTokensAfter: before,
|
|
157
|
+
usage,
|
|
154
158
|
};
|
|
155
159
|
}
|
|
156
160
|
const currentUser = messages[currentTurnStart];
|
|
@@ -159,6 +163,7 @@ export async function compactMessagesIfNeeded(messages, tools, client, model, se
|
|
|
159
163
|
compacted: false,
|
|
160
164
|
estimatedTokensBefore: before,
|
|
161
165
|
estimatedTokensAfter: before,
|
|
166
|
+
usage,
|
|
162
167
|
};
|
|
163
168
|
}
|
|
164
169
|
const compactedMessages = [
|
|
@@ -171,6 +176,7 @@ export async function compactMessagesIfNeeded(messages, tools, client, model, se
|
|
|
171
176
|
compacted: true,
|
|
172
177
|
estimatedTokensBefore: before,
|
|
173
178
|
estimatedTokensAfter: estimateContextTokens(messages, tools, imageTokens),
|
|
179
|
+
usage,
|
|
174
180
|
};
|
|
175
181
|
}
|
|
176
182
|
//# sourceMappingURL=compaction.js.map
|
package/dist/compaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../src/compaction.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export interface ArenaConfig {
|
|
2
2
|
model: string;
|
|
3
3
|
workspace: string;
|
|
4
|
+
stateRoot: string;
|
|
4
5
|
tenantId: string;
|
|
5
6
|
apiBase?: string;
|
|
6
7
|
apiKey?: string;
|
|
@@ -18,6 +19,8 @@ export interface ArenaConfig {
|
|
|
18
19
|
modelMaxRetries?: number;
|
|
19
20
|
modelRetryBaseMs?: number;
|
|
20
21
|
modelRetryMaxMs?: number;
|
|
22
|
+
modelStreamIdleTimeoutMs?: number;
|
|
21
23
|
}
|
|
22
24
|
export declare function expandPath(value: string): string;
|
|
25
|
+
export declare function defaultStateRoot(): string;
|
|
23
26
|
export declare function configFromEnv(workspace?: string): ArenaConfig;
|
package/dist/config.js
CHANGED
|
@@ -33,12 +33,22 @@ export function expandPath(value) {
|
|
|
33
33
|
return path.join(os.homedir(), value.slice(2));
|
|
34
34
|
return value;
|
|
35
35
|
}
|
|
36
|
+
// Session state (histories, session metadata, daemon session workspaces)
|
|
37
|
+
// lives outside the task workspace so runs never pollute the files an agent
|
|
38
|
+
// or verifier sees. ARENA_HOME overrides the default `~/.arena`.
|
|
39
|
+
export function defaultStateRoot() {
|
|
40
|
+
const override = process.env.ARENA_HOME;
|
|
41
|
+
if (override)
|
|
42
|
+
return path.resolve(expandPath(override));
|
|
43
|
+
return path.join(os.homedir(), ".arena");
|
|
44
|
+
}
|
|
36
45
|
export function configFromEnv(workspace = process.cwd()) {
|
|
37
46
|
const source = modelSpec();
|
|
38
47
|
return {
|
|
39
48
|
model: process.env.ARENA_MODEL ||
|
|
40
49
|
"openai/qwen-latest-series-invite-beta-v92",
|
|
41
50
|
workspace: path.resolve(expandPath(workspace)),
|
|
51
|
+
stateRoot: defaultStateRoot(),
|
|
42
52
|
tenantId: process.env.ARENA_TENANT_ID || "local",
|
|
43
53
|
apiBase: process.env.ARENA_API_BASE || undefined,
|
|
44
54
|
apiKey: process.env.ARENA_API_KEY || undefined,
|
|
@@ -56,6 +66,9 @@ export function configFromEnv(workspace = process.cwd()) {
|
|
|
56
66
|
modelMaxRetries: nonNegativeNumber(process.env.ARENA_MODEL_MAX_RETRIES, 5, true),
|
|
57
67
|
modelRetryBaseMs: nonNegativeNumber(process.env.ARENA_MODEL_RETRY_BASE_MS, 1000),
|
|
58
68
|
modelRetryMaxMs: nonNegativeNumber(process.env.ARENA_MODEL_RETRY_MAX_MS, 30000),
|
|
69
|
+
// A stream that stays open but delivers no bytes for this long is treated
|
|
70
|
+
// as a transient network fault and retried. 0 disables the watchdog.
|
|
71
|
+
modelStreamIdleTimeoutMs: nonNegativeNumber(process.env.ARENA_MODEL_STREAM_IDLE_TIMEOUT_MS, 300_000),
|
|
59
72
|
};
|
|
60
73
|
}
|
|
61
74
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/history.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Message } from "./types.js";
|
|
2
|
-
export declare function sessionStorageRoot(
|
|
3
|
-
export declare function storedHistoryPath(
|
|
2
|
+
export declare function sessionStorageRoot(stateRoot: string, tenantId: string, sessionId: string): string;
|
|
3
|
+
export declare function storedHistoryPath(stateRoot: string, tenantId: string, sessionId: string): string;
|
|
4
4
|
export declare function loadStoredHistory(filePath: string): Promise<Message[] | undefined>;
|
|
5
5
|
export declare function saveStoredHistory(filePath: string, messages: readonly Message[]): Promise<void>;
|
package/dist/history.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import crypto from "node:crypto";
|
|
2
2
|
import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
export function sessionStorageRoot(
|
|
5
|
-
return path.join(
|
|
4
|
+
export function sessionStorageRoot(stateRoot, tenantId, sessionId) {
|
|
5
|
+
return path.join(stateRoot, "tenants", tenantId, "sessions", sessionId);
|
|
6
6
|
}
|
|
7
|
-
export function storedHistoryPath(
|
|
8
|
-
return path.join(sessionStorageRoot(
|
|
7
|
+
export function storedHistoryPath(stateRoot, tenantId, sessionId) {
|
|
8
|
+
return path.join(sessionStorageRoot(stateRoot, tenantId, sessionId), "history.json");
|
|
9
9
|
}
|
|
10
10
|
export async function loadStoredHistory(filePath) {
|
|
11
11
|
try {
|
package/dist/history.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.js","sourceRoot":"","sources":["../src/history.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,QAAgB,EAChB,SAAiB;IAEjB,OAAO,IAAI,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"history.js","sourceRoot":"","sources":["../src/history.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,QAAgB,EAChB,SAAiB;IAEjB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,SAAiB,EACjB,QAAgB,EAChB,SAAiB;IAEjB,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,cAAc,CAAC,CAAC;AACvF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB;IAEhB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAE7C,CAAC;QACd,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;QAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,SAAS,CAAC;QACzE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,QAA4B;IAE5B,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,GAAG,QAAQ,IAAI,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC;IAC3D,MAAM,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IACjE,MAAM,MAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AACpC,CAAC"}
|
package/dist/mock.js
CHANGED
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
function chunk(delta) {
|
|
2
2
|
return { choices: [{ delta }] };
|
|
3
3
|
}
|
|
4
|
+
// Mirrors stream_options.include_usage: a final chunk with no choices that
|
|
5
|
+
// carries the request's token usage.
|
|
6
|
+
function usageChunk(promptTokens, completionTokens) {
|
|
7
|
+
return {
|
|
8
|
+
choices: [],
|
|
9
|
+
usage: {
|
|
10
|
+
prompt_tokens: promptTokens,
|
|
11
|
+
completion_tokens: completionTokens,
|
|
12
|
+
total_tokens: promptTokens + completionTokens,
|
|
13
|
+
},
|
|
14
|
+
};
|
|
15
|
+
}
|
|
4
16
|
function toolChunk(callId = "", name = "", argumentsText = "") {
|
|
5
17
|
return chunk({
|
|
6
18
|
tool_calls: [
|
|
@@ -139,12 +151,14 @@ export class MockModelClient {
|
|
|
139
151
|
const split = Math.floor(argumentsText.length / 2);
|
|
140
152
|
yield toolChunk("call_mock_write", "write_file", argumentsText.slice(0, split));
|
|
141
153
|
yield toolChunk("", "", argumentsText.slice(split));
|
|
154
|
+
yield usageChunk(120, 45);
|
|
142
155
|
}
|
|
143
156
|
else {
|
|
144
157
|
yield chunk({
|
|
145
158
|
reasoning_content: "The file write completed successfully.",
|
|
146
159
|
});
|
|
147
160
|
yield chunk({ content: "Created `hello.html`." });
|
|
161
|
+
yield usageChunk(210, 12);
|
|
148
162
|
}
|
|
149
163
|
}
|
|
150
164
|
}
|
package/dist/mock.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mock.js","sourceRoot":"","sources":["../src/mock.ts"],"names":[],"mappings":"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"}
|
package/dist/protocol.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AgentEvent, AgentResult, Message, ModelDelta, Question } from "./types.js";
|
|
1
|
+
import type { AgentEvent, AgentResult, Message, ModelDelta, ModelUsage, Question } from "./types.js";
|
|
2
2
|
export type OutputFormat = "text" | "json" | "stream-json" | "silent";
|
|
3
3
|
export interface EventSinkOptions {
|
|
4
4
|
format: OutputFormat;
|
|
@@ -14,7 +14,8 @@ export declare class EventSink {
|
|
|
14
14
|
delta(sessionId: string, delta: ModelDelta): void;
|
|
15
15
|
modelStart(sessionId: string, step: number): void;
|
|
16
16
|
modelRetry(sessionId: string, attempt: number, reason?: string): void;
|
|
17
|
-
modelComplete(sessionId: string, step: number, finishReason: string): void;
|
|
17
|
+
modelComplete(sessionId: string, step: number, finishReason: string, usage?: ModelUsage): void;
|
|
18
|
+
compaction(sessionId: string, usage?: ModelUsage): void;
|
|
18
19
|
toolStart(sessionId: string, toolCallId: string, toolName: string): void;
|
|
19
20
|
toolComplete(sessionId: string, toolCallId: string, toolName: string): void;
|
|
20
21
|
inputRequired(sessionId: string, toolCallId: string, questions: Question[]): void;
|
package/dist/protocol.js
CHANGED
|
@@ -28,12 +28,20 @@ export class EventSink {
|
|
|
28
28
|
...(reason ? { error: reason } : {}),
|
|
29
29
|
});
|
|
30
30
|
}
|
|
31
|
-
modelComplete(sessionId, step, finishReason) {
|
|
31
|
+
modelComplete(sessionId, step, finishReason, usage) {
|
|
32
32
|
this.emit({
|
|
33
33
|
type: "model.complete",
|
|
34
34
|
session_id: sessionId,
|
|
35
35
|
step,
|
|
36
36
|
finish_reason: finishReason,
|
|
37
|
+
...(usage ? { usage } : {}),
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
compaction(sessionId, usage) {
|
|
41
|
+
this.emit({
|
|
42
|
+
type: "compaction",
|
|
43
|
+
session_id: sessionId,
|
|
44
|
+
...(usage ? { usage } : {}),
|
|
37
45
|
});
|
|
38
46
|
}
|
|
39
47
|
toolStart(sessionId, toolCallId, toolName) {
|
package/dist/protocol.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../src/protocol.ts"],"names":[],"mappings":"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"}
|
package/dist/provider.d.ts
CHANGED
|
@@ -16,16 +16,20 @@ export interface ApiConnection {
|
|
|
16
16
|
}
|
|
17
17
|
export declare function resolveApiConnection(config: ArenaConfig, requestedModel?: string): ApiConnection;
|
|
18
18
|
export declare function apiEndpoint(connection: ApiConnection, pathname: string): string;
|
|
19
|
+
export declare function withIdleTimeout(stream: ReadableStream<Uint8Array>, timeoutMs: number | undefined): ReadableStream<Uint8Array>;
|
|
19
20
|
export declare class HttpModelClient implements ModelClient {
|
|
20
21
|
private readonly config;
|
|
21
22
|
private readonly fetch;
|
|
22
23
|
private readonly sleep;
|
|
23
24
|
private readonly random;
|
|
24
25
|
private readonly now;
|
|
26
|
+
private anthropicBearerAuth;
|
|
25
27
|
constructor(config: ArenaConfig, options?: HttpModelClientOptions);
|
|
26
28
|
private retryDelay;
|
|
29
|
+
private fetchWithHeadersTimeout;
|
|
27
30
|
private completionResponse;
|
|
28
31
|
stream(request: ModelRequest): AsyncIterable<ModelChunk>;
|
|
32
|
+
private streamAnthropic;
|
|
29
33
|
}
|
|
30
34
|
export declare function checkedFetch(connection: ApiConnection, pathname: string, init: RequestInit): Promise<Response>;
|
|
31
35
|
export {};
|
package/dist/provider.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { anthropicChunks, anthropicFallbackChunk, anthropicRequestBody, } from "./anthropic.js";
|
|
1
2
|
function withoutTrailingSlash(value) {
|
|
2
3
|
return value.replace(/\/+$/, "");
|
|
3
4
|
}
|
|
@@ -51,12 +52,20 @@ function wireContentPart(part) {
|
|
|
51
52
|
return { type: "text", text: String(part.text ?? "") };
|
|
52
53
|
}
|
|
53
54
|
function wireMessages(messages) {
|
|
54
|
-
return messages.map((message) =>
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
55
|
+
return messages.map((message) => {
|
|
56
|
+
if (message.role === "user" && Array.isArray(message.content)) {
|
|
57
|
+
return {
|
|
58
|
+
role: "user",
|
|
59
|
+
content: message.content.map((part) => wireContentPart(part)),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
if (message.role === "assistant" &&
|
|
63
|
+
(message.usage !== undefined || message.reasoning_details !== undefined)) {
|
|
64
|
+
const { usage: _usage, reasoning_details: _details, ...wire } = message;
|
|
65
|
+
return wire;
|
|
58
66
|
}
|
|
59
|
-
|
|
67
|
+
return message;
|
|
68
|
+
});
|
|
60
69
|
}
|
|
61
70
|
function stripProviderPrefix(model) {
|
|
62
71
|
const separator = model.indexOf("/");
|
|
@@ -108,11 +117,18 @@ export function resolveApiConnection(config, requestedModel = config.model) {
|
|
|
108
117
|
if (!apiKey) {
|
|
109
118
|
throw new Error(`No API key configured for ${provider}; set ARENA_API_KEY or the provider key`);
|
|
110
119
|
}
|
|
111
|
-
headers.authorization = `Bearer ${apiKey}`;
|
|
112
120
|
if (provider === "anthropic") {
|
|
121
|
+
// Anthropic authenticates with x-api-key; Authorization is deliberately
|
|
122
|
+
// omitted because some Anthropic-compatible gateways (e.g. DashScope's
|
|
123
|
+
// /apps/anthropic) hang when both headers are present. Gateways that
|
|
124
|
+
// expect a Bearer token instead (e.g. DashScope's claude-code-proxy) are
|
|
125
|
+
// handled by a one-time 401 fallback in the native client.
|
|
113
126
|
headers["x-api-key"] = apiKey;
|
|
114
127
|
headers["anthropic-version"] = "2023-06-01";
|
|
115
128
|
}
|
|
129
|
+
else {
|
|
130
|
+
headers.authorization = `Bearer ${apiKey}`;
|
|
131
|
+
}
|
|
116
132
|
return {
|
|
117
133
|
baseUrl: withoutTrailingSlash(baseUrl),
|
|
118
134
|
apiKey,
|
|
@@ -145,6 +161,47 @@ async function responseError(response) {
|
|
|
145
161
|
}
|
|
146
162
|
return new Error(`Model request failed (${response.status} ${response.statusText}): ${detail.slice(0, 2000)}`);
|
|
147
163
|
}
|
|
164
|
+
// Guards against streams that stay open but silently stop delivering bytes
|
|
165
|
+
// (observed on DashScope's /apps/anthropic gateway, which can send a single
|
|
166
|
+
// ping frame and then stall forever). The error carries a code the agent's
|
|
167
|
+
// stream-retry logic treats as a transient network fault.
|
|
168
|
+
export function withIdleTimeout(stream, timeoutMs) {
|
|
169
|
+
if (!timeoutMs || timeoutMs <= 0)
|
|
170
|
+
return stream;
|
|
171
|
+
const reader = stream.getReader();
|
|
172
|
+
return new ReadableStream({
|
|
173
|
+
async pull(controller) {
|
|
174
|
+
let timer;
|
|
175
|
+
try {
|
|
176
|
+
const result = await Promise.race([
|
|
177
|
+
reader.read(),
|
|
178
|
+
new Promise((_resolve, reject) => {
|
|
179
|
+
timer = setTimeout(() => {
|
|
180
|
+
const error = new Error(`model stream produced no data for ${timeoutMs}ms`);
|
|
181
|
+
error.code =
|
|
182
|
+
"ARENA_STREAM_IDLE_TIMEOUT";
|
|
183
|
+
reject(error);
|
|
184
|
+
}, timeoutMs);
|
|
185
|
+
}),
|
|
186
|
+
]);
|
|
187
|
+
if (result.done)
|
|
188
|
+
controller.close();
|
|
189
|
+
else
|
|
190
|
+
controller.enqueue(result.value);
|
|
191
|
+
}
|
|
192
|
+
catch (error) {
|
|
193
|
+
await reader.cancel().catch(() => undefined);
|
|
194
|
+
controller.error(error);
|
|
195
|
+
}
|
|
196
|
+
finally {
|
|
197
|
+
clearTimeout(timer);
|
|
198
|
+
}
|
|
199
|
+
},
|
|
200
|
+
cancel(reason) {
|
|
201
|
+
return reader.cancel(reason);
|
|
202
|
+
},
|
|
203
|
+
});
|
|
204
|
+
}
|
|
148
205
|
async function* parseSse(stream) {
|
|
149
206
|
const reader = stream.getReader();
|
|
150
207
|
const decoder = new TextDecoder();
|
|
@@ -181,6 +238,7 @@ async function* parseSse(stream) {
|
|
|
181
238
|
function fallbackChunk(value) {
|
|
182
239
|
const choices = (value.choices || []);
|
|
183
240
|
return {
|
|
241
|
+
usage: value.usage,
|
|
184
242
|
choices: choices.map((choice) => {
|
|
185
243
|
const message = (choice.message || {});
|
|
186
244
|
return {
|
|
@@ -201,6 +259,7 @@ export class HttpModelClient {
|
|
|
201
259
|
sleep;
|
|
202
260
|
random;
|
|
203
261
|
now;
|
|
262
|
+
anthropicBearerAuth = false;
|
|
204
263
|
constructor(config, options = {}) {
|
|
205
264
|
this.config = config;
|
|
206
265
|
this.fetch = options.fetch || globalThis.fetch.bind(globalThis);
|
|
@@ -219,13 +278,45 @@ export class HttpModelClient {
|
|
|
219
278
|
const exponential = Math.min(maximum, base * 2 ** Math.min(retry, 30));
|
|
220
279
|
return Math.floor(exponential * this.random());
|
|
221
280
|
}
|
|
281
|
+
// The same silent-stall guard as withIdleTimeout, but for the phase before
|
|
282
|
+
// response headers arrive — a gateway can also accept the request and never
|
|
283
|
+
// answer. The coded abort reason makes the agent's stream retry re-issue
|
|
284
|
+
// the turn instead of waiting on undici's five-minute default.
|
|
285
|
+
async fetchWithHeadersTimeout(url, init) {
|
|
286
|
+
const timeoutMs = this.config.modelStreamIdleTimeoutMs;
|
|
287
|
+
if (!timeoutMs || timeoutMs <= 0)
|
|
288
|
+
return this.fetch(url, init);
|
|
289
|
+
const outerSignal = init.signal ?? undefined;
|
|
290
|
+
const controller = new AbortController();
|
|
291
|
+
// The derived signal also governs the response body, so the outer abort
|
|
292
|
+
// listener must stay attached for the lifetime of the response — only the
|
|
293
|
+
// headers timer is cleared once headers arrive.
|
|
294
|
+
if (outerSignal) {
|
|
295
|
+
if (outerSignal.aborted)
|
|
296
|
+
controller.abort(outerSignal.reason);
|
|
297
|
+
else {
|
|
298
|
+
outerSignal.addEventListener("abort", () => controller.abort(outerSignal.reason), { once: true });
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
const timer = setTimeout(() => {
|
|
302
|
+
const error = new Error(`model response headers not received within ${timeoutMs}ms`);
|
|
303
|
+
error.code = "ARENA_STREAM_IDLE_TIMEOUT";
|
|
304
|
+
controller.abort(error);
|
|
305
|
+
}, timeoutMs);
|
|
306
|
+
try {
|
|
307
|
+
return await this.fetch(url, { ...init, signal: controller.signal });
|
|
308
|
+
}
|
|
309
|
+
finally {
|
|
310
|
+
clearTimeout(timer);
|
|
311
|
+
}
|
|
312
|
+
}
|
|
222
313
|
async completionResponse(url, init) {
|
|
223
314
|
const maxRetries = Math.max(0, Math.floor(this.config.modelMaxRetries ?? 5));
|
|
224
315
|
for (let retry = 0;; retry += 1) {
|
|
225
316
|
init.signal?.throwIfAborted();
|
|
226
317
|
let response;
|
|
227
318
|
try {
|
|
228
|
-
response = await this.
|
|
319
|
+
response = await this.fetchWithHeadersTimeout(url, init);
|
|
229
320
|
}
|
|
230
321
|
catch (error) {
|
|
231
322
|
if (init.signal?.aborted)
|
|
@@ -247,6 +338,13 @@ export class HttpModelClient {
|
|
|
247
338
|
}
|
|
248
339
|
async *stream(request) {
|
|
249
340
|
const connection = resolveApiConnection(this.config, request.model);
|
|
341
|
+
// Direct anthropic/ connections speak the native Messages protocol; the
|
|
342
|
+
// LiteLLM proxy path resolves to provider "litellm" and stays on the
|
|
343
|
+
// OpenAI-compatible wire format below.
|
|
344
|
+
if (connection.provider === "anthropic") {
|
|
345
|
+
yield* this.streamAnthropic(connection, request);
|
|
346
|
+
return;
|
|
347
|
+
}
|
|
250
348
|
const body = {
|
|
251
349
|
model: connection.model,
|
|
252
350
|
messages: wireMessages(request.messages),
|
|
@@ -255,6 +353,11 @@ export class HttpModelClient {
|
|
|
255
353
|
temperature: request.temperature,
|
|
256
354
|
max_tokens: request.maxTokens,
|
|
257
355
|
stream: true,
|
|
356
|
+
// Ask OpenAI-compatible services to report token usage on the final
|
|
357
|
+
// stream chunk so each assistant turn can be recorded with its real
|
|
358
|
+
// cost. Providers that reject the option can override it through
|
|
359
|
+
// ARENA_EXTRA_BODY, which is merged after this body is built.
|
|
360
|
+
stream_options: { include_usage: true },
|
|
258
361
|
};
|
|
259
362
|
if (request.enableThinking) {
|
|
260
363
|
if (connection.liteLlmProxy) {
|
|
@@ -286,12 +389,46 @@ export class HttpModelClient {
|
|
|
286
389
|
throw await responseError(response);
|
|
287
390
|
if (response.body &&
|
|
288
391
|
(response.headers.get("content-type") || "").includes("text/event-stream")) {
|
|
289
|
-
yield* parseSse(response.body);
|
|
392
|
+
yield* parseSse(withIdleTimeout(response.body, this.config.modelStreamIdleTimeoutMs));
|
|
290
393
|
return;
|
|
291
394
|
}
|
|
292
395
|
const value = (await response.json());
|
|
293
396
|
yield fallbackChunk(value);
|
|
294
397
|
}
|
|
398
|
+
async *streamAnthropic(connection, request) {
|
|
399
|
+
const body = anthropicRequestBody(request, connection.model);
|
|
400
|
+
if (process.env.ARENA_EXTRA_BODY) {
|
|
401
|
+
const extra = JSON.parse(process.env.ARENA_EXTRA_BODY);
|
|
402
|
+
Object.assign(body, extra);
|
|
403
|
+
}
|
|
404
|
+
const url = apiEndpoint(connection, "/messages");
|
|
405
|
+
const bearerHeaders = {
|
|
406
|
+
"anthropic-version": "2023-06-01",
|
|
407
|
+
authorization: `Bearer ${connection.apiKey}`,
|
|
408
|
+
};
|
|
409
|
+
const send = (headers) => this.completionResponse(url, {
|
|
410
|
+
method: "POST",
|
|
411
|
+
headers: { "content-type": "application/json", ...headers },
|
|
412
|
+
body: JSON.stringify(body),
|
|
413
|
+
signal: request.signal,
|
|
414
|
+
});
|
|
415
|
+
let response = await send(this.anthropicBearerAuth ? bearerHeaders : connection.headers);
|
|
416
|
+
if (response.status === 401 && !this.anthropicBearerAuth) {
|
|
417
|
+
// Anthropic-compatible gateways that authenticate with a Bearer token
|
|
418
|
+
// reject x-api-key with a 401; switch auth styles once and remember.
|
|
419
|
+
await response.body?.cancel().catch(() => undefined);
|
|
420
|
+
this.anthropicBearerAuth = true;
|
|
421
|
+
response = await send(bearerHeaders);
|
|
422
|
+
}
|
|
423
|
+
if (!response.ok)
|
|
424
|
+
throw await responseError(response);
|
|
425
|
+
if (response.body &&
|
|
426
|
+
(response.headers.get("content-type") || "").includes("text/event-stream")) {
|
|
427
|
+
yield* anthropicChunks(withIdleTimeout(response.body, this.config.modelStreamIdleTimeoutMs));
|
|
428
|
+
return;
|
|
429
|
+
}
|
|
430
|
+
yield anthropicFallbackChunk((await response.json()));
|
|
431
|
+
}
|
|
295
432
|
}
|
|
296
433
|
export async function checkedFetch(connection, pathname, init) {
|
|
297
434
|
const response = await fetch(apiEndpoint(connection, pathname), {
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -137,7 +137,7 @@ function clientLocation(value) {
|
|
|
137
137
|
return Object.keys(result).length ? result : undefined;
|
|
138
138
|
}
|
|
139
139
|
function sessionRoot(context, sessionId) {
|
|
140
|
-
return sessionStorageRoot(context.
|
|
140
|
+
return sessionStorageRoot(context.config.stateRoot, context.config.tenantId, sessionId);
|
|
141
141
|
}
|
|
142
142
|
function sessionPaths(context, sessionId) {
|
|
143
143
|
const root = sessionRoot(context, sessionId);
|