@frontmcp/sdk 1.8.3 → 1.8.5

package/esm/index.mjs

@@ -110,7 +110,7 @@ function extractPublicMessageImpl(error, visited) {
   }
   return error == null ? "Unknown error" : String(error);
 }
-var MCP_ERROR_CODES, McpError, PublicMcpError, InternalMcpError, ToolNotFoundError, ToolNotConsentedError, EntryUnavailableError, ResourceNotFoundError, ResourceReadError, InvalidResourceUriError, InvalidInputError, InvalidOutputError, InvalidMethodError, PayloadTooLargeError, ToolExecutionError, RateLimitError, QuotaExceededError, UnauthorizedError, GenericServerError, DependencyNotFoundError, InvalidHookFlowError, InvalidPluginScopeError, RequestContextNotAvailableError, AuthConfigurationError, PromptNotFoundError, PromptExecutionError, SessionMissingError, UnsupportedClientVersionError, GlobalConfigNotFoundError, AuthorityDeniedMcpError, GuardLimitMcpError;
+var MCP_ERROR_CODES, sequentialErrorIds, McpError, PublicMcpError, InternalMcpError, ToolNotFoundError, ToolNotConsentedError, EntryUnavailableError, ResourceNotFoundError, ResourceReadError, InvalidResourceUriError, InvalidInputError, InvalidOutputError, InvalidMethodError, PayloadTooLargeError, ToolExecutionError, RateLimitError, QuotaExceededError, UnauthorizedError, GenericServerError, DependencyNotFoundError, InvalidHookFlowError, InvalidPluginScopeError, RequestContextNotAvailableError, AuthConfigurationError, PromptNotFoundError, PromptExecutionError, SessionMissingError, UnsupportedClientVersionError, GlobalConfigNotFoundError, AuthorityDeniedMcpError, GuardLimitMcpError;
 var init_mcp_error = __esm({
   "libs/sdk/src/errors/mcp.error.ts"() {
     "use strict";
@@ -132,6 +132,7 @@ var init_mcp_error = __esm({
       /** Parse error (-32700) */
       PARSE_ERROR: -32700
     };
+    sequentialErrorIds = 0;
     McpError = class extends Error {
       /**
        * Unique error ID for tracking in logs
@@ -144,7 +145,12 @@ var init_mcp_error = __esm({
         Error.captureStackTrace(this, this.constructor);
       }
       generateErrorId() {
-        return `err_${bytesToHex(randomBytes(8))}`;
+        try {
+          return `err_${bytesToHex(randomBytes(8))}`;
+        } catch {
+          sequentialErrorIds += 1;
+          return `err_${sequentialErrorIds.toString(16).padStart(16, "0")}`;
+        }
       }
       /**
        * Get the internal error message (for logging)
@@ -865,7 +871,8 @@ var init_plugin_tokens = __esm({
       skills: tokenFactory.meta("skills"),
       scope: tokenFactory.meta("scope"),
       contextExtensions: tokenFactory.meta("contextExtensions"),
-      enforcesMetadata: tokenFactory.meta("enforcesMetadata")
+      enforcesMetadata: tokenFactory.meta("enforcesMetadata"),
+      dynamicSkills: tokenFactory.meta("dynamicSkills")
     };
   }
 });
@@ -3436,7 +3443,8 @@ var init_plugin_metadata = __esm({
       skills: z30.array(annotatedFrontMcpSkillsSchema).optional(),
       scope: z30.enum(["app", "server"]).optional().default("app"),
       contextExtensions: z30.array(contextExtensionSchema).optional(),
-      enforcesMetadata: z30.array(z30.string().min(1)).optional()
+      enforcesMetadata: z30.array(z30.string().min(1)).optional(),
+      dynamicSkills: z30.boolean().optional()
     }).passthrough();
   }
 });
@@ -4571,6 +4579,25 @@ var init_tool_credentials_required_error = __esm({
   }
 });
 
+// libs/sdk/src/errors/session-identity-required.error.ts
+var SessionIdentityRequiredError;
+var init_session_identity_required_error = __esm({
+  "libs/sdk/src/errors/session-identity-required.error.ts"() {
+    "use strict";
+    init_mcp_error();
+    SessionIdentityRequiredError = class extends PublicMcpError {
+      mcpErrorCode = MCP_ERROR_CODES.FORBIDDEN;
+      constructor(what = "Session-scoped storage") {
+        super(
+          `${what} needs a verified session or a signed-in caller. Authenticate the request, or use a session transport (an MCP revision before 2026-07-28).`,
+          "SESSION_IDENTITY_REQUIRED",
+          403
+        );
+      }
+    };
+  }
+});
+
 // libs/sdk/src/errors/error-handler.ts
 import { isProduction as isProduction2 } from "@frontmcp/utils";
 function createErrorHandler(options = {}) {
@@ -5932,6 +5959,7 @@ __export(errors_exports, {
   ServerlessHandlerNotInitializedError: () => ServerlessHandlerNotInitializedError,
   SessionClaimConflictError: () => SessionClaimConflictError,
   SessionIdEmptyError: () => SessionIdEmptyError,
+  SessionIdentityRequiredError: () => SessionIdentityRequiredError,
   SessionMissingError: () => SessionMissingError,
   SessionSecretRequiredError: () => SessionSecretRequiredError,
   SessionVerificationFailedError: () => SessionVerificationFailedError,
@@ -5986,6 +6014,7 @@ var init_errors = __esm({
     init_mcp_error();
     init_authorization_required_error();
     init_tool_credentials_required_error();
+    init_session_identity_required_error();
     init_error_handler();
     init_agent_errors();
     init_task_error();
@@ -6468,30 +6497,30 @@ var require_dist = __commonJS({
       sqliteStorageOptionsSchema: () => sqliteStorageOptionsSchema
     });
     module.exports = __toCommonJS2(index_exports);
-    var import_utils108 = __require("@frontmcp/utils");
+    var import_utils114 = __require("@frontmcp/utils");
     var HKDF_SALT = new TextEncoder().encode("frontmcp-sqlite-storage-v1");
     var HKDF_INFO = new TextEncoder().encode("aes-256-gcm-value-encryption");
     var KEY_LENGTH = 32;
     function deriveEncryptionKey(secret) {
       const ikm = new TextEncoder().encode(secret);
-      return (0, import_utils108.hkdfSha256)(ikm, HKDF_SALT, HKDF_INFO, KEY_LENGTH);
+      return (0, import_utils114.hkdfSha256)(ikm, HKDF_SALT, HKDF_INFO, KEY_LENGTH);
     }
     var SEPARATOR = ":";
     function encryptValue(key, plaintext) {
-      const iv = (0, import_utils108.randomBytes)(12);
+      const iv = (0, import_utils114.randomBytes)(12);
       const plaintextBytes = new TextEncoder().encode(plaintext);
-      const { ciphertext, tag } = (0, import_utils108.encryptAesGcm)(key, plaintextBytes, iv);
-      return [(0, import_utils108.base64urlEncode)(iv), (0, import_utils108.base64urlEncode)(tag), (0, import_utils108.base64urlEncode)(ciphertext)].join(SEPARATOR);
+      const { ciphertext, tag } = (0, import_utils114.encryptAesGcm)(key, plaintextBytes, iv);
+      return [(0, import_utils114.base64urlEncode)(iv), (0, import_utils114.base64urlEncode)(tag), (0, import_utils114.base64urlEncode)(ciphertext)].join(SEPARATOR);
     }
     function decryptValue(key, encrypted) {
       const parts = encrypted.split(SEPARATOR);
       if (parts.length !== 3) {
         throw new Error("Invalid encrypted value format");
       }
-      const iv = (0, import_utils108.base64urlDecode)(parts[0]);
-      const tag = (0, import_utils108.base64urlDecode)(parts[1]);
-      const ciphertext = (0, import_utils108.base64urlDecode)(parts[2]);
-      const plaintext = (0, import_utils108.decryptAesGcm)(key, ciphertext, iv, tag);
+      const iv = (0, import_utils114.base64urlDecode)(parts[0]);
+      const tag = (0, import_utils114.base64urlDecode)(parts[1]);
+      const ciphertext = (0, import_utils114.base64urlDecode)(parts[2]);
+      const plaintext = (0, import_utils114.decryptAesGcm)(key, ciphertext, iv, tag);
       return new TextDecoder().decode(plaintext);
     }
     var import_utils210 = __require("@frontmcp/utils");
@@ -7405,8 +7434,8 @@ function detectStorageType(storage, configuredType) {
   return "memory";
 }
 async function createTaskStore(options = {}) {
-  const { storage: storageConfig, redis, keyPrefix = "mcp:task:", logger, isEdgeRuntime: isEdgeRuntime2 = false, sqlite } = options;
-  if (isEdgeRuntime2 && sqlite) {
+  const { storage: storageConfig, redis, keyPrefix = "mcp:task:", logger, isEdgeRuntime: isEdgeRuntime3 = false, sqlite } = options;
+  if (isEdgeRuntime3 && sqlite) {
     throw new TaskStoreNotSupportedError(
       "SQLite task store is not supported on Edge runtime (better-sqlite3 is a native module). Use Redis or Upstash."
     );
@@ -7461,7 +7490,7 @@ async function createTaskStore(options = {}) {
       "Vercel KV is not supported for task stores (pub/sub required). Use Redis or Upstash."
     );
   }
-  if (isEdgeRuntime2 && (!finalStorageConfig || finalStorageConfig.type === "memory")) {
+  if (isEdgeRuntime3 && (!finalStorageConfig || finalStorageConfig.type === "memory")) {
     throw new TaskStoreNotSupportedError(
       "Tasks require distributed storage on Edge runtime. Configure Redis or Upstash."
     );
@@ -7469,7 +7498,7 @@ async function createTaskStore(options = {}) {
   const storage = await createStorage({
     ...finalStorageConfig,
     prefix: keyPrefix,
-    fallback: isEdgeRuntime2 ? "error" : "memory"
+    fallback: isEdgeRuntime3 ? "error" : "memory"
   });
   const store = new StorageTaskStore(storage, logger);
   const type = detectStorageType(storage, finalStorageConfig?.type);
@@ -7651,8 +7680,9 @@ var init_task_id = __esm({
 });
 
 // libs/sdk/src/task/helpers/task-runner.ts
+import { runRequestExclusive } from "@frontmcp/utils";
 function runTaskInBackground(params) {
-  return Promise.resolve().then(() => executeTask(params));
+  return Promise.resolve().then(() => runRequestExclusive(() => executeTask(params)));
 }
 async function executeTask(params) {
   const { record, cleanedRequestParams, ctx, scope, store, registry, notifier, logger } = params;
@@ -8694,6 +8724,7 @@ var init_get_prompt_request_handler = __esm({
 import {
   ListRootsResultSchema
 } from "@frontmcp/protocol";
+import { awaitOutsideRequest } from "@frontmcp/utils";
 function hasMcpAppsExtension(capabilities) {
   if (!capabilities?.experimental) {
     return false;
@@ -9410,9 +9441,11 @@ var init_notification_service = __esm({
         }
         try {
           this.logger.verbose(`Requesting roots from client for session ${sessionId.slice(0, 20)}...`);
-          const result = await registered.server.request({ method: "roots/list" }, ListRootsResultSchema, {
-            timeout: options?.timeout ?? 3e4
-          });
+          const result = await awaitOutsideRequest(
+            registered.server.request({ method: "roots/list" }, ListRootsResultSchema, {
+              timeout: options?.timeout ?? 3e4
+            })
+          );
           registered.cachedRoots = result.roots;
           registered.rootsFetchedAt = Date.now();
           this.logger.verbose(
@@ -10221,7 +10254,7 @@ function callerSurface(ctx, surface) {
 }
 async function filterServableSkills(scope, skills, ctx, surface) {
   const caller = callerSurface(ctx, surface);
-  const offered = skills.filter((skill) => isOfferedOnSurface(skill.metadata.availableWhen, caller));
+  const offered = skills.filter((skill) => availabilityForCall(skill.metadata.availableWhen, caller) === "available");
   if (offered.length === 0) return [];
   const { skills: servable } = await scope.runFlowForOutput("skills:filter", { skills: [...offered], ctx });
   const servableSkills = new Set(servable);
@@ -10242,7 +10275,33 @@ async function filterDiscoverableSkillResults(scope, registry, results, caller =
     return entry === void 0 || servable.has(entry);
   });
 }
-var SKILLS_HTTP_SURFACE;
+function skillToolsForCaller(loaded, tools, ctx, surface) {
+  const caller = callerSurface(ctx, surface);
+  if (!tools || caller === void 0 || loaded.availableTools.length === 0) return loaded;
+  const availability = new Map(tools.getTools(true).map((tool) => [tool.name, tool.metadata?.availableWhen]));
+  const notOffered = loaded.availableTools.filter((name44) => !isOfferedOnSurface(availability.get(name44), caller));
+  if (notOffered.length === 0) return loaded;
+  return {
+    ...loaded,
+    availableTools: loaded.availableTools.filter((name44) => !notOffered.includes(name44)),
+    missingTools: [...loaded.missingTools, ...notOffered],
+    isComplete: false,
+    warning: warningWithMissingTools(loaded.warning, loaded.skill?.name, notOffered)
+  };
+}
+function warningWithMissingTools(warning, skillName, names) {
+  const prefix = warning?.match(WARNING_PREFIX);
+  if (warning && prefix && warning.endsWith(WARNING_SUFFIX)) {
+    const parts = warning.slice(prefix[0].length, -WARNING_SUFFIX.length).split("; ");
+    const missing = parts.findIndex((part) => part.startsWith(MISSING_PART));
+    if (missing === -1) parts.unshift(`${MISSING_PART}${names.join(", ")}`);
+    else parts[missing] = `${parts[missing]}, ${names.join(", ")}`;
+    return `${prefix[0]}${parts.join("; ")}${WARNING_SUFFIX}`;
+  }
+  const sentence = `Skill "${skillName ?? "skill"}" references ${MISSING_PART}${names.join(", ")}${WARNING_SUFFIX}`;
+  return warning ? `${warning} ${sentence}` : sentence;
+}
+var SKILLS_HTTP_SURFACE, WARNING_PREFIX, WARNING_SUFFIX, MISSING_PART;
 var init_skill_filter_helper = __esm({
   "libs/sdk/src/skill/skill-filter.helper.ts"() {
     "use strict";
@@ -10251,6 +10310,9 @@ var init_skill_filter_helper = __esm({
     init_skill_authorities_helper();
     init_skill_entry_resolver();
     SKILLS_HTTP_SURFACE = "mcp";
+    WARNING_PREFIX = /^Skill "(.*)" references /;
+    WARNING_SUFFIX = ". Some functionality may be limited.";
+    MISSING_PART = "missing tools: ";
   }
 });
 
@@ -10351,7 +10413,13 @@ async function formatSkillsForLlmFull(registry, toolRegistry, visibility = "both
     }
     const loaded = await registry.loadSkill(skill.name);
     if (loaded) {
-      parts.push(formatSkillForLLMWithSchemas(loaded.skill, loaded.availableTools, loaded.missingTools, toolRegistry));
+      const { availableTools, missingTools } = skillToolsForCaller(
+        loaded,
+        toolRegistry,
+        void 0,
+        SKILLS_HTTP_SURFACE
+      );
+      parts.push(formatSkillForLLMWithSchemas(loaded.skill, availableTools, missingTools, toolRegistry));
     }
   }
   return parts.join("\n\n---\n\n");
@@ -10471,6 +10539,7 @@ function skillToApiResponse(skill, loadResult) {
 var init_skill_http_utils = __esm({
   "libs/sdk/src/skill/skill-http.utils.ts"() {
     "use strict";
+    init_skill_filter_helper();
   }
 });
 
@@ -11032,7 +11101,11 @@ function skillsLoadRequestHandler({
             throw toSdkMcpError(err);
           }
         }
-        const { skill, availableTools, missingTools, isComplete, warning } = loadResult;
+        const { skill, availableTools, missingTools, isComplete, warning } = skillToolsForCaller(
+          loadResult,
+          toolRegistry,
+          withMcpSurface(scope, ctx)
+        );
         if (warning) {
           warnings.push(warning);
         }
@@ -11889,7 +11962,8 @@ function createMcpHandlers(options) {
   const hasPromptsOrResources = options.scope?.prompts?.hasAny() || options.scope?.resources?.hasAny();
   const completionHandler = hasPromptsOrResources && options.serverOptions?.capabilities?.completions ? [completeRequestHandler(options)] : [];
   const loggingHandler = options.serverOptions?.capabilities?.logging ? [LoggingSetLevelRequestHandler(options)] : [];
-  const skillsHandler = options.scope?.skills?.hasAny() ? [skillsSearchRequestHandler(options), skillsLoadRequestHandler(options), skillsListRequestHandler(options)] : [];
+  const skillRegistry = options.scope?.skills;
+  const skillsHandler = skillRegistry?.servesSkills?.() ?? skillRegistry?.hasAny() ? [skillsSearchRequestHandler(options), skillsLoadRequestHandler(options), skillsListRequestHandler(options)] : [];
   const tasksHandler = options.serverOptions?.capabilities?.["tasks"] ? [
     tasksGetRequestHandler(options),
     tasksResultRequestHandler(options),
@@ -11944,7 +12018,7 @@ var in_memory_server_exports = {};
 __export(in_memory_server_exports, {
   createInMemoryServer: () => createInMemoryServer
 });
-import { randomUUID as randomUUID4 } from "@frontmcp/utils";
+import { randomUUID as randomUUID4, runRequestExclusive as runRequestExclusive2 } from "@frontmcp/utils";
 async function createInMemoryServer(scope, options) {
   const { InMemoryTransport, McpServer: McpServer2 } = await import("@frontmcp/protocol");
   const { createMcpHandlers: createMcpHandlers2 } = await Promise.resolve().then(() => (init_mcp_handlers(), mcp_handlers_exports));
@@ -11964,7 +12038,7 @@ async function createInMemoryServer(scope, options) {
           sessionId
         }
       };
-      return originalHandler(request, enrichedCtx);
+      return runRequestExclusive2(() => originalHandler(request, enrichedCtx));
     };
     mcpServer.setRequestHandler(handler.requestSchema, wrappedHandler);
   }
@@ -12612,7 +12686,7 @@ var init_connect = __esm({
 });
 
 // libs/sdk/src/direct/direct-server.ts
-import { randomUUID as randomUUID6, sha256Hex } from "@frontmcp/utils";
+import { randomUUID as randomUUID6, runRequestExclusive as runRequestExclusive3, sha256Hex } from "@frontmcp/utils";
 function buildAuthInfo(authContext, defaultSessionId) {
   if (!authContext && !defaultSessionId) {
     return void 0;
@@ -12687,7 +12761,7 @@ var init_direct_server = __esm({
         }
         const ctx = this.buildHandlerContext(options);
         try {
-          return await this.scope.runFlowForOutput(flowName, { request, ctx });
+          return await runRequestExclusive3(() => this.scope.runFlowForOutput(flowName, { request, ctx }));
         } catch (e) {
           if (e instanceof FlowControl && e.type === "respond") {
             return e.output;
@@ -14116,11 +14190,19 @@ var init_frontmcp_context = __esm({
       updateAuthInfo(authInfo) {
         this._authInfo = { ...this._authInfo, ...authInfo };
       }
-      /** `sessionId` when the server verified it; undefined for stateless and per-request placeholder ids. */
+      /**
+       * The session the server verified for this request; undefined for a request without one (MCP
+       * 2026-07-28, the stateless transports, an `mcp-session-id` the server did not accept).
+       *
+       * Over HTTP that is the session session verification recorded (`authInfo.extra.sessionId`),
+       * which it records only for a session the request presented: its `mcp-session-id` header, or the
+       * `?sessionId=` a legacy SSE client posts its messages with. Over an in-process transport (stdio,
+       * `connect()`, `createDirect()`) it is the session the transport runs the request in.
+       */
       get verifiedSessionId() {
-        if (this.sessionId === STATELESS_SESSION_ID) return void 0;
-        const verified = this._authInfo.sessionId ?? this._authInfo.extra?.["sessionId"];
-        return verified === this.sessionId ? this.sessionId : void 0;
+        const recorded = this._authInfo.extra?.["sessionId"];
+        const verified = typeof recorded === "string" && recorded.length > 0 ? recorded : this._authInfo.sessionId === this.sessionId ? this.sessionId : void 0;
+        return verified === STATELESS_SESSION_ID ? void 0 : verified;
       }
       /**
        * The client's self-reported identity, sent with this request (MCP 2026-07-28 `_meta`).
@@ -14572,6 +14654,9 @@ function readPublicUrlPin() {
 function isPublicUrlPinned() {
   return readPublicUrlPin() !== void 0;
 }
+function getPinnedPublicUrl() {
+  return readPublicUrlPin();
+}
 function isProxyTrusted() {
   try {
     if (typeof process !== "undefined" && process.env) {
@@ -15863,6 +15948,9 @@ function registerHookOnClass(ctor, meta) {
 function resolvePendingTC39HooksForClass(ctor) {
   return pendingHookRegistry.resolveForClass(ctor);
 }
+function peekPendingTC39HooksForClass(ctor) {
+  return pendingHookRegistry.resolveForClass(ctor, false);
+}
 function registerPendingTC39Hook(method, meta) {
   pendingHookRegistry.store(method, meta);
 }
@@ -16008,7 +16096,7 @@ var init_elicitation_types = __esm({
 
 // libs/sdk/src/elicitation/helpers/elicit.helper.ts
 import { toJSONSchema, z as z45 } from "@frontmcp/lazy-zod";
-import { randomUUID as randomUUID10 } from "@frontmcp/utils";
+import { awaitOutsideRequest as awaitOutsideRequest2, randomUUID as randomUUID10 } from "@frontmcp/utils";
 async function performElicit(deps, message, requestedSchema, options) {
   const { sessionId, getClientCapabilities, tryGetContext, entryName, entryInput, elicitationEnabled } = deps;
   if (elicitationEnabled !== true) {
@@ -16016,6 +16104,11 @@ async function performElicit(deps, message, requestedSchema, options) {
   }
   const ctx = tryGetContext();
   const mrtr = ctx?.getMrtrExchange?.();
+  if (mrtr && mrtr.clientDeclaredRevision === false && mrtr.supportsElicitation?.(options?.mode ?? "form") !== true) {
+    throw new ElicitationNotSupportedError(
+      "This client does not support elicitation: it declared no elicitation capability, and without a session the elicitation fallback has no one to answer it"
+    );
+  }
   if (mrtr) {
     const zodSchema = requestedSchema instanceof z45.ZodType ? requestedSchema : z45.object(requestedSchema);
     const answer = mrtr.resolveElicitation({
@@ -16056,7 +16149,7 @@ async function performElicit(deps, message, requestedSchema, options) {
   if (!transport) {
     throw new ElicitationNotSupportedError("Transport not available for elicitation");
   }
-  return transport.elicit(message, requestedSchema, options);
+  return awaitOutsideRequest2(transport.elicit(message, requestedSchema, options));
 }
 function generateElicitationId() {
   return `elicit-${randomUUID10()}`;
@@ -18224,12 +18317,12 @@ function qualifiedNameOf(lineage, name44) {
   return `${ownerKeyOf(lineage)}:${name44}`;
 }
 function hookOwnerIdOf(lineage, owner) {
-  const owners = owner ? [...lineage, owner] : lineage;
-  return appOwnerIdOf(owners) ?? owners[owners.length - 1]?.id;
+  const owners2 = owner ? [...lineage, owner] : lineage;
+  return appOwnerIdOf(owners2) ?? owners2[owners2.length - 1]?.id;
 }
 function appOwnerIdOf(lineage, owner) {
-  const owners = owner ? [...lineage, owner] : lineage;
-  return owners.find((candidate) => candidate.kind === "app")?.id;
+  const owners2 = owner ? [...lineage, owner] : lineage;
+  return owners2.find((candidate) => candidate.kind === "app")?.id;
 }
 var EntryLineageIndex;
 var init_lineage_utils = __esm({
@@ -18327,6 +18420,7 @@ var init_get_prompt_flow = __esm({
     init_remote_capabilities_utils();
     init_common();
     init_availability();
+    init_call_surface();
     init_errors();
     init_resolved_entries();
     init_hooks_utils();
@@ -18530,7 +18624,10 @@ var init_get_prompt_flow = __esm({
         }
         promptContext.mark("execute");
         try {
-          promptContext.output = await promptContext.execute(parsedArgs);
+          promptContext.output = await runOnSurface(
+            callSurfaceOf(this.input.ctx),
+            async () => promptContext.execute(parsedArgs)
+          );
           this.logger.verbose("execute:done");
         } catch (error) {
           if (error instanceof FlowControl || isClientFacingError(error)) throw error;
@@ -21615,6 +21712,7 @@ var init_send_elicitation_result_tool = __esm({
   "libs/sdk/src/elicitation/send-elicitation-result.tool.ts"() {
     "use strict";
     init_common();
+    init_call_surface();
     init_errors();
     init_fallback_helper();
     inputSchema12 = {
@@ -21695,8 +21793,15 @@ var init_send_elicitation_result_tool = __esm({
                 arguments: pending.toolInput
               }
             },
-            // Pass the context for auth info and request ID (used for elicitation routing)
-            ctx: this.tryGetContext() ?? { authInfo: this.getAuthInfo() }
+            // The call context of this call, whose caller is the owner: its auth info as its transport
+            // gave it (the tool reads it as `this.auth`), on the surface it was made from. Not the
+            // request context object, whose auth info is a getter a call context does not carry over.
+            ctx: {
+              authInfo: this.authInfo,
+              requestId: this.tryGetContext()?.requestId ?? this.runId,
+              surface: getCallSurface(),
+              ...this.signal ? { signal: this.signal } : {}
+            }
           });
           this.logger.info("sendElicitationResult: original tool completed", {
             elicitId,
@@ -21874,7 +21979,14 @@ import {
   MCP_APPS_MIME_TYPE as MCP_APPS_MIME_TYPE2,
   resolveServingMode
 } from "@frontmcp/uipack/adapters";
-import { findNonFiniteNumber, getRuntimeContext as getRuntimeContext7, isDebug, isDevelopment as isDevelopment2, randomUUID as randomUUID11 } from "@frontmcp/utils";
+import {
+  awaitOutsideRequest as awaitOutsideRequest3,
+  findNonFiniteNumber,
+  getRuntimeContext as getRuntimeContext7,
+  isDebug,
+  isDevelopment as isDevelopment2,
+  randomUUID as randomUUID11
+} from "@frontmcp/utils";
 function toolNameCandidates(name44) {
   if (!/[-_]/.test(name44)) return [name44];
   return [name44, name44.includes("_") ? name44.replace(/_/g, "-") : name44.replace(/-/g, "_")];
@@ -22138,6 +22250,8 @@ var init_call_tool_flow = __esm({
           request: { method: "tools/call", params: cleanedParams },
           scopeId: this.scope.id
         };
+        const callSurface = callSurfaceOf(this.input.ctx);
+        if (callSurface !== void 0) record.surface = callSurface;
         if (this.state.progressToken !== void 0) {
           record.progressToken = this.state.progressToken;
         }
@@ -22362,6 +22476,7 @@ var init_call_tool_flow = __esm({
           context.mark("createToolCallContext");
           context._toolNameInternal = tool.metadata.id ?? tool.metadata.name;
           context._toolInputInternal = input.arguments;
+          context._jsonRpcRequestIdInternal = this.state.jsonRpcRequestId;
           const frontmcpContext = context.tryGetContext();
           const authInfoWithTransport = authInfo;
           if (frontmcpContext && authInfoWithTransport?.transport?.sendElicitRequest) {
@@ -22543,8 +22658,11 @@ var init_call_tool_flow = __esm({
               elicitId: error.elicitId,
               sessionId,
               owner,
-              toolName: error.toolName,
-              toolInput: error.toolInput,
+              // The answer re-runs the call this flow ran: this tool, with these arguments. What asked
+              // may be an entry the tool runs, like the agent behind `invoke_<agent>`, whose own name
+              // no `tools/call` resolves.
+              toolName: tool.fullName,
+              toolInput: this.state.required.input.arguments,
               elicitMessage: error.elicitMessage,
               elicitSchema: error.schema,
               createdAt: Date.now(),
@@ -22556,7 +22674,7 @@ var init_call_tool_flow = __esm({
                 elicitId: error.elicitId
               });
               const deps = { scope: this.scope, sessionId, logger: this.logger };
-              const result = await handleWaitingFallback(deps, error);
+              const result = await awaitOutsideRequest3(handleWaitingFallback(deps, error));
               toolContext.output = result;
               this.logger.verbose("execute:done (elicitation waiting fallback)");
               return;
@@ -24430,6 +24548,39 @@ var init_server_validation = __esm({
   }
 });
 
+// libs/sdk/src/flows/flow.http-path.ts
+function matchMountedPath(pattern, path3) {
+  if (!pattern.includes("/:")) {
+    const prefix = pattern.endsWith("/") ? pattern : `${pattern}/`;
+    return path3 === pattern || path3.startsWith(prefix) ? {} : void 0;
+  }
+  const mount = pattern.endsWith("/") ? pattern.slice(0, -1) : pattern;
+  const expected = mount.split("/");
+  const actual = path3.split("/");
+  if (actual.length < expected.length) return void 0;
+  const params = {};
+  for (let i = 0; i < expected.length; i++) {
+    const segment = expected[i];
+    const value = actual[i];
+    if (segment.length > 1 && segment.startsWith(":")) {
+      if (value.length === 0) return void 0;
+      try {
+        params[segment.slice(1)] = decodeURIComponent(value);
+      } catch {
+        return void 0;
+      }
+    } else if (segment !== value) {
+      return void 0;
+    }
+  }
+  return params;
+}
+var init_flow_http_path = __esm({
+  "libs/sdk/src/flows/flow.http-path.ts"() {
+    "use strict";
+  }
+});
+
 // libs/sdk/src/flows/flow.stages.ts
 function sortStageMap(table) {
   for (const key of Object.keys(table)) {
@@ -24537,6 +24688,7 @@ var init_flow_instance = __esm({
     init_context();
     init_errors();
     init_server_validation();
+    init_flow_http_path();
     init_flow_stages();
     FAILED_OUTCOMES = /* @__PURE__ */ new Set(["fail", "abort", "unknown_error"]);
     CAP = (s) => s ? s[0].toUpperCase() + s.slice(1) : s;
@@ -24656,12 +24808,16 @@ var init_flow_instance = __esm({
         const hasMwCanActivate = (mw.canActivate?.length ?? 0) > 0;
         if (!path3 && !hasStaticCanActivate && !hasMwCanActivate) return false;
         if (this.method && request.method !== this.method) return false;
-        if (path3) {
-          const reqPath = request.path;
-          const prefix = path3.endsWith("/") ? path3 : `${path3}/`;
-          if (reqPath !== path3 && !reqPath.startsWith(prefix)) return false;
+        const captured = path3 ? matchMountedPath(path3, request.path) : {};
+        if (!captured) return false;
+        const previous = request.params;
+        if (Object.keys(captured).length > 0) request.params = { ...captured, ...previous };
+        const activated = await this.canActivate(request);
+        if (!activated) {
+          if (previous === void 0) delete request.params;
+          else request.params = previous;
         }
-        return this.canActivate(request);
+        return activated;
       }
       /**
        * Get FrontMcpContextStorage from providers (with fallback).
@@ -25656,6 +25812,11 @@ var init_execution_context_interface = __esm({
        * Authority/authorization checks still run — an internal call carries the
        * same `authInfo` as the surrounding request, so ABAC/RBAC guards apply.
        *
+       * `availableWhen.surface`: the call carries {@link callToolSurface}. From a tool, resource or
+       * prompt that is none (in-process dispatch, which no surface restricts); a job's call carries
+       * `'job'`, an agent's `'agent'`, and an HTTP trigger's `'http-trigger'`, so a tool whose `surface`
+       * leaves that caller out answers as an unknown tool.
+       *
        * @param name Tool name (or fully-qualified `owner.name`).
        * @param args Tool arguments — validated by the tool's input schema.
        * @param opts Optional progress token / abort signal forwarded into `_meta`.
@@ -25673,10 +25834,12 @@ var init_execution_context_interface = __esm({
             ...Object.keys(requestMeta).length > 0 && { _meta: requestMeta }
           }
         };
+        const surface = this.callToolSurface();
         const ctx = {
           authInfo: this.getAuthInfo(),
           requestId: this.tryGetContext()?.requestId ?? this.runId,
           internalCall: true,
+          ...surface && { surface },
           ...opts?.signal && { signal: opts.signal }
         };
         const result = await scope.runFlow("tools:call-tool", { request, ctx });
@@ -25685,6 +25848,14 @@ var init_execution_context_interface = __esm({
         }
         return result;
       }
+      /**
+       * The surface (`availableWhen.surface`) a {@link callTool} from this context calls on. None by
+       * default: a tool, resource or prompt composing with other tools is in-process dispatch. Contexts
+       * that are callers of their own (jobs, agents, HTTP triggers) name their surface.
+       */
+      callToolSurface() {
+        return void 0;
+      }
       /**
        * Fail the execution and trigger error handling.
        */
@@ -27175,7 +27346,11 @@ var init_skill_events = __esm({
        */
       emit(event) {
         for (const listener of [...this.listeners]) {
-          listener(event);
+          try {
+            listener(event);
+          } catch (err) {
+            console.error("SkillEmitter listener error:", err instanceof Error ? err.message : "Unknown error");
+          }
         }
       }
       /**
@@ -27456,6 +27631,24 @@ var init_skill_instance = __esm({
 // libs/sdk/src/skill/skill.registry.ts
 import { tokenName as tokenName9 } from "@frontmcp/di";
 import { getRuntimeContext as getRuntimeContext11, isEntryAvailable as isEntryAvailable5 } from "@frontmcp/utils";
+function findIdPathCollision(skills) {
+  const byPath = /* @__PURE__ */ new Map();
+  for (const skill of skills) {
+    const path3 = skill.getSkillPath();
+    if (!byPath.has(path3)) byPath.set(path3, skill);
+  }
+  for (const idOwner of skills) {
+    const id = idOwner.metadata.id;
+    if (!id || id === idOwner.getSkillPath()) continue;
+    const pathOwner = byPath.get(id);
+    if (pathOwner) return { idOwner, pathOwner };
+  }
+  return void 0;
+}
+function describeIdPathCollision({ idOwner, pathOwner }) {
+  const id = idOwner.metadata.id;
+  return `id "${id}" of skill "${idOwner.metadata.name}" is the skill:// path of skill "${pathOwner.metadata.name}", so skill://${id}/SKILL.md would serve one for the other. Give one of them another id or name.`;
+}
 var DEFAULT_LIST_LIMIT, SkillRegistry;
 var init_skill_registry = __esm({
   "libs/sdk/src/skill/skill.registry.ts"() {
@@ -27487,16 +27680,34 @@ var init_skill_registry = __esm({
       dynamicContents = /* @__PURE__ */ new Map();
       /**
        * Per-id generation counter for dynamic registrations. Bumped on every
-       * registerSkillContent call so a stale unregister handle held by an earlier
-       * caller cannot remove a replacement registration.
+       * registerSkillContent call, and on every removal, so a stale unregister
+       * handle held by an earlier caller cannot remove a later registration. Never
+       * reset: a counter restarted at 1 would match an old handle's generation.
        */
       dynamicGenerations = /* @__PURE__ */ new Map();
+      /**
+       * Ids of skills that left the registry (its own dynamic skills, or an adopted child's) whose copy
+       * in the storage provider is not removed yet: the removal is pending, or the provider failed it.
+       * Provider-backed reads skip them until the removal succeeds or the id is served again. Each maps
+       * to the number of its withdrawal.
+       */
+      withdrawn = /* @__PURE__ */ new Map();
+      /** Numbers each withdrawal, so a removal that completes late clears only its own. */
+      withdrawals = 0;
+      /** The last storage-provider write queued per skill id ({@link syncProvider}). */
+      providerWrites = /* @__PURE__ */ new Map();
+      /** Whether a plugin registers skills at runtime ({@link expectDynamicSkills}). */
+      dynamicSkillsExpected = false;
       /** Adopted skills from child registries */
       adopted = /* @__PURE__ */ new Map();
       /** Children registries */
       children = /* @__PURE__ */ new Set();
+      /** The registries that adopted this one: a skill registered here is served through them too. */
+      adopters = /* @__PURE__ */ new Set();
       /** O(1) indexes */
       byQualifiedId = /* @__PURE__ */ new Map();
+      /** Owner lineage per skill instance, rebuilt with the index so `lineageOf` is O(1). */
+      lineages = new EntryLineageIndex();
       byName = /* @__PURE__ */ new Map();
       byOwnerAndName = /* @__PURE__ */ new Map();
       /** Version and emitter for change tracking */
@@ -27577,8 +27788,10 @@ var init_skill_registry = __esm({
           const row = this.makeRow(token, instance, lineage, this);
           this.localRows.push(row);
           try {
-            const content = await instance.load();
-            await this.storageProvider.add(content);
+            await this.syncProvider(instance.metadata.id ?? instance.metadata.name, async () => {
+              const content = await instance.load();
+              await this.storageProvider.add(content);
+            });
           } catch (error) {
             this.scope.logger.warn(`Failed to load skill ${instance.name}: ${error.message}`);
           }
@@ -27601,6 +27814,10 @@ var init_skill_registry = __esm({
             await this.adoptFromChild(child, child.owner);
           }
         }
+        const collision = findIdPathCollision(this.listAllInstances());
+        if (collision) {
+          throw new InvalidSkillError(collision.idOwner.metadata.name, describeIdPathCollision(collision));
+        }
         this.reindex();
         logAvailabilityFiltering(
           "SkillRegistry",
@@ -27620,24 +27837,31 @@ var init_skill_registry = __esm({
         const adoptedRows = childRows.map((r) => this.relineage(r, prepend));
         this.adopted.set(child, adoptedRows);
         this.children.add(child);
+        child.adopters.add(this);
         child.subscribe({ immediate: false }, () => {
+          const previous = this.adopted.get(child) ?? [];
           const latest = child.listAllIndexed().map((r) => this.relineage(r, prepend));
           this.adopted.set(child, latest);
           this.reindex();
-          this.bump("reset");
+          this.withdrawGoneAdoptedSkills(previous);
           for (const row of latest) {
-            row.instance.load().then((content) => {
-              this.storageProvider.add(content);
+            const skillId = row.instance.metadata.id ?? row.instance.metadata.name;
+            this.syncProvider(skillId, async () => {
+              const content = await row.instance.load();
+              await this.storageProvider.add(content);
             }).catch((error) => {
               this.scope.logger.warn(`Failed to reload adopted skill ${row.baseName}: ${error.message}`);
             });
           }
+          this.bump("reset");
         });
         await Promise.all(
           adoptedRows.map(async (row) => {
             try {
-              const content = await row.instance.load();
-              await this.storageProvider.add(content);
+              await this.syncProvider(row.instance.metadata.id ?? row.instance.metadata.name, async () => {
+                const content = await row.instance.load();
+                await this.storageProvider.add(content);
+              });
             } catch (error) {
               this.scope.logger.warn(`Failed to load adopted skill ${row.baseName}: ${error.message}`);
             }
@@ -27646,6 +27870,37 @@ var init_skill_registry = __esm({
         this.reindex();
         this.bump("reset");
       }
+      /**
+       * The `skill://` namespaces this registry's skills are served in: its own, and that of every
+       * registry that adopts it, directly or through another, sibling registries included.
+       */
+      namespacesServingThis() {
+        const registries = /* @__PURE__ */ new Set();
+        const climb = (registry) => {
+          if (registries.has(registry)) return;
+          registries.add(registry);
+          for (const adopter of registry.adopters) climb(adopter);
+        };
+        climb(this);
+        return [...registries].map((registry) => registry.liveSkills());
+      }
+      /**
+       * This registry's skills and those of every registry it adopted, read from each registry's own rows.
+       * An adopter's copy of a child's rows is refreshed only on the child's change event, which a
+       * registration emits after it has committed its row and awaited the storage provider.
+       */
+      liveSkills() {
+        const registries = /* @__PURE__ */ new Set();
+        const skills = /* @__PURE__ */ new Set();
+        const descend = (registry) => {
+          if (registries.has(registry)) return;
+          registries.add(registry);
+          for (const row of [...registry.localRows, ...registry.dynamicRows]) skills.add(row.instance);
+          for (const child of registry.children) descend(child);
+        };
+        descend(this);
+        return [...skills];
+      }
       /* -------------------- Public API -------------------- */
       /**
        * Get all skills in the registry.
@@ -27763,7 +28018,14 @@ var init_skill_registry = __esm({
         }
       }
       async search(query, options) {
-        const baseResults = await this.storageProvider.search(query, options);
+        const topK = options?.topK;
+        const hidden = this.hiddenFromProviderRead();
+        const providerOptions = hidden.size > 0 && typeof topK === "number" && topK >= 0 ? { ...options, topK: topK + hidden.size } : options;
+        let baseResults = await this.storageProvider.search(query, providerOptions);
+        if (hidden.size > 0 || this.withdrawn.size > 0) {
+          baseResults = baseResults.filter((r) => !hidden.has(r.metadata));
+          if (typeof topK === "number" && topK >= 0) baseResults = baseResults.slice(0, topK);
+        }
         if (this.dynamicContents.size === 0) return baseResults;
         const baseSeen = /* @__PURE__ */ new Set();
         let rewrites = 0;
@@ -27787,7 +28049,6 @@ var init_skill_registry = __esm({
         const overlayOnly = this.searchDynamicOverlay(query, options, baseSeen);
         if (overlayOnly.length === 0 && rewrites === 0) return baseResults;
         const merged = [...rewrittenBase, ...overlayOnly].sort((a, b) => b.score - a.score);
-        const topK = options?.topK;
         return typeof topK === "number" && topK >= 0 ? merged.slice(0, topK) : merged;
       }
       /**
@@ -27842,7 +28103,10 @@ var init_skill_registry = __esm({
             warning
           };
         }
+        const hidden = this.hiddenFromProviderRead();
+        if (hidden.has({ name: skillId })) return void 0;
         const result = await this.storageProvider.load(skillId);
+        if (result && hidden.has(result.skill)) return void 0;
         return result ?? void 0;
       }
       /**
@@ -27878,8 +28142,12 @@ var init_skill_registry = __esm({
        * and `hasMore` stay correct.
        */
       async listSkills(options) {
-        if (this.dynamicContents.size === 0) return this.storageProvider.list(options);
-        const base = await this.listAllFromProvider(options);
+        const hidden = this.hiddenFromProviderRead();
+        if (this.dynamicContents.size === 0 && hidden.size === 0) {
+          const page = await this.storageProvider.list(options);
+          if (this.withdrawn.size === 0) return page;
+        }
+        const base = (await this.listAllFromProvider(options)).filter((meta) => !hidden.has(meta));
         const baseIds = /* @__PURE__ */ new Set();
         const merged = base.map((meta) => {
           const id = meta.id ?? meta.name;
@@ -27911,30 +28179,48 @@ var init_skill_registry = __esm({
           if (!page.hasMore || page.skills.length === 0) return all;
         }
       }
+      /**
+       * Owner lineage (root → leaf) of a skill, or undefined when no row holds it. A skill a plugin
+       * contributes is owned by the plugin; its lineage names the app the plugin is installed on.
+       */
+      lineageOf(entry) {
+        return this.lineages.lineageOf(entry);
+      }
       /**
        * Check if any skills exist.
        */
       hasAny() {
         return this.listAllIndexed().length > 0;
       }
+      /**
+       * Record that a plugin registers skills at runtime ({@link registerSkillContent}), such as a
+       * skill bundle loaded after the server starts. The scope then serves the skills capability and
+       * methods from startup, answering with the skills registered so far.
+       */
+      expectDynamicSkills() {
+        this.dynamicSkillsExpected = true;
+      }
+      /** Whether the scope serves skills: it has some, or a plugin registers them at runtime. */
+      servesSkills() {
+        return this.dynamicSkillsExpected || this.hasAny();
+      }
       /**
        * Get total skill count.
        *
-       * Sums the provider count with overlay rows the provider does not know
+       * Counts the provider's rows with overlay rows the provider does not know
        * about so callers see the same surface as `search` / `listSkills`.
        */
       async count(options) {
-        const baseCount = await this.storageProvider.count(options);
-        if (this.dynamicContents.size === 0) return baseCount;
-        const baseList = await this.storageProvider.list({
-          tags: options?.tags,
-          includeHidden: options?.includeHidden,
-          limit: Number.MAX_SAFE_INTEGER
-        });
+        const hidden = this.hiddenFromProviderRead();
+        if (this.dynamicContents.size === 0 && hidden.size === 0) {
+          const counted = await this.storageProvider.count(options);
+          if (this.withdrawn.size === 0) return counted;
+        }
+        const baseList = (await this.listAllFromProvider({ tags: options?.tags, includeHidden: options?.includeHidden })).filter((m) => !hidden.has(m));
         const baseIds = /* @__PURE__ */ new Set();
-        for (const m of baseList.skills) baseIds.add(m.id ?? m.name);
+        for (const m of baseList) baseIds.add(m.id ?? m.name);
         const overlay = this.collectDynamicMetadata(options).filter((m) => !baseIds.has(m.id ?? m.name));
-        return baseCount + overlay.length;
+        return baseList.length + overlay.length;
       }
       /**
        * Project a SkillContent into the SkillMetadata shape callers expect from
@@ -28060,7 +28346,7 @@ var init_skill_registry = __esm({
        * of the schema cutover see the declaration.
        */
       getCapabilities() {
-        if (!this.hasAny()) return {};
+        if (!this.servesSkills()) return {};
         return {
           experimental: {
             [SEP_2640_EXTENSION_ID]: {}
@@ -28224,10 +28510,6 @@ var init_skill_registry = __esm({
           throw new PublicMcpError("registerSkillContent: SkillContent.name is required", "INVALID_PARAMS");
         }
         const id = content.id;
-        const existingIdx = this.dynamicRows.findIndex((r) => r.instance.name === id);
-        if (existingIdx !== -1) {
-          this.dynamicRows.splice(existingIdx, 1);
-        }
         const metadata = {
           id,
           name: content.name,
@@ -28263,28 +28545,49 @@ var init_skill_registry = __esm({
             `[SkillRegistry] Failed to pre-load dynamic skill ${id} from source ${opts?.source ?? "unknown"}: ${error.message}`
           );
         }
+        const existingIdx = this.dynamicRows.findIndex((r) => r.instance.name === id);
+        const superseded = new Set(opts?.supersedes);
+        const leaving = new Set(
+          this.dynamicRows.filter((r) => r.instance.name === id || superseded.has(r.instance.name)).map((r) => r.instance)
+        );
+        for (const skills of this.namespacesServingThis()) {
+          const collision = findIdPathCollision([...skills.filter((other) => !leaving.has(other)), instance]);
+          if (collision) {
+            throw new PublicMcpError(`registerSkillContent: ${describeIdPathCollision(collision)}`, "INVALID_PARAMS");
+          }
+        }
+        if (existingIdx !== -1) {
+          this.dynamicRows.splice(existingIdx, 1);
+        }
+        const mutable = this.asMutableProvider(this.storageProvider);
+        const removed = this.dynamicRows.filter((r) => superseded.has(r.instance.name) && findIdPathCollision([r.instance, instance])).map((r) => r.instance.name);
+        for (const removedId of removed) {
+          this.withdrawDynamicSkill(removedId, mutable);
+        }
         const lineage = this.owner ? [this.owner] : [];
         const row = this.makeRow(provideToken, instance, lineage, this);
         this.dynamicRows.push(row);
         this.dynamicContents.set(id, structuredClone(content));
+        this.withdrawn.delete(id);
         const generation = (this.dynamicGenerations.get(id) ?? 0) + 1;
         this.dynamicGenerations.set(id, generation);
-        const mutable = this.asMutableProvider(this.storageProvider);
-        if (mutable) {
-          try {
+        this.reindex();
+        const providerWrites = mutable ? [
+          ...removed.map((removedId) => this.removeFromProvider(mutable, removedId)),
+          this.syncProvider(id, async () => {
             if (await mutable.exists(id)) {
               await mutable.update(id, content);
             } else {
               await mutable.add(content);
             }
-          } catch (error) {
+          }).catch((error) => {
             this.scope.logger.warn(
               `[SkillRegistry] Failed to index dynamic skill ${id} in storage provider: ${error.message}`
             );
-          }
-        }
-        this.reindex();
+          })
+        ] : [];
         this.bump("reset");
+        await Promise.all(providerWrites);
         let unregistered = false;
         const unregister = async () => {
           if (unregistered) return;
@@ -28297,32 +28600,99 @@ var init_skill_registry = __esm({
         this.scope.logger.debug(
           `[SkillRegistry] Registered dynamic skill ${id}${opts?.source ? ` (source: ${opts.source})` : ""}`
         );
-        return { id, unregister };
+        return { id, unregister, removed };
       }
       /**
        * Remove a previously-registered dynamic skill by id.
        */
       async unregisterSkill(id) {
-        const idx = this.dynamicRows.findIndex((r) => r.instance.name === id);
-        if (idx === -1) return false;
-        this.dynamicRows.splice(idx, 1);
-        this.dynamicContents.delete(id);
-        this.dynamicGenerations.delete(id);
+        if (!this.dynamicRows.some((r) => r.instance.name === id)) return false;
         const mutable = this.asMutableProvider(this.storageProvider);
-        if (mutable) {
-          try {
-            await mutable.remove(id);
-          } catch (error) {
-            this.scope.logger.warn(
-              `[SkillRegistry] Failed to remove dynamic skill ${id} from storage provider: ${error.message}`
-            );
-          }
-        }
+        this.withdrawDynamicSkill(id, mutable);
         this.reindex();
+        const removal = mutable ? this.removeFromProvider(mutable, id) : void 0;
         this.bump("reset");
+        await removal;
         this.scope.logger.debug(`[SkillRegistry] Unregistered dynamic skill ${id}`);
         return true;
       }
+      /**
+       * Take a dynamic skill out of the registry, synchronously. Its generation advances so a handle
+       * from an earlier registration stays a no-op, and while a mutable provider still holds its copy it
+       * is withdrawn from provider-backed reads.
+       */
+      withdrawDynamicSkill(id, mutable) {
+        this.dynamicRows.splice(
+          this.dynamicRows.findIndex((r) => r.instance.name === id),
+          1
+        );
+        this.dynamicContents.delete(id);
+        this.dynamicGenerations.set(id, (this.dynamicGenerations.get(id) ?? 0) + 1);
+        if (mutable) this.withdrawn.set(id, ++this.withdrawals);
+      }
+      /** Remove a withdrawn skill's copy from the provider. If that fails it stays withdrawn from reads. */
+      async removeFromProvider(mutable, id) {
+        const withdrawal = this.withdrawn.get(id);
+        try {
+          await this.syncProvider(id, () => mutable.remove(id));
+          if (this.withdrawn.get(id) === withdrawal) this.withdrawn.delete(id);
+        } catch (error) {
+          this.scope.logger.warn(
+            `[SkillRegistry] Failed to remove skill ${id} from storage provider; it stays hidden from provider-backed reads: ${error.message}`
+          );
+        }
+      }
+      /**
+       * Run a storage-provider write for one skill id after the ones queued before it for that id, so a
+       * removal that completes late cannot delete the copy a later registration added. The returned
+       * promise settles with the write; a failure does not hold back the next one.
+       */
+      syncProvider(id, write) {
+        const run = (this.providerWrites.get(id) ?? Promise.resolve()).then(write);
+        const settled = run.then(
+          () => void 0,
+          () => void 0
+        );
+        this.providerWrites.set(id, settled);
+        void settled.then(() => {
+          if (this.providerWrites.get(id) === settled) this.providerWrites.delete(id);
+        });
+        return run;
+      }
+      /**
+       * After a child's change, take the skills that left it (and are not served here some other way)
+       * out of this registry's storage provider too. The re-add on change only adds, so without this an
+       * adopter's provider kept serving a skill the child had removed. Until the removal completes, and
+       * if it fails, provider-backed reads skip it.
+       */
+      withdrawGoneAdoptedSkills(previous) {
+        const mutable = this.asMutableProvider(this.storageProvider);
+        if (!mutable) return;
+        const skillIdOf = (entry) => entry.metadata.id ?? entry.metadata.name;
+        const live = new Set(this.listAllIndexed().map((r) => skillIdOf(r.instance)));
+        for (const id of live) this.withdrawn.delete(id);
+        for (const row of previous) {
+          const id = skillIdOf(row.instance);
+          if (live.has(id) || this.withdrawn.has(id)) continue;
+          this.withdrawn.set(id, ++this.withdrawals);
+          void this.removeFromProvider(mutable, id);
+        }
+      }
+      /**
+       * Which provider-backed rows a read that starts now must skip: a skill withdrawn when the read
+       * starts (its removal may complete while the provider answers, clearing the withdrawal, yet the
+       * answer can still hold it), or withdrawn by the time the answer arrives.
+       */
+      hiddenFromProviderRead() {
+        const atStart = new Set(this.withdrawn.keys());
+        return {
+          size: atStart.size,
+          has: (meta) => {
+            const id = meta.id ?? meta.name;
+            return atStart.has(id) || this.withdrawn.has(id);
+          }
+        };
+      }
       /* -------------------- Internal helpers -------------------- */
       asMutableProvider(provider) {
         const candidate = provider;
@@ -28339,6 +28709,7 @@ var init_skill_registry = __esm({
       }
       reindex() {
         const effective = this.listAllIndexed();
+        this.lineages.rebuild(effective);
         this.byQualifiedId.clear();
         this.byName.clear();
         this.byOwnerAndName.clear();
@@ -29263,13 +29634,15 @@ var init_agent_utils = __esm({
 // libs/sdk/src/agent/agent.instance.ts
 import { AuthorityDeniedError as AuthorityDeniedError6 } from "@frontmcp/auth";
 import { toJSONSchema as toJSONSchema2, z as z59 } from "@frontmcp/lazy-zod";
-var VALID_AGENT_HOOK_FLOWS, AGENT_ONLY_METADATA_KEYS, AgentInstance, FunctionAgentContext;
+var VALID_AGENT_HOOK_FLOWS, AGENT_SURFACE, AGENT_ONLY_METADATA_KEYS, AgentInstance, FunctionAgentContext;
 var init_agent_instance = __esm({
   "libs/sdk/src/agent/agent.instance.ts"() {
     "use strict";
     init_config();
     init_common();
+    init_availability();
     init_tool_decorator();
+    init_call_surface();
     init_running_tool();
     init_errors();
     init_hooks_utils();
@@ -29279,6 +29652,7 @@ var init_agent_instance = __esm({
     init_agent_scope();
     init_agent_utils();
     VALID_AGENT_HOOK_FLOWS = ["agents:call-agent", "agents:list-agents"];
+    AGENT_SURFACE = "agent";
     AGENT_ONLY_METADATA_KEYS = /* @__PURE__ */ new Set([
       "id",
       "name",
@@ -29301,7 +29675,7 @@ var init_agent_instance = __esm({
       "hideFromDiscovery"
     ]);
     AgentInstance = class extends AgentEntry {
-      providers;
+      providerRegistry;
       scope;
       hooks;
       /** The LLM adapter for this agent */
@@ -29319,11 +29693,11 @@ var init_agent_instance = __esm({
       constructor(record, providers, owner) {
         super(record);
         this.owner = owner;
-        this.providers = providers;
+        this.providerRegistry = providers;
         this.name = record.metadata.id ?? record.metadata.name;
         this.id = record.metadata.id ?? record.metadata.name;
         this.fullName = this.owner.id + ":" + this.name;
-        this.scope = this.providers.getActiveScope();
+        this.scope = this.providerRegistry.getActiveScope();
         this.hooks = this.scope.hooks;
         this.inputSchema = record.metadata.inputSchema ?? {};
         this.outputSchema = record.metadata.outputSchema;
@@ -29382,11 +29756,11 @@ var init_agent_instance = __esm({
         const adapterOptions = {
           providerResolver: {
             get: (token) => {
-              return this.providers.get(token);
+              return this.providerRegistry.get(token);
             },
             tryGet: (token) => {
               try {
-                return this.providers.get(token);
+                return this.providerRegistry.get(token);
               } catch {
                 return void 0;
               }
@@ -29399,7 +29773,7 @@ var init_agent_instance = __esm({
           }
         };
         try {
-          const configService = this.providers.get(ConfigService);
+          const configService = this.providerRegistry.get(ConfigService);
           if (configService) {
             adapterOptions.configResolver = this.createConfigResolver(configService);
           }
@@ -29507,7 +29881,7 @@ var init_agent_instance = __esm({
           const toolMetadata = this.buildAgentToolMetadata();
           const agentToolFunction = frontMcpTool(toolMetadata)(this.createAgentToolExecuteHandler());
           const toolRecord = normalizeTool(agentToolFunction);
-          this.agentToolInstance = new ToolInstance(toolRecord, this.providers, this.owner);
+          this.agentToolInstance = new ToolInstance(toolRecord, this.providerRegistry, this.owner);
           await this.agentToolInstance.ready;
           this.scope.logger.debug(`Created agent tool instance: ${this.agentToolInstance.name} for agent ${this.name}`);
         } catch (error) {
@@ -29549,16 +29923,34 @@ var init_agent_instance = __esm({
       /**
        * Create the execute handler for the agent tool.
        *
-       * This handler is called when the tool is invoked through the standard
-       * tools:call-tool flow. It creates an AgentContext and runs the LLM loop.
+       * The tool's `tools:call-tool` flow has already applied everything the agent declares
+       * (authorities, rate limit, concurrency, timeout and plugin gates, copied onto the tool). The
+       * handler then runs the agent through the `agents:call-agent` flow, so the hooks registered for
+       * agent invocation (`AgentCallHook`, and the agent class's own hooks on that flow) run and the
+       * agent's context gets the request's context providers. The flow's own gates are left to the
+       * tool flow (`gatedBy`), so nothing is counted twice.
        */
       createAgentToolExecuteHandler() {
         return async (input, toolCtx) => {
           const authInfo = toolCtx.authInfo;
-          const agentCallExtra = { authInfo };
-          const agentContext = this.create(input, agentCallExtra);
-          const result = await agentContext.execute(input);
-          return result;
+          const progressToken = toolCtx._progressTokenInternal;
+          const requestId = toolCtx._jsonRpcRequestIdInternal;
+          return this.scope.runFlowForOutput("agents:call-agent", {
+            request: {
+              method: "tools/call",
+              params: {
+                name: this.id,
+                arguments: input,
+                ...progressToken !== void 0 ? { _meta: { progressToken } } : {}
+              }
+            },
+            ctx: {
+              authInfo,
+              ...requestId !== void 0 ? { requestId } : {},
+              ...toolCtx.signal ? { signal: toolCtx.signal } : {}
+            },
+            gatedBy: "tools:call-tool"
+          });
         };
       }
       /**
@@ -29572,6 +29964,10 @@ var init_agent_instance = __esm({
       getToolInstance() {
         return this.agentToolInstance;
       }
+      /** The provider registry this agent was registered with (its app's). */
+      get providers() {
+        return this.providerRegistry;
+      }
       /**
        * The tools this agent can call: those it declares and those its plugins contribute, as its private
        * scope holds them. Empty until the agent is initialized.
@@ -29621,7 +30017,7 @@ var init_agent_instance = __esm({
           case "VALUE" /* VALUE */:
             return this.record.useValue;
           case "FACTORY" /* FACTORY */:
-            return this.record.useFactory(this.providers);
+            return this.record.useFactory(this.providerRegistry);
           case "ESM" /* ESM */:
             throw new AgentNotConfiguredError(`ESM agent "${this.name}" cannot be created via AgentInstance.create()`);
           case "REMOTE" /* REMOTE */:
@@ -29640,11 +30036,13 @@ var init_agent_instance = __esm({
        * @param llmAdapter - The LLM adapter (passed explicitly to avoid non-null assertion)
        */
       buildAgentCtorArgs(input, ctx, llmAdapter) {
-        const scope = this.providers.getActiveScope();
+        const scope = this.providerRegistry.getActiveScope();
         return {
           metadata: this.metadata,
           input,
-          providers: this.providers,
+          // The request's context-aware providers when the agents:call-agent flow built them, so
+          // `this.context` and CONTEXT-scoped providers resolve inside the agent.
+          providers: ctx.contextProviders ?? this.providerRegistry,
           logger: scope.logger,
           authInfo: ctx.authInfo,
           llmAdapter,
@@ -29655,10 +30053,17 @@ var init_agent_instance = __esm({
       }
       /**
        * Get tool definitions available to this agent.
-       * Returns only the agent's own tools (from @Agent({ tools: [...] })).
+       * Returns only the agent's own tools (from @Agent({ tools: [...] })) that are offered to it.
        */
       getToolDefinitions() {
-        return buildAgentToolDefinitions(this.agentTools);
+        return buildAgentToolDefinitions(this.getOfferedTools());
+      }
+      /**
+       * The agent's tools its model may call: those whose `availableWhen.surface` offers them on the
+       * `'agent'` surface. The others are neither shown to the model nor run for it.
+       */
+      getOfferedTools() {
+        return this.agentTools.filter((tool) => isOfferedOnSurface(tool.metadata.availableWhen, AGENT_SURFACE));
       }
       /**
        * Create a tool executor for agent-scoped tools.
@@ -29681,12 +30086,13 @@ var init_agent_instance = __esm({
       createToolExecutor(ctx) {
         const useToolFlow = this.record.metadata.execution?.useToolFlow !== false;
         return async (toolName, args) => {
-          const tool = this.agentTools.find((t) => t.name === toolName || t.fullName === toolName);
+          const offeredTools = this.getOfferedTools();
+          const tool = offeredTools.find((t) => t.name === toolName || t.fullName === toolName);
           if (!tool) {
             throw new AgentToolNotFoundError(
               this.name,
               toolName,
-              this.agentTools.map((t) => t.name)
+              offeredTools.map((t) => t.name)
             );
           }
           if (useToolFlow && this.agentScope) {
@@ -29697,16 +30103,20 @@ var init_agent_instance = __esm({
               },
               ctx: {
                 authInfo: ctx.authInfo,
-                _skipUI: true
+                _skipUI: true,
                 // Skip UI rendering - agent returns structured data
+                surface: AGENT_SURFACE
               }
             });
             return this.extractToolResult(result);
           }
           await this.assertToolAuthorized(tool, ctx.authInfo, args);
           const runningTool = { name: tool.name, fullName: tool.fullName };
-          const toolContext = runAsTool(runningTool, () => tool.create(args, ctx));
-          return runAsTool(runningTool, () => Promise.resolve(toolContext.execute(args)));
+          return runOnSurface(AGENT_SURFACE, () => {
+            const { contextProviders: _agentProviders, ...toolCtx } = ctx;
+            const toolContext = runAsTool(runningTool, () => tool.create(args, toolCtx));
+            return runAsTool(runningTool, () => Promise.resolve(toolContext.execute(args)));
+          });
         };
       }
       /**
@@ -30243,6 +30653,53 @@ var init_agent_registry = __esm({
   }
 });
 
+// libs/sdk/src/channel/sources/completion-events.ts
+function completionEventsOf(scope) {
+  let events = byScope.get(scope);
+  if (!events) {
+    events = new ScopeCompletionEvents();
+    byScope.set(scope, events);
+  }
+  return events;
+}
+function completionOutputText(value) {
+  if (value === void 0) return void 0;
+  if (typeof value === "string") return value;
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
+var CompletionStream, ScopeCompletionEvents, byScope;
+var init_completion_events = __esm({
+  "libs/sdk/src/channel/sources/completion-events.ts"() {
+    "use strict";
+    CompletionStream = class {
+      listeners = /* @__PURE__ */ new Set();
+      subscribe(listener) {
+        this.listeners.add(listener);
+        return () => {
+          this.listeners.delete(listener);
+        };
+      }
+      emit(event) {
+        for (const listener of [...this.listeners]) {
+          try {
+            listener(event);
+          } catch {
+          }
+        }
+      }
+    };
+    ScopeCompletionEvents = class {
+      agents = new CompletionStream();
+      jobs = new CompletionStream();
+    };
+    byScope = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // libs/sdk/src/agent/flows/call-agent.flow.ts
 import { AuthorityDeniedError as AuthorityDeniedError7, resolveRequiredScopes as resolveRequiredScopes5 } from "@frontmcp/auth";
 import { ExecutionTimeoutError as ExecutionTimeoutError2, withTimeout as withTimeout2 } from "@frontmcp/guard";
@@ -30252,13 +30709,22 @@ var inputSchema15, outputSchema14, stateSchema14, plan14, name14, Stage14, CallA
 var init_call_agent_flow = __esm({
   "libs/sdk/src/agent/flows/call-agent.flow.ts"() {
     "use strict";
+    init_completion_events();
     init_common();
     init_errors();
     init_hooks_utils();
+    init_flow_context_providers();
     inputSchema15 = z60.object({
       request: CallToolRequestSchema3,
       // z.any() used because ctx is the MCP SDK's ToolCallExtra type which varies by SDK version
-      ctx: z60.any()
+      ctx: z60.any(),
+      /**
+       * Set when the agent's `invoke_<agent>` tool runs this flow. That tool's `tools:call-tool` flow
+       * has already applied the agent's authorities, rate limit, concurrency and timeout (they are
+       * copied onto the tool), so this flow's stages for them leave the checks to it instead of
+       * counting the call twice. Their hooks still run.
+       */
+      gatedBy: z60.literal("tools:call-tool").optional()
     });
     outputSchema14 = CallToolResultSchema3;
     stateSchema14 = z60.object({
@@ -30291,7 +30757,13 @@ var init_call_agent_flow = __esm({
       // Semaphore ticket for concurrency control (set by acquireSemaphore, used by releaseSemaphore)
       semaphoreTicket: z60.any().optional(),
       // A timed-out execute() that is still running; its concurrency slot is released when it settles
-      abandonedExecution: z60.instanceof(Promise).optional()
+      abandonedExecution: z60.instanceof(Promise).optional(),
+      // When execute() started, and the error it ended with (for the completion event)
+      executionStartedAt: z60.number().optional(),
+      executionError: z60.any().optional(),
+      // The MCP result built from rawOutput (parseOutput), or why it could not be built
+      parsedOutput: z60.any().optional(),
+      outputError: z60.any().optional()
     });
     plan14 = {
       pre: [
@@ -30304,12 +30776,16 @@ var init_call_agent_flow = __esm({
         "acquireSemaphore"
       ],
       execute: ["validateInput", "execute", "validateOutput"],
-      finalize: ["releaseSemaphore", "releaseQuota", "finalize"]
+      finalize: ["releaseSemaphore", "releaseQuota", "parseOutput", "emitCompletion", "finalize"]
     };
     name14 = "agents:call-agent";
     ({ Stage: Stage14 } = FlowHooksOf(name14));
     CallAgentFlow = class extends FlowBase {
       logger = this.scopeLogger.child("CallAgentFlow");
+      /** Whether the `invoke_<agent>` tool's flow already applied the agent's gates. */
+      get gatedByToolFlow() {
+        return this.input.gatedBy === "tools:call-tool";
+      }
       async parseInput() {
         this.logger.verbose("parseInput:start");
         let method;
@@ -30376,6 +30852,10 @@ var init_call_agent_flow = __esm({
       }
       async checkEntryAuthorities() {
         this.logger.verbose("checkEntryAuthorities:start");
+        if (this.gatedByToolFlow) {
+          this.logger.verbose("checkEntryAuthorities:skip (checked by the invoke tool flow)");
+          return;
+        }
         const engine = this.scope.authoritiesEngine;
         const ctxBuilder = this.scope.authoritiesContextBuilder;
         if (!engine || !ctxBuilder) {
@@ -30441,14 +30921,17 @@ var init_call_agent_flow = __esm({
         const progressToken = this.state.progressToken;
         const authInfo = this.state.authInfo;
         try {
-          const context = agent.create(input.arguments, { ...ctx, progressToken });
+          const sessionKey = authInfo?.sessionId ?? "anonymous";
+          const agentViews = await agent.providers.buildViews(sessionKey, new Map(this.deps), this.scope.providers);
+          const contextProviders = new FlowContextProviders(agent.providers, agentViews.context);
+          const context = agent.create(input.arguments, { ...ctx, progressToken, contextProviders });
           this.appendContextHooks(hooksBoundTo(this.scope.hooks.getClsHooks(agent.record.provide), context));
           context.mark("createAgentContext");
           const frontmcpContext = context.tryGetContext();
           const sdkAuthInfo = authInfo;
-          if (frontmcpContext && sdkAuthInfo?.transport?.sendElicitRequest) {
+          const jsonRpcRequestId = this.state.jsonRpcRequestId;
+          if (frontmcpContext && sdkAuthInfo?.transport?.sendElicitRequest && jsonRpcRequestId !== void 0) {
             const transport = sdkAuthInfo.transport;
-            const jsonRpcRequestId = this.state.jsonRpcRequestId;
             frontmcpContext.setTransport({
               sendElicitRequest: transport.sendElicitRequest.bind(transport),
               type: transport.type ?? "unknown",
@@ -30465,7 +30948,7 @@ var init_call_agent_flow = __esm({
       async acquireQuota() {
         this.logger.verbose("acquireQuota:start");
         const manager = this.scope.rateLimitManager;
-        if (!manager) {
+        if (!manager || this.gatedByToolFlow) {
           this.state.agentContext?.mark("acquireQuota");
           this.logger.verbose("acquireQuota:done (no rate limit manager)");
           return;
@@ -30489,7 +30972,7 @@ var init_call_agent_flow = __esm({
       async acquireSemaphore() {
         this.logger.verbose("acquireSemaphore:start");
         const manager = this.scope.rateLimitManager;
-        if (!manager) {
+        if (!manager || this.gatedByToolFlow) {
           this.state.agentContext?.mark("acquireSemaphore");
           this.logger.verbose("acquireSemaphore:done (no rate limit manager)");
           return;
@@ -30534,7 +31017,8 @@ var init_call_agent_flow = __esm({
         }
         agentContext.mark("execute");
         const startTime = Date.now();
-        const timeoutMs = agent.metadata.timeout?.executeMs ?? agent.metadata.execution?.timeout ?? this.scope.rateLimitManager?.config?.defaultTimeout?.executeMs;
+        this.state.set("executionStartedAt", startTime);
+        const timeoutMs = this.gatedByToolFlow ? agent.metadata.timeout?.executeMs === void 0 ? agent.metadata.execution?.timeout : void 0 : agent.metadata.timeout?.executeMs ?? agent.metadata.execution?.timeout ?? this.scope.rateLimitManager?.config?.defaultTimeout?.executeMs;
         const running = (async () => {
           agentContext.output = await agentContext.execute(agentContext.input);
         })();
@@ -30545,6 +31029,7 @@ var init_call_agent_flow = __esm({
           });
           this.logger.verbose("execute:done");
         } catch (error) {
+          this.state.set("executionError", error);
           if (error instanceof ExecutionTimeoutError2) {
             this.logger.warn("execute: agent execution timed out", {
               agent: agent.metadata.name,
@@ -30553,6 +31038,7 @@ var init_call_agent_flow = __esm({
             this.state.set("abandonedExecution", running);
             throw error;
           }
+          if (this.gatedByToolFlow) throw error;
           throw new AgentExecutionError(agent.metadata.name, error instanceof Error ? error : void 0);
         }
       }
@@ -30590,9 +31076,34 @@ var init_call_agent_flow = __esm({
         this.state.agentContext?.mark("releaseQuota");
         this.logger.verbose("releaseQuota:done");
       }
+      async parseOutput() {
+        const { agent, rawOutput } = this.state;
+        if (!agent || rawOutput === void 0) return;
+        const parseResult = agent.safeParseOutput(rawOutput);
+        if (parseResult.success) this.state.set("parsedOutput", parseResult.data);
+        else this.state.set("outputError", parseResult.error);
+      }
+      async emitCompletion() {
+        const { agent, agentContext, executionStartedAt, executionError, outputError, authInfo } = this.state;
+        if (!agent || executionStartedAt === void 0) return;
+        if (executionError instanceof ElicitationFallbackRequired || executionError instanceof FlowControl) return;
+        const failure = executionError ?? (outputError !== void 0 ? new InvalidOutputError() : void 0);
+        const failed = failure !== void 0;
+        const requestId = this.tryGetContext()?.requestId;
+        const sessionId = typeof authInfo?.sessionId === "string" && authInfo.sessionId ? authInfo.sessionId : void 0;
+        completionEventsOf(this.scope).agents.emit({
+          agentId: agent.id,
+          agentName: agent.name,
+          status: failed ? "error" : "success",
+          durationMs: Date.now() - executionStartedAt,
+          ...failed ? { error: failure instanceof Error ? failure.message : String(failure) } : { output: completionOutputText(agentContext?.output) },
+          ...requestId ? { runId: requestId } : {},
+          ...sessionId ? { sessionId } : {}
+        });
+      }
       async finalize() {
         this.logger.verbose("finalize:start");
-        const { agent, rawOutput, executionMeta } = this.state;
+        const { agent, rawOutput, parsedOutput, outputError, executionMeta } = this.state;
         if (!agent) {
           this.logger.verbose("finalize: skipping (no agent in state)");
           return;
@@ -30601,15 +31112,14 @@ var init_call_agent_flow = __esm({
           this.logger.verbose("finalize: skipping (no output - execute stage likely failed)");
           return;
         }
-        const parseResult = agent.safeParseOutput(rawOutput);
-        if (!parseResult.success) {
+        if (outputError !== void 0 || parsedOutput === void 0) {
           this.logger.error("finalize: output validation failed", {
             agent: agent.metadata.name,
-            errors: parseResult.error
+            errors: outputError
           });
           throw new InvalidOutputError();
         }
-        const result = parseResult.data;
+        const result = parsedOutput;
         if (executionMeta) {
           result._meta = {
             ...result._meta,
@@ -30675,6 +31185,12 @@ var init_call_agent_flow = __esm({
     __decorateClass([
       Stage14("releaseQuota")
     ], CallAgentFlow.prototype, "releaseQuota", 1);
+    __decorateClass([
+      Stage14("parseOutput")
+    ], CallAgentFlow.prototype, "parseOutput", 1);
+    __decorateClass([
+      Stage14("emitCompletion")
+    ], CallAgentFlow.prototype, "emitCompletion", 1);
     __decorateClass([
       Stage14("finalize")
     ], CallAgentFlow.prototype, "finalize", 1);
@@ -31476,10 +31992,17 @@ var init_mrtr = __esm({
       /** Per-kind call counters, used to derive stable keys across a replay. */
       counters = { elicitation: 0, sampling: 0, roots: 0 };
       clientCapabilities;
+      /**
+       * Whether the client itself declared this revision. `false` when the SERVER served an
+       * unversioned call as 2026-07-28 (`transport.defaultProtocolVersion`, the Worker default): such a
+       * client, typically a 2025-03-26 one, never agreed to the revision's input-request contract.
+       */
+      clientDeclaredRevision;
       binding;
       constructor(params) {
         this.responses = { ...params.carriedResponses ?? {}, ...params.inputResponses ?? {} };
         this.clientCapabilities = params.clientCapabilities;
+        this.clientDeclaredRevision = params.clientDeclaredRevision ?? true;
         this.binding = params.binding;
       }
       /** True when the client declared the capability a given request kind needs. */
@@ -31832,7 +32355,7 @@ function shouldCreateTask(params) {
   return { kind: "create", owner: ownership.owner };
 }
 async function resumeTask(params) {
-  const { scope, record, authInfo, clientCapabilities, frontmcpContext } = params;
+  const { scope, record, authInfo, clientCapabilities, frontmcpContext, clientDeclaredRevision } = params;
   const registry = scope.tasks;
   const runner = registry?.runner;
   if (!runner) {
@@ -31843,6 +32366,8 @@ async function resumeTask(params) {
     new MrtrExchange({
       carriedResponses: record.inputResponses ?? {},
       clientCapabilities,
+      // A caller that never declared the revision is refused an elicitation as a legacy caller is.
+      clientDeclaredRevision,
       binding: {
         principal: resolveTaskPrincipal(authInfo),
         binding: computeRequestBinding("tasks/resume", { name: record.taskId })
@@ -31889,6 +32414,7 @@ async function dispatch20260728(options) {
     scope,
     body,
     clientCapabilities,
+    clientDeclaredRevision,
     frontmcpContext,
     authInfo,
     isAnonymous,
@@ -31935,7 +32461,8 @@ async function dispatch20260728(options) {
         record,
         authInfo: { ...authInfo ?? {}, sessionId: ownership.owner },
         clientCapabilities,
-        frontmcpContext
+        frontmcpContext,
+        clientDeclaredRevision
       })
     });
     return outcome.kind === "result" ? { kind: "result", result: decorate(outcome.result) } : outcome;
@@ -31965,7 +32492,8 @@ async function dispatch20260728(options) {
     inputResponses: params["inputResponses"],
     carriedResponses: carried.ok ? carried.responses : {},
     clientCapabilities,
-    binding
+    binding,
+    clientDeclaredRevision
   });
   frontmcpContext?.setMrtrExchange(exchange);
   if (notificationSink) frontmcpContext?.setRequestNotificationSink(notificationSink);
@@ -35442,13 +35970,13 @@ var init_esm_module_loader = __esm({
             URL.revokeObjectURL(url);
           }
         }
-        const { ensureDir, fileExists: fileExists9, sha256Hex: sha256Hex13, writeFile } = await import("@frontmcp/utils");
+        const { ensureDir, fileExists: fileExists9, sha256Hex: sha256Hex14, writeFile } = await import("@frontmcp/utils");
         const nodePath = await import("node:path");
         const nodeOs = await import("node:os");
         const { pathToFileURL } = await import("node:url");
         const dir = nodePath.join(nodeOs.tmpdir(), "frontmcp-esm-modules");
         await ensureDir(dir);
-        const tempPath = nodePath.join(dir, `${sha256Hex13(bundleContent)}.mjs`);
+        const tempPath = nodePath.join(dir, `${sha256Hex14(bundleContent)}.mjs`);
         if (!await fileExists9(tempPath)) {
           await writeFile(tempPath, bundleContent);
         }
@@ -37187,7 +37715,7 @@ var init_oauth_authorize_flow = __esm({
     });
     inputSchema16 = httpInputSchema;
     stateSchema15 = z65.object({
-      isDefaultAuthProvider: z65.boolean().describe("If FrontMcp initialized without auth options"),
+      isDefaultAuthProvider: z65.boolean().describe("No sign-in to run: no auth options, or public mode (the same configuration, written out)"),
       isOrchestrated: z65.boolean().describe("If FrontMcp is orchestrated (local oauth proxy, remote oauth proxy)"),
       allowAnonymous: z65.boolean().describe("Allow anonymous access, force orchestrated mode"),
       // Validated OAuth request (after validation)
@@ -37253,9 +37781,13 @@ var init_oauth_authorize_flow = __esm({
        * Returns `undefined` when the configured auth instance has no issuer, so the
        * parameter is simply omitted rather than emitted empty — a client validating
        * `iss` treats absence as "not supported" and proceeds.
+       *
+       * With `request`, the issuer the tokens redeemed for this request name
+       * (`LocalPrimaryAuth.issuerFor`); without it, the boot-time issuer.
        */
-      resolveIssuer() {
-        const issuer = this.scope.auth?.issuer;
+      resolveIssuer(request) {
+        const auth = this.scope.auth;
+        const issuer = request && auth?.issuerFor ? auth.issuerFor(request) : auth?.issuer;
         return typeof issuer === "string" && issuer.length > 0 ? issuer : void 0;
       }
       logger = this.scope.logger.child("OauthAuthorizeFlow");
@@ -37295,7 +37827,7 @@ var init_oauth_authorize_flow = __esm({
           }
         }
         const existingSessionId = request.query["session_id"];
-        const isDefaultAuthProvider = !metadata.auth;
+        const isDefaultAuthProvider = !metadata.auth || isPublicMode(metadata.auth);
         let requiresFederatedLogin = false;
         if (metadata.auth && isOrchestratedMode(metadata.auth)) {
           const configProviders = getConfiguredProviderIds(metadata.auth);
@@ -37368,11 +37900,26 @@ var init_oauth_authorize_flow = __esm({
           if (result2.data.state) {
             url.searchParams.set("state", result2.data.state);
           }
-          const issuer = this.resolveIssuer();
+          const issuer = this.resolveIssuer(this.rawInput.request);
           if (issuer) url.searchParams.set("iss", issuer);
           this.respond(httpRespond.redirect(url.toString()));
           return;
         }
+        const authConfig = this.scope.metadata.auth;
+        if (!authConfig || !isOrchestratedMode(authConfig)) {
+          const mode = authConfig?.mode ?? "public";
+          this.logger.warn(`Authorization request refused: auth mode ${mode} does not sign users in`);
+          this.respond(
+            this.htmlPage(
+              this.renderErrorPage(
+                "unsupported_response_type",
+                `This server does not sign users in (auth mode: ${mode}). Present its access token instead.`
+              ),
+              400
+            )
+          );
+          return;
+        }
         const result = oauthAuthorizeRequestSchema.safeParse({
           response_type: request.query["response_type"],
           client_id: request.query["client_id"],
@@ -37408,10 +37955,10 @@ var init_oauth_authorize_flow = __esm({
         const redirectAllowlisted = !!registry?.hasRedirectAllowlist() && registry.isRedirectUriAllowed(redirect_uri);
         let redirectVerified = redirectAllowlisted;
         const isCimdClientId2 = !!cimdService?.enabled && cimdService.isCimdClientId(client_id);
-        const dcrError = this.checkDcrAllowlist(client_id, redirect_uri, isCimdClientId2);
-        if (dcrError) {
-          this.logger.warn(`OAuth authorize: DCR allowlist rejection \u2014 ${dcrError}`);
-          this.respondWithError([dcrError], redirectVerified ? redirect_uri : void 0, rawState);
+        const redirectError = this.checkDcrRedirectAllowlist(redirect_uri);
+        if (redirectError) {
+          this.logger.warn(`OAuth authorize: DCR allowlist rejection \u2014 ${redirectError}`);
+          this.respondWithError([redirectError], void 0, rawState);
           return;
         }
         if (isCimdClientId2) {
@@ -37435,24 +37982,34 @@ var init_oauth_authorize_flow = __esm({
             return;
           }
         }
-        if (!isCimdClientId2) {
-          const registered = registry?.get?.(client_id);
-          if (registered) {
-            if (!registered.redirect_uris.includes(redirect_uri)) {
-              this.logger.warn(`OAuth authorize: redirect_uri "${redirect_uri}" not registered for client "${client_id}"`);
-              this.respondWithError(["redirect_uri is not registered for this client"], void 0, rawState);
-              return;
-            }
-            redirectVerified = true;
-          } else if (authOptions?.requireRegisteredClients !== false) {
-            this.logger.warn(`OAuth authorize: rejecting unregistered client_id "${client_id}" (requireRegisteredClients)`);
-            this.respondWithError(
-              ["Unknown client_id: register the client (DCR / pre-registered) or use a CIMD client-id URL"],
-              void 0,
-              rawState
-            );
+        const registered = isCimdClientId2 ? void 0 : registry?.get?.(client_id);
+        if (registered) {
+          if (!registered.redirect_uris.includes(redirect_uri)) {
+            this.logger.warn(`OAuth authorize: redirect_uri "${redirect_uri}" not registered for client "${client_id}"`);
+            this.respondWithError(["redirect_uri is not registered for this client"], void 0, rawState);
             return;
           }
+          redirectVerified = true;
+        }
+        const clientIdError = isCimdClientId2 ? void 0 : this.checkDcrClientIdAllowlist(client_id);
+        if (clientIdError) {
+          this.logger.warn(`OAuth authorize: DCR allowlist rejection \u2014 ${clientIdError}`);
+          this.respondWithError(
+            [clientIdError],
+            redirectVerified ? redirect_uri : void 0,
+            rawState,
+            "unauthorized_client"
+          );
+          return;
+        }
+        if (!isCimdClientId2 && !registered && authOptions?.requireRegisteredClients !== false) {
+          this.logger.warn(`OAuth authorize: rejecting unregistered client_id "${client_id}" (requireRegisteredClients)`);
+          this.respondWithError(
+            ["Unknown client_id: register the client (DCR / pre-registered) or use a CIMD client-id URL"],
+            void 0,
+            rawState
+          );
+          return;
         }
         const canonicalResource = computeResource(request, this.scope.entryPath, this.scope.routeBase);
         if (!validatedRequest.resource) {
@@ -37893,26 +38450,28 @@ var init_oauth_authorize_flow = __esm({
         return httpRespond.html(markup, status, builtInAuthPageHeaders());
       }
       /**
-       * Enforce the local-AS DCR allowlists (#462) at authorize time. Returns a
-       * human-readable rejection reason, or `undefined` when the request is allowed
-       * (including when no allowlist is configured, or the auth instance does not
-       * expose a DCR registry — e.g. non-local modes).
-       *
-       * - `allowedRedirectUris`: applies to ALL clients (CIMD or not) as an
-       *   open-redirect / lateral-movement guard.
-       * - `allowedClientIds`: applies only to non-CIMD client ids; CIMD URLs are
-       *   validated by the CIMD layer instead.
+       * Enforce the local-AS DCR `allowedRedirectUris` (#462) at authorize time,
+       * for ALL clients (CIMD or not) as an open-redirect / lateral-movement guard.
+       * Returns a human-readable rejection reason, or `undefined` when the
+       * redirect_uri is allowed (including when no allowlist is configured, or the
+       * auth instance does not expose a DCR registry — e.g. non-local modes).
        */
-      checkDcrAllowlist(clientId, redirectUri, isCimdClientId2) {
-        const auth = this.scope.auth;
-        const registry = auth?.dcrClientRegistry;
-        if (!registry) {
-          return void 0;
-        }
-        if (registry.hasRedirectAllowlist() && !registry.isRedirectUriAllowed(redirectUri)) {
+      checkDcrRedirectAllowlist(redirectUri) {
+        const registry = this.scope.auth?.dcrClientRegistry;
+        if (registry?.hasRedirectAllowlist() && !registry.isRedirectUriAllowed(redirectUri)) {
           return `redirect_uri "${redirectUri}" is not in the configured allowlist`;
         }
-        if (!isCimdClientId2 && registry.hasClientIdAllowlist() && !registry.isClientIdAllowed(clientId)) {
+        return void 0;
+      }
+      /**
+       * Enforce the local-AS DCR `allowedClientIds` (#462) at authorize time, for
+       * non-CIMD client ids (the caller skips CIMD URLs, which the CIMD layer
+       * validates). Returns a human-readable rejection reason, or `undefined` when
+       * the client is allowed or no allowlist is configured.
+       */
+      checkDcrClientIdAllowlist(clientId) {
+        const registry = this.scope.auth?.dcrClientRegistry;
+        if (registry?.hasClientIdAllowlist() && !registry.isClientIdAllowed(clientId)) {
           return `client_id "${clientId}" is not in the configured allowlist`;
         }
         return void 0;
@@ -37927,24 +38486,29 @@ var init_oauth_authorize_flow = __esm({
         });
       }
       /**
-       * Respond with OAuth error - redirect if possible, otherwise show error page
+       * Respond with OAuth error - redirect if possible, otherwise show error page.
+       *
+       * @param redirectUri A redirect_uri validated for the client; omit it for an error page.
+       * @param error       The RFC 6749 §4.1.2.1 error code. Default `invalid_request`.
        */
-      respondWithError(errors, redirectUri, state) {
+      respondWithError(errors, redirectUri, state, error = "invalid_request") {
         const errorDescription = errors.join("; ");
         if (redirectUri) {
           const safe = safeRedirectUriSchema.safeParse(redirectUri);
           if (safe.success) {
             const url = new URL(safe.data);
-            url.searchParams.set("error", "invalid_request");
+            url.searchParams.set("error", error);
             url.searchParams.set("error_description", errorDescription);
             if (state) {
               url.searchParams.set("state", state);
             }
+            const issuer = this.resolveIssuer(this.rawInput.request);
+            if (issuer) url.searchParams.set("iss", issuer);
             this.respond(httpRespond.redirect(url.toString()));
             return;
           }
         }
-        this.respond(this.htmlPage(this.renderErrorPage("invalid_request", errorDescription), 400));
+        this.respond(this.htmlPage(this.renderErrorPage(error, errorDescription), 400));
       }
       /**
        * Render the local login page.
@@ -38223,9 +38787,13 @@ var init_oauth_callback_flow = __esm({
        * Returns `undefined` when the configured auth instance has no issuer, so the
        * parameter is simply omitted rather than emitted empty — a client validating
        * `iss` treats absence as "not supported" and proceeds.
+       *
+       * With `request`, the issuer the tokens redeemed for this request name
+       * (`LocalPrimaryAuth.issuerFor`); without it, the boot-time issuer.
        */
-      resolveIssuer() {
-        const issuer = this.scope.auth?.issuer;
+      resolveIssuer(request) {
+        const auth = this.scope.auth;
+        const issuer = request && auth?.issuerFor ? auth.issuerFor(request) : auth?.issuer;
         return typeof issuer === "string" && issuer.length > 0 ? issuer : void 0;
       }
       async checkIpFilter() {
@@ -38763,7 +39331,7 @@ var init_oauth_callback_flow = __esm({
         if (originalState) {
           url.searchParams.set("state", originalState);
         }
-        const issuer = this.resolveIssuer();
+        const issuer = this.resolveIssuer(this.rawInput.request);
         if (issuer) url.searchParams.set("iss", issuer);
         if (isIncremental && targetAppId) {
           url.searchParams.set("incremental", "true");
@@ -40094,7 +40662,7 @@ var init_oauth_provider_callback_flow = __esm({
         if (session.state) {
           url.searchParams.set("state", session.state);
         }
-        url.searchParams.set("iss", this.getLocalAuth().issuer);
+        url.searchParams.set("iss", this.getLocalAuth().issuerFor(this.rawInput.request));
         this.logger.info(
           `Federated auth complete: ${selectedProviderIds.length} providers authenticated, redirecting to client`
         );
@@ -40665,7 +41233,7 @@ var init_oauth_token_flow = __esm({
     stateSchema20 = z70.object({
       body: tokenRequestSchema.optional(),
       grantType: z70.enum(["authorization_code", "refresh_token", "anonymous"]).optional(),
-      isDefaultAuthProvider: z70.boolean().describe("If FrontMcp initialized without auth options"),
+      isDefaultAuthProvider: z70.boolean().describe("No sign-in to run: no auth options, or public mode (the same configuration, written out)"),
       isOrchestrated: z70.boolean().describe("If auth mode is orchestrated"),
       // Token response data
       tokenResponse: z70.object({
@@ -40695,7 +41263,7 @@ var init_oauth_token_flow = __esm({
       async parseInput() {
         const { metadata } = this.scope;
         const { request } = this.rawInput;
-        const isDefaultAuthProvider = !metadata.auth;
+        const isDefaultAuthProvider = !metadata.auth || isPublicMode(metadata.auth);
         const isOrchestrated = !isDefaultAuthProvider;
         const rawBody = coerceTokenRequestBody(request);
         const basic = parseBasicAuthorization(request.headers?.["authorization"]);
@@ -40744,7 +41312,10 @@ var init_oauth_token_flow = __esm({
         const authOptions = this.scope.auth?.options;
         if (isDefaultAuthProvider && body.code === "anonymous" && !!authOptions && allowsPublicAccess(authOptions)) {
           const localAuth2 = this.scope.auth;
-          const accessToken = await localAuth2.signAnonymousJwt({ audience: this.canonicalResource() });
+          const accessToken = await localAuth2.signAnonymousJwt({
+            audience: this.canonicalResource(),
+            issuer: localAuth2.issuerFor(this.rawInput.request)
+          });
           this.state.set("tokenResponse", {
             access_token: accessToken,
             token_type: "Bearer",
@@ -40760,7 +41331,8 @@ var init_oauth_token_flow = __esm({
           body.redirect_uri,
           body.code_verifier,
           body.client_secret,
-          this.canonicalResource()
+          this.canonicalResource(),
+          localAuth.issuerFor(this.rawInput.request)
         );
         if ("error" in result) {
           this.logger.warn(`Code exchange failed: ${result.error}`);
@@ -40798,7 +41370,10 @@ var init_oauth_token_flow = __esm({
             return;
           }
           const localAuth2 = this.scope.auth;
-          const accessToken = await localAuth2.signAnonymousJwt({ audience: this.canonicalResource() });
+          const accessToken = await localAuth2.signAnonymousJwt({
+            audience: this.canonicalResource(),
+            issuer: localAuth2.issuerFor(this.rawInput.request)
+          });
           this.state.set("tokenResponse", {
             access_token: accessToken,
             token_type: "Bearer",
@@ -40812,7 +41387,8 @@ var init_oauth_token_flow = __esm({
           body.refresh_token,
           body.client_id,
           body.client_secret,
-          this.canonicalResource()
+          this.canonicalResource(),
+          localAuth.issuerFor(this.rawInput.request)
         );
         if ("error" in result) {
           this.logger.warn(`Refresh token failed: ${result.error}`);
@@ -40868,7 +41444,10 @@ var init_oauth_token_flow = __esm({
         }
         const localAuth = this.scope.auth;
         const audience = body?.grant_type === "anonymous" && body.resource ? body.resource : canonicalResource;
-        const accessToken = await localAuth.signAnonymousJwt({ audience });
+        const accessToken = await localAuth.signAnonymousJwt({
+          audience,
+          issuer: localAuth.issuerFor(this.rawInput.request)
+        });
         this.state.set("tokenResponse", {
           access_token: accessToken,
           token_type: "Bearer",
@@ -40996,7 +41575,8 @@ var init_oauth_userinfo_flow = __esm({
           return;
         }
         const localAuth = this.scope.auth;
-        const result = await localAuth.verifyGatewayToken(token, baseUrl);
+        const issuer = localAuth.acceptedIssuersFor?.(this.rawInput.request);
+        const result = await localAuth.verifyGatewayToken(token, baseUrl, void 0, issuer);
         if (!result.ok) {
           this.logger.warn("userinfo: token verification failed", { error: result.error });
           this.respond(
@@ -41054,6 +41634,7 @@ var init_oauth_userinfo_flow = __esm({
 // libs/sdk/src/auth/flows/session.verify.flow.ts
 import "reflect-metadata";
 import {
+  anonymousCallerClaims,
   buildInsufficientScopeHeader,
   buildInvalidTokenHeader,
   buildUnauthorizedHeader,
@@ -41090,7 +41671,14 @@ var init_session_verify_flow = __esm({
     init_common();
     init_notification_service();
     init_session_id_utils();
-    inputSchema23 = httpRequestInputSchema;
+    inputSchema23 = httpRequestInputSchema.extend({
+      /**
+       * The request is served without a session (MCP 2026-07-28): an anonymous or static-key caller is
+       * identified for this request only, and no session is minted for it (#629). Minting one needs
+       * `MCP_SESSION_SECRET`, for a session id the client would never present.
+       */
+      sessionless: z72.boolean().optional()
+    });
     stateSchema22 = z72.object({
       baseUrl: z72.string().min(1),
       authorizationHeader: z72.string().optional(),
@@ -41148,20 +41736,22 @@ var init_session_verify_flow = __esm({
        * Encapsulates the shared logic for session creation, payload encryption, and user derivation.
        */
       createAnonymousSession(options) {
-        const { authMode, issuer, scopes = ["anonymous"], subject, sessionIdHeader } = options;
+        const { authMode, subject, sessionIdHeader } = options;
         this.logger.verbose("createAnonymousSession", { authMode, hasExistingSession: !!sessionIdHeader });
+        if (this.rawInput.sessionless) {
+          this.respond({
+            kind: "authorized",
+            authorization: { token: "", user: anonymousCallerClaims(options, randomUUID20()) }
+          });
+          return;
+        }
         const machineId = getMachineId2();
         const authSignature = subject ? `${authMode}:${subject}` : authMode;
         if (sessionIdHeader) {
           const existingPayload = decryptPublicSession(sessionIdHeader, authSignature);
           if (existingPayload && existingPayload.nodeId === machineId) {
             const anonId = existingPayload.uuid ?? `${existingPayload.iat * 1e3}`;
-            const user2 = {
-              sub: subject ?? `anon:${anonId}`,
-              iss: issuer,
-              name: subject ? "Static token" : "Anonymous",
-              scope: scopes.join(" ")
-            };
+            const user2 = anonymousCallerClaims(options, anonId);
             this.respond({
               kind: "authorized",
               authorization: {
@@ -41175,13 +41765,8 @@ var init_session_verify_flow = __esm({
           this.logger.verbose("createAnonymousSession: ignoring unrecognized client session id; minting a fresh one");
         }
         const now = Date.now();
-        const user = {
-          sub: subject ?? `anon:${randomUUID20()}`,
-          iss: issuer,
-          name: subject ? "Static token" : "Anonymous",
-          scope: scopes.join(" ")
-        };
         const uuid = randomUUID20();
+        const user = anonymousCallerClaims(options, uuid);
         const platformDetectionConfig = this.scope.metadata.transport?.platformDetection;
         const platformType = detectPlatformFromUserAgent(this.state.userAgent, platformDetectionConfig);
         const payload = {
@@ -41374,7 +41959,8 @@ var init_session_verify_flow = __esm({
         } else {
           const configuredAudience = isOrchestratedMode(authOptions) ? authOptions.expectedAudience : void 0;
           const resource = computeResource(this.rawInput.request, this.scope.entryPath, this.scope.routeBase);
-          verify = auth.verifyGatewayToken(token, this.state.required.baseUrl, configuredAudience ?? resource);
+          const issuer = auth.acceptedIssuersFor?.(this.rawInput.request);
+          verify = auth.verifyGatewayToken(token, this.state.required.baseUrl, configuredAudience ?? resource, issuer);
         }
         const result = await verify;
         if (result.ok) {
@@ -41621,6 +42207,7 @@ var init_well_known_jwks_flow = __esm({
 
 // libs/sdk/src/auth/flows/well-known.oauth-authorization-server.flow.ts
 import "reflect-metadata";
+import { advertisedScopes } from "@frontmcp/auth";
 import { z as z74 } from "@frontmcp/lazy-zod";
 import { isProduction as isProduction4 } from "@frontmcp/utils";
 function resolveDcrEnabled(auth) {
@@ -41665,6 +42252,9 @@ var init_well_known_oauth_authorization_server_flow = __esm({
     wellKnownAsStateSchema = z74.object({
       baseUrl: z74.string().min(1),
       // baseUrl + entryPrefix (unsuffixed)
+      // The issuer this server names in answer to the request (`LocalPrimaryAuth.issuerFor`, #629): the
+      // one on its authorization responses and tokens. Without it, `baseUrl`.
+      issuer: z74.string().min(1).optional(),
       // Root origin (proto://host WITHOUT the entryPath prefix). The OAuth
       // endpoints (/oauth/authorize, /oauth/token, /oauth/register, …) are
       // registered at literal root paths by their flows, NOT under entryPath, so
@@ -41696,6 +42286,9 @@ var init_well_known_oauth_authorization_server_flow = __esm({
         if (!request) throw new FlowInputMissingError("request", "well-known:oauth-authorization-server");
         const { metadata } = this.scope;
         const baseUrl = getRequestBaseUrl(request, this.scope.entryPath);
+        const issuer = this.scope.auth?.issuerFor?.(
+          request
+        );
         const oauthBaseUrl = getRequestBaseUrl(request);
         let cimdEnabled = true;
         if (metadata.auth && isOrchestratedMode(metadata.auth)) {
@@ -41704,8 +42297,11 @@ var init_well_known_oauth_authorization_server_flow = __esm({
         this.state.set(
           wellKnownAsStateSchema.parse({
             baseUrl,
+            issuer,
             oauthBaseUrl,
-            scopesSupported: [],
+            // The scopes this server grants (`allowedScopes`, #262): the literal
+            // entries; a `*` glob names no scope a client could ask for.
+            scopesSupported: metadata.auth && isOrchestratedMode(metadata.auth) ? advertisedScopes(metadata.auth.allowedScopes) : [],
             tokenEndpointAuthMethods: [],
             // #462 — advertise registration_endpoint only when local-AS DCR is
             // actually active (explicit auth.dcr.enabled, else dev/prod default).
@@ -41716,6 +42312,7 @@ var init_well_known_oauth_authorization_server_flow = __esm({
         );
       }
       async collectData() {
+        const { issuer } = this.state;
         const {
           baseUrl,
           oauthBaseUrl,
@@ -41726,7 +42323,7 @@ var init_well_known_oauth_authorization_server_flow = __esm({
           cimdEnabled
         } = this.state.required;
         if (isOrchestrated) {
-          const baseIssuer = `${baseUrl}`;
+          const baseIssuer = issuer ?? baseUrl;
           this.respond({
             kind: "json",
             contentType: "application/json; charset=utf-8",
@@ -41753,6 +42350,8 @@ var init_well_known_oauth_authorization_server_flow = __esm({
               grant_types_supported: ["authorization_code", "refresh_token"],
               scopes_supported: scopesSupported,
               code_challenge_methods_supported: ["S256"],
+              // Every authorization response, error responses included, carries `iss` (RFC 9207 §2, §3).
+              authorization_response_iss_parameter_supported: true,
               // CIMD support advertisement per draft-ietf-oauth-client-id-metadata-document-00
               client_id_metadata_document_supported: cimdEnabled
             }
@@ -41789,6 +42388,7 @@ var init_well_known_oauth_authorization_server_flow = __esm({
 
 // libs/sdk/src/auth/flows/well-known.prm.flow.ts
 import "reflect-metadata";
+import { resourceScopesFor } from "@frontmcp/auth";
 import { z as z75 } from "@frontmcp/lazy-zod";
 var inputSchema26, stateSchema24, outputSchema24, plan24, name25, Stage25, WellKnownPrmFlow;
 var init_well_known_prm_flow = __esm({
@@ -41800,14 +42400,16 @@ var init_well_known_prm_flow = __esm({
     stateSchema24 = z75.object({
       resource: z75.string().min(1),
       baseUrl: z75.string().min(1),
-      scopesSupported: z75.array(z75.string()).default(["openid", "profile", "email"]),
+      // The authorization server to name: the issuer this server names for the request (#629).
+      authorizationServer: z75.string().min(1).optional(),
+      scopesSupported: z75.array(z75.string()),
       isOrchestrated: z75.boolean()
     });
     outputSchema24 = HttpJsonSchema.extend({
       body: z75.object({
         resource: z75.string().min(1),
         authorization_servers: z75.array(z75.string().min(1)).min(1),
-        scopes_supported: z75.array(z75.string()).default(["openid", "profile", "email"]),
+        scopes_supported: z75.array(z75.string()).optional(),
         bearer_methods_supported: z75.array(z75.string()).default(["header"])
       }).passthrough()
     });
@@ -41831,11 +42433,17 @@ var init_well_known_prm_flow = __esm({
         if (!request) throw new FlowInputMissingError("request", "well-known:prm");
         const resource = computeResource(request, scope.entryPath, scope.routeBase);
         const baseUrl = getRequestBaseUrl(request, scope.entryPath);
+        const authorizationServer = scope.auth?.issuerFor?.(request);
+        const authOptions = scope.auth?.options ?? scope.metadata.auth;
+        const granted = resourceScopesFor(authOptions);
+        const orchestrated = authOptions?.mode === "local" || authOptions?.mode === "remote";
+        const scopesSupported = orchestrated ? granted : [.../* @__PURE__ */ new Set([...granted, ...scope.getAllSupportedScopes()])];
         this.state.set(
           stateSchema24.parse({
             resource,
             baseUrl,
-            scopesSupported: scope.getAllSupportedScopes(),
+            authorizationServer,
+            scopesSupported,
             isOrchestrated: false
             //scope.orchestrated,// TODO: fix
           })
@@ -41843,6 +42451,8 @@ var init_well_known_prm_flow = __esm({
       }
       async collectData() {
         const { resource, baseUrl, scopesSupported, isOrchestrated } = this.state.required;
+        const { authorizationServer } = this.state;
+        const scopes = scopesSupported.length > 0 ? { scopes_supported: scopesSupported } : {};
         if (isOrchestrated) {
           this.respond({
             kind: "json",
@@ -41854,8 +42464,8 @@ var init_well_known_prm_flow = __esm({
             headers: { "cache-control": "no-store" },
             body: {
               resource,
-              authorization_servers: [baseUrl],
-              scopes_supported: scopesSupported,
+              authorization_servers: [authorizationServer ?? baseUrl],
+              ...scopes,
               bearer_methods_supported: ["header"]
             }
           });
@@ -41868,8 +42478,8 @@ var init_well_known_prm_flow = __esm({
           headers: { "cache-control": "no-store" },
           body: {
             resource,
-            authorization_servers: [baseUrl],
-            scopes_supported: scopesSupported,
+            authorization_servers: [authorizationServer ?? baseUrl],
+            ...scopes,
             bearer_methods_supported: ["header"]
           }
         });
@@ -41899,6 +42509,24 @@ var init_well_known_prm_flow = __esm({
   }
 });
 
+// libs/sdk/src/auth/session-scope-identity.ts
+import { isAnonymousSubject as isAnonymousSubject3 } from "@frontmcp/auth";
+function sessionScopeIdentity(ctx) {
+  const verified = ctx.verifiedSessionId;
+  if (verified) return verified;
+  const authInfo = ctx.authInfo ?? {};
+  const extraUser = authInfo.extra?.["user"];
+  const principal = [authInfo.user?.sub, extraUser?.sub, authInfo.clientId].find(
+    (candidate) => !isAnonymousSubject3(candidate)
+  );
+  return principal ? `principal:${principal}` : void 0;
+}
+var init_session_scope_identity = __esm({
+  "libs/sdk/src/auth/session-scope-identity.ts"() {
+    "use strict";
+  }
+});
+
 // libs/sdk/src/auth/secure-store/secure-store.providers.ts
 import {
   SECURE_STORE_ACCESSOR,
@@ -41906,8 +42534,9 @@ import {
 } from "@frontmcp/auth";
 import { ProviderScope as ProviderScope6 } from "@frontmcp/di";
 function resolveRequestSessionId(ctx) {
-  const sid = ctx.sessionId;
-  return typeof sid === "string" && sid.length > 0 ? sid : void 0;
+  const identity = sessionScopeIdentity(ctx);
+  if (identity) return identity;
+  throw new SessionIdentityRequiredError("The secure store's session scope");
 }
 function createSecureStoreProviders(opts) {
   const { backend, scope, ttlMs } = opts;
@@ -41939,7 +42568,9 @@ var init_secure_store_providers = __esm({
     "use strict";
     init_common();
     init_frontmcp_context_provider();
+    init_session_identity_required_error();
     init_credentials_providers();
+    init_session_scope_identity();
     SECURE_STORE_BACKEND = /* @__PURE__ */ Symbol.for("frontmcp:SECURE_STORE_BACKEND");
   }
 });
@@ -42027,6 +42658,14 @@ function audienceMatchesResource(aud, expected) {
 function isUnsupportedOperation(error) {
   return error instanceof StorageNotSupportedError;
 }
+function originOf2(value) {
+  try {
+    const origin = new URL(value).origin;
+    return origin === "null" ? void 0 : origin;
+  } catch {
+    return void 0;
+  }
+}
 var MIN_HS256_SECRET_BYTES, defaultNoAuthSecret, RESERVED_JWT_CLAIMS, LocalPrimaryAuth;
 var init_instance_local_primary_auth = __esm({
   "libs/sdk/src/auth/instances/instance.local-primary-auth.ts"() {
@@ -42079,6 +42718,7 @@ var init_instance_local_primary_auth = __esm({
         this.port = this.providers.getActiveScope().metadata.http?.port ?? 3001;
         this.host = getEnv4("FRONTMCP_PUBLIC_HOST")?.trim() || "localhost";
         this.issuer = this.deriveIssuer(options);
+        this.publicHostPinned = !!getEnv4("FRONTMCP_PUBLIC_HOST")?.trim();
         const jwtSecret = getEnv4("JWT_SECRET");
         const hasJwtSecret = !!jwtSecret?.trim();
         if (hasJwtSecret && jwtSecret) {
@@ -42117,7 +42757,10 @@ var init_instance_local_primary_auth = __esm({
       providers;
       host;
       port;
+      /** The boot-time issuer: the configured one, else this server's listener address (see {@link issuerFor}). */
       issuer;
+      /** Whether `FRONTMCP_PUBLIC_HOST` names the boot-time issuer's host, pinning it for every request. */
+      publicHostPinned;
       keys = [];
       secret;
       logger;
@@ -42266,18 +42909,61 @@ var init_instance_local_primary_auth = __esm({
        * supported knob for aligning the issuer with discovery.
        */
       deriveIssuer(options) {
-        const basePath = `http://${this.host}:${this.port}${this.scope.fullPath}`;
-        if (isPublicMode(options)) {
-          return options.issuer ?? basePath;
-        }
-        if (isOrchestratedMode(options)) {
-          if (isOrchestratedLocal(options)) {
-            return options.local?.issuer ?? basePath;
-          } else {
-            return options.local?.issuer ?? basePath;
-          }
+        return this.configuredIssuer(options) ?? `http://${this.host}:${this.port}${this.scope.fullPath}`;
+      }
+      /** The issuer the options name: `issuer` in public mode, `local.issuer` in local and remote mode. */
+      configuredIssuer(options) {
+        if (isPublicMode(options)) return options.issuer;
+        if (isOrchestratedMode(options)) return options.local?.issuer;
+        return void 0;
+      }
+      /**
+       * The issuer this server names in answer to `request`: in its discovery
+       * documents (`/.well-known/oauth-authorization-server`'s `issuer`, the
+       * protected resource metadata's `authorization_servers`), on its
+       * authorization responses (the RFC 9207 `iss`, errors included), and as the
+       * `iss` of the tokens it issues; the tokens it accepts there must name it
+       * (#269, and see {@link acceptedIssuersFor}). Every entry point asks this, so
+       * none of them can disagree, on the Node server and under a Web fetch
+       * handler alike (#629). In order:
+       *
+       * 1. a configured issuer (`issuer` / `local.issuer`);
+       * 2. with `FRONTMCP_PUBLIC_URL` pinned, that URL plus this scope's path;
+       * 3. with `FRONTMCP_PUBLIC_HOST` set, the boot-time issuer it names the host
+       *    of (`http://<host>:<http.port><path>`);
+       * 4. the request's own origin plus this scope's path;
+       * 5. without a request, the boot-time issuer.
+       */
+      issuerFor(request) {
+        const configured = this.configuredIssuer(this.options);
+        if (configured !== void 0) return configured;
+        const pinned = getPinnedPublicUrl();
+        if (pinned !== void 0) {
+          return request ? computeIssuer(request, this.scope.entryPath, this.scope.routeBase) : `${pinned}${this.scope.fullPath}`;
+        }
+        if (this.publicHostPinned || !request) return this.issuer;
+        return computeIssuer(request, this.scope.entryPath, this.scope.routeBase);
+      }
+      /**
+       * The issuers a token presented with `request` may name: {@link issuerFor}
+       * the request. When the issuer follows the request (nothing pins it) and
+       * local or remote mode lists `expectedAudience`, a token for any listed
+       * address was issued under that address's issuer, so each listed address's
+       * issuer is accepted too, and so is the boot-time issuer that 1.8.4 named on
+       * those tokens. The token's `aud` must still name a listed resource.
+       */
+      acceptedIssuersFor(request) {
+        const issuer = this.issuerFor(request);
+        const options = this.options;
+        const followsRequest = !!request && this.configuredIssuer(options) === void 0 && getPinnedPublicUrl() === void 0 && !this.publicHostPinned;
+        if (!followsRequest || !isOrchestratedMode(options) || options.expectedAudience === void 0) return issuer;
+        const listed = Array.isArray(options.expectedAudience) ? options.expectedAudience : [options.expectedAudience];
+        const accepted = /* @__PURE__ */ new Set([issuer, this.issuer]);
+        for (const audience of listed) {
+          const origin = originOf2(audience);
+          if (origin) accepted.add(`${origin}${this.scope.fullPath}`);
         }
-        return basePath;
+        return [...accepted];
       }
       /**
        * Read the `tokenStorage` selection off the auth options. Only
@@ -42508,9 +43194,10 @@ var init_instance_local_primary_auth = __esm({
        * user, and its scopes are the configured `anonymousScopes`, never a role.
        *
        * @param options.audience The protected resource the token is for (`aud`, #269).
+       * @param options.issuer   The issuer to name (`iss`): {@link issuerFor} the request. Default: the boot-time issuer.
        */
       async signAnonymousJwt(options = {}) {
-        const jwt = new SignJWT({ sub: `anon:${randomUUID21()}`, anonymous: true, scope: this.anonymousScopes().join(" ") }).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt().setIssuer(this.issuer).setExpirationTime("1d").setJti(randomUUID21());
+        const jwt = new SignJWT({ sub: `anon:${randomUUID21()}`, anonymous: true, scope: this.anonymousScopes().join(" ") }).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt().setIssuer(options.issuer ?? this.issuer).setExpirationTime("1d").setJti(randomUUID21());
         if (options.audience) jwt.setAudience(options.audience);
         return jwt.sign(this.secret);
       }
@@ -42527,8 +43214,10 @@ var init_instance_local_primary_auth = __esm({
        *
        * The secret alone doesn't make a token this server's: every server started
        * with the same JWT_SECRET holds it. So a token must also (#269):
-       * - name THIS instance as its issuer (`iss`, the boot-time issuer it signs
-       *   with, never the request-derived base URL), and
+       * - name THIS instance as its issuer (`iss`): `expectedIssuer` (one issuer or
+       *   several), which callers take from {@link acceptedIssuersFor} the request,
+       *   matching what the token endpoint names when it signs ({@link issuerFor});
+       *   the boot-time issuer when not given. Never the token's own claim; and
        * - when `expectedAudience` is given, be issued for that protected resource,
        *   or one of those resources (`aud`, compared as RFC 8707 resource URIs).
        *   `session:verify` passes the request's resource URL, or the configured
@@ -42537,11 +43226,11 @@ var init_instance_local_primary_auth = __esm({
        * Lifetime: `exp` is required (#272) and checked with `nbf` by `jose`. The
        * algorithm is pinned to HS256 to block `alg` confusion.
        */
-      async verifyGatewayToken(token, requestBaseUrl, expectedAudience) {
+      async verifyGatewayToken(token, requestBaseUrl, expectedAudience, expectedIssuer) {
         try {
           const { payload, protectedHeader } = await jwtVerify(token, this.secret, {
             algorithms: ["HS256"],
-            issuer: this.issuer,
+            issuer: typeof expectedIssuer === "string" ? expectedIssuer : expectedIssuer ? [...expectedIssuer] : this.issuer,
             requiredClaims: ["exp"]
           });
           if (expectedAudience !== void 0 && !audienceMatchesResource(payload.aud, expectedAudience)) {
@@ -42562,7 +43251,7 @@ var init_instance_local_primary_auth = __esm({
       /**
        * Sign an access token for an authenticated user
        */
-      async signAccessToken(user, scopes, audience, consentMetadata) {
+      async signAccessToken(user, scopes, audience, consentMetadata, issuer) {
         const claims = {
           sub: user.sub,
           scope: scopes.join(" ")
@@ -42598,7 +43287,7 @@ var init_instance_local_primary_auth = __esm({
             }
           }
         }
-        const jwt = new SignJWT(claims).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt().setIssuer(this.issuer).setExpirationTime(`${this.accessTokenTtlSeconds}s`).setJti(randomUUID21());
+        const jwt = new SignJWT(claims).setProtectedHeader({ alg: "HS256", typ: "JWT" }).setIssuedAt().setIssuer(issuer ?? this.issuer).setExpirationTime(`${this.accessTokenTtlSeconds}s`).setJti(randomUUID21());
         if (audience) {
           jwt.setAudience(audience);
         }
@@ -42607,7 +43296,7 @@ var init_instance_local_primary_auth = __esm({
       /**
        * Exchange an authorization code for tokens
        */
-      async exchangeCode(code, clientId, redirectUri, codeVerifier, clientSecret, defaultAudience) {
+      async exchangeCode(code, clientId, redirectUri, codeVerifier, clientSecret, defaultAudience, issuer) {
         if (this.dcrClientRegistryImpl.verifyClientSecret(clientId, clientSecret) === "invalid") {
           this.logger.warn("Client authentication failed at token endpoint (authorization_code)");
           return { error: "invalid_client", error_description: "Client authentication failed" };
@@ -42674,7 +43363,7 @@ var init_instance_local_primary_auth = __esm({
           customClaims: codeRecord.customClaims
         } : void 0;
         const resource = codeRecord.resource ?? defaultAudience;
-        const accessToken = await this.signAccessToken(user, codeRecord.scopes, resource, consentMetadata);
+        const accessToken = await this.signAccessToken(user, codeRecord.scopes, resource, consentMetadata, issuer);
         if (codeRecord.pendingAuthId && codeRecord.federatedLoginUsed) {
           try {
             const pendingAuthId = `pending:${codeRecord.pendingAuthId}`;
@@ -42716,7 +43405,7 @@ var init_instance_local_primary_auth = __esm({
       /**
        * Refresh an access token using a refresh token
        */
-      async refreshAccessToken(refreshToken, clientId, clientSecret, defaultAudience) {
+      async refreshAccessToken(refreshToken, clientId, clientSecret, defaultAudience, issuer) {
         if (this.dcrClientRegistryImpl.verifyClientSecret(clientId, clientSecret) === "invalid") {
           this.logger.warn("Client authentication failed at token endpoint (refresh_token)");
           return { error: "invalid_client", error_description: "Client authentication failed" };
@@ -42753,7 +43442,7 @@ var init_instance_local_primary_auth = __esm({
           customClaims: tokenRecord.customClaims
         } : void 0;
         const resource = tokenRecord.resource ?? defaultAudience;
-        const accessToken = await this.signAccessToken(user, tokenRecord.scopes, resource, consentMetadata);
+        const accessToken = await this.signAccessToken(user, tokenRecord.scopes, resource, consentMetadata, issuer);
         const newRefreshRecord = this.authorizationStore.createRefreshTokenRecord({
           clientId,
           userSub: tokenRecord.userSub,
@@ -43497,6 +44186,111 @@ var init_auth_registry = __esm({
   }
 });
 
+// libs/sdk/src/server/custom-routes.helper.ts
+function computeReservedPaths(entryPath, routeBase) {
+  const prefix = normalizeEntryPrefix(entryPath);
+  const base = normalizeScopeBase(routeBase);
+  const mcpBase = `${prefix}${base}`;
+  const exact = /* @__PURE__ */ new Set([
+    mcpBase === "" ? "/" : mcpBase,
+    `${mcpBase}/sse`,
+    `${mcpBase}/message`,
+    "/health",
+    "/metrics"
+  ]);
+  return { exact, prefixes: ["/oauth", "/.well-known"] };
+}
+function normalizeForCompare(path3) {
+  if (path3.length > 1 && path3.endsWith("/")) return path3.slice(0, -1);
+  return path3;
+}
+function assertNotReserved(method, path3, reserved) {
+  const normalized = normalizeForCompare(path3);
+  if (reserved.exact.has(normalized)) {
+    throw new ReservedRouteCollisionError(method, path3, normalized);
+  }
+  for (const prefix of reserved.prefixes) {
+    if (normalized === prefix || normalized.startsWith(`${prefix}/`)) {
+      throw new ReservedRouteCollisionError(method, path3, prefix);
+    }
+  }
+}
+function wrapWithAuth(handler, verifySession, logger) {
+  return async (req, res, next) => {
+    let result;
+    try {
+      result = await verifySession(req);
+    } catch (error) {
+      if (error instanceof FlowControl && error.type === "respond") {
+        result = error.output;
+      } else {
+        throw error;
+      }
+    }
+    if (!result || result.kind === "unauthorized") {
+      logger.verbose("custom-route auth: unauthorized");
+      return writeHttpResponse(
+        res,
+        httpRespond.unauthorized({
+          headers: result?.kind === "unauthorized" ? { "WWW-Authenticate": result.prmMetadataHeader } : void 0
+        })
+      );
+    }
+    if (result.kind === "forbidden") {
+      logger.verbose("custom-route auth: forbidden (insufficient scope)");
+      return writeHttpResponse(
+        res,
+        httpRespond.forbidden({
+          headers: { "WWW-Authenticate": result.prmMetadataHeader }
+        })
+      );
+    }
+    req.authSession = result.authorization;
+    req[ServerRequestTokens.auth] = result.authorization;
+    return handler(req, res, next);
+  };
+}
+function wrapWithIpFilter(handler, checkClientIp) {
+  return async (req, res, next) => {
+    const rejection = await checkClientIp(req, res);
+    if (rejection) return writeHttpResponse(res, rejection);
+    return handler(req, res, next);
+  };
+}
+function registerCustomHttpRoutes(args) {
+  const { routes, server, verifySession, checkClientIp, entryPath, routeBase, logger } = args;
+  if (!routes || routes.length === 0) return;
+  const reserved = computeReservedPaths(entryPath, routeBase);
+  for (const route of routes) {
+    assertNotReserved(route.method, route.path, reserved);
+    const handler = route.auth === true ? wrapWithAuth(route.handler, verifySession, logger) : route.handler;
+    server.registerRoute(route.method, route.path, wrapWithIpFilter(handler, checkClientIp));
+    logger.info(`Registered custom http route: ${route.method} ${route.path}${route.auth ? " (auth)" : ""}`);
+  }
+}
+var ReservedRouteCollisionError;
+var init_custom_routes_helper = __esm({
+  "libs/sdk/src/server/custom-routes.helper.ts"() {
+    "use strict";
+    init_common();
+    init_server_validation();
+    ReservedRouteCollisionError = class extends Error {
+      constructor(method, path3, reserved) {
+        super(
+          `Custom http.route "${method} ${path3}" collides with the reserved FrontMCP path "${reserved}". Reserved prefixes are the MCP entry path (and its /sse + /message siblings), /oauth/*, /.well-known/*, /health, and /metrics. Choose a different path.`
+        );
+        this.method = method;
+        this.path = path3;
+        this.reserved = reserved;
+        this.name = "ReservedRouteCollisionError";
+      }
+      method;
+      path;
+      reserved;
+    };
+  }
+});
+
 // libs/sdk/src/channel/channel-notification.service.ts
 var CHANNEL_NOTIFICATION_METHOD, ChannelNotificationService;
 var init_channel_notification_service = __esm({
@@ -44466,6 +45260,12 @@ function wireJobCompletionSource(channel2, sourceConfig, jobEmitterSubscribe, lo
         return;
       }
     }
+    if (!event.sessionId) {
+      logger.verbose(
+        `Skipping job completion for channel "${channel2.name}": no sessionId (prevents cross-session leak)`
+      );
+      return;
+    }
     logger.verbose(`Job completion event for channel "${channel2.name}": job=${event.jobName}, status=${event.status}`);
     channel2.handleEvent(event, event.sessionId).catch((err) => {
       logger.error(`Failed to handle job completion event in channel "${channel2.name}"`, { error: err });
@@ -44478,6 +45278,41 @@ var init_job_completion_source = __esm({
   }
 });
 
+// libs/sdk/src/channel/sources/webhook.source.ts
+function createWebhookMiddleware(channel2, sourceConfig, logger) {
+  return async (req, res) => {
+    const rawHeaders = req.headers ?? {};
+    const normalizedHeaders = {};
+    for (const [key, value] of Object.entries(rawHeaders)) {
+      normalizedHeaders[key.toLowerCase()] = value;
+    }
+    const payload = {
+      body: req.body,
+      headers: normalizedHeaders,
+      method: req.method ?? "POST",
+      query: req.query
+    };
+    logger.verbose(`Webhook received for channel "${channel2.name}" at ${sourceConfig.path}`);
+    try {
+      const notification = await runOnSurface("http-trigger", () => channel2.handleEvent(payload));
+      if (notification) {
+        res.status(200).json({ ok: true, channel: channel2.name });
+      } else {
+        res.status(200).json({ ok: true, channel: channel2.name, skipped: true });
+      }
+    } catch (err) {
+      logger.error(`Webhook handler failed for channel "${channel2.name}"`, { error: err });
+      res.status(500).json({ ok: false, error: "Internal channel error" });
+    }
+  };
+}
+var init_webhook_source = __esm({
+  "libs/sdk/src/channel/sources/webhook.source.ts"() {
+    "use strict";
+    init_call_surface();
+  }
+});
+
 // libs/sdk/src/channel/channel-scope.helper.ts
 async function registerChannelCapabilities(args) {
   const {
@@ -44488,11 +45323,15 @@ async function registerChannelCapabilities(args) {
     notificationService,
     flowRegistry,
     toolRegistry,
-    agentEmitterSubscribe,
-    jobEmitterSubscribe,
+    http: http2,
     logger
   } = args;
+  const completions = completionEventsOf(providers.getActiveScope());
+  const agentEmitterSubscribe = args.agentEmitterSubscribe ?? ((cb) => completions.agents.subscribe(cb));
+  const jobEmitterSubscribe = args.jobEmitterSubscribe ?? ((cb) => completions.jobs.subscribe(cb));
   const unsubscribers = [];
+  const reservedPaths = http2 ? computeReservedPaths(http2.entryPath, http2.routeBase) : void 0;
+  const webhookPaths = /* @__PURE__ */ new Map();
   const channelRegistry = new ChannelRegistry(providers, channelsList, owner);
   await channelRegistry.ready;
   const channelNotificationService = new ChannelNotificationService(
@@ -44508,31 +45347,23 @@ async function registerChannelCapabilities(args) {
     const sourceType = instance.source.type;
     switch (sourceType) {
       case "agent-completion": {
-        if (agentEmitterSubscribe) {
-          const unsub = wireAgentCompletionSource(
-            instance,
-            instance.metadata.source,
-            agentEmitterSubscribe,
-            logger
-          );
-          unsubscribers.push(unsub);
-        } else {
-          logger.warn(`Channel "${instance.name}" has agent-completion source but no agent emitter available`);
-        }
+        const unsub = wireAgentCompletionSource(
+          instance,
+          instance.metadata.source,
+          agentEmitterSubscribe,
+          logger
+        );
+        unsubscribers.push(unsub);
         break;
       }
       case "job-completion": {
-        if (jobEmitterSubscribe) {
-          const unsub = wireJobCompletionSource(
-            instance,
-            instance.metadata.source,
-            jobEmitterSubscribe,
-            logger
-          );
-          unsubscribers.push(unsub);
-        } else {
-          logger.warn(`Channel "${instance.name}" has job-completion source but no job emitter available`);
-        }
+        const unsub = wireJobCompletionSource(
+          instance,
+          instance.metadata.source,
+          jobEmitterSubscribe,
+          logger
+        );
+        unsubscribers.push(unsub);
         break;
       }
       case "app-event": {
@@ -44541,7 +45372,25 @@ async function registerChannelCapabilities(args) {
         unsubscribers.push(unsub);
         break;
       }
-      case "webhook":
+      case "webhook": {
+        const source = instance.metadata.source;
+        if (!http2 || !reservedPaths) {
+          logger.warn(`Channel "${instance.name}" has a webhook source but no HTTP server to serve ${source.path}`);
+          break;
+        }
+        assertNotReserved("POST", source.path, reservedPaths);
+        const claimedBy = webhookPaths.get(source.path);
+        if (claimedBy) {
+          throw new Error(
+            `Channels "${claimedBy}" and "${instance.name}" both declare the webhook path ${source.path}. Give each webhook channel its own path.`
+          );
+        }
+        webhookPaths.set(source.path, instance.name);
+        const handler = createWebhookMiddleware(instance, source, logger);
+        await http2.server.registerRoute("POST", source.path, wrapWithIpFilter(handler, http2.checkClientIp));
+        logger.info(`Registered webhook route for channel "${instance.name}": POST ${source.path}`);
+        break;
+      }
       case "manual":
         break;
       case "service":
@@ -44624,6 +45473,7 @@ async function registerChannelCapabilities(args) {
 var init_channel_scope_helper = __esm({
   "libs/sdk/src/channel/channel-scope.helper.ts"() {
     "use strict";
+    init_custom_routes_helper();
     init_tool_instance();
     init_tool_utils();
     init_channel_notification_service();
@@ -44633,7 +45483,9 @@ var init_channel_scope_helper = __esm({
     init_channel_reply_tool();
     init_agent_completion_source();
     init_app_event_source();
+    init_completion_events();
     init_job_completion_source();
+    init_webhook_source();
   }
 });
 
@@ -45876,12 +46728,12 @@ async function createElicitationStore(options = {}) {
     sqlite,
     keyPrefix = "mcp:elicit:",
     logger,
-    isEdgeRuntime: isEdgeRuntime2 = false,
+    isEdgeRuntime: isEdgeRuntime3 = false,
     requiresPubSub = true,
     encryption
   } = options;
   if (sqlite) {
-    if (isEdgeRuntime2) {
+    if (isEdgeRuntime3) {
       throw new ElicitationNotSupportedError(
         "SQLite elicitation store is not supported on Edge runtime (better-sqlite3 is a native module). Use Redis or Upstash instead."
       );
@@ -45955,7 +46807,7 @@ async function createElicitationStore(options = {}) {
       "Vercel KV is not supported for elicitation stores. Elicitation requires pub/sub for cross-node result routing, which Vercel KV does not support. Use Redis or Upstash instead."
     );
   }
-  if (isEdgeRuntime2 && (!finalStorageConfig || finalStorageConfig.type === "memory")) {
+  if (isEdgeRuntime3 && (!finalStorageConfig || finalStorageConfig.type === "memory")) {
     throw new ElicitationNotSupportedError(
       "Elicitation requires distributed storage when running on Edge runtime. Edge functions are stateless and cannot use in-memory elicitation. Configure Redis or Upstash storage."
     );
@@ -45963,7 +46815,7 @@ async function createElicitationStore(options = {}) {
   const storage = await createStorage2({
     ...finalStorageConfig,
     prefix: keyPrefix,
-    fallback: isEdgeRuntime2 ? "error" : "memory"
+    fallback: isEdgeRuntime3 ? "error" : "memory"
   });
   if (requiresPubSub && !storage.supportsPubSub()) {
     throw new ElicitationNotSupportedError(
@@ -47629,6 +48481,7 @@ var WorkflowStepExecutor;
 var init_workflow_step_executor = __esm({
   "libs/sdk/src/workflow/engine/workflow-step.executor.ts"() {
     "use strict";
+    init_call_surface();
     init_errors();
     init_job_errors();
     init_workflow_errors();
@@ -47691,7 +48544,7 @@ var init_workflow_step_executor = __esm({
           const timer = setTimeout(() => {
             reject(new WorkflowJobTimeoutError(job.name, timeout));
           }, timeout);
-          Promise.resolve(ctx.execute(parsedInput)).then((result) => {
+          runOnSurface("job", async () => ctx.execute(parsedInput)).then((result) => {
             clearTimeout(timer);
             resolve(result);
           }).catch((err) => {
@@ -47705,6 +48558,7 @@ var init_workflow_step_executor = __esm({
 });
 
 // libs/sdk/src/workflow/engine/workflow.engine.ts
+import { getAsyncContextMode } from "@frontmcp/utils";
 var WorkflowEngine;
 var init_workflow_engine = __esm({
   "libs/sdk/src/workflow/engine/workflow.engine.ts"() {
@@ -47774,7 +48628,7 @@ var init_workflow_engine = __esm({
             }
             continue;
           }
-          const batch = ready.slice(0, this.maxConcurrency);
+          const batch = ready.slice(0, getAsyncContextMode() === "serialized" ? 1 : this.maxConcurrency);
           await Promise.allSettled(
             batch.map(async (step) => {
               if (step.condition) {
@@ -47881,12 +48735,13 @@ var init_workflow_engine = __esm({
 });
 
 // libs/sdk/src/job/execution/job-execution.manager.ts
-import { randomUUID as randomUUID23 } from "@frontmcp/utils";
+import { randomUUID as randomUUID23, runRequestExclusive as runRequestExclusive4 } from "@frontmcp/utils";
 var JobExecutionManager;
 var init_job_execution_manager = __esm({
   "libs/sdk/src/job/execution/job-execution.manager.ts"() {
     "use strict";
     init_principal_utils();
+    init_call_surface();
     init_errors();
     init_workflow_engine();
     init_job_permission_guard();
@@ -47923,7 +48778,7 @@ var init_job_execution_manager = __esm({
         };
         await this.stateStore.createRun(runRecord);
         if (opts.background) {
-          this.executeJobBackground(job, input, runId, opts).catch(async (err) => {
+          runRequestExclusive4(() => this.executeJobBackground(job, input, runId, opts)).catch(async (err) => {
             this.logger.error(`Background job execution failed: ${err}`);
             try {
               await this.updateState(runId, {
@@ -47963,18 +48818,20 @@ var init_job_execution_manager = __esm({
         };
         await this.stateStore.createRun(runRecord);
         if (opts.background) {
-          this.executeWorkflowBackground(workflow, jobRegistry, runId, opts).catch(async (err) => {
-            this.logger.error(`Background workflow execution failed: ${err}`);
-            try {
-              await this.updateState(runId, {
-                state: "failed",
-                error: { message: err?.message ?? String(err), name: err?.name ?? "Error" },
-                completedAt: Date.now()
-              });
-            } catch (updateErr) {
-              this.logger.error(`Failed to update run state after error: ${updateErr}`);
+          runRequestExclusive4(() => this.executeWorkflowBackground(workflow, jobRegistry, runId, opts)).catch(
+            async (err) => {
+              this.logger.error(`Background workflow execution failed: ${err}`);
+              try {
+                await this.updateState(runId, {
+                  state: "failed",
+                  error: { message: err?.message ?? String(err), name: err?.name ?? "Error" },
+                  completedAt: Date.now()
+                });
+              } catch (updateErr) {
+                this.logger.error(`Failed to update run state after error: ${updateErr}`);
+              }
             }
-          });
+          );
           return { runId, state: "pending" };
         }
         return this.executeWorkflowInline(workflow, jobRegistry, runId, opts);
@@ -48027,7 +48884,7 @@ var init_job_execution_manager = __esm({
               authInfo: opts.authInfo ?? {},
               contextProviders: opts.contextProviders
             });
-            const result = await ctx.execute(parsedInput);
+            const result = await runOnSurface("job", async () => ctx.execute(parsedInput));
             const logs = ctx.getLogs();
             await this.updateState(runId, {
               state: "completed",
@@ -48262,6 +49119,10 @@ var init_job_interface = __esm({
       getLogs() {
         return this._logs;
       }
+      /** A job (or a workflow step running it) calls tools on the `'job'` surface. */
+      callToolSurface() {
+        return "job";
+      }
     };
   }
 });
@@ -49364,7 +50225,11 @@ async function registerJobCapabilities(args) {
   for (const dynWf of dynamicWorkflows) {
     workflowRegistry.registerDynamic(dynWf);
   }
-  const executionManager = new JobExecutionManager(stateStore, logger, notifyFn);
+  const completions = completionEventsOf(providers.getActiveScope());
+  const executionManager = new JobExecutionManager(stateStore, logger, async (data) => {
+    await notifyFn?.(data);
+    await publishJobCompletion(data, stateStore, completions);
+  });
   const managementTools = [
     ListJobsTool,
     ExecuteJobTool,
@@ -49393,9 +50258,27 @@ async function registerJobCapabilities(args) {
     managementTools
   };
 }
+async function publishJobCompletion(data, stateStore, completions) {
+  const { type, state, runId } = data;
+  if (type !== "job:status" && type !== "workflow:status") return;
+  if (state !== "completed" && state !== "failed" || typeof runId !== "string") return;
+  const run = await stateStore.getRun(runId);
+  if (!run) return;
+  const workflowName = type === "workflow:status" ? run.workflowName : void 0;
+  completions.jobs.emit({
+    jobName: workflowName ?? run.jobName,
+    jobId: run.jobId,
+    status: state === "completed" ? "success" : "error",
+    ...run.completedAt !== void 0 ? { durationMs: run.completedAt - run.startedAt } : {},
+    ...state === "completed" ? { output: completionOutputText(run.result) } : { error: run.error?.message },
+    attempt: run.attempt,
+    ...run.sessionId ? { sessionId: run.sessionId } : {}
+  });
+}
 var init_job_scope_helper = __esm({
   "libs/sdk/src/job/job-scope.helper.ts"() {
     "use strict";
+    init_completion_events();
     init_execute_workflow_tool();
     init_get_workflow_status_tool();
     init_list_workflows_tool();
@@ -49620,111 +50503,6 @@ var init_enforced_metadata_check = __esm({
   }
 });
 
-// libs/sdk/src/server/custom-routes.helper.ts
-function computeReservedPaths(entryPath, routeBase) {
-  const prefix = normalizeEntryPrefix(entryPath);
-  const base = normalizeScopeBase(routeBase);
-  const mcpBase = `${prefix}${base}`;
-  const exact = /* @__PURE__ */ new Set([
-    mcpBase === "" ? "/" : mcpBase,
-    `${mcpBase}/sse`,
-    `${mcpBase}/message`,
-    "/health",
-    "/metrics"
-  ]);
-  return { exact, prefixes: ["/oauth", "/.well-known"] };
-}
-function normalizeForCompare(path3) {
-  if (path3.length > 1 && path3.endsWith("/")) return path3.slice(0, -1);
-  return path3;
-}
-function assertNotReserved(method, path3, reserved) {
-  const normalized = normalizeForCompare(path3);
-  if (reserved.exact.has(normalized)) {
-    throw new ReservedRouteCollisionError(method, path3, normalized);
-  }
-  for (const prefix of reserved.prefixes) {
-    if (normalized === prefix || normalized.startsWith(`${prefix}/`)) {
-      throw new ReservedRouteCollisionError(method, path3, prefix);
-    }
-  }
-}
-function wrapWithAuth(handler, verifySession, logger) {
-  return async (req, res, next) => {
-    let result;
-    try {
-      result = await verifySession(req);
-    } catch (error) {
-      if (error instanceof FlowControl && error.type === "respond") {
-        result = error.output;
-      } else {
-        throw error;
-      }
-    }
-    if (!result || result.kind === "unauthorized") {
-      logger.verbose("custom-route auth: unauthorized");
-      return writeHttpResponse(
-        res,
-        httpRespond.unauthorized({
-          headers: result?.kind === "unauthorized" ? { "WWW-Authenticate": result.prmMetadataHeader } : void 0
-        })
-      );
-    }
-    if (result.kind === "forbidden") {
-      logger.verbose("custom-route auth: forbidden (insufficient scope)");
-      return writeHttpResponse(
-        res,
-        httpRespond.forbidden({
-          headers: { "WWW-Authenticate": result.prmMetadataHeader }
-        })
-      );
-    }
-    req.authSession = result.authorization;
-    req[ServerRequestTokens.auth] = result.authorization;
-    return handler(req, res, next);
-  };
-}
-function wrapWithIpFilter(handler, checkClientIp) {
-  return async (req, res, next) => {
-    const rejection = await checkClientIp(req, res);
-    if (rejection) return writeHttpResponse(res, rejection);
-    return handler(req, res, next);
-  };
-}
-function registerCustomHttpRoutes(args) {
-  const { routes, server, verifySession, checkClientIp, entryPath, routeBase, logger } = args;
-  if (!routes || routes.length === 0) return;
-  const reserved = computeReservedPaths(entryPath, routeBase);
-  for (const route of routes) {
-    assertNotReserved(route.method, route.path, reserved);
-    const handler = route.auth === true ? wrapWithAuth(route.handler, verifySession, logger) : route.handler;
-    server.registerRoute(route.method, route.path, wrapWithIpFilter(handler, checkClientIp));
-    logger.info(`Registered custom http route: ${route.method} ${route.path}${route.auth ? " (auth)" : ""}`);
-  }
-}
-var ReservedRouteCollisionError;
-var init_custom_routes_helper = __esm({
-  "libs/sdk/src/server/custom-routes.helper.ts"() {
-    "use strict";
-    init_common();
-    init_server_validation();
-    ReservedRouteCollisionError = class extends Error {
-      constructor(method, path3, reserved) {
-        super(
-          `Custom http.route "${method} ${path3}" collides with the reserved FrontMCP path "${reserved}". Reserved prefixes are the MCP entry path (and its /sse + /message siblings), /oauth/*, /.well-known/*, /health, and /metrics. Choose a different path.`
-        );
-        this.method = method;
-        this.path = path3;
-        this.reserved = reserved;
-        this.name = "ReservedRouteCollisionError";
-      }
-      method;
-      path;
-      reserved;
-    };
-  }
-});
-
 // libs/sdk/src/skill/errors/tool-not-allowed.error.ts
 var ToolNotAllowedError, ToolApprovalRequiredError;
 var init_tool_not_allowed_error = __esm({
@@ -50899,7 +51677,7 @@ var init_load_skill_flow = __esm({
             }
             await assertSkillAuthorized(this.scope, entry, authInfo);
           }
-          loadResults.push({ loadResult: result });
+          loadResults.push({ loadResult: skillToolsForCaller(result, this.scope.tools, ctx) });
         }
         this.state.set({ loadResults, warnings });
         this.logger.verbose("loadSkills:done", { loaded: loadResults.length, notFound: warnings.length });
@@ -51145,7 +51923,10 @@ async function authorizeSkillHttpRequest(scope, skillsConfig, request, logger) {
   if (mode === "inherit") {
     const authOptions = scope.auth?.options;
     if (!authOptions || isPublicMode(authOptions)) return { allowed: true, authInfo: {} };
-    const verified = await scope.runFlow("session:verify", { request });
+    const verified = await scope.runFlow("session:verify", {
+      request,
+      sessionless: true
+    });
     if (verified?.kind === "authorized") {
       return { allowed: true, authInfo: { ...authInfoFromAuthorization(verified.authorization) } };
     }
@@ -52114,7 +52895,12 @@ var init_skills_api_flow = __esm({
           respondNotFound();
           return;
         }
-        const { skill, availableTools, missingTools, isComplete, warning } = loadResult;
+        const { skill, availableTools, missingTools, isComplete, warning } = skillToolsForCaller(
+          loadResult,
+          toolRegistry,
+          void 0,
+          SKILLS_HTTP_SURFACE
+        );
         const skillEntry = createSkillEntryResolver(skillRegistry)(skillId, skill.id);
         if (skillEntry) {
           if (!await isSkillServable(this.scope, skillEntry, void 0, SKILLS_HTTP_SURFACE)) {
@@ -52401,6 +53187,8 @@ var init_server_interface = __esm({
     ServerRequest = class extends IncomingMessage {
       path;
       query;
+      /** Path parameters of the matched route (`:providerId` in `/oauth/provider/:providerId/callback`). */
+      params;
       body;
       authSession;
     };
@@ -52473,6 +53261,8 @@ var init_tool_interface = __esm({
       _toolNameInternal;
       /** @internal Tool input for fallback elicitation - set by CallToolFlow */
       _toolInputInternal;
+      /** @internal JSON-RPC id of the tools/call request - set by CallToolFlow, for flows the call is handed on to */
+      _jsonRpcRequestIdInternal;
       // ---- INPUT storages (backing fields)
       _rawInput;
       _input;
@@ -52505,6 +53295,10 @@ var init_tool_interface = __esm({
         this._progressToken = progressToken;
         this.signal = signal;
       }
+      /** @internal The request's progress token, for flows the call is handed on to (the agent tool). */
+      get _progressTokenInternal() {
+        return this._progressToken;
+      }
       /**
        * Like {@link ExecutionContextBase.fetch}, and also aborted with {@link signal}, so a
        * cancelled or timed-out call stops its outbound requests.
@@ -52923,9 +53717,10 @@ var init_agent_execution_loop = __esm({
         let iterations = 0;
         let totalPromptTokens = 0;
         let totalCompletionTokens = 0;
+        let timeout;
         try {
           const timeoutPromise = new Promise((_, reject) => {
-            setTimeout(
+            timeout = setTimeout(
               () => reject(new Error(`Agent execution timed out after ${this.config.timeout}ms`)),
               this.config.timeout
             );
@@ -52969,6 +53764,8 @@ var init_agent_execution_loop = __esm({
             error,
             durationMs: Date.now() - startTime
           };
+        } finally {
+          clearTimeout(timeout);
         }
       }
       /**
@@ -53288,6 +54085,7 @@ var init_agent_interface = __esm({
   "libs/sdk/src/common/interfaces/agent.interface.ts"() {
     "use strict";
     init_agent_execution_loop();
+    init_frontmcp_context_storage();
     init_elicitation2();
     init_errors();
     init_execution_context_interface();
@@ -53555,6 +54353,10 @@ var init_agent_interface = __esm({
       async invokeAgent(agentId, input) {
         throw new AgentMethodNotAvailableError("invokeAgent", agentId);
       }
+      /** An agent calls tools on the `'agent'` surface, as its model's tool calls do. */
+      callToolSurface() {
+        return "agent";
+      }
       // ============================================================================
       // Notification Methods
       // ============================================================================
@@ -53671,7 +54473,9 @@ var init_agent_interface = __esm({
           {
             sessionId: this.authInfo.sessionId,
             getClientCapabilities: (sid) => this.scope.notifications.getClientCapabilities(sid),
-            tryGetContext: () => this.tryGetContext(),
+            // The request holds what answers this question: a fallback answer the owner already sent
+            // (the re-run of its call), or the 2026-07-28 exchange.
+            tryGetContext: () => this.tryGetContext() ?? this.runningRequestContext(),
             entryName: this._agentNameInternal ?? this.agentName,
             entryInput: this._agentInputInternal ?? this.input,
             elicitationEnabled: this.scope.metadata.elicitation?.enabled === true
@@ -53681,6 +54485,17 @@ var init_agent_interface = __esm({
           options
         );
       }
+      /**
+       * The context of the request this agent runs in. An agent is built with its own provider registry,
+       * which holds no request-scoped instances, so the context is read from the running request.
+       */
+      runningRequestContext() {
+        try {
+          return this.scope.providers.get(FrontMcpContextStorage).getStore();
+        } catch {
+          return void 0;
+        }
+      }
       /**
        * Respond with the final output and end execution.
        *
@@ -53836,6 +54651,7 @@ var ChannelContext;
 var init_channel_interface = __esm({
   "libs/sdk/src/common/interfaces/channel.interface.ts"() {
     "use strict";
+    init_call_surface();
     init_mcp_error();
     init_execution_context_interface();
     ChannelContext = class extends ExecutionContextBase {
@@ -53913,13 +54729,27 @@ var init_channel_interface = __esm({
           this.logger.warn(`Channel "${this.channelName}": pushIncoming called but no handler is wired`);
         }
       }
+      /**
+       * While it handles an HTTP trigger (a webhook source's request), a channel calls tools on the
+       * `'http-trigger'` surface. Handling any other event, it dispatches in-process.
+       */
+      callToolSurface() {
+        return getCallSurface() === "http-trigger" ? "http-trigger" : void 0;
+      }
     };
   }
 });
 
 // libs/sdk/src/common/utils/auth-info.utils.ts
-function authInfoFromAuthorization(authorization) {
+function sessionIdPresentedBy(request) {
+  const header = request.headers?.["mcp-session-id"];
+  if (typeof header === "string" && header.length > 0) return header;
+  const query = request.query?.["sessionId"];
+  return typeof query === "string" && query.length > 0 ? query : void 0;
+}
+function authInfoFromAuthorization(authorization, presentedSessionId) {
   const { token, user, session } = authorization;
+  const verifiedSession = session !== void 0 && presentedSessionId !== void 0 && session.id === presentedSessionId ? session : void 0;
   return {
     token,
     clientId: user?.sub,
@@ -53929,8 +54759,8 @@ function authInfoFromAuthorization(authorization) {
     user,
     extra: {
       user,
-      sessionId: session?.id,
-      sessionPayload: session?.payload
+      sessionId: verifiedSession?.id,
+      sessionPayload: verifiedSession?.payload
     }
   };
 }
@@ -54308,7 +55138,7 @@ var init_decide_request_intent_utils = __esm({
 });
 
 // libs/sdk/src/common/utils/guard.utils.ts
-import { isAnonymousSubject as isAnonymousSubject3 } from "@frontmcp/auth";
+import { isAnonymousSubject as isAnonymousSubject4 } from "@frontmcp/auth";
 import {
   ConcurrencyLimitError
 } from "@frontmcp/guard";
@@ -54321,15 +55151,19 @@ function enforceIpFilter(scope, clientIp, buildRejection = () => httpRespond.for
 function buildPartitionContext(source) {
   if (!source) return void 0;
   const clientId = source.authInfo?.clientId;
-  const userId = isAnonymousSubject3(clientId) ? void 0 : String(clientId);
-  const verifiedSessionId = source.authInfo?.sessionId ?? source.authInfo?.extra?.sessionId;
+  const userId = isAnonymousSubject4(clientId) ? void 0 : String(clientId);
   const callerKey = userId ? `user:${userId}` : "anonymous";
   return {
-    sessionId: verifiedSessionId === source.sessionId ? source.sessionId : callerKey,
+    sessionId: verifiedSessionOf(source) ?? callerKey,
     clientIp: source.metadata?.clientIp,
     userId
   };
 }
+function verifiedSessionOf(source) {
+  if ("verifiedSessionId" in source) return source.verifiedSessionId;
+  const confirmed = source.authInfo?.sessionId ?? source.authInfo?.extra?.sessionId;
+  return confirmed === source.sessionId ? source.sessionId : void 0;
+}
 function partitionsByIdentity(partitionBy) {
   return partitionBy === "session" || partitionBy === "userId" || typeof partitionBy === "function";
 }
@@ -54512,8 +55346,12 @@ var init_primary_auth_provider_interface = __esm({
        * @param _expectedAudience  The protected resource(s) the token must be for
        *                           (`aud` names at least one), when the caller is a
        *                           resource endpoint.
+       * @param _expectedIssuer    The issuer the token must name (or one of them):
+       *                           the ones this instance accepts for the request
+       *                           (`LocalPrimaryAuth.acceptedIssuersFor`). Default:
+       *                           its boot-time issuer.
        */
-      verifyGatewayToken(_token, _requestBaseUrl, _expectedAudience) {
+      verifyGatewayToken(_token, _requestBaseUrl, _expectedAudience, _expectedIssuer) {
         return Promise.resolve({
           ok: false,
           error: "gateway token verification is not supported by this auth mode"
@@ -54586,7 +55424,10 @@ function findSkillByPath(scope, skillPath) {
   const segments = skillPath.split("/").filter((s) => s.length > 0);
   if (segments.length === 0) return void 0;
   const lastSegment = segments[segments.length - 1];
-  return visible.find((s) => s.name === lastSegment && s.getSkillPath() === lastSegment);
+  const byName = visible.find((s) => s.name === lastSegment && s.getSkillPath() === lastSegment);
+  if (byName) return byName;
+  if (segments.length !== 1) return void 0;
+  return visible.find((s) => s.metadata.id === lastSegment && s.getSkillPath() === s.metadata.name);
 }
 async function findAndLoadSkillByPath(scope, skillPath) {
   const registry = scope.skills;
@@ -55045,7 +55886,10 @@ function buildPerSkillResourceRecord(scope, skill, opts = {}) {
     description: skill.metadata.description,
     mimeType: SKILL_MD_MIME_TYPE,
     annotations,
-    _meta: meta
+    _meta: meta,
+    // The skill's own `availableWhen`, so `resources/list` and `resources/read` offer its SKILL.md
+    // on the surfaces that offer the skill, and answer others as for an unknown resource.
+    ...skill.metadata.availableWhen !== void 0 && { availableWhen: skill.metadata.availableWhen }
   };
   const handler = async () => {
     const { loadResult } = await findAndLoadSkillByPath(scope, skillPath);
@@ -55119,6 +55963,8 @@ function refreshFromSkill(resource, skill) {
   }
   Object.assign(resource.metadata, extensions);
   resource.metadata["description"] = skill.metadata.description;
+  if (skill.metadata.availableWhen === void 0) Reflect.deleteProperty(resource.metadata, "availableWhen");
+  else resource.metadata["availableWhen"] = skill.metadata.availableWhen;
   resource.extensionKeys = Object.keys(extensions);
 }
 var init_sep_2640_per_skill = __esm({
@@ -55218,11 +56064,23 @@ var init_skill_audit_helper = __esm({
 });
 
 // libs/sdk/src/skill/skill-scope.helper.ts
+function declaresDynamicSkills(metadata) {
+  return metadata.dynamicSkills === true || (metadata.plugins ?? []).some((plugin) => declaresDynamicSkills(normalizePlugin(plugin).metadata));
+}
+function pluginsRegisterDynamicSkills(plugins) {
+  for (const plugin of plugins) {
+    if (declaresDynamicSkills(normalizePlugin(plugin).metadata)) return true;
+  }
+  return false;
+}
 async function registerSkillCapabilities(options) {
-  const { skillRegistry, flowRegistry, resourceRegistry, providers, skillsConfig, logger } = options;
+  const { skillRegistry, flowRegistry, resourceRegistry, providers, skillsConfig, logger, dynamicSkills } = options;
   registerSkillAuditWriter({ providers, audit: skillsConfig?.audit, logger });
   await flowRegistry.registryFlows([FilterSkillsFlow]);
-  if (!skillRegistry.hasAny()) {
+  if (dynamicSkills) {
+    skillRegistry.expectDynamicSkills();
+  }
+  if (!skillRegistry.servesSkills()) {
     return;
   }
   await flowRegistry.registryFlows([SearchSkillsFlow, LoadSkillFlow]);
@@ -55264,6 +56122,7 @@ async function registerSep2640Resources(options) {
 var init_skill_scope_helper = __esm({
   "libs/sdk/src/skill/skill-scope.helper.ts"() {
     "use strict";
+    init_plugin_utils();
     init_flows2();
     init_resources();
     init_sep_2640_last_modified();
@@ -55849,8 +56708,10 @@ var init_session_store_factory = __esm({
 });
 
 // libs/sdk/src/transport/flows/handle.mcp-20260728.flow.ts
+import { isAnonymousSubject as isAnonymousSubject5 } from "@frontmcp/auth";
 import { z as z102 } from "@frontmcp/lazy-zod";
 import { MCP_20260728_META as MCP_20260728_META5 } from "@frontmcp/protocol";
+import { runRequestExclusive as runRequestExclusive5 } from "@frontmcp/utils";
 function frame2(message) {
   return encoder3.encode(`event: message
 data: ${JSON.stringify(message)}
@@ -55900,6 +56761,11 @@ async function* streamMessageResponse(options, sink, requestId, runInContext) {
   }
   yield frame2({ jsonrpc: "2.0", id, result: outcome?.result });
 }
+function isAnonymousCaller(auth) {
+  if (!auth) return true;
+  if (!isAnonymousSubject5(auth.user?.sub)) return false;
+  return !auth.token || auth.session?.payload?.isPublic === true;
+}
 function errorResponse(status, error, id) {
   return httpRespond.json(
     {
@@ -55942,7 +56808,9 @@ var init_handle_mcp_20260728_flow = __esm({
       /** Negotiated protocol version for this request. */
       version: z102.string().optional(),
       requestType: z102.enum(["notification", "subscriptions", "message"]).optional(),
-      isAnonymous: z102.boolean().default(true)
+      isAnonymous: z102.boolean().default(true),
+      /** Whether the client declared this revision itself (not served under it by default). */
+      clientDeclaredRevision: z102.boolean().optional()
     });
     name38 = "handle:mcp-202607280728";
     ({ Stage: Stage38 } = FlowHooksOf(name38));
@@ -55956,11 +56824,7 @@ var init_handle_mcp_20260728_flow = __esm({
       async parseInput() {
         const { request } = this.rawInput;
         const auth = request[ServerRequestTokens.auth];
-        this.state.set(
-          stateSchema37.parse({
-            isAnonymous: !auth?.token || auth.token.length === 0 || auth.session?.payload?.isPublic === true
-          })
-        );
+        this.state.set(stateSchema37.parse({ isAnonymous: isAnonymousCaller(auth) }));
       }
       async validate() {
         const { request } = this.rawInput;
@@ -55993,6 +56857,7 @@ var init_handle_mcp_20260728_flow = __esm({
           return;
         }
         this.state.set("version", result.version);
+        this.state.set("clientDeclaredRevision", strictHeaders);
       }
       /**
        * Resolve a tool's input JSON Schema so `x-mcp-header` annotations can be
@@ -56017,7 +56882,7 @@ var init_handle_mcp_20260728_flow = __esm({
         if (!context) return (fn) => fn();
         const storage = this.scope.providers.get(FrontMcpContextStorage);
         return async (fn) => {
-          await storage.runWithContext(context, fn);
+          await runRequestExclusive5(() => storage.runWithContext(context, fn));
         };
       }
       findToolSchema(scope, toolName) {
@@ -56103,13 +56968,17 @@ var init_handle_mcp_20260728_flow = __esm({
           clientCapabilities,
           frontmcpContext: this.tryGetContext(),
           authInfo: auth ? {
+            // No session is presented: this revision has none, so the request has no verified
+            // session (`extra.sessionId`), and anything kept across requests falls back to the
+            // authenticated caller.
             ...authInfoFromAuthorization(auth),
-            // Sessions no longer exist at the protocol level, but the shared
-            // handlers key per-request state (memory, credentials) off an id.
-            // Derive a request-scoped one so nothing leaks between calls.
-            sessionId: auth.session?.id
+            // The shared handlers still key per-request state (provider views, notifications)
+            // off an id. It names the request only, the same per-request id as the request
+            // context's `sessionId`; the request context does not vouch for it (#629).
+            sessionId: auth.session?.id ?? this.tryGetContext()?.sessionId
           } : void 0,
           isAnonymous: this.state.required.isAnonymous,
+          clientDeclaredRevision: this.state.clientDeclaredRevision !== false,
           composeInstructions: () => this.scope.metadata.instructions,
           notificationSink: sink,
           traceContext: extractTraceContext(meta)
@@ -56991,6 +57860,7 @@ var init_handle_streamable_http_flow = __esm({
     init_ext_apps2();
     init_ha_constants();
     init_skill_mode_utils();
+    init_mcp_surface();
     plan40 = {
       pre: ["parseInput", "router"],
       execute: ["onInitialize", "onMessage", "onElicitResult", "onSseListener", "onExtApps"],
@@ -57373,7 +58243,8 @@ var init_handle_streamable_http_flow = __esm({
                     sessionId: session.id,
                     sessionIdPayload: session.payload,
                     token
-                  }
+                  },
+                  surface: mcpRequestSurface(this.scope)
                 }
               });
               const parsed = CallToolResultSchema4.safeParse(result);
@@ -59695,6 +60566,41 @@ var init_request_log_redaction = __esm({
   }
 });
 
+// libs/sdk/src/transport/persistent-session-owner.ts
+var persistent_session_owner_exports = {};
+__export(persistent_session_owner_exports, {
+  claimPersistentSession: () => claimPersistentSession,
+  persistentSessionCallerKey: () => persistentSessionCallerKey
+});
+import { isAnonymousSubject as isAnonymousSubject6 } from "@frontmcp/auth";
+import { sha256Hex as sha256Hex13 } from "@frontmcp/utils";
+function persistentSessionCallerKey(authorization) {
+  const sub = authorization?.user?.sub;
+  if (!isAnonymousSubject6(sub)) {
+    const iss = authorization?.user?.iss;
+    return `sub:${sha256Hex13(JSON.stringify([typeof iss === "string" ? iss : "", sub]))}`;
+  }
+  if (authorization?.token) return `token:${sha256Hex13(authorization.token)}`;
+  return null;
+}
+function claimPersistentSession(session, callerKey, store) {
+  if (!owners.has(session) && store && store.initial !== void 0) {
+    owners.set(session, store.initial);
+  }
+  if (!owners.has(session)) {
+    owners.set(session, callerKey);
+    return "claimed";
+  }
+  return owners.get(session) === callerKey ? "owner" : "refused";
+}
+var owners;
+var init_persistent_session_owner = __esm({
+  "libs/sdk/src/transport/persistent-session-owner.ts"() {
+    "use strict";
+    owners = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // libs/sdk/src/transport/web-standard-mcp.ts
 var web_standard_mcp_exports = {};
 __export(web_standard_mcp_exports, {
@@ -59721,7 +60627,8 @@ async function wireServer(scope, serverOptions, sessionId, sessionIdGenerator, e
 }
 async function buildPersistentWebStandardMcp(scope, options) {
   const serverOptions = buildScopedServerOptions(scope);
-  return wireServer(scope, serverOptions, options.sessionId, () => options.sessionId, false);
+  const pair = await wireServer(scope, serverOptions, options.sessionId, () => options.sessionId, false);
+  return options.owner ? { ...pair, owner: options.owner } : pair;
 }
 async function runWebStandardMcp(scope, request, options) {
   if (options.persistent) {
@@ -59730,13 +60637,7 @@ async function runWebStandardMcp(scope, request, options) {
   const sessionId = `web:${randomUUID26()}`;
   const accept = request.headers.get("accept") ?? "";
   const wantsStream = request.method === "GET" || options.sse && accept.includes("text/event-stream");
-  const { mcpServer, transport } = await wireServer(
-    scope,
-    options.serverOptions,
-    sessionId,
-    void 0,
-    !wantsStream
-  );
+  const { mcpServer, transport } = await wireServer(scope, options.serverOptions, sessionId, void 0, !wantsStream);
   const response = await transport.handleRequest(request, {
     authInfo: options.authInfo
   });
@@ -59798,6 +60699,10 @@ var init_http_request_flow = __esm({
         "router"
       ],
       execute: [
+        // A Durable Object's persistent session serves only the caller that opened
+        // it: anyone else presenting its id is answered as an unknown session. First,
+        // before every protocol handler (2026-07-28 included), so none can serve it.
+        "checkPersistentSessionOwner",
         // Protocol 2026-07-28. Runs before EVERY session-era handler — including
         // `handleWebFetch`, which answers any request carrying a Web `Request`
         // regardless of intent and would otherwise swallow 2026 traffic on a
@@ -59922,7 +60827,10 @@ var init_http_request_flow = __esm({
         const { request } = this.rawInput;
         this.logger.verbose(`[${this.requestId}] checkAuthorization: verifying session`);
         try {
-          const result = await this.scope.runFlow("session:verify", { request });
+          const result = await this.scope.runFlow("session:verify", {
+            request,
+            sessionless: this.servesProtocol20260728()
+          });
           if (!result) {
             this.logger.error(`[${this.requestId}] failed to verify session`);
             throw new SessionVerificationFailedError();
@@ -59934,7 +60842,8 @@ var init_http_request_flow = __esm({
             const ctx = this.tryGetContext();
             if (ctx) {
               const { token, user } = result.authorization;
-              ctx.updateAuthInfo(authInfoFromAuthorization(result.authorization));
+              const presentedSessionId = this.servesProtocol20260728() ? void 0 : sessionIdPresentedBy(request);
+              ctx.updateAuthInfo(authInfoFromAuthorization(result.authorization, presentedSessionId));
               await this.bindOrchestrationAccessor(ctx, token, user);
             }
           }
@@ -59986,6 +60895,24 @@ var init_http_request_flow = __esm({
         });
         ctx.setContextToken(ORCHESTRATED_AUTH_ACCESSOR2, new OrchestratedAuthAccessorAdapter(authorization));
       }
+      /**
+       * Whether this request is served under MCP protocol 2026-07-28.
+       *
+       * A V8-isolate deployment (Cloudflare Worker) defaults to the stateless revision: it needs no
+       * session storage, so an unversioned call is served directly instead of minting a session in a
+       * Durable Object. Node keeps defaulting to the session pipeline. Either way an explicit declaration
+       * from the client always wins.
+       */
+      servesProtocol20260728() {
+        const { request } = this.rawInput;
+        const isWebMode = !!request[ServerRequestTokens.webRequest];
+        const defaultProtocolVersion = this.scope.metadata.transport?.defaultProtocolVersion ?? (isWebMode ? "2026-07-28" : "legacy");
+        return isProtocol20260728Request({
+          headers: request.headers,
+          body: request.body,
+          defaultVersion: defaultProtocolVersion
+        });
+      }
       async router() {
         try {
           const { request } = this.rawInput;
@@ -60019,12 +60946,7 @@ var init_http_request_flow = __esm({
             reasons: decision.reasons,
             debug: decision.debug
           });
-          const defaultProtocolVersion = transportConfig.defaultProtocolVersion ?? (isWebMode ? "2026-07-28" : "legacy");
-          if (isProtocol20260728Request({
-            headers: request.headers,
-            body: request.body,
-            defaultVersion: defaultProtocolVersion
-          })) {
+          if (this.servesProtocol20260728()) {
             const verify = this.state.required.verifyResult;
             if (verify.kind === "authorized") {
               request[ServerRequestTokens.auth] = verify.authorization;
@@ -60070,6 +60992,11 @@ var init_http_request_flow = __esm({
             const deleteVerify = this.state.required.verifyResult;
             const requestedSessionId = request[ServerRequestTokens.sessionId] ?? request.headers["mcp-session-id"] ?? request.query?.["sessionId"];
             const deleteAuthz = authorizeSessionTermination(deleteVerify, requestedSessionId);
+            if (request[ServerRequestTokens.webTransport] && deleteAuthz.kind !== "unauthorized") {
+              request[ServerRequestTokens.auth] = deleteVerify.authorization;
+              this.state.set("intent", decision.intent);
+              return;
+            }
             if (deleteAuthz.kind === "unauthorized") {
               this.logger.warn(`[${this.requestId}] DELETE session denied: request is not authenticated`);
               this.respond(
@@ -60183,6 +61110,28 @@ var init_http_request_flow = __esm({
           throw error;
         }
       }
+      async checkPersistentSessionOwner() {
+        const req = this.rawInput.request;
+        const persistent = req[ServerRequestTokens.webTransport];
+        if (!req[ServerRequestTokens.webRequest] || !persistent || typeof persistent !== "object") return;
+        const { claimPersistentSession: claimPersistentSession2, persistentSessionCallerKey: persistentSessionCallerKey2 } = await Promise.resolve().then(() => (init_persistent_session_owner(), persistent_session_owner_exports));
+        const authorization = req[ServerRequestTokens.auth];
+        const callerKey = persistentSessionCallerKey2(authorization);
+        const store = persistent.owner;
+        const claim = claimPersistentSession2(persistent, callerKey, store);
+        if (claim === "claimed") {
+          await store?.save(callerKey);
+          return;
+        }
+        if (claim === "owner") return;
+        this.logger.warn(`[${this.requestId}] Persistent session refused: it was opened by another caller`);
+        this.respond(
+          httpRespond.json(
+            { jsonrpc: "2.0", error: { code: -32001, message: "Session not found" }, id: null },
+            { status: 404 }
+          )
+        );
+      }
       async handleWebFetch() {
         const { request } = this.rawInput;
         const req = request;
@@ -60197,7 +61146,7 @@ var init_http_request_flow = __esm({
           const proto = expandProtocolConfig2(scope.metadata.transport?.protocol);
           const sse = proto.streamable && !proto.json;
           const authorization = req[ServerRequestTokens.auth];
-          const authInfo = authorization ? authInfoFromAuthorization(authorization) : void 0;
+          const authInfo = authorization ? authInfoFromAuthorization(authorization, sessionIdPresentedBy(request)) : void 0;
           const persistent = req[ServerRequestTokens.webTransport];
           const response = await runWebStandardMcp2(scope, webRequest, {
             serverOptions: buildScopedServerOptions2(scope),
@@ -60403,6 +61352,9 @@ var init_http_request_flow = __esm({
     __decorateClass([
       Stage43("router")
     ], HttpRequestFlow.prototype, "router", 1);
+    __decorateClass([
+      Stage43("checkPersistentSessionOwner")
+    ], HttpRequestFlow.prototype, "checkPersistentSessionOwner", 1);
     __decorateClass([
       Stage43("handleWebFetch")
     ], HttpRequestFlow.prototype, "handleWebFetch", 1);
@@ -60990,7 +61942,11 @@ var init_scope_instance = __esm({
         if (!this.cliMode) {
           await this.buildAuthUiRegistry();
         }
-        if (this.scopeSkills.hasAny()) {
+        const dynamicSkills = pluginsRegisterDynamicSkills([
+          ...serverPlugins,
+          ...this.scopeApps.getApps().flatMap((app) => "plugins" in app.metadata ? app.metadata.plugins ?? [] : [])
+        ]);
+        if (this.scopeSkills.hasAny() || dynamicSkills) {
           const store = createSkillSessionStore({ type: "memory" });
           this._skillSession = new SkillSessionManager(
             {
@@ -61041,7 +61997,8 @@ var init_scope_instance = __esm({
           resourceRegistry: this.scopeResources,
           providers: this.scopeProviders,
           skillsConfig: this.metadata.skillsConfig,
-          logger: this.logger
+          logger: this.logger,
+          dynamicSkills
         });
         const jobsConfig = this.metadata.jobs;
         const metaRecord = this.metadata;
@@ -61157,6 +62114,15 @@ var init_scope_instance = __esm({
             notificationService: this.notificationService,
             flowRegistry: this.scopeFlows,
             toolRegistry: this.scopeTools,
+            http: {
+              server: this.server,
+              checkClientIp: (request, response) => this.runFlow("http:ip-filter", {
+                request,
+                response
+              }),
+              entryPath: this.entryPath,
+              routeBase: this.routeBase
+            },
             logger: this.logger
           });
           this._scopeChannels = channelResult.channelRegistry;
@@ -61561,12 +62527,12 @@ var init_scope_instance = __esm({
         return this._authoritiesScopeMapping;
       }
       /**
-       * Collect all supported OAuth scopes from base OIDC scopes and
-       * tool-level authProvider scope declarations.
-       * Used by PRM endpoint to populate `scopes_supported` (RFC 9728).
+       * Collect the OAuth scopes entries declare on their `authProviders`. The PRM
+       * endpoint advertises them in `scopes_supported` (RFC 9728) next to the scopes
+       * the auth mode grants (`resourceScopesFor`), not a fixed OIDC list (#629).
        */
       getAllSupportedScopes() {
-        const scopes = /* @__PURE__ */ new Set(["openid", "profile", "email"]);
+        const scopes = /* @__PURE__ */ new Set();
         const collectScopes = (metadata) => {
           const authProviders = metadata?.["authProviders"];
           if (!Array.isArray(authProviders)) return;
@@ -61844,7 +62810,7 @@ import {
   ProviderScope as ProviderScope8,
   tokenName as tokenName18
 } from "@frontmcp/di";
-function verifiedSessionOf(requestContext) {
+function verifiedSessionOf2(requestContext) {
   const { authInfo } = requestContext;
   const verified = authInfo.sessionId ?? authInfo.extra?.["sessionId"];
   return typeof verified === "string" && verified.length > 0 && verified !== STATELESS_SESSION_ID ? verified : void 0;
@@ -62605,7 +63571,7 @@ var init_provider_registry = __esm({
         if (!(requestContext instanceof FrontMcpContext)) {
           return newProviderStore();
         }
-        if (!this.sessionCacheEnabled || verifiedSessionOf(requestContext) !== sessionKey) {
+        if (!this.sessionCacheEnabled || verifiedSessionOf2(requestContext) !== sessionKey) {
           let stores = requestContext.get(REQUEST_PROVIDER_STORES);
           if (!stores) {
             stores = /* @__PURE__ */ new WeakMap();
@@ -63027,6 +63993,7 @@ var init_web_response_renderer = __esm({
 });
 
 // libs/sdk/src/transport/web-fetch-handler.ts
+import { runRequestExclusive as runRequestExclusive6 } from "@frontmcp/utils";
 function isCloudflareWorkersRuntime(request) {
   if (typeof navigator !== "undefined" && navigator.userAgent === CLOUDFLARE_WORKERS_USER_AGENT) return true;
   const cloudflareProperties = request.cf;
@@ -63140,10 +64107,12 @@ async function runHttpRequestFlowWeb(scope, request, opts = {}) {
   const serverRequest = await toServerRequest(request, url, opts.ctx, opts.persistent, opts.env);
   let output;
   try {
-    output = await scope.runFlow("http:request", {
-      request: serverRequest,
-      response: {}
-    });
+    output = await runRequestExclusive6(
+      () => scope.runFlow("http:request", {
+        request: serverRequest,
+        response: {}
+      })
+    );
   } catch (error) {
     output = flowErrorToHttpOutput(error);
   }
@@ -63156,10 +64125,12 @@ async function runMatchingHttpFlowWeb(scope, request, opts = {}) {
   if (!flowName) return void 0;
   let output;
   try {
-    output = await scope.runFlow(flowName, {
-      request: serverRequest,
-      response: {}
-    });
+    output = await runRequestExclusive6(
+      () => scope.runFlow(flowName, {
+        request: serverRequest,
+        response: {}
+      })
+    );
   } catch (error) {
     output = flowErrorToHttpOutput(error);
   }
@@ -63170,6 +64141,7 @@ async function toServerRequest(request, url, ctx, persistent, env) {
   request.headers.forEach((v, k) => {
     headers[k] = v;
   });
+  headers["host"] = url.host;
   const query = {};
   url.searchParams.forEach((v, k) => {
     const existing = query[k];
@@ -63200,6 +64172,8 @@ async function toServerRequest(request, url, ctx, persistent, env) {
   const webRequest = new Request(url.toString(), init);
   const serverRequest = {
     method,
+    // The scheme the client used, as Express reports it (`req.protocol`).
+    protocol: url.protocol.slice(0, -1),
     path: url.pathname,
     url: url.pathname + url.search,
     headers,
@@ -63229,10 +64203,57 @@ function findMisconfiguration(error) {
     if (typeof code === "string" && MISCONFIGURATION_REMEDIES[code]) {
       return { code, remedy: MISCONFIGURATION_REMEDIES[code] };
     }
+    if (current.name === "ZodError") return { code: "CONFIG_INVALID", remedy: CONFIG_INVALID_REMEDY };
     current = current.cause;
   }
   return void 0;
 }
+function createDeferredServerBuild(build, options = {}) {
+  const now = options.now ?? Date.now;
+  let built;
+  let inFlight;
+  let failure;
+  return {
+    get(arg) {
+      if (built) return Promise.resolve(built.value);
+      if (inFlight) return inFlight;
+      if (failure && now() < failure.retryAt) return Promise.reject(failure.error);
+      const failures = failure?.count ?? 0;
+      inFlight = build(arg).then(
+        (value) => {
+          built = { value };
+          failure = void 0;
+          inFlight = void 0;
+          return value;
+        },
+        (error) => {
+          const delay = Math.min(STARTUP_RETRY_MAX_MS, STARTUP_RETRY_MIN_MS * 2 ** failures);
+          failure = { error, retryAt: now() + delay, count: failures + 1 };
+          inFlight = void 0;
+          options.onFailure?.(error);
+          throw error;
+        }
+      );
+      return inFlight;
+    },
+    retryAfterSeconds() {
+      if (!failure) return 0;
+      return Math.max(1, Math.ceil((failure.retryAt - now()) / 1e3));
+    }
+  };
+}
+function startupFailureResponse(error, retryAfterSeconds = 1) {
+  const misconfigured = misconfigurationResponse(error);
+  if (misconfigured) return misconfigured;
+  return Response.json(
+    {
+      error: "server_unavailable",
+      code: "SERVER_START_FAILED",
+      message: "The server failed to start, so it refuses requests. Its log has the cause; a request after the Retry-After delay tries to start it again."
+    },
+    { status: 503, headers: { "Retry-After": String(Math.max(1, retryAfterSeconds)) } }
+  );
+}
 function flowErrorToHttpOutput(error) {
   const misconfiguration = findMisconfiguration(error);
   if (misconfiguration) {
@@ -63266,7 +64287,7 @@ function flowErrorToHttpOutput(error) {
   }
   return { kind: "text", status: 500, body: "Internal Server Error", contentType: "text/plain; charset=utf-8" };
 }
-var CLOUDFLARE_WORKERS_USER_AGENT, MISCONFIGURATION_REMEDIES;
+var CLOUDFLARE_WORKERS_USER_AGENT, MISCONFIGURATION_REMEDIES, CONFIG_INVALID_REMEDY, STARTUP_RETRY_MIN_MS, STARTUP_RETRY_MAX_MS;
 var init_web_fetch_handler = __esm({
   "libs/sdk/src/transport/web-fetch-handler.ts"() {
     "use strict";
@@ -63280,8 +64301,14 @@ var init_web_fetch_handler = __esm({
     MISCONFIGURATION_REMEDIES = {
       SESSION_SECRET_REQUIRED: "Set MCP_SESSION_SECRET in the deployment environment (e.g. `wrangler secret put MCP_SESSION_SECRET`). Session IDs are encrypted with it, and production refuses the development machine-id fallback.",
       JWT_SECRET_INVALID: "JWT_SECRET is present but too weak: HS256 requires at least 32 bytes (RFC 7518). Replace it with `openssl rand -hex 32`.",
-      JWT_SECRET_REQUIRED: "Set JWT_SECRET in the deployment environment (e.g. `wrangler secret put JWT_SECRET`). Tokens are signed with it; production refuses the random per-process fallback because tokens would not survive a restart or verify across instances."
+      JWT_SECRET_REQUIRED: "Set JWT_SECRET in the deployment environment (e.g. `wrangler secret put JWT_SECRET`). Tokens are signed with it; production refuses the random per-process fallback because tokens would not survive a restart or verify across instances.",
+      // The startup checks: a server whose entries ask for protection nothing gives them does not start.
+      UNENFORCED_METADATA: "An entry declares a field only a plugin enforces (approval, featureFlag, ...) and no installed plugin that enforces it reaches the entry, so the server refuses to start. Install the plugin or remove the field; the server log names the entries.",
+      AUTH_CONFIGURATION_ERROR: "The auth or authorities configuration is invalid (for example, entries declare authorities and the server has no authorities option, or a rule checks nothing), so the server refuses to start. The server log names the entries."
     };
+    CONFIG_INVALID_REMEDY = "The FrontMCP configuration failed validation, so the server refuses to start. The server log names the invalid fields.";
+    STARTUP_RETRY_MIN_MS = 1e3;
+    STARTUP_RETRY_MAX_MS = 6e4;
   }
 });
 
@@ -63930,12 +64957,172 @@ var init_front_mcp_providers = __esm({
   }
 });
 
+// libs/sdk/src/front-mcp/static-startup.check.ts
+function tryNormalize(normalize) {
+  try {
+    return normalize();
+  } catch {
+    return void 0;
+  }
+}
+function asMetadata(value) {
+  return value !== null && typeof value === "object" ? value : void 0;
+}
+function isServedEverywhere(metadata) {
+  const availability = asMetadata(metadata["availableWhen"]);
+  if (!availability) return true;
+  return Object.entries(availability).every(
+    ([axis, value]) => value === void 0 || axis === "surface" && Array.isArray(value) && value.length > 0
+  );
+}
+function pluginClassOf(record) {
+  switch (record.kind) {
+    case "CLASS_TOKEN" /* CLASS_TOKEN */:
+      return record.provide;
+    case "CLASS" /* CLASS */:
+      return record.useClass;
+    case "VALUE" /* VALUE */:
+      return record.useValue?.constructor;
+    default:
+      return void 0;
+  }
+}
+function pluginHooksOf(record) {
+  const pluginClass = pluginClassOf(record);
+  if (!pluginClass) return void 0;
+  return [...collectHook(pluginClass), ...peekPendingTC39HooksForClass(pluginClass)];
+}
+function keysEnforcedByPlugins2(plugins, into = /* @__PURE__ */ new Set()) {
+  for (const plugin of plugins ?? []) {
+    const record = tryNormalize(() => normalizePlugin(plugin));
+    if (!record) continue;
+    for (const key of record.metadata.enforcesMetadata ?? []) into.add(key);
+    keysEnforcedByPlugins2(record.metadata.plugins, into);
+  }
+  return into;
+}
+function collectStaticEntries(config) {
+  const found = [];
+  const everyAppKeys = /* @__PURE__ */ new Set();
+  const ownAppKeys = /* @__PURE__ */ new Map();
+  const add = (label, metadata, reach) => {
+    const fields = asMetadata(metadata);
+    if (!fields || !isServedEverywhere(fields)) return false;
+    found.push({ label, metadata: fields, reach });
+    return true;
+  };
+  const keysOfApp = (app) => {
+    const keys = ownAppKeys.get(app) ?? /* @__PURE__ */ new Set();
+    ownAppKeys.set(app, keys);
+    return keys;
+  };
+  const visitPlugins = (plugins, app) => {
+    for (const plugin of plugins ?? []) {
+      const record = tryNormalize(() => normalizePlugin(plugin));
+      if (!record) continue;
+      const hooks = pluginHooksOf(record);
+      if (hooks === void 0 || hooks.length > 0) {
+        const gatesOnlyItsApp = hooks !== void 0 && !hooks.some((hook) => hook.appliesTo === "uncovered-apps");
+        const keys = app && gatesOnlyItsApp ? keysOfApp(app) : everyAppKeys;
+        for (const key of record.metadata.enforcesMetadata ?? []) keys.add(key);
+      }
+      visitEntries(record.metadata, app);
+    }
+  };
+  const visitEntries = (owner, app) => {
+    const reach = app ? { app } : "every-plugin";
+    for (const item of owner.tools ?? []) {
+      const record = tryNormalize(() => normalizeTool(item));
+      if (record) add(`Tool "${record.metadata.id || record.metadata.name}"`, record.metadata, reach);
+    }
+    for (const item of owner.resources ?? []) {
+      if (tryNormalize(() => isResourceTemplate(item))) {
+        const record = tryNormalize(() => normalizeResourceTemplate(item));
+        if (record) add(`Resource template "${record.metadata.name}"`, record.metadata, reach);
+      } else {
+        const record = tryNormalize(() => normalizeResource(item));
+        if (record) add(`Resource "${record.metadata.name}"`, record.metadata, reach);
+      }
+    }
+    for (const item of owner.prompts ?? []) {
+      const record = tryNormalize(() => normalizePrompt(item));
+      if (record) add(`Prompt "${record.metadata.name}"`, record.metadata, reach);
+    }
+    for (const item of owner.agents ?? []) {
+      const record = tryNormalize(() => normalizeAgent(item));
+      if (!record) continue;
+      const agentName = record.metadata.id ?? record.metadata.name;
+      if (!add(`Agent "${agentName}"`, record.metadata, reach)) continue;
+      const agentKeys = record.metadata.execution?.useToolFlow === false ? /* @__PURE__ */ new Set() : keysEnforcedByPlugins2(record.metadata.plugins);
+      for (const toolItem of record.metadata.tools ?? []) {
+        const toolRecord = tryNormalize(() => normalizeTool(toolItem));
+        if (toolRecord) add(`Tool "${agentName}:${toolRecord.metadata.name}"`, toolRecord.metadata, { agentKeys });
+      }
+    }
+    for (const item of owner.skills ?? []) {
+      const record = tryNormalize(() => normalizeSkill(item));
+      if (record) add(`Skill "${record.metadata.id ?? record.metadata.name}"`, record.metadata, "every-plugin");
+    }
+    visitPlugins(owner.plugins, app);
+  };
+  const server = config;
+  visitEntries({ skills: server.skills, plugins: server.plugins }, void 0);
+  for (const app of server.apps ?? []) {
+    const record = tryNormalize(() => normalizeApp(app));
+    if (record?.kind === "LOCAL_CLASS" /* LOCAL_CLASS */) visitEntries(record.metadata, record);
+  }
+  const everyPluginKeys = /* @__PURE__ */ new Set([...everyAppKeys, ...[...ownAppKeys.values()].flatMap((keys) => [...keys])]);
+  const keysReaching = (reach) => {
+    if (reach === "every-plugin") return everyPluginKeys;
+    if ("agentKeys" in reach) return reach.agentKeys;
+    return /* @__PURE__ */ new Set([...everyAppKeys, ...ownAppKeys.get(reach.app) ?? []]);
+  };
+  return found.map(({ label, metadata, reach }) => ({ label, metadata, enforcedBy: keysReaching(reach) }));
+}
+function assertStaticStartupConfig(config) {
+  const entries = collectStaticEntries(config);
+  if (!config.authorities) {
+    const labels = entries.filter(({ metadata }) => isEnforcementRequested(metadata["authorities"])).map(({ label }) => label);
+    if (labels.length > 0) {
+      const names = labels.slice(0, 5).join(", ");
+      const suffix = labels.length > 5 ? ` and ${labels.length - 5} more` : "";
+      throw new AuthConfigurationError(
+        `Authorities configuration required: ${names}${suffix} declare 'authorities' metadata but authorities enforcement is not fully configured (engine/context builder missing). Add 'authorities: { claimsMapping: {...}, profiles: {...} }' to your @FrontMcp() decorator to enable enforcement, or remove 'authorities' from entry metadata.`,
+        { suggestion: "Add authorities config to @FrontMcp() or remove authorities from entry metadata" }
+      );
+    }
+  }
+  const problems = entries.flatMap(
+    ({ label, metadata, enforcedBy }) => getEnforcedMetadataKeys().filter((key) => isEnforcementRequested(metadata[key]) && !enforcedBy.has(key)).map((key) => {
+      const enforcer = describeMetadataEnforcer(key);
+      return `${label} declares '${key}'${enforcer ? ` (enforced by ${enforcer})` : ""}`;
+    })
+  );
+  if (problems.length > 0) throw new UnenforcedMetadataError(problems);
+}
+var init_static_startup_check = __esm({
+  "libs/sdk/src/front-mcp/static-startup.check.ts"() {
+    "use strict";
+    init_agent_utils();
+    init_app_utils();
+    init_hook_decorator();
+    init_enforced_metadata_utils();
+    init_errors();
+    init_hooks_utils();
+    init_plugin_utils();
+    init_prompt_utils();
+    init_resource_utils();
+    init_skill_utils();
+    init_tool_utils();
+  }
+});
+
 // libs/sdk/src/front-mcp/front-mcp.ts
 var front_mcp_exports = {};
 __export(front_mcp_exports, {
   FrontMcpInstance: () => FrontMcpInstance
 });
-import { fileExists as fileExists7, randomUUID as randomUUID28, unlink as unlink2 } from "@frontmcp/utils";
+import { fileExists as fileExists7, isEdgeRuntime as isEdgeRuntime2, randomUUID as randomUUID28, unlink as unlink2 } from "@frontmcp/utils";
 function resolveConfigInput(optionsOrClass) {
   if (typeof optionsOrClass === "function") {
     const stored = getDecoratorConfig(optionsOrClass);
@@ -63963,6 +65150,7 @@ var init_front_mcp = __esm({
     init_task();
     init_web_fetch_handler();
     init_front_mcp_providers();
+    init_static_startup_check();
     stdioServing = false;
     FrontMcpInstance = class _FrontMcpInstance2 {
       config;
@@ -64121,17 +65309,30 @@ var init_front_mcp = __esm({
        * Express / Node `req`/`res` and runs on V8-isolate targets (Cloudflare
        * Workers, Deno Deploy, Bun).
        *
+       * A server the startup checks refuse (an entry whose `approval`, `featureFlag`
+       * or `authorities` nothing enforces, a missing secret, ...) rejects here, as
+       * with {@link createDirect}. On an edge isolate the server is built on its
+       * first request instead (see below).
+       *
        * @example
        * // worker entry
        * const handler = await FrontMcpInstance.createFetchHandler(config);
        * export default { fetch: (request) => handler(request) };
        */
       static async createFetchHandler(options) {
-        let inner;
-        let building;
-        const build = async () => {
-          const frontMcp = new _FrontMcpInstance2(frontMcpMetadataSchema.parse(options));
-          await frontMcp.ready;
+        const build = async (deferred) => {
+          let frontMcp;
+          try {
+            frontMcp = new _FrontMcpInstance2(frontMcpMetadataSchema.parse(options));
+            await frontMcp.ready;
+          } catch (err) {
+            if (deferred) {
+              const message = "FrontMCP failed to start; requests are refused until a retry succeeds";
+              if (frontMcp?.log) frontMcp.log.error(message, err);
+              else console.error(`[frontmcp] ${message}`, err);
+            }
+            throw err;
+          }
           const scope = frontMcp.getPrimaryScope();
           if (!scope) {
             throw new ServerNotFoundError();
@@ -64139,21 +65340,15 @@ var init_front_mcp = __esm({
           frontMcp.log?.info("FrontMCP fetch handler created (web-standard transport)");
           return createWebFetchHandler(scope);
         };
+        if (!isEdgeRuntime2()) return build(false);
+        assertStaticStartupConfig(options);
+        const server = createDeferredServerBuild(() => build(true));
         return async (request, ctx, env) => {
-          if (!inner) {
-            if (!building) {
-              building = build().catch((err) => {
-                building = void 0;
-                throw err;
-              });
-            }
-            try {
-              inner = await building;
-            } catch (err) {
-              const misconfigured = misconfigurationResponse(err);
-              if (misconfigured) return misconfigured;
-              throw err;
-            }
+          let inner;
+          try {
+            inner = await server.get();
+          } catch (err) {
+            return startupFailureResponse(err, server.retryAfterSeconds());
           }
           return inner(request, ctx, env);
         };
@@ -64649,7 +65844,8 @@ async function executeTaskWorker(options, taskId) {
     await runTaskInBackground({
       record,
       cleanedRequestParams: record.request.params,
-      ctx: { authInfo: { sessionId } },
+      // On the surface of the call that created the task, as the in-process runner runs it.
+      ctx: { authInfo: { sessionId }, ...record.surface !== void 0 && { surface: record.surface } },
       scope,
       store: taskStore,
       registry,
@@ -66519,6 +67715,7 @@ var init_common = __esm({
 // libs/sdk/src/index.ts
 init_common();
 init_front_mcp2();
+init_static_startup_check();
 init_serverless_handler();
 init_common();
 init_errors();
@@ -66856,6 +68053,39 @@ init_agent_decorator();
 
 // libs/sdk/src/index.ts
 init_adapters();
+
+// libs/sdk/src/hooks/hook-coverage.ts
+init_lineage_utils();
+function gateOf(scope, entry) {
+  if ("tool" in entry) {
+    return {
+      flow: "tools:call-tool",
+      ownerId: hookOwnerIdOf(scope.tools.lineageOf(entry.tool) ?? [], entry.tool.owner)
+    };
+  }
+  if ("resource" in entry) {
+    return {
+      flow: "resources:read-resource",
+      ownerId: appOwnerIdOf(scope.resources.lineageOf(entry.resource) ?? [], entry.resource.owner)
+    };
+  }
+  if ("prompt" in entry) {
+    return {
+      flow: "prompts:get-prompt",
+      ownerId: appOwnerIdOf(scope.prompts.lineageOf(entry.prompt) ?? [], entry.prompt.owner)
+    };
+  }
+  return {
+    flow: "skills:filter",
+    ownerId: appOwnerIdOf(scope.skills.lineageOf?.(entry.skill) ?? [], entry.skill.owner)
+  };
+}
+function isEntryGatedBy(scope, entry, target) {
+  const { flow, ownerId } = gateOf(scope, entry);
+  return scope.hooks.getFlowHooksForOwner(flow, ownerId).some((hook) => hook.metadata.target === target);
+}
+
+// libs/sdk/src/index.ts
 init_config();
 init_config();
 init_direct();
@@ -66876,6 +68106,7 @@ init_mcp_stateless_client_adapter();
 init_ext_apps2();
 import { PROTOCOL_2026_07_28 as PROTOCOL_2026_07_284 } from "@frontmcp/protocol";
 import { InMemoryOrchestratedTokenStore as InMemoryOrchestratedTokenStore2 } from "@frontmcp/auth";
+import { isAnonymousSubject as isAnonymousSubject7 } from "@frontmcp/auth";
 (function suppressZodExpressWarning() {
   if (typeof process === "undefined" || typeof process.emitWarning !== "function") return;
   const originalEmitWarning = process.emitWarning.bind(process);
@@ -67270,6 +68501,7 @@ export {
   SessionClaimConflictError,
   SessionHookStage,
   SessionIdEmptyError,
+  SessionIdentityRequiredError,
   SessionMissingError,
   SessionSecretRequiredError,
   SessionVerificationFailedError,
@@ -67397,6 +68629,7 @@ export {
   appAuthOptionsSchema,
   appFilterConfigSchema,
   applyPrimitiveFilter,
+  assertStaticStartupConfig,
   authInfoFromAuthorization,
   authOptionsSchema,
   authenticateFnSchema,
@@ -67442,6 +68675,7 @@ export {
   create,
   createChildSpanContext,
   createContextResolver,
+  createDeferredServerBuild,
   createDirectResolver,
   createElicitationStore,
   createElicitationStoreFromStorage,
@@ -67549,6 +68783,7 @@ export {
   getElicitationSecret,
   getGlobalStoreConfig,
   getNestedValue,
+  getPinnedPublicUrl,
   getRegistryUrl,
   getRequestBaseUrl,
   getRunningTool,
@@ -67568,6 +68803,7 @@ export {
   incrementalAuthConfigSchema,
   intentSchema,
   isAlive,
+  isAnonymousSubject7 as isAnonymousSubject,
   isAuthError,
   isChannelClass,
   isChannelFunction,
@@ -67577,6 +68813,7 @@ export {
   isDynamicPluginClass,
   isElicitationEncryptionAvailable,
   isEncryptedBlob,
+  isEntryGatedBy,
   isFileInstructions,
   isInlineInstructions,
   isLazy,
@@ -67657,6 +68894,7 @@ export {
   parseTraceContext,
   partitionsByIdentity,
   pathToEnvKey,
+  peekPendingTC39HooksForClass,
   performElicit,
   performListRoots,
   performSample,
@@ -67702,6 +68940,7 @@ export {
   serializeHttpCookie,
   serverInfoOptionsSchema,
   sessionIdPayloadSchema2 as sessionIdPayloadSchema,
+  sessionIdPresentedBy,
   sessionIdSchema,
   sessionOptionsSchema,
   setNestedValue,
@@ -67720,6 +68959,7 @@ export {
   skillsConfigOptionsSchema,
   skippedAppBehaviorSchema,
   sqliteOptionsSchema,
+  startupFailureResponse,
   staticAuthOptionsSchema,
   storageProviderSchema,
   supportsStreaming,