@kya-os/mcp-i-cloudflare 1.6.19 → 1.6.20-canary.clientinfo.20251126125404

package/dist/services/kta-client-lookup.js

@@ -71,9 +71,9 @@ export async function lookupClientDidFromKTA(clientName, ktaApiUrl = "https://kn
  * Resolve client identity from MCP client info
  *
  * Priority:
- * 1. Use pre-registered DID from known clients registry
- * 2. Look up DID from KTA API (if API URL provided)
- * 3. Generate ephemeral DID for unknown clients
+ * 1. Use did:web DID from known clients registry (all known clients have one)
+ * 2. Look up DID from KTA API for unknown clients (if API URL provided)
+ * 3. Generate ephemeral DID for truly unknown clients
  *
  * @param clientInfo - Client info from MCP initialize message
  * @param ktaApiUrl - Optional KTA API URL for lookups
@@ -84,37 +84,11 @@ export async function resolveClientIdentity(clientInfo, ktaApiUrl) {
     // Check known clients registry first
     const knownClient = findKnownClient(clientName);
     if (knownClient) {
-        // Known client found
-        if (knownClient.ktaDid) {
-            // Has pre-registered DID
-            return {
-                did: knownClient.ktaDid,
-                source: "knowthat.ai",
-                knownClientId: knownClient.id,
-                displayName: knownClient.displayName,
-                vendor: knownClient.vendor,
-                isKnown: true,
-            };
-        }
-        // Known client but no pre-registered DID - try KTA lookup
-        if (ktaApiUrl) {
-            const ktaDid = await lookupClientDidFromKTA(clientName, ktaApiUrl);
-            if (ktaDid) {
-                return {
-                    did: ktaDid,
-                    source: "kta-lookup",
-                    knownClientId: knownClient.id,
-                    displayName: knownClient.displayName,
-                    vendor: knownClient.vendor,
-                    isKnown: true,
-                };
-            }
-        }
-        // Generate ephemeral DID for known client without registration
-        const ephemeralDid = await generateEphemeralDid(clientName);
+        // Known client found - all known clients have did:web DIDs
         return {
-            did: ephemeralDid,
-            source: "generated",
+            did: knownClient.ktaDid,
+            source: "knowthat.ai",
+            registered: knownClient.ktaRegistered, // Use ktaRegistered flag
             knownClientId: knownClient.id,
             displayName: knownClient.displayName,
             vendor: knownClient.vendor,
@@ -128,17 +102,19 @@ export async function resolveClientIdentity(clientInfo, ktaApiUrl) {
             return {
                 did: ktaDid,
                 source: "kta-lookup",
+                registered: true, // Found on KTA API means registered
                 displayName: clientName,
                 vendor: clientInfo?.vendor,
                 isKnown: false,
             };
         }
     }
-    // Generate ephemeral DID for unknown client
+    // Generate ephemeral DID for truly unknown client
     const ephemeralDid = await generateEphemeralDid(clientName);
     return {
         did: ephemeralDid,
         source: "generated",
+        registered: false, // Unknown clients are not registered
         displayName: clientName,
         vendor: clientInfo?.vendor,
         isKnown: false,

package/dist/services/kta-client-lookup.js.map

@@ -1 +1 @@
-{"version":3,"file":"kta-client-lookup.js","sourceRoot":"","sources":["../../src/services/kta-client-lookup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kta-client-lookup.js","sourceRoot":"","sources":["../../src/services/kta-client-lookup.ts"],"names":[],"mappings":"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"}

package/dist/utils/client-info.d.ts

@@ -0,0 +1,69 @@
+/**
+ * Client Info Utilities
+ *
+ * Handles MCP client information extraction, normalization, and handshake payload preparation.
+ * This consolidates logic for working with client metadata across initialize and handshake.
+ */
+import type { HandshakeRequest, MCPClientCapabilities } from "@kya-os/contracts/handshake";
+import type { MCPClientInfo as SessionClientInfo } from "../types/client";
+/**
+ * Initialize context with client information
+ */
+export interface InitializeContext {
+    timestamp: number;
+    protocolVersion?: string;
+    capabilities?: MCPClientCapabilities;
+    clientInfo?: Partial<SessionClientInfo>;
+}
+/**
+ * Normalize client info from various formats
+ *
+ * @param value Client info from request (could be from initialize or handshake)
+ * @returns Normalized client info or undefined if invalid
+ */
+export declare function normalizeClientInfo(value: unknown): Partial<SessionClientInfo> | undefined;
+/**
+ * Extract MCP client information from handshake request and initialize context
+ *
+ * @param request Handshake request
+ * @param initializeContext Optional context from previous initialize call
+ * @returns Extracted and normalized client info or undefined
+ */
+export declare function extractMCPClient(request: HandshakeRequest, initializeContext?: InitializeContext): SessionClientInfo | undefined;
+/**
+ * Prepare handshake payload with client information from initialize context
+ *
+ * @param params Original handshake request parameters
+ * @param initializeContext Optional context from previous initialize call
+ * @returns Enhanced handshake request with client info
+ */
+export declare function prepareHandshakePayload(params: HandshakeRequest, initializeContext?: InitializeContext): HandshakeRequest;
+/**
+ * Clone capabilities object (deep copy)
+ *
+ * @param capabilities Capabilities to clone
+ * @returns Cloned capabilities or undefined
+ */
+export declare function cloneCapabilities(capabilities: unknown): MCPClientCapabilities | undefined;
+/**
+ * Type guard for record objects
+ *
+ * @param value Value to check
+ * @returns true if value is a record object
+ */
+export declare function isRecord(value: unknown): value is Record<string, unknown>;
+/**
+ * Extract client ID from client info if available
+ *
+ * @param clientInfo Client info object
+ * @returns Client ID or undefined
+ */
+export declare function extractClientId(clientInfo: unknown): string | undefined;
+/**
+ * Merge client info from multiple sources
+ *
+ * @param sources Array of potential client info sources (later sources override earlier)
+ * @returns Merged client info
+ */
+export declare function mergeClientInfo(...sources: (Partial<SessionClientInfo> | undefined)[]): Partial<SessionClientInfo>;
+//# sourceMappingURL=client-info.d.ts.map

package/dist/utils/client-info.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-info.d.ts","sourceRoot":"","sources":["../../src/utils/client-info.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAC3F,OAAO,KAAK,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,UAAU,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACzC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAuCxC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,gBAAgB,EACzB,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,iBAAiB,GAAG,SAAS,CAkD/B;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,gBAAgB,EACxB,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,gBAAgB,CA8BlB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,OAAO,GACpB,qBAAqB,GAAG,SAAS,CAMnC;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEzE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAWvE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,GAAG,OAAO,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC,EAAE,GACrD,OAAO,CAAC,iBAAiB,CAAC,CAU5B"}

package/dist/utils/client-info.js

@@ -0,0 +1,178 @@
+/**
+ * Client Info Utilities
+ *
+ * Handles MCP client information extraction, normalization, and handshake payload preparation.
+ * This consolidates logic for working with client metadata across initialize and handshake.
+ */
+/**
+ * Normalize client info from various formats
+ *
+ * @param value Client info from request (could be from initialize or handshake)
+ * @returns Normalized client info or undefined if invalid
+ */
+export function normalizeClientInfo(value) {
+    if (!isRecord(value)) {
+        return undefined;
+    }
+    const normalized = {};
+    const record = value;
+    const name = record.name;
+    if (typeof name === "string" && name.trim().length > 0) {
+        normalized.name = name.trim();
+    }
+    const title = record.title;
+    if (typeof title === "string" && title.trim().length > 0) {
+        normalized.title = title.trim();
+    }
+    const version = record.version;
+    if (typeof version === "string" && version.trim().length > 0) {
+        normalized.version = version.trim();
+    }
+    const platform = record.platform;
+    if (typeof platform === "string" && platform.trim().length > 0) {
+        normalized.platform = platform.trim();
+    }
+    const vendor = record.vendor;
+    if (typeof vendor === "string" && vendor.trim().length > 0) {
+        normalized.vendor = vendor.trim();
+    }
+    const persistentId = record.persistentId;
+    if (typeof persistentId === "string" && persistentId.trim().length > 0) {
+        normalized.persistentId = persistentId.trim();
+    }
+    return Object.keys(normalized).length > 0 ? normalized : undefined;
+}
+/**
+ * Extract MCP client information from handshake request and initialize context
+ *
+ * @param request Handshake request
+ * @param initializeContext Optional context from previous initialize call
+ * @returns Extracted and normalized client info or undefined
+ */
+export function extractMCPClient(request, initializeContext) {
+    const fromHandshake = normalizeClientInfo(request.clientInfo);
+    const merged = {
+        ...(initializeContext?.clientInfo ?? {}),
+        ...(fromHandshake ?? {}),
+    };
+    const handshakeClientId = isRecord(request.clientInfo) &&
+        typeof request.clientInfo.clientId === "string" &&
+        request.clientInfo.clientId.trim().length > 0
+        ? request.clientInfo.clientId.trim()
+        : undefined;
+    const hasClientMetadata = Object.keys(merged).length > 0 ||
+        handshakeClientId ||
+        typeof request.clientProtocolVersion === "string" ||
+        isRecord(request.clientCapabilities);
+    if (!hasClientMetadata) {
+        return undefined;
+    }
+    const nameValue = merged.name;
+    const name = typeof nameValue === "string" && nameValue.trim().length > 0
+        ? nameValue.trim()
+        : "unknown";
+    const clientId = handshakeClientId || crypto.randomUUID();
+    const capabilities = isRecord(request.clientCapabilities)
+        ? request.clientCapabilities
+        : initializeContext?.capabilities;
+    return {
+        name,
+        title: merged.title,
+        version: merged.version,
+        platform: merged.platform,
+        vendor: merged.vendor,
+        persistentId: merged.persistentId,
+        protocolVersion: request.clientProtocolVersion ??
+            initializeContext?.protocolVersion ??
+            merged.protocolVersion,
+        capabilities,
+        clientId,
+    };
+}
+/**
+ * Prepare handshake payload with client information from initialize context
+ *
+ * @param params Original handshake request parameters
+ * @param initializeContext Optional context from previous initialize call
+ * @returns Enhanced handshake request with client info
+ */
+export function prepareHandshakePayload(params, initializeContext) {
+    const payload = {
+        ...params,
+    };
+    if (!payload.clientProtocolVersion && initializeContext?.protocolVersion) {
+        payload.clientProtocolVersion = initializeContext.protocolVersion;
+    }
+    if (!payload.clientCapabilities && initializeContext?.capabilities) {
+        payload.clientCapabilities = initializeContext.capabilities;
+    }
+    if (!payload.clientInfo && initializeContext?.clientInfo?.name) {
+        const source = initializeContext.clientInfo;
+        const name = source.name;
+        if (!name) {
+            return payload;
+        }
+        payload.clientInfo = {
+            name,
+            ...(source.title ? { title: source.title } : {}),
+            ...(source.version ? { version: source.version } : {}),
+            ...(source.platform ? { platform: source.platform } : {}),
+            ...(source.vendor ? { vendor: source.vendor } : {}),
+            ...(source.persistentId ? { persistentId: source.persistentId } : {}),
+        };
+    }
+    return payload;
+}
+/**
+ * Clone capabilities object (deep copy)
+ *
+ * @param capabilities Capabilities to clone
+ * @returns Cloned capabilities or undefined
+ */
+export function cloneCapabilities(capabilities) {
+    if (!isRecord(capabilities)) {
+        return undefined;
+    }
+    return JSON.parse(JSON.stringify(capabilities));
+}
+/**
+ * Type guard for record objects
+ *
+ * @param value Value to check
+ * @returns true if value is a record object
+ */
+export function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+ * Extract client ID from client info if available
+ *
+ * @param clientInfo Client info object
+ * @returns Client ID or undefined
+ */
+export function extractClientId(clientInfo) {
+    if (!isRecord(clientInfo)) {
+        return undefined;
+    }
+    const clientId = clientInfo.clientId;
+    if (typeof clientId === "string" && clientId.trim().length > 0) {
+        return clientId.trim();
+    }
+    return undefined;
+}
+/**
+ * Merge client info from multiple sources
+ *
+ * @param sources Array of potential client info sources (later sources override earlier)
+ * @returns Merged client info
+ */
+export function mergeClientInfo(...sources) {
+    const merged = {};
+    for (const source of sources) {
+        if (source) {
+            Object.assign(merged, source);
+        }
+    }
+    return merged;
+}
+//# sourceMappingURL=client-info.js.map

package/dist/utils/client-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client-info.js","sourceRoot":"","sources":["../../src/utils/client-info.ts"],"names":[],"mappings":"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"}

package/dist/utils/error-formatter.d.ts

@@ -0,0 +1,103 @@
+/**
+ * Error Formatter Utility
+ *
+ * Provides consistent JSON-RPC error response formatting for all error types.
+ * Handles special cases like DelegationRequiredError and OAuthRequiredError.
+ */
+/**
+ * JSON-RPC error response structure
+ */
+export interface JsonRpcErrorResponse {
+    jsonrpc: string;
+    id: unknown;
+    error: {
+        code: number;
+        message: string;
+        data?: any;
+    };
+}
+/**
+ * Error codes for different error types
+ */
+export declare const ERROR_CODES: {
+    readonly PARSE_ERROR: -32700;
+    readonly INVALID_REQUEST: -32600;
+    readonly METHOD_NOT_FOUND: -32601;
+    readonly INVALID_PARAMS: -32602;
+    readonly INTERNAL_ERROR: -32603;
+    readonly DELEGATION_REQUIRED: -32001;
+    readonly OAUTH_REQUIRED: -32002;
+    readonly AUTHORIZATION_REQUIRED: -32003;
+    readonly SESSION_EXPIRED: -32004;
+};
+/**
+ * Format a generic error into JSON-RPC response
+ *
+ * @param error The error to format
+ * @param id Request ID from JSON-RPC request
+ * @returns Formatted JSON-RPC error response
+ */
+export declare function formatJsonRpcError(error: unknown, id: unknown): JsonRpcErrorResponse;
+/**
+ * Format DelegationRequiredError into JSON-RPC response
+ *
+ * @param error Delegation required error
+ * @param id Request ID
+ * @returns Formatted error response with consent URL
+ */
+export declare function formatDelegationError(error: any, id: unknown): JsonRpcErrorResponse;
+/**
+ * Format OAuthRequiredError into JSON-RPC response
+ *
+ * @param error OAuth required error
+ * @param id Request ID
+ * @returns Formatted error response with OAuth URL
+ */
+export declare function formatOAuthError(error: any, id: unknown): JsonRpcErrorResponse;
+/**
+ * Check if error is a DelegationRequiredError
+ *
+ * @param error Error to check
+ * @returns true if it's a delegation required error
+ */
+export declare function isDelegationRequiredError(error: unknown): boolean;
+/**
+ * Check if error is an OAuthRequiredError
+ *
+ * @param error Error to check
+ * @returns true if it's an OAuth required error
+ */
+export declare function isOAuthRequiredError(error: unknown): boolean;
+/**
+ * Format method not found error
+ *
+ * @param method The method that was not found
+ * @param id Request ID
+ * @returns Formatted error response
+ */
+export declare function formatMethodNotFoundError(method: string, id: unknown): JsonRpcErrorResponse;
+/**
+ * Format tool not found error
+ *
+ * @param toolName The tool that was not found
+ * @param id Request ID
+ * @returns Formatted error response
+ */
+export declare function formatToolNotFoundError(toolName: string, id: unknown): JsonRpcErrorResponse;
+/**
+ * Format session expired error
+ *
+ * @param sessionId The expired session ID
+ * @param id Request ID
+ * @returns Formatted error response
+ */
+export declare function formatSessionExpiredError(sessionId: string, id: unknown): JsonRpcErrorResponse;
+/**
+ * Create a success response wrapper
+ *
+ * @param result The result to wrap
+ * @param id Request ID
+ * @returns JSON-RPC success response
+ */
+export declare function formatSuccessResponse(result: any, id: unknown): any;
+//# sourceMappingURL=error-formatter.d.ts.map

package/dist/utils/error-formatter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"error-formatter.d.ts","sourceRoot":"","sources":["../../src/utils/error-formatter.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,OAAO,CAAC;IACZ,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,GAAG,CAAC;KACZ,CAAC;CACH;AAED;;GAEG;AACH,eAAO,MAAM,WAAW;;;;;;;;;;CAad,CAAC;AAEX;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CAoDpF;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CA4BnF;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CA8B9E;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAWjE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAW5D;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CAS3F;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CAS3F;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,GAAG,oBAAoB,CAY9F;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,GAAG,GAAG,CAMnE"}