zelari-code 2.35.0 → 2.36.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli/anthropicOAuth.js +1 -1
- package/dist/cli/anthropicOAuth.js.map +1 -1
- package/dist/cli/desktopConfig.js +18 -3
- package/dist/cli/desktopConfig.js.map +1 -1
- package/dist/cli/hooks/useSlashDispatch.js +1 -0
- package/dist/cli/hooks/useSlashDispatch.js.map +1 -1
- package/dist/cli/keyStore.js +3 -7
- package/dist/cli/keyStore.js.map +1 -1
- package/dist/cli/main.bundled.js +398 -46
- package/dist/cli/main.bundled.js.map +4 -4
- package/dist/cli/provider/chatgpt.js +1 -1
- package/dist/cli/provider/chatgpt.js.map +1 -1
- package/dist/cli/provider/resolveStream.js +8 -0
- package/dist/cli/provider/resolveStream.js.map +1 -1
- package/dist/cli/provider/responsesApi.js +281 -0
- package/dist/cli/provider/responsesApi.js.map +1 -0
- package/dist/cli/providerConfig.js +49 -0
- package/dist/cli/providerConfig.js.map +1 -1
- package/dist/cli/refreshRegistry.js +78 -0
- package/dist/cli/refreshRegistry.js.map +1 -1
- package/dist/cli/slashCommands.js +18 -0
- package/dist/cli/slashCommands.js.map +1 -1
- package/dist/cli/slashHandlers/provider.js +11 -1
- package/dist/cli/slashHandlers/provider.js.map +1 -1
- package/dist/cli/thinking.js +5 -4
- package/dist/cli/thinking.js.map +1 -1
- package/dist/cli/thinkingCapability.js +7 -2
- package/dist/cli/thinkingCapability.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatgpt.js","sourceRoot":"","sources":["../../../src/cli/provider/chatgpt.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,2BAA2B,EAC3B,uBAAuB,EACvB,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAE5D,SAAS,OAAO,CAAC,MAA8B;IAC7C,MAAM,CAAC,GAA2B;QAChC,cAAc,EAAE,kBAAkB;QAClC,MAAM,EAAE,mBAAmB;QAC3B,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;QACxC,aAAa,EAAE,wBAAwB;KACxC,CAAC;IACF,IAAI,MAAM,CAAC,SAAS;QAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC;IACjE,IAAI,MAAM,CAAC,YAAY;QAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAC/D,OAAO,CAAC,CAAC;AACX,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"chatgpt.js","sourceRoot":"","sources":["../../../src/cli/provider/chatgpt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
import { openaiCompatibleProvider, } from './openai-compatible.js';
|
|
2
2
|
import { anthropicMessagesProvider } from './anthropic.js';
|
|
3
3
|
import { chatgptResponsesProvider } from './chatgpt.js';
|
|
4
|
+
import { responsesApiProvider } from './responsesApi.js';
|
|
5
|
+
import { getApiStyleFor } from '../providerConfig.js';
|
|
4
6
|
export function buildProviderStream(config) {
|
|
5
7
|
if (config.providerId === 'anthropic')
|
|
6
8
|
return anthropicMessagesProvider(config);
|
|
7
9
|
if (config.providerId === 'chatgpt')
|
|
8
10
|
return chatgptResponsesProvider(config);
|
|
11
|
+
// Endpoint-style override: any OpenAI-compatible provider can be switched
|
|
12
|
+
// to the Responses API (`POST /responses`) via `/provider api responses`.
|
|
13
|
+
// The selection is persisted per-provider (providerConfig.apiStyleByProvider).
|
|
14
|
+
if (getApiStyleFor(config.providerId) === 'responses') {
|
|
15
|
+
return responsesApiProvider(config);
|
|
16
|
+
}
|
|
9
17
|
return openaiCompatibleProvider(config);
|
|
10
18
|
}
|
|
11
19
|
//# sourceMappingURL=resolveStream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveStream.js","sourceRoot":"","sources":["../../../src/cli/provider/resolveStream.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,wBAAwB,GAEzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"resolveStream.js","sourceRoot":"","sources":["../../../src/cli/provider/resolveStream.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,wBAAwB,GAEzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,UAAU,mBAAmB,CAAC,MAA8B;IAChE,IAAI,MAAM,CAAC,UAAU,KAAK,WAAW;QAAE,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAChF,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;QAAE,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC7E,0EAA0E;IAC1E,0EAA0E;IAC1E,+EAA+E;IAC/E,IAAI,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,WAAW,EAAE,CAAC;QACtD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,wBAAwB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}
|
|
@@ -0,0 +1,281 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OpenAI Responses API transport for OpenAI-compatible providers.
|
|
3
|
+
*
|
|
4
|
+
* Any provider routed through `openaiCompatibleProvider` (openai-compatible,
|
|
5
|
+
* custom, grok, glm, minimax, deepseek) can be switched to the Responses API
|
|
6
|
+
* (`POST {baseUrl}/responses`) with `/provider api responses`. Selection is
|
|
7
|
+
* persisted per-provider in providerConfig (`apiStyleByProvider`) and applied
|
|
8
|
+
* by `resolveStream.buildProviderStream`.
|
|
9
|
+
*
|
|
10
|
+
* Differences from the ChatGPT OAuth transport (`chatgpt.ts`):
|
|
11
|
+
* - Plain `Authorization: Bearer <apiKey>` (no ChatGPT-Account-Id /
|
|
12
|
+
* OpenAI-Beta headers — those stay exclusive to the OAuth flow).
|
|
13
|
+
* - baseUrl comes from the resolved provider endpoint (custom endpoint /
|
|
14
|
+
* OPENAI_BASE_URL already work through `resolveBaseUrl`).
|
|
15
|
+
* - Sends `temperature` and `max_output_tokens` from the capability
|
|
16
|
+
* profile + per-request generation overrides.
|
|
17
|
+
* - Transient retry (429/5xx/network) with exponential backoff, same
|
|
18
|
+
* policy as openai-compatible.ts.
|
|
19
|
+
*
|
|
20
|
+
* Message mapping (`toInput`) and the SSE event loop are shared with
|
|
21
|
+
* chatgpt.ts — the Responses wire format is identical.
|
|
22
|
+
*/
|
|
23
|
+
import { PROVIDER_CONNECT_TIMEOUT_MS, PROVIDER_STREAM_IDLE_MS, PROVIDER_STREAM_MAX_MS, readChunkWithTimeout, } from './openai-compatible.js';
|
|
24
|
+
import { toInput } from './chatgpt.js';
|
|
25
|
+
import { translateResponsesThinking } from '../thinking.js';
|
|
26
|
+
import { capabilitiesFor } from './capabilities.js';
|
|
27
|
+
const RETRYABLE_STATUSES = new Set([429, 500, 502, 503, 504]);
|
|
28
|
+
const MAX_RETRIES = (() => {
|
|
29
|
+
const raw = process.env.ZELARI_PROVIDER_MAX_RETRIES;
|
|
30
|
+
const n = raw ? Number.parseInt(raw, 10) : 3;
|
|
31
|
+
return Number.isFinite(n) && n >= 0 ? n : 3;
|
|
32
|
+
})();
|
|
33
|
+
const BACKOFF_BASE_MS = 500;
|
|
34
|
+
const BACKOFF_CAP_MS = 8000;
|
|
35
|
+
function backoffDelay(attempt, retryAfterHeader) {
|
|
36
|
+
if (retryAfterHeader) {
|
|
37
|
+
const seconds = Number.parseFloat(retryAfterHeader);
|
|
38
|
+
if (Number.isFinite(seconds) && seconds >= 0) {
|
|
39
|
+
return Math.min(seconds * 1000, BACKOFF_CAP_MS);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return Math.min(BACKOFF_BASE_MS * 2 ** attempt, BACKOFF_CAP_MS);
|
|
43
|
+
}
|
|
44
|
+
/** Sleep that resolves early when the caller's signal fires. */
|
|
45
|
+
function abortableSleep(ms, signal) {
|
|
46
|
+
return new Promise((resolve) => {
|
|
47
|
+
if (signal?.aborted)
|
|
48
|
+
return resolve();
|
|
49
|
+
const t = setTimeout(resolve, ms);
|
|
50
|
+
signal?.addEventListener('abort', () => {
|
|
51
|
+
clearTimeout(t);
|
|
52
|
+
resolve();
|
|
53
|
+
}, { once: true });
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
function headers(config) {
|
|
57
|
+
const h = {
|
|
58
|
+
'Content-Type': 'application/json',
|
|
59
|
+
Accept: 'text/event-stream',
|
|
60
|
+
Authorization: `Bearer ${config.apiKey}`,
|
|
61
|
+
};
|
|
62
|
+
if (config.extraHeaders)
|
|
63
|
+
Object.assign(h, config.extraHeaders);
|
|
64
|
+
return h;
|
|
65
|
+
}
|
|
66
|
+
export function responsesApiProvider(config) {
|
|
67
|
+
return async function* (params) {
|
|
68
|
+
const capabilities = capabilitiesFor(params.model, config.providerId);
|
|
69
|
+
const { instructions, input } = toInput(params.messages);
|
|
70
|
+
const body = {
|
|
71
|
+
model: params.model,
|
|
72
|
+
stream: true,
|
|
73
|
+
input,
|
|
74
|
+
};
|
|
75
|
+
if (instructions)
|
|
76
|
+
body.instructions = instructions;
|
|
77
|
+
if (params.tools && params.tools.length > 0) {
|
|
78
|
+
body.tools = params.tools.map((t) => ({
|
|
79
|
+
type: 'function',
|
|
80
|
+
name: t.name,
|
|
81
|
+
description: t.description,
|
|
82
|
+
parameters: t.parameters,
|
|
83
|
+
}));
|
|
84
|
+
}
|
|
85
|
+
// Sampling params mirror openai-compatible.ts: per-request generation
|
|
86
|
+
// overrides win, else the capability-profile defaults.
|
|
87
|
+
const generation = params.generation;
|
|
88
|
+
body.temperature = generation?.temperature ?? capabilities.sampling.temperature;
|
|
89
|
+
const maxTokens = generation?.maxTokens ?? capabilities.maxOutputTokens;
|
|
90
|
+
if (typeof maxTokens === 'number' && maxTokens > 0) {
|
|
91
|
+
body.max_output_tokens = maxTokens;
|
|
92
|
+
}
|
|
93
|
+
// Unified thinking-effort selection (ADR-0017). The provider id drives
|
|
94
|
+
// the clamp ladder so 'max' survives on openai-compatible / custom.
|
|
95
|
+
const thinkingSpec = config.thinking ?? 'auto';
|
|
96
|
+
if (thinkingSpec !== 'auto') {
|
|
97
|
+
const t = translateResponsesThinking(thinkingSpec, config.model, config.providerId);
|
|
98
|
+
if (t.degraded) {
|
|
99
|
+
console.warn(`[thinking] ${t.note ?? 'unsupported'} — falling back to provider default.`);
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
Object.assign(body, t.patch);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
const base = config.baseUrl.replace(/\/$/, '');
|
|
106
|
+
const url = `${base}/responses`;
|
|
107
|
+
let response;
|
|
108
|
+
let lastStatus = 0;
|
|
109
|
+
let lastErrText = '';
|
|
110
|
+
for (let attempt = 0;; attempt++) {
|
|
111
|
+
// CONNECT-only timeout (policy identical to openai-compatible.ts).
|
|
112
|
+
const connectController = new AbortController();
|
|
113
|
+
const connectTimer = setTimeout(() => connectController.abort(new Error(`Provider connect timeout after ${Math.round(PROVIDER_CONNECT_TIMEOUT_MS / 1000)}s ` +
|
|
114
|
+
`(no response headers). Override ZELARI_PROVIDER_CONNECT_TIMEOUT_MS.`)), PROVIDER_CONNECT_TIMEOUT_MS);
|
|
115
|
+
const signals = [connectController.signal];
|
|
116
|
+
if (params.signal)
|
|
117
|
+
signals.push(params.signal);
|
|
118
|
+
try {
|
|
119
|
+
response = await fetch(url, {
|
|
120
|
+
method: 'POST',
|
|
121
|
+
headers: headers(config),
|
|
122
|
+
body: JSON.stringify(body),
|
|
123
|
+
signal: signals.length === 1 ? signals[0] : AbortSignal.any(signals),
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
catch (err) {
|
|
127
|
+
lastStatus = 0;
|
|
128
|
+
lastErrText = err instanceof Error ? err.message : String(err);
|
|
129
|
+
if (params.signal?.aborted) {
|
|
130
|
+
yield { kind: 'error', message: 'aborted' };
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (attempt < MAX_RETRIES) {
|
|
134
|
+
await abortableSleep(backoffDelay(attempt, null), params.signal);
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
yield { kind: 'error', message: `Network error: ${lastErrText}` };
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
clearTimeout(connectTimer);
|
|
142
|
+
}
|
|
143
|
+
if (response.ok && response.body)
|
|
144
|
+
break;
|
|
145
|
+
lastStatus = response.status;
|
|
146
|
+
lastErrText = await response.text().catch(() => '');
|
|
147
|
+
if (!RETRYABLE_STATUSES.has(response.status) || attempt >= MAX_RETRIES)
|
|
148
|
+
break;
|
|
149
|
+
await abortableSleep(backoffDelay(attempt, response.headers.get('retry-after')), params.signal);
|
|
150
|
+
if (params.signal?.aborted) {
|
|
151
|
+
yield { kind: 'error', message: 'aborted' };
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (!response || !response.ok || !response.body) {
|
|
156
|
+
const msg = lastStatus === 0
|
|
157
|
+
? `Network error: ${lastErrText}`
|
|
158
|
+
: `HTTP ${lastStatus}: ${lastErrText.slice(0, 240)}`;
|
|
159
|
+
yield { kind: 'error', message: msg };
|
|
160
|
+
return;
|
|
161
|
+
}
|
|
162
|
+
// SSE event loop — identical to chatgpt.ts (same wire format).
|
|
163
|
+
const reader = response.body.getReader();
|
|
164
|
+
const decoder = new TextDecoder();
|
|
165
|
+
let buffer = '';
|
|
166
|
+
const tools = new Map();
|
|
167
|
+
let emittedTool = false;
|
|
168
|
+
const flush = function* (id) {
|
|
169
|
+
const t = tools.get(id);
|
|
170
|
+
if (!t?.name)
|
|
171
|
+
return;
|
|
172
|
+
let args = {};
|
|
173
|
+
try {
|
|
174
|
+
args = JSON.parse(t.argsJson || '{}');
|
|
175
|
+
}
|
|
176
|
+
catch {
|
|
177
|
+
args = {};
|
|
178
|
+
}
|
|
179
|
+
tools.delete(id);
|
|
180
|
+
emittedTool = true;
|
|
181
|
+
yield { kind: 'tool_call', toolCallId: t.id, toolName: t.name, args };
|
|
182
|
+
};
|
|
183
|
+
const streamStartedAt = Date.now();
|
|
184
|
+
let lastUsefulAt = streamStartedAt;
|
|
185
|
+
const streamDeadline = streamStartedAt + PROVIDER_STREAM_MAX_MS;
|
|
186
|
+
try {
|
|
187
|
+
while (true) {
|
|
188
|
+
const { value, done } = await readChunkWithTimeout(reader, {
|
|
189
|
+
idleMs: PROVIDER_STREAM_IDLE_MS,
|
|
190
|
+
deadlineMs: streamDeadline,
|
|
191
|
+
signal: params.signal,
|
|
192
|
+
lastUsefulAt: () => lastUsefulAt,
|
|
193
|
+
});
|
|
194
|
+
if (done)
|
|
195
|
+
break;
|
|
196
|
+
buffer += decoder.decode(value, { stream: true });
|
|
197
|
+
const lines = buffer.split('\n');
|
|
198
|
+
buffer = lines.pop() ?? '';
|
|
199
|
+
for (const line of lines) {
|
|
200
|
+
const trimmed = line.trim();
|
|
201
|
+
if (!trimmed.startsWith('data:'))
|
|
202
|
+
continue;
|
|
203
|
+
const data = trimmed.slice(5).trim();
|
|
204
|
+
if (!data || data === '[DONE]')
|
|
205
|
+
continue;
|
|
206
|
+
let ev;
|
|
207
|
+
try {
|
|
208
|
+
ev = JSON.parse(data);
|
|
209
|
+
}
|
|
210
|
+
catch {
|
|
211
|
+
continue;
|
|
212
|
+
}
|
|
213
|
+
const type = typeof ev.type === 'string' ? ev.type : '';
|
|
214
|
+
if (type)
|
|
215
|
+
lastUsefulAt = Date.now();
|
|
216
|
+
if (type === 'response.output_text.delta' && typeof ev.delta === 'string') {
|
|
217
|
+
yield { kind: 'text', delta: ev.delta };
|
|
218
|
+
}
|
|
219
|
+
else if (type === 'response.reasoning_text.delta' && typeof ev.delta === 'string') {
|
|
220
|
+
yield { kind: 'thinking', delta: ev.delta };
|
|
221
|
+
}
|
|
222
|
+
else if (type === 'response.output_item.added') {
|
|
223
|
+
const item = ev.item;
|
|
224
|
+
if (item?.type === 'function_call') {
|
|
225
|
+
const id = String(item.call_id ?? item.id ?? `fc-${tools.size}`);
|
|
226
|
+
tools.set(id, {
|
|
227
|
+
id,
|
|
228
|
+
name: typeof item.name === 'string' ? item.name : '',
|
|
229
|
+
argsJson: typeof item.arguments === 'string' ? item.arguments : '',
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
else if (type === 'response.function_call_arguments.delta') {
|
|
234
|
+
const itemId = String(ev.item_id ?? ev.call_id ?? '');
|
|
235
|
+
const existing = itemId ? tools.get(itemId) : [...tools.values()].at(-1);
|
|
236
|
+
if (existing && typeof ev.delta === 'string')
|
|
237
|
+
existing.argsJson += ev.delta;
|
|
238
|
+
}
|
|
239
|
+
else if (type === 'response.output_item.done') {
|
|
240
|
+
const item = ev.item;
|
|
241
|
+
if (item?.type === 'function_call') {
|
|
242
|
+
const id = String(item.call_id ?? item.id ?? '');
|
|
243
|
+
if (id)
|
|
244
|
+
yield* flush(id);
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
else if (type === 'response.completed') {
|
|
248
|
+
const usage = ev.response?.usage;
|
|
249
|
+
if (usage) {
|
|
250
|
+
yield {
|
|
251
|
+
kind: 'usage',
|
|
252
|
+
usage: {
|
|
253
|
+
promptTokens: usage.input_tokens ?? usage.prompt_tokens ?? 0,
|
|
254
|
+
completionTokens: usage.output_tokens ?? usage.completion_tokens ?? 0,
|
|
255
|
+
totalTokens: usage.total_tokens ??
|
|
256
|
+
(usage.input_tokens ?? 0) + (usage.output_tokens ?? 0),
|
|
257
|
+
},
|
|
258
|
+
};
|
|
259
|
+
}
|
|
260
|
+
yield { kind: 'finish', reason: emittedTool ? 'tool_calls' : 'stop' };
|
|
261
|
+
return;
|
|
262
|
+
}
|
|
263
|
+
else if (type === 'response.failed' || type === 'error') {
|
|
264
|
+
const msg = typeof ev.message === 'string'
|
|
265
|
+
? ev.message
|
|
266
|
+
: JSON.stringify(ev.error ?? ev).slice(0, 200);
|
|
267
|
+
yield { kind: 'error', message: msg };
|
|
268
|
+
return;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
for (const id of [...tools.keys()])
|
|
273
|
+
yield* flush(id);
|
|
274
|
+
yield { kind: 'finish', reason: emittedTool ? 'tool_calls' : 'stop' };
|
|
275
|
+
}
|
|
276
|
+
finally {
|
|
277
|
+
reader.releaseLock();
|
|
278
|
+
}
|
|
279
|
+
};
|
|
280
|
+
}
|
|
281
|
+
//# sourceMappingURL=responsesApi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"responsesApi.js","sourceRoot":"","sources":["../../../src/cli/provider/responsesApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,7 @@ function mergeStoredProviderConfig(parsed) {
|
|
|
66
66
|
modelByProvider: { ...DEFAULTS.modelByProvider, ...parsed.modelByProvider },
|
|
67
67
|
thinkingByProvider: { ...DEFAULTS.thinkingByProvider, ...parsed.thinkingByProvider },
|
|
68
68
|
customEndpoints: mergeCustomEndpoints(parsed.customEndpoints),
|
|
69
|
+
apiStyleByProvider: mergeApiStyles(parsed.apiStyleByProvider),
|
|
69
70
|
krakenVerifier: mergeKrakenVerifier(parsed.krakenVerifier),
|
|
70
71
|
};
|
|
71
72
|
}
|
|
@@ -80,6 +81,24 @@ function cloneDefaults() {
|
|
|
80
81
|
customEndpoints: { ...DEFAULTS.customEndpoints },
|
|
81
82
|
};
|
|
82
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* Sanitize a parsed `apiStyleByProvider` blob: keep only known provider ids
|
|
86
|
+
* with value 'responses' ('chat' entries are dropped — absent means chat).
|
|
87
|
+
*/
|
|
88
|
+
function mergeApiStyles(raw) {
|
|
89
|
+
if (!raw || typeof raw !== 'object')
|
|
90
|
+
return {};
|
|
91
|
+
const result = {};
|
|
92
|
+
const validIds = new Set(PROVIDERS.map((p) => p.id));
|
|
93
|
+
for (const [key, value] of Object.entries(raw)) {
|
|
94
|
+
if (!validIds.has(key))
|
|
95
|
+
continue;
|
|
96
|
+
if (value !== 'responses')
|
|
97
|
+
continue;
|
|
98
|
+
result[key] = 'responses';
|
|
99
|
+
}
|
|
100
|
+
return result;
|
|
101
|
+
}
|
|
83
102
|
/**
|
|
84
103
|
* Apply env overrides (ANATHEMA_ACTIVE_PROVIDER, OPENAI_MODEL) on top of a
|
|
85
104
|
* resolved config — always last, so env wins over both file and defaults.
|
|
@@ -177,6 +196,36 @@ export function clearCustomEndpoint(id) {
|
|
|
177
196
|
delete config.customEndpoints[id];
|
|
178
197
|
writeProviderConfig(config);
|
|
179
198
|
}
|
|
199
|
+
/**
|
|
200
|
+
* Return the HTTP endpoint style for a provider ('chat' | 'responses').
|
|
201
|
+
* Absent entry or unknown provider → 'chat' (the legacy default).
|
|
202
|
+
*/
|
|
203
|
+
export function getApiStyleFor(id) {
|
|
204
|
+
return getProviderConfig().apiStyleByProvider?.[id] === 'responses'
|
|
205
|
+
? 'responses'
|
|
206
|
+
: 'chat';
|
|
207
|
+
}
|
|
208
|
+
/**
|
|
209
|
+
* Select the HTTP endpoint style for a provider (`/provider api`).
|
|
210
|
+
* 'chat' removes the override (falls back to the default transport).
|
|
211
|
+
*/
|
|
212
|
+
export function setApiStyleFor(id, style) {
|
|
213
|
+
const spec = PROVIDERS.find((p) => p.id === id);
|
|
214
|
+
if (!spec) {
|
|
215
|
+
throw new Error(`Unknown provider id: "${id}". Available: ${PROVIDERS.map((p) => p.id).join(', ')}`);
|
|
216
|
+
}
|
|
217
|
+
if (style !== 'chat' && style !== 'responses') {
|
|
218
|
+
throw new Error(`Invalid api style: "${style}". Use 'chat' or 'responses'.`);
|
|
219
|
+
}
|
|
220
|
+
const config = getProviderConfig();
|
|
221
|
+
if (!config.apiStyleByProvider)
|
|
222
|
+
config.apiStyleByProvider = {};
|
|
223
|
+
if (style === 'chat')
|
|
224
|
+
delete config.apiStyleByProvider[id];
|
|
225
|
+
else
|
|
226
|
+
config.apiStyleByProvider[id] = 'responses';
|
|
227
|
+
writeProviderConfig(config);
|
|
228
|
+
}
|
|
180
229
|
/**
|
|
181
230
|
* Sanitize a parsed `krakenVerifier` blob. Drops anything that is not a
|
|
182
231
|
* complete, valid override (both provider+model, known provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerConfig.js","sourceRoot":"","sources":["../../src/cli/providerConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"providerConfig.js","sourceRoot":"","sources":["../../src/cli/providerConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,4 +88,82 @@ export function registerDefaultRefreshImpls() {
|
|
|
88
88
|
if (!registry.has('anthropic'))
|
|
89
89
|
registry.set('anthropic', anthropicRefreshAdapter);
|
|
90
90
|
}
|
|
91
|
+
/**
|
|
92
|
+
* Thrown when the upstream IdP rejects the refresh token (invalid_grant): the
|
|
93
|
+
* stored credential is dead and the only fix is a fresh `/login <id>`.
|
|
94
|
+
* Distinct from transient failures (network, 5xx, 429) where the stale access
|
|
95
|
+
* token may still work and a later retry can succeed.
|
|
96
|
+
*
|
|
97
|
+
* Mirrors OpenClaw's refresh-token-reuse detection (MIT): refresh tokens are
|
|
98
|
+
* single-use, so when two concurrent refreshes race, the loser receives
|
|
99
|
+
* invalid_grant — without this signal the loser wrongly concludes "logged out".
|
|
100
|
+
*/
|
|
101
|
+
export class RefreshRejectedError extends Error {
|
|
102
|
+
providerId;
|
|
103
|
+
cause;
|
|
104
|
+
/** Marker callers can check without importing the class. */
|
|
105
|
+
reloginRequired = true;
|
|
106
|
+
constructor(message, providerId, cause) {
|
|
107
|
+
super(message);
|
|
108
|
+
this.providerId = providerId;
|
|
109
|
+
this.cause = cause;
|
|
110
|
+
this.name = 'RefreshRejectedError';
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
/** Type guard: did a refresh fail because the stored credential is dead? */
|
|
114
|
+
export function isRefreshRejected(err) {
|
|
115
|
+
if (err instanceof RefreshRejectedError)
|
|
116
|
+
return true;
|
|
117
|
+
return (typeof err === 'object' &&
|
|
118
|
+
err !== null &&
|
|
119
|
+
err.reloginRequired === true);
|
|
120
|
+
}
|
|
121
|
+
function normalizeRefreshError(providerId, err) {
|
|
122
|
+
const code = err?.code;
|
|
123
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
124
|
+
if (code === 'invalid_grant' || message.includes('invalid_grant')) {
|
|
125
|
+
return new RefreshRejectedError(`${providerId}: refresh token rejected (invalid_grant) — run /login ${providerId} to re-authenticate`, providerId, err);
|
|
126
|
+
}
|
|
127
|
+
return err;
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* In-flight refresh per provider (OpenClaw-style serialization): concurrent
|
|
131
|
+
* callers for the SAME provider share one impl call instead of racing two
|
|
132
|
+
* refresh-token exchanges. Anthropic and OpenAI rotate refresh tokens on every
|
|
133
|
+
* exchange, so an unserialized race burns one of the two tokens — the classic
|
|
134
|
+
* reuse trap this map prevents.
|
|
135
|
+
*/
|
|
136
|
+
const inflightRefresh = new Map();
|
|
137
|
+
/**
|
|
138
|
+
* Run the registered refresh impl for `id`, serialized per provider.
|
|
139
|
+
*
|
|
140
|
+
* - No impl registered → throws the same "No refresh impl registered" error
|
|
141
|
+
* `defaultRefreshImpl` in keyStore used to produce (callers/tests match).
|
|
142
|
+
* - Concurrent calls for the same provider id share the single in-flight
|
|
143
|
+
* exchange and observe the same outcome.
|
|
144
|
+
* - `invalid_grant`-shaped failures are normalized to `RefreshRejectedError`
|
|
145
|
+
* so callers can tell "re-login required" apart from transient errors.
|
|
146
|
+
*/
|
|
147
|
+
export async function runRefreshImpl(id, refreshToken) {
|
|
148
|
+
const existing = inflightRefresh.get(id);
|
|
149
|
+
if (existing)
|
|
150
|
+
return existing;
|
|
151
|
+
const impl = getRefreshImpl(id);
|
|
152
|
+
if (!impl) {
|
|
153
|
+
throw new Error(`No refresh impl registered for provider "${id}"`);
|
|
154
|
+
}
|
|
155
|
+
const run = Promise.resolve()
|
|
156
|
+
.then(() => impl(id, refreshToken))
|
|
157
|
+
.catch((err) => {
|
|
158
|
+
throw normalizeRefreshError(id, err);
|
|
159
|
+
});
|
|
160
|
+
inflightRefresh.set(id, run);
|
|
161
|
+
void run
|
|
162
|
+
.finally(() => {
|
|
163
|
+
if (inflightRefresh.get(id) === run)
|
|
164
|
+
inflightRefresh.delete(id);
|
|
165
|
+
})
|
|
166
|
+
.catch(() => undefined);
|
|
167
|
+
return run;
|
|
168
|
+
}
|
|
91
169
|
//# sourceMappingURL=refreshRegistry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshRegistry.js","sourceRoot":"","sources":["../../src/cli/refreshRegistry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAqB5D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA6B,CAAC;AAEtD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,EAAgB,EAAE,IAAwB;IAC5E,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,sDAAsD;AACtD,MAAM,UAAU,qBAAqB,CAAC,EAAgB;IACpD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACtB,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,cAAc,CAAC,EAAgB;IAC7C,OAAO,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;AAClC,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,gBAAgB;IAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;AACrC,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,oBAAoB;IAClC,QAAQ,CAAC,KAAK,EAAE,CAAC;AACnB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAgB,KAAK,EAClD,WAAW,EACX,YAAY,EACZ,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IACrD,MAAM,QAAQ,GAAG,WAAW,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QAC3D,CAAC,CAAC,WAAW;QACb,CAAC,CAAC,4BAA4B,CAAC;IACjC,OAAO,gBAAgB,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAgB,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE;IACpF,OAAO,mBAAmB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAgB,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE;IACtF,OAAO,qBAAqB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAC;AACjD,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,UAAU,2BAA2B;IACzC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACpE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC;QAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAC7E,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;QAAE,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC;AACrF,CAAC"}
|
|
1
|
+
{"version":3,"file":"refreshRegistry.js","sourceRoot":"","sources":["../../src/cli/refreshRegistry.ts"],"names":[],"mappings":"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"}
|
|
@@ -237,6 +237,24 @@ export function handleSlashCommand(text, availableSkills) {
|
|
|
237
237
|
customEndpoint: url,
|
|
238
238
|
};
|
|
239
239
|
}
|
|
240
|
+
if (subcommand === 'api') {
|
|
241
|
+
const target = args[1];
|
|
242
|
+
if (!target || target === 'show') {
|
|
243
|
+
return {
|
|
244
|
+
handled: true,
|
|
245
|
+
kind: 'provider_custom',
|
|
246
|
+
message: 'Usage: /provider api chat — POST /chat/completions (default)\n /provider api responses — POST /responses (OpenAI Responses API)\nApplies to the active provider; chatgpt/anthropic have a fixed transport.',
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
if (target !== 'chat' && target !== 'responses') {
|
|
250
|
+
return {
|
|
251
|
+
handled: true,
|
|
252
|
+
kind: 'provider_custom',
|
|
253
|
+
message: `[provider] unknown api style: ${target}. Use: chat | responses`,
|
|
254
|
+
};
|
|
255
|
+
}
|
|
256
|
+
return { handled: true, kind: 'provider_custom', apiStyle: target };
|
|
257
|
+
}
|
|
240
258
|
// v3-F: /provider <id> refresh | status subcommands.
|
|
241
259
|
// subcommand is the provider id here; args[1] is the sub-subcommand.
|
|
242
260
|
const providerId = subcommand;
|