Extensions: first-class advertised-extensions map (Phase 1 of #1633) (#1742)

* Extensions: first-class advertised-extensions map (Phase 1 of #1633)

Collapse the two ad-hoc `capabilities.extensions` spreads in the
InspectorClient constructor (EMA, gated on enterpriseManaged; the modern
Tasks extension, always-on) into a single builder that is the source of
truth for what the client advertises.

- core/mcp/extensions.ts: `ADVERTISABLE_EXTENSIONS` registry (id + label +
  default-on flag), the `EMA_EXTENSION_KEY` constant, and
  `buildClientExtensions()`. The registry is the shared list the Server
  Settings toggle UI (Phase 2, #1739) will drive; EMA stays a conditional
  built-in (auth-mode driven, not a free toggle).
- InspectorClientOptions.advertisedExtensions: per-extension overrides
  (present key wins over the registry default) so a future UI can toggle
  advertised extensions as a debugging knob.
- Behavior preserved: tasks defaults to advertised, so the map is non-empty
  and rides every modern request envelope; EMA advertised iff enterpriseManaged.

The raw modern-task envelope re-stamp is left untouched (it fires only on
the raw tasks channel, which requires the extension anyway).

Tests: extensions.test.ts covers the registry and every builder branch
(defaults, EMA on/off, override enable/disable, unknown key) at 100%.
The tasks-era and EMA integration suites still assert the same wire
advertisement. `advertisedExtensions` is plumbed but not yet wired to the
form (that lands in Phase 2).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5

* Extensions: address Phase 1 review (EMA-override test + envelope comment)

- extensions.test.ts: add an EMA-specific assertion that an override for
  EMA_EXTENSION_KEY cannot advertise it (auth-mode only) — documents intent
  and guards against EMA being added to ADVERTISABLE_EXTENSIONS by mistake.
- inspectorClient.ts: rewrite the withModernTaskEnvelope tasks-stamp comment
  so it stays accurate once Phase 2 lets a user disable general tasks
  advertisement — the force-stamp is load-bearing (the raw tasks/* channel
  requires the extension), not a redundant re-add.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5

* TUI: de-flake step-up OAuth frame assertions (raise poll ceiling)

The step-up authorize tests intermittently timed out on the final
"Step-up authorization succeeded" frame. Root cause is a test-infra
timing budget, not product code: waitForFrame/waitUntil polled only 25×
(25ms tick ≈ 625ms), and the step-up flow adds an extra async OAuth-runner
hop plus React commits that can exceed that under CI load with v8 coverage.

Hoist the poll count into a named POLL_TRIES = 100 (~2.5s ceiling). A poll
exits the instant its predicate is true, so a higher ceiling never slows a
passing assertion — it only widens the margin for the slow path. Verified
5× green (3 plain + 2 under --coverage), including the previously-flaky
step-up cases.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5

* TUI: prettier-format the wrapped waitForFrame signature

The POLL_TRIES change pushed waitForFrame's signature past the print width;
Prettier wraps it. (Root has no aggregate format script — format is
per-client, so this was missed locally.)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Cliff Hall 2026-07-22 15:25:45 -04:00 • committed by GitHub
commit 2f80958d3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

93
core/mcp/extensions.ts Normal file
View file

@ -0,0 +1,93 @@
import type { ClientCapabilities } from "@modelcontextprotocol/client";
import { TASKS_EXTENSION_KEY } from "./modernTaskSchemas.js";
/**
* Extension identifier for SEP-2350 enterprise-managed authorization. Advertised
* when the connection routes through the enterprise IdP (EMA), which is a
* property of the auth mode rather than a free debugging toggle — so it is a
* conditional built-in in {@link buildClientExtensions}, not a registry entry.
*/
export const EMA_EXTENSION_KEY =
"io.modelcontextprotocol/enterprise-managed-authorization";
/**
* The value the client stamps for each advertised extension. The wire shape is
* `{ [extensionId]: object }` (per `ClientCapabilities.extensions`); an empty
* object is the standard "declared, no sub-options" advertisement.
*/
export type ExtensionAdvertisement = NonNullable<
ClientCapabilities["extensions"]
>[string];
/**
* A single Inspector-advertisable extension. The registry of these is the shared
* source of truth for both the capability builder here and the Server Settings
* toggle UI (#1739), so the two never drift on which extensions exist or what
* they are called.
*/
export interface AdvertisableExtension {
/** Extension identifier stamped into `capabilities.extensions`. */
key: string;
/** Human-readable label for the Server Settings toggle. */
label: string;
/**
* Whether the Inspector advertises this extension when the user has expressed
* no explicit preference (the toggle's default position).
*/
defaultAdvertised: boolean;
}
/**
* Catalog of extensions the Inspector can advertise and the user can toggle.
* EMA is deliberately absent — it is driven by the auth mode (see
* {@link EMA_EXTENSION_KEY}), not a standalone toggle. The `io.modelcontextprotocol/ui`
* Apps extension is added here in Phase 3 (#1740).
*/
export const ADVERTISABLE_EXTENSIONS: readonly AdvertisableExtension[] = [
{
key: TASKS_EXTENSION_KEY,
label: "Tasks (io.modelcontextprotocol/tasks)",
// The modern Tasks extension (SEP-2663). Advertised by default so the SDK
// stamps it into every modern request envelope — the per-request
// declaration a server requires before it may return a `CreateTaskResult`
// (server-directed task creation). Harmless on legacy (extensions ignored).
defaultAdvertised: true,
},
];
export interface BuildClientExtensionsInput {
/** True when the connection routes through the enterprise IdP (EMA). */
enterpriseManaged: boolean;
/**
* Per-extension advertise overrides keyed by extension id, from
* {@link InspectorClientOptions.advertisedExtensions}. A key present here wins
* over the registry's `defaultAdvertised`; an absent key falls back to it.
*/
advertised?: Record<string, boolean>;
}
/**
* Assemble the `capabilities.extensions` map advertised at construction — the
* single source of truth that replaces the previously ad-hoc, per-extension
* spreads. Registry entries resolve to advertised/not via the user override with
* a registry-default fallback; EMA is layered on top as an auth-mode-driven
* built-in.
*
* With the Tasks entry defaulting to advertised, the map is non-empty for a
* default config, so `capabilities.extensions` is always attached.
*/
export function buildClientExtensions(
input: BuildClientExtensionsInput,
): Record<string, ExtensionAdvertisement> {
const map: Record<string, ExtensionAdvertisement> = {};
for (const ext of ADVERTISABLE_EXTENSIONS) {
const advertised = input.advertised?.[ext.key] ?? ext.defaultAdvertised;
if (advertised) {
map[ext.key] = {};
}
}
if (input.enterpriseManaged) {
map[EMA_EXTENSION_KEY] = {};
}
return map;
}