Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/features/app/hooks/useAppServerEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type AppServerEventHandlers = {
onThreadTokenUsageUpdated?: (
workspaceId: string,
threadId: string,
tokenUsage: Record<string, unknown>,
tokenUsage: Record<string, unknown> | null,
) => void;
onAccountRateLimitsUpdated?: (
workspaceId: string,
Expand Down Expand Up @@ -299,9 +299,9 @@ export function useAppServerEvents(handlers: AppServerEventHandlers) {
if (method === "thread/tokenUsage/updated") {
const threadId = String(params.threadId ?? params.thread_id ?? "");
const tokenUsage =
(params.tokenUsage as Record<string, unknown> | undefined) ??
(params.token_usage as Record<string, unknown> | undefined);
if (threadId && tokenUsage) {
(params.tokenUsage as Record<string, unknown> | null | undefined) ??
(params.token_usage as Record<string, unknown> | null | undefined);
if (threadId && tokenUsage !== undefined) {
handlers.onThreadTokenUsageUpdated?.(workspace_id, threadId, tokenUsage);
}
return;
Expand Down
6 changes: 5 additions & 1 deletion src/features/threads/hooks/useThreadTurnEvents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ export function useThreadTurnEvents({
);

const onThreadTokenUsageUpdated = useCallback(
(workspaceId: string, threadId: string, tokenUsage: Record<string, unknown>) => {
(
workspaceId: string,
threadId: string,
tokenUsage: Record<string, unknown> | null,
) => {
dispatch({ type: "ensureThread", workspaceId, threadId });
dispatch({
type: "setThreadTokenUsage",
Expand Down
11 changes: 7 additions & 4 deletions src/features/threads/utils/threadNormalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,12 @@ export function extractReviewThreadId(response: unknown): string | null {
return threadId || null;
}

export function normalizeTokenUsage(raw: Record<string, unknown>): ThreadTokenUsage {
const total = (raw.total as Record<string, unknown>) ?? {};
const last = (raw.last as Record<string, unknown>) ?? {};
export function normalizeTokenUsage(
raw: Record<string, unknown> | null | undefined,
): ThreadTokenUsage {
const source = raw ?? {};
const total = (source.total as Record<string, unknown>) ?? {};
const last = (source.last as Record<string, unknown>) ?? {};
return {
total: {
totalTokens: asNumber(total.totalTokens ?? total.total_tokens),
Expand All @@ -98,7 +101,7 @@ export function normalizeTokenUsage(raw: Record<string, unknown>): ThreadTokenUs
),
},
modelContextWindow: (() => {
const value = raw.modelContextWindow ?? raw.model_context_window;
const value = source.modelContextWindow ?? source.model_context_window;
if (typeof value === "number") {
return value;
}
Expand Down