@pixelbyte-software/pixcode 1.30.1 → 1.31.0

package/server/services/notification-orchestrator.js

@@ -1,227 +1,242 @@
-import webPush from 'web-push';
-import { notificationPreferencesDb, pushSubscriptionsDb, sessionNamesDb } from '../database/db.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 shouldSendPush(preferences, event) {
-  const webPushEnabled = Boolean(preferences?.channels?.webPush);
-  const prefEventKey = KIND_TO_PREF_KEY[event.kind];
-  const eventEnabled = prefEventKey ? Boolean(preferences?.events?.[prefEventKey]) : true;
-
-  return webPushEnabled && 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 resolveSessionName(event) {
-  const explicitSessionName = normalizeSessionName(event.meta?.sessionName);
-  if (explicitSessionName) {
-    return explicitSessionName;
-  }
-
-  if (!event.sessionId || !event.provider) {
-    return null;
-  }
-
-  return normalizeSessionName(sessionNamesDb.getName(event.sessionId, event.provider));
-}
-
-function buildPushBody(event) {
-  const CODE_MAP = {
-    'permission.required': event.meta?.toolName
-      ? `Action Required: Tool "${event.meta.toolName}" needs approval`
-      : 'Action Required: A tool needs your approval',
-    'run.stopped': event.meta?.stopReason || 'Run Stopped: The run has stopped',
-    'run.failed': event.meta?.error ? `Run Failed: ${event.meta.error}` : 'Run Failed: The run encountered an error',
-    'agent.notification': event.meta?.message ? String(event.meta.message) : 'You have a new notification',
-    'push.enabled': 'Push notifications are now enabled!'
-  };
-  const providerLabel = PROVIDER_LABELS[event.provider] || 'Assistant';
-  const sessionName = resolveSessionName(event);
-  const message = CODE_MAP[event.code] || 'You have a new notification';
-
-  return {
-    title: sessionName || 'Pixcode',
-    body: `${providerLabel}: ${message}`,
-    data: {
-      sessionId: event.sessionId || null,
-      code: event.code,
-      provider: event.provider || null,
-      sessionName,
-      tag: `${event.provider || 'assistant'}:${event.sessionId || 'none'}:${event.code}`
-    }
-  };
-}
-
-async function sendWebPush(userId, event) {
-  const subscriptions = pushSubscriptionsDb.getSubscriptions(userId);
-  if (!subscriptions.length) return;
-
-  const payload = JSON.stringify(buildPushBody(event));
-
-  const results = await Promise.allSettled(
-    subscriptions.map((sub) =>
-      webPush.sendNotification(
-        {
-          endpoint: sub.endpoint,
-          keys: {
-            p256dh: sub.keys_p256dh,
-            auth: sub.keys_auth
-          }
-        },
-        payload
-      )
-    )
-  );
-
-  // Clean up gone subscriptions (410 Gone or 404)
-  results.forEach((result, index) => {
-    if (result.status === 'rejected') {
-      const statusCode = result.reason?.statusCode;
-      if (statusCode === 410 || statusCode === 404) {
-        pushSubscriptionsDb.removeSubscription(subscriptions[index].endpoint);
-      }
-    }
-  });
-}
-
-function notifyUserIfEnabled({ userId, event }) {
-  if (!userId || !event) {
-    return;
-  }
-
-  const preferences = notificationPreferencesDb.getPreferences(userId);
-  if (!shouldSendPush(preferences, event)) {
-    return;
-  }
-  if (isDuplicate(event)) {
-    return;
-  }
-
-  sendWebPush(userId, event).catch((err) => {
-    console.error('Web push 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 {
-  createNotificationEvent,
-  notifyUserIfEnabled,
-  notifyRunStopped,
-  notifyRunFailed
-};
+import webPush from 'web-push';
+import { notificationPreferencesDb, pushSubscriptionsDb, sessionNamesDb } from '../database/db.js';
+import { notifyUser as notifyTelegramUser } from './telegram/bot.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 shouldSendPush(preferences, event) {
+  const webPushEnabled = Boolean(preferences?.channels?.webPush);
+  const prefEventKey = KIND_TO_PREF_KEY[event.kind];
+  const eventEnabled = prefEventKey ? Boolean(preferences?.events?.[prefEventKey]) : true;
+
+  return webPushEnabled && 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 resolveSessionName(event) {
+  const explicitSessionName = normalizeSessionName(event.meta?.sessionName);
+  if (explicitSessionName) {
+    return explicitSessionName;
+  }
+
+  if (!event.sessionId || !event.provider) {
+    return null;
+  }
+
+  return normalizeSessionName(sessionNamesDb.getName(event.sessionId, event.provider));
+}
+
+function buildPushBody(event) {
+  const CODE_MAP = {
+    'permission.required': event.meta?.toolName
+      ? `Action Required: Tool "${event.meta.toolName}" needs approval`
+      : 'Action Required: A tool needs your approval',
+    'run.stopped': event.meta?.stopReason || 'Run Stopped: The run has stopped',
+    'run.failed': event.meta?.error ? `Run Failed: ${event.meta.error}` : 'Run Failed: The run encountered an error',
+    'agent.notification': event.meta?.message ? String(event.meta.message) : 'You have a new notification',
+    'push.enabled': 'Push notifications are now enabled!'
+  };
+  const providerLabel = PROVIDER_LABELS[event.provider] || 'Assistant';
+  const sessionName = resolveSessionName(event);
+  const message = CODE_MAP[event.code] || 'You have a new notification';
+
+  return {
+    title: sessionName || 'Pixcode',
+    body: `${providerLabel}: ${message}`,
+    data: {
+      sessionId: event.sessionId || null,
+      code: event.code,
+      provider: event.provider || null,
+      sessionName,
+      tag: `${event.provider || 'assistant'}:${event.sessionId || 'none'}:${event.code}`
+    }
+  };
+}
+
+async function sendWebPush(userId, event) {
+  const subscriptions = pushSubscriptionsDb.getSubscriptions(userId);
+  if (!subscriptions.length) return;
+
+  const payload = JSON.stringify(buildPushBody(event));
+
+  const results = await Promise.allSettled(
+    subscriptions.map((sub) =>
+      webPush.sendNotification(
+        {
+          endpoint: sub.endpoint,
+          keys: {
+            p256dh: sub.keys_p256dh,
+            auth: sub.keys_auth
+          }
+        },
+        payload
+      )
+    )
+  );
+
+  // Clean up gone subscriptions (410 Gone or 404)
+  results.forEach((result, index) => {
+    if (result.status === 'rejected') {
+      const statusCode = result.reason?.statusCode;
+      if (statusCode === 410 || statusCode === 404) {
+        pushSubscriptionsDb.removeSubscription(subscriptions[index].endpoint);
+      }
+    }
+  });
+}
+
+function notifyUserIfEnabled({ userId, event }) {
+  if (!userId || !event) {
+    return;
+  }
+
+  const preferences = notificationPreferencesDb.getPreferences(userId);
+  if (isDuplicate(event)) {
+    return;
+  }
+
+  if (shouldSendPush(preferences, event)) {
+    sendWebPush(userId, event).catch((err) => {
+      console.error('Web push send error:', err);
+    });
+  }
+
+  // Telegram is gated independently of web-push: a user might want Telegram
+  // pings without enabling browser push, or vice-versa. The telegram service
+  // reads its own per-user notifications_enabled flag.
+  const providerLabel = PROVIDER_LABELS[event.provider] || event.provider || 'Session';
+  const sessionTitle = event.meta?.sessionName || providerLabel;
+  const errorText = event.meta?.error || '';
+  notifyTelegramUser({
+    userId,
+    kind: event.kind,
+    title: sessionTitle,
+    error: errorText,
+  }).catch((err) => {
+    console.warn('[telegram] notify failed:', err?.message || 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 {
+  createNotificationEvent,
+  notifyUserIfEnabled,
+  notifyRunStopped,
+  notifyRunFailed
+};

package/server/services/provider-credentials.js

@@ -0,0 +1,151 @@
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+/**
+ * Central credentials store for CLI providers.
+ *
+ * File: `~/.pixcode/provider-credentials.json`. Lets the UI save an API key
+ * (and optional base URL for OpenAI-compatible providers) once and have it
+ * picked up by:
+ *   - the spawn adapters (claude-sdk.js, cursor-cli.js, openai-codex.js,
+ *     gemini-cli.js, qwen-code-cli.js) when they launch the CLI subprocess
+ *   - the provider-auth modules as an additional "authenticated" signal
+ *
+ * Keeping credentials in one file instead of per-CLI config files means we
+ * don't have to learn each CLI's settings schema just to set an API key,
+ * and users see one "Logout" button that actually clears everything.
+ */
+
+const CONFIG_FILE = path.join(os.homedir(), '.pixcode', 'provider-credentials.json');
+
+/**
+ * Map provider id → {apiKeyEnv, baseUrlEnv} so we know which env vars to
+ * inject into the spawn env. Cursor is OAuth-only; it has no api-key entry.
+ */
+export const PROVIDER_ENV_VARS = Object.freeze({
+    claude: { apiKeyEnv: 'ANTHROPIC_API_KEY', baseUrlEnv: 'ANTHROPIC_BASE_URL' },
+    codex:  { apiKeyEnv: 'OPENAI_API_KEY',    baseUrlEnv: 'OPENAI_BASE_URL' },
+    gemini: { apiKeyEnv: 'GEMINI_API_KEY',    baseUrlEnv: null },
+    qwen:   { apiKeyEnv: 'OPENAI_API_KEY',    baseUrlEnv: 'OPENAI_BASE_URL' },
+});
+
+async function readStore() {
+    try {
+        const raw = await fs.readFile(CONFIG_FILE, 'utf8');
+        const parsed = JSON.parse(raw);
+        return parsed && typeof parsed === 'object' ? parsed : {};
+    } catch {
+        return {};
+    }
+}
+
+async function writeStore(next) {
+    await fs.mkdir(path.dirname(CONFIG_FILE), { recursive: true });
+    await fs.writeFile(CONFIG_FILE, JSON.stringify(next, null, 2), { mode: 0o600 });
+}
+
+/**
+ * Returns `{ apiKey, baseUrl }` for the given provider, or `null` if no key
+ * is stored. Safe to call on any provider id — unknown ids yield null.
+ */
+export async function getProviderCredentials(provider) {
+    const store = await readStore();
+    const entry = store[provider];
+    if (!entry || typeof entry !== 'object') return null;
+    const apiKey = typeof entry.apiKey === 'string' && entry.apiKey.trim() ? entry.apiKey.trim() : null;
+    if (!apiKey) return null;
+    const baseUrl = typeof entry.baseUrl === 'string' && entry.baseUrl.trim() ? entry.baseUrl.trim() : null;
+    return { apiKey, baseUrl };
+}
+
+/** Persist credentials; empty string apiKey deletes the entry. */
+export async function setProviderCredentials(provider, { apiKey, baseUrl }) {
+    const store = await readStore();
+    const trimmedKey = typeof apiKey === 'string' ? apiKey.trim() : '';
+    if (!trimmedKey) {
+        delete store[provider];
+    } else {
+        store[provider] = {
+            apiKey: trimmedKey,
+            baseUrl: typeof baseUrl === 'string' && baseUrl.trim() ? baseUrl.trim() : null,
+            updatedAt: new Date().toISOString(),
+        };
+    }
+    await writeStore(store);
+}
+
+export async function clearProviderCredentials(provider) {
+    await setProviderCredentials(provider, { apiKey: '', baseUrl: null });
+}
+
+/**
+ * Builds an env object that inherits from the server process env and
+ * overlays stored credentials for the given provider. Use when spawning
+ * a CLI subprocess so the user's Pixcode-configured key is available
+ * without leaking unrelated provider keys into the child.
+ */
+export async function buildSpawnEnv(provider, baseEnv = process.env) {
+    const envVars = PROVIDER_ENV_VARS[provider];
+    const env = { ...baseEnv };
+    if (!envVars) return env;
+
+    const creds = await getProviderCredentials(provider);
+    if (!creds) return env;
+
+    if (envVars.apiKeyEnv) env[envVars.apiKeyEnv] = creds.apiKey;
+    if (envVars.baseUrlEnv && creds.baseUrl) env[envVars.baseUrlEnv] = creds.baseUrl;
+    return env;
+}
+
+/**
+ * Apply stored credentials onto `process.env` for every known provider.
+ * Called on server boot so SDK-based integrations (Claude, Codex) see the
+ * API keys without reading our credentials file directly. Subprocess spawns
+ * go through `buildSpawnEnv` which layers on top of this.
+ */
+export async function applyAllStoredCredentialsToEnv() {
+    const store = await readStore();
+    for (const [provider, envVars] of Object.entries(PROVIDER_ENV_VARS)) {
+        const entry = store[provider];
+        if (!entry || typeof entry !== 'object') continue;
+        const apiKey = typeof entry.apiKey === 'string' ? entry.apiKey.trim() : '';
+        const baseUrl = typeof entry.baseUrl === 'string' ? entry.baseUrl.trim() : '';
+        if (envVars.apiKeyEnv && apiKey) process.env[envVars.apiKeyEnv] = apiKey;
+        if (envVars.baseUrlEnv && baseUrl) process.env[envVars.baseUrlEnv] = baseUrl;
+    }
+}
+
+/**
+ * Sync a single provider's credentials into `process.env` (or clear them
+ * when no key is set). Call after mutating the store via the API so the
+ * effect is immediate instead of needing a restart.
+ */
+export async function applyProviderCredentialsToEnv(provider) {
+    const envVars = PROVIDER_ENV_VARS[provider];
+    if (!envVars) return;
+    const creds = await getProviderCredentials(provider);
+    if (envVars.apiKeyEnv) {
+        if (creds?.apiKey) process.env[envVars.apiKeyEnv] = creds.apiKey;
+        else delete process.env[envVars.apiKeyEnv];
+    }
+    if (envVars.baseUrlEnv) {
+        if (creds?.baseUrl) process.env[envVars.baseUrlEnv] = creds.baseUrl;
+        else delete process.env[envVars.baseUrlEnv];
+    }
+}
+
+/** Listing + logout helpers for the UI. */
+export async function listProviderCredentialSummaries() {
+    const store = await readStore();
+    const out = {};
+    for (const key of Object.keys(PROVIDER_ENV_VARS)) {
+        const entry = store[key];
+        out[key] = {
+            hasKey: Boolean(entry && typeof entry.apiKey === 'string' && entry.apiKey.trim()),
+            baseUrl: entry && typeof entry.baseUrl === 'string' && entry.baseUrl.trim() ? entry.baseUrl.trim() : null,
+            updatedAt: entry && typeof entry.updatedAt === 'string' ? entry.updatedAt : null,
+        };
+    }
+    return out;
+}