neoagent 2.3.1-beta.4 → 2.3.1-beta.41

package/server/services/integrations/oauth_provider.js

@@ -241,14 +241,17 @@ function createOAuthProvider(options = {}) {
     label: options.label,
     description: options.description,
     icon: options.icon,
+    requiresRefreshToken: options.requiresRefreshToken === true,
     apps: apps.map(({ id, label, description }) => ({ id, label, description })),
     connectPrompt: options.connectPrompt || null,
+    supportsMultipleAccounts: options.supportsMultipleAccounts !== false,
+    connectionMethod: options.connectionMethod || 'oauth',
     getApp,
     getToolAppId(toolName) {
       return toolAppMap.get(String(toolName || '').trim()) || null;
     },
-    getEnvStatus() {
-      return options.getEnvStatus();
+    getEnvStatus(context = {}) {
+      return options.getEnvStatus(context);
     },
     getToolDefinitions(toolOptions = {}) {
       const connectedAppIds = new Set(toolOptions.connectedAppIds || []);
@@ -257,8 +260,8 @@ function createOAuthProvider(options = {}) {
     supportsTool(toolName) {
       return toolAppMap.has(String(toolName || '').trim());
     },
-    buildSnapshot(connectionRows) {
-      const env = this.getEnvStatus();
+    buildSnapshot(connectionRows, context = {}) {
+      const env = this.getEnvStatus(context);
       const byApp = new Map();
       for (const row of Array.isArray(connectionRows) ? connectionRows : []) {
         const appId = String(row.app_key || '').trim();
@@ -311,15 +314,17 @@ function createOAuthProvider(options = {}) {
           0,
         ),
         connectPrompt: this.connectPrompt,
+        supportsMultipleAccounts: this.supportsMultipleAccounts,
+        connectionMethod: this.connectionMethod,
       };
     },
-    async beginOAuth({ state, codeVerifier, appKey, userId }) {
+    async beginOAuth({ state, codeVerifier, appKey, userId, agentId }) {
       const app = getApp(appKey);
       if (!app) {
         throw new Error(`Unknown ${this.label} app: ${appKey}`);
       }
       const normalizedState = assertValidOAuthState(state);
-      const env = this.getEnvStatus();
+      const env = this.getEnvStatus({ userId, agentId });
       if (!env.configured) {
         throw new Error(env.summary);
       }
@@ -327,11 +332,12 @@ function createOAuthProvider(options = {}) {
         state: normalizedState,
         codeVerifier,
         userId,
+        agentId,
         app,
         env,
       });
     },
-    async finishOAuth({ code, codeVerifier, appKey, userId, state }) {
+    async finishOAuth({ code, codeVerifier, appKey, userId, agentId, state }) {
       const app = getApp(appKey);
       if (!app) {
         throw new Error(`Unknown ${this.label} app: ${appKey}`);
@@ -341,9 +347,10 @@ function createOAuthProvider(options = {}) {
         code,
         codeVerifier,
         userId,
+        agentId,
         state: normalizedState,
         app,
-        env: this.getEnvStatus(),
+        env: this.getEnvStatus({ userId, agentId }),
       });
     },
     async disconnect(connectionRow) {
@@ -368,12 +375,19 @@ function createOAuthProvider(options = {}) {
         appId: toolAppMap.get(String(toolName || '').trim()) || connectionRow.app_key,
         connection: connectionRow,
         credentials,
+        env: this.getEnvStatus({
+          userId: connectionRow?.user_id,
+          agentId: connectionRow?.agent_id,
+        }),
       });
     },
     summarizeConnection(connectionRows) {
       const snapshot = this.buildSnapshot(connectionRows);
       if (!snapshot.connection.connected) {
         if (snapshot.connection.status === 'env_not_configured') {
+          if (snapshot?.env?.setupMode === 'user') {
+            return `${this.label} still needs per-user setup before accounts can connect.`;
+          }
           return `${this.label} still needs administrator setup before accounts can connect.`;
         }
         return `${this.label} is not connected.`;
@@ -392,6 +406,9 @@ function createOAuthProvider(options = {}) {
     },
     summarizeForModel(snapshot) {
       if (!snapshot?.env?.configured) {
+        if (snapshot?.env?.setupMode === 'user') {
+          return `${this.label}: setup is user-managed and is not complete yet. If the user wants to use it, tell them to open Official Integrations and finish setup in their account first.`;
+        }
         return `${this.label}: workspace setup is not complete yet. If the user wants to use it, tell them to open Official Integrations and ask an administrator to finish setup first.`;
       }
 

package/server/services/integrations/provider_config_store.js

@@ -0,0 +1,85 @@
+'use strict';
+
+const db = require('../../db/database');
+const { decryptValue, encryptValue } = require('./secrets');
+const { resolveAgentId } = require('../agents/manager');
+
+function normalizeProviderKey(providerKey) {
+  return String(providerKey || '').trim();
+}
+
+function parseConfig(value) {
+  try {
+    const parsed = JSON.parse(decryptValue(value || '{}') || '{}');
+    return parsed && typeof parsed === 'object' ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function getProviderConfig(userId, providerKey, agentId = null) {
+  const normalizedProviderKey = normalizeProviderKey(providerKey);
+  const normalizedUserId = Number(userId);
+  if (!Number.isInteger(normalizedUserId) || normalizedUserId <= 0 || !normalizedProviderKey) {
+    return {};
+  }
+  const scopedAgentId = resolveAgentId(normalizedUserId, agentId);
+
+  const row = db
+    .prepare(
+      `SELECT config_json
+       FROM integration_provider_configs
+       WHERE user_id = ? AND agent_id = ? AND provider_key = ?`,
+    )
+    .get(normalizedUserId, scopedAgentId, normalizedProviderKey);
+
+  return parseConfig(row?.config_json);
+}
+
+function setProviderConfig(userId, providerKey, config, agentId = null) {
+  const normalizedProviderKey = normalizeProviderKey(providerKey);
+  const normalizedUserId = Number(userId);
+  if (!Number.isInteger(normalizedUserId) || normalizedUserId <= 0 || !normalizedProviderKey) {
+    throw new Error('A valid user and provider are required to save integration config.');
+  }
+  const scopedAgentId = resolveAgentId(normalizedUserId, agentId);
+
+  const payload = config && typeof config === 'object' ? config : {};
+  db.prepare(
+    `INSERT INTO integration_provider_configs (
+       user_id,
+       agent_id,
+       provider_key,
+       config_json,
+       created_at,
+       updated_at
+     ) VALUES (?, ?, ?, ?, datetime('now'), datetime('now'))
+     ON CONFLICT(user_id, agent_id, provider_key) DO UPDATE SET
+       config_json = excluded.config_json,
+       updated_at = excluded.updated_at`,
+  ).run(
+    normalizedUserId,
+    scopedAgentId,
+    normalizedProviderKey,
+    encryptValue(JSON.stringify(payload)),
+  );
+}
+
+function deleteProviderConfig(userId, providerKey, agentId = null) {
+  const normalizedProviderKey = normalizeProviderKey(providerKey);
+  const normalizedUserId = Number(userId);
+  if (!Number.isInteger(normalizedUserId) || normalizedUserId <= 0 || !normalizedProviderKey) {
+    return;
+  }
+  const scopedAgentId = resolveAgentId(normalizedUserId, agentId);
+
+  db.prepare(
+    'DELETE FROM integration_provider_configs WHERE user_id = ? AND agent_id = ? AND provider_key = ?',
+  ).run(normalizedUserId, scopedAgentId, normalizedProviderKey);
+}
+
+module.exports = {
+  deleteProviderConfig,
+  getProviderConfig,
+  setProviderConfig,
+};

package/server/services/integrations/registry.js

@@ -2,7 +2,9 @@
 
 const { createFigmaProvider } = require('./figma/provider');
 const { createGoogleWorkspaceProvider } = require('./google/provider');
+const { createGithubProvider } = require('./github/provider');
 const { createHomeAssistantProvider } = require('./home_assistant/provider');
+const { createTrelloProvider } = require('./trello/provider');
 const { createMicrosoftProvider } = require('./microsoft/provider');
 const { createNotionProvider } = require('./notion/provider');
 const { createSpotifyProvider } = require('./spotify/provider');
@@ -13,11 +15,13 @@ const { createWhatsAppPersonalProvider } = require('./whatsapp');
 function createIntegrationRegistry(options = {}) {
   const providers = [
     createGoogleWorkspaceProvider(),
+    createGithubProvider(),
     createNotionProvider(),
     createMicrosoftProvider(),
     createSlackProvider(),
     createFigmaProvider(),
     createHomeAssistantProvider(),
+    createTrelloProvider(),
     createWeatherProvider(),
     createSpotifyProvider(),
     createWhatsAppPersonalProvider(options),

package/server/services/integrations/spotify/provider.js

@@ -394,6 +394,7 @@ function createSpotifyProvider() {
     label: 'Spotify',
     description: 'Official Spotify account integration for music search and playback control.',
     icon: 'spotify',
+    requiresRefreshToken: true,
     apps: SPOTIFY_APPS,
     toolDefinitions: spotifyToolDefinitions,
     connectPrompt: