@unity-china/codely-cli 1.0.0-beta.42 → 1.0.0-beta.44

package/bundle/gemini.js

@@ -72954,7 +72954,7 @@ var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
     "use strict";
     init_esbuild_polyfill();
-    DEFAULT_QWEN_MODEL = "qwen3-coder-480b-a35b-instruct-fp8";
+    DEFAULT_QWEN_MODEL = "qwen3-flash";
     DEFAULT_QWEN_FLASH_MODEL = "qwen3-flash";
     DEFAULT_CODELY_MODEL = "glm-4.7-fp8";
     DEFAULT_GEMINI_MODEL = DEFAULT_CODELY_MODEL;
@@ -269948,13 +269948,18 @@ var init_codelyContentGenerator = __esm({
 
 // packages/core/dist/src/core/contentGenerator.js
 function createContentGeneratorConfig(config4, authType) {
-  const geminiApiKey = process.env.GEMINI_API_KEY || void 0;
-  const googleApiKey = process.env.GOOGLE_API_KEY || void 0;
-  const googleCloudProject = process.env.GOOGLE_CLOUD_PROJECT || void 0;
-  const googleCloudLocation = process.env.GOOGLE_CLOUD_LOCATION || void 0;
-  const openaiApiKey = process.env.OPENAI_API_KEY;
-  const openaiBaseUrl = process.env.OPENAI_BASE_URL || "https://codely-litellm.tuanjie.cn/v1";
-  const openaiModel = process.env.OPENAI_MODEL || DEFAULT_QWEN_MODEL;
+  const CODELY_DEFAULT_OPENAI_COMPAT_BASE_URL = "https://codely-litellm.tuanjie.cn/v1";
+  const customAuthEnabled = !!process.env.CUSTOM_AUTH;
+  const allowGeminiEnv = customAuthEnabled && authType === AuthType3.USE_GEMINI;
+  const allowVertexEnv = customAuthEnabled && authType === AuthType3.USE_VERTEX_AI;
+  const allowOpenAIEnv = customAuthEnabled && authType === AuthType3.USE_OPENAI;
+  const geminiApiKey = allowGeminiEnv ? process.env.GEMINI_API_KEY : void 0;
+  const googleApiKey = allowVertexEnv ? process.env.GOOGLE_API_KEY : void 0;
+  const googleCloudProject = allowVertexEnv ? process.env.GOOGLE_CLOUD_PROJECT : void 0;
+  const googleCloudLocation = allowVertexEnv ? process.env.GOOGLE_CLOUD_LOCATION : void 0;
+  const openaiApiKey = allowOpenAIEnv ? process.env.OPENAI_API_KEY : void 0;
+  const openaiBaseUrl = allowOpenAIEnv ? process.env.OPENAI_BASE_URL || CODELY_DEFAULT_OPENAI_COMPAT_BASE_URL : CODELY_DEFAULT_OPENAI_COMPAT_BASE_URL;
+  const openaiModel = allowOpenAIEnv ? process.env.OPENAI_MODEL || DEFAULT_QWEN_MODEL : void 0;
   const configModel = config4.getModel();
   const effectiveModel = configModel && typeof configModel === "string" ? configModel : DEFAULT_GEMINI_MODEL;
   const mergedSamplingParams = config4.getContentGeneratorSamplingParams();
@@ -270002,10 +270007,9 @@ function createContentGeneratorConfig(config4, authType) {
     return contentGeneratorConfig;
   }
   if (authType === AuthType3.CODELY_OAUTH) {
-    contentGeneratorConfig.apiKey = openaiApiKey || "CODELY_OAUTH_DYNAMIC_TOKEN";
-    contentGeneratorConfig.baseUrl = openaiBaseUrl;
+    contentGeneratorConfig.apiKey = "CODELY_OAUTH_DYNAMIC_TOKEN";
+    contentGeneratorConfig.baseUrl = CODELY_DEFAULT_OPENAI_COMPAT_BASE_URL;
     contentGeneratorConfig.model = config4.getModel() || // Use the model from config (e.g. from --model CLI arg)
-    openaiModel || // Fall back to OPENAI_MODEL env var
     DEFAULT_QWEN_MODEL;
     return contentGeneratorConfig;
   }
@@ -365232,7 +365236,7 @@ function urlMatches(urlArray, targetUrl) {
   const normalizedTarget = normalizeUrl2(targetUrl);
   return urlArray.some((url4) => normalizeUrl2(url4) === normalizedTarget);
 }
-function getCoreSystemPrompt(userMemory, config4, additionalPrompts) {
+function getCoreSystemPrompt(userMemory, config4, additionalPrompts, runtimeContext) {
   const enableSequentialThinking = config4?.enableSequentialThinking ?? true;
   const planToolingGuidance = enableSequentialThinking ? [
     `  - Use the '${SequentialThinkTool.Name}' and '${TodoWriteTool.Name}' together to plan before implementing the task.`,
@@ -365264,9 +365268,9 @@ function getCoreSystemPrompt(userMemory, config4, additionalPrompts) {
       }
     }
   }
-  if (config4?.systemPromptMappings) {
-    const currentModel = process23.env.OPENAI_MODEL || "";
-    const currentBaseUrl = process23.env.OPENAI_BASE_URL || "";
+  if (config4?.systemPromptMappings && process23.env.CUSTOM_AUTH && runtimeContext?.authType === AuthType3.USE_OPENAI) {
+    const currentModel = runtimeContext.model || "";
+    const currentBaseUrl = runtimeContext.baseUrl || "";
     const matchedMapping = config4.systemPromptMappings.find((mapping) => {
       const { baseUrls, modelNames } = mapping;
       if (baseUrls && modelNames && urlMatches(baseUrls, currentBaseUrl) && modelNames.includes(currentModel)) {
@@ -365798,6 +365802,7 @@ var init_prompts = __esm({
     init_gitUtils();
     init_memoryTool();
     init_tool_names();
+    init_contentGenerator();
     SystemPromptExtensions = class _SystemPromptExtensions {
       static instance;
       extensions = [];
@@ -379968,7 +379973,7 @@ Your result MUST be a concise but informative summary for the caller (main agent
         let finalPrompt = getCoreSystemPrompt(userMemory, {
           systemPromptMappings,
           enableSequentialThinking: !this.runtimeContext.isThinkingSupportedModel()
-        });
+        }, void 0, this.runtimeContext.getContentGeneratorConfig());
         finalPrompt += `
 
 # Agent Specialization
@@ -419214,7 +419219,7 @@ async function getPackageJson2() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson2();
-  return "1.0.0-beta.42";
+  return "1.0.0-beta.44";
 }
 
 // packages/cli/src/ui/commands/types.ts
@@ -419747,7 +419752,7 @@ import process30 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_polyfill();
-var GIT_COMMIT_INFO = "9ad807a5";
+var GIT_COMMIT_INFO = "107c4b52";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 var bugCommand = {
@@ -461883,10 +461888,14 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
     (_, i3) => allExtensions[i3].isActive
   );
   if (argv.openaiApiKey) {
-    process33.env.OPENAI_API_KEY = argv.openaiApiKey;
+    if (process33.env.CUSTOM_AUTH && settings.selectedAuthType === AuthType3.USE_OPENAI) {
+      process33.env.OPENAI_API_KEY = argv.openaiApiKey;
+    }
   }
   if (argv.openaiBaseUrl) {
-    process33.env.OPENAI_BASE_URL = argv.openaiBaseUrl;
+    if (process33.env.CUSTOM_AUTH && settings.selectedAuthType === AuthType3.USE_OPENAI) {
+      process33.env.OPENAI_BASE_URL = argv.openaiBaseUrl;
+    }
   }
   if (argv.tavilyApiKey) {
     process33.env.TAVILY_API_KEY = argv.tavilyApiKey;
@@ -462108,7 +462117,7 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
     cwd: cwd3,
     fileDiscoveryService: fileService,
     bugCommand: settings.bugCommand,
-    model: argv.model || settings.model || process33.env.OPENAI_MODEL || DEFAULT_CODELY_MODEL,
+    model: argv.model || settings.model || (process33.env.CUSTOM_AUTH && settings.selectedAuthType === AuthType3.USE_OPENAI ? process33.env.OPENAI_MODEL : void 0) || DEFAULT_CODELY_MODEL,
     flashModel: argv.flash || settings.flashModel,
     multimodalModel: argv.multimodal || settings.multimodalModel,
     extensionContextFilePaths,
@@ -485846,6 +485855,12 @@ init_esbuild_polyfill();
 init_dist6();
 var validateAuthMethod = (authMethod) => {
   loadEnvironment();
+  if (!Object.values(AuthType3).includes(authMethod)) {
+    return "Invalid auth method selected.";
+  }
+  if (!process.env.CUSTOM_AUTH && authMethod !== AuthType3.CODELY_OAUTH && authMethod !== AuthType3.LOGIN_WITH_GOOGLE && authMethod !== AuthType3.CLOUD_SHELL) {
+    return "CUSTOM_AUTH is required for non-default authentication providers.";
+  }
   if (authMethod === AuthType3.LOGIN_WITH_GOOGLE || authMethod === AuthType3.CLOUD_SHELL) {
     return null;
   }
@@ -486031,12 +486046,6 @@ function OpenAIKeyPrompt({
 
 // packages/cli/src/ui/components/AuthDialog.tsx
 var import_jsx_runtime24 = __toESM(require_jsx_runtime(), 1);
-function parseDefaultAuthType(defaultAuthType) {
-  if (defaultAuthType && Object.values(AuthType3).includes(defaultAuthType)) {
-    return defaultAuthType;
-  }
-  return null;
-}
 function AuthDialog({
   onSelect,
   settings,
@@ -486061,19 +486070,7 @@ function AuthDialog({
       if (settings.merged.selectedAuthType) {
         return item.value === settings.merged.selectedAuthType;
       }
-      const defaultAuthType = parseDefaultAuthType(
-        process.env.GEMINI_DEFAULT_AUTH_TYPE
-      );
-      if (defaultAuthType) {
-        return item.value === defaultAuthType;
-      }
-      if (process.env.GEMINI_API_KEY) {
-        return item.value === AuthType3.USE_GEMINI;
-      }
-      if (process.env.QWEN_OAUTH_TOKEN) {
-        return item.value === AuthType3.QWEN_OAUTH;
-      }
-      return item.value === AuthType3.LOGIN_WITH_GOOGLE;
+      return item.value === AuthType3.CODELY_OAUTH;
     })
   );
   const handleAuthSelect = (authMethod) => {
@@ -492269,18 +492266,20 @@ async function start_sandbox(config4, nodeArgs = [], cliConfig) {
     if (process.env.GOOGLE_API_KEY) {
       args.push("--env", `GOOGLE_API_KEY=${process.env.GOOGLE_API_KEY}`);
     }
-    if (process.env.OPENAI_API_KEY) {
-      args.push("--env", `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}`);
+    if (process.env.CUSTOM_AUTH) {
+      if (process.env.OPENAI_API_KEY) {
+        args.push("--env", `OPENAI_API_KEY=${process.env.OPENAI_API_KEY}`);
+      }
+      if (process.env.OPENAI_BASE_URL) {
+        args.push("--env", `OPENAI_BASE_URL=${process.env.OPENAI_BASE_URL}`);
+      }
+      if (process.env.OPENAI_MODEL) {
+        args.push("--env", `OPENAI_MODEL=${process.env.OPENAI_MODEL}`);
+      }
     }
     if (process.env.TAVILY_API_KEY) {
       args.push("--env", `TAVILY_API_KEY=${process.env.TAVILY_API_KEY}`);
     }
-    if (process.env.OPENAI_BASE_URL) {
-      args.push("--env", `OPENAI_BASE_URL=${process.env.OPENAI_BASE_URL}`);
-    }
-    if (process.env.OPENAI_MODEL) {
-      args.push("--env", `OPENAI_MODEL=${process.env.OPENAI_MODEL}`);
-    }
     if (process.env.GOOGLE_GENAI_USE_VERTEXAI) {
       args.push(
         "--env",
@@ -493170,29 +493169,17 @@ init_dist6();
 // packages/cli/src/validateNonInterActiveAuth.ts
 init_esbuild_polyfill();
 init_dist6();
-function getAuthTypeFromEnv() {
-  if (process.env.GOOGLE_GENAI_USE_GCA === "true") {
-    return AuthType3.LOGIN_WITH_GOOGLE;
-  }
-  if (process.env.GOOGLE_GENAI_USE_VERTEXAI === "true") {
-    return AuthType3.USE_VERTEX_AI;
-  }
-  if (process.env.GEMINI_API_KEY) {
-    return AuthType3.USE_GEMINI;
-  }
-  if (process.env.OPENAI_API_KEY) {
-    return AuthType3.USE_OPENAI;
-  }
-  if (process.env.QWEN_OAUTH_TOKEN) {
-    return AuthType3.QWEN_OAUTH;
+function resolveEffectiveAuthType(configuredAuthType) {
+  if (!process.env.CUSTOM_AUTH) {
+    return AuthType3.CODELY_OAUTH;
   }
-  return void 0;
+  return configuredAuthType || AuthType3.CODELY_OAUTH;
 }
 async function validateNonInteractiveAuth(configuredAuthType, useExternalAuth, nonInteractiveConfig) {
-  const effectiveAuthType = configuredAuthType || getAuthTypeFromEnv() || AuthType3.CODELY_OAUTH;
+  const effectiveAuthType = resolveEffectiveAuthType(configuredAuthType);
   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, OPENAI_API_KEY, GOOGLE_GENAI_USE_VERTEXAI, GOOGLE_GENAI_USE_GCA`
+      `Please set an Auth method in your ${USER_SETTINGS_PATH} (or pass --auth-type).`
     );
     process.exit(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unity-china/codely-cli",
-  "version": "1.0.0-beta.42",
+  "version": "1.0.0-beta.44",
   "engines": {
     "node": ">=20.0.0"
   },