fluxmail 0.2.0 → 0.3.0

package/LICENSE.md

@@ -0,0 +1,111 @@
+# Fluxmail Proprietary License Agreement
+
+Version 1.0, July 12, 2026
+
+Copyright © 2026 Fluxmail. All rights reserved.
+
+This Fluxmail Proprietary License Agreement (the “Agreement”) is between Fluxmail and the individual or entity accepting this Agreement (“you”). If you use the Software for an organization, you represent that you have authority to bind that organization, and “you” includes that organization.
+
+By downloading, copying, installing, modifying, or using the Software, you accept this Agreement. If you do not accept it, do not use the Software.
+
+## 1. Definitions
+
+“Software” means the Fluxmail software distributed with this Agreement, including its source code, object code, documentation, and any Fluxmail updates or modifications provided under this Agreement. Software does not include Third-Party Software.
+
+“License Entitlement” means the users, mailboxes, instances, features, usage limits, term, and other rights authorized by a license key, built-in plan, order form, subscription record, or other written authorization issued by Fluxmail.
+
+“Production Use” means using the Software for live personal, business, organizational, customer-facing, or revenue-generating operations. It includes processing live mailbox data or making the Software available to users other than solely for development, testing, security review, or evaluation.
+
+“Non-Production Use” means private development, testing, security review, or evaluation that does not process live operations or provide a service to end users.
+
+“Third-Party Software” means software identified as third-party or open-source software, including dependencies distributed with or used by the Software.
+
+“Competing Product” means a product or service whose primary purpose is to provide third parties with a self-hosted or hosted email integration server, email-agent interface, or email API offering substantially similar core functionality to the Software. It does not include software developed and used solely for your own internal operations.
+
+## 2. License grant
+
+Subject to this Agreement, Fluxmail grants you a limited, worldwide, non-exclusive, non-transferable, non-sublicensable license to:
+
+1. view, audit, download, copy, compile, and run the Software for Non-Production Use;
+2. make private modifications to the Software for your own use;
+3. make reasonable backup and archival copies;
+4. use GitHub’s standard public-repository features to view and fork the Software solely as needed to exercise the rights in items 1 through 3; and
+5. use the Software in Production Use only within a valid License Entitlement.
+
+A License Entitlement may be offered without charge. A zero-dollar or built-in entitlement remains subject to this Agreement and to its stated limits.
+
+All rights not expressly granted in this Agreement are reserved by Fluxmail.
+
+## 3. License Entitlements and technical controls
+
+Your Production Use must stay within your License Entitlement. A License Entitlement applies only to the person, organization, and instances it covers. You may not share a license key outside that person or organization or use it on more instances than authorized.
+
+You may not modify, remove, disable, circumvent, bypass, or interfere with any license-key validation, entitlement enforcement, usage metering, plan limitation, or other technical restriction in the Software. You may not enable or expose functionality protected by any of those controls except as authorized by your License Entitlement.
+
+Modified versions and derivative works containing any part of the Software remain subject to this Agreement. Production Use of them requires a valid License Entitlement covering that use.
+
+## 4. Restrictions
+
+Unless Fluxmail gives you separate written permission, you may not:
+
+1. distribute, publish, sell, sublicense, rent, lease, or otherwise provide the Software or a modified version to a third party;
+2. publish or maintain a fork for distributing the Software, providing production-ready builds to others, avoiding License Entitlements, or operating a Competing Product;
+3. offer the Software or its substantial features to third parties as a hosted, managed, time-sharing, or service-bureau product;
+4. white-label the Software or represent it as your own product;
+5. embed or incorporate the Software into a product or service distributed or provided to third parties;
+6. use the Software or its source code to develop, train, support, or operate a Competing Product;
+7. exceed or help another person exceed a License Entitlement;
+8. remove, alter, or obscure copyright, license, attribution, or trademark notices; or
+9. use Fluxmail names, logos, or trademarks except as allowed by applicable law or separate written permission.
+
+These restrictions do not limit rights that applicable law does not allow Fluxmail to restrict.
+
+## 5. Ownership and modifications
+
+Fluxmail and its licensors retain all right, title, and interest in the Software, including all intellectual property rights. This Agreement does not transfer ownership of the Software to you.
+
+As between you and Fluxmail, you retain ownership of code you write independently. Your ownership of a modification does not give you rights in the underlying Software or permission to distribute or commercially exploit a combined or derivative work.
+
+## 6. Third-Party Software
+
+Third-Party Software is licensed under its own terms, not this Agreement. If a third-party license conflicts with this Agreement for that Third-Party Software, the third-party license controls for that component. You are responsible for complying with applicable third-party terms.
+
+## 7. Orders, subscriptions, and other agreements
+
+Pricing, payment, renewal, cancellation, support, and service terms may be stated in an order form, subscription terms, or another agreement with Fluxmail. If that agreement conflicts with this Agreement, it controls for the specific subject and parties it covers.
+
+Each release of the Software is governed by the license version distributed with that release. Fluxmail may distribute later releases under updated terms, but updated terms do not change the license for a release you already received unless you agree otherwise.
+
+## 8. Term and termination
+
+This Agreement continues until terminated. It terminates automatically if you materially breach it and do not cure the breach within 30 days after receiving notice from Fluxmail. A breach involving circumvention of technical controls, unauthorized distribution, or misuse of a license key may be terminated immediately if it cannot reasonably be cured.
+
+When this Agreement terminates, you must stop using and delete all copies of the Software in your possession or control, except copies you must retain by law. Sections 4 through 12 survive termination. Termination does not affect rights or remedies that accrued before termination.
+
+Expiration, cancellation, or downgrade of a License Entitlement may reduce or end your authorized Production Use without terminating this Agreement. Any grace period or restricted mode is determined by the applicable License Entitlement and the Software release you use.
+
+## 9. Disclaimer of warranties
+
+TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED “AS IS” AND “AS AVAILABLE,” WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND. FLUXMAIL DISCLAIMS ALL EXPRESS, IMPLIED, AND STATUTORY WARRANTIES, INCLUDING WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND THAT THE SOFTWARE WILL BE SECURE, UNINTERRUPTED, OR ERROR-FREE.
+
+## 10. Limitation of liability
+
+TO THE MAXIMUM EXTENT PERMITTED BY LAW, FLUXMAIL WILL NOT BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, EXEMPLARY, OR PUNITIVE DAMAGES, OR FOR ANY LOSS OF DATA, REVENUE, PROFITS, GOODWILL, OR BUSINESS OPPORTUNITY, ARISING OUT OF OR RELATED TO THE SOFTWARE OR THIS AGREEMENT, EVEN IF FLUXMAIL WAS ADVISED THAT SUCH DAMAGES WERE POSSIBLE.
+
+TO THE MAXIMUM EXTENT PERMITTED BY LAW, FLUXMAIL’S TOTAL LIABILITY ARISING OUT OF OR RELATED TO THE SOFTWARE OR THIS AGREEMENT WILL NOT EXCEED THE GREATER OF (A) THE AMOUNT YOU PAID FLUXMAIL FOR THE SOFTWARE DURING THE 12 MONTHS BEFORE THE EVENT GIVING RISE TO THE CLAIM OR (B) US$100.
+
+Some jurisdictions do not allow certain warranty disclaimers or liability limitations. In those jurisdictions, these provisions apply only to the extent permitted by law.
+
+## 11. Notices
+
+Fluxmail may give you notice under this Agreement by email to any address you provided in connection with a License Entitlement, order, subscription, support request, or other communication with Fluxmail. An email notice is deemed received on the first business day after it is sent unless Fluxmail receives a delivery-failure message. You are responsible for keeping your contact information current.
+
+## 12. General terms
+
+You may not assign or transfer this Agreement or your License Entitlement without Fluxmail’s prior written consent. Fluxmail may assign this Agreement in connection with a merger, acquisition, reorganization, or sale of substantially all related assets.
+
+If any provision of this Agreement is unenforceable, it will be enforced to the maximum extent permitted, and the remaining provisions will remain in effect. A waiver must be in writing and applies only to the specific instance stated. Headings are for convenience and do not affect interpretation.
+
+This Agreement is governed by the laws of the State of New Jersey, excluding its conflict-of-law rules. Any dispute arising out of or relating to the Software or this Agreement must be brought exclusively in a state or federal court of competent jurisdiction located in New Jersey. You and Fluxmail consent to the personal jurisdiction of those courts. This paragraph does not limit rights that applicable law does not allow a party to waive.
+
+This Agreement, together with any applicable License Entitlement and agreement described in Section 7, is the entire agreement between you and Fluxmail about the Software and replaces prior discussions or understandings about its licensing.

package/README.md

@@ -1,15 +1,21 @@
 # Fluxmail
 
-Fluxmail is a self-hosted MCP server that connects AI agents to Gmail and IMAP/SMTP mailboxes. It gives MCP clients a consistent set of tools to read, search, draft, send, and organize email.
+[Fluxmail](https://github.com/churichard/fluxmail-mcp) is a self-hosted MCP server that connects AI agents to Gmail and IMAP/SMTP mailboxes. It gives MCP clients a consistent set of tools to read, search, draft, send, and organize email.
 
 ## Install
 
-Fluxmail requires Node.js 20 or later.
+Fluxmail requires Node.js 20.20.x, or Node.js 22.22 or later.
 
 ```bash
 npm install -g fluxmail
 ```
 
+To run Fluxmail without installing it globally:
+
+```bash
+npx fluxmail
+```
+
 ## Connect Gmail
 
 Create a Google Cloud OAuth client with the Gmail API enabled, then save its credentials:
@@ -20,7 +26,15 @@ fluxmail config set GOOGLE_CLIENT_SECRET <your-client-secret>
 fluxmail accounts add gmail
 ```
 
-The last command opens Google's consent flow in your browser.
+For a local installation, the last command starts Google's consent flow in your browser.
+
+For Docker or a remote server, set `FLUXMAIL_PUBLIC_URL` to the server's public HTTPS address and register `<FLUXMAIL_PUBLIC_URL>/auth/google/callback` as an authorized redirect URI in Google Cloud. Run the command on the server, then open the printed URL in your local browser:
+
+```bash
+docker compose exec fluxmail fluxmail accounts add gmail
+```
+
+Open the printed link, then select Continue with Google. The link expires after 10 minutes and works once. Fluxmail selects the flow from `FLUXMAIL_PUBLIC_URL`; `--local` and `--hosted` override that selection when needed.
 
 ## Connect IMAP
 
@@ -35,7 +49,7 @@ Fluxmail prompts for the password and stores it encrypted. Use `--imap-password-
 
 ## Connect an MCP client
 
-Configure your client to launch `fluxmail stdio`. For example, with Claude Code:
+For example, with Claude Code:
 
 ```bash
 claude mcp add fluxmail -- fluxmail stdio
@@ -47,6 +61,8 @@ Or with Codex CLI:
 codex mcp add fluxmail -- fluxmail stdio
 ```
 
+To have your MCP client run Fluxmail without a global installation, replace `fluxmail stdio` with `npx -y fluxmail@latest stdio`. Replace `@latest` with an exact version to keep the client on that version.
+
 Fluxmail also supports Streamable HTTP for Docker and remote deployments.
 
 See the [setup guide](https://fluxmail.ai/docs/quickstart) for Google OAuth configuration, Docker deployment, supported MCP clients, environment variables, and the complete tool list.

package/dist/accounts/gmailConnection.d.ts

@@ -0,0 +1,17 @@
+import type { FluxmailConfig } from '../config.js';
+import type { FluxmailDb } from '../storage/db.js';
+import { type GmailConnectionIntent } from '../storage/gmailConnectionGrants.js';
+export type GmailConnectionMode = 'local' | 'hosted';
+export declare function validateAccountConnectionFlags(provider: 'gmail' | 'imap', options: {
+    local?: boolean;
+    hosted?: boolean;
+}): void;
+export declare function selectGmailConnectionMode(config: FluxmailConfig, options: {
+    local?: boolean;
+    hosted?: boolean;
+}): GmailConnectionMode;
+export declare function prepareHostedGmailConnection(db: FluxmailDb, config: FluxmailConfig, intent: GmailConnectionIntent): {
+    connectionUrl: string;
+    expiresAt: number;
+};
+//# sourceMappingURL=gmailConnection.d.ts.map

package/dist/accounts/gmailConnection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gmailConnection.d.ts","sourceRoot":"","sources":["../../src/accounts/gmailConnection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAA8B,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAG7G,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,QAAQ,CAAC;AAOrD,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,OAAO,GAAG,MAAM,EAC1B,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,IAAI,CAIN;AAED,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7C,mBAAmB,CAUrB;AAED,wBAAgB,4BAA4B,CAC1C,EAAE,EAAE,UAAU,EACd,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,qBAAqB,GAC5B;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAO9C"}

package/dist/accounts/gmailConnection.js

@@ -0,0 +1,32 @@
+import { EmailError } from '@fluxmail/core';
+import { createGmailConnectionGrant } from '../storage/gmailConnectionGrants.js';
+import { requireGoogleConfig } from './googleAuth.js';
+function isLoopbackPublicUrl(publicUrl) {
+    const hostname = new URL(publicUrl).hostname;
+    return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]';
+}
+export function validateAccountConnectionFlags(provider, options) {
+    if (provider === 'imap' && (options.local || options.hosted)) {
+        throw new EmailError('invalid_request', '--local and --hosted are only available for Gmail accounts.');
+    }
+}
+export function selectGmailConnectionMode(config, options) {
+    if (options.local && options.hosted) {
+        throw new EmailError('invalid_request', '--local and --hosted cannot be used together.');
+    }
+    if (options.hosted && !config.publicUrlConfigured) {
+        throw new EmailError('invalid_request', '--hosted requires FLUXMAIL_PUBLIC_URL to be set.');
+    }
+    return options.hosted || (config.publicUrlConfigured && !options.local && !isLoopbackPublicUrl(config.publicUrl))
+        ? 'hosted'
+        : 'local';
+}
+export function prepareHostedGmailConnection(db, config, intent) {
+    requireGoogleConfig(config);
+    const { token, expiresAt } = createGmailConnectionGrant(db, intent);
+    return {
+        connectionUrl: `${config.publicUrl}/auth/google/connect?token=${encodeURIComponent(token)}`,
+        expiresAt,
+    };
+}
+//# sourceMappingURL=gmailConnection.js.map

package/dist/accounts/gmailConnection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gmailConnection.js","sourceRoot":"","sources":["../../src/accounts/gmailConnection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,0BAA0B,EAA8B,MAAM,qCAAqC,CAAC;AAC7G,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD,SAAS,mBAAmB,CAAC,SAAiB;IAC5C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC7C,OAAO,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,WAAW,IAAI,QAAQ,KAAK,OAAO,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,QAA0B,EAC1B,OAA8C;IAE9C,IAAI,QAAQ,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7D,MAAM,IAAI,UAAU,CAAC,iBAAiB,EAAE,6DAA6D,CAAC,CAAC;IACzG,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,MAAsB,EACtB,OAA8C;IAE9C,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACpC,MAAM,IAAI,UAAU,CAAC,iBAAiB,EAAE,+CAA+C,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAClD,MAAM,IAAI,UAAU,CAAC,iBAAiB,EAAE,kDAAkD,CAAC,CAAC;IAC9F,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,mBAAmB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC/G,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,OAAO,CAAC;AACd,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,EAAc,EACd,MAAsB,EACtB,MAA6B;IAE7B,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC5B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,0BAA0B,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACpE,OAAO;QACL,aAAa,EAAE,GAAG,MAAM,CAAC,SAAS,8BAA8B,kBAAkB,CAAC,KAAK,CAAC,EAAE;QAC3F,SAAS;KACV,CAAC;AACJ,CAAC"}

package/dist/cli.d.ts

@@ -1,3 +1,9 @@
 #!/usr/bin/env node
+import { type PermissionPolicy } from './permissions.js';
+interface PermissionOptions {
+    profile?: string;
+    allow: string[];
+}
+export declare function permissionPolicyFromOptions(opts: PermissionOptions, requireSelection?: boolean): PermissionPolicy;
 export {};
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":""}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAwCA,OAAO,EAOL,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAkC1B,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAMD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,iBAAiB,EAAE,gBAAgB,UAAQ,GAAG,gBAAgB,CAa/G"}

package/dist/cli.js

@@ -9,7 +9,8 @@ import { configFilePath, maskStoredConfigValue, readStoredConfig, resolveDataDir
 import { createApp } from './http/app.js';
 import { buildMcpServer } from './mcp/buildServer.js';
 import { runLoopbackFlow } from './accounts/googleAuth.js';
-import { createApiKey, listApiKeys, revokeApiKey } from './storage/apiKeys.js';
+import { prepareHostedGmailConnection, selectGmailConnectionMode, validateAccountConnectionFlags, } from './accounts/gmailConnection.js';
+import { createApiKey, listApiKeys, revokeApiKey, updateApiKeyPermissions } from './storage/apiKeys.js';
 import { addMember, findMember, listMembers, removeMember } from './storage/members.js';
 import { activateLicense } from './licensing/activation.js';
 import { LICENSE_KEY_PATTERN, releaseLicense } from './licensing/client.js';
@@ -18,6 +19,27 @@ import { checkLicenseState, clearLease, getEntitlements, readLeaseRow, } from '.
 import { loadInstanceId, startLicenseRefresher } from './licensing/refresher.js';
 import { VERSION } from './version.js';
 import { countPending } from './storage/scheduledSends.js';
+import { customPermissionPolicy, FULL_PERMISSION_POLICY, isNamedPermissionProfile, MCP_CAPABILITIES, NAMED_PERMISSION_PROFILES, permissionPolicyForProfile, } from './permissions.js';
+import { getTelemetry, installTelemetryStreamEndHandler, isTelemetryEnabled, setTelemetryEnabled, shutdownTelemetry, } from './telemetry.js';
+function collectOption(value, previous) {
+    return [...previous, value];
+}
+export function permissionPolicyFromOptions(opts, requireSelection = false) {
+    if (opts.profile && opts.allow.length) {
+        throw new Error('--profile cannot be combined with --allow.');
+    }
+    if (opts.profile) {
+        if (!isNamedPermissionProfile(opts.profile)) {
+            throw new Error(`Unknown profile "${opts.profile}". Expected one of: ${NAMED_PERMISSION_PROFILES.join(', ')}.`);
+        }
+        return permissionPolicyForProfile(opts.profile);
+    }
+    if (opts.allow.length)
+        return customPermissionPolicy(opts.allow);
+    if (requireSelection)
+        throw new Error('Choose --profile or at least one --allow capability.');
+    return FULL_PERMISSION_POLICY;
+}
 function connectionPort(value, option) {
     const port = Number(value);
     if (!Number.isInteger(port) || port < 1 || port > 65_535) {
@@ -93,15 +115,72 @@ function warnLicense(db, log = console.error) {
         log(`Warning: ${warning}`);
 }
 const program = new Command();
-program.name('fluxmail').description('Fluxmail, a self-hosted MCP server for your email').version(VERSION);
+program
+    .name('fluxmail')
+    .description('Fluxmail, a self-hosted MCP server for your email')
+    .version(VERSION, '-v, --version');
+function commandPath(command) {
+    const names = [];
+    for (let current = command; current?.parent; current = current.parent)
+        names.unshift(current.name());
+    return names.join(' ');
+}
+let telemetrySignalHandlersInstalled = false;
+const TELEMETRY_SIGNAL_SHUTDOWN_TIMEOUT_MS = 1_000;
+/** Flush queued telemetry before restoring Node's default signal behavior. */
+function installTelemetrySignalHandlers() {
+    if (telemetrySignalHandlersInstalled)
+        return;
+    telemetrySignalHandlersInstalled = true;
+    const shutdownAndResignal = (signal) => {
+        process.off('SIGINT', onSigint);
+        process.off('SIGTERM', onSigterm);
+        process.off('SIGHUP', onSighup);
+        let resignaled = false;
+        const resignal = () => {
+            if (resignaled)
+                return;
+            resignaled = true;
+            process.kill(process.pid, signal);
+        };
+        const timeout = setTimeout(resignal, TELEMETRY_SIGNAL_SHUTDOWN_TIMEOUT_MS);
+        void shutdownTelemetry().finally(() => {
+            clearTimeout(timeout);
+            resignal();
+        });
+    };
+    const onSigint = () => shutdownAndResignal('SIGINT');
+    const onSigterm = () => shutdownAndResignal('SIGTERM');
+    const onSighup = () => shutdownAndResignal('SIGHUP');
+    process.once('SIGINT', onSigint);
+    process.once('SIGTERM', onSigterm);
+    process.once('SIGHUP', onSighup);
+}
+program.hook('preAction', (_command, actionCommand) => {
+    const command = commandPath(actionCommand);
+    // Respect the opt-out before creating a telemetry client or recording this command.
+    if (command === 'telemetry disable')
+        return;
+    const dataDir = resolveDataDir();
+    getTelemetry(dataDir).capture('cli command used', {
+        product_surface: 'cli',
+        command,
+    });
+});
+program.hook('postAction', async (_command, actionCommand) => {
+    if (actionCommand.name() !== 'serve' && actionCommand.name() !== 'stdio')
+        await shutdownTelemetry();
+});
 program
     .command('serve')
     .description('Run the HTTP server (Streamable HTTP MCP at /mcp)')
     .action(() => {
+    installTelemetrySignalHandlers();
     const ctx = createContext();
     const app = createApp(ctx);
     ctx.scheduler.start();
     serve({ fetch: app.fetch, port: ctx.config.port }, () => {
+        ctx.telemetry.capture('mcp server started', { product_surface: 'mcp', transport: 'http' });
         console.log(`Fluxmail listening on ${ctx.config.publicUrl}`);
         console.log(`  MCP endpoint:   ${ctx.config.publicUrl}/mcp`);
         console.log(`  Auth mode:      ${ctx.config.authMode}`);
@@ -125,11 +204,22 @@ program
 program
     .command('stdio')
     .description('Run as a stdio MCP server (for Claude Desktop / Claude Code local config)')
-    .action(async () => {
+    .option('--profile <profile>', `Tool profile: ${NAMED_PERMISSION_PROFILES.join(', ')}`)
+    .option('--allow <capability>', 'Allow one MCP capability; repeat as needed', collectOption, [])
+    .action(async (opts) => {
+    installTelemetrySignalHandlers();
+    installTelemetryStreamEndHandler(process.stdin);
     const ctx = createContext();
-    const server = buildMcpServer(ctx.service);
+    const permissions = permissionPolicyFromOptions(opts);
+    const server = buildMcpServer(ctx.service, {
+        permissions,
+        maxAttachmentBytes: ctx.config.maxAttachmentBytes,
+        telemetry: ctx.telemetry,
+        transport: 'stdio',
+    });
     ctx.scheduler.start();
     await server.connect(new StdioServerTransport());
+    ctx.telemetry.capture('mcp server started', { product_surface: 'mcp', transport: 'stdio' });
     // stdout belongs to the MCP protocol; log to stderr only.
     startLicenseRefresher({
         db: ctx.db,
@@ -149,6 +239,8 @@ accounts
     .argument('<provider>', 'Email provider: gmail or imap')
     .option('--reauthorize <account-id>', 'Reconnect an existing account')
     .option('--member <member>', 'Member (id or email) who owns the new mailbox; omit for a shared mailbox')
+    .option('--local', 'Use the local browser callback for Gmail')
+    .option('--hosted', 'Use FLUXMAIL_PUBLIC_URL for the Gmail callback')
     .option('--email <address>', 'Mailbox address (required for IMAP)')
     .option('--display-name <name>', 'Sender name for IMAP messages')
     .option('--imap-host <host>', 'IMAP server hostname')
@@ -177,6 +269,7 @@ accounts
     const ctx = createContext();
     warnLicense(ctx.db);
     try {
+        validateAccountConnectionFlags(provider, opts);
         if (opts.reauthorize && opts.member) {
             throw new EmailError('invalid_request', '--member cannot be combined with --reauthorize; use "fluxmail accounts assign" to change ownership.');
         }
@@ -240,6 +333,17 @@ accounts
                 console.log(`Warning: ${warning.message}.`);
             return;
         }
+        const gmailConnectionMode = selectGmailConnectionMode(ctx.config, opts);
+        if (gmailConnectionMode === 'hosted') {
+            const { connectionUrl } = prepareHostedGmailConnection(ctx.db, ctx.config, {
+                ...(member ? { memberId: member.id } : {}),
+                ...(existing ? { reauthorizeAccountId: existing.id } : {}),
+            });
+            console.log('\nOpen this URL in your browser to connect Gmail:\n');
+            console.log(`  ${connectionUrl}\n`);
+            console.log('This link expires in 10 minutes and can only be used once.');
+            return;
+        }
         const account = await runLoopbackFlow(ctx.config, (url) => {
             console.log('\nOpen this URL in your browser to authorize Gmail access:\n');
             console.log(`  ${url}\n`);
@@ -425,18 +529,30 @@ membersCmd
     }
 });
 const apikey = program.command('apikey').description('Manage API keys for the HTTP MCP endpoint');
+apikey
+    .command('capabilities')
+    .description('List MCP capabilities for custom permission policies')
+    .action(() => {
+    for (const capability of MCP_CAPABILITIES)
+        console.log(capability);
+});
 apikey
     .command('create')
     .requiredOption('--name <name>', 'Human-readable key name')
     .option('--member <member>', 'Member (id or email) the key is issued to')
+    .option('--profile <profile>', `Tool profile: ${NAMED_PERMISSION_PROFILES.join(', ')}`)
+    .option('--allow <capability>', 'Allow one MCP capability; repeat as needed', collectOption, [])
     .description('Create an API key (shown once)')
     .action((opts) => {
     const ctx = createContext();
     warnLicense(ctx.db);
     try {
         const member = opts.member ? findMember(ctx.db, opts.member) : undefined;
-        const { key, info } = createApiKey(ctx.db, opts.name, member?.id);
-        console.log(`Created API key "${info.name}" (id: ${info.id})` + (member ? ` for member ${member.name}` : '') + '\n');
+        const permissions = permissionPolicyFromOptions(opts);
+        const { key, info } = createApiKey(ctx.db, opts.name, member?.id, permissions);
+        console.log(`Created API key "${info.name}" (id: ${info.id}, profile: ${info.permissionProfile})` +
+            (member ? ` for member ${member.name}` : '') +
+            '\n');
         console.log(`  ${key}\n`);
         console.log('Store it now; it cannot be shown again.');
     }
@@ -460,7 +576,32 @@ apikey
     for (const k of keys) {
         const lastUsed = k.lastUsedAt ? new Date(k.lastUsedAt).toISOString() : 'never';
         const member = k.memberId ? (memberNames.get(k.memberId) ?? k.memberId) : '-';
-        console.log(`${k.id}  ${k.name}  member=${member}  created=${new Date(k.createdAt).toISOString()}  lastUsed=${lastUsed}`);
+        console.log(`${k.id}  ${k.name}  member=${member}  profile=${k.permissionProfile}` +
+            (k.permissionProfile === 'custom' ? `  allows=${k.capabilities.join(',')}` : '') +
+            `  created=${new Date(k.createdAt).toISOString()}  lastUsed=${lastUsed}`);
+    }
+});
+apikey
+    .command('permissions')
+    .argument('<keyId>')
+    .option('--profile <profile>', `Tool profile: ${NAMED_PERMISSION_PROFILES.join(', ')}`)
+    .option('--allow <capability>', 'Allow one MCP capability; repeat as needed', collectOption, [])
+    .description('Change the MCP permissions for an API key')
+    .action((keyId, opts) => {
+    const ctx = createContext();
+    warnLicense(ctx.db);
+    try {
+        const permissions = permissionPolicyFromOptions(opts, true);
+        if (!updateApiKeyPermissions(ctx.db, keyId, permissions)) {
+            console.error(`No key with id ${keyId}`);
+            process.exitCode = 1;
+            return;
+        }
+        console.log(`Updated ${keyId} to profile ${permissions.profile}`);
+    }
+    catch (err) {
+        console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
+        process.exitCode = 1;
     }
 });
 apikey
@@ -614,6 +755,31 @@ configCmd
         console.log(`${key}=${maskStoredConfigValue(key, value)}`);
     }
 });
+const telemetryCmd = program.command('telemetry').description('Manage anonymous usage telemetry');
+telemetryCmd
+    .command('disable')
+    .description('Stop sending anonymous usage telemetry')
+    .action(() => {
+    const dataDir = resolveDataDir();
+    setTelemetryEnabled(dataDir, false);
+    console.log('Telemetry disabled.');
+});
+telemetryCmd
+    .command('enable')
+    .description('Allow anonymous usage telemetry')
+    .action(() => {
+    const dataDir = resolveDataDir();
+    setTelemetryEnabled(dataDir, true);
+    unsetStoredConfig(dataDir, 'FLUXMAIL_TELEMETRY');
+    console.log('Telemetry enabled. FLUXMAIL_TELEMETRY=0 or DO_NOT_TRACK=1 can still turn it off.');
+});
+telemetryCmd
+    .command('status')
+    .description('Show whether anonymous usage telemetry is enabled')
+    .action(() => {
+    const dataDir = resolveDataDir();
+    console.log(`Telemetry is ${isTelemetryEnabled(dataDir) ? 'enabled' : 'disabled'}.`);
+});
 program
     .command('status')
     .description('Show accounts, members, entitlements, and provider availability')
@@ -622,8 +788,9 @@ program
     warnLicense(ctx.db);
     console.log(JSON.stringify(await ctx.service.status(), null, 2));
 });
-program.parseAsync(process.argv).catch((err) => {
+program.parseAsync(process.argv).catch(async (err) => {
     console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
     process.exitCode = 1;
+    await shutdownTelemetry();
 });
 //# sourceMappingURL=cli.js.map