@n24q02m/hull 0.0.0-stage → 0.4.0-beta.9

package/build/storage/config-file.js

@@ -0,0 +1,259 @@
+import { existsSync } from 'node:fs';
+import { chmod, mkdir, readFile, unlink, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+import envPaths from 'env-paths';
+import { decryptData, deriveFileKey, derivePassphraseKey, encryptData, LEGACY_EXPORT_SALT, LEGACY_PBKDF2_ITERATIONS, LEGACY_SALT, PBKDF2_ITERATIONS } from './encryption.js';
+import { getMachineId, getUsername } from './machine-id.js';
+const paths = envPaths('mcp', { suffix: '' });
+const DEFAULT_CONFIG_PATH = join(paths.config, 'config.enc');
+const SALT_SIZE = 16;
+function validateAuth(config) {
+    return Object.values(config).every((value) => typeof value === 'string');
+}
+function validateServer(server) {
+    if (!server || typeof server !== 'object')
+        return false;
+    return validateAuth(server);
+}
+function validateSchema(data) {
+    if (!data || typeof data !== 'object')
+        return false;
+    const d = data;
+    if (d.version !== 1)
+        return false;
+    if (!d.servers || typeof d.servers !== 'object')
+        return false;
+    const servers = d.servers;
+    for (const serverName in servers) {
+        if (typeof serverName !== 'string' || !validateServer(servers[serverName])) {
+            return false;
+        }
+    }
+    return true;
+}
+// Allow overriding config path for testing
+let configPathOverride = null;
+export function setConfigPath(path) {
+    configPathOverride = path;
+}
+function getConfigPath() {
+    return configPathOverride ?? DEFAULT_CONFIG_PATH;
+}
+const MAX_RETRIES = 3;
+const BASE_DELAY_MS = 100;
+async function withRetry(fn) {
+    for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            const isLocked = err instanceof Error && 'code' in err && err.code === 'EBUSY';
+            if (!isLocked || attempt === MAX_RETRIES - 1)
+                throw err;
+            await new Promise((r) => setTimeout(r, BASE_DELAY_MS * 2 ** attempt));
+        }
+    }
+    throw new Error('Unreachable');
+}
+// Cache the derived file key to avoid expensive PBKDF2 iterations on every config read/write.
+// This significantly speeds up successive configuration accesses within the same process.
+let cachedKey = null;
+let cachedSalt = null;
+export function clearKeyCacheForTesting() {
+    cachedKey = null;
+    cachedSalt = null;
+}
+async function getKey(salt) {
+    if (cachedKey && cachedSalt && Buffer.from(cachedSalt).equals(salt))
+        return cachedKey;
+    const [machineId, username] = await Promise.all([getMachineId(), getUsername()]);
+    cachedKey = await deriveFileKey(machineId, username, salt);
+    cachedSalt = new Uint8Array(salt);
+    return cachedKey;
+}
+async function loadStore() {
+    const configPath = getConfigPath();
+    if (!existsSync(configPath)) {
+        return { version: 1, servers: {} };
+    }
+    const [machineId, username] = await Promise.all([getMachineId(), getUsername()]);
+    const data = await readFile(configPath);
+    // Try new format: [16-byte salt][iv][ciphertext]
+    if (data.length >= SALT_SIZE + 12) {
+        const salt = data.subarray(0, SALT_SIZE);
+        const payload = data.subarray(SALT_SIZE);
+        try {
+            const key = await getKey(salt);
+            const json = await decryptData(key, payload);
+            const store = JSON.parse(json);
+            if (!validateSchema(store)) {
+                throw new Error('Invalid config schema');
+            }
+            return store;
+        }
+        catch (_err) {
+            // Fall through to legacy check
+        }
+    }
+    // Try legacy format: [iv][ciphertext] using LEGACY_SALT
+    try {
+        const legacyKey = await deriveFileKey(machineId, username, LEGACY_SALT, PBKDF2_ITERATIONS);
+        const json = await decryptData(legacyKey, data);
+        const store = JSON.parse(json);
+        if (!validateSchema(store)) {
+            throw new Error('Invalid config schema');
+        }
+        // Auto-migrate to current iterations AND new salted format
+        await saveStore(store);
+        return store;
+    }
+    catch (err) {
+        try {
+            const legacyKey = await deriveFileKey(machineId, username, LEGACY_SALT, LEGACY_PBKDF2_ITERATIONS);
+            const json = await decryptData(legacyKey, data);
+            const store = JSON.parse(json);
+            if (!validateSchema(store)) {
+                throw new Error('Invalid config schema');
+            }
+            // Auto-migrate
+            await saveStore(store);
+            return store;
+        }
+        catch {
+            throw err;
+        }
+    }
+}
+async function saveStore(store) {
+    const configPath = getConfigPath();
+    const dir = dirname(configPath);
+    if (!existsSync(dir)) {
+        await mkdir(dir, { recursive: true, mode: 0o700 });
+        if (process.platform !== 'win32') {
+            await chmod(dir, 0o700);
+        }
+    }
+    let salt = cachedSalt;
+    if (!salt) {
+        salt = crypto.getRandomValues(new Uint8Array(SALT_SIZE));
+    }
+    const key = await getKey(salt);
+    const encrypted = await encryptData(key, JSON.stringify(store));
+    const finalData = Buffer.concat([Buffer.from(salt), encrypted]);
+    await withRetry(() => writeFile(configPath, finalData, { mode: 0o600 }));
+}
+/**
+ * Schedule a process exit so an MCP client can respawn the server and pick up
+ * fresh credentials from disk. Only relevant for stdio-mode servers whose
+ * client supervises restart. HTTP-mode servers update credentials in-process
+ * and MUST NOT call this — an exit mid-OAuth-device-code flow kills the user's
+ * verification window. Skipped under vitest (NODE_ENV=test) and when
+ * MCP_NO_RELOAD is set.
+ */
+export function scheduleReloadExit() {
+    if (process.env.NODE_ENV !== 'test' && !process.env.MCP_NO_RELOAD) {
+        setTimeout(() => process.exit(0), 1000).unref();
+    }
+}
+export async function readConfig(serverName) {
+    const store = await loadStore();
+    return store.servers[serverName] ?? null;
+}
+export async function writeConfig(serverName, config) {
+    const store = await loadStore();
+    store.servers[serverName] = config;
+    await saveStore(store);
+}
+export async function deleteConfig(serverName) {
+    const store = await loadStore();
+    delete store.servers[serverName];
+    const configPath = getConfigPath();
+    if (Object.keys(store.servers).length === 0) {
+        if (existsSync(configPath)) {
+            await unlink(configPath);
+        }
+    }
+    else {
+        await saveStore(store);
+    }
+}
+/**
+ * Metadata flag set by `markSetupComplete` after a successful relay-form
+ * submission (POST /authorize). `runHttpServer`/`isSchemaComplete` read this
+ * to distinguish "user has submitted the form" from "config.enc has values
+ * written by a peer-share or partial bootstrap path". Lives alongside the
+ * user's normal credential keys in the same per-server config dict.
+ */
+export const SETUP_COMPLETE_KEY = '_setup_complete';
+/**
+ * Set the `_setup_complete` flag in `serverName`'s config. Idempotent.
+ * Creates a new entry with just the flag if no prior config exists (useful
+ * for all-optional schemas where the user may submit an empty form).
+ *
+ * Strict equality semantics in `isSchemaComplete` rely on this writing the
+ * literal string `"true"`.
+ */
+export async function markSetupComplete(serverName) {
+    const existing = (await readConfig(serverName)) ?? {};
+    existing[SETUP_COMPLETE_KEY] = 'true';
+    await writeConfig(serverName, existing);
+}
+export async function listConfigs() {
+    const store = await loadStore();
+    return Object.keys(store.servers);
+}
+export async function exportConfig(passphrase) {
+    const store = await loadStore();
+    const salt = crypto.getRandomValues(new Uint8Array(SALT_SIZE));
+    const key = await derivePassphraseKey(passphrase, salt);
+    const encrypted = await encryptData(key, JSON.stringify(store));
+    return Buffer.concat([Buffer.from(salt), encrypted]);
+}
+export async function importConfig(passphrase, data) {
+    let json;
+    // Try new format: [16-byte salt][iv][ciphertext]
+    if (data.length >= SALT_SIZE + 12) {
+        const salt = data.subarray(0, SALT_SIZE);
+        const payload = data.subarray(SALT_SIZE);
+        try {
+            const key = await derivePassphraseKey(passphrase, salt, PBKDF2_ITERATIONS);
+            json = await decryptData(key, payload);
+        }
+        catch (_err) {
+            try {
+                const legacyKey = await derivePassphraseKey(passphrase, salt, LEGACY_PBKDF2_ITERATIONS);
+                json = await decryptData(legacyKey, payload);
+            }
+            catch {
+                // Fall through to legacy format check
+            }
+        }
+    }
+    if (!json) {
+        // Try legacy format: [iv][ciphertext] using LEGACY_EXPORT_SALT
+        try {
+            const key = await derivePassphraseKey(passphrase, LEGACY_EXPORT_SALT, PBKDF2_ITERATIONS);
+            json = await decryptData(key, data);
+        }
+        catch (err) {
+            try {
+                const legacyKey = await derivePassphraseKey(passphrase, LEGACY_EXPORT_SALT, LEGACY_PBKDF2_ITERATIONS);
+                json = await decryptData(legacyKey, data);
+            }
+            catch {
+                throw err;
+            }
+        }
+    }
+    const imported = JSON.parse(json);
+    if (!validateSchema(imported)) {
+        throw new Error('Invalid config schema in imported data');
+    }
+    const store = await loadStore();
+    // Merge imported servers into local config
+    for (const [name, config] of Object.entries(imported.servers)) {
+        store.servers[name] = config;
+    }
+    await saveStore(store);
+}
+//# sourceMappingURL=config-file.js.map

package/build/storage/config-file.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-file.js","sourceRoot":"","sources":["../../src/storage/config-file.ts"],"names":[],"mappings":"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"}

package/build/storage/credential-store.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Unified single-user credential store router.
+ *
+ * Single-user MCP credentials historically lived in the shared, machine-bound
+ * `config.enc` (`storage/config-file.ts`), keyed by the console name. But the
+ * CLI built-ins (`buildCli` config/doctor) and the whole Python stack read and
+ * write via `PerPluginStore`, keyed by the plugin slug -- so the two never saw
+ * each other's data: a TS server would save credentials the CLI then reported
+ * as "not configured".
+ *
+ * This module unifies single-user storage onto `PerPluginStore` (matching the
+ * wet-mcp Python `credential_state.py` cutover) while keeping a READ fallback
+ * to the legacy `config.enc`, so credentials already on disk keep working with
+ * ZERO re-auth. On the next WRITE the credentials migrate to the per-plugin
+ * store; DELETE clears BOTH stores.
+ *
+ *   WRITE  -> PerPluginStore(pluginName).save(config)
+ *   READ   -> PerPluginStore(pluginName).load() ?? legacy readConfig(serverName)
+ *   DELETE -> PerPluginStore(pluginName).clear() + legacy deleteConfig(serverName)
+ *
+ * `pluginName` defaults to `serverName` with a trailing `-mcp` stripped -- the
+ * same convention `buildCli` and core-py `build_cli` use -- so single-user
+ * credentials land under the SAME slug the CLI reads and the multi-user
+ * per-sub store keys on (`better-email`, `better-notion`, `wet`, ...). Pass it
+ * explicitly when the slug differs from that default (telegram saves under
+ * `"telegram"` though its console name is `"better-telegram-mcp"`).
+ *
+ * Multi-user HTTP storage (per-JWT-sub) is unaffected: it uses
+ * `PerPluginStore(pluginName, sub)`, a distinct on-disk key from the
+ * single-user `PerPluginStore(pluginName)` this module manages.
+ */
+/**
+ * Derive the credential-storage plugin slug from a console/server name by
+ * stripping a trailing `-mcp`. Shared with `buildCli` so the CLI reads exactly
+ * the slug single-user writes land under.
+ */
+export declare function pluginNameForServer(serverName: string): string;
+/**
+ * Read a server's single-user credential config.
+ *
+ * Prefers the per-plugin store; falls back to the legacy shared `config.enc`
+ * so credentials written by the pre-unification path stay readable with no
+ * re-auth. Returns `null` when neither store has an entry.
+ */
+export declare function readStoredConfig(serverName: string, pluginName?: string): Promise<Record<string, string> | null>;
+/**
+ * Write a server's single-user credential config to the per-plugin store.
+ *
+ * Full replace, mirroring the legacy `writeConfig` contract and the wet-mcp
+ * Python `save()` call: callers that need to preserve prior keys read first and
+ * merge (see `markSetupComplete`). The write also serves as the migration
+ * trigger -- an existing legacy `config.enc` entry is superseded because
+ * `readStoredConfig` prefers the per-plugin store from here on.
+ */
+export declare function writeStoredConfig(serverName: string, config: Record<string, string>, pluginName?: string): Promise<void>;
+/**
+ * Delete a server's single-user credential config from BOTH stores.
+ *
+ * Clears the per-plugin store and the legacy `config.enc` entry so a reset
+ * leaves nothing behind in either backend.
+ */
+export declare function deleteStoredConfig(serverName: string, pluginName?: string): Promise<void>;
+/**
+ * Set the persistent `_setup_complete` flag in a server's single-user config,
+ * preserving any existing keys. Reads through the unified path (so a legacy
+ * entry is migrated forward) and writes the merged result to the per-plugin
+ * store. Creates an entry with just the flag when nothing exists (useful for
+ * all-optional schemas where the user may submit an empty form).
+ */
+export declare function markSetupComplete(serverName: string, pluginName?: string): Promise<void>;
+//# sourceMappingURL=credential-store.d.ts.map

package/build/storage/credential-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"credential-store.d.ts","sourceRoot":"","sources":["../../src/storage/credential-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AASH;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE9D;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAwC,GACnD,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,CAMxC;AAED;;;;;;;;GAQG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,UAAU,GAAE,MAAwC,GACnD,OAAO,CAAC,IAAI,CAAC,CAEf;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAwC,GACnD,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAwC,GACnD,OAAO,CAAC,IAAI,CAAC,CAIf"}

package/build/storage/credential-store.js

@@ -0,0 +1,91 @@
+/**
+ * Unified single-user credential store router.
+ *
+ * Single-user MCP credentials historically lived in the shared, machine-bound
+ * `config.enc` (`storage/config-file.ts`), keyed by the console name. But the
+ * CLI built-ins (`buildCli` config/doctor) and the whole Python stack read and
+ * write via `PerPluginStore`, keyed by the plugin slug -- so the two never saw
+ * each other's data: a TS server would save credentials the CLI then reported
+ * as "not configured".
+ *
+ * This module unifies single-user storage onto `PerPluginStore` (matching the
+ * wet-mcp Python `credential_state.py` cutover) while keeping a READ fallback
+ * to the legacy `config.enc`, so credentials already on disk keep working with
+ * ZERO re-auth. On the next WRITE the credentials migrate to the per-plugin
+ * store; DELETE clears BOTH stores.
+ *
+ *   WRITE  -> PerPluginStore(pluginName).save(config)
+ *   READ   -> PerPluginStore(pluginName).load() ?? legacy readConfig(serverName)
+ *   DELETE -> PerPluginStore(pluginName).clear() + legacy deleteConfig(serverName)
+ *
+ * `pluginName` defaults to `serverName` with a trailing `-mcp` stripped -- the
+ * same convention `buildCli` and core-py `build_cli` use -- so single-user
+ * credentials land under the SAME slug the CLI reads and the multi-user
+ * per-sub store keys on (`better-email`, `better-notion`, `wet`, ...). Pass it
+ * explicitly when the slug differs from that default (telegram saves under
+ * `"telegram"` though its console name is `"better-telegram-mcp"`).
+ *
+ * Multi-user HTTP storage (per-JWT-sub) is unaffected: it uses
+ * `PerPluginStore(pluginName, sub)`, a distinct on-disk key from the
+ * single-user `PerPluginStore(pluginName)` this module manages.
+ */
+import { deleteConfig as deleteLegacyConfig, readConfig as readLegacyConfig, SETUP_COMPLETE_KEY } from './config-file.js';
+import { PerPluginStore } from './per-plugin-store.js';
+/**
+ * Derive the credential-storage plugin slug from a console/server name by
+ * stripping a trailing `-mcp`. Shared with `buildCli` so the CLI reads exactly
+ * the slug single-user writes land under.
+ */
+export function pluginNameForServer(serverName) {
+    return serverName.replace(/-mcp$/, '');
+}
+/**
+ * Read a server's single-user credential config.
+ *
+ * Prefers the per-plugin store; falls back to the legacy shared `config.enc`
+ * so credentials written by the pre-unification path stay readable with no
+ * re-auth. Returns `null` when neither store has an entry.
+ */
+export async function readStoredConfig(serverName, pluginName = pluginNameForServer(serverName)) {
+    const fromStore = await new PerPluginStore(pluginName).load();
+    // Single-user blobs are always string maps (written by writeStoredConfig /
+    // markSetupComplete below); the cast restates that invariant.
+    if (fromStore !== null)
+        return fromStore;
+    return readLegacyConfig(serverName);
+}
+/**
+ * Write a server's single-user credential config to the per-plugin store.
+ *
+ * Full replace, mirroring the legacy `writeConfig` contract and the wet-mcp
+ * Python `save()` call: callers that need to preserve prior keys read first and
+ * merge (see `markSetupComplete`). The write also serves as the migration
+ * trigger -- an existing legacy `config.enc` entry is superseded because
+ * `readStoredConfig` prefers the per-plugin store from here on.
+ */
+export async function writeStoredConfig(serverName, config, pluginName = pluginNameForServer(serverName)) {
+    await new PerPluginStore(pluginName).save(config);
+}
+/**
+ * Delete a server's single-user credential config from BOTH stores.
+ *
+ * Clears the per-plugin store and the legacy `config.enc` entry so a reset
+ * leaves nothing behind in either backend.
+ */
+export async function deleteStoredConfig(serverName, pluginName = pluginNameForServer(serverName)) {
+    await new PerPluginStore(pluginName).clear();
+    await deleteLegacyConfig(serverName);
+}
+/**
+ * Set the persistent `_setup_complete` flag in a server's single-user config,
+ * preserving any existing keys. Reads through the unified path (so a legacy
+ * entry is migrated forward) and writes the merged result to the per-plugin
+ * store. Creates an entry with just the flag when nothing exists (useful for
+ * all-optional schemas where the user may submit an empty form).
+ */
+export async function markSetupComplete(serverName, pluginName = pluginNameForServer(serverName)) {
+    const existing = (await readStoredConfig(serverName, pluginName)) ?? {};
+    existing[SETUP_COMPLETE_KEY] = 'true';
+    await writeStoredConfig(serverName, existing, pluginName);
+}
+//# sourceMappingURL=credential-store.js.map

package/build/storage/credential-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"credential-store.js","sourceRoot":"","sources":["../../src/storage/credential-store.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EACL,YAAY,IAAI,kBAAkB,EAClC,UAAU,IAAI,gBAAgB,EAC9B,kBAAkB,EACnB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,UAAkB;IACpD,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AACxC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAkB,EAClB,UAAU,GAAW,mBAAmB,CAAC,UAAU,CAAC;IAEpD,MAAM,SAAS,GAAG,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;IAC7D,2EAA2E;IAC3E,8DAA8D;IAC9D,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,SAAmC,CAAA;IAClE,OAAO,gBAAgB,CAAC,UAAU,CAAC,CAAA;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,MAA8B,EAC9B,UAAU,GAAW,mBAAmB,CAAC,UAAU,CAAC;IAEpD,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AACnD,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAAkB,EAClB,UAAU,GAAW,mBAAmB,CAAC,UAAU,CAAC;IAEpD,MAAM,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAA;IAC5C,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAA;AACtC,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,UAAU,GAAW,mBAAmB,CAAC,UAAU,CAAC;IAEpD,MAAM,QAAQ,GAAG,CAAC,MAAM,gBAAgB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAA;IACvE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,MAAM,CAAA;IACrC,MAAM,iBAAiB,CAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAA;AAC3D,CAAC"}

package/build/storage/data-dir.d.ts

@@ -0,0 +1,58 @@
+/**
+ * On-disk data directory layout for per-plugin credential storage.
+ *
+ * Current layout (written by every save):
+ *
+ *   ~/.<plugin>/config.json              single-user blob
+ *   ~/.<plugin>/subs/<sub>/config.json   multi-user (per-sub) blob
+ *   ~/.<plugin>/.secret                  single-user machine key (0600)
+ *
+ * Earlier releases stored the same files under two longer names. They stay
+ * READABLE so credentials already on disk keep working with zero re-auth, in
+ * this order (newest naming first):
+ *
+ *   1. ~/.<plugin>/               current
+ *   2. ~/.<plugin>-mcp/           legacy, keyed by `<plugin>`
+ *   3. ~/.better-<plugin>-mcp/    legacy, keyed by `better-<plugin>`
+ *
+ * "Keyed by" is the plugin name the legacy writer used for key derivation: the
+ * single-user machine key is that directory's own `.secret`, and the multi-user
+ * scrypt salt is `<keyPlugin>:<sub>`. A `better-<x>-mcp` directory was written
+ * by a server whose plugin slug was `better-<x>`, so its salt carries the
+ * `better-` prefix too.
+ */
+/** One place a credential blob may live on disk. */
+export interface DataDirLocation {
+    /** Absolute directory path (resolved against the current home dir). */
+    readonly dir: string;
+    /** Plugin name the writer used for key derivation in this directory. */
+    readonly keyPlugin: string;
+    /** True for the read-only fallback layouts; false for the current one. */
+    readonly legacy: boolean;
+}
+/**
+ * Validate a plugin name for use as a single path component. Underscore,
+ * hyphen and dot are allowed; separators and `..` are not.
+ */
+export declare function assertValidPluginName(pluginName: string): void;
+/**
+ * Validate a multi-user sub for use as a single path component. The OAuth AS
+ * mints sub = token_urlsafe(), whose base64url alphabet includes `_` and `-`,
+ * so both must pass; `/` and `..` stay rejected.
+ */
+export declare function assertValidSub(sub: string): void;
+/** Directory name (relative to home) of the current layout: `.<plugin>`. */
+export declare function dataDirName(pluginName: string): string;
+/** Absolute path of the current data directory: `~/.<plugin>`. */
+export declare function dataDir(pluginName: string): string;
+/**
+ * Every location a plugin's credentials may live in, in read-precedence order:
+ * the current `~/.<plugin>/` first, then `~/.<plugin>-mcp/`, then
+ * `~/.better-<plugin>-mcp/`.
+ */
+export declare function dataDirCandidates(pluginName: string): DataDirLocation[];
+/** Only the legacy (read-only fallback) locations, in read-precedence order. */
+export declare function legacyDataDirs(pluginName: string): DataDirLocation[];
+/** Path of the credential blob inside a given data directory. */
+export declare function blobPathIn(dir: string, sub: string | null): string;
+//# sourceMappingURL=data-dir.d.ts.map

package/build/storage/data-dir.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-dir.d.ts","sourceRoot":"","sources":["../../src/storage/data-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAKH,oDAAoD;AACpD,MAAM,WAAW,eAAe;IAC9B,uEAAuE;IACvE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,wEAAwE;IACxE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,0EAA0E;IAC1E,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CACzB;AAMD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAI9D;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAIhD;AAED,4EAA4E;AAC5E,wBAAgB,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,kEAAkE;AAClE,wBAAgB,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,EAAE,CAQvE;AAED,gFAAgF;AAChF,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,EAAE,CAEpE;AAED,iEAAiE;AACjE,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAElE"}

package/build/storage/data-dir.js

@@ -0,0 +1,79 @@
+/**
+ * On-disk data directory layout for per-plugin credential storage.
+ *
+ * Current layout (written by every save):
+ *
+ *   ~/.<plugin>/config.json              single-user blob
+ *   ~/.<plugin>/subs/<sub>/config.json   multi-user (per-sub) blob
+ *   ~/.<plugin>/.secret                  single-user machine key (0600)
+ *
+ * Earlier releases stored the same files under two longer names. They stay
+ * READABLE so credentials already on disk keep working with zero re-auth, in
+ * this order (newest naming first):
+ *
+ *   1. ~/.<plugin>/               current
+ *   2. ~/.<plugin>-mcp/           legacy, keyed by `<plugin>`
+ *   3. ~/.better-<plugin>-mcp/    legacy, keyed by `better-<plugin>`
+ *
+ * "Keyed by" is the plugin name the legacy writer used for key derivation: the
+ * single-user machine key is that directory's own `.secret`, and the multi-user
+ * scrypt salt is `<keyPlugin>:<sub>`. A `better-<x>-mcp` directory was written
+ * by a server whose plugin slug was `better-<x>`, so its salt carries the
+ * `better-` prefix too.
+ */
+import { join } from 'node:path';
+import { getHomeDir } from './home-dir.js';
+// Not global: a /g flag makes .test() stateful across calls (lastIndex), which
+// could let a second input bypass validation.
+const UNSAFE = /[^a-zA-Z0-9._-]/;
+/**
+ * Validate a plugin name for use as a single path component. Underscore,
+ * hyphen and dot are allowed; separators and `..` are not.
+ */
+export function assertValidPluginName(pluginName) {
+    if (!pluginName || UNSAFE.test(pluginName) || pluginName.includes('..')) {
+        throw new Error('Invalid pluginName');
+    }
+}
+/**
+ * Validate a multi-user sub for use as a single path component. The OAuth AS
+ * mints sub = token_urlsafe(), whose base64url alphabet includes `_` and `-`,
+ * so both must pass; `/` and `..` stay rejected.
+ */
+export function assertValidSub(sub) {
+    if (!sub || UNSAFE.test(sub) || sub.includes('..')) {
+        throw new Error('Invalid sub');
+    }
+}
+/** Directory name (relative to home) of the current layout: `.<plugin>`. */
+export function dataDirName(pluginName) {
+    return `.${pluginName}`;
+}
+/** Absolute path of the current data directory: `~/.<plugin>`. */
+export function dataDir(pluginName) {
+    assertValidPluginName(pluginName);
+    return join(getHomeDir(), dataDirName(pluginName));
+}
+/**
+ * Every location a plugin's credentials may live in, in read-precedence order:
+ * the current `~/.<plugin>/` first, then `~/.<plugin>-mcp/`, then
+ * `~/.better-<plugin>-mcp/`.
+ */
+export function dataDirCandidates(pluginName) {
+    assertValidPluginName(pluginName);
+    const home = getHomeDir();
+    return [
+        { dir: join(home, dataDirName(pluginName)), keyPlugin: pluginName, legacy: false },
+        { dir: join(home, `.${pluginName}-mcp`), keyPlugin: pluginName, legacy: true },
+        { dir: join(home, `.better-${pluginName}-mcp`), keyPlugin: `better-${pluginName}`, legacy: true }
+    ];
+}
+/** Only the legacy (read-only fallback) locations, in read-precedence order. */
+export function legacyDataDirs(pluginName) {
+    return dataDirCandidates(pluginName).filter((loc) => loc.legacy);
+}
+/** Path of the credential blob inside a given data directory. */
+export function blobPathIn(dir, sub) {
+    return sub ? join(dir, 'subs', sub, 'config.json') : join(dir, 'config.json');
+}
+//# sourceMappingURL=data-dir.js.map

package/build/storage/data-dir.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"data-dir.js","sourceRoot":"","sources":["../../src/storage/data-dir.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAY1C,+EAA+E;AAC/E,8CAA8C;AAC9C,MAAM,MAAM,GAAG,iBAAiB,CAAA;AAEhC;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,UAAkB;IACtD,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;IACvC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAA;IAChC,CAAC;AACH,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,WAAW,CAAC,UAAkB;IAC5C,OAAO,IAAI,UAAU,EAAE,CAAA;AACzB,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,OAAO,CAAC,UAAkB;IACxC,qBAAqB,CAAC,UAAU,CAAC,CAAA;IACjC,OAAO,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,CAAA;AACpD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,UAAkB;IAClD,qBAAqB,CAAC,UAAU,CAAC,CAAA;IACjC,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;IACzB,OAAO;QACL,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE;QAClF,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,UAAU,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE;QAC9E,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,WAAW,UAAU,MAAM,CAAC,EAAE,SAAS,EAAE,UAAU,UAAU,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;KAClG,CAAA;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,cAAc,CAAC,UAAkB;IAC/C,OAAO,iBAAiB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAClE,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,UAAU,CAAC,GAAW,EAAE,GAAkB;IACxD,OAAO,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;AAC/E,CAAC"}

package/build/storage/encryption.d.ts

@@ -0,0 +1,9 @@
+export declare const LEGACY_SALT: Uint8Array<ArrayBuffer>;
+export declare const LEGACY_EXPORT_SALT: Uint8Array<ArrayBuffer>;
+export declare const PBKDF2_ITERATIONS = 600000;
+export declare const LEGACY_PBKDF2_ITERATIONS = 100000;
+export declare function deriveFileKey(machineId: string, username: string, salt: Uint8Array, iterations?: number): Promise<CryptoKey>;
+export declare function derivePassphraseKey(passphrase: string, salt: Uint8Array, iterations?: number): Promise<CryptoKey>;
+export declare function encryptData(key: CryptoKey, plaintext: string): Promise<Buffer>;
+export declare function decryptData(key: CryptoKey, data: Buffer): Promise<string>;
+//# sourceMappingURL=encryption.d.ts.map

package/build/storage/encryption.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"encryption.d.ts","sourceRoot":"","sources":["../../src/storage/encryption.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,yBAAqC,CAAA;AAC7D,eAAO,MAAM,kBAAkB,yBAAqC,CAAA;AACpE,eAAO,MAAM,iBAAiB,SAAU,CAAA;AACxC,eAAO,MAAM,wBAAwB,SAAU,CAAA;AAE/C,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,UAAU,EAChB,UAAU,GAAE,MAA0B,GACrC,OAAO,CAAC,SAAS,CAAC,CAepB;AAED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,UAAU,EAChB,UAAU,GAAE,MAA0B,GACrC,OAAO,CAAC,SAAS,CAAC,CASpB;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKpF;AAED,wBAAsB,WAAW,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAS/E"}

package/build/storage/encryption.js

@@ -0,0 +1,27 @@
+const encoder = new TextEncoder();
+const decoder = new TextDecoder();
+export const LEGACY_SALT = encoder.encode('mcp-relay-config');
+export const LEGACY_EXPORT_SALT = encoder.encode('mcp-relay-export');
+export const PBKDF2_ITERATIONS = 600_000;
+export const LEGACY_PBKDF2_ITERATIONS = 100_000;
+export async function deriveFileKey(machineId, username, salt, iterations = PBKDF2_ITERATIONS) {
+    const keyMaterial = await crypto.subtle.importKey('raw', encoder.encode(`${machineId}:${username}`), 'PBKDF2', false, ['deriveKey']);
+    return crypto.subtle.deriveKey({ name: 'PBKDF2', hash: 'SHA-256', salt: salt, iterations }, keyMaterial, { name: 'AES-GCM', length: 256 }, false, ['encrypt', 'decrypt']);
+}
+export async function derivePassphraseKey(passphrase, salt, iterations = PBKDF2_ITERATIONS) {
+    const keyMaterial = await crypto.subtle.importKey('raw', encoder.encode(passphrase), 'PBKDF2', false, ['deriveKey']);
+    return crypto.subtle.deriveKey({ name: 'PBKDF2', hash: 'SHA-256', salt: salt, iterations }, keyMaterial, { name: 'AES-GCM', length: 256 }, false, ['encrypt', 'decrypt']);
+}
+export async function encryptData(key, plaintext) {
+    const iv = crypto.getRandomValues(new Uint8Array(12));
+    const encrypted = await crypto.subtle.encrypt({ name: 'AES-GCM', iv }, key, encoder.encode(plaintext));
+    // Format: [12-byte IV][ciphertext+tag]
+    return Buffer.concat([iv, Buffer.from(encrypted)]);
+}
+export async function decryptData(key, data) {
+    const iv = data.subarray(0, 12);
+    const ciphertext = data.subarray(12);
+    const decrypted = await crypto.subtle.decrypt({ name: 'AES-GCM', iv: new Uint8Array(iv) }, key, new Uint8Array(ciphertext));
+    return decoder.decode(decrypted);
+}
+//# sourceMappingURL=encryption.js.map

package/build/storage/encryption.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"encryption.js","sourceRoot":"","sources":["../../src/storage/encryption.ts"],"names":[],"mappings":"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"}