@pascal-app/mcp 1.0.4 → 1.0.6

package/dist/bin/pascal-mcp.js

@@ -94,7 +94,7 @@ async function main() {
     }
     else {
         // --stdio is the default when no transport flag is passed.
-        await connectStdio(createServer());
+        connectStdio(createServer);
         console.error('[pascal-mcp] stdio server running');
     }
 }

package/dist/bridge/agent-session.d.ts

@@ -0,0 +1,18 @@
+import { type SessionKeep, type SessionRecord } from '@pascal-app/core/agent-operations';
+/**
+ * Where a host keeps what the agent's session should remember: the moments it named and what it
+ * made. Never scene data. A host with sessions that outlive the process keeps it beside them.
+ */
+export type AgentSession = {
+    read(): SessionRecord;
+    keep(keep: SessionKeep): void;
+};
+/** The standalone server's: in memory, for as long as the bridge holds a scene. */
+export declare class InMemoryAgentSession implements AgentSession {
+    #private;
+    read(): SessionRecord;
+    keep(keep: SessionKeep): void;
+    /** Binding another scene starts another session. */
+    replace(record?: SessionRecord): void;
+}
+//# sourceMappingURL=agent-session.d.ts.map

package/dist/bridge/agent-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-session.d.ts","sourceRoot":"","sources":["../../src/bridge/agent-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,WAAW,EAChB,KAAK,aAAa,EACnB,MAAM,mCAAmC,CAAA;AAE1C;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,IAAI,aAAa,CAAA;IACrB,IAAI,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAAA;CAC9B,CAAA;AAED,mFAAmF;AACnF,qBAAa,oBAAqB,YAAW,YAAY;;IAGvD,IAAI,IAAI,aAAa,CAEpB;IAED,IAAI,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI,CAE5B;IAED,oDAAoD;IACpD,OAAO,CAAC,MAAM,GAAE,aAA6B,GAAG,IAAI,CAEnD;CACF"}

package/dist/bridge/agent-session.js

@@ -0,0 +1,15 @@
+import { EMPTY_SESSION, keepInSession, } from '@pascal-app/core/agent-operations';
+/** The standalone server's: in memory, for as long as the bridge holds a scene. */
+export class InMemoryAgentSession {
+    #record = EMPTY_SESSION;
+    read() {
+        return this.#record;
+    }
+    keep(keep) {
+        this.#record = keepInSession(this.#record, keep);
+    }
+    /** Binding another scene starts another session. */
+    replace(record = EMPTY_SESSION) {
+        this.#record = record;
+    }
+}

package/dist/bridge/index.d.ts

@@ -1,3 +1,3 @@
-export type { ActiveSceneMeta, CreatePatch, DeletePatch, Patch, UpdatePatch, ValidationError, ValidationResult, } from './scene-bridge.js';
+export type { ActiveSceneMeta, CreatePatch, DeletePatch, MaterialUpsertPatch, Patch, UpdatePatch, ValidationError, ValidationResult, } from './scene-bridge.js';
 export { SceneBridge } from './scene-bridge.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/bridge/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACX,KAAK,EACL,WAAW,EACX,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bridge/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,eAAe,EACf,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,KAAK,EACL,WAAW,EACX,eAAe,EACf,gBAAgB,GACjB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA"}

package/dist/bridge/scene-bridge.d.ts

@@ -5,6 +5,7 @@ import type { AnyNode, Collection, CollectionId, SceneMaterialId } from '@pascal
 import { type AnyNodeId, type AnyNodeType, SceneMaterial } from '@pascal-app/core/schema';
 import useScene from '@pascal-app/core/store';
 import type { SceneMeta } from '../storage/types.js';
+import { InMemoryAgentSession } from './agent-session.js';
 export type ValidationError = {
     nodeId: string;
     path: string;
@@ -51,6 +52,8 @@ export declare class SceneBridge {
     /** `applyPatch` takes `upsert_material` patches, in the patch's one history step. */
     readonly supportsMaterialUpserts = true;
     private activeScene;
+    /** What the agent's session has kept: its named moments, and what it made. */
+    readonly agentSession: InMemoryAgentSession;
     /**
      * Scene identity currently bound to this bridge. MCP tools use this to know
      * which editor scene should receive live events after mutations.

package/dist/bridge/scene-bridge.d.ts.map

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

package/dist/bridge/scene-bridge.js

@@ -4,6 +4,7 @@ import { adjacentLevelId, applyStructureReconciliation, assertDerivedNodeWrites,
 import { AnyNode as AnyNodeSchema, generateId, parseNode, SceneMaterial, } from '@pascal-app/core/schema';
 // Per PLAN §0.6: `useScene` is the DEFAULT export from `@pascal-app/core/store`.
 import useScene from '@pascal-app/core/store';
+import { InMemoryAgentSession } from './agent-session.js';
 /**
  * Headless bridge to the `@pascal-app/core` Zustand store.
  *
@@ -15,6 +16,8 @@ export class SceneBridge {
     /** `applyPatch` takes `upsert_material` patches, in the patch's one history step. */
     supportsMaterialUpserts = true;
     activeScene = null;
+    /** What the agent's session has kept: its named moments, and what it made. */
+    agentSession = new InMemoryAgentSession();
     /**
      * Scene identity currently bound to this bridge. MCP tools use this to know
      * which editor scene should receive live events after mutations.
@@ -38,10 +41,12 @@ export class SceneBridge {
     }
     /** Load initial state; if empty, creates default Site → Building → Level. */
     loadDefault() {
+        this.agentSession.replace();
         useScene.getState().loadScene();
     }
     /** Replace entire scene (undoable via Zundo). */
     setScene(nodes, rootNodeIds, extra) {
+        this.agentSession.replace();
         useScene.getState().setScene(nodes, rootNodeIds, extra);
     }
     /** Full snapshot for export, including collections and the material palette. */
@@ -317,6 +322,8 @@ export class SceneBridge {
     applyPatch(patches) {
         const state = useScene.getState();
         const nodes = state.nodes;
+        if (state.readOnly)
+            throw new Error('scene_read_only');
         // Track synthesized state as we dry-run so later ops can reference
         // earlier-created ids and reflect earlier-deleted ids.
         const simAvailable = new Set(Object.keys(nodes));

package/dist/lib/safe-fetch.d.ts

@@ -1,3 +1,21 @@
+import type { LookupAddress } from 'node:dns';
+import { type IncomingMessage } from 'node:http';
+import { type LookupFunction } from 'node:net';
+/** True for any address a server-side fetch must not reach. Unparseable input is blocked. */
+export declare function isBlockedAddress(address: string): boolean;
+export type Resolver = (hostname: string) => Promise<LookupAddress[]>;
+/** A socket `lookup` that only ever answers with the given, already-checked addresses. */
+export declare function pinnedLookup(addresses: LookupAddress[]): LookupFunction;
+export type PinnedRequestInit = {
+    headers: Record<string, string>;
+    lookup: LookupFunction;
+    signal: AbortSignal;
+};
+export type Requester = (url: URL, init: PinnedRequestInit) => Promise<IncomingMessage>;
+export type SafeFetchDeps = {
+    resolve: Resolver;
+    request: Requester;
+};
 export type SafeFetchOptions = {
     maxBytes?: number;
     timeoutMs?: number;
@@ -11,9 +29,9 @@ export type SafeFetchResult = {
     hops: string[];
 };
 /**
- * SSRF-safe fetch that follows redirects manually, revalidating the host
- * allowlist + private-IP check on every hop. Throws `McpError` for blocked
- * URLs, non-2xx responses, oversize bodies, or timeouts.
+ * SSRF-safe fetch that follows redirects manually, re-resolving and rechecking
+ * the host on every hop and connecting only to the checked addresses. Throws
+ * `ProtocolError` for blocked URLs, non-2xx responses, oversize bodies, or timeouts.
  */
-export declare function safeFetch(urlStr: string, opts?: SafeFetchOptions): Promise<SafeFetchResult>;
+export declare function safeFetch(urlStr: string, opts?: SafeFetchOptions, deps?: SafeFetchDeps): Promise<SafeFetchResult>;
 //# sourceMappingURL=safe-fetch.d.ts.map

package/dist/lib/safe-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../../src/lib/safe-fetch.ts"],"names":[],"mappings":"AAkHA,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf,CAAA;AAED;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,eAAe,CAAC,CA6F1B"}
+{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../../src/lib/safe-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAA0B,KAAK,eAAe,EAAE,MAAM,WAAW,CAAA;AAExE,OAAO,EAAQ,KAAK,cAAc,EAAE,MAAM,UAAU,CAAA;AA2GpD,6FAA6F;AAC7F,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAYzD;AAkDD,MAAM,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,EAAE,CAAC,CAAA;AA2BrE,0FAA0F;AAC1F,wBAAgB,YAAY,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,cAAc,CAcvE;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/B,MAAM,EAAE,cAAc,CAAA;IACtB,MAAM,EAAE,WAAW,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;AAqBvF,MAAM,MAAM,aAAa,GAAG;IAAE,OAAO,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,SAAS,CAAA;CAAE,CAAA;AAOrE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,uCAAuC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,MAAM,EAAE,CAAA;CACf,CAAA;AAOD;;;;GAIG;AACH,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,gBAAqB,EAC3B,IAAI,GAAE,aAA2B,GAChC,OAAO,CAAC,eAAe,CAAC,CAwE1B"}

package/dist/lib/safe-fetch.js

@@ -1,83 +1,150 @@
-import { isIPv4, isIPv6 } from 'node:net';
-import { ErrorCode, McpError } from '@modelcontextprotocol/sdk/types.js';
+import { lookup as dnsLookup } from 'node:dns/promises';
+import { request as httpRequest } from 'node:http';
+import { request as httpsRequest } from 'node:https';
+import { isIP } from 'node:net';
+import { ProtocolError, ProtocolErrorCode } from '@modelcontextprotocol/server';
 /**
  * SSRF-safe fetch for user-supplied URLs (image URLs in vision tools).
  *
- * Blocks the usual server-side-request-forgery attack surface:
- * - loopback (127.0.0.0/8, ::1)
- * - link-local (169.254.0.0/16 — includes cloud metadata at 169.254.169.254)
- * - private ranges (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16, fc00::/7)
- * - non-http(s) schemes
- * - manual-redirect with the same allowlist applied to each hop
- * - max body size (default 20 MB)
- * - request timeout (default 10 s)
+ * Every hop (the initial URL and each redirect target) is checked the same way:
+ * - only http(s) schemes
+ * - well-known local hostnames are refused outright
+ * - the host is resolved once and *every* resolved address must be public;
+ *   IPv6 forms that embed an IPv4 address (mapped, compatible, 6to4) are
+ *   judged by the embedded address
+ * - the socket connects only to the addresses that were checked, so a DNS
+ *   answer that changes between check and connect cannot reach a private host
+ * - optional origin allowlist via `PASCAL_ALLOWED_ASSET_ORIGINS` (comma-separated)
+ * - max body size (default 20 MB) and request timeout (default 10 s)
  *
- * Optional allowlist via `PASCAL_ALLOWED_ASSET_ORIGINS` env var (comma-separated).
- *
- * Phase 10 A2 found that photo_to_scene / analyze_floorplan_image /
- * analyze_room_photo all called raw `fetch(url)` with no protection, giving
- * a direct `169.254.169.254` exfil primitive on any host.
+ * Used by photo_to_scene / analyze_floorplan_image / analyze_room_photo.
  */
 const DEFAULT_MAX_BYTES = 20 * 1024 * 1024; // 20 MB
 const DEFAULT_TIMEOUT_MS = 10_000;
 const MAX_REDIRECTS = 3;
-function isPrivateOrLoopbackV4(addr) {
-    const parts = addr.split('.').map(Number);
-    if (parts.length !== 4 || parts.some((n) => !Number.isInteger(n) || n < 0 || n > 255))
-        return true; // malformed → treat as unsafe
-    const [a, b] = parts;
-    if (a === 127)
-        return true; // 127.0.0.0/8 loopback
+function parseIPv4(addr) {
+    const parts = addr.split('.');
+    if (parts.length !== 4 || parts.some((p) => !/^\d{1,3}$/.test(p)))
+        return null;
+    const octets = parts.map(Number);
+    return octets.every((n) => n <= 255) ? octets : null;
+}
+/** Expands any valid IPv6 text form (incl. `::` and a dotted IPv4 tail) to 8 groups. */
+function parseIPv6(addr) {
+    let s = addr.toLowerCase();
+    const zone = s.indexOf('%');
+    if (zone >= 0)
+        s = s.slice(0, zone);
+    let tail = [];
+    const lastColon = s.lastIndexOf(':');
+    if (lastColon < 0)
+        return null;
+    if (s.slice(lastColon + 1).includes('.')) {
+        const v4 = parseIPv4(s.slice(lastColon + 1));
+        if (!v4)
+            return null;
+        tail = [(v4[0] << 8) | v4[1], (v4[2] << 8) | v4[3]];
+        const prefix = s.slice(0, lastColon + 1);
+        s = prefix.endsWith('::') ? prefix : prefix.slice(0, -1);
+    }
+    const halves = s.split('::');
+    if (halves.length > 2)
+        return null;
+    const groups = (part) => part === ''
+        ? []
+        : part.split(':').map((h) => (/^[0-9a-f]{1,4}$/.test(h) ? parseInt(h, 16) : NaN));
+    const head = groups(halves[0]);
+    const rest = halves.length === 2 ? groups(halves[1]) : [];
+    const explicit = head.length + rest.length + tail.length;
+    if ([...head, ...rest].some(Number.isNaN))
+        return null;
+    if (halves.length === 1)
+        return explicit === 8 ? [...head, ...tail] : null;
+    if (explicit > 7)
+        return null;
+    return [...head, ...new Array(8 - explicit).fill(0), ...rest, ...tail];
+}
+function isBlockedV4([a, b]) {
+    if (a === 0)
+        return true; // 0.0.0.0/8 "this network"
     if (a === 10)
         return true; // 10.0.0.0/8 private
+    if (a === 100 && b >= 64 && b <= 127)
+        return true; // 100.64.0.0/10 CGNAT (incl. Alibaba metadata)
+    if (a === 127)
+        return true; // 127.0.0.0/8 loopback
+    if (a === 169 && b === 254)
+        return true; // 169.254.0.0/16 link-local (cloud metadata)
     if (a === 172 && b >= 16 && b <= 31)
         return true; // 172.16.0.0/12 private
+    if (a === 192 && b === 0)
+        return true; // 192.0.0.0/24 IETF protocol assignments
     if (a === 192 && b === 168)
         return true; // 192.168.0.0/16 private
-    if (a === 169 && b === 254)
-        return true; // link-local incl. cloud metadata
-    if (a === 0)
-        return true; // current-network
+    if (a === 198 && (b === 18 || b === 19))
+        return true; // 198.18.0.0/15 benchmarking
     if (a >= 224)
-        return true; // multicast / reserved
+        return true; // multicast, reserved, broadcast
     return false;
 }
-function isPrivateOrLoopbackV6(addr) {
-    const lower = addr.toLowerCase();
-    if (lower === '::1' || lower === '::')
-        return true;
-    if (lower.startsWith('fe80:') ||
-        lower.startsWith('fe90:') ||
-        lower.startsWith('fea0:') ||
-        lower.startsWith('feb0:'))
-        return true; // link-local
-    if (lower.startsWith('fc') || lower.startsWith('fd'))
-        return true; // ULA fc00::/7
-    if (lower.startsWith('::ffff:')) {
-        // v4-mapped
-        const v4 = lower.slice(7);
-        if (isIPv4(v4))
-            return isPrivateOrLoopbackV4(v4);
+function embeddedV4(hi, lo) {
+    return [hi >> 8, hi & 0xff, lo >> 8, lo & 0xff];
+}
+function isBlockedV6(g) {
+    const [g0, g1, g2, g3, g4, g5, g6, g7] = g;
+    const first4Zero = g0 === 0 && g1 === 0 && g2 === 0 && g3 === 0;
+    // ::/96 (unspecified, loopback, IPv4-compatible), ::ffff:0:0/96 (mapped),
+    // ::ffff:0:0:0/96 (translated) — judge by the embedded IPv4 address.
+    if (first4Zero && ((g4 === 0 && (g5 === 0 || g5 === 0xffff)) || (g4 === 0xffff && g5 === 0))) {
+        return isBlockedV4(embeddedV4(g6, g7));
     }
+    if (g0 === 0x64 && g1 === 0xff9b)
+        return true; // 64:ff9b::/96 and 64:ff9b:1::/48 NAT64
+    if (g0 === 0x100 && g1 === 0 && g2 === 0 && g3 === 0)
+        return true; // 100::/64 discard
+    if (g0 === 0x2001 && g1 === 0)
+        return true; // 2001::/32 Teredo
+    if (g0 === 0x2002)
+        return isBlockedV4(embeddedV4(g1, g2)); // 2002::/16 6to4
+    if ((g0 & 0xfe00) === 0xfc00)
+        return true; // fc00::/7 ULA (incl. fd00:ec2::254 metadata)
+    if ((g0 & 0xffc0) === 0xfe80)
+        return true; // fe80::/10 link-local
+    if ((g0 & 0xffc0) === 0xfec0)
+        return true; // fec0::/10 site-local
+    if ((g0 & 0xff00) === 0xff00)
+        return true; // ff00::/8 multicast
     return false;
 }
-function isUnsafeHost(hostname) {
-    const host = hostname.replace(/^\[|\]$/g, ''); // strip IPv6 brackets if any
-    if (isIPv4(host))
-        return isPrivateOrLoopbackV4(host);
-    if (isIPv6(host))
-        return isPrivateOrLoopbackV6(host);
-    // Hostname (not IP) — block well-known local names.
-    const lower = host.toLowerCase();
-    if (lower === 'localhost' ||
+/** True for any address a server-side fetch must not reach. Unparseable input is blocked. */
+export function isBlockedAddress(address) {
+    const literal = address.replace(/^\[|\]$/g, '');
+    const family = isIP(literal);
+    if (family === 4) {
+        const v4 = parseIPv4(literal);
+        return v4 ? isBlockedV4(v4) : true;
+    }
+    if (family === 6) {
+        const v6 = parseIPv6(literal);
+        return v6 ? isBlockedV6(v6) : true;
+    }
+    return true;
+}
+function isLocalHostname(hostname) {
+    const lower = hostname.toLowerCase().replace(/\.+$/, '');
+    return (lower === 'localhost' ||
         lower.endsWith('.localhost') ||
         lower === 'broadcasthost' ||
         lower.endsWith('.local') ||
         lower.endsWith('.internal') ||
-        lower.endsWith('.corp')) {
-        return true;
-    }
-    return false;
+        lower.endsWith('.corp'));
+}
+function blocked(reason, details, log = {}) {
+    console.error(`[pascal-mcp] safe_fetch_blocked ${JSON.stringify({ reason, ...details, ...log })}`);
+    return protocolError(reason, details);
+}
+function protocolError(reason, details) {
+    throw new ProtocolError(ProtocolErrorCode.InvalidParams, reason, details);
 }
 function assertAllowedUrl(url) {
     let parsed;
@@ -85,21 +152,11 @@ function assertAllowedUrl(url) {
         parsed = new URL(url);
     }
     catch {
-        throw new McpError(ErrorCode.InvalidParams, 'invalid_url', { url });
+        return protocolError('invalid_url', { url });
     }
     if (parsed.protocol !== 'https:' && parsed.protocol !== 'http:') {
-        throw new McpError(ErrorCode.InvalidParams, 'url_scheme_not_allowed', {
-            url,
-            protocol: parsed.protocol,
-        });
+        blocked('url_scheme_not_allowed', { url, protocol: parsed.protocol });
     }
-    if (isUnsafeHost(parsed.hostname)) {
-        throw new McpError(ErrorCode.InvalidParams, 'url_host_blocked', {
-            url,
-            hostname: parsed.hostname,
-        });
-    }
-    // Optional env-allowlist narrowing.
     const allowEnv = process.env.PASCAL_ALLOWED_ASSET_ORIGINS;
     if (allowEnv) {
         const origins = allowEnv
@@ -107,20 +164,85 @@ function assertAllowedUrl(url) {
             .map((s) => s.trim())
             .filter(Boolean);
         if (!origins.includes(parsed.origin)) {
-            throw new McpError(ErrorCode.InvalidParams, 'url_origin_not_allowlisted', {
-                url,
-                origin: parsed.origin,
-            });
+            blocked('url_origin_not_allowlisted', { url, origin: parsed.origin });
         }
     }
     return parsed;
 }
+/** Resolves `url`'s host and returns its addresses only if every one of them is public. */
+async function resolveCheckedAddresses(url, resolve) {
+    const host = url.hostname.replace(/^\[|\]$/g, '');
+    const details = { url: url.toString(), hostname: url.hostname };
+    const literalFamily = isIP(host);
+    let addresses;
+    if (literalFamily) {
+        addresses = [{ address: host, family: literalFamily }];
+    }
+    else {
+        if (isLocalHostname(host))
+            blocked('url_host_blocked', details);
+        try {
+            addresses = await resolve(host);
+        }
+        catch (err) {
+            return protocolError('dns_lookup_failed', {
+                ...details,
+                message: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    if (addresses.length === 0)
+        protocolError('dns_lookup_failed', details);
+    const unsafe = addresses.find((a) => isBlockedAddress(a.address));
+    if (unsafe)
+        blocked('url_host_blocked', details, { address: unsafe.address });
+    return addresses;
+}
+/** A socket `lookup` that only ever answers with the given, already-checked addresses. */
+export function pinnedLookup(addresses) {
+    return (_hostname, options, callback) => {
+        const family = options.family === 'IPv4' ? 4 : options.family === 'IPv6' ? 6 : options.family;
+        const matching = family === 4 || family === 6 ? addresses.filter((a) => a.family === family) : addresses;
+        const first = matching[0];
+        if (!first) {
+            callback(Object.assign(new Error('no checked address for family'), { code: 'ENOTFOUND' }), '');
+        }
+        else if (options.all) {
+            callback(null, matching);
+        }
+        else {
+            callback(null, first.address, first.family);
+        }
+    };
+}
+function requestPinned(url, init) {
+    const send = url.protocol === 'https:' ? httpsRequest : httpRequest;
+    return new Promise((resolve, reject) => {
+        const req = send(url, {
+            method: 'GET',
+            agent: false,
+            headers: init.headers,
+            lookup: init.lookup,
+            signal: init.signal,
+        }, resolve);
+        req.on('error', reject);
+        req.end();
+    });
+}
+const defaultDeps = {
+    resolve: (hostname) => dnsLookup(hostname, { all: true, verbatim: true }),
+    request: requestPinned,
+};
+function header(res, name) {
+    const value = res.headers[name];
+    return Array.isArray(value) ? (value[0] ?? null) : (value ?? null);
+}
 /**
- * SSRF-safe fetch that follows redirects manually, revalidating the host
- * allowlist + private-IP check on every hop. Throws `McpError` for blocked
- * URLs, non-2xx responses, oversize bodies, or timeouts.
+ * SSRF-safe fetch that follows redirects manually, re-resolving and rechecking
+ * the host on every hop and connecting only to the checked addresses. Throws
+ * `ProtocolError` for blocked URLs, non-2xx responses, oversize bodies, or timeouts.
  */
-export async function safeFetch(urlStr, opts = {}) {
+export async function safeFetch(urlStr, opts = {}, deps = defaultDeps) {
     const maxBytes = opts.maxBytes ?? DEFAULT_MAX_BYTES;
     const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
     const hops = [];
@@ -131,89 +253,66 @@ export async function safeFetch(urlStr, opts = {}) {
         for (let i = 0; i <= MAX_REDIRECTS; i++) {
             const parsed = assertAllowedUrl(current);
             hops.push(parsed.toString());
-            const res = await fetch(parsed, {
-                redirect: 'manual',
+            const addresses = await resolveCheckedAddresses(parsed, deps.resolve);
+            const res = await deps.request(parsed, {
+                headers: opts.accept ? { Accept: opts.accept } : {},
+                lookup: pinnedLookup(addresses),
                 signal: controller.signal,
-                headers: opts.accept ? { Accept: opts.accept } : undefined,
             });
-            // Manual redirect handling
-            if (res.status >= 300 && res.status < 400) {
-                const location = res.headers.get('location');
+            const status = res.statusCode ?? 0;
+            if (status >= 300 && status < 400) {
+                res.resume();
+                const location = header(res, 'location');
                 if (!location) {
-                    throw new McpError(ErrorCode.InvalidParams, 'redirect_without_location', {
-                        url: parsed.toString(),
-                        status: res.status,
-                    });
+                    protocolError('redirect_without_location', { url: parsed.toString(), status });
                 }
                 current = new URL(location, parsed).toString();
                 continue;
             }
-            if (!res.ok) {
-                throw new McpError(ErrorCode.InvalidParams, 'fetch_failed', {
+            if (status < 200 || status >= 300) {
+                res.resume();
+                protocolError('fetch_failed', {
                     url: parsed.toString(),
-                    status: res.status,
-                    statusText: res.statusText,
+                    status,
+                    statusText: res.statusMessage ?? '',
                 });
             }
-            // Enforce Content-Length up front if present.
-            const declared = Number(res.headers.get('content-length'));
+            const declared = Number(header(res, 'content-length') ?? Number.NaN);
             if (Number.isFinite(declared) && declared > maxBytes) {
-                throw new McpError(ErrorCode.InvalidParams, 'response_too_large', {
-                    url: parsed.toString(),
-                    declared,
-                    maxBytes,
-                });
-            }
-            // Stream with a running cap so servers that lie about length still get bounded.
-            const reader = res.body?.getReader();
-            if (!reader) {
-                throw new McpError(ErrorCode.InvalidParams, 'empty_response', {
-                    url: parsed.toString(),
-                });
+                res.destroy();
+                protocolError('response_too_large', { url: parsed.toString(), declared, maxBytes });
             }
+            // Running cap so servers that lie about length still get bounded.
             const chunks = [];
             let total = 0;
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done)
-                    break;
-                if (value) {
-                    total += value.byteLength;
-                    if (total > maxBytes) {
-                        try {
-                            await reader.cancel();
-                        }
-                        catch {
-                            // ignore
-                        }
-                        throw new McpError(ErrorCode.InvalidParams, 'response_too_large', {
-                            url: parsed.toString(),
-                            received: total,
-                            maxBytes,
-                        });
-                    }
-                    chunks.push(value);
+            for await (const chunk of res) {
+                const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+                total += buf.byteLength;
+                if (total > maxBytes) {
+                    res.destroy();
+                    protocolError('response_too_large', { url: parsed.toString(), received: total, maxBytes });
                 }
+                chunks.push(buf);
             }
             return {
-                buffer: Buffer.concat(chunks.map((c) => Buffer.from(c))),
-                contentType: res.headers.get('content-type'),
+                buffer: Buffer.concat(chunks),
+                contentType: header(res, 'content-type'),
                 finalUrl: parsed.toString(),
                 hops,
             };
         }
-        throw new McpError(ErrorCode.InvalidParams, 'too_many_redirects', {
-            hops: hops.slice(0, MAX_REDIRECTS + 1),
-        });
+        return protocolError('too_many_redirects', { hops: hops.slice(0, MAX_REDIRECTS + 1) });
     }
     catch (err) {
-        if (err instanceof McpError)
+        if (err instanceof ProtocolError)
             throw err;
-        if (err.name === 'AbortError') {
-            throw new McpError(ErrorCode.InvalidParams, 'fetch_timeout', { url: urlStr, timeoutMs });
+        if (controller.signal.aborted || err.name === 'AbortError') {
+            return protocolError('fetch_timeout', { url: urlStr, timeoutMs });
         }
-        const message = err instanceof Error ? err.message : String(err);
-        throw new McpError(ErrorCode.InvalidParams, 'fetch_error', { url: urlStr, message });
+        return protocolError('fetch_error', {
+            url: urlStr,
+            message: err instanceof Error ? err.message : String(err),
+        });
     }
     finally {
         clearTimeout(timer);