@zeph-to/mcp-server 1.11.1 → 1.11.2

package/dist/crypto.d.ts

@@ -27,13 +27,28 @@
  *   sensitive-but-not-secret.
  */
 /**
- * Initialize crypto: sync keys with server, then fallback to local/generate.
- * Server is source of truth for per-user key pair.
+ * Initialize crypto.
+ *
+ * The MCP server is a CONSUMER of encryption keys, not a generator. Keys
+ * are created in the Zeph app where the user explicitly opts in (Settings
+ * → Encryption). This function only imports keys that the server already
+ * has, and only when the server confirms encryption is enabled.
+ *
+ * Any other state — server says disabled, server has no keys, server is
+ * unreachable — leaves encryption OFF (cache empty, no fallback). A
+ * previous version generated and uploaded a fresh keypair on the "no keys
+ * anywhere" path; combined with a transient fetch failure, that silently
+ * turned encryption on without user consent and locked the account into
+ * an "encryption enabled" state on the server.
+ *
+ * Opt-out: `ZEPH_DISABLE_ENCRYPTION=1` forces crypto off regardless of
+ * server state — useful while cleaning up legacy state or for users who
+ * never want encryption.
+ *
  * Safe to call concurrently — deduplicates to single init.
- * Returns the exported public key (Base64 SPKI).
+ * Returns the exported public key when encryption is active, '' otherwise.
  *
- * NOTE: when `apiKey` is provided, `baseUrl` is required — otherwise a
- * caller in a dev environment would silently upload keys to prod.
+ * NOTE: when `apiKey` is provided, `baseUrl` is required.
  */
 export declare const initCrypto: (apiKey?: string, baseUrl?: string) => Promise<string>;
 export declare const getKeyPair: () => CryptoKeyPair | null;

package/dist/crypto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AA2JH;;;;;;;;GAQG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAyE5E,CAAC;AAqCF,eAAO,MAAM,UAAU,QAAO,aAAa,GAAG,IAAqB,CAAC;AACpE,eAAO,MAAM,YAAY,QAAO,MAAM,GAAG,IAA+B,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,OAAO;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KACrD,OAAO,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,IAAI,CAAC;CACnB,CAaA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,KACd,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAQlE,CAAC"}
+{"version":3,"file":"crypto.d.ts","sourceRoot":"","sources":["../src/crypto.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AA4JH;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,UAAU,GAAI,SAAS,MAAM,EAAE,UAAU,MAAM,KAAG,OAAO,CAAC,MAAM,CAsE5E,CAAC;AA8BF,eAAO,MAAM,UAAU,QAAO,aAAa,GAAG,IAAqB,CAAC;AACpE,eAAO,MAAM,YAAY,QAAO,MAAM,GAAG,IAA+B,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,sBAAsB,GACjC,OAAO;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,KACrD,OAAO,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,IAAI,CAAC;CACnB,CAaA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kBAAkB,GAC7B,SAAS,MAAM,KACd,OAAO,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAQlE,CAAC"}

package/dist/crypto.js

@@ -52,14 +52,8 @@ const fromBase64 = (base64) => {
 };
 // ─── ECDH key management ───
 const ECDH_PARAMS = { name: 'ECDH', namedCurve: 'P-256' };
-const generateKeyPair = async () => crypto.subtle.generateKey(ECDH_PARAMS, true, ['deriveKey', 'deriveBits']);
-const exportKeyPair = async (keyPair) => {
-    const [publicRaw, privateRaw] = await Promise.all([
-        crypto.subtle.exportKey('spki', keyPair.publicKey),
-        crypto.subtle.exportKey('pkcs8', keyPair.privateKey),
-    ]);
-    return { publicKey: toBase64(publicRaw), privateKey: toBase64(privateRaw) };
-};
+// generateKeyPair / exportKeyPair were removed in fix/no-auto-encryption.
+// This module imports keys only; it never creates or exports them.
 const importPublicKey = async (base64) => crypto.subtle.importKey('spki', fromBase64(base64), ECDH_PARAMS, true, []);
 const importPrivateKey = async (base64) => crypto.subtle.importKey('pkcs8', fromBase64(base64), ECDH_PARAMS, true, ['deriveKey', 'deriveBits']);
 const importKeyPair = async (exported) => {
@@ -117,80 +111,102 @@ const storeKeys = (exported) => {
     (0, fs_1.mkdirSync)(KEYS_DIR, { recursive: true, mode: 0o700 });
     (0, fs_1.writeFileSync)(KEYS_PATH, JSON.stringify(exported, null, 2), { mode: 0o600 });
 };
+const deleteStoredKeys = () => {
+    try {
+        (0, fs_1.unlinkSync)(KEYS_PATH);
+    }
+    catch { /* not present — fine */ }
+};
+const envIsTrue = (key) => {
+    const v = process.env[key];
+    return !!v && /^(1|true|yes|on)$/i.test(v.trim());
+};
 // ─── Cached state ───
 let cachedKeyPair = null;
 let cachedExportedPublicKey = null;
 let cachedOwnPublicKey = null;
 let initPromise = null;
 /**
- * Initialize crypto: sync keys with server, then fallback to local/generate.
- * Server is source of truth for per-user key pair.
+ * Initialize crypto.
+ *
+ * The MCP server is a CONSUMER of encryption keys, not a generator. Keys
+ * are created in the Zeph app where the user explicitly opts in (Settings
+ * → Encryption). This function only imports keys that the server already
+ * has, and only when the server confirms encryption is enabled.
+ *
+ * Any other state — server says disabled, server has no keys, server is
+ * unreachable — leaves encryption OFF (cache empty, no fallback). A
+ * previous version generated and uploaded a fresh keypair on the "no keys
+ * anywhere" path; combined with a transient fetch failure, that silently
+ * turned encryption on without user consent and locked the account into
+ * an "encryption enabled" state on the server.
+ *
+ * Opt-out: `ZEPH_DISABLE_ENCRYPTION=1` forces crypto off regardless of
+ * server state — useful while cleaning up legacy state or for users who
+ * never want encryption.
+ *
  * Safe to call concurrently — deduplicates to single init.
- * Returns the exported public key (Base64 SPKI).
+ * Returns the exported public key when encryption is active, '' otherwise.
  *
- * NOTE: when `apiKey` is provided, `baseUrl` is required — otherwise a
- * caller in a dev environment would silently upload keys to prod.
+ * NOTE: when `apiKey` is provided, `baseUrl` is required.
  */
 const initCrypto = (apiKey, baseUrl) => {
+    // Hard opt-out — skip everything, leave cache empty.
+    if (envIsTrue('ZEPH_DISABLE_ENCRYPTION')) {
+        cachedKeyPair = null;
+        cachedExportedPublicKey = null;
+        cachedOwnPublicKey = null;
+        return Promise.resolve('');
+    }
     if (apiKey && !baseUrl) {
         return Promise.reject(new Error('initCrypto: baseUrl is required when apiKey is provided. ' +
-            'Pass the resolved config.baseUrl to avoid silently syncing dev keys to prod.'));
+            'Pass the resolved config.baseUrl to avoid talking to the wrong environment.'));
     }
     if (initPromise)
         return initPromise;
-    // The check above guarantees baseUrl is defined when apiKey is — narrow once.
     const baseUrlRequired = apiKey ? baseUrl : baseUrl;
     initPromise = (async () => {
-        const stored = loadStoredKeys();
-        // Try server sync if API key available
         if (apiKey) {
             const serverResult = await fetchServerKeys(apiKey, baseUrlRequired);
-            // Server says encryption disabled — skip crypto init
-            if (serverResult && !serverResult.encryptionEnabled) {
+            // The only path that turns encryption ON: server confirms enabled AND
+            // hands us a real keypair. Everything else leaves the cache empty.
+            const haveServerKeys = !!serverResult && serverResult.encryptionEnabled && !!serverResult.keys;
+            if (!haveServerKeys) {
                 cachedKeyPair = null;
                 cachedExportedPublicKey = null;
                 cachedOwnPublicKey = null;
-                return '';
-            }
-            if (serverResult?.keys) {
-                if (!stored || stored.publicKey !== serverResult.keys.publicKey) {
-                    storeKeys(serverResult.keys);
+                // If the server is reachable and explicitly says encryption is off,
+                // drop any stale local cache so a future regression can't resurrect
+                // a keypair that the user already disabled.
+                if (serverResult && !serverResult.encryptionEnabled) {
+                    deleteStoredKeys();
                 }
-                cachedKeyPair = await importKeyPair(serverResult.keys);
-                cachedExportedPublicKey = serverResult.keys.publicKey;
-                cachedOwnPublicKey = cachedKeyPair.publicKey;
-                return serverResult.keys.publicKey;
+                return '';
             }
-            if (stored) {
-                await uploadServerKeys(stored, apiKey, baseUrlRequired);
-                cachedKeyPair = await importKeyPair(stored);
-                cachedExportedPublicKey = stored.publicKey;
-                cachedOwnPublicKey = cachedKeyPair.publicKey;
-                return stored.publicKey;
+            const keys = serverResult.keys;
+            const stored = loadStoredKeys();
+            if (!stored || stored.publicKey !== keys.publicKey) {
+                storeKeys(keys);
             }
-            const keyPair = await generateKeyPair();
-            const exported = await exportKeyPair(keyPair);
-            storeKeys(exported);
-            await uploadServerKeys(exported, apiKey, baseUrlRequired);
-            cachedKeyPair = keyPair;
-            cachedExportedPublicKey = exported.publicKey;
-            cachedOwnPublicKey = keyPair.publicKey;
-            return exported.publicKey;
-        }
-        // No API key — local-only mode
-        if (stored) {
-            cachedKeyPair = await importKeyPair(stored);
-            cachedExportedPublicKey = stored.publicKey;
+            cachedKeyPair = await importKeyPair(keys);
+            cachedExportedPublicKey = keys.publicKey;
             cachedOwnPublicKey = cachedKeyPair.publicKey;
-            return stored.publicKey;
+            return keys.publicKey;
         }
-        const keyPair = await generateKeyPair();
-        const exported = await exportKeyPair(keyPair);
-        storeKeys(exported);
-        cachedKeyPair = keyPair;
-        cachedExportedPublicKey = exported.publicKey;
-        cachedOwnPublicKey = keyPair.publicKey;
-        return exported.publicKey;
+        // Local-only mode (no apiKey): load stored keys if they exist; do NOT
+        // generate. Used by tests and offline / pre-provisioned setups where
+        // a keypair has been dropped into ~/.config/zeph/keys.json out-of-band.
+        const stored = loadStoredKeys();
+        if (!stored) {
+            cachedKeyPair = null;
+            cachedExportedPublicKey = null;
+            cachedOwnPublicKey = null;
+            return '';
+        }
+        cachedKeyPair = await importKeyPair(stored);
+        cachedExportedPublicKey = stored.publicKey;
+        cachedOwnPublicKey = cachedKeyPair.publicKey;
+        return stored.publicKey;
     })().catch((err) => {
         initPromise = null;
         throw err;
@@ -216,17 +232,9 @@ const fetchServerKeys = async (apiKey, baseUrl) => {
         return null;
     }
 };
-const uploadServerKeys = async (keys, apiKey, baseUrl) => {
-    try {
-        const url = `${baseUrl.replace(/\/$/, '')}/users/me/keys`;
-        await fetch(url, {
-            method: 'PUT',
-            headers: { 'X-API-Key': apiKey, 'Content-Type': 'application/json' },
-            body: JSON.stringify(keys),
-        });
-    }
-    catch { /* non-critical */ }
-};
+// uploadServerKeys was removed in fix/no-auto-encryption — the MCP server
+// must never write to /users/me/keys. Keys are created by the Zeph app
+// where the user explicitly opts in.
 const getKeyPair = () => cachedKeyPair;
 exports.getKeyPair = getKeyPair;
 const getPublicKey = () => cachedExportedPublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeph-to/mcp-server",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Zeph MCP server — AI agent notifications, prompts, and input via MCP protocol",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",