@yagni-app/code-staging 1.2.3-staging.1607.1 → 1.2.3-staging.1610.1

package/dist/extension/mcp/auth.js

@@ -202,11 +202,25 @@ export class YagniAuthProvider {
         return {
             client_id: clientId,
             ...(entry?.clientSecret ? { client_secret: entry.clientSecret } : {}),
+            ...(entry?.clientIssuer ? { issuer: entry.clientIssuer } : {}),
         };
     }
     async saveClientInformation(info) {
         updateStoredOAuthEntry(this.serverName, this.config, (entry) => {
+            // The SDK also calls this to bind the client we already use (stored, or
+            // pre-registered in the config) to the authorization server that just
+            // accepted it. That is not a registration: record the server only, so
+            // a pre-registered id never lands in the auth store.
+            if (info.client_id === (entry.clientId ?? this.config.oauth?.clientId)) {
+                if (info.issuer)
+                    entry.clientIssuer = info.issuer;
+                return;
+            }
             entry.clientId = info.client_id;
+            if (info.issuer)
+                entry.clientIssuer = info.issuer;
+            else
+                delete entry.clientIssuer;
             if (info.client_secret != null) {
                 entry.clientSecret = info.client_secret;
                 entry.clientSecretSource = "dcr";
@@ -216,7 +230,7 @@ export class YagniAuthProvider {
                 delete entry.clientSecret;
                 delete entry.clientSecretSource;
             }
-            // The SDK only calls this from dynamic client registration, so the
+            // A new client id only comes from dynamic client registration, so the
             // redirect this provider advertised is exactly what the server pinned.
             entry.redirectUri = this.redirectUri;
         });
@@ -232,6 +246,7 @@ export class YagniAuthProvider {
             ...(entry.refreshToken ? { refresh_token: entry.refreshToken } : {}),
             ...(expiresIn != null ? { expires_in: expiresIn } : {}),
             ...(entry.scopes ? { scope: entry.scopes.join(" ") } : {}),
+            ...(entry.tokensIssuer ? { issuer: entry.tokensIssuer } : {}),
         };
     }
     async saveTokens(tokens) {
@@ -243,6 +258,8 @@ export class YagniAuthProvider {
             entry.expiresAt = Date.now() + expiresIn * 1000;
             if (tokens.scope)
                 entry.scopes = tokens.scope.split(/\s+/).filter(Boolean);
+            if (tokens.issuer)
+                entry.tokensIssuer = tokens.issuer;
         });
     }
     async saveCodeVerifier(codeVerifier) {
@@ -266,11 +283,13 @@ export class YagniAuthProvider {
                 delete entry.clientId;
                 delete entry.clientSecret;
                 delete entry.redirectUri;
+                delete entry.clientIssuer;
             }
             if (scope === "tokens" || scope === "all") {
                 delete entry.accessToken;
                 delete entry.refreshToken;
                 delete entry.expiresAt;
+                delete entry.tokensIssuer;
             }
         });
         if (scope === "verifier" || scope === "all")
@@ -430,6 +449,7 @@ function dropPinnedClientIfPortChanged(serverName, config, stored, listener, red
     const { errors } = updateStoredOAuthEntry(serverName, config, (entry) => {
         delete entry.clientId;
         delete entry.redirectUri;
+        delete entry.clientIssuer;
         // The secret goes with the DCR client unless it is the operator's
         // (`--client-secret`), which belongs to the config's pre-registered
         // client and lives nowhere else. Entries from before provenance was

package/dist/extension/mcp/authStore.d.ts

@@ -44,11 +44,20 @@ export interface StoredOAuthEntry {
      * client ids (their redirect is whatever the operator registered).
      */
     redirectUri?: string;
+    /**
+     * The authorization server the client in use (`clientId`, or the config's
+     * pre-registered one) is bound to. The MCP SDK stamps it on what it saves
+     * and refuses a stored client stamped for a different server, so the
+     * client is never sent to an authorization server it was not issued by.
+     */
+    clientIssuer?: string;
     accessToken?: string;
     refreshToken?: string;
     /** Epoch ms when the access token expires (refresh happens before this). */
     expiresAt?: number;
     scopes?: string[];
+    /** The authorization server that issued the tokens (see `clientIssuer`). */
+    tokensIssuer?: string;
 }
 export interface McpAuthFile {
     servers?: Record<string, StoredOAuthEntry>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.2.3-staging.1607.1",
+  "version": "1.2.3-staging.1610.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -38,7 +38,7 @@
     "@earendil-works/pi-coding-agent": "0.84.1",
     "@earendil-works/pi-tui": "0.84.1",
     "@grpc/grpc-js": "^1.14.5",
-    "@modelcontextprotocol/sdk": "^1.30.0",
+    "@modelcontextprotocol/sdk": "^1.31.0",
     "@opentelemetry/api": "^1.9.1",
     "@opentelemetry/api-logs": "^0.222.0",
     "@opentelemetry/exporter-logs-otlp-grpc": "^0.222.0",
@@ -58,5 +58,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "edbcdfaf5b4700317fb1930f5390b8ad9012c4cb"
+  "yagniSourceSha": "d5f7b3a2c093a8bc24c60984a849fd7646fe639f"
 }