@unity-china/codely-cli 1.0.0-beta.37 → 1.0.0-beta.38

package/bundle/gemini.js

@@ -267781,6 +267781,8 @@ var init_openaiContentGenerator = __esm({
         };
       }
       async buildCreateParams(request3, userPromptId) {
+        const isPlainObject4 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+        const extraBodyParams = isPlainObject4(this.contentGeneratorConfig.extra_body) ? this.contentGeneratorConfig.extra_body : void 0;
         const baseParams = {
           model: this.resolveRequestModel(request3),
           messages: this.convertToOpenAIFormat(request3),
@@ -267790,10 +267792,25 @@ var init_openaiContentGenerator = __esm({
         const toolParams = await this.buildToolParams(request3);
         const extensions = {};
         const enableThinking = this.resolveEnableThinking(request3);
+        const requestChatTemplateKwargs = request3.config?.chat_template_kwargs;
+        const extraBodyChatTemplateKwargs = isPlainObject4(extraBodyParams?.chat_template_kwargs) ? extraBodyParams?.chat_template_kwargs : void 0;
+        const mergedChatTemplateKwargs = {
+          ...isPlainObject4(this.contentGeneratorConfig.chat_template_kwargs) ? this.contentGeneratorConfig.chat_template_kwargs : {},
+          ...extraBodyChatTemplateKwargs ?? {},
+          ...isPlainObject4(requestChatTemplateKwargs) ? requestChatTemplateKwargs : {}
+        };
         if (enableThinking !== void 0) {
-          extensions.chat_template_kwargs = { enable_thinking: enableThinking };
+          mergedChatTemplateKwargs.enable_thinking = enableThinking;
+        }
+        if (Object.keys(mergedChatTemplateKwargs).length > 0) {
+          extensions.chat_template_kwargs = mergedChatTemplateKwargs;
         }
-        return { ...baseParams, ...toolParams, ...extensions };
+        return {
+          ...extraBodyParams ?? {},
+          ...baseParams,
+          ...toolParams,
+          ...extensions
+        };
       }
       /**
        * Prefer per-request model override when provided (e.g. internal utility calls
@@ -267835,6 +267852,8 @@ var init_openaiContentGenerator = __esm({
         const createParams = await this.buildCreateParams(request3, userPromptId);
         const requestModel = createParams.model;
         try {
+          delete createParams.stream;
+          delete createParams.stream_options;
           const completion2 = await this.client.chat.completions.create(createParams);
           const response = this.convertToGeminiFormat(completion2);
           const durationMs = Date.now() - startTime;
@@ -268693,17 +268712,18 @@ ${reasoningChunk}` });
             parts.push({ text: "\n</think>\n" });
             this.accumulatedReasoningContent = "";
           }
-          response.candidates = [
-            {
-              content: {
-                parts,
-                role: "model"
-              },
-              finishReason: choice2.finish_reason ? this.mapFinishReason(choice2.finish_reason) : FinishReason2.FINISH_REASON_UNSPECIFIED,
-              index: 0,
-              safetyRatings: []
-            }
-          ];
+          const candidate = {
+            content: {
+              parts,
+              role: "model"
+            },
+            index: 0,
+            safetyRatings: []
+          };
+          if (choice2.finish_reason) {
+            candidate.finishReason = this.mapFinishReason(choice2.finish_reason);
+          }
+          response.candidates = [candidate];
         } else {
           response.candidates = [];
         }
@@ -269828,6 +269848,7 @@ function createContentGeneratorConfig(config3, authType) {
   const effectiveModel = configModel && typeof configModel === "string" ? configModel : DEFAULT_GEMINI_MODEL;
   const mergedSamplingParams = config3.getContentGeneratorSamplingParams();
   const chatTemplateKwargs = config3.getContentGeneratorChatTemplateKwargs?.();
+  const extraBody = config3.getContentGeneratorExtraBody?.();
   const contentGeneratorConfig = {
     model: effectiveModel,
     authType,
@@ -269840,6 +269861,9 @@ function createContentGeneratorConfig(config3, authType) {
   if (chatTemplateKwargs !== void 0) {
     contentGeneratorConfig.chat_template_kwargs = chatTemplateKwargs;
   }
+  if (extraBody !== void 0) {
+    contentGeneratorConfig.extra_body = extraBody;
+  }
   if (authType === AuthType3.LOGIN_WITH_GOOGLE || authType === AuthType3.CLOUD_SHELL) {
     return contentGeneratorConfig;
   }
@@ -364250,7 +364274,8 @@ This error was probably caused by cyclic schema references in one of the followi
         let hasToolCall = false;
         let hasFinishReason = false;
         for await (const chunk2 of this.stopBeforeSecondMutator(streamResponse)) {
-          hasFinishReason = chunk2?.candidates?.some((candidate) => candidate.finishReason) ?? false;
+          const chunkHasFinishReason = chunk2?.candidates?.some((candidate) => candidate.finishReason != null) ?? false;
+          hasFinishReason = hasFinishReason || chunkHasFinishReason;
           if (isValidResponse2(chunk2)) {
             const content = chunk2.candidates?.[0]?.content;
             if (content?.parts) {
@@ -380031,6 +380056,9 @@ var init_config2 = __esm({
       getContentGeneratorChatTemplateKwargs() {
         return this.contentGeneratorOptions?.chat_template_kwargs;
       }
+      getContentGeneratorExtraBody() {
+        return this.contentGeneratorOptions?.extra_body;
+      }
       getToolExecutionConfig() {
         return this.toolExecution;
       }
@@ -417144,7 +417172,7 @@ async function getPackageJson2() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson2();
-  return "1.0.0-beta.37";
+  return "1.0.0-beta.38";
 }
 
 // packages/cli/src/ui/commands/types.ts
@@ -417636,7 +417664,7 @@ import process30 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_polyfill();
-var GIT_COMMIT_INFO = "8dcb2033";
+var GIT_COMMIT_INFO = "f42af402";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 var bugCommand = {
@@ -459191,6 +459219,10 @@ async function parseArguments() {
       type: "boolean",
       alias: ["enableReasoning"],
       description: "Alias of --enable_thinking: set chat_template_kwargs.enable_thinking (omit field when not provided)"
+    }).option("extra_body", {
+      type: "string",
+      alias: ["extraBody"],
+      description: "OpenAI-compatible extra_body as a JSON object string (merged into request body)"
     }).option("tavily-api-key", {
       type: "string",
       description: "Tavily API key for web search functionality"
@@ -459466,7 +459498,23 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
   const cliVersion = await getCliVersion();
   const reasoningEffort = argv.reasoning_effort ?? argv.reasoningEffort;
   const enableThinking = argv.enable_thinking ?? argv.enableThinking ?? argv.enable_reasoning ?? argv.enableReasoning;
-  const mergedContentGenerator = reasoningEffort !== void 0 || enableThinking !== void 0 ? {
+  const extraBodyRaw = argv.extra_body ?? argv.extraBody;
+  let extraBody;
+  if (extraBodyRaw !== void 0) {
+    try {
+      const parsed = JSON.parse(extraBodyRaw);
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        throw new Error("Value must be a JSON object");
+      }
+      extraBody = parsed;
+    } catch (error2) {
+      const message = error2 instanceof Error ? error2.message : `Unknown error: ${error2}`;
+      throw new Error(
+        `Invalid value for --extra_body: must be a JSON object string. ${message}`
+      );
+    }
+  }
+  const mergedContentGenerator = reasoningEffort !== void 0 || enableThinking !== void 0 || extraBody !== void 0 ? {
     ...settings.contentGenerator || {},
     ...reasoningEffort !== void 0 ? {
       samplingParams: {
@@ -459481,6 +459529,12 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
         ...settings.contentGenerator?.chat_template_kwargs || {},
         enable_thinking: enableThinking
       }
+    } : {},
+    ...extraBody !== void 0 ? {
+      extra_body: {
+        ...typeof settings.contentGenerator?.extra_body === "object" && settings.contentGenerator?.extra_body !== null && !Array.isArray(settings.contentGenerator?.extra_body) ? settings.contentGenerator?.extra_body || {} : {},
+        ...extraBody
+      }
     } : {}
   } : settings.contentGenerator;
   return new Config({
@@ -461366,18 +461420,6 @@ var COLOR_CYAN4 = "\x1B[36m";
 var COLOR_GREY3 = "\x1B[90m";
 var COLOR_RED4 = "\x1B[31m";
 var RESET_COLOR5 = "\x1B[0m";
-function getUserAddedModels(context2) {
-  const settings = context2.services.settings;
-  const customModels = settings.merged.availableModels;
-  if (Array.isArray(customModels)) {
-    return customModels;
-  }
-  return [];
-}
-async function saveAvailableModels(context2, models) {
-  const { settings } = context2.services;
-  settings.setValue("User" /* User */, "availableModels", models);
-}
 async function fetchModelsFromProvider(providerName, config3, context2) {
   if (!config3.baseUrl || !config3.apiKey) {
     return {
@@ -461484,61 +461526,23 @@ function getProviderName(config3) {
       return "Unknown Provider";
   }
 }
-var listCommand6 = {
-  name: "list",
-  description: "List available models",
-  kind: "built-in" /* BUILT_IN */,
-  action: async (context2) => {
-    const { config: config3 } = context2.services;
-    if (!config3) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: "Config not loaded."
-      };
-    }
-    const userAddedModels = getUserAddedModels(context2);
-    const currentModel = config3.getModel();
-    let message = `${COLOR_CYAN4}Available Models:${RESET_COLOR5}
-
-`;
-    if (userAddedModels.length === 0) {
-      message += `${COLOR_GREEN5}\u25CF ${currentModel}${RESET_COLOR5} ${COLOR_GREEN5}(current)${RESET_COLOR5}
-`;
-      message += `
-${COLOR_GREY3}Use "/model add <model_name>" to add more models to this list${RESET_COLOR5}`;
-      message += `
-${COLOR_GREY3}Use "/model list-provider" to discover available models from your provider${RESET_COLOR5}`;
-    } else {
-      for (const model of userAddedModels) {
-        const isCurrentModel = model === currentModel;
-        const indicator = isCurrentModel ? `${COLOR_GREEN5}\u25CF ${RESET_COLOR5}` : `${COLOR_GREY3}\u25CB ${RESET_COLOR5}`;
-        const modelDisplay = isCurrentModel ? `${COLOR_GREEN5}${model}${RESET_COLOR5}` : model;
-        const suffix = isCurrentModel ? ` ${COLOR_GREEN5}(current)${RESET_COLOR5}` : "";
-        message += `${indicator}${modelDisplay}${suffix}
-`;
-      }
-      if (!userAddedModels.includes(currentModel)) {
-        message += `
-${COLOR_YELLOW5}Current model not in list:${RESET_COLOR5}
-`;
-        message += `${COLOR_GREEN5}\u25CF ${currentModel}${RESET_COLOR5} ${COLOR_GREEN5}(current)${RESET_COLOR5}
-`;
-        message += `
-${COLOR_GREY3}Use "/model add ${currentModel}" to add it to your list${RESET_COLOR5}`;
-      }
-      message += `
-${COLOR_GREY3}Use "/model use <model_name>" to switch models${RESET_COLOR5}`;
-      message += `
-${COLOR_GREY3}Use "/model add <model_name>" to add more models${RESET_COLOR5}`;
-    }
-    return {
-      type: "message",
-      messageType: "info",
-      content: message
-    };
+var PROVIDER_MODELS_CACHE_TTL_MS = 5 * 60 * 1e3;
+var providerModelsCache = null;
+function getProviderModelsCacheKey(config3) {
+  return `${config3.authType || "unknown"}|${config3.baseUrl || ""}`;
+}
+function getCachedProviderModels(key) {
+  if (!providerModelsCache || providerModelsCache.key !== key) {
+    return null;
   }
-};
+  if (Date.now() - providerModelsCache.updatedAt > PROVIDER_MODELS_CACHE_TTL_MS) {
+    return null;
+  }
+  return providerModelsCache.models;
+}
+function setCachedProviderModels(key, models) {
+  providerModelsCache = { key, models, updatedAt: Date.now() };
+}
 var useCommand = {
   name: "use",
   description: "Switch to a specific model",
@@ -461591,53 +461595,43 @@ var useCommand = {
     }
   },
   completion: async (context2, partialArg) => {
-    const userAddedModels = getUserAddedModels(context2);
-    return userAddedModels.filter(
-      (model) => model.toLowerCase().includes(partialArg.toLowerCase())
-    );
-  }
-};
-var addCommand2 = {
-  name: "add",
-  description: "Add a new model to the available models list",
-  kind: "built-in" /* BUILT_IN */,
-  action: async (context2, args) => {
-    const modelName = args.trim();
-    if (!modelName) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: "Please specify a model name. Usage: /model add <model_name>"
-      };
+    const { config: config3 } = context2.services;
+    if (!config3) {
+      return [];
     }
-    try {
-      const userAddedModels = getUserAddedModels(context2);
-      if (userAddedModels.includes(modelName)) {
-        return {
-          type: "message",
-          messageType: "error",
-          content: `Model "${modelName}" is already in your models list.`
-        };
-      }
-      const updatedModels = [...userAddedModels, modelName];
-      await saveAvailableModels(context2, updatedModels);
-      return {
-        type: "message",
-        messageType: "info",
-        content: `${COLOR_GREEN5}\u2713${RESET_COLOR5} Added "${COLOR_CYAN4}${modelName}${RESET_COLOR5}" to available models list.`
-      };
-    } catch (error2) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: `Failed to add model: ${error2 instanceof Error ? error2.message : "Unknown error"}`
-      };
+    const contentGeneratorConfig = config3.getContentGeneratorConfig();
+    if (!contentGeneratorConfig) {
+      return [];
+    }
+    const cacheKey = getProviderModelsCacheKey(contentGeneratorConfig);
+    const cached = getCachedProviderModels(cacheKey);
+    if (cached) {
+      const normalized3 = partialArg.trim();
+      const query2 = normalized3.split(/\s+/).pop() || "";
+      return cached.filter(
+        (model) => model.toLowerCase().includes(query2.toLowerCase())
+      );
     }
+    const providerName = getProviderName(contentGeneratorConfig);
+    const result = await fetchModelsFromProvider(
+      providerName,
+      contentGeneratorConfig,
+      context2
+    );
+    if (result.error) {
+      return [];
+    }
+    setCachedProviderModels(cacheKey, result.models);
+    const normalized2 = partialArg.trim();
+    const query = normalized2.split(/\s+/).pop() || "";
+    return result.models.filter(
+      (model) => model.toLowerCase().includes(query.toLowerCase())
+    );
   }
 };
 var listProviderCommand = {
   name: "list-provider",
-  altNames: ["list-providers", "lp"],
+  altNames: ["list", "list-providers", "ls"],
   description: "List models available from configured providers via /v1/models API",
   kind: "built-in" /* BUILT_IN */,
   action: async (context2) => {
@@ -461658,6 +461652,7 @@ var listProviderCommand = {
       };
     }
     const providerName = getProviderName(contentGeneratorConfig);
+    const cacheKey = getProviderModelsCacheKey(contentGeneratorConfig);
     context2.ui.addItem(
       {
         type: "info",
@@ -461713,10 +461708,11 @@ var listProviderCommand = {
 `;
       }
       message += `
-${COLOR_GREY3}Use "/model add <model_name>" to add models to your available list${RESET_COLOR5}`;
-      message += `
 ${COLOR_GREY3}Use "/model use <model_name>" to switch to a different model${RESET_COLOR5}`;
     }
+    if (!result.error) {
+      setCachedProviderModels(cacheKey, result.models);
+    }
     return {
       type: "message",
       messageType: result.error ? "error" : "info",
@@ -461724,90 +461720,21 @@ ${COLOR_GREY3}Use "/model use <model_name>" to switch to a different model${RESE
     };
   }
 };
-var removeCommand2 = {
-  name: "remove",
-  altNames: ["rm"],
-  description: "Remove a model from the available models list",
-  kind: "built-in" /* BUILT_IN */,
-  action: async (context2, args) => {
-    const { config: config3 } = context2.services;
-    if (!config3) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: "Config not loaded."
-      };
-    }
-    const modelName = args.trim();
-    if (!modelName) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: "Please specify a model name. Usage: /model remove <model_name>"
-      };
-    }
-    try {
-      const userAddedModels = getUserAddedModels(context2);
-      if (!userAddedModels.includes(modelName)) {
-        return {
-          type: "message",
-          messageType: "error",
-          content: `Model "${modelName}" is not in your models list.`
-        };
-      }
-      const currentModel = config3.getModel();
-      if (currentModel === modelName) {
-        return {
-          type: "message",
-          messageType: "error",
-          content: `Cannot remove "${modelName}" because it is currently active. Switch to another model first.`
-        };
-      }
-      const updatedModels = userAddedModels.filter(
-        (model) => model !== modelName
-      );
-      await saveAvailableModels(context2, updatedModels);
-      return {
-        type: "message",
-        messageType: "info",
-        content: `${COLOR_GREEN5}\u2713${RESET_COLOR5} Removed "${COLOR_YELLOW5}${modelName}${RESET_COLOR5}" from available models list.`
-      };
-    } catch (error2) {
-      return {
-        type: "message",
-        messageType: "error",
-        content: `Failed to remove model: ${error2 instanceof Error ? error2.message : "Unknown error"}`
-      };
-    }
-  },
-  completion: async (context2, partialArg) => {
-    const userAddedModels = getUserAddedModels(context2);
-    return userAddedModels.filter(
-      (model) => model.toLowerCase().includes(partialArg.toLowerCase())
-    );
-  }
-};
 var modelCommand = {
   name: "model",
   description: "Manage and switch between available AI models",
   kind: "built-in" /* BUILT_IN */,
-  subCommands: [
-    listCommand6,
-    useCommand,
-    addCommand2,
-    removeCommand2,
-    listProviderCommand
-  ],
+  subCommands: [listProviderCommand, useCommand],
   // Default action when no subcommand is provided
   action: async (context2, args) => {
     if (args.trim()) {
       return {
         type: "message",
         messageType: "error",
-        content: `Unknown subcommand: "${args.trim()}". Available subcommands: list, use, add, remove, list-provider`
+        content: `Unknown subcommand: "${args.trim()}". Available subcommands: list-provider (aliases: list, list-providers, ls), use`
       };
     }
-    return listCommand6.action(context2, args);
+    return listProviderCommand.action(context2, args);
   }
 };
 

package/package.json

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