zelari-code 1.33.2 → 1.34.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/README.md +2 -2
- package/dist/cli/anthropicOAuth.js +153 -0
- package/dist/cli/anthropicOAuth.js.map +1 -0
- package/dist/cli/app.js +3 -1
- package/dist/cli/app.js.map +1 -1
- package/dist/cli/chatgptOAuth.js +245 -0
- package/dist/cli/chatgptOAuth.js.map +1 -0
- package/dist/cli/desktopConfig.js +66 -2
- package/dist/cli/desktopConfig.js.map +1 -1
- package/dist/cli/hooks/useChatTurn.js +6 -5
- package/dist/cli/hooks/useChatTurn.js.map +1 -1
- package/dist/cli/hooks/useSlashDispatch.js +4 -3
- package/dist/cli/hooks/useSlashDispatch.js.map +1 -1
- package/dist/cli/keyStore.js +52 -4
- package/dist/cli/keyStore.js.map +1 -1
- package/dist/cli/main.bundled.js +2861 -1381
- package/dist/cli/main.bundled.js.map +4 -4
- package/dist/cli/main.js +60 -1
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/modelDiscovery.js +106 -7
- package/dist/cli/modelDiscovery.js.map +1 -1
- package/dist/cli/modelPricing.js +9 -0
- package/dist/cli/modelPricing.js.map +1 -1
- package/dist/cli/oauthDesktop.js +136 -0
- package/dist/cli/oauthDesktop.js.map +1 -0
- package/dist/cli/oauthPkce.js +74 -0
- package/dist/cli/oauthPkce.js.map +1 -0
- package/dist/cli/oauthSession.js +53 -0
- package/dist/cli/oauthSession.js.map +1 -0
- package/dist/cli/provider/anthropic.js +205 -0
- package/dist/cli/provider/anthropic.js.map +1 -0
- package/dist/cli/provider/chatgpt.js +197 -0
- package/dist/cli/provider/chatgpt.js.map +1 -0
- package/dist/cli/provider/openai-compatible.js +14 -1
- package/dist/cli/provider/openai-compatible.js.map +1 -1
- package/dist/cli/provider/resolveStream.js +11 -0
- package/dist/cli/provider/resolveStream.js.map +1 -0
- package/dist/cli/providerConfig.js +2 -0
- package/dist/cli/providerConfig.js.map +1 -1
- package/dist/cli/refreshRegistry.js +13 -2
- package/dist/cli/refreshRegistry.js.map +1 -1
- package/dist/cli/runHeadless.js +3 -2
- package/dist/cli/runHeadless.js.map +1 -1
- package/dist/cli/slashCommands.js +10 -7
- package/dist/cli/slashCommands.js.map +1 -1
- package/dist/cli/slashHandlers/provider.js +46 -20
- package/dist/cli/slashHandlers/provider.js.map +1 -1
- package/dist/cli/toolRegistry.js +4 -3
- package/dist/cli/toolRegistry.js.map +1 -1
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthDesktop.js","sourceRoot":"","sources":["../../src/cli/oauthDesktop.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* oauthPkce — PKCE helpers + loopback callback server for native OAuth.
|
|
3
|
+
*
|
|
4
|
+
* Shared by ChatGPT (optional browser flow) and Anthropic magic-link.
|
|
5
|
+
* No provider-specific endpoints here.
|
|
6
|
+
*/
|
|
7
|
+
import { createHash, randomBytes } from 'node:crypto';
|
|
8
|
+
import { createServer } from 'node:http';
|
|
9
|
+
export function generatePkcePair() {
|
|
10
|
+
const verifier = randomBytes(32).toString('base64url');
|
|
11
|
+
const challenge = createHash('sha256').update(verifier).digest('base64url');
|
|
12
|
+
return { verifier, challenge };
|
|
13
|
+
}
|
|
14
|
+
export function generateOAuthState() {
|
|
15
|
+
return randomBytes(32).toString('base64url');
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Bind 127.0.0.1:<port> and wait for a single OAuth redirect.
|
|
19
|
+
* Rejects on timeout or bind failure.
|
|
20
|
+
*/
|
|
21
|
+
export async function waitForLoopbackCallback(options) {
|
|
22
|
+
const host = options.host ?? '127.0.0.1';
|
|
23
|
+
const timeoutMs = options.timeoutMs ?? 300_000;
|
|
24
|
+
const expectedPath = options.path.startsWith('/') ? options.path : `/${options.path}`;
|
|
25
|
+
return new Promise((resolve, reject) => {
|
|
26
|
+
let settled = false;
|
|
27
|
+
const server = createServer((req, res) => {
|
|
28
|
+
const url = new URL(req.url ?? '/', `http://${host}`);
|
|
29
|
+
if (url.pathname !== expectedPath) {
|
|
30
|
+
res.writeHead(404, { 'Content-Type': 'text/plain' });
|
|
31
|
+
res.end('Not found');
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const result = {
|
|
35
|
+
code: url.searchParams.get('code') ?? undefined,
|
|
36
|
+
state: url.searchParams.get('state') ?? undefined,
|
|
37
|
+
error: url.searchParams.get('error') ?? undefined,
|
|
38
|
+
errorDescription: url.searchParams.get('error_description') ?? undefined,
|
|
39
|
+
};
|
|
40
|
+
const ok = Boolean(result.code) && !result.error;
|
|
41
|
+
res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
|
|
42
|
+
res.end(oauthResultHtml(ok, result.errorDescription ?? result.error));
|
|
43
|
+
finish(result);
|
|
44
|
+
});
|
|
45
|
+
const timer = setTimeout(() => {
|
|
46
|
+
finish(undefined, new Error(`Timed out waiting for OAuth callback on http://${host}:${options.port}`));
|
|
47
|
+
}, timeoutMs);
|
|
48
|
+
const finish = (value, err) => {
|
|
49
|
+
if (settled)
|
|
50
|
+
return;
|
|
51
|
+
settled = true;
|
|
52
|
+
clearTimeout(timer);
|
|
53
|
+
server.close(() => {
|
|
54
|
+
if (err)
|
|
55
|
+
reject(err);
|
|
56
|
+
else
|
|
57
|
+
resolve(value ?? {});
|
|
58
|
+
});
|
|
59
|
+
};
|
|
60
|
+
server.on('error', (err) => finish(undefined, err));
|
|
61
|
+
server.listen(options.port, host);
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
function oauthResultHtml(ok, detail) {
|
|
65
|
+
const title = ok ? 'Signed in' : 'Sign-in failed';
|
|
66
|
+
const body = ok
|
|
67
|
+
? 'You can close this tab and return to Zelari.'
|
|
68
|
+
: detail ?? 'Authorization was denied or incomplete.';
|
|
69
|
+
return `<!doctype html><html><head><meta charset="utf-8"><title>${title}</title>
|
|
70
|
+
<style>body{font-family:system-ui,sans-serif;display:grid;place-items:center;min-height:100vh;margin:0;background:#111;color:#eee}
|
|
71
|
+
main{max-width:28rem;padding:2rem;border:1px solid #333;border-radius:12px}</style></head>
|
|
72
|
+
<body><main><h1>${title}</h1><p>${body}</p></main></body></html>`;
|
|
73
|
+
}
|
|
74
|
+
//# sourceMappingURL=oauthPkce.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthPkce.js","sourceRoot":"","sources":["../../src/cli/oauthPkce.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* oauthSession — persist PKCE verifier between Anthropic magic-link start/complete.
|
|
3
|
+
*/
|
|
4
|
+
import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
|
|
5
|
+
import os from 'node:os';
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
const MAX_AGE_MS = 15 * 60_000;
|
|
8
|
+
export function getPendingOAuthPath() {
|
|
9
|
+
return (process.env.ANATHEMA_OAUTH_PENDING_FILE ??
|
|
10
|
+
path.join(os.homedir(), '.tmp', 'zelari-code', 'oauth-pending.json'));
|
|
11
|
+
}
|
|
12
|
+
export function savePendingOAuth(pending) {
|
|
13
|
+
const file = getPendingOAuthPath();
|
|
14
|
+
mkdirSync(path.dirname(file), { recursive: true });
|
|
15
|
+
let all = {};
|
|
16
|
+
if (existsSync(file)) {
|
|
17
|
+
try {
|
|
18
|
+
const parsed = JSON.parse(readFileSync(file, 'utf-8'));
|
|
19
|
+
if (parsed && typeof parsed === 'object')
|
|
20
|
+
all = parsed;
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
all = {};
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
all[pending.provider] = pending;
|
|
27
|
+
writeFileSync(file, JSON.stringify(all, null, 2), { encoding: 'utf-8', mode: 0o600 });
|
|
28
|
+
}
|
|
29
|
+
export function takePendingOAuth(provider) {
|
|
30
|
+
const file = getPendingOAuthPath();
|
|
31
|
+
if (!existsSync(file))
|
|
32
|
+
return null;
|
|
33
|
+
try {
|
|
34
|
+
const parsed = JSON.parse(readFileSync(file, 'utf-8'));
|
|
35
|
+
const entry = parsed?.[provider];
|
|
36
|
+
if (!entry || typeof entry.codeVerifier !== 'string')
|
|
37
|
+
return null;
|
|
38
|
+
delete parsed[provider];
|
|
39
|
+
writeFileSync(file, JSON.stringify(parsed, null, 2), { encoding: 'utf-8', mode: 0o600 });
|
|
40
|
+
if (Date.now() - entry.createdAt > MAX_AGE_MS)
|
|
41
|
+
return null;
|
|
42
|
+
return entry;
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
return null;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
export function clearPendingOAuthFile() {
|
|
49
|
+
const file = getPendingOAuthPath();
|
|
50
|
+
if (existsSync(file))
|
|
51
|
+
unlinkSync(file);
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=oauthSession.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthSession.js","sourceRoot":"","sources":["../../src/cli/oauthSession.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzF,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAS7B,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,CAAC;AAE/B,MAAM,UAAU,mBAAmB;IACjC,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,2BAA2B;QACvC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,oBAAoB,CAAC,CACrE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAqB;IACpD,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACnD,IAAI,GAAG,GAAiC,EAAE,CAAC;IAC3C,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAiC,CAAC;YACvF,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ;gBAAE,GAAG,GAAG,MAAM,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,GAAG,GAAG,EAAE,CAAC;QACX,CAAC;IACH,CAAC;IACD,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC;IAChC,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAiC,CAAC;QACvF,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC;QAClE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxB,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QACzF,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,SAAS,GAAG,UAAU;YAAE,OAAO,IAAI,CAAC;QAC3D,OAAO,KAAK,CAAC;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,MAAM,IAAI,GAAG,mBAAmB,EAAE,CAAC;IACnC,IAAI,UAAU,CAAC,IAAI,CAAC;QAAE,UAAU,CAAC,IAAI,CAAC,CAAC;AACzC,CAAC"}
|
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
const ANTHROPIC_VERSION = '2023-06-01';
|
|
2
|
+
const ANTHROPIC_BETA = 'oauth-2025-04-20';
|
|
3
|
+
function authHeaders(apiKey) {
|
|
4
|
+
return {
|
|
5
|
+
'Content-Type': 'application/json',
|
|
6
|
+
Accept: 'application/json',
|
|
7
|
+
'anthropic-version': ANTHROPIC_VERSION,
|
|
8
|
+
'anthropic-beta': ANTHROPIC_BETA,
|
|
9
|
+
Authorization: `Bearer ${apiKey}`,
|
|
10
|
+
'x-api-key': apiKey,
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
function splitMessages(messages) {
|
|
14
|
+
const systemParts = [];
|
|
15
|
+
const rest = [];
|
|
16
|
+
for (const m of messages) {
|
|
17
|
+
if (m.role === 'system') {
|
|
18
|
+
if (m.content)
|
|
19
|
+
systemParts.push(m.content);
|
|
20
|
+
continue;
|
|
21
|
+
}
|
|
22
|
+
if (m.role === 'tool') {
|
|
23
|
+
rest.push({
|
|
24
|
+
role: 'user',
|
|
25
|
+
content: [
|
|
26
|
+
{
|
|
27
|
+
type: 'tool_result',
|
|
28
|
+
tool_use_id: m.toolCallId,
|
|
29
|
+
content: m.content ?? '',
|
|
30
|
+
},
|
|
31
|
+
],
|
|
32
|
+
});
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
if (m.role === 'assistant' && m.toolCalls && m.toolCalls.length > 0) {
|
|
36
|
+
const content = [];
|
|
37
|
+
if (m.content)
|
|
38
|
+
content.push({ type: 'text', text: m.content });
|
|
39
|
+
for (const tc of m.toolCalls) {
|
|
40
|
+
content.push({
|
|
41
|
+
type: 'tool_use',
|
|
42
|
+
id: tc.id,
|
|
43
|
+
name: tc.name,
|
|
44
|
+
input: tc.args ?? {},
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
rest.push({ role: 'assistant', content });
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
rest.push({ role: m.role, content: m.content ?? '' });
|
|
51
|
+
}
|
|
52
|
+
return { system: systemParts.join('\n\n'), rest };
|
|
53
|
+
}
|
|
54
|
+
export function anthropicMessagesProvider(config) {
|
|
55
|
+
return async function* (params) {
|
|
56
|
+
const { system, rest } = splitMessages(params.messages);
|
|
57
|
+
const body = {
|
|
58
|
+
model: params.model,
|
|
59
|
+
max_tokens: 16_384,
|
|
60
|
+
messages: rest,
|
|
61
|
+
stream: true,
|
|
62
|
+
};
|
|
63
|
+
if (system)
|
|
64
|
+
body.system = system;
|
|
65
|
+
if (params.tools && params.tools.length > 0) {
|
|
66
|
+
body.tools = params.tools.map((t) => ({
|
|
67
|
+
name: t.name,
|
|
68
|
+
description: t.description,
|
|
69
|
+
input_schema: t.parameters,
|
|
70
|
+
}));
|
|
71
|
+
}
|
|
72
|
+
const base = config.baseUrl.replace(/\/$/, '').replace(/\/v1$/, '');
|
|
73
|
+
const url = `${base}/v1/messages`;
|
|
74
|
+
let response;
|
|
75
|
+
try {
|
|
76
|
+
response = await fetch(url, {
|
|
77
|
+
method: 'POST',
|
|
78
|
+
headers: authHeaders(config.apiKey),
|
|
79
|
+
body: JSON.stringify(body),
|
|
80
|
+
signal: params.signal,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
catch (err) {
|
|
84
|
+
yield {
|
|
85
|
+
kind: 'error',
|
|
86
|
+
message: `Network error: ${err instanceof Error ? err.message : String(err)}`,
|
|
87
|
+
};
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (!response.ok || !response.body) {
|
|
91
|
+
const text = await response.text().catch(() => '');
|
|
92
|
+
yield { kind: 'error', message: `HTTP ${response.status}: ${text.slice(0, 240)}` };
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const reader = response.body.getReader();
|
|
96
|
+
const decoder = new TextDecoder();
|
|
97
|
+
let buffer = '';
|
|
98
|
+
let currentTool = null;
|
|
99
|
+
let emittedTool = false;
|
|
100
|
+
const flushTool = function* () {
|
|
101
|
+
if (!currentTool?.name)
|
|
102
|
+
return;
|
|
103
|
+
let args = {};
|
|
104
|
+
try {
|
|
105
|
+
args = JSON.parse(currentTool.argsJson || '{}');
|
|
106
|
+
}
|
|
107
|
+
catch {
|
|
108
|
+
args = {};
|
|
109
|
+
}
|
|
110
|
+
emittedTool = true;
|
|
111
|
+
yield {
|
|
112
|
+
kind: 'tool_call',
|
|
113
|
+
toolCallId: currentTool.id,
|
|
114
|
+
toolName: currentTool.name,
|
|
115
|
+
args,
|
|
116
|
+
};
|
|
117
|
+
currentTool = null;
|
|
118
|
+
};
|
|
119
|
+
try {
|
|
120
|
+
while (true) {
|
|
121
|
+
const { value, done } = await reader.read();
|
|
122
|
+
if (done)
|
|
123
|
+
break;
|
|
124
|
+
buffer += decoder.decode(value, { stream: true });
|
|
125
|
+
const lines = buffer.split('\n');
|
|
126
|
+
buffer = lines.pop() ?? '';
|
|
127
|
+
for (const line of lines) {
|
|
128
|
+
const trimmed = line.trim();
|
|
129
|
+
if (!trimmed.startsWith('data:'))
|
|
130
|
+
continue;
|
|
131
|
+
const data = trimmed.slice(5).trim();
|
|
132
|
+
if (!data || data === '[DONE]')
|
|
133
|
+
continue;
|
|
134
|
+
let ev;
|
|
135
|
+
try {
|
|
136
|
+
ev = JSON.parse(data);
|
|
137
|
+
}
|
|
138
|
+
catch {
|
|
139
|
+
continue;
|
|
140
|
+
}
|
|
141
|
+
const type = ev.type;
|
|
142
|
+
if (type === 'content_block_delta') {
|
|
143
|
+
const delta = ev.delta;
|
|
144
|
+
if (delta?.type === 'text_delta' && typeof delta.text === 'string') {
|
|
145
|
+
yield { kind: 'text', delta: delta.text };
|
|
146
|
+
}
|
|
147
|
+
else if (delta?.type === 'thinking_delta' && typeof delta.thinking === 'string') {
|
|
148
|
+
yield { kind: 'thinking', delta: delta.thinking };
|
|
149
|
+
}
|
|
150
|
+
else if (delta?.type === 'input_json_delta' && typeof delta.partial_json === 'string') {
|
|
151
|
+
if (currentTool)
|
|
152
|
+
currentTool.argsJson += delta.partial_json;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
else if (type === 'content_block_start') {
|
|
156
|
+
const block = ev.content_block;
|
|
157
|
+
if (block?.type === 'tool_use') {
|
|
158
|
+
currentTool = {
|
|
159
|
+
id: typeof block.id === 'string' ? block.id : `tu-${Date.now()}`,
|
|
160
|
+
name: typeof block.name === 'string' ? block.name : '',
|
|
161
|
+
argsJson: '',
|
|
162
|
+
};
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else if (type === 'content_block_stop') {
|
|
166
|
+
yield* flushTool();
|
|
167
|
+
}
|
|
168
|
+
else if (type === 'message_delta') {
|
|
169
|
+
const usage = (ev.usage ?? ev.delta?.usage);
|
|
170
|
+
if (usage) {
|
|
171
|
+
yield {
|
|
172
|
+
kind: 'usage',
|
|
173
|
+
usage: {
|
|
174
|
+
promptTokens: usage.input_tokens ?? 0,
|
|
175
|
+
completionTokens: usage.output_tokens ?? 0,
|
|
176
|
+
totalTokens: (usage.input_tokens ?? 0) + (usage.output_tokens ?? 0),
|
|
177
|
+
},
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
const stop = ev.delta?.stop_reason;
|
|
181
|
+
if (stop) {
|
|
182
|
+
yield {
|
|
183
|
+
kind: 'finish',
|
|
184
|
+
reason: stop === 'tool_use' || emittedTool ? 'tool_calls' : 'stop',
|
|
185
|
+
};
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
else if (type === 'error') {
|
|
189
|
+
const msg = typeof ev.error?.message === 'string'
|
|
190
|
+
? ev.error.message
|
|
191
|
+
: 'Anthropic stream error';
|
|
192
|
+
yield { kind: 'error', message: msg };
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
yield* flushTool();
|
|
198
|
+
yield { kind: 'finish', reason: emittedTool ? 'tool_calls' : 'stop' };
|
|
199
|
+
}
|
|
200
|
+
finally {
|
|
201
|
+
reader.releaseLock();
|
|
202
|
+
}
|
|
203
|
+
};
|
|
204
|
+
}
|
|
205
|
+
//# sourceMappingURL=anthropic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../../src/cli/provider/anthropic.ts"],"names":[],"mappings":"AAMA,MAAM,iBAAiB,GAAG,YAAY,CAAC;AACvC,MAAM,cAAc,GAAG,kBAAkB,CAAC;AAE1C,SAAS,WAAW,CAAC,MAAc;IACjC,OAAO;QACL,cAAc,EAAE,kBAAkB;QAClC,MAAM,EAAE,kBAAkB;QAC1B,mBAAmB,EAAE,iBAAiB;QACtC,gBAAgB,EAAE,cAAc;QAChC,aAAa,EAAE,UAAU,MAAM,EAAE;QACjC,WAAW,EAAE,MAAM;KACpB,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAwB;IAI7C,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,MAAM,IAAI,GAAmC,EAAE,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,IAAI,CAAC,CAAC,OAAO;gBAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAC3C,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,aAAa;wBACnB,WAAW,EAAE,CAAC,CAAC,UAAU;wBACzB,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE;qBACzB;iBACF;aACF,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpE,MAAM,OAAO,GAAmC,EAAE,CAAC;YACnD,IAAI,CAAC,CAAC,OAAO;gBAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/D,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;gBAC7B,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,EAAE,CAAC,EAAE;oBACT,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE;iBACrB,CAAC,CAAC;YACL,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC;YAC1C,SAAS;QACX,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;AACpD,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,MAA8B;IACtE,OAAO,KAAK,SAAS,CAAC,EAAE,MAAM;QAC5B,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACxD,MAAM,IAAI,GAA4B;YACpC,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb,CAAC;QACF,IAAI,MAAM;YAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACjC,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACpC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,WAAW,EAAE,CAAC,CAAC,WAAW;gBAC1B,YAAY,EAAE,CAAC,CAAC,UAAU;aAC3B,CAAC,CAAC,CAAC;QACN,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACpE,MAAM,GAAG,GAAG,GAAG,IAAI,cAAc,CAAC;QAClC,IAAI,QAAkB,CAAC;QACvB,IAAI,CAAC;YACH,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAC1B,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;gBACnC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM;gBACJ,IAAI,EAAE,OAAO;gBACb,OAAO,EAAE,kBAAkB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;aAC9E,CAAC;YACF,OAAO;QACT,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACnD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,QAAQ,CAAC,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;YACnF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,WAAW,GAA0D,IAAI,CAAC;QAC9E,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,MAAM,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,WAAW,EAAE,IAAI;gBAAE,OAAO;YAC/B,IAAI,IAAI,GAA4B,EAAE,CAAC;YACvC,IAAI,CAAC;gBACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,QAAQ,IAAI,IAAI,CAA4B,CAAC;YAC7E,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,GAAG,EAAE,CAAC;YACZ,CAAC;YACD,WAAW,GAAG,IAAI,CAAC;YACnB,MAAM;gBACJ,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,WAAW,CAAC,EAAE;gBAC1B,QAAQ,EAAE,WAAW,CAAC,IAAI;gBAC1B,IAAI;aACL,CAAC;YACF,WAAW,GAAG,IAAI,CAAC;QACrB,CAAC,CAAC;QAEF,IAAI,CAAC;YACH,OAAO,IAAI,EAAE,CAAC;gBACZ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5C,IAAI,IAAI;oBAAE,MAAM;gBAChB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;gBAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;gBAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;oBAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC;wBAAE,SAAS;oBAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACrC,IAAI,CAAC,IAAI,IAAI,IAAI,KAAK,QAAQ;wBAAE,SAAS;oBACzC,IAAI,EAA2B,CAAC;oBAChC,IAAI,CAAC;wBACH,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA4B,CAAC;oBACnD,CAAC;oBAAC,MAAM,CAAC;wBACP,SAAS;oBACX,CAAC;oBACD,MAAM,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;oBACrB,IAAI,IAAI,KAAK,qBAAqB,EAAE,CAAC;wBACnC,MAAM,KAAK,GAAG,EAAE,CAAC,KAA4C,CAAC;wBAC9D,IAAI,KAAK,EAAE,IAAI,KAAK,YAAY,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;4BACnE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;wBAC5C,CAAC;6BAAM,IAAI,KAAK,EAAE,IAAI,KAAK,gBAAgB,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;4BAClF,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;wBACpD,CAAC;6BAAM,IAAI,KAAK,EAAE,IAAI,KAAK,kBAAkB,IAAI,OAAO,KAAK,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;4BACxF,IAAI,WAAW;gCAAE,WAAW,CAAC,QAAQ,IAAI,KAAK,CAAC,YAAY,CAAC;wBAC9D,CAAC;oBACH,CAAC;yBAAM,IAAI,IAAI,KAAK,qBAAqB,EAAE,CAAC;wBAC1C,MAAM,KAAK,GAAG,EAAE,CAAC,aAAoD,CAAC;wBACtE,IAAI,KAAK,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;4BAC/B,WAAW,GAAG;gCACZ,EAAE,EAAE,OAAO,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE;gCAChE,IAAI,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;gCACtD,QAAQ,EAAE,EAAE;6BACb,CAAC;wBACJ,CAAC;oBACH,CAAC;yBAAM,IAAI,IAAI,KAAK,oBAAoB,EAAE,CAAC;wBACzC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;oBACrB,CAAC;yBAAM,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;wBACpC,MAAM,KAAK,GAAG,CAAC,EAAE,CAAC,KAAK,IAAK,EAAE,CAAC,KAAyC,EAAE,KAAK,CAElE,CAAC;wBACd,IAAI,KAAK,EAAE,CAAC;4BACV,MAAM;gCACJ,IAAI,EAAE,OAAO;gCACb,KAAK,EAAE;oCACL,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,CAAC;oCACrC,gBAAgB,EAAE,KAAK,CAAC,aAAa,IAAI,CAAC;oCAC1C,WAAW,EAAE,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC;iCACpE;6BACF,CAAC;wBACJ,CAAC;wBACD,MAAM,IAAI,GAAI,EAAE,CAAC,KAA8C,EAAE,WAAW,CAAC;wBAC7E,IAAI,IAAI,EAAE,CAAC;4BACT,MAAM;gCACJ,IAAI,EAAE,QAAQ;gCACd,MAAM,EAAE,IAAI,KAAK,UAAU,IAAI,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM;6BACnE,CAAC;wBACJ,CAAC;oBACH,CAAC;yBAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC5B,MAAM,GAAG,GACP,OAAQ,EAAE,CAAC,KAA0C,EAAE,OAAO,KAAK,QAAQ;4BACzE,CAAC,CAAE,EAAE,CAAC,KAA6B,CAAC,OAAO;4BAC3C,CAAC,CAAC,wBAAwB,CAAC;wBAC/B,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;wBACtC,OAAO;oBACT,CAAC;gBACH,CAAC;YACH,CAAC;YACD,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;YACnB,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACxE,CAAC;gBAAS,CAAC;YACT,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
function headers(config) {
|
|
2
|
+
const h = {
|
|
3
|
+
'Content-Type': 'application/json',
|
|
4
|
+
Accept: 'text/event-stream',
|
|
5
|
+
Authorization: `Bearer ${config.apiKey}`,
|
|
6
|
+
'OpenAI-Beta': 'responses=experimental',
|
|
7
|
+
};
|
|
8
|
+
if (config.accountId)
|
|
9
|
+
h['ChatGPT-Account-Id'] = config.accountId;
|
|
10
|
+
if (config.extraHeaders)
|
|
11
|
+
Object.assign(h, config.extraHeaders);
|
|
12
|
+
return h;
|
|
13
|
+
}
|
|
14
|
+
function toInput(messages) {
|
|
15
|
+
const instructions = [];
|
|
16
|
+
const input = [];
|
|
17
|
+
for (const m of messages) {
|
|
18
|
+
if (m.role === 'system') {
|
|
19
|
+
if (m.content)
|
|
20
|
+
instructions.push(m.content);
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
if (m.role === 'tool') {
|
|
24
|
+
input.push({
|
|
25
|
+
type: 'function_call_output',
|
|
26
|
+
call_id: m.toolCallId,
|
|
27
|
+
output: m.content ?? '',
|
|
28
|
+
});
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
31
|
+
if (m.role === 'assistant' && m.toolCalls && m.toolCalls.length > 0) {
|
|
32
|
+
if (m.content)
|
|
33
|
+
input.push({ role: 'assistant', content: m.content });
|
|
34
|
+
for (const tc of m.toolCalls) {
|
|
35
|
+
input.push({
|
|
36
|
+
type: 'function_call',
|
|
37
|
+
call_id: tc.id,
|
|
38
|
+
name: tc.name,
|
|
39
|
+
arguments: JSON.stringify(tc.args ?? {}),
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
continue;
|
|
43
|
+
}
|
|
44
|
+
input.push({ role: m.role, content: m.content ?? '' });
|
|
45
|
+
}
|
|
46
|
+
return { instructions: instructions.join('\n\n'), input };
|
|
47
|
+
}
|
|
48
|
+
export function chatgptResponsesProvider(config) {
|
|
49
|
+
return async function* (params) {
|
|
50
|
+
const { instructions, input } = toInput(params.messages);
|
|
51
|
+
const body = {
|
|
52
|
+
model: params.model,
|
|
53
|
+
stream: true,
|
|
54
|
+
input,
|
|
55
|
+
};
|
|
56
|
+
if (instructions)
|
|
57
|
+
body.instructions = instructions;
|
|
58
|
+
if (params.tools && params.tools.length > 0) {
|
|
59
|
+
body.tools = params.tools.map((t) => ({
|
|
60
|
+
type: 'function',
|
|
61
|
+
name: t.name,
|
|
62
|
+
description: t.description,
|
|
63
|
+
parameters: t.parameters,
|
|
64
|
+
}));
|
|
65
|
+
}
|
|
66
|
+
const base = config.baseUrl.replace(/\/$/, '');
|
|
67
|
+
const url = `${base}/responses`;
|
|
68
|
+
let response;
|
|
69
|
+
try {
|
|
70
|
+
response = await fetch(url, {
|
|
71
|
+
method: 'POST',
|
|
72
|
+
headers: headers(config),
|
|
73
|
+
body: JSON.stringify(body),
|
|
74
|
+
signal: params.signal,
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
yield {
|
|
79
|
+
kind: 'error',
|
|
80
|
+
message: `Network error: ${err instanceof Error ? err.message : String(err)}`,
|
|
81
|
+
};
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
if (!response.ok || !response.body) {
|
|
85
|
+
const text = await response.text().catch(() => '');
|
|
86
|
+
yield { kind: 'error', message: `HTTP ${response.status}: ${text.slice(0, 240)}` };
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
const reader = response.body.getReader();
|
|
90
|
+
const decoder = new TextDecoder();
|
|
91
|
+
let buffer = '';
|
|
92
|
+
const tools = new Map();
|
|
93
|
+
let emittedTool = false;
|
|
94
|
+
const flush = function* (id) {
|
|
95
|
+
const t = tools.get(id);
|
|
96
|
+
if (!t?.name)
|
|
97
|
+
return;
|
|
98
|
+
let args = {};
|
|
99
|
+
try {
|
|
100
|
+
args = JSON.parse(t.argsJson || '{}');
|
|
101
|
+
}
|
|
102
|
+
catch {
|
|
103
|
+
args = {};
|
|
104
|
+
}
|
|
105
|
+
tools.delete(id);
|
|
106
|
+
emittedTool = true;
|
|
107
|
+
yield { kind: 'tool_call', toolCallId: t.id, toolName: t.name, args };
|
|
108
|
+
};
|
|
109
|
+
try {
|
|
110
|
+
while (true) {
|
|
111
|
+
const { value, done } = await reader.read();
|
|
112
|
+
if (done)
|
|
113
|
+
break;
|
|
114
|
+
buffer += decoder.decode(value, { stream: true });
|
|
115
|
+
const lines = buffer.split('\n');
|
|
116
|
+
buffer = lines.pop() ?? '';
|
|
117
|
+
for (const line of lines) {
|
|
118
|
+
const trimmed = line.trim();
|
|
119
|
+
if (!trimmed.startsWith('data:'))
|
|
120
|
+
continue;
|
|
121
|
+
const data = trimmed.slice(5).trim();
|
|
122
|
+
if (!data || data === '[DONE]')
|
|
123
|
+
continue;
|
|
124
|
+
let ev;
|
|
125
|
+
try {
|
|
126
|
+
ev = JSON.parse(data);
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
const type = typeof ev.type === 'string' ? ev.type : '';
|
|
132
|
+
if (type === 'response.output_text.delta' && typeof ev.delta === 'string') {
|
|
133
|
+
yield { kind: 'text', delta: ev.delta };
|
|
134
|
+
}
|
|
135
|
+
else if (type === 'response.reasoning_text.delta' && typeof ev.delta === 'string') {
|
|
136
|
+
yield { kind: 'thinking', delta: ev.delta };
|
|
137
|
+
}
|
|
138
|
+
else if (type === 'response.output_item.added') {
|
|
139
|
+
const item = ev.item;
|
|
140
|
+
if (item?.type === 'function_call') {
|
|
141
|
+
const id = String(item.call_id ?? item.id ?? `fc-${tools.size}`);
|
|
142
|
+
tools.set(id, {
|
|
143
|
+
id,
|
|
144
|
+
name: typeof item.name === 'string' ? item.name : '',
|
|
145
|
+
argsJson: typeof item.arguments === 'string' ? item.arguments : '',
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
else if (type === 'response.function_call_arguments.delta') {
|
|
150
|
+
const itemId = String(ev.item_id ?? ev.call_id ?? '');
|
|
151
|
+
const existing = itemId ? tools.get(itemId) : [...tools.values()].at(-1);
|
|
152
|
+
if (existing && typeof ev.delta === 'string')
|
|
153
|
+
existing.argsJson += ev.delta;
|
|
154
|
+
}
|
|
155
|
+
else if (type === 'response.output_item.done') {
|
|
156
|
+
const item = ev.item;
|
|
157
|
+
if (item?.type === 'function_call') {
|
|
158
|
+
const id = String(item.call_id ?? item.id ?? '');
|
|
159
|
+
if (id)
|
|
160
|
+
yield* flush(id);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
else if (type === 'response.completed') {
|
|
164
|
+
const usage = ev.response?.usage;
|
|
165
|
+
if (usage) {
|
|
166
|
+
yield {
|
|
167
|
+
kind: 'usage',
|
|
168
|
+
usage: {
|
|
169
|
+
promptTokens: usage.input_tokens ?? usage.prompt_tokens ?? 0,
|
|
170
|
+
completionTokens: usage.output_tokens ?? usage.completion_tokens ?? 0,
|
|
171
|
+
totalTokens: usage.total_tokens ??
|
|
172
|
+
(usage.input_tokens ?? 0) + (usage.output_tokens ?? 0),
|
|
173
|
+
},
|
|
174
|
+
};
|
|
175
|
+
}
|
|
176
|
+
yield { kind: 'finish', reason: emittedTool ? 'tool_calls' : 'stop' };
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
else if (type === 'response.failed' || type === 'error') {
|
|
180
|
+
const msg = typeof ev.message === 'string'
|
|
181
|
+
? ev.message
|
|
182
|
+
: JSON.stringify(ev.error ?? ev).slice(0, 200);
|
|
183
|
+
yield { kind: 'error', message: msg };
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
for (const id of [...tools.keys()])
|
|
189
|
+
yield* flush(id);
|
|
190
|
+
yield { kind: 'finish', reason: emittedTool ? 'tool_calls' : 'stop' };
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
reader.releaseLock();
|
|
194
|
+
}
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=chatgpt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chatgpt.js","sourceRoot":"","sources":["../../../src/cli/provider/chatgpt.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
*
|
|
13
13
|
* Implements ProviderStreamFn (AsyncIterable<ProviderDelta>).
|
|
14
14
|
*/
|
|
15
|
-
import { resolveApiKeyWithMeta } from '../keyStore.js';
|
|
15
|
+
import { getOAuthToken, resolveApiKeyWithMeta } from '../keyStore.js';
|
|
16
16
|
import { getProviderConfig, getModelForProvider, getCustomEndpoint } from '../providerConfig.js';
|
|
17
17
|
/**
|
|
18
18
|
* v1.5.2: transient-HTTP retry. A single 429/5xx/network failure used to flip
|
|
@@ -194,6 +194,8 @@ export const PROVIDER_ENDPOINTS = {
|
|
|
194
194
|
// DeepSeek global platform (OpenAI-compatible). Chat → /chat/completions,
|
|
195
195
|
// discovery → /models against this same host.
|
|
196
196
|
'deepseek': 'https://api.deepseek.com',
|
|
197
|
+
'chatgpt': 'https://chatgpt.com/backend-api/codex',
|
|
198
|
+
'anthropic': 'https://api.anthropic.com',
|
|
197
199
|
'custom': '',
|
|
198
200
|
};
|
|
199
201
|
/** Resolve the active provider id (env override > on-disk config > default). */
|
|
@@ -700,6 +702,15 @@ export function openaiCompatibleProvider(config) {
|
|
|
700
702
|
* - OPENAI_MODEL env override (always wins)
|
|
701
703
|
* - providerConfig.modelByProvider[providerId]
|
|
702
704
|
*/
|
|
705
|
+
function extraFromStored(providerId) {
|
|
706
|
+
const stored = getOAuthToken(providerId);
|
|
707
|
+
if (!stored?.accountId)
|
|
708
|
+
return {};
|
|
709
|
+
return {
|
|
710
|
+
accountId: stored.accountId,
|
|
711
|
+
extraHeaders: { 'ChatGPT-Account-Id': stored.accountId },
|
|
712
|
+
};
|
|
713
|
+
}
|
|
703
714
|
export async function providerFromEnv() {
|
|
704
715
|
const providerId = resolveActiveProvider();
|
|
705
716
|
const apiKey = await resolveApiKeyWithMeta(providerId);
|
|
@@ -710,6 +721,7 @@ export async function providerFromEnv() {
|
|
|
710
721
|
baseUrl: resolveBaseUrl(providerId),
|
|
711
722
|
model: getModelForProvider(providerId),
|
|
712
723
|
providerId,
|
|
724
|
+
...extraFromStored(providerId),
|
|
713
725
|
};
|
|
714
726
|
}
|
|
715
727
|
/**
|
|
@@ -727,6 +739,7 @@ export async function providerConfigFor(providerId) {
|
|
|
727
739
|
baseUrl: resolveBaseUrl(providerId),
|
|
728
740
|
model: getModelForProvider(providerId),
|
|
729
741
|
providerId,
|
|
742
|
+
...extraFromStored(providerId),
|
|
730
743
|
};
|
|
731
744
|
}
|
|
732
745
|
//# sourceMappingURL=openai-compatible.js.map
|