@organizaone/o1-code 0.8.0 → 0.10.4

package/chunks/{chunk-AZY4TCZ7.js → chunk-SOWXEFJH.js}

@@ -27,13 +27,13 @@ import {
   sendStructuredMessage,
   wrapConfirmWithBadge,
   writeMessage
-} from "./chunk-GNUA6XPQ.js";
+} from "./chunk-7H3GWNGJ.js";
 import {
   claimTask,
   listTasks,
   onTasksUpdated,
   unassignTeammateTasks
-} from "./chunk-Y37FNMS7.js";
+} from "./chunk-X427DWFD.js";
 import {
   SessionArtifactSnapshotAccumulator,
   aggregateTranscriptRecordFragments,
@@ -121,10 +121,10 @@ import {
   stringify,
   validateGoalProposalReason,
   validateSkillName
-} from "./chunk-C656OW55.js";
+} from "./chunk-TAFMMFLK.js";
 import {
   canUseRipgrep
-} from "./chunk-35RKSP4A.js";
+} from "./chunk-XHYWPHWN.js";
 import {
   AGENT_WORKTREE_SLUG_PATTERN,
   GitWorktreeService,
@@ -138,7 +138,7 @@ import {
   worktreeHasWork,
   writeRuntimeStatus,
   writeWorktreeSessionMarker
-} from "./chunk-CMZHL55Y.js";
+} from "./chunk-3KUQCZUE.js";
 import {
   hasVerifiableInode,
   openSyncNoFollow
@@ -168,17 +168,17 @@ import {
 import {
   buildModelIdContext,
   resolveModelId
-} from "./chunk-HNYPLSAN.js";
+} from "./chunk-67LZSGOU.js";
 import {
   glob,
   globSync
-} from "./chunk-OBPGYMIV.js";
+} from "./chunk-4ESI3MQ5.js";
 import {
   isTruthy
 } from "./chunk-SYMKXR42.js";
 import {
   normalizeImageGenerationBaseUrl
-} from "./chunk-ZQPD7WDS.js";
+} from "./chunk-7M4NSLWM.js";
 import {
   restoreSessionSources
 } from "./chunk-CDYMT4OZ.js";
@@ -194,7 +194,7 @@ import {
   getShellPagerEnv,
   isSignalTermination,
   normalizePathEnvForWindows
-} from "./chunk-FZUEC7ES.js";
+} from "./chunk-QCONHGJR.js";
 import {
   stripAnsi
 } from "./chunk-WU3R2YUE.js";
@@ -219,7 +219,7 @@ import {
   shouldDefaultToNodePty,
   splitCommands,
   stripShellWrapper
-} from "./chunk-V23Q4GBY.js";
+} from "./chunk-J5UW3SF4.js";
 import {
   resolveBundleDir
 } from "./chunk-Z2IHOXIK.js";
@@ -235,7 +235,7 @@ import {
   admitShellSandbox,
   assertShellSandboxCwd,
   probeShellSandbox
-} from "./chunk-XKOGHPWS.js";
+} from "./chunk-N7NBYHMJ.js";
 import {
   resolveNetworkTarget
 } from "./chunk-HPQNI3OQ.js";
@@ -243,10 +243,10 @@ import {
   delay,
   isUnattendedMode,
   retryWithBackoff
-} from "./chunk-SQX3PXHY.js";
+} from "./chunk-VIAJ74X3.js";
 import {
   isOmniDeliveryActive
-} from "./chunk-YO5ABP3C.js";
+} from "./chunk-VOETOZWN.js";
 import {
   MediaResourceRegistry,
   evaluateMediaPolicyToolCall,
@@ -255,12 +255,12 @@ import {
 } from "./chunk-CI2ZHR5C.js";
 import {
   require_proper_lockfile
-} from "./chunk-ZFZB6WC5.js";
+} from "./chunk-4LCUE7BN.js";
 import {
   DEFERRED_TOOL_CALL_CANCELLATION_PREFIX,
   DEFERRED_TOOL_CALL_REFUSAL_PREFIX,
   resolveDeferredToolCall
-} from "./chunk-TCME6IG6.js";
+} from "./chunk-7LFCBMVX.js";
 import {
   EXCLUDED_TOOLS_FOR_SUBAGENTS,
   READ_ONLY_INSPECTION_TOOLS,
@@ -289,13 +289,13 @@ import {
   splitCompoundCommand,
   splitCompoundCommandSegments,
   toolMatchesRuleToolName
-} from "./chunk-NGPEFWU4.js";
+} from "./chunk-OJSW65PQ.js";
 import {
   APPROVAL_MODES
 } from "./chunk-KQAVEXYD.js";
 import {
   require_shell_quote
-} from "./chunk-HLWXBJCH.js";
+} from "./chunk-WZCKDUBO.js";
 import {
   AskUserQuestionTool,
   TrustedUserAnswers,
@@ -336,7 +336,7 @@ import {
 import {
   DashScopeOpenAICompatibleProvider,
   selectDashScopeThinkingKnob
-} from "./chunk-B43A45RP.js";
+} from "./chunk-CPWPD6SR.js";
 import {
   childLaunchDepth,
   getCurrentAgentConfiguredToolAllowlist,
@@ -382,7 +382,7 @@ import {
   isRateLimitError,
   isRetryableUpstreamError,
   isStructuredError
-} from "./chunk-WUKHAI4J.js";
+} from "./chunk-7USF7X6U.js";
 import {
   combineAbortSignals,
   createAbortController,
@@ -390,7 +390,7 @@ import {
 } from "./chunk-O4IWNFDK.js";
 import {
   ResponsesHttpError
-} from "./chunk-NGE3GHMN.js";
+} from "./chunk-MWFHMYVA.js";
 import {
   getThoughtSummary
 } from "./chunk-CP63SY5N.js";
@@ -408,14 +408,14 @@ import {
   resolveSavedModelApiKey,
   stripRuntimeSnapshotPrefix,
   validateReasoningCapabilities
-} from "./chunk-B2FLT75F.js";
+} from "./chunk-7ODOX4UM.js";
 import {
   BaseTokenStorage,
   KeychainTokenStorage
 } from "./chunk-RS2LNQEC.js";
 import {
   addDaemonRequestAttribute
-} from "./chunk-POHJY7RJ.js";
+} from "./chunk-HCE5HUQG.js";
 import {
   ApiRetryEvent,
   COMBINED_PASS_TOLERANCE_FACTOR,
@@ -508,7 +508,7 @@ import {
   updateMCPServerStatus,
   writeLine,
   writeLineSync
-} from "./chunk-G5Q6NMUW.js";
+} from "./chunk-RX5J7HHZ.js";
 import {
   Mutex
 } from "./chunk-242JUBPM.js";
@@ -599,14 +599,14 @@ import {
   resolveContentGeneratorConfigWithSources,
   setGeneratorReasoningEffort,
   tokenLimit
-} from "./chunk-APE4IW2O.js";
+} from "./chunk-CF5SF4G5.js";
 import {
   getOrCreateMcpDispatcher,
   loadUndici,
   preloadRuntimeFetchModule,
   redactProxyError,
   setResolvedProxyUrlForRuntimeFetch
-} from "./chunk-PLWOHBC7.js";
+} from "./chunk-HDGYCLNB.js";
 import {
   DEFAULT_O1CODE_MODEL
 } from "./chunk-LEXKU5FI.js";
@@ -758,7 +758,7 @@ import {
   startToolExecutionSpan,
   startToolSpan,
   truncateSpanError
-} from "./chunk-TQI6ULGQ.js";
+} from "./chunk-ER3EHNTV.js";
 import {
   normalizeContent,
   stripAnsiAndControl,
@@ -11225,7 +11225,7 @@ async function startTunnelSession(o) {
   return { agent, pinSync, server, target, port: server.address().port, close };
 }
 __name(startTunnelSession, "startTunnelSession");
-var VERSION = true ? "9.2.0" : "dev";
+var VERSION = true ? "9.4.0" : "dev";
 var O1ConnectError = class extends Error {
   static {
     __name(this, "O1ConnectError");
@@ -11344,7 +11344,8 @@ async function open(opts) {
       transport: cfg.transport,
       port,
       localKeyHash: hashLocalKey(apiKey),
-      userAgent: `o1-connect-lib/${VERSION}`,
+      // Only when the app asks (like the CLI's identify): absent, nothing about the client goes on the wire.
+      userAgent: opts.identify === true ? `o1-connect-lib/${VERSION}` : void 0,
       log,
       onMismatch: /* @__PURE__ */ __name((received) => {
         log?.(`TUNNEL IDENTITY MISMATCH: received ${received}; possible interception`);
@@ -36460,7 +36461,7 @@ var LlmChat = class {
                 const degradeAttempt = omniMediaDegradeAttempts++;
                 let degradeOutcome;
                 try {
-                  const { degradeOmniMediaAfterServerReject } = await import("./reactive-degrade-PKHNF3KO.js");
+                  const { degradeOmniMediaAfterServerReject } = await import("./reactive-degrade-L6W5KNGV.js");
                   degradeOutcome = await degradeOmniMediaAfterServerReject(
                     self2.config,
                     self2.history,
@@ -70353,7 +70354,12 @@ var OAuthTokensSchema = object2({
   token_type: string2(),
   expires_in: coerce_exports.number().optional(),
   scope: string2().optional(),
-  refresh_token: string2().optional()
+  refresh_token: string2().optional(),
+  /**
+   * Not part of the wire format: the authorization server this value was obtained from, added by
+   * the client's `auth()` before it is stored and compared when it is read back.
+   */
+  issuer: string2().optional().catch(void 0)
 }).strip();
 var OAuthErrorResponseSchema = object2({
   error: string2(),
@@ -70383,7 +70389,12 @@ var OAuthClientInformationSchema = object2({
   client_id: string2(),
   client_secret: string2().optional(),
   client_id_issued_at: number2().optional(),
-  client_secret_expires_at: number2().optional()
+  client_secret_expires_at: number2().optional(),
+  /**
+   * Not part of the wire format: the authorization server this value was obtained from, added by
+   * the client's `auth()` before it is stored and compared when it is read back.
+   */
+  issuer: string2().optional().catch(void 0)
 }).strip();
 var OAuthClientInformationFullSchema = OAuthClientMetadataSchema.merge(OAuthClientInformationSchema);
 var OAuthClientRegistrationErrorSchema = object2({
@@ -70653,6 +70664,29 @@ async function parseErrorResponse(input) {
   }
 }
 __name(parseErrorResponse, "parseErrorResponse");
+function issuersMatch(a, b2) {
+  let [x, y] = [a, b2];
+  try {
+    [x, y] = [new URL(a).href, new URL(b2).href];
+  } catch {
+  }
+  return x === y || x.endsWith("/") && x.slice(0, -1) === y || y.endsWith("/") && y.slice(0, -1) === x;
+}
+__name(issuersMatch, "issuersMatch");
+function discardIfIssuerMismatch(stored, issuer) {
+  if (!stored)
+    return void 0;
+  if (typeof stored.issuer !== "string")
+    return stored.issuer == null ? stored : { ...stored, issuer: void 0 };
+  return issuersMatch(stored.issuer, issuer) ? stored : void 0;
+}
+__name(discardIfIssuerMismatch, "discardIfIssuerMismatch");
+var TokenResponseSchema = OAuthTokensSchema.omit({ issuer: true });
+var RegistrationResponseSchema = OAuthClientInformationFullSchema.omit({ issuer: true });
+function boundElsewhereError(stored, issuer) {
+  return new Error(`OAuth client information is bound to authorization server ${stored.issuer} and is not presented to ${issuer}. Clear the stored client information, or correct \`expectedIssuer\`, if the authorization server has moved.`);
+}
+__name(boundElsewhereError, "boundElsewhereError");
 async function auth(provider, options2) {
   try {
     return await authInternal(provider, options2);
@@ -70707,9 +70741,24 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
       authorizationServerMetadata: metadata
     });
   }
-  const resource = await selectResourceURL(serverUrl, provider, resourceMetadata);
+  const issuer = String(authorizationServerUrl);
+  const selectedResource = await selectResourceURL(serverUrl, provider, resourceMetadata);
+  const resource = selectedResource && resourceMetadata && !provider.validateResourceURL ? resourceMetadata.resource : selectedResource;
   const resolvedScope = scope || resourceMetadata?.scopes_supported?.join(" ") || provider.clientMetadata.scope;
-  let clientInformation = await Promise.resolve(provider.clientInformation());
+  const storedClientInformation = await Promise.resolve(provider.clientInformation());
+  let clientInformation = discardIfIssuerMismatch(storedClientInformation, issuer);
+  const canRegisterAgain = provider.saveClientInformation !== void 0 && !!provider.redirectUrl;
+  if (storedClientInformation && !clientInformation && !canRegisterAgain) {
+    throw boundElsewhereError(storedClientInformation, issuer);
+  }
+  const unstampedClientInformation = clientInformation?.issuer == null ? clientInformation : void 0;
+  const bindClientInformation = /* @__PURE__ */ __name(async () => {
+    try {
+      if (unstampedClientInformation)
+        await provider.saveClientInformation?.({ ...unstampedClientInformation, issuer });
+    } catch {
+    }
+  }, "bindClientInformation");
   if (!clientInformation) {
     if (authorizationCode !== void 0) {
       throw new Error("Existing OAuth client information is required when exchanging an authorization code");
@@ -70721,9 +70770,7 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
     }
     const shouldUseUrlBasedClientId = supportsUrlBasedClientId && clientMetadataUrl;
     if (shouldUseUrlBasedClientId) {
-      clientInformation = {
-        client_id: clientMetadataUrl
-      };
+      clientInformation = { client_id: clientMetadataUrl, issuer };
       await provider.saveClientInformation?.(clientInformation);
     } else {
       if (!provider.saveClientInformation) {
@@ -70735,8 +70782,8 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
         scope: resolvedScope,
         fetchFn
       });
-      await provider.saveClientInformation(fullInformation);
-      clientInformation = fullInformation;
+      clientInformation = { ...fullInformation, issuer };
+      await provider.saveClientInformation(clientInformation);
     }
   }
   const nonInteractiveFlow = !provider.redirectUrl;
@@ -70747,10 +70794,14 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
       authorizationCode,
       fetchFn
     });
-    await provider.saveTokens(tokens2);
+    await bindClientInformation();
+    await provider.saveTokens({ ...tokens2, issuer });
     return "AUTHORIZED";
   }
-  const tokens = await provider.tokens();
+  const tokens = discardIfIssuerMismatch(await provider.tokens(), issuer);
+  if (tokens?.refresh_token && tokens.issuer == null) {
+    console.warn("[mcp-sdk] stored OAuth tokens have no 'issuer' property (saved by an earlier version, or by a provider that does not keep it) and are used as-is; make sure your OAuthClientProvider stores what saveTokens() and saveClientInformation() receive unchanged.");
+  }
   if (tokens?.refresh_token) {
     try {
       const newTokens = await refreshAuthorization(authorizationServerUrl, {
@@ -70761,7 +70812,8 @@ async function authInternal(provider, { serverUrl, authorizationCode, scope, res
         addClientAuthentication: provider.addClientAuthentication,
         fetchFn
       });
-      await provider.saveTokens(newTokens);
+      await bindClientInformation();
+      await provider.saveTokens({ ...newTokens, issuer });
       return "AUTHORIZED";
     } catch (error42) {
       if (!(error42 instanceof OAuthError) || error42 instanceof ServerError) {
@@ -70998,6 +71050,10 @@ async function discoverOAuthServerInfo(serverUrl, opts) {
   };
 }
 __name(discoverOAuthServerInfo, "discoverOAuthServerInfo");
+function resourceIndicatorToString(resource) {
+  return typeof resource === "string" ? resource : resource.href;
+}
+__name(resourceIndicatorToString, "resourceIndicatorToString");
 async function startAuthorization(authorizationServerUrl, { metadata, clientInformation, redirectUrl, scope, state, resource }) {
   let authorizationUrl;
   if (metadata) {
@@ -71029,7 +71085,7 @@ async function startAuthorization(authorizationServerUrl, { metadata, clientInfo
     authorizationUrl.searchParams.append("prompt", "consent");
   }
   if (resource) {
-    authorizationUrl.searchParams.set("resource", resource.href);
+    authorizationUrl.searchParams.set("resource", resourceIndicatorToString(resource));
   }
   return { authorizationUrl, codeVerifier };
 }
@@ -71050,7 +71106,7 @@ async function executeTokenRequest(authorizationServerUrl, { metadata, tokenRequ
     Accept: "application/json"
   });
   if (resource) {
-    tokenRequestParams.set("resource", resource.href);
+    tokenRequestParams.set("resource", resourceIndicatorToString(resource));
   }
   if (addClientAuthentication) {
     await addClientAuthentication(headers, tokenRequestParams, tokenUrl, metadata);
@@ -71067,7 +71123,7 @@ async function executeTokenRequest(authorizationServerUrl, { metadata, tokenRequ
   if (!response.ok) {
     throw await parseErrorResponse(response);
   }
-  return OAuthTokensSchema.parse(await response.json());
+  return TokenResponseSchema.parse(await response.json());
 }
 __name(executeTokenRequest, "executeTokenRequest");
 async function refreshAuthorization(authorizationServerUrl, { metadata, clientInformation, refreshToken, resource, addClientAuthentication, fetchFn }) {
@@ -71087,6 +71143,15 @@ async function refreshAuthorization(authorizationServerUrl, { metadata, clientIn
 }
 __name(refreshAuthorization, "refreshAuthorization");
 async function fetchToken(provider, authorizationServerUrl, { metadata, resource, authorizationCode, fetchFn } = {}) {
+  const readClientInformation = /* @__PURE__ */ __name(async () => {
+    const storedClientInformation = await provider.clientInformation();
+    const checked = discardIfIssuerMismatch(storedClientInformation, String(authorizationServerUrl));
+    if (storedClientInformation && !checked) {
+      throw boundElsewhereError(storedClientInformation, String(authorizationServerUrl));
+    }
+    return checked;
+  }, "readClientInformation");
+  let clientInformation = await readClientInformation();
   const scope = provider.clientMetadata.scope;
   let tokenRequestParams;
   if (provider.prepareTokenRequest) {
@@ -71102,11 +71167,11 @@ async function fetchToken(provider, authorizationServerUrl, { metadata, resource
     const codeVerifier = await provider.codeVerifier();
     tokenRequestParams = prepareAuthorizationCodeRequest(authorizationCode, codeVerifier, provider.redirectUrl);
   }
-  const clientInformation = await provider.clientInformation();
+  clientInformation ?? (clientInformation = await readClientInformation());
   return executeTokenRequest(authorizationServerUrl, {
     metadata,
     tokenRequestParams,
-    clientInformation: clientInformation ?? void 0,
+    clientInformation,
     addClientAuthentication: provider.addClientAuthentication,
     resource,
     fetchFn
@@ -71136,7 +71201,7 @@ async function registerClient(authorizationServerUrl, { metadata, clientMetadata
   if (!response.ok) {
     throw await parseErrorResponse(response);
   }
-  return OAuthClientInformationFullSchema.parse(await response.json());
+  return RegistrationResponseSchema.parse(await response.json());
 }
 __name(registerClient, "registerClient");
 
@@ -74114,7 +74179,7 @@ var CoreToolScheduler = class _CoreToolScheduler {
     const notices = [];
     let omniProcessed = responseParts;
     if (this.config.isOmniEnabled?.()) {
-      const { processToolResultOmniMedia } = await import("./tool-result-media-SVT627AG.js");
+      const { processToolResultOmniMedia } = await import("./tool-result-media-5BM7EQS2.js");
       omniProcessed = await processToolResultOmniMedia(
         responseParts,
         this.config,
@@ -77272,7 +77337,7 @@ ${body}
           artifacts: toolResult.artifacts
         } : void 0;
         if (policyArtifacts && policyArtifacts.executionOrigin.kind !== "fixed_policy" && scheduledCall.tool.mediaPolicyDescriptor) {
-          const { collectModelPolicyCall } = await import("./model-call-collection-KCCY7UXB.js");
+          const { collectModelPolicyCall } = await import("./model-call-collection-CQDJ77VA.js");
           await collectModelPolicyCall({
             config: this.config,
             batch: policyArtifacts,
@@ -101292,7 +101357,7 @@ init_esbuild_shims();
 // node_modules/@modelcontextprotocol/client/dist/index.mjs
 init_esbuild_shims();
 
-// node_modules/@modelcontextprotocol/client/dist/src-D_zzAWoS.mjs
+// node_modules/@modelcontextprotocol/client/dist/src-xKF0PJN-.mjs
 init_esbuild_shims();
 
 // node_modules/@modelcontextprotocol/client/dist/chunk-Br0eD_fh.mjs
@@ -101359,7 +101424,7 @@ __name(declaredDialect, "declaredDialect");
 // node_modules/@modelcontextprotocol/core/dist/internal.mjs
 init_esbuild_shims();
 
-// node_modules/@modelcontextprotocol/core/dist/auth-CUe6YdwF.mjs
+// node_modules/@modelcontextprotocol/core/dist/auth-BNDyLTqp.mjs
 init_esbuild_shims();
 
 // node_modules/@modelcontextprotocol/core/node_modules/zod/v4/classic/external.js
@@ -107042,7 +107107,7 @@ __name(date7, "date");
 // node_modules/@modelcontextprotocol/core/node_modules/zod/v4/classic/external.js
 config2(en_default3());
 
-// node_modules/@modelcontextprotocol/core/dist/auth-CUe6YdwF.mjs
+// node_modules/@modelcontextprotocol/core/dist/auth-BNDyLTqp.mjs
 var LATEST_PROTOCOL_VERSION2 = "2025-11-25";
 var SUPPORTED_PROTOCOL_VERSIONS2 = [
   LATEST_PROTOCOL_VERSION2,
@@ -107879,7 +107944,8 @@ var OAuthMetadataSchema2 = looseObject2({
   introspection_endpoint_auth_signing_alg_values_supported: array2(string5()).optional(),
   code_challenge_methods_supported: array2(string5()).optional(),
   client_id_metadata_document_supported: boolean5().optional(),
-  authorization_response_iss_parameter_supported: boolean5().optional().catch(void 0)
+  authorization_response_iss_parameter_supported: boolean5().optional().catch(void 0),
+  dpop_signing_alg_values_supported: array2(string5()).optional()
 });
 var OpenIdProviderMetadataSchema2 = looseObject2({
   issuer: string5(),
@@ -107930,7 +107996,8 @@ var OAuthTokensSchema2 = object3({
   token_type: string5(),
   expires_in: coerce_exports2.number().optional(),
   scope: string5().optional(),
-  refresh_token: string5().optional()
+  refresh_token: string5().optional(),
+  issuer: string5().optional().catch(void 0)
 }).strip();
 var IdJagTokenExchangeResponseSchema = object3({
   issued_token_type: literal3("urn:ietf:params:oauth:token-type:id-jag"),
@@ -107968,7 +108035,8 @@ var OAuthClientInformationSchema2 = object3({
   client_id: string5(),
   client_secret: string5().optional(),
   client_id_issued_at: number5().optional(),
-  client_secret_expires_at: number5().optional()
+  client_secret_expires_at: number5().optional(),
+  issuer: string5().optional().catch(void 0)
 }).strip();
 var OAuthClientInformationFullSchema2 = OAuthClientMetadataSchema2.merge(OAuthClientInformationSchema2);
 var OAuthClientRegistrationErrorSchema2 = object3({
@@ -113662,7 +113730,7 @@ __name(preprocess3, "preprocess");
 // node_modules/@modelcontextprotocol/client/node_modules/zod/v4/classic/external.js
 config3(en_default4());
 
-// node_modules/@modelcontextprotocol/client/dist/src-D_zzAWoS.mjs
+// node_modules/@modelcontextprotocol/client/dist/src-xKF0PJN-.mjs
 var BRANDS = Symbol.for("mcp.sdk.errorBrands");
 function stampErrorBrands(instance, ctor) {
   const brands = /* @__PURE__ */ new Set();
@@ -113710,6 +113778,8 @@ var OAuthErrorCode = /* @__PURE__ */ (function(OAuthErrorCode$1) {
   OAuthErrorCode$1["InvalidRedirectUri"] = "invalid_redirect_uri";
   OAuthErrorCode$1["InsufficientScope"] = "insufficient_scope";
   OAuthErrorCode$1["InvalidTarget"] = "invalid_target";
+  OAuthErrorCode$1["InvalidDpopProof"] = "invalid_dpop_proof";
+  OAuthErrorCode$1["UseDpopNonce"] = "use_dpop_nonce";
   return OAuthErrorCode$1;
 })({});
 var OAuthError2 = class OAuthError3 extends Error {
@@ -113805,8 +113875,18 @@ var SdkError = class extends Error {
     if (typeof this !== "function") throw new TypeError("isInstance must be called on the class (e.g. `SdkError.isInstance(value)`); for callbacks use `v => SdkError.isInstance(v)`");
     return brandedHasInstance(this, value);
   }
-  constructor(code, message, data) {
-    super(message);
+  /**
+  * @param code - Stable string code identifying the failure ({@linkcode SdkErrorCode}).
+  * @param message - Human-readable description.
+  * @param data - Optional structured payload (for example the HTTP status carried by
+  * {@linkcode SdkHttpError}). Opaque to the SDK: a `cause` key inside `data` is not
+  * promoted to `Error.cause`.
+  * @param options - Standard `ErrorOptions`, forwarded to `Error`. Pass the underlying
+  * failure as `{ cause }` so it is reachable through the `Error.cause` chain that
+  * loggers and error trackers walk.
+  */
+  constructor(code, message, data, options2) {
+    super(message, options2);
     this.code = code;
     this.data = data;
     this.name = "SdkError";
@@ -113820,8 +113900,11 @@ var SdkHttpError = class extends SdkError {
   static {
     Object.defineProperty(this, "mcpBrand", { value: "mcp.SdkHttpError" });
   }
-  constructor(code, message, data) {
-    super(code, message, data);
+  /**
+  * @param options - Standard `ErrorOptions`, forwarded to `Error` (see {@linkcode SdkError}).
+  */
+  constructor(code, message, data, options2) {
+    super(code, message, data, options2);
     this.name = "SdkHttpError";
   }
   get status() {
@@ -113837,6 +113920,13 @@ function resourceUrlFromServerUrl2(url4) {
   return resourceURL;
 }
 __name(resourceUrlFromServerUrl2, "resourceUrlFromServerUrl");
+function withoutIssuer(body) {
+  if (typeof body !== "object" || body === null || Array.isArray(body)) return body;
+  const copy = { ...body };
+  delete copy.issuer;
+  return copy;
+}
+__name(withoutIssuer, "withoutIssuer");
 function checkResourceAllowed2({ requestedResource, configuredResource }) {
   const requested = typeof requestedResource === "string" ? new URL(requestedResource) : new URL(requestedResource.href);
   const configured = typeof configuredResource === "string" ? new URL(configuredResource) : new URL(configuredResource.href);
@@ -114964,10 +115054,10 @@ function getNotificationSchema(method) {
 __name(getNotificationSchema, "getNotificationSchema");
 var rev2025RequestMethods = Object.keys(requestMethodKeys$1);
 var rev2025NotificationMethods = Object.keys(notificationMethodKeys$1);
-function isPlainObject$4(value) {
+function isPlainObject$5(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-__name(isPlainObject$4, "isPlainObject$4");
+__name(isPlainObject$5, "isPlainObject$5");
 function triState$1(schema, raw) {
   if (schema === void 0) return {
     ok: false,
@@ -114989,7 +115079,7 @@ var NOT_IN_ERA$1 = {
   reason: "not-in-era"
 };
 function toolNeedsLegacyWrap(t) {
-  return isPlainObject$4(t) && isPlainObject$4(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
+  return isPlainObject$5(t) && isPlainObject$5(t["outputSchema"]) && isNonObjectJsonSchemaRoot(t["outputSchema"]);
 }
 __name(toolNeedsLegacyWrap, "toolNeedsLegacyWrap");
 function toNeutralResult(value) {
@@ -115025,7 +115115,7 @@ var rev2025Codec = {
     };
   },
   decodeResult(_method, raw) {
-    if (isPlainObject$4(raw) && "resultType" in raw) {
+    if (isPlainObject$5(raw) && "resultType" in raw) {
       const stripped = { ...raw };
       delete stripped["resultType"];
       return {
@@ -116131,10 +116221,10 @@ function fillCacheFields(method, result) {
   return filled;
 }
 __name(fillCacheFields, "fillCacheFields");
-function isPlainObject$3(value) {
+function isPlainObject$4(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-__name(isPlainObject$3, "isPlainObject$3");
+__name(isPlainObject$4, "isPlainObject$4");
 function stampServerInfoMeta(result, serverInfo) {
   if (serverInfo === void 0) return result;
   const meta4 = result["_meta"];
@@ -116142,7 +116232,7 @@ function stampServerInfoMeta(result, serverInfo) {
     ...result,
     _meta: { [SERVER_INFO_META_KEY]: serverInfo }
   };
-  if (!isPlainObject$3(meta4)) return result;
+  if (!isPlainObject$4(meta4)) return result;
   if (meta4[SERVER_INFO_META_KEY] !== void 0) return result;
   return {
     ...result,
@@ -116260,10 +116350,10 @@ function getNotificationSchema2026(method) {
 __name(getNotificationSchema2026, "getNotificationSchema2026");
 var rev2026RequestMethods = Object.keys(requestMethodKeys);
 var rev2026NotificationMethods = Object.keys(notificationMethodKeys);
-function isPlainObject$2(value) {
+function isPlainObject$3(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
-__name(isPlainObject$2, "isPlainObject$2");
+__name(isPlainObject$3, "isPlainObject$3");
 function triState(schema, raw) {
   if (schema === void 0) return {
     ok: false,
@@ -116296,14 +116386,14 @@ function enforceDeletedFields(method, result) {
     return next;
   }, "copy");
   const tools = result.tools;
-  if (method === "tools/list" && Array.isArray(tools) && tools.some((tool) => isPlainObject$2(tool) && "execution" in tool)) copy().tools = tools.map((tool) => {
-    if (!isPlainObject$2(tool) || !("execution" in tool)) return tool;
+  if (method === "tools/list" && Array.isArray(tools) && tools.some((tool) => isPlainObject$3(tool) && "execution" in tool)) copy().tools = tools.map((tool) => {
+    if (!isPlainObject$3(tool) || !("execution" in tool)) return tool;
     const rest = { ...tool };
     delete rest["execution"];
     return rest;
   });
   const capabilities = result.capabilities;
-  if (isPlainObject$2(capabilities) && "tasks" in capabilities) {
+  if (isPlainObject$3(capabilities) && "tasks" in capabilities) {
     const rest = { ...capabilities };
     delete rest["tasks"];
     copy().capabilities = rest;
@@ -116351,7 +116441,7 @@ var rev2026Codec = {
   projectCallToolResult: /* @__PURE__ */ __name((result) => appendTextFallbackForNonObject(result), "projectCallToolResult"),
   inputRequestSchema: getInputRequestSchema2026,
   decodeResult(method, raw) {
-    if (!isPlainObject$2(raw)) return {
+    if (!isPlainObject$3(raw)) return {
       kind: "invalid",
       error: new SdkError(SdkErrorCode.InvalidResult, `Invalid result for ${method}: not an object`, { method })
     };
@@ -116372,8 +116462,10 @@ var rev2026Codec = {
     };
     if (rawResultType === "input_required") {
       const rawInputRequests = raw["inputRequests"];
-      const inputRequests = isPlainObject$2(rawInputRequests) ? rawInputRequests : {};
+      const inputRequests = isPlainObject$3(rawInputRequests) ? rawInputRequests : {};
       const requestState = raw["requestState"];
+      const metaParse = raw["_meta"] === void 0 ? void 0 : buildSchemas2026().ResultMetaSchema.safeParse(raw["_meta"]);
+      const meta4 = metaParse?.success ? metaParse.data : void 0;
       if (Object.keys(inputRequests).length === 0 && typeof requestState !== "string") return {
         kind: "invalid",
         error: new SdkError(SdkErrorCode.InvalidResult, `Invalid result for ${method}: input_required carries neither inputRequests nor requestState (every input_required result must include at least one of the two)`, {
@@ -116384,7 +116476,8 @@ var rev2026Codec = {
       return {
         kind: "input_required",
         inputRequests,
-        ...typeof requestState === "string" && { requestState }
+        ...typeof requestState === "string" && { requestState },
+        ...meta4 !== void 0 && { _meta: meta4 }
       };
     }
     if (rawResultType !== "complete") return {
@@ -116835,7 +116928,7 @@ var INBOUND_VALIDATION_LADDER = [
     evaluatedAt: "pre-dispatch",
     codes: [HEADER_MISMATCH_ERROR_CODE],
     conformance: ["http-header-validation"],
-    rationale: "SEP-2243 standard `Mcp-Method` / `Mcp-Name` headers \u2014 presence, sentinel decoding, and `Mcp-Name` \u2194 body cross-check \u2014 are validated by the HTTP entry on a modern-classified request after the supported-revision gate and before dispatch. The classifier\u2019s own header-mismatch cells (protocol-version, `Mcp-Method` mismatch) stay on the edge `era-classification` rung; this rung carries the entry-layer presence/`Mcp-Name` half. Evaluated before the capability gate, the factory call, and the `Mcp-Param-*` rung so a request that fails several rungs is answered by the standard-header rung first. The documented order (after method-registry 5 and request-params 6) is NOT the observed precedence: serveModern evaluates this rung immediately after the supported-revision gate, so a request that also fails a dispatch rung is answered here before the dispatch rungs (5\u20136) are consulted."
+    rationale: "SEP-2243 standard `MCP-Protocol-Version` / `Mcp-Method` / `Mcp-Name` headers \u2014 presence, sentinel decoding, and `Mcp-Name` \u2194 body cross-check \u2014 are validated by the HTTP entry on a modern-classified request after the supported-revision gate and before dispatch. The spec requires `MCP-Protocol-Version` and `Mcp-Method` on every modern *request* POST (`Mcp-Name` only for the methods that mirror `params.name` / `params.uri` / `params.taskId`, see `MCP_NAME_HEADER_SOURCE`) and names them in that order, so a request missing several is answered by the earliest. Notification POSTs are exempt: the presence half runs on requests only, so a modern-enveloped notification is dispatched even with no standard headers at all. The classifier\u2019s own header-mismatch cells (protocol-version, `Mcp-Method` mismatch) stay on the edge `era-classification` rung; this rung carries the entry-layer presence/`Mcp-Name` half \u2014 including the missing `MCP-Protocol-Version` cell, which cannot live on the edge rung without breaking body-primary classification. Evaluated before the capability gate, the factory call, and the `Mcp-Param-*` rung so a request that fails several rungs is answered by the standard-header rung first. The documented order (after method-registry 5 and request-params 6) is NOT the observed precedence: serveModern evaluates this rung immediately after the supported-revision gate, so a request that also fails a dispatch rung is answered here before the dispatch rungs (5\u20136) are consulted."
   },
   {
     rung: "client-capabilities",
@@ -116862,6 +116955,28 @@ var LADDER_ERROR_HTTP_STATUS = {
   [ProtocolErrorCode.MissingRequiredClientCapability]: 400,
   [HEADER_MISMATCH_ERROR_CODE]: 400
 };
+var MCP_NAME_HEADER_SOURCE = {
+  "tools/call": "name",
+  "prompts/get": "name",
+  "resources/read": "uri",
+  "tasks/get": "taskId",
+  "tasks/update": "taskId",
+  "tasks/cancel": "taskId"
+};
+function mcpNameSource(method, params) {
+  const field = Object.hasOwn(MCP_NAME_HEADER_SOURCE, method) ? MCP_NAME_HEADER_SOURCE[method] : void 0;
+  if (field === void 0) return;
+  const raw = isPlainObject$2(params) ? params[field] : void 0;
+  return {
+    field,
+    value: typeof raw === "string" ? raw : void 0
+  };
+}
+__name(mcpNameSource, "mcpNameSource");
+function isPlainObject$2(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+__name(isPlainObject$2, "isPlainObject$2");
 function parseSchema(schema, data) {
   return safeParse7(schema, data);
 }
@@ -117652,7 +117767,7 @@ var Protocol2 = class {
     return this._requestHandlers.get(method);
   }
   async _oncancel(notification) {
-    if (!notification.params.requestId) return;
+    if (notification.params.requestId === void 0) return;
     this._requestHandlerAbortControllers.get(notification.params.requestId)?.abort(notification.params.reason);
   }
   _setupTimeout(messageId, timeout, maxTotalTimeout, onTimeout, resetTimeoutOnProgress = false) {
@@ -118051,19 +118166,20 @@ var Protocol2 = class {
       const cancel = /* @__PURE__ */ __name((reason) => {
         if (responseReceived) return;
         this._progressHandlers.delete(messageId);
-        if (requestAbort === void 0) this._transport?.send(this._envelopeOutbound({
-          jsonrpc: "2.0",
-          method: "notifications/cancelled",
-          params: {
-            requestId: messageId,
-            reason: String(reason)
-          }
-        }), {
-          relatedRequestId,
-          resumptionToken,
-          onresumptiontoken
-        }).catch((error42) => this._onerror(/* @__PURE__ */ new Error(`Failed to send cancellation: ${error42}`)));
-        else requestAbort.abort();
+        if (requestAbort === void 0) {
+          if (request.method !== "initialize") this._transport?.send(this._envelopeOutbound({
+            jsonrpc: "2.0",
+            method: "notifications/cancelled",
+            params: {
+              requestId: messageId,
+              reason: String(reason)
+            }
+          }), {
+            relatedRequestId,
+            resumptionToken,
+            onresumptiontoken
+          }).catch((error42) => this._onerror(/* @__PURE__ */ new Error(`Failed to send cancellation: ${error42}`)));
+        } else requestAbort.abort();
         reject(reason instanceof SdkError ? reason : new SdkError(SdkErrorCode.RequestTimeout, String(reason)));
       }, "cancel");
       this._responseHandlers.set(messageId, (response) => {
@@ -118125,7 +118241,7 @@ var Protocol2 = class {
   * Emits a notification, which is a one-way message that does not expect a response.
   */
   async notification(notification, options2) {
-    return this._notificationViaCodec(this._resolveOutboundCodec(notification.method), notification, options2);
+    return await this._notificationViaCodec(this._resolveOutboundCodec(notification.method), notification, options2);
   }
   /**
   * The notification funnel proper, keyed by the resolved era codec —
@@ -118143,7 +118259,7 @@ var Protocol2 = class {
       jsonrpc: "2.0",
       ...notification
     });
-    if ((this._options?.debouncedNotificationMethods ?? []).includes(notification.method) && !notification.params && !options2?.relatedRequestId) {
+    if ((this._options?.debouncedNotificationMethods ?? []).includes(notification.method) && !notification.params && options2?.relatedRequestId === void 0) {
       if (this._pendingDebouncedNotifications.has(notification.method)) return;
       this._pendingDebouncedNotifications.add(notification.method);
       Promise.resolve().then(() => {
@@ -118364,7 +118480,8 @@ function manualInputRequiredValue(decoded) {
   return {
     resultType: "input_required",
     inputRequests: decoded.inputRequests,
-    ...decoded.requestState !== void 0 && { requestState: decoded.requestState }
+    ...decoded.requestState !== void 0 && { requestState: decoded.requestState },
+    ...decoded._meta !== void 0 && { _meta: decoded._meta }
   };
 }
 __name(manualInputRequiredValue, "manualInputRequiredValue");
@@ -126316,7 +126433,7 @@ var InsecureTokenEndpointError = class extends OAuthClientFlowError {
   /** The token endpoint URL that was rejected. */
   tokenEndpoint;
   constructor(tokenEndpoint) {
-    super(`Refusing to send credentials to non-https token endpoint '${tokenEndpoint}'. OAuth token requests MUST use TLS (localhost / 127.0.0.1 / ::1 are exempt).`);
+    super(`Refusing to send credentials to non-https token endpoint '${tokenEndpoint}'. OAuth token requests MUST use TLS (localhost / *.localhost / 127.0.0.1 / ::1 are exempt).`);
     this.tokenEndpoint = tokenEndpoint;
   }
 };
@@ -126328,7 +126445,7 @@ var AuthorizationServerMismatchError = class extends OAuthClientFlowError {
     Object.defineProperty(this, "mcpBrand", { value: "mcp.AuthorizationServerMismatchError" });
   }
   constructor(recordedIssuer, currentIssuer) {
-    super(`Authorization server changed between redirect and callback (redirected to ${JSON.stringify(recordedIssuer)}, callback resolved ${JSON.stringify(currentIssuer)}); refusing to send authorization_code/code_verifier to a different token endpoint`);
+    super(`Authorization server mismatch: credentials are bound to ${JSON.stringify(recordedIssuer)} but this call resolved ${JSON.stringify(currentIssuer)}; refusing to present them to a different authorization server`);
     this.recordedIssuer = recordedIssuer;
     this.currentIssuer = currentIssuer;
   }
@@ -126353,19 +126470,22 @@ var InsufficientScopeError2 = class extends OAuthClientFlowError {
     this.errorDescription = init.errorDescription;
   }
 };
-function discardIfIssuerMismatch(stored, issuer, opts) {
-  if (stored === void 0) return void 0;
-  if (stored.issuer === void 0) {
+function discardIfIssuerMismatch2(stored, issuer, opts) {
+  if (!stored) return void 0;
+  if (typeof stored.issuer !== "string") {
     if (opts?.canPersistStamp !== false) console.warn("[mcp-sdk] SEP-2352: stored OAuth credential has no 'issuer' stamp (pre-upgrade storage or provider not round-tripping the value). SEP-2352 isolation is inactive for this read; ensure your provider round-trips the issuer field.");
-    return stored;
+    return stored.issuer === void 0 ? stored : {
+      ...stored,
+      issuer: void 0
+    };
   }
-  return issuersMatch(stored.issuer, issuer) ? stored : void 0;
+  return issuersMatch2(stored.issuer, issuer) ? stored : void 0;
 }
-__name(discardIfIssuerMismatch, "discardIfIssuerMismatch");
-function issuersMatch(a, b2) {
+__name(discardIfIssuerMismatch2, "discardIfIssuerMismatch");
+function issuersMatch2(a, b2) {
   return a === b2 || a.endsWith("/") && a.slice(0, -1) === b2 || b2.endsWith("/") && b2.slice(0, -1) === a;
 }
-__name(issuersMatch, "issuersMatch");
+__name(issuersMatch2, "issuersMatch");
 function isOAuthClientProvider(provider) {
   if (provider == null) return false;
   const p2 = provider;
@@ -126531,7 +126651,7 @@ function applyPublicAuth2(clientId, params) {
 }
 __name(applyPublicAuth2, "applyPublicAuth");
 function isLoopbackHost2(hostname4) {
-  return hostname4 === "localhost" || hostname4 === "127.0.0.1" || hostname4 === "[::1]" || hostname4 === "::1";
+  return hostname4 === "localhost" || hostname4.endsWith(".localhost") || hostname4 === "127.0.0.1" || hostname4 === "[::1]" || hostname4 === "::1";
 }
 __name(isLoopbackHost2, "isLoopbackHost");
 function assertSecureTokenEndpoint(tokenEndpoint) {
@@ -126575,16 +126695,23 @@ async function parseErrorResponse2(input) {
   }
 }
 __name(parseErrorResponse2, "parseErrorResponse");
+function warnCredentialInvalidation(provider, error42, invalidated) {
+  const action = provider.invalidateCredentials === void 0 ? `retrying authorization without discarding the stored ${invalidated} (provider implements no invalidateCredentials())` : `invalidating the stored ${invalidated} and retrying authorization`;
+  console.warn(`[mcp-sdk] OAuth ${JSON.stringify(error42.code)} \u2014 ${action}. Cause: ${JSON.stringify(error42.message)}`);
+}
+__name(warnCredentialInvalidation, "warnCredentialInvalidation");
 async function auth2(provider, options2) {
   try {
     return await authInternal2(provider, options2);
   } catch (error42) {
     if (error42 instanceof OAuthError2) {
       if (error42.code === OAuthErrorCode.InvalidClient || error42.code === OAuthErrorCode.UnauthorizedClient) {
+        warnCredentialInvalidation(provider, error42, "client credentials and tokens");
         await provider.invalidateCredentials?.("client");
         await provider.invalidateCredentials?.("tokens");
         return await authInternal2(provider, options2);
-      } else if (error42.code === OAuthErrorCode.InvalidGrant) {
+      } else if (error42.code === OAuthErrorCode.InvalidGrant || error42.code === OAuthErrorCode.InvalidDpopProof) {
+        warnCredentialInvalidation(provider, error42, "tokens");
         await provider.invalidateCredentials?.("tokens");
         return await authInternal2(provider, options2);
       }
@@ -126651,11 +126778,12 @@ async function authInternal2(provider, { serverUrl, authorizationCode, iss, scop
     if (recordedIssuer === void 0) {
       if (provider.saveDiscoveryState !== void 0) throw new AuthorizationServerMismatchError("discoveryState was not available on the callback leg; ensure your provider persists discoveryState alongside codeVerifier", issuer);
       console.warn("[mcp-sdk] OAuthClientProvider does not implement saveDiscoveryState()/discoveryState(); the SEP-2352 callback-leg authorization-server binding cannot be checked. Implement discoveryState (persist alongside codeVerifier) \u2014 see docs/migration/upgrade-to-v2.md \xA7SEP-2352.");
-    } else if (!issuersMatch(recordedIssuer, issuer)) throw new AuthorizationServerMismatchError(recordedIssuer, issuer);
+    } else if (!issuersMatch2(recordedIssuer, issuer)) throw new AuthorizationServerMismatchError(recordedIssuer, issuer);
   }
   if (freshDiscoveryState) await provider.saveDiscoveryState?.(freshDiscoveryState);
-  const resource = await selectResourceURL2(serverUrl, provider, resourceMetadata);
-  if (resource) await provider.saveResourceUrl?.(String(resource));
+  const selectedResource = await selectResourceURL2(serverUrl, provider, resourceMetadata);
+  const resource = selectedResource && resourceMetadata && !provider.validateResourceURL ? resourceMetadata.resource : selectedResource;
+  if (resource) await provider.saveResourceUrl?.(resourceIndicatorToString2(resource));
   const resolvedScope = determineScope({
     requestedScope: scope,
     resourceMetadata,
@@ -126663,7 +126791,7 @@ async function authInternal2(provider, { serverUrl, authorizationCode, iss, scop
     clientMetadata: provider.clientMetadata
   });
   const rawClientInfo = await Promise.resolve(provider.clientInformation(infoCtx));
-  let clientInformation = discardIfIssuerMismatch(rawClientInfo, issuer, { canPersistStamp: provider.saveClientInformation !== void 0 });
+  let clientInformation = discardIfIssuerMismatch2(rawClientInfo, issuer, { canPersistStamp: provider.saveClientInformation !== void 0 });
   if (clientInformation === void 0 && rawClientInfo?.issuer && provider.saveClientInformation === void 0) throw new AuthorizationServerMismatchError(rawClientInfo.issuer, issuer);
   if (clientInformation && clientInformation.issuer === void 0) {
     clientInformation = {
@@ -126718,7 +126846,7 @@ async function authInternal2(provider, { serverUrl, authorizationCode, iss, scop
     }, infoCtx);
     return "AUTHORIZED";
   }
-  let tokens = discardIfIssuerMismatch(await provider.tokens(infoCtx), issuer);
+  let tokens = discardIfIssuerMismatch2(await provider.tokens(infoCtx), issuer);
   if (tokens && tokens.issuer === void 0) {
     tokens = {
       ...tokens,
@@ -126726,24 +126854,30 @@ async function authInternal2(provider, { serverUrl, authorizationCode, iss, scop
     };
     await provider.saveTokens(tokens, infoCtx);
   }
-  if (tokens?.refresh_token && !forceReauthorization) try {
-    const newTokens = await refreshAuthorization2(authorizationServerUrl, {
-      metadata,
-      clientInformation,
-      refreshToken: tokens.refresh_token,
-      resource,
-      addClientAuthentication: provider.addClientAuthentication,
-      fetchFn
-    });
-    await provider.saveTokens({
-      ...newTokens,
-      issuer
-    }, infoCtx);
-    return "AUTHORIZED";
-  } catch (error42) {
-    if (error42 instanceof InsecureTokenEndpointError) throw error42;
-    if (!(error42 instanceof OAuthError2) || error42.code === OAuthErrorCode.ServerError) {
-    } else throw error42;
+  if (tokens?.refresh_token && !forceReauthorization) {
+    let newTokens;
+    try {
+      newTokens = await refreshAuthorization2(authorizationServerUrl, {
+        metadata,
+        clientInformation,
+        refreshToken: tokens.refresh_token,
+        resource,
+        addClientAuthentication: provider.addClientAuthentication,
+        dpop: await provider.dpop?.(),
+        fetchFn
+      });
+    } catch (error42) {
+      if (error42 instanceof InsecureTokenEndpointError) throw error42;
+      if (!(error42 instanceof OAuthError2) || error42.code === OAuthErrorCode.ServerError) console.warn(`[mcp-sdk] Could not refresh OAuth tokens; falling back to a new authorization request. Cause: ${JSON.stringify(error42 instanceof Error ? error42.message : String(error42))}`);
+      else throw error42;
+    }
+    if (newTokens) {
+      await provider.saveTokens({
+        ...newTokens,
+        issuer
+      }, infoCtx);
+      return "AUTHORIZED";
+    }
   }
   const state = provider.state ? await provider.state() : void 0;
   const { authorizationUrl, codeVerifier } = await startAuthorization2(authorizationServerUrl, {
@@ -126780,11 +126914,12 @@ async function selectResourceURL2(serverUrl, provider, resourceMetadata) {
   return new URL(resourceMetadata.resource);
 }
 __name(selectResourceURL2, "selectResourceURL");
+var RECOGNIZED_CHALLENGE_SCHEMES = /* @__PURE__ */ new Set(["bearer", "dpop"]);
 function extractWWWAuthenticateParams2(res) {
   const authenticateHeader = res.headers.get("WWW-Authenticate");
   if (!authenticateHeader) return {};
   const [type, scheme] = authenticateHeader.split(" ");
-  if (type?.toLowerCase() !== "bearer" || !scheme) return {};
+  if (!type || !RECOGNIZED_CHALLENGE_SCHEMES.has(type.toLowerCase()) || !scheme) return {};
   const resourceMetadataMatch = extractFieldFromWwwAuth2(res, "resource_metadata") || void 0;
   let resourceMetadataUrl;
   if (resourceMetadataMatch) try {
@@ -126952,6 +127087,10 @@ async function discoverOAuthServerInfo2(serverUrl, opts) {
   };
 }
 __name(discoverOAuthServerInfo2, "discoverOAuthServerInfo");
+function resourceIndicatorToString2(resource) {
+  return typeof resource === "string" ? resource : resource.href;
+}
+__name(resourceIndicatorToString2, "resourceIndicatorToString");
 async function startAuthorization2(authorizationServerUrl, { metadata, clientInformation, redirectUrl, scope, state, resource }) {
   let authorizationUrl;
   if (metadata) {
@@ -126970,7 +127109,7 @@ async function startAuthorization2(authorizationServerUrl, { metadata, clientInf
   if (state) authorizationUrl.searchParams.set("state", state);
   if (scope) authorizationUrl.searchParams.set("scope", scope);
   if (scope?.split(" ").includes("offline_access")) authorizationUrl.searchParams.append("prompt", "consent");
-  if (resource) authorizationUrl.searchParams.set("resource", resource.href);
+  if (resource) authorizationUrl.searchParams.set("resource", resourceIndicatorToString2(resource));
   return {
     authorizationUrl,
     codeVerifier
@@ -126986,31 +127125,47 @@ function prepareAuthorizationCodeRequest2(authorizationCode, codeVerifier, redir
   });
 }
 __name(prepareAuthorizationCodeRequest2, "prepareAuthorizationCodeRequest");
-async function executeTokenRequest2(authorizationServerUrl, { metadata, tokenRequestParams, clientInformation, addClientAuthentication, resource, fetchFn }) {
+async function executeTokenRequest2(authorizationServerUrl, { metadata, tokenRequestParams, clientInformation, addClientAuthentication, resource, dpop, fetchFn }) {
   const tokenUrl = assertSecureTokenEndpoint(metadata?.token_endpoint ?? new URL("/token", authorizationServerUrl));
   const headers = new Headers({
     "Content-Type": "application/x-www-form-urlencoded",
     Accept: "application/json"
   });
-  if (resource) tokenRequestParams.set("resource", resource.href);
-  if (addClientAuthentication) await addClientAuthentication(headers, tokenRequestParams, tokenUrl, metadata);
-  else if (clientInformation) applyClientAuthentication2(selectClientAuthMethod2(clientInformation, metadata?.token_endpoint_auth_methods_supported ?? []), clientInformation, headers, tokenRequestParams);
-  const response = await (fetchFn ?? fetch)(tokenUrl, {
-    method: "POST",
-    headers,
-    body: tokenRequestParams
-  });
+  if (resource) tokenRequestParams.set("resource", resourceIndicatorToString2(resource));
+  if (!addClientAuthentication && clientInformation) applyClientAuthentication2(selectClientAuthMethod2(clientInformation, metadata?.token_endpoint_auth_methods_supported ?? []), clientInformation, headers, tokenRequestParams);
+  const requestOnce = /* @__PURE__ */ __name(async () => {
+    const requestHeaders = new Headers(headers);
+    if (addClientAuthentication) await addClientAuthentication(requestHeaders, tokenRequestParams, tokenUrl, metadata);
+    if (dpop) requestHeaders.set("DPoP", await dpop.buildProof({
+      htm: "POST",
+      htu: tokenUrl
+    }));
+    return (fetchFn ?? fetch)(tokenUrl, {
+      method: "POST",
+      headers: requestHeaders,
+      body: tokenRequestParams
+    });
+  }, "requestOnce");
+  let response = await requestOnce();
+  if (dpop && response.status === 400) {
+    if ((await response.clone().json().catch(() => {
+    }))?.error === OAuthErrorCode.UseDpopNonce) {
+      dpop.observeNonce(response, tokenUrl);
+      response = await requestOnce();
+    }
+  }
+  dpop?.observeNonce(response, tokenUrl);
   if (!response.ok) throw await parseErrorResponse2(response);
   const json2 = await response.json();
   try {
-    return OAuthTokensSchema2.parse(json2);
+    return OAuthTokensSchema2.parse(withoutIssuer(json2));
   } catch (parseError) {
     if (typeof json2 === "object" && json2 !== null && "error" in json2) throw await parseErrorResponse2(JSON.stringify(json2));
     throw parseError;
   }
 }
 __name(executeTokenRequest2, "executeTokenRequest");
-async function refreshAuthorization2(authorizationServerUrl, { metadata, clientInformation, refreshToken, resource, addClientAuthentication, fetchFn }) {
+async function refreshAuthorization2(authorizationServerUrl, { metadata, clientInformation, refreshToken, resource, addClientAuthentication, dpop, fetchFn }) {
   return {
     refresh_token: refreshToken,
     ...await executeTokenRequest2(authorizationServerUrl, {
@@ -127022,6 +127177,7 @@ async function refreshAuthorization2(authorizationServerUrl, { metadata, clientI
       clientInformation,
       addClientAuthentication,
       resource,
+      dpop,
       fetchFn
     })
   };
@@ -127033,6 +127189,14 @@ async function fetchToken2(provider, authorizationServerUrl, { metadata, resourc
     expectedIssuer: metadata?.issuer,
     issParameterSupported: isIssParameterSupported(metadata)
   });
+  const issuer = metadata?.issuer ?? String(authorizationServerUrl);
+  const readClientInformation = /* @__PURE__ */ __name(async () => {
+    const rawClientInfo = await provider.clientInformation({ issuer });
+    const checked = discardIfIssuerMismatch2(rawClientInfo, issuer, { canPersistStamp: false });
+    if (rawClientInfo && checked === void 0) throw new AuthorizationServerMismatchError(String(rawClientInfo.issuer), issuer);
+    return checked;
+  }, "readClientInformation");
+  let clientInformation = await readClientInformation();
   const effectiveScope = scope ?? provider.clientMetadata.scope;
   let tokenRequestParams;
   if (provider.prepareTokenRequest) tokenRequestParams = await provider.prepareTokenRequest(effectiveScope);
@@ -127041,13 +127205,14 @@ async function fetchToken2(provider, authorizationServerUrl, { metadata, resourc
     if (!provider.redirectUrl) throw new Error("redirectUrl is required for authorization_code flow");
     tokenRequestParams = prepareAuthorizationCodeRequest2(authorizationCode, await provider.codeVerifier(), provider.redirectUrl);
   }
-  const clientInformation = await provider.clientInformation({ issuer: metadata?.issuer ?? String(authorizationServerUrl) });
+  clientInformation ??= await readClientInformation();
   return executeTokenRequest2(authorizationServerUrl, {
     metadata,
     tokenRequestParams,
-    clientInformation: clientInformation ?? void 0,
+    clientInformation,
     addClientAuthentication: provider.addClientAuthentication,
     resource,
+    dpop: await provider.dpop?.(),
     fetchFn
   });
 }
@@ -127072,7 +127237,7 @@ async function registerClient2(authorizationServerUrl, { metadata, clientMetadat
     body: await response.text(),
     submittedMetadata
   });
-  return OAuthClientInformationFullSchema2.parse(await response.json());
+  return OAuthClientInformationFullSchema2.parse(withoutIssuer(await response.json()));
 }
 __name(registerClient2, "registerClient");
 var CAP_EXEMPT_METHODS = /* @__PURE__ */ new Set([
@@ -127674,7 +127839,7 @@ function classifyNetworkError(error42, context2) {
   if (context2.environment === "browser" && isOpaqueFetchTypeError(error42)) return { kind: "legacy" };
   return {
     kind: "error",
-    error: new SdkError(SdkErrorCode.EraNegotiationFailed, `Version negotiation probe failed: ${describeError3(error42)}`, { cause: error42 })
+    error: new SdkError(SdkErrorCode.EraNegotiationFailed, `Version negotiation probe failed: ${describeError3(error42)}`, { cause: error42 }, { cause: error42 })
   };
 }
 __name(classifyNetworkError, "classifyNetworkError");
@@ -128735,7 +128900,7 @@ var Client2 = class extends Protocol2 {
     }, options2);
     const hit = await this._serveFromCache("prompts/list", void 0, options2);
     if (hit !== void 0) return hit;
-    return this._listAllPages("prompts/list", params, options2, (acc, page) => acc.prompts.push(...page.prompts));
+    return this._listAllPages("prompts/list", params, options2, (r) => r.prompts);
   }
   /**
   * Lists available resources.
@@ -128774,7 +128939,7 @@ var Client2 = class extends Protocol2 {
     }, options2);
     const hit = await this._serveFromCache("resources/list", void 0, options2);
     if (hit !== void 0) return hit;
-    return this._listAllPages("resources/list", params, options2, (acc, page) => acc.resources.push(...page.resources));
+    return this._listAllPages("resources/list", params, options2, (r) => r.resources);
   }
   /**
   * Lists available resource URI templates for dynamic resources.
@@ -128799,7 +128964,7 @@ var Client2 = class extends Protocol2 {
     }, options2);
     const hit = await this._serveFromCache("resources/templates/list", void 0, options2);
     if (hit !== void 0) return hit;
-    return this._listAllPages("resources/templates/list", params, options2, (acc, page) => acc.resourceTemplates.push(...page.resourceTemplates));
+    return this._listAllPages("resources/templates/list", params, options2, (r) => r.resourceTemplates);
   }
   /**
   * Walk every page of a paginated list verb, aggregate, and write ONE
@@ -128807,8 +128972,7 @@ var Client2 = class extends Protocol2 {
   * methods' no-`cursor` auto-aggregate path. Page 1's result object is
   * mutated in place (its items array is extended; `nextCursor` is
   * cleared); page-1 metadata (`ttlMs`, `cacheScope`, `_meta`) is preserved.
-  * A `nextCursor` that repeats stops the walk (defence against a
-  * non-converging server, mcp.d's `drainList` guard);
+  * A page with the same items and `nextCursor` as the previous page ends the walk;
   * {@linkcode ClientOptions.listMaxPages} is a hard cap — hitting it
   * throws, so a partial aggregate is never cached. The
   * captured-generation guard skips the write when a `list_changed` landed
@@ -128823,7 +128987,7 @@ var Client2 = class extends Protocol2 {
   * trace context) supplied to the public `list*()` reaches every wire
   * request the walk issues.
   */
-  async _listAllPages(method, baseParams, options2, append, finalize3) {
+  async _listAllPages(method, baseParams, options2, items, finalize3) {
     const bypass = options2?.cacheMode === "bypass";
     const generation = this._cache.captureGeneration(method);
     const acc = await this.request({
@@ -128831,14 +128995,13 @@ var Client2 = class extends Protocol2 {
       ...baseParams && { params: { ...baseParams } }
     }, options2);
     let cursor = acc.nextCursor;
-    const seen2 = /* @__PURE__ */ new Set();
+    let previous = acc;
     let pages = 1;
-    while (cursor !== void 0 && !seen2.has(cursor)) {
+    while (cursor !== void 0) {
       if (this._listMaxPages !== 0 && pages >= this._listMaxPages) throw new SdkError(SdkErrorCode.ListPaginationExceeded, `${method}: exceeded listMaxPages (${this._listMaxPages}); server pagination did not terminate`, {
         method,
         listMaxPages: this._listMaxPages
       });
-      seen2.add(cursor);
       const page = await this.request({
         method,
         params: {
@@ -128846,7 +129009,9 @@ var Client2 = class extends Protocol2 {
           cursor
         }
       }, options2);
-      append(acc, page);
+      if (page.nextCursor === cursor && JSON.stringify(items(page)) === JSON.stringify(items(previous))) break;
+      items(acc).push(...items(page));
+      previous = page;
       cursor = page.nextCursor;
       pages++;
     }
@@ -129110,19 +129275,22 @@ var Client2 = class extends Protocol2 {
         notifications: filter
       }
     };
+    const routeSendFailure = /* @__PURE__ */ __name((error42) => {
+      settle({
+        cause: "remote",
+        error: error42 instanceof Error ? error42 : new Error(String(error42))
+      });
+    }, "routeSendFailure");
     try {
-      await this.transport.send(jsonrpcRequest, {
+      this.transport.send(jsonrpcRequest, {
         requestSignal: requestAbort.signal,
         onRequestStreamEnd: /* @__PURE__ */ __name(() => settle({
           cause: "remote",
           error: /* @__PURE__ */ new Error("subscriptions/listen: stream ended")
         }), "onRequestStreamEnd")
-      });
+      }).catch(routeSendFailure);
     } catch (error42) {
-      settle({
-        cause: "remote",
-        error: error42 instanceof Error ? error42 : new Error(String(error42))
-      });
+      routeSendFailure(error42);
     }
     return {
       honoredFilter: await opening,
@@ -129374,7 +129542,7 @@ var Client2 = class extends Protocol2 {
     }
     const hit = await this._serveFromCache("tools/list", void 0, options2);
     if (hit !== void 0) return hit;
-    return this._listAllPages("tools/list", params, options2, (acc, page) => acc.tools.push(...page.tools), (acc) => this._excludeInvalidXMcpHeaderTools(acc));
+    return this._listAllPages("tools/list", params, options2, (r) => r.tools, (acc) => this._excludeInvalidXMcpHeaderTools(acc));
   }
   /**
   * SEP-2243 (protocol revision 2026-07-28): a Streamable HTTP client MUST
@@ -129445,6 +129613,65 @@ var Client2 = class extends Protocol2 {
     return this.notification({ method: "notifications/roots/list_changed" });
   }
 };
+function hasDpopChallenge(wwwAuthenticate) {
+  return /(?:^|,)\s*dpop(?:\s|$|,)/i.test(wwwAuthenticate);
+}
+__name(hasDpopChallenge, "hasDpopChallenge");
+function isDpopNonceChallenge(response) {
+  if (response.status !== 401) return false;
+  const wwwAuthenticate = response.headers.get("www-authenticate") ?? "";
+  return hasDpopChallenge(wwwAuthenticate) && /use_dpop_nonce/i.test(wwwAuthenticate);
+}
+__name(isDpopNonceChallenge, "isDpopNonceChallenge");
+var withDpop = /* @__PURE__ */ __name((session, getToken) => (next) => {
+  const resolveSession = typeof session === "function" ? session : () => session;
+  return async (input, init) => {
+    const method = (init?.method ?? "GET").toUpperCase();
+    const url4 = new URL(input.toString());
+    const activeSession = await resolveSession();
+    if (!activeSession) return next(input, init);
+    const makeRequest = /* @__PURE__ */ __name(async () => {
+      const accessToken = await getToken();
+      if (!accessToken) return next(input, init);
+      const headers = new Headers(init?.headers);
+      const proof = await activeSession.buildProof({
+        htm: method,
+        htu: url4,
+        accessToken
+      });
+      headers.set("Authorization", `DPoP ${accessToken}`);
+      headers.set("DPoP", proof);
+      return next(input, {
+        ...init,
+        headers
+      });
+    }, "makeRequest");
+    let response = await makeRequest();
+    if (isDpopNonceChallenge(response) && response.headers.has("dpop-nonce")) {
+      activeSession.observeNonce(response, url4);
+      await response.text?.().catch(() => {
+      });
+      response = await makeRequest();
+    }
+    activeSession.observeNonce(response, url4);
+    return response;
+  };
+}, "withDpop");
+var withDpopFromProvider = /* @__PURE__ */ __name((provider) => withDpop(async () => {
+  try {
+    return await provider.dpop?.();
+  } catch (error42) {
+    throw markAuthSeamEscape(error42);
+  }
+}, async () => {
+  let tokens;
+  try {
+    tokens = await provider.tokens();
+  } catch (error42) {
+    throw markAuthSeamEscape(error42);
+  }
+  return tokens?.token_type?.toLowerCase() === "dpop" ? tokens.access_token : void 0;
+}), "withDpopFromProvider");
 var SseError = class extends Error {
   static {
     __name(this, "SseError");
@@ -129492,6 +129719,7 @@ var SSEClientTransport = class {
   _skipIssuerMetadataValidation;
   _fetch;
   _fetchWithInit;
+  _dpop;
   _protocolVersion;
   onclose;
   onerror;
@@ -129503,32 +129731,33 @@ var SSEClientTransport = class {
     this._eventSourceInit = opts?.eventSourceInit;
     this._requestInit = opts?.requestInit;
     this._skipIssuerMetadataValidation = opts?.skipIssuerMetadataValidation;
+    this._fetch = opts?.fetch;
     if (isOAuthClientProvider(opts?.authProvider)) {
       this._oauthProvider = opts.authProvider;
       this._authProvider = adaptOAuthProvider(opts.authProvider, { skipIssuerMetadataValidation: opts.skipIssuerMetadataValidation });
+      if (opts.authProvider.dpop) {
+        this._dpop = withDpopFromProvider(opts.authProvider);
+        this._fetch = this._dpop(opts.fetch ?? fetch);
+      }
     } else this._authProvider = opts?.authProvider;
-    this._fetch = opts?.fetch;
     this._fetchWithInit = createFetchWithInit2(opts?.fetch, opts?.requestInit);
   }
   _last401Response;
   async _commonHeaders() {
-    const headers = {};
+    const headers = new Headers(this._requestInit?.headers || void 0);
     let token;
     try {
       token = await this._authProvider?.token();
     } catch (error42) {
       throw markAuthSeamEscape(error42);
     }
-    if (token) headers["Authorization"] = `Bearer ${token}`;
-    if (this._protocolVersion) headers["mcp-protocol-version"] = this._protocolVersion;
-    const extraHeaders = normalizeHeaders2(this._requestInit?.headers);
-    return new Headers({
-      ...headers,
-      ...extraHeaders
-    });
+    if (token) headers.set("Authorization", `Bearer ${token}`);
+    if (this._protocolVersion) headers.set("mcp-protocol-version", this._protocolVersion);
+    return headers;
   }
   _startOrAuth() {
-    const fetchImpl = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
+    const eventSourceFetch = this._eventSourceInit?.fetch;
+    const fetchImpl = eventSourceFetch ? this._dpop?.(eventSourceFetch) ?? eventSourceFetch : this._fetch ?? fetch;
     return new Promise((resolve34, reject) => {
       this._eventSource = new EventSource(this._url.href, {
         ...this._eventSourceInit,
@@ -129698,6 +129927,7 @@ var DEFAULT_STREAMABLE_HTTP_RECONNECTION_OPTIONS2 = {
 };
 var RESERVED_REQUEST_HEADER_NAMES = /* @__PURE__ */ new Set([
   "authorization",
+  "dpop",
   "content-type",
   "mcp-protocol-version",
   "mcp-method",
@@ -129766,11 +129996,12 @@ var StreamableHTTPClientTransport2 = class {
     this._scope = void 0;
     this._requestInit = opts?.requestInit;
     this._skipIssuerMetadataValidation = opts?.skipIssuerMetadataValidation;
+    this._fetch = opts?.fetch;
     if (isOAuthClientProvider(opts?.authProvider)) {
       this._oauthProvider = opts.authProvider;
       this._authProvider = adaptOAuthProvider(opts.authProvider, { skipIssuerMetadataValidation: opts.skipIssuerMetadataValidation });
+      if (opts.authProvider.dpop) this._fetch = withDpopFromProvider(opts.authProvider)(opts.fetch ?? fetch);
     } else this._authProvider = opts?.authProvider;
-    this._fetch = opts?.fetch;
     this._fetchWithInit = createFetchWithInit2(opts?.fetch, opts?.requestInit);
     this._sessionId = opts?.sessionId;
     this._protocolVersion = opts?.protocolVersion;
@@ -129824,21 +130055,17 @@ var StreamableHTTPClientTransport2 = class {
     });
   }
   async _commonHeaders() {
-    const headers = {};
+    const headers = new Headers(this._requestInit?.headers || void 0);
     let token;
     try {
       token = await this._authProvider?.token();
     } catch (error42) {
       throw markAuthSeamEscape(error42);
     }
-    if (token) headers["Authorization"] = `Bearer ${token}`;
-    if (this._sessionId) headers["mcp-session-id"] = this._sessionId;
-    if (this._protocolVersion) headers["mcp-protocol-version"] = this._protocolVersion;
-    const extraHeaders = normalizeHeaders2(this._requestInit?.headers);
-    return new Headers({
-      ...headers,
-      ...extraHeaders
-    });
+    if (token) headers.set("Authorization", `Bearer ${token}`);
+    if (this._sessionId) headers.set("mcp-session-id", this._sessionId);
+    if (this._protocolVersion) headers.set("mcp-protocol-version", this._protocolVersion);
+    return headers;
   }
   /**
   * Body-derived per-request headers: when an outgoing request carries a
@@ -129854,9 +130081,8 @@ var StreamableHTTPClientTransport2 = class {
     if (typeof envelopeVersion !== "string") return;
     headers.set("mcp-protocol-version", envelopeVersion);
     headers.set("mcp-method", message.method);
-    const params = message.params;
-    const nameHeader = message.method === "resources/read" ? typeof params?.uri === "string" ? params.uri : void 0 : typeof params?.name === "string" ? params.name : void 0;
-    if (nameHeader !== void 0) headers.set("mcp-name", encodeMcpParamValue(nameHeader));
+    const source = mcpNameSource(message.method, message.params);
+    if (source?.value !== void 0) headers.set("mcp-name", encodeMcpParamValue(source.value));
   }
   /**
   * `true` when the outbound message is a single request carrying a
@@ -130278,17 +130504,23 @@ import process7 from "node:process";
 import { PassThrough as PassThrough2 } from "node:stream";
 var DEFAULT_INHERITED_ENV_VARS2 = process7.platform === "win32" ? [
   "APPDATA",
+  "COMSPEC",
   "HOMEDRIVE",
   "HOMEPATH",
   "LOCALAPPDATA",
   "PATH",
+  "PATHEXT",
   "PROCESSOR_ARCHITECTURE",
+  "PROGRAMDATA",
+  "PROGRAMFILES",
+  "PROGRAMFILES(X86)",
+  "PROGRAMW6432",
   "SYSTEMDRIVE",
   "SYSTEMROOT",
   "TEMP",
   "USERNAME",
   "USERPROFILE",
-  "PROGRAMFILES"
+  "WINDIR"
 ] : [
   "HOME",
   "LOGNAME",
@@ -151809,18 +152041,29 @@ var generatedConfigKeyAllowances = [
   [/credential(..+)?.helper/, "allowUnsafeCredentialHelper"],
   [/diff(..+)?.command/, "allowUnsafeDiffExternal"],
   [/diff.external/, "allowUnsafeDiffExternal"],
+  [/difftool(..+)?.cmd/, "allowUnsafeDiffExternal"],
   [/diff(..+)?.textconv/, "allowUnsafeDiffTextConv"],
   [/filter(..+)?.clean/, "allowUnsafeFilter"],
+  [/filter(..+)?.process/, "allowUnsafeFilter"],
   [/filter(..+)?.smudge/, "allowUnsafeFilter"],
   [/gpg(..+)?.program/, "allowUnsafeGpgProgram"],
+  [/include.path/, "allowUnsafeInclude"],
+  [/includeif/, "allowUnsafeInclude"],
   [/init.templatedir/, "allowUnsafeTemplateDir"],
+  [/pager(..+)?./, "allowUnsafePager"],
   [/merge(..+)?.driver/, "allowUnsafeMergeDriver"],
   [/mergetool(..+)?.path/, "allowUnsafeMergeDriver"],
   [/mergetool(..+)?.cmd/, "allowUnsafeMergeDriver"],
   [/protocol(..+)?.allow/, "allowUnsafeProtocolOverride"],
   [/remote(..+)?.receivepack/, "allowUnsafePack"],
   [/remote(..+)?.uploadpack/, "allowUnsafePack"],
-  [/sequence.editor/, "allowUnsafeEditor"]
+  [/uploadpack.packobjectshook/, "allowUnsafePack"],
+  [/sequence.editor/, "allowUnsafeEditor"],
+  [/submodule(..+)?.update/, "allowUnsafeSubmodule"],
+  [/tar(..+)?.command/, "allowUnsafeCommandBinaries"],
+  [/trailer(..+)?.cmd/, "allowUnsafeCommandBinaries"],
+  [/trailer(..+)?.command/, "allowUnsafeCommandBinaries"],
+  [/url(..+)?.insteadof/, "allowUnsafeUrlRewrite"]
 ];
 function allowGeneratedConfigKeyFalsePositives(unsafe, key) {
   const normalizedKey = key.toLowerCase().trim();
@@ -151852,7 +152095,14 @@ function createExtensionGitClient(simpleGit, {
   const git = simpleGit(baseDir, {
     ...signal ? { abort: signal } : {},
     ...hasNetworkConfig ? { config: networkConfig } : {},
-    ...restrictEnvironment || hasNetworkConfig ? { unsafe } : {}
+    ...restrictEnvironment || hasNetworkConfig ? { unsafe } : {},
+    ...restrictEnvironment ? {
+      allowEnvironment: [
+        "GIT_CONFIG_NOSYSTEM",
+        "GIT_CONFIG_GLOBAL",
+        ...authentication ? ["GIT_CONFIG_COUNT", "GIT_CONFIG_KEY_0", "GIT_CONFIG_VALUE_0"] : []
+      ]
+    } : {}
   });
   if (!restrictEnvironment) return git;
   const environment = {
@@ -171224,7 +171474,7 @@ var Config = class _Config {
     await this.proxyDispatcherReady;
     options2?.signal?.throwIfAborted();
     if (this.isOmniEnabled()) {
-      const { normalizeDedicatedOmniUploadConfig } = await import("./upload-config-2NB472QI.js");
+      const { normalizeDedicatedOmniUploadConfig } = await import("./upload-config-EALPYJRO.js");
       this.omniUploadConfig = normalizeDedicatedOmniUploadConfig({
         baseUrl: this.omniUploadBaseUrl,
         apiKeyEnv: this.omniUploadApiKeyEnv,
@@ -175124,7 +175374,7 @@ var Config = class _Config {
     return this.omniPolicyTools;
   }
   async loadOmniMediaReader() {
-    return import("./omni-TBNGAJHP.js");
+    return import("./omni-RULYOVJP.js");
   }
   /** Normalized `omni.processing` view. Undefined until tool warmup
    * completes (or when omni is disabled). */
@@ -176700,7 +176950,7 @@ var Config = class _Config {
   async registerWorkflowTool(registry4) {
     if (registry4.getAllToolNames().includes(ToolNames.WORKFLOW)) return true;
     await this.registerLazyTool(registry4, ToolNames.WORKFLOW, async () => {
-      const { WorkflowTool } = await import("./workflow-L2WL3ZDX.js");
+      const { WorkflowTool } = await import("./workflow-WUNSCM5D.js");
       return new WorkflowTool(this);
     });
     return registry4.getAllToolNames().includes(ToolNames.WORKFLOW);
@@ -176722,7 +176972,7 @@ var Config = class _Config {
     }
     if (status === "disabled") return;
     const factory = /* @__PURE__ */ __name(async () => {
-      const { ImageGenTool } = await import("./image-gen-72F4XQEU.js");
+      const { ImageGenTool } = await import("./image-gen-GRJ73O3N.js");
       return new ImageGenTool(this);
     }, "factory");
     if (status === "deferred") {
@@ -176749,7 +176999,7 @@ var Config = class _Config {
       return;
     }
     const factory = /* @__PURE__ */ __name(async () => {
-      const { RecordSourceTool } = await import("./record-source-PHBQTGL4.js");
+      const { RecordSourceTool } = await import("./record-source-ANENC5K7.js");
       return new RecordSourceTool(this);
     }, "factory");
     if (status === "deferred") {
@@ -176780,16 +177030,16 @@ var Config = class _Config {
     const registerGoalWorkerTools = /* @__PURE__ */ __name(async () => {
       if (options2?.forSubAgent) return;
       await registerLazy(ToolNames.GET_GOAL, async () => {
-        const { GetGoalTool: GetGoalTool2 } = await import("./goal-tools-AGBJACM2.js");
+        const { GetGoalTool: GetGoalTool2 } = await import("./goal-tools-CDMDPDOI.js");
         return new GetGoalTool2(this);
       });
       await registerLazy(ToolNames.UPDATE_GOAL, async () => {
-        const { UpdateGoalTool: UpdateGoalTool2 } = await import("./goal-tools-AGBJACM2.js");
+        const { UpdateGoalTool: UpdateGoalTool2 } = await import("./goal-tools-CDMDPDOI.js");
         return new UpdateGoalTool2(this);
       });
       if (this.getModelProposedGoals() !== "disabled" && (resolveInteractionMode(this) === "interactive" || this.goalProposalHostSupported)) {
         await registerLazy(ToolNames.PROPOSE_GOAL, async () => {
-          const { ProposeGoalTool: ProposeGoalTool2 } = await import("./goal-tools-AGBJACM2.js");
+          const { ProposeGoalTool: ProposeGoalTool2 } = await import("./goal-tools-CDMDPDOI.js");
           return new ProposeGoalTool2(this);
         });
       }
@@ -176809,16 +177059,16 @@ var Config = class _Config {
         });
       }
       await registerLazy(ToolNames.WEB_FETCH, async () => {
-        const { WebFetchTool } = await import("./web-fetch-HMJ5ZCBP.js");
+        const { WebFetchTool } = await import("./web-fetch-B4MFZK5W.js");
         return new WebFetchTool(this);
       });
       const hasExplicitWebSearchBackend = !!this.webSearchSettings?.model?.trim() || !!this.webSearchSettings?.baseUrl;
       if (!this.getBareMode() && !this.isSafeMode() && this.webSearchSettings?.enabled !== false && (this.webSearchSettings?.enabled === true || !hasExplicitWebSearchBackend)) {
-        const { evaluateWebSearchGate } = await import("./web-search-7JL754Q6.js");
+        const { evaluateWebSearchGate } = await import("./web-search-R3JBN6A5.js");
         const gate = evaluateWebSearchGate(this);
         if (gate.ok) {
           await registerLazy(ToolNames.WEB_SEARCH, async () => {
-            const { WebSearchTool } = await import("./web-search-7JL754Q6.js");
+            const { WebSearchTool } = await import("./web-search-R3JBN6A5.js");
             return new WebSearchTool(this);
           });
         } else if (!gate.silent && !this.webSearchNoticeEmitted && !options2?.forSubAgent) {
@@ -176835,8 +177085,8 @@ var Config = class _Config {
         );
       }
       const [{ createExecutionTools }, { wrapExecutionTool }] = await Promise.all([
-        import("./local-execution-environment-T3BRDBZD.js"),
-        import("./execution-tool-E56GOUSU.js")
+        import("./local-execution-environment-HRGLGYYE.js"),
+        import("./execution-tool-SZ4AURPN.js")
       ]);
       for (const [name, tool] of createExecutionTools(this)) {
         if (environment.toolNames && !environment.toolNames.has(name)) continue;
@@ -176847,11 +177097,11 @@ var Config = class _Config {
         );
       }
       await registerLazy(ToolNames.TOOL_CALL, async () => {
-        const { ToolCallTool } = await import("./tool-call-7HZFNB7J.js");
+        const { ToolCallTool } = await import("./tool-call-GVZHLCX6.js");
         return new ToolCallTool(registry4);
       });
       await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-        const { ToolSearchTool } = await import("./tool-search-YFKQ6DHN.js");
+        const { ToolSearchTool } = await import("./tool-search-MCB74V2Z.js");
         return new ToolSearchTool(this);
       });
       if (this.executionEnvironment && !options2?.forSubAgent) {
@@ -176863,7 +177113,7 @@ var Config = class _Config {
     }
     if (this.shellExecutionSandbox) {
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-WXVQNSMT.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-BUXOKE4X.js");
         return new ShellTool2(this);
       });
       await registerLazy(ToolNames.TASK_STOP, async () => {
@@ -176871,27 +177121,27 @@ var Config = class _Config {
         return new TaskStopTool(this);
       });
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-E57BEGBG.js");
+        const { ReadFileTool } = await import("./read-file-G4G5LOGO.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.WRITE_FILE, async () => {
-        const { WriteFileTool } = await import("./write-file-IRIAC5H3.js");
+        const { WriteFileTool } = await import("./write-file-6FNRAYPO.js");
         return new WriteFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-NWFXC7XD.js");
+        const { EditTool } = await import("./edit-XEHFRLTK.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.MONITOR, async () => {
-        const { MonitorTool } = await import("./monitor-YVEEBOJ2.js");
+        const { MonitorTool } = await import("./monitor-YAWMJU7P.js");
         return new MonitorTool(this);
       });
       await registerLazy(ToolNames.AGENT, async () => {
-        const { AgentTool: AgentTool2 } = await import("./agent-4PIKN4KJ.js");
+        const { AgentTool: AgentTool2 } = await import("./agent-RU7E6G34.js");
         return new AgentTool2(this);
       });
       await registerLazy(ToolNames.GLOB, async () => {
-        const { GlobTool } = await import("./glob-EVTXD6VF.js");
+        const { GlobTool } = await import("./glob-WJQOKIRP.js");
         return new GlobTool(this);
       });
       await registerLazy(ToolNames.LS, async () => {
@@ -176910,19 +177160,19 @@ var Config = class _Config {
     }
     if (this.getBareMode()) {
       await registerLazy(ToolNames.READ_FILE, async () => {
-        const { ReadFileTool } = await import("./read-file-E57BEGBG.js");
+        const { ReadFileTool } = await import("./read-file-G4G5LOGO.js");
         return new ReadFileTool(this);
       });
       await registerLazy(ToolNames.EDIT, async () => {
-        const { EditTool } = await import("./edit-NWFXC7XD.js");
+        const { EditTool } = await import("./edit-XEHFRLTK.js");
         return new EditTool(this);
       });
       await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-        const { NotebookEditTool } = await import("./notebook-edit-RKCHUGBX.js");
+        const { NotebookEditTool } = await import("./notebook-edit-FTYD3OR2.js");
         return new NotebookEditTool(this);
       });
       await registerLazy(ToolNames.SHELL, async () => {
-        const { ShellTool: ShellTool2 } = await import("./shell-WXVQNSMT.js");
+        const { ShellTool: ShellTool2 } = await import("./shell-BUXOKE4X.js");
         return new ShellTool2(this);
       });
       await registerGoalWorkerTools();
@@ -176937,11 +177187,11 @@ var Config = class _Config {
     await registerExecIfEnabled();
     await registerGoalWorkerTools();
     await registerLazy(ToolNames.TOOL_CALL, async () => {
-      const { ToolCallTool } = await import("./tool-call-7HZFNB7J.js");
+      const { ToolCallTool } = await import("./tool-call-GVZHLCX6.js");
       return new ToolCallTool(registry4);
     });
     await registerLazy(ToolNames.TOOL_SEARCH, async () => {
-      const { ToolSearchTool } = await import("./tool-search-YFKQ6DHN.js");
+      const { ToolSearchTool } = await import("./tool-search-MCB74V2Z.js");
       return new ToolSearchTool(this);
     });
     await registerLazy(ToolNames.READ_MCP_RESOURCE, async () => {
@@ -176949,7 +177199,7 @@ var Config = class _Config {
       return new ReadMcpResourceTool(this);
     });
     await registerLazy(ToolNames.AGENT, async () => {
-      const { AgentTool: AgentTool2 } = await import("./agent-4PIKN4KJ.js");
+      const { AgentTool: AgentTool2 } = await import("./agent-RU7E6G34.js");
       return new AgentTool2(this);
     });
     await registerLazy(ToolNames.LIST_AGENTS, async () => {
@@ -176961,11 +177211,11 @@ var Config = class _Config {
       return new TaskStopTool(this);
     });
     await registerLazy(ToolNames.SEND_MESSAGE, async () => {
-      const { SendMessageTool } = await import("./send-message-NATKTKQZ.js");
+      const { SendMessageTool } = await import("./send-message-QOWWQKZJ.js");
       return new SendMessageTool(this);
     });
     await registerLazy(ToolNames.SKILL, async () => {
-      const { SkillTool } = await import("./skill-AMXJBJ77.js");
+      const { SkillTool } = await import("./skill-Y4TKTJS7.js");
       return new SkillTool(this);
     });
     if (this.isLsToolEnabled()) {
@@ -176975,11 +177225,11 @@ var Config = class _Config {
       });
     }
     await registerLazy(ToolNames.READ_FILE, async () => {
-      const { ReadFileTool } = await import("./read-file-E57BEGBG.js");
+      const { ReadFileTool } = await import("./read-file-G4G5LOGO.js");
       return new ReadFileTool(this);
     });
     await registerLazy(ToolNames.ZOOM_IMAGE, async () => {
-      const { ZoomImageTool } = await import("./zoom-image-I26GRMX4.js");
+      const { ZoomImageTool } = await import("./zoom-image-UOWJTYWI.js");
       return new ZoomImageTool(this);
     });
     if (this.getUseRipgrep()) {
@@ -176994,7 +177244,7 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       if (useRipgrep) {
         await registerLazy(ToolNames.GREP, async () => {
-          const { RipGrepTool } = await import("./ripGrep-EX2NI7O3.js");
+          const { RipGrepTool } = await import("./ripGrep-2MEBBDSU.js");
           return new RipGrepTool(this);
         });
       } else {
@@ -177007,7 +177257,7 @@ var Config = class _Config {
           )
         );
         await registerLazy(ToolNames.GREP, async () => {
-          const { GrepTool } = await import("./grep-ENZEP6KL.js");
+          const { GrepTool } = await import("./grep-VO76ZOXG.js");
           return new GrepTool(this);
         });
       }
@@ -177015,28 +177265,28 @@ var Config = class _Config {
       recordStartupEvent("config_initialize_ripgrep_probe_start");
       recordStartupEvent("config_initialize_ripgrep_probe_end");
       await registerLazy(ToolNames.GREP, async () => {
-        const { GrepTool } = await import("./grep-ENZEP6KL.js");
+        const { GrepTool } = await import("./grep-VO76ZOXG.js");
         return new GrepTool(this);
       });
     }
     await registerLazy(ToolNames.GLOB, async () => {
-      const { GlobTool } = await import("./glob-EVTXD6VF.js");
+      const { GlobTool } = await import("./glob-WJQOKIRP.js");
       return new GlobTool(this);
     });
     await registerLazy(ToolNames.EDIT, async () => {
-      const { EditTool } = await import("./edit-NWFXC7XD.js");
+      const { EditTool } = await import("./edit-XEHFRLTK.js");
       return new EditTool(this);
     });
     await registerLazy(ToolNames.NOTEBOOK_EDIT, async () => {
-      const { NotebookEditTool } = await import("./notebook-edit-RKCHUGBX.js");
+      const { NotebookEditTool } = await import("./notebook-edit-FTYD3OR2.js");
       return new NotebookEditTool(this);
     });
     await registerLazy(ToolNames.WRITE_FILE, async () => {
-      const { WriteFileTool } = await import("./write-file-IRIAC5H3.js");
+      const { WriteFileTool } = await import("./write-file-6FNRAYPO.js");
       return new WriteFileTool(this);
     });
     await registerLazy(ToolNames.SHELL, async () => {
-      const { ShellTool: ShellTool2 } = await import("./shell-WXVQNSMT.js");
+      const { ShellTool: ShellTool2 } = await import("./shell-BUXOKE4X.js");
       return new ShellTool2(this);
     });
     await registerLazy(ToolNames.REPORT_FINDINGS, async () => {
@@ -177052,22 +177302,22 @@ var Config = class _Config {
     }
     if (!this.sdkMode && (supportsUserInteraction || options2?.forSubAgent)) {
       await registerLazy(ToolNames.EXIT_PLAN_MODE, async () => {
-        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-KGJAK2Y4.js");
+        const { ExitPlanModeTool: ExitPlanModeTool2 } = await import("./exitPlanMode-PAZMVUS6.js");
         return new ExitPlanModeTool2(this);
       });
     }
     if (!this.sdkMode && supportsUserInteraction) {
       await registerLazy(ToolNames.ENTER_PLAN_MODE, async () => {
-        const { EnterPlanModeTool } = await import("./enterPlanMode-QDDMKHKN.js");
+        const { EnterPlanModeTool } = await import("./enterPlanMode-TJNAVH6W.js");
         return new EnterPlanModeTool(this);
       });
     }
     await registerLazy(ToolNames.ENTER_WORKTREE, async () => {
-      const { EnterWorktreeTool } = await import("./enter-worktree-53CUMISV.js");
+      const { EnterWorktreeTool } = await import("./enter-worktree-A2WD27HQ.js");
       return new EnterWorktreeTool(this);
     });
     await registerLazy(ToolNames.EXIT_WORKTREE, async () => {
-      const { ExitWorktreeTool } = await import("./exit-worktree-CZUYCPZ3.js");
+      const { ExitWorktreeTool } = await import("./exit-worktree-S7KUQ4HO.js");
       return new ExitWorktreeTool(this);
     });
     if (resolveInteractionMode(this) === "interactive" && !this.sdkMode && !this.getScreenReader() && !options2?.forSubAgent) {
@@ -177125,33 +177375,33 @@ var Config = class _Config {
     }
     if (this.isAgentTeamEnabled()) {
       await registerLazy(ToolNames.TEAM_CREATE, async () => {
-        const { TeamCreateTool } = await import("./team-create-YTQ2D6AQ.js");
+        const { TeamCreateTool } = await import("./team-create-2M2ZEJK3.js");
         return new TeamCreateTool(this);
       });
       await registerLazy(ToolNames.TEAM_DELETE, async () => {
-        const { TeamDeleteTool } = await import("./team-delete-6T2NMHDV.js");
+        const { TeamDeleteTool } = await import("./team-delete-WBSKRFVF.js");
         return new TeamDeleteTool(this);
       });
       await registerLazy(ToolNames.TEAM_PLAN_APPROVAL, async () => {
-        const { TeamPlanApprovalTool } = await import("./team-plan-approval-5I5VH4DM.js");
+        const { TeamPlanApprovalTool } = await import("./team-plan-approval-AHSBAARB.js");
         return new TeamPlanApprovalTool(this);
       });
       if (!options2?.forSubAgent) {
         await registerLazy(ToolNames.REQUEST_SHUTDOWN, async () => {
-          const { RequestShutdownTool } = await import("./request-shutdown-OMWHNC3R.js");
+          const { RequestShutdownTool } = await import("./request-shutdown-LRWCJOEG.js");
           return new RequestShutdownTool(this);
         });
       }
       await registerLazy(ToolNames.TASK_CREATE, async () => {
-        const { TaskCreateTool } = await import("./task-create-A3FAT34J.js");
+        const { TaskCreateTool } = await import("./task-create-2BHPJUF3.js");
         return new TaskCreateTool(this);
       });
       await registerLazy(ToolNames.TASK_UPDATE, async () => {
-        const { TaskUpdateTool } = await import("./task-update-BE27HYCU.js");
+        const { TaskUpdateTool } = await import("./task-update-NGKKBFU5.js");
         return new TaskUpdateTool(this);
       });
       await registerLazy(ToolNames.TASK_LIST, async () => {
-        const { TaskListTool } = await import("./task-list-FGRDSMJZ.js");
+        const { TaskListTool } = await import("./task-list-6LPOL5UB.js");
         return new TaskListTool(this);
       });
     }
@@ -177229,7 +177479,7 @@ var Config = class _Config {
       }
     }
     await registerLazy(ToolNames.MONITOR, async () => {
-      const { MonitorTool } = await import("./monitor-YVEEBOJ2.js");
+      const { MonitorTool } = await import("./monitor-YAWMJU7P.js");
       return new MonitorTool(this);
     });
     if (this.pendingMcpBudgetCallback) {
@@ -178487,7 +178737,7 @@ export {
  */
 /*! Bundled license information:
 
-@modelcontextprotocol/client/dist/src-D_zzAWoS.mjs:
+@modelcontextprotocol/client/dist/src-xKF0PJN-.mjs:
   (*!
   * content-type
   * Copyright(c) 2015 Douglas Christopher Wilson