@cogitator-ai/express 0.2.14 → 0.3.1
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 +68 -22
- package/dist/middleware/cors.d.ts.map +1 -1
- package/dist/middleware/cors.js +16 -11
- package/dist/middleware/cors.js.map +1 -1
- package/dist/middleware/error-handler.d.ts.map +1 -1
- package/dist/middleware/error-handler.js +34 -0
- package/dist/middleware/error-handler.js.map +1 -1
- package/dist/middleware/rate-limit.d.ts.map +1 -1
- package/dist/middleware/rate-limit.js +24 -14
- package/dist/middleware/rate-limit.js.map +1 -1
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +60 -35
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/health.d.ts +1 -1
- package/dist/routes/health.d.ts.map +1 -1
- package/dist/routes/health.js +1 -2
- package/dist/routes/health.js.map +1 -1
- package/dist/routes/swarms.d.ts.map +1 -1
- package/dist/routes/swarms.js +53 -41
- package/dist/routes/swarms.js.map +1 -1
- package/dist/routes/threads.d.ts.map +1 -1
- package/dist/routes/threads.js +27 -35
- package/dist/routes/threads.js.map +1 -1
- package/dist/routes/tools.d.ts.map +1 -1
- package/dist/routes/tools.js +4 -3
- package/dist/routes/tools.js.map +1 -1
- package/dist/routes/utils.d.ts +36 -0
- package/dist/routes/utils.d.ts.map +1 -0
- package/dist/routes/utils.js +95 -0
- package/dist/routes/utils.js.map +1 -0
- package/dist/routes/workflows.d.ts.map +1 -1
- package/dist/routes/workflows.js +49 -31
- package/dist/routes/workflows.js.map +1 -1
- package/dist/server.d.ts +8 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +27 -15
- package/dist/server.js.map +1 -1
- package/dist/streaming/express-stream-writer.d.ts +1 -0
- package/dist/streaming/express-stream-writer.d.ts.map +1 -1
- package/dist/streaming/express-stream-writer.js +14 -1
- package/dist/streaming/express-stream-writer.js.map +1 -1
- package/dist/types.d.ts +0 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/websocket/ws-handler.d.ts +7 -0
- package/dist/websocket/ws-handler.d.ts.map +1 -1
- package/dist/websocket/ws-handler.js +238 -113
- package/dist/websocket/ws-handler.js.map +1 -1
- package/package.json +9 -9
|
@@ -1,88 +1,206 @@
|
|
|
1
1
|
import { generateId } from '../streaming/helpers.js';
|
|
2
|
-
const
|
|
3
|
-
|
|
2
|
+
const WS_OPEN = 1;
|
|
3
|
+
const MAX_SUBSCRIPTIONS = 64;
|
|
4
|
+
const MAX_CHANNEL_LENGTH = 256;
|
|
5
|
+
const MESSAGE_TYPES = new Set([
|
|
6
|
+
'subscribe',
|
|
7
|
+
'unsubscribe',
|
|
8
|
+
'run',
|
|
9
|
+
'stop',
|
|
10
|
+
'ping',
|
|
11
|
+
]);
|
|
12
|
+
class ChannelHub {
|
|
13
|
+
channels = new Map();
|
|
14
|
+
subscribe(ws, channel) {
|
|
15
|
+
let members = this.channels.get(channel);
|
|
16
|
+
if (!members) {
|
|
17
|
+
members = new Set();
|
|
18
|
+
this.channels.set(channel, members);
|
|
19
|
+
}
|
|
20
|
+
members.add(ws);
|
|
21
|
+
}
|
|
22
|
+
unsubscribe(ws, channel) {
|
|
23
|
+
const members = this.channels.get(channel);
|
|
24
|
+
if (!members)
|
|
25
|
+
return;
|
|
26
|
+
members.delete(ws);
|
|
27
|
+
if (members.size === 0)
|
|
28
|
+
this.channels.delete(channel);
|
|
29
|
+
}
|
|
30
|
+
publish(channel, response, exclude) {
|
|
31
|
+
const members = this.channels.get(channel);
|
|
32
|
+
if (!members)
|
|
33
|
+
return;
|
|
34
|
+
for (const member of members) {
|
|
35
|
+
if (member !== exclude)
|
|
36
|
+
sendResponse(member, { ...response, channel });
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
function isPlainObject(value) {
|
|
41
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
42
|
+
}
|
|
43
|
+
function parseMessage(raw) {
|
|
44
|
+
let data;
|
|
4
45
|
try {
|
|
5
|
-
|
|
6
|
-
const wss = new WebSocketServer({
|
|
7
|
-
server,
|
|
8
|
-
path: config.path || `${ctx.config.basePath}/ws`,
|
|
9
|
-
maxPayload: config.maxPayloadSize || 1024 * 1024,
|
|
10
|
-
});
|
|
11
|
-
const pingInterval = config.pingInterval || 30000;
|
|
12
|
-
wss.on('connection', (ws) => {
|
|
13
|
-
const clientState = {
|
|
14
|
-
id: generateId('ws'),
|
|
15
|
-
subscriptions: new Map(),
|
|
16
|
-
};
|
|
17
|
-
clients.set(ws, clientState);
|
|
18
|
-
let alive = true;
|
|
19
|
-
const heartbeat = setInterval(() => {
|
|
20
|
-
if (!alive) {
|
|
21
|
-
clearInterval(heartbeat);
|
|
22
|
-
ws.terminate();
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
alive = false;
|
|
26
|
-
ws.ping();
|
|
27
|
-
}, pingInterval);
|
|
28
|
-
ws.on('pong', () => {
|
|
29
|
-
alive = true;
|
|
30
|
-
});
|
|
31
|
-
ws.on('message', async (data) => {
|
|
32
|
-
try {
|
|
33
|
-
const message = JSON.parse(data.toString());
|
|
34
|
-
await handleMessage(ws, message, ctx, clientState);
|
|
35
|
-
}
|
|
36
|
-
catch (error) {
|
|
37
|
-
sendResponse(ws, {
|
|
38
|
-
type: 'error',
|
|
39
|
-
error: error instanceof Error ? error.message : 'Invalid message',
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
});
|
|
43
|
-
ws.on('close', () => {
|
|
44
|
-
clearInterval(heartbeat);
|
|
45
|
-
clientState.abortController?.abort();
|
|
46
|
-
clients.delete(ws);
|
|
47
|
-
});
|
|
48
|
-
ws.on('error', () => {
|
|
49
|
-
clearInterval(heartbeat);
|
|
50
|
-
clientState.abortController?.abort();
|
|
51
|
-
clients.delete(ws);
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
console.log(`[CogitatorServer] WebSocket enabled at ${ctx.config.basePath}/ws`);
|
|
55
|
-
return wss;
|
|
46
|
+
data = JSON.parse(raw);
|
|
56
47
|
}
|
|
57
48
|
catch {
|
|
49
|
+
return null;
|
|
50
|
+
}
|
|
51
|
+
if (!isPlainObject(data) || typeof data.type !== 'string' || !MESSAGE_TYPES.has(data.type)) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
if (data.id !== undefined && typeof data.id !== 'string')
|
|
55
|
+
return null;
|
|
56
|
+
if (data.channel !== undefined && typeof data.channel !== 'string')
|
|
57
|
+
return null;
|
|
58
|
+
return {
|
|
59
|
+
type: data.type,
|
|
60
|
+
id: data.id,
|
|
61
|
+
channel: data.channel,
|
|
62
|
+
payload: data.payload,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function parseRunPayload(payload) {
|
|
66
|
+
if (!isPlainObject(payload))
|
|
67
|
+
return null;
|
|
68
|
+
const { type, name, input, context, threadId } = payload;
|
|
69
|
+
if (type !== 'agent' && type !== 'workflow' && type !== 'swarm')
|
|
70
|
+
return null;
|
|
71
|
+
if (typeof name !== 'string' || !name)
|
|
72
|
+
return null;
|
|
73
|
+
if (typeof input !== 'string' || !input.trim())
|
|
74
|
+
return null;
|
|
75
|
+
if (context !== undefined && !isPlainObject(context))
|
|
76
|
+
return null;
|
|
77
|
+
if (threadId !== undefined && typeof threadId !== 'string')
|
|
78
|
+
return null;
|
|
79
|
+
return { type, name, input, context, threadId };
|
|
80
|
+
}
|
|
81
|
+
function isModuleNotFound(error) {
|
|
82
|
+
return (typeof error === 'object' &&
|
|
83
|
+
error !== null &&
|
|
84
|
+
'code' in error &&
|
|
85
|
+
(error.code === 'ERR_MODULE_NOT_FOUND' || error.code === 'MODULE_NOT_FOUND'));
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Attach the Cogitator WebSocket protocol to an HTTP server.
|
|
89
|
+
*
|
|
90
|
+
* When `ctx.config.auth` is set it is called with the upgrade request; connections whose
|
|
91
|
+
* auth function throws are rejected with 401. Returns `null` when the optional `ws`
|
|
92
|
+
* package is not installed.
|
|
93
|
+
*/
|
|
94
|
+
export async function setupWebSocket(server, ctx, config = {}) {
|
|
95
|
+
let wsModule;
|
|
96
|
+
try {
|
|
97
|
+
wsModule = await import('ws');
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
if (!isModuleNotFound(error))
|
|
101
|
+
throw error;
|
|
58
102
|
console.warn('[CogitatorServer] WebSocket setup failed (ws package not installed)');
|
|
59
103
|
return null;
|
|
60
104
|
}
|
|
105
|
+
const authFn = ctx.config.auth;
|
|
106
|
+
const authResults = new WeakMap();
|
|
107
|
+
const hub = new ChannelHub();
|
|
108
|
+
const path = config.path || `${ctx.config.basePath}/ws`;
|
|
109
|
+
const wss = new wsModule.WebSocketServer({
|
|
110
|
+
server,
|
|
111
|
+
path,
|
|
112
|
+
maxPayload: config.maxPayloadSize || 1024 * 1024,
|
|
113
|
+
verifyClient: authFn
|
|
114
|
+
? (info, callback) => {
|
|
115
|
+
Promise.resolve()
|
|
116
|
+
.then(() => authFn(info.req))
|
|
117
|
+
.then((auth) => {
|
|
118
|
+
authResults.set(info.req, auth);
|
|
119
|
+
callback(true);
|
|
120
|
+
})
|
|
121
|
+
.catch(() => callback(false, 401, 'Unauthorized'));
|
|
122
|
+
}
|
|
123
|
+
: undefined,
|
|
124
|
+
});
|
|
125
|
+
const pingInterval = config.pingInterval || 30000;
|
|
126
|
+
wss.on('connection', (ws, req) => {
|
|
127
|
+
const clientState = {
|
|
128
|
+
id: generateId('ws'),
|
|
129
|
+
auth: authResults.get(req),
|
|
130
|
+
subscriptions: new Set(),
|
|
131
|
+
};
|
|
132
|
+
let alive = true;
|
|
133
|
+
const heartbeat = setInterval(() => {
|
|
134
|
+
if (!alive) {
|
|
135
|
+
clearInterval(heartbeat);
|
|
136
|
+
ws.terminate();
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
alive = false;
|
|
140
|
+
ws.ping();
|
|
141
|
+
}, pingInterval);
|
|
142
|
+
ws.on('pong', () => {
|
|
143
|
+
alive = true;
|
|
144
|
+
});
|
|
145
|
+
ws.on('message', (data) => {
|
|
146
|
+
const message = parseMessage(data.toString());
|
|
147
|
+
if (!message) {
|
|
148
|
+
sendResponse(ws, { type: 'error', error: 'Invalid message' });
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
void handleMessage(ws, message, ctx, clientState, hub);
|
|
152
|
+
});
|
|
153
|
+
const cleanup = () => {
|
|
154
|
+
clearInterval(heartbeat);
|
|
155
|
+
clientState.abortController?.abort();
|
|
156
|
+
clientState.abortController = undefined;
|
|
157
|
+
for (const channel of clientState.subscriptions)
|
|
158
|
+
hub.unsubscribe(ws, channel);
|
|
159
|
+
clientState.subscriptions.clear();
|
|
160
|
+
};
|
|
161
|
+
ws.on('close', cleanup);
|
|
162
|
+
ws.on('error', cleanup);
|
|
163
|
+
});
|
|
164
|
+
wss.on('close', () => {
|
|
165
|
+
for (const client of wss.clients)
|
|
166
|
+
client.terminate();
|
|
167
|
+
});
|
|
168
|
+
console.log(`[CogitatorServer] WebSocket enabled at ${path}`);
|
|
169
|
+
return wss;
|
|
61
170
|
}
|
|
62
|
-
async function handleMessage(ws, message, ctx, state) {
|
|
171
|
+
async function handleMessage(ws, message, ctx, state, hub) {
|
|
63
172
|
switch (message.type) {
|
|
64
173
|
case 'ping':
|
|
65
|
-
sendResponse(ws, { type: 'pong' });
|
|
174
|
+
sendResponse(ws, { type: 'pong', id: message.id });
|
|
66
175
|
break;
|
|
67
|
-
case 'subscribe':
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
176
|
+
case 'subscribe': {
|
|
177
|
+
const channel = message.channel;
|
|
178
|
+
if (!channel || channel.length > MAX_CHANNEL_LENGTH) {
|
|
179
|
+
sendResponse(ws, { type: 'error', id: message.id, error: 'Invalid channel' });
|
|
180
|
+
break;
|
|
181
|
+
}
|
|
182
|
+
if (!state.subscriptions.has(channel) && state.subscriptions.size >= MAX_SUBSCRIPTIONS) {
|
|
183
|
+
sendResponse(ws, {
|
|
184
|
+
type: 'error',
|
|
185
|
+
id: message.id,
|
|
186
|
+
error: `Subscription limit reached (max ${MAX_SUBSCRIPTIONS})`,
|
|
74
187
|
});
|
|
75
|
-
|
|
188
|
+
break;
|
|
76
189
|
}
|
|
190
|
+
state.subscriptions.add(channel);
|
|
191
|
+
hub.subscribe(ws, channel);
|
|
192
|
+
sendResponse(ws, { type: 'subscribed', id: message.id, channel });
|
|
77
193
|
break;
|
|
194
|
+
}
|
|
78
195
|
case 'unsubscribe':
|
|
79
196
|
if (message.channel) {
|
|
80
197
|
state.subscriptions.delete(message.channel);
|
|
81
|
-
|
|
198
|
+
hub.unsubscribe(ws, message.channel);
|
|
199
|
+
sendResponse(ws, { type: 'unsubscribed', id: message.id, channel: message.channel });
|
|
82
200
|
}
|
|
83
201
|
break;
|
|
84
202
|
case 'run':
|
|
85
|
-
await handleRun(ws, message, ctx, state);
|
|
203
|
+
await handleRun(ws, message, ctx, state, hub);
|
|
86
204
|
break;
|
|
87
205
|
case 'stop':
|
|
88
206
|
state.abortController?.abort();
|
|
@@ -90,57 +208,61 @@ async function handleMessage(ws, message, ctx, state) {
|
|
|
90
208
|
break;
|
|
91
209
|
}
|
|
92
210
|
}
|
|
93
|
-
async function handleRun(ws, message, ctx, state) {
|
|
94
|
-
const payload = message.payload;
|
|
95
|
-
if (!payload
|
|
211
|
+
async function handleRun(ws, message, ctx, state, hub) {
|
|
212
|
+
const payload = parseRunPayload(message.payload);
|
|
213
|
+
if (!payload) {
|
|
96
214
|
sendResponse(ws, { type: 'error', id: message.id, error: 'Invalid run payload' });
|
|
97
215
|
return;
|
|
98
216
|
}
|
|
217
|
+
if (payload.type !== 'agent') {
|
|
218
|
+
sendResponse(ws, {
|
|
219
|
+
type: 'error',
|
|
220
|
+
id: message.id,
|
|
221
|
+
error: `Run type '${payload.type}' is not supported over WebSocket`,
|
|
222
|
+
});
|
|
223
|
+
return;
|
|
224
|
+
}
|
|
225
|
+
const agent = Object.hasOwn(ctx.agents, payload.name) ? ctx.agents[payload.name] : undefined;
|
|
226
|
+
if (!agent) {
|
|
227
|
+
sendResponse(ws, {
|
|
228
|
+
type: 'error',
|
|
229
|
+
id: message.id,
|
|
230
|
+
error: `Agent '${payload.name}' not found`,
|
|
231
|
+
});
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
99
234
|
state.abortController?.abort();
|
|
100
|
-
|
|
235
|
+
const controller = new AbortController();
|
|
236
|
+
state.abortController = controller;
|
|
237
|
+
const channel = `agent:${payload.name}`;
|
|
238
|
+
const emit = (eventPayload) => {
|
|
239
|
+
const response = { type: 'event', id: message.id, payload: eventPayload };
|
|
240
|
+
sendResponse(ws, response);
|
|
241
|
+
hub.publish(channel, response, ws);
|
|
242
|
+
};
|
|
101
243
|
try {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
payload: { type: 'token', delta: token },
|
|
121
|
-
});
|
|
122
|
-
},
|
|
123
|
-
onToolCall: (toolCall) => {
|
|
124
|
-
sendResponse(ws, {
|
|
125
|
-
type: 'event',
|
|
126
|
-
id: message.id,
|
|
127
|
-
payload: { type: 'tool-call', ...toolCall },
|
|
128
|
-
});
|
|
129
|
-
},
|
|
130
|
-
onToolResult: (toolResult) => {
|
|
131
|
-
sendResponse(ws, {
|
|
132
|
-
type: 'event',
|
|
133
|
-
id: message.id,
|
|
134
|
-
payload: { type: 'tool-result', ...toolResult },
|
|
135
|
-
});
|
|
136
|
-
},
|
|
137
|
-
});
|
|
138
|
-
sendResponse(ws, { type: 'event', id: message.id, payload: { type: 'complete', result } });
|
|
139
|
-
}
|
|
244
|
+
const result = await ctx.cogitator.run(agent, {
|
|
245
|
+
input: payload.input,
|
|
246
|
+
context: payload.context,
|
|
247
|
+
threadId: payload.threadId,
|
|
248
|
+
userId: state.auth?.userId,
|
|
249
|
+
signal: controller.signal,
|
|
250
|
+
stream: true,
|
|
251
|
+
onToken: (token) => {
|
|
252
|
+
emit({ type: 'token', delta: token });
|
|
253
|
+
},
|
|
254
|
+
onToolCall: (toolCall) => {
|
|
255
|
+
emit({ type: 'tool-call', ...toolCall });
|
|
256
|
+
},
|
|
257
|
+
onToolResult: (toolResult) => {
|
|
258
|
+
emit({ type: 'tool-result', ...toolResult });
|
|
259
|
+
},
|
|
260
|
+
});
|
|
261
|
+
emit({ type: 'complete', result });
|
|
140
262
|
}
|
|
141
263
|
catch (error) {
|
|
142
|
-
if (
|
|
143
|
-
|
|
264
|
+
if (controller.signal.aborted) {
|
|
265
|
+
emit({ type: 'cancelled' });
|
|
144
266
|
}
|
|
145
267
|
else {
|
|
146
268
|
sendResponse(ws, {
|
|
@@ -150,13 +272,16 @@ async function handleRun(ws, message, ctx, state) {
|
|
|
150
272
|
});
|
|
151
273
|
}
|
|
152
274
|
}
|
|
275
|
+
finally {
|
|
276
|
+
if (state.abortController === controller)
|
|
277
|
+
state.abortController = undefined;
|
|
278
|
+
}
|
|
153
279
|
}
|
|
154
|
-
const WS_OPEN = 1;
|
|
155
280
|
function sendResponse(ws, response) {
|
|
281
|
+
if (ws.readyState !== WS_OPEN)
|
|
282
|
+
return;
|
|
156
283
|
try {
|
|
157
|
-
|
|
158
|
-
ws.send(JSON.stringify(response));
|
|
159
|
-
}
|
|
284
|
+
ws.send(JSON.stringify(response));
|
|
160
285
|
}
|
|
161
286
|
catch { }
|
|
162
287
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-handler.js","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ws-handler.js","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogitator-ai/express",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "Express.js server adapter for Cogitator AI runtime",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -15,17 +15,17 @@
|
|
|
15
15
|
"dist"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@cogitator-ai/
|
|
19
|
-
"@cogitator-ai/
|
|
20
|
-
"@cogitator-ai/
|
|
18
|
+
"@cogitator-ai/core": "0.20.0",
|
|
19
|
+
"@cogitator-ai/types": "0.23.0",
|
|
20
|
+
"@cogitator-ai/server-shared": "0.1.0"
|
|
21
21
|
},
|
|
22
22
|
"peerDependencies": {
|
|
23
23
|
"express": ">=4.18.0"
|
|
24
24
|
},
|
|
25
25
|
"optionalDependencies": {
|
|
26
26
|
"ws": "^8.0.0",
|
|
27
|
-
"@cogitator-ai/
|
|
28
|
-
"@cogitator-ai/
|
|
27
|
+
"@cogitator-ai/swarms": "0.5.1",
|
|
28
|
+
"@cogitator-ai/workflows": "0.6.1"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@types/express": "^4.17.21",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"typescript": "^5.6.0",
|
|
37
37
|
"vitest": "^4.0.18",
|
|
38
38
|
"ws": "^8.18.0",
|
|
39
|
-
"@cogitator-ai/swarms": "0.
|
|
40
|
-
"@cogitator-ai/workflows": "0.
|
|
39
|
+
"@cogitator-ai/swarms": "0.5.1",
|
|
40
|
+
"@cogitator-ai/workflows": "0.6.1"
|
|
41
41
|
},
|
|
42
42
|
"repository": {
|
|
43
43
|
"type": "git",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"llm"
|
|
59
59
|
],
|
|
60
60
|
"scripts": {
|
|
61
|
-
"build": "tsc",
|
|
61
|
+
"build": "tsc && tsx ../../scripts/fix-esm-imports.ts .",
|
|
62
62
|
"dev": "tsc --watch",
|
|
63
63
|
"test": "vitest run",
|
|
64
64
|
"test:watch": "vitest",
|