Era-aware connection model & capability gating (#1626) (#1697)
Some checks failed
Run install, format, lint, build, and test on every push / build (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish-github-container-registry (push) Has been cancelled
Some checks failed
Run install, format, lint, build, and test on every push / build (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish (push) Has been cancelled
Run install, format, lint, build, and test on every push / publish-github-container-registry (push) Has been cancelled
* Era-aware connection model & capability gating (#1626) Make protocol era (SEP §7.8) a first-class, per-server connection dimension, orthogonal to the transport type, and drive the SDK Client's versionNegotiation from it. Config - Add `ServerProtocolEra` ("legacy" | "auto" | "modern"), `DEFAULT_PROTOCOL_ERA` (legacy, per the SDK's don't-auto-probe guidance), `MODERN_PROTOCOL_VERSION`, and `eraToVersionNegotiation()` in core/mcp/types.ts. - Persist `protocolEra` on `StoredMCPServer` / `InspectorServerSettings`, round-tripping through serverList.ts (omitting the default on disk) and the `/api/servers` read + write validators. InspectorClient / state - Thread `versionNegotiation` through `InspectorClientOptions` (default legacy), replacing the hardcoded pin. After connect, read `getProtocolEra()` / `getDiscoverResult()` / `getNegotiatedProtocolVersion()`, expose them via getters, dispatch `protocolEraChange` / `discoverResultChange`, and clear on disconnect. `useInspectorClient` surfaces `protocolEra` / `discoverResult`. Web UI - ServerSettingsForm: a Protocol Era selector bound to the per-server setting. - ConnectionInfoContent: era-aware — Era badge, Session ("Sessionless" on modern), and a Discovery section (supported versions + extensions) from the `server/discover` result. CLI/TUI also map the mcp.json `protocolEra` into versionNegotiation so the field applies uniformly. Version negotiation stays fully client-side; modern connect works over the existing remote tunnel and disconnect is sessionless (the SDK skips DELETE when there is no session id). Mcp-* header fidelity is left to the History/Network card. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * Address @claude review: era docstrings, era validation, stdio session label, AGENTS.md rule - Fix stale docstrings/comments in inspectorClient.ts, useInspectorClient.ts, inspectorClientEventTarget.ts, and ConnectionInfoContent.tsx: getProtocolEra() returns "legacy" (not undefined) on a plain legacy connect; it is undefined only when not connected. - Validate protocolEra at the storedFieldsToInspectorSettings read boundary (new shared isProtocolEra guard) so a hand-edited mcp.json read directly by the CLI/TUI drops an unknown era instead of passing it to eraToVersionNegotiation. Keeps the exhaustive switch intact. - ConnectionInfoContent: the Session row is HTTP-only — show "N/A (stdio)" for stdio instead of the misleading "Session-based". - AGENTS.md: add a rule against unjustified `as unknown as` double casts, and drop the one such cast introduced in the serverList test. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XNdjEPKLG637X8YmhDiEk5 * Address re-review: dedupe isProtocolEra guard in remote server Replace the local isProtocolEra in remote/node/server.ts with the shared guard now exported from serverList.ts (already imported here), so the era literal set lives in one place and can't drift. 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:
parent
7fecebed5e
commit
e026051b47
1 changed files with 808 additions and 16 deletions
|
|
@ -51,6 +51,7 @@ import {
|
|||
extractSecretsFromStored,
|
||||
INSPECTOR_FIELD_KEYS,
|
||||
inspectorSettingsToStoredFields,
|
||||
isProtocolEra,
|
||||
mergeSecretsIntoStored,
|
||||
normalizeServerType,
|
||||
storedFieldsToInspectorSettings,
|
||||
|
|
@ -1178,6 +1179,13 @@ export function createRemoteApp(
|
|||
);
|
||||
delete valObj.roots;
|
||||
}
|
||||
if ("protocolEra" in valObj && !isProtocolEra(valObj.protocolEra)) {
|
||||
logWarn(
|
||||
{ route: "/api/servers", id, droppedKey: "protocolEra" },
|
||||
"Dropping malformed `protocolEra` field — expected 'legacy', 'auto', or 'modern'.",
|
||||
);
|
||||
delete valObj.protocolEra;
|
||||
}
|
||||
|
||||
out[id] = normalizeServerType(
|
||||
valObj as Record<string, unknown> & { type?: string },
|
||||
|
|
@ -1436,6 +1444,15 @@ export function createRemoteApp(
|
|||
error: "settings.roots must be an array of { uri, name? }",
|
||||
};
|
||||
}
|
||||
// protocolEra is optional on the wire (older clients won't send it); when
|
||||
// present it must be one of the three era literals, otherwise it defaults
|
||||
// to absent (→ legacy) below.
|
||||
if (obj.protocolEra !== undefined && !isProtocolEra(obj.protocolEra)) {
|
||||
return {
|
||||
ok: false,
|
||||
error: "settings.protocolEra must be 'legacy', 'auto', or 'modern'",
|
||||
};
|
||||
}
|
||||
// Build the validated value from explicitly named fields rather than
|
||||
// casting the raw object through. Unknown keys silently drop so a
|
||||
// misconfigured client can't smuggle stowaways onto disk, and consumers
|
||||
|
|
@ -1494,6 +1511,11 @@ export function createRemoteApp(
|
|||
) {
|
||||
value.oauthOnInsufficientScope = obj.oauthOnInsufficientScope;
|
||||
}
|
||||
// Optional; when a valid era is present, carry it. Absence reads back as the
|
||||
// default era downstream (eraToVersionNegotiation is not called for absent).
|
||||
if (isProtocolEra(obj.protocolEra)) {
|
||||
value.protocolEra = obj.protocolEra;
|
||||
}
|
||||
// Empty cwd coerces to absent on the value (matching the read side); the
|
||||
// write-through distinguishes "sent cwd: '' " (clear) from "cwd omitted"
|
||||
// (preserve) via `cwdProvided` below rather than the value alone.
|
||||
|
|
|
|||
Loading…
Reference in a new issue