mcp-google-multi 6.0.0-alpha.44 → 6.0.0-alpha.45

package/dist/index.js

@@ -381,6 +381,13 @@ async function main() {
         // re-auth link into the AS's alias_reauth flow instead of a stdio CLI hint.
         const { setHttpReauthBase } = await import('./reauth-hint.js');
         setHttpReauthBase(httpCfg.publicUrl);
+        // Wizard consent over HTTP: hand out the clientless AS link instead of
+        // binding a loopback listener (single-owner flow; a tenancy host installs
+        // its own signed-mint context here).
+        const { setWizardHttpConsent } = await import('./tools/account-wizard.js');
+        setWizardHttpConsent({
+            mintConsentUrl: (alias) => `${httpCfg.publicUrl}/authorize?flow=alias_reauth&alias=${encodeURIComponent(alias)}`,
+        });
         let httpTap;
         if (httpMetrics) {
             const { tapUsageMetrics } = await import('./metrics-tap.js');

package/dist/tools/account-wizard.d.ts

@@ -53,4 +53,13 @@ export declare function argsToAddForm(a: {
 /** Scopes requested by the profile but NOT granted at consent (granular
  * consent / unchecked bundles). Pure. */
 export declare function scopeGrantDiff(requested: string[], grantedScope: string | undefined): string[];
+/** HTTP-transport consent context (S1.20): set by the HTTP bootstrap. When
+ * present, runConsent NEVER binds a server-side loopback listener — the
+ * user's browser cannot reach the daemon's loopback — and instead hands out
+ * a clientless AS consent URL. The injector decides the flow (single-owner =
+ * the legacy alias_reauth link; a tenancy host mints a signed alias_add URL). */
+export interface WizardHttpConsent {
+    mintConsentUrl: (alias: string) => Promise<string> | string;
+}
+export declare function setWizardHttpConsent(ctx: WizardHttpConsent | null): void;
 export declare function registerAccountWizardTools(registry: ToolRegistry, server: McpServer): void;

package/dist/tools/account-wizard.js

@@ -136,6 +136,15 @@ function errorResult(slug, message, hint, account) {
         isError: true,
     };
 }
+let httpConsent = null;
+export function setWizardHttpConsent(ctx) {
+    httpConsent = ctx;
+}
+function pendingText(alias, url) {
+    return (`Account "${alias}" is ready to authorize. Open this link in a browser (it belongs to whoever owns the Google account):\n${url}\n` +
+        `On completion the token is stored server-side and the account is usable immediately — no restart. ` +
+        `If the link expires, run account_reauth for a fresh one.\n${TESTING_MODE_WARNING}`);
+}
 /** Run Google consent for `alias` and persist the token. Opens the browser via
  * URL-mode elicitation when the client supports it, else server-side + prints
  * the URL. Returns the granted-scope diff for the S4 report. */
@@ -150,6 +159,29 @@ async function runConsent(server, alias) {
             hint: 'Accounts sourced from GOOGLE_ACCOUNTS are not editable here. Run `mcp-google-multi migrate-config` to move them into config.json.',
         };
     }
+    // HTTP transport: consent completes OUT OF BAND at the AS /callback. Never
+    // bind a loopback listener here; try URL-mode elicitation as a convenience
+    // but surface the URL UP FRONT either way (not only on failure).
+    const http = httpConsent;
+    if (http) {
+        let url;
+        try {
+            url = await http.mintConsentUrl(alias);
+        }
+        catch (e) {
+            return { ok: false, slug: 'internal', message: safeMessage(e) };
+        }
+        const caps = server.server.getClientCapabilities?.();
+        if (caps?.elicitation?.url !== undefined) {
+            try {
+                await server.server.elicitInput(urlElicitationParams(alias, url, randomBytes(16).toString('hex')));
+            }
+            catch {
+                // the URL in the pending text is the recovery
+            }
+        }
+        return { ok: 'pending', url };
+    }
     // Bind the ephemeral loopback listener BEFORE building the auth URL: the
     // redirect URI needs the assigned port, and listening first means the
     // callback can't race the browser.
@@ -267,6 +299,8 @@ export function registerAccountWizardTools(registry, server) {
             invalidateAccountSet();
             // S3 + S4: consent + validate.
             const consent = await runConsent(server, validated.alias);
+            if (consent.ok === 'pending')
+                return textResult(pendingText(validated.alias, consent.url));
             if (!consent.ok)
                 return errorResult(consent.slug, consent.message, consent.hint, validated.alias);
             // B15: offer to register the server with another MCP client.
@@ -303,6 +337,8 @@ export function registerAccountWizardTools(registry, server) {
                 return errorResult('validation_error', `Unknown account "${alias}".`, `Pass one of the configured aliases: ${getAccountSet().aliases.join(', ')}. Use account_add to create a new one.`, alias);
             }
             const consent = await runConsent(server, alias);
+            if (consent.ok === 'pending')
+                return textResult(pendingText(alias, consent.url));
             if (!consent.ok)
                 return errorResult(consent.slug, consent.message, consent.hint, alias);
             return textResult(s4Text(alias, consent.missing));
@@ -353,6 +389,12 @@ export function registerAccountWizardTools(registry, server) {
                 if (client.managed === 'cli') {
                     blocks.push(`${client.label}: run\n  ${instr.text}`);
                 }
+                else if (a.write && mode === 'http') {
+                    // Over HTTP this tool runs on the DAEMON, whose homedir is not the
+                    // caller's machine: write:true would edit the operator's own client
+                    // configs (a cross-tenant hazard under tenancy). Snippet only.
+                    blocks.push(`${client.label}: write:true is ignored over HTTP — this tool runs on the server, not your machine. Add to ${instr.path}\n${instr.text}`);
+                }
                 else if (a.write) {
                     const res = applyFileEntry(client, name, entry);
                     blocks.push(res.ok

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mcp-google-multi",
-  "version": "6.0.0-alpha.44",
+  "version": "6.0.0-alpha.45",
   "mcpName": "io.github.bakissation/mcp-google-multi",
   "description": "Local MCP server for Google Workspace (Gmail, Drive, Calendar, Sheets, Docs, Contacts, Tasks, Meet, Search Console, +Forms/Chat/Admin) across multiple accounts — OAuth-only, encrypted token storage, deny-by-default writes.",
   "type": "module",