@cogitator-ai/next 0.2.12 → 0.3.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 +40 -13
- package/dist/client/http-error.d.ts +6 -0
- package/dist/client/http-error.d.ts.map +1 -0
- package/dist/client/http-error.js +26 -0
- package/dist/client/http-error.js.map +1 -0
- package/dist/client/index.d.ts +1 -0
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +1 -0
- package/dist/client/index.js.map +1 -1
- package/dist/client/retry.d.ts +2 -1
- package/dist/client/retry.d.ts.map +1 -1
- package/dist/client/retry.js +37 -11
- package/dist/client/retry.js.map +1 -1
- package/dist/client/sse-parser.d.ts.map +1 -1
- package/dist/client/sse-parser.js +29 -28
- package/dist/client/sse-parser.js.map +1 -1
- package/dist/client/use-agent.d.ts.map +1 -1
- package/dist/client/use-agent.js +29 -6
- package/dist/client/use-agent.js.map +1 -1
- package/dist/client/use-chat.d.ts.map +1 -1
- package/dist/client/use-chat.js +130 -96
- package/dist/client/use-chat.js.map +1 -1
- package/dist/handlers/agent.d.ts.map +1 -1
- package/dist/handlers/agent.js +33 -35
- package/dist/handlers/agent.js.map +1 -1
- package/dist/handlers/chat.d.ts.map +1 -1
- package/dist/handlers/chat.js +124 -70
- package/dist/handlers/chat.js.map +1 -1
- package/dist/handlers/http.d.ts +15 -0
- package/dist/handlers/http.d.ts.map +1 -0
- package/dist/handlers/http.js +66 -0
- package/dist/handlers/http.js.map +1 -0
- package/dist/streaming/protocol.d.ts +2 -1
- package/dist/streaming/protocol.d.ts.map +1 -1
- package/dist/streaming/protocol.js +2 -2
- package/dist/streaming/protocol.js.map +1 -1
- package/dist/streaming/stream-writer.d.ts +2 -1
- package/dist/streaming/stream-writer.d.ts.map +1 -1
- package/dist/streaming/stream-writer.js +12 -3
- package/dist/streaming/stream-writer.js.map +1 -1
- package/package.json +4 -4
package/dist/handlers/chat.js
CHANGED
|
@@ -1,48 +1,65 @@
|
|
|
1
1
|
import { StreamWriter } from '../streaming/stream-writer.js';
|
|
2
2
|
import { generateId } from '../streaming/encoder.js';
|
|
3
|
+
import { exceedsDeclaredSize, hookErrorResponse, isPlainObject, jsonError, readJsonBody, } from './http.js';
|
|
3
4
|
const SSE_HEADERS = {
|
|
4
5
|
'Content-Type': 'text/event-stream',
|
|
5
6
|
'Cache-Control': 'no-cache',
|
|
6
7
|
Connection: 'keep-alive',
|
|
7
8
|
'X-Accel-Buffering': 'no',
|
|
8
|
-
'x-vercel-ai-ui-message-stream': 'v1',
|
|
9
9
|
};
|
|
10
|
-
const
|
|
10
|
+
const CHAT_ROLES = new Set(['user', 'assistant', 'system']);
|
|
11
|
+
function isChatRole(role) {
|
|
12
|
+
return typeof role === 'string' && CHAT_ROLES.has(role);
|
|
13
|
+
}
|
|
11
14
|
function parseDefaultInput(body) {
|
|
12
|
-
|
|
15
|
+
if (!isPlainObject(body)) {
|
|
16
|
+
return { ok: false, error: 'Request body must be a JSON object' };
|
|
17
|
+
}
|
|
18
|
+
if (!Array.isArray(body.messages)) {
|
|
19
|
+
return { ok: false, error: 'messages must be an array' };
|
|
20
|
+
}
|
|
21
|
+
if (body.threadId !== undefined && body.threadId !== null && typeof body.threadId !== 'string') {
|
|
22
|
+
return { ok: false, error: 'threadId must be a string' };
|
|
23
|
+
}
|
|
24
|
+
if (body.metadata !== undefined && body.metadata !== null && !isPlainObject(body.metadata)) {
|
|
25
|
+
return { ok: false, error: 'metadata must be an object' };
|
|
26
|
+
}
|
|
13
27
|
const messages = [];
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
messages.push({
|
|
18
|
-
id: msg.id ?? generateId('msg'),
|
|
19
|
-
role: msg.role,
|
|
20
|
-
content: String(msg.content),
|
|
21
|
-
});
|
|
22
|
-
}
|
|
28
|
+
for (const msg of body.messages) {
|
|
29
|
+
if (!isPlainObject(msg) || !isChatRole(msg.role) || typeof msg.content !== 'string') {
|
|
30
|
+
continue;
|
|
23
31
|
}
|
|
32
|
+
messages.push({
|
|
33
|
+
id: typeof msg.id === 'string' && msg.id ? msg.id : generateId('msg'),
|
|
34
|
+
role: msg.role,
|
|
35
|
+
content: msg.content,
|
|
36
|
+
metadata: isPlainObject(msg.metadata) ? msg.metadata : undefined,
|
|
37
|
+
});
|
|
24
38
|
}
|
|
25
39
|
return {
|
|
26
|
-
|
|
27
|
-
|
|
40
|
+
ok: true,
|
|
41
|
+
input: {
|
|
42
|
+
messages,
|
|
43
|
+
threadId: typeof body.threadId === 'string' ? body.threadId : undefined,
|
|
44
|
+
metadata: isPlainObject(body.metadata) ? body.metadata : undefined,
|
|
45
|
+
},
|
|
28
46
|
};
|
|
29
47
|
}
|
|
30
48
|
function getLastUserMessage(messages) {
|
|
49
|
+
if (!Array.isArray(messages))
|
|
50
|
+
return undefined;
|
|
31
51
|
for (let i = messages.length - 1; i >= 0; i--) {
|
|
32
|
-
|
|
33
|
-
|
|
52
|
+
const message = messages[i];
|
|
53
|
+
if (message?.role === 'user' && typeof message.content === 'string' && message.content.trim()) {
|
|
54
|
+
return message.content;
|
|
34
55
|
}
|
|
35
56
|
}
|
|
36
|
-
return
|
|
57
|
+
return undefined;
|
|
37
58
|
}
|
|
38
59
|
export function createChatHandler(cogitator, agent, options) {
|
|
39
60
|
return async (req) => {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
return new Response(JSON.stringify({ error: 'Payload too large' }), {
|
|
43
|
-
status: 413,
|
|
44
|
-
headers: { 'Content-Type': 'application/json' },
|
|
45
|
-
});
|
|
61
|
+
if (exceedsDeclaredSize(req)) {
|
|
62
|
+
return jsonError('Payload too large', 413);
|
|
46
63
|
}
|
|
47
64
|
let input;
|
|
48
65
|
if (options?.parseInput) {
|
|
@@ -50,21 +67,21 @@ export function createChatHandler(cogitator, agent, options) {
|
|
|
50
67
|
input = await options.parseInput(req);
|
|
51
68
|
}
|
|
52
69
|
catch (err) {
|
|
53
|
-
return
|
|
70
|
+
return jsonError(err instanceof Error ? err.message : 'Parse error', 400);
|
|
54
71
|
}
|
|
55
72
|
}
|
|
56
73
|
else {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
body
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
return
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
74
|
+
const body = await readJsonBody(req);
|
|
75
|
+
if (!body.ok)
|
|
76
|
+
return body.response;
|
|
77
|
+
const parsed = parseDefaultInput(body.body);
|
|
78
|
+
if (!parsed.ok)
|
|
79
|
+
return jsonError(parsed.error, 400);
|
|
80
|
+
input = parsed.input;
|
|
81
|
+
}
|
|
82
|
+
const userMessage = getLastUserMessage(input.messages);
|
|
83
|
+
if (userMessage === undefined) {
|
|
84
|
+
return jsonError('No user message provided', 400);
|
|
68
85
|
}
|
|
69
86
|
let runContext = {};
|
|
70
87
|
if (options?.beforeRun) {
|
|
@@ -74,64 +91,101 @@ export function createChatHandler(cogitator, agent, options) {
|
|
|
74
91
|
runContext = ctx;
|
|
75
92
|
}
|
|
76
93
|
catch (err) {
|
|
77
|
-
|
|
78
|
-
return new Response(JSON.stringify({ error: err instanceof Error ? err.message : 'Unauthorized' }), {
|
|
79
|
-
status: status && status >= 400 && status < 600 ? status : 401,
|
|
80
|
-
headers: { 'Content-Type': 'application/json' },
|
|
81
|
-
});
|
|
94
|
+
return hookErrorResponse(err, 'Unauthorized');
|
|
82
95
|
}
|
|
83
96
|
}
|
|
84
97
|
const { readable, writable } = new TransformStream();
|
|
85
98
|
const sw = new StreamWriter(writable.getWriter());
|
|
86
99
|
const messageId = generateId('msg');
|
|
100
|
+
const abortController = new AbortController();
|
|
101
|
+
const abortRun = () => {
|
|
102
|
+
if (!abortController.signal.aborted)
|
|
103
|
+
abortController.abort();
|
|
104
|
+
};
|
|
105
|
+
const parentSignals = [req.signal, runContext.signal].filter((signal) => signal instanceof AbortSignal);
|
|
106
|
+
for (const signal of parentSignals) {
|
|
107
|
+
if (signal.aborted)
|
|
108
|
+
abortRun();
|
|
109
|
+
else
|
|
110
|
+
signal.addEventListener('abort', abortRun, { once: true });
|
|
111
|
+
}
|
|
112
|
+
let queue = Promise.resolve();
|
|
113
|
+
const emit = (write) => {
|
|
114
|
+
queue = queue.then(write).catch(abortRun);
|
|
115
|
+
return queue;
|
|
116
|
+
};
|
|
117
|
+
let textId = null;
|
|
118
|
+
let streamedText = false;
|
|
119
|
+
const writeText = async (delta) => {
|
|
120
|
+
if (textId === null) {
|
|
121
|
+
textId = generateId('txt');
|
|
122
|
+
await sw.textStart(textId);
|
|
123
|
+
}
|
|
124
|
+
await sw.textDelta(textId, delta);
|
|
125
|
+
};
|
|
126
|
+
const endText = async () => {
|
|
127
|
+
if (textId === null)
|
|
128
|
+
return;
|
|
129
|
+
const id = textId;
|
|
130
|
+
textId = null;
|
|
131
|
+
await sw.textEnd(id);
|
|
132
|
+
};
|
|
87
133
|
const runStream = async () => {
|
|
88
|
-
let currentTextId = generateId('txt');
|
|
89
|
-
let textStarted = false;
|
|
90
134
|
try {
|
|
91
|
-
await sw.start(messageId);
|
|
92
|
-
await sw.textStart(currentTextId);
|
|
93
|
-
textStarted = true;
|
|
94
|
-
const userMessage = getLastUserMessage(input.messages);
|
|
135
|
+
await emit(() => sw.start(messageId));
|
|
95
136
|
const result = await cogitator.run(agent, {
|
|
96
137
|
input: userMessage,
|
|
97
138
|
threadId: input.threadId,
|
|
139
|
+
context: input.metadata,
|
|
98
140
|
...runContext,
|
|
99
|
-
|
|
100
|
-
|
|
141
|
+
stream: true,
|
|
142
|
+
signal: abortController.signal,
|
|
143
|
+
onToken: (token) => {
|
|
144
|
+
if (!token)
|
|
145
|
+
return;
|
|
146
|
+
streamedText = true;
|
|
147
|
+
void emit(() => writeText(token));
|
|
101
148
|
},
|
|
102
|
-
onToolCall:
|
|
103
|
-
|
|
104
|
-
await
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
await sw.toolCallEnd(tc.id);
|
|
149
|
+
onToolCall: (tc) => {
|
|
150
|
+
void emit(async () => {
|
|
151
|
+
await endText();
|
|
152
|
+
await sw.toolCallStart(tc.id, tc.name);
|
|
153
|
+
await sw.toolCallDelta(tc.id, JSON.stringify(tc.arguments));
|
|
154
|
+
await sw.toolCallEnd(tc.id);
|
|
155
|
+
});
|
|
110
156
|
},
|
|
111
|
-
onToolResult:
|
|
112
|
-
|
|
113
|
-
currentTextId = generateId('txt');
|
|
114
|
-
await sw.textStart(currentTextId);
|
|
115
|
-
textStarted = true;
|
|
157
|
+
onToolResult: (tr) => {
|
|
158
|
+
void emit(() => sw.toolResult(generateId('tr'), tr.callId, tr.result));
|
|
116
159
|
},
|
|
117
160
|
});
|
|
118
|
-
|
|
119
|
-
|
|
161
|
+
await queue;
|
|
162
|
+
if (!streamedText && result.output) {
|
|
163
|
+
await emit(() => writeText(result.output));
|
|
120
164
|
}
|
|
121
|
-
await
|
|
122
|
-
inputTokens: result.usage.inputTokens,
|
|
123
|
-
outputTokens: result.usage.outputTokens,
|
|
124
|
-
totalTokens: result.usage.totalTokens,
|
|
125
|
-
});
|
|
165
|
+
await emit(endText);
|
|
126
166
|
if (options?.afterRun) {
|
|
127
167
|
await options.afterRun(result);
|
|
128
168
|
}
|
|
169
|
+
await emit(() => sw.finish(messageId, {
|
|
170
|
+
inputTokens: result.usage.inputTokens,
|
|
171
|
+
outputTokens: result.usage.outputTokens,
|
|
172
|
+
totalTokens: result.usage.totalTokens,
|
|
173
|
+
}, result.threadId));
|
|
129
174
|
}
|
|
130
175
|
catch (err) {
|
|
131
|
-
|
|
132
|
-
|
|
176
|
+
await queue;
|
|
177
|
+
if (!sw.isClosed) {
|
|
178
|
+
const message = err instanceof Error ? err.message : 'Unknown error';
|
|
179
|
+
await emit(async () => {
|
|
180
|
+
await endText();
|
|
181
|
+
await sw.error(message);
|
|
182
|
+
});
|
|
183
|
+
}
|
|
133
184
|
}
|
|
134
185
|
finally {
|
|
186
|
+
for (const signal of parentSignals) {
|
|
187
|
+
signal.removeEventListener('abort', abortRun);
|
|
188
|
+
}
|
|
135
189
|
await sw.close();
|
|
136
190
|
}
|
|
137
191
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/handlers/chat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../src/handlers/chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export declare const MAX_BODY_SIZE: number;
|
|
2
|
+
export declare function jsonResponse(body: unknown, status?: number): Response;
|
|
3
|
+
export declare function jsonError(message: string, status: number): Response;
|
|
4
|
+
export declare function isPlainObject(value: unknown): value is Record<string, unknown>;
|
|
5
|
+
export declare function exceedsDeclaredSize(req: Request, maxSize?: number): boolean;
|
|
6
|
+
export type BodyResult = {
|
|
7
|
+
ok: true;
|
|
8
|
+
body: unknown;
|
|
9
|
+
} | {
|
|
10
|
+
ok: false;
|
|
11
|
+
response: Response;
|
|
12
|
+
};
|
|
13
|
+
export declare function readJsonBody(req: Request, maxSize?: number): Promise<BodyResult>;
|
|
14
|
+
export declare function hookErrorResponse(err: unknown, fallbackMessage: string): Response;
|
|
15
|
+
//# sourceMappingURL=http.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/handlers/http.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAc,CAAC;AAEzC,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,SAAM,GAAG,QAAQ,CAKlE;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,QAAQ,CAEnE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE9E;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,MAAsB,GAAG,OAAO,CAK1F;AAED,MAAM,MAAM,UAAU,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEzF,wBAAsB,YAAY,CAChC,GAAG,EAAE,OAAO,EACZ,OAAO,GAAE,MAAsB,GAC9B,OAAO,CAAC,UAAU,CAAC,CAoCrB;AAQD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,GAAG,QAAQ,CAKjF"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
export const MAX_BODY_SIZE = 1024 * 1024;
|
|
2
|
+
export function jsonResponse(body, status = 200) {
|
|
3
|
+
return new Response(JSON.stringify(body), {
|
|
4
|
+
status,
|
|
5
|
+
headers: { 'Content-Type': 'application/json' },
|
|
6
|
+
});
|
|
7
|
+
}
|
|
8
|
+
export function jsonError(message, status) {
|
|
9
|
+
return jsonResponse({ error: message }, status);
|
|
10
|
+
}
|
|
11
|
+
export function isPlainObject(value) {
|
|
12
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
13
|
+
}
|
|
14
|
+
export function exceedsDeclaredSize(req, maxSize = MAX_BODY_SIZE) {
|
|
15
|
+
const header = req.headers.get('content-length');
|
|
16
|
+
if (header === null)
|
|
17
|
+
return false;
|
|
18
|
+
const declared = Number(header);
|
|
19
|
+
return Number.isFinite(declared) && declared > maxSize;
|
|
20
|
+
}
|
|
21
|
+
export async function readJsonBody(req, maxSize = MAX_BODY_SIZE) {
|
|
22
|
+
if (!req.body) {
|
|
23
|
+
return { ok: false, response: jsonError('Invalid JSON', 400) };
|
|
24
|
+
}
|
|
25
|
+
const reader = req.body.getReader();
|
|
26
|
+
const chunks = [];
|
|
27
|
+
let size = 0;
|
|
28
|
+
try {
|
|
29
|
+
for (;;) {
|
|
30
|
+
const { done, value } = await reader.read();
|
|
31
|
+
if (done)
|
|
32
|
+
break;
|
|
33
|
+
size += value.byteLength;
|
|
34
|
+
if (size > maxSize) {
|
|
35
|
+
await reader.cancel().catch(() => { });
|
|
36
|
+
return { ok: false, response: jsonError('Payload too large', 413) };
|
|
37
|
+
}
|
|
38
|
+
chunks.push(value);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
catch {
|
|
42
|
+
return { ok: false, response: jsonError('Failed to read request body', 400) };
|
|
43
|
+
}
|
|
44
|
+
const bytes = new Uint8Array(size);
|
|
45
|
+
let offset = 0;
|
|
46
|
+
for (const chunk of chunks) {
|
|
47
|
+
bytes.set(chunk, offset);
|
|
48
|
+
offset += chunk.byteLength;
|
|
49
|
+
}
|
|
50
|
+
try {
|
|
51
|
+
return { ok: true, body: JSON.parse(new TextDecoder().decode(bytes)) };
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return { ok: false, response: jsonError('Invalid JSON', 400) };
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function readErrorStatus(err) {
|
|
58
|
+
if (typeof err !== 'object' || err === null || !('status' in err))
|
|
59
|
+
return undefined;
|
|
60
|
+
const { status } = err;
|
|
61
|
+
return typeof status === 'number' && status >= 400 && status < 600 ? status : undefined;
|
|
62
|
+
}
|
|
63
|
+
export function hookErrorResponse(err, fallbackMessage) {
|
|
64
|
+
return jsonError(err instanceof Error ? err.message : fallbackMessage, readErrorStatus(err) ?? 401);
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=http.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/handlers/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ export interface FinishEvent {
|
|
|
50
50
|
type: 'finish';
|
|
51
51
|
messageId: string;
|
|
52
52
|
usage?: Usage;
|
|
53
|
+
threadId?: string;
|
|
53
54
|
}
|
|
54
55
|
export declare function createStartEvent(messageId: string): StartEvent;
|
|
55
56
|
export declare function createTextStartEvent(id: string): TextStartEvent;
|
|
@@ -60,5 +61,5 @@ export declare function createToolCallDeltaEvent(id: string, argsTextDelta: stri
|
|
|
60
61
|
export declare function createToolCallEndEvent(id: string): ToolCallEndEvent;
|
|
61
62
|
export declare function createToolResultEvent(id: string, toolCallId: string, result: unknown): ToolResultEvent;
|
|
62
63
|
export declare function createErrorEvent(message: string, code?: string): ErrorEvent;
|
|
63
|
-
export declare function createFinishEvent(messageId: string, usage?: Usage): FinishEvent;
|
|
64
|
+
export declare function createFinishEvent(messageId: string, usage?: Usage, threadId?: string): FinishEvent;
|
|
64
65
|
//# sourceMappingURL=protocol.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/streaming/protocol.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,WAAW,GACnB,UAAU,GACV,cAAc,GACd,cAAc,GACd,YAAY,GACZ,kBAAkB,GAClB,kBAAkB,GAClB,gBAAgB,GAChB,eAAe,GACf,UAAU,GACV,WAAW,CAAC;AAEhB,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"protocol.d.ts","sourceRoot":"","sources":["../../src/streaming/protocol.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,KAAK;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,WAAW,GACnB,UAAU,GACV,cAAc,GACd,cAAc,GACd,YAAY,GACZ,kBAAkB,GAClB,kBAAkB,GAClB,gBAAgB,GAChB,eAAe,GACf,UAAU,GACV,WAAW,CAAC;AAEhB,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,YAAY,CAAC;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,iBAAiB,CAAC;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU,CAE9D;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,CAE/D;AAED,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,cAAc,CAE9E;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,CAE3D;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAEzF;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,kBAAkB,CAE9F;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,CAEnE;AAED,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,GACd,eAAe,CAEjB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,UAAU,CAE3E;AAED,wBAAgB,iBAAiB,CAC/B,SAAS,EAAE,MAAM,EACjB,KAAK,CAAC,EAAE,KAAK,EACb,QAAQ,CAAC,EAAE,MAAM,GAChB,WAAW,CAEb"}
|
|
@@ -25,7 +25,7 @@ export function createToolResultEvent(id, toolCallId, result) {
|
|
|
25
25
|
export function createErrorEvent(message, code) {
|
|
26
26
|
return { type: 'error', message, code };
|
|
27
27
|
}
|
|
28
|
-
export function createFinishEvent(messageId, usage) {
|
|
29
|
-
return { type: 'finish', messageId, usage };
|
|
28
|
+
export function createFinishEvent(messageId, usage, threadId) {
|
|
29
|
+
return { type: 'finish', messageId, usage, threadId };
|
|
30
30
|
}
|
|
31
31
|
//# sourceMappingURL=protocol.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/streaming/protocol.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"protocol.js","sourceRoot":"","sources":["../../src/streaming/protocol.ts"],"names":[],"mappings":"AA4EA,MAAM,UAAU,gBAAgB,CAAC,SAAiB;IAChD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EAAU;IAC7C,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,EAAU,EAAE,KAAa;IAC5D,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EAAU;IAC3C,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EAAU,EAAE,QAAgB;IACnE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,EAAU,EAAE,aAAqB;IACxE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,EAAU;IAC/C,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,EAAU,EACV,UAAkB,EAClB,MAAe;IAEf,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,IAAa;IAC7D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,SAAiB,EACjB,KAAa,EACb,QAAiB;IAEjB,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACxD,CAAC"}
|
|
@@ -3,6 +3,7 @@ export declare class StreamWriter {
|
|
|
3
3
|
private writer;
|
|
4
4
|
private closed;
|
|
5
5
|
constructor(writer: WritableStreamDefaultWriter<Uint8Array>);
|
|
6
|
+
get isClosed(): boolean;
|
|
6
7
|
private write;
|
|
7
8
|
start(messageId: string): Promise<void>;
|
|
8
9
|
textStart(id: string): Promise<void>;
|
|
@@ -13,7 +14,7 @@ export declare class StreamWriter {
|
|
|
13
14
|
toolCallEnd(id: string): Promise<void>;
|
|
14
15
|
toolResult(id: string, toolCallId: string, result: unknown): Promise<void>;
|
|
15
16
|
error(message: string, code?: string): Promise<void>;
|
|
16
|
-
finish(messageId: string, usage?: Usage): Promise<void>;
|
|
17
|
+
finish(messageId: string, usage?: Usage, threadId?: string): Promise<void>;
|
|
17
18
|
close(): Promise<void>;
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=stream-writer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-writer.d.ts","sourceRoot":"","sources":["../../src/streaming/stream-writer.ts"],"names":[],"mappings":"AACA,OAAO,EAWL,KAAK,KAAK,EACX,MAAM,eAAe,CAAC;AAEvB,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAA0C;IACxD,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,2BAA2B,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"stream-writer.d.ts","sourceRoot":"","sources":["../../src/streaming/stream-writer.ts"],"names":[],"mappings":"AACA,OAAO,EAWL,KAAK,KAAK,EACX,MAAM,eAAe,CAAC;AAEvB,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAA0C;IACxD,OAAO,CAAC,MAAM,CAAS;gBAEX,MAAM,EAAE,2BAA2B,CAAC,UAAU,CAAC;IAI3D,IAAI,QAAQ,IAAI,OAAO,CAEtB;YAEa,KAAK;IAUb,KAAK,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKnD,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlC,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItC,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B"}
|
|
@@ -6,10 +6,19 @@ export class StreamWriter {
|
|
|
6
6
|
constructor(writer) {
|
|
7
7
|
this.writer = writer;
|
|
8
8
|
}
|
|
9
|
+
get isClosed() {
|
|
10
|
+
return this.closed;
|
|
11
|
+
}
|
|
9
12
|
async write(data) {
|
|
10
13
|
if (this.closed)
|
|
11
14
|
return;
|
|
12
|
-
|
|
15
|
+
try {
|
|
16
|
+
await this.writer.write(encodeSSE(data));
|
|
17
|
+
}
|
|
18
|
+
catch (error) {
|
|
19
|
+
this.closed = true;
|
|
20
|
+
throw error;
|
|
21
|
+
}
|
|
13
22
|
}
|
|
14
23
|
async start(messageId) {
|
|
15
24
|
await this.write(createStartEvent(messageId));
|
|
@@ -40,10 +49,10 @@ export class StreamWriter {
|
|
|
40
49
|
async error(message, code) {
|
|
41
50
|
await this.write(createErrorEvent(message, code));
|
|
42
51
|
}
|
|
43
|
-
async finish(messageId, usage) {
|
|
52
|
+
async finish(messageId, usage, threadId) {
|
|
44
53
|
if (this.closed)
|
|
45
54
|
return;
|
|
46
|
-
await this.write(createFinishEvent(messageId, usage));
|
|
55
|
+
await this.write(createFinishEvent(messageId, usage, threadId));
|
|
47
56
|
if (this.closed)
|
|
48
57
|
return;
|
|
49
58
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-writer.js","sourceRoot":"","sources":["../../src/streaming/stream-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,YAAY;IACf,MAAM,CAA0C;IAChD,MAAM,GAAG,KAAK,CAAC;IAEvB,YAAY,MAA+C;QACzD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,IAAa;QAC/B,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"stream-writer.js","sourceRoot":"","sources":["../../src/streaming/stream-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,kBAAkB,EAClB,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,MAAM,OAAO,YAAY;IACf,MAAM,CAA0C;IAChD,MAAM,GAAG,KAAK,CAAC;IAEvB,YAAY,MAA+C;QACzD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,IAAa;QAC/B,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YACnB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,SAAiB;QAC3B,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU;QACxB,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,KAAa;QACvC,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,MAAM,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,MAAM,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,QAAgB;QAC9C,MAAM,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,aAAqB;QACnD,MAAM,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAU;QAC1B,MAAM,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,UAAkB,EAAE,MAAe;QAC9D,MAAM,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAe,EAAE,IAAa;QACxC,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,KAAa,EAAE,QAAiB;QAC9D,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,MAAM,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAChE,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACrB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogitator-ai/next",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Next.js integration for Cogitator AI runtime",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -20,8 +20,8 @@
|
|
|
20
20
|
"README.md"
|
|
21
21
|
],
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@cogitator-ai/core": "0.
|
|
24
|
-
"@cogitator-ai/types": "0.
|
|
23
|
+
"@cogitator-ai/core": "0.20.0",
|
|
24
|
+
"@cogitator-ai/types": "0.23.0"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"next": ">=14.0.0",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"directory": "packages/next"
|
|
50
50
|
},
|
|
51
51
|
"scripts": {
|
|
52
|
-
"build": "tsc",
|
|
52
|
+
"build": "tsc && tsx ../../scripts/fix-esm-imports.ts .",
|
|
53
53
|
"dev": "tsc --watch",
|
|
54
54
|
"typecheck": "tsc --noEmit",
|
|
55
55
|
"test": "vitest run",
|