@vybestack/llxprt-code 0.7.0 → 0.8.0-nightly.260101.f35159d03

package/dist/src/validateNonInterActiveAuth.js

@@ -3,7 +3,7 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { AuthType } from '@vybestack/llxprt-code-core';
+import { AuthType, JsonFormatter, OutputFormat, } from '@vybestack/llxprt-code-core';
 import { USER_SETTINGS_PATH } from './config/settings.js';
 import { validateAuthMethod } from './config/auth.js';
 function getAuthTypeFromEnv() {
@@ -20,7 +20,62 @@ function getAuthTypeFromEnv() {
     }
     return undefined;
 }
+function getEnforcedAuthTypeFromSettings(settings) {
+    const enforcedType = settings?.merged?.['security'];
+    const enforcedAuth = enforcedType?.['auth'];
+    const raw = enforcedAuth?.['enforcedType'];
+    if (typeof raw !== 'string') {
+        return undefined;
+    }
+    const trimmed = raw.trim();
+    if (trimmed.length === 0) {
+        return undefined;
+    }
+    const validAuthTypes = new Set(Object.values(AuthType));
+    if (!validAuthTypes.has(trimmed)) {
+        throw new Error(`Invalid security.auth.enforcedType: "${trimmed}". Valid values: ${Array.from(validAuthTypes).join(', ')}`);
+    }
+    return trimmed;
+}
+function getCurrentGoogleAuthTypeFromEnv() {
+    if (process.env.GOOGLE_GENAI_USE_GCA === 'true') {
+        return AuthType.LOGIN_WITH_GOOGLE;
+    }
+    if (process.env.GOOGLE_GENAI_USE_VERTEXAI === 'true') {
+        return AuthType.USE_VERTEX_AI;
+    }
+    if (process.env.GEMINI_API_KEY || process.env.LLXPRT_API_KEY) {
+        return AuthType.USE_GEMINI;
+    }
+    return undefined;
+}
+function reportNonInteractiveAuthError(config, message) {
+    const outputFormat = typeof config.getOutputFormat === 'function'
+        ? config.getOutputFormat()
+        : OutputFormat.TEXT;
+    if (outputFormat === OutputFormat.JSON) {
+        const formatter = new JsonFormatter();
+        process.stderr.write(`${formatter.formatError(new Error(message), 1)}\n`);
+        return;
+    }
+    console.error(message);
+}
 export async function validateNonInteractiveAuth(configuredAuthType, useExternalAuth, nonInteractiveConfig, settings) {
+    let enforcedAuthType;
+    try {
+        enforcedAuthType = getEnforcedAuthTypeFromSettings(settings);
+    }
+    catch (error) {
+        reportNonInteractiveAuthError(nonInteractiveConfig, error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    }
+    if (enforcedAuthType) {
+        const currentAuthType = getCurrentGoogleAuthTypeFromEnv();
+        if (currentAuthType && enforcedAuthType !== currentAuthType) {
+            reportNonInteractiveAuthError(nonInteractiveConfig, `Auth type mismatch: configured auth type is ${enforcedAuthType}, current auth type is ${currentAuthType}.`);
+            process.exit(1);
+        }
+    }
     // Check if a provider is already configured via command line
     const providerManager = nonInteractiveConfig.getProviderManager?.();
     const configProvider = nonInteractiveConfig.getProvider?.();
@@ -52,13 +107,13 @@ export async function validateNonInteractiveAuth(configuredAuthType, useExternal
     }
     const effectiveAuthType = configuredAuthType || getAuthTypeFromEnv();
     if (!effectiveAuthType) {
-        console.error(`Please set an Auth method in your ${USER_SETTINGS_PATH} or specify one of the following environment variables before running: GEMINI_API_KEY, LLXPRT_API_KEY, GOOGLE_GENAI_USE_VERTEXAI, GOOGLE_GENAI_USE_GCA, OPENAI_API_KEY, ANTHROPIC_API_KEY`);
+        reportNonInteractiveAuthError(nonInteractiveConfig, `Please set an Auth method in your ${USER_SETTINGS_PATH} or specify one of the following environment variables before running: GEMINI_API_KEY, LLXPRT_API_KEY, GOOGLE_GENAI_USE_VERTEXAI, GOOGLE_GENAI_USE_GCA, OPENAI_API_KEY, ANTHROPIC_API_KEY`);
         process.exit(1);
     }
     if (!useExternalAuth) {
         const err = validateAuthMethod(effectiveAuthType);
         if (err != null) {
-            console.error(err);
+            reportNonInteractiveAuthError(nonInteractiveConfig, err);
             process.exit(1);
         }
     }

package/dist/src/validateNonInterActiveAuth.js.map

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