wind-agent-cli 1.37.2 → 1.37.3

package/server/modules/notifications/index.ts

@@ -1,24 +1,24 @@
-export {
-  // Used by notification tests and delivery workflows to create channel payloads.
-  buildNotificationPayload,
-  // Used by provider runtimes and Settings to create normalized notification events.
-  createNotificationEvent,
-  // Used by provider runtimes and Settings to deliver events through enabled channels.
-  notifyUserIfEnabled,
-  // Used by provider runtimes to report failed agent runs.
-  notifyRunFailed,
-  // Used by provider runtimes to report stopped or completed agent runs.
-  notifyRunStopped,
-  // Used by provider runtimes to report background work that finished after its turn ended.
-  notifyBackgroundWorkCompleted,
-} from '@/modules/notifications/services/notification-orchestrator.service.js';
-export {
-  registerDesktopNotificationClient,
-  sendDesktopNotification,
-  unregisterDesktopNotificationClient,
-} from '@/modules/notifications/services/desktop-notification-clients.service.js';
-export { handleDesktopNotificationsConnection } from '@/modules/notifications/websocket/desktop-notifications-websocket.service.js';
-// getPublicKey: used by Settings to expose the Web Push subscription key.
-export { getPublicKey } from './vapid-keys.service.js';
-// configureWebPush: used by the server entrypoint during notification startup.
-export { configureWebPush } from './vapid-keys.service.js';
+export {
+  // Used by notification tests and delivery workflows to create channel payloads.
+  buildNotificationPayload,
+  // Used by provider runtimes and Settings to create normalized notification events.
+  createNotificationEvent,
+  // Used by provider runtimes and Settings to deliver events through enabled channels.
+  notifyUserIfEnabled,
+  // Used by provider runtimes to report failed agent runs.
+  notifyRunFailed,
+  // Used by provider runtimes to report stopped or completed agent runs.
+  notifyRunStopped,
+  // Used by provider runtimes to report background work that finished after its turn ended.
+  notifyBackgroundWorkCompleted,
+} from '@/modules/notifications/services/notification-orchestrator.service.js';
+export {
+  registerDesktopNotificationClient,
+  sendDesktopNotification,
+  unregisterDesktopNotificationClient,
+} from '@/modules/notifications/services/desktop-notification-clients.service.js';
+export { handleDesktopNotificationsConnection } from '@/modules/notifications/websocket/desktop-notifications-websocket.service.js';
+// getPublicKey: used by Settings to expose the Web Push subscription key.
+export { getPublicKey } from './vapid-keys.service.js';
+// configureWebPush: used by the server entrypoint during notification startup.
+export { configureWebPush } from './vapid-keys.service.js';

package/server/modules/notifications/notifications.routes.ts

@@ -1,127 +1,127 @@
-import express from 'express';
-
-import { notificationChannelEndpointsDb, notificationPreferencesDb } from '@/modules/database/index.js';
-
-const router = express.Router();
-
-function readText(value: unknown): string {
-  return typeof value === 'string' ? value.trim() : '';
-}
-
-function sanitizeEndpoint(endpoint: any) {
-  return {
-    id: endpoint.id,
-    channel: endpoint.channel,
-    endpointId: endpoint.endpoint_id,
-    label: endpoint.label,
-    metadata: notificationChannelEndpointsDb.parseMetadata(endpoint.metadata_json),
-    enabled: Boolean(endpoint.enabled),
-    lastSeenAt: endpoint.last_seen_at,
-    createdAt: endpoint.created_at,
-    updatedAt: endpoint.updated_at,
-  };
-}
-
-function readUserId(req: express.Request): number {
-  const userId = Number((req as any).user?.id);
-  if (!Number.isInteger(userId) || userId <= 0) {
-    throw new Error('Authenticated user is missing');
-  }
-  return userId;
-}
-
-function updateChannelPreference(userId: number, channel: string): unknown {
-  const currentPrefs = notificationPreferencesDb.getPreferences(userId);
-  const hasEnabledEndpoint = notificationChannelEndpointsDb.getEnabledEndpoints(userId, channel).length > 0;
-  return notificationPreferencesDb.updatePreferences(userId, {
-    ...currentPrefs,
-    channels: { ...currentPrefs.channels, [channel]: hasEnabledEndpoint },
-  });
-}
-
-router.get('/endpoints', (req, res) => {
-  try {
-    const channel = readText(req.query.channel);
-    if (!channel) {
-      return res.status(400).json({ error: 'channel is required' });
-    }
-
-    const userId = readUserId(req);
-    const endpoints = notificationChannelEndpointsDb
-      .getEndpoints(userId, channel)
-      .map(sanitizeEndpoint);
-    return res.json({ success: true, endpoints });
-  } catch (error) {
-    console.error('Error fetching notification endpoints:', error);
-    return res.status(500).json({ error: 'Failed to fetch notification endpoints' });
-  }
-});
-
-router.post('/endpoints/current', (req, res) => {
-  try {
-    const { channel, endpointId, label, metadata = {}, enabled = true } = req.body || {};
-    const normalizedChannel = readText(channel);
-    const normalizedEndpointId = readText(endpointId);
-    if (!normalizedChannel || !normalizedEndpointId) {
-      return res.status(400).json({ error: 'channel and endpointId are required' });
-    }
-
-    const userId = readUserId(req);
-    const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
-      userId,
-      channel: normalizedChannel,
-      endpointId: normalizedEndpointId,
-      label,
-      metadata: metadata && typeof metadata === 'object' ? metadata : {},
-      enabled: enabled !== false,
-    });
-
-    const preferences = updateChannelPreference(userId, normalizedChannel);
-    return res.json({ success: true, endpoint: sanitizeEndpoint(endpoint), preferences });
-  } catch (error) {
-    console.error('Error registering notification endpoint:', error);
-    return res.status(500).json({ error: 'Failed to register notification endpoint' });
-  }
-});
-
-router.patch('/endpoints/:channel/:endpointId', (req, res) => {
-  try {
-    const { channel, endpointId } = req.params;
-    const { enabled } = req.body || {};
-    if (typeof enabled !== 'boolean') {
-      return res.status(400).json({ error: 'enabled must be a boolean' });
-    }
-
-    const userId = readUserId(req);
-    const updated = notificationChannelEndpointsDb.setEndpointEnabled(userId, channel, endpointId, enabled);
-    if (!updated) {
-      return res.status(404).json({ error: 'Notification endpoint not found' });
-    }
-
-    const endpoint = notificationChannelEndpointsDb.getEndpoint(userId, channel, endpointId);
-    const preferences = updateChannelPreference(userId, channel);
-    return res.json({ success: true, endpoint: endpoint ? sanitizeEndpoint(endpoint) : null, preferences });
-  } catch (error) {
-    console.error('Error updating notification endpoint:', error);
-    return res.status(500).json({ error: 'Failed to update notification endpoint' });
-  }
-});
-
-router.delete('/endpoints/:channel/:endpointId', (req, res) => {
-  try {
-    const { channel, endpointId } = req.params;
-    const userId = readUserId(req);
-    const removed = notificationChannelEndpointsDb.removeEndpoint(userId, channel, endpointId);
-    if (!removed) {
-      return res.status(404).json({ error: 'Notification endpoint not found' });
-    }
-
-    const preferences = updateChannelPreference(userId, channel);
-    return res.json({ success: true, preferences });
-  } catch (error) {
-    console.error('Error removing notification endpoint:', error);
-    return res.status(500).json({ error: 'Failed to remove notification endpoint' });
-  }
-});
-
-export default router;
+import express from 'express';
+
+import { notificationChannelEndpointsDb, notificationPreferencesDb } from '@/modules/database/index.js';
+
+const router = express.Router();
+
+function readText(value: unknown): string {
+  return typeof value === 'string' ? value.trim() : '';
+}
+
+function sanitizeEndpoint(endpoint: any) {
+  return {
+    id: endpoint.id,
+    channel: endpoint.channel,
+    endpointId: endpoint.endpoint_id,
+    label: endpoint.label,
+    metadata: notificationChannelEndpointsDb.parseMetadata(endpoint.metadata_json),
+    enabled: Boolean(endpoint.enabled),
+    lastSeenAt: endpoint.last_seen_at,
+    createdAt: endpoint.created_at,
+    updatedAt: endpoint.updated_at,
+  };
+}
+
+function readUserId(req: express.Request): number {
+  const userId = Number((req as any).user?.id);
+  if (!Number.isInteger(userId) || userId <= 0) {
+    throw new Error('Authenticated user is missing');
+  }
+  return userId;
+}
+
+function updateChannelPreference(userId: number, channel: string): unknown {
+  const currentPrefs = notificationPreferencesDb.getPreferences(userId);
+  const hasEnabledEndpoint = notificationChannelEndpointsDb.getEnabledEndpoints(userId, channel).length > 0;
+  return notificationPreferencesDb.updatePreferences(userId, {
+    ...currentPrefs,
+    channels: { ...currentPrefs.channels, [channel]: hasEnabledEndpoint },
+  });
+}
+
+router.get('/endpoints', (req, res) => {
+  try {
+    const channel = readText(req.query.channel);
+    if (!channel) {
+      return res.status(400).json({ error: 'channel is required' });
+    }
+
+    const userId = readUserId(req);
+    const endpoints = notificationChannelEndpointsDb
+      .getEndpoints(userId, channel)
+      .map(sanitizeEndpoint);
+    return res.json({ success: true, endpoints });
+  } catch (error) {
+    console.error('Error fetching notification endpoints:', error);
+    return res.status(500).json({ error: 'Failed to fetch notification endpoints' });
+  }
+});
+
+router.post('/endpoints/current', (req, res) => {
+  try {
+    const { channel, endpointId, label, metadata = {}, enabled = true } = req.body || {};
+    const normalizedChannel = readText(channel);
+    const normalizedEndpointId = readText(endpointId);
+    if (!normalizedChannel || !normalizedEndpointId) {
+      return res.status(400).json({ error: 'channel and endpointId are required' });
+    }
+
+    const userId = readUserId(req);
+    const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
+      userId,
+      channel: normalizedChannel,
+      endpointId: normalizedEndpointId,
+      label,
+      metadata: metadata && typeof metadata === 'object' ? metadata : {},
+      enabled: enabled !== false,
+    });
+
+    const preferences = updateChannelPreference(userId, normalizedChannel);
+    return res.json({ success: true, endpoint: sanitizeEndpoint(endpoint), preferences });
+  } catch (error) {
+    console.error('Error registering notification endpoint:', error);
+    return res.status(500).json({ error: 'Failed to register notification endpoint' });
+  }
+});
+
+router.patch('/endpoints/:channel/:endpointId', (req, res) => {
+  try {
+    const { channel, endpointId } = req.params;
+    const { enabled } = req.body || {};
+    if (typeof enabled !== 'boolean') {
+      return res.status(400).json({ error: 'enabled must be a boolean' });
+    }
+
+    const userId = readUserId(req);
+    const updated = notificationChannelEndpointsDb.setEndpointEnabled(userId, channel, endpointId, enabled);
+    if (!updated) {
+      return res.status(404).json({ error: 'Notification endpoint not found' });
+    }
+
+    const endpoint = notificationChannelEndpointsDb.getEndpoint(userId, channel, endpointId);
+    const preferences = updateChannelPreference(userId, channel);
+    return res.json({ success: true, endpoint: endpoint ? sanitizeEndpoint(endpoint) : null, preferences });
+  } catch (error) {
+    console.error('Error updating notification endpoint:', error);
+    return res.status(500).json({ error: 'Failed to update notification endpoint' });
+  }
+});
+
+router.delete('/endpoints/:channel/:endpointId', (req, res) => {
+  try {
+    const { channel, endpointId } = req.params;
+    const userId = readUserId(req);
+    const removed = notificationChannelEndpointsDb.removeEndpoint(userId, channel, endpointId);
+    if (!removed) {
+      return res.status(404).json({ error: 'Notification endpoint not found' });
+    }
+
+    const preferences = updateChannelPreference(userId, channel);
+    return res.json({ success: true, preferences });
+  } catch (error) {
+    console.error('Error removing notification endpoint:', error);
+    return res.status(500).json({ error: 'Failed to remove notification endpoint' });
+  }
+});
+
+export default router;

package/server/modules/notifications/services/desktop-notification-clients.service.ts

@@ -1,124 +1,124 @@
-import type { WebSocket } from 'ws';
-
-import { notificationChannelEndpointsDb } from '@/modules/database/index.js';
-
-const DESKTOP_CHANNEL = 'desktop';
-
-const clientsByUserId = new Map<number, Map<string, WebSocket>>();
-const clientBySocket = new WeakMap<WebSocket, { userId: number; endpointId: string }>();
-
-function normalizeUserId(userId: unknown): number | null {
-  const numeric = Number(userId);
-  return Number.isInteger(numeric) && numeric > 0 ? numeric : null;
-}
-
-function normalizeEndpointId(endpointId: unknown): string {
-  if (typeof endpointId !== 'string') return '';
-  return endpointId.trim();
-}
-
-function getUserClients(userId: unknown, create = false): Map<string, WebSocket> | null {
-  const normalizedUserId = normalizeUserId(userId);
-  if (!normalizedUserId) return null;
-  let clients = clientsByUserId.get(normalizedUserId);
-  if (!clients && create) {
-    clients = new Map();
-    clientsByUserId.set(normalizedUserId, clients);
-  }
-  return clients || null;
-}
-
-export function registerDesktopNotificationClient({
-  userId,
-  deviceId,
-  label = null,
-  platform = null,
-  appVersion = null,
-  ws,
-}: {
-  userId: number;
-  deviceId: string;
-  label?: string | null;
-  platform?: string | null;
-  appVersion?: string | null;
-  ws: WebSocket;
-}) {
-  const normalizedUserId = normalizeUserId(userId);
-  const endpointId = normalizeEndpointId(deviceId);
-  if (!normalizedUserId || !endpointId) {
-    return false;
-  }
-
-  const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
-    userId: normalizedUserId,
-    channel: DESKTOP_CHANNEL,
-    endpointId,
-    label,
-    metadata: { platform, appVersion },
-    enabled: true,
-  });
-
-  const clients = getUserClients(normalizedUserId, true)!;
-  const previous = clients.get(endpointId);
-  if (previous && previous !== ws && previous.readyState === previous.OPEN) {
-    previous.close(4000, 'Device reconnected');
-  }
-
-  clients.set(endpointId, ws);
-  clientBySocket.set(ws, { userId: normalizedUserId, endpointId });
-  return endpoint;
-}
-
-export function unregisterDesktopNotificationClient(ws: WebSocket): void {
-  const registration = clientBySocket.get(ws);
-  if (!registration) return;
-
-  const clients = getUserClients(registration.userId);
-  if (clients?.get(registration.endpointId) === ws) {
-    clients.delete(registration.endpointId);
-    if (clients.size === 0) {
-      clientsByUserId.delete(registration.userId);
-    }
-  }
-  clientBySocket.delete(ws);
-}
-
-export function sendDesktopNotification(userId: unknown, payload: unknown): { attempted: number; sent: number } {
-  const normalizedUserId = normalizeUserId(userId);
-  if (!normalizedUserId) return { attempted: 0, sent: 0 };
-
-  const clients = getUserClients(normalizedUserId);
-  if (!clients?.size) return { attempted: 0, sent: 0 };
-
-  const enabledEndpointIds = new Set(
-    notificationChannelEndpointsDb
-      .getEnabledEndpoints(normalizedUserId, DESKTOP_CHANNEL)
-      .map((endpoint) => endpoint.endpoint_id)
-  );
-
-  const message = JSON.stringify({
-    type: 'notification',
-    id: typeof (payload as any)?.data?.tag === 'string' ? (payload as any).data.tag : `${Date.now()}`,
-    payload,
-  });
-
-  let attempted = 0;
-  let sent = 0;
-  for (const [endpointId, ws] of clients.entries()) {
-    if (!enabledEndpointIds.has(endpointId)) continue;
-    attempted += 1;
-    if (ws.readyState !== ws.OPEN) {
-      unregisterDesktopNotificationClient(ws);
-      continue;
-    }
-    try {
-      ws.send(message);
-      notificationChannelEndpointsDb.touchEndpoint(normalizedUserId, DESKTOP_CHANNEL, endpointId);
-      sent += 1;
-    } catch {
-      unregisterDesktopNotificationClient(ws);
-    }
-  }
-
-  return { attempted, sent };
-}
+import type { WebSocket } from 'ws';
+
+import { notificationChannelEndpointsDb } from '@/modules/database/index.js';
+
+const DESKTOP_CHANNEL = 'desktop';
+
+const clientsByUserId = new Map<number, Map<string, WebSocket>>();
+const clientBySocket = new WeakMap<WebSocket, { userId: number; endpointId: string }>();
+
+function normalizeUserId(userId: unknown): number | null {
+  const numeric = Number(userId);
+  return Number.isInteger(numeric) && numeric > 0 ? numeric : null;
+}
+
+function normalizeEndpointId(endpointId: unknown): string {
+  if (typeof endpointId !== 'string') return '';
+  return endpointId.trim();
+}
+
+function getUserClients(userId: unknown, create = false): Map<string, WebSocket> | null {
+  const normalizedUserId = normalizeUserId(userId);
+  if (!normalizedUserId) return null;
+  let clients = clientsByUserId.get(normalizedUserId);
+  if (!clients && create) {
+    clients = new Map();
+    clientsByUserId.set(normalizedUserId, clients);
+  }
+  return clients || null;
+}
+
+export function registerDesktopNotificationClient({
+  userId,
+  deviceId,
+  label = null,
+  platform = null,
+  appVersion = null,
+  ws,
+}: {
+  userId: number;
+  deviceId: string;
+  label?: string | null;
+  platform?: string | null;
+  appVersion?: string | null;
+  ws: WebSocket;
+}) {
+  const normalizedUserId = normalizeUserId(userId);
+  const endpointId = normalizeEndpointId(deviceId);
+  if (!normalizedUserId || !endpointId) {
+    return false;
+  }
+
+  const endpoint = notificationChannelEndpointsDb.upsertEndpoint({
+    userId: normalizedUserId,
+    channel: DESKTOP_CHANNEL,
+    endpointId,
+    label,
+    metadata: { platform, appVersion },
+    enabled: true,
+  });
+
+  const clients = getUserClients(normalizedUserId, true)!;
+  const previous = clients.get(endpointId);
+  if (previous && previous !== ws && previous.readyState === previous.OPEN) {
+    previous.close(4000, 'Device reconnected');
+  }
+
+  clients.set(endpointId, ws);
+  clientBySocket.set(ws, { userId: normalizedUserId, endpointId });
+  return endpoint;
+}
+
+export function unregisterDesktopNotificationClient(ws: WebSocket): void {
+  const registration = clientBySocket.get(ws);
+  if (!registration) return;
+
+  const clients = getUserClients(registration.userId);
+  if (clients?.get(registration.endpointId) === ws) {
+    clients.delete(registration.endpointId);
+    if (clients.size === 0) {
+      clientsByUserId.delete(registration.userId);
+    }
+  }
+  clientBySocket.delete(ws);
+}
+
+export function sendDesktopNotification(userId: unknown, payload: unknown): { attempted: number; sent: number } {
+  const normalizedUserId = normalizeUserId(userId);
+  if (!normalizedUserId) return { attempted: 0, sent: 0 };
+
+  const clients = getUserClients(normalizedUserId);
+  if (!clients?.size) return { attempted: 0, sent: 0 };
+
+  const enabledEndpointIds = new Set(
+    notificationChannelEndpointsDb
+      .getEnabledEndpoints(normalizedUserId, DESKTOP_CHANNEL)
+      .map((endpoint) => endpoint.endpoint_id)
+  );
+
+  const message = JSON.stringify({
+    type: 'notification',
+    id: typeof (payload as any)?.data?.tag === 'string' ? (payload as any).data.tag : `${Date.now()}`,
+    payload,
+  });
+
+  let attempted = 0;
+  let sent = 0;
+  for (const [endpointId, ws] of clients.entries()) {
+    if (!enabledEndpointIds.has(endpointId)) continue;
+    attempted += 1;
+    if (ws.readyState !== ws.OPEN) {
+      unregisterDesktopNotificationClient(ws);
+      continue;
+    }
+    try {
+      ws.send(message);
+      notificationChannelEndpointsDb.touchEndpoint(normalizedUserId, DESKTOP_CHANNEL, endpointId);
+      sent += 1;
+    } catch {
+      unregisterDesktopNotificationClient(ws);
+    }
+  }
+
+  return { attempted, sent };
+}