@cloudcli-ai/cloudcli 1.33.3 → 1.35.0

package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js

@@ -0,0 +1,78 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { closeConnection } from '../../../modules/database/connection.js';
+import { initializeDatabase } from '../../../modules/database/init-db.js';
+import { sessionsDb } from '../../../modules/database/repositories/sessions.db.js';
+async function withIsolatedDatabase(runTest) {
+    const previousDatabasePath = process.env.DATABASE_PATH;
+    const tempDirectory = await mkdtemp(path.join(tmpdir(), 'sessions-mapping-'));
+    const databasePath = path.join(tempDirectory, 'auth.db');
+    closeConnection();
+    process.env.DATABASE_PATH = databasePath;
+    await initializeDatabase();
+    try {
+        await runTest();
+    }
+    finally {
+        closeConnection();
+        if (previousDatabasePath === undefined) {
+            delete process.env.DATABASE_PATH;
+        }
+        else {
+            process.env.DATABASE_PATH = previousDatabasePath;
+        }
+        await rm(tempDirectory, { recursive: true, force: true });
+    }
+}
+test('disk-discovered sessions are keyed by the provider id for both columns', async () => {
+    await withIsolatedDatabase(() => {
+        sessionsDb.createSession('provider-abc', 'claude', '/workspace/demo', 'From Disk');
+        const row = sessionsDb.getSessionById('provider-abc');
+        assert.equal(row?.session_id, 'provider-abc');
+        assert.equal(row?.provider_session_id, 'provider-abc');
+        const byProviderId = sessionsDb.getSessionByProviderSessionId('provider-abc');
+        assert.equal(byProviderId?.session_id, 'provider-abc');
+    });
+});
+test('app sessions get the provider id assigned without creating a duplicate row', async () => {
+    await withIsolatedDatabase(() => {
+        sessionsDb.createAppSession('app-id-1', 'claude', '/workspace/demo');
+        sessionsDb.assignProviderSessionId('app-id-1', 'provider-xyz');
+        // A later synchronizer pass that discovers the transcript on disk must
+        // update the app row in place instead of inserting a provider-keyed row.
+        const returnedId = sessionsDb.createSession('provider-xyz', 'claude', '/workspace/demo', 'Synced Name', undefined, undefined, '/fake/path/provider-xyz.jsonl');
+        assert.equal(returnedId, 'app-id-1');
+        assert.equal(sessionsDb.getAllSessions().length, 1);
+        const row = sessionsDb.getSessionById('app-id-1');
+        assert.equal(row?.provider_session_id, 'provider-xyz');
+        assert.equal(row?.jsonl_path, '/fake/path/provider-xyz.jsonl');
+    });
+});
+test('assignProviderSessionId merges a watcher-created duplicate into the app row', async () => {
+    await withIsolatedDatabase(() => {
+        sessionsDb.createAppSession('app-id-2', 'codex', '/workspace/demo');
+        // Simulate the race: the filesystem watcher indexed the provider
+        // transcript before the runtime announced its session id to the gateway.
+        sessionsDb.createSession('provider-race', 'codex', '/workspace/demo', 'Watcher Name', undefined, undefined, '/fake/provider-race.jsonl');
+        assert.equal(sessionsDb.getAllSessions().length, 2);
+        sessionsDb.assignProviderSessionId('app-id-2', 'provider-race');
+        const rows = sessionsDb.getAllSessions();
+        assert.equal(rows.length, 1);
+        assert.equal(rows[0]?.session_id, 'app-id-2');
+        assert.equal(rows[0]?.provider_session_id, 'provider-race');
+        // Transcript path and name from the duplicate are adopted.
+        assert.equal(rows[0]?.jsonl_path, '/fake/provider-race.jsonl');
+        assert.equal(rows[0]?.custom_name, 'Watcher Name');
+    });
+});
+test('legacy provider-keyed rows stay resolvable through both lookups', async () => {
+    await withIsolatedDatabase(() => {
+        sessionsDb.createSession('legacy-1', 'gemini', '/workspace/demo');
+        assert.equal(sessionsDb.getSessionById('legacy-1')?.provider, 'gemini');
+        assert.equal(sessionsDb.getSessionByProviderSessionId('legacy-1')?.session_id, 'legacy-1');
+    });
+});
+//# sourceMappingURL=sessions-provider-mapping.test.js.map

package/dist-server/server/modules/database/tests/sessions-provider-mapping.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions-provider-mapping.test.js","sourceRoot":"","sources":["../../../../../server/modules/database/tests/sessions-provider-mapping.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/database/{repositories → tests}/sessions.db.integration.test.js

@@ -58,4 +58,14 @@ test('createSession reactivates archived rows when the session becomes active ag
         assert.equal(restoredSession?.isArchived, 0);
     });
 });
+test('repository reads normalize SQLite UTC timestamps to ISO strings', async () => {
+    await withIsolatedDatabase(() => {
+        sessionsDb.createAppSession('session-timezone', 'claude', '/workspace/demo-project');
+        const row = sessionsDb.getSessionById('session-timezone');
+        assert.ok(row?.created_at.endsWith('Z'));
+        assert.ok(row?.updated_at.endsWith('Z'));
+        assert.match(row?.created_at ?? '', /^\d{4}-\d{2}-\d{2}T/);
+        assert.match(row?.updated_at ?? '', /^\d{4}-\d{2}-\d{2}T/);
+    });
+});
 //# sourceMappingURL=sessions.db.integration.test.js.map

package/dist-server/server/modules/database/tests/sessions.db.integration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sessions.db.integration.test.js","sourceRoot":"","sources":["../../../../../server/modules/database/tests/sessions.db.integration.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/notifications/index.js

@@ -0,0 +1,4 @@
+export { buildNotificationPayload, createNotificationEvent, notifyUserIfEnabled, notifyRunFailed, notifyRunStopped, } 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';
+//# sourceMappingURL=index.js.map

package/dist-server/server/modules/notifications/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/modules/notifications/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,eAAe,EACf,gBAAgB,GACjB,MAAM,uEAAuE,CAAC;AAC/E,OAAO,EACL,iCAAiC,EACjC,uBAAuB,EACvB,mCAAmC,GACpC,MAAM,0EAA0E,CAAC;AAClF,OAAO,EAAE,oCAAoC,EAAE,MAAM,8EAA8E,CAAC"}

package/dist-server/server/modules/notifications/notifications.routes.js

@@ -0,0 +1,115 @@
+import express from 'express';
+import { notificationChannelEndpointsDb, notificationPreferencesDb } from '../../modules/database/index.js';
+const router = express.Router();
+function readText(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+function sanitizeEndpoint(endpoint) {
+    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) {
+    const userId = Number(req.user?.id);
+    if (!Number.isInteger(userId) || userId <= 0) {
+        throw new Error('Authenticated user is missing');
+    }
+    return userId;
+}
+function updateChannelPreference(userId, channel) {
+    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;
+//# sourceMappingURL=notifications.routes.js.map

package/dist-server/server/modules/notifications/notifications.routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notifications.routes.js","sourceRoot":"","sources":["../../../../server/modules/notifications/notifications.routes.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,97 @@
+import { notificationChannelEndpointsDb } from '../../../modules/database/index.js';
+const DESKTOP_CHANNEL = 'desktop';
+const clientsByUserId = new Map();
+const clientBySocket = new WeakMap();
+function normalizeUserId(userId) {
+    const numeric = Number(userId);
+    return Number.isInteger(numeric) && numeric > 0 ? numeric : null;
+}
+function normalizeEndpointId(endpointId) {
+    if (typeof endpointId !== 'string')
+        return '';
+    return endpointId.trim();
+}
+function getUserClients(userId, create = false) {
+    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, }) {
+    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) {
+    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, payload) {
+    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?.data?.tag === 'string' ? payload.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 };
+}
+//# sourceMappingURL=desktop-notification-clients.service.js.map

package/dist-server/server/modules/notifications/services/desktop-notification-clients.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"desktop-notification-clients.service.js","sourceRoot":"","sources":["../../../../../server/modules/notifications/services/desktop-notification-clients.service.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js

@@ -0,0 +1,229 @@
+import webPush from 'web-push';
+import { notificationPreferencesDb, pushSubscriptionsDb, sessionsDb } from '../../../modules/database/index.js';
+import { sendDesktopNotification as sendDesktopNotificationToClients } from '../../../modules/notifications/services/desktop-notification-clients.service.js';
+const KIND_TO_PREF_KEY = {
+    action_required: 'actionRequired',
+    stop: 'stop',
+    error: 'error'
+};
+const PROVIDER_LABELS = {
+    claude: 'Claude',
+    cursor: 'Cursor',
+    codex: 'Codex',
+    gemini: 'Gemini',
+    system: 'System'
+};
+const recentEventKeys = new Map();
+const DEDUPE_WINDOW_MS = 20000;
+const cleanupOldEventKeys = () => {
+    const now = Date.now();
+    for (const [key, timestamp] of recentEventKeys.entries()) {
+        if (now - timestamp > DEDUPE_WINDOW_MS) {
+            recentEventKeys.delete(key);
+        }
+    }
+};
+function isNotificationEventEnabled(preferences, event) {
+    const prefEventKey = KIND_TO_PREF_KEY[event.kind];
+    const eventEnabled = prefEventKey ? Boolean(preferences?.events?.[prefEventKey]) : true;
+    return eventEnabled;
+}
+function isDuplicate(event) {
+    cleanupOldEventKeys();
+    const key = event.dedupeKey || `${event.provider}:${event.kind || 'info'}:${event.code || 'generic'}:${event.sessionId || 'none'}`;
+    if (recentEventKeys.has(key)) {
+        return true;
+    }
+    recentEventKeys.set(key, Date.now());
+    return false;
+}
+function createNotificationEvent({ provider, sessionId = null, kind = 'info', code = 'generic.info', meta = {}, severity = 'info', dedupeKey = null, requiresUserAction = false }) {
+    return {
+        provider,
+        sessionId,
+        kind,
+        code,
+        meta,
+        severity,
+        requiresUserAction,
+        dedupeKey,
+        createdAt: new Date().toISOString()
+    };
+}
+function normalizeErrorMessage(error) {
+    if (typeof error === 'string') {
+        return error;
+    }
+    if (error && typeof error.message === 'string') {
+        return error.message;
+    }
+    if (error == null) {
+        return 'Unknown error';
+    }
+    return String(error);
+}
+function normalizeSessionName(sessionName) {
+    if (typeof sessionName !== 'string') {
+        return null;
+    }
+    const normalized = sessionName.replace(/\s+/g, ' ').trim();
+    if (!normalized) {
+        return null;
+    }
+    return normalized.length > 80 ? `${normalized.slice(0, 77)}...` : normalized;
+}
+function rowMatchesProvider(row, provider) {
+    return row && (!provider || row.provider === provider);
+}
+function resolveSessionRow(sessionId, provider) {
+    if (!sessionId) {
+        return null;
+    }
+    const appSessionRow = sessionsDb.getSessionById(sessionId);
+    if (rowMatchesProvider(appSessionRow, provider)) {
+        return appSessionRow;
+    }
+    const providerSessionRow = sessionsDb.getSessionByProviderSessionId(sessionId);
+    if (rowMatchesProvider(providerSessionRow, provider)) {
+        return providerSessionRow;
+    }
+    return null;
+}
+function normalizeNotificationSession(event) {
+    if (!event?.sessionId || !event.provider || event.provider === 'system') {
+        return event;
+    }
+    const row = resolveSessionRow(event.sessionId, event.provider);
+    if (!row || row.session_id === event.sessionId) {
+        return event;
+    }
+    return {
+        ...event,
+        sessionId: row.session_id
+    };
+}
+function resolveSessionName(event) {
+    const explicitSessionName = normalizeSessionName(event.meta?.sessionName);
+    if (explicitSessionName) {
+        return explicitSessionName;
+    }
+    if (!event.sessionId || !event.provider) {
+        return null;
+    }
+    return normalizeSessionName(sessionsDb.getSessionName(event.sessionId, event.provider));
+}
+function buildNotificationPayload(event) {
+    const normalizedEvent = normalizeNotificationSession(event);
+    const CODE_MAP = {
+        'permission.required': normalizedEvent.meta?.toolName
+            ? `Action Required: Tool "${normalizedEvent.meta.toolName}" needs approval`
+            : 'Action Required: A tool needs your approval',
+        'run.stopped': normalizedEvent.meta?.stopReason || 'Run Stopped: The run has stopped',
+        'run.failed': normalizedEvent.meta?.error ? `Run Failed: ${normalizedEvent.meta.error}` : 'Run Failed: The run encountered an error',
+        'agent.notification': normalizedEvent.meta?.message ? String(normalizedEvent.meta.message) : 'You have a new notification',
+        'push.enabled': 'Push notifications are now enabled!'
+    };
+    const providerLabel = PROVIDER_LABELS[normalizedEvent.provider] || 'Assistant';
+    const sessionName = resolveSessionName(normalizedEvent);
+    const message = CODE_MAP[normalizedEvent.code] || 'You have a new notification';
+    return {
+        title: sessionName || 'CloudCLI',
+        body: `${providerLabel}: ${message}`,
+        data: {
+            sessionId: normalizedEvent.sessionId || null,
+            code: normalizedEvent.code,
+            provider: normalizedEvent.provider || null,
+            sessionName,
+            tag: `${normalizedEvent.provider || 'assistant'}:${normalizedEvent.sessionId || 'none'}:${normalizedEvent.code}`
+        }
+    };
+}
+function sendWebPushPayload(userId, payload) {
+    const subscriptions = pushSubscriptionsDb.getSubscriptions(userId);
+    if (!subscriptions.length)
+        return Promise.resolve();
+    const serializedPayload = JSON.stringify(payload);
+    return Promise.allSettled(subscriptions.map((sub) => webPush.sendNotification({
+        endpoint: sub.endpoint,
+        keys: {
+            p256dh: sub.keys_p256dh,
+            auth: sub.keys_auth
+        }
+    }, serializedPayload))).then((results) => {
+        results.forEach((result, index) => {
+            if (result.status === 'rejected') {
+                const statusCode = result.reason?.statusCode;
+                if (statusCode === 410 || statusCode === 404) {
+                    pushSubscriptionsDb.removeSubscription(subscriptions[index].endpoint);
+                }
+            }
+        });
+    });
+}
+const notificationChannels = [
+    {
+        id: 'webPush',
+        // TODO: Web push still uses push_subscriptions. Do not remove that table until
+        // browser push subscriptions are migrated into notification_channel_endpoints.
+        isEnabled: (preferences) => Boolean(preferences?.channels?.webPush),
+        send: ({ userId, payload }) => sendWebPushPayload(userId, payload)
+    },
+    {
+        id: 'desktop',
+        isEnabled: (preferences) => Boolean(preferences?.channels?.desktop),
+        send: ({ userId, payload }) => sendDesktopNotificationToClients(userId, payload)
+    }
+];
+function notifyUserIfEnabled({ userId, event }) {
+    if (!userId || !event) {
+        return;
+    }
+    const normalizedEvent = normalizeNotificationSession(event);
+    const preferences = notificationPreferencesDb.getPreferences(userId);
+    if (!isNotificationEventEnabled(preferences, normalizedEvent)) {
+        return;
+    }
+    if (isDuplicate(normalizedEvent)) {
+        return;
+    }
+    const payload = buildNotificationPayload(normalizedEvent);
+    for (const channel of notificationChannels) {
+        if (!channel.isEnabled(preferences)) {
+            continue;
+        }
+        Promise.resolve(channel.send({ userId, event: normalizedEvent, payload })).catch((err) => {
+            console.error(`Notification channel "${channel.id}" send error:`, err);
+        });
+    }
+}
+function notifyRunStopped({ userId, provider, sessionId = null, stopReason = 'completed', sessionName = null }) {
+    notifyUserIfEnabled({
+        userId,
+        event: createNotificationEvent({
+            provider,
+            sessionId,
+            kind: 'stop',
+            code: 'run.stopped',
+            meta: { stopReason, sessionName },
+            severity: 'info',
+            dedupeKey: `${provider}:run:stop:${sessionId || 'none'}:${stopReason}`
+        })
+    });
+}
+function notifyRunFailed({ userId, provider, sessionId = null, error, sessionName = null }) {
+    const errorMessage = normalizeErrorMessage(error);
+    notifyUserIfEnabled({
+        userId,
+        event: createNotificationEvent({
+            provider,
+            sessionId,
+            kind: 'error',
+            code: 'run.failed',
+            meta: { error: errorMessage, sessionName },
+            severity: 'error',
+            dedupeKey: `${provider}:run:error:${sessionId || 'none'}:${errorMessage}`
+        })
+    });
+}
+export { buildNotificationPayload, createNotificationEvent, notifyUserIfEnabled, notifyRunStopped, notifyRunFailed };
+//# sourceMappingURL=notification-orchestrator.service.js.map

package/dist-server/server/modules/notifications/services/notification-orchestrator.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notification-orchestrator.service.js","sourceRoot":"","sources":["../../../../../server/modules/notifications/services/notification-orchestrator.service.js"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,UAAU,CAAC;AAE/B,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzG,OAAO,EAAE,uBAAuB,IAAI,gCAAgC,EAAE,MAAM,0EAA0E,CAAC;AAEvJ,MAAM,gBAAgB,GAAG;IACvB,eAAe,EAAE,gBAAgB;IACjC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;AAClC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B,MAAM,mBAAmB,GAAG,GAAG,EAAE;IAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,KAAK,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QACzD,IAAI,GAAG,GAAG,SAAS,GAAG,gBAAgB,EAAE,CAAC;YACvC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,SAAS,0BAA0B,CAAC,WAAW,EAAE,KAAK;IACpD,MAAM,YAAY,GAAG,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAExF,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,WAAW,CAAC,KAAK;IACxB,mBAAmB,EAAE,CAAC;IACtB,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC,IAAI,IAAI,SAAS,IAAI,KAAK,CAAC,SAAS,IAAI,MAAM,EAAE,CAAC;IACnI,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,uBAAuB,CAAC,EAC/B,QAAQ,EACR,SAAS,GAAG,IAAI,EAChB,IAAI,GAAG,MAAM,EACb,IAAI,GAAG,cAAc,EACrB,IAAI,GAAG,EAAE,EACT,QAAQ,GAAG,MAAM,EACjB,SAAS,GAAG,IAAI,EAChB,kBAAkB,GAAG,KAAK,EAC3B;IACC,OAAO;QACL,QAAQ;QACR,SAAS;QACT,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,QAAQ;QACR,kBAAkB;QAClB,SAAS;QACT,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAK;IAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,KAAK,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC,OAAO,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAW;IACvC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,UAAU,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC;AAC/E,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAG,EAAE,QAAQ;IACvC,OAAO,GAAG,IAAI,CAAC,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED,SAAS,iBAAiB,CAAC,SAAS,EAAE,QAAQ;IAC5C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,aAAa,GAAG,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IAC3D,IAAI,kBAAkB,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC;QAChD,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,kBAAkB,GAAG,UAAU,CAAC,6BAA6B,CAAC,SAAS,CAAC,CAAC;IAC/E,IAAI,kBAAkB,CAAC,kBAAkB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACrD,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAK;IACzC,IAAI,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,iBAAiB,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/D,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,UAAU,KAAK,KAAK,CAAC,SAAS,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,GAAG,KAAK;QACR,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAK;IAC/B,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC1E,IAAI,mBAAmB,EAAE,CAAC;QACxB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,oBAAoB,CAAC,UAAU,CAAC,cAAc,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAK;IACrC,MAAM,eAAe,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG;QACf,qBAAqB,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ;YACnD,CAAC,CAAC,0BAA0B,eAAe,CAAC,IAAI,CAAC,QAAQ,kBAAkB;YAC3E,CAAC,CAAC,6CAA6C;QACjD,aAAa,EAAE,eAAe,CAAC,IAAI,EAAE,UAAU,IAAI,kCAAkC;QACrF,YAAY,EAAE,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,eAAe,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,0CAA0C;QACpI,oBAAoB,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,6BAA6B;QAC1H,cAAc,EAAE,qCAAqC;KACtD,CAAC;IACF,MAAM,aAAa,GAAG,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,WAAW,CAAC;IAC/E,MAAM,WAAW,GAAG,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,6BAA6B,CAAC;IAEhF,OAAO;QACL,KAAK,EAAE,WAAW,IAAI,UAAU;QAChC,IAAI,EAAE,GAAG,aAAa,KAAK,OAAO,EAAE;QACpC,IAAI,EAAE;YACJ,SAAS,EAAE,eAAe,CAAC,SAAS,IAAI,IAAI;YAC5C,IAAI,EAAE,eAAe,CAAC,IAAI;YAC1B,QAAQ,EAAE,eAAe,CAAC,QAAQ,IAAI,IAAI;YAC1C,WAAW;YACX,GAAG,EAAE,GAAG,eAAe,CAAC,QAAQ,IAAI,WAAW,IAAI,eAAe,CAAC,SAAS,IAAI,MAAM,IAAI,eAAe,CAAC,IAAI,EAAE;SACjH;KACF,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAM,EAAE,OAAO;IACzC,MAAM,aAAa,GAAG,mBAAmB,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACnE,IAAI,CAAC,aAAa,CAAC,MAAM;QAAE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAEpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAClD,OAAO,OAAO,CAAC,UAAU,CACvB,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACxB,OAAO,CAAC,gBAAgB,CACtB;QACE,QAAQ,EAAE,GAAG,CAAC,QAAQ;QACtB,IAAI,EAAE;YACJ,MAAM,EAAE,GAAG,CAAC,WAAW;YACvB,IAAI,EAAE,GAAG,CAAC,SAAS;SACpB;KACF,EACD,iBAAiB,CAClB,CACF,CACF,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;QACjB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAChC,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACjC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC;gBAC7C,IAAI,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;oBAC7C,mBAAmB,CAAC,kBAAkB,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,oBAAoB,GAAG;IAC3B;QACE,EAAE,EAAE,SAAS;QACb,+EAA+E;QAC/E,+EAA+E;QAC/E,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC;QACnE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC;KACnE;IACD;QACE,EAAE,EAAE,SAAS;QACb,SAAS,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC;QACnE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,gCAAgC,CAAC,MAAM,EAAE,OAAO,CAAC;KACjF;CACF,CAAC;AAEF,SAAS,mBAAmB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE;IAC5C,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,eAAe,GAAG,4BAA4B,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,WAAW,GAAG,yBAAyB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACrE,IAAI,CAAC,0BAA0B,CAAC,WAAW,EAAE,eAAe,CAAC,EAAE,CAAC;QAC9D,OAAO;IACT,CAAC;IACD,IAAI,WAAW,CAAC,eAAe,CAAC,EAAE,CAAC;QACjC,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAC1D,KAAK,MAAM,OAAO,IAAI,oBAAoB,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACvF,OAAO,CAAC,KAAK,CAAC,yBAAyB,OAAO,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,EAAE,UAAU,GAAG,WAAW,EAAE,WAAW,GAAG,IAAI,EAAE;IAC5G,mBAAmB,CAAC;QAClB,MAAM;QACN,KAAK,EAAE,uBAAuB,CAAC;YAC7B,QAAQ;YACR,SAAS;YACT,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE;YACjC,QAAQ,EAAE,MAAM;YAChB,SAAS,EAAE,GAAG,QAAQ,aAAa,SAAS,IAAI,MAAM,IAAI,UAAU,EAAE;SACvE,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,EAAE;IACxF,MAAM,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAElD,mBAAmB,CAAC;QAClB,MAAM;QACN,KAAK,EAAE,uBAAuB,CAAC;YAC7B,QAAQ;YACR,SAAS;YACT,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE;YAC1C,QAAQ,EAAE,OAAO;YACjB,SAAS,EAAE,GAAG,QAAQ,cAAc,SAAS,IAAI,MAAM,IAAI,YAAY,EAAE;SAC1E,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,OAAO,EACL,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EAChB,CAAC"}