@darkiceinteractive/mcp-conductor 1.1.0 → 3.0.0-beta.1

package/dist/daemon/shared-kv.d.ts

@@ -0,0 +1,81 @@
+/**
+ * Shared Key-Value Store for MCP Conductor Daemon.
+ *
+ * Provides in-memory storage with optional disk persistence and TTL support.
+ * Each KV entry can carry an expiry timestamp; a background sweep runs every
+ * 30 s to evict stale entries and sync the on-disk snapshot.
+ *
+ * @module daemon/shared-kv
+ */
+/** Options accepted by {@link SharedKV.set}. */
+export interface KVSetOptions {
+    /** Time-to-live in milliseconds. Entry is deleted after this duration. */
+    ttl?: number;
+}
+/** Options for constructing a {@link SharedKV} instance. */
+export interface SharedKVOptions {
+    /** Directory for disk persistence. Defaults to `~/.mcp-conductor/kv/`. */
+    persistDir?: string;
+    /** Sweep interval for TTL expiry, in milliseconds. Defaults to 30 000. */
+    sweepIntervalMs?: number;
+    /** Namespace / shard name used for the snapshot file. Defaults to `default`. */
+    namespace?: string;
+    /** Whether to skip loading from disk on construction. Useful in tests. */
+    skipLoad?: boolean;
+}
+/**
+ * Shared key-value store with TTL expiry and disk persistence.
+ *
+ * Thread-safety note: Node.js is single-threaded; all mutations are
+ * synchronous operations on the in-memory Map, so no locking is required
+ * within a single process. Cross-process sharing is handled by the daemon
+ * server, which owns a single SharedKV instance.
+ */
+export declare class SharedKV {
+    private readonly store;
+    private readonly persistDir;
+    private readonly snapshotPath;
+    private readonly sweepIntervalMs;
+    private sweepTimer;
+    private dirty;
+    constructor(options?: SharedKVOptions);
+    /**
+     * Retrieve a value by key.
+     * Returns `null` if the key does not exist or has expired.
+     */
+    get<T>(key: string): T | null;
+    /**
+     * Store a value, with an optional TTL.
+     */
+    set<T>(key: string, value: T, options?: KVSetOptions): void;
+    /**
+     * Delete a key. No-op if the key does not exist.
+     */
+    delete(key: string): void;
+    /**
+     * List all non-expired keys, optionally filtered by a string prefix.
+     */
+    list(prefix?: string): string[];
+    /**
+     * Remove all entries (optionally matching a prefix).
+     */
+    clear(prefix?: string): void;
+    /** Total number of (potentially expired) entries currently held in memory. */
+    get size(): number;
+    /**
+     * Flush the in-memory state to disk and stop the sweep timer.
+     * Call this before process exit or daemon shutdown.
+     */
+    shutdown(): Promise<void>;
+    private loadFromDisk;
+    /** Write the current (non-expired) state to disk. */
+    flushToDisk(): void;
+    private startSweep;
+    private evictExpired;
+    /**
+     * Delete all snapshot files under `persistDir`.
+     * Used in tests for clean-up between runs.
+     */
+    static clearAllSnapshots(persistDir: string): void;
+}
+//# sourceMappingURL=shared-kv.d.ts.map

package/dist/daemon/shared-kv.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-kv.d.ts","sourceRoot":"","sources":["../../src/daemon/shared-kv.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,gDAAgD;AAChD,MAAM,WAAW,YAAY;IAC3B,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAeD,4DAA4D;AAC5D,MAAM,WAAW,eAAe;IAC9B,0EAA0E;IAC1E,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,0EAA0E;IAC1E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8B;IACpD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IACzC,OAAO,CAAC,UAAU,CAA+C;IACjE,OAAO,CAAC,KAAK,CAAS;gBAEV,OAAO,GAAE,eAAoB;IAgBzC;;;OAGG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI;IAa7B;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAS3D;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAMzB;;OAEG;IACH,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE;IAY/B;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAW5B,8EAA8E;IAC9E,IAAI,IAAI,IAAI,MAAM,CAEjB;IAMD;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAa/B,OAAO,CAAC,YAAY;IA2BpB,qDAAqD;IACrD,WAAW,IAAI,IAAI;IAqBnB,OAAO,CAAC,UAAU;IAclB,OAAO,CAAC,YAAY;IAUpB;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;CAQnD"}

package/dist/daemon/shared-kv.js

@@ -0,0 +1,215 @@
+/**
+ * Shared Key-Value Store for MCP Conductor Daemon.
+ *
+ * Provides in-memory storage with optional disk persistence and TTL support.
+ * Each KV entry can carry an expiry timestamp; a background sweep runs every
+ * 30 s to evict stale entries and sync the on-disk snapshot.
+ *
+ * @module daemon/shared-kv
+ */
+import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { homedir } from 'node:os';
+import { logger } from '../utils/logger.js';
+/**
+ * Shared key-value store with TTL expiry and disk persistence.
+ *
+ * Thread-safety note: Node.js is single-threaded; all mutations are
+ * synchronous operations on the in-memory Map, so no locking is required
+ * within a single process. Cross-process sharing is handled by the daemon
+ * server, which owns a single SharedKV instance.
+ */
+export class SharedKV {
+    store = new Map();
+    persistDir;
+    snapshotPath;
+    sweepIntervalMs;
+    sweepTimer = null;
+    dirty = false;
+    constructor(options = {}) {
+        this.persistDir = options.persistDir ?? join(homedir(), '.mcp-conductor', 'kv');
+        this.sweepIntervalMs = options.sweepIntervalMs ?? 30_000;
+        const ns = options.namespace ?? 'default';
+        this.snapshotPath = join(this.persistDir, `${ns}.json`);
+        if (!options.skipLoad) {
+            this.loadFromDisk();
+        }
+        this.startSweep();
+    }
+    // ---------------------------------------------------------------------------
+    // Public API
+    // ---------------------------------------------------------------------------
+    /**
+     * Retrieve a value by key.
+     * Returns `null` if the key does not exist or has expired.
+     */
+    get(key) {
+        const entry = this.store.get(key);
+        if (!entry)
+            return null;
+        if (entry.expiresAt !== undefined && Date.now() > entry.expiresAt) {
+            this.store.delete(key);
+            this.dirty = true;
+            return null;
+        }
+        return entry.value;
+    }
+    /**
+     * Store a value, with an optional TTL.
+     */
+    set(key, value, options) {
+        const entry = { value };
+        if (options?.ttl !== undefined && options.ttl > 0) {
+            entry.expiresAt = Date.now() + options.ttl;
+        }
+        this.store.set(key, entry);
+        this.dirty = true;
+    }
+    /**
+     * Delete a key. No-op if the key does not exist.
+     */
+    delete(key) {
+        if (this.store.delete(key)) {
+            this.dirty = true;
+        }
+    }
+    /**
+     * List all non-expired keys, optionally filtered by a string prefix.
+     */
+    list(prefix) {
+        const now = Date.now();
+        const keys = [];
+        for (const [k, entry] of this.store) {
+            if (entry.expiresAt !== undefined && now > entry.expiresAt)
+                continue;
+            if (prefix === undefined || k.startsWith(prefix)) {
+                keys.push(k);
+            }
+        }
+        return keys.sort();
+    }
+    /**
+     * Remove all entries (optionally matching a prefix).
+     */
+    clear(prefix) {
+        if (prefix === undefined) {
+            this.store.clear();
+        }
+        else {
+            for (const k of this.store.keys()) {
+                if (k.startsWith(prefix))
+                    this.store.delete(k);
+            }
+        }
+        this.dirty = true;
+    }
+    /** Total number of (potentially expired) entries currently held in memory. */
+    get size() {
+        return this.store.size;
+    }
+    // ---------------------------------------------------------------------------
+    // Lifecycle
+    // ---------------------------------------------------------------------------
+    /**
+     * Flush the in-memory state to disk and stop the sweep timer.
+     * Call this before process exit or daemon shutdown.
+     */
+    async shutdown() {
+        if (this.sweepTimer !== null) {
+            clearInterval(this.sweepTimer);
+            this.sweepTimer = null;
+        }
+        this.evictExpired();
+        this.flushToDisk();
+    }
+    // ---------------------------------------------------------------------------
+    // Persistence
+    // ---------------------------------------------------------------------------
+    loadFromDisk() {
+        if (!existsSync(this.snapshotPath))
+            return;
+        try {
+            const raw = readFileSync(this.snapshotPath, 'utf-8');
+            const snapshot = JSON.parse(raw);
+            if (snapshot.version !== 1) {
+                logger.warn('SharedKV: unknown snapshot version, skipping load', { path: this.snapshotPath });
+                return;
+            }
+            const now = Date.now();
+            let loaded = 0;
+            let skipped = 0;
+            for (const [k, entry] of Object.entries(snapshot.entries)) {
+                if (entry.expiresAt !== undefined && now > entry.expiresAt) {
+                    skipped++;
+                    continue; // already expired — do not restore
+                }
+                this.store.set(k, entry);
+                loaded++;
+            }
+            logger.debug('SharedKV: loaded from disk', { loaded, skipped, path: this.snapshotPath });
+        }
+        catch (err) {
+            logger.warn('SharedKV: failed to load snapshot', { error: String(err), path: this.snapshotPath });
+        }
+    }
+    /** Write the current (non-expired) state to disk. */
+    flushToDisk() {
+        try {
+            mkdirSync(this.persistDir, { recursive: true });
+            const entries = {};
+            const now = Date.now();
+            for (const [k, entry] of this.store) {
+                if (entry.expiresAt !== undefined && now > entry.expiresAt)
+                    continue;
+                entries[k] = entry;
+            }
+            const snapshot = { version: 1, entries };
+            writeFileSync(this.snapshotPath, JSON.stringify(snapshot, null, 2), 'utf-8');
+            this.dirty = false;
+        }
+        catch (err) {
+            logger.error('SharedKV: failed to flush to disk', { error: String(err), path: this.snapshotPath });
+        }
+    }
+    // ---------------------------------------------------------------------------
+    // TTL sweep
+    // ---------------------------------------------------------------------------
+    startSweep() {
+        this.sweepTimer = setInterval(() => {
+            this.evictExpired();
+            if (this.dirty) {
+                this.flushToDisk();
+            }
+        }, this.sweepIntervalMs);
+        // Allow the process to exit even if the timer is still running.
+        if (this.sweepTimer.unref) {
+            this.sweepTimer.unref();
+        }
+    }
+    evictExpired() {
+        const now = Date.now();
+        for (const [k, entry] of this.store) {
+            if (entry.expiresAt !== undefined && now > entry.expiresAt) {
+                this.store.delete(k);
+                this.dirty = true;
+            }
+        }
+    }
+    /**
+     * Delete all snapshot files under `persistDir`.
+     * Used in tests for clean-up between runs.
+     */
+    static clearAllSnapshots(persistDir) {
+        if (!existsSync(persistDir))
+            return;
+        for (const f of readdirSync(persistDir)) {
+            if (f.endsWith('.json')) {
+                try {
+                    unlinkSync(join(persistDir, f));
+                }
+                catch { /* ignore */ }
+            }
+        }
+    }
+}
+//# sourceMappingURL=shared-kv.js.map

package/dist/daemon/shared-kv.js.map

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

package/dist/daemon/shared-lock.d.ts

@@ -0,0 +1,71 @@
+/**
+ * Shared Lock Primitive for MCP Conductor Daemon.
+ *
+ * Implements an in-process mutex per key using a promise chain. Callers
+ * `acquire` a lock, receive a `release` function, and must call `release`
+ * when their critical section completes.
+ *
+ * Cross-daemon distributed locking is deferred to v3.1; this module handles
+ * the single-daemon (single-process) case which covers the v3.0 requirement
+ * of serialising concurrent writers within one daemon instance.
+ *
+ * @module daemon/shared-lock
+ */
+/** Handle returned by {@link SharedLock.acquire}. */
+export interface LockHandle {
+    /** Release the lock so the next waiter can proceed. */
+    release: () => Promise<void>;
+    /** Key this lock was acquired for. */
+    key: string;
+}
+/** Options for {@link SharedLock.acquire}. */
+export interface LockAcquireOptions {
+    /**
+     * Maximum time to wait for the lock in milliseconds.
+     * If the lock is not acquired within this window, the call throws.
+     * Defaults to 30 000 ms.
+     */
+    timeoutMs?: number;
+}
+/**
+ * Error thrown when a lock acquisition times out.
+ */
+export declare class LockTimeoutError extends Error {
+    constructor(key: string, timeoutMs: number);
+}
+/**
+ * In-process mutex registry keyed by arbitrary string keys.
+ *
+ * Each key gets its own independent promise chain. The chain starts as a
+ * resolved promise; each caller appends to it by storing a new promise that
+ * resolves only after the previous holder calls `release`.
+ */
+export declare class SharedLock {
+    private readonly locks;
+    /**
+     * Acquire the lock for `key`.
+     *
+     * Returns a {@link LockHandle} with a `release` function.  The caller MUST
+     * call `release()` — ideally in a `finally` block — to unblock the next
+     * waiter. Forgetting to release will deadlock all subsequent acquirers.
+     *
+     * @throws {LockTimeoutError} if the lock is not acquired within `timeoutMs`.
+     */
+    acquire(key: string, options?: LockAcquireOptions): Promise<LockHandle>;
+    /**
+     * Execute `fn` while holding the lock for `key`.
+     * The lock is always released after `fn` completes (even on throw).
+     */
+    withLock<T>(key: string, fn: () => Promise<T>, options?: LockAcquireOptions): Promise<T>;
+    /**
+     * Number of active waiters (including the current holder) for a given key.
+     * Returns 0 if the key has no lock contention.
+     */
+    waiters(key: string): number;
+    /**
+     * True if any key currently has at least one waiter.
+     */
+    get hasActiveLocks(): boolean;
+    private waitWithTimeout;
+}
+//# sourceMappingURL=shared-lock.d.ts.map

package/dist/daemon/shared-lock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-lock.d.ts","sourceRoot":"","sources":["../../src/daemon/shared-lock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,qDAAqD;AACrD,MAAM,WAAW,UAAU;IACzB,uDAAuD;IACvD,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,sCAAsC;IACtC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,8CAA8C;AAC9C,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;gBAC7B,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAI3C;AAUD;;;;;;GAMG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAEvD;;;;;;;;OAQG;IACG,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,CAAC;IA4C7E;;;OAGG;IACG,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC;IAS9F;;;OAGG;IACH,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI5B;;OAEG;IACH,IAAI,cAAc,IAAI,OAAO,CAE5B;YAMa,eAAe;CAoB9B"}

package/dist/daemon/shared-lock.js

@@ -0,0 +1,119 @@
+/**
+ * Shared Lock Primitive for MCP Conductor Daemon.
+ *
+ * Implements an in-process mutex per key using a promise chain. Callers
+ * `acquire` a lock, receive a `release` function, and must call `release`
+ * when their critical section completes.
+ *
+ * Cross-daemon distributed locking is deferred to v3.1; this module handles
+ * the single-daemon (single-process) case which covers the v3.0 requirement
+ * of serialising concurrent writers within one daemon instance.
+ *
+ * @module daemon/shared-lock
+ */
+import { logger } from '../utils/logger.js';
+/**
+ * Error thrown when a lock acquisition times out.
+ */
+export class LockTimeoutError extends Error {
+    constructor(key, timeoutMs) {
+        super(`Lock acquisition timed out for key "${key}" after ${timeoutMs}ms`);
+        this.name = 'LockTimeoutError';
+    }
+}
+/**
+ * In-process mutex registry keyed by arbitrary string keys.
+ *
+ * Each key gets its own independent promise chain. The chain starts as a
+ * resolved promise; each caller appends to it by storing a new promise that
+ * resolves only after the previous holder calls `release`.
+ */
+export class SharedLock {
+    locks = new Map();
+    /**
+     * Acquire the lock for `key`.
+     *
+     * Returns a {@link LockHandle} with a `release` function.  The caller MUST
+     * call `release()` — ideally in a `finally` block — to unblock the next
+     * waiter. Forgetting to release will deadlock all subsequent acquirers.
+     *
+     * @throws {LockTimeoutError} if the lock is not acquired within `timeoutMs`.
+     */
+    async acquire(key, options) {
+        const timeoutMs = options?.timeoutMs ?? 30_000;
+        // Get or create the per-key chain.
+        const current = this.locks.get(key) ?? { chain: Promise.resolve(), waiters: 0 };
+        current.waiters++;
+        this.locks.set(key, current);
+        // `releaseNext` is the function that the new holder will call to advance
+        // the chain for the subsequent waiter.
+        let releaseNext;
+        const next = new Promise((resolve) => { releaseNext = resolve; });
+        // Wait for the previous holder to release, with a timeout.
+        const previousChain = current.chain;
+        // Advance the chain pointer so the next caller waits on our `next`.
+        current.chain = next;
+        await this.waitWithTimeout(previousChain, timeoutMs, key);
+        logger.debug('SharedLock: acquired', { key, waiters: current.waiters });
+        const released = { done: false };
+        return {
+            key,
+            release: async () => {
+                if (released.done) {
+                    logger.warn('SharedLock: release called more than once', { key });
+                    return;
+                }
+                released.done = true;
+                current.waiters--;
+                logger.debug('SharedLock: released', { key, remainingWaiters: current.waiters });
+                // Clean up the key entry if no one else is waiting.
+                if (current.waiters === 0) {
+                    this.locks.delete(key);
+                }
+                releaseNext();
+            },
+        };
+    }
+    /**
+     * Execute `fn` while holding the lock for `key`.
+     * The lock is always released after `fn` completes (even on throw).
+     */
+    async withLock(key, fn, options) {
+        const handle = await this.acquire(key, options);
+        try {
+            return await fn();
+        }
+        finally {
+            await handle.release();
+        }
+    }
+    /**
+     * Number of active waiters (including the current holder) for a given key.
+     * Returns 0 if the key has no lock contention.
+     */
+    waiters(key) {
+        return this.locks.get(key)?.waiters ?? 0;
+    }
+    /**
+     * True if any key currently has at least one waiter.
+     */
+    get hasActiveLocks() {
+        return this.locks.size > 0;
+    }
+    // ---------------------------------------------------------------------------
+    // Private helpers
+    // ---------------------------------------------------------------------------
+    async waitWithTimeout(promise, timeoutMs, key) {
+        let timer;
+        const timeout = new Promise((_, reject) => {
+            timer = setTimeout(() => reject(new LockTimeoutError(key, timeoutMs)), timeoutMs);
+        });
+        try {
+            await Promise.race([promise, timeout]);
+        }
+        finally {
+            clearTimeout(timer);
+        }
+    }
+}
+//# sourceMappingURL=shared-lock.js.map

package/dist/daemon/shared-lock.js.map

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

package/dist/hub/mcp-hub.d.ts

@@ -13,6 +13,7 @@ import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 import type { Tool } from '@modelcontextprotocol/sdk/types.js';
 import { EventEmitter } from 'node:events';
 import { RateLimiter } from '../utils/index.js';
+import { type RedactMatcher } from '../utils/tokenize.js';
 import type { ServersConfig, RateLimitConfig } from '../config/schema.js';
 export type ServerStatus = 'connecting' | 'connected' | 'disconnected' | 'error';
 export interface ServerConnection {
@@ -138,6 +139,28 @@ export declare class MCPHub extends EventEmitter {
      * Call a tool on a specific server
      */
     callTool(serverName: string, toolName: string, params: Record<string, unknown>): Promise<unknown>;
+    /**
+     * Call a tool on a specific server, applying PII tokenization to the result.
+     *
+     * Used by the bridge `/call` handler when the tool's `ToolDefinition.redact.response`
+     * annotation is present. Returns both the redacted result and the per-call
+     * reverse map so the sandbox can resolve tokens via `mcp.detokenize()`.
+     *
+     * The reverse map is scoped to a single `execute_code` invocation — it is
+     * embedded in the sandbox preamble by `generateSandboxCode` and never
+     * persisted to disk or shared across calls.
+     *
+     * @param serverName  Backend server name
+     * @param toolName    Tool to invoke
+     * @param params      Tool arguments
+     * @param matchers    Built-in matcher names from `ToolDefinition.redact.response`
+     * @returns `{ result, reverseMap }` — result has PII replaced with tokens;
+     *          reverseMap maps `[TOKEN_N]` → original value.
+     */
+    callToolTokenized(serverName: string, toolName: string, params: Record<string, unknown>, matchers: ReadonlyArray<RedactMatcher>): Promise<{
+        result: unknown;
+        reverseMap: Record<string, string>;
+    }>;
     /**
      * Check if a server is connected
      */

package/dist/hub/mcp-hub.d.ts.map

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

package/dist/hub/mcp-hub.js

@@ -12,7 +12,9 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { EventEmitter } from 'node:events';
 import { logger, RateLimiter, minimalChildEnv } from '../utils/index.js';
+import { tokenize } from '../utils/tokenize.js';
 import { loadClaudeConfig, findClaudeConfig, loadConductorConfig, findConductorConfig, } from '../config/loader.js';
+import { MCPToolError, extractErrorCode } from '../reliability/errors.js';
 const DEFAULT_HUB_CONFIG = {
     claudeConfigPath: '',
     conductorConfigPath: '',
@@ -508,11 +510,42 @@ export class MCPHub extends EventEmitter {
             return result;
         }
         catch (error) {
+            // Never double-wrap an MCPToolError — propagate as-is.
+            if (error instanceof MCPToolError)
+                throw error;
             const errorMessage = error instanceof Error ? error.message : String(error);
             logger.error(`Tool call failed: ${serverName}.${toolName}`, { error: errorMessage, params });
-            throw new Error(`Tool call failed: ${serverName}.${toolName} - ${errorMessage}`);
+            const code = extractErrorCode(error);
+            throw new MCPToolError(code, serverName, toolName, error);
         }
     }
+    /**
+     * Call a tool on a specific server, applying PII tokenization to the result.
+     *
+     * Used by the bridge `/call` handler when the tool's `ToolDefinition.redact.response`
+     * annotation is present. Returns both the redacted result and the per-call
+     * reverse map so the sandbox can resolve tokens via `mcp.detokenize()`.
+     *
+     * The reverse map is scoped to a single `execute_code` invocation — it is
+     * embedded in the sandbox preamble by `generateSandboxCode` and never
+     * persisted to disk or shared across calls.
+     *
+     * @param serverName  Backend server name
+     * @param toolName    Tool to invoke
+     * @param params      Tool arguments
+     * @param matchers    Built-in matcher names from `ToolDefinition.redact.response`
+     * @returns `{ result, reverseMap }` — result has PII replaced with tokens;
+     *          reverseMap maps `[TOKEN_N]` → original value.
+     */
+    async callToolTokenized(serverName, toolName, params, matchers) {
+        const raw = await this.callTool(serverName, toolName, params);
+        if (matchers.length === 0) {
+            return { result: raw, reverseMap: {} };
+        }
+        const { redacted, reverseMap } = tokenize(raw, matchers);
+        logger.debug(`callToolTokenized: ${serverName}.${toolName} — ${Object.keys(reverseMap).length} token(s) minted`);
+        return { result: redacted, reverseMap };
+    }
     /**
      * Check if a server is connected
      */