@ogment-ai/cli 0.4.2 → 0.5.0

package/dist/services/auth.js

@@ -9,7 +9,6 @@ import { CLI_CLIENT_NAME, CLI_REDIRECT_HOST } from "../shared/constants.js";
 import { ERROR_CODE } from "../shared/error-codes.js";
 import { AuthError, RemoteRequestError, UnexpectedError, ValidationError, } from "../shared/errors.js";
 import { parseWithSchema } from "../shared/guards.js";
-import { remoteRetryConfig } from "../shared/retry.js";
 import { browserAgentCallbackSchema, cliExchangeErrorSchema, cliExchangeRequestSchema, cliExchangeSuccessSchema, deviceCodeStartSchema, deviceTokenApprovedSchema, oauthClientRegistrationSchema, oauthTokenSchema, } from "../shared/schemas.js";
 const CALLBACK_TIMEOUT_MILLISECONDS = 5 * 60 * 1000;
 const defaultSleep = async (milliseconds) => {
@@ -127,7 +126,7 @@ const waitForOAuthCallback = async (server, port) => {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authInvalidCredentials,
                     message: `OAuth error: ${oauthError}`,
-                    suggestedCommand: "ogment auth login --browser",
+                    recovery: { command: "ogment auth login --browser" },
                 }));
             }
             const code = url.searchParams.get("code");
@@ -139,7 +138,7 @@ const waitForOAuthCallback = async (server, port) => {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authInvalidCredentials,
                     message: "No authorization code in callback",
-                    suggestedCommand: "ogment auth login --browser",
+                    recovery: { command: "ogment auth login --browser" },
                 }));
             }
             return Result.ok({
@@ -154,13 +153,13 @@ const waitForOAuthCallback = async (server, port) => {
             return Result.err(new AuthError({
                 code: ERROR_CODE.authInvalidCredentials,
                 message: "Login timed out. No callback received within 5 minutes.",
-                suggestedCommand: "ogment auth login --browser",
+                recovery: { command: "ogment auth login --browser" },
             }));
         }
         return Result.err(new AuthError({
             code: ERROR_CODE.authInvalidCredentials,
             message: "Failed while waiting for OAuth callback.",
-            suggestedCommand: "ogment auth login --browser",
+            recovery: { command: "ogment auth login --browser" },
         }));
     }
     finally {
@@ -169,7 +168,7 @@ const waitForOAuthCallback = async (server, port) => {
     return Result.err(new AuthError({
         code: ERROR_CODE.authInvalidCredentials,
         message: "Login timed out. No callback received within 5 minutes.",
-        suggestedCommand: "ogment auth login --browser",
+        recovery: { command: "ogment auth login --browser" },
     }));
 };
 const waitForAgentCallback = async (server, port) => {
@@ -195,7 +194,7 @@ const waitForAgentCallback = async (server, port) => {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authInvalidCredentials,
                     message: "No exchange code in callback",
-                    suggestedCommand: "ogment auth login --browser",
+                    recovery: { command: "ogment auth login --browser" },
                 }));
             }
             const agentName = parsedCallback.value.agent_name ?? "CLI Agent";
@@ -214,13 +213,13 @@ const waitForAgentCallback = async (server, port) => {
             return Result.err(new AuthError({
                 code: ERROR_CODE.authInvalidCredentials,
                 message: "Agent selection timed out.",
-                suggestedCommand: "ogment auth login --browser",
+                recovery: { command: "ogment auth login --browser" },
             }));
         }
         return Result.err(new AuthError({
             code: ERROR_CODE.authInvalidCredentials,
             message: "Failed while waiting for agent callback.",
-            suggestedCommand: "ogment auth login --browser",
+            recovery: { command: "ogment auth login --browser" },
         }));
     }
     finally {
@@ -229,7 +228,7 @@ const waitForAgentCallback = async (server, port) => {
     return Result.err(new AuthError({
         code: ERROR_CODE.authInvalidCredentials,
         message: "Agent selection timed out.",
-        suggestedCommand: "ogment auth login --browser",
+        recovery: { command: "ogment auth login --browser" },
     }));
 };
 const deviceCodeUrl = (baseUrl) => `${baseUrl}/api/v1/mcp-auth/device/code`;
@@ -246,21 +245,11 @@ export const createAuthService = (deps) => {
     const createServerFn = deps.createServerFn ?? createServer;
     const detectEnvironment = deps.detectEnvironment ?? detectExecutionEnvironment;
     const hostnameFn = deps.hostnameFn ?? hostname;
-    const retryConfig = remoteRetryConfig();
-    const requestWithRetry = async (input, init) => {
-        return Result.tryPromise({
-            catch: (cause) => cause,
-            try: async () => {
-                const response = await deps.httpClient.request(input, init);
-                if (Result.isError(response)) {
-                    throw response.error;
-                }
-                return response.value;
-            },
-        }, retryConfig);
+    const requestRemote = async (input, init) => {
+        return deps.httpClient.request(input, init);
     };
     const loginWithDevice = async (options) => {
-        const startFlowResponse = await requestWithRetry(deviceCodeUrl(deps.baseUrl), {
+        const startFlowResponse = await requestRemote(deviceCodeUrl(deps.baseUrl), {
             headers: {
                 "Content-Type": "application/json",
             },
@@ -273,14 +262,19 @@ export const createAuthService = (deps) => {
             const body = await readResponseText(startFlowResponse.value);
             return Result.err(new RemoteRequestError({
                 body,
+                httpStatus: startFlowResponse.value.status,
                 message: "Failed to start device login",
-                status: startFlowResponse.value.status,
+                operation: "auth/device/start",
+                raw: body,
+                source: "http",
             }));
         }
         const startPayload = await Result.tryPromise({
             catch: () => new RemoteRequestError({
+                httpStatus: startFlowResponse.value.status,
                 message: "Failed to parse device login start payload",
-                status: startFlowResponse.value.status,
+                operation: "auth/device/start",
+                source: "http",
             }),
             try: async () => startFlowResponse.value.json(),
         });
@@ -299,7 +293,7 @@ export const createAuthService = (deps) => {
         const interval = parsedStartPayload.value.data.interval * 1000;
         while (now() < deadline) {
             await sleep(interval);
-            const pollResponse = await requestWithRetry(deviceTokenUrl(deps.baseUrl), {
+            const pollResponse = await requestRemote(deviceTokenUrl(deps.baseUrl), {
                 body: JSON.stringify({
                     device_code: parsedStartPayload.value.data.device_code,
                 }),
@@ -315,28 +309,33 @@ export const createAuthService = (deps) => {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authDeviceExpired,
                     message: "Device login code expired. Run `ogment auth login` again.",
-                    suggestedCommand: "ogment auth login",
+                    recovery: { command: "ogment auth login" },
                 }));
             }
             if (pollResponse.value.status === 404) {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authInvalidCredentials,
                     message: "Invalid device login code. Run `ogment auth login` again.",
-                    suggestedCommand: "ogment auth login",
+                    recovery: { command: "ogment auth login" },
                 }));
             }
             if (!pollResponse.value.ok) {
                 const body = await readResponseText(pollResponse.value);
                 return Result.err(new RemoteRequestError({
                     body,
+                    httpStatus: pollResponse.value.status,
                     message: "Failed to poll device login status",
-                    status: pollResponse.value.status,
+                    operation: "auth/device/poll",
+                    raw: body,
+                    source: "http",
                 }));
             }
             const pollPayload = await Result.tryPromise({
                 catch: () => new RemoteRequestError({
+                    httpStatus: pollResponse.value.status,
                     message: "Failed to parse device login poll payload",
-                    status: pollResponse.value.status,
+                    operation: "auth/device/poll",
+                    source: "http",
                 }),
                 try: async () => pollResponse.value.json(),
             });
@@ -359,13 +358,14 @@ export const createAuthService = (deps) => {
             }
             return Result.ok({
                 agentName: approvedPayload.value.data.agent_name ?? "CLI Agent",
-                alreadyLoggedIn: false,
+                loggedIn: true,
+                outcome: "authenticated",
             });
         }
         return Result.err(new AuthError({
             code: ERROR_CODE.authDeviceExpired,
             message: "Device login code expired. Run `ogment auth login` again.",
-            suggestedCommand: "ogment auth login",
+            recovery: { command: "ogment auth login" },
         }));
     };
     const loginWithBrowser = async () => {
@@ -375,7 +375,7 @@ export const createAuthService = (deps) => {
         }
         const { port, server } = callbackServerResult.value;
         const redirectUri = `http://${CLI_REDIRECT_HOST}:${port}/callback`;
-        const registerResponse = await requestWithRetry(oauthRegisterUrl(deps.baseUrl), {
+        const registerResponse = await requestRemote(oauthRegisterUrl(deps.baseUrl), {
             body: JSON.stringify({
                 client_name: CLI_CLIENT_NAME,
                 grant_types: ["authorization_code"],
@@ -397,14 +397,19 @@ export const createAuthService = (deps) => {
             await closeServer(server);
             return Result.err(new RemoteRequestError({
                 body,
+                httpStatus: registerResponse.value.status,
                 message: "Client registration failed",
-                status: registerResponse.value.status,
+                operation: "auth/browser/register",
+                raw: body,
+                source: "http",
             }));
         }
         const registerPayload = await Result.tryPromise({
             catch: () => new RemoteRequestError({
+                httpStatus: registerResponse.value.status,
                 message: "Failed to parse client registration payload",
-                status: registerResponse.value.status,
+                operation: "auth/browser/register",
+                source: "http",
             }),
             try: async () => registerResponse.value.json(),
         });
@@ -447,7 +452,7 @@ export const createAuthService = (deps) => {
             return Result.err(new AuthError({
                 code: ERROR_CODE.authInvalidCredentials,
                 message: "OAuth state mismatch - possible CSRF attack.",
-                suggestedCommand: "ogment auth login --browser",
+                recovery: { command: "ogment auth login --browser" },
             }));
         }
         const tokenBody = new URLSearchParams({
@@ -461,7 +466,7 @@ export const createAuthService = (deps) => {
             parsedClient.value.client_secret.length > 0) {
             tokenBody.set("client_secret", parsedClient.value.client_secret);
         }
-        const tokenResponse = await requestWithRetry(oauthTokenUrl(deps.baseUrl), {
+        const tokenResponse = await requestRemote(oauthTokenUrl(deps.baseUrl), {
             body: tokenBody.toString(),
             headers: {
                 "Content-Type": "application/x-www-form-urlencoded",
@@ -477,14 +482,19 @@ export const createAuthService = (deps) => {
             await closeServer(server);
             return Result.err(new RemoteRequestError({
                 body,
+                httpStatus: tokenResponse.value.status,
                 message: "Token exchange failed",
-                status: tokenResponse.value.status,
+                operation: "auth/browser/token",
+                raw: body,
+                source: "http",
             }));
         }
         const tokenPayload = await Result.tryPromise({
             catch: () => new RemoteRequestError({
+                httpStatus: tokenResponse.value.status,
                 message: "Failed to parse token payload",
-                status: tokenResponse.value.status,
+                operation: "auth/browser/token",
+                source: "http",
             }),
             try: async () => tokenResponse.value.json(),
         });
@@ -518,7 +528,7 @@ export const createAuthService = (deps) => {
         if (Result.isError(parsedExchangeRequestPayload)) {
             return parsedExchangeRequestPayload;
         }
-        const exchangeResponse = await requestWithRetry(cliExchangeUrl(deps.baseUrl), {
+        const exchangeResponse = await requestRemote(cliExchangeUrl(deps.baseUrl), {
             body: JSON.stringify(parsedExchangeRequestPayload.value),
             headers: {
                 "Content-Type": "application/json",
@@ -542,36 +552,41 @@ export const createAuthService = (deps) => {
                         return Result.err(new AuthError({
                             code: ERROR_CODE.authDeviceExpired,
                             message: "Browser login code expired. Run `ogment auth login --browser` again.",
-                            suggestedCommand: "ogment auth login --browser",
+                            recovery: { command: "ogment auth login --browser" },
                         }));
                     }
                     if (exchangeErrorCode === "invalid_exchange_code") {
                         return Result.err(new AuthError({
                             code: ERROR_CODE.authInvalidCredentials,
                             message: "Invalid browser login code. Run `ogment auth login --browser` again.",
-                            suggestedCommand: "ogment auth login --browser",
+                            recovery: { command: "ogment auth login --browser" },
                         }));
                     }
                     if (exchangeErrorCode === "authorization_pending") {
                         return Result.err(new AuthError({
                             code: ERROR_CODE.authDevicePending,
                             message: "Browser login authorization is still pending.",
+                            recovery: { command: "ogment auth login --browser" },
                             retryable: true,
-                            suggestedCommand: "ogment auth login --browser",
                         }));
                     }
                 }
             }
             return Result.err(new RemoteRequestError({
                 body,
+                httpStatus: exchangeResponse.value.status,
                 message: "Failed to exchange browser login code",
-                status: exchangeResponse.value.status,
+                operation: "auth/browser/exchange",
+                raw: body,
+                source: "http",
             }));
         }
         const exchangePayload = await Result.tryPromise({
             catch: () => new RemoteRequestError({
+                httpStatus: exchangeResponse.value.status,
                 message: "Failed to parse browser exchange payload",
-                status: exchangeResponse.value.status,
+                operation: "auth/browser/exchange",
+                source: "http",
             }),
             try: async () => exchangeResponse.value.json(),
         });
@@ -591,7 +606,8 @@ export const createAuthService = (deps) => {
         }
         return Result.ok({
             agentName: parsedExchangePayload.value.data.name,
-            alreadyLoggedIn: false,
+            loggedIn: true,
+            outcome: "authenticated",
         });
     };
     return {
@@ -606,21 +622,22 @@ export const createAuthService = (deps) => {
                 }
                 return Result.ok({
                     agentName: "CLI Agent",
-                    alreadyLoggedIn: false,
+                    loggedIn: true,
+                    outcome: "authenticated",
                 });
             }
             if (options.mode === "apiKey") {
                 return Result.err(new ValidationError({
                     code: ERROR_CODE.validationInvalidInput,
                     message: "Missing API key value. Provide a non-empty API key.",
-                    suggestedCommand: "ogment auth login --api-key <key>",
+                    recovery: { command: "ogment auth login --api-key <key>" },
                 }));
             }
             if (options.nonInteractive && options.mode === "browser") {
                 return Result.err(new ValidationError({
                     code: ERROR_CODE.validationInvalidInput,
                     message: "Use `ogment auth login` in non-interactive mode.",
-                    suggestedCommand: "ogment auth login",
+                    recovery: { command: "ogment auth login" },
                 }));
             }
             const stored = deps.credentialsStore.load();
@@ -630,7 +647,8 @@ export const createAuthService = (deps) => {
             if (stored.value !== null) {
                 return Result.ok({
                     agentName: stored.value.agentName ?? "CLI Agent",
-                    alreadyLoggedIn: true,
+                    loggedIn: true,
+                    outcome: "already_authenticated",
                 });
             }
             if (options.mode === "device") {
@@ -649,7 +667,7 @@ export const createAuthService = (deps) => {
                     revoked: false,
                 });
             }
-            const revokeResult = await requestWithRetry(revokeUrl(deps.baseUrl), {
+            const revokeResult = await requestRemote(revokeUrl(deps.baseUrl), {
                 headers: {
                     Authorization: `Bearer ${stored.value.apiKey}`,
                 },
@@ -682,7 +700,7 @@ export const createAuthService = (deps) => {
             return Result.err(new AuthError({
                 code: ERROR_CODE.authRequired,
                 message: "Not logged in. Run `ogment auth login` or set OGMENT_API_KEY.",
-                suggestedCommand: "ogment auth login",
+                recovery: { command: "ogment auth login" },
             }));
         },
         status: async (overrideApiKey) => {

package/dist/services/info.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../src/services/info.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EACV,aAAa,EAGb,WAAW,EAEZ,MAAM,oBAAoB,CAAC;AAsB5B,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACxD;AAED,UAAU,eAAe;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,4BAA4B,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAqFD,eAAO,MAAM,iBAAiB,GAAI,MAAM,eAAe,KAAG,WAgNzD,CAAC"}
+{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../src/services/info.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EACV,aAAa,EAGb,WAAW,EAEZ,MAAM,oBAAoB,CAAC;AAsB5B,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACxD;AAED,UAAU,eAAe;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,4BAA4B,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5C,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;CACjB;AAmGD,eAAO,MAAM,iBAAiB,GAAI,MAAM,eAAe,KAAG,WAwQzD,CAAC"}

package/dist/services/info.js

@@ -68,6 +68,16 @@ const toSummary = (issues) => {
         status: issues.length > 0 ? "warning" : "ok",
     };
 };
+const emptyAccountErrorDetails = () => {
+    return {
+        errorCode: null,
+        errorHttpStatus: null,
+        errorMcpCode: null,
+        errorRaw: null,
+        errorRetryable: null,
+        errorSource: null,
+    };
+};
 export const createInfoService = (deps) => {
     const detectEnvironment = deps.detectExecutionEnvironmentFn ?? detectExecutionEnvironment;
     const existsSyncFn = deps.existsSyncFn ?? existsSync;
@@ -106,6 +116,7 @@ export const createInfoService = (deps) => {
             const collectAccount = async () => {
                 if (selectedApiKey === null) {
                     return {
+                        ...emptyAccountErrorDetails(),
                         errorType: null,
                         latencyMs: null,
                         message: "No API key available",
@@ -123,6 +134,7 @@ export const createInfoService = (deps) => {
                         return organization.servers.map((server) => server.path);
                     });
                     return {
+                        ...emptyAccountErrorDetails(),
                         errorType: null,
                         latencyMs: accountElapsedMs,
                         message: null,
@@ -152,6 +164,56 @@ export const createInfoService = (deps) => {
                     }
                 }
                 return {
+                    ...("code" in accountResult.error
+                        ? {
+                            errorCode: String(accountResult.error.code),
+                        }
+                        : {
+                            errorCode: null,
+                        }),
+                    ...("httpStatus" in accountResult.error
+                        ? {
+                            errorHttpStatus: typeof accountResult.error.httpStatus === "number"
+                                ? accountResult.error.httpStatus
+                                : null,
+                        }
+                        : {
+                            errorHttpStatus: null,
+                        }),
+                    ...("mcpCode" in accountResult.error
+                        ? {
+                            errorMcpCode: typeof accountResult.error.mcpCode === "number"
+                                ? accountResult.error.mcpCode
+                                : null,
+                        }
+                        : {
+                            errorMcpCode: null,
+                        }),
+                    ...("raw" in accountResult.error
+                        ? {
+                            errorRaw: accountResult.error.raw ?? null,
+                        }
+                        : {
+                            errorRaw: null,
+                        }),
+                    ...("retryable" in accountResult.error
+                        ? {
+                            errorRetryable: typeof accountResult.error.retryable === "boolean"
+                                ? accountResult.error.retryable
+                                : null,
+                        }
+                        : {
+                            errorRetryable: null,
+                        }),
+                    ...("source" in accountResult.error
+                        ? {
+                            errorSource: typeof accountResult.error.source === "string"
+                                ? accountResult.error.source
+                                : null,
+                        }
+                        : {
+                            errorSource: null,
+                        }),
                     errorType: accountResult.error._tag,
                     latencyMs: accountElapsedMs,
                     message: accountResult.error.message,

package/dist/services/mcp-error-mapping.d.ts

@@ -0,0 +1,9 @@
+import { RemoteRequestError } from "../shared/errors.js";
+interface CreateRemoteRequestErrorOptions {
+    cause: unknown;
+    message: string;
+    operation: string;
+}
+export declare const createRemoteRequestErrorFromMcpCause: (options: CreateRemoteRequestErrorOptions) => RemoteRequestError;
+export {};
+//# sourceMappingURL=mcp-error-mapping.d.ts.map

package/dist/services/mcp-error-mapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-error-mapping.d.ts","sourceRoot":"","sources":["../../src/services/mcp-error-mapping.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAazD,UAAU,+BAA+B;IACvC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB;AA0ID,eAAO,MAAM,oCAAoC,GAC/C,SAAS,+BAA+B,KACvC,kBAaF,CAAC"}

package/dist/services/mcp-error-mapping.js

@@ -0,0 +1,129 @@
+import { StreamableHTTPError } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { McpError, isJSONRPCErrorResponse } from "@modelcontextprotocol/sdk/types.js";
+import { RemoteRequestError } from "../shared/errors.js";
+const toSerializable = (value) => {
+    if (value instanceof Error) {
+        return {
+            message: value.message,
+            name: value.name,
+            stack: value.stack,
+        };
+    }
+    try {
+        return structuredClone(value);
+    }
+    catch {
+        return String(value);
+    }
+};
+const toJsonRpcErrorPayload = (payload) => {
+    if (isJSONRPCErrorResponse(payload)) {
+        return {
+            code: payload.error.code,
+            data: payload.error.data,
+            raw: toSerializable(payload),
+        };
+    }
+    if (typeof payload !== "object" || payload === null || !Object.hasOwn(payload, "error")) {
+        return null;
+    }
+    const errorRecord = payload.error;
+    if (typeof errorRecord !== "object" || errorRecord === null) {
+        return null;
+    }
+    const asRecord = errorRecord;
+    const code = asRecord["code"];
+    if (typeof code !== "number") {
+        return null;
+    }
+    return {
+        code,
+        data: asRecord["data"],
+        raw: toSerializable(payload),
+    };
+};
+const extractStreamableBody = (message) => {
+    const marker = "Error POSTing to endpoint:";
+    const markerIndex = message.indexOf(marker);
+    if (markerIndex === -1) {
+        return undefined;
+    }
+    const body = message.slice(markerIndex + marker.length).trim();
+    return body.length > 0 ? body : undefined;
+};
+const mapStreamableHttpError = (error) => {
+    const body = extractStreamableBody(error.message);
+    const parsedBody = body === undefined
+        ? null
+        : (() => {
+            try {
+                return JSON.parse(body);
+            }
+            catch {
+                return null;
+            }
+        })();
+    const jsonRpcPayload = parsedBody === null ? null : toJsonRpcErrorPayload(parsedBody);
+    const httpStatus = typeof error.code === "number" && error.code >= 100 ? error.code : undefined;
+    const retryable = httpStatus === undefined
+        ? undefined
+        : httpStatus === 429 || httpStatus >= 500 || httpStatus === 408;
+    return {
+        ...(body === undefined ? {} : { body }),
+        ...(httpStatus === undefined ? {} : { httpStatus }),
+        ...(jsonRpcPayload === null ? {} : { mcpCode: jsonRpcPayload.code }),
+        ...(jsonRpcPayload === null ? {} : { mcpData: jsonRpcPayload.data }),
+        raw: jsonRpcPayload?.raw ?? toSerializable(parsedBody ?? error),
+        ...(retryable === undefined ? {} : { retryable }),
+        source: "mcp_transport_http",
+    };
+};
+const mapMcpError = (error) => {
+    return {
+        mcpCode: error.code,
+        mcpData: toSerializable(error.data),
+        raw: toSerializable({
+            code: error.code,
+            data: error.data,
+            message: error.message,
+            name: error.name,
+        }),
+        retryable: error.code === -32_001,
+        source: "mcp_jsonrpc",
+    };
+};
+const mapUnknownError = (cause) => {
+    if (cause instanceof Error) {
+        return {
+            raw: toSerializable(cause),
+            source: "network",
+        };
+    }
+    return {
+        raw: toSerializable(cause),
+        source: "unknown",
+    };
+};
+const mapCause = (cause) => {
+    if (cause instanceof StreamableHTTPError) {
+        return mapStreamableHttpError(cause);
+    }
+    if (cause instanceof McpError) {
+        return mapMcpError(cause);
+    }
+    return mapUnknownError(cause);
+};
+export const createRemoteRequestErrorFromMcpCause = (options) => {
+    const mapped = mapCause(options.cause);
+    return new RemoteRequestError({
+        ...(mapped.body === undefined ? {} : { body: mapped.body }),
+        ...(mapped.httpStatus === undefined ? {} : { httpStatus: mapped.httpStatus }),
+        ...(mapped.mcpCode === undefined ? {} : { mcpCode: mapped.mcpCode }),
+        ...(mapped.mcpData === undefined ? {} : { mcpData: mapped.mcpData }),
+        message: options.message,
+        operation: options.operation,
+        raw: mapped.raw,
+        ...(mapped.retryable === undefined ? {} : { retryable: mapped.retryable }),
+        source: mapped.source,
+    });
+};

package/dist/services/mcp.d.ts

@@ -10,10 +10,16 @@ interface McpClientLike {
     callTool(params: {
         arguments: Record<string, unknown>;
         name: string;
+    }, resultSchema?: unknown, options?: {
+        timeout?: number;
     }): Promise<unknown>;
     close(): Promise<void>;
-    connect(transport: unknown): Promise<void>;
-    listTools(): Promise<{
+    connect(transport: unknown, options?: {
+        timeout?: number;
+    }): Promise<void>;
+    listTools(params?: unknown, options?: {
+        timeout?: number;
+    }): Promise<{
         tools: Array<Record<string, unknown>>;
     }>;
 }

package/dist/services/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/services/mcp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI/E,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzE,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,aAAa;IACrB,QAAQ,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzF,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,IAAI,OAAO,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACvC,CAAC,CAAC;CACJ;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,aAAa,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,6BAA6B,CAAC;IAC9E,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEnE,MAAM,WAAW,UAAU;IACzB,QAAQ,CACN,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;IACxD,SAAS,CACP,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;CAC3D;AAkFD,eAAO,MAAM,gBAAgB,GAAI,MAAM,cAAc,KAAG,UAsHvD,CAAC"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/services/mcp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAI1D,OAAO,EAAE,kBAAkB,EAAE,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG/E,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMzE,UAAU,SAAS;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,aAAa;IACrB,QAAQ,CACN,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAC5D,YAAY,CAAC,EAAE,OAAO,EACtB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3E,SAAS,CACP,MAAM,CAAC,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,GAC7B,OAAO,CAAC;QACT,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACvC,CAAC,CAAC;CACJ;AAED,UAAU,cAAc;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,aAAa,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,6BAA6B,CAAC;IAC9E,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,eAAe,GAAG,kBAAkB,GAAG,eAAe,CAAC;AAEnE,MAAM,WAAW,UAAU;IACzB,QAAQ,CACN,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;IACxD,SAAS,CACP,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,UAAU,CAAC,cAAc,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;CAC3D;AAkFD,eAAO,MAAM,gBAAgB,GAAI,MAAM,cAAc,KAAG,UAkIvD,CAAC"}