@oar-sh/oar 0.9.24 → 0.9.26

package/server/server-runtime.mjs

@@ -84,6 +84,7 @@ import { sessionLaunchMutex } from './services/session-launch-mutex-service.mjs'
 import { createWorkerRecycleService, sweepArchivedWorkers } from './services/worker-recycle-service.mjs';
 import { createClaudeApiUsageService } from './services/claude-api-usage-service.mjs';
 import { createTokenUsageService } from './services/token-usage-service.mjs';
+import { createOpenAIImageSpendService } from './services/openai-image-spend-service.mjs';
 import { createClaudeApiCapWatch, createClaudeApiPlanUsage, createClaudeApiStopNoteLedger } from './services/plan-usage-claude-api.mjs';
 import { DEEPSEEK_DEFAULT_AUTO_COMPACT_WINDOW, DEFAULT_DEEPSEEK_MODEL, deepseekModelLabel } from '../shared/deepseek-models.mjs';
 import { createClaudeCloudSessionService } from './services/claude-cloud-session-service.mjs';
@@ -2400,6 +2401,8 @@ function setPwaAppName(rawValue) {
   } else {
     stmts.deleteAppSetting.run(PWA_APP_NAME_SETTING_KEY);
   }
+  // Settings open on another device show the new name (Settings › Relays).
+  try { remoteRelayRegistry.notifySelfChanged(); } catch {}
   return { ok: true, appName: normalized.value };
 }
 
@@ -5807,6 +5810,16 @@ const claudeApiUsageService = createClaudeApiUsageService({ db, logger: console
 // Tokens per turn and per day for every provider, booked from the
 // workers' reports; the Tokens sections in Check Usage and About read it.
 const tokenUsageService = createTokenUsageService({ db, logger: console });
+// OpenAI image spend against its daily cap: one ledger of the tries in
+// flight for the image routes and the settings route alike. Its events go
+// to the owner's clients once the socket server is up.
+const openAIImageSpend = createOpenAIImageSpendService({
+  tokenUsageService,
+  readSetting: readAppSettingValue,
+  db,
+  emit: (event, payload) => io?.emit?.(event, payload),
+  logger: console,
+});
 // This month's spend on the key against the cap, and the Check Usage card
 // (services/plan-usage-claude-api.mjs), over the same local days.
 const claudeApiPlanUsage = createClaudeApiPlanUsage({
@@ -8175,6 +8188,11 @@ const sharedRouteDeps = {
   path,
   uploadsDir: UPLOAD_DIR,
   uploadReadDirs: UPLOAD_READ_DIRS,
+  // Never read for a send's imagePaths, even inside the session's folder.
+  imageInputDenyPaths: {
+    dirs: [DATA_DIR],
+    files: [DB_PATH, `${DB_PATH}-wal`, `${DB_PATH}-shm`, `${DB_PATH}-journal`, CONFIG_PATH],
+  },
   fetchUsageSummary,
   fetchCopilotBillingUsage,
   fetchGrokBillingUsage: createGrokBillingUsageFetcher(),
@@ -8231,6 +8249,9 @@ const sharedRouteDeps = {
   claudeBillingSwitchService,
   claudeApiUsageService,
   tokenUsageService,
+  openAIImageSpend,
+  getOpenAIImageSpendState: (options) => openAIImageSpend.buildState(options),
+  notifyOpenAIImageSpendChanged: () => openAIImageSpend.notifyImageSpendChanged(),
   claudeApiClaimCheck,
   onClaudeBillingFence: handleClaudeBillingFence,
   claudeApiPlanUsage,

package/server/services/database-file.mjs

@@ -45,10 +45,12 @@ export const STARTUP_SETTING_KEYS = Object.freeze([
   'model_refresh_last',
 ]);
 // And the tables such a start fills that hold no one's work: the model
-// catalog and its refresh state, the restart orchestrator's one row. (The
-// shadow tables of the message search are left out too: they follow
-// messages.) Any other table with a row makes the start refuse.
-export const STARTUP_TABLES = Object.freeze(['model_variants', 'model_selector_state', 'relay_restart_orchestrator']);
+// catalog and its refresh state, the restart orchestrator's one row, the
+// media index's extractor version (migration 0039; its items and queue
+// follow messages and stay empty without them). (The shadow tables of the
+// message search are left out too: they follow messages.) Any other table
+// with a row makes the start refuse.
+export const STARTUP_TABLES = Object.freeze(['model_variants', 'model_selector_state', 'relay_restart_orchestrator', 'media_index_meta']);
 
 /** A database's files: the main file, its -wal and its -shm. */
 export function sideFiles(name) {

package/server/services/generated-image-cleanup-service.mjs

@@ -25,7 +25,8 @@ function parseMessageAttachments(rawAttachments, { parseAttachments, hydrateAtta
   return attachments.map((entry) => hydrateAttachment(entry)).filter(Boolean);
 }
 
-function resolveGeneratedImagePath({
+/** The file of a generated-image attachment under `root`, or null for one that would leave its folder. */
+export function resolveGeneratedImagePath({
   root,
   sessionId,
   relativePath,

package/server/services/generated-image-files.mjs

@@ -0,0 +1,110 @@
+'use strict';
+
+import fs from 'fs';
+
+import { IMAGE_HEADER_BYTES, readImageHeader } from '../../shared/image-header.mjs';
+import { resolveGeneratedImagePath } from './generated-image-cleanup-service.mjs';
+
+// A generated image's attachment as GET /api/conversation/:id serves it: its
+// absolute file on this relay (`generatedImage.path`) and its pixel size, so
+// another relay's agent can name the file in a later send. The path is worked
+// out on every read, never stored: checkouts and state folders move.
+
+// PNG and WebP headers sit in the first bytes; a JPEG's frame header comes
+// after its EXIF/ICC blocks, so only a JPEG that needs more reads further.
+const FIRST_READ_BYTES = 4096;
+
+// The conversation page is polled: a file read once is not read again while
+// its size and time stay the same.
+const HEADER_CACHE_MAX = 500;
+const headerCache = new Map();
+
+function readFirstBytes(filePath, length) {
+  let fd = null;
+  try {
+    fd = fs.openSync(filePath, 'r');
+    const buffer = Buffer.alloc(length);
+    const read = fs.readSync(fd, buffer, 0, length, 0);
+    return buffer.subarray(0, read);
+  } catch {
+    return null;
+  } finally {
+    if (fd !== null) {
+      try { fs.closeSync(fd); } catch {}
+    }
+  }
+}
+
+function imageHeaderOf(filePath, stat) {
+  const cached = headerCache.get(filePath);
+  if (cached && cached.size === stat.size && cached.mtimeMs === stat.mtimeMs) return cached.header;
+  const first = readFirstBytes(filePath, Math.min(FIRST_READ_BYTES, stat.size));
+  let header = first ? readImageHeader(first) : null;
+  if (!header && first && first[0] === 0xff && first[1] === 0xd8 && stat.size > first.length) {
+    const more = readFirstBytes(filePath, Math.min(IMAGE_HEADER_BYTES, stat.size));
+    header = more ? readImageHeader(more) : null;
+  }
+  if (headerCache.size >= HEADER_CACHE_MAX) headerCache.delete(headerCache.keys().next().value);
+  headerCache.set(filePath, { size: stat.size, mtimeMs: stat.mtimeMs, header });
+  return header;
+}
+
+function positiveInt(value) {
+  return Number.isInteger(value) && value > 0 ? value : null;
+}
+
+function withFile(attachment, root) {
+  const { path: _stored, ...generatedImage } = attachment.generatedImage;
+  const bare = { ...attachment, generatedImage };
+  const filePath = resolveGeneratedImagePath({
+    root,
+    sessionId: generatedImage.sessionId,
+    relativePath: generatedImage.relativePath,
+  });
+  if (!filePath) return bare;
+  let stat = null;
+  try {
+    stat = fs.statSync(filePath, { throwIfNoEntry: false }) || null;
+  } catch {}
+  if (!stat?.isFile()) return bare;
+  const width = positiveInt(attachment.width);
+  const height = positiveInt(attachment.height);
+  // New attachments carry their size; older ones are read.
+  const header = width && height ? null : imageHeaderOf(filePath, stat);
+  return {
+    ...bare,
+    ...(header ? { width: header.width, height: header.height } : {}),
+    ...(!attachment.type && header?.mime ? { type: header.mime } : {}),
+    generatedImage: { ...generatedImage, path: filePath },
+  };
+}
+
+/**
+ * `messages` with each generated-image attachment given its file path and
+ * pixel size, when the file is there. Messages without one come back as they
+ * are; a missing or unreadable file leaves the attachment without a path.
+ * Never throws.
+ */
+export function withGeneratedImageFiles(messages, { resolveSessionStateRoot } = {}) {
+  if (!Array.isArray(messages) || typeof resolveSessionStateRoot !== 'function') return messages;
+  let root = '';
+  try {
+    root = String(resolveSessionStateRoot() || '').trim();
+  } catch {}
+  if (!root) return messages;
+  return messages.map((message) => {
+    const attachments = Array.isArray(message?.attachments) ? message.attachments : null;
+    if (!attachments || !attachments.some((entry) => entry?.generatedImage && typeof entry.generatedImage === 'object')) return message;
+    return {
+      ...message,
+      attachments: attachments.map((entry) => {
+        if (!entry?.generatedImage || typeof entry.generatedImage !== 'object') return entry;
+        try {
+          return withFile(entry, root);
+        } catch {
+          return entry;
+        }
+      }),
+    };
+  });
+}

package/server/services/image-input-paths.mjs

@@ -0,0 +1,389 @@
+'use strict';
+
+// The images a send names by path (`imagePaths` of POST /api/message: a
+// relay_tool send or create_session with `images`), read on this relay.
+//
+// A path is allowed when its real path lies in the session's folder, or is
+// exactly a generated image of a session on this relay:
+// <session-state root>/<session>/generated-images/<conversation>/<message>/img-NN.<ext>,
+// of a conversation that is not deleted. The relay's own data (data dir,
+// upload dirs, database and config files) and the rest of the session-state
+// root are never read, even inside the session's folder. Every check runs
+// before anything is stored: one refused path refuses the whole send.
+//
+// A hard link is a file of its own to these rules: one in the session's
+// folder to a file elsewhere (the database, say) passes the path checks, as
+// the path is all the relay sees. What stops it is the content: only PNG,
+// JPEG and WebP bytes are ever attached, and only to the model.
+
+import crypto from 'crypto';
+import fsDefault from 'fs';
+import path from 'path';
+
+import { IMAGE_HEADER_BYTES, readImageHeader } from '../../shared/image-header.mjs';
+import { OPENAI_IMAGE_LIMITS } from '../../shared/openai-image-options.mjs';
+
+export { IMAGE_INPUT_REFUSED_CODE } from '../../shared/openai-image-options.mjs';
+
+// The largest attached image OpenAI is sent: a side, and the pixels in all.
+export const IMAGE_INPUT_EDGE_MAX = 16384;
+export const IMAGE_INPUT_PIXELS_MAX = 64 * 1000 * 1000;
+const PATH_CHARS_MAX = 4096;
+// Paths one send may name before the duplicates go.
+export const IMAGE_INPUT_PATHS_MAX = 16;
+const READ_CHUNK_BYTES = 1024 * 1024;
+// PNG chunks read for an acTL before the first IDAT.
+const PNG_CHUNKS_SCANNED_MAX = 1024;
+
+const WIN32_RESERVED_NAME = /^(?:con|prn|aux|nul|com[1-9]|lpt[1-9]|conin\$|conout\$)$/i;
+const STORAGE_SEGMENT = /^[A-Za-z0-9_-]{1,96}$/;
+const GENERATED_IMAGE_FILE = /^img-\d{2}\.(?:png|jpe?g|webp)$/i;
+
+function shown(raw) {
+  const text = String(raw ?? '');
+  return text.length > 200 ? `${text.slice(0, 200)}…` : text;
+}
+
+function refused(error) {
+  return { ok: false, error };
+}
+
+function isCaseInsensitive(platform) {
+  return platform === 'win32' || platform === 'darwin';
+}
+
+/**
+ * Whether `raw` has the shape of an absolute local file path on `platform`,
+ * before anything touches the disk: `{ ok:true }` or `{ ok:false, error }`.
+ * Network and device paths (\\host, //host, \\?\, \\.\) are refused, since
+ * merely opening one can hand out the relay's credentials; on win32 also
+ * alternate data streams, segments that end in a dot or a space, and
+ * reserved device names (CON, NUL.png, COM1, …).
+ */
+export function checkImageInputPathShape(raw, { platform = process.platform } = {}) {
+  if (typeof raw !== 'string' || !raw || raw.length > PATH_CHARS_MAX || raw.includes('\0')) {
+    return refused('an image path is empty, too long or not a path');
+  }
+  const win32 = platform === 'win32';
+  if (/^[\\/]{2}/.test(raw)) return refused(`"${shown(raw)}" is a network or device path`);
+  if (win32) {
+    if (!/^[A-Za-z]:[\\/]/.test(raw)) return refused(`"${shown(raw)}" is not an absolute path on this relay (C:\\… on Windows)`);
+    if (raw.indexOf(':', 2) !== -1) return refused(`"${shown(raw)}" names an alternate data stream`);
+  } else if (!path.posix.isAbsolute(raw)) {
+    return refused(`"${shown(raw)}" is not an absolute path on this relay`);
+  }
+  const segments = raw.split(win32 ? /[\\/]/ : '/').slice(win32 ? 1 : 0).filter(Boolean);
+  if (segments.some((segment) => segment === '.' || segment === '..')) {
+    return refused(`"${shown(raw)}" has . or .. segments; give the full path`);
+  }
+  if (win32) {
+    if (segments.some((segment) => /[. ]$/.test(segment))) {
+      return refused(`"${shown(raw)}" has a name that ends in a dot or a space`);
+    }
+    if (segments.some((segment) => WIN32_RESERVED_NAME.test(segment.split('.')[0].trimEnd()))) {
+      return refused(`"${shown(raw)}" names a reserved device`);
+    }
+  }
+  return { ok: true };
+}
+
+function realPathOf(fs, value) {
+  const text = String(value || '').trim();
+  if (!text) return null;
+  try {
+    return fs.realpathSync.native(text);
+  } catch {
+    return null;
+  }
+}
+
+function makePathKey(platform) {
+  return (value) => (isCaseInsensitive(platform) ? String(value).toLowerCase() : String(value));
+}
+
+/** The parts of `real` below `root` (both real paths), or null when it is not inside. */
+function partsBelow(real, root, key, sep) {
+  const a = key(real);
+  const b = key(root);
+  if (a === b) return [];
+  const prefix = b.endsWith(sep) ? b : `${b}${sep}`;
+  if (!a.startsWith(prefix)) return null;
+  return real.slice(prefix.length).split(sep);
+}
+
+/**
+ * The roots one send's paths are checked against, resolved once: the
+ * session's folder, the session-state root, and the relay's own folders and
+ * files. A root that does not resolve allows nothing (no fail-open).
+ */
+export function resolveImageInputRoots({
+  cwd = '',
+  sessionStateRoot = '',
+  deniedDirs = [],
+  deniedFiles = [],
+  fs = fsDefault,
+} = {}) {
+  return {
+    cwd: realPathOf(fs, cwd),
+    cwdShown: String(cwd || '').trim(),
+    sessionStateRoot: realPathOf(fs, sessionStateRoot),
+    deniedDirs: (Array.isArray(deniedDirs) ? deniedDirs : []).map((dir) => realPathOf(fs, dir)).filter(Boolean),
+    deniedFiles: (Array.isArray(deniedFiles) ? deniedFiles : [])
+      .map((file) => realPathOf(fs, file) || (String(file || '').trim() ? path.resolve(String(file)) : null))
+      .filter(Boolean),
+  };
+}
+
+/**
+ * Where an image path may be read from: `{ ok:true, realPath, source }`
+ * (`source` 'cwd' or 'generated') or `{ ok:false, error }`. The path and the
+ * roots are real paths; `isLiveConversation(id)` says whether a conversation
+ * exists and is not deleted.
+ */
+export function resolveImageInputPath(raw, roots, {
+  isLiveConversation = () => false,
+  platform = process.platform,
+  fs = fsDefault,
+} = {}) {
+  const shape = checkImageInputPathShape(raw, { platform });
+  if (!shape.ok) return shape;
+  const key = makePathKey(platform);
+  const sep = platform === 'win32' ? '\\' : path.sep;
+  const outside = () => refused(`"${shown(raw)}" is outside this session's folder${roots?.cwdShown ? ` (${shown(roots.cwdShown)})` : ''} and is no image this relay generated`);
+  const realPath = realPathOf(fs, raw);
+  // Outside the roots a missing file reads like any other path there, so
+  // the answer tells nothing of what exists on this relay.
+  if (!realPath) return namedInsideRoots(raw, roots, { platform, key, sep }) ? refused(`"${shown(raw)}" was not found on this relay`) : outside();
+  // The file the checks below are about: the read compares its descriptor
+  // with it, so a folder swapped for a link in between is caught.
+  let identity = null;
+  try {
+    const stat = fs.statSync(realPath, { bigint: true });
+    identity = { dev: stat.dev, ino: stat.ino };
+  } catch {
+    return refused(`"${shown(raw)}" was not found on this relay`);
+  }
+
+  if (roots?.sessionStateRoot) {
+    const parts = partsBelow(realPath, roots.sessionStateRoot, key, sep);
+    if (parts) {
+      const [session, folder, conversationId, messageId, file, ...rest] = parts;
+      const shaped = parts.length === 5 && !rest.length
+        && STORAGE_SEGMENT.test(session)
+        && key(folder) === 'generated-images'
+        && STORAGE_SEGMENT.test(conversationId)
+        && STORAGE_SEGMENT.test(messageId)
+        && GENERATED_IMAGE_FILE.test(file);
+      if (!shaped) {
+        return refused(`"${shown(raw)}" is in this relay's session-state folder, where only the generated images (…/generated-images/<conversation>/<message>/img-NN.png) can be attached`);
+      }
+      if (!isLiveConversation(conversationId)) {
+        return refused(`"${shown(raw)}" is a generated image of a session that is gone from this relay`);
+      }
+      return { ok: true, realPath, source: 'generated', identity };
+    }
+  }
+  const own = (roots?.deniedDirs || []).some((dir) => partsBelow(realPath, dir, key, sep))
+    || (roots?.deniedFiles || []).some((file) => key(file) === key(realPath));
+  if (own) return refused(`"${shown(raw)}" is in this relay's own data (data, uploads, database or config), which is never attached`);
+  if (roots?.cwd && partsBelow(realPath, roots.cwd, key, sep)) return { ok: true, realPath, source: 'cwd', identity };
+  return outside();
+}
+
+/** Whether `raw`, as written, names a place under the session's folder or the session-state root. */
+function namedInsideRoots(raw, roots, { platform, key, sep }) {
+  const flavour = platform === 'win32' ? path.win32 : path.posix;
+  const named = flavour.normalize(raw);
+  return [roots?.cwd, roots?.cwdShown, roots?.sessionStateRoot]
+    .filter(Boolean)
+    .some((root) => partsBelow(named, flavour.normalize(root), key, sep) !== null);
+}
+
+function u32be(bytes, at) {
+  return ((bytes[at] << 24) >>> 0) + (bytes[at + 1] << 16) + (bytes[at + 2] << 8) + bytes[at + 3];
+}
+
+/** Whether a PNG has an acTL chunk before its first IDAT (an animated PNG). */
+function isAnimatedPng(bytes) {
+  let at = 8;
+  for (let count = 0; count < PNG_CHUNKS_SCANNED_MAX && at + 8 <= bytes.length; count += 1) {
+    const type = String.fromCharCode(bytes[at + 4], bytes[at + 5], bytes[at + 6], bytes[at + 7]);
+    if (type === 'acTL') return true;
+    if (type === 'IDAT' || type === 'IEND') return false;
+    at += 12 + u32be(bytes, at);
+  }
+  return false;
+}
+
+/** Whether a WebP is an extended one with its animation flag set. */
+function isAnimatedWebp(bytes) {
+  return bytes.length > 20
+    && String.fromCharCode(bytes[12], bytes[13], bytes[14], bytes[15]) === 'VP8X'
+    && (bytes[20] & 0x02) !== 0;
+}
+
+/**
+ * What an attached image is, from its first bytes: `{ ok:true, mime, width,
+ * height }` for a still PNG, JPEG or WebP within the size caps, else
+ * `{ ok:false, error }` naming `label`. The type comes from the bytes, never
+ * from the name.
+ */
+export function sniffImageInput(bytes, label = 'the image') {
+  const head = bytes.subarray(0, IMAGE_HEADER_BYTES);
+  const header = readImageHeader(head);
+  if (!header) return refused(`"${shown(label)}" is not a PNG, JPEG or WebP image`);
+  if ((header.mime === 'image/png' && isAnimatedPng(head)) || (header.mime === 'image/webp' && isAnimatedWebp(head))) {
+    return refused(`"${shown(label)}" is an animated image; only still images can be attached`);
+  }
+  if (header.width > IMAGE_INPUT_EDGE_MAX || header.height > IMAGE_INPUT_EDGE_MAX || header.width * header.height > IMAGE_INPUT_PIXELS_MAX) {
+    return refused(`"${shown(label)}" is ${header.width}x${header.height} pixels; an attached image has at most ${IMAGE_INPUT_EDGE_MAX} pixels a side and 64 megapixels`);
+  }
+  return { ok: true, ...header };
+}
+
+/**
+ * The bytes of one resolved image: opened once (on POSIX without following
+ * a link and without blocking on a FIFO), checked as a regular file of
+ * 1 byte to `maxBytes` that is still the file the path resolved to, and
+ * read from that descriptor in a bounded loop. `{ ok:true, bytes }` or
+ * `{ ok:false, error }`.
+ *
+ * O_NOFOLLOW guards the last part of the path only. So the descriptor's file
+ * is compared with `identity` (dev and inode the checks were made on, from
+ * resolveImageInputPath), and the path is resolved again after the open and
+ * must still be `realPath`: a parent folder swapped for a link in between
+ * fails one of the two.
+ *
+ * Platform note: Windows has no O_NOFOLLOW; there the file id comparison and
+ * the second resolve are the guard.
+ */
+export function readImageInputFile(realPath, {
+  label = realPath,
+  maxBytes = OPENAI_IMAGE_LIMITS.inputImageBytesMax,
+  identity = null,
+  platform = process.platform,
+  fs = fsDefault,
+} = {}) {
+  const { O_RDONLY, O_NOFOLLOW = 0, O_NONBLOCK = 0 } = fs.constants;
+  const flags = platform === 'win32' ? O_RDONLY : (O_RDONLY | O_NOFOLLOW | O_NONBLOCK);
+  const megabytes = Math.round(maxBytes / (1024 * 1024));
+  let fd = null;
+  try {
+    try {
+      fd = fs.openSync(realPath, flags);
+    } catch {
+      return refused(`"${shown(label)}" could not be opened`);
+    }
+    const opened = fs.fstatSync(fd, { bigint: true });
+    if (!opened.isFile()) return refused(`"${shown(label)}" is not a regular file`);
+    if (opened.size <= 0n) return refused(`"${shown(label)}" is empty`);
+    if (opened.size > BigInt(maxBytes)) return refused(`"${shown(label)}" is larger than ${megabytes} MB`);
+    let expected = identity;
+    if (!expected) {
+      try {
+        const stat = fs.statSync(realPath, { bigint: true });
+        expected = { dev: stat.dev, ino: stat.ino };
+      } catch {}
+    }
+    const key = makePathKey(platform);
+    const again = realPathOf(fs, realPath);
+    // The path once more, after the open: a folder swapped for a link before
+    // the checks and back after the open passes the two tests above (the
+    // checks saw the swapped file too), but not this one.
+    let after = null;
+    try {
+      after = fs.statSync(realPath, { bigint: true });
+    } catch {}
+    if (!expected || expected.dev !== opened.dev || expected.ino !== opened.ino || !again || key(again) !== key(realPath)
+      || !after || after.dev !== opened.dev || after.ino !== opened.ino || !descriptorPathMatches(fs, fd, realPath, key, platform)) {
+      return refused(`"${shown(label)}" changed while it was read`);
+    }
+    const chunks = [];
+    let total = 0;
+    while (total <= maxBytes) {
+      const chunk = Buffer.allocUnsafe(Math.min(READ_CHUNK_BYTES, maxBytes + 1 - total));
+      const read = fs.readSync(fd, chunk, 0, chunk.length, null);
+      if (read <= 0) break;
+      chunks.push(read === chunk.length ? chunk : chunk.subarray(0, read));
+      total += read;
+    }
+    if (total > maxBytes) return refused(`"${shown(label)}" is larger than ${megabytes} MB`);
+    if (total === 0) return refused(`"${shown(label)}" is empty`);
+    return { ok: true, bytes: Buffer.concat(chunks, total) };
+  } catch {
+    return refused(`"${shown(label)}" could not be read`);
+  } finally {
+    if (fd !== null) {
+      try { fs.closeSync(fd); } catch {}
+    }
+  }
+}
+
+/**
+ * Where the descriptor itself points, on Linux: /proc/self/fd/<fd> names the
+ * file it opened, whatever the path did since. Elsewhere, and on a Linux
+ * without a readable /proc (a container that hides it, say), this check
+ * passes (fails open) and the file-id checks stand alone.
+ */
+function descriptorPathMatches(fs, fd, realPath, key, platform) {
+  if (platform !== 'linux') return true;
+  let target = null;
+  try {
+    target = fs.readlinkSync(`/proc/self/fd/${fd}`);
+  } catch {
+    return true;
+  }
+  return key(target) === key(realPath);
+}
+
+/**
+ * Every image of one send, all or nothing: `{ ok:true, images, dropped }`
+ * with `images` in the order named (the first is the base of an edit), each
+ * `{ realPath, source, name, bytes, sha256, mime, width, height }`, the same
+ * file named twice (also through a link) and the same bytes under two names
+ * kept once (`dropped` counts those); or `{ ok:false, error }` for the first
+ * path refused. Nothing is stored here.
+ */
+export function resolveImageInputs(rawPaths, {
+  roots,
+  isLiveConversation,
+  maxBytes = OPENAI_IMAGE_LIMITS.inputImageBytesMax,
+  platform = process.platform,
+  fs = fsDefault,
+} = {}) {
+  const list = Array.isArray(rawPaths) ? rawPaths : [];
+  if (list.length > IMAGE_INPUT_PATHS_MAX) return refused(`at most ${IMAGE_INPUT_PATHS_MAX} image paths per send`);
+  const key = makePathKey(platform);
+  const resolved = [];
+  const seenPaths = new Set();
+  for (const raw of list) {
+    const place = resolveImageInputPath(raw, roots, { isLiveConversation, platform, fs });
+    if (!place.ok) return place;
+    const pathKey = key(place.realPath);
+    if (seenPaths.has(pathKey)) continue;
+    seenPaths.add(pathKey);
+    resolved.push({ raw, ...place });
+  }
+  const images = [];
+  const seenHashes = new Set();
+  for (const entry of resolved) {
+    const file = readImageInputFile(entry.realPath, { label: entry.raw, maxBytes, identity: entry.identity, platform, fs });
+    if (!file.ok) return file;
+    const kind = sniffImageInput(file.bytes, entry.raw);
+    if (!kind.ok) return kind;
+    const sha256 = crypto.createHash('sha256').update(file.bytes).digest('hex');
+    if (seenHashes.has(sha256)) continue;
+    seenHashes.add(sha256);
+    images.push({
+      realPath: entry.realPath,
+      source: entry.source,
+      name: path.basename(entry.realPath),
+      bytes: file.bytes,
+      sha256,
+      mime: kind.mime,
+      width: kind.width,
+      height: kind.height,
+    });
+  }
+  return { ok: true, images, dropped: list.length - images.length };
+}

package/server/services/image-operation-service.mjs

@@ -1,6 +1,7 @@
 'use strict';
 
 import crypto from 'crypto';
+import { stripRemotePromptHeader } from '../../shared/remote-relay-contract.mjs';
 import { createImageContextService } from './image-context-service.mjs';
 
 function canonicalJson(value) {
@@ -37,6 +38,9 @@ export function createImageOperationService({
     createdAt = new Date().toISOString(),
   } = {}) {
     const operationId = `img_op_${uuidv4()}`;
+    // The prompt OpenAI gets: an agent's prompt from another relay without
+    // the "[Remote prompt from …]" header the relay put above it.
+    const imagePrompt = stripRemotePromptHeader(String(prompt || '')).trim();
     let imageSessionId;
     let parentNodeId = null;
     let reconstructionMode = executionMode === 'native_responses' ? 'native' : 'image_only';
@@ -78,7 +82,7 @@ export function createImageOperationService({
       queueMessageId,
       kind,
       parentNodeId,
-      prompt: String(prompt || ''),
+      prompt: imagePrompt,
       selectedImageModel,
       orchestrationModel,
       provider: 'openai',
@@ -94,7 +98,7 @@ export function createImageOperationService({
       queueMessageId,
       kind,
       parentNodeId,
-      prompt: String(prompt || ''),
+      prompt: imagePrompt,
       selectedImageModel,
       orchestrationModel,
       provider: 'openai',