@ogment-ai/cli 0.6.0 → 0.7.0

package/dist/services/auth.js

@@ -1,270 +0,0 @@
-import { Result } from "better-result";
-import { readResponseText } from "../infra/http.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 { deviceCodeStartSchema, deviceTokenApprovedSchema } from "../shared/schemas.js";
-const defaultSleep = async (milliseconds) => {
-    await new Promise((resolve) => {
-        setTimeout(resolve, milliseconds);
-    });
-};
-const toPendingPayload = (payload) => {
-    if (typeof payload !== "object" || payload === null) {
-        return null;
-    }
-    if (!Object.hasOwn(payload, "error")) {
-        return null;
-    }
-    const error = payload.error;
-    if (error === "authorization_pending") {
-        return "authorization_pending";
-    }
-    return null;
-};
-const deviceCodeUrl = (baseUrl) => `${baseUrl}/api/v1/mcp-auth/device/code`;
-const deviceTokenUrl = (baseUrl) => `${baseUrl}/api/v1/mcp-auth/device/token`;
-const revokeUrl = (baseUrl) => `${baseUrl}/api/v1/mcp-auth/cli/revoke-self`;
-export const createAuthService = (deps) => {
-    const now = deps.now ?? Date.now;
-    const sleep = deps.sleep ?? defaultSleep;
-    const requestRemote = async (input, init) => {
-        return deps.httpClient.request(input, init);
-    };
-    const loginWithDevice = async (options) => {
-        const startFlowResponse = await requestRemote(deviceCodeUrl(deps.baseUrl), {
-            headers: {
-                "Content-Type": "application/json",
-            },
-            method: "POST",
-        });
-        if (Result.isError(startFlowResponse)) {
-            return startFlowResponse;
-        }
-        if (!startFlowResponse.value.ok) {
-            const body = await readResponseText(startFlowResponse.value);
-            return Result.err(new RemoteRequestError({
-                body,
-                httpStatus: startFlowResponse.value.status,
-                message: "Failed to start device login",
-                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",
-                operation: "auth/device/start",
-                source: "http",
-            }),
-            try: async () => startFlowResponse.value.json(),
-        });
-        if (Result.isError(startPayload)) {
-            return startPayload;
-        }
-        const parsedStartPayload = parseWithSchema(deviceCodeStartSchema, startPayload.value, "device login start response");
-        if (Result.isError(parsedStartPayload)) {
-            return parsedStartPayload;
-        }
-        options.onPending?.({
-            userCode: parsedStartPayload.value.data.user_code,
-            verificationUri: parsedStartPayload.value.data.verification_uri,
-        });
-        const deadline = now() + parsedStartPayload.value.data.expires_in * 1000;
-        const interval = parsedStartPayload.value.data.interval * 1000;
-        while (now() < deadline) {
-            await sleep(interval);
-            const pollResponse = await requestRemote(deviceTokenUrl(deps.baseUrl), {
-                body: JSON.stringify({
-                    device_code: parsedStartPayload.value.data.device_code,
-                }),
-                headers: {
-                    "Content-Type": "application/json",
-                },
-                method: "POST",
-            });
-            if (Result.isError(pollResponse)) {
-                return pollResponse;
-            }
-            if (pollResponse.value.status === 410) {
-                return Result.err(new AuthError({
-                    code: ERROR_CODE.authDeviceExpired,
-                    message: "Device login code expired. Run `ogment auth login` again.",
-                    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.",
-                    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",
-                    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",
-                    operation: "auth/device/poll",
-                    source: "http",
-                }),
-                try: async () => pollResponse.value.json(),
-            });
-            if (Result.isError(pollPayload)) {
-                return pollPayload;
-            }
-            if (toPendingPayload(pollPayload.value) === "authorization_pending") {
-                continue;
-            }
-            const approvedPayload = parseWithSchema(deviceTokenApprovedSchema, pollPayload.value, "device login poll response");
-            if (Result.isError(approvedPayload)) {
-                return approvedPayload;
-            }
-            const saveResult = deps.credentialsStore.save({
-                agentName: approvedPayload.value.data.agent_name ?? "CLI Agent",
-                apiKey: approvedPayload.value.data.api_key,
-            });
-            if (Result.isError(saveResult)) {
-                return saveResult;
-            }
-            return Result.ok({
-                agentName: approvedPayload.value.data.agent_name ?? "CLI Agent",
-                loggedIn: true,
-                outcome: "authenticated",
-            });
-        }
-        return Result.err(new AuthError({
-            code: ERROR_CODE.authDeviceExpired,
-            message: "Device login code expired. Run `ogment auth login` again.",
-            recovery: { command: "ogment auth login" },
-        }));
-    };
-    return {
-        login: async (options) => {
-            if (options.mode === "apiKey" && options.apiKey.length > 0) {
-                const saveResult = deps.credentialsStore.save({
-                    agentName: "CLI Agent",
-                    apiKey: options.apiKey,
-                });
-                if (Result.isError(saveResult)) {
-                    return saveResult;
-                }
-                return Result.ok({
-                    agentName: "CLI Agent",
-                    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.",
-                    recovery: { command: "ogment auth login --api-key <key>" },
-                }));
-            }
-            const stored = deps.credentialsStore.load();
-            if (Result.isError(stored)) {
-                return stored;
-            }
-            if (stored.value !== null) {
-                return Result.ok({
-                    agentName: stored.value.agentName ?? "CLI Agent",
-                    loggedIn: true,
-                    outcome: "already_authenticated",
-                });
-            }
-            return loginWithDevice(options);
-        },
-        logout: async () => {
-            const stored = deps.credentialsStore.load();
-            if (Result.isError(stored)) {
-                return stored;
-            }
-            if (stored.value === null) {
-                return Result.ok({
-                    localCredentialsDeleted: false,
-                    revoked: false,
-                });
-            }
-            const revokeResult = await requestRemote(revokeUrl(deps.baseUrl), {
-                headers: {
-                    Authorization: `Bearer ${stored.value.apiKey}`,
-                },
-                method: "POST",
-            });
-            const deleteResult = deps.credentialsStore.delete();
-            if (Result.isError(deleteResult)) {
-                return deleteResult;
-            }
-            const revoked = Result.isOk(revokeResult) && revokeResult.value.ok;
-            return Result.ok({
-                localCredentialsDeleted: true,
-                revoked,
-            });
-        },
-        resolveApiKey: async (overrideApiKey) => {
-            if (typeof overrideApiKey === "string" && overrideApiKey.length > 0) {
-                return Result.ok(overrideApiKey);
-            }
-            if (typeof deps.envApiKey === "string" && deps.envApiKey.length > 0) {
-                return Result.ok(deps.envApiKey);
-            }
-            const stored = deps.credentialsStore.load();
-            if (Result.isError(stored)) {
-                return stored;
-            }
-            if (stored.value !== null) {
-                return Result.ok(stored.value.apiKey);
-            }
-            return Result.err(new AuthError({
-                code: ERROR_CODE.authRequired,
-                message: "Not logged in. Run `ogment auth login` or set OGMENT_API_KEY.",
-                recovery: { command: "ogment auth login" },
-            }));
-        },
-        status: async (overrideApiKey) => {
-            if (typeof overrideApiKey === "string" && overrideApiKey.length > 0) {
-                return Result.ok({
-                    agentName: null,
-                    apiKeySource: "apiKeyOption",
-                    loggedIn: true,
-                });
-            }
-            if (typeof deps.envApiKey === "string" && deps.envApiKey.length > 0) {
-                return Result.ok({
-                    agentName: null,
-                    apiKeySource: "env",
-                    loggedIn: true,
-                });
-            }
-            const stored = deps.credentialsStore.load();
-            if (Result.isError(stored)) {
-                return stored;
-            }
-            if (stored.value === null) {
-                return Result.ok({
-                    agentName: null,
-                    apiKeySource: "none",
-                    loggedIn: false,
-                });
-            }
-            return Result.ok({
-                agentName: stored.value.agentName ?? null,
-                apiKeySource: "credentialsFile",
-                loggedIn: true,
-            });
-        },
-    };
-};

package/dist/services/info.d.ts

@@ -1,24 +0,0 @@
-import type { CredentialsStore } from "../infra/credentials.js";
-import type { HttpClient } from "../infra/http.js";
-import type { AccountService } from "./account.js";
-import type { BaseUrlSource, InfoPayload } from "../shared/types.js";
-export interface InfoService {
-    collect(apiKeyOverride?: string): Promise<InfoPayload>;
-}
-interface InfoServiceDeps {
-    accountService: AccountService;
-    baseUrl: string;
-    baseUrlSource: BaseUrlSource;
-    configDir: string;
-    credentialsPath: string;
-    credentialsStore: CredentialsStore;
-    detectExecutionEnvironmentFn?: () => string;
-    envApiKey: string | undefined;
-    existsSyncFn?: (path: string) => boolean;
-    httpClient: HttpClient;
-    now?: () => number;
-    version: string;
-}
-export declare const createInfoService: (deps: InfoServiceDeps) => InfoService;
-export {};
-//# sourceMappingURL=info.d.ts.map

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

@@ -1 +0,0 @@
-{"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

@@ -1,316 +0,0 @@
-import { createHash } from "node:crypto";
-import { existsSync } from "node:fs";
-import { Result } from "better-result";
-import { detectExecutionEnvironment } from "../infra/env.js";
-const maskApiKey = (apiKey) => {
-    if (apiKey.length <= 8) {
-        return `*** (sha256:${createHash("sha256").update(apiKey).digest("hex").slice(0, 12)})`;
-    }
-    const start = apiKey.slice(0, 4);
-    const end = apiKey.slice(-4);
-    const fingerprint = createHash("sha256").update(apiKey).digest("hex").slice(0, 12);
-    return `${start}...${end} (sha256:${fingerprint})`;
-};
-const resolveApiKey = (apiKeyOverride, envApiKey, credentialsStore) => {
-    if (typeof apiKeyOverride === "string" && apiKeyOverride.length > 0) {
-        return {
-            loadError: null,
-            source: "apiKeyOption",
-            value: apiKeyOverride,
-        };
-    }
-    if (typeof envApiKey === "string" && envApiKey.length > 0) {
-        return {
-            loadError: null,
-            source: "env",
-            value: envApiKey,
-        };
-    }
-    const storedCredentials = credentialsStore.load();
-    if (Result.isError(storedCredentials)) {
-        return {
-            loadError: storedCredentials.error.message,
-            source: "credentialsError",
-            value: null,
-        };
-    }
-    if (storedCredentials.value !== null) {
-        return {
-            loadError: null,
-            source: "credentialsFile",
-            value: storedCredentials.value.apiKey,
-        };
-    }
-    return {
-        loadError: null,
-        source: "none",
-        value: null,
-    };
-};
-const nextActionByIssueCode = {
-    auth_failed: "Run `ogment auth login` to refresh credentials.",
-    credentials_load_failed: "Check file permissions and contents of `~/.config/ogment/credentials.json`.",
-    no_api_key: "Run `ogment auth login` or set `OGMENT_API_KEY`.",
-    unreachable: "Verify `OGMENT_BASE_URL` and network connectivity.",
-};
-const toSummary = (issues) => {
-    const nextActions = new Set();
-    for (const issue of issues) {
-        const nextAction = nextActionByIssueCode[issue.code];
-        if (nextAction !== undefined) {
-            nextActions.add(nextAction);
-        }
-    }
-    nextActions.add("Run `ogment catalog` to inspect available servers.");
-    return {
-        issues: issues.map((issue) => issue.message),
-        nextActions: [...nextActions],
-        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;
-    const now = deps.now ?? Date.now;
-    return {
-        collect: async (apiKeyOverride) => {
-            const apiKeyResolution = resolveApiKey(apiKeyOverride, deps.envApiKey, deps.credentialsStore);
-            const selectedApiKey = apiKeyResolution.value;
-            const credentialsFileExists = existsSyncFn(deps.credentialsPath);
-            const endpoint = `${deps.baseUrl}/api/v1/mcp-auth/me`;
-            const pingHeaders = typeof selectedApiKey === "string"
-                ? {
-                    Authorization: `Bearer ${selectedApiKey}`,
-                }
-                : undefined;
-            const pingStartedAt = now();
-            const pingResult = await deps.httpClient.request(endpoint, pingHeaders === undefined ? undefined : { headers: pingHeaders });
-            const pingElapsedMs = now() - pingStartedAt;
-            const ping = pingResult.status === "ok"
-                ? {
-                    endpoint,
-                    error: null,
-                    latencyMs: pingElapsedMs,
-                    reachable: true,
-                    status: pingResult.value.status,
-                    statusText: pingResult.value.statusText,
-                }
-                : {
-                    endpoint,
-                    error: pingResult.error.message,
-                    latencyMs: null,
-                    reachable: false,
-                    status: null,
-                    statusText: null,
-                };
-            const collectAccount = async () => {
-                if (selectedApiKey === null) {
-                    return {
-                        ...emptyAccountErrorDetails(),
-                        errorType: null,
-                        latencyMs: null,
-                        message: "No API key available",
-                        orgCount: null,
-                        serverCount: null,
-                        serverPaths: [],
-                        status: "skipped",
-                    };
-                }
-                const accountStartedAt = now();
-                const accountResult = await deps.accountService.fetchAccount(selectedApiKey);
-                const accountElapsedMs = now() - accountStartedAt;
-                if (accountResult.status === "ok") {
-                    const servers = accountResult.value.orgs.flatMap((organization) => {
-                        return organization.servers.map((server) => server.path);
-                    });
-                    return {
-                        ...emptyAccountErrorDetails(),
-                        errorType: null,
-                        latencyMs: accountElapsedMs,
-                        message: null,
-                        orgCount: accountResult.value.orgs.length,
-                        serverCount: servers.length,
-                        serverPaths: servers.slice(0, 5),
-                        status: "success",
-                    };
-                }
-                let normalizedStatus = "unexpected_error";
-                switch (accountResult.error._tag) {
-                    case "AuthError": {
-                        normalizedStatus = "auth_error";
-                        break;
-                    }
-                    case "RemoteRequestError": {
-                        normalizedStatus = "remote_error";
-                        break;
-                    }
-                    case "ValidationError": {
-                        normalizedStatus = "validation_error";
-                        break;
-                    }
-                    default: {
-                        normalizedStatus = "unexpected_error";
-                        break;
-                    }
-                }
-                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,
-                    orgCount: null,
-                    serverCount: null,
-                    serverPaths: [],
-                    status: normalizedStatus,
-                };
-            };
-            const account = await collectAccount();
-            const issues = [];
-            if (!ping.reachable) {
-                issues.push({
-                    code: "unreachable",
-                    message: `Could not reach ${deps.baseUrl}: ${ping.error ?? "unknown error"}`,
-                });
-            }
-            if (apiKeyResolution.source === "none") {
-                issues.push({
-                    code: "no_api_key",
-                    message: "No API key found in --api-key, OGMENT_API_KEY, or credentials file.",
-                });
-            }
-            if (apiKeyResolution.source === "credentialsError" && apiKeyResolution.loadError !== null) {
-                issues.push({
-                    code: "credentials_load_failed",
-                    message: `Failed to load credentials file: ${apiKeyResolution.loadError}`,
-                });
-            }
-            if (account.status === "auth_error") {
-                issues.push({
-                    code: "auth_failed",
-                    message: `Authentication failed: ${account.message ?? "unknown auth error"}`,
-                });
-            }
-            if (account.status === "remote_error") {
-                issues.push({
-                    code: "remote_request_failed",
-                    message: `Remote request failed: ${account.message ?? "unknown remote error"}`,
-                });
-            }
-            if (account.status === "validation_error") {
-                issues.push({
-                    code: "response_validation_failed",
-                    message: `Response validation failed: ${account.message ?? "unknown validation error"}`,
-                });
-            }
-            if (account.status === "unexpected_error") {
-                issues.push({
-                    code: "unexpected_diagnostic_error",
-                    message: `Unexpected diagnostic error: ${account.message ?? "unknown error"}`,
-                });
-            }
-            return {
-                auth: {
-                    apiKeyPresent: selectedApiKey !== null,
-                    apiKeyPreview: selectedApiKey === null ? null : maskApiKey(selectedApiKey),
-                    apiKeySource: apiKeyResolution.source,
-                    credentialsFileExists,
-                    credentialsFileLoadError: apiKeyResolution.loadError,
-                },
-                config: {
-                    baseUrl: deps.baseUrl,
-                    baseUrlSource: deps.baseUrlSource,
-                    configDir: deps.configDir,
-                    credentialsPath: deps.credentialsPath,
-                },
-                documentation: {
-                    configPrecedence: [
-                        "--api-key option",
-                        "OGMENT_API_KEY environment variable",
-                        "~/.config/ogment/credentials.json",
-                        "default base URL when OGMENT_BASE_URL is unset",
-                    ],
-                    quickCommands: [
-                        "ogment status",
-                        "ogment auth login",
-                        "ogment catalog",
-                        "ogment catalog <server-id>",
-                        "ogment catalog <server-id> <tool-name>",
-                        "ogment invoke <server-id>/<tool-name> --input '{}'",
-                    ],
-                },
-                generatedAt: new Date(now()).toISOString(),
-                remote: {
-                    account,
-                    ping,
-                },
-                runtime: {
-                    cliVersion: deps.version,
-                    executionEnvironment: detectEnvironment(),
-                    nodeVersion: process.version,
-                    platform: process.platform,
-                    processArch: process.arch,
-                },
-                summary: toSummary(issues),
-            };
-        },
-    };
-};

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

@@ -1,9 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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"}