agent-shim 8.20.1 → 8.21.0

package/dist/cli.cjs

@@ -6891,7 +6891,7 @@ var require_util2 = __commonJS({
     var { kDestroyed, kBodyUsed, kListeners, kBody } = require_symbols();
     var { IncomingMessage } = require("node:http");
     var stream = require("node:stream");
-    var net3 = require("node:net");
+    var net4 = require("node:net");
     var { stringify } = require("node:querystring");
     var { EventEmitter: EE } = require("node:events");
     var timers = require_timers();
@@ -7040,7 +7040,7 @@ var require_util2 = __commonJS({
       }
       assert2(typeof host === "string");
       const servername = getHostname(host);
-      if (net3.isIP(servername)) {
+      if (net4.isIP(servername)) {
         return "";
       }
       return servername;
@@ -8703,7 +8703,7 @@ var require_dispatcher_base = __commonJS({
 var require_connect = __commonJS({
   "node_modules/.pnpm/undici@7.29.1/node_modules/undici/lib/core/connect.js"(exports2, module2) {
     "use strict";
-    var net3 = require("node:net");
+    var net4 = require("node:net");
     var assert2 = require("node:assert");
     var util = require_util2();
     var { InvalidArgumentError: InvalidArgumentError2 } = require_errors();
@@ -8786,7 +8786,7 @@ var require_connect = __commonJS({
         } else {
           assert2(!httpSocket, "httpSocket can only be sent on TLS update");
           port = port || 80;
-          socket = net3.connect({
+          socket = net4.connect({
             highWaterMark: 64 * 1024,
             // Same as nodejs fs streams.
             ...options,
@@ -14463,8 +14463,8 @@ var require_client = __commonJS({
   "node_modules/.pnpm/undici@7.29.1/node_modules/undici/lib/dispatcher/client.js"(exports2, module2) {
     "use strict";
     var assert2 = require("node:assert");
-    var net3 = require("node:net");
-    var http7 = require("node:http");
+    var net4 = require("node:net");
+    var http8 = require("node:http");
     var util = require_util2();
     var { ClientStats } = require_stats();
     var { channels } = require_diagnostics();
@@ -14522,7 +14522,7 @@ var require_client = __commonJS({
     var connectH1 = require_client_h1();
     var connectH2 = require_client_h2();
     var kClosedResolve = /* @__PURE__ */ Symbol("kClosedResolve");
-    var getDefaultNodeMaxHeaderSize = http7 && http7.maxHeaderSize && Number.isInteger(http7.maxHeaderSize) && http7.maxHeaderSize > 0 ? () => http7.maxHeaderSize : () => {
+    var getDefaultNodeMaxHeaderSize = http8 && http8.maxHeaderSize && Number.isInteger(http8.maxHeaderSize) && http8.maxHeaderSize > 0 ? () => http8.maxHeaderSize : () => {
       throw new InvalidArgumentError2("http module not available or http.maxHeaderSize invalid");
     };
     var noop = () => {
@@ -14618,7 +14618,7 @@ var require_client = __commonJS({
         if (maxRequestsPerClient != null && (!Number.isInteger(maxRequestsPerClient) || maxRequestsPerClient < 0)) {
           throw new InvalidArgumentError2("maxRequestsPerClient must be a positive number");
         }
-        if (localAddress != null && (typeof localAddress !== "string" || net3.isIP(localAddress) === 0)) {
+        if (localAddress != null && (typeof localAddress !== "string" || net4.isIP(localAddress) === 0)) {
           throw new InvalidArgumentError2("localAddress must be valid string IP address");
         }
         if (maxResponseSize != null && (!Number.isInteger(maxResponseSize) || maxResponseSize < -1)) {
@@ -14798,7 +14798,7 @@ var require_client = __commonJS({
         const idx = hostname3.indexOf("]");
         assert2(idx !== -1);
         const ip = hostname3.substring(1, idx);
-        assert2(net3.isIPv6(ip));
+        assert2(net4.isIPv6(ip));
         hostname3 = ip;
       }
       client[kConnecting] = true;
@@ -15743,10 +15743,10 @@ var require_socks5_utils = __commonJS({
   "node_modules/.pnpm/undici@7.29.1/node_modules/undici/lib/core/socks5-utils.js"(exports2, module2) {
     "use strict";
     var { Buffer: Buffer3 } = require("node:buffer");
-    var net3 = require("node:net");
+    var net4 = require("node:net");
     var { InvalidArgumentError: InvalidArgumentError2 } = require_errors();
     function parseAddress(address) {
-      if (net3.isIPv4(address)) {
+      if (net4.isIPv4(address)) {
         const parts = address.split(".").map(Number);
         return {
           type: 1,
@@ -15754,7 +15754,7 @@ var require_socks5_utils = __commonJS({
           buffer: Buffer3.from(parts)
         };
       }
-      if (net3.isIPv6(address)) {
+      if (net4.isIPv6(address)) {
         return {
           type: 4,
           // IPv6
@@ -15777,7 +15777,7 @@ var require_socks5_utils = __commonJS({
       if (address.includes(".")) {
         const lastColonIndex = address.lastIndexOf(":");
         const ipv4Part = address.slice(lastColonIndex + 1);
-        if (net3.isIPv4(ipv4Part)) {
+        if (net4.isIPv4(ipv4Part)) {
           const octets = ipv4Part.split(".").map(Number);
           const high = (octets[0] << 8 | octets[1]).toString(16);
           const low = (octets[2] << 8 | octets[3]).toString(16);
@@ -16658,18 +16658,18 @@ var require_proxy_agent = __commonJS({
         }
       }
       [kClose]() {
-        const promises = [this[kAgent].close()];
+        const promises2 = [this[kAgent].close()];
         if (this[kClient]) {
-          promises.push(this[kClient].close());
+          promises2.push(this[kClient].close());
         }
-        return Promise.all(promises);
+        return Promise.all(promises2);
       }
       [kDestroy]() {
-        const promises = [this[kAgent].destroy()];
+        const promises2 = [this[kAgent].destroy()];
         if (this[kClient]) {
-          promises.push(this[kClient].destroy());
+          promises2.push(this[kClient].destroy());
         }
-        return Promise.all(promises);
+        return Promise.all(promises2);
       }
     };
     function buildHeaders(headers) {
@@ -20817,7 +20817,7 @@ var require_dump = __commonJS({
 var require_dns = __commonJS({
   "node_modules/.pnpm/undici@7.29.1/node_modules/undici/lib/interceptor/dns.js"(exports2, module2) {
     "use strict";
-    var { isIP: isIP2 } = require("node:net");
+    var { isIP: isIP3 } = require("node:net");
     var { lookup } = require("node:dns");
     var DecoratorHandler = require_decorator_handler();
     var { InvalidArgumentError: InvalidArgumentError2, InformationalError } = require_errors();
@@ -21223,7 +21223,7 @@ var require_dns = __commonJS({
       return (dispatch) => {
         return function dnsInterceptor(origDispatchOpts, handler) {
           const origin = origDispatchOpts.origin.constructor === URL ? origDispatchOpts.origin : new URL(origDispatchOpts.origin);
-          if (isIP2(origin.hostname) !== 0) {
+          if (isIP3(origin.hostname) !== 0) {
             return dispatch(origDispatchOpts, handler);
           }
           instance.runLookup(origin, origDispatchOpts, (err, newOrigin) => {
@@ -36009,8 +36009,8 @@ function getElementAtPath(obj, path44) {
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
-  const promises = keys.map((key) => promisesObj[key]);
-  return Promise.all(promises).then((results) => {
+  const promises2 = keys.map((key) => promisesObj[key]);
+  return Promise.all(promises2).then((results) => {
     const resolvedObj = {};
     for (let i2 = 0; i2 < keys.length; i2++) {
       resolvedObj[keys[i2]] = results[i2];
@@ -61790,7 +61790,7 @@ function registerIdentityCommand(program2, deps) {
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.20.1",
+  version: "8.21.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -62169,6 +62169,7 @@ var INTERNAL_HEADER_NAMES = [
   "x-agent-shim-hop",
   "x-agent-shim-hop-id",
   "x-headroom-project-id",
+  "x-headroom-session-id",
   "x-headroom-base-url"
 ];
 var IDENTITY_HEADER = "x-agent-shim-identity";
@@ -62176,6 +62177,7 @@ var SESSION_HEADER = "x-agent-shim-session";
 var PROVIDER_HEADER = "x-agent-shim-provider";
 var HEADROOM_FLAG_HEADER = "x-agent-shim-headroom";
 var PROJECT_ID_HEADER = "x-headroom-project-id";
+var SESSION_ATTRIBUTION_HEADER = "x-headroom-session-id";
 var HEADROOM_BASE_URL_HEADER = "x-headroom-base-url";
 var AUTH_HEADER = "x-agent-shim-auth";
 var HOP_SECRET_HEADER = "x-agent-shim-hop";
@@ -65669,22 +65671,22 @@ async function runFrontDoorSupervisor(idleShutdownMinutes, ports, options = {})
   };
   writeFrontDoorState(fs19, paths.frontdoorStateFile, { supervisorPid: ports.ownPid, ...sticky() });
   const previousSticky = lastPort;
-  let http7;
+  let http8;
   try {
-    http7 = await ports.startProviderListener(lastPort);
+    http8 = await ports.startProviderListener(lastPort);
   } catch (error62) {
     return fail(`could not start the provider listener: ${error62 instanceof Error ? error62.message : String(error62)}`);
   }
-  if (previousSticky !== void 0 && http7.port !== previousSticky) {
-    ports.log(`agent-shim frontdoor supervisor: sticky port ${String(previousSticky)} was occupied; moving to ${String(http7.port)} (sessions launched against the old port are stale until they relaunch)`);
+  if (previousSticky !== void 0 && http8.port !== previousSticky) {
+    ports.log(`agent-shim frontdoor supervisor: sticky port ${String(previousSticky)} was occupied; moving to ${String(http8.port)} (sessions launched against the old port are stale until they relaunch)`);
   }
-  lastPort = http7.port;
+  lastPort = http8.port;
   const previousStickyConnect = lastConnectPort;
   let connect3;
   try {
     connect3 = await ports.startConnectListener(lastConnectPort);
   } catch (error62) {
-    await http7.close();
+    await http8.close();
     return fail(`could not start the CONNECT surface: ${error62 instanceof Error ? error62.message : String(error62)}`);
   }
   if (previousStickyConnect !== void 0 && connect3.port !== previousStickyConnect) {
@@ -65697,16 +65699,16 @@ async function runFrontDoorSupervisor(idleShutdownMinutes, ports, options = {})
     direct = await ports.startDirectListener(lastDirectPort);
   } catch (error62) {
     await connect3.close();
-    await http7.close();
+    await http8.close();
     return fail(`could not start the direct listener: ${error62 instanceof Error ? error62.message : String(error62)}`);
   }
   if (previousStickyDirect !== void 0 && direct.port !== previousStickyDirect) {
     ports.log(`agent-shim frontdoor supervisor: sticky direct port ${String(previousStickyDirect)} was occupied; moving to ${String(direct.port)} (headroom must be restarted to admit the new address)`);
   }
   lastDirectPort = direct.port;
-  writeFrontDoorState(fs19, paths.frontdoorStateFile, { protocol: FRONT_DOOR_PROTOCOL, supervisorPid: ports.ownPid, port: http7.port, connectPort: connect3.port, directPort: direct.port, ...sticky() });
+  writeFrontDoorState(fs19, paths.frontdoorStateFile, { protocol: FRONT_DOOR_PROTOCOL, supervisorPid: ports.ownPid, port: http8.port, connectPort: connect3.port, directPort: direct.port, ...sticky() });
   fs19.removeRecursive(paths.frontdoorLockFile);
-  ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: front door on 127.0.0.1:${String(http7.port)}, CONNECT surface on 127.0.0.1:${String(connect3.port)}`);
+  ports.log(`agent-shim frontdoor supervisor ${String(ports.ownPid)}: front door on 127.0.0.1:${String(http8.port)}, CONNECT surface on 127.0.0.1:${String(connect3.port)}`);
   let idleSince;
   let ticks = 0;
   for (; ; ) {
@@ -65724,7 +65726,7 @@ async function runFrontDoorSupervisor(idleShutdownMinutes, ports, options = {})
         ports.log(`agent-shim frontdoor supervisor: no sessions for ${String(idleShutdownMinutes)} minute(s); closing the front door and exiting`);
         await direct.close();
         await connect3.close();
-        await http7.close();
+        await http8.close();
         ports.closeRcStreamHub();
         writeFrontDoorState(fs19, paths.frontdoorStateFile, sticky());
         return 0;
@@ -72230,6 +72232,9 @@ async function applyHeadroomHop(request7, response, upstream, deps) {
   if (request7.session.projectId !== void 0) {
     headers[PROJECT_ID_HEADER] = request7.session.projectId;
   }
+  if (request7.session.sessionId !== void 0) {
+    headers[SESSION_ATTRIBUTION_HEADER] = request7.session.sessionId;
+  }
   headers[HOP_SECRET_HEADER] = deps.hopSecret;
   try {
     await forwardThroughHeadroom(request7, response, { socketPath, headers, log: deps.log });
@@ -73989,6 +73994,252 @@ function createRcClientPage(expectedToken) {
   };
 }
 
+// src/frontdoor/rcWebFetch.ts
+var dns2 = __toESM(require("node:dns"), 1);
+var http6 = __toESM(require("node:http"), 1);
+var https5 = __toESM(require("node:https"), 1);
+var net3 = __toESM(require("node:net"), 1);
+var RC_WEB_FETCH_MAX_BYTES = 12582912;
+var RC_WEB_FETCH_DEADLINE_MS = 4e4;
+var RC_WEB_FETCH_MAX_REDIRECTS = 20;
+var RC_WEB_FETCH_ALLOW_PRIVATE_ENV = "AGENT_SHIM_FRONTDOOR_RC_SELF_HOST_WEB_FETCH_ALLOW_PRIVATE";
+function rcWebFetchAllowsPrivateFromEnv(env) {
+  return env[RC_WEB_FETCH_ALLOW_PRIVATE_ENV] === "1";
+}
+var WEB_FETCH_USER_AGENT = "agent-shim-frontdoor";
+var ERROR_PREFIX = "web_fetch_";
+var V4_THIS_NETWORK_OCTET = 0;
+var V4_PRIVATE_A_OCTET = 10;
+var V4_LOOPBACK_OCTET = 127;
+var V4_CGNAT_OCTET = 100;
+var V4_CGNAT_SECOND_FROM = 64;
+var V4_CGNAT_SECOND_TO = 127;
+var V4_LINK_LOCAL_OCTET = 169;
+var V4_LINK_LOCAL_SECOND = 254;
+var V4_PRIVATE_B_OCTET = 172;
+var V4_PRIVATE_B_SECOND_FROM = 16;
+var V4_PRIVATE_B_SECOND_TO = 31;
+var V4_PRIVATE_C_OCTET = 192;
+var V4_PRIVATE_C_SECOND = 168;
+var V4_MULTICAST_FROM_OCTET = 224;
+var V6_UNIQUE_LOCAL_FROM = 64512;
+var V6_UNIQUE_LOCAL_TO = 65023;
+var V6_LINK_LOCAL_FROM = 65152;
+var V6_LINK_LOCAL_TO = 65215;
+var V6_MULTICAST_FROM = 65280;
+var IP_VERSION_4 = 4;
+var IP_VERSION_6 = 6;
+var HTTP_MOVED_PERMANENTLY = 301;
+var HTTP_FOUND = 302;
+var HTTP_SEE_OTHER = 303;
+var HTTP_TEMPORARY_REDIRECT = 307;
+var HTTP_PERMANENT_REDIRECT = 308;
+var SUCCESS_STATUS_MAX_EXCLUSIVE3 = 300;
+function refused(errorType, errorMessage2) {
+  return { kind: "refused", errorType: `${ERROR_PREFIX}${errorType}`, errorMessage: errorMessage2 };
+}
+function isPrivateAddress(address) {
+  const version2 = net3.isIP(address);
+  if (version2 === IP_VERSION_4) {
+    const octets = address.split(".").map((part) => Number(part));
+    const first = octets[0] ?? -1;
+    const second = octets[1] ?? -1;
+    if (first === V4_THIS_NETWORK_OCTET || first === V4_PRIVATE_A_OCTET || first === V4_LOOPBACK_OCTET) {
+      return true;
+    }
+    if (first === V4_CGNAT_OCTET && second >= V4_CGNAT_SECOND_FROM && second <= V4_CGNAT_SECOND_TO) {
+      return true;
+    }
+    if (first === V4_LINK_LOCAL_OCTET && second === V4_LINK_LOCAL_SECOND) {
+      return true;
+    }
+    if (first === V4_PRIVATE_B_OCTET && second >= V4_PRIVATE_B_SECOND_FROM && second <= V4_PRIVATE_B_SECOND_TO) {
+      return true;
+    }
+    if (first === V4_PRIVATE_C_OCTET && second === V4_PRIVATE_C_SECOND) {
+      return true;
+    }
+    return first >= V4_MULTICAST_FROM_OCTET;
+  }
+  if (version2 === IP_VERSION_6) {
+    const lower = address.toLowerCase();
+    const mapped = /^::ffff:(\d{1,3}(?:\.\d{1,3}){3})$/.exec(lower);
+    if (mapped !== null) {
+      return isPrivateAddress(mapped[1] ?? "");
+    }
+    if (lower === "::" || lower === "::1") {
+      return true;
+    }
+    const firstGroup = Number.parseInt(/^([0-9a-f]+):/.exec(lower)?.[1] ?? "0", 16);
+    if (Number.isNaN(firstGroup)) {
+      return true;
+    }
+    if (firstGroup >= V6_UNIQUE_LOCAL_FROM && firstGroup <= V6_UNIQUE_LOCAL_TO) {
+      return true;
+    }
+    if (firstGroup >= V6_LINK_LOCAL_FROM && firstGroup <= V6_LINK_LOCAL_TO) {
+      return true;
+    }
+    return firstGroup >= V6_MULTICAST_FROM;
+  }
+  return true;
+}
+function isSuccessful3(status) {
+  return status >= HTTP_STATUS.ok && status < SUCCESS_STATUS_MAX_EXCLUSIVE3;
+}
+function isRedirect(status) {
+  return status === HTTP_MOVED_PERMANENTLY || status === HTTP_FOUND || status === HTTP_SEE_OTHER || status === HTTP_TEMPORARY_REDIRECT || status === HTTP_PERMANENT_REDIRECT;
+}
+function readableContentType(contentType) {
+  if (contentType === void 0 || contentType.trim() === "") {
+    return true;
+  }
+  const normalised = contentType.split(";")[0]?.trim().toLowerCase() ?? "";
+  const slash = normalised.indexOf("/");
+  const main2 = slash === -1 ? normalised : normalised.slice(0, slash);
+  const sub = slash === -1 ? "" : normalised.slice(slash + 1);
+  if (main2 === "text") {
+    return true;
+  }
+  return /json|xml|javascript|ecmascript|yaml|csv/.test(sub);
+}
+async function readCapped(chunks) {
+  const collected = [];
+  let total = 0;
+  for await (const chunk of chunks) {
+    total += chunk.byteLength;
+    if (total > RC_WEB_FETCH_MAX_BYTES) {
+      return { tooLarge: true, text: "" };
+    }
+    collected.push(Buffer.from(chunk));
+  }
+  return { tooLarge: false, text: Buffer.concat(collected).toString("utf8") };
+}
+async function checkTarget(url2, deps) {
+  if (url2.protocol !== "http:" && url2.protocol !== "https:") {
+    return refused("scheme", `the web-fetch proxy dials http and https only, not ${url2.protocol}`);
+  }
+  if (deps.allowPrivate) {
+    return void 0;
+  }
+  const hostname3 = url2.hostname.replace(/^\[|\]$/g, "");
+  let addresses;
+  try {
+    addresses = net3.isIP(hostname3) === 0 ? await deps.lookup(hostname3) : [hostname3];
+  } catch {
+    return refused("resolve", `${hostname3} did not resolve`);
+  }
+  for (const address of addresses) {
+    if (isPrivateAddress(address)) {
+      return refused("private_address", `${hostname3} resolves to ${address}, a private address this web-fetch proxy refuses; set ${RC_WEB_FETCH_ALLOW_PRIVATE_ENV}=1 on the door if serving internal targets is intended`);
+    }
+  }
+  return void 0;
+}
+async function fetchThroughWebProxy(url2, deps) {
+  let current;
+  try {
+    current = new URL(url2);
+  } catch {
+    return refused("malformed_url", `${url2} is not a URL this proxy can dial`);
+  }
+  const controller = new AbortController();
+  const timer = setTimeout(() => {
+    controller.abort();
+  }, deps.deadlineMs);
+  timer.unref();
+  try {
+    let redirects = 0;
+    for (; ; ) {
+      const refusal = await checkTarget(current, deps);
+      if (refusal !== void 0) {
+        return refusal;
+      }
+      let hop;
+      try {
+        hop = await deps.dial(current, controller.signal);
+      } catch (error62) {
+        if (controller.signal.aborted) {
+          return refused("deadline", `the fetch of ${url2} did not settle within its deadline`);
+        }
+        return refused("transport", `the dial of ${current.toString()} failed: ${error62 instanceof Error ? error62.message : "unknown error"}`);
+      }
+      if (isRedirect(hop.status) && hop.location !== void 0) {
+        if (redirects >= RC_WEB_FETCH_MAX_REDIRECTS) {
+          controller.abort();
+          return refused("too_many_redirects", `${url2} followed more than ${String(RC_WEB_FETCH_MAX_REDIRECTS)} redirects without settling`);
+        }
+        let next;
+        try {
+          next = new URL(hop.location, current);
+        } catch {
+          controller.abort();
+          return refused("malformed_url", `a redirect of ${current.toString()} named ${hop.location}, which is not a URL this proxy can dial`);
+        }
+        const drained = await readCapped(hop.chunks);
+        if (drained.tooLarge) {
+          controller.abort();
+          return refused("too_large", `the body of a redirect from ${url2} exceeds the ${String(RC_WEB_FETCH_MAX_BYTES)} byte cap the CLI's proxy client reads`);
+        }
+        redirects += 1;
+        current = next;
+        continue;
+      }
+      if (!isSuccessful3(hop.status)) {
+        controller.abort();
+        return refused("status", `the target answered HTTP ${String(hop.status)} for ${current.toString()}`);
+      }
+      const contentType = hop.contentType ?? "";
+      if (!readableContentType(contentType)) {
+        controller.abort();
+        return refused("content_type", `the target at ${current.toString()} served a ${contentType} answer, which the proxy's text field cannot carry`);
+      }
+      const read = await readCapped(hop.chunks);
+      if (read.tooLarge) {
+        controller.abort();
+        return refused("too_large", `the body of ${current.toString()} exceeds the ${String(RC_WEB_FETCH_MAX_BYTES)} byte cap the CLI's proxy client reads`);
+      }
+      return { kind: "fetched", url: url2, destinationUrl: current.toString(), contentType: hop.contentType, text: read.text };
+    }
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function realRcWebFetch(options) {
+  const plainAgent = new ExemptHttpAgent();
+  const tlsAgent = new ExemptTlsAgent();
+  const deps = {
+    dial: async (url2, signal) => await new Promise((resolve, reject) => {
+      const request7 = (url2.protocol === "https:" ? https5 : http6).request(
+        {
+          hostname: url2.hostname,
+          port: url2.port === "" ? void 0 : Number(url2.port),
+          method: "GET",
+          path: `${url2.pathname}${url2.search}`,
+          headers: { accept: "*/*", "accept-encoding": "identity", "user-agent": WEB_FETCH_USER_AGENT },
+          agent: url2.protocol === "https:" ? tlsAgent : plainAgent,
+          signal
+        },
+        (response) => {
+          const location = response.headers.location;
+          resolve({
+            status: response.statusCode ?? 0,
+            location: typeof location === "string" ? location : void 0,
+            contentType: typeof response.headers["content-type"] === "string" ? response.headers["content-type"] : void 0,
+            chunks: response
+          });
+        }
+      );
+      request7.once("error", reject);
+      request7.end();
+    }),
+    lookup: async (hostname3) => (await dns2.promises.lookup(hostname3, { all: true })).map((entry) => entry.address),
+    allowPrivate: options.allowPrivate,
+    deadlineMs: RC_WEB_FETCH_DEADLINE_MS
+  };
+  return async (url2) => await fetchThroughWebProxy(url2, deps);
+}
+
 // src/frontdoor/rcSelfHost.ts
 var RC_SELF_HOST_ENV = "AGENT_SHIM_FRONTDOOR_RC_SELF_HOST";
 function rcSelfHostFromEnv(env) {
@@ -74018,6 +74269,9 @@ var CONFLICT_REASON_EPOCH_STALE = "epoch_stale";
 function isRecord5(value2) {
   return typeof value2 === "object" && value2 !== null && !Array.isArray(value2);
 }
+function isWebSearchRefusal(value2) {
+  return !Array.isArray(value2);
+}
 function nonEmptyString2(record2, field) {
   const value2 = record2 === void 0 ? void 0 : record2[field];
   return typeof value2 === "string" && value2 !== "" ? value2 : void 0;
@@ -74032,6 +74286,20 @@ function numberOf(record2, field) {
   }
   return void 0;
 }
+function stringArray(record2, field) {
+  const value2 = record2 === void 0 ? void 0 : record2[field];
+  if (!Array.isArray(value2)) {
+    return void 0;
+  }
+  const members2 = [];
+  for (const member of value2) {
+    if (typeof member !== "string") {
+      return void 0;
+    }
+    members2.push(member);
+  }
+  return members2;
+}
 function singleHeader2(headers, name) {
   const value2 = headers[name];
   return typeof value2 === "string" ? value2 : void 0;
@@ -74262,11 +74530,12 @@ data: ${JSON.stringify(envelope)}
       return;
     }
     if (tail === "worker" || tail.startsWith("worker/")) {
-      if (!presentsWorkerJwt(request7.headers, session)) {
+      const workerTail = tail === "worker" ? "" : tail.slice("worker/".length);
+      const webProxy = workerTail === "web-fetch" || workerTail === "web-search";
+      if (!(webProxy ? presentsCredential(request7.headers) || presentsWorkerJwt(request7.headers, session) : presentsWorkerJwt(request7.headers, session))) {
         await unauthorized(response);
         return;
       }
-      const workerTail = tail === "worker" ? "" : tail.slice("worker/".length);
       if (workerTail === "" && method === "GET") {
         await answerJson2(response, HTTP_STATUS.ok, { worker: { external_metadata: session.externalMetadata ?? null } });
         return;
@@ -74365,6 +74634,58 @@ data: ${JSON.stringify(envelope)}
         await answerJson2(response, HTTP_STATUS.ok, {});
         return;
       }
+      if (workerTail === "web-fetch" && method === "POST") {
+        const body = parseJsonObject2(await readBody3(request7.body, CONTROL_BODY_CAP_BYTES));
+        const target = nonEmptyString2(body, "url");
+        if (target === void 0) {
+          await answerJson2(response, HTTP_STATUS.badRequest, { type: "error", error: { type: "invalid_request_error", message: "a worker web-fetch carries one url" } });
+          return;
+        }
+        const outcome = await deps.webFetch(target);
+        if (outcome.kind === "fetched") {
+          const answer = { url: target, destination_url: outcome.destinationUrl, text: outcome.text, ...outcome.contentType === void 0 ? {} : { content_type: outcome.contentType } };
+          if (Buffer.byteLength(JSON.stringify(answer), "utf8") > RC_WEB_FETCH_MAX_BYTES) {
+            deps.log?.(`rc selfhost ${session.id}: worker web-fetch of ${target} escaped past the reader cap when framed`);
+            await answerJson2(response, HTTP_STATUS.ok, { error: { error_type: "web_fetch_too_large", error_message: `the answer for ${target} exceeds the ${String(RC_WEB_FETCH_MAX_BYTES)} byte cap the CLI's proxy client reads` } });
+            return;
+          }
+          deps.log?.(`rc selfhost ${session.id}: worker web-fetch served ${target} as ${outcome.destinationUrl}`);
+          await answerJson2(response, HTTP_STATUS.ok, answer);
+          return;
+        }
+        deps.log?.(`rc selfhost ${session.id}: worker web-fetch of ${target} refused: ${outcome.errorType}`);
+        await answerJson2(response, HTTP_STATUS.ok, { error: { error_type: outcome.errorType, error_message: outcome.errorMessage } });
+        return;
+      }
+      if (workerTail === "web-search" && method === "POST") {
+        const body = parseJsonObject2(await readBody3(request7.body, CONTROL_BODY_CAP_BYTES));
+        const query = nonEmptyString2(body, "query");
+        if (query === void 0) {
+          await answerJson2(response, HTTP_STATUS.badRequest, { type: "error", error: { type: "invalid_request_error", message: "a worker web-search carries one query" } });
+          return;
+        }
+        const allowedDomains = stringArray(body, "allowed_domains");
+        const blockedDomains = stringArray(body, "blocked_domains");
+        if (body?.allowed_domains !== void 0 && allowedDomains === void 0 || body?.blocked_domains !== void 0 && blockedDomains === void 0) {
+          await answerJson2(response, HTTP_STATUS.badRequest, { type: "error", error: { type: "invalid_request_error", message: "the domain filters of a worker web-search are string arrays" } });
+          return;
+        }
+        const searchProfile = nonEmptyString2(body, "search_profile");
+        const backend = deps.webSearch;
+        if (backend === void 0) {
+          deps.log?.(`rc selfhost ${session.id}: worker web-search of "${query}" refused: no search backend serves this door`);
+          await answerJson2(response, HTTP_STATUS.ok, { results: [], error: { error_type: "web_search_unavailable", error_message: "this front door serves the Remote Control web-search proxy without a search backend, so no query can be served here" } });
+          return;
+        }
+        const answered = await backend({ query, ...allowedDomains === void 0 ? {} : { allowedDomains }, ...blockedDomains === void 0 ? {} : { blockedDomains }, ...searchProfile === void 0 ? {} : { searchProfile } });
+        deps.log?.(`rc selfhost ${session.id}: worker web-search of "${query}" answered by its backend`);
+        if (isWebSearchRefusal(answered)) {
+          await answerJson2(response, HTTP_STATUS.ok, { results: [], error: { error_type: answered.errorType, error_message: answered.errorMessage } });
+          return;
+        }
+        await answerJson2(response, HTTP_STATUS.ok, { results: answered.map((result) => ({ title: result.title ?? "", url: result.url, snippet: result.snippet ?? "" })) });
+        return;
+      }
       await answerJson2(response, HTTP_STATUS.notFound, { type: "error", error: { type: "api_error", message: `the self-hosted Remote Control surface serves no worker path "${workerTail}"` } });
       return;
     }
@@ -74679,9 +75000,9 @@ function mintRcSelfHostCredential(deps) {
 var RC_STREAM_EVENT_NAME2 = "client_event";
 var SSE_BYTE_ORDER_MARK = 65279;
 var RC_STREAM_BACKOFF_MS = 45e3;
-var SUCCESS_STATUS_MAX_EXCLUSIVE3 = 300;
-function isSuccessful3(status) {
-  return status >= HTTP_STATUS.ok && status < SUCCESS_STATUS_MAX_EXCLUSIVE3;
+var SUCCESS_STATUS_MAX_EXCLUSIVE4 = 300;
+function isSuccessful4(status) {
+  return status >= HTTP_STATUS.ok && status < SUCCESS_STATUS_MAX_EXCLUSIVE4;
 }
 function createSseParser() {
   let buffer = "";
@@ -74848,7 +75169,7 @@ function createRcStreamHub(deps) {
     if (presence.status === HTTP_STATUS.unauthorized) {
       return "unauthorized";
     }
-    if (!isSuccessful3(presence.status)) {
+    if (!isSuccessful4(presence.status)) {
       throw new Error(`the presence call answered HTTP ${String(presence.status)}: ${presence.body}`);
     }
     const cursor3 = deps.sequenceNumOf(attachment.sessionId) ?? deps.storedSequenceNumOf?.(attachment.sessionId);
@@ -74857,7 +75178,7 @@ function createRcStreamHub(deps) {
     if (answer.status === HTTP_STATUS.unauthorized) {
       return "unauthorized";
     }
-    if (!isSuccessful3(answer.status)) {
+    if (!isSuccessful4(answer.status)) {
       throw new Error(`the client read stream answered HTTP ${String(answer.status)}`);
     }
     deps.log?.(`rc stream ${attachment.sessionId}: attached as client ${attachment.clientId}${resume === void 0 ? ", reading from the stream's own head" : `, resuming after sequence number ${String(resume.fromSequenceNum)}`}`);
@@ -75061,8 +75382,8 @@ function zaiWindow(limit) {
 var zaiQuotaAdapter = {
   source: ZAI_SOURCE,
   matches: (baseUrl) => URL.canParse(baseUrl) && new URL(baseUrl).hostname === ZAI_HOST,
-  fetch: async (apiKey, http7, signal, nowMs) => {
-    const response = await http7(ZAI_QUOTA_URL, { authorization: apiKey, accept: "application/json" }, signal);
+  fetch: async (apiKey, http8, signal, nowMs) => {
+    const response = await http8(ZAI_QUOTA_URL, { authorization: apiKey, accept: "application/json" }, signal);
     if (response.status !== HTTP_OK) {
       throw new ProviderQuotaError(ZAI_SOURCE, `answered HTTP ${String(response.status)}`);
     }
@@ -75103,8 +75424,8 @@ var OpenRouterKeySchema = external_exports.object({
   })
 });
 var OpenRouterCreditsSchema = external_exports.object({ data: external_exports.object({ total_credits: external_exports.number().nonnegative(), total_usage: external_exports.number().nonnegative() }) });
-async function openRouterGet(url2, schema, apiKey, http7, signal) {
-  const response = await http7(url2, { authorization: `Bearer ${apiKey}`, accept: "application/json" }, signal);
+async function openRouterGet(url2, schema, apiKey, http8, signal) {
+  const response = await http8(url2, { authorization: `Bearer ${apiKey}`, accept: "application/json" }, signal);
   if (response.status === HTTP_FORBIDDEN) {
     return "forbidden";
   }
@@ -75129,12 +75450,12 @@ function nextUtcMidnight(nowMs) {
 var openRouterQuotaAdapter = {
   source: OPENROUTER_SOURCE,
   matches: (baseUrl) => URL.canParse(baseUrl) && new URL(baseUrl).hostname === OPENROUTER_HOST,
-  fetch: async (apiKey, http7, signal, nowMs) => {
-    const key = await openRouterGet(OPENROUTER_KEY_URL, OpenRouterKeySchema, apiKey, http7, signal);
+  fetch: async (apiKey, http8, signal, nowMs) => {
+    const key = await openRouterGet(OPENROUTER_KEY_URL, OpenRouterKeySchema, apiKey, http8, signal);
     if (key === "forbidden") {
       throw new ProviderQuotaError(OPENROUTER_SOURCE, "/api/v1/key refused the key (HTTP 403)");
     }
-    const credits = await openRouterGet(OPENROUTER_CREDITS_URL, OpenRouterCreditsSchema, apiKey, http7, signal);
+    const credits = await openRouterGet(OPENROUTER_CREDITS_URL, OpenRouterCreditsSchema, apiKey, http8, signal);
     const { limit, limit_remaining: limitRemaining, limit_reset: limitReset, free_model_daily_requests: free, is_free_tier: isFreeTier } = key.data;
     const windows = [];
     if (limit !== null && limit > 0) {
@@ -75330,6 +75651,7 @@ function realFrontDoorSupervisorPorts(paths) {
     newUuid: import_node_crypto14.randomUUID,
     randomToken: () => (0, import_node_crypto14.randomBytes)(MINTED_TOKEN_RANDOM_BYTES).toString("base64url"),
     credentialRecord: () => readRcSelfHostRecord(realFarmFs, paths.frontdoorDir),
+    webFetch: realRcWebFetch({ allowPrivate: rcWebFetchAllowsPrivateFromEnv(process.env) }),
     log
   }) : void 0;
   const rcCredentialStore = createRcCredentialStore(realFarmFs, paths.frontdoorRcCredentialsDir);