@codeflyai/codefly 0.24.2 → 0.24.5

package/bundle/codefly.js

@@ -92847,6 +92847,9 @@ function isAutoModel(model) {
 function supportsMultimodalFunctionResponse(model) {
   return model.startsWith("gemini-3-");
 }
+function isGeminiModel(model) {
+  return model.startsWith("gemini-") || model.startsWith("google/") || /^gemini-\d/.test(model);
+}
 var PREVIEW_CODEFLY_MODEL, PREVIEW_CODEFLY_FLASH_MODEL, DEFAULT_CODEFLY_MODEL, DEFAULT_CODEFLY_FLASH_MODEL, LEGACY_GEMINI_2_5_PRO, LEGACY_GEMINI_2_5_FLASH, DEFAULT_GEMINI_FLASH_LITE_MODEL, VALID_CODEFLY_MODELS, PREVIEW_CODEFLY_MODEL_AUTO, DEFAULT_CODEFLY_MODEL_AUTO, CODEFLY_MODEL_ALIAS_AUTO, CODEFLY_MODEL_ALIAS_PRO, CODEFLY_MODEL_ALIAS_FLASH, CODEFLY_MODEL_ALIAS_FLASH_LITE, DEFAULT_CODEFLY_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
 var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
@@ -111157,11 +111160,15 @@ var init_read_package_up = __esm({
 
 // packages/core/dist/src/utils/package.js
 async function getPackageJson(cwd7) {
-  const result2 = await readPackageUp({ cwd: cwd7 });
-  if (!result2) {
+  try {
+    const result2 = await readPackageUp({ cwd: cwd7 });
+    if (!result2) {
+      return void 0;
+    }
+    return result2.packageJson;
+  } catch (_e) {
     return void 0;
   }
-  return result2.packageJson;
 }
 var init_package = __esm({
   "packages/core/dist/src/utils/package.js"() {
@@ -111218,8 +111225,8 @@ var init_channel = __esm({
 import { fileURLToPath as fileURLToPath4 } from "node:url";
 import path12 from "node:path";
 async function getVersion() {
-  if ("0.24.2") {
-    return "0.24.2";
+  if ("0.24.4") {
+    return "0.24.4";
   }
   const pkgJson = await getPackageJson(__dirname3);
   return pkgJson?.version || "unknown";
@@ -185928,8 +185935,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "0d1876205";
-    CLI_VERSION = "0.24.2";
+    GIT_COMMIT_INFO = "6575fcec5";
+    CLI_VERSION = "0.24.4";
   }
 });
 
@@ -187383,6 +187390,10 @@ function logApiRequest(config2, event) {
     logger5.emit(event.toLogRecord(config2));
     logger5.emit(event.toSemanticLogRecord(config2));
   });
+  const inputMessages = event.prompt.contents ? toInputMessages(event.prompt.contents) : [];
+  coreEvents.emitConsoleLog("debug", `[API Request] Model: ${event.model}
+Prompt ID: ${event.prompt.prompt_id}
+Messages: ${JSON.stringify(inputMessages, null, 2)}`);
 }
 function logFlashFallback(config2, event) {
   ClearcutLogger.getInstance(config2)?.logFlashFallbackEvent();
@@ -187432,6 +187443,11 @@ function logApiError(config2, event) {
       }
     });
   });
+  const inputMessages = event.prompt.contents ? toInputMessages(event.prompt.contents) : [];
+  coreEvents.emitConsoleLog("error", `[API Error] Model: ${event.model}
+Error: ${event.error}
+Duration: ${event.duration_ms}ms
+Messages: ${JSON.stringify(inputMessages, null, 2)}`);
 }
 function logApiResponse(config2, event) {
   const uiEvent = {
@@ -187445,6 +187461,12 @@ function logApiResponse(config2, event) {
     const logger5 = import_api_logs.logs.getLogger(SERVICE_NAME);
     logger5.emit(event.toLogRecord(config2));
     logger5.emit(event.toSemanticLogRecord(config2));
+    const outputMessages = toOutputMessages(event.response.candidates);
+    coreEvents.emitConsoleLog("debug", `[API Response] Model: ${event.model}
+Status: ${event.status_code}
+Duration: ${event.duration_ms}ms
+Usage: ${JSON.stringify(event.usage, null, 2)}
+Messages: ${JSON.stringify(outputMessages, null, 2)}`);
     const conventionAttributes = getConventionAttributes(event);
     recordApiResponseMetrics(config2, event.duration_ms, {
       model: event.model,
@@ -187786,6 +187808,8 @@ var init_loggers = __esm({
     import_api_logs = __toESM(require_src12(), 1);
     init_constants();
     init_types6();
+    init_events();
+    init_semantic();
     init_metrics2();
     init_sdk();
     init_uiTelemetry();
@@ -188387,8 +188411,9 @@ var OpenAICompatibleContentGenerator;
 var init_openaiCompatibleContentGenerator = __esm({
   "packages/core/dist/src/core/openaiCompatibleContentGenerator.js"() {
     "use strict";
-    init_node();
     init_converter2();
+    init_events();
+    init_node();
     OpenAICompatibleContentGenerator = class {
       config;
       baseUrl;
@@ -188405,26 +188430,105 @@ var init_openaiCompatibleContentGenerator = __esm({
         return apiKey;
       }
       mapContentToOpenAIMessages(contents) {
-        return contents.map((content) => {
+        const messages = [];
+        for (const content of contents) {
           let role = content.role === "model" ? "assistant" : "user";
           if (role === "user" && !content.role) {
             role = "user";
           }
-          const textParts = (content.parts || []).filter((part) => part.text).map((part) => part.text).join("");
+          const parts2 = content.parts || [];
+          const textParts = parts2.filter((part) => part.text).map((part) => part.text).join("");
+          const toolCalls = parts2.filter((part) => part.functionCall).map((part) => ({
+            id: part.functionCall.id || `call_${Math.random().toString(36).slice(2, 11)}`,
+            type: "function",
+            function: {
+              name: part.functionCall.name || "unknown",
+              arguments: JSON.stringify(part.functionCall.args)
+            }
+          }));
+          const functionResponseParts = parts2.filter((part) => part.functionResponse);
+          if (functionResponseParts.length > 0) {
+            for (const part of functionResponseParts) {
+              messages.push({
+                role: "tool",
+                content: JSON.stringify(part.functionResponse.response),
+                tool_call_id: part.functionResponse.id || part.functionResponse.name
+              });
+            }
+          } else {
+            messages.push({
+              role,
+              content: textParts || null,
+              tool_calls: toolCalls.length > 0 ? toolCalls : void 0
+            });
+          }
+        }
+        return messages;
+      }
+      mapToolsToOpenAITools(tools) {
+        if (!tools || !Array.isArray(tools))
+          return void 0;
+        const openAITools = [];
+        for (const tool of tools) {
+          const toolObj = tool;
+          if (toolObj.functionDeclarations) {
+            for (const fd of toolObj.functionDeclarations) {
+              openAITools.push({
+                type: "function",
+                function: {
+                  name: fd.name,
+                  description: fd.description,
+                  parameters: fd.parameters || fd.parametersJsonSchema || {}
+                }
+              });
+            }
+          }
+        }
+        return openAITools.length > 0 ? openAITools : void 0;
+      }
+      mapToolConfigToOpenAIToolChoice(toolConfig) {
+        if (!toolConfig || !toolConfig.functionCallingConfig)
+          return void 0;
+        const mode = toolConfig.functionCallingConfig.mode;
+        if (mode === "ANY")
+          return "required";
+        if (mode === "NONE")
+          return "none";
+        if (mode === "AUTO")
+          return "auto";
+        if (toolConfig.functionCallingConfig.allowedFunctionNames && toolConfig.functionCallingConfig.allowedFunctionNames.length > 0) {
           return {
-            role,
-            content: textParts
+            type: "function",
+            function: {
+              name: toolConfig.functionCallingConfig.allowedFunctionNames[0]
+            }
           };
-        });
+        }
+        return void 0;
       }
       async generateContent(request3, _userPromptId) {
         const contents = toContents2(request3.contents);
         const messages = this.mapContentToOpenAIMessages(contents);
+        if (request3.config?.systemInstruction) {
+          const systemContent = toContents2(request3.config.systemInstruction)[0];
+          const systemText = (systemContent.parts || []).filter((p) => p.text).map((p) => p.text).join("");
+          if (systemText) {
+            messages.unshift({
+              role: "system",
+              content: systemText
+            });
+          }
+        }
         const token2 = this.getAuthToken();
         const requestBody = {
-          model: request3.model || this.config.model,
-          messages
-          // TODO: Map other parameters like temperature, topP, etc.
+          model: this.resolveModelName(request3.model),
+          messages,
+          tools: this.mapToolsToOpenAITools(request3.config?.tools),
+          tool_choice: this.mapToolConfigToOpenAIToolChoice(request3.config?.toolConfig),
+          temperature: request3.config?.temperature,
+          top_p: request3.config?.topP,
+          max_tokens: request3.config?.maxOutputTokens,
+          stop: request3.config?.stopSequences
         };
         const response = await fetch(`${this.baseUrl}/chat/completions`, {
           method: "POST",
@@ -188440,12 +188544,42 @@ var init_openaiCompatibleContentGenerator = __esm({
         }
         const data = await response.json();
         const choice2 = data.choices[0];
+        const parts2 = [];
+        if (choice2.message.reasoning_content) {
+          parts2.push({
+            text: choice2.message.reasoning_content,
+            thought: true
+          });
+          parts2.push({
+            text: `<think>
+${choice2.message.reasoning_content}
+</think>
+
+`
+          });
+        }
+        if (choice2.message.content) {
+          parts2.push({ text: choice2.message.content });
+        }
+        if (choice2.message.tool_calls) {
+          for (const tc of choice2.message.tool_calls) {
+            if (tc.function?.name && tc.function?.arguments) {
+              parts2.push({
+                functionCall: {
+                  name: tc.function.name,
+                  args: JSON.parse(tc.function.arguments),
+                  id: tc.id
+                }
+              });
+            }
+          }
+        }
         const genResponse = {
           candidates: [
             {
               content: {
                 role: "model",
-                parts: [{ text: choice2.message.content }]
+                parts: parts2
               },
               finishReason: choice2.finish_reason,
               index: choice2.index
@@ -188462,11 +188596,30 @@ var init_openaiCompatibleContentGenerator = __esm({
       async generateContentStream(request3, _userPromptId) {
         const contents = toContents2(request3.contents);
         const messages = this.mapContentToOpenAIMessages(contents);
+        if (request3.config?.systemInstruction) {
+          const systemContent = toContents2(request3.config.systemInstruction)[0];
+          const systemText = (systemContent.parts || []).filter((p) => p.text).map((p) => p.text).join("");
+          if (systemText) {
+            messages.unshift({
+              role: "system",
+              content: systemText
+            });
+          }
+        }
         const token2 = this.getAuthToken();
         const requestBody = {
-          model: request3.model || this.config.model,
+          model: this.resolveModelName(request3.model),
           messages,
-          stream: true
+          stream: true,
+          tools: this.mapToolsToOpenAITools(request3.config?.tools),
+          tool_choice: this.mapToolConfigToOpenAIToolChoice(request3.config?.toolConfig),
+          temperature: request3.config?.temperature,
+          top_p: request3.config?.topP,
+          max_tokens: request3.config?.maxOutputTokens,
+          stop: request3.config?.stopSequences,
+          stream_options: {
+            include_usage: true
+          }
         };
         const response = await fetch(`${this.baseUrl}/chat/completions`, {
           method: "POST",
@@ -188487,39 +188640,171 @@ var init_openaiCompatibleContentGenerator = __esm({
         const decoder = new TextDecoder();
         return async function* () {
           let buffer = "";
+          let isThinking = false;
+          const toolCallsAccumulator = /* @__PURE__ */ new Map();
           while (true) {
             const { done, value } = await reader.read();
             if (done)
               break;
-            buffer += decoder.decode(value, { stream: true });
+            const chunkText = decoder.decode(value, { stream: true });
+            buffer += chunkText;
             const lines = buffer.split("\n");
             buffer = lines.pop() || "";
             for (const line of lines) {
-              if (line.trim() === "")
+              const trimmedLine = line.trim();
+              if (trimmedLine === "" || trimmedLine === "data: [DONE]")
                 continue;
-              if (line.trim() === "data: [DONE]")
-                continue;
-              if (line.startsWith("data: ")) {
+              if (trimmedLine.startsWith("data: ")) {
+                const jsonStr = trimmedLine.slice(6);
+                coreEvents.emitConsoleLog("debug", `[OpenAI Stream] ${jsonStr}`);
                 try {
-                  const data = JSON.parse(line.slice(6));
+                  const data = JSON.parse(jsonStr);
+                  if (data.usage) {
+                    const genResponse = {
+                      candidates: [],
+                      usageMetadata: {
+                        promptTokenCount: data.usage.prompt_tokens,
+                        candidatesTokenCount: data.usage.completion_tokens,
+                        totalTokenCount: data.usage.total_tokens
+                      }
+                    };
+                    yield Object.setPrototypeOf(genResponse, GenerateContentResponse.prototype);
+                  }
                   const choice2 = data.choices[0];
-                  const content = choice2.delta.content;
-                  if (content) {
+                  if (!choice2)
+                    continue;
+                  const delta = choice2.delta;
+                  const finishReason = choice2.finish_reason;
+                  if (delta.reasoning_content) {
+                    const parts2 = [];
+                    if (!isThinking) {
+                      isThinking = true;
+                      parts2.push({ text: "<think>\n" });
+                    }
+                    parts2.push({ text: delta.reasoning_content });
+                    parts2.push({
+                      text: delta.reasoning_content,
+                      thought: true
+                    });
                     const genResponse = {
                       candidates: [
                         {
                           content: {
                             role: "model",
-                            parts: [{ text: content }]
+                            parts: parts2
                           },
-                          finishReason: choice2.finish_reason ? choice2.finish_reason : void 0,
+                          finish_reason: finishReason ? finishReason : void 0,
                           index: choice2.index
                         }
                       ]
                     };
                     yield Object.setPrototypeOf(genResponse, GenerateContentResponse.prototype);
                   }
-                } catch {
+                  if (delta.content) {
+                    const parts2 = [];
+                    if (isThinking) {
+                      isThinking = false;
+                      parts2.push({ text: "\n</think>\n\n" });
+                    }
+                    const content = delta.content;
+                    const toolCallRegex = /<tool_call>(.*?)<arg_key>(.*?)<\/arg_key><arg_value>(.*?)<\/arg_value><\/tool_call>/gs;
+                    let match2;
+                    let lastIndex = 0;
+                    let foundToolCall = false;
+                    while ((match2 = toolCallRegex.exec(content)) !== null) {
+                      foundToolCall = true;
+                      if (match2.index > lastIndex) {
+                        parts2.push({ text: content.slice(lastIndex, match2.index) });
+                      }
+                      const toolName = match2[1].trim();
+                      const key = match2[2].trim();
+                      const value2 = match2[3].trim();
+                      parts2.push({
+                        functionCall: {
+                          name: toolName,
+                          args: { [key]: value2 },
+                          id: `xml_${Math.random().toString(36).slice(2, 11)}`
+                        }
+                      });
+                      lastIndex = toolCallRegex.lastIndex;
+                    }
+                    if (foundToolCall) {
+                      if (lastIndex < content.length) {
+                        parts2.push({ text: content.slice(lastIndex) });
+                      }
+                    } else {
+                      parts2.push({ text: content });
+                    }
+                    const genResponse = {
+                      candidates: [
+                        {
+                          content: {
+                            role: "model",
+                            parts: parts2
+                          },
+                          finishReason: finishReason ? finishReason : void 0,
+                          index: choice2.index
+                        }
+                      ]
+                    };
+                    yield Object.setPrototypeOf(genResponse, GenerateContentResponse.prototype);
+                  }
+                  if (delta.tool_calls) {
+                    for (const tc of delta.tool_calls) {
+                      const index = tc.index ?? 0;
+                      if (!toolCallsAccumulator.has(index)) {
+                        toolCallsAccumulator.set(index, { arguments: "" });
+                      }
+                      const acc = toolCallsAccumulator.get(index);
+                      if (tc.id)
+                        acc.id = tc.id;
+                      if (tc.function?.name)
+                        acc.name = tc.function.name;
+                      if (tc.function?.arguments) {
+                        acc.arguments += tc.function.arguments;
+                      }
+                    }
+                  }
+                  if (finishReason === "tool_calls" || finishReason === "stop") {
+                    if (toolCallsAccumulator.size > 0) {
+                      const parts2 = [];
+                      for (const acc of toolCallsAccumulator.values()) {
+                        if (acc.name && acc.arguments) {
+                          try {
+                            const args2 = JSON.parse(acc.arguments);
+                            parts2.push({
+                              functionCall: {
+                                name: acc.name,
+                                args: args2,
+                                id: acc.id
+                              }
+                            });
+                            coreEvents.emitConsoleLog("debug", `[OpenAI Tool Call] Yielding: ${acc.name}(${acc.arguments})`);
+                          } catch (_e) {
+                            coreEvents.emitConsoleLog("error", `[OpenAI Tool Call] Failed to parse arguments for ${acc.name}: ${acc.arguments}`);
+                          }
+                        }
+                      }
+                      if (parts2.length > 0) {
+                        const genResponse = {
+                          candidates: [
+                            {
+                              content: {
+                                role: "model",
+                                parts: parts2
+                              },
+                              finishReason,
+                              index: choice2.index
+                            }
+                          ]
+                        };
+                        yield Object.setPrototypeOf(genResponse, GenerateContentResponse.prototype);
+                      }
+                      toolCallsAccumulator.clear();
+                    }
+                  }
+                } catch (_e) {
+                  coreEvents.emitConsoleLog("error", `[OpenAI Stream] Failed to parse JSON: ${line}`);
                 }
               }
             }
@@ -188535,6 +188820,20 @@ var init_openaiCompatibleContentGenerator = __esm({
       async embedContent(_request) {
         throw new Error("embedContent not implemented for OpenAI compatible provider yet.");
       }
+      /**
+       * Resolves the model name to use for the request.
+       * If a Gemini model name is requested (usually from an internal alias like 'classifier'),
+       * but the provider is OpenAI-compatible, we redirect it to the configured OpenAI model
+       * unless the configured OpenAI model itself looks like a Gemini model (which might happen
+       * if the user is using a proxy specifically for Gemini).
+       */
+      resolveModelName(requestedModel) {
+        const model = requestedModel || this.config.model;
+        if (model.startsWith("gemini-") && !this.config.model.startsWith("gemini-")) {
+          return this.config.model;
+        }
+        return model;
+      }
     };
   }
 });
@@ -188570,7 +188869,7 @@ async function createContentGeneratorConfig(config2, authType) {
     if (apiKey) {
       contentGeneratorConfig.apiKey = apiKey;
       contentGeneratorConfig.baseUrl = config2.openaiConfig?.baseUrl || openaiBaseUrl || "https://api.openai.com/v1";
-      contentGeneratorConfig.model = openaiModel || config2.openaiConfig?.model || config2.getModel() || "gpt-4o";
+      contentGeneratorConfig.model = openaiModel || config2.openaiConfig?.model || "gpt-4o";
       return contentGeneratorConfig;
     }
   }
@@ -224054,7 +224353,13 @@ async function getProcessTableWindows() {
 async function getProcessInfo(pid) {
   try {
     const command2 = `ps -o ppid=,command= -p ${pid}`;
-    const { stdout } = await execAsync(command2);
+    const timeoutPromise = new Promise((_2, reject) => {
+      setTimeout(() => reject(new Error("Process info lookup timed out")), 2e3);
+    });
+    const { stdout } = await Promise.race([
+      execAsync(command2),
+      timeoutPromise
+    ]);
     const trimmedStdout = stdout.trim();
     if (!trimmedStdout) {
       return { parentPid: 0, name: "", command: "" };
@@ -290425,7 +290730,8 @@ var init_retry = __esm({
       "EPIPE",
       "ENOTFOUND",
       "EAI_AGAIN",
-      "ECONNREFUSED"
+      "ECONNREFUSED",
+      "ERR_STREAM_PREMATURE_CLOSE"
     ];
     FETCH_FAILED_MESSAGE = "fetch failed";
   }
@@ -319351,7 +319657,11 @@ var init_nextSpeakerChecker = __esm({
 });
 
 // packages/core/dist/src/core/tokenLimits.js
-function tokenLimit(model) {
+function tokenLimit(model, config2) {
+  const userLimit = config2?.getOpenaiContextWindowLimit();
+  if (userLimit && userLimit > 0) {
+    return userLimit;
+  }
   switch (model) {
     case PREVIEW_CODEFLY_MODEL:
     case PREVIEW_CODEFLY_FLASH_MODEL:
@@ -319360,6 +319670,9 @@ function tokenLimit(model) {
     case DEFAULT_GEMINI_FLASH_LITE_MODEL:
       return 1048576;
     default:
+      if (model && model.toLowerCase().includes("glm-4")) {
+        return 1048576;
+      }
       return DEFAULT_TOKEN_LIMIT;
   }
 }
@@ -320778,7 +321091,7 @@ var init_client2 = __esm({
         if (compressed.compressionStatus === CompressionStatus.COMPRESSED) {
           yield { type: CodeflyEventType.ChatCompressed, value: compressed };
         }
-        const remainingTokenCount = tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
+        const remainingTokenCount = tokenLimit(modelForLimitCheck, this.config) - this.getChat().getLastPromptTokenCount();
         const estimatedRequestTokenCount = await calculateRequestTokenCount(request3, this.getContentGeneratorOrFail(), modelForLimitCheck);
         if (estimatedRequestTokenCount > remainingTokenCount) {
           yield {
@@ -330655,21 +330968,21 @@ var init_cli_help_agent = __esm({
     init_zod();
     init_get_internal_docs();
     CliHelpReportSchema = external_exports.object({
-      answer: external_exports.string().describe("The detailed answer to the user question about Gemini CLI."),
+      answer: external_exports.string().describe("The detailed answer to the user question about Codefly CLI."),
       sources: external_exports.array(external_exports.string()).describe("The documentation files used to answer the question.")
     });
     CliHelpAgent = (config2) => ({
       name: "cli_help",
       kind: "local",
       displayName: "CLI Help Agent",
-      description: "Specialized in answering questions about how users use you, (Gemini CLI): features, documentation, and current runtime configuration.",
+      description: "Specialized in answering questions about how users use you, (Codefly CLI): features, documentation, and current runtime configuration.",
       inputConfig: {
         inputSchema: {
           type: "object",
           properties: {
             question: {
               type: "string",
-              description: "The specific question about Gemini CLI."
+              description: "The specific question about Codefly CLI."
             }
           },
           required: ["question"]
@@ -330700,8 +331013,8 @@ var init_cli_help_agent = __esm({
         tools: [new GetInternalDocsTool(config2.getMessageBus())]
       },
       promptConfig: {
-        query: "Your task is to answer the following question about Gemini CLI:\n<question>\n${question}\n</question>",
-        systemPrompt: "You are **CLI Help Agent**, an expert on Gemini CLI. Your purpose is to provide accurate information about Gemini CLI's features, configuration, and current state.\n\n### Runtime Context\n- **CLI Version:** ${cliVersion}\n- **Active Model:** ${activeModel}\n- **Today's Date:** ${today}\n\n" + (config2.isAgentsEnabled() ? '### Sub-Agents (Local & Remote)\nUser defined sub-agents are defined in `.codefly/agents/` or `~/.codefly/agents/` as .md files. **CRITICAL:** These files **MUST** start with YAML frontmatter enclosed in triple-dashes `---`, for example:\n\n```yaml\n---\nname: my-agent\n---\n```\n\nWithout this mandatory frontmatter, the agent will not be discovered or loaded by Gemini CLI. The Markdown body following the frontmatter becomes the agent\'s system prompt (`system_prompt`). Always reference the types and properties outlined here directly when answering questions about sub-agents.\n- **Local Agent:** `kind = "local"`, `name`, `description`, `system_prompt`, and optional `tools`, `model`, `temperate`, `max_turns`, `timeout_mins`.\n- **Remote Agent (A2A):** `kind = "remote"`, `name`, `agent_card_url`. Remote Agents do not use `system_prompt`. Multiple remote agents can be defined by using a YAML array at the top level of the frontmatter. **Note:** When users ask about "remote agents", they are referring to this Agent2Agent functionality, which is completely distinct from MCP servers.\n- **Agent Names:** Must be valid slugs (lowercase letters, numbers, hyphens, and underscores only).\n- **User Commands:** The user can manage agents using `/agents list` to see all available agents and `/agents refresh` to reload the registry after modifying definition files. You (the agent) cannot run these commands.\n\n' : "") + "### Instructions\n1. **Explore Documentation**: Use the `get_internal_docs` tool to find answers. If you don't know where to start, call `get_internal_docs()` without arguments to see the full list of available documentation files.\n2. **Be Precise**: Use the provided runtime context and documentation to give exact answers.\n3. **Cite Sources**: Always include the specific documentation files you used in your final report.\n4. **Non-Interactive**: You operate in a loop and cannot ask the user for more info. If the question is ambiguous, answer as best as you can with the information available.\n\n" + (config2.language && config2.language !== "auto" ? `CRITICAL: You MUST respond in ${config2.language}.
+        query: "Your task is to answer the following question about Codefly CLI:\n<question>\n${question}\n</question>",
+        systemPrompt: "You are **CLI Help Agent**, an expert on Codefly CLI. Your purpose is to provide accurate information about Codefly CLI's features, configuration, and current state.\n\n### Runtime Context\n- **CLI Version:** ${cliVersion}\n- **Active Model:** ${activeModel}\n- **Today's Date:** ${today}\n\n" + (config2.isAgentsEnabled() ? '### Sub-Agents (Local & Remote)\nUser defined sub-agents are defined in `.codefly/agents/` or `~/.codefly/agents/` as .md files. **CRITICAL:** These files **MUST** start with YAML frontmatter enclosed in triple-dashes `---`, for example:\n\n```yaml\n---\nname: my-agent\n---\n```\n\nWithout this mandatory frontmatter, the agent will not be discovered or loaded by Codefly CLI. The Markdown body following the frontmatter becomes the agent\'s system prompt (`system_prompt`). Always reference the types and properties outlined here directly when answering questions about sub-agents.\n- **Local Agent:** `kind = "local"`, `name`, `description`, `system_prompt`, and optional `tools`, `model`, `temperate`, `max_turns`, `timeout_mins`.\n- **Remote Agent (A2A):** `kind = "remote"`, `name`, `agent_card_url`. Remote Agents do not use `system_prompt`. Multiple remote agents can be defined by using a YAML array at the top level of the frontmatter. **Note:** When users ask about "remote agents", they are referring to this Agent2Agent functionality, which is completely distinct from MCP servers.\n- **Agent Names:** Must be valid slugs (lowercase letters, numbers, hyphens, and underscores only).\n- **User Commands:** The user can manage agents using `/agents list` to see all available agents and `/agents refresh` to reload the registry after modifying definition files. You (the agent) cannot run these commands.\n\n' : "") + "### Instructions\n1. **Explore Documentation**: Use the `get_internal_docs` tool to find answers. If you don't know where to start, call `get_internal_docs()` without arguments to see the full list of available documentation files.\n2. **Be Precise**: Use the provided runtime context and documentation to give exact answers.\n3. **Cite Sources**: Always include the specific documentation files you used in your final report.\n4. **Non-Interactive**: You operate in a loop and cannot ask the user for more info. If the question is ambiguous, answer as best as you can with the information available.\n\n" + (config2.language && config2.language !== "auto" ? `CRITICAL: You MUST respond in ${config2.language}.
 ` : "") + "You MUST call `complete_task` with a JSON report containing your `answer` and the `sources` you used."
       }
     });
@@ -340973,7 +341286,7 @@ var init_config3 = __esm({
           this.setHasAccessToPreviewModel(true);
         }
         if (!this.hasAccessToPreviewModel && isPreviewModel(this.model)) {
-          this.setModel(DEFAULT_CODEFLY_MODEL_AUTO);
+          await this.setModel(DEFAULT_CODEFLY_MODEL_AUTO);
         }
         await this.ensureExperimentsLoaded();
         const adminControlsEnabled = this.experiments?.flags[ExperimentFlags.ENABLE_ADMIN_CONTROLS]?.boolValue ?? false;
@@ -341051,12 +341364,21 @@ var init_config3 = __esm({
         return this.contentGeneratorConfig;
       }
       getModel() {
-        return this.model;
+        return this._activeModel;
       }
-      setModel(newModel, isTemporary = true) {
+      async setModel(newModel, isTemporary = true) {
         if (this.model !== newModel || this._activeModel !== newModel) {
-          this.model = newModel;
+          if (!isTemporary) {
+            this.model = newModel;
+          }
           this._activeModel = newModel;
+          const currentAuthType = this.contentGeneratorConfig?.authType;
+          const isNewModelGemini = isGeminiModel(newModel) || isAutoModel(newModel);
+          if (isNewModelGemini && currentAuthType === AuthType2.OPENAI && !isGeminiModel(this.openaiConfig?.model || "")) {
+            await this.refreshAuth(AuthType2.LOGIN_WITH_GOOGLE);
+          } else if (!isNewModelGemini && currentAuthType !== AuthType2.OPENAI && this.openaiConfig?.models?.split(",").map((m2) => m2.trim()).includes(newModel)) {
+            await this.refreshAuth(AuthType2.OPENAI);
+          }
           coreEvents.emitModelChanged(newModel);
           if (this.onModelChange && !isTemporary) {
             this.onModelChange(newModel);
@@ -341065,7 +341387,7 @@ var init_config3 = __esm({
         this.modelAvailabilityService.reset();
       }
       activateFallbackMode(model) {
-        this.setModel(model, true);
+        void this.setModel(model, true);
         const authType = this.getContentGeneratorConfig()?.authType;
         if (authType) {
           logFlashFallback(this, new FlashFallbackEvent(authType));
@@ -341154,9 +341476,9 @@ var init_config3 = __esm({
         this.previewFeatures = previewFeatures;
         const currentModel = this.getModel();
         if (!previewFeatures && isPreviewModel(currentModel)) {
-          this.setModel(DEFAULT_CODEFLY_MODEL_AUTO);
+          void this.setModel(DEFAULT_CODEFLY_MODEL_AUTO);
         } else if (previewFeatures && currentModel === DEFAULT_CODEFLY_MODEL_AUTO) {
-          this.setModel(PREVIEW_CODEFLY_MODEL_AUTO);
+          void this.setModel(PREVIEW_CODEFLY_MODEL_AUTO);
         }
       }
       getHasAccessToPreviewModel() {
@@ -341285,6 +341607,9 @@ var init_config3 = __esm({
       getContextManager() {
         return this.contextManager;
       }
+      getOpenaiContextWindowLimit() {
+        return this.openaiConfig?.contextWindowLimit;
+      }
       isJitContextEnabled() {
         return this.experimentalJitContext;
       }
@@ -351163,6 +351488,7 @@ __export(dist_exports, {
   isEditorAvailable: () => isEditorAvailable,
   isEnabled: () => isEnabled,
   isFatalToolError: () => isFatalToolError,
+  isGeminiModel: () => isGeminiModel,
   isGitRepository: () => isGitRepository,
   isGuiEditor: () => isGuiEditor,
   isInvalidArgumentError: () => isInvalidArgumentError,
@@ -418326,7 +418652,7 @@ var init_init3 = __esm({
     init_command_generation();
     init_legacy_cleanup();
     init_shared2();
-    OPENSPEC_VERSION2 = "0.24.2";
+    OPENSPEC_VERSION2 = "0.24.4";
     DEFAULT_SCHEMA4 = "spec-driven";
     PROGRESS_SPINNER = {
       interval: 80,
@@ -430826,13 +431152,14 @@ var isAtCommand = (query) => (
   query.startsWith("@") || /\s@/.test(query)
 );
 var isSlashCommand = (query) => {
-  if (!query.startsWith("/")) {
+  const trimmedQuery = query.trimStart();
+  if (!trimmedQuery.startsWith("/")) {
     return false;
   }
-  if (query.startsWith("//")) {
+  if (trimmedQuery.startsWith("//")) {
     return false;
   }
-  if (query.startsWith("/*")) {
+  if (trimmedQuery.startsWith("/*")) {
     return false;
   }
   return true;
@@ -449168,7 +449495,7 @@ var SETTINGS_SCHEMA = {
         category: "UI",
         requiresRestart: false,
         default: false,
-        description: "Show Gemini CLI model thoughts in the terminal window title during the working phase",
+        description: "Show Codefly CLI model thoughts in the terminal window title during the working phase",
         showInDialog: true
       },
       dynamicWindowTitle: {
@@ -449186,7 +449513,7 @@ var SETTINGS_SCHEMA = {
         category: "UI",
         requiresRestart: true,
         default: true,
-        description: "Show a warning when running Gemini CLI in the home directory.",
+        description: "Show a warning when running Codefly CLI in the home directory.",
         showInDialog: true
       },
       hideTips: {
@@ -450114,6 +450441,15 @@ var SETTINGS_SCHEMA = {
                 default: void 0,
                 description: "OpenAI Compatible model names (comma-separated).",
                 showInDialog: true
+              },
+              contextWindowLimit: {
+                type: "number",
+                label: "Context Window Limit",
+                category: "Security",
+                requiresRestart: true,
+                default: void 0,
+                description: "The maximum number of tokens allowed in the context window for OpenAI-compatible models.",
+                showInDialog: true
               }
             }
           },
@@ -450694,7 +451030,7 @@ var SETTINGS_SCHEMA_DEFINITIONS = {
       },
       extension: {
         type: "object",
-        description: "Metadata describing the Gemini CLI extension that owns this MCP server.",
+        description: "Metadata describing the Codefly CLI extension that owns this MCP server.",
         additionalProperties: { type: ["string", "boolean", "number"] }
       },
       oauth: {
@@ -450723,7 +451059,7 @@ var SETTINGS_SCHEMA_DEFINITIONS = {
   },
   TelemetrySettings: {
     type: "object",
-    description: "Telemetry configuration for Gemini CLI.",
+    description: "Telemetry configuration for Codefly CLI.",
     additionalProperties: false,
     properties: {
       enabled: {
@@ -450816,7 +451152,7 @@ var SETTINGS_SCHEMA_DEFINITIONS = {
   },
   CustomTheme: {
     type: "object",
-    description: "Custom theme definition used for styling Gemini CLI output. Colors are provided as hex strings or named ANSI colors.",
+    description: "Custom theme definition used for styling Codefly CLI output. Colors are provided as hex strings or named ANSI colors.",
     additionalProperties: false,
     properties: {
       type: {
@@ -453134,7 +453470,7 @@ var WarningMessage = ({ text }) => {
 };
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO2 = "0d1876205";
+var GIT_COMMIT_INFO2 = "6575fcec5";
 
 // packages/cli/src/ui/components/AboutBox.tsx
 var import_jsx_runtime34 = __toESM(require_jsx_runtime(), 1);
@@ -460956,7 +461292,7 @@ function SettingsDialog({
     settings.workspace.path,
     showRestartPrompt
   ]);
-  const footerContent = showRestartPrompt ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: theme.status.warning, children: "To see changes, Gemini CLI must be restarted. Press r to exit and apply changes now." }) : null;
+  const footerContent = showRestartPrompt ? /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(Text, { color: theme.status.warning, children: "To see changes, Codefly CLI must be restarted. Press r to exit and apply changes now." }) : null;
   return /* @__PURE__ */ (0, import_jsx_runtime71.jsx)(
     BaseSettingsDialog,
     {
@@ -461243,18 +461579,13 @@ function AuthDialog({
   if (defaultAuthTypeEnv && Object.values(AuthType2).includes(defaultAuthTypeEnv)) {
     defaultAuthType = defaultAuthTypeEnv;
   }
-  let initialAuthIndex = items.findIndex((item) => {
-    if (settings.merged.security.auth.selectedType) {
-      return item.value === settings.merged.security.auth.selectedType;
-    }
-    if (defaultAuthType) {
-      return item.value === defaultAuthType;
-    }
-    if (process.env["GEMINI_API_KEY"]) {
-      return item.value === AuthType2.USE_GEMINI;
-    }
-    return item.value === AuthType2.LOGIN_WITH_GOOGLE;
-  });
+  const preferredAuthType = settings.merged.security.auth.selectedType || defaultAuthType || (process.env["GEMINI_API_KEY"] ? AuthType2.USE_GEMINI : null) || (process.env["OPENAI_API_KEY"] ? AuthType2.OPENAI : null) || (process.env["GOOGLE_CLOUD_PROJECT"] && process.env["GOOGLE_CLOUD_LOCATION"] ? AuthType2.USE_VERTEX_AI : null) || AuthType2.LOGIN_WITH_GOOGLE;
+  let initialAuthIndex = items.findIndex(
+    (item) => item.value === preferredAuthType
+  );
+  if (initialAuthIndex === -1) {
+    initialAuthIndex = 0;
+  }
   if (settings.merged.security.auth.enforcedType) {
     initialAuthIndex = 0;
   }
@@ -462779,7 +463110,7 @@ function ModelDialog({ onClose }) {
       {
         value: DEFAULT_CODEFLY_MODEL_AUTO,
         title: getDisplayString(DEFAULT_CODEFLY_MODEL_AUTO),
-        description: "Let Gemini CLI decide the best model for the task: gemini-2.5-pro, gemini-2.5-flash",
+        description: "Let Codefly CLI decide the best model for the task: gemini-2.5-pro, gemini-2.5-flash",
         key: DEFAULT_CODEFLY_MODEL_AUTO
       },
       {
@@ -462805,7 +463136,7 @@ function ModelDialog({ onClose }) {
       list2.unshift({
         value: PREVIEW_CODEFLY_MODEL_AUTO,
         title: getDisplayString(PREVIEW_CODEFLY_MODEL_AUTO),
-        description: "Let Gemini CLI decide the best model for the task: gemini-3-pro, gemini-3-flash",
+        description: "Let Codefly CLI decide the best model for the task: gemini-3-pro, gemini-3-flash",
         key: PREVIEW_CODEFLY_MODEL_AUTO
       });
     }
@@ -462890,7 +463221,7 @@ function ModelDialog({ onClose }) {
         return;
       }
       if (config2) {
-        config2.setModel(model, persistMode ? false : true);
+        void config2.setModel(model, persistMode ? false : true);
         const event = new ModelSlashCommandEvent(model);
         logModelSlashCommand(config2, event);
       }
@@ -463607,7 +463938,7 @@ var INFORMATIVE_TIPS = [
   "Enable AI-powered prompt completion while typing (/settings)\u2026",
   "Enable debug logging of keystrokes to the console (/settings)\u2026",
   "Enable automatic session cleanup of old conversations (/settings)\u2026",
-  "Show Gemini CLI status in the terminal window title (/settings)\u2026",
+  "Show Codefly CLI status in the terminal window title (/settings)\u2026",
   "Use the entire width of the terminal for output (/settings)\u2026",
   "Enable screen reader mode for better accessibility (/settings)\u2026",
   "Skip the next speaker check for faster responses (/settings)\u2026",
@@ -465050,7 +465381,8 @@ function useCommandParser(query, slashCommands) {
         isArgumentCompletion: false
       };
     }
-    const fullPath = query.substring(1) || "";
+    const trimmedQuery = query.trimStart();
+    const fullPath = trimmedQuery.substring(1) || "";
     const hasTrailingSpace = !!query.endsWith(" ");
     const rawParts = fullPath.split(/\s+/).filter((p) => p);
     let commandPathParts = rawParts;
@@ -465802,7 +466134,7 @@ init_dist7();
 // packages/cli/src/ui/utils/highlight.ts
 init_mnemonist();
 var HIGHLIGHT_REGEX = new RegExp(
-  `(^/[a-zA-Z0-9_-]+|@(?:\\\\ |[^,\\s;!?()\\[\\]{}])+|${PASTED_TEXT_PLACEHOLDER_REGEX.source})`,
+  `((?:^|\\s)/[a-zA-Z0-9_-]*|@(?:\\\\ |[^,\\s;!?()\\[\\]{}])+|${PASTED_TEXT_PLACEHOLDER_REGEX.source})`,
   "g"
 );
 var highlightCache = new import_lru_cache.default(
@@ -465837,12 +466169,20 @@ function parseInputForHighlighting(text, index, transformations = [], cursorCol)
       if (matchIndex > last2) {
         tokens2.push({ text: text2.slice(last2, matchIndex), type: "default" });
       }
-      const type2 = fullMatch.startsWith("/") ? "command" : fullMatch.startsWith("@") ? "file" : "paste";
-      if (type2 === "command" && index !== 0) {
-        tokens2.push({ text: fullMatch, type: "default" });
-      } else {
-        tokens2.push({ text: fullMatch, type: type2 });
+      const trimmed2 = fullMatch.trimStart();
+      let type2 = "paste";
+      if (trimmed2.startsWith("/")) {
+        type2 = "command";
+      } else if (trimmed2.startsWith("@")) {
+        type2 = "file";
+      }
+      if (type2 === "command") {
+        const prefix = text2.slice(0, match2.index);
+        if (index !== 0 || prefix.trim().length > 0) {
+          type2 = "default";
+        }
       }
+      tokens2.push({ text: fullMatch, type: type2 });
       last2 = matchIndex + fullMatch.length;
     }
     if (last2 < text2.length) {
@@ -465868,7 +466208,16 @@ function parseInputForHighlighting(text, index, transformations = [], cursorCol)
   const textAfterFinalTransformation = cpSlice(text, column);
   tokens.push(...parseUntransformedInput(textAfterFinalTransformation));
   highlightCache.set(cacheKey, tokens);
-  return tokens;
+  const mergedTokens = [];
+  for (const token2 of tokens) {
+    const last2 = mergedTokens[mergedTokens.length - 1];
+    if (last2 && last2.type === token2.type) {
+      last2.text += token2.text;
+    } else {
+      mergedTokens.push(token2);
+    }
+  }
+  return mergedTokens;
 }
 function parseSegmentsFromTokens(tokens, sliceStart, sliceEnd) {
   if (sliceStart >= sliceEnd) return [];
@@ -466657,7 +467006,7 @@ var InputPrompt = ({
       width: suggestionsWidth,
       scrollOffset: activeCompletion.visibleStartIndex,
       userInput: buffer.text,
-      mode: completion3.completionMode === "AT" /* AT */ ? "reverse" : buffer.text.startsWith("/") && !reverseSearchActive && !commandSearchActive ? "slash" : "reverse",
+      mode: completion3.completionMode === "AT" /* AT */ ? "reverse" : isSlashCommand(buffer.text) && !reverseSearchActive && !commandSearchActive ? "slash" : "reverse",
       expandedIndex: expandedSuggestionIndex
     }
   ) }) : null;
@@ -468251,13 +468600,16 @@ var CommandService = class _CommandService {
       loaders.map((loader2) => loader2.loadCommands(signal))
     );
     const allCommands = [];
-    for (const result2 of results) {
+    results.forEach((result2, index) => {
       if (result2.status === "fulfilled") {
         allCommands.push(...result2.value);
       } else {
-        debugLogger.debug("A command loader failed:", result2.reason);
+        debugLogger.error(
+          `Command loader ${loaders[index].constructor.name} failed:`,
+          result2.reason
+        );
       }
-    }
+    });
     const commandMap = /* @__PURE__ */ new Map();
     for (const cmd of allCommands) {
       let finalName = cmd.name;
@@ -476760,7 +477112,7 @@ async function copyExtension(source2, destination) {
 }
 function getContextFileNames(config2) {
   if (!config2.contextFileName) {
-    return ["CODEFLY.md", "CODEFLY.md"];
+    return ["CODEFLY.md"];
   } else if (!Array.isArray(config2.contextFileName)) {
     return [config2.contextFileName];
   }
@@ -480659,7 +481011,7 @@ function enableCompletion(context2, partialArg) {
 }
 var skillsCommand = {
   name: "skills",
-  description: "List, enable, disable, or reload Gemini CLI agent skills. Usage: /skills [list | disable <name> | enable <name> | reload]",
+  description: "List, enable, disable, or reload Codefly CLI agent skills. Usage: /skills [list | disable <name> | enable <name> | reload]",
   kind: "built-in" /* BUILT_IN */,
   autoExecute: false,
   subCommands: [
@@ -481040,90 +481392,110 @@ var BuiltinCommandLoader = class {
    */
   async loadCommands(_signal) {
     const handle2 = startupProfiler.start("load_builtin_commands");
-    const isNightlyBuild = await isNightly(process.cwd());
-    const allDefinitions = [
-      aboutCommand,
-      ...this.config?.isAgentsEnabled() ? [agentsCommand] : [],
-      authCommand,
-      bugCommand,
-      {
-        ...chatCommand,
-        subCommands: isNightlyBuild ? [...chatCommand.subCommands || [], debugCommand] : chatCommand.subCommands
-      },
-      clearCommand,
-      compressCommand,
-      copyCommand,
-      corgiCommand,
-      docsCommand,
-      directoryCommand,
-      editorCommand,
-      ...this.config?.getExtensionsEnabled() === false ? [
-        {
-          name: "extensions",
-          description: "Manage extensions",
-          kind: "built-in" /* BUILT_IN */,
-          autoExecute: false,
-          subCommands: [],
-          action: async (_context) => ({
-            type: "message",
-            messageType: "error",
-            content: "Extensions are disabled by your admin."
-          })
-        }
-      ] : [extensionsCommand(this.config?.getEnableExtensionReloading())],
-      helpCommand,
-      ...this.config?.getEnableHooksUI() ? [hooksCommand] : [],
-      rewindCommand,
-      await ideCommand(),
-      initCommand,
-      ...this.config?.getMcpEnabled() === false ? [
-        {
-          name: "mcp",
-          description: "Manage configured Model Context Protocol (MCP) servers",
-          kind: "built-in" /* BUILT_IN */,
-          autoExecute: false,
-          subCommands: [],
-          action: async (_context) => ({
-            type: "message",
-            messageType: "error",
-            content: "MCP is disabled by your admin."
-          })
-        }
-      ] : [mcpCommand],
-      memoryCommand,
-      modelCommand,
-      openspecCommand,
-      ...this.config?.getFolderTrust() ? [permissionsCommand] : [],
-      privacyCommand,
-      policiesCommand,
-      ...isDevelopment ? [profileCommand] : [],
-      quitCommand,
-      restoreCommand(this.config),
-      resumeCommand2,
-      statsCommand,
-      themeCommand,
-      toolsCommand,
-      ...this.config?.isSkillsSupportEnabled() ? this.config?.getSkillManager()?.isAdminEnabled() === false ? [
+    let allDefinitions = [];
+    try {
+      let isNightlyBuild = false;
+      try {
+        isNightlyBuild = await isNightly(process.cwd());
+      } catch (e3) {
+        debugLogger.debug("Failed to check for nightly build:", e3);
+      }
+      allDefinitions = [
+        aboutCommand,
+        ...this.config?.isAgentsEnabled() ? [agentsCommand] : [],
+        authCommand,
+        bugCommand,
         {
-          name: "skills",
-          description: "Manage agent skills",
-          kind: "built-in" /* BUILT_IN */,
-          autoExecute: false,
-          subCommands: [],
-          action: async (_context) => ({
-            type: "message",
-            messageType: "error",
-            content: "Agent skills are disabled by your admin."
-          })
-        }
-      ] : [skillsCommand] : [],
-      settingsCommand,
-      vimCommand,
-      setupGithubCommand,
-      terminalSetupCommand
-    ];
-    handle2?.end();
-    handle2?.end();
+          ...chatCommand,
+          subCommands: isNightlyBuild ? [...chatCommand.subCommands || [], debugCommand] : chatCommand.subCommands
+        },
+        clearCommand,
+        compressCommand,
+        copyCommand,
+        corgiCommand,
+        docsCommand,
+        directoryCommand,
+        editorCommand,
+        ...this.config?.getExtensionsEnabled() === false ? [
+          {
+            name: "extensions",
+            description: "Manage extensions",
+            kind: "built-in" /* BUILT_IN */,
+            autoExecute: false,
+            subCommands: [],
+            action: async (_context) => ({
+              type: "message",
+              messageType: "error",
+              content: "Extensions are disabled by your admin."
+            })
+          }
+        ] : [extensionsCommand(this.config?.getEnableExtensionReloading())],
+        helpCommand,
+        ...this.config?.getEnableHooksUI() ? [hooksCommand] : [],
+        rewindCommand,
+        ...await (async () => {
+          try {
+            const timeoutPromise = new Promise((_2, reject) => {
+              setTimeout(() => reject(new Error("ideCommand timed out")), 2e3);
+            });
+            return [await Promise.race([ideCommand(), timeoutPromise])];
+          } catch (e3) {
+            debugLogger.debug("Failed to load ide command:", e3);
+            return [];
+          }
+        })(),
+        initCommand,
+        ...this.config?.getMcpEnabled() === false ? [
+          {
+            name: "mcp",
+            description: "Manage configured Model Context Protocol (MCP) servers",
+            kind: "built-in" /* BUILT_IN */,
+            autoExecute: false,
+            subCommands: [],
+            action: async (_context) => ({
+              type: "message",
+              messageType: "error",
+              content: "MCP is disabled by your admin."
+            })
+          }
+        ] : [mcpCommand],
+        memoryCommand,
+        modelCommand,
+        openspecCommand,
+        ...this.config?.getFolderTrust() ? [permissionsCommand] : [],
+        privacyCommand,
+        policiesCommand,
+        ...isDevelopment ? [profileCommand] : [],
+        quitCommand,
+        restoreCommand(this.config),
+        resumeCommand2,
+        statsCommand,
+        themeCommand,
+        toolsCommand,
+        ...this.config?.isSkillsSupportEnabled() ? this.config?.getSkillManager()?.isAdminEnabled() === false ? [
+          {
+            name: "skills",
+            description: "Manage agent skills",
+            kind: "built-in" /* BUILT_IN */,
+            autoExecute: false,
+            subCommands: [],
+            action: async (_context) => ({
+              type: "message",
+              messageType: "error",
+              content: "Agent skills are disabled by your admin."
+            })
+          }
+        ] : [skillsCommand] : [],
+        settingsCommand,
+        vimCommand,
+        setupGithubCommand,
+        terminalSetupCommand
+      ];
+    } catch (e3) {
+      debugLogger.error("Critical failure in BuiltinCommandLoader:", e3);
+    } finally {
+      handle2?.end();
+    }
     return allDefinitions.filter((cmd) => cmd !== null);
   }
 };
@@ -482588,7 +482960,7 @@ function computeTerminalTitle({
   const MAX_LEN = 80;
   let displayContext = process.env["CLI_TITLE"] || folderName;
   if (!useDynamicTitle) {
-    const base = "Gemini CLI ";
+    const base = "Codefly CLI ";
     const maxContextLen = MAX_LEN - base.length - 2;
     displayContext = truncate(displayContext, maxContextLen);
     return `${base}(${displayContext})`.padEnd(MAX_LEN, " ");
@@ -484328,11 +484700,15 @@ var useGeminiStream = (geminiClient, history, addItem, config2, settings, onDebu
   const handleContextWindowWillOverflowEvent = (0, import_react131.useCallback)(
     (estimatedRequestTokenCount, remainingTokenCount) => {
       onCancelSubmit(true);
-      const limit = tokenLimit(config2.getModel());
-      const isLessThan75Percent = limit > 0 && remainingTokenCount < limit * 0.75;
+      const limit = tokenLimit(config2.getModel(), config2);
       let text = `Sending this message (${estimatedRequestTokenCount} tokens) might exceed the remaining context window limit (${remainingTokenCount} tokens).`;
-      if (isLessThan75Percent) {
-        text += " Please try reducing the size of your message or use the `/compress` command to compress the chat history.";
+      if (estimatedRequestTokenCount > limit) {
+        text = `This message is too large (${estimatedRequestTokenCount} tokens) and exceeds the total context window limit (${limit} tokens). Please try reducing the size of your message by removing large file attachments or @ commands.`;
+      } else {
+        const isLessThan75Percent = limit > 0 && remainingTokenCount < limit * 0.75;
+        if (isLessThan75Percent) {
+          text += " Please try reducing the size of your message or use the `/compress` command to compress the chat history.";
+        }
       }
       addItem({
         type: "info",
@@ -487972,8 +488348,12 @@ var AppContainer = (props) => {
             apiKey,
             baseUrl: baseUrl || "",
             models: models || "",
-            model: updatedModel
+            model: updatedModel,
+            contextWindowLimit: settings.merged.security.auth.openai?.contextWindowLimit
           };
+          if (updatedModel) {
+            await config2.setModel(updatedModel);
+          }
         }
         if (currentAuthType === AuthType2.USE_GEMINI) {
           await saveApiKey(apiKey);
@@ -495690,7 +496070,7 @@ init_shared2();
 init_legacy_cleanup();
 init_interactive();
 import path153 from "node:path";
-var OPENSPEC_VERSION = "0.24.2";
+var OPENSPEC_VERSION = "0.24.4";
 var UpdateCommand = class {
   force;
   constructor(options = {}) {
@@ -501651,7 +502031,7 @@ function isGhAuthenticated() {
   }
 }
 function getVersion2() {
-  return "0.24.2";
+  return "0.24.4";
 }
 function getPlatform2() {
   return os33.platform();
@@ -503940,7 +504320,7 @@ ${options.description}
 
 // packages/core/dist/src/openspec/cli/index.js
 var program2 = new Command2();
-var version3 = "0.24.2";
+var version3 = "0.24.4";
 program2.name("openspec").description("AI-native system for spec-driven development").version(version3);
 program2.option("--no-color", "Disable color output");
 program2.hook("preAction", async (thisCommand) => {
@@ -505703,7 +506083,7 @@ var homeDirectoryCheck = {
         if (isFolderTrustEnabled(settings) && isWorkspaceTrusted(settings).isTrusted) {
           return null;
         }
-        return "Warning you are running Gemini CLI in your home directory.\nThis warning can be disabled in /settings";
+        return "Warning you are running Codefly CLI in your home directory.\nThis warning can be disabled in /settings";
       }
       return null;
     } catch (_err) {
@@ -505716,7 +506096,7 @@ var rootDirectoryCheck = {
   check: async (workspaceRoot, _settings) => {
     try {
       const workspaceRealPath = await fs143.realpath(workspaceRoot);
-      const errorMessage = "Warning: You are running Gemini CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
+      const errorMessage = "Warning: You are running Codefly CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
       if (path186.dirname(workspaceRealPath) === workspaceRealPath) {
         return errorMessage;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codeflyai/codefly",
-  "version": "0.24.2",
+  "version": "0.24.5",
   "engines": {
     "node": ">=20.0.0"
   },