@frontmcp/sdk 1.8.4 → 1.8.5

package/esm/index.mjs

@@ -6497,30 +6497,30 @@ var require_dist = __commonJS({
       sqliteStorageOptionsSchema: () => sqliteStorageOptionsSchema
     });
     module.exports = __toCommonJS2(index_exports);
-    var import_utils113 = __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_utils113.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_utils113.randomBytes)(12);
+      const iv = (0, import_utils114.randomBytes)(12);
       const plaintextBytes = new TextEncoder().encode(plaintext);
-      const { ciphertext, tag } = (0, import_utils113.encryptAesGcm)(key, plaintextBytes, iv);
-      return [(0, import_utils113.base64urlEncode)(iv), (0, import_utils113.base64urlEncode)(tag), (0, import_utils113.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_utils113.base64urlDecode)(parts[0]);
-      const tag = (0, import_utils113.base64urlDecode)(parts[1]);
-      const ciphertext = (0, import_utils113.base64urlDecode)(parts[2]);
-      const plaintext = (0, import_utils113.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");
@@ -10275,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";
@@ -10284,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: ";
   }
 });
 
@@ -10384,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");
@@ -10504,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();
   }
 });
 
@@ -11065,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);
         }
@@ -14614,6 +14654,9 @@ function readPublicUrlPin() {
 function isPublicUrlPinned() {
   return readPublicUrlPin() !== void 0;
 }
+function getPinnedPublicUrl() {
+  return readPublicUrlPin();
+}
 function isProxyTrusted() {
   try {
     if (typeof process !== "undefined" && process.env) {
@@ -16061,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({
@@ -22428,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) {
@@ -27297,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");
+          }
         }
       }
       /**
@@ -27578,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"() {
@@ -27609,16 +27680,30 @@ 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). */
@@ -27703,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}`);
           }
@@ -27727,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",
@@ -27746,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}`);
             }
@@ -27772,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.
@@ -27889,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;
@@ -27913,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;
       }
       /**
@@ -27968,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;
       }
       /**
@@ -28004,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;
@@ -28065,21 +28207,20 @@ var init_skill_registry = __esm({
       /**
        * 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
@@ -28369,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,
@@ -28408,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;
@@ -28442,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;
@@ -29450,7 +29675,7 @@ var init_agent_instance = __esm({
       "hideFromDiscovery"
     ]);
     AgentInstance = class extends AgentEntry {
-      providers;
+      providerRegistry;
       scope;
       hooks;
       /** The LLM adapter for this agent */
@@ -29468,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;
@@ -29531,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;
               }
@@ -29548,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);
           }
@@ -29656,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) {
@@ -29698,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"
+          });
         };
       }
       /**
@@ -29721,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.
@@ -29770,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 */:
@@ -29789,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,
@@ -29864,7 +30113,8 @@ var init_agent_instance = __esm({
           await this.assertToolAuthorized(tool, ctx.authInfo, args);
           const runningTool = { name: tool.name, fullName: tool.fullName };
           return runOnSurface(AGENT_SURFACE, () => {
-            const toolContext = runAsTool(runningTool, () => tool.create(args, ctx));
+            const { contextProviders: _agentProviders, ...toolCtx } = ctx;
+            const toolContext = runAsTool(runningTool, () => tool.create(args, toolCtx));
             return runAsTool(runningTool, () => Promise.resolve(toolContext.execute(args)));
           });
         };
@@ -30403,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";
@@ -30412,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({
@@ -30451,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: [
@@ -30464,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;
@@ -30536,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) {
@@ -30601,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",
@@ -30625,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;
@@ -30649,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;
@@ -30694,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);
         })();
@@ -30705,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,
@@ -30713,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);
         }
       }
@@ -30750,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;
@@ -30761,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,
@@ -30835,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);
@@ -31636,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. */
@@ -31992,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) {
@@ -32003,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 })
@@ -32049,6 +32414,7 @@ async function dispatch20260728(options) {
     scope,
     body,
     clientCapabilities,
+    clientDeclaredRevision,
     frontmcpContext,
     authInfo,
     isAnonymous,
@@ -32095,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;
@@ -32125,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);
@@ -38134,6 +38502,8 @@ var init_oauth_authorize_flow = __esm({
             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;
           }
@@ -40292,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`
         );
@@ -41205,7 +41575,7 @@ var init_oauth_userinfo_flow = __esm({
           return;
         }
         const localAuth = this.scope.auth;
-        const issuer = localAuth.issuerFor?.(this.rawInput.request);
+        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 });
@@ -41264,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,
@@ -41300,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(),
@@ -41358,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: {
@@ -41385,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 = {
@@ -41584,7 +41959,7 @@ 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);
-          const issuer = auth.issuerFor?.(this.rawInput.request);
+          const issuer = auth.acceptedIssuersFor?.(this.rawInput.request);
           verify = auth.verifyGatewayToken(token, this.state.required.baseUrl, configuredAudience ?? resource, issuer);
         }
         const result = await verify;
@@ -41877,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
@@ -41908,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)) {
@@ -41916,6 +42297,7 @@ var init_well_known_oauth_authorization_server_flow = __esm({
         this.state.set(
           wellKnownAsStateSchema.parse({
             baseUrl,
+            issuer,
             oauthBaseUrl,
             // The scopes this server grants (`allowedScopes`, #262): the literal
             // entries; a `*` glob names no scope a client could ask for.
@@ -41930,6 +42312,7 @@ var init_well_known_oauth_authorization_server_flow = __esm({
         );
       }
       async collectData() {
+        const { issuer } = this.state;
         const {
           baseUrl,
           oauthBaseUrl,
@@ -41940,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",
@@ -41967,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
             }
@@ -42003,7 +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 { advertisedScopes as advertisedScopes2 } from "@frontmcp/auth";
+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({
@@ -42015,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()
     });
@@ -42046,12 +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 auth = scope.metadata.auth;
+        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: auth && isOrchestratedMode(auth) ? advertisedScopes2(auth.allowedScopes) : scope.getAllSupportedScopes(),
+            authorizationServer,
+            scopesSupported,
             isOrchestrated: false
             //scope.orchestrated,// TODO: fix
           })
@@ -42059,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",
@@ -42070,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"]
             }
           });
@@ -42084,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"]
           }
         });
@@ -42264,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"() {
@@ -42316,7 +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.issuerIsConfigured = this.configuredIssuer(options) !== void 0 || !!getEnv4("FRONTMCP_PUBLIC_HOST")?.trim();
+        this.publicHostPinned = !!getEnv4("FRONTMCP_PUBLIC_HOST")?.trim();
         const jwtSecret = getEnv4("JWT_SECRET");
         const hasJwtSecret = !!jwtSecret?.trim();
         if (hasJwtSecret && jwtSecret) {
@@ -42357,8 +42759,8 @@ var init_instance_local_primary_auth = __esm({
       port;
       /** The boot-time issuer: the configured one, else this server's listener address (see {@link issuerFor}). */
       issuer;
-      /** Whether the operator named the issuer (`issuer` / `local.issuer`, or its host with `FRONTMCP_PUBLIC_HOST`). */
-      issuerIsConfigured;
+      /** Whether `FRONTMCP_PUBLIC_HOST` names the boot-time issuer's host, pinning it for every request. */
+      publicHostPinned;
       keys = [];
       secret;
       logger;
@@ -42516,27 +42918,52 @@ var init_instance_local_primary_auth = __esm({
         return void 0;
       }
       /**
-       * The issuer (`iss`) this server names on the tokens it issues in answer to
-       * `request`, and requires on the tokens it accepts there (#269). Issuing and
-       * verifying both ask this, so they can't disagree:
+       * 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:
        *
-       * - a configured issuer (`issuer` / `local.issuer`) is the issuer;
-       * - with `FRONTMCP_PUBLIC_URL` pinned, the issuer is that URL plus this
-       *   scope's path, the address discovery advertises;
-       * - with `FRONTMCP_PUBLIC_HOST` or `expectedAudience` set, the boot-time
-       *   issuer, so a token serves at every address the server answers to;
-       * - a request that came through a Web fetch handler (a Worker, Deno, Bun, a
-       *   Durable Object) has no listener the boot-time issuer could describe, so
-       *   the issuer is the request's own origin plus this scope's path;
-       * - otherwise (the Node server) the boot-time issuer.
+       * 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) {
-        if (!request || this.issuerIsConfigured) return this.issuer;
-        if (isPublicUrlPinned()) return computeIssuer(request, this.scope.entryPath, this.scope.routeBase);
+        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;
-        if (isOrchestratedMode(options) && options.expectedAudience !== void 0) return this.issuer;
-        const webRequest = request[ServerRequestTokens.webRequest];
-        return webRequest === void 0 ? this.issuer : computeIssuer(request, this.scope.entryPath, this.scope.routeBase);
+        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 [...accepted];
       }
       /**
        * Read the `tokenStorage` selection off the auth options. Only
@@ -42787,10 +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`): `expectedIssuer`, which callers
-       *   take from {@link issuerFor} the request, as the token endpoint does when
-       *   it signs; the boot-time issuer when not given. Never the token's own
-       *   claim; 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
@@ -42803,7 +43230,7 @@ var init_instance_local_primary_auth = __esm({
         try {
           const { payload, protectedHeader } = await jwtVerify(token, this.secret, {
             algorithms: ["HS256"],
-            issuer: expectedIssuer ?? this.issuer,
+            issuer: typeof expectedIssuer === "string" ? expectedIssuer : expectedIssuer ? [...expectedIssuer] : this.issuer,
             requiredClaims: ["exp"]
           });
           if (expectedAudience !== void 0 && !audienceMatchesResource(payload.aud, expectedAudience)) {
@@ -43759,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({
@@ -44728,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 });
@@ -44740,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 {
@@ -44750,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(
@@ -44770,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": {
@@ -44803,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":
@@ -44886,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();
@@ -44895,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();
   }
 });
 
@@ -47968,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"() {
@@ -48037,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) {
@@ -49634,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,
@@ -49663,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();
@@ -49890,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({
@@ -51169,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 });
@@ -51415,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) } };
     }
@@ -52384,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)) {
@@ -52745,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;
@@ -52777,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.
@@ -54824,10 +55346,10 @@ 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: the one this
-       *                           instance issues tokens under for the request
-       *                           (`LocalPrimaryAuth.issuerFor`). Default: its
-       *                           boot-time issuer.
+       * @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, _expectedIssuer) {
         return Promise.resolve({
@@ -54902,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;
@@ -56283,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));
@@ -56330,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
@@ -56445,10 +56973,12 @@ var init_handle_mcp_20260728_flow = __esm({
             // authenticated caller.
             ...authInfoFromAuthorization(auth),
             // The shared handlers still key per-request state (provider views, notifications)
-            // off an id. This one names the request only; the request context does not vouch for it.
-            sessionId: auth.session?.id
+            // 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)
@@ -60297,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();
@@ -61581,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;
@@ -61985,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;
@@ -63661,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) {
@@ -63698,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";
@@ -63717,6 +64306,9 @@ var init_web_fetch_handler = __esm({
       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;
   }
 });
 
@@ -64729,11 +65321,16 @@ var init_front_mcp = __esm({
        */
       static async createFetchHandler(options) {
         const build = async (deferred) => {
-          const frontMcp = new _FrontMcpInstance2(frontMcpMetadataSchema.parse(options));
+          let frontMcp;
           try {
+            frontMcp = new _FrontMcpInstance2(frontMcpMetadataSchema.parse(options));
             await frontMcp.ready;
           } catch (err) {
-            if (deferred) frontMcp.log?.error("FrontMCP failed to start; requests are refused until it does", 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();
@@ -64745,23 +65342,13 @@ var init_front_mcp = __esm({
         };
         if (!isEdgeRuntime2()) return build(false);
         assertStaticStartupConfig(options);
-        let inner;
-        let building;
+        const server = createDeferredServerBuild(() => build(true));
         return async (request, ctx, env) => {
-          if (!inner) {
-            if (!building) {
-              building = build(true).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);
         };
@@ -68088,6 +68675,7 @@ export {
   create,
   createChildSpanContext,
   createContextResolver,
+  createDeferredServerBuild,
   createDirectResolver,
   createElicitationStore,
   createElicitationStoreFromStorage,
@@ -68195,6 +68783,7 @@ export {
   getElicitationSecret,
   getGlobalStoreConfig,
   getNestedValue,
+  getPinnedPublicUrl,
   getRegistryUrl,
   getRequestBaseUrl,
   getRunningTool,
@@ -68370,6 +68959,7 @@ export {
   skillsConfigOptionsSchema,
   skippedAppBehaviorSchema,
   sqliteOptionsSchema,
+  startupFailureResponse,
   staticAuthOptionsSchema,
   storageProviderSchema,
   supportsStreaming,