@ogment-ai/cli 0.4.2 → 0.6.0

package/dist/services/account.js

@@ -3,7 +3,6 @@ import { readResponseText } from "../infra/http.js";
 import { ERROR_CODE } from "../shared/error-codes.js";
 import { AuthError, RemoteRequestError } from "../shared/errors.js";
 import { parseWithSchema } from "../shared/guards.js";
-import { remoteRetryConfig } from "../shared/retry.js";
 import { accountMeSchema } from "../shared/schemas.js";
 const authHeader = (apiKey) => {
     return {
@@ -23,20 +22,25 @@ export const createAccountService = (deps) => {
                 return Result.err(new AuthError({
                     code: ERROR_CODE.authInvalidCredentials,
                     message: "Authentication failed. Run `ogment auth login` again.",
-                    suggestedCommand: "ogment auth login",
+                    recovery: { command: "ogment auth login" },
                 }));
             }
             const body = await readResponseText(responseResult.value);
             return Result.err(new RemoteRequestError({
                 body,
+                httpStatus: responseResult.value.status,
                 message: "Failed to fetch account details",
-                status: responseResult.value.status,
+                operation: "account/fetch",
+                raw: body,
+                source: "http",
             }));
         }
         const jsonResult = await Result.tryPromise({
             catch: () => new RemoteRequestError({
+                httpStatus: responseResult.value.status,
                 message: "Failed to parse account response JSON",
-                status: responseResult.value.status,
+                operation: "account/fetch",
+                source: "http",
             }),
             try: async () => responseResult.value.json(),
         });
@@ -49,18 +53,7 @@ export const createAccountService = (deps) => {
         }
         return Result.ok(parsed.value.data);
     };
-    const fetchAccount = async (apiKey) => {
-        return Result.tryPromise({
-            catch: (cause) => cause,
-            try: async () => {
-                const result = await fetchAccountOnce(apiKey);
-                if (Result.isError(result)) {
-                    throw result.error;
-                }
-                return result.value;
-            },
-        }, remoteRetryConfig());
-    };
+    const fetchAccount = async (apiKey) => fetchAccountOnce(apiKey);
     return {
         fetchAccount,
         listServers: async (apiKey) => {

package/dist/services/auth.d.ts

@@ -1,6 +1,4 @@
-import { createServer } from "node:http";
 import type { Result as ResultType } from "better-result";
-import type { BrowserOpener } from "../infra/browser.js";
 import type { CredentialsStore } from "../infra/credentials.js";
 import type { HttpClient } from "../infra/http.js";
 import { AuthError, RemoteRequestError, UnexpectedError, ValidationError } from "../shared/errors.js";
@@ -9,21 +7,15 @@ export interface LoginPendingInfo {
     userCode: string;
     verificationUri: string;
 }
-interface BaseLoginOptions {
-    nonInteractive: boolean;
-}
-interface DeviceLoginOptions extends BaseLoginOptions {
+interface DeviceLoginOptions {
     mode: "device";
     onPending?: (info: LoginPendingInfo) => void;
 }
-interface BrowserLoginOptions extends BaseLoginOptions {
-    mode: "browser";
-}
-interface ApiKeyLoginOptions extends BaseLoginOptions {
+interface ApiKeyLoginOptions {
     apiKey: string;
     mode: "apiKey";
 }
-export type LoginOptions = ApiKeyLoginOptions | BrowserLoginOptions | DeviceLoginOptions;
+export type LoginOptions = ApiKeyLoginOptions | DeviceLoginOptions;
 export type LoginError = AuthError | RemoteRequestError | UnexpectedError | ValidationError;
 export type ResolveApiKeyError = AuthError | UnexpectedError;
 export interface AuthService {
@@ -34,12 +26,8 @@ export interface AuthService {
 }
 interface AuthServiceDeps {
     baseUrl: string;
-    browserOpener: BrowserOpener;
     credentialsStore: CredentialsStore;
-    createServerFn?: typeof createServer;
-    detectEnvironment?: () => string;
     envApiKey: string | undefined;
-    hostnameFn?: () => string;
     httpClient: HttpClient;
     now?: () => number;
     sleep?: (milliseconds: number) => Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/services/auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAMzC,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAInD,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAa7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEzF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,gBAAgB;IACxB,cAAc,EAAE,OAAO,CAAC;CACzB;AAED,UAAU,kBAAmB,SAAQ,gBAAgB;IACnD,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC9C;AAED,UAAU,mBAAoB,SAAQ,gBAAgB;IACpD,IAAI,EAAE,SAAS,CAAC;CACjB;AAED,UAAU,kBAAmB,SAAQ,gBAAgB;IACnD,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,kBAAkB,CAAC;AAEzF,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,eAAe,CAAC;AAE5F,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,eAAe,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5E,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9D,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;CAC1F;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,cAAc,CAAC,EAAE,OAAO,YAAY,CAAC;IACrC,iBAAiB,CAAC,EAAE,MAAM,MAAM,CAAC;IACjC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AAgTD,eAAO,MAAM,iBAAiB,GAAI,MAAM,eAAe,KAAG,WAioBzD,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/services/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,eAAe,EACf,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEzF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,kBAAkB;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;CAC9C;AAED,UAAU,kBAAkB;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ,CAAC;CAChB;AAED,MAAM,MAAM,YAAY,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAEnE,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,kBAAkB,GAAG,eAAe,GAAG,eAAe,CAAC;AAE5F,MAAM,MAAM,kBAAkB,GAAG,SAAS,GAAG,eAAe,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;IAC5E,MAAM,IAAI,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9D,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACxF,MAAM,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC,CAAC;CAC1F;AAED,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,UAAU,EAAE,UAAU,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACjD;AA6BD,eAAO,MAAM,iBAAiB,GAAI,MAAM,eAAe,KAAG,WA+TzD,CAAC"}