basalt-ui 1.41.0 → 2.0.1

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "basalt-ui",
-  "version": "1.41.0",
-  "description": "Opinionated framework for Mantine-based React apps — theme, app shell, visx charts, toolchain presets",
+  "version": "2.0.1",
+  "description": "Opinionated framework for Mantine-based React apps — theme, app shell, TanStack Charts, toolchain presets",
   "keywords": [
     "charts",
     "design-system",
     "mantine",
     "oxlint",
     "react",
-    "theme",
-    "visx"
+    "tanstack-charts",
+    "theme"
   ],
   "homepage": "https://github.com/jkrumm/basalt-ui/tree/master/packages/basalt-ui#readme",
   "bugs": {
@@ -62,98 +62,65 @@
       "import": "./dist/tokens/index.js",
       "default": "./dist/tokens/index.js"
     },
-    "./theme-lab": {
-      "types": "./dist/theme-lab/index.d.ts",
-      "import": "./dist/theme-lab/index.js",
-      "default": "./dist/theme-lab/index.js"
+    "./controls": {
+      "types": "./dist/controls/index.d.ts",
+      "import": "./dist/controls/index.js",
+      "default": "./dist/controls/index.js"
     },
-    "./vite": {
-      "types": "./dist/vite.d.ts",
-      "import": "./dist/vite.js",
-      "default": "./dist/vite.js"
+    "./controls-dates": {
+      "types": "./dist/controls-dates/index.d.ts",
+      "import": "./dist/controls-dates/index.js",
+      "default": "./dist/controls-dates/index.js"
     },
-    "./guard": {
-      "types": "./dist/guard/index.d.ts",
-      "import": "./dist/guard/index.js",
-      "default": "./dist/guard/index.js"
+    "./forms": {
+      "types": "./dist/forms/index.d.ts",
+      "import": "./dist/forms/index.js",
+      "default": "./dist/forms/index.js"
+    },
+    "./state": {
+      "types": "./dist/state.d.ts",
+      "import": "./dist/state.js",
+      "default": "./dist/state.js"
+    },
+    "./table": {
+      "types": "./dist/table/index.d.ts",
+      "import": "./dist/table/index.js",
+      "default": "./dist/table/index.js"
     },
     "./format": {
       "types": "./dist/format/index.d.ts",
       "import": "./dist/format/index.js",
       "default": "./dist/format/index.js"
     },
-    "./forms": {
-      "types": "./dist/forms/index.d.ts",
-      "import": "./dist/forms/index.js",
-      "default": "./dist/forms/index.js"
-    },
     "./commands": {
       "types": "./dist/commands/index.d.ts",
       "import": "./dist/commands/index.js",
       "default": "./dist/commands/index.js"
     },
-    "./notifications": {
-      "types": "./dist/notifications/index.d.ts",
-      "import": "./dist/notifications/index.js",
-      "default": "./dist/notifications/index.js"
-    },
-    "./router-tanstack": {
-      "types": "./dist/router-tanstack/index.d.ts",
-      "import": "./dist/router-tanstack/index.js",
-      "default": "./dist/router-tanstack/index.js"
-    },
-    "./data/table": {
-      "types": "./dist/data/table.d.ts",
-      "import": "./dist/data/table.js",
-      "default": "./dist/data/table.js"
-    },
-    "./data/virtual": {
-      "types": "./dist/data/virtual.d.ts",
-      "import": "./dist/data/virtual.js",
-      "default": "./dist/data/virtual.js"
-    },
     "./agent": {
       "types": "./dist/agent/index.d.ts",
       "import": "./dist/agent/index.js",
       "default": "./dist/agent/index.js"
     },
-    "./agent-chat": {
-      "types": "./dist/agent-chat/index.d.ts",
-      "import": "./dist/agent-chat/index.js",
-      "default": "./dist/agent-chat/index.js"
-    },
     "./content": {
       "types": "./dist/content/index.d.ts",
       "import": "./dist/content/index.js",
       "default": "./dist/content/index.js"
     },
-    "./controls": {
-      "types": "./dist/controls/index.d.ts",
-      "import": "./dist/controls/index.js",
-      "default": "./dist/controls/index.js"
-    },
-    "./controls-dates": {
-      "types": "./dist/controls-dates/index.d.ts",
-      "import": "./dist/controls-dates/index.js",
-      "default": "./dist/controls-dates/index.js"
-    },
-    "./state": {
-      "types": "./dist/state.d.ts",
-      "import": "./dist/state.js",
-      "default": "./dist/state.js"
+    "./vite": {
+      "types": "./dist/vite.d.ts",
+      "import": "./dist/vite.js",
+      "default": "./dist/vite.js"
     },
     "./styles.css": "./dist/styles.css",
-    "./tokens.css": "./dist/tokens.css",
-    "./configs/*": "./configs/*",
-    "./llms.txt": "./llms.txt",
-    "./package.json": "./package.json"
+    "./configs/*": "./configs/*"
   },
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
   "scripts": {
-    "build": "tsup && tsc -p tsconfig.build.json --emitDeclarationOnly --declarationMap && bun scripts/copy-assets.mjs && bun scripts/gen-tokens-css.mjs && bun scripts/fix-esm-extensions.mjs",
+    "build": "tsup && tsc -p tsconfig.build.json --emitDeclarationOnly --declarationMap && bun scripts/gen-chart-css.ts --check && bun scripts/copy-assets.mjs && bun scripts/gen-tokens-css.mjs && bun scripts/fix-esm-extensions.mjs",
     "typecheck": "tsc --noEmit",
     "check-budgets": "bun scripts/check-budgets.ts",
     "test": "cd ../.. && bun test packages/basalt-ui",
@@ -166,34 +133,30 @@
     "@fontsource-variable/hubot-sans": "5.3.0",
     "@fontsource-variable/jetbrains-mono": "5.3.0",
     "@fontsource-variable/nunito-sans": "5.3.0",
-    "@mantine/dates": "9.3.0",
-    "@shikijs/langs": "^4.4.3",
-    "@shikijs/themes": "^4.4.3",
-    "@tanstack/react-hotkeys": "0.10.0",
+    "@mantine/dates": "9.7.1",
+    "@shikijs/langs": "^4.5.0",
+    "@shikijs/themes": "^4.5.0",
+    "@tanstack/charts": "1.1.0",
+    "@tanstack/react-hotkeys": "0.13.0",
     "@tanstack/react-router-devtools": "^1.167.2",
+    "@tanstack/react-table": "9.2.8",
+    "@tanstack/react-virtual": "3.14.14",
     "@testing-library/react": "16.3.3",
     "@types/bun": "^1.4.2",
+    "@types/d3-scale": "4.0.9",
     "@types/hast": "^3.0.5",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
-    "@visx/axis": "4.0.0",
-    "@visx/curve": "4.0.0",
-    "@visx/event": "4.0.0",
-    "@visx/grid": "4.0.0",
-    "@visx/group": "4.0.0",
-    "@visx/responsive": "4.0.0",
-    "@visx/scale": "4.0.0",
-    "@visx/shape": "4.0.0",
-    "@visx/threshold": "4.0.0",
-    "ai": "^7.0.107",
+    "ai": "^7.0.137",
     "beautiful-mermaid": "^1.1.3",
-    "motion": "12.42.0",
+    "d3-scale": "4.0.2",
+    "motion": "14.1.0",
     "publint": "0.3.24",
     "react-markdown": "^10.1.0",
     "rehype-sanitize": "6.0.0",
     "remark-gfm": "^4.0.1",
-    "remend": "1.3.1",
-    "shiki": "^4.4.3",
+    "remend": "1.4.0",
+    "shiki": "^4.5.0",
     "tsup": "^8.5.1",
     "typescript": "^6.0.3",
     "use-stick-to-bottom": "^1.1.6",
@@ -201,59 +164,45 @@
     "vite-plugin-pwa": "^1.3.0"
   },
   "peerDependencies": {
-    "@fontsource-variable/hubot-sans": "5.2.8",
-    "@fontsource-variable/jetbrains-mono": "5.2.8",
-    "@fontsource-variable/nunito-sans": "5.2.7",
-    "@mantine/core": "^9.3.0",
-    "@mantine/dates": "^9.3.0",
-    "@mantine/form": "^9.3.0",
-    "@mantine/hooks": "^9.3.0",
-    "@mantine/modals": "^9.3.0",
-    "@mantine/notifications": "^9.3.0",
-    "@mantine/spotlight": "^9.3.0",
-    "@shikijs/langs": "^4.3.1",
-    "@shikijs/themes": "^4.3.1",
-    "@tanstack/react-hotkeys": "0.10.0",
-    "@tanstack/react-query": "^5.101.0",
-    "@tanstack/react-query-devtools": "^5.101.0",
+    "@ai-sdk/provider": "^4.0.26",
+    "@fontsource-variable/hubot-sans": "5.3.0",
+    "@fontsource-variable/jetbrains-mono": "5.3.0",
+    "@fontsource-variable/nunito-sans": "5.3.0",
+    "@mantine/core": "^9.7.0",
+    "@mantine/dates": "^9.7.0",
+    "@mantine/form": "^9.7.0",
+    "@mantine/hooks": "^9.7.0",
+    "@mantine/modals": "^9.7.0",
+    "@mantine/notifications": "^9.7.0",
+    "@mantine/spotlight": "^9.7.0",
+    "@shikijs/langs": "^4.5.0",
+    "@shikijs/themes": "^4.5.0",
+    "@tanstack/charts": "1.1.0",
+    "@tanstack/react-hotkeys": "0.13.0",
+    "@tanstack/react-query": "^5.104.0",
+    "@tanstack/react-query-devtools": "^5.104.0",
     "@tanstack/react-router": "^1.170.0",
     "@tanstack/react-router-devtools": "^1.166.13",
-    "@tanstack/react-table": ">=8 <9",
-    "@tanstack/react-virtual": ">=3.13.26 <4",
-    "@visx/axis": "4.0.0",
-    "@visx/curve": "4.0.0",
-    "@visx/event": "4.0.0",
-    "@visx/grid": "4.0.0",
-    "@visx/group": "4.0.0",
-    "@visx/responsive": "4.0.0",
-    "@visx/scale": "4.0.0",
-    "@visx/shape": "4.0.0",
-    "@visx/threshold": "4.0.0",
-    "ai": "^7.0.15",
+    "@tanstack/react-table": "9.2.8",
+    "@tanstack/react-virtual": ">=3.14.0 <4",
+    "ai": "^7.0.137",
     "beautiful-mermaid": "^1.1.0",
-    "motion": "12.42.0",
-    "react": "^19.2.7",
-    "react-dom": "^19.2.7",
+    "d3-scale": "4.0.2",
+    "dayjs": "^1.11.0",
+    "motion": "14.1.0",
+    "react": "^19.3.0",
+    "react-dom": "^19.3.0",
     "react-markdown": "^10.1.0",
     "rehype-sanitize": "^6.0.0",
     "remark-gfm": "^4.0.1",
-    "remend": "1.3.0",
-    "shiki": "^4.3.0",
+    "remend": "1.4.0",
+    "shiki": "^4.5.0",
     "use-stick-to-bottom": "^1.1.6",
     "vite": "^7 || ^8",
     "vite-plugin-pwa": "^1.3.0"
   },
   "peerDependenciesMeta": {
-    "@fontsource-variable/hubot-sans": {
-      "optional": true
-    },
-    "@fontsource-variable/jetbrains-mono": {
-      "optional": true
-    },
-    "@fontsource-variable/nunito-sans": {
-      "optional": true
-    },
-    "@mantine/core": {
+    "@ai-sdk/provider": {
       "optional": true
     },
     "@mantine/dates": {
@@ -262,36 +211,21 @@
     "@mantine/form": {
       "optional": true
     },
-    "@mantine/hooks": {
-      "optional": true
-    },
     "@shikijs/langs": {
       "optional": true
     },
     "@shikijs/themes": {
       "optional": true
     },
-    "@tanstack/react-hotkeys": {
-      "optional": true
-    },
-    "@mantine/modals": {
+    "@tanstack/charts": {
       "optional": true
     },
-    "@mantine/notifications": {
-      "optional": true
-    },
-    "@mantine/spotlight": {
-      "optional": true
-    },
-    "@tanstack/react-query": {
+    "@tanstack/react-hotkeys": {
       "optional": true
     },
     "@tanstack/react-query-devtools": {
       "optional": true
     },
-    "@tanstack/react-router": {
-      "optional": true
-    },
     "@tanstack/react-router-devtools": {
       "optional": true
     },
@@ -301,46 +235,19 @@
     "@tanstack/react-virtual": {
       "optional": true
     },
-    "@visx/axis": {
-      "optional": true
-    },
-    "@visx/curve": {
-      "optional": true
-    },
-    "@visx/event": {
-      "optional": true
-    },
-    "@visx/grid": {
-      "optional": true
-    },
-    "@visx/group": {
-      "optional": true
-    },
-    "@visx/responsive": {
-      "optional": true
-    },
-    "@visx/scale": {
-      "optional": true
-    },
-    "@visx/shape": {
-      "optional": true
-    },
-    "@visx/threshold": {
-      "optional": true
-    },
     "ai": {
       "optional": true
     },
     "beautiful-mermaid": {
       "optional": true
     },
-    "motion": {
+    "d3-scale": {
       "optional": true
     },
-    "react": {
+    "dayjs": {
       "optional": true
     },
-    "react-dom": {
+    "motion": {
       "optional": true
     },
     "react-markdown": {
@@ -374,7 +281,7 @@
     ],
     "exempt": [
       "src/tokens/palette.ts",
-      "src/tokens/index.ts",
+      "src/tokens/core.ts",
       "src/tokens/derive.ts",
       "src/tokens/hct.ts",
       "src/theme/index.ts",
@@ -384,7 +291,7 @@
     "rawRadius": true,
     "exemptRules": {
       "inline-spacing": [
-        "primitives"
+        "charts"
       ],
       "inline-display": [
         "agent"

package/src/agent/ai-sdk-transport.ts

@@ -1,7 +1,7 @@
 /**
  * aiSdkTransport — an AgentTransport backed by Vercel AI SDK's native streaming + resumption
  * primitives (the `ai` npm package). This is the RECOMMENDED DEFAULT transport for LLM chat use
- * cases — edenTransport remains the zero-extra-dependency alternative (see agent/rules/basalt-agent.md).
+ * cases.
  *
  * OPTIONAL PEER: `ai` is not a required dependency. Importing 'basalt-ui/agent' (and calling this
  * factory) does NOT eagerly resolve it — the package is loaded via a memoized dynamic import()
@@ -9,7 +9,7 @@
  * contract used by BasaltStickToBottom. Unlike that, there is no meaningful "plain text" fallback
  * for a missing transport: if 'ai' is not installed, the dynamic import
  * rejects and the error propagates through the async generator to the consumer's EXISTING error
- * handling (useAgentStream sets status: 'error'; useAgentThreadRuns falls back to its
+ * handling (useAgentThreadRuns falls back to its
  * onFailureStatus) — no separate crash path is introduced.
  *
  * Install the optional peer:
@@ -18,33 +18,31 @@
  * WHY DIFFING IS NEEDED: AI SDK's `readUIMessageStream` yields the FULL accumulated `UIMessage`
  * snapshot (a growing `parts` array, with existing parts' content growing in place) on every
  * update — it is not itself a delta stream. basalt-ui's whole part-accumulation model
- * (useAgentStream / useAgentThreadRuns, and every consumer's own coalescing) is delta-based: many
+ * (useAgentThreadRuns, and every consumer's own coalescing) is delta-based: many
  * small parts merged at render time. This module diffs consecutive snapshots and yields only the
  * new deltas as AgentParts, so nothing is double-rendered.
  *
  * CHAT ID BINDING: AI SDK's convention is that the chat id is known client-side before the
  * request (unlike a river/server-minted id) — `aiSdkTransport(options)` mints ONE stable chat id
- * at construction time, so the returned object is immediately usable with useAgentStream (a single
+ * at construction time, so the returned object is immediately usable as-is (a single
  * ongoing conversation). `.forThread(threadId)` returns a transport bound to an arbitrary
  * caller-supplied id instead — pass a basalt-ui thread id here to plug into
  * useAgentThreadRuns's per-thread transport-factory form, so a thread's turns (and its mount-time
  * resume) share one continuous AI SDK chat session:
  *
- * @example
- * import { useAgentStream, aiSdkTransport } from 'basalt-ui/agent'
- *
- * const transport = aiSdkTransport({ api: '/api/chat' })
- * const { parts, status, send } = useAgentStream({ transport })
+ * TRANSPORT SEAM: pass `{ api, headers?, credentials?, fetch? }` for AI SDK's HTTP transport, or
+ * `{ transport }` with any `ChatTransport<UIMessage>` — a `WebSocketChatTransport` plugs in
+ * unwrapped (`aiSdkTransport({ transport: new WebSocketChatTransport({ ... }) })`). basalt never
+ * wraps a transport; it reads the chunk stream the transport returns.
  *
  * @example
- * import { useAgentThreadRuns, aiSdkTransport, createThreadsStore, heuristicOutcome } from 'basalt-ui/agent'
+ * import { useAgentThreadRuns, aiSdkTransport } from 'basalt-ui/agent'
  *
- * const useThreads = createThreadsStore({ key: 'main-threads', version: 1 })
  * const transport = aiSdkTransport({ api: '/api/chat' })
  * const { runs, start } = useAgentThreadRuns({
  *   transport: (threadId) => transport.forThread(threadId),
- *   store: useThreads(),
- *   resolveOutcome: heuristicOutcome,
+ *   store, // your consumer-owned ThreadsStore
+ *   resolveOutcome, // your OutcomeResolver
  * })
  */
 import { assertNever } from '../register'
@@ -57,7 +55,7 @@ import type { ResumableAgentTransport } from './transport'
 // verbatimModuleSyntax-safe: these never trigger a runtime resolution of 'ai'. The actual runtime
 // access goes through the memoized `import('ai')` inside resolveAiSdk() below.
 import type {
-  DefaultChatTransport,
+  ChatTransport,
   DynamicToolUIPart,
   ToolUIPart,
   UIMessage,
@@ -70,20 +68,33 @@ type AiPart = UIMessage['parts'][number]
 
 // ── AiSdkTransportOptions ─────────────────────────────────────────────────────
 
-export type AiSdkTransportOptions = {
+export type AiSdkHttpOptions = {
   /** The API URL AI SDK's transport POSTs new turns to and GETs reconnects from. */
   readonly api: string
+  readonly transport?: undefined
   /** HTTP headers to send with every request. */
-  readonly headers?: Record<string, string> | Headers
+  readonly headers?: Record<string, string> | Headers | undefined
   /** The fetch credentials mode. Defaults to 'same-origin' (AI SDK's own default). */
-  readonly credentials?: RequestCredentials
+  readonly credentials?: RequestCredentials | undefined
   /**
    * Custom fetch implementation — e.g. to scope requests to a mock backend in tests/playground,
    * or to add middleware. Defaults to the ambient `fetch` when omitted.
    */
-  readonly fetch?: typeof globalThis.fetch
+  readonly fetch?: typeof globalThis.fetch | undefined
 }
 
+/**
+ * Any AI SDK `ChatTransport<UIMessage>`, used as-is: a `WebSocketChatTransport` plugs in here
+ * unwrapped. basalt never wraps or re-implements a transport; it only reads the chunk stream the
+ * transport returns.
+ */
+export type AiSdkCustomOptions = {
+  readonly api?: undefined
+  readonly transport: ChatTransport<UIMessage>
+}
+
+export type AiSdkTransportOptions = AiSdkHttpOptions | AiSdkCustomOptions
+
 // ── AiSdkTransport ─────────────────────────────────────────────────────────────
 
 export type AiSdkTransport<TPart = AgentPart> = ResumableAgentTransport<TPart, string> & {
@@ -99,7 +110,7 @@ export type AiSdkTransport<TPart = AgentPart> = ResumableAgentTransport<TPart, s
 
 /** Everything resolved from the dynamically-imported 'ai' module, memoized per aiSdkTransport() call. */
 type ResolvedAiSdk = {
-  readonly httpTransport: DefaultChatTransport<UIMessage>
+  readonly chatTransport: ChatTransport<UIMessage>
   readonly readUIMessageStream: typeof readUIMessageStream
 }
 
@@ -113,12 +124,15 @@ function createAiSdkResolver(options: AiSdkTransportOptions): () => Promise<Reso
   return function resolveAiSdk(): Promise<ResolvedAiSdk> {
     resolved ??= import('ai').then(
       ({ DefaultChatTransport: DefaultChatTransportCtor, readUIMessageStream: read }) => ({
-        httpTransport: new DefaultChatTransportCtor<UIMessage>({
-          api: options.api,
-          ...(options.headers !== undefined ? { headers: options.headers } : {}),
-          ...(options.credentials !== undefined ? { credentials: options.credentials } : {}),
-          ...(options.fetch !== undefined ? { fetch: options.fetch } : {}),
-        }),
+        chatTransport:
+          options.transport !== undefined
+            ? options.transport
+            : new DefaultChatTransportCtor<UIMessage>({
+                api: options.api,
+                ...(options.headers !== undefined ? { headers: options.headers } : {}),
+                ...(options.credentials !== undefined ? { credentials: options.credentials } : {}),
+                ...(options.fetch !== undefined ? { fetch: options.fetch } : {}),
+              }),
         readUIMessageStream: read,
       }),
     )
@@ -350,9 +364,9 @@ function diffMessage(
  * A fresh `toolStartTimes` map is scoped to ONE diffChunkStream call (one stream()/resume()
  * invocation), never shared across calls or threads.
  *
- * `resume()`'s underlying reconnectToStream call has no AbortSignal parameter in the current AI
- * SDK API (unlike sendMessages), so we can't cancel the in-flight fetch directly — checking
- * `signal.aborted` here at least stops yielding further deltas to an aborted caller promptly.
+ * Both `sendMessages` and `reconnectToStream` receive the caller's AbortSignal as `abortSignal`,
+ * so an abort cancels the in-flight request; checking `signal.aborted` here also stops yielding
+ * deltas from a stream that was already handed back.
  */
 async function* diffChunkStream<TPart>(
   chatId: string,
@@ -362,7 +376,10 @@ async function* diffChunkStream<TPart>(
 ): AsyncGenerator<TPart> {
   let prev: UIMessage | undefined
   const toolStartTimes = new Map<string, number>()
-  for await (const curr of readStream<UIMessage>({ stream: chunkStream })) {
+  // terminateOnError: a mid-stream `error` chunk or a malformed chunk rejects the iteration, so
+  // the failure reaches useAgentThreadRuns (and its AgentError) instead of ending the turn as if
+  // it had completed.
+  for await (const curr of readStream<UIMessage>({ stream: chunkStream, terminateOnError: true })) {
     if (signal?.aborted) return
     for (const part of diffMessage(chatId, prev, curr, toolStartTimes)) {
       yield part as TPart
@@ -374,15 +391,15 @@ async function* diffChunkStream<TPart>(
 // ── aiSdkTransport ─────────────────────────────────────────────────────────────
 
 /**
- * Wraps AI SDK's `DefaultChatTransport` + `readUIMessageStream` into an AgentTransport.
+ * Wraps an AI SDK `ChatTransport` (`DefaultChatTransport` for `{ api }`, or your own via
+ * `{ transport }`) + `readUIMessageStream` into an AgentTransport.
  *
- * The returned object is immediately usable with useAgentStream (one fixed, stable chat id for
+ * The returned object is immediately usable as-is (one fixed, stable chat id for
  * the whole conversation). Call `.forThread(threadId)` to get a transport bound to a different
  * (caller-supplied) chat id — the per-thread form for useAgentThreadRuns.
  *
  * @example
  * const transport = aiSdkTransport<AgentPart>({ api: '/api/chat' })
- * const { send, parts, status } = useAgentStream({ transport })
  */
 export function aiSdkTransport<TPart = AgentPart>(
   options: AiSdkTransportOptions,
@@ -404,19 +421,19 @@ export function aiSdkTransport<TPart = AgentPart>(
         // need to wait on the server to hand us a run id (unlike a river-style protocol).
         yield { id: `${chatId}#start`, type: 'start', runId: chatId, resumeToken: chatId } as TPart
 
-        const { httpTransport, readUIMessageStream: readStream } = await resolveAiSdk()
+        const { chatTransport, readUIMessageStream: readStream } = await resolveAiSdk()
         const userMessage: UIMessage = {
           // This id is what AI SDK's own backend persistence/dedup keys turns hang off — the same
           // idempotency-key cost as basalt's own ChatMessage.id (see mintMessageId's doc). Prefer
           // the caller's OWN idempotency key (ctx.messageId — the id useAgentThreadRuns.start()
           // already minted for this turn's ChatMessage) so the two never diverge for one turn; only
-          // a caller that omits ctx (useAgentStream, a hand-rolled stream() call) falls back to
+          // a caller that omits ctx (a hand-rolled stream() call) falls back to
           // minting a fresh one here.
           id: ctx?.messageId ?? mintMessageId(),
           role: 'user',
           parts: [{ type: 'text', text: input }],
         }
-        const chunkStream = await httpTransport.sendMessages({
+        const chunkStream = await chatTransport.sendMessages({
           chatId,
           messages: [userMessage],
           trigger: 'submit-message',
@@ -426,8 +443,11 @@ export function aiSdkTransport<TPart = AgentPart>(
         yield* diffChunkStream<TPart>(chatId, chunkStream, readStream, signal)
       },
       async *resume(resumeToken: string, signal?: AbortSignal): AsyncGenerator<TPart> {
-        const { httpTransport, readUIMessageStream: readStream } = await resolveAiSdk()
-        const chunkStream = await httpTransport.reconnectToStream({ chatId: resumeToken })
+        const { chatTransport, readUIMessageStream: readStream } = await resolveAiSdk()
+        const chunkStream = await chatTransport.reconnectToStream({
+          chatId: resumeToken,
+          ...(signal !== undefined ? { abortSignal: signal } : {}),
+        })
         if (chunkStream === null) return
         // resumeToken IS the chat id (see CHAT ID BINDING above) — reusing it as the id-namespace
         // here keeps replayed index-addressed ids identical to the ones the original run minted.