toolcraft 0.0.312 → 0.0.314

package/composition.json

@@ -98,7 +98,7 @@
     },
     {
       "name": "tiny-http-mcp-server",
-      "version": "0.1.29",
+      "version": "0.1.33",
       "license": "MIT"
     },
     {
@@ -113,7 +113,7 @@
     },
     {
       "name": "toolcraft",
-      "version": "0.0.312",
+      "version": "0.0.314",
       "license": "MIT"
     },
     {
@@ -123,7 +123,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.312",
+      "version": "0.0.314",
       "license": "MIT"
     },
     {

package/dist/composition.json

@@ -98,7 +98,7 @@
     },
     {
       "name": "tiny-http-mcp-server",
-      "version": "0.1.29",
+      "version": "0.1.33",
       "license": "MIT"
     },
     {
@@ -113,7 +113,7 @@
     },
     {
       "name": "toolcraft",
-      "version": "0.0.312",
+      "version": "0.0.314",
       "license": "MIT"
     },
     {
@@ -123,7 +123,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.312",
+      "version": "0.0.314",
       "license": "MIT"
     },
     {

package/node_modules/tiny-http-mcp-server/dist/composition.json

@@ -18,7 +18,7 @@
     },
     {
       "name": "tiny-http-mcp-server",
-      "version": "0.1.29",
+      "version": "0.1.33",
       "license": "MIT"
     },
     {

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/README.md

@@ -42,6 +42,7 @@ const verifier = createJwksTokenVerifier({
   - `mode: "static"` with `clientId`, optional `clientSecret`, optional `metadata`
 - `allowInteractive: false` prevents interactive login while retaining cached tokens and silent refresh
 - `sessionLockTimeoutMs` limits acquisition waits for a session transaction lock (default 30,000 ms; integer from 1 to 2147483647)
+- `persistenceNamespace` isolates native sessions and registrations for a named profile (nonempty string, at most 1024 UTF-8 bytes)
 - `initialGrant: { resource, tokens }` optionally imports an existing Bearer grant for one HTTP resource; requires the original client ID
 - `browser.openBrowser(url)` optional
 - `browser.readLine()` optional
@@ -95,7 +96,14 @@ on 401 even when the server omits `error="invalid_token"`. Invalid provenance
 fails without quoting token values.
 
 Configure `client.metadata.scope` to request a precise scope set; broader
-discovery metadata does not override it.
+discovery metadata does not override it. Explicit scopes must match the cached
+or imported grant's scope set; ordering, repeated spaces and duplicates are
+normalized. An imported grant must declare its scope when a scope is configured.
+Authorization records the requested set when the endpoint omits scope, and
+refresh retains the previous granted set. Mismatched responses never activate
+credentials; an unusable refresh response retains the pending refresh record.
+Select a separate persistence namespace for another scope profile. No scope is
+invented when the client does not configure one.
 
 Imported `initialGrant.tokens` use `accessToken`, optional `refreshToken`,
 `tokenType: "Bearer"`, `expiresAt` (Unix epoch milliseconds or `null` if unknown),
@@ -104,6 +112,17 @@ Discovery binds an expired or explicitly rejected grant before silent refresh,
 using the original configured client. Persisted sessions take precedence,
 including sessions whose tokens have been cleared; an import cannot revive them.
 Input tokens are copied and invalid expiry values fail before authorization.
+Static clients and dynamic initial-grant imports require cached grants to match
+the original normalized client ID and secret. A different client configuration
+fails before attaching or refreshing credentials and retains the stored record;
+select separate persistence or explicitly reset the session to change apps.
+Use `persistenceNamespace: "personal"` or `"work"` to keep separate native
+profiles for the same resource/issuer. `createAuthStoreSessionStore(options,
+namespace)` addresses the same profile when seeding or inspecting credentials.
+Namespaces are hashed into file/Keychain identities and transaction locks;
+omitting one preserves the default storage keys. Switching namespaces selects a
+different record and does not migrate or reset the previous profile. Host-owned
+`sessionStore` implementations remain responsible for their own profile keys.
 
 `createAuthStoreSessionStore(options)` accepts the standard `auth-store` config.
 

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/auth-store-session-store.d.ts

@@ -9,6 +9,7 @@ export interface OAuthClientStore {
     save(issuer: string, client: StoredOAuthClient): Promise<void>;
     clear(issuer: string): Promise<void>;
 }
-export declare function createAuthStoreSessionStore(options?: CreateSecretStoreInput): OAuthSessionStore;
-export declare function createAuthStoreClientStore(options: CreateSecretStoreInput): OAuthClientStore;
+export declare function createAuthStoreSessionStore(options?: CreateSecretStoreInput, namespace?: string): OAuthSessionStore;
+export declare function createAuthStoreClientStore(options: CreateSecretStoreInput, namespace?: string): OAuthClientStore;
+export declare function assertPersistenceNamespace(namespace: string | undefined): void;
 export {};

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/auth-store-session-store.js

@@ -9,16 +9,17 @@ const DEFAULT_CLIENT_FILE_SALT = "poe-code:mcp-oauth:clients:v1";
 const DEFAULT_CLIENT_FILE_DIRECTORY = ".poe-code/mcp-oauth/clients";
 const DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
 const MAX_JS_DATE_MS = 8_640_000_000_000_000;
-export function createAuthStoreSessionStore(options = {}) {
+export function createAuthStoreSessionStore(options = {}, namespace) {
+    assertPersistenceNamespace(namespace);
     return {
         async withLock(resource, operation, lockOptions) {
-            const store = createResourceSecretStore(resource, options);
+            const store = createResourceSecretStore(resource, options, namespace);
             if (store.withLock === undefined)
                 throw new Error("OAuth secret-store backend does not support transaction locks");
             return store.withLock(operation, lockOptions);
         },
         async load(resource) {
-            const store = createResourceSecretStore(resource, options);
+            const store = createResourceSecretStore(resource, options, namespace);
             const value = await store.get();
             if (value === null) {
                 return null;
@@ -36,19 +37,20 @@ export function createAuthStoreSessionStore(options = {}) {
             throw new Error("Stored OAuth session must match the expected shape");
         },
         async save(resource, session) {
-            const store = createResourceSecretStore(resource, options);
+            const store = createResourceSecretStore(resource, options, namespace);
             await store.set(JSON.stringify(session));
         },
         async clear(resource) {
-            const store = createResourceSecretStore(resource, options);
+            const store = createResourceSecretStore(resource, options, namespace);
             await store.delete();
         }
     };
 }
-export function createAuthStoreClientStore(options) {
+export function createAuthStoreClientStore(options, namespace) {
+    assertPersistenceNamespace(namespace);
     return {
         async load(issuer) {
-            const store = createIssuerSecretStore(issuer, options);
+            const store = createIssuerSecretStore(issuer, options, namespace);
             const value = await store.get();
             if (value === null) {
                 return null;
@@ -72,17 +74,17 @@ export function createAuthStoreClientStore(options) {
             throw new Error("Stored OAuth client must be a JSON object with clientId");
         },
         async save(issuer, client) {
-            const store = createIssuerSecretStore(issuer, options);
+            const store = createIssuerSecretStore(issuer, options, namespace);
             await store.set(JSON.stringify(client));
         },
         async clear(issuer) {
-            const store = createIssuerSecretStore(issuer, options);
+            const store = createIssuerSecretStore(issuer, options, namespace);
             await store.delete();
         }
     };
 }
-function createNamedSecretStore(key, options, defaults) {
-    const hash = crypto.createHash("sha256").update(key).digest("hex");
+function createNamedSecretStore(key, options, defaults, namespace) {
+    const hash = crypto.createHash("sha256").update(namespace === undefined ? key : JSON.stringify([namespace, key])).digest("hex");
     const configuredFilePath = options.fileStore?.filePath;
     const parsedFilePath = configuredFilePath === undefined ? null : path.parse(configuredFilePath);
     const fileStore = {
@@ -104,21 +106,25 @@ function createNamedSecretStore(key, options, defaults) {
     };
     return createSecretStore({ ...options, fileStore, keychainStore }).store;
 }
-function createResourceSecretStore(resource, options) {
+function createResourceSecretStore(resource, options, namespace) {
     return createNamedSecretStore(canonicalizeResourceIndicator(resource), options, {
         salt: DEFAULT_FILE_SALT,
         directory: DEFAULT_FILE_DIRECTORY,
         service: DEFAULT_KEYCHAIN_SERVICE,
         accountPrefix: "provider"
-    });
+    }, namespace);
 }
-function createIssuerSecretStore(issuer, options) {
+function createIssuerSecretStore(issuer, options, namespace) {
     return createNamedSecretStore(issuer, options, {
         salt: DEFAULT_CLIENT_FILE_SALT,
         directory: DEFAULT_CLIENT_FILE_DIRECTORY,
         service: DEFAULT_CLIENT_KEYCHAIN_SERVICE,
         accountPrefix: "issuer"
-    });
+    }, namespace);
+}
+export function assertPersistenceNamespace(namespace) {
+    if (namespace !== undefined && (typeof namespace !== "string" || namespace.trim() === "" || Buffer.byteLength(namespace, "utf8") > 1024))
+        throw new Error("OAuth persistence namespace must be a nonempty string within 1024 bytes");
 }
 function isObjectRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -138,6 +144,7 @@ function isStoredOAuthSession(value) {
         isNonBlankOwnString(value, "authorizationServer") &&
         isStoredOAuthClient(getOwnEntry(value, "client")) &&
         isStoredOAuthDiscovery(getOwnEntry(value, "discovery")) &&
+        (getOwnEntry(value, "requestedScope") === undefined || isNonBlankOwnString(value, "requestedScope")) &&
         (getOwnEntry(value, "refreshState") === undefined ||
             (getOwnEntry(value, "refreshState") === "pending" && getOwnEntry(value, "tokens") === undefined)) &&
         isStoredOAuthTokensOrMissing(getOwnEntry(value, "tokens")));

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/default-oauth-client-provider.js

@@ -1,7 +1,8 @@
+import { normalizeOAuthScope } from "./scope.js";
 import { isIP } from "node:net";
 import { fetchMcpResponse } from "../http-fetch.js";
 import { URL } from "node:url";
-import { createAuthStoreClientStore, createAuthStoreSessionStore } from "./auth-store-session-store.js";
+import { createAuthStoreClientStore, createAuthStoreSessionStore, assertPersistenceNamespace } from "./auth-store-session-store.js";
 import { createLoopbackAuthorizationSession, loopbackTarget } from "./loopback-authorization.js";
 import { createAuthorizationState } from "./authorization-state.js";
 import { generateCodeChallenge, generateCodeVerifier } from "./pkce.js";
@@ -17,8 +18,11 @@ export function createOAuthClientProvider(options) {
 }
 export function createDefaultOAuthClientProvider(options) {
     loopbackTarget(options.browser);
-    const sessionStore = options.sessionStore ?? createAuthStoreSessionStore(options.authStore);
-    const clientStore = options.authStore === undefined ? null : createAuthStoreClientStore(options.authStore);
+    assertPersistenceNamespace(options.persistenceNamespace);
+    const clientMetadata = getClientMetadata(options.client);
+    const requestedScope = clientMetadata?.scope;
+    const sessionStore = options.sessionStore ?? createAuthStoreSessionStore(options.authStore, options.persistenceNamespace);
+    const clientStore = options.authStore === undefined ? null : createAuthStoreClientStore(options.authStore, options.persistenceNamespace);
     const now = options.now ?? Date.now;
     const registeredClients = new Map();
     if (options.initialGrant !== undefined) {
@@ -40,6 +44,8 @@ export function createDefaultOAuthClientProvider(options) {
     if (initialGrant !== undefined && (initialGrant.tokens === undefined || initialGrant.client === null))
         throw new Error("OAuth initial grant requires valid tokens and the original client ID");
     if (initialGrant?.tokens !== undefined) {
+        if (requestedScope !== undefined && initialGrant.tokens.scope !== requestedScope)
+            throw new Error("OAuth initial grant does not match the requested OAuth scope");
         try {
             new Headers({ Authorization: `Bearer ${initialGrant.tokens.accessToken}` });
         }
@@ -132,7 +138,8 @@ export function createDefaultOAuthClientProvider(options) {
                 initialGrant.tokens !== undefined && initialGrant.client !== null) {
                 assertSecureOAuthFlowEndpoints(discovery.authorizationServerMetadata);
                 session = { resource: canonicalResource, authorizationServer: discovery.authorizationServer,
-                    client: initialGrant.client, tokens: initialGrant.tokens, discovery: toStoredDiscovery(discovery) };
+                    client: initialGrant.client, tokens: initialGrant.tokens,
+                    ...(requestedScope === undefined ? {} : { requestedScope }), discovery: toStoredDiscovery(discovery) };
                 await saveSession(canonicalResource, session);
                 initialGrantConsumed = true;
                 signal?.throwIfAborted();
@@ -140,6 +147,13 @@ export function createDefaultOAuthClientProvider(options) {
             if (forceRefresh && rejectedTokens !== undefined && (rejectedTokens === null || session?.tokens === undefined || !sameTokenGrant(session.tokens, rejectedTokens)))
                 forceRefresh = false;
             const sessionDiscovery = resolveDiscovery(discovery, session);
+            if ((options.client.mode === "static" || initialGrant !== undefined) && session !== null && (session.tokens !== undefined || session.refreshState === "pending")) {
+                const configured = normalizeConfiguredClient(options.client);
+                if (configured === null || configured.clientId !== session.client.clientId || configured.clientSecret !== session.client.clientSecret)
+                    throw new Error("Stored session belongs to a different OAuth client; use separate persistence or explicitly reset it");
+            }
+            if (requestedScope !== undefined && session?.tokens !== undefined && normalizeOAuthScope(session.tokens.scope ?? session.requestedScope) !== requestedScope)
+                throw new Error("Stored session does not match the requested OAuth scope; authorize again or select separate persistence");
             if (session?.refreshState === "pending") {
                 if (!allowInteractive || options.allowInteractive === false || sessionDiscovery === undefined)
                     throw new Error("OAuth refresh outcome is unknown; authorize again before using this resource");
@@ -220,10 +234,13 @@ export function createDefaultOAuthClientProvider(options) {
             ...session,
             tokens: {
                 ...refreshedTokens,
-                refreshToken: refreshedTokens.refreshToken ?? session.tokens.refreshToken
+                refreshToken: refreshedTokens.refreshToken ?? session.tokens.refreshToken,
+                scope: refreshedTokens.scope ?? session.tokens.scope
             },
             discovery: toStoredDiscovery(discovery)
         };
+        if (requestedScope !== undefined && normalizeOAuthScope(updatedSession.tokens?.scope ?? session.requestedScope) !== requestedScope)
+            throw new Error("OAuth refresh response does not match the requested OAuth scope; authorize again");
         await saveSession(resource, updatedSession);
         return updatedSession;
     }
@@ -251,6 +268,7 @@ export function createDefaultOAuthClientProvider(options) {
                     resource,
                     authorizationServer: discovery.authorizationServer,
                     client: resolvedClient.client,
+                    ...(requestedScope === undefined ? {} : { requestedScope }),
                     discovery: toStoredDiscovery(discovery)
                 };
                 await saveSession(resource, sessionWithoutTokens);
@@ -262,7 +280,7 @@ export function createDefaultOAuthClientProvider(options) {
                     clientId: resolvedClient.client.clientId,
                     redirectUri: loopback.redirectUri,
                     codeChallenge: challenge,
-                    clientMetadata: getClientMetadata(options.client)
+                    clientMetadata
                 });
                 const code = await loopback.waitForCode(authorizationUrl);
                 const tokens = await exchangeAuthorizationCode({
@@ -276,6 +294,8 @@ export function createDefaultOAuthClientProvider(options) {
                     fetch, signal,
                     now
                 });
+                if (requestedScope !== undefined && tokens.scope !== undefined && normalizeOAuthScope(tokens.scope) !== requestedScope)
+                    throw new Error("OAuth authorization response does not match the requested OAuth scope");
                 const session = {
                     ...sessionWithoutTokens,
                     tokens
@@ -357,7 +377,7 @@ export function createDefaultOAuthClientProvider(options) {
                 };
             }
         }
-        const registrationBody = buildClientRegistrationBody(getClientMetadata(options.client), redirectUri);
+        const registrationBody = buildClientRegistrationBody(clientMetadata, redirectUri);
         const deadline = AbortSignal.timeout(30_000);
         const signal = parentSignal === undefined ? deadline : AbortSignal.any([parentSignal, deadline]);
         const response = await fetchMcpResponse(fetch, registrationEndpoint, {
@@ -520,10 +540,10 @@ function normalizeStoredTokens(value) {
     const tokenType = getOwnString(value, "tokenType");
     const expiresAt = getOwnEntry(value, "expiresAt");
     const refreshToken = getOwnEntry(value, "refreshToken");
-    const scope = getOwnString(value, "scope");
+    const scope = getOwnEntry(value, "scope");
     const normalizedAccessToken = accessToken?.trim();
     const normalizedRefreshToken = typeof refreshToken === "string" ? refreshToken.trim() : undefined;
-    const normalizedScope = scope?.trim();
+    const normalizedScope = normalizeOAuthScope(scope);
     if (accessToken === undefined ||
         normalizedAccessToken === undefined ||
         normalizedAccessToken.length === 0 ||
@@ -555,7 +575,7 @@ function getClientMetadata(client) {
     }
     return {
         clientName: normalizeOptionalOAuthString(client.metadata.clientName),
-        scope: normalizeOptionalOAuthString(client.metadata.scope),
+        scope: normalizeOAuthScope(client.metadata.scope),
         softwareId: normalizeOptionalOAuthString(client.metadata.softwareId),
         softwareVersion: normalizeOptionalOAuthString(client.metadata.softwareVersion)
     };

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/scope.d.ts

@@ -0,0 +1,2 @@
+/** Compare OAuth scope sets without accepting controls or changing token case. */
+export declare function normalizeOAuthScope(scope: unknown): string | undefined;

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/scope.js

@@ -0,0 +1,9 @@
+/** Compare OAuth scope sets without accepting controls or changing token case. */
+export function normalizeOAuthScope(scope) {
+    if (scope === undefined)
+        return undefined;
+    if (typeof scope !== "string" || [...scope].some(char => char.charCodeAt(0) < 32 || char.charCodeAt(0) > 126 || char === '"' || char === "\\"))
+        throw new Error("Invalid OAuth scope syntax");
+    const normalized = [...new Set(scope.split(" ").filter(Boolean))].sort().join(" ");
+    return normalized || undefined;
+}

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/token-endpoint.js

@@ -1,6 +1,7 @@
 import { canonicalizeResourceIndicator } from "../resource-indicator.js";
 import { readBoundedResponseText } from "../http-response.js";
 import { fetchMcpResponse } from "../http-fetch.js";
+import { normalizeOAuthScope } from "./scope.js";
 const MAX_JS_DATE_MS = 8_640_000_000_000_000;
 export class OAuthError extends Error {
     error;
@@ -117,7 +118,9 @@ async function requestTokens(input) {
     const normalizedRefreshToken = typeof refreshToken === "string" && refreshToken.trim().length > 0
         ? refreshToken.trim()
         : undefined;
-    const normalizedScope = typeof scope === "string" && scope.trim().length > 0 ? scope.trim() : undefined;
+    const normalizedScope = normalizeOAuthScope(scope);
+    if (scope !== undefined && normalizedScope === undefined)
+        throw new Error("Invalid OAuth scope syntax in token response");
     return {
         accessToken: normalizedAccessToken,
         refreshToken: normalizedRefreshToken === undefined ? undefined : normalizedRefreshToken,

package/node_modules/tiny-http-mcp-server/node_modules/mcp-oauth/dist/client/types.d.ts

@@ -80,6 +80,8 @@ export interface StoredOAuthSession {
     tokens?: StoredOAuthTokens;
     /** A refresh was begun; its winning response may not have been persisted. */
     refreshState?: "pending";
+    /** Canonical explicitly requested scope set when the server omits token scope. */
+    requestedScope?: string;
     discovery: {
         resourceMetadataUrl: string;
         resourceMetadata: Record<string, unknown>;
@@ -112,6 +114,8 @@ export interface DefaultOAuthClientProviderOptions {
     allowInteractive?: boolean;
     /** Maximum wait to acquire a session transaction lock (default 30,000 ms). */
     sessionLockTimeoutMs?: number;
+    /** Isolate native persisted sessions and registrations for a named profile. */
+    persistenceNamespace?: string;
     /** Import an existing grant for one resource. Persisted sessions take precedence. */
     initialGrant?: {
         resource: string;

package/node_modules/tiny-http-mcp-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-http-mcp-server",
-  "version": "0.1.29",
+  "version": "0.1.33",
   "description": "Minimal MCP server over HTTP built on tiny-stdio-mcp-server",
   "type": "module",
   "main": "dist/index.js",

package/node_modules/tiny-mcp-client/dist/index.d.ts

@@ -183,6 +183,8 @@ interface StoredOAuthSession {
     tokens?: StoredOAuthTokens;
     /** A refresh was begun; its winning response may not have been persisted. */
     refreshState?: "pending";
+    /** Canonical explicitly requested scope set when the server omits token scope. */
+    requestedScope?: string;
     discovery: {
         resourceMetadataUrl: string;
         resourceMetadata: Record<string, unknown>;
@@ -215,6 +217,8 @@ interface DefaultOAuthClientProviderOptions {
     allowInteractive?: boolean;
     /** Maximum wait to acquire a session transaction lock (default 30,000 ms). */
     sessionLockTimeoutMs?: number;
+    /** Isolate native persisted sessions and registrations for a named profile. */
+    persistenceNamespace?: string;
     /** Import an existing grant for one resource. Persisted sessions take precedence. */
     initialGrant?: {
         resource: string;

package/node_modules/tiny-mcp-client/dist/index.js

@@ -4077,16 +4077,17 @@ var DEFAULT_CLIENT_FILE_SALT = "poe-code:mcp-oauth:clients:v1";
 var DEFAULT_CLIENT_FILE_DIRECTORY = ".poe-code/mcp-oauth/clients";
 var DEFAULT_CLIENT_KEYCHAIN_SERVICE = "poe-code-mcp-oauth-clients";
 var MAX_JS_DATE_MS = 864e13;
-function createAuthStoreSessionStore(options = {}) {
+function createAuthStoreSessionStore(options = {}, namespace) {
+  assertPersistenceNamespace(namespace);
   return {
     async withLock(resource, operation, lockOptions) {
-      const store = createResourceSecretStore(resource, options);
+      const store = createResourceSecretStore(resource, options, namespace);
       if (store.withLock === void 0)
         throw new Error("OAuth secret-store backend does not support transaction locks");
       return store.withLock(operation, lockOptions);
     },
     async load(resource) {
-      const store = createResourceSecretStore(resource, options);
+      const store = createResourceSecretStore(resource, options, namespace);
       const value = await store.get();
       if (value === null) {
         return null;
@@ -4103,19 +4104,20 @@ function createAuthStoreSessionStore(options = {}) {
       throw new Error("Stored OAuth session must match the expected shape");
     },
     async save(resource, session) {
-      const store = createResourceSecretStore(resource, options);
+      const store = createResourceSecretStore(resource, options, namespace);
       await store.set(JSON.stringify(session));
     },
     async clear(resource) {
-      const store = createResourceSecretStore(resource, options);
+      const store = createResourceSecretStore(resource, options, namespace);
       await store.delete();
     }
   };
 }
-function createAuthStoreClientStore(options) {
+function createAuthStoreClientStore(options, namespace) {
+  assertPersistenceNamespace(namespace);
   return {
     async load(issuer) {
-      const store = createIssuerSecretStore(issuer, options);
+      const store = createIssuerSecretStore(issuer, options, namespace);
       const value = await store.get();
       if (value === null) {
         return null;
@@ -4137,17 +4139,17 @@ function createAuthStoreClientStore(options) {
       throw new Error("Stored OAuth client must be a JSON object with clientId");
     },
     async save(issuer, client) {
-      const store = createIssuerSecretStore(issuer, options);
+      const store = createIssuerSecretStore(issuer, options, namespace);
       await store.set(JSON.stringify(client));
     },
     async clear(issuer) {
-      const store = createIssuerSecretStore(issuer, options);
+      const store = createIssuerSecretStore(issuer, options, namespace);
       await store.delete();
     }
   };
 }
-function createNamedSecretStore(key2, options, defaults) {
-  const hash = crypto.createHash("sha256").update(key2).digest("hex");
+function createNamedSecretStore(key2, options, defaults, namespace) {
+  const hash = crypto.createHash("sha256").update(namespace === void 0 ? key2 : JSON.stringify([namespace, key2])).digest("hex");
   const configuredFilePath = options.fileStore?.filePath;
   const parsedFilePath = configuredFilePath === void 0 ? null : path4.parse(configuredFilePath);
   const fileStore = {
@@ -4165,21 +4167,25 @@ function createNamedSecretStore(key2, options, defaults) {
   };
   return createSecretStore({ ...options, fileStore, keychainStore }).store;
 }
-function createResourceSecretStore(resource, options) {
+function createResourceSecretStore(resource, options, namespace) {
   return createNamedSecretStore(canonicalizeResourceIndicator(resource), options, {
     salt: DEFAULT_FILE_SALT,
     directory: DEFAULT_FILE_DIRECTORY,
     service: DEFAULT_KEYCHAIN_SERVICE,
     accountPrefix: "provider"
-  });
+  }, namespace);
 }
-function createIssuerSecretStore(issuer, options) {
+function createIssuerSecretStore(issuer, options, namespace) {
   return createNamedSecretStore(issuer, options, {
     salt: DEFAULT_CLIENT_FILE_SALT,
     directory: DEFAULT_CLIENT_FILE_DIRECTORY,
     service: DEFAULT_CLIENT_KEYCHAIN_SERVICE,
     accountPrefix: "issuer"
-  });
+  }, namespace);
+}
+function assertPersistenceNamespace(namespace) {
+  if (namespace !== void 0 && (typeof namespace !== "string" || namespace.trim() === "" || Buffer.byteLength(namespace, "utf8") > 1024))
+    throw new Error("OAuth persistence namespace must be a nonempty string within 1024 bytes");
 }
 function isObjectRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -4195,7 +4201,7 @@ function isStoredOAuthSession(value) {
   if (!isObjectRecord(value)) {
     return false;
   }
-  return isNonBlankOwnString(value, "resource") && isNonBlankOwnString(value, "authorizationServer") && isStoredOAuthClient(getOwnEntry3(value, "client")) && isStoredOAuthDiscovery(getOwnEntry3(value, "discovery")) && (getOwnEntry3(value, "refreshState") === void 0 || getOwnEntry3(value, "refreshState") === "pending" && getOwnEntry3(value, "tokens") === void 0) && isStoredOAuthTokensOrMissing(getOwnEntry3(value, "tokens"));
+  return isNonBlankOwnString(value, "resource") && isNonBlankOwnString(value, "authorizationServer") && isStoredOAuthClient(getOwnEntry3(value, "client")) && isStoredOAuthDiscovery(getOwnEntry3(value, "discovery")) && (getOwnEntry3(value, "requestedScope") === void 0 || isNonBlankOwnString(value, "requestedScope")) && (getOwnEntry3(value, "refreshState") === void 0 || getOwnEntry3(value, "refreshState") === "pending" && getOwnEntry3(value, "tokens") === void 0) && isStoredOAuthTokensOrMissing(getOwnEntry3(value, "tokens"));
 }
 function isStoredOAuthClient(value) {
   if (!isObjectRecord(value) || !isNonBlankOwnString(value, "clientId")) {
@@ -4236,6 +4242,16 @@ function isNonBlankOwnString(record2, key2) {
   return value !== void 0 && value.trim().length > 0;
 }
 
+// ../mcp-oauth/dist/client/scope.js
+function normalizeOAuthScope(scope) {
+  if (scope === void 0)
+    return void 0;
+  if (typeof scope !== "string" || [...scope].some((char) => char.charCodeAt(0) < 32 || char.charCodeAt(0) > 126 || char === '"' || char === "\\"))
+    throw new Error("Invalid OAuth scope syntax");
+  const normalized = [...new Set(scope.split(" ").filter(Boolean))].sort().join(" ");
+  return normalized || void 0;
+}
+
 // ../mcp-oauth/dist/client/default-oauth-client-provider.js
 import { isIP } from "node:net";
 
@@ -4720,7 +4736,9 @@ async function requestTokens(input) {
   const refreshToken = getOwnEntry5(payload, "refresh_token");
   const scope = getOwnEntry5(payload, "scope");
   const normalizedRefreshToken = typeof refreshToken === "string" && refreshToken.trim().length > 0 ? refreshToken.trim() : void 0;
-  const normalizedScope = typeof scope === "string" && scope.trim().length > 0 ? scope.trim() : void 0;
+  const normalizedScope = normalizeOAuthScope(scope);
+  if (scope !== void 0 && normalizedScope === void 0)
+    throw new Error("Invalid OAuth scope syntax in token response");
   return {
     accessToken: normalizedAccessToken,
     refreshToken: normalizedRefreshToken === void 0 ? void 0 : normalizedRefreshToken,
@@ -4840,8 +4858,11 @@ function createOAuthClientProvider(options) {
 }
 function createDefaultOAuthClientProvider(options) {
   loopbackTarget(options.browser);
-  const sessionStore = options.sessionStore ?? createAuthStoreSessionStore(options.authStore);
-  const clientStore = options.authStore === void 0 ? null : createAuthStoreClientStore(options.authStore);
+  assertPersistenceNamespace(options.persistenceNamespace);
+  const clientMetadata = getClientMetadata(options.client);
+  const requestedScope = clientMetadata?.scope;
+  const sessionStore = options.sessionStore ?? createAuthStoreSessionStore(options.authStore, options.persistenceNamespace);
+  const clientStore = options.authStore === void 0 ? null : createAuthStoreClientStore(options.authStore, options.persistenceNamespace);
   const now = options.now ?? Date.now;
   const registeredClients = /* @__PURE__ */ new Map();
   if (options.initialGrant !== void 0) {
@@ -4862,6 +4883,8 @@ function createDefaultOAuthClientProvider(options) {
   if (initialGrant !== void 0 && (initialGrant.tokens === void 0 || initialGrant.client === null))
     throw new Error("OAuth initial grant requires valid tokens and the original client ID");
   if (initialGrant?.tokens !== void 0) {
+    if (requestedScope !== void 0 && initialGrant.tokens.scope !== requestedScope)
+      throw new Error("OAuth initial grant does not match the requested OAuth scope");
     try {
       new Headers({ Authorization: `Bearer ${initialGrant.tokens.accessToken}` });
     } catch {
@@ -4949,6 +4972,7 @@ function createDefaultOAuthClientProvider(options) {
           authorizationServer: discovery.authorizationServer,
           client: initialGrant.client,
           tokens: initialGrant.tokens,
+          ...requestedScope === void 0 ? {} : { requestedScope },
           discovery: toStoredDiscovery(discovery)
         };
         await saveSession(canonicalResource, session);
@@ -4958,6 +4982,13 @@ function createDefaultOAuthClientProvider(options) {
       if (forceRefresh && rejectedTokens !== void 0 && (rejectedTokens === null || session?.tokens === void 0 || !sameTokenGrant(session.tokens, rejectedTokens)))
         forceRefresh = false;
       const sessionDiscovery = resolveDiscovery(discovery, session);
+      if ((options.client.mode === "static" || initialGrant !== void 0) && session !== null && (session.tokens !== void 0 || session.refreshState === "pending")) {
+        const configured = normalizeConfiguredClient(options.client);
+        if (configured === null || configured.clientId !== session.client.clientId || configured.clientSecret !== session.client.clientSecret)
+          throw new Error("Stored session belongs to a different OAuth client; use separate persistence or explicitly reset it");
+      }
+      if (requestedScope !== void 0 && session?.tokens !== void 0 && normalizeOAuthScope(session.tokens.scope ?? session.requestedScope) !== requestedScope)
+        throw new Error("Stored session does not match the requested OAuth scope; authorize again or select separate persistence");
       if (session?.refreshState === "pending") {
         if (!allowInteractive || options.allowInteractive === false || sessionDiscovery === void 0)
           throw new Error("OAuth refresh outcome is unknown; authorize again before using this resource");
@@ -5034,10 +5065,13 @@ function createDefaultOAuthClientProvider(options) {
       ...session,
       tokens: {
         ...refreshedTokens,
-        refreshToken: refreshedTokens.refreshToken ?? session.tokens.refreshToken
+        refreshToken: refreshedTokens.refreshToken ?? session.tokens.refreshToken,
+        scope: refreshedTokens.scope ?? session.tokens.scope
       },
       discovery: toStoredDiscovery(discovery)
     };
+    if (requestedScope !== void 0 && normalizeOAuthScope(updatedSession.tokens?.scope ?? session.requestedScope) !== requestedScope)
+      throw new Error("OAuth refresh response does not match the requested OAuth scope; authorize again");
     await saveSession(resource, updatedSession);
     return updatedSession;
   }
@@ -5065,6 +5099,7 @@ function createDefaultOAuthClientProvider(options) {
           resource,
           authorizationServer: discovery.authorizationServer,
           client: resolvedClient.client,
+          ...requestedScope === void 0 ? {} : { requestedScope },
           discovery: toStoredDiscovery(discovery)
         };
         await saveSession(resource, sessionWithoutTokens);
@@ -5076,7 +5111,7 @@ function createDefaultOAuthClientProvider(options) {
           clientId: resolvedClient.client.clientId,
           redirectUri: loopback.redirectUri,
           codeChallenge: challenge,
-          clientMetadata: getClientMetadata(options.client)
+          clientMetadata
         });
         const code = await loopback.waitForCode(authorizationUrl);
         const tokens = await exchangeAuthorizationCode({
@@ -5091,6 +5126,8 @@ function createDefaultOAuthClientProvider(options) {
           signal,
           now
         });
+        if (requestedScope !== void 0 && tokens.scope !== void 0 && normalizeOAuthScope(tokens.scope) !== requestedScope)
+          throw new Error("OAuth authorization response does not match the requested OAuth scope");
         const session = {
           ...sessionWithoutTokens,
           tokens
@@ -5168,7 +5205,7 @@ function createDefaultOAuthClientProvider(options) {
         };
       }
     }
-    const registrationBody = buildClientRegistrationBody(getClientMetadata(options.client), redirectUri);
+    const registrationBody = buildClientRegistrationBody(clientMetadata, redirectUri);
     const deadline = AbortSignal.timeout(3e4);
     const signal = parentSignal === void 0 ? deadline : AbortSignal.any([parentSignal, deadline]);
     const response = await fetchMcpResponse(fetch2, registrationEndpoint, {
@@ -5323,10 +5360,10 @@ function normalizeStoredTokens(value) {
   const tokenType = getOwnString2(value, "tokenType");
   const expiresAt = getOwnEntry6(value, "expiresAt");
   const refreshToken = getOwnEntry6(value, "refreshToken");
-  const scope = getOwnString2(value, "scope");
+  const scope = getOwnEntry6(value, "scope");
   const normalizedAccessToken = accessToken?.trim();
   const normalizedRefreshToken = typeof refreshToken === "string" ? refreshToken.trim() : void 0;
-  const normalizedScope = scope?.trim();
+  const normalizedScope = normalizeOAuthScope(scope);
   if (accessToken === void 0 || normalizedAccessToken === void 0 || normalizedAccessToken.length === 0 || tokenType !== "Bearer" || !(expiresAt === null || typeof expiresAt === "number" && Number.isSafeInteger(expiresAt) && expiresAt <= MAX_JS_DATE_MS3 && Number.isFinite(new Date(expiresAt).getTime())) || refreshToken !== void 0 && (typeof refreshToken !== "string" || normalizedRefreshToken === void 0 || normalizedRefreshToken.length === 0)) {
     return void 0;
   }
@@ -5344,7 +5381,7 @@ function getClientMetadata(client) {
   }
   return {
     clientName: normalizeOptionalOAuthString(client.metadata.clientName),
-    scope: normalizeOptionalOAuthString(client.metadata.scope),
+    scope: normalizeOAuthScope(client.metadata.scope),
     softwareId: normalizeOptionalOAuthString(client.metadata.softwareId),
     softwareVersion: normalizeOptionalOAuthString(client.metadata.softwareVersion)
   };

package/node_modules/tiny-stdio-mcp-server/dist/composition.json

@@ -8,7 +8,7 @@
     },
     {
       "name": "toolcraft-schema",
-      "version": "0.0.312",
+      "version": "0.0.314",
       "license": "MIT"
     }
   ]

package/node_modules/toolcraft-schema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-schema",
-  "version": "0.0.312",
+  "version": "0.0.314",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft",
-  "version": "0.0.312",
+  "version": "0.0.314",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
@@ -158,7 +158,7 @@
     "yaml"
   ],
   "optionalDependencies": {
-    "toolcraft-schema": "0.0.312",
+    "toolcraft-schema": "0.0.314",
     "toolcraft-design": "*",
     "@poe-code/frontmatter": "*",
     "@poe-code/agent-mcp-config": "*",