niahere 0.2.47 → 0.2.48
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/package.json
CHANGED
package/src/chat/engine.ts
CHANGED
|
@@ -332,22 +332,42 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
|
|
|
332
332
|
}
|
|
333
333
|
|
|
334
334
|
if (message.type === "result" && pending) {
|
|
335
|
+
const msg = message as any;
|
|
335
336
|
if (!message.is_error) {
|
|
336
|
-
const resultText =
|
|
337
|
-
const costUsd =
|
|
338
|
-
const turns =
|
|
337
|
+
const resultText = msg.result as string;
|
|
338
|
+
const costUsd = msg.total_cost_usd as number;
|
|
339
|
+
const turns = msg.num_turns as number;
|
|
340
|
+
|
|
341
|
+
const metadata: Record<string, unknown> = {
|
|
342
|
+
cost_usd: costUsd,
|
|
343
|
+
turns,
|
|
344
|
+
duration_ms: msg.duration_ms,
|
|
345
|
+
duration_api_ms: msg.duration_api_ms,
|
|
346
|
+
stop_reason: msg.stop_reason,
|
|
347
|
+
session_id: msg.session_id,
|
|
348
|
+
subtype: msg.subtype,
|
|
349
|
+
usage: msg.usage,
|
|
350
|
+
model_usage: msg.modelUsage,
|
|
351
|
+
};
|
|
339
352
|
|
|
340
353
|
let messageId: number | undefined;
|
|
341
354
|
if (sessionId && resultText) {
|
|
342
|
-
|
|
355
|
+
const saveParams = {
|
|
343
356
|
sessionId,
|
|
344
357
|
room,
|
|
345
358
|
sender: "nia",
|
|
346
359
|
content: resultText,
|
|
347
360
|
isFromAgent: true,
|
|
348
|
-
deliveryStatus: "pending",
|
|
349
|
-
|
|
361
|
+
deliveryStatus: "pending" as const,
|
|
362
|
+
metadata,
|
|
363
|
+
};
|
|
364
|
+
try {
|
|
365
|
+
messageId = await Message.save(saveParams);
|
|
366
|
+
} catch {
|
|
367
|
+
messageId = await Message.save({ ...saveParams, metadata: undefined });
|
|
368
|
+
}
|
|
350
369
|
await Session.touch(sessionId);
|
|
370
|
+
await Session.accumulateMetadata(sessionId, { ...metadata, channel }).catch(() => {});
|
|
351
371
|
}
|
|
352
372
|
|
|
353
373
|
await ActiveEngine.unregister(room);
|
|
@@ -356,7 +376,7 @@ export async function createChatEngine(opts: EngineOptions): Promise<ChatEngine>
|
|
|
356
376
|
pending = null;
|
|
357
377
|
resetIdleTimer();
|
|
358
378
|
} else {
|
|
359
|
-
const errors =
|
|
379
|
+
const errors = msg.errors;
|
|
360
380
|
const errorText = `[error] ${errors?.join(", ") || "unknown error"}`;
|
|
361
381
|
await ActiveEngine.unregister(room);
|
|
362
382
|
clearLongRunningTimer();
|
package/src/db/models/message.ts
CHANGED
|
@@ -3,12 +3,13 @@ import type { SaveMessageParams, RoomStats, RecentMessage, SearchResult, Session
|
|
|
3
3
|
|
|
4
4
|
export type DeliveryStatus = "pending" | "sent" | "failed";
|
|
5
5
|
|
|
6
|
-
export async function save(params: SaveMessageParams & { deliveryStatus?: DeliveryStatus }): Promise<number> {
|
|
6
|
+
export async function save(params: SaveMessageParams & { deliveryStatus?: DeliveryStatus; metadata?: Record<string, unknown> }): Promise<number> {
|
|
7
7
|
const sql = getSql();
|
|
8
8
|
const status = params.deliveryStatus || "sent";
|
|
9
|
+
const meta = params.metadata ? JSON.stringify(params.metadata) : null;
|
|
9
10
|
const rows = await sql`
|
|
10
|
-
INSERT INTO messages (session_id, room, sender, content, is_from_agent, delivery_status)
|
|
11
|
-
VALUES (${params.sessionId}, ${params.room}, ${params.sender}, ${params.content}, ${params.isFromAgent}, ${status})
|
|
11
|
+
INSERT INTO messages (session_id, room, sender, content, is_from_agent, delivery_status, metadata)
|
|
12
|
+
VALUES (${params.sessionId}, ${params.room}, ${params.sender}, ${params.content}, ${params.isFromAgent}, ${status}, ${meta})
|
|
12
13
|
RETURNING id
|
|
13
14
|
`;
|
|
14
15
|
return rows[0].id;
|
package/src/db/models/session.ts
CHANGED
|
@@ -113,6 +113,44 @@ export async function getRecentSummaries(room: string, limit = 3): Promise<Array
|
|
|
113
113
|
}));
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
+
export async function accumulateMetadata(id: string, resultMeta: Record<string, unknown>): Promise<void> {
|
|
117
|
+
const sql = getSql();
|
|
118
|
+
const rows = await sql`SELECT metadata FROM sessions WHERE id = ${id}`;
|
|
119
|
+
const existing = (rows[0]?.metadata as Record<string, unknown>) || {};
|
|
120
|
+
|
|
121
|
+
const modelUsage = resultMeta.model_usage as Record<string, Record<string, number>> | undefined;
|
|
122
|
+
const modelsUsed = new Set<string>((existing.models_used as string[]) || []);
|
|
123
|
+
let inputTokens = 0;
|
|
124
|
+
let outputTokens = 0;
|
|
125
|
+
let cacheReadTokens = 0;
|
|
126
|
+
let cacheCreationTokens = 0;
|
|
127
|
+
if (modelUsage) {
|
|
128
|
+
for (const [model, usage] of Object.entries(modelUsage)) {
|
|
129
|
+
modelsUsed.add(model);
|
|
130
|
+
inputTokens += usage.inputTokens || 0;
|
|
131
|
+
outputTokens += usage.outputTokens || 0;
|
|
132
|
+
cacheReadTokens += usage.cacheReadInputTokens || 0;
|
|
133
|
+
cacheCreationTokens += usage.cacheCreationInputTokens || 0;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
const updated: Record<string, unknown> = {
|
|
138
|
+
total_cost_usd: ((existing.total_cost_usd as number) || 0) + ((resultMeta.cost_usd as number) || 0),
|
|
139
|
+
total_turns: ((existing.total_turns as number) || 0) + ((resultMeta.turns as number) || 0),
|
|
140
|
+
total_duration_ms: ((existing.total_duration_ms as number) || 0) + ((resultMeta.duration_ms as number) || 0),
|
|
141
|
+
total_duration_api_ms: ((existing.total_duration_api_ms as number) || 0) + ((resultMeta.duration_api_ms as number) || 0),
|
|
142
|
+
total_input_tokens: ((existing.total_input_tokens as number) || 0) + inputTokens,
|
|
143
|
+
total_output_tokens: ((existing.total_output_tokens as number) || 0) + outputTokens,
|
|
144
|
+
total_cache_read_tokens: ((existing.total_cache_read_tokens as number) || 0) + cacheReadTokens,
|
|
145
|
+
total_cache_creation_tokens: ((existing.total_cache_creation_tokens as number) || 0) + cacheCreationTokens,
|
|
146
|
+
message_count: ((existing.message_count as number) || 0) + 1,
|
|
147
|
+
models_used: [...modelsUsed],
|
|
148
|
+
channel: existing.channel || resultMeta.channel,
|
|
149
|
+
};
|
|
150
|
+
|
|
151
|
+
await sql`UPDATE sessions SET metadata = ${JSON.stringify(updated)} WHERE id = ${id}`;
|
|
152
|
+
}
|
|
153
|
+
|
|
116
154
|
export async function getLatestRoomIndex(prefix: string): Promise<number> {
|
|
117
155
|
const sql = getSql();
|
|
118
156
|
const rows = await sql`
|