test(ai): keep image bridge fixture type safe

Add a Move to group action for the selected hosts, reusing existing group moves and saving the selection once. Omit the hidden synthetic General destination.

Related to #3194; marquee selection and dragging a selection are outside this change.

65 focused checks, lint, build and real grid/list mouse/keyboard/cancel/reload/single-host drag checks pass. Current-head remote review and both CI jobs pass.

application/i18n/locales/en/core.ts

@@ -1149,6 +1149,9 @@ Highlight the focused split pane:
   'vault.hosts.deleteMultiple.success': 'Deleted {count} hosts',
   'vault.hosts.connectSelected': 'Connect ({count})',
   'vault.hosts.connectMultiple.success': 'Connecting {count} hosts',
+  'vault.hosts.moveSelected': 'Move to group ({count})',
+  'vault.hosts.moveSelected.description': 'Move the selected hosts to an existing group, or leave them ungrouped. Selected groups are not moved.',
+  'vault.hosts.moveMultiple.success': 'Moved {count} hosts to {group}',
   'vault.hosts.moveToGroup.success': 'Moved {host} to {group}',
   'vault.hosts.errors.nameRequired': 'Host name is required.',
   'vault.hosts.empty.title': 'Set up your hosts',

application/i18n/locales/es/core.ts

@@ -1107,6 +1107,9 @@ Resalta el panel dividido enfocado:
   'vault.hosts.deleteMultiple.success': 'Se eliminaron {count} hosts',
   'vault.hosts.connectSelected': 'Conectar ({count})',
   'vault.hosts.connectMultiple.success': 'Conectando {count} hosts',
+  'vault.hosts.moveSelected': 'Mover al grupo ({count})',
+  'vault.hosts.moveSelected.description': 'Mueve los hosts seleccionados a un grupo existente o los deja sin grupo. Los grupos seleccionados no se mueven.',
+  'vault.hosts.moveMultiple.success': 'Se movieron {count} hosts a {group}',
   'vault.hosts.moveToGroup.success': 'Se movió {host} a {group}',
   'vault.hosts.errors.nameRequired': 'Se requiere el nombre del host.',
   'vault.hosts.empty.title': 'Configura tus hosts',

application/i18n/locales/ru/vault.ts

@@ -128,6 +128,9 @@ export const ruVaultMessages: Messages = {
   'vault.hosts.deleteMultiple.success': 'Удалено хостов: {count}',
   'vault.hosts.connectSelected': 'Подключить ({count})',
   'vault.hosts.connectMultiple.success': 'Подключение хостов: {count}',
+  'vault.hosts.moveSelected': 'Переместить в группу ({count})',
+  'vault.hosts.moveSelected.description': 'Переместить выбранные хосты в существующую группу или оставить без группы. Выбранные группы не перемещаются.',
+  'vault.hosts.moveMultiple.success': 'Перемещено {count} хостов в {group}',
   'vault.hosts.moveToGroup.success': 'Хост {host} перемещён в {group}',
   'vault.hosts.empty.title': 'Настройте свои хосты',
   'vault.hosts.empty.desc': 'Сохраняйте хосты, чтобы быстро подключаться к серверам, виртуальным машинам и контейнерам.',

application/i18n/locales/zh-CN/core.ts

@@ -766,6 +766,9 @@ export const zhCNCoreMessages: Messages = {
   'vault.hosts.deleteMultiple.success': '已删除 {count} 个主机',
   'vault.hosts.connectSelected': '连接 ({count})',
   'vault.hosts.connectMultiple.success': '正在连接 {count} 个主机',
+  'vault.hosts.moveSelected': '移动到分组 ({count})',
+  'vault.hosts.moveSelected.description': '将选中的主机移动到现有分组，也可移出分组。选中的分组本身不会移动。',
+  'vault.hosts.moveMultiple.success': '已将 {count} 个主机移动到 {group}',
   'vault.hosts.moveToGroup.success': '已将 {host} 移动到 {group}',
   'vault.hosts.errors.nameRequired': '主机名称不能为空。',
   'vault.hosts.empty.title': '设置你的主机',

application/i18n/locales/zh-TW/core.ts

@@ -768,6 +768,9 @@ export const zhTWCoreMessages: Messages = {
   'vault.hosts.deleteMultiple.success': '已刪除 {count} 個主機',
   'vault.hosts.connectSelected': '連線 ({count})',
   'vault.hosts.connectMultiple.success': '正在連線 {count} 個主機',
+  'vault.hosts.moveSelected': '移動到群組 ({count})',
+  'vault.hosts.moveSelected.description': '將選取的主機移動到現有群組，也可移出群組。選取的群組本身不會移動。',
+  'vault.hosts.moveMultiple.success': '已將 {count} 個主機移動到 {group}',
   'vault.hosts.moveToGroup.success': '已將 {host} 移動到 {group}',
   'vault.hosts.errors.nameRequired': '主機名稱不能為空。',
   'vault.hosts.empty.title': '設定你的主機',

application/state/sessionFactories.test.ts

@@ -4,7 +4,7 @@ import test from "node:test";
 import type { Host } from "../../domain/models";
 import { prepareSerialConfigForSavedHost } from "../../domain/serialBackspace";
 import { buildTelnetDeepLinkConnectionHost } from "../../domain/telnetDeepLink";
-import { resolveEffectiveTerminalHost } from "../../domain/terminalHostResolution";
+import { resolveEffectiveTerminalHost, resolveTerminalSessionHost } from "../../domain/terminalHostResolution";
 import {
   createHostTerminalSession,
   createSerialTerminalSession,
@@ -171,3 +171,16 @@ test("host session factories snapshot plugin connection configuration", () => {
   assert.deepEqual(workspace.pluginConnection, pluginConnection);
   assert.notEqual(workspace.pluginConnection, pluginConnection);
 });
+
+test("local sessions preserve intentionally absent display metadata when the saved shell changes", () => {
+  const original = host({ protocol: "local", hostname: "localhost", localShell: "/bin/bash" });
+  const source = createHostTerminalSession("original-bash", original);
+  const edited = { ...original, localShell: "/bin/zsh", localShellName: "Zsh", localShellIcon: "zsh" };
+  const copied = resolveTerminalSessionHost({ session: source, hosts: [edited], groupConfigs: [], proxyProfiles: [], localOs: "macos" });
+  assert.equal(copied.localShell, "/bin/bash");
+  assert.equal(copied.localShellName, "");
+  assert.equal(copied.localShellIcon, "");
+  const named = createHostTerminalSession("named-zsh", edited);
+  assert.equal(named.localShellName, "Zsh");
+  assert.equal(named.localShellIcon, "zsh");
+});

application/state/sessionFactories.ts

@@ -153,8 +153,8 @@ export const createHostTerminalSession = (
       // Preserve field presence: an edited host must not contribute its args
       // to a session that was launched with an explicit shell and no args.
       localShellArgs: host.localShellArgs ?? EMPTY_LOCAL_SHELL_ARGS,
-      localShellName: host.localShellName,
-      localShellIcon: host.localShellIcon,
+      localShellName: host.localShellName ?? "",
+      localShellIcon: host.localShellIcon ?? "",
       // Effective directory from resolveHostDefaultLocalShell, including a
       // Settings directory the saved host inherits. Copy Tab overlays this
       // snapshot, so a later settings or vault edit cannot move the relaunch.

components/VaultView.tsx

@@ -1358,6 +1358,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
     handleUnmanageGroup,
     managedGroupPaths,
     moveHostToGroup,
+    moveHostsToGroup,
     setDragOverDropTarget,
     setGroupDragOverDropTarget,
   } = useVaultGroupDragHandlers({
@@ -1602,6 +1603,7 @@ const VaultViewInner: React.FC<VaultViewProps> = ({
           managedSources,
           moveGroup,
           moveHostToGroup,
+          moveHostsToGroup,
           Network,
           newFolderName,
           newHostGroupPath,

components/top-tabs/TopTabItems.tsx

@@ -86,7 +86,7 @@ const SessionTabIcon: React.FC<{
   // Local protocol → shell-specific icon if available, else OS-specific icon
   if (protocol === 'local' || host?.protocol === 'local' || (!protocol && !host)) {
     // Use shell icon from discovery when available
-    const iconId = shellIcon || host?.localShellIcon;
+    const iconId = shellIcon ?? host?.localShellIcon;
     if (iconId) {
       return (
         <img

components/vault/VaultViewLayout.tsx

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { Combobox } from "../ui/combobox";
 import React, { useCallback } from "react";
 import { deleteVaultKey } from "../../application/defaultKeyPassphrases";
 import { VaultGroupDeletionConfirmationChangedError } from "../../application/state/useVaultGroupDeletion";
@@ -243,6 +244,7 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) {
     managedSources,
     moveGroup,
     moveHostToGroup,
+    moveHostsToGroup,
     Network,
     newFolderName,
     newHostGroupPath,
@@ -445,6 +447,8 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) {
     persistWidthStorageKey: STORAGE_KEY_VAULT_HOST_PANEL_WIDTH,
     resizeAriaLabel: t("vault.panel.resizeWidth"),
   };
+  const [isMoveHostsOpen, setIsMoveHostsOpen] = React.useState(false);
+  const [moveTargetGroup, setMoveTargetGroup] = React.useState("");
   const [isSidebarResizing, setIsSidebarResizing] = React.useState(false);
   const keyListRef = React.useRef(keys);
   keyListRef.current = keys;
@@ -1130,6 +1134,19 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) {
                     count: selectedHostIds.size,
                   })}
                 </Button>
+                <Button
+                  variant="secondary"
+                  size="sm"
+                  className="h-7 px-2 text-xs"
+                  disabled={selectedHostIds.size === 0}
+                  onClick={() => {
+                    setMoveTargetGroup("");
+                    setIsMoveHostsOpen(true);
+                  }}
+                >
+                  <FolderTree size={12} className="mr-1" />
+                  {t("vault.hosts.moveSelected", { count: selectedHostIds.size })}
+                </Button>
                 <Button
                   variant="destructive"
                   size="sm"
@@ -1794,6 +1811,43 @@ export function VaultViewLayout({ ctx }: { ctx: VaultViewLayoutContext }) {
         </DialogContent>
       </Dialog>
 
+      <Dialog open={isMoveHostsOpen} onOpenChange={setIsMoveHostsOpen}>
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>{t("vault.hosts.moveSelected", { count: selectedHostIds.size })}</DialogTitle>
+            <DialogDescription>{t("vault.hosts.moveSelected.description")}</DialogDescription>
+          </DialogHeader>
+          <Combobox
+            options={[
+              { value: "", label: t("vault.hosts.allHosts") },
+              ...allGroupPaths
+                .filter((path: string) => path !== "General"
+                  || customGroups.includes("General")
+                  || allGroupPaths.some((group: string) => group.startsWith("General/")))
+                .map((path: string) => ({ value: path, label: path })),
+            ]}
+            value={moveTargetGroup}
+            onValueChange={setMoveTargetGroup}
+            ariaLabel={t("hostDetails.group.placeholder")}
+            placeholder={t("vault.hosts.allHosts")}
+            clearable={false}
+          />
+          <DialogFooter>
+            <Button variant="ghost" onClick={() => setIsMoveHostsOpen(false)}>{t("common.cancel")}</Button>
+            <Button
+              disabled={selectedHostIds.size === 0}
+              onClick={() => {
+                moveHostsToGroup(selectedHostIds, moveTargetGroup || null);
+                setIsMoveHostsOpen(false);
+                clearHostSelection();
+              }}
+            >
+              {t("vault.hosts.moveSelected", { count: selectedHostIds.size })}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+
       <ImportVaultDialog
         open={isImportOpen}
         onOpenChange={setIsImportOpen}

components/vault/useVaultGroupDragHandlers.test.tsx

@@ -0,0 +1,85 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import React from 'react';
+import { act, create, type ReactTestRenderer } from 'react-test-renderer';
+import type { Host, ManagedSource } from '../../types';
+import { useVaultGroupDragHandlers } from './useVaultGroupDragHandlers';
+
+const host = (id: string, extra: Partial<Host> = {}): Host => ({
+  id, label: `Host ${id}`, hostname: `${id}.example`, username: 'user', port: 22,
+  tags: ['keep'], group: 'Old', ...extra,
+});
+
+test('bulk group move publishes all selected hosts together and preserves unselected hosts', async () => {
+  const original = [host('a'), host('b', { protocol: 'telnet' }), host('c')];
+  const writes: Host[][] = [];
+  await withActions(original, [], actions => {
+    act(() => actions.moveHostsToGroup(new Set(['a', 'b']), 'New/Nested'));
+    assert.equal(writes.length, 1);
+    assert.deepEqual(writes[0].map(h => h.group), ['New/Nested', 'New/Nested', 'Old']);
+    assert.equal(writes[0][2], original[2]);
+    assert.deepEqual(writes[0][0].tags, ['keep']);
+    assert.equal(writes[0][0].hostname, original[0].hostname);
+  }, writes);
+});
+
+test('mixed protocols entering and leaving managed groups retain single-host move rules', async () => {
+  const original = [host('ssh'), host('telnet', { protocol: 'telnet' }), host('local', { protocol: 'local' })];
+  const sources = [{ id: 'parent', groupName: 'Managed' }, { id: 'child', groupName: 'Managed/Nested' }] as ManagedSource[];
+  const writes: Host[][] = [];
+  await withActions(original, sources, actions => {
+    act(() => actions.moveHostsToGroup(new Set(original.map(h => h.id)), 'Managed/Nested'));
+    assert.equal(writes.length, 1);
+    assert.equal(writes[0][0].managedSourceId, 'child');
+    assert.equal(writes[0][0].label, 'Hostssh');
+    assert.equal(writes[0][1].managedSourceId, undefined);
+    assert.equal(writes[0][1].label, 'Host telnet');
+    assert.equal(writes[0][2].managedSourceId, undefined);
+    assert.equal(writes[0][2].label, 'Host local');
+  }, writes);
+  await withActions(writes[0], sources, actions => {
+    act(() => actions.moveHostsToGroup(new Set(original.map(h => h.id)), null));
+    assert.deepEqual(writes[1].map(h => h.group), ['', '', '']);
+    assert.ok(writes[1].every(h => h.managedSourceId === undefined));
+  }, writes);
+});
+
+test('same-group, missing and empty selections do not publish changes', async () => {
+  const writes: Host[][] = [];
+  await withActions([host('a')], [], actions => {
+    act(() => actions.moveHostsToGroup(new Set(['a']), 'Old'));
+    act(() => actions.moveHostsToGroup(new Set(['missing']), 'New'));
+    act(() => actions.moveHostsToGroup(new Set(), 'New'));
+    assert.equal(writes.length, 0);
+    act(() => actions.moveHostToGroup('a', 'New'));
+    assert.equal(writes.length, 1);
+    assert.equal(writes[0][0].group, 'New');
+  }, writes);
+});
+
+async function withActions(
+  hosts: Host[], managedSources: ManagedSource[],
+  run: (actions: ReturnType<typeof useVaultGroupDragHandlers>) => void,
+  writes: Host[][],
+) {
+  const previousWindow = globalThis.window;
+  const actEnvironment = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
+  const previousAct = actEnvironment.IS_REACT_ACT_ENVIRONMENT;
+  actEnvironment.IS_REACT_ACT_ENVIRONMENT = true;
+  globalThis.window = { setTimeout: () => 1, clearTimeout: () => {} } as unknown as Window & typeof globalThis;
+  let renderer: ReactTestRenderer | undefined;
+  let actions: ReturnType<typeof useVaultGroupDragHandlers>;
+  function Probe() {
+    actions = useVaultGroupDragHandlers({ hosts, managedSources,
+      onUpdateHosts: next => writes.push(next), onUpdateManagedSources: () => {}, t: key => key });
+    return null;
+  }
+  try {
+    await act(async () => { renderer = create(<Probe />); });
+    run(actions!);
+  } finally {
+    await act(async () => renderer?.unmount());
+    globalThis.window = previousWindow;
+    actEnvironment.IS_REACT_ACT_ENVIRONMENT = previousAct;
+  }
+}

components/vault/useVaultGroupDragHandlers.ts

@@ -66,53 +66,40 @@ export function useVaultGroupDragHandlers({
       setDragOverDropTarget(path ? { kind: "group", path } : null);
     }, []);
   
-  const moveHostToGroup = useCallback((hostId: string, groupPath: string | null) => {
+  const moveHostsToGroup = useCallback((hostIds: ReadonlySet<string>, groupPath: string | null) => {
       const targetGroup = groupPath || "";
-      const hostToMove = hosts.find((h) => h.id === hostId);
-      if (!hostToMove || (hostToMove.group || "") === targetGroup) {
-        setDragOverDropTarget(null);
-        return;
-      }
-  
-      // Find the most specific (deepest) managed source that matches the target group
       const targetManagedSource = managedSources
         .filter(s => targetGroup === s.groupName || targetGroup.startsWith(s.groupName + "/"))
         .sort((a, b) => b.groupName.length - a.groupName.length)[0];
-  
-      const movedHost = {
-        ...hostToMove,
-        group: targetGroup,
-      };
-      const updatedHost = (() => {
-          const h = movedHost;
-  
-          // Only SSH hosts can be managed (SSH config only supports SSH)
-          const canBeManaged = !h.protocol || h.protocol === "ssh";
-  
-          // Sanitize label if moving to a managed group (SSH config requires no spaces in Host alias)
-          let label = h.label;
-          if (targetManagedSource && canBeManaged && label) {
-            label = label.replace(/\s/g, '');
-          }
-  
-          return {
-            ...h,
-            label,
-            group: targetGroup,
-            managedSourceId: (targetManagedSource && canBeManaged) ? targetManagedSource.id : undefined,
-          };
-        })();
-      onUpdateHosts(hosts.map((host) => (host.id === hostId ? updatedHost : host)));
+      let movedCount = 0;
+      const updatedHosts = hosts.map(host => {
+        if (!hostIds.has(host.id) || (host.group || "") === targetGroup) return host;
+        movedCount += 1;
+        const canBeManaged = !host.protocol || host.protocol === "ssh";
+        return {
+          ...host,
+          group: targetGroup,
+          label: targetManagedSource && canBeManaged
+            ? host.label.replace(/\s/g, '') : host.label,
+          managedSourceId: targetManagedSource && canBeManaged ? targetManagedSource.id : undefined,
+        };
+      });
       setDragOverDropTarget(null);
+      if (movedCount === 0) return;
+      // Publish the entire selection once; repeated single-host updates would
+      // each start from the same render snapshot and overwrite earlier moves.
+      onUpdateHosts(updatedHosts);
       pulseDropTarget(groupPath ? { kind: "group", path: groupPath } : { kind: "root" });
-      toast.success(
-        t("vault.hosts.moveToGroup.success", {
-          host: hostToMove.label,
-          group: groupPath || t("vault.hosts.allHosts"),
-        }),
-      );
+      toast.success(t("vault.hosts.moveMultiple.success", {
+        count: movedCount,
+        group: groupPath || t("vault.hosts.allHosts"),
+      }));
     }, [hosts, managedSources, onUpdateHosts, pulseDropTarget, t]);
-  
+
+  const moveHostToGroup = useCallback((hostId: string, groupPath: string | null) => {
+      moveHostsToGroup(new Set([hostId]), groupPath);
+    }, [moveHostsToGroup]);
+
   const getDropTargetClasses = (target: DropTarget) =>
       cn(
         isSameDropTarget(dragOverDropTarget, target) &&
@@ -151,6 +138,7 @@ export function useVaultGroupDragHandlers({
     handleUnmanageGroup,
     managedGroupPaths,
     moveHostToGroup,
+    moveHostsToGroup,
     setDragOverDropTarget,
     setGroupDragOverDropTarget,
   };

domain/sessionRestore.test.ts

@@ -875,3 +875,21 @@ test("restore retains an explicit backend-default local shell snapshot", () => {
   assert.deepEqual(restored.sessions[0].localShellArgs, []);
   assert.equal(restored.sessions[0].localStartDir, "~");
 });
+
+test("restore retains absent local display snapshots while legacy fields remain absent", () => {
+  const payload = buildSessionRestorePayload({
+    sessions: [
+      { ...session("empty-display"), protocol: "local", localShellName: "", localShellIcon: "" },
+      { ...session("named-display"), protocol: "local", localShellName: "Bash", localShellIcon: "bash" },
+      { ...session("legacy-display"), protocol: "local" },
+    ],
+    workspaces: [], tabOrder: [], activeTabId: "empty-display", now: 123,
+  });
+  const restored = sanitizeSessionRestorePayload(JSON.parse(JSON.stringify(payload)));
+  assert.equal(restored.sessions[0].localShellName, "");
+  assert.equal(restored.sessions[0].localShellIcon, "");
+  assert.equal(restored.sessions[1].localShellName, "Bash");
+  assert.equal(restored.sessions[1].localShellIcon, "bash");
+  assert.equal(restored.sessions[2].localShellName, undefined);
+  assert.equal(restored.sessions[2].localShellIcon, undefined);
+});

domain/sessionRestore.ts

@@ -154,8 +154,8 @@ const restoreSession = (session: TerminalSession): RestoredTerminalSession => {
     ...(serialConfig ? { serialConfig } : {}),
     ...(session.localShell !== undefined ? { localShell: session.localShell } : {}),
     ...(session.localShellArgs ? { localShellArgs: [...session.localShellArgs] } : {}),
-    ...(session.localShellName ? { localShellName: session.localShellName } : {}),
-    ...(session.localShellIcon ? { localShellIcon: session.localShellIcon } : {}),
+    ...(session.localShellName !== undefined ? { localShellName: session.localShellName } : {}),
+    ...(session.localShellIcon !== undefined ? { localShellIcon: session.localShellIcon } : {}),
     ...(session.localStartDir ? { localStartDir: session.localStartDir } : {}),
     ...(session.fontSize !== undefined ? { fontSize: session.fontSize } : {}),
     ...(session.fontSizeOverride !== undefined ? { fontSizeOverride: session.fontSizeOverride } : {}),
@@ -197,8 +197,8 @@ const restoreSessionFromUnknown = (value: unknown): RestoredTerminalSession | nu
     ...(serialConfig ? { serialConfig } : {}),
     ...(readStringAllowEmpty(value, "localShell") !== undefined ? { localShell: readStringAllowEmpty(value, "localShell") } : {}),
     ...(Array.isArray(value.localShellArgs) ? { localShellArgs: value.localShellArgs.filter((arg): arg is string => typeof arg === "string") } : {}),
-    ...(readString(value, "localShellName") ? { localShellName: readString(value, "localShellName") } : {}),
-    ...(readString(value, "localShellIcon") ? { localShellIcon: readString(value, "localShellIcon") } : {}),
+    ...(readStringAllowEmpty(value, "localShellName") !== undefined ? { localShellName: readStringAllowEmpty(value, "localShellName") } : {}),
+    ...(readStringAllowEmpty(value, "localShellIcon") !== undefined ? { localShellIcon: readStringAllowEmpty(value, "localShellIcon") } : {}),
     ...(readString(value, "localStartDir") ? { localStartDir: readString(value, "localStartDir") } : {}),
     ...(readNumber(value, "fontSize") !== undefined ? { fontSize: readNumber(value, "fontSize") } : {}),
     ...(readBoolean(value, "fontSizeOverride") !== undefined ? { fontSizeOverride: readBoolean(value, "fontSizeOverride") } : {}),

infrastructure/ai/sdkProviders.test.ts

@@ -1,5 +1,8 @@
 import assert from "node:assert/strict";
 import test from "node:test";
+import { generateText, streamText } from "ai";
+import { buildCattySdkMessages, createContinuationContext } from "./harness/turnDrivers/cattyMessageBuilder";
+import { ToolOutputStore } from "./harness/toolOutputStore";
 
 import { createModelFromConfig, resolveProviderEndpoint } from "./sdk/providers";
 import type { ProviderConfig } from "./types";
@@ -280,3 +283,43 @@ test("SDK requests forward custom headers and scope OpenCode sessions", async (t
   }
   assert.equal(requests.length, 16);
 });
+
+test("OpenAI Chat sends inline image attachments as data URLs through the bridge", async (t) => {
+  const browserGlobal = globalThis as typeof globalThis & { window?: unknown };
+  const originalWindow = browserGlobal.window;
+  t.after(() => { browserGlobal.window = originalWindow; });
+  const requests: Array<{ url: string; body: Record<string, unknown> }> = [];
+  Reflect.set(globalThis, "window", { netcatty: {
+    aiFetch: async (url: string, _method: string, _headers: Record<string, string>, body: string) => {
+      requests.push({ url, body: JSON.parse(body) });
+      return { ok: false, status: 400, data: '{"error":{"message":"captured request"}}' };
+    },
+    aiChatStream: async (_requestId: string, url: string, _headers: Record<string, string>, body: string) => {
+      requests.push({ url, body: JSON.parse(body) });
+      return { ok: false, error: "captured request" };
+    },
+    onAiStreamData: () => () => {},
+    onAiStreamEnd: () => () => {},
+    onAiStreamError: () => () => {},
+  } });
+
+  for (const [mediaType, base64Data] of [["image/png", "iVBORw0KGgo="], ["image/jpeg", "/9j/4A=="]]) {
+    const messages = buildCattySdkMessages({
+      allMessages: [], includeCurrentUserMessage: true, trimmed: "Read this image",
+      attachments: [{ mediaType, base64Data }],
+      continuationContext: createContinuationContext("p", "openai", "m", false),
+      chatSessionId: "images", toolOutputStore: new ToolOutputStore(), fieldsByMessage: new Map(),
+    });
+    const model = createModelFromConfig(makeConfig({ openaiApi: "chat", apiKey: "test-key", baseURL: "https://example.test/v1" }));
+    await assert.rejects(generateText({ model, messages, maxRetries: 0 }), /captured request/);
+    await assert.rejects(async () => await streamText({ model, messages, maxRetries: 0, onError: () => {} }).text);
+    for (const request of requests.slice(-2)) {
+      assert.equal(request.url, "https://example.test/v1/chat/completions");
+      assert.deepEqual(request.body.messages, [{ role: "user", content: [
+        { type: "text", text: "Read this image" },
+        { type: "image_url", image_url: { url: `data:${mediaType};base64,${base64Data}` } },
+      ] }]);
+    }
+  }
+  assert.equal(requests.length, 4);
+});

package-lock.json

@@ -16,7 +16,7 @@
       "dependencies": {
         "@ai-sdk/anthropic": "^4.0.0",
         "@ai-sdk/google": "^4.0.0",
-        "@ai-sdk/openai": "^4.0.0",
+        "@ai-sdk/openai": "4.0.8",
         "@aws-sdk/client-s3": "^3.956.0",
         "@eslint-community/regexpp": "4.12.2",
         "@fontsource/jetbrains-mono": "^5.2.8",
@@ -197,13 +197,43 @@
       }
     },
     "node_modules/@ai-sdk/openai": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@ai-sdk/openai/-/openai-4.0.0.tgz",
-      "integrity": "sha512-XcI/bJEG+Ymx8ZwQMY9GE9waHdEcSzT6wn2o+YW80hOQPf8IAGQvdNWKaD0mxLi6AmOM0L01y/p626w7rImblQ==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/openai/-/openai-4.0.8.tgz",
+      "integrity": "sha512-yW2UuS6jlu2LRYCd+cSpVdu/umf+QjypihYAiGvKk5HnpqQf21ffNjFbke9xo9jhT+TBt2YR30Fs5Sy0md/dfA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@ai-sdk/provider": "4.0.0",
-        "@ai-sdk/provider-utils": "5.0.0"
+        "@ai-sdk/provider": "4.0.2",
+        "@ai-sdk/provider-utils": "5.0.5"
+      },
+      "engines": {
+        "node": ">=22"
+      },
+      "peerDependencies": {
+        "zod": "^3.25.76 || ^4.1.8"
+      }
+    },
+    "node_modules/@ai-sdk/openai/node_modules/@ai-sdk/provider": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider/-/provider-4.0.2.tgz",
+      "integrity": "sha512-pfPoy9J1B1xV7cqJ8MYHOsDYrMv5tR3+EMNfI249OhkD2uRakvav3Fo7XpD2luuN/YNCBY7KfEQc7vEV7KEtyw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "json-schema": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=22"
+      }
+    },
+    "node_modules/@ai-sdk/openai/node_modules/@ai-sdk/provider-utils": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/@ai-sdk/provider-utils/-/provider-utils-5.0.5.tgz",
+      "integrity": "sha512-oI0t3dvCoqWNV1I8o1Rybi2DXDvHES5r/TrwtJW90tuFLVepgJlftPxrcjh8vaSvjqC2diTuA2vXyjKAyHJm4A==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ai-sdk/provider": "4.0.2",
+        "@standard-schema/spec": "^1.1.0",
+        "@workflow/serde": "4.1.0",
+        "eventsource-parser": "^3.0.8"
       },
       "engines": {
         "node": ">=22"

package.json

@@ -76,7 +76,7 @@
   "dependencies": {
     "@ai-sdk/anthropic": "^4.0.0",
     "@ai-sdk/google": "^4.0.0",
-    "@ai-sdk/openai": "^4.0.0",
+    "@ai-sdk/openai": "4.0.8",
     "@aws-sdk/client-s3": "^3.956.0",
     "@eslint-community/regexpp": "4.12.2",
     "@fontsource/jetbrains-mono": "^5.2.8",