Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry

# Conflicts:
#	apps/web/tests/session-title.snapshot.ts

packages/llm/llm-retry/src/history.ts

@@ -24,7 +24,7 @@ export function providerForClosedStep(
   if (stepEndIndex < 0) return undefined
   for (let index = stepEndIndex; index >= 0; index -= 1) {
     // The loop bounds prove this indexed read exists.
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    // oxlint-disable-next-line typescript/no-non-null-assertion
     const event = events[index]!
     if (event.type === 'request/header') return event.data.header.config.provider
   }

packages/llm/llm/src/index.ts

@@ -531,7 +531,7 @@ export class LlmService extends Service {
         yield value
       }
     } finally {
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- the iteration catch sets its latch before entering finally.
+      // oxlint-disable-next-line typescript/no-unnecessary-condition -- the iteration catch sets its latch before entering finally.
       if (!completed && !iterationFailed) {
         const close = iterator.return?.bind(iterator)
         if (close) await close()

packages/llm/llm/tests/assembler.spec.ts

@@ -72,10 +72,10 @@ describe('BlockAssembler', () => {
   it('mustGet throws when an index is missing from the partials map (invariant violation)', () => {
     const assembler = new BlockAssembler()
     // Force the invariant violation: manually corrupt the data structures.
-    /* eslint-disable */
+    /* oxlint-disable */
     const hack = assembler as any
     hack.order.push(99)
-    /* eslint-enable */
+    /* oxlint-enable */
     expect(() => assembler.blocks()).toThrow('BlockAssembler invariant violated')
   })
 

packages/llm/llm/tests/service.spec.ts

@@ -756,7 +756,7 @@ describe('LlmService', () => {
         return {
           [Symbol.asyncIterator](): AsyncIterator<StreamChunk> {
             // Third-party adapters can reject with arbitrary values.
-            // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
+            // oxlint-disable-next-line typescript/prefer-promise-reject-errors
             return { next: () => Promise.reject('plain provider failure') }
           },
         }

packages/llm/token-meter/src/index.ts

@@ -171,7 +171,7 @@ export class TokenMeterService extends Service {
     }
 
     while (state.consumedEvents < session.events.length) {
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- contiguous session seqs index the durable log
+      // oxlint-disable-next-line typescript/no-non-null-assertion -- contiguous session seqs index the durable log
       const event = session.events[state.consumedEvents]!
       this._foldEvent(session, state, event)
       state.consumedEvents += 1
@@ -226,7 +226,7 @@ export class TokenMeterService extends Service {
       }
 
       // assistant/message is surface-mandatory at every append/seed boundary.
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      // oxlint-disable-next-line typescript/no-non-null-assertion
       const eventTokens = surface!.tokens
       if (event.data.usage !== undefined && nextHeader !== undefined) {
         const providerAssistantTokens = this._estimateProviderAssistant(
@@ -334,7 +334,7 @@ export class TokenMeterService extends Service {
       // Session construction validates contiguous seqs, and the explicit
       // earlier-than-assistant check above therefore guarantees existence.
       const source = session.events[seq]
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      // oxlint-disable-next-line typescript/no-non-null-assertion
       const sourceEvent = source!
       if (sourceEvent.type !== 'assistant/chunk') {
         throw new Error(`token meter: assistant/message at seq ${event.seq} source seq ${seq} is not assistant/chunk`)