wind-agent-cli 1.37.2 → 1.37.3

package/server/modules/assets/assets.routes.ts

@@ -1,150 +1,150 @@
-import express from 'express';
-import multer from 'multer';
-
-import {
-  buildStoredAttachmentRecords,
-  buildStoredImageRecords,
-  ensureImageAssetsDir,
-  isAllowedImageMimeType,
-  openStoredAttachmentAsset,
-} from '@/modules/assets/services/image-assets.service.js';
-
-const router = express.Router();
-
-// Multer writes uploads straight into the global assets folder; the service
-// owns the folder location and the response record shape.
-const storage = multer.diskStorage({
-  destination: (req, file, cb) => {
-    ensureImageAssetsDir()
-      .then((assetsDir) => cb(null, assetsDir))
-      .catch((error) => cb(error as Error, ''));
-  },
-  filename: (req, file, cb) => {
-    const uniqueSuffix = `${Date.now()}-${Math.round(Math.random() * 1e9)}`;
-    const sanitizedName = file.originalname.replace(/[^a-zA-Z0-9.-]/g, '_');
-    cb(null, `${uniqueSuffix}-${sanitizedName}`);
-  },
-});
-
-const upload = multer({
-  storage,
-  fileFilter: (req, file, cb) => {
-    if (isAllowedImageMimeType(file.mimetype)) {
-      cb(null, true);
-    } else {
-      cb(new Error('Invalid file type. Only JPEG, PNG, GIF, WebP, and SVG are allowed.'));
-    }
-  },
-  limits: {
-    fileSize: 5 * 1024 * 1024, // 5MB
-    files: 5,
-  },
-});
-
-const attachmentUpload = multer({
-  storage,
-  limits: {
-    fileSize: 10 * 1024 * 1024,
-    files: 10,
-  },
-});
-
-/**
- * Stores chat image attachments in the global `~/.cloudcli/assets` folder and
- * returns their absolute paths for use in provider prompts and chat history.
- */
-router.post('/images', (req, res) => {
-  upload.array('images', 5)(req, res, (err: unknown) => {
-    if (err) {
-      const message = err instanceof Error ? err.message : 'Upload failed';
-      return res.status(400).json({ error: message });
-    }
-
-    const files = Array.isArray(req.files) ? req.files : [];
-    if (files.length === 0) {
-      return res.status(400).json({ error: 'No image files provided' });
-    }
-
-    res.json({ images: buildStoredImageRecords(files) });
-  });
-});
-
-/**
- * Stores provider-neutral chat attachments. Files of any MIME type are
- * accepted because providers inspect them as data through their file-reading
- * tools; uploads are capped at 10 files and 10MB per file.
- */
-router.post('/files', (req, res) => {
-  attachmentUpload.array('files', 10)(req, res, (err: unknown) => {
-    if (err) {
-      const message = err instanceof Error ? err.message : 'Upload failed';
-      return res.status(400).json({ error: message });
-    }
-
-    const files = Array.isArray(req.files) ? req.files : [];
-    if (files.length === 0) {
-      return res.status(400).json({ error: 'No files provided' });
-    }
-
-    res.json({ attachments: buildStoredAttachmentRecords(files) });
-  });
-});
-
-/**
- * Serves one stored image asset by filename. Only files directly inside the
- * global assets folder are reachable; traversal attempts resolve to null.
- */
-router.get('/images/:filename', async (req, res) => {
-  const asset = await openStoredAttachmentAsset(req.params.filename);
-  if (asset.status === 'invalid') {
-    return res.status(400).json({ error: 'Invalid asset filename' });
-  }
-  if (asset.status === 'missing') {
-    return res.status(404).json({ error: 'Asset not found' });
-  }
-
-  res.setHeader('Content-Type', asset.contentType);
-  // Stored-XSS hardening: never let the browser sniff a different type, and
-  // force SVGs (which can carry scripts when rendered as a document) to
-  // download instead of rendering inline. The chat UI is unaffected — it
-  // fetches assets as blobs and shows them through <img>, where SVG scripts
-  // never execute.
-  res.setHeader('X-Content-Type-Options', 'nosniff');
-  if (asset.contentType === 'image/svg+xml') {
-    res.setHeader('Content-Disposition', 'attachment');
-  }
-  asset.stream.pipe(res);
-  asset.stream.on('error', (error) => {
-    console.error('Error streaming image asset:', error);
-    if (!res.headersSent) {
-      res.status(500).json({ error: 'Error reading asset' });
-    }
-  });
-});
-
-/**
- * Downloads one stored non-image attachment. Content-Disposition prevents
- * uploaded HTML or other active formats from rendering in the application.
- */
-router.get('/files/:filename', async (req, res) => {
-  const asset = await openStoredAttachmentAsset(req.params.filename);
-  if (asset.status === 'invalid') {
-    return res.status(400).json({ error: 'Invalid asset filename' });
-  }
-  if (asset.status === 'missing') {
-    return res.status(404).json({ error: 'Asset not found' });
-  }
-
-  res.setHeader('Content-Type', asset.contentType);
-  res.setHeader('X-Content-Type-Options', 'nosniff');
-  res.setHeader('Content-Disposition', `attachment; filename="${req.params.filename.replace(/["\r\n]/g, '_')}"`);
-  asset.stream.pipe(res);
-  asset.stream.on('error', (error) => {
-    console.error('Error streaming attachment asset:', error);
-    if (!res.headersSent) {
-      res.status(500).json({ error: 'Error reading asset' });
-    }
-  });
-});
-
-export default router;
+import express from 'express';
+import multer from 'multer';
+
+import {
+  buildStoredAttachmentRecords,
+  buildStoredImageRecords,
+  ensureImageAssetsDir,
+  isAllowedImageMimeType,
+  openStoredAttachmentAsset,
+} from '@/modules/assets/services/image-assets.service.js';
+
+const router = express.Router();
+
+// Multer writes uploads straight into the global assets folder; the service
+// owns the folder location and the response record shape.
+const storage = multer.diskStorage({
+  destination: (req, file, cb) => {
+    ensureImageAssetsDir()
+      .then((assetsDir) => cb(null, assetsDir))
+      .catch((error) => cb(error as Error, ''));
+  },
+  filename: (req, file, cb) => {
+    const uniqueSuffix = `${Date.now()}-${Math.round(Math.random() * 1e9)}`;
+    const sanitizedName = file.originalname.replace(/[^a-zA-Z0-9.-]/g, '_');
+    cb(null, `${uniqueSuffix}-${sanitizedName}`);
+  },
+});
+
+const upload = multer({
+  storage,
+  fileFilter: (req, file, cb) => {
+    if (isAllowedImageMimeType(file.mimetype)) {
+      cb(null, true);
+    } else {
+      cb(new Error('Invalid file type. Only JPEG, PNG, GIF, WebP, and SVG are allowed.'));
+    }
+  },
+  limits: {
+    fileSize: 5 * 1024 * 1024, // 5MB
+    files: 5,
+  },
+});
+
+const attachmentUpload = multer({
+  storage,
+  limits: {
+    fileSize: 10 * 1024 * 1024,
+    files: 10,
+  },
+});
+
+/**
+ * Stores chat image attachments in the global `~/.cloudcli/assets` folder and
+ * returns their absolute paths for use in provider prompts and chat history.
+ */
+router.post('/images', (req, res) => {
+  upload.array('images', 5)(req, res, (err: unknown) => {
+    if (err) {
+      const message = err instanceof Error ? err.message : 'Upload failed';
+      return res.status(400).json({ error: message });
+    }
+
+    const files = Array.isArray(req.files) ? req.files : [];
+    if (files.length === 0) {
+      return res.status(400).json({ error: 'No image files provided' });
+    }
+
+    res.json({ images: buildStoredImageRecords(files) });
+  });
+});
+
+/**
+ * Stores provider-neutral chat attachments. Files of any MIME type are
+ * accepted because providers inspect them as data through their file-reading
+ * tools; uploads are capped at 10 files and 10MB per file.
+ */
+router.post('/files', (req, res) => {
+  attachmentUpload.array('files', 10)(req, res, (err: unknown) => {
+    if (err) {
+      const message = err instanceof Error ? err.message : 'Upload failed';
+      return res.status(400).json({ error: message });
+    }
+
+    const files = Array.isArray(req.files) ? req.files : [];
+    if (files.length === 0) {
+      return res.status(400).json({ error: 'No files provided' });
+    }
+
+    res.json({ attachments: buildStoredAttachmentRecords(files) });
+  });
+});
+
+/**
+ * Serves one stored image asset by filename. Only files directly inside the
+ * global assets folder are reachable; traversal attempts resolve to null.
+ */
+router.get('/images/:filename', async (req, res) => {
+  const asset = await openStoredAttachmentAsset(req.params.filename);
+  if (asset.status === 'invalid') {
+    return res.status(400).json({ error: 'Invalid asset filename' });
+  }
+  if (asset.status === 'missing') {
+    return res.status(404).json({ error: 'Asset not found' });
+  }
+
+  res.setHeader('Content-Type', asset.contentType);
+  // Stored-XSS hardening: never let the browser sniff a different type, and
+  // force SVGs (which can carry scripts when rendered as a document) to
+  // download instead of rendering inline. The chat UI is unaffected — it
+  // fetches assets as blobs and shows them through <img>, where SVG scripts
+  // never execute.
+  res.setHeader('X-Content-Type-Options', 'nosniff');
+  if (asset.contentType === 'image/svg+xml') {
+    res.setHeader('Content-Disposition', 'attachment');
+  }
+  asset.stream.pipe(res);
+  asset.stream.on('error', (error) => {
+    console.error('Error streaming image asset:', error);
+    if (!res.headersSent) {
+      res.status(500).json({ error: 'Error reading asset' });
+    }
+  });
+});
+
+/**
+ * Downloads one stored non-image attachment. Content-Disposition prevents
+ * uploaded HTML or other active formats from rendering in the application.
+ */
+router.get('/files/:filename', async (req, res) => {
+  const asset = await openStoredAttachmentAsset(req.params.filename);
+  if (asset.status === 'invalid') {
+    return res.status(400).json({ error: 'Invalid asset filename' });
+  }
+  if (asset.status === 'missing') {
+    return res.status(404).json({ error: 'Asset not found' });
+  }
+
+  res.setHeader('Content-Type', asset.contentType);
+  res.setHeader('X-Content-Type-Options', 'nosniff');
+  res.setHeader('Content-Disposition', `attachment; filename="${req.params.filename.replace(/["\r\n]/g, '_')}"`);
+  asset.stream.pipe(res);
+  asset.stream.on('error', (error) => {
+    console.error('Error streaming attachment asset:', error);
+    if (!res.headersSent) {
+      res.status(500).json({ error: 'Error reading asset' });
+    }
+  });
+});
+
+export default router;

package/server/modules/assets/index.ts

@@ -1,3 +1,3 @@
-// Express router mounted at /api/assets by server/index.ts for uploading and
-// serving chat attachments stored in the global ~/.cloudcli/assets folder.
-export { default as assetsRoutes } from './assets.routes.js';
+// Express router mounted at /api/assets by server/index.ts for uploading and
+// serving chat attachments stored in the global ~/.cloudcli/assets folder.
+export { default as assetsRoutes } from './assets.routes.js';

package/server/modules/assets/services/image-assets.service.ts

@@ -1,127 +1,127 @@
-import fsSync, { promises as fs } from 'node:fs';
-import path from 'node:path';
-
-import mime from 'mime-types';
-
-import { getGlobalImageAssetsDir, toPosixPath } from '@/shared/image-attachments.js';
-
-/**
- * Image mime types accepted for chat attachment uploads. SVG is allowed for
- * storage/preview even though some providers (Claude API) skip it at send time.
- */
-const ALLOWED_IMAGE_MIME_TYPES = new Set([
-  'image/jpeg',
-  'image/png',
-  'image/gif',
-  'image/webp',
-  'image/svg+xml',
-]);
-
-// Used only by this service and the assets routes via the barrel file.
-type StoredImageAsset = {
-  /** Original upload filename, for display. */
-  name: string;
-  /** Absolute posix-normalized path inside the global assets folder. */
-  path: string;
-  size: number;
-  mimeType: string;
-};
-
-// Shape of one multer-stored file; kept local because only this module reads it.
-type UploadedImageFile = {
-  originalname: string;
-  filename: string;
-  size: number;
-  mimetype: string;
-};
-
-type UploadedAttachmentFile = UploadedImageFile;
-
-/** Returns whether one uploaded mime type may be stored as a chat image asset. */
-export function isAllowedImageMimeType(mimeType: string): boolean {
-  return ALLOWED_IMAGE_MIME_TYPES.has(mimeType);
-}
-
-/** Creates the global `~/.cloudcli/assets` folder if needed and returns it. */
-export async function ensureImageAssetsDir(): Promise<string> {
-  const assetsDir = getGlobalImageAssetsDir();
-  await fs.mkdir(assetsDir, { recursive: true });
-  return assetsDir;
-}
-
-/**
- * Maps multer-stored upload files to the attachment records returned to the
- * chat composer. The absolute path is what providers receive and what session
- * history carries back to the UI.
- */
-export function buildStoredImageRecords(files: UploadedImageFile[]): StoredImageAsset[] {
-  const assetsDir = getGlobalImageAssetsDir();
-  return files.map((file) => ({
-    name: file.originalname,
-    path: toPosixPath(path.join(assetsDir, file.filename)),
-    size: file.size,
-    mimeType: file.mimetype,
-  }));
-}
-
-/**
- * Maps multer-stored files to provider-neutral attachment records for the
- * assets route. The shared storage format intentionally matches image records
- * so one uploaded file can move through queueing and provider dispatch.
- */
-export function buildStoredAttachmentRecords(files: UploadedAttachmentFile[]): StoredImageAsset[] {
-  return buildStoredImageRecords(files);
-}
-
-/**
- * Resolves one asset filename to its absolute path inside the global assets
- * folder, or null when the name is empty, contains path separators/traversal,
- * or would escape the folder. This is the only lookup the serving route uses,
- * so nothing outside `~/.cloudcli/assets` can ever be read through it.
- */
-export function resolveImageAssetFile(filename: string): string | null {
-  const trimmed = typeof filename === 'string' ? filename.trim() : '';
-  if (!trimmed || trimmed.includes('/') || trimmed.includes('\\') || trimmed.includes('..')) {
-    return null;
-  }
-
-  const assetsDir = path.resolve(getGlobalImageAssetsDir());
-  const resolved = path.resolve(assetsDir, trimmed);
-  if (!resolved.startsWith(assetsDir + path.sep)) {
-    return null;
-  }
-
-  return resolved;
-}
-
-/**
- * Resolves a general chat attachment for the assets serving route. It shares
- * the image resolver's strict direct-child containment boundary.
- */
-export function resolveAttachmentAssetFile(filename: string): string | null {
-  return resolveImageAssetFile(filename);
-}
-
-/**
- * Opens one stored chat asset for the assets route without exposing arbitrary
- * filesystem reads. The route translates the lookup status and streams the
- * returned direct-child file to the authenticated client.
- */
-export async function openStoredAttachmentAsset(filename: string) {
-  const resolved = resolveAttachmentAssetFile(filename);
-  if (!resolved) {
-    return { status: 'invalid' as const };
-  }
-
-  try {
-    await fs.access(resolved);
-  } catch {
-    return { status: 'missing' as const };
-  }
-
-  return {
-    status: 'found' as const,
-    contentType: mime.lookup(resolved) || 'application/octet-stream',
-    stream: fsSync.createReadStream(resolved),
-  };
-}
+import fsSync, { promises as fs } from 'node:fs';
+import path from 'node:path';
+
+import mime from 'mime-types';
+
+import { getGlobalImageAssetsDir, toPosixPath } from '@/shared/image-attachments.js';
+
+/**
+ * Image mime types accepted for chat attachment uploads. SVG is allowed for
+ * storage/preview even though some providers (Claude API) skip it at send time.
+ */
+const ALLOWED_IMAGE_MIME_TYPES = new Set([
+  'image/jpeg',
+  'image/png',
+  'image/gif',
+  'image/webp',
+  'image/svg+xml',
+]);
+
+// Used only by this service and the assets routes via the barrel file.
+type StoredImageAsset = {
+  /** Original upload filename, for display. */
+  name: string;
+  /** Absolute posix-normalized path inside the global assets folder. */
+  path: string;
+  size: number;
+  mimeType: string;
+};
+
+// Shape of one multer-stored file; kept local because only this module reads it.
+type UploadedImageFile = {
+  originalname: string;
+  filename: string;
+  size: number;
+  mimetype: string;
+};
+
+type UploadedAttachmentFile = UploadedImageFile;
+
+/** Returns whether one uploaded mime type may be stored as a chat image asset. */
+export function isAllowedImageMimeType(mimeType: string): boolean {
+  return ALLOWED_IMAGE_MIME_TYPES.has(mimeType);
+}
+
+/** Creates the global `~/.cloudcli/assets` folder if needed and returns it. */
+export async function ensureImageAssetsDir(): Promise<string> {
+  const assetsDir = getGlobalImageAssetsDir();
+  await fs.mkdir(assetsDir, { recursive: true });
+  return assetsDir;
+}
+
+/**
+ * Maps multer-stored upload files to the attachment records returned to the
+ * chat composer. The absolute path is what providers receive and what session
+ * history carries back to the UI.
+ */
+export function buildStoredImageRecords(files: UploadedImageFile[]): StoredImageAsset[] {
+  const assetsDir = getGlobalImageAssetsDir();
+  return files.map((file) => ({
+    name: file.originalname,
+    path: toPosixPath(path.join(assetsDir, file.filename)),
+    size: file.size,
+    mimeType: file.mimetype,
+  }));
+}
+
+/**
+ * Maps multer-stored files to provider-neutral attachment records for the
+ * assets route. The shared storage format intentionally matches image records
+ * so one uploaded file can move through queueing and provider dispatch.
+ */
+export function buildStoredAttachmentRecords(files: UploadedAttachmentFile[]): StoredImageAsset[] {
+  return buildStoredImageRecords(files);
+}
+
+/**
+ * Resolves one asset filename to its absolute path inside the global assets
+ * folder, or null when the name is empty, contains path separators/traversal,
+ * or would escape the folder. This is the only lookup the serving route uses,
+ * so nothing outside `~/.cloudcli/assets` can ever be read through it.
+ */
+export function resolveImageAssetFile(filename: string): string | null {
+  const trimmed = typeof filename === 'string' ? filename.trim() : '';
+  if (!trimmed || trimmed.includes('/') || trimmed.includes('\\') || trimmed.includes('..')) {
+    return null;
+  }
+
+  const assetsDir = path.resolve(getGlobalImageAssetsDir());
+  const resolved = path.resolve(assetsDir, trimmed);
+  if (!resolved.startsWith(assetsDir + path.sep)) {
+    return null;
+  }
+
+  return resolved;
+}
+
+/**
+ * Resolves a general chat attachment for the assets serving route. It shares
+ * the image resolver's strict direct-child containment boundary.
+ */
+export function resolveAttachmentAssetFile(filename: string): string | null {
+  return resolveImageAssetFile(filename);
+}
+
+/**
+ * Opens one stored chat asset for the assets route without exposing arbitrary
+ * filesystem reads. The route translates the lookup status and streams the
+ * returned direct-child file to the authenticated client.
+ */
+export async function openStoredAttachmentAsset(filename: string) {
+  const resolved = resolveAttachmentAssetFile(filename);
+  if (!resolved) {
+    return { status: 'invalid' as const };
+  }
+
+  try {
+    await fs.access(resolved);
+  } catch {
+    return { status: 'missing' as const };
+  }
+
+  return {
+    status: 'found' as const,
+    contentType: mime.lookup(resolved) || 'application/octet-stream',
+    stream: fsSync.createReadStream(resolved),
+  };
+}