mixdog 1.3.4 → 1.4.0

package/src/session-runtime/mcp-glue/server-catalog.mjs

@@ -2,7 +2,15 @@
 // servers plus the servers registered plugins declare (resolved live, with
 // explicit owner metadata), per-server config reads, and the live/failed rollup.
 import { clean } from '../../runtime/agent/orchestrator/runtime-core/session-text.mjs';
-import { connectorOfServer, gmailAppPasswordAccount } from '../../runtime/shared/connector-catalog.mjs';
+import {
+  connectorAccountEnabled,
+  connectorAccountServer,
+  connectorAccountsOf,
+  connectorOfServer,
+  gmailAppPasswordAccount,
+} from '../../runtime/shared/connector-catalog.mjs';
+import { connectorAccountHealth } from '../../runtime/connectors/connector-accounts-mcp.mjs';
+import { googleOAuthClient } from '../../runtime/shared/google-oauth-client.mjs';
 import { envFlag } from '../../runtime/shared/env.mjs';
 import { resolveMcpServerCatalog } from './plugin-servers.mjs';
 
@@ -111,6 +119,25 @@ export function createMcpServerCatalog({
     };
   }
 
+  /** One account of a multi-account connector server, as its row lists it:
+   *  `{ name, email, enabled?, appPassword?, oauth?, ownClient?, error?, authRequired? }`
+   *  (`enabled: false` only for an account that is switched off). */
+  function accountRow(accountCfg, enabled) {
+    const address = gmailAppPasswordAccount(accountCfg);
+    const oauth = address ? null : mcpClient.getMcpServerOAuthState?.(accountCfg);
+    const state = connectorAccountHealth(accountCfg.name);
+    const authRequired = Boolean(oauth && oauth.signedIn !== true) || state?.authRequired === true;
+    return {
+      name: accountCfg.name,
+      ...(enabled ? {} : { enabled: false }),
+      email: address || oauth?.account || state?.email || '',
+      ...(address ? { appPassword: { account: address } } : {}),
+      ...(oauth ? { oauth } : {}),
+      ...(typeof accountCfg.oauthClientId === 'string' && accountCfg.oauthClientId.trim() ? { ownClient: true } : {}),
+      ...(authRequired ? { authRequired: true } : state?.error ? { error: state.error } : {}),
+    };
+  }
+
   function statusRows(catalog) {
     const { servers: configured, sources, entries } = catalog;
     const connected = new Map((mcpClient.getMcpServerStatus?.(getMcpScopeId()) || []).map((row) => [row.name, row]));
@@ -125,7 +152,19 @@ export function createMcpServerCatalog({
         failures.get(name) || (dead ? { msg: live.error || live.lastError || 'MCP server is not alive' } : undefined);
       const entry = entries[name] || {};
       const loginPending = !(live && !dead) && mcpClient.isMcpLoginPending?.(name, getMcpScopeId()) === true;
-      const status = mcpServerStatus(cfg, live && !dead, fail, loginPending);
+      const accounts = entry.owner
+        ? []
+        : connectorAccountsOf(cfg).map((account) =>
+            accountRow(connectorAccountServer(cfg, account), connectorAccountEnabled(account))
+          );
+      // A connector server none of whose accounts is signed in needs a sign-in, not a repair.
+      const accountsSignIn = accounts.length > 0 && accounts.every((account) => account.authRequired === true);
+      const status = mcpServerStatus(
+        cfg,
+        live && !dead,
+        fail && accountsSignIn ? { ...fail, authRequired: true } : fail,
+        loginPending
+      );
       // Needing an OAuth sign-in is a state, not an error.
       const authRequired = status === 'sign-in required';
       const row = {
@@ -153,6 +192,16 @@ export function createMcpServerCatalog({
       // Gmail connected with an app password: the account it runs as.
       const appPasswordAccount = gmailAppPasswordAccount(cfg);
       if (appPasswordAccount) row.appPassword = { account: appPasswordAccount };
+      // A catalog connector running on the user's own Google client.
+      if (connector && typeof cfg?.oauthClientId === 'string' && cfg.oauthClientId.trim()) row.ownClient = true;
+      if (accounts.length) {
+        // A multi-account connector: its accounts, each with its own state.
+        row.accounts = accounts;
+        if (accounts.some((account) => account.ownClient)) row.ownClient = true;
+        // One account reads like the one-account server it replaces.
+        if (accounts.length === 1 && accounts[0].oauth) row.oauth = accounts[0].oauth;
+        if (accounts.length === 1 && accounts[0].appPassword) row.appPassword = accounts[0].appPassword;
+      }
       if (entry.owner) {
         row.owner = entry.owner;
         row.pluginEnabled = entry.pluginEnabled;
@@ -172,7 +221,13 @@ export function createMcpServerCatalog({
 
   function mcpStatus() {
     if (envFlag('MIXDOG_DISABLE_MCP')) {
-      return { servers: [], configuredCount: 0, connectedCount: 0, failedCount: 0 };
+      return {
+        servers: [],
+        configuredCount: 0,
+        connectedCount: 0,
+        failedCount: 0,
+        googleClient: Boolean(googleOAuthClient()),
+      };
     }
     const catalog = resolveCatalog();
     const servers = statusRows(catalog);
@@ -186,6 +241,9 @@ export function createMcpServerCatalog({
       failedCount: servers.filter((row) => row.status === 'failed').length,
       warnings: catalog.warnings,
       declarationErrors,
+      // Whether this build carries Mixdog's own Google client (else the
+      // Google sign-ins need the user's own client).
+      googleClient: Boolean(googleOAuthClient()),
     };
   }
 

package/src/session-runtime/mcp-oauth-login.mjs

@@ -8,7 +8,7 @@ import { openInBrowser } from '../runtime/shared/open-url.mjs';
 // Settled flows stay readable long enough for a poller to observe the result.
 const SETTLED_FLOW_TTL_MS = 10 * 60_000;
 const NOT_COMPLETED = 'MCP OAuth sign-in was not completed';
-export const MCP_OAUTH_LOGIN_TIMED_OUT = 'MCP OAuth sign-in timed out';
+const MCP_OAUTH_LOGIN_TIMED_OUT = 'MCP OAuth sign-in timed out';
 // A sign-in nobody finishes ends here, ahead of the OAuth layer's own 5-minute
 // abort, so its failure is reported as the timeout it is.
 const LOGIN_DEADLINE_MS = 5 * 60_000 - 10_000;
@@ -125,7 +125,9 @@ export function createMcpOAuthLogins({
     Promise.all([...flows.values()].filter((flow) => flow.owner === owner && flow.name === name).map(cancelFlow));
 
   async function begin(name, options = {}) {
-    const { openBrowser: hostBrowser, mode = 'connect' } = options || {};
+    // `beside`: run any mode through `switchAccount` (a sign-in beside the
+    // stored one, for an account that is not a server of its own).
+    const { openBrowser: hostBrowser, mode = 'connect', beside = false } = options || {};
     if (hostBrowser !== undefined && typeof hostBrowser !== 'boolean') {
       throw new TypeError('openBrowser must be a boolean');
     }
@@ -178,7 +180,7 @@ export function createMcpOAuthLogins({
       flow.done = (async () => {
         try {
           const outcome =
-            mode === 'switch'
+            mode === 'switch' || beside === true
               ? await switchAccount(name, launch, {
                   set abort(fn) {
                     flow.abort = fn;