@agent-native/core 0.206.0-nightly-20261009153146 → 0.206.0

package/dist/mcp/embed-app.js

@@ -3,6 +3,7 @@ import { MCP_APP_HOST_FILL_ATTRIBUTE, MCP_APP_PANE_FILL_MAX_HEIGHT, } from "../s
 const MCP_APP_IMPORT = "https://esm.sh/@modelcontextprotocol/ext-apps@1.7.5/app-with-deps";
 export const MCP_APP_REQUEST_ORIGIN_CSP_SOURCE = "$requestOrigin";
 const MCP_APP_WRAPPER_CHROME_HEIGHT = 44;
+const MCP_APP_INLINE_LAUNCHER_HEIGHT = 56;
 export const DEFAULT_MCP_APP_SHELL_HEIGHT = 560;
 export const DEFAULT_MCP_APP_VIEWPORT_HEIGHT = DEFAULT_MCP_APP_SHELL_HEIGHT - MCP_APP_WRAPPER_CHROME_HEIGHT;
 function attr(value) {
@@ -29,12 +30,9 @@ export function embedApp(options = {}) {
         ...(options.description ? { description: options.description } : {}),
         html: (ctx) => {
             const remoteBridgeFallbackEnabled = ctx.catalogMode !== "directory";
-            // A directory widget is an editor that lives in a host pane, never a
-            // content-sized card, so it fills the pane even when the host will not
-            // give it a height (see paneFillHeight).
             const fillsPane = ctx.catalogMode === "directory";
             return `<!doctype html>
-<html lang="en"${fillsPane ? ` ${MCP_APP_HOST_FILL_ATTRIBUTE}="1"` : ""}>
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -60,6 +58,10 @@ export function embedApp(options = {}) {
     .fallback-copy { max-width: 520px; color: color-mix(in srgb, CanvasText 64%, Canvas); font-size: 13px; line-height: 1.45; }
     .fallback-actions { display: flex; flex-wrap: wrap; align-items: center; justify-content: center; gap: 8px; }
     .fallback-url { max-width: min(560px, 100%); overflow-wrap: anywhere; color: color-mix(in srgb, CanvasText 76%, Canvas); font-size: 12px; }
+    body[data-catalog-mode="directory"][data-widget-mode="inline"] .shell { display: flex; align-items: center; height: ${MCP_APP_INLINE_LAUNCHER_HEIGHT}px; min-height: ${MCP_APP_INLINE_LAUNCHER_HEIGHT}px; max-height: ${MCP_APP_INLINE_LAUNCHER_HEIGHT}px; overflow: hidden; }
+    body[data-catalog-mode="directory"][data-widget-mode="inline"] .bar { width: 100%; height: ${MCP_APP_INLINE_LAUNCHER_HEIGHT}px; min-height: ${MCP_APP_INLINE_LAUNCHER_HEIGHT}px; padding: 0 12px; border: 0; }
+    body[data-catalog-mode="directory"][data-widget-mode="inline"] [data-display] { display: none !important; }
+    body[data-catalog-mode="directory"][data-widget-mode="inline"] .stage { display: none; }
     html[${MCP_APP_HOST_FILL_ATTRIBUTE}], html[${MCP_APP_HOST_FILL_ATTRIBUTE}] body { height: 100%; }
     html[${MCP_APP_HOST_FILL_ATTRIBUTE}] .shell { display: flex; flex-direction: column; gap: 0; height: 100vh; height: 100dvh; min-height: 0; }
     html[${MCP_APP_HOST_FILL_ATTRIBUTE}] .bar { display: none; }
@@ -73,6 +75,7 @@ export function embedApp(options = {}) {
   data-open-label="${attr(openLabel)}"
   data-start-tool="${attr(ctx.startToolName ?? startToolName)}"
   data-catalog-mode="${attr(ctx.catalogMode)}"
+  data-widget-mode="${fillsPane ? "inline" : "content"}"
   data-embed-default="${embedByDefault ? "1" : "0"}"
 >
   <main class="shell">
@@ -125,14 +128,18 @@ export function embedApp(options = {}) {
     let toolResponseMetadata = {};
     let openUrl = "";
     let openStartUrl = "";
+    let activeEmbedSessionTicket = "";
     let startedFor = "";
     let appFrame = null;
     let appFrameReady = false;
     let appFrameReadyTimer = null;
     let appFrameLoadTimer = null;
     let lastFrameSrc = "";
+    const appFrameDocumentState = { loadGeneration: 0 };
     let embedSessionRefreshAttempts = 0;
     let reportedContentHeight = 0;
+    let directoryWidgetOpenRequested = false;
+    let lastHostDisplayMode = "";
 
     function esc(value) {
       return String(value ?? "")
@@ -178,6 +185,27 @@ export function embedApp(options = {}) {
       return record.displayMode === "fullscreen" || record.displayMode === "pip";
     }
 
+    function isCompactDirectoryWidget() {
+      return fillsPane && body.dataset.widgetMode === "inline";
+    }
+
+    function updateDirectoryWidgetLayout() {
+      if (!fillsPane) return false;
+      const context = hostState().context || {};
+      const displayMode = context.displayMode;
+      if (displayMode === "inline" && lastHostDisplayMode === "fullscreen") {
+        directoryWidgetOpenRequested = false;
+      }
+      if (typeof displayMode === "string") {
+        lastHostDisplayMode = displayMode;
+      }
+      const inline =
+        !directoryWidgetOpenRequested &&
+        (displayMode === undefined || displayMode === "inline");
+      body.dataset.widgetMode = inline ? "inline" : "pane";
+      return inline;
+    }
+
     // A fullscreen view or fixed-height container sizes the frame itself, so
     // the shell fills it with CSS and never reports a height. An inline card is
     // the opposite: the host follows the height reported here, so filling the
@@ -187,15 +215,19 @@ export function embedApp(options = {}) {
     function applyHostFillMode() {
       const context = hostState().context || {};
       const hostFill = hostFillsContainer(context);
+      const compactInline = isCompactDirectoryWidget();
       const root = document.documentElement;
-      if (hostFill || fillsPane) {
+      if (compactInline) {
+        root.removeAttribute(hostFillAttribute);
+        if (appFrame) appFrame.style.height = "";
+      } else if (hostFill || fillsPane) {
         root.setAttribute(hostFillAttribute, "1");
         if (appFrame) appFrame.style.height = "";
       } else {
         root.removeAttribute(hostFillAttribute);
       }
       body.dataset.hostFill = hostFill ? "1" : "0";
-      body.dataset.paneFill = fillsPane && !hostFill ? "1" : "0";
+      body.dataset.paneFill = fillsPane && !hostFill && !compactInline ? "1" : "0";
       body.dataset.hostDisplayMode = typeof context.displayMode === "string" ? context.displayMode : "";
       return hostFill;
     }
@@ -222,7 +254,13 @@ export function embedApp(options = {}) {
     // the frame's height; in a pane the shell owns it, so tell the app so.
     function hostStateForApp() {
       const state = hostState();
-      if (!fillsPane || hostFillsContainer(state.context)) return state;
+      if (
+        !fillsPane ||
+        isCompactDirectoryWidget() ||
+        hostFillsContainer(state.context)
+      ) {
+        return state;
+      }
       const context = objectValue(state.context);
       return {
         ...state,
@@ -298,7 +336,11 @@ export function embedApp(options = {}) {
     function toolResultMeta(params) {
       if (!params || typeof params !== "object") return {};
       const direct = metadataRecord(params);
-      if (direct) return direct;
+      if (direct) {
+        const mcpToolResult = direct.mcp_tool_result;
+        const mcpMeta = metadataRecord(mcpToolResult);
+        return mcpMeta || direct;
+      }
       if (params.result && typeof params.result === "object") {
         return toolResultMeta(params.result);
       }
@@ -396,8 +438,31 @@ export function embedApp(options = {}) {
       };
     }
 
+    function appFrameTargetOrigin() {
+      if (body.dataset.catalogMode !== "directory") return "*";
+      const candidates = [openStartUrl, openUrl];
+      for (const candidate of candidates) {
+        if (!candidate) continue;
+        try {
+          const origin = new URL(candidate, window.location.href).origin;
+          if (origin && origin !== "null") return origin;
+        // coercion-ok: skip a malformed optional URL so the next host URL can be tried.
+        } catch {}
+      }
+      return "";
+    }
+
+    function isTrustedAppFrameOrigin(origin) {
+      return (
+        body.dataset.catalogMode !== "directory" ||
+        origin === "null" ||
+        (!!origin && origin === appFrameTargetOrigin())
+      );
+    }
+
     function sendToAppFrame(message) {
       if (!appFrame || !appFrame.contentWindow) return;
+      // ChatGPT sandboxes nested app frames to opaque origins. Only non-secret bridge data is sent here.
       try { appFrame.contentWindow.postMessage(message, "*"); } catch {}
     }
 
@@ -472,7 +537,7 @@ export function embedApp(options = {}) {
       const originPayload = { type: "agentNative.frameOrigin", origin: window.location.origin };
       frameReadyMessageDelays.forEach((delay) => {
         setTimeout(() => {
-          try { frame.contentWindow && frame.contentWindow.postMessage(originPayload, "*"); } catch {}
+          if (frame.contentWindow) frame.contentWindow.postMessage(originPayload, "*");
           sendHostContext();
         }, delay);
       });
@@ -492,20 +557,52 @@ export function embedApp(options = {}) {
       }
     }
 
-    function embedSessionArgsFor(value) {
-      const chrome = typeof toolInput.chrome === "string" ? toolInput.chrome : "full";
+    function embedTicketFromStartUrl(value) {
+      if (typeof value !== "string" || !value) return null;
+      const url = new URL(value, window.location.href);
+      return url.pathname.endsWith("/_agent-native/embed/start")
+        ? url.searchParams.get("ticket") || null
+        : null;
+    }
+
+    function rememberActiveEmbedSessionTicket(value) {
+      const ticket = embedTicketFromStartUrl(value);
+      if (ticket) activeEmbedSessionTicket = ticket;
+    }
+
+    function embedSessionArgsFor(
+      value,
+      renewInPlace = false,
+      renewalSourceTicket = "",
+    ) {
       if (body.dataset.catalogMode === "directory") {
-        const widgetSource = toolResponseMetadata["agent-native/widgetSource"];
-        const sourceTool = widgetSource && typeof widgetSource.toolName === "string"
-          ? widgetSource.toolName
-          : undefined;
+        const widgetSource = objectValue(
+          toolResponseMetadata["agent-native/widgetSource"],
+        );
+        const originalSourceTicket =
+          typeof widgetSource.sourceTicket === "string" &&
+          widgetSource.sourceTicket.trim()
+            ? widgetSource.sourceTicket
+            : embedTicketFromStartUrl(openStartUrl || value);
+        const sourceTicket = renewInPlace
+          ? typeof renewalSourceTicket === "string" &&
+            renewalSourceTicket.trim()
+            ? renewalSourceTicket
+            : null
+          : originalSourceTicket;
+        if (typeof sourceTicket !== "string" || !sourceTicket.trim()) {
+          throw new Error(
+            renewInPlace
+              ? "The active widget session ticket is unavailable."
+              : "The original widget session ticket is unavailable.",
+          );
+        }
         return {
-          ...(sourceTool ? { sourceTool } : {}),
-          toolInput,
-          toolOutput: toolResultData,
-          chrome
+          sourceTicket,
+          ...(renewInPlace ? { renewInPlace: true } : {}),
         };
       }
+      const chrome = typeof toolInput.chrome === "string" ? toolInput.chrome : "full";
       return typeof value === "string" && value.startsWith("/")
         ? { path: value, chrome }
         : { url: value, chrome };
@@ -995,6 +1092,7 @@ export function embedApp(options = {}) {
     }
 
     async function transplantAppDocument(src) {
+      rememberActiveEmbedSessionTicket(src);
       clearFrameReadyTimer();
       clearFrameLoadTimer();
       appFrame = null;
@@ -1100,11 +1198,16 @@ export function embedApp(options = {}) {
       const context = hostState().context || {};
       const nextMode = context.displayMode === "fullscreen" ? "inline" : "fullscreen";
       const supported = supportedDisplayMode(nextMode);
-      displayButton.hidden = !supported;
+      displayButton.hidden = !supported || (fillsPane && nextMode === "fullscreen");
       displayButton.disabled = !supported;
       displayButton.textContent = nextMode === "fullscreen" ? "Fullscreen" : "Inline";
       displayButton.onclick = () => {
         if (!supportedDisplayMode(nextMode)) return;
+        if (fillsPane && nextMode === "inline") {
+          directoryWidgetOpenRequested = false;
+          updateDirectoryWidgetLayout();
+          notifyHostHeight();
+        }
         void requestHostDisplayMode(nextMode).catch((err) => {
           console.warn("[agent-native] MCP host rejected display mode request", err);
         });
@@ -1355,6 +1458,7 @@ export function embedApp(options = {}) {
     }
 
     function renderFrame(src) {
+      rememberActiveEmbedSessionTicket(src);
       clearFrameReadyTimer();
       clearFrameLoadTimer();
       const frame = document.createElement("iframe");
@@ -1364,8 +1468,10 @@ export function embedApp(options = {}) {
       appFrame = frame;
       appFrameReady = false;
       lastFrameSrc = src;
+      appFrameDocumentState.loadGeneration += 1;
       frame.addEventListener("load", () => {
         if (appFrame !== frame) return;
+        appFrameDocumentState.loadGeneration += 1;
         clearFrameLoadTimer();
         notifyOuterMcpAppReady();
         sendFrameReadyMessages(frame);
@@ -1404,6 +1510,83 @@ export function embedApp(options = {}) {
       void launchEmbed();
     }
 
+    async function renewExpiredEmbedSession(
+      requestId,
+      frame,
+      frameLoadGeneration,
+    ) {
+      const directoryMode = body.dataset.catalogMode === "directory";
+      const canDeliverRenewal = () =>
+        frame === appFrame &&
+        (!directoryMode ||
+          appFrameDocumentState.loadGeneration === frameLoadGeneration);
+      const sendRenewalResult = (message) => {
+        if (!canDeliverRenewal()) return;
+        sendToAppFrame(message);
+      };
+      if (!requestId || !frame || !canDeliverRenewal()) return;
+      if (!openUrl) {
+        sendRenewalResult({
+          type: "agentNative.embedSessionRenewed",
+          data: { requestId, ok: false },
+        });
+        return;
+      }
+      if (embedSessionRefreshAttempts >= maxEmbedSessionRefreshAttempts) {
+        sendRenewalResult({
+          type: "agentNative.embedSessionRenewed",
+          data: { requestId, ok: false },
+        });
+        return;
+      }
+
+      embedSessionRefreshAttempts += 1;
+      try {
+        const result = await callEmbedSessionTool(
+          embedSessionArgsFor(
+            directoryMode ? openStartUrl || openUrl : openUrl,
+            directoryMode,
+            activeEmbedSessionTicket,
+          ),
+        );
+        const data = parseToolResult(result);
+        if (directoryMode) {
+          if (data.renewed !== true) {
+            sendRenewalResult({
+              type: "agentNative.embedSessionRenewed",
+              data: { requestId, ok: false },
+            });
+            return;
+          }
+          sendRenewalResult({
+            type: "agentNative.embedSessionRenewed",
+            data: { requestId, ok: true },
+          });
+          return;
+        }
+        if (typeof data.startUrl !== "string" || !data.startUrl) {
+          sendRenewalResult({
+            type: "agentNative.embedSessionRenewed",
+            data: { requestId, ok: false },
+          });
+          return;
+        }
+        sendRenewalResult({
+          type: "agentNative.embedSessionRenewed",
+          data: {
+            requestId,
+            ok: true,
+            startUrl: withChatBridgeParam(data.startUrl),
+          },
+        });
+      } catch {
+        sendRenewalResult({
+          type: "agentNative.embedSessionRenewed",
+          data: { requestId, ok: false },
+        });
+      }
+    }
+
     function shouldSelfNavigateToApp() {
       const render = renderModeSource();
       const mode = render.mode;
@@ -1464,6 +1647,7 @@ export function embedApp(options = {}) {
     }
 
     function navigateToAppFrame(src) {
+      rememberActiveEmbedSessionTicket(src);
       if (isCurrentFrameUrl(src)) {
         clearFrameReadyTimer();
         clearFrameLoadTimer();
@@ -1552,8 +1736,12 @@ export function embedApp(options = {}) {
     }
 
     function notifyHostHeight() {
-      if (applyHostFillMode()) return;
-      const height = fillsPane
+      updateDirectoryWidgetLayout();
+      const compactInline = isCompactDirectoryWidget();
+      if (applyHostFillMode() && !compactInline) return;
+      const height = compactInline
+        ? ${MCP_APP_INLINE_LAUNCHER_HEIGHT}
+        : fillsPane
         ? paneFillHeight(hostState().context || {})
         : applyIntrinsicHeight(visibleIntrinsicHeight());
       if (!openAiBridge || typeof openAiBridge.notifyIntrinsicHeight !== "function") {
@@ -1787,6 +1975,7 @@ export function embedApp(options = {}) {
         event.source === null &&
         (message.embedStartUrl === appFrame?.src ||
           message.embedStartUrl === lastFrameSrc);
+      if (!isTrustedAppFrameOrigin(event.origin)) return;
       if (
         !appFrame ||
         (!expiredSessionMessage && event.source !== appFrame.contentWindow)
@@ -1812,7 +2001,23 @@ export function embedApp(options = {}) {
         return;
       }
       if (message.type === "agentNative.embedSessionExpired") {
-        refreshExpiredEmbedSession();
+        if (expiredSessionMessage) {
+          refreshExpiredEmbedSession();
+        } else if (typeof data.requestId === "string") {
+          void renewExpiredEmbedSession(
+            data.requestId,
+            appFrame,
+            appFrameDocumentState.loadGeneration,
+          );
+        } else if (body.dataset.catalogMode !== "directory") {
+          // Older app frames do not include a renewal id, so preserve their
+          // existing full-refresh fallback until they load the renewal client.
+          refreshExpiredEmbedSession();
+        }
+        return;
+      }
+      if (message.type === "agentNative.embedSessionRenewalApplied") {
+        embedSessionRefreshAttempts = 0;
         return;
       }
       if (message.type === "agentNative.submitChat") {
@@ -1853,6 +2058,11 @@ export function embedApp(options = {}) {
     }
 
     async function launchEmbed() {
+      updateDirectoryWidgetLayout();
+      if (isCompactDirectoryWidget()) {
+        notifyHostHeight();
+        return;
+      }
       let launchUrl = openStartUrl || openUrl;
       if (!launchUrl) {
         renderAppLaunchError("Open link was not available.");
@@ -1940,12 +2150,47 @@ export function embedApp(options = {}) {
     function updateOpenButton() {
       const buttonUrl = openUrl;
       openButton.disabled = !buttonUrl;
+      openButton.textContent = body.dataset.openLabel || "Open in app";
       openButton.onclick = () => {
-        if (buttonUrl) void openHostLink({ url: buttonUrl });
+        if (!buttonUrl) return;
+        if (fillsPane) {
+          void openDirectoryWidget();
+        } else {
+          void openHostLink({ url: buttonUrl });
+        }
       };
       updateHostOpenInAppUrl();
     }
 
+    async function openDirectoryWidget() {
+      directoryWidgetOpenRequested = true;
+      updateDirectoryWidgetLayout();
+      const displayMode = hostState().context?.displayMode;
+      if (displayMode !== "fullscreen") {
+        if (!supportedDisplayMode("fullscreen")) {
+          notifyHostHeight();
+          await launchEmbed();
+          return;
+        }
+        try {
+          const granted = await requestHostDisplayMode("fullscreen");
+          if (granted?.mode !== "fullscreen") {
+            notifyHostHeight();
+            await launchEmbed();
+            return;
+          }
+        } catch (err) {
+          console.warn("[agent-native] MCP host could not open the widget fullscreen", err);
+          notifyHostHeight();
+          await launchEmbed();
+          return;
+        }
+      }
+      updateDirectoryWidgetLayout();
+      notifyHostHeight();
+      await launchEmbed();
+    }
+
     function updateTitle(data) {
       const record = objectValue(data);
       const openLink = objectValue(toolResponseMetadata["agent-native/openLink"]);
@@ -1993,7 +2238,7 @@ export function embedApp(options = {}) {
       openAiBridge = bridge;
       toolInput = objectValue(bridge.toolInput);
       const params = openAiToolResultParams(bridge);
-      toolResponseMetadata = objectValue(params._meta);
+      toolResponseMetadata = toolResultMeta(params);
       const data = parseToolResult(params);
       toolResultData = objectValue(data);
       openUrl = openLinkFrom(params, data);
@@ -2026,6 +2271,7 @@ export function embedApp(options = {}) {
       }
       lastOpenAiSyncSignature = signature;
       updateTitle(data);
+      updateDirectoryWidgetLayout();
       updateOpenButton();
       updateDisplayButton();
       notifyHostHeight();
@@ -2284,19 +2530,33 @@ export function embedApp(options = {}) {
         openUrl = openLinkFrom(params, data);
         openStartUrl = embedStartUrlFrom(params, data);
         updateTitle(data);
+        updateDirectoryWidgetLayout();
         updateOpenButton();
         void launchEmbed();
       };
       app.onhostcontextchanged = () => {
-        updateDisplayButton();
-        notifyHostHeight();
-        sendHostContext();
+        handleHostContextChanged();
       };
       await ensureHostAppConnected();
       notifyOuterMcpAppReady();
+      updateDirectoryWidgetLayout();
+      updateDisplayButton();
+      notifyHostHeight();
+      sendHostContext();
+    }
+
+    function handleHostContextChanged() {
+      updateDirectoryWidgetLayout();
       updateDisplayButton();
       notifyHostHeight();
       sendHostContext();
+      if (
+        fillsPane &&
+        !isCompactDirectoryWidget() &&
+        (openStartUrl || openUrl)
+      ) {
+        void launchEmbed();
+      }
     }
 
     ${remoteBridgeFallbackEnabled
@@ -2318,16 +2578,16 @@ export function embedApp(options = {}) {
         openUrl = openLinkFrom(params, data);
         openStartUrl = embedStartUrlFrom(params, data);
         updateTitle(data);
+        updateDirectoryWidgetLayout();
         updateOpenButton();
         void launchEmbed();
       };
       app.onhostcontextchanged = () => {
-        updateDisplayButton();
-        notifyHostHeight();
-        sendHostContext();
+        handleHostContextChanged();
       };
       await ensureHostAppConnected();
       notifyOuterMcpAppReady();
+      updateDirectoryWidgetLayout();
       updateDisplayButton();
       notifyHostHeight();
       sendHostContext();

package/dist/mcp/oauth-route.js

@@ -796,6 +796,7 @@ async function issueTokenSet(params, tx) {
         orgDomain: params.orgDomain ?? null,
         scope: params.scope,
         resource: params.resource,
+        grantCreatedAtMs: params.grantCreatedAtMs,
     }, tx);
     const accessToken = await signMcpOAuthAccessToken(params);
     return {
@@ -858,6 +859,7 @@ async function handleAuthorizationCodeGrant(event, body) {
                 scope: consumed.scope,
                 resource: consumed.resource,
                 issuer,
+                grantCreatedAtMs: consumed.createdAt,
             }, tx));
         });
     }
@@ -917,6 +919,7 @@ async function handleRefreshTokenGrant(event, body) {
                 scope: existing.scope,
                 resource: existing.resource,
                 issuer,
+                grantCreatedAtMs: existing.grantCreatedAtMs,
             });
             return json({
                 access_token: accessToken,

package/dist/mcp/oauth-store.d.ts

@@ -49,7 +49,7 @@ export interface OAuthRefreshTokenRow {
     orgDomain: string | null;
     scope: string;
     resource: string;
-    createdAt: number | null;
+    grantCreatedAtMs: number | null;
     expiresAt: number | null;
     lastUsedAt: number | null;
     revokedAt: number | null;
@@ -87,6 +87,7 @@ export declare function createOAuthRefreshToken(params: {
     orgDomain?: string | null;
     scope: string;
     resource: string;
+    grantCreatedAtMs: number | null;
 }, db?: DbExec): Promise<OAuthRefreshTokenRow>;
 export declare function rotateOAuthRefreshToken(params: {
     oldRefreshToken: string;

package/dist/mcp/oauth-store.js

@@ -205,7 +205,7 @@ function mapRefreshRow(row) {
         orgDomain: row.org_domain ?? row.orgDomain ?? null,
         scope: row.scope,
         resource: row.resource,
-        createdAt: numOrNull(row.created_at ?? row.createdAt),
+        grantCreatedAtMs: numOrNull(row.created_at ?? row.createdAt),
         expiresAt: refreshTokenExpiryFromRow(row),
         lastUsedAt: numOrNull(row.last_used_at ?? row.lastUsedAt),
         revokedAt: numOrNull(row.revoked_at ?? row.revokedAt),
@@ -382,7 +382,6 @@ export async function createOAuthRefreshToken(params, db) {
     if (!db)
         await ensureTable();
     const client = db ?? getDbExec();
-    const now = Date.now();
     const row = {
         id: randomUUID(),
         tokenHash: hashOAuthToken(params.refreshToken),
@@ -393,7 +392,8 @@ export async function createOAuthRefreshToken(params, db) {
         orgDomain: params.orgDomain ?? null,
         scope: params.scope,
         resource: params.resource,
-        createdAt: now,
+        // This is the authorization grant's immutable timestamp, not row-creation time.
+        grantCreatedAtMs: params.grantCreatedAtMs,
         expiresAt: null,
         lastUsedAt: null,
         revokedAt: null,
@@ -411,7 +411,7 @@ export async function createOAuthRefreshToken(params, db) {
             row.orgDomain,
             row.scope,
             row.resource,
-            row.createdAt,
+            row.grantCreatedAtMs,
             row.expiresAt,
             row.lastUsedAt,
             row.revokedAt,
@@ -454,7 +454,6 @@ export async function rotateOAuthRefreshToken(params, db) {
         ...old,
         id: randomUUID(),
         tokenHash: newHash,
-        createdAt: now,
         expiresAt: null,
         lastUsedAt: null,
         revokedAt: null,
@@ -472,7 +471,7 @@ export async function rotateOAuthRefreshToken(params, db) {
             next.orgDomain,
             next.scope,
             next.resource,
-            next.createdAt,
+            next.grantCreatedAtMs,
             next.expiresAt,
             next.lastUsedAt,
             next.revokedAt,

package/dist/mcp/oauth-token.d.ts

@@ -18,6 +18,7 @@ export interface McpOAuthAccessTokenClaims {
     scope: string;
     client_id: string;
     resource: string;
+    grant_created_at_ms?: number;
     jti?: string;
     typ: typeof MCP_OAUTH_TOKEN_TYPE;
     credential_version: typeof MCP_OAUTH_CREDENTIAL_VERSION | typeof MCP_OAUTH_SERVICE_CREDENTIAL_VERSION;
@@ -36,6 +37,8 @@ export declare function signMcpOAuthAccessToken(params: {
     scope: string;
     resource: string;
     issuer: string;
+    /** Immutable server-recorded creation time of the OAuth grant, in ms. */
+    grantCreatedAtMs?: number | null;
     jti?: string;
     expiresIn?: string | number;
     catalogScope?: "full";
@@ -49,6 +52,8 @@ export declare function verifyMcpOAuthAccessToken(token: string, resource: strin
     scopes: string[];
     clientId: string;
     jti?: string;
+    /** Immutable OAuth grant creation time, in milliseconds. */
+    grantCreatedAtMs?: number;
     catalogScope?: "full";
     /** `iat`, in seconds. */
     issuedAt?: number;