canvas-parent-mcp 1.2.4 → 1.3.0

package/dist/bundle.js

@@ -2991,7 +2991,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve.call(this, root, ref);
+      let _sch = resolve2.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -3018,7 +3018,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve(root, ref) {
+    function resolve2(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -3649,9 +3649,14 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve(baseURI, relativeURI, options) {
+    function resolve2(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-      const resolved2 = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
+      const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
+      const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
+      if (baseMalformed || relativeMalformed) {
+        throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
+      }
+      const resolved2 = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
       schemelessOptions.skipEscape = true;
       return serialize(resolved2, schemelessOptions);
     }
@@ -3777,6 +3782,7 @@ var require_fast_uri = __commonJS({
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
     var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
+    var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
     function getParseError(parsed, matches) {
       if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
         return 'URI path must start with "/" when authority is present.';
@@ -3811,6 +3817,20 @@ var require_fast_uri = __commonJS({
         parsed.error = "URI authority must not contain a literal backslash.";
         malformedAuthorityOrPort = true;
       }
+      const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
+      if (introducerMatch !== null) {
+        const region = introducerMatch[1];
+        const normalizedRegion = region.replace(/[\t\n\r]/g, "");
+        if (normalizedRegion.length >= 2) {
+          if (normalizedRegion.slice(0, 2) !== "//") {
+            parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
+            malformedAuthorityOrPort = true;
+          } else if (region.length !== normalizedRegion.length) {
+            parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
+            malformedAuthorityOrPort = true;
+          }
+        }
+      }
       const matches = uri.match(URI_PARSE);
       if (matches) {
         parsed.scheme = matches[1];
@@ -3913,7 +3933,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve,
+      resolve: resolve2,
       resolveComponent,
       equal,
       serialize,
@@ -9141,7 +9161,7 @@ var require_websocket = __commonJS({
     var http = __require("http");
     var net = __require("net");
     var tls = __require("tls");
-    var { randomBytes, createHash } = __require("crypto");
+    var { randomBytes: randomBytes2, createHash } = __require("crypto");
     var { Duplex, Readable } = __require("stream");
     var { URL: URL2 } = __require("url");
     var PerMessageDeflate2 = require_permessage_deflate();
@@ -9679,7 +9699,7 @@ var require_websocket = __commonJS({
         }
       }
       const defaultPort = isSecure ? 443 : 80;
-      const key = randomBytes(16).toString("base64");
+      const key = randomBytes2(16).toString("base64");
       const request = isSecure ? https.request : http.request;
       const protocolSet = /* @__PURE__ */ new Set();
       let perMessageDeflate;
@@ -10573,7 +10593,7 @@ var require_websocket_server = __commonJS({
 });
 
 // src/index.ts
-import { dirname as dirname2, join as join2 } from "path";
+import { dirname as dirname3, join as join4 } from "path";
 import { fileURLToPath } from "url";
 
 // node_modules/zod/v3/helpers/util.js
@@ -32534,7 +32554,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve) => setTimeout(resolve, pollInterval));
+        await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error51) {
@@ -32551,7 +32571,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       const earlyReject = (error51) => {
         reject(error51);
       };
@@ -32629,7 +32649,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve(parseResult.data);
+            resolve2(parseResult.data);
           }
         } catch (error51) {
           reject(error51);
@@ -32890,12 +32910,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve2, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve, interval);
+      const timeoutId = setTimeout(resolve2, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -33986,7 +34006,7 @@ var McpServer = class {
     let task = createTaskResult.task;
     const pollInterval = task.pollInterval ?? 5e3;
     while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
+      await new Promise((resolve2) => setTimeout(resolve2, pollInterval));
       const updatedTask = await extra.taskStore.getTask(taskId);
       if (!updatedTask) {
         throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -34650,64 +34670,17 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve) => {
+    return new Promise((resolve2) => {
       const json2 = serializeMessage(message);
       if (this._stdout.write(json2)) {
-        resolve();
+        resolve2();
       } else {
-        this._stdout.once("drain", resolve);
+        this._stdout.once("drain", resolve2);
       }
     });
   }
 };
 
-// node_modules/@chrischall/mcp-utils/dist/server/index.js
-async function createMcpServer(opts) {
-  const server = new McpServer({ name: opts.name, version: opts.version });
-  if (opts.banner !== void 0) {
-    console.error(opts.banner);
-  }
-  const deps = opts.deps;
-  for (const register of opts.tools) {
-    await register(server, deps);
-  }
-  return server;
-}
-function withGracefulShutdown(server, opts = {}) {
-  const shouldExit = opts.exit ?? true;
-  let shuttingDown = false;
-  const handler = (signal) => {
-    if (shuttingDown)
-      return;
-    shuttingDown = true;
-    void (async () => {
-      try {
-        if (opts.onSignal)
-          await opts.onSignal(signal);
-        await server.close();
-      } catch (err) {
-        console.error(`[mcp-utils] error during graceful shutdown on ${signal}: ${err instanceof Error ? err.message : String(err)}`);
-      } finally {
-        if (shouldExit)
-          process.exit(0);
-      }
-    })();
-  };
-  process.on("SIGINT", () => handler("SIGINT"));
-  process.on("SIGTERM", () => handler("SIGTERM"));
-}
-async function runMcp(opts) {
-  const server = await createMcpServer(opts);
-  const shutdown = opts.shutdown ?? true;
-  if (shutdown !== false) {
-    withGracefulShutdown(server, shutdown === true ? {} : shutdown);
-  }
-  const spec = opts.transport ?? "stdio";
-  const transport = spec === "stdio" ? new StdioServerTransport() : spec;
-  await server.connect(transport);
-  return server;
-}
-
 // node_modules/@chrischall/mcp-utils/dist/errors/index.js
 var DEFAULT_ERROR_MESSAGE_MAX = 500;
 var McpToolError = class extends Error {
@@ -34765,6 +34738,81 @@ function textResult(data) {
     content: [{ type: "text", text: JSON.stringify(data, null, 2) }]
   };
 }
+function errorResult(message) {
+  return {
+    content: [{ type: "text", text: redactSecrets(message) }],
+    isError: true
+  };
+}
+
+// node_modules/@chrischall/mcp-utils/dist/server/index.js
+function hintResultOrRethrow(err) {
+  if (err instanceof McpToolError && err.hint) {
+    return errorResult(`${err.message}
+
+Hint: ${err.hint}`);
+  }
+  throw err;
+}
+function surfaceToolHints(server) {
+  const register = server.registerTool.bind(server);
+  server.registerTool = (name, config2, cb) => register(name, config2, (...args) => {
+    let result;
+    try {
+      result = cb(...args);
+    } catch (err) {
+      return hintResultOrRethrow(err);
+    }
+    return result instanceof Promise ? result.catch(hintResultOrRethrow) : result;
+  });
+}
+async function createMcpServer(opts) {
+  const server = new McpServer({ name: opts.name, version: opts.version });
+  if (opts.surfaceHints !== false)
+    surfaceToolHints(server);
+  if (opts.banner !== void 0) {
+    console.error(opts.banner);
+  }
+  const deps = opts.deps;
+  for (const register of opts.tools) {
+    await register(server, deps);
+  }
+  return server;
+}
+function withGracefulShutdown(server, opts = {}) {
+  const shouldExit = opts.exit ?? true;
+  let shuttingDown = false;
+  const handler = (signal) => {
+    if (shuttingDown)
+      return;
+    shuttingDown = true;
+    void (async () => {
+      try {
+        if (opts.onSignal)
+          await opts.onSignal(signal);
+        await server.close();
+      } catch (err) {
+        console.error(`[mcp-utils] error during graceful shutdown on ${signal}: ${err instanceof Error ? err.message : String(err)}`);
+      } finally {
+        if (shouldExit)
+          process.exit(0);
+      }
+    })();
+  };
+  process.on("SIGINT", () => handler("SIGINT"));
+  process.on("SIGTERM", () => handler("SIGTERM"));
+}
+async function runMcp(opts) {
+  const server = await createMcpServer(opts);
+  const shutdown = opts.shutdown ?? true;
+  if (shutdown !== false) {
+    withGracefulShutdown(server, shutdown === true ? {} : shutdown);
+  }
+  const spec = opts.transport ?? "stdio";
+  const transport = spec === "stdio" ? new StdioServerTransport() : spec;
+  await server.connect(transport);
+  return server;
+}
 
 // node_modules/@chrischall/mcp-utils/dist/config/index.js
 var PLACEHOLDER_RE = /^\$\{[^}]*\}$/;
@@ -34779,6 +34827,20 @@ function readEnvVar(key, opts = {}) {
   }
   return opts.default;
 }
+var TRUE_TOKENS = /* @__PURE__ */ new Set(["1", "true", "yes", "on"]);
+var FALSE_TOKENS = /* @__PURE__ */ new Set(["0", "false", "no", "off"]);
+function parseBoolEnv(key, opts = {}) {
+  const fallback = opts.default ?? false;
+  const raw = readEnvVar(key, { env: opts.env });
+  if (raw === void 0)
+    return fallback;
+  const token = raw.toLowerCase();
+  if (TRUE_TOKENS.has(token))
+    return true;
+  if (FALSE_TOKENS.has(token))
+    return false;
+  return fallback;
+}
 async function loadDotenvSafely(opts = {}) {
   try {
     const mod = await import(
@@ -34998,8 +35060,15 @@ function createOAuth2Refresher(opts) {
 }
 
 // node_modules/@fetchproxy/protocol/dist/frames.js
-var PROTOCOL_VERSION = 2;
+var PROTOCOL_VERSION = 3;
 var HKDF_SESSION_INFO = "fetchproxy/1.0.0/session";
+function readySignaturePayload(mcpHelloNonce, extHelloNonce, extensionSessionPub) {
+  const out = new Uint8Array(mcpHelloNonce.length + extHelloNonce.length + extensionSessionPub.length);
+  out.set(mcpHelloNonce, 0);
+  out.set(extHelloNonce, mcpHelloNonce.length);
+  out.set(extensionSessionPub, mcpHelloNonce.length + extHelloNonce.length);
+  return out;
+}
 var KNOWN_CAPABILITIES = /* @__PURE__ */ new Set([
   "fetch",
   "read_cookies",
@@ -35010,7 +35079,8 @@ var KNOWN_CAPABILITIES = /* @__PURE__ */ new Set([
   "read_indexed_db",
   "read_dom",
   "download",
-  "graphql"
+  "graphql",
+  "write_cookies"
 ]);
 
 // node_modules/@fetchproxy/protocol/dist/mcp-id.js
@@ -35121,6 +35191,15 @@ function assertHttpUrl(x, label) {
     throw new ProtocolError(`${label}: must be http(s), got ${u.protocol}`);
   }
 }
+function assertCookiePath(x, label) {
+  assertString(x, label);
+  if (!x.startsWith("/") || x.startsWith("//")) {
+    throw new ProtocolError(`${label}: must be an absolute path like "/campus"`);
+  }
+  if (x.includes("?") || x.includes("#") || x.includes("\\")) {
+    throw new ProtocolError(`${label}: must not contain a query, fragment, or backslash`);
+  }
+}
 function assertHttpsOriginOnly(x, label) {
   assertString(x, label);
   let u;
@@ -35565,13 +35644,43 @@ function validateInnerRequest(raw) {
     }
     assertHttpsOriginOnly(raw.init.origin, "inner.init.origin");
     assertNonEmptyKeyArray(raw.init.keys, "inner.init.keys");
+    if (raw.init.path !== void 0)
+      assertCookiePath(raw.init.path, "inner.init.path");
     for (const k of Object.keys(raw.init)) {
-      if (k !== "origin" && k !== "keys") {
+      if (k !== "origin" && k !== "keys" && k !== "path") {
         throw new ProtocolError(`inner.init: unexpected field ${JSON.stringify(k)} on read_cookies`);
       }
     }
     return raw;
   }
+  if (raw.op === "write_cookies") {
+    assertObject(raw.init, "inner.init");
+    assertHttpsOriginOnly(raw.init.origin, "inner.init.origin");
+    if (!Array.isArray(raw.init.cookies) || raw.init.cookies.length === 0) {
+      throw new ProtocolError("inner.init.cookies: must be a non-empty array");
+    }
+    for (const [i, entry] of raw.init.cookies.entries()) {
+      assertObject(entry, `inner.init.cookies[${i}]`);
+      assertString(entry.name, `inner.init.cookies[${i}].name`);
+      if (!SCOPE_KEY_RE.test(entry.name)) {
+        throw new ProtocolError(`inner.init.cookies[${i}].name: invalid key ${JSON.stringify(entry.name)}`);
+      }
+      assertString(entry.value, `inner.init.cookies[${i}].value`);
+      for (const k of Object.keys(entry)) {
+        if (k !== "name" && k !== "value") {
+          throw new ProtocolError(`inner.init.cookies[${i}]: unexpected field ${JSON.stringify(k)}`);
+        }
+      }
+    }
+    if (raw.init.path !== void 0)
+      assertCookiePath(raw.init.path, "inner.init.path");
+    for (const k of Object.keys(raw.init)) {
+      if (k !== "origin" && k !== "cookies" && k !== "path") {
+        throw new ProtocolError(`inner.init: unexpected field ${JSON.stringify(k)} on write_cookies`);
+      }
+    }
+    return raw;
+  }
   if (raw.op === "read_local_storage" || raw.op === "read_session_storage") {
     assertObject(raw.init, "inner.init");
     if (raw.init.origin === void 0) {
@@ -35758,7 +35867,7 @@ function validateInnerRequest(raw) {
     }
     return raw;
   }
-  throw new ProtocolError(`inner.op: must be one of "fetch", "read_cookies", "read_local_storage", "read_session_storage", "capture_request_header", "capture_redirect", "read_indexed_db", "read_dom", "download", "graphql_query"; got ${JSON.stringify(raw.op)}`);
+  throw new ProtocolError(`inner.op: must be one of "fetch", "read_cookies", "read_local_storage", "read_session_storage", "capture_request_header", "capture_redirect", "read_indexed_db", "read_dom", "download", "graphql_query", "write_cookies"; got ${JSON.stringify(raw.op)}`);
 }
 function assertNonEmptyKeyArray(value, label) {
   if (!Array.isArray(value)) {
@@ -35819,6 +35928,18 @@ function validateInnerResponse(raw) {
       }
       return raw;
     }
+    if (op === "write_cookies") {
+      if (raw.written === void 0) {
+        throw new ProtocolError("inner.written: missing on write_cookies response");
+      }
+      if (!Array.isArray(raw.written)) {
+        throw new ProtocolError("inner.written: must be an array");
+      }
+      for (const [i, name] of raw.written.entries()) {
+        assertString(name, `inner.written[${i}]`);
+      }
+      return raw;
+    }
     if (op === "read_local_storage" || op === "read_session_storage") {
       if (raw.values === void 0) {
         throw new ProtocolError(`inner.values: missing on ${String(op)} response`);
@@ -36112,7 +36233,7 @@ var DEFAULT_BIND_TIMEOUT_MS = 5e3;
 async function electRole(opts) {
   const server = createServer();
   const bindTimeoutMs = opts.bindTimeoutMs ?? DEFAULT_BIND_TIMEOUT_MS;
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve2, reject) => {
     let timer;
     const clearBindTimer = () => {
       if (timer) {
@@ -36128,7 +36249,7 @@ async function electRole(opts) {
           server.close();
         } catch {
         }
-        resolve({ role: "peer" });
+        resolve2({ role: "peer" });
       } else {
         reject(e);
       }
@@ -36136,7 +36257,7 @@ async function electRole(opts) {
     const onListening = () => {
       clearBindTimer();
       server.removeListener("error", onError);
-      resolve({ role: "host", server });
+      resolve2({ role: "host", server });
     };
     server.once("error", onError);
     server.once("listening", onListening);
@@ -36296,6 +36417,148 @@ async function awaitSessionReady(ready, opts) {
   }
 }
 
+// node_modules/@fetchproxy/server/dist/extension-trust.js
+import { readFile as readFile2, writeFile as writeFile2, rename, unlink, mkdir as mkdir2, chmod as chmod2 } from "node:fs/promises";
+import { join as join2 } from "node:path";
+
+// node_modules/@fetchproxy/server/dist/identity.js
+import { readFile, writeFile, mkdir, chmod } from "node:fs/promises";
+import { join } from "node:path";
+import { homedir } from "node:os";
+var SAFE_PLAIN = /^[A-Za-z0-9._-]+$/;
+var SAFE_SCOPED = /^@[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
+function defaultIdentityDir() {
+  return join(homedir(), ".fetchproxy", "identity");
+}
+function safeIdentityFileBase(serverName) {
+  if (!serverName || serverName === ".." || serverName.includes("..") || !SAFE_PLAIN.test(serverName) && !SAFE_SCOPED.test(serverName)) {
+    throw new Error(`unsafe serverName for identity file: ${JSON.stringify(serverName)}`);
+  }
+  return serverName.replace(/\//g, "_");
+}
+async function loadOrCreateIdentity(serverName, dir = defaultIdentityDir()) {
+  const safeFile = safeIdentityFileBase(serverName);
+  const path = join(dir, `${safeFile}.json`);
+  await mkdir(dir, { recursive: true, mode: 448 });
+  try {
+    const raw = await readFile(path, "utf8");
+    const j2 = JSON.parse(raw);
+    return {
+      x25519Priv: fromB64(j2.x25519Priv),
+      x25519Pub: fromB64(j2.x25519Pub),
+      ed25519Priv: fromB64(j2.ed25519Priv),
+      ed25519Pub: fromB64(j2.ed25519Pub),
+      createdAt: j2.createdAt
+    };
+  } catch (e) {
+    if (e.code !== "ENOENT")
+      throw e;
+  }
+  const x = await generateX25519();
+  const ed = await generateEd25519();
+  const id = {
+    x25519Priv: x.privateKey,
+    x25519Pub: x.publicKey,
+    ed25519Priv: ed.privateKey,
+    ed25519Pub: ed.publicKey,
+    createdAt: Date.now()
+  };
+  const j = {
+    x25519Priv: toB64(id.x25519Priv),
+    x25519Pub: toB64(id.x25519Pub),
+    ed25519Priv: toB64(id.ed25519Priv),
+    ed25519Pub: toB64(id.ed25519Pub),
+    createdAt: id.createdAt
+  };
+  await writeFile(path, JSON.stringify(j, null, 2), { mode: 384 });
+  await chmod(path, 384);
+  return id;
+}
+
+// node_modules/@fetchproxy/server/dist/extension-trust.js
+function fileExtensionTrust(args) {
+  return {
+    allowNew: args.allowNew,
+    location: extensionTrustPath(args.serverName, args.dir ?? defaultIdentityDir()),
+    read: () => readExtensionPin(args.serverName, args.dir ?? defaultIdentityDir()),
+    write: (pin) => writeExtensionPin(args.serverName, pin, args.dir ?? defaultIdentityDir())
+  };
+}
+var TRUST_NEW_EXTENSION_ENV = "FETCHPROXY_TRUST_NEW_EXTENSION";
+function allowNewExtensionIdentity(explicit, env = process.env) {
+  if (explicit !== void 0)
+    return explicit;
+  return env[TRUST_NEW_EXTENSION_ENV] === "1";
+}
+function decideExtensionTrust(args) {
+  const { pin, hello, allowNew, serverName } = args;
+  if (!pin)
+    return { decision: "first-use" };
+  if (pin.identityX25519Pub === hello.identityX25519Pub && pin.identityEd25519Pub === hello.identityEd25519Pub) {
+    return { decision: "pinned" };
+  }
+  const trustPath = args.location ?? extensionTrustPathHint(serverName);
+  if (allowNew) {
+    return {
+      decision: "replace",
+      message: `[fetchproxy] ${serverName}: accepting a NEW extension identity because ${TRUST_NEW_EXTENSION_ENV}=1 \u2014 re-pinning. Unset it once the browser you expect is connected.`
+    };
+  }
+  return {
+    decision: "refused",
+    message: `[fetchproxy] ${serverName}: refusing an extension whose identity is not the one this MCP paired with. If you re-installed the extension or moved to another browser, re-pair deliberately: run this MCP once with ${TRUST_NEW_EXTENSION_ENV}=1, or delete ${trustPath}. If you did neither, something else is answering as your browser.`
+  };
+}
+function extensionTrustPath(serverName, dir = defaultIdentityDir()) {
+  return join2(dir, `${safeIdentityFileBase(serverName)}.extension-trust.json`);
+}
+function extensionTrustPathHint(serverName) {
+  try {
+    return extensionTrustPath(serverName);
+  } catch {
+    return join2(defaultIdentityDir(), "<server-name>.extension-trust.json");
+  }
+}
+function isPin(x) {
+  if (!x || typeof x !== "object")
+    return false;
+  const r = x;
+  return typeof r.identityX25519Pub === "string" && typeof r.identityEd25519Pub === "string" && typeof r.pinnedAt === "number";
+}
+async function readExtensionPin(serverName, dir = defaultIdentityDir()) {
+  const path = extensionTrustPath(serverName, dir);
+  let raw;
+  try {
+    raw = await readFile2(path, "utf8");
+  } catch (e) {
+    if (e.code === "ENOENT")
+      return null;
+    throw e;
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    throw new Error(`unreadable extension pin at ${path} (not JSON) \u2014 delete it to re-pair`);
+  }
+  if (!isPin(parsed)) {
+    throw new Error(`unreadable extension pin at ${path} (wrong shape) \u2014 delete it to re-pair`);
+  }
+  return {
+    identityX25519Pub: parsed.identityX25519Pub,
+    identityEd25519Pub: parsed.identityEd25519Pub,
+    pinnedAt: parsed.pinnedAt
+  };
+}
+async function writeExtensionPin(serverName, pin, dir = defaultIdentityDir()) {
+  const path = extensionTrustPath(serverName, dir);
+  await mkdir2(dir, { recursive: true, mode: 448 });
+  const tmp = `${path}.tmp`;
+  await writeFile2(tmp, JSON.stringify(pin, null, 2), { mode: 384 });
+  await chmod2(tmp, 384);
+  await rename(tmp, path);
+}
+
 // node_modules/@fetchproxy/server/dist/host.js
 var PUBLIC_ORIGIN_RE = /^https?:\/\/(?!(127\.0\.0\.1|localhost)(:|$))/i;
 var enc2 = new TextEncoder();
@@ -36340,8 +36603,8 @@ async function startHost(opts) {
   let rejectOwnSession;
   let ownSessionReady;
   function resetSessionPromise() {
-    ownSessionReady = new Promise((resolve, reject) => {
-      resolveOwnSession = resolve;
+    ownSessionReady = new Promise((resolve2, reject) => {
+      resolveOwnSession = resolve2;
       rejectOwnSession = reject;
     });
     ownSessionReady.catch(() => {
@@ -36349,9 +36612,12 @@ async function startHost(opts) {
   }
   resetSessionPromise();
   let extensionHello = null;
+  let extensionClaim = null;
   wss.on("connection", (ws) => {
     let identified = null;
     let peerMcpId = null;
+    let closed = false;
+    let pinOnReady = false;
     ws.on("message", async (data) => {
       try {
         let frame;
@@ -36363,10 +36629,43 @@ async function startHost(opts) {
           return;
         }
         if (frame.type === "hello" && frame.role === "extension") {
-          if (extensionWs) {
+          if (extensionWs || extensionClaim) {
             ws.close(1008, "extension already connected");
             return;
           }
+          extensionClaim = ws;
+          let pin;
+          try {
+            pin = await opts.extensionTrust.read();
+          } catch (e) {
+            console.error(`[fetchproxy] ${String(e)}`);
+            if (extensionClaim === ws)
+              extensionClaim = null;
+            ws.close(1008, "extension pin unreadable");
+            return;
+          }
+          const outcome = decideExtensionTrust({
+            pin,
+            hello: frame,
+            allowNew: opts.extensionTrust.allowNew,
+            serverName: opts.ownServerName,
+            location: opts.extensionTrust.location
+          });
+          if (outcome.decision === "refused") {
+            console.warn(outcome.message);
+            if (extensionClaim === ws)
+              extensionClaim = null;
+            ws.close(1008, "extension identity is not the pinned one");
+            return;
+          }
+          if (outcome.decision === "replace")
+            console.warn(outcome.message);
+          if (closed || ws.readyState !== import_websocket.default.OPEN) {
+            if (extensionClaim === ws)
+              extensionClaim = null;
+            return;
+          }
+          pinOnReady = outcome.decision !== "pinned";
           identified = "extension";
           extensionWs = ws;
           extensionHello = frame;
@@ -36378,6 +36677,8 @@ async function startHost(opts) {
               console.error("[fetchproxy] onPairCode threw:", e);
             }
           }
+          for (const slot of peers.values())
+            slot.ws.send(JSON.stringify(frame));
           ws.send(JSON.stringify(ownHello));
           for (const slot of peers.values()) {
             ws.send(JSON.stringify(slot.helloFrame));
@@ -36413,6 +36714,8 @@ async function startHost(opts) {
           peers.set(frame.mcpId, { ws, helloFrame: frame });
           if (extensionWs)
             extensionWs.send(JSON.stringify(frame));
+          if (extensionHello)
+            ws.send(JSON.stringify(extensionHello));
           return;
         }
         if (frame.type === "ready") {
@@ -36424,7 +36727,7 @@ async function startHost(opts) {
             }
             const extEdPub = fromB64(extensionHello.identityEd25519Pub);
             const extNonce = fromB64(extensionHello.sessionNonce);
-            const msg = concatBytes(ownSessionNonce, extNonce);
+            const msg = readySignaturePayload(ownSessionNonce, extNonce, fromB64(frame.extensionSessionPub));
             const sig = fromB64(frame.sessionSig);
             let sigOk = false;
             try {
@@ -36437,6 +36740,18 @@ async function startHost(opts) {
               ws.close(1008, "extension session signature invalid");
               return;
             }
+            if (pinOnReady) {
+              pinOnReady = false;
+              try {
+                await opts.extensionTrust.write({
+                  identityX25519Pub: extensionHello.identityX25519Pub,
+                  identityEd25519Pub: extensionHello.identityEd25519Pub,
+                  pinnedAt: Date.now()
+                });
+              } catch (e) {
+                console.error(`[fetchproxy] could not persist the extension pin: ${String(e)}`);
+              }
+            }
             const extPub = fromB64(frame.extensionSessionPub);
             const shared = await ecdhX25519(opts.ownIdentity.x25519Priv, extPub);
             const key = await hkdfSha256(shared, ownSessionNonce, enc2.encode(HKDF_SESSION_INFO), 32);
@@ -36490,6 +36805,9 @@ async function startHost(opts) {
       }
     });
     ws.on("close", () => {
+      closed = true;
+      if (extensionClaim === ws)
+        extensionClaim = null;
       if (identified === "extension" && extensionWs === ws) {
         extensionWs = null;
         extensionHello = null;
@@ -36507,7 +36825,7 @@ async function startHost(opts) {
     });
   });
   return {
-    close: () => new Promise((resolve) => {
+    close: () => new Promise((resolve2) => {
       for (const client of wss.clients) {
         try {
           client.terminate();
@@ -36515,7 +36833,7 @@ async function startHost(opts) {
         }
       }
       wss.close(() => {
-        opts.httpServer.close(() => resolve());
+        opts.httpServer.close(() => resolve2());
       });
     }),
     sendOwnInner: async (inner) => {
@@ -36545,8 +36863,8 @@ async function startHost(opts) {
 var enc3 = new TextEncoder();
 async function startPeer(opts) {
   const ws = new import_websocket.default(`ws://${opts.host}:${opts.port}`);
-  await new Promise((resolve, reject) => {
-    ws.once("open", () => resolve());
+  await new Promise((resolve2, reject) => {
+    ws.once("open", () => resolve2());
     ws.once("error", reject);
   });
   const hello = await buildServerHello({
@@ -36576,15 +36894,88 @@ async function startPeer(opts) {
   let pendingPairCode = null;
   let resolveFirstReady;
   let rejectFirstReady;
-  const sessionPromise = new Promise((resolve, reject) => {
-    resolveFirstReady = resolve;
+  const sessionPromise = new Promise((resolve2, reject) => {
+    resolveFirstReady = resolve2;
     rejectFirstReady = reject;
   });
+  let extensionHello = null;
+  let warnedUnverifiable = false;
+  let cachedPin = void 0;
+  const authenticateExtension = async (sessionSig, extensionSessionPub) => {
+    if (!extensionHello) {
+      if (opts.requireExtensionIdentity) {
+        console.error(`[fetchproxy] ${opts.serverName}: the concentrator does not forward the extension's identity, so this session cannot be verified \u2014 refusing. Upgrade the MCP holding the bridge port to 1.12.0 or later.`);
+        return false;
+      }
+      if (!warnedUnverifiable) {
+        warnedUnverifiable = true;
+        console.warn(`[fetchproxy] ${opts.serverName}: the concentrator does not forward the extension's identity (pre-1.12.0), so this peer cannot verify which browser it is talking to. Upgrade the MCP holding the bridge port to close this.`);
+      }
+      return true;
+    }
+    const payload = readySignaturePayload(sessionNonce, fromB64(extensionHello.sessionNonce), fromB64(extensionSessionPub));
+    let sigOk = false;
+    try {
+      sigOk = await ed25519Verify(fromB64(extensionHello.identityEd25519Pub), payload, fromB64(sessionSig));
+    } catch {
+      sigOk = false;
+    }
+    if (!sigOk) {
+      console.warn(`[fetchproxy] ${opts.serverName}: extension session signature invalid \u2014 refusing (the concentrator may be answering in the browser's place)`);
+      return false;
+    }
+    if (cachedPin === void 0) {
+      try {
+        cachedPin = await opts.extensionTrust.read();
+      } catch (e) {
+        console.error(`[fetchproxy] ${String(e)}`);
+        return false;
+      }
+    }
+    const pin = cachedPin;
+    const outcome = decideExtensionTrust({
+      pin,
+      hello: extensionHello,
+      allowNew: opts.extensionTrust.allowNew,
+      serverName: opts.serverName,
+      location: opts.extensionTrust.location
+    });
+    if (outcome.decision === "refused") {
+      console.warn(outcome.message);
+      return false;
+    }
+    if (outcome.decision === "replace")
+      console.warn(outcome.message);
+    if (outcome.decision !== "pinned") {
+      try {
+        const written = {
+          identityX25519Pub: extensionHello.identityX25519Pub,
+          identityEd25519Pub: extensionHello.identityEd25519Pub,
+          pinnedAt: Date.now()
+        };
+        await opts.extensionTrust.write(written);
+        cachedPin = written;
+      } catch (e) {
+        console.error(`[fetchproxy] could not persist the extension pin: ${String(e)}`);
+      }
+    }
+    return true;
+  };
   const onMessage = async (data) => {
     try {
       const raw = JSON.parse(data.toString());
       const frame = validateFrame(raw);
+      if (frame.type === "hello" && frame.role === "extension") {
+        extensionHello = frame;
+        return;
+      }
       if (frame.type === "ready" && frame.mcpId === opts.mcpId) {
+        const authorised = await authenticateExtension(frame.sessionSig, frame.extensionSessionPub);
+        if (!authorised) {
+          ws.close(1008, "extension identity refused");
+          rejectFirstReady(new Error("peer: extension identity refused"));
+          return;
+        }
         const extPub = fromB64(frame.extensionSessionPub);
         const shared = await ecdhX25519(opts.identity.x25519Priv, extPub);
         const sessionKey = await hkdfSha256(shared, sessionNonce, enc3.encode(HKDF_SESSION_INFO), 32);
@@ -36665,57 +37056,6 @@ async function startPeer(opts) {
   return handle;
 }
 
-// node_modules/@fetchproxy/server/dist/identity.js
-import { readFile, writeFile, mkdir, chmod } from "node:fs/promises";
-import { join } from "node:path";
-import { homedir } from "node:os";
-var SAFE_PLAIN = /^[A-Za-z0-9._-]+$/;
-var SAFE_SCOPED = /^@[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
-function defaultIdentityDir() {
-  return join(homedir(), ".fetchproxy", "identity");
-}
-async function loadOrCreateIdentity(serverName, dir = defaultIdentityDir()) {
-  if (!serverName || serverName === ".." || serverName.includes("..") || !SAFE_PLAIN.test(serverName) && !SAFE_SCOPED.test(serverName)) {
-    throw new Error(`unsafe serverName for identity file: ${JSON.stringify(serverName)}`);
-  }
-  const safeFile = serverName.replace(/\//g, "_");
-  const path = join(dir, `${safeFile}.json`);
-  await mkdir(dir, { recursive: true, mode: 448 });
-  try {
-    const raw = await readFile(path, "utf8");
-    const j2 = JSON.parse(raw);
-    return {
-      x25519Priv: fromB64(j2.x25519Priv),
-      x25519Pub: fromB64(j2.x25519Pub),
-      ed25519Priv: fromB64(j2.ed25519Priv),
-      ed25519Pub: fromB64(j2.ed25519Pub),
-      createdAt: j2.createdAt
-    };
-  } catch (e) {
-    if (e.code !== "ENOENT")
-      throw e;
-  }
-  const x = await generateX25519();
-  const ed = await generateEd25519();
-  const id = {
-    x25519Priv: x.privateKey,
-    x25519Pub: x.publicKey,
-    ed25519Priv: ed.privateKey,
-    ed25519Pub: ed.publicKey,
-    createdAt: Date.now()
-  };
-  const j = {
-    x25519Priv: toB64(id.x25519Priv),
-    x25519Pub: toB64(id.x25519Pub),
-    ed25519Priv: toB64(id.ed25519Priv),
-    ed25519Pub: toB64(id.ed25519Pub),
-    createdAt: id.createdAt
-  };
-  await writeFile(path, JSON.stringify(j, null, 2), { mode: 384 });
-  await chmod(path, 384);
-  return id;
-}
-
 // node_modules/@fetchproxy/server/dist/error-kind.js
 function classifyFetchError(error51) {
   if (/Could not establish connection/i.test(error51) || /Receiving end does not exist/i.test(error51)) {
@@ -36756,6 +37096,17 @@ function classifyBridgeError(err) {
 }
 
 // node_modules/@fetchproxy/server/dist/ws-server.js
+function envWsPort() {
+  const raw = process.env.FETCHPROXY_WS_PORT;
+  if (raw === void 0 || raw.trim() === "")
+    return void 0;
+  if (!/^\d+$/.test(raw.trim()))
+    return void 0;
+  const port = Number(raw.trim());
+  if (!Number.isInteger(port) || port < 1 || port > 65535)
+    return void 0;
+  return port;
+}
 var FetchproxyProtocolError = class extends Error {
   constructor(message) {
     super(message);
@@ -36797,6 +37148,39 @@ var FetchproxyBridgeDownError = class extends FetchproxyProtocolError {
     this.hint = hint;
   }
 };
+var FetchproxyHintedError = class extends FetchproxyProtocolError {
+  /** The extension's raw rejection, unmodified. */
+  originalError;
+  /** What the user should actually do, in prose. */
+  hint;
+  constructor(originalError, hint) {
+    super(`${originalError} \u2014 ${hint}`);
+    this.name = "FetchproxyHintedError";
+    this.originalError = originalError;
+    this.hint = hint;
+  }
+};
+var FetchproxyScopeError = class extends FetchproxyHintedError {
+  constructor(originalError) {
+    super(originalError, "the declared scope changed since you paired, so the extension is refusing the request. Revoke this MCP in the Transporter extension popup, then re-run \u2014 you will be asked to approve the new scope. This is not a version problem and does not need an update.");
+    this.name = "FetchproxyScopeError";
+  }
+};
+var FetchproxyNoTabError = class extends FetchproxyHintedError {
+  constructor(originalError) {
+    super(originalError, "open a tab on that host and sign in, then re-run. This is not a version problem and does not need an update.");
+    this.name = "FetchproxyNoTabError";
+  }
+};
+var SCOPE_REJECTION = /not in declared/;
+var NO_TAB_REJECTION = /no tab matching (?!.*content script loaded)/;
+function protocolErrorFrom(error51) {
+  if (SCOPE_REJECTION.test(error51))
+    return new FetchproxyScopeError(error51);
+  if (NO_TAB_REJECTION.test(error51))
+    return new FetchproxyNoTabError(error51);
+  return new FetchproxyProtocolError(error51);
+}
 var FetchproxyTimeoutError = class extends FetchproxyProtocolError {
   url;
   timeoutMs;
@@ -36826,6 +37210,17 @@ var FetchproxyTimeoutError = class extends FetchproxyProtocolError {
   }
 };
 var SUBDOMAIN_LABEL_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
+function normalizeCookiePath(path) {
+  if (path === void 0 || path === "")
+    return void 0;
+  const trimmed = path.endsWith("/") && path !== "/" ? path.slice(0, -1) : path;
+  try {
+    assertCookiePath(trimmed, "path");
+  } catch (e) {
+    throw new Error(`FetchproxyServer: ${e instanceof Error ? e.message : String(e)} (got ${JSON.stringify(path)})`);
+  }
+  return trimmed;
+}
 function assertSubdomainLabel(label) {
   if (!SUBDOMAIN_LABEL_RE.test(label)) {
     throw new Error(`FetchproxyServer: subdomain must be a DNS label like "www" or "api" (or dot-separated like "auth.api"), got ${JSON.stringify(label)}`);
@@ -36890,6 +37285,9 @@ var FetchproxyServer = class {
   // them off from `pending` (fetch) and `pendingReadCookies` (legacy
   // string-shape) so the response routing in `onInner` stays linear.
   pendingStorage = /* @__PURE__ */ new Map();
+  // 1.12.0+: write-cookies awaiters resolve the list of names actually
+  // written, so a caller can confirm rather than assume.
+  pendingWriteCookies = /* @__PURE__ */ new Map();
   // 0.3.0+: capture-header awaiters resolve a single string.
   pendingCapture = /* @__PURE__ */ new Map();
   // capture_redirect awaiters resolve the captured redirect URL string.
@@ -36956,7 +37354,7 @@ var FetchproxyServer = class {
       }
     }
     this.opts = {
-      port: opts.port ?? 37149,
+      port: opts.port ?? envWsPort() ?? 37149,
       host: opts.host ?? "127.0.0.1",
       serverName: opts.serverName,
       version: opts.version,
@@ -37016,6 +37414,8 @@ var FetchproxyServer = class {
       keepAliveIntervalMs: opts.keepAliveIntervalMs ?? 2e4,
       keepAliveMaxIdleMs: opts.keepAliveMaxIdleMs ?? 5 * 60 * 1e3,
       identityDir: opts.identityDir,
+      allowNewExtensionIdentity: opts.allowNewExtensionIdentity,
+      requireExtensionIdentity: opts.requireExtensionIdentity,
       onPairCode: opts.onPairCode
     };
   }
@@ -37115,7 +37515,8 @@ var FetchproxyServer = class {
         ownSessionStoragePointers: this.opts.sessionStoragePointers,
         ownDomSelectors: this.opts.domSelectors,
         ownGraphqlOps: this.opts.graphqlOps,
-        onPairCode: this.opts.onPairCode
+        onPairCode: this.opts.onPairCode,
+        extensionTrust: this.extensionTrust()
       });
       this.hostHandle.onOwnInner((inner) => this.onInner(inner));
       this.hostHandle.onExtensionDisconnect(() => {
@@ -37144,7 +37545,9 @@ var FetchproxyServer = class {
         localStoragePointers: this.opts.localStoragePointers,
         sessionStoragePointers: this.opts.sessionStoragePointers,
         domSelectors: this.opts.domSelectors,
-        graphqlOps: this.opts.graphqlOps
+        graphqlOps: this.opts.graphqlOps,
+        extensionTrust: this.extensionTrust(),
+        requireExtensionIdentity: this.opts.requireExtensionIdentity
       });
       this.peerHandle.onInner((inner) => this.onInner(inner));
       this.peerHandle.onRenegotiate(() => {
@@ -37283,6 +37686,23 @@ var FetchproxyServer = class {
   markActive() {
     this.noteActivityForKeepalive();
   }
+  /**
+   * #208: this MCP's pin on the extension's identity, stored beside its own
+   * identity key and so following `identityDir` wherever the caller put it.
+   *
+   * `allowNewExtensionIdentity` falls back to an environment variable when the
+   * caller expressed no opinion, because the thirteen MCPs that construct this
+   * class are separate packages: an operator whose extension re-install has
+   * just locked all of them out needs one lever that does not require patching
+   * every one of them.
+   */
+  extensionTrust() {
+    return fileExtensionTrust({
+      serverName: this.opts.serverName,
+      dir: this.opts.identityDir,
+      allowNew: allowNewExtensionIdentity(this.opts.allowNewExtensionIdentity)
+    });
+  }
   noteActivityForKeepalive() {
     const intervalMs = this.opts.keepAliveIntervalMs;
     if (intervalMs <= 0)
@@ -37346,6 +37766,7 @@ var FetchproxyServer = class {
         this.pending.delete(id);
         this.pendingReadCookies.delete(id);
         this.pendingStorage.delete(id);
+        this.pendingWriteCookies.delete(id);
         this.pendingCapture.delete(id);
         this.pendingRedirect.delete(id);
         this.pendingDownload.delete(id);
@@ -37363,8 +37784,8 @@ var FetchproxyServer = class {
   async _fetchOnceWithTimeout(init) {
     const id = this.nextRequestId++;
     const inner = { type: "request", id, op: "fetch", init };
-    const pending = new Promise((resolve) => {
-      this.pending.set(id, resolve);
+    const pending = new Promise((resolve2) => {
+      this.pending.set(id, resolve2);
     });
     await this.sendInnerFrame(inner);
     const timeoutMs = this.opts.fetchTimeoutMs;
@@ -37375,12 +37796,12 @@ var FetchproxyServer = class {
     try {
       return await Promise.race([
         pending,
-        new Promise((resolve) => {
+        new Promise((resolve2) => {
           timer = setTimeout(() => {
             this.pending.delete(id);
             const elapsedMs = Date.now() - start;
             const error51 = `fetchproxy: ${init.url} did not respond within ${timeoutMs}ms`;
-            resolve({
+            resolve2({
               ok: false,
               error: error51,
               kind: "timeout",
@@ -37467,7 +37888,7 @@ var FetchproxyServer = class {
         port: this.opts.port
       });
     }
-    return new FetchproxyProtocolError(result.error);
+    return protocolErrorFrom(result.error);
   }
   /**
    * Convenience wrapper around `fetch()`. Builds the URL from a path
@@ -37503,10 +37924,20 @@ var FetchproxyServer = class {
     }
     const url2 = isAbsolute ? path : `https://${host}${path}`;
     assertUrlInDomains("request url", url2, this.opts.domains);
+    let tabUrl = `https://${host}/`;
+    if (opts.viaTab !== void 0) {
+      try {
+        new URL(opts.viaTab);
+      } catch {
+        throw new Error(`FetchproxyServer.request: viaTab is not a valid URL: ${JSON.stringify(opts.viaTab)}`);
+      }
+      assertUrlInDomains("viaTab", opts.viaTab, this.opts.domains);
+      tabUrl = opts.viaTab;
+    }
     const init = {
       url: url2,
       method,
-      tabUrl: `https://${host}/`,
+      tabUrl,
       headers: opts.headers,
       body: opts.body
     };
@@ -37718,25 +38149,85 @@ var FetchproxyServer = class {
     let inner;
     if (opts.keys !== void 0) {
       this.assertScopeSubset(opts.keys, this.opts.cookieKeys, "cookieKeys");
+      const cookiePath = normalizeCookiePath(opts.path);
       const initV3 = {
+        // Origin stays BARE. The path travels as its own validated field —
+        // `assertHttpsOriginOnly` deliberately refuses a path here so one
+        // cannot be used to re-point the read past the domain gate.
         origin: `https://${host}`,
-        keys: [...opts.keys]
+        keys: [...opts.keys],
+        ...cookiePath !== void 0 ? { path: cookiePath } : {}
       };
       inner = { type: "request", id, op: "read_cookies", init: initV3 };
     } else {
       const tabUrl = `https://${host}/`;
       inner = { type: "request", id, op: "read_cookies", init: { tabUrl } };
     }
-    const pending = new Promise((resolve) => {
-      this.pendingReadCookies.set(id, resolve);
+    const pending = new Promise((resolve2) => {
+      this.pendingReadCookies.set(id, resolve2);
     });
     await this.sendInnerFrame(inner);
     const result = await this._withVerbTimeout(pending, this.pendingReadCookies, id, `https://${host}`);
     if (!result.ok) {
-      throw new FetchproxyProtocolError(result.error);
+      throw protocolErrorFrom(result.error);
     }
     return result.cookies;
   }
+  /**
+   * 1.12.0+: overwrite the value of cookies this MCP already declares.
+   *
+   * The bridge's only write verb, and it exists for one failure class. Sites
+   * that ROTATE a credential cookie hand back a new value on every refresh; if
+   * the MCP refreshes and keeps the result to itself, the copy in the browser's
+   * cookie jar is dead, and the user gets signed out of a tab they never
+   * touched — usually reported to them as "inactivity". Writing the rotated
+   * value back is the only thing that repairs it.
+   *
+   * Requires `'write_cookies'` in capabilities, which the user approves at pair
+   * time as its own line. Every name must ALSO be in declared `cookieKeys`: a
+   * write can never reach a cookie the MCP was not already trusted to read, so
+   * granting it cannot widen which cookies are in play — only what may be done
+   * to the ones already listed.
+   *
+   * The extension refuses the whole request unless every named cookie already
+   * exists; this refreshes a value in place and deliberately cannot author new
+   * cookies. Returns the names actually written.
+   */
+  async writeCookies(opts) {
+    if (!this.opts.capabilities.includes("write_cookies")) {
+      throw new Error('FetchproxyServer.writeCookies(): MCP did not declare "write_cookies" in capabilities \u2014 add it to FetchproxyServerOpts.capabilities to enable this verb');
+    }
+    const names = Object.keys(opts.cookies);
+    if (names.length === 0) {
+      throw new Error("FetchproxyServer.writeCookies(): no cookies given");
+    }
+    await this.ensureConnected();
+    this.throwIfPendingPair();
+    if (opts.subdomain !== void 0)
+      assertSubdomainLabel(opts.subdomain);
+    const baseDomain = this.resolveBaseDomain(opts.domain);
+    const host = opts.subdomain ? `${opts.subdomain}.${baseDomain}` : baseDomain;
+    this.assertScopeSubset(names, this.opts.cookieKeys, "cookieKeys");
+    const cookiePath = normalizeCookiePath(opts.path);
+    const id = this.nextRequestId++;
+    const inner = {
+      type: "request",
+      id,
+      op: "write_cookies",
+      init: {
+        // Bare origin, same invariant as the read path: a path must never be
+        // able to move the request past the domain gate.
+        origin: `https://${host}`,
+        cookies: Object.entries(opts.cookies).map(([name, value]) => ({ name, value })),
+        ...cookiePath !== void 0 ? { path: cookiePath } : {}
+      }
+    };
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingWriteCookies.set(id, { resolve: resolve2, reject });
+    });
+    await this.sendInnerFrame(inner);
+    return this._withVerbTimeout(pending, this.pendingWriteCookies, id, `https://${host}`);
+  }
   /**
    * 0.3.0+: read declared localStorage keys from the user's signed-in
    * tab. Requires `'read_local_storage'` in capabilities AND each key
@@ -37794,8 +38285,8 @@ var FetchproxyServer = class {
         ...opts.pointers ? { pointers: { ...opts.pointers } } : {}
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingStorage.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingStorage.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingStorage, id, `https://${host}`);
@@ -37899,8 +38390,8 @@ var FetchproxyServer = class {
         ...opts.timeoutMs !== void 0 ? { timeoutMs: opts.timeoutMs } : {}
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingCapture.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingCapture.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingCapture, id, `https://${opts.host}${opts.path ?? "/*"}`);
@@ -37984,8 +38475,8 @@ var FetchproxyServer = class {
         ...opts.timeoutMs !== void 0 ? { timeoutMs: opts.timeoutMs } : {}
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingRedirect.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingRedirect.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingRedirect, id, `https://${opts.host}${opts.path ?? "/*"}`);
@@ -38066,8 +38557,8 @@ var FetchproxyServer = class {
         ...opts.timeoutMs !== void 0 ? { timeoutMs: opts.timeoutMs } : {}
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingDownload.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingDownload.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingDownload, id, opts.url);
@@ -38114,8 +38605,8 @@ var FetchproxyServer = class {
         keys: [...opts.keys]
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingIdb.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingIdb.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingIdb, id, origin);
@@ -38154,8 +38645,8 @@ var FetchproxyServer = class {
       op: "read_dom",
       init: { origin, names: [...opts.names] }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingStorage.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingStorage.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingStorage, id, origin);
@@ -38200,8 +38691,8 @@ var FetchproxyServer = class {
         ...opts.tabUrl !== void 0 ? { tabUrl: opts.tabUrl } : {}
       }
     };
-    const pending = new Promise((resolve, reject) => {
-      this.pendingGraphql.set(id, { resolve, reject });
+    const pending = new Promise((resolve2, reject) => {
+      this.pendingGraphql.set(id, { resolve: resolve2, reject });
     });
     await this.sendInnerFrame(inner);
     return this._withVerbTimeout(pending, this.pendingGraphql, id, opts.name);
@@ -38283,7 +38774,7 @@ var FetchproxyServer = class {
           storageCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on storage awaiter`));
         }
       } else {
-        storageCb.reject(new FetchproxyProtocolError(inner.error));
+        storageCb.reject(protocolErrorFrom(inner.error));
       }
       return;
     }
@@ -38297,7 +38788,7 @@ var FetchproxyServer = class {
           captureCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on capture awaiter`));
         }
       } else {
-        captureCb.reject(new FetchproxyProtocolError(inner.error));
+        captureCb.reject(protocolErrorFrom(inner.error));
       }
       return;
     }
@@ -38311,7 +38802,7 @@ var FetchproxyServer = class {
           redirectCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on capture_redirect awaiter`));
         }
       } else {
-        redirectCb.reject(new FetchproxyProtocolError(inner.error));
+        redirectCb.reject(protocolErrorFrom(inner.error));
       }
       return;
     }
@@ -38325,7 +38816,7 @@ var FetchproxyServer = class {
           idbCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on read_indexed_db awaiter`));
         }
       } else {
-        idbCb.reject(new FetchproxyProtocolError(inner.error));
+        idbCb.reject(protocolErrorFrom(inner.error));
       }
       return;
     }
@@ -38339,7 +38830,7 @@ var FetchproxyServer = class {
           downloadCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on download awaiter`));
         }
       } else {
-        downloadCb.reject(new FetchproxyProtocolError(inner.error));
+        downloadCb.reject(protocolErrorFrom(inner.error));
       }
       return;
     }
@@ -38353,7 +38844,17 @@ var FetchproxyServer = class {
           graphqlCb.reject(new FetchproxyProtocolError(`unexpected ${String(inner.op)} response on graphql_query awaiter`));
         }
       } else {
-        graphqlCb.reject(new FetchproxyProtocolError(inner.error));
+        graphqlCb.reject(protocolErrorFrom(inner.error));
+      }
+      return;
+    }
+    const writeCookiesCb = this.pendingWriteCookies.get(inner.id);
+    if (writeCookiesCb) {
+      this.pendingWriteCookies.delete(inner.id);
+      if (inner.ok && inner.op === "write_cookies") {
+        writeCookiesCb.resolve([...inner.written]);
+      } else {
+        writeCookiesCb.reject(protocolErrorFrom(inner.ok ? "write_cookies response had the wrong op" : inner.error));
       }
       return;
     }
@@ -38396,6 +38897,9 @@ var FetchproxyServer = class {
     for (const { reject } of this.pendingStorage.values())
       reject(err);
     this.pendingStorage.clear();
+    for (const { reject } of this.pendingWriteCookies.values())
+      reject(err);
+    this.pendingWriteCookies.clear();
     for (const { reject } of this.pendingCapture.values())
       reject(err);
     this.pendingCapture.clear();
@@ -38546,7 +39050,9 @@ async function runOneLift(opts) {
     if (opts.declare.cookies.length > 0) {
       const joined = await server.readCookies({
         keys: opts.declare.cookies,
-        ...storageDomainOpts
+        ...storageDomainOpts,
+        // Cookie-only: the other buckets are origin-scoped and ignore path.
+        ...opts.storagePath !== void 0 ? { path: opts.storagePath } : {}
       });
       for (const piece of joined.split("; ")) {
         if (!piece)
@@ -38720,7 +39226,7 @@ function loadAccount(env = process.env) {
 // package.json
 var package_default = {
   name: "canvas-parent-mcp",
-  version: "1.2.4",
+  version: "1.3.0",
   mcpName: "io.github.chrischall/canvas-parent-mcp",
   description: "Canvas LMS (Instructure) MCP server \u2014 student/observer read access with optional file download",
   author: "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -38754,19 +39260,22 @@ var package_default = {
     ".claude-plugin",
     "skills",
     ".mcp.json",
-    "server.json"
+    "server.json",
+    "mint.yaml"
   ],
   scripts: {
     build: "tsc && npm run bundle",
     bundle: `esbuild src/index.ts --bundle --platform=node --format=esm --external:dotenv --banner:js='import { createRequire as __createRequire } from "module"; const require = __createRequire(import.meta.url);' --outfile=dist/bundle.js`,
     dev: "node --env-file=.env dist/index.js",
-    test: "vitest run",
-    "test:watch": "vitest"
+    test: "npm run typecheck && vitest run",
+    "test:coverage": "npm run typecheck && vitest run --coverage",
+    "test:watch": "vitest",
+    typecheck: "tsc -p tsconfig.json --noEmit"
   },
   dependencies: {
-    "@chrischall/mcp-utils": "^0.14.0",
-    "@fetchproxy/bootstrap": "^1.9.1",
-    "@fetchproxy/server": "^1.7.0",
+    "@chrischall/mcp-utils": "^0.17.1",
+    "@fetchproxy/bootstrap": "^2.0.0",
+    "@fetchproxy/server": "^2.0.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     dotenv: "^17.4.2",
     zod: "^4.4.3"
@@ -38873,11 +39382,128 @@ async function liftBrowserCookie(declaredDomain, baseHost) {
 }
 
 // src/client.ts
-import { writeFile as writeFile2, stat } from "fs/promises";
-import { dirname } from "path";
+import { writeFile as writeFile3, stat } from "fs/promises";
 
 // node_modules/@chrischall/mcp-utils/dist/session/index.js
+import { existsSync, readFileSync, writeFileSync, mkdirSync, chmodSync, renameSync, unlinkSync } from "node:fs";
+import { dirname, join as join3, resolve } from "node:path";
+import { homedir as homedir2 } from "node:os";
+import { randomBytes, createHmac } from "node:crypto";
+function bindingDigest(secret, salt) {
+  return createHmac("sha256", salt).update(secret).digest("hex").slice(0, 32);
+}
+function isEnvelope(raw) {
+  return raw !== null && typeof raw === "object" && raw.v === 1 && "state" in raw;
+}
+var StatePersistenceError = class extends Error {
+  cause;
+  constructor(cause) {
+    super(cause instanceof Error ? cause.message : String(cause));
+    this.name = "StatePersistenceError";
+    this.cause = cause;
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+};
+function createFileStatePersistence(opts) {
+  const { filePath, validate } = opts;
+  const secret = opts.boundTo;
+  return {
+    load() {
+      if (!existsSync(filePath))
+        return null;
+      try {
+        const raw = JSON.parse(readFileSync(filePath, "utf8"));
+        let state;
+        if (isEnvelope(raw)) {
+          const b = raw.boundTo;
+          if (secret === void 0) {
+            if (b !== void 0)
+              return null;
+          } else {
+            if (b === void 0)
+              return null;
+            if (bindingDigest(secret, b.salt) !== b.digest)
+              return null;
+          }
+          state = raw.state;
+        } else {
+          if (secret !== void 0)
+            return null;
+          state = raw;
+        }
+        if (validate !== void 0)
+          return validate(state);
+        return state;
+      } catch {
+        return null;
+      }
+    },
+    save(state) {
+      const dir = dirname(filePath);
+      const tmp = `${filePath}.tmp-${randomBytes(6).toString("hex")}`;
+      const dirExisted = existsSync(dir);
+      try {
+        mkdirSync(dir, { recursive: true, mode: 448 });
+        if (!dirExisted)
+          chmodSync(dir, 448);
+        let boundTo;
+        if (secret !== void 0) {
+          const salt = randomBytes(16).toString("hex");
+          boundTo = { salt, digest: bindingDigest(secret, salt) };
+        }
+        const envelope = { v: 1, ...boundTo !== void 0 ? { boundTo } : {}, state };
+        writeFileSync(tmp, JSON.stringify(envelope, null, 2), { mode: 384 });
+        chmodSync(tmp, 384);
+        renameSync(tmp, filePath);
+        chmodSync(filePath, 384);
+      } catch (err) {
+        try {
+          if (existsSync(tmp))
+            unlinkSync(tmp);
+        } catch {
+        }
+        throw err;
+      }
+    },
+    clear() {
+      try {
+        if (existsSync(filePath))
+          unlinkSync(filePath);
+      } catch {
+      }
+    }
+  };
+}
+function homeOf(env) {
+  return readEnvVar("HOME", { env }) ?? homedir2();
+}
+function resolveStateDir(opts = {}) {
+  const env = opts.env;
+  return join3(readEnvVar("MCP_DATA_DIR", { env }) ?? homeOf(env), opts.subdir ?? "");
+}
+function resolveStateFile(opts) {
+  const override = opts.envVar !== void 0 ? readEnvVar(opts.envVar, { env: opts.env }) : void 0;
+  if (override !== void 0) {
+    if (override === "~")
+      return homeOf(opts.env);
+    if (override.startsWith("~/"))
+      return join3(homeOf(opts.env), override.slice(2));
+    return resolve(override);
+  }
+  const dirOpts = { env: opts.env };
+  if (opts.subdir !== void 0)
+    dirOpts.subdir = opts.subdir;
+  return join3(resolveStateDir(dirOpts), opts.fileName);
+}
 var TOKEN_REFRESH_SKEW_MS = 5 * 60 * 1e3;
+function isPersistedCookieSession(raw) {
+  if (raw === null || typeof raw !== "object")
+    return false;
+  const r = raw;
+  if (typeof r.sessionAt !== "number" || !Number.isFinite(r.sessionAt))
+    return false;
+  return typeof r.session === "object" && r.session !== null;
+}
 var CookieSessionManager = class {
   session;
   inFlight;
@@ -38891,6 +39517,17 @@ var CookieSessionManager = class {
   maxAgeMs;
   now;
   onReplayLoginErrorFn;
+  persistence;
+  onPersistErrorFn;
+  /** Persistence is consulted once per process; a miss must not be re-read. */
+  persistenceRead = false;
+  /**
+   * Serializes persistence writes. `seed()` and `invalidate()` are synchronous
+   * by contract and so fire-and-forget their save/clear; with an async backend a
+   * slow save could otherwise land AFTER the clear that followed it and leave an
+   * invalidated session on disk.
+   */
+  persistChain = Promise.resolve();
   constructor(opts) {
     this.loginFn = opts.login;
     this.isExpiredFn = opts.isExpired ?? (() => false);
@@ -38898,6 +39535,8 @@ var CookieSessionManager = class {
     this.maxAgeMs = opts.maxAgeMs;
     this.now = opts.now ?? Date.now;
     this.onReplayLoginErrorFn = opts.onReplayLoginError;
+    this.persistence = opts.persistence;
+    this.onPersistErrorFn = opts.onPersistError;
   }
   /** The current session, or `undefined` before the first successful login. */
   get current() {
@@ -38946,6 +39585,8 @@ var CookieSessionManager = class {
     this.session = session;
     this.sessionAt = this.now();
     this.inFlight = void 0;
+    this.persistenceRead = true;
+    void this.persist(session, this.sessionAt);
   }
   /**
    * One login attempt. Self-clears `inFlight` on settle so a rejected login
@@ -38957,13 +39598,25 @@ var CookieSessionManager = class {
     const holder = {};
     holder.p = (async () => {
       try {
+        const restored = this.persistence !== void 0 && !this.persistenceRead ? await this.restoreFromPersistence() : null;
+        if (restored !== null) {
+          if (this.inFlight === holder.p) {
+            this.session = restored.session;
+            this.sessionAt = restored.sessionAt;
+          }
+          return restored.session;
+        }
         const session = await this.loginFn();
+        const at = this.now();
         if (this.inFlight === holder.p) {
           this.session = session;
-          this.sessionAt = this.now();
+          this.sessionAt = at;
         }
+        await this.persist(session, at);
         return session;
       } catch (err) {
+        if (err instanceof StatePersistenceError)
+          throw err.cause;
         if (this.isPermanentErrorFn(err))
           this.permanentError = err;
         throw err;
@@ -38983,6 +39636,71 @@ var CookieSessionManager = class {
   invalidate() {
     this.session = void 0;
     this.inFlight = void 0;
+    void this.clearPersisted();
+  }
+  /**
+   * The persisted session, if there is one worth using. Read at most once per
+   * process — after that the in-memory session (or its absence) is the truth,
+   * so an invalidate() cannot be undone by a stale file.
+   */
+  async restoreFromPersistence() {
+    if (this.persistence === void 0 || this.persistenceRead)
+      return null;
+    this.persistenceRead = true;
+    try {
+      let raw = null;
+      await this.enqueuePersist(async () => {
+        raw = await this.persistence?.load();
+      });
+      if (!isPersistedCookieSession(raw))
+        return null;
+      if (this.maxAgeMs !== void 0 && this.now() - raw.sessionAt >= this.maxAgeMs)
+        return null;
+      return raw;
+    } catch {
+      return null;
+    }
+  }
+  /**
+   * Append a persistence op to the chain, preserving call order.
+   *
+   * The RETURNED promise can reject — that is the whole `StatePersistenceError`
+   * path, and the awaited login write depends on it. Only the retained chain is
+   * swallowed, so one failed write cannot poison every later one.
+   */
+  enqueuePersist(op) {
+    const next = this.persistChain.then(op);
+    this.persistChain = next.catch(() => void 0);
+    return next;
+  }
+  /** Write the session. Silent unless `onPersistError` throws. */
+  persist(session, sessionAt) {
+    return this.enqueuePersist(async () => {
+      if (this.persistence === void 0)
+        return;
+      try {
+        await this.persistence.save({ session, sessionAt });
+      } catch (err) {
+        if (this.onPersistErrorFn === void 0)
+          return;
+        try {
+          this.onPersistErrorFn(err);
+        } catch (hookErr) {
+          throw new StatePersistenceError(hookErr);
+        }
+      }
+    });
+  }
+  /** Discard the persisted session. Never throws. */
+  clearPersisted() {
+    return this.enqueuePersist(async () => {
+      if (this.persistence?.clear === void 0)
+        return;
+      try {
+        await this.persistence.clear();
+      } catch {
+      }
+    });
   }
   /**
    * Run an authenticated `call` with the current session and reactive
@@ -39016,6 +39734,57 @@ var CookieSessionManager = class {
   }
 };
 
+// src/session-cache.ts
+function sessionCachePath(env = process.env) {
+  return resolveStateFile({
+    env,
+    envVar: "CANVAS_SESSION_FILE",
+    subdir: ".canvas-parent-mcp",
+    fileName: "session.json"
+  });
+}
+function isRecord(raw) {
+  if (raw === null || typeof raw !== "object") return false;
+  const r = raw;
+  if (typeof r.sessionAt !== "number") return false;
+  const s = r.session;
+  if (s === null || typeof s !== "object") return false;
+  const h = s.headers;
+  if (h === null || typeof h !== "object" || Object.keys(h).length === 0) return false;
+  if (Object.values(h).some((v) => typeof v !== "string")) return false;
+  return s.accessTokenExpiresAt === void 0 || typeof s.accessTokenExpiresAt === "number";
+}
+function bindingFor(account, browserBacked) {
+  if (account.mode === "token") return null;
+  if (account.mode === "session") {
+    if (browserBacked) return null;
+    return ["session", account.baseUrl, account.username.trim().toLowerCase(), account.password].join(
+      "\0"
+    );
+  }
+  return ["oauth", account.baseUrl, account.clientId, account.refreshToken].join("\0");
+}
+function createSessionCache(account, opts = {}) {
+  const env = opts.env ?? process.env;
+  if (!parseBoolEnv("CANVAS_SESSION_CACHE", { env, default: true })) return null;
+  const boundTo = bindingFor(account, opts.browserBacked === true);
+  if (boundTo === null) return null;
+  return createFileStatePersistence({
+    filePath: sessionCachePath(env),
+    boundTo,
+    validate: (raw) => isRecord(raw) ? raw : null
+  });
+}
+function reportCacheWriteFailure(err) {
+  const detail = err instanceof Error ? err.message : String(err);
+  console.error(
+    `[canvas-parent-mcp] could not cache the session (${detail}); continuing without the cache \u2014 every restart will authenticate again until this is fixed.`
+  );
+}
+
+// src/client.ts
+import { dirname as dirname2 } from "path";
+
 // src/session-login.ts
 var USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/147.0.0.0 Safari/537.36";
 var SessionLoginError = class extends Error {
@@ -39136,7 +39905,9 @@ var CanvasClient = class {
       // account with neither a lift nor credentials still can't — those 401s
       // fall through as a Response and `mapStatus` turns them into a
       // TokenExpiredError.
-      isExpired: (res) => res.status === 401 && this.canReauth()
+      isExpired: (res) => res.status === 401 && this.canReauth(),
+      persistence: createSessionCache(account, { browserBacked: this.refreshSession !== null }) ?? void 0,
+      onPersistError: reportCacheWriteFailure
     });
   }
   /** Account metadata (no secrets) — useful for diagnostics. */
@@ -39174,7 +39945,7 @@ var CanvasClient = class {
     }
     if (destStat?.isDirectory()) throw new InvalidPathError(destinationPath);
     if (destStat && !opts.overwrite) throw new FileExistsError(destinationPath);
-    const parent = dirname(destinationPath);
+    const parent = dirname2(destinationPath);
     try {
       await stat(parent);
     } catch {
@@ -39186,7 +39957,7 @@ var CanvasClient = class {
     if (res.status === 404) throw new Error(`Canvas download 404 for ${path}`);
     if (!res.ok) throw new Error(`Canvas download ${res.status} for ${path}`);
     const buf = new Uint8Array(await res.arrayBuffer());
-    await writeFile2(destinationPath, buf);
+    await writeFile3(destinationPath, buf);
     return {
       path: destinationPath,
       bytes: buf.byteLength,
@@ -39709,8 +40480,8 @@ function registerFileTools(server, client) {
 }
 
 // src/index.ts
-var __dirname = dirname2(fileURLToPath(import.meta.url));
-await loadDotenvSafely({ path: join2(__dirname, "..", ".env"), override: false });
+var __dirname = dirname3(fileURLToPath(import.meta.url));
+await loadDotenvSafely({ path: join4(__dirname, "..", ".env"), override: false });
 var resolved = null;
 var configError = null;
 try {
@@ -39720,7 +40491,7 @@ try {
 }
 await runMcp({
   name: "canvas",
-  version: "1.2.4",
+  version: "1.3.0",
   // x-release-please-version
   tools: [
     (server) => {