@unity-china/codely-cli 1.0.0-beta.43 → 1.0.0-beta.45

package/bundle/gemini.js

@@ -25910,7 +25910,7 @@ var require_backend = __commonJS({
                     });
                     return value;
                   },
-                  useEffect: function useEffect38(create4) {
+                  useEffect: function useEffect39(create4) {
                     nextHook();
                     hookLog.push({
                       displayName: null,
@@ -25983,7 +25983,7 @@ var require_backend = __commonJS({
                     return [initialArg, function() {
                     }];
                   },
-                  useRef: function useRef14(initialValue) {
+                  useRef: function useRef15(initialValue) {
                     var hook = nextHook();
                     initialValue = null !== hook ? hook.memoizedState : {
                       current: initialValue
@@ -25998,7 +25998,7 @@ var require_backend = __commonJS({
                     });
                     return initialValue;
                   },
-                  useState: function useState42(initialState2) {
+                  useState: function useState43(initialState2) {
                     var hook = nextHook();
                     initialState2 = null !== hook ? hook.memoizedState : "function" === typeof initialState2 ? initialState2() : initialState2;
                     hookLog.push({
@@ -34598,7 +34598,7 @@ var require_backend = __commonJS({
                 var symbolOrNumber = renderer_typeof(type) === "object" && type !== null ? type.$$typeof : type;
                 return renderer_typeof(symbolOrNumber) === "symbol" ? symbolOrNumber.toString() : symbolOrNumber;
               }
-              var _ReactTypeOfWork = ReactTypeOfWork, CacheComponent = _ReactTypeOfWork.CacheComponent, ClassComponent = _ReactTypeOfWork.ClassComponent, IncompleteClassComponent = _ReactTypeOfWork.IncompleteClassComponent, IncompleteFunctionComponent = _ReactTypeOfWork.IncompleteFunctionComponent, FunctionComponent = _ReactTypeOfWork.FunctionComponent, IndeterminateComponent = _ReactTypeOfWork.IndeterminateComponent, ForwardRef = _ReactTypeOfWork.ForwardRef, HostRoot = _ReactTypeOfWork.HostRoot, HostHoistable = _ReactTypeOfWork.HostHoistable, HostSingleton = _ReactTypeOfWork.HostSingleton, HostComponent = _ReactTypeOfWork.HostComponent, HostPortal = _ReactTypeOfWork.HostPortal, HostText = _ReactTypeOfWork.HostText, Fragment7 = _ReactTypeOfWork.Fragment, LazyComponent = _ReactTypeOfWork.LazyComponent, LegacyHiddenComponent = _ReactTypeOfWork.LegacyHiddenComponent, MemoComponent = _ReactTypeOfWork.MemoComponent, OffscreenComponent = _ReactTypeOfWork.OffscreenComponent, Profiler = _ReactTypeOfWork.Profiler, ScopeComponent = _ReactTypeOfWork.ScopeComponent, SimpleMemoComponent = _ReactTypeOfWork.SimpleMemoComponent, SuspenseComponent = _ReactTypeOfWork.SuspenseComponent, SuspenseListComponent = _ReactTypeOfWork.SuspenseListComponent, TracingMarkerComponent = _ReactTypeOfWork.TracingMarkerComponent, Throw = _ReactTypeOfWork.Throw, ViewTransitionComponent = _ReactTypeOfWork.ViewTransitionComponent, ActivityComponent = _ReactTypeOfWork.ActivityComponent;
+              var _ReactTypeOfWork = ReactTypeOfWork, CacheComponent = _ReactTypeOfWork.CacheComponent, ClassComponent = _ReactTypeOfWork.ClassComponent, IncompleteClassComponent = _ReactTypeOfWork.IncompleteClassComponent, IncompleteFunctionComponent = _ReactTypeOfWork.IncompleteFunctionComponent, FunctionComponent = _ReactTypeOfWork.FunctionComponent, IndeterminateComponent = _ReactTypeOfWork.IndeterminateComponent, ForwardRef = _ReactTypeOfWork.ForwardRef, HostRoot = _ReactTypeOfWork.HostRoot, HostHoistable = _ReactTypeOfWork.HostHoistable, HostSingleton = _ReactTypeOfWork.HostSingleton, HostComponent = _ReactTypeOfWork.HostComponent, HostPortal = _ReactTypeOfWork.HostPortal, HostText = _ReactTypeOfWork.HostText, Fragment6 = _ReactTypeOfWork.Fragment, LazyComponent = _ReactTypeOfWork.LazyComponent, LegacyHiddenComponent = _ReactTypeOfWork.LegacyHiddenComponent, MemoComponent = _ReactTypeOfWork.MemoComponent, OffscreenComponent = _ReactTypeOfWork.OffscreenComponent, Profiler = _ReactTypeOfWork.Profiler, ScopeComponent = _ReactTypeOfWork.ScopeComponent, SimpleMemoComponent = _ReactTypeOfWork.SimpleMemoComponent, SuspenseComponent = _ReactTypeOfWork.SuspenseComponent, SuspenseListComponent = _ReactTypeOfWork.SuspenseListComponent, TracingMarkerComponent = _ReactTypeOfWork.TracingMarkerComponent, Throw = _ReactTypeOfWork.Throw, ViewTransitionComponent = _ReactTypeOfWork.ViewTransitionComponent, ActivityComponent = _ReactTypeOfWork.ActivityComponent;
               function resolveFiberType(type) {
                 var typeSymbol = getTypeSymbol(type);
                 switch (typeSymbol) {
@@ -34655,7 +34655,7 @@ var require_backend = __commonJS({
                   case HostPortal:
                   case HostText:
                     return null;
-                  case Fragment7:
+                  case Fragment6:
                     return "Fragment";
                   case LazyComponent:
                     return "Lazy";
@@ -34808,7 +34808,7 @@ var require_backend = __commonJS({
             function renderer_attach(hook, rendererID, renderer2, global2, shouldStartProfilingNow, profilingSettings) {
               var version3 = renderer2.reconcilerVersion || renderer2.version;
               var _getInternalReactCons = getInternalReactConstants(version3), getDisplayNameForFiber = _getInternalReactCons.getDisplayNameForFiber, getTypeSymbol = _getInternalReactCons.getTypeSymbol, ReactPriorityLevels = _getInternalReactCons.ReactPriorityLevels, ReactTypeOfWork = _getInternalReactCons.ReactTypeOfWork, StrictModeBits = _getInternalReactCons.StrictModeBits;
-              var ActivityComponent = ReactTypeOfWork.ActivityComponent, CacheComponent = ReactTypeOfWork.CacheComponent, ClassComponent = ReactTypeOfWork.ClassComponent, ContextConsumer = ReactTypeOfWork.ContextConsumer, DehydratedSuspenseComponent = ReactTypeOfWork.DehydratedSuspenseComponent, ForwardRef = ReactTypeOfWork.ForwardRef, Fragment7 = ReactTypeOfWork.Fragment, FunctionComponent = ReactTypeOfWork.FunctionComponent, HostRoot = ReactTypeOfWork.HostRoot, HostHoistable = ReactTypeOfWork.HostHoistable, HostSingleton = ReactTypeOfWork.HostSingleton, HostPortal = ReactTypeOfWork.HostPortal, HostComponent = ReactTypeOfWork.HostComponent, HostText = ReactTypeOfWork.HostText, IncompleteClassComponent = ReactTypeOfWork.IncompleteClassComponent, IncompleteFunctionComponent = ReactTypeOfWork.IncompleteFunctionComponent, IndeterminateComponent = ReactTypeOfWork.IndeterminateComponent, LegacyHiddenComponent = ReactTypeOfWork.LegacyHiddenComponent, MemoComponent = ReactTypeOfWork.MemoComponent, OffscreenComponent = ReactTypeOfWork.OffscreenComponent, SimpleMemoComponent = ReactTypeOfWork.SimpleMemoComponent, SuspenseComponent = ReactTypeOfWork.SuspenseComponent, SuspenseListComponent = ReactTypeOfWork.SuspenseListComponent, TracingMarkerComponent = ReactTypeOfWork.TracingMarkerComponent, Throw = ReactTypeOfWork.Throw, ViewTransitionComponent = ReactTypeOfWork.ViewTransitionComponent;
+              var ActivityComponent = ReactTypeOfWork.ActivityComponent, CacheComponent = ReactTypeOfWork.CacheComponent, ClassComponent = ReactTypeOfWork.ClassComponent, ContextConsumer = ReactTypeOfWork.ContextConsumer, DehydratedSuspenseComponent = ReactTypeOfWork.DehydratedSuspenseComponent, ForwardRef = ReactTypeOfWork.ForwardRef, Fragment6 = ReactTypeOfWork.Fragment, FunctionComponent = ReactTypeOfWork.FunctionComponent, HostRoot = ReactTypeOfWork.HostRoot, HostHoistable = ReactTypeOfWork.HostHoistable, HostSingleton = ReactTypeOfWork.HostSingleton, HostPortal = ReactTypeOfWork.HostPortal, HostComponent = ReactTypeOfWork.HostComponent, HostText = ReactTypeOfWork.HostText, IncompleteClassComponent = ReactTypeOfWork.IncompleteClassComponent, IncompleteFunctionComponent = ReactTypeOfWork.IncompleteFunctionComponent, IndeterminateComponent = ReactTypeOfWork.IndeterminateComponent, LegacyHiddenComponent = ReactTypeOfWork.LegacyHiddenComponent, MemoComponent = ReactTypeOfWork.MemoComponent, OffscreenComponent = ReactTypeOfWork.OffscreenComponent, SimpleMemoComponent = ReactTypeOfWork.SimpleMemoComponent, SuspenseComponent = ReactTypeOfWork.SuspenseComponent, SuspenseListComponent = ReactTypeOfWork.SuspenseListComponent, TracingMarkerComponent = ReactTypeOfWork.TracingMarkerComponent, Throw = ReactTypeOfWork.Throw, ViewTransitionComponent = ReactTypeOfWork.ViewTransitionComponent;
               var ImmediatePriority = ReactPriorityLevels.ImmediatePriority, UserBlockingPriority = ReactPriorityLevels.UserBlockingPriority, NormalPriority = ReactPriorityLevels.NormalPriority, LowPriority = ReactPriorityLevels.LowPriority, IdlePriority = ReactPriorityLevels.IdlePriority, NoPriority = ReactPriorityLevels.NoPriority;
               var getLaneLabelMap = renderer2.getLaneLabelMap, injectProfilingHooks = renderer2.injectProfilingHooks, overrideHookState = renderer2.overrideHookState, overrideHookStateDeletePath = renderer2.overrideHookStateDeletePath, overrideHookStateRenamePath = renderer2.overrideHookStateRenamePath, overrideProps = renderer2.overrideProps, overridePropsDeletePath = renderer2.overridePropsDeletePath, overridePropsRenamePath = renderer2.overridePropsRenamePath, scheduleRefresh = renderer2.scheduleRefresh, setErrorHandler = renderer2.setErrorHandler, setSuspenseHandler = renderer2.setSuspenseHandler, scheduleUpdate = renderer2.scheduleUpdate, getCurrentFiber = renderer2.getCurrentFiber;
               var supportsTogglingError = typeof setErrorHandler === "function" && typeof scheduleUpdate === "function";
@@ -35153,7 +35153,7 @@ var require_backend = __commonJS({
                     return true;
                   case HostRoot:
                     return false;
-                  case Fragment7:
+                  case Fragment6:
                     return key === null;
                   default:
                     var typeSymbol = getTypeSymbol(type);
@@ -35227,7 +35227,7 @@ var require_backend = __commonJS({
                     return ElementTypeHostComponent;
                   case HostPortal:
                   case HostText:
-                  case Fragment7:
+                  case Fragment6:
                     return ElementTypeOtherOrUnknown;
                   case MemoComponent:
                   case SimpleMemoComponent:
@@ -80631,7 +80631,7 @@ var init_codelyOAuth2 = __esm({
 import * as https2 from "https";
 import * as http3 from "http";
 import { URL as URL3 } from "url";
-var import_https_proxy_agent3, getCodelyStorageEndpoint, CodelyLogger;
+var import_https_proxy_agent3, getCodelyStorageEndpoint, CODELY_LOGGER_NO_EMIT_ENV, CodelyLogger;
 var init_codely_logger = __esm({
   "packages/core/dist/src/telemetry/codely-logger/codely-logger.js"() {
     "use strict";
@@ -80641,6 +80641,7 @@ var init_codely_logger = __esm({
     init_codelyOAuth2();
     init_serverUrl();
     getCodelyStorageEndpoint = () => `${getServerBaseUrl()}/api/codely/storage`;
+    CODELY_LOGGER_NO_EMIT_ENV = "CODELY_LOGGER_NO_EMIT";
     CodelyLogger = class _CodelyLogger {
       static instance;
       config;
@@ -80674,6 +80675,9 @@ var init_codely_logger = __esm({
         return this.accessToken;
       }
       async sendEventToCodely(event) {
+        if (process.env[CODELY_LOGGER_NO_EMIT_ENV]?.trim()) {
+          return;
+        }
         if (process.env.CUSTOM_AUTH) {
           return;
         }
@@ -363862,13 +363866,21 @@ var init_activate_skill = __esm({
     init_getFolderStructure();
     ActivateSkillToolInvocation = class extends BaseToolInvocation {
       config;
+      allowedSkillNames;
       cachedFolderStructure;
-      constructor(config4, params) {
+      constructor(config4, params, allowedSkillNames) {
         super(params);
         this.config = config4;
+        this.allowedSkillNames = allowedSkillNames;
+      }
+      isSkillAllowed(name3) {
+        return this.allowedSkillNames ? this.allowedSkillNames.has(name3) : true;
       }
       getDescription() {
         const skillName = this.params.name;
+        if (!this.isSkillAllowed(skillName)) {
+          return `"${skillName}" (not allowed)`;
+        }
         const skill = this.config.getSkillManager().getSkill(skillName);
         if (skill) {
           return `"${skillName}": ${skill.description}`;
@@ -363883,6 +363895,9 @@ var init_activate_skill = __esm({
       }
       async shouldConfirmExecute() {
         const skillName = this.params.name;
+        if (!this.isSkillAllowed(skillName)) {
+          return false;
+        }
         const skill = this.config.getSkillManager().getSkill(skillName);
         if (!skill || skill.disabled) {
           return false;
@@ -363911,8 +363926,8 @@ ${folderStructure}`,
         const skillName = this.params.name;
         const skillManager = this.config.getSkillManager();
         const skill = skillManager.getSkill(skillName);
-        if (!skill || skill.disabled) {
-          const availableSkills = skillManager.getSkills().map((s3) => s3.name).join(", ");
+        const availableSkills = skillManager.getSkills().map((s3) => s3.name).filter((name3) => this.isSkillAllowed(name3)).join(", ");
+        if (!this.isSkillAllowed(skillName) || !skill || skill.disabled) {
           const errorMessage = `Skill "${skillName}" not found. Available skills are: ${availableSkills}`;
           return {
             llmContent: `Error: ${errorMessage}`,
@@ -363945,9 +363960,11 @@ ${folderStructure}`
     ActivateSkillTool = class _ActivateSkillTool extends BaseDeclarativeTool {
       config;
       static Name = ACTIVATE_SKILL_TOOL_NAME;
-      constructor(config4) {
+      allowedSkillNames;
+      constructor(config4, options2) {
+        const allowlist = Array.isArray(options2?.allowedSkillNames) && options2.allowedSkillNames.length > 0 ? new Set(options2.allowedSkillNames) : null;
         const skills = config4.getSkillManager().getSkills();
-        const skillNames = skills.map((s3) => s3.name);
+        const skillNames = skills.map((s3) => s3.name).filter((name3) => allowlist ? allowlist.has(name3) : true);
         const schema = skillNames.length === 0 ? {
           type: "object",
           properties: {
@@ -363985,11 +364002,19 @@ ${folderStructure}`
           false
         );
         this.config = config4;
+        this.allowedSkillNames = allowlist;
+      }
+      isSkillAllowed(name3) {
+        return this.allowedSkillNames ? this.allowedSkillNames.has(name3) : true;
       }
       validateToolParams(params) {
         if (!params.name || typeof params.name !== "string") {
           return 'Parameter "name" must be a non-empty string.';
         }
+        if (!this.isSkillAllowed(params.name)) {
+          const available = this.config.getSkillManager().getSkills().map((s3) => s3.name).filter((name3) => this.isSkillAllowed(name3));
+          return `Skill "${params.name}" not found. Available skills: ${available.join(", ")}`;
+        }
         const skill = this.config.getSkillManager().getSkill(params.name);
         if (!skill || skill.disabled) {
           const available = this.config.getSkillManager().getSkills().map((s3) => s3.name);
@@ -363998,7 +364023,7 @@ ${folderStructure}`
         return null;
       }
       createInvocation(params) {
-        return new ActivateSkillToolInvocation(this.config, params);
+        return new ActivateSkillToolInvocation(this.config, params, this.allowedSkillNames);
       }
     };
   }
@@ -365236,7 +365261,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.`,
@@ -365268,9 +365293,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)) {
@@ -365802,6 +365827,7 @@ var init_prompts = __esm({
     init_gitUtils();
     init_memoryTool();
     init_tool_names();
+    init_contentGenerator();
     SystemPromptExtensions = class _SystemPromptExtensions {
       static instance;
       extensions = [];
@@ -367484,7 +367510,10 @@ Original error: ${getErrorMessage(error41)}`);
           },
           config: {
             systemInstruction: { text: getCompressionPrompt() },
-            tools: []
+            tools: [],
+            // Compression summaries can be truncated if users configured a low global max output.
+            // Override with a safe default so compression remains effective.
+            maxOutputTokens: 5e3
           }
         }, prompt_id);
         let fullResponse = "";
@@ -375712,6 +375741,10 @@ var init_agentLoader = __esm({
         const parsedTools = parseStringList(toolsRaw)?.filter((t3) => t3 !== DELEGATE_TO_AGENT_TOOL_NAME).filter(Boolean);
         const toolList = parsedTools ?? [];
         const inheritTools = toolsRaw === void 0 || toolsRaw === null || toolList.length === 0;
+        const skillsRaw = frontmatter["skills"];
+        const parsedSkills = parseStringList(skillsRaw)?.filter(Boolean);
+        const skillList = parsedSkills ?? [];
+        const inheritSkills = skillsRaw === void 0 || skillsRaw === null || skillList.length === 0;
         const modelRaw = frontmatter["model"];
         const model = typeof modelRaw === "string" ? modelRaw.trim().toLowerCase() === "inherit" ? "" : modelRaw.trim() : "";
         const queryRaw = frontmatter["query"];
@@ -375736,6 +375769,8 @@ var init_agentLoader = __esm({
         };
         if (inheritTools)
           metadata["inheritTools"] = true;
+        if (inheritSkills)
+          metadata["inheritSkills"] = true;
         if (Object.keys(extraFrontmatter).length > 0) {
           metadata["frontmatter"] = extraFrontmatter;
         }
@@ -375758,6 +375793,7 @@ var init_agentLoader = __esm({
             stream: stream4
           },
           toolConfig: inheritTools ? void 0 : { tools: toolList },
+          skillConfig: inheritSkills ? void 0 : { skills: skillList },
           // Claude-style YAML agents: keep inputs minimal and consistent. We always
           // expose a single required `task` param and do not support YAML-defined schemas.
           inputConfig: buildInputConfig(void 0),
@@ -375779,6 +375815,9 @@ var init_agentLoader = __esm({
         const rawAllowedTools = config4.agent.tools?.allowed_tools;
         const tools = (Array.isArray(rawAllowedTools) ? rawAllowedTools : []).filter((t3) => typeof t3 === "string" && t3.trim().length > 0).map((t3) => t3.trim()).filter((t3) => t3 !== DELEGATE_TO_AGENT_TOOL_NAME);
         const inheritTools = !rawAllowedTools || tools.length === 0;
+        const rawAllowedSkills = config4.agent.skills?.allowed_skills;
+        const skills = (Array.isArray(rawAllowedSkills) ? rawAllowedSkills : []).filter((s3) => typeof s3 === "string" && s3.trim().length > 0).map((s3) => s3.trim());
+        const inheritSkills = !rawAllowedSkills || skills.length === 0;
         return {
           name: agentName,
           displayName: config4.agent.name || baseName,
@@ -375807,11 +375846,13 @@ var init_agentLoader = __esm({
             stream: config4.agent.run_config?.stream ?? false
           },
           toolConfig: inheritTools ? void 0 : { tools },
+          skillConfig: inheritSkills ? void 0 : { skills },
           inputConfig: buildInputConfig(coerceStringRecord(config4.validation?.input_schema)),
           metadata: {
             source: filePath,
             scope,
-            ...inheritTools ? { inheritTools: true } : {}
+            ...inheritTools ? { inheritTools: true } : {},
+            ...inheritSkills ? { inheritSkills: true } : {}
           }
         };
       }
@@ -375832,6 +375873,9 @@ var init_agentLoader = __esm({
         const rawTools = Array.isArray(config4.tools) ? config4.tools : void 0;
         const tools = (Array.isArray(rawTools) ? rawTools : []).filter((t3) => typeof t3 === "string" && t3.trim().length > 0).map((t3) => t3.trim()).filter((t3) => t3 !== DELEGATE_TO_AGENT_TOOL_NAME);
         const inheritTools = !rawTools || tools.length === 0;
+        const rawSkills = Array.isArray(config4.skills) ? config4.skills : void 0;
+        const skills = (Array.isArray(rawSkills) ? rawSkills : []).filter((s3) => typeof s3 === "string" && s3.trim().length > 0).map((s3) => s3.trim());
+        const inheritSkills = !rawSkills || skills.length === 0;
         const kindRaw = typeof config4.kind === "string" ? config4.kind : void 0;
         const kind = kindRaw === "remote" ? "remote" : "local";
         const validationInputSchema = coerceStringRecord(config4.validation?.input_schema);
@@ -375860,11 +375904,13 @@ var init_agentLoader = __esm({
             stream: typeof run?.stream === "boolean" ? run.stream : false
           },
           toolConfig: inheritTools ? void 0 : { tools },
+          skillConfig: inheritSkills ? void 0 : { skills },
           inputConfig: buildInputConfig(inputSchema),
           metadata: {
             source: filePath,
             scope,
-            ...inheritTools ? { inheritTools: true } : {}
+            ...inheritTools ? { inheritTools: true } : {},
+            ...inheritSkills ? { inheritSkills: true } : {}
           }
         };
       }
@@ -375937,7 +375983,7 @@ You run as a non-interactive subagent (do NOT ask the user questions). Your job
 # thinking_budget = -1
 
 [agent.model_config.sampling_params]
-# reasoning_effort = "high" # "minimal" | "low" | "medium" | "high"
+# reasoning_effort = "high" # "minimal" | "low" | "medium" | "high" | "xhigh"
 # max_completion_tokens = 8192
 # temperature = 0.2
 # top_p = 0.95
@@ -375959,6 +376005,11 @@ stream = false
 #### Tool allowlist (empty = ALL tools)
 allowed_tools = []
 
+[agent.skills]
+#### Skills allowlist (empty = ALL skills)
+#### Only relevant when the main session has --experimental-skills enabled.
+allowed_skills = []
+
 #### Available tools (DisplayName (real_name)):
 ${toolHintLines}
 
@@ -376004,6 +376055,10 @@ kind = "local"
 #### Tool allowlist (empty = ALL tools)
 tools = []
 
+#### Skills allowlist (empty = ALL skills)
+#### Only relevant when the main session has --experimental-skills enabled.
+skills = []
+
 #### Available tools (DisplayName (real_name)):
 ${toolHintLines}
 
@@ -376091,6 +376146,11 @@ description: ${description || `Specialized agent for ${displayName.toLowerCase()
 tools:
 # tools: read_file, search_file_content, glob
 
+#### Skills allowlist (Claude-style; empty/omitted = ALL skills)
+#### Only relevant when the main session has --experimental-skills enabled.
+skills:
+# skills: code-review, testing
+
 #### Available tools (DisplayName (real_name)):
 ${toolHintLines}
 
@@ -379257,6 +379317,7 @@ var init_executor = __esm({
     init_modelSamplingParams();
     init_generateContentResponseUtilities();
     init_tool_names();
+    init_activate_skill();
     TASK_COMPLETE_TOOL_NAME = "complete_task";
     MAX_IDLE_RESPONSES = 3;
     AgentExecutor = class _AgentExecutor {
@@ -379310,6 +379371,14 @@ var init_executor = __esm({
             }
           }
         }
+        const skillAllowlist = effectiveDefinition.skillConfig?.skills ?? [];
+        const shouldRestrictSkills = Array.isArray(skillAllowlist) && skillAllowlist.length > 0;
+        const hasActivateSkillTool = Boolean(effectiveDefinition.toolConfig?.tools?.some((t3) => typeof t3 === "string" && t3 === ACTIVATE_SKILL_TOOL_NAME));
+        if (shouldRestrictSkills && hasActivateSkillTool) {
+          agentToolRegistry.registerTool(new ActivateSkillTool(runtimeContext, {
+            allowedSkillNames: skillAllowlist
+          }));
+        }
         const parentPromptId = promptIdContext.getStore();
         return new _AgentExecutor(effectiveDefinition, runtimeContext, agentToolRegistry, parentPromptId, onActivity);
       }
@@ -379972,7 +380041,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
@@ -381211,6 +381280,7 @@ var init_config2 = __esm({
       cliVersion;
       experimentalZedIntegration = false;
       experimentalSkills = false;
+      enabledSkills;
       disabledSkills = [];
       agentRegistry;
       agentRegistryInitPromise;
@@ -381281,6 +381351,7 @@ var init_config2 = __esm({
         this.sessionTokenLimit = params.sessionTokenLimit ?? -1;
         this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
         this.experimentalSkills = params.experimentalSkills ?? false;
+        this.enabledSkills = params.enabledSkills;
         this.disabledSkills = params.disabledSkills ?? [];
         this.listExtensions = params.listExtensions ?? false;
         this.storage = new Storage(this.targetDir);
@@ -381880,7 +381951,17 @@ var init_config2 = __esm({
           this.disabledSkills = disabledSkills;
         }
         await this.skillManager.discoverSkills();
-        this.skillManager.setDisabledSkills(this.disabledSkills);
+        const allowlist = Array.isArray(this.enabledSkills) && this.enabledSkills.length > 0 ? new Set(this.enabledSkills) : null;
+        const allowlistDisabled = [];
+        if (allowlist) {
+          for (const skill of this.skillManager.getAllSkills()) {
+            if (!allowlist.has(skill.name)) {
+              allowlistDisabled.push(skill.name);
+            }
+          }
+        }
+        const effectiveDisabled = Array.from(/* @__PURE__ */ new Set([...this.disabledSkills, ...allowlistDisabled]));
+        this.skillManager.setDisabledSkills(effectiveDisabled);
         const registry2 = await this.getToolRegistry();
         registry2.registerTool(new ActivateSkillTool(this));
         try {
@@ -397922,7 +398003,7 @@ var require_react_is_development = __commonJS({
         var ContextProvider = REACT_PROVIDER_TYPE;
         var Element3 = REACT_ELEMENT_TYPE;
         var ForwardRef = REACT_FORWARD_REF_TYPE;
-        var Fragment7 = REACT_FRAGMENT_TYPE;
+        var Fragment6 = REACT_FRAGMENT_TYPE;
         var Lazy = REACT_LAZY_TYPE;
         var Memo = REACT_MEMO_TYPE;
         var Portal = REACT_PORTAL_TYPE;
@@ -397981,7 +398062,7 @@ var require_react_is_development = __commonJS({
         exports2.ContextProvider = ContextProvider;
         exports2.Element = Element3;
         exports2.ForwardRef = ForwardRef;
-        exports2.Fragment = Fragment7;
+        exports2.Fragment = Fragment6;
         exports2.Lazy = Lazy;
         exports2.Memo = Memo;
         exports2.Portal = Portal;
@@ -414993,7 +415074,7 @@ var NoColorTheme = new Theme(
 
 // packages/cli/src/ui/themes/theme-manager.ts
 import process26 from "node:process";
-var DEFAULT_THEME = QwenDark;
+var DEFAULT_THEME = ANSI;
 var ThemeManager = class {
   availableThemes;
   activeTheme;
@@ -415180,15 +415261,16 @@ var USER_SETTINGS_DIR = path53.join(homedir15(), SETTINGS_DIRECTORY_NAME);
 var USER_SETTINGS_PATH = path53.join(USER_SETTINGS_DIR, "settings.json");
 var DEFAULT_EXCLUDED_ENV_VARS = ["DEBUG", "DEBUG_MODE"];
 function getSystemSettingsPath() {
-  if (process.env.GEMINI_CLI_SYSTEM_SETTINGS_PATH) {
-    return process.env.GEMINI_CLI_SYSTEM_SETTINGS_PATH;
+  const override = process.env.CODELY_CLI_SYSTEM_SETTINGS_PATH;
+  if (override) {
+    return override;
   }
   if (platform8() === "darwin") {
-    return "/Library/Application Support/QwenCode/settings.json";
+    return "/Library/Application Support/CodelyCLI/settings.json";
   } else if (platform8() === "win32") {
-    return "C:\\ProgramData\\qwen-code\\settings.json";
+    return "C:\\ProgramData\\codely-cli\\settings.json";
   } else {
-    return "/etc/qwen-code/settings.json";
+    return "/etc/codely-cli/settings.json";
   }
 }
 function getWorkspaceSettingsPath(workspaceDir) {
@@ -415224,23 +415306,24 @@ var LoadedSettings = class {
     const workspace = this.workspace.settings;
     const { folderTrust, ...workspaceWithoutFolderTrust } = workspace;
     return {
+      // Precedence (low -> high): system < user < workspace.
+      ...system,
       ...user,
       ...workspaceWithoutFolderTrust,
-      ...system,
       customThemes: {
+        ...system.customThemes || {},
         ...user.customThemes || {},
-        ...workspace.customThemes || {},
-        ...system.customThemes || {}
+        ...workspace.customThemes || {}
       },
       mcpServers: {
+        ...system.mcpServers || {},
         ...user.mcpServers || {},
-        ...workspace.mcpServers || {},
-        ...system.mcpServers || {}
+        ...workspace.mcpServers || {}
       },
       skills: {
+        ...system.skills || {},
         ...user.skills || {},
         ...workspaceWithoutFolderTrust.skills || {},
-        ...system.skills || {},
         // Union disabled lists across scopes for Gemini-compat behavior.
         disabled: Array.from(
           /* @__PURE__ */ new Set([
@@ -417317,6 +417400,43 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
   const [pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
   const processedMemoryToolsRef = (0, import_react37.useRef)(/* @__PURE__ */ new Set());
   const { startNewPrompt, getPromptCount } = useSessionStats();
+  const pendingGeminiTextRef = (0, import_react37.useRef)("");
+  const flushTimerRef = (0, import_react37.useRef)(null);
+  const clearFlushTimer = (0, import_react37.useCallback)(() => {
+    if (flushTimerRef.current) {
+      clearTimeout(flushTimerRef.current);
+      flushTimerRef.current = null;
+    }
+  }, []);
+  const flushPendingGeminiText = (0, import_react37.useCallback)(
+    (options2) => {
+      const force = options2?.force ?? false;
+      if (!force && flushTimerRef.current) {
+        return;
+      }
+      const doFlush = () => {
+        flushTimerRef.current = null;
+        if (pendingHistoryItemRef.current?.type !== "gemini" && pendingHistoryItemRef.current?.type !== "gemini_content") {
+          return;
+        }
+        setPendingHistoryItem((item) => {
+          if (!item) return item;
+          if (item.type !== "gemini" && item.type !== "gemini_content")
+            return item;
+          if (item.text === pendingGeminiTextRef.current) return item;
+          return { ...item, text: pendingGeminiTextRef.current };
+        });
+      };
+      if (force) {
+        clearFlushTimer();
+        doFlush();
+        return;
+      }
+      flushTimerRef.current = setTimeout(doFlush, 50);
+    },
+    [clearFlushTimer, pendingHistoryItemRef, setPendingHistoryItem]
+  );
+  (0, import_react37.useEffect)(() => clearFlushTimer, [clearFlushTimer]);
   const gitService = (0, import_react37.useMemo)(() => {
     if (!config4.getProjectRoot()) {
       return;
@@ -417395,6 +417515,7 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
     turnCancelledRef.current = true;
     isSubmittingQueryRef.current = false;
     abortControllerRef.current?.abort();
+    flushPendingGeminiText({ force: true });
     if (pendingHistoryItemRef.current) {
       addItem(pendingHistoryItemRef.current, Date.now());
     }
@@ -417411,6 +417532,7 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
   }, [
     streamingState,
     addItem,
+    flushPendingGeminiText,
     setPendingHistoryItem,
     onCancelSubmit,
     pendingHistoryItemRef,
@@ -417533,20 +417655,23 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
         return "";
       }
       let newGeminiMessageBuffer = currentGeminiMessageBuffer + eventValue;
+      const shouldForceFlush = eventValue.includes("\n") || eventValue.toLowerCase().includes("</think>") || eventValue.toLowerCase().includes("</thinking>");
       if (pendingHistoryItemRef.current?.type !== "gemini" && pendingHistoryItemRef.current?.type !== "gemini_content") {
         if (pendingHistoryItemRef.current) {
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         }
         setPendingHistoryItem({ type: "gemini", text: "" });
         newGeminiMessageBuffer = eventValue;
+        pendingGeminiTextRef.current = newGeminiMessageBuffer;
+        flushPendingGeminiText({ force: true });
+        return newGeminiMessageBuffer;
       }
+      pendingGeminiTextRef.current = newGeminiMessageBuffer;
       const splitPoint = findLastSafeSplitPoint(newGeminiMessageBuffer);
       if (splitPoint === newGeminiMessageBuffer.length) {
-        setPendingHistoryItem((item) => ({
-          type: item?.type,
-          text: newGeminiMessageBuffer
-        }));
+        flushPendingGeminiText({ force: shouldForceFlush });
       } else {
+        flushPendingGeminiText({ force: true });
         const beforeText = newGeminiMessageBuffer.substring(0, splitPoint);
         const afterText = newGeminiMessageBuffer.substring(splitPoint);
         addItem(
@@ -417558,16 +417683,24 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
         );
         setPendingHistoryItem({ type: "gemini_content", text: afterText });
         newGeminiMessageBuffer = afterText;
+        pendingGeminiTextRef.current = newGeminiMessageBuffer;
+        flushPendingGeminiText({ force: true });
       }
       return newGeminiMessageBuffer;
     },
-    [addItem, pendingHistoryItemRef, setPendingHistoryItem]
+    [
+      addItem,
+      flushPendingGeminiText,
+      pendingHistoryItemRef,
+      setPendingHistoryItem
+    ]
   );
   const handleUserCancelledEvent = (0, import_react37.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
       }
+      flushPendingGeminiText({ force: true });
       if (pendingHistoryItemRef.current) {
         if (pendingHistoryItemRef.current.type === "tool_group") {
           const updatedTools = pendingHistoryItemRef.current.tools.map(
@@ -417590,10 +417723,17 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
       setIsResponding(false);
       setThought(null);
     },
-    [addItem, pendingHistoryItemRef, setPendingHistoryItem, setThought]
+    [
+      addItem,
+      flushPendingGeminiText,
+      pendingHistoryItemRef,
+      setPendingHistoryItem,
+      setThought
+    ]
   );
   const handleErrorEvent = (0, import_react37.useCallback)(
     (eventValue, userMessageTimestamp) => {
+      flushPendingGeminiText({ force: true });
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
@@ -417613,7 +417753,14 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
       );
       setThought(null);
     },
-    [addItem, pendingHistoryItemRef, setPendingHistoryItem, config4, setThought]
+    [
+      addItem,
+      flushPendingGeminiText,
+      pendingHistoryItemRef,
+      setPendingHistoryItem,
+      config4,
+      setThought
+    ]
   );
   const handleFinishedEvent = (0, import_react37.useCallback)(
     (event, userMessageTimestamp) => {
@@ -417839,6 +417986,7 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
           return;
         }
         if (pendingHistoryItemRef.current) {
+          flushPendingGeminiText({ force: true });
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
           setPendingHistoryItem(null);
         }
@@ -417895,7 +418043,9 @@ var useGeminiStream = (geminiClient, history, addItem, config4, logger7, onDebug
       config4,
       startNewPrompt,
       getPromptCount,
-      handleLoopDetectedEvent
+      handleLoopDetectedEvent,
+      cancelOngoingRequest,
+      flushPendingGeminiText
     ]
   );
   const handleCompletedTools = (0, import_react37.useCallback)(
@@ -419218,7 +419368,7 @@ async function getPackageJson2() {
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson2();
-  return "1.0.0-beta.43";
+  return "1.0.0-beta.45";
 }
 
 // packages/cli/src/ui/commands/types.ts
@@ -419751,7 +419901,7 @@ import process30 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_polyfill();
-var GIT_COMMIT_INFO = "92247f00";
+var GIT_COMMIT_INFO = "b8a99db1";
 
 // packages/cli/src/ui/commands/bugCommand.ts
 var bugCommand = {
@@ -421523,7 +421673,7 @@ Analyze the current directory and generate a comprehensive **${contextFileName}*
    - Based on the initial view, pick the most informative files. Typical priorities (choose any that exist, up to ten):
      - \`ProjectSettings/ProjectVersion.txt\` \u2013 Unity version.
      - \`Packages/manifest.json\` \u2013 package list, target platforms, render pipeline.
-     - \`Assets/Scenes/*.unity\` \u2013 entry/start scene(s).
+     - \`Assets/Scenes/*.unity\` or \`Assets/Scenes/*.scene\` \u2013 entry/start scene(s). Note: Unity engine uses \`.unity\` extension, while Tuanjie engine uses \`.scene\` extension. Check both patterns when searching for scene files.
      - \`Assets/Prefabs/*.prefab\` \u2013 key game objects (player, UI manager, etc.).
      - \`Assets/Scripts/**/*.cs\` \u2013 main scripts (e.g., \`GameManager.cs\`, \`PlayerController.cs\`).
      - Any \`*.asmdef\` files \u2013 code\u2011assembly boundaries.
@@ -421553,8 +421703,8 @@ Analyze the current directory and generate a comprehensive **${contextFileName}*
   - Render pipeline (URP/HDRP/Legacy) and any major packages (Cinemachine, Input System, DOTS, etc.).
 
 - **Key Scenes & Entry Point**
-  - List the main scenes (\`*.unity\`).
-  - Indicate which scene is loaded first (often \`Boot.unity\` or \`Main.unity\`).
+  - List the main scenes (\`*.unity\` for Unity engine or \`*.scene\` for Tuanjie engine). When searching for scene files, check both patterns: \`*.unity\` and \`*.scene\`.
+  - Indicate which scene is loaded first (often \`Boot.unity\`/\`Boot.scene\` or \`Main.unity\`/\`Main.scene\`).
 
 - **Core Assets**
   - Important prefabs (Player, UI Canvas, GameManager, etc.).
@@ -425655,6 +425805,7 @@ init_esbuild_polyfill();
 var UNITY_EXTENSIONS = [
   ".cs",
   ".unity",
+  ".scene",
   ".prefab",
   ".mat",
   ".asset",
@@ -426525,7 +426676,7 @@ ManageEditorTool.Name = "unity_editor";
 init_esbuild_polyfill();
 var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
   constructor() {
-    super(_ManageGameObjectTool.Name, "Unity GameObject Manager", "Manages Unity GameObjects with comprehensive operations including create, modify, delete, find, and component management. Supports primitives, prefabs, transforms, and advanced component manipulation with property setting and reference assignments.", {
+    super(_ManageGameObjectTool.Name, "Unity GameObject Manager", "Manages Unity GameObjects with comprehensive operations including create, modify, delete, find, list_children, and component management. Supports primitives, prefabs, transforms, and advanced component manipulation with property setting and reference assignments.", {
       type: "object",
       properties: {
         action: {
@@ -426539,13 +426690,14 @@ var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
             "modify",
             "delete",
             "find",
+            "list_children",
             "select",
             "add_component",
             "remove_component",
             "set_component_property",
             "get_components"
           ],
-          description: 'Operation to perform. Ensure operations are idempotent (safe to call multiple times). Use "select" to set Unity Editor selection.'
+          description: 'Operation to perform. Ensure operations are idempotent (safe to call multiple times). Use "list_children" to retrieve a depth-limited *tree-structured* children hierarchy for a specific GameObject (large results can be written to a JSON file under Assets/). Use "select" to set Unity Editor selection. For full-scene hierarchy roots, prefer unity_scene action="get_hierarchy".'
         },
         component_type: {
           type: "string",
@@ -426569,7 +426721,7 @@ var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
         },
         target: {
           oneOf: [{ type: "string" }, { type: "number" }],
-          description: "GameObject identifier (name or path string) for modify/delete/component actions"
+          description: "GameObject identifier (name/path/instance ID) for modify/delete/component actions. For list_children, this is the root GameObject whose subtree will be returned."
         },
         searchMethod: {
           type: "string",
@@ -426675,7 +426827,34 @@ var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
         searchInactive: {
           type: "boolean",
           description: "Include inactive GameObjects in search",
-          default: false
+          default: true
+        },
+        depth: {
+          type: "integer",
+          description: 'For list_children action: how many levels below target to traverse (1 = direct children). The returned result keeps a tree structure (nested "children") up to this depth.',
+          minimum: 1,
+          default: 1
+        },
+        includeInactive: {
+          type: "boolean",
+          description: "For list_children action: whether to include inactive objects in the returned results (alias of searchInactive).",
+          default: true
+        },
+        resultMode: {
+          type: "string",
+          enum: ["auto", "inline", "file"],
+          description: "For list_children action: 'auto' returns inline unless the result exceeds maxInlineItems, then writes the full tree JSON to a file and returns its path; 'inline' errors if too large (no truncation); 'file' always writes JSON to disk and returns its path.",
+          default: "auto"
+        },
+        maxInlineItems: {
+          type: "integer",
+          description: "For list_children action: maximum number of descendant nodes (within depth) allowed for inline output before switching to file (or erroring in inline mode).",
+          minimum: 1,
+          default: 200
+        },
+        outputPath: {
+          type: "string",
+          description: "For list_children action with resultMode='file' (or auto overflow): output JSON path under Assets/. The tool returns this path so callers can read the full, untruncated result."
         },
         selectAll: {
           type: "boolean",
@@ -426718,6 +426897,7 @@ var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
       "modify",
       "delete",
       "find",
+      "list_children",
       "select",
       "add_component",
       "remove_component",
@@ -426832,6 +427012,46 @@ var ManageGameObjectTool = class _ManageGameObjectTool extends UnityToolBase {
           return "target or searchTerm is required for find";
         }
         break;
+      case "list_children":
+        if (!params.target) {
+          return "target is required for list_children action";
+        }
+        if (params.includeInactive !== void 0 && params.searchInactive === void 0) {
+          params.searchInactive = params.includeInactive;
+        }
+        if (params.depth !== void 0) {
+          try {
+            const parsedDepth = UnityToolBase.parseInteger(params.depth, "depth");
+            if (parsedDepth !== void 0) {
+              if (parsedDepth < 1) {
+                return "depth must be >= 1";
+              }
+              params.depth = parsedDepth;
+            }
+          } catch (error41) {
+            return error41 instanceof Error ? error41.message : "Invalid depth parameter";
+          }
+        }
+        if (params.maxInlineItems !== void 0) {
+          try {
+            const parsedMaxInline = UnityToolBase.parseInteger(params.maxInlineItems, "maxInlineItems");
+            if (parsedMaxInline !== void 0) {
+              if (parsedMaxInline < 1) {
+                return "maxInlineItems must be >= 1";
+              }
+              params.maxInlineItems = parsedMaxInline;
+            }
+          } catch (error41) {
+            return error41 instanceof Error ? error41.message : "Invalid maxInlineItems parameter";
+          }
+        }
+        if (params.outputPath && !params.outputPath.startsWith("Assets/")) {
+          return "outputPath must start with Assets/";
+        }
+        if (params.resultMode && !["auto", "inline", "file"].includes(params.resultMode)) {
+          return `Invalid resultMode: ${params.resultMode}. Valid values are: auto, inline, file`;
+        }
+        break;
       case "select":
         break;
       default:
@@ -427016,8 +427236,12 @@ ManagePackageTool.Name = "unity_package";
 // packages/codely-unity-client/dist/src/tools/unity-tools/manage-scene/ManageSceneTool.js
 init_esbuild_polyfill();
 var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
+  static hasAllowedSceneExtension(path96) {
+    const lower2 = path96.toLowerCase();
+    return _ManageSceneTool.AllowedSceneExtensions.some((ext3) => lower2.endsWith(ext3));
+  }
   constructor() {
-    super(_ManageSceneTool.Name, "Unity Scene Manager", "Manages Unity scenes: create, load, save, get hierarchy, get active scene info, and build settings. Provides comprehensive scene operations for Unity projects.", {
+    super(_ManageSceneTool.Name, "Unity Scene Manager", "Manages Unity scenes: create, load, save, get hierarchy, get active scene info, and build settings. IMPORTANT: Scene files use .unity extension for Unity engine and .scene extension for Tuanjie engine (the tool validates/accepts both). Note: for very large scenes, get_hierarchy may return only scene root objects (roots-only) with hints to drill down using unity_gameobject list_children.", {
       type: "object",
       properties: {
         action: {
@@ -427032,15 +427256,15 @@ var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
             "get_active",
             "get_build_settings"
           ],
-          description: "Scene operation to perform. ensure_scene_open requires full scene path ending with .unity"
+          description: "Scene operation to perform. ensure_scene_open requires full scene path ending with .unity or .scene. get_hierarchy may return roots-only for very large scenes."
         },
         name: {
           type: "string",
-          description: "Scene name (without .unity extension). Used for create, load, save actions."
+          description: "Scene name (without .unity/.scene extension). Used for create, load, save actions."
         },
         path: {
           type: "string",
-          description: 'For ensure_scene_open: full scene path ending with .unity (e.g., "Assets/Scenes/MyScene.unity"). For create/load/save: directory path (default: "Assets/Scenes/").'
+          description: 'For ensure_scene_open: full scene path ending with .unity or .scene (e.g., "Assets/Scenes/MyScene.unity"). For create/load/save: directory path (default: "Assets/Scenes/").'
         },
         build_index: {
           type: "integer",
@@ -427079,8 +427303,8 @@ var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
         if (!params.path.startsWith("Assets/")) {
           return 'path must start with "Assets/"';
         }
-        if (!params.path.endsWith(".unity")) {
-          return 'path must end with ".unity" for scene files';
+        if (!_ManageSceneTool.hasAllowedSceneExtension(params.path)) {
+          return 'path must end with ".unity" or ".scene" for scene files';
         }
         break;
       case "ensure_scene_saved":
@@ -427089,8 +427313,8 @@ var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
         if (!params.name) {
           return "name is required for create action";
         }
-        if (params.name.toLowerCase().endsWith(".unity")) {
-          return "name should not include .unity extension";
+        if (_ManageSceneTool.hasAllowedSceneExtension(params.name)) {
+          return "name should not include .unity/.scene extension";
         }
         break;
       case "load":
@@ -427099,8 +427323,8 @@ var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
         }
         break;
       case "save":
-        if (params.name && params.name.toLowerCase().endsWith(".unity")) {
-          return "name should not include .unity extension";
+        if (params.name && _ManageSceneTool.hasAllowedSceneExtension(params.name)) {
+          return "name should not include .unity/.scene extension";
         }
         break;
       case "get_hierarchy":
@@ -427130,6 +427354,7 @@ var ManageSceneTool = class _ManageSceneTool extends UnityToolBase {
   }
 };
 ManageSceneTool.Name = "unity_scene";
+ManageSceneTool.AllowedSceneExtensions = [".unity", ".scene"];
 
 // packages/codely-unity-client/dist/src/tools/unity-tools/manage-screenshot/ScreenShotTool.js
 init_esbuild_polyfill();
@@ -428093,7 +428318,7 @@ var UnityToolsManager = class {
 Available Unity Builtin Tools (13 total):
 
 - \`unity_editor\`: Controls editor state, compilation, long-task waiting, and queries Unity project info (use get_current_state for full state, and start_compilation_pipeline + wait_for_compile for script edits)
-- \`unity_scene\`: Creates, loads, saves scenes with ensure operations for idempotent scene workflows
+- \`unity_scene\`: Creates, loads, saves scenes with ensure operations for idempotent scene workflows. **IMPORTANT**: Scene files use \`.unity\` extension for Unity engine and \`.scene\` extension for Tuanjie engine. When searching for scene files (e.g., using FindFiles), always check both patterns: \`*.unity\` and \`*.scene\`.
 - \`unity_gameobject\`: Creates, modifies, deletes GameObjects with ensure operations for components/materials
 - \`unity_script\`: Creates, edits, and manages C# script files (used together with compile + console check)
 - \`unity_asset\`: Creates, imports, and manages prefabs and assets with meta safety operations
@@ -461299,10 +461524,16 @@ function spawnAcpAgent(args) {
 var webUiServeCommand = {
   command: "web-ui",
   describe: "Start Codely Web UI (localhost) by proxying ACP over WebSocket to a spawned agent process",
-  builder: (yargs) => yargs.usage("Usage: codely serve web-ui [--port <port>] [options]").option("port", {
+  builder: (yargs) => yargs.usage(
+    "Usage: codely serve web-ui [--port <port>] [--host <host>] [options]"
+  ).option("port", {
     type: "number",
     default: 3939,
     describe: "HTTP server port for Web UI (default: 3939)"
+  }).option("host", {
+    type: "string",
+    default: "127.0.0.1",
+    describe: "HTTP server host for Web UI (default: 127.0.0.1). Use 0.0.0.0 to accept connections from any network interface."
   }).option("open", {
     type: "boolean",
     default: false,
@@ -461314,11 +461545,16 @@ var webUiServeCommand = {
     describe: "Enable debug logging"
   }).example([
     ["$0 serve web-ui", "Start Web UI on http://127.0.0.1:3939"],
-    ["$0 serve web-ui --port 3000", "Start Web UI on port 3000"]
+    ["$0 serve web-ui --port 3000", "Start Web UI on port 3000"],
+    [
+      "$0 serve web-ui --host 0.0.0.0",
+      "Start Web UI accessible from any network interface"
+    ]
   ]).version(false),
   handler: async (argv) => {
     const args = argv;
     const port = args.port ?? 3939;
+    const host = args.host ?? "127.0.0.1";
     const debug3 = Boolean(args.debug);
     const cwd3 = process.cwd();
     const { staticDir, indexPath } = resolveStaticDir();
@@ -461422,11 +461658,11 @@ If you're running an installed bundle, your package may be missing bundled Web U
     });
     await new Promise((resolve26, reject) => {
       server.once("error", reject);
-      server.listen(port, "127.0.0.1", () => resolve26());
+      server.listen(port, host, () => resolve26());
     });
-    const url4 = `http://127.0.0.1:${port}`;
+    const url4 = `http://${host}:${port}`;
     console.error(`\u2705 Web UI listening on ${url4}`);
-    console.error(`   WS endpoint: ws://127.0.0.1:${port}/ws`);
+    console.error(`   WS endpoint: ws://${host}:${port}/ws`);
     if (args.open) {
       try {
         await open_default(url4, { wait: false });
@@ -461706,6 +461942,13 @@ async function parseArguments() {
       type: "boolean",
       description: "Enable experimental Skills feature",
       default: false
+    }).option("skills", {
+      type: "array",
+      string: true,
+      description: "Limit enabled skills to the provided list (requires --experimental-skills). Supports comma-separated values or repeated --skills flags.",
+      coerce: (skills) => skills.flatMap(
+        (value) => String(value ?? "").split(",").map((s3) => s3.trim()).filter(Boolean)
+      )
     }).option("allowed-mcp-server-names", {
       type: "array",
       string: true,
@@ -461742,8 +461985,8 @@ async function parseArguments() {
     }).option("reasoning_effort", {
       type: "string",
       alias: ["reasoningEffort"],
-      choices: ["minimal", "low", "medium", "high"],
-      description: "OpenAI reasoning_effort for reasoning/compatible models (minimal|low|medium|high)"
+      choices: ["minimal", "low", "medium", "high", "xhigh"],
+      description: "OpenAI reasoning_effort for reasoning/compatible models (minimal|low|medium|high|xhigh)"
     }).option("enable_thinking", {
       type: "boolean",
       alias: ["enableThinking"],
@@ -461811,6 +462054,11 @@ async function parseArguments() {
           "Cannot use both --example-prompt and --prompt-interactive (-i) together"
         );
       }
+      if (Array.isArray(argv.skills) && argv.skills.filter(Boolean).length > 0 && !argv.experimentalSkills) {
+        throw new Error(
+          "Cannot use --skills without --experimental-skills. Enable skills first with --experimental-skills."
+        );
+      }
       return true;
     })
   ).command(mcpCommand2).command(extensionsCommand2).command(serveCommand).version(await getCliVersion()).alias("v", "version").help().alias("h", "help").strict().demandCommand(0, 0);
@@ -461887,10 +462135,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;
@@ -462112,7 +462364,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,
@@ -462120,6 +462372,7 @@ async function loadCliConfig(settings, extensions, sessionId2, argv, cwd3 = proc
     sessionTokenLimit: settings.sessionTokenLimit ?? -1,
     experimentalZedIntegration: argv.experimentalAcp || false,
     experimentalSkills: argv.experimentalSkills || false,
+    enabledSkills: argv.experimentalSkills && argv.skills && argv.skills.length > 0 ? argv.skills : void 0,
     disabledSkills: settings.skills?.disabled ?? [],
     listExtensions: argv.listExtensions || false,
     extensions: allExtensions,
@@ -466374,8 +466627,11 @@ var AutoAcceptIndicator = ({
 init_esbuild_polyfill();
 var import_jsx_runtime10 = __toESM(require_jsx_runtime(), 1);
 var ShellModeIndicator = () => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(Text, { color: Colors.AccentYellow, children: [
-  "shell mode enabled",
-  /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(Text, { color: Colors.Gray, children: " (esc to disable)" })
+  "SHELL MODE: type a command and press Enter to run",
+  /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(Text, { color: Colors.Gray, children: [
+    " ",
+    "(Esc to exit; press ! on empty input to toggle)"
+  ] })
 ] }) });
 
 // packages/cli/src/ui/components/InputPrompt.tsx
@@ -487178,6 +487434,15 @@ var EMPTY_LINE_HEIGHT = 1;
 var CODE_BLOCK_PREFIX_PADDING = 1;
 var LIST_ITEM_PREFIX_PADDING = 1;
 var LIST_ITEM_TEXT_FLEX_GROW = 1;
+var HEADER_REGEX = /^ *(#{1,4}) +(.*)/;
+var CODE_FENCE_REGEX = /^ *(`{3,}|~{3,}) *(\w*?) *$/;
+var UL_ITEM_REGEX = /^([ \t]*)([-*+]) +(.*)/;
+var OL_ITEM_REGEX = /^([ \t]*)(\d+)\. +(.*)/;
+var HR_REGEX = /^ *([-*_] *){3,} *$/;
+var TABLE_ROW_REGEX = /^\s*\|(.+)\|\s*$/;
+var TABLE_SEPARATOR_REGEX = /^\s*\|?\s*(:?-+:?)\s*(\|\s*(:?-+:?)\s*)+\|?\s*$/;
+var THINK_START_REGEX = /^__THINK_START__$/;
+var THINK_END_REGEX = /^__THINK_END__$/;
 function processThinkTags(text) {
   if (!text) return text;
   const firstNonWhitespaceIndex = text.search(/\S/);
@@ -487222,257 +487487,253 @@ var MarkdownDisplayInternal = ({
   terminalWidth,
   enableThinkTags = true
 }) => {
-  if (!text) return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(import_jsx_runtime35.Fragment, {});
-  const processedText = enableThinkTags ? processThinkTags(text) : text.replace(/\n\n+/g, "\n\n");
-  const lines = processedText.split("\n");
-  const headerRegex = /^ *(#{1,4}) +(.*)/;
-  const codeFenceRegex = /^ *(`{3,}|~{3,}) *(\w*?) *$/;
-  const ulItemRegex = /^([ \t]*)([-*+]) +(.*)/;
-  const olItemRegex = /^([ \t]*)(\d+)\. +(.*)/;
-  const hrRegex = /^ *([-*_] *){3,} *$/;
-  const tableRowRegex = /^\s*\|(.+)\|\s*$/;
-  const tableSeparatorRegex = /^\s*\|?\s*(:?-+:?)\s*(\|\s*(:?-+:?)\s*)+\|?\s*$/;
-  const thinkStartRegex = /^__THINK_START__$/;
-  const thinkEndRegex = /^__THINK_END__$/;
-  const contentBlocks = [];
-  let inCodeBlock = false;
-  let lastLineEmpty = true;
-  let codeBlockContent = [];
-  let codeBlockLang = null;
-  let codeBlockFence = "";
-  let inTable = false;
-  let tableRows = [];
-  let tableHeaders = [];
-  let inThinkBlock = false;
-  let thinkContent = [];
-  function addContentBlock(block2) {
-    if (block2) {
-      contentBlocks.push(block2);
-      lastLineEmpty = false;
-    }
-  }
-  lines.forEach((line, index) => {
-    const key = `line-${index}`;
-    if (inCodeBlock) {
-      const fenceMatch = line.match(codeFenceRegex);
-      if (fenceMatch && fenceMatch[1].startsWith(codeBlockFence[0]) && fenceMatch[1].length >= codeBlockFence.length) {
+  const processedText = import_react76.default.useMemo(() => {
+    if (!text) return "";
+    return enableThinkTags ? processThinkTags(text) : text.replace(/\n\n+/g, "\n\n");
+  }, [text, enableThinkTags]);
+  const lines = import_react76.default.useMemo(() => processedText.split("\n"), [processedText]);
+  const contentBlocks = import_react76.default.useMemo(() => {
+    const blocks = [];
+    let inCodeBlock = false;
+    let lastLineEmpty = true;
+    let codeBlockContent = [];
+    let codeBlockLang = null;
+    let codeBlockFence = "";
+    let inTable = false;
+    let tableRows = [];
+    let tableHeaders = [];
+    let inThinkBlock = false;
+    let thinkContent = [];
+    function addContentBlock(block2) {
+      if (block2) {
+        blocks.push(block2);
+        lastLineEmpty = false;
+      }
+    }
+    lines.forEach((line, index) => {
+      const key = `line-${index}`;
+      if (inCodeBlock) {
+        const fenceMatch = line.match(CODE_FENCE_REGEX);
+        if (fenceMatch && fenceMatch[1].startsWith(codeBlockFence[0]) && fenceMatch[1].length >= codeBlockFence.length) {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+              RenderCodeBlock,
+              {
+                content: codeBlockContent,
+                lang: codeBlockLang,
+                isPending,
+                availableTerminalHeight,
+                terminalWidth
+              },
+              key
+            )
+          );
+          inCodeBlock = false;
+          codeBlockContent = [];
+          codeBlockLang = null;
+          codeBlockFence = "";
+        } else {
+          codeBlockContent.push(line);
+        }
+        return;
+      }
+      if (inThinkBlock) {
+        if (line.match(THINK_END_REGEX)) {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+              RenderThinkBlock,
+              {
+                content: thinkContent,
+                isPending,
+                isStreaming: false,
+                terminalWidth
+              },
+              key
+            )
+          );
+          inThinkBlock = false;
+          thinkContent = [];
+        } else if (!line.match(THINK_START_REGEX)) {
+          thinkContent.push(line);
+        }
+        return;
+      }
+      const codeFenceMatch = line.match(CODE_FENCE_REGEX);
+      const headerMatch = line.match(HEADER_REGEX);
+      const ulMatch = line.match(UL_ITEM_REGEX);
+      const olMatch = line.match(OL_ITEM_REGEX);
+      const hrMatch = line.match(HR_REGEX);
+      const tableRowMatch = line.match(TABLE_ROW_REGEX);
+      const tableSeparatorMatch = line.match(TABLE_SEPARATOR_REGEX);
+      const thinkStartMatch = line.match(THINK_START_REGEX);
+      const thinkEndMatch = line.match(THINK_END_REGEX);
+      if (thinkStartMatch) {
+        inThinkBlock = true;
+      } else if (thinkEndMatch) {
+        return;
+      } else if (codeFenceMatch) {
+        inCodeBlock = true;
+        codeBlockFence = codeFenceMatch[1];
+        codeBlockLang = codeFenceMatch[2] || null;
+      } else if (tableRowMatch && !inTable) {
+        if (index + 1 < lines.length && lines[index + 1].match(TABLE_SEPARATOR_REGEX)) {
+          inTable = true;
+          tableHeaders = tableRowMatch[1].split("|").map((cell) => cell.trim());
+          tableRows = [];
+        } else {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
+          );
+        }
+      } else if (inTable && tableSeparatorMatch) {
+      } else if (inTable && tableRowMatch) {
+        const cells = tableRowMatch[1].split("|").map((cell) => cell.trim());
+        while (cells.length < tableHeaders.length) {
+          cells.push("");
+        }
+        if (cells.length > tableHeaders.length) {
+          cells.length = tableHeaders.length;
+        }
+        tableRows.push(cells);
+      } else if (inTable && !tableRowMatch) {
+        if (tableHeaders.length > 0 && tableRows.length > 0) {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+              RenderTable,
+              {
+                headers: tableHeaders,
+                rows: tableRows,
+                terminalWidth
+              },
+              `table-${blocks.length}`
+            )
+          );
+        }
+        inTable = false;
+        tableRows = [];
+        tableHeaders = [];
+        if (line.trim().length > 0) {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
+          );
+        }
+      } else if (hrMatch) {
         addContentBlock(
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-            RenderCodeBlock,
-            {
-              content: codeBlockContent,
-              lang: codeBlockLang,
-              isPending,
-              availableTerminalHeight,
-              terminalWidth
-            },
-            key
-          )
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { dimColor: true, children: "---" }) }, key)
         );
-        inCodeBlock = false;
-        codeBlockContent = [];
-        codeBlockLang = null;
-        codeBlockFence = "";
-      } else {
-        codeBlockContent.push(line);
-      }
-      return;
-    }
-    if (inThinkBlock) {
-      if (line.match(thinkEndRegex)) {
+      } else if (headerMatch) {
+        const level = headerMatch[1].length;
+        const headerText = headerMatch[2];
+        let headerNode = null;
+        switch (level) {
+          case 1:
+            headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, color: Colors.AccentCyan, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
+            break;
+          case 2:
+            headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, color: Colors.AccentBlue, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
+            break;
+          case 3:
+            headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
+            break;
+          case 4:
+            headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { italic: true, color: Colors.Gray, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
+            break;
+          default:
+            headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
+            break;
+        }
+        if (headerNode) addContentBlock(/* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: headerNode }, key));
+      } else if (ulMatch) {
+        const leadingWhitespace = ulMatch[1];
+        const marker = ulMatch[2];
+        const itemText = ulMatch[3];
         addContentBlock(
           /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-            RenderThinkBlock,
+            RenderListItem,
             {
-              content: thinkContent,
-              isPending,
-              isStreaming: false,
-              terminalWidth
+              itemText,
+              type: "ul",
+              marker,
+              leadingWhitespace
             },
             key
           )
         );
-        inThinkBlock = false;
-        thinkContent = [];
-      } else if (!line.match(thinkStartRegex)) {
-        thinkContent.push(line);
-      }
-      return;
-    }
-    const codeFenceMatch = line.match(codeFenceRegex);
-    const headerMatch = line.match(headerRegex);
-    const ulMatch = line.match(ulItemRegex);
-    const olMatch = line.match(olItemRegex);
-    const hrMatch = line.match(hrRegex);
-    const tableRowMatch = line.match(tableRowRegex);
-    const tableSeparatorMatch = line.match(tableSeparatorRegex);
-    const thinkStartMatch = line.match(thinkStartRegex);
-    const thinkEndMatch = line.match(thinkEndRegex);
-    if (thinkStartMatch) {
-      inThinkBlock = true;
-    } else if (thinkEndMatch) {
-      return;
-    } else if (codeFenceMatch) {
-      inCodeBlock = true;
-      codeBlockFence = codeFenceMatch[1];
-      codeBlockLang = codeFenceMatch[2] || null;
-    } else if (tableRowMatch && !inTable) {
-      if (index + 1 < lines.length && lines[index + 1].match(tableSeparatorRegex)) {
-        inTable = true;
-        tableHeaders = tableRowMatch[1].split("|").map((cell) => cell.trim());
-        tableRows = [];
-      } else {
-        addContentBlock(
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
-        );
-      }
-    } else if (inTable && tableSeparatorMatch) {
-    } else if (inTable && tableRowMatch) {
-      const cells = tableRowMatch[1].split("|").map((cell) => cell.trim());
-      while (cells.length < tableHeaders.length) {
-        cells.push("");
-      }
-      if (cells.length > tableHeaders.length) {
-        cells.length = tableHeaders.length;
-      }
-      tableRows.push(cells);
-    } else if (inTable && !tableRowMatch) {
-      if (tableHeaders.length > 0 && tableRows.length > 0) {
+      } else if (olMatch) {
+        const leadingWhitespace = olMatch[1];
+        const marker = olMatch[2];
+        const itemText = olMatch[3];
         addContentBlock(
           /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-            RenderTable,
+            RenderListItem,
             {
-              headers: tableHeaders,
-              rows: tableRows,
-              terminalWidth
+              itemText,
+              type: "ol",
+              marker,
+              leadingWhitespace
             },
-            `table-${contentBlocks.length}`
+            key
           )
         );
+      } else {
+        if (line.trim().length === 0 && !inCodeBlock) {
+          if (!lastLineEmpty) {
+            blocks.push(
+              /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { height: EMPTY_LINE_HEIGHT }, `spacer-${index}`)
+            );
+            lastLineEmpty = true;
+          }
+        } else {
+          addContentBlock(
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
+          );
+        }
       }
-      inTable = false;
-      tableRows = [];
-      tableHeaders = [];
-      if (line.trim().length > 0) {
-        addContentBlock(
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
-        );
-      }
-    } else if (hrMatch) {
+    });
+    if (inCodeBlock) {
       addContentBlock(
-        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { dimColor: true, children: "---" }) }, key)
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+          RenderCodeBlock,
+          {
+            content: codeBlockContent,
+            lang: codeBlockLang,
+            isPending,
+            availableTerminalHeight,
+            terminalWidth
+          },
+          "line-eof"
+        )
       );
-    } else if (headerMatch) {
-      const level = headerMatch[1].length;
-      const headerText = headerMatch[2];
-      let headerNode = null;
-      switch (level) {
-        case 1:
-          headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, color: Colors.AccentCyan, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
-          break;
-        case 2:
-          headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, color: Colors.AccentBlue, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
-          break;
-        case 3:
-          headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
-          break;
-        case 4:
-          headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { italic: true, color: Colors.Gray, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
-          break;
-        default:
-          headerNode = /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: headerText }) });
-          break;
-      }
-      if (headerNode) addContentBlock(/* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: headerNode }, key));
-    } else if (ulMatch) {
-      const leadingWhitespace = ulMatch[1];
-      const marker = ulMatch[2];
-      const itemText = ulMatch[3];
+    }
+    if (inThinkBlock) {
       addContentBlock(
         /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-          RenderListItem,
+          RenderThinkBlock,
           {
-            itemText,
-            type: "ul",
-            marker,
-            leadingWhitespace
+            content: thinkContent,
+            isPending,
+            isStreaming: true,
+            terminalWidth
           },
-          key
+          "think-eof"
         )
       );
-    } else if (olMatch) {
-      const leadingWhitespace = olMatch[1];
-      const marker = olMatch[2];
-      const itemText = olMatch[3];
+    }
+    if (inTable && tableHeaders.length > 0 && tableRows.length > 0) {
       addContentBlock(
         /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-          RenderListItem,
+          RenderTable,
           {
-            itemText,
-            type: "ol",
-            marker,
-            leadingWhitespace
+            headers: tableHeaders,
+            rows: tableRows,
+            terminalWidth
           },
-          key
+          `table-${blocks.length}`
         )
       );
-    } else {
-      if (line.trim().length === 0 && !inCodeBlock) {
-        if (!lastLineEmpty) {
-          contentBlocks.push(
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { height: EMPTY_LINE_HEIGHT }, `spacer-${index}`)
-          );
-          lastLineEmpty = true;
-        }
-      } else {
-        addContentBlock(
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { wrap: "wrap", children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RenderInline, { text: line }) }) }, key)
-        );
-      }
     }
-  });
-  if (inCodeBlock) {
-    addContentBlock(
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-        RenderCodeBlock,
-        {
-          content: codeBlockContent,
-          lang: codeBlockLang,
-          isPending,
-          availableTerminalHeight,
-          terminalWidth
-        },
-        "line-eof"
-      )
-    );
-  }
-  if (inThinkBlock) {
-    addContentBlock(
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-        RenderThinkBlock,
-        {
-          content: thinkContent,
-          isPending,
-          isStreaming: true,
-          terminalWidth
-        },
-        "think-eof"
-      )
-    );
-  }
-  if (inTable && tableHeaders.length > 0 && tableRows.length > 0) {
-    addContentBlock(
-      /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
-        RenderTable,
-        {
-          headers: tableHeaders,
-          rows: tableRows,
-          terminalWidth
-        },
-        `table-${contentBlocks.length}`
-      )
-    );
-  }
+    return blocks;
+  }, [lines, isPending, availableTerminalHeight, terminalWidth]);
   return /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { flexDirection: "column", alignItems: "flex-start", children: contentBlocks });
 };
 var RenderCodeBlockInternal = ({
@@ -487565,8 +487826,8 @@ var RenderThinkBlockInternal = ({
   terminalWidth: _terminalWidth
 }) => {
   const MAX_VISIBLE_THINK_LINES = 10;
+  const MAX_THINK_LINES_WHEN_NOT_PENDING = 50;
   const MAX_VISIBLE_THINK_CHARS_WHEN_COLLAPSED = 500;
-  const shouldCollapse = isPending && isStreaming;
   const filteredContent = content.filter((line) => line.trim().length > 0);
   if (filteredContent.length === 0) {
     return null;
@@ -487577,6 +487838,8 @@ var RenderThinkBlockInternal = ({
   if (cleanedContent.length === 0) {
     return null;
   }
+  void isStreaming;
+  const shouldCollapse = isPending || cleanedContent.length > MAX_THINK_LINES_WHEN_NOT_PENDING;
   let visibleContent = cleanedContent;
   let hiddenLineCount = 0;
   if (shouldCollapse) {
@@ -487637,7 +487900,23 @@ var RenderThinkBlockInternal = ({
     }
   );
 };
-var RenderThinkBlock = import_react76.default.memo(RenderThinkBlockInternal);
+var RenderThinkBlock = import_react76.default.memo(
+  RenderThinkBlockInternal,
+  (prevProps, nextProps) => {
+    if (prevProps.isPending !== nextProps.isPending || prevProps.isStreaming !== nextProps.isStreaming || prevProps.terminalWidth !== nextProps.terminalWidth) {
+      return false;
+    }
+    if (prevProps.content.length !== nextProps.content.length) {
+      return false;
+    }
+    for (let i3 = 0; i3 < prevProps.content.length; i3++) {
+      if (prevProps.content[i3] !== nextProps.content[i3]) {
+        return false;
+      }
+    }
+    return true;
+  }
+);
 var MarkdownDisplay = import_react76.default.memo(MarkdownDisplayInternal);
 
 // packages/cli/src/ui/components/messages/GeminiMessage.tsx
@@ -487699,7 +487978,7 @@ var import_jsx_runtime39 = __toESM(require_jsx_runtime(), 1);
 var STATIC_HEIGHT = 1;
 var RESERVED_LINE_COUNT = 5;
 var STATUS_INDICATOR_WIDTH = 3;
-var MIN_LINES_SHOWN = 2;
+var MIN_LINES_SHOWN = 4;
 var MAX_TOOL_DESCRIPTION_CHARACTERS = 240;
 var MAXIMUM_RESULT_DISPLAY_CHARACTERS = 1e6;
 function formatToolDescription(description) {
@@ -487724,11 +488003,10 @@ var ToolMessage = ({
   emphasis = "medium",
   renderOutputAsMarkdown = true
 }) => {
-  const availableHeight = availableTerminalHeight ? Math.max(
+  const availableHeight = availableTerminalHeight === void 0 ? void 0 : Math.max(
     availableTerminalHeight - STATIC_HEIGHT - RESERVED_LINE_COUNT,
-    MIN_LINES_SHOWN + 1
-    // enforce minimum lines shown
-  ) : void 0;
+    MIN_LINES_SHOWN
+  );
   if (availableHeight) {
     renderOutputAsMarkdown = false;
   }
@@ -487758,7 +488036,7 @@ var ToolMessage = ({
       {
         paddingLeft: STATUS_INDICATOR_WIDTH,
         width: "100%",
-        marginTop: 1,
+        marginTop: availableHeight === void 0 ? 1 : 0,
         alignItems: "flex-start",
         children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "column", alignItems: "flex-start", width: "100%", children: [
           typeof resultDisplay === "string" && renderOutputAsMarkdown && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { flexDirection: "column", alignItems: "flex-start", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
@@ -487772,7 +488050,14 @@ var ToolMessage = ({
             }
           ) }),
           typeof resultDisplay === "string" && !renderOutputAsMarkdown && // PowerShell output handling - split by lines for better formatting
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: resultDisplay.split(/\r?\n/).map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { alignItems: "flex-start", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { wrap: "wrap", children: line || " " }) }, index)) }),
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(MaxSizedBox, { maxHeight: availableHeight, maxWidth: childWidth, children: (() => {
+            const lines = resultDisplay.split(/\r?\n/);
+            while (lines.length > 0 && (lines[lines.length - 1] ?? "").trim() === "") {
+              lines.pop();
+            }
+            const displayLines = lines.length > 0 ? lines : [" "];
+            return displayLines.map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { alignItems: "flex-start", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { wrap: "wrap", children: line || " " }) }, index));
+          })() }),
           typeof resultDisplay !== "string" && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
             DiffRenderer,
             {
@@ -488052,6 +488337,85 @@ var ToolConfirmationMessage = ({
 
 // packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
 var import_jsx_runtime41 = __toESM(require_jsx_runtime(), 1);
+var LARGE_TOOL_GROUP_THRESHOLD = 10;
+var TOOL_GROUP_RENDER_QUEUE_DELAY_MS = 100;
+var TOOL_GROUP_RENDER_QUEUE_DELAY_MS_LARGE = 1e3;
+var TOOL_GROUP_TICK_INTERVAL_MS = 100;
+var TERMINAL_TOOL_STATUSES = /* @__PURE__ */ new Set([
+  "Success" /* Success */,
+  "Error" /* Error */,
+  "Canceled" /* Canceled */
+]);
+var COMPACT_TOOL_OUTPUT_PREVIEW_LINES = 3;
+var COMPACT_DESCRIPTION_MAX_CHARS = 80;
+function renderCadenceMs(toolCount) {
+  return toolCount > LARGE_TOOL_GROUP_THRESHOLD ? TOOL_GROUP_RENDER_QUEUE_DELAY_MS_LARGE : TOOL_GROUP_RENDER_QUEUE_DELAY_MS;
+}
+function statusSymbol(status) {
+  switch (status) {
+    case "Pending" /* Pending */:
+      return TOOL_STATUS.PENDING;
+    case "Executing" /* Executing */:
+      return TOOL_STATUS.EXECUTING;
+    case "Success" /* Success */:
+      return TOOL_STATUS.SUCCESS;
+    case "Confirming" /* Confirming */:
+      return TOOL_STATUS.CONFIRMING;
+    case "Canceled" /* Canceled */:
+      return TOOL_STATUS.CANCELED;
+    case "Error" /* Error */:
+      return TOOL_STATUS.ERROR;
+    default: {
+      const exhaustiveCheck = status;
+      return String(exhaustiveCheck);
+    }
+  }
+}
+function compactDescription(description) {
+  const singleLine = description.replace(/\s+/g, " ").trim();
+  if (singleLine.length <= COMPACT_DESCRIPTION_MAX_CHARS) return singleLine;
+  return `${singleLine.slice(0, COMPACT_DESCRIPTION_MAX_CHARS - 1)}\u2026`;
+}
+function toolOutputPreviewLines(tool, maxLines) {
+  const rd = tool.resultDisplay;
+  if (typeof rd === "string") {
+    const lines = rd.split(/\r?\n/);
+    while (lines.length > 0 && (lines[lines.length - 1] ?? "").trim() === "") {
+      lines.pop();
+    }
+    if (lines.length === 0) return [];
+    return lines.slice(Math.max(0, lines.length - maxLines));
+  }
+  if (rd && typeof rd === "object") {
+    const fileName = rd.fileName;
+    if (typeof fileName === "string" && fileName.trim() !== "") {
+      return [`(diff) ${fileName}`];
+    }
+    return ["(diff)"];
+  }
+  return [];
+}
+function toolCallsRenderSignature(toolCalls) {
+  let signature = `${toolCalls.length}|`;
+  for (const t3 of toolCalls) {
+    signature += `${t3.callId}:${t3.status}:`;
+    const rd = t3.resultDisplay;
+    if (typeof rd === "string") {
+      signature += `s${rd.length}`;
+    } else if (rd && typeof rd === "object") {
+      const maybeFileDiff = rd.fileDiff;
+      if (typeof maybeFileDiff === "string") {
+        signature += `d${maybeFileDiff.length}`;
+      } else {
+        signature += "o";
+      }
+    } else {
+      signature += "n";
+    }
+    signature += ";";
+  }
+  return signature;
+}
 var ToolGroupMessage = ({
   toolCalls,
   availableTerminalHeight,
@@ -488059,44 +488423,154 @@ var ToolGroupMessage = ({
   config: config4,
   isFocused = true
 }) => {
-  const hasPending = !toolCalls.every(
+  const [renderToolCalls, setRenderToolCalls] = (0, import_react78.useState)(toolCalls);
+  const latestToolCallsRef = (0, import_react78.useRef)(toolCalls);
+  const scheduledFlushRef = (0, import_react78.useRef)(
+    void 0
+  );
+  const lastRenderedSignatureRef = (0, import_react78.useRef)(
+    toolCallsRenderSignature(toolCalls)
+  );
+  const lastRenderedAtRef = (0, import_react78.useRef)(Date.now());
+  const compactDesiredHeightRef = (0, import_react78.useRef)(void 0);
+  const toolCallsSignature = toolCallsRenderSignature(toolCalls);
+  const cadenceMs = renderCadenceMs(toolCalls.length);
+  (0, import_react78.useEffect)(() => {
+    latestToolCallsRef.current = toolCalls;
+    const needsImmediateRender = toolCalls.some(
+      (t3) => t3.status === "Confirming" /* Confirming */
+    );
+    if (needsImmediateRender) {
+      if (scheduledFlushRef.current !== void 0) {
+        clearTimeout(scheduledFlushRef.current);
+        scheduledFlushRef.current = void 0;
+      }
+      lastRenderedSignatureRef.current = toolCallsSignature;
+      lastRenderedAtRef.current = Date.now();
+      setRenderToolCalls([...toolCalls]);
+      return;
+    }
+    if (scheduledFlushRef.current !== void 0) return;
+    scheduledFlushRef.current = setTimeout(() => {
+      scheduledFlushRef.current = void 0;
+      lastRenderedSignatureRef.current = toolCallsRenderSignature(
+        latestToolCallsRef.current
+      );
+      lastRenderedAtRef.current = Date.now();
+      setRenderToolCalls([...latestToolCallsRef.current]);
+    }, cadenceMs);
+  }, [toolCallsSignature, toolCalls, cadenceMs]);
+  (0, import_react78.useEffect)(
+    () => () => {
+      if (scheduledFlushRef.current !== void 0) {
+        clearTimeout(scheduledFlushRef.current);
+      }
+    },
+    []
+  );
+  (0, import_react78.useEffect)(() => {
+    const interval = setInterval(() => {
+      const current = latestToolCallsRef.current;
+      const currentSignature = toolCallsRenderSignature(current);
+      if (currentSignature === lastRenderedSignatureRef.current) return;
+      const now = Date.now();
+      const currentCadence = renderCadenceMs(current.length);
+      if (now - lastRenderedAtRef.current < currentCadence) return;
+      lastRenderedSignatureRef.current = currentSignature;
+      lastRenderedAtRef.current = now;
+      setRenderToolCalls([...current]);
+      const anyConfirming = current.some(
+        (t3) => t3.status === "Confirming" /* Confirming */
+      );
+      const allTerminal = current.every(
+        (t3) => TERMINAL_TOOL_STATUSES.has(t3.status)
+      );
+      if (!anyConfirming && allTerminal) {
+        clearInterval(interval);
+      }
+    }, TOOL_GROUP_TICK_INTERVAL_MS);
+    return () => clearInterval(interval);
+  }, []);
+  const isConfirmingNow = toolCalls.some(
+    (t3) => t3.status === "Confirming" /* Confirming */
+  );
+  const isGroupCompleteNow = toolCalls.every(
+    (t3) => TERMINAL_TOOL_STATUSES.has(t3.status)
+  );
+  const toolCallsForRender = isConfirmingNow || isGroupCompleteNow ? toolCalls : renderToolCalls;
+  const hasPending = !toolCallsForRender.every(
     (t3) => t3.status === "Success" /* Success */
   );
-  const isShellCommand = toolCalls.some((t3) => t3.name === SHELL_COMMAND_NAME);
-  const borderColor = hasPending || isShellCommand ? Colors.AccentYellow : Colors.Gray;
-  const staticHeight = (
-    /* border */
-    2 + /* marginBottom */
-    1
+  const isShellCommand = toolCallsForRender.some(
+    (t3) => t3.name === SHELL_COMMAND_NAME
   );
-  const innerWidth = terminalWidth - 4;
+  const borderColor = hasPending || isShellCommand ? Colors.AccentYellow : Colors.Gray;
+  const boxChromeHeight = 2;
   const toolAwaitingApproval = (0, import_react78.useMemo)(
-    () => toolCalls.find((tc) => tc.status === "Confirming" /* Confirming */),
-    [toolCalls]
+    () => toolCallsForRender.find((tc) => tc.status === "Confirming" /* Confirming */),
+    [toolCallsForRender]
   );
-  let countToolCallsWithResults = 0;
-  for (const tool of toolCalls) {
-    if (tool.resultDisplay !== void 0 && tool.resultDisplay !== "") {
-      countToolCallsWithResults++;
-    }
-  }
-  const countOneLineToolCalls = toolCalls.length - countToolCallsWithResults;
-  const availableTerminalHeightPerToolMessage = availableTerminalHeight ? Math.max(
+  const availableTerminalHeightPerToolMessage = availableTerminalHeight !== void 0 && !isGroupCompleteNow ? Math.max(
     Math.floor(
-      (availableTerminalHeight - staticHeight - countOneLineToolCalls) / Math.max(1, countToolCallsWithResults)
+      (availableTerminalHeight - boxChromeHeight) / Math.max(toolCallsForRender.length, 1)
     ),
     1
   ) : void 0;
+  const shouldUseCompactMode = availableTerminalHeight !== void 0 && toolCallsForRender.length > 1 && !isConfirmingNow && !isGroupCompleteNow;
+  const desiredCompactHeight = shouldUseCompactMode && availableTerminalHeight !== void 0 ? (() => {
+    let compactLines = 0;
+    for (const tool of toolCallsForRender) {
+      const preview = toolOutputPreviewLines(
+        tool,
+        COMPACT_TOOL_OUTPUT_PREVIEW_LINES
+      );
+      compactLines += 1 + preview.length;
+    }
+    const candidate = boxChromeHeight + compactLines;
+    if (toolCallsForRender.length > LARGE_TOOL_GROUP_THRESHOLD) {
+      const prev = compactDesiredHeightRef.current;
+      const next = prev === void 0 ? candidate : Math.max(prev, candidate);
+      compactDesiredHeightRef.current = next;
+      return next;
+    }
+    if (compactDesiredHeightRef.current !== void 0) {
+      compactDesiredHeightRef.current = void 0;
+    }
+    return candidate;
+  })() : void 0;
+  if (!shouldUseCompactMode && compactDesiredHeightRef.current !== void 0) {
+    compactDesiredHeightRef.current = void 0;
+  }
+  const isCompactClamped = desiredCompactHeight !== void 0 && availableTerminalHeight !== void 0 && desiredCompactHeight > availableTerminalHeight;
+  const effectiveCompactHeight = desiredCompactHeight !== void 0 && availableTerminalHeight !== void 0 ? Math.min(desiredCompactHeight, availableTerminalHeight) : void 0;
+  const compactMaxHeight = effectiveCompactHeight !== void 0 ? Math.max(effectiveCompactHeight - boxChromeHeight, MINIMUM_MAX_HEIGHT) : void 0;
+  const groupMarginLeft = shouldUseCompactMode && isCompactClamped ? 0 : 1;
+  const innerWidth = terminalWidth - (groupMarginLeft === 1 ? 4 : 3);
   return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
     Box_default,
     {
       flexDirection: "column",
       borderStyle: "round",
       width: "100%",
-      marginLeft: 1,
+      marginLeft: groupMarginLeft,
       borderDimColor: hasPending,
       borderColor,
-      children: toolCalls.map((tool) => {
+      height: shouldUseCompactMode ? effectiveCompactHeight : void 0,
+      overflow: shouldUseCompactMode ? "hidden" : void 0,
+      children: shouldUseCompactMode ? /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(MaxSizedBox, { maxHeight: compactMaxHeight, maxWidth: innerWidth, children: toolCallsForRender.flatMap((tool) => {
+        const head = `${statusSymbol(tool.status)}  ${tool.name}: ${compactDescription(tool.description)}`;
+        const preview = toolOutputPreviewLines(
+          tool,
+          COMPACT_TOOL_OUTPUT_PREVIEW_LINES
+        );
+        return [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { alignItems: "flex-start", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { wrap: "truncate", children: head }) }, `${tool.callId}-h`),
+          ...preview.map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { alignItems: "flex-start", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: Colors.Gray, wrap: "truncate", children: [
+            "   ",
+            line
+          ] }) }, `${tool.callId}-o-${index}`))
+        ];
+      }) }) : toolCallsForRender.map((tool) => {
         const isConfirming = toolAwaitingApproval?.callId === tool.callId;
         return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", minHeight: 1, children: [
           /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
@@ -490875,6 +491349,18 @@ var appEvents = new EventEmitter14();
 // packages/cli/src/ui/App.tsx
 var import_jsx_runtime60 = __toESM(require_jsx_runtime(), 1);
 var CTRL_EXIT_PROMPT_DURATION_MS = 1e3;
+function getInputPlaceholder({
+  shellModeActive,
+  vimModeEnabled
+}) {
+  if (shellModeActive) {
+    return "  Shell command only";
+  }
+  if (vimModeEnabled) {
+    return "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode.";
+  }
+  return "  Type your message or @path/to/file";
+}
 var AppWrapper = (props) => /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(SessionStatsProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(VimModeProvider, { settings: props.settings, children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(App2, { ...props }) }) });
 var App2 = ({ config: config4, settings, startupWarnings = [], version: version3 }) => {
   const isFocused = useFocus();
@@ -491529,7 +492015,10 @@ var App2 = ({ config: config4, settings, startupWarnings = [], version: version3
   const mainAreaWidth = Math.floor(terminalWidth * 0.9);
   const debugConsoleMaxHeight = Math.floor(Math.max(terminalHeight * 0.2, 5));
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-  const placeholder = vimModeEnabled ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode." : "  Type your message or @path/to/file";
+  const placeholder = getInputPlaceholder({
+    shellModeActive,
+    vimModeEnabled
+  });
   return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(StreamingContext.Provider, { value: streamingState, children: /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(Box_default, { flexDirection: "column", width: "90%", children: [
     /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
       Static,
@@ -492261,18 +492750,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",
@@ -506057,6 +506548,195 @@ var RequestError3 = class _RequestError extends Error {
 init_esbuild_polyfill();
 init_strip_ansi();
 init_dist6();
+function toText(value) {
+  return typeof value === "string" ? value : "";
+}
+function toToolStatus(status) {
+  const s3 = typeof status === "string" ? status.toLowerCase() : "";
+  if (s3 === "pending") return "pending";
+  if (s3 === "confirming" || s3 === "executing") return "in_progress";
+  if (s3 === "success") return "completed";
+  if (s3 === "error" || s3 === "canceled" || s3 === "cancelled") return "failed";
+  return "completed";
+}
+function toToolKind(kind) {
+  switch (kind) {
+    case "read":
+    case "edit":
+    case "delete":
+    case "move":
+    case "search":
+    case "execute":
+    case "think":
+    case "fetch":
+    case "other":
+      return kind;
+    default:
+      return "other";
+  }
+}
+function historyToUiMessages(history) {
+  const out = [];
+  for (const item of history) {
+    switch (item.type) {
+      case "user": {
+        out.push({ role: "user", type: "text", text: toText(item.text) });
+        break;
+      }
+      case "user_shell": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          out.push({ role: "user", type: "text", text });
+        }
+        break;
+      }
+      case "gemini":
+      case "gemini_content": {
+        out.push({ role: "assistant", type: "text", text: toText(item.text) });
+        break;
+      }
+      case "info": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          out.push({ role: "assistant", type: "text", text });
+        }
+        break;
+      }
+      case "error": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          out.push({ role: "assistant", type: "text", text: `Error: ${text}` });
+        }
+        break;
+      }
+      case "tool_group": {
+        const tools = Array.isArray(item.tools) ? item.tools : [];
+        const lines = tools.map((t3) => {
+          const name3 = typeof t3?.name === "string" ? t3.name : "tool";
+          const status = typeof t3?.status === "string" ? t3.status : "";
+          return status ? `- ${name3} (${status})` : `- ${name3}`;
+        }).filter((l2) => l2.trim().length > 0);
+        if (lines.length > 0) {
+          out.push({
+            role: "assistant",
+            type: "text",
+            text: `Tool calls:
+${lines.join("\n")}`
+          });
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  return out.filter((m2) => m2.text.trim().length > 0);
+}
+function historyToUiFeedAndTools(history) {
+  const feed = [];
+  const tools = [];
+  for (const item of history) {
+    switch (item.type) {
+      case "user": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          feed.push({
+            kind: "message",
+            message: { role: "user", type: "text", text }
+          });
+        }
+        break;
+      }
+      case "user_shell": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          feed.push({
+            kind: "message",
+            message: { role: "user", type: "text", text }
+          });
+        }
+        break;
+      }
+      case "gemini":
+      case "gemini_content": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          feed.push({
+            kind: "message",
+            message: { role: "assistant", type: "text", text }
+          });
+        }
+        break;
+      }
+      case "info": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          feed.push({
+            kind: "message",
+            message: { role: "assistant", type: "text", text }
+          });
+        }
+        break;
+      }
+      case "error": {
+        const text = toText(item.text);
+        if (text.trim().length > 0) {
+          feed.push({
+            kind: "message",
+            message: {
+              role: "assistant",
+              type: "text",
+              text: `Error: ${text}`
+            }
+          });
+        }
+        break;
+      }
+      case "tool_group": {
+        const groupTools = Array.isArray(item.tools) ? item.tools : [];
+        for (const t3 of groupTools) {
+          const toolCallId = typeof t3?.callId === "string" && t3.callId.trim().length > 0 ? t3.callId : `tool_${Date.now()}_${Math.random().toString(16).slice(2)}`;
+          const title = typeof t3?.name === "string" ? t3.name : "Tool call";
+          const status = toToolStatus(t3?.status);
+          const kind = toToolKind(t3?.kind);
+          const resultDisplay = typeof t3?.resultDisplay === "string" ? t3.resultDisplay : "";
+          tools.push({
+            toolCallId,
+            title,
+            status,
+            kind,
+            ...resultDisplay.trim().length > 0 ? {
+              content: [
+                {
+                  type: "content",
+                  content: { type: "text", text: resultDisplay }
+                }
+              ]
+            } : {}
+          });
+          feed.push({ kind: "tool", toolCallId });
+        }
+        break;
+      }
+      default:
+        break;
+    }
+  }
+  return { feed, tools };
+}
+function toReplaceHistoryMeta(history) {
+  const { feed, tools } = historyToUiFeedAndTools(history);
+  return {
+    codely: {
+      ui: {
+        action: "replace_history",
+        feed,
+        tools,
+        messages: historyToUiMessages(history)
+      }
+    }
+  };
+}
 function buildCommandNameList(commands) {
   const seen = /* @__PURE__ */ new Set();
   const names = [];
@@ -506129,6 +506809,54 @@ var AcpSlashCommandRunner = class {
     }
     return available;
   }
+  /**
+   * Returns argument completion candidates for the given raw slash command line.
+   *
+   * Example:
+   * - "/chat resume " -> ["tag1", "tag2", ...]
+   * - "/model use gpt" -> ["gpt-4.1", "gpt-4o", ...]
+   */
+  async complete(rawQuery, signal, maxResults = 20) {
+    const trimmed2 = rawQuery.trimStart();
+    if (!trimmed2.startsWith("/")) return [];
+    await this.ensureCommandsLoaded(signal);
+    const afterSlash = trimmed2.substring(1);
+    const hasTrailingSpace = /\s$/.test(afterSlash);
+    const parts = afterSlash.trim().split(/\s+/).filter(Boolean);
+    if (parts.length === 0) return [];
+    let currentCommands = this.commands;
+    let commandToExecute;
+    let pathIndex = 0;
+    for (const part of parts) {
+      let found = currentCommands.find((cmd) => cmd.name === part);
+      if (!found) {
+        found = currentCommands.find((cmd) => cmd.altNames?.includes(part));
+      }
+      if (!found) break;
+      commandToExecute = found;
+      pathIndex++;
+      if (found.subCommands) {
+        currentCommands = found.subCommands;
+      } else {
+        break;
+      }
+    }
+    if (!commandToExecute?.completion) return [];
+    const argsParts = parts.slice(pathIndex);
+    const fixedArgsParts = hasTrailingSpace ? argsParts : argsParts.slice(0, -1);
+    const partialArg = !hasTrailingSpace && argsParts.length > 0 ? argsParts[argsParts.length - 1] : "";
+    const { context: context2 } = this.createCommandContext(
+      trimmed2,
+      commandToExecute.name,
+      fixedArgsParts.join(" ")
+    );
+    try {
+      const items = await commandToExecute.completion(context2, partialArg);
+      return items.slice(0, maxResults);
+    } catch {
+      return [];
+    }
+  }
   createCommandContext(rawCommand, commandName, args) {
     const collectedOutput = [];
     const gitService = this.config.getProjectRoot() ? new GitService(this.config.getProjectRoot()) : void 0;
@@ -506187,7 +506915,7 @@ var AcpSlashCommandRunner = class {
       getCollectedOutput: () => collectedOutput.join("\n")
     };
   }
-  processCommandResult(result) {
+  async processCommandResult(result) {
     switch (result.type) {
       case "message":
         return { handled: true, response: result.content };
@@ -506208,10 +506936,25 @@ Tool execution via slash commands is not supported in ACP mode yet.`
           response: `Dialog "${result.dialog}" is not supported in ACP mode.`
         };
       case "load_history":
+        try {
+          await this.config.getGeminiClient().setHistory(result.clientHistory);
+        } catch (e3) {
+          const msg = e3 instanceof Error ? e3.message : String(e3);
+          return {
+            handled: true,
+            response: `Failed to restore model history: ${msg}`
+          };
+        }
+        return {
+          handled: true,
+          // Keep a small human-readable message for ACP clients that don't support our meta.
+          response: "Conversation restored.",
+          meta: toReplaceHistoryMeta(result.history)
+        };
       case "load_history_with_resume":
         return {
           handled: true,
-          response: "History loading is not supported in ACP mode."
+          response: "Use /chat resume to restore conversation history."
         };
       case "confirm_shell_commands":
       case "confirm_action":
@@ -506299,7 +507042,7 @@ Supported commands in ACP mode:
           content: stripAnsi(output)
         };
       }
-      const processed = this.processCommandResult(result);
+      const processed = await this.processCommandResult(result);
       if (!processed.handled && processed.forwardToModelText) {
         return {
           handled: false,
@@ -506314,7 +507057,8 @@ Supported commands in ACP mode:
       return {
         handled: true,
         messageType: "info",
-        content: finalText
+        content: finalText,
+        ...processed.meta ? { meta: processed.meta } : {}
       };
     } catch (error41) {
       const msg = error41 instanceof Error ? error41.message : String(error41);
@@ -506329,6 +507073,84 @@ Supported commands in ACP mode:
 
 // packages/cli/src/zed-integration/zedIntegration.ts
 import { randomUUID as randomUUID7 } from "crypto";
+
+// packages/cli/src/zed-integration/autoCompress.ts
+init_esbuild_polyfill();
+init_dist6();
+async function* streamWithAutoCompressAndRetry(options2) {
+  const { createStream, compress, isRetryableError, onRetry } = options2;
+  let alreadyRetried = false;
+  while (true) {
+    let emittedChunk = false;
+    try {
+      const stream4 = await createStream();
+      for await (const event of stream4) {
+        if (event.type === StreamEventType.CHUNK) {
+          emittedChunk = true;
+        }
+        yield event;
+      }
+      return;
+    } catch (error41) {
+      if (alreadyRetried || emittedChunk || !isRetryableError(error41)) {
+        throw error41;
+      }
+      alreadyRetried = true;
+      const didCompress = await compress();
+      if (!didCompress) {
+        throw error41;
+      }
+      if (onRetry) {
+        await onRetry();
+      }
+      yield { type: StreamEventType.RETRY };
+    }
+  }
+}
+
+// packages/cli/src/zed-integration/acpTelemetry.ts
+init_esbuild_polyfill();
+init_dist6();
+function extractPromptTextForTelemetry(blocks) {
+  return blocks.filter(
+    (p) => p.type === "text" && typeof p.text === "string"
+  ).map((p) => p.text).join("\n");
+}
+function emitAcpUserPromptTelemetry(params) {
+  const prompt = extractPromptTextForTelemetry(params.promptBlocks);
+  logUserPrompt(
+    params.config,
+    new UserPromptEvent(
+      prompt.length,
+      params.promptId,
+      params.authType,
+      prompt
+    )
+  );
+}
+function emitAcpApiRequestTelemetry(params) {
+  logApiRequest(
+    params.config,
+    new ApiRequestEvent(params.model, params.promptId)
+  );
+}
+function emitAcpApiResponseTelemetry(params) {
+  const responseId = typeof params.responseId === "string" && params.responseId.trim().length > 0 ? params.responseId : `${params.promptId}-${Date.now()}`;
+  logApiResponse(
+    params.config,
+    new ApiResponseEvent(
+      responseId,
+      params.model,
+      params.durationMs,
+      params.promptId,
+      params.authType,
+      params.usageMetadata,
+      params.responseText
+    )
+  );
+}
+
+// packages/cli/src/zed-integration/zedIntegration.ts
 function getAcpAuthMethods() {
   if (!process.env.CUSTOM_AUTH) {
     return [
@@ -506611,6 +507433,45 @@ var GeminiAgent = class {
     }
     return session.prompt(params);
   }
+  async extMethod(method, params) {
+    if (method === "workspace/suggest_paths") {
+      const parsed = external_exports.object({
+        sessionId: external_exports.string(),
+        pattern: external_exports.string(),
+        maxResults: external_exports.number().optional()
+      }).safeParse(params);
+      if (!parsed.success) {
+        throw RequestError3.invalidParams(parsed.error.format());
+      }
+      const { sessionId: sessionId2, pattern, maxResults } = parsed.data;
+      const session = this.sessions.get(sessionId2);
+      if (!session) {
+        throw new Error(`Session not found: ${sessionId2}`);
+      }
+      const max = maxResults ?? 20;
+      const paths = await session.suggestPaths(pattern, max);
+      return { paths };
+    }
+    if (method === "slash/complete") {
+      const parsed = external_exports.object({
+        sessionId: external_exports.string(),
+        line: external_exports.string(),
+        maxResults: external_exports.number().optional()
+      }).safeParse(params);
+      if (!parsed.success) {
+        throw RequestError3.invalidParams(parsed.error.format());
+      }
+      const { sessionId: sessionId2, line, maxResults } = parsed.data;
+      const session = this.sessions.get(sessionId2);
+      if (!session) {
+        throw new Error(`Session not found: ${sessionId2}`);
+      }
+      const max = maxResults ?? 20;
+      const items = await session.completeSlash(line, max);
+      return { items };
+    }
+    throw RequestError3.methodNotFound(`_${method}`);
+  }
 };
 var Session2 = class {
   constructor(id, config4, settings, client) {
@@ -506622,9 +507483,41 @@ var Session2 = class {
   }
   pendingPrompt = null;
   slashCommands;
+  fileSearch = null;
   getChat() {
     return this.config.getGeminiClient().getChat();
   }
+  async ensureFileSearch() {
+    if (this.fileSearch) return this.fileSearch;
+    const root = this.config.getTargetDir();
+    const opts = this.config.getFileFilteringOptions?.();
+    const searcher = new FileSearch({
+      projectRoot: root,
+      ignoreDirs: [],
+      useGitignore: opts?.respectGitIgnore ?? true,
+      useGeminiignore: opts?.respectGeminiIgnore ?? true,
+      cache: true,
+      cacheTtl: 30,
+      maxDepth: !(this.config.getEnableRecursiveFileSearch?.() ?? true) ? 0 : void 0
+    });
+    await searcher.initialize();
+    this.fileSearch = searcher;
+    return searcher;
+  }
+  async suggestPaths(pattern, maxResults) {
+    const searcher = await this.ensureFileSearch();
+    const results = await searcher.search(pattern, { maxResults });
+    return results.filter((p) => !/\s/.test(p)).slice(0, maxResults);
+  }
+  async completeSlash(line, maxResults) {
+    const controller = new AbortController();
+    const items = await this.slashCommands.complete(
+      line,
+      controller.signal,
+      maxResults
+    );
+    return items.slice(0, maxResults);
+  }
   async advertiseAvailableCommands() {
     const controller = new AbortController();
     const availableCommands = await this.slashCommands.getAvailableCommands(
@@ -506647,7 +507540,8 @@ var Session2 = class {
     const pendingSend = new AbortController();
     this.pendingPrompt = pendingSend;
     const promptId = Math.random().toString(16).slice(2);
-    const chat = this.getChat();
+    const geminiClient = this.config.getGeminiClient();
+    const authType = this.config.getContentGeneratorConfig()?.authType;
     const firstText = params.prompt.find(
       (p) => p.type === "text" && typeof p.text === "string"
     )?.text ?? "";
@@ -506661,7 +507555,8 @@ var Session2 = class {
         const prefix = slashResult.messageType === "error" ? "Error: " : "";
         await this.sendUpdate({
           sessionUpdate: "agent_message_chunk",
-          content: { type: "text", text: `${prefix}${slashResult.content}` }
+          content: { type: "text", text: `${prefix}${slashResult.content}` },
+          ...slashResult.meta ? { _meta: slashResult.meta } : {}
         });
         return { stopReason: "end_turn" };
       }
@@ -506681,6 +507576,12 @@ var Session2 = class {
         }
       }
     }
+    emitAcpUserPromptTelemetry({
+      config: this.config,
+      promptId,
+      authType,
+      promptBlocks: promptBlocksForModel
+    });
     const parts = await this.#resolvePrompt(
       promptBlocksForModel,
       pendingSend.signal
@@ -506688,21 +507589,68 @@ var Session2 = class {
     let nextMessage = { role: "user", parts };
     while (nextMessage !== null) {
       if (pendingSend.signal.aborted) {
-        chat.addHistory(nextMessage);
+        this.getChat().addHistory(nextMessage);
         return { stopReason: "cancelled" };
       }
       const functionCalls = [];
+      const currentMessageParts = nextMessage.parts ?? [];
       try {
-        const responseStream = await chat.sendMessageStream(
-          this.config.getModel(),
-          {
-            message: nextMessage?.parts ?? [],
-            config: {
-              abortSignal: pendingSend.signal
+        const modelForRequest = this.config.getModel();
+        const requestStartedAt = Date.now();
+        let aggregatedResponseText = "";
+        let usageMetadata;
+        let responseId = "";
+        emitAcpApiRequestTelemetry({
+          config: this.config,
+          promptId,
+          model: modelForRequest
+        });
+        const responseStream = streamWithAutoCompressAndRetry({
+          createStream: async () => {
+            const preCompressed = await geminiClient.tryCompressChat(
+              promptId,
+              false
+            );
+            if (preCompressed && this.config.getDebugMode()) {
+              await this.sendUpdate({
+                sessionUpdate: "agent_thought_chunk",
+                content: {
+                  type: "text",
+                  text: `[Auto-Compress] Pre-send compression: ${preCompressed.originalTokenCount} \u2192 ${preCompressed.newTokenCount} tokens`
+                }
+              });
             }
+            const chat = this.getChat();
+            return await chat.sendMessageStream(
+              this.config.getModel(),
+              {
+                message: currentMessageParts,
+                config: {
+                  abortSignal: pendingSend.signal
+                }
+              },
+              promptId
+            );
           },
-          promptId
-        );
+          compress: async () => {
+            const compressed = await geminiClient.tryCompressChat(
+              promptId,
+              true
+            );
+            return compressed !== null;
+          },
+          isRetryableError: (error41) => !pendingSend.signal.aborted && isContextWindowExceededError(error41),
+          onRetry: async () => {
+            if (!this.config.getDebugMode()) return;
+            await this.sendUpdate({
+              sessionUpdate: "agent_thought_chunk",
+              content: {
+                type: "text",
+                text: "[Auto-Compress] Context too long; compressed history and retrying."
+              }
+            });
+          }
+        });
         nextMessage = null;
         const thinkTagProcessor2 = new ThinkTagStreamProcessor();
         thinkTagProcessor2.reset();
@@ -506714,6 +507662,14 @@ var Session2 = class {
             continue;
           }
           const resp = event.type === StreamEventType.CHUNK ? event.value : event;
+          const maybeResponseId = resp?.responseId ?? resp?.response_id;
+          if (typeof maybeResponseId === "string" && maybeResponseId) {
+            responseId = maybeResponseId;
+          }
+          const maybeUsage = resp?.usageMetadata;
+          if (maybeUsage && typeof maybeUsage === "object") {
+            usageMetadata = maybeUsage;
+          }
           if (resp.candidates && resp.candidates.length > 0) {
             const candidate = resp.candidates[0];
             const parts2 = candidate.content?.parts ?? [];
@@ -506740,6 +507696,7 @@ var Session2 = class {
                   });
                 }
                 if (content.length > 0) {
+                  aggregatedResponseText += content;
                   this.sendUpdate({
                     sessionUpdate: "agent_message_chunk",
                     content: { type: "text", text: content }
@@ -506752,6 +507709,17 @@ var Session2 = class {
             functionCalls.push(...resp.functionCalls);
           }
         }
+        const durationMs = Date.now() - requestStartedAt;
+        emitAcpApiResponseTelemetry({
+          config: this.config,
+          promptId,
+          authType,
+          model: modelForRequest,
+          responseId,
+          durationMs,
+          usageMetadata,
+          responseText: aggregatedResponseText
+        });
       } catch (error41) {
         if (getErrorStatus(error41) === 429) {
           throw new RequestError3(
@@ -506778,10 +507746,10 @@ var Session2 = class {
       } else {
         if (!pendingSend.signal.aborted) {
           try {
-            const geminiClient = this.config.getGeminiClient();
+            const geminiClient2 = this.config.getGeminiClient();
             const nextSpeakerCheck = await checkNextSpeaker(
               this.getChat(),
-              geminiClient,
+              geminiClient2,
               pendingSend.signal
             );
             logNextSpeakerCheck(
@@ -506973,7 +507941,25 @@ var Session2 = class {
       });
     }
     try {
-      const toolResult = await invocation.execute(abortSignal);
+      const updateOutput2 = (output) => {
+        void (async () => {
+          await this.sendUpdate({
+            sessionUpdate: "tool_call_update",
+            toolCallId: callId,
+            status: "in_progress",
+            content: [
+              {
+                type: "content",
+                content: { type: "text", text: output }
+              }
+            ]
+          });
+        })();
+      };
+      const toolResult = await invocation.execute(
+        abortSignal,
+        updateOutput2
+      );
       const content = toToolCallContent(toolResult);
       await this.sendUpdate({
         sessionUpdate: "tool_call_update",