@adia-ai/llm 0.8.25 → 0.8.27
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/CHANGELOG.md +13 -0
- package/adapters/anthropic.d.ts +44 -1
- package/adapters/anthropic.d.ts.map +1 -1
- package/adapters/anthropic.js +71 -1
- package/adapters/anthropic.js.map +1 -1
- package/adapters/gemini.d.ts +4 -0
- package/adapters/gemini.d.ts.map +1 -1
- package/adapters/gemini.js +52 -5
- package/adapters/gemini.js.map +1 -1
- package/adapters/index.d.ts +5 -3
- package/adapters/index.d.ts.map +1 -1
- package/adapters/index.js +2 -0
- package/adapters/index.js.map +1 -1
- package/adapters/openai.d.ts +10 -0
- package/adapters/openai.d.ts.map +1 -1
- package/adapters/openai.js +90 -7
- package/adapters/openai.js.map +1 -1
- package/index.d.ts +2 -1
- package/index.d.ts.map +1 -1
- package/index.js +1 -1
- package/index.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.8.27] — 2026-08-05
|
|
4
|
+
|
|
5
|
+
### Maintenance
|
|
6
|
+
- **Lockstep version bump only.** No source changes in this package; bumped to maintain the lockstep version coherence enforced by `scripts/release/check-lockstep.mjs`. Substantive v0.8.27 work shipped in menu subtitle + roster migration, agent model pins, proper deflake, release tooling (gh#614/616/617/618). See `packages/web-modules/CHANGELOG.md#0827--2026-08-05` for details.
|
|
7
|
+
|
|
8
|
+
## [0.8.26] — 2026-08-05
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
- **Tool calling across all three adapters (gh#579).** `ChatOpts.tools` (JSON-Schema `ToolSpec[]`), provider-neutral `Part[]` message content (`text` / `tool_use` / `tool_result`), a `tool_use` chunk in the `StreamChunk` union, and `ChatResult.toolUse`. Streaming emits COMPLETE tool_use chunks only — Anthropic `input_json_delta` accumulated per block index, OpenAI argument fragments per call index flushed at `finish_reason`, Gemini `functionCall` parts passed through whole. The smart-proxy neutral body and reference `server.js` forward `tools` (previously silently dropped). Barrel now re-exports the client types (`ChatOpts`, `ChatResult`, `LLMClient`, `StreamChunk`, `ToolSpec`, `ToolUse`, `Part`, `AdapterUsage`) and `detectProviderFromModel`. All additive — string-content messages and existing chunk consumers are untouched.
|
|
12
|
+
|
|
13
|
+
### Maintenance
|
|
14
|
+
- **`src/` touched in this release window** (5 file(s), e.g. `adapters/anthropic.ts`) — carried by the entries above.
|
|
15
|
+
|
|
3
16
|
## [0.8.25] — 2026-07-31
|
|
4
17
|
|
|
5
18
|
### Maintenance
|
package/adapters/anthropic.d.ts
CHANGED
|
@@ -13,10 +13,44 @@ export interface AdapterUsage {
|
|
|
13
13
|
cacheCreation?: number;
|
|
14
14
|
cacheRead?: number;
|
|
15
15
|
}
|
|
16
|
+
/** A tool the model may call. `inputSchema` is standard JSON Schema; each
|
|
17
|
+
* adapter translates it to its provider's wire shape (input_schema /
|
|
18
|
+
* function.parameters / functionDeclarations.parameters). */
|
|
19
|
+
export interface ToolSpec {
|
|
20
|
+
name: string;
|
|
21
|
+
description?: string;
|
|
22
|
+
inputSchema: Record<string, unknown>;
|
|
23
|
+
}
|
|
24
|
+
/** One completed tool call parsed out of a model response. */
|
|
25
|
+
export interface ToolUse {
|
|
26
|
+
id: string;
|
|
27
|
+
name: string;
|
|
28
|
+
input: Record<string, unknown>;
|
|
29
|
+
}
|
|
30
|
+
/** Provider-neutral message part. Adapters translate to/from wire shapes;
|
|
31
|
+
* consumers passing plain-string content never see these.
|
|
32
|
+
* `tool_result.name` is required by Gemini (functionResponse addresses the
|
|
33
|
+
* function by name, not id) and ignored by the other providers. */
|
|
34
|
+
export type Part = {
|
|
35
|
+
type: 'text';
|
|
36
|
+
text: string;
|
|
37
|
+
} | {
|
|
38
|
+
type: 'tool_use';
|
|
39
|
+
id: string;
|
|
40
|
+
name: string;
|
|
41
|
+
input: Record<string, unknown>;
|
|
42
|
+
} | {
|
|
43
|
+
type: 'tool_result';
|
|
44
|
+
toolUseId: string;
|
|
45
|
+
name?: string;
|
|
46
|
+
content: string;
|
|
47
|
+
isError?: boolean;
|
|
48
|
+
};
|
|
16
49
|
export interface AdapterResponse {
|
|
17
50
|
text: string;
|
|
18
51
|
usage: AdapterUsage;
|
|
19
52
|
stopReason: string;
|
|
53
|
+
toolUse?: ToolUse[];
|
|
20
54
|
}
|
|
21
55
|
export type StreamChunk = {
|
|
22
56
|
type: 'text';
|
|
@@ -25,6 +59,11 @@ export type StreamChunk = {
|
|
|
25
59
|
} | {
|
|
26
60
|
type: 'thinking';
|
|
27
61
|
text: string;
|
|
62
|
+
} | {
|
|
63
|
+
type: 'tool_use';
|
|
64
|
+
id: string;
|
|
65
|
+
name: string;
|
|
66
|
+
input: Record<string, unknown>;
|
|
28
67
|
} | {
|
|
29
68
|
type: 'done';
|
|
30
69
|
text: string;
|
|
@@ -38,7 +77,7 @@ export interface BuildRequestOpts {
|
|
|
38
77
|
model: string;
|
|
39
78
|
messages: Array<{
|
|
40
79
|
role: string;
|
|
41
|
-
content: string;
|
|
80
|
+
content: string | Part[];
|
|
42
81
|
}>;
|
|
43
82
|
apiKey: string;
|
|
44
83
|
system?: string | Array<{
|
|
@@ -48,6 +87,7 @@ export interface BuildRequestOpts {
|
|
|
48
87
|
type: string;
|
|
49
88
|
};
|
|
50
89
|
}>;
|
|
90
|
+
tools?: ToolSpec[];
|
|
51
91
|
maxTokens?: number;
|
|
52
92
|
temperature?: number;
|
|
53
93
|
stream?: boolean;
|
|
@@ -68,6 +108,9 @@ interface AnthropicResponseBody {
|
|
|
68
108
|
content?: Array<{
|
|
69
109
|
type: string;
|
|
70
110
|
text?: string;
|
|
111
|
+
id?: string;
|
|
112
|
+
name?: string;
|
|
113
|
+
input?: Record<string, unknown>;
|
|
71
114
|
}>;
|
|
72
115
|
usage?: AnthropicUsage;
|
|
73
116
|
stop_reason?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/adapters/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../src/adapters/anthropic.ts"],"names":[],"mappings":"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"}
|
package/adapters/anthropic.js
CHANGED
|
@@ -6,6 +6,31 @@ import { readSSE } from './sse.js';
|
|
|
6
6
|
const API_URL = 'https://api.anthropic.com/v1/messages';
|
|
7
7
|
const API_VERSION = '2023-06-01';
|
|
8
8
|
const DEFAULT_MAX_TOKENS = 32768;
|
|
9
|
+
// ── Neutral-message translation ──────────────────────────────────────────
|
|
10
|
+
/** Anthropic's wire shape is closest to the neutral Part model: rename
|
|
11
|
+
* toolUseId → tool_use_id and route tool-role messages to 'user' (tool
|
|
12
|
+
* results ride user turns in the Messages API). */
|
|
13
|
+
function toAnthropicMessages(messages) {
|
|
14
|
+
return messages.map(msg => {
|
|
15
|
+
if (typeof msg.content === 'string')
|
|
16
|
+
return { role: msg.role, content: msg.content };
|
|
17
|
+
const content = msg.content.map(part => {
|
|
18
|
+
if (part.type === 'tool_result') {
|
|
19
|
+
return {
|
|
20
|
+
type: 'tool_result',
|
|
21
|
+
tool_use_id: part.toolUseId,
|
|
22
|
+
content: part.content,
|
|
23
|
+
...(part.isError ? { is_error: true } : {}),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
if (part.type === 'tool_use') {
|
|
27
|
+
return { type: 'tool_use', id: part.id, name: part.name, input: part.input };
|
|
28
|
+
}
|
|
29
|
+
return { type: 'text', text: part.text };
|
|
30
|
+
});
|
|
31
|
+
return { role: msg.role === 'tool' ? 'user' : msg.role, content };
|
|
32
|
+
});
|
|
33
|
+
}
|
|
9
34
|
// ── Adapter ───────────────────────────────────────────────────────────────
|
|
10
35
|
export const anthropic = {
|
|
11
36
|
name: 'anthropic',
|
|
@@ -13,9 +38,16 @@ export const anthropic = {
|
|
|
13
38
|
const body = {
|
|
14
39
|
model: opts.model,
|
|
15
40
|
max_tokens: opts.maxTokens ?? DEFAULT_MAX_TOKENS,
|
|
16
|
-
messages: opts.messages,
|
|
41
|
+
messages: toAnthropicMessages(opts.messages),
|
|
17
42
|
stream: !!opts.stream,
|
|
18
43
|
};
|
|
44
|
+
if (opts.tools?.length) {
|
|
45
|
+
body['tools'] = opts.tools.map(t => ({
|
|
46
|
+
name: t.name,
|
|
47
|
+
...(t.description ? { description: t.description } : {}),
|
|
48
|
+
input_schema: t.inputSchema,
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
19
51
|
if (opts.system != null) {
|
|
20
52
|
body['system'] = opts.cache
|
|
21
53
|
? [{ type: 'text', text: opts.system, cache_control: { type: 'ephemeral' } }]
|
|
@@ -38,6 +70,9 @@ export const anthropic = {
|
|
|
38
70
|
},
|
|
39
71
|
parseResponse(data) {
|
|
40
72
|
const text = data.content?.find(b => b.type === 'text')?.text ?? '';
|
|
73
|
+
const toolUse = (data.content ?? [])
|
|
74
|
+
.filter(b => b.type === 'tool_use')
|
|
75
|
+
.map(b => ({ id: b.id ?? '', name: b.name ?? '', input: b.input ?? {} }));
|
|
41
76
|
return {
|
|
42
77
|
text,
|
|
43
78
|
usage: {
|
|
@@ -47,6 +82,7 @@ export const anthropic = {
|
|
|
47
82
|
cacheRead: data.usage?.cache_read_input_tokens ?? 0,
|
|
48
83
|
},
|
|
49
84
|
stopReason: data.stop_reason ?? 'end',
|
|
85
|
+
...(toolUse.length ? { toolUse } : {}),
|
|
50
86
|
};
|
|
51
87
|
},
|
|
52
88
|
async *parseStream(response) {
|
|
@@ -55,6 +91,11 @@ export const anthropic = {
|
|
|
55
91
|
let snapshot = '';
|
|
56
92
|
let usage = { input: 0, output: 0, cacheCreation: 0, cacheRead: 0 };
|
|
57
93
|
let stopReason = 'end';
|
|
94
|
+
// Tool-use blocks stream as content_block_start (id + name) followed by
|
|
95
|
+
// input_json_delta fragments; the complete chunk is emitted only at
|
|
96
|
+
// content_block_stop — consumers never see partial JSON. Keyed by block
|
|
97
|
+
// index (multiple tool calls can interleave in one message).
|
|
98
|
+
const pendingTools = new Map();
|
|
58
99
|
for await (const event of readSSE(response.body)) {
|
|
59
100
|
if (event.done)
|
|
60
101
|
break;
|
|
@@ -74,6 +115,15 @@ export const anthropic = {
|
|
|
74
115
|
usage.cacheRead = data.message.usage.cache_read_input_tokens ?? 0;
|
|
75
116
|
}
|
|
76
117
|
break;
|
|
118
|
+
case 'content_block_start':
|
|
119
|
+
if (data.content_block?.type === 'tool_use' && data.index != null) {
|
|
120
|
+
pendingTools.set(data.index, {
|
|
121
|
+
id: data.content_block.id ?? '',
|
|
122
|
+
name: data.content_block.name ?? '',
|
|
123
|
+
json: '',
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
break;
|
|
77
127
|
case 'content_block_delta': {
|
|
78
128
|
const delta = data.delta;
|
|
79
129
|
if (delta?.type === 'text_delta' && delta.text != null) {
|
|
@@ -83,6 +133,26 @@ export const anthropic = {
|
|
|
83
133
|
else if (delta?.type === 'thinking_delta' && delta.thinking != null) {
|
|
84
134
|
yield { type: 'thinking', text: delta.thinking };
|
|
85
135
|
}
|
|
136
|
+
else if (delta?.type === 'input_json_delta' && delta.partial_json != null && data.index != null) {
|
|
137
|
+
const pending = pendingTools.get(data.index);
|
|
138
|
+
if (pending)
|
|
139
|
+
pending.json += delta.partial_json;
|
|
140
|
+
}
|
|
141
|
+
break;
|
|
142
|
+
}
|
|
143
|
+
case 'content_block_stop': {
|
|
144
|
+
if (data.index == null)
|
|
145
|
+
break;
|
|
146
|
+
const pending = pendingTools.get(data.index);
|
|
147
|
+
if (pending) {
|
|
148
|
+
pendingTools.delete(data.index);
|
|
149
|
+
let input = {};
|
|
150
|
+
try {
|
|
151
|
+
input = pending.json ? JSON.parse(pending.json) : {};
|
|
152
|
+
}
|
|
153
|
+
catch { }
|
|
154
|
+
yield { type: 'tool_use', id: pending.id, name: pending.name, input };
|
|
155
|
+
}
|
|
86
156
|
break;
|
|
87
157
|
}
|
|
88
158
|
case 'message_delta':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../src/adapters/anthropic.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAEnC,MAAM,OAAO,GAAG,uCAAuC,CAAC;AACxD,MAAM,WAAW,GAAG,YAAY,CAAC;AACjC,MAAM,kBAAkB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../src/adapters/anthropic.ts"],"names":[],"mappings":"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"}
|
package/adapters/gemini.d.ts
CHANGED
package/adapters/gemini.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../src/adapters/gemini.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAgB,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOnH,UAAU,mBAAmB;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,UAAU,UAAU;
|
|
1
|
+
{"version":3,"file":"gemini.d.ts","sourceRoot":"","sources":["../src/adapters/gemini.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAgB,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOnH,UAAU,mBAAmB;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,UAAU,UAAU;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAC;CAClE;AACD,UAAU,aAAa;IAAG,KAAK,CAAC,EAAE,UAAU,EAAE,CAAA;CAAE;AAChD,UAAU,eAAe;IACvB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,mBAAmB,CAAC;CACrC;AA+BD,eAAO,MAAM,MAAM;;uBAGE,gBAAgB,GAAG,cAAc;wBAoChC,kBAAkB,GAAG,eAAe;0BAwB3B,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC;CA+CpE,CAAC"}
|
package/adapters/gemini.js
CHANGED
|
@@ -6,19 +6,49 @@
|
|
|
6
6
|
import { readSSE } from './sse.js';
|
|
7
7
|
const API_URL = 'https://generativelanguage.googleapis.com/v1beta/models';
|
|
8
8
|
const DEFAULT_MAX_TOKENS = 32768;
|
|
9
|
+
/** Gemini has no tool-call ids — functionCall/functionResponse address the
|
|
10
|
+
* function by NAME. Ids are synthesized (`call_<n>_<name>`) on parse so the
|
|
11
|
+
* neutral loop can match results to calls; on the way back out only the
|
|
12
|
+
* part's `name` is used. */
|
|
13
|
+
let syntheticId = 0;
|
|
14
|
+
/** Neutral Parts → Gemini wire: tool_use → functionCall, tool_result →
|
|
15
|
+
* functionResponse (in a user-role content), roles assistant → model. */
|
|
16
|
+
function toGeminiContents(messages) {
|
|
17
|
+
return messages.map(msg => {
|
|
18
|
+
const role = msg.role === 'assistant' ? 'model' : 'user';
|
|
19
|
+
if (typeof msg.content === 'string') {
|
|
20
|
+
return { role, parts: [{ text: msg.content }] };
|
|
21
|
+
}
|
|
22
|
+
const parts = msg.content.map(part => {
|
|
23
|
+
if (part.type === 'tool_use') {
|
|
24
|
+
return { functionCall: { name: part.name, args: part.input } };
|
|
25
|
+
}
|
|
26
|
+
if (part.type === 'tool_result') {
|
|
27
|
+
return { functionResponse: { name: part.name ?? part.toolUseId, response: { content: part.content } } };
|
|
28
|
+
}
|
|
29
|
+
return { text: part.text };
|
|
30
|
+
});
|
|
31
|
+
return { role, parts };
|
|
32
|
+
});
|
|
33
|
+
}
|
|
9
34
|
// ── Adapter ────────────────────────────────────────────────────────────────
|
|
10
35
|
export const gemini = {
|
|
11
36
|
name: 'gemini',
|
|
12
37
|
buildRequest(opts) {
|
|
13
38
|
const model = opts.model;
|
|
14
|
-
const
|
|
15
|
-
role: msg.role === 'assistant' ? 'model' : 'user',
|
|
16
|
-
parts: [{ text: msg.content }],
|
|
17
|
-
}));
|
|
18
|
-
const body = { contents };
|
|
39
|
+
const body = { contents: toGeminiContents(opts.messages) };
|
|
19
40
|
if (opts.system != null) {
|
|
20
41
|
body['systemInstruction'] = { parts: [{ text: opts.system }] };
|
|
21
42
|
}
|
|
43
|
+
if (opts.tools?.length) {
|
|
44
|
+
body['tools'] = [{
|
|
45
|
+
functionDeclarations: opts.tools.map(t => ({
|
|
46
|
+
name: t.name,
|
|
47
|
+
...(t.description ? { description: t.description } : {}),
|
|
48
|
+
parameters: t.inputSchema,
|
|
49
|
+
})),
|
|
50
|
+
}];
|
|
51
|
+
}
|
|
22
52
|
const generationConfig = {
|
|
23
53
|
maxOutputTokens: opts.maxTokens ?? DEFAULT_MAX_TOKENS,
|
|
24
54
|
};
|
|
@@ -38,6 +68,13 @@ export const gemini = {
|
|
|
38
68
|
parseResponse(data) {
|
|
39
69
|
const parts = data.candidates?.[0]?.content?.parts ?? [];
|
|
40
70
|
const text = parts.map(p => p.text ?? '').join('');
|
|
71
|
+
const toolUse = parts
|
|
72
|
+
.filter(p => p.functionCall)
|
|
73
|
+
.map(p => ({
|
|
74
|
+
id: `call_${++syntheticId}_${p.functionCall?.name ?? ''}`,
|
|
75
|
+
name: p.functionCall?.name ?? '',
|
|
76
|
+
input: p.functionCall?.args ?? {},
|
|
77
|
+
}));
|
|
41
78
|
return {
|
|
42
79
|
text,
|
|
43
80
|
usage: {
|
|
@@ -48,6 +85,7 @@ export const gemini = {
|
|
|
48
85
|
// STOP / MAX_TOKENS / SAFETY / …; the downstream truncation detector
|
|
49
86
|
// reads the raw value. 'end' only when the field is absent.
|
|
50
87
|
stopReason: data.candidates?.[0]?.finishReason ?? 'end',
|
|
88
|
+
...(toolUse.length ? { toolUse } : {}),
|
|
51
89
|
};
|
|
52
90
|
},
|
|
53
91
|
async *parseStream(response) {
|
|
@@ -87,6 +125,15 @@ export const gemini = {
|
|
|
87
125
|
snapshot += part.text;
|
|
88
126
|
yield { type: 'text', text: part.text, snapshot };
|
|
89
127
|
}
|
|
128
|
+
if (part.functionCall) {
|
|
129
|
+
// Gemini streams functionCall parts complete, never as deltas.
|
|
130
|
+
yield {
|
|
131
|
+
type: 'tool_use',
|
|
132
|
+
id: `call_${++syntheticId}_${part.functionCall.name ?? ''}`,
|
|
133
|
+
name: part.functionCall.name ?? '',
|
|
134
|
+
input: part.functionCall.args ?? {},
|
|
135
|
+
};
|
|
136
|
+
}
|
|
90
137
|
}
|
|
91
138
|
}
|
|
92
139
|
yield { type: 'done', text: snapshot, usage, stopReason };
|
package/adapters/gemini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/adapters/gemini.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,OAAO,GAAG,yDAAyD,CAAC;AAC1E,MAAM,kBAAkB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../src/adapters/gemini.ts"],"names":[],"mappings":"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"}
|
package/adapters/index.d.ts
CHANGED
|
@@ -36,13 +36,13 @@
|
|
|
36
36
|
import { anthropic } from './anthropic.js';
|
|
37
37
|
import { openai } from './openai.js';
|
|
38
38
|
import { gemini } from './gemini.js';
|
|
39
|
-
import type { AdapterResponse, AdapterUsage, StreamChunk, BuildRequestOpts } from './anthropic.js';
|
|
40
|
-
export type { StreamChunk, AdapterUsage, AdapterResponse, BuildRequestOpts };
|
|
39
|
+
import type { AdapterResponse, AdapterUsage, StreamChunk, BuildRequestOpts, ToolSpec, ToolUse, Part } from './anthropic.js';
|
|
40
|
+
export type { StreamChunk, AdapterUsage, AdapterResponse, BuildRequestOpts, ToolSpec, ToolUse, Part };
|
|
41
41
|
export interface ChatOpts {
|
|
42
42
|
model: string;
|
|
43
43
|
messages: Array<{
|
|
44
44
|
role: string;
|
|
45
|
-
content: string;
|
|
45
|
+
content: string | Part[];
|
|
46
46
|
}>;
|
|
47
47
|
apiKey: string;
|
|
48
48
|
provider?: string;
|
|
@@ -53,6 +53,7 @@ export interface ChatOpts {
|
|
|
53
53
|
type: string;
|
|
54
54
|
};
|
|
55
55
|
}>;
|
|
56
|
+
tools?: ToolSpec[];
|
|
56
57
|
maxTokens?: number;
|
|
57
58
|
temperature?: number;
|
|
58
59
|
stream?: boolean;
|
|
@@ -66,6 +67,7 @@ export interface ChatResult {
|
|
|
66
67
|
text: string;
|
|
67
68
|
usage: AdapterUsage;
|
|
68
69
|
stopReason: string;
|
|
70
|
+
toolUse?: ToolUse[];
|
|
69
71
|
}
|
|
70
72
|
export interface LLMClient {
|
|
71
73
|
chat(opts: Partial<ChatOpts>): Promise<ChatResult>;
|
package/adapters/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE5H,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAItG,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,CAAA;KAAE,CAAC,CAAC;IAC5D,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC1F,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;CAC9D;AAOD;;yEAEyE;AACzE,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAI3G;AA0FD;;GAEG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAmB9D;AAED;;GAEG;AACH,wBAAuB,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,CA0B7E;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,QAAQ,GAAE,OAAO,CAAC,QAAQ,CAAM,GAAG,SAAS,CAKxE;AAGD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC"}
|
package/adapters/index.js
CHANGED
|
@@ -103,6 +103,8 @@ function proxyRequest(opts, stream) {
|
|
|
103
103
|
};
|
|
104
104
|
if (opts.system != null)
|
|
105
105
|
body['system'] = opts.system;
|
|
106
|
+
if (opts.tools?.length)
|
|
107
|
+
body['tools'] = opts.tools;
|
|
106
108
|
if (opts.maxTokens != null)
|
|
107
109
|
body['maxTokens'] = opts.maxTokens;
|
|
108
110
|
if (opts.temperature != null)
|
package/adapters/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/adapters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/adapters/index.ts"],"names":[],"mappings":"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"}
|
package/adapters/openai.d.ts
CHANGED
|
@@ -8,13 +8,23 @@ interface OpenAIUsage {
|
|
|
8
8
|
prompt_tokens?: number;
|
|
9
9
|
completion_tokens?: number;
|
|
10
10
|
}
|
|
11
|
+
interface OpenAIToolCall {
|
|
12
|
+
index?: number;
|
|
13
|
+
id?: string;
|
|
14
|
+
function?: {
|
|
15
|
+
name?: string;
|
|
16
|
+
arguments?: string;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
11
19
|
interface OpenAIChoice {
|
|
12
20
|
message?: {
|
|
13
21
|
content?: string;
|
|
22
|
+
tool_calls?: OpenAIToolCall[];
|
|
14
23
|
};
|
|
15
24
|
delta?: {
|
|
16
25
|
content?: string;
|
|
17
26
|
reasoning_content?: string;
|
|
27
|
+
tool_calls?: OpenAIToolCall[];
|
|
18
28
|
};
|
|
19
29
|
finish_reason?: string;
|
|
20
30
|
}
|
package/adapters/openai.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/adapters/openai.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAgB,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMnH,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../src/adapters/openai.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAgB,WAAW,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAMnH,UAAU,WAAW;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,cAAc;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAClD;AAED,UAAU,YAAY;IACpB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IAC9D,KAAK,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,cAAc,EAAE,CAAA;KAAE,CAAC;IACxF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,kBAAkB;IAC1B,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,WAAW,CAAC;CACrB;AA2CD,eAAO,MAAM,MAAM;;uBAGE,gBAAgB,GAAG,cAAc;wBA8BhC,kBAAkB,GAAG,eAAe;0BAgB3B,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC;CA4DpE,CAAC"}
|
package/adapters/openai.js
CHANGED
|
@@ -5,21 +5,70 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { readSSE } from './sse.js';
|
|
7
7
|
const API_URL = 'https://api.openai.com/v1/chat/completions';
|
|
8
|
+
function parseArgs(args) {
|
|
9
|
+
if (!args)
|
|
10
|
+
return {};
|
|
11
|
+
try {
|
|
12
|
+
return JSON.parse(args);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return {};
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/** Neutral Parts → OpenAI wire: tool_use parts become the assistant
|
|
19
|
+
* message's tool_calls array; each tool_result part becomes its own
|
|
20
|
+
* `role:'tool'` message (OpenAI's shape — results are messages, not parts). */
|
|
21
|
+
function toOpenAIMessages(system, messages) {
|
|
22
|
+
const out = [];
|
|
23
|
+
if (system)
|
|
24
|
+
out.push({ role: 'system', content: system });
|
|
25
|
+
for (const msg of messages) {
|
|
26
|
+
if (typeof msg.content === 'string') {
|
|
27
|
+
out.push({ role: msg.role, content: msg.content });
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
const text = msg.content.filter(p => p.type === 'text').map(p => p.text).join('');
|
|
31
|
+
const toolUses = msg.content.filter(p => p.type === 'tool_use');
|
|
32
|
+
const toolResults = msg.content.filter(p => p.type === 'tool_result');
|
|
33
|
+
if (toolUses.length) {
|
|
34
|
+
out.push({
|
|
35
|
+
role: 'assistant',
|
|
36
|
+
content: text || null,
|
|
37
|
+
tool_calls: toolUses.map(p => ({
|
|
38
|
+
id: p.id,
|
|
39
|
+
type: 'function',
|
|
40
|
+
function: { name: p.name, arguments: JSON.stringify(p.input) },
|
|
41
|
+
})),
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
else if (!toolResults.length) {
|
|
45
|
+
out.push({ role: msg.role, content: text });
|
|
46
|
+
}
|
|
47
|
+
for (const p of toolResults) {
|
|
48
|
+
out.push({ role: 'tool', tool_call_id: p.toolUseId, content: p.content });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return out;
|
|
52
|
+
}
|
|
8
53
|
// ── Adapter ────────────────────────────────────────────────────────────────
|
|
9
54
|
export const openai = {
|
|
10
55
|
name: 'openai',
|
|
11
56
|
buildRequest(opts) {
|
|
12
|
-
const messages = [];
|
|
13
|
-
if (opts.system)
|
|
14
|
-
messages.push({ role: 'system', content: opts.system });
|
|
15
|
-
for (const msg of opts.messages) {
|
|
16
|
-
messages.push({ role: msg.role, content: msg.content });
|
|
17
|
-
}
|
|
18
57
|
const body = {
|
|
19
58
|
model: opts.model,
|
|
20
|
-
messages,
|
|
59
|
+
messages: toOpenAIMessages(opts.system, opts.messages),
|
|
21
60
|
stream: !!opts.stream,
|
|
22
61
|
};
|
|
62
|
+
if (opts.tools?.length) {
|
|
63
|
+
body['tools'] = opts.tools.map(t => ({
|
|
64
|
+
type: 'function',
|
|
65
|
+
function: {
|
|
66
|
+
name: t.name,
|
|
67
|
+
...(t.description ? { description: t.description } : {}),
|
|
68
|
+
parameters: t.inputSchema,
|
|
69
|
+
},
|
|
70
|
+
}));
|
|
71
|
+
}
|
|
23
72
|
if (opts.maxTokens)
|
|
24
73
|
body['max_tokens'] = opts.maxTokens;
|
|
25
74
|
if (opts.temperature != null)
|
|
@@ -38,10 +87,16 @@ export const openai = {
|
|
|
38
87
|
parseResponse(data) {
|
|
39
88
|
const choice = data.choices?.[0];
|
|
40
89
|
const text = choice?.message?.content ?? '';
|
|
90
|
+
const toolUse = (choice?.message?.tool_calls ?? []).map(tc => ({
|
|
91
|
+
id: tc.id ?? '',
|
|
92
|
+
name: tc.function?.name ?? '',
|
|
93
|
+
input: parseArgs(tc.function?.arguments),
|
|
94
|
+
}));
|
|
41
95
|
return {
|
|
42
96
|
text,
|
|
43
97
|
usage: { input: data.usage?.prompt_tokens ?? 0, output: data.usage?.completion_tokens ?? 0 },
|
|
44
98
|
stopReason: choice?.finish_reason === 'stop' ? 'end' : (choice?.finish_reason ?? 'end'),
|
|
99
|
+
...(toolUse.length ? { toolUse } : {}),
|
|
45
100
|
};
|
|
46
101
|
},
|
|
47
102
|
async *parseStream(response) {
|
|
@@ -50,6 +105,21 @@ export const openai = {
|
|
|
50
105
|
let snapshot = '';
|
|
51
106
|
let usage = { input: 0, output: 0 };
|
|
52
107
|
let stopReason = 'end';
|
|
108
|
+
// Tool-call deltas arrive as {index, id?, function:{name?, arguments?}}
|
|
109
|
+
// fragments — id/name on the first fragment, argument-string pieces on
|
|
110
|
+
// the rest. There is no per-call stop event, so complete tool_use chunks
|
|
111
|
+
// are emitted when the choice reports finish_reason (or at stream end).
|
|
112
|
+
const pendingTools = new Map();
|
|
113
|
+
let toolsFlushed = false;
|
|
114
|
+
function* flushTools() {
|
|
115
|
+
if (toolsFlushed)
|
|
116
|
+
return;
|
|
117
|
+
toolsFlushed = true;
|
|
118
|
+
for (const [, tc] of [...pendingTools.entries()].sort((a, b) => a[0] - b[0])) {
|
|
119
|
+
yield { type: 'tool_use', id: tc.id, name: tc.name, input: parseArgs(tc.args) };
|
|
120
|
+
}
|
|
121
|
+
pendingTools.clear();
|
|
122
|
+
}
|
|
53
123
|
for await (const event of readSSE(response.body)) {
|
|
54
124
|
if (event.done)
|
|
55
125
|
break;
|
|
@@ -67,8 +137,20 @@ export const openai = {
|
|
|
67
137
|
const choice = data.choices?.[0];
|
|
68
138
|
if (!choice)
|
|
69
139
|
continue;
|
|
140
|
+
for (const tc of choice.delta?.tool_calls ?? []) {
|
|
141
|
+
const idx = tc.index ?? 0;
|
|
142
|
+
const pending = pendingTools.get(idx) ?? { id: '', name: '', args: '' };
|
|
143
|
+
if (tc.id)
|
|
144
|
+
pending.id = tc.id;
|
|
145
|
+
if (tc.function?.name)
|
|
146
|
+
pending.name = tc.function.name;
|
|
147
|
+
if (tc.function?.arguments)
|
|
148
|
+
pending.args += tc.function.arguments;
|
|
149
|
+
pendingTools.set(idx, pending);
|
|
150
|
+
}
|
|
70
151
|
if (choice.finish_reason) {
|
|
71
152
|
stopReason = choice.finish_reason === 'stop' ? 'end' : choice.finish_reason;
|
|
153
|
+
yield* flushTools();
|
|
72
154
|
}
|
|
73
155
|
const delta = choice.delta;
|
|
74
156
|
if (delta?.content) {
|
|
@@ -79,6 +161,7 @@ export const openai = {
|
|
|
79
161
|
yield { type: 'thinking', text: delta.reasoning_content };
|
|
80
162
|
}
|
|
81
163
|
}
|
|
164
|
+
yield* flushTools();
|
|
82
165
|
yield { type: 'done', text: snapshot, usage, stopReason };
|
|
83
166
|
},
|
|
84
167
|
};
|
package/adapters/openai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../src/adapters/openai.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,MAAM,OAAO,GAAG,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../src/adapters/openai.ts"],"names":[],"mappings":"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"}
|
package/index.d.ts
CHANGED
|
@@ -7,7 +7,8 @@
|
|
|
7
7
|
* - StubLLMAdapter — deterministic test stub
|
|
8
8
|
* - createAdapter — AdiaUI pipeline bridge
|
|
9
9
|
*/
|
|
10
|
-
export { chat, streamChat, createClient } from './adapters/index.js';
|
|
10
|
+
export { chat, streamChat, createClient, detectProviderFromModel } from './adapters/index.js';
|
|
11
|
+
export type { ChatOpts, ChatResult, LLMClient, StreamChunk, AdapterUsage, ToolSpec, ToolUse, Part } from './adapters/index.js';
|
|
11
12
|
export { MODELS, DEFAULT_MODEL } from './models.js';
|
|
12
13
|
export { StubLLMAdapter } from './llm-stub.js';
|
|
13
14
|
export { createAdapter } from './llm-bridge.js';
|
package/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9F,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAC/H,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
|
package/index.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* - StubLLMAdapter — deterministic test stub
|
|
8
8
|
* - createAdapter — AdiaUI pipeline bridge
|
|
9
9
|
*/
|
|
10
|
-
export { chat, streamChat, createClient } from './adapters/index.js';
|
|
10
|
+
export { chat, streamChat, createClient, detectProviderFromModel } from './adapters/index.js';
|
|
11
11
|
export { MODELS, DEFAULT_MODEL } from './models.js';
|
|
12
12
|
export { StubLLMAdapter } from './llm-stub.js';
|
|
13
13
|
export { createAdapter } from './llm-bridge.js';
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9F,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adia-ai/llm",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.27",
|
|
4
4
|
"description": "Provider-agnostic LLM client — anthropic / openai / gemini adapters with a unified chat() + streamChat() facade. Used by AdiaUI's chat-shell and the A2UI generation pipeline; works in browser (with proxyUrl) and Node.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|