diff --git a/web/src/lib/stream.ts b/web/src/lib/stream.ts
index 59887b7..cf05cc4 100644
--- a/web/src/lib/stream.ts
+++ b/web/src/lib/stream.ts
@@ -30,9 +30,24 @@ export interface StreamEvent {
     | "title_updated";
   content?: string;
   title?: string;
-  usage?: { input_tokens: number; output_tokens: number };
+  usage?: {
+    prompt_tokens: number;
+    completion_tokens: number;
+    total_tokens: number;
+  };
   error?: { code: string; message: string };
-  [extra: string]: any;
+  message?: string; // error event sends message at top level
+  // start event fields
+  conversation_id?: string;
+  user_message_id?: string;
+  assistant_message_id?: string;
+  stream_id?: string;
+  // tool_call event fields
+  id?: string;
+  name?: string;
+  arguments?: string;
+  // tool_result event fields
+  tool_call_id?: string;
 }
 
 export interface StreamHandlers {
diff --git a/web/src/routes/chat/+page.svelte b/web/src/routes/chat/+page.svelte
index 435e755..c18236a 100644
--- a/web/src/routes/chat/+page.svelte
+++ b/web/src/routes/chat/+page.svelte
@@ -272,7 +272,7 @@
 
     const sid: string = ev.stream_id;
     const aid: string = ev.assistant_message_id;
-    const model: string = ev.model || selectedModel || '';
+    const model: string = selectedModel || '';
 
     streaming = true;
     streamingMsgId = aid;
@@ -388,17 +388,17 @@
           if (!hadPending) toolPauseStartMs = Date.now();
           processSteps = [...processSteps, {
             type: 'tool',
-            id: ((ev as any).id as string) || uuid(),
-            name: ((ev as any).name as string) || 'tool',
-            args: ((ev as any).arguments as string) || '',
+            id: ev.id || uuid(),
+            name: ev.name || 'tool',
+            args: ev.arguments || '',
             result: '',
             done: false
           }];
         }
 
         if (ev.type === 'tool_result') {
-          const tcId = ((ev as any).tool_call_id as string) || '';
-          const result = ((ev as any).content as string) || '';
+          const tcId = ev.tool_call_id || '';
+          const result = ev.content || '';
           const idx = tcId
             ? processSteps.findIndex((s) => s.type === 'tool' && s.id === tcId)
             : processSteps.findLastIndex((s) => s.type === 'tool' && !s.done);
@@ -419,7 +419,7 @@
 
         if (ev.type === 'done' || ev.type === 'error') {
           const doneMs = Date.now();
-          const completionTokens = (ev.usage as any)?.completion_tokens ?? ev.usage?.output_tokens;
+          const completionTokens = ev.usage?.completion_tokens;
           const ttft = streamFirstTokenMs ? streamFirstTokenMs - streamStartMs : undefined;
           const tps =
             completionTokens && streamFirstTokenMs
@@ -436,7 +436,7 @@
             await db.conversations.where({ id: convId }).modify({ updated_at: Math.floor(doneMs / 1000) });
           } else {
             await db.messages.delete(assistantId);
-            errorMsg = ev.error?.message || (ev as any).message || 'stream error';
+            errorMsg = ev.error?.message || ev.message || 'stream error';
           }
           // UI state teardown: onClose (attach path) or finally (inline path).
         }
@@ -551,8 +551,8 @@
       });
 
       if (!res.ok || !res.body) {
-        const j = await res.json().catch(() => ({}));
-        throw new Error((j as any)?.error?.message || `HTTP ${res.status}`);
+        const j = await res.json().catch(() => ({})) as { error?: { message?: string } };
+        throw new Error(j?.error?.message || `HTTP ${res.status}`);
       }
 
       const reader = res.body.pipeThrough(new TextDecoderStream()).getReader();
diff --git a/web/src/routes/pool/+page.svelte b/web/src/routes/pool/+page.svelte
index 1b7001c..c13c4b6 100644
--- a/web/src/routes/pool/+page.svelte
+++ b/web/src/routes/pool/+page.svelte
@@ -444,8 +444,7 @@
                 </td>
                 <td class="num mono limits-td" onclick={(e) => editingLimitsId === key.id && e.stopPropagation()}>
                   {#if key.mine && editingLimitsId === key.id && limitsPos}
-                    <!-- svelte-ignore a11y_interactive_supports_focus a11y_click_events_have_key_events -->
-                    <div class="limits-popover" role="dialog" style="position:fixed;top:{limitsPos.top}px;right:{limitsPos.right}px" onclick={(e) => e.stopPropagation()}>
+                    <div class="limits-popover" role="dialog" tabindex="-1" style="position:fixed;top:{limitsPos.top}px;right:{limitsPos.right}px" onclick={(e) => e.stopPropagation()} onkeydown={(e) => { if (e.key === 'Escape') { editingLimitsId = null; limitsPos = null; } }}>
                       <div class="limits-row">
                         <span class="limits-label">ceiling</span>
                         <span class="limits-readonly mono">${editMaxDollars} <span class="limits-hint">(from pioneer)</span></span>