@qwen-code/qwen-code 0.22.2 → 0.22.3-nightly.20260831.3a0c4c6108

package/chunks/{chunk-G34IR3D6.js → chunk-U5RTYI7D.js}

@@ -2,12 +2,12 @@
 "use strict";
 import {
   buildPermissionSettings
-} from "./chunk-KEKZFOL6.js";
+} from "./chunk-JPKTAQS3.js";
 import {
   resolveVoiceStreamConfig,
   resolveVoiceTranscriptionConfig,
   transcribeVoiceAudio
-} from "./chunk-JCQD3INC.js";
+} from "./chunk-YNG7XAJU.js";
 import {
   getVoiceSettingsScope,
   isSelectableVoiceModel,
@@ -16,20 +16,15 @@ import {
   readVoiceMode,
   readVoiceModel,
   resolveVoiceTransport
-} from "./chunk-XRSOI3DL.js";
+} from "./chunk-BE5FGT5Z.js";
 import {
   MCP_RESTART_SERVER_DEADLINE_MS
 } from "./chunk-OCPBI7J5.js";
-import {
-  resolveSkillSettings
-} from "./chunk-Z4X5MTRT.js";
 import {
   WorkspacePermissionRulesSessionRequiredError,
   WorkspaceSettingsPartialPersistError,
-  WorkspaceSkillNotFoundError,
-  WorkspaceSkillNotToggleableError,
-  mapWorkspaceSkillToggleError
-} from "./chunk-Z7VOMGDC.js";
+  WorkspaceSkillNotFoundError
+} from "./chunk-FTJMWDND.js";
 import {
   BridgeChannelClosedError,
   SERVE_CONTROL_EXT_METHODS,
@@ -43,7 +38,7 @@ import {
   createIdleWorkspaceProvidersStatus,
   createIdleWorkspaceSkillsStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-JHS74YAB.js";
+} from "./chunk-J4Y3QJHF.js";
 import {
   McpServerNotFoundError,
   McpServerRestartFailedError,
@@ -52,27 +47,27 @@ import {
   WorkspaceInitPathEscapeError,
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError
-} from "./chunk-ERFDKH32.js";
+} from "./chunk-YPISTYEI.js";
 import {
   getPersistScopeForModelSelection,
   loadSettings
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-AAX236AR.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-V4QXXQJ2.js";
+} from "./chunk-I75VKFCJ.js";
 import {
   ModelsConfig,
   SkillManager,
   require_yauzl
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ZBDYI7VM.js";
 import {
   Storage,
   createDebugLogger
-} from "./chunk-UHQFIS7N.js";
+} from "./chunk-EAHOJF6V.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
-} from "./chunk-KGJGEEVR.js";
+} from "./chunk-7FA2II6K.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -357,6 +352,15 @@ function validateWorkspaceSkillName(name) {
   return normalized;
 }
 __name(validateWorkspaceSkillName, "validateWorkspaceSkillName");
+function rejectInstallArtifactSkillName(name) {
+  if (/\.(backup|installing)-\d+-\d+$/.test(name)) {
+    skillError(
+      "invalid_skill_name",
+      "Skill name ends with a reserved install-artifact suffix"
+    );
+  }
+}
+__name(rejectInstallArtifactSkillName, "rejectInstallArtifactSkillName");
 function decodeBase64(value) {
   if (!value || !/^[A-Za-z0-9+/]*={0,2}$/.test(value)) {
     skillError("invalid_skill_source", "Invalid base64 skill content");
@@ -949,6 +953,7 @@ __name(ensureDirectoryWithoutSymlinks, "ensureDirectoryWithoutSymlinks");
 async function installWorkspaceSkill(workspace, request, githubToken, assertGenerationOpen) {
   assertGenerationOpen?.();
   const skillName = validateWorkspaceSkillName(request.name);
+  rejectInstallArtifactSkillName(skillName);
   const files = await filesFromSource(request.source, githubToken);
   const baseDir = skillBaseDir(workspace, request.scope);
   assertGenerationOpen?.();
@@ -1171,11 +1176,20 @@ function createDaemonWorkspaceService(deps) {
     });
   }, "loadBoundSettings");
   const assertActiveGeneration = /* @__PURE__ */ __name(() => assertGenerationOpen?.(), "assertActiveGeneration");
+  const loggedPreheatFailures = /* @__PURE__ */ new WeakSet();
+  const logPreheatFailure = /* @__PURE__ */ __name((err) => {
+    if (typeof err === "object" && err !== null) {
+      if (loggedPreheatFailures.has(err)) return;
+      loggedPreheatFailures.add(err);
+    }
+    writeStderrLineSafe(
+      `qwen serve: ACP preheat failed: ${err instanceof Error ? err.message : String(err)}`
+    );
+  }, "logPreheatFailure");
   let lastWorkspaceSkillsStatus;
   let lastWorkspaceSkillsStatusAt = 0;
   let workspaceSkillsGeneration = 0;
   let inFlightWorkspaceSkillsStatus;
-  let inFlightAcpPreheat;
   const invalidateWorkspaceSkillsSnapshot = /* @__PURE__ */ __name(() => {
     workspaceSkillsGeneration += 1;
     lastWorkspaceSkillsStatus = void 0;
@@ -1295,10 +1309,10 @@ function createDaemonWorkspaceService(deps) {
         ...result,
         durationMs: Math.max(0, Math.round(performance.now() - startedAt))
       }), "finish");
-      if (channelLive()) {
-        return finish({ ready: true, channelLive: true });
-      }
       if (!preheatAcpChildOnBridge) {
+        if (channelLive()) {
+          return finish({ ready: true, channelLive: true });
+        }
         return finish({
           ready: false,
           channelLive: false,
@@ -1306,35 +1320,10 @@ function createDaemonWorkspaceService(deps) {
           error: "ACP preheat is unavailable"
         });
       }
-      if (!inFlightAcpPreheat) {
-        const promise = Promise.resolve().then(preheatAcpChildOnBridge);
-        inFlightAcpPreheat = promise;
-        void promise.then(
-          () => {
-            if (inFlightAcpPreheat === promise) {
-              inFlightAcpPreheat = void 0;
-            }
-          },
-          (err) => {
-            try {
-              writeStderrLineSafe(
-                `qwen serve: ACP preheat failed: ${err instanceof Error ? err.message : String(err)}`
-              );
-            } finally {
-              if (inFlightAcpPreheat === promise) {
-                inFlightAcpPreheat = void 0;
-              }
-            }
-          }
-        );
-      }
-      const sharedPreheat = inFlightAcpPreheat;
+      const preheat = Promise.resolve().then(() => preheatAcpChildOnBridge());
+      void preheat.catch(logPreheatFailure);
       try {
-        await withTimeout(
-          sharedPreheat,
-          opts?.timeoutMs ?? 5e3,
-          "ACP preheat"
-        );
+        await withTimeout(preheat, opts?.timeoutMs ?? 5e3, "ACP preheat");
       } catch (err) {
         if (err instanceof TimeoutError) {
           writeStderrLineSafe(
@@ -1603,31 +1592,10 @@ function createDaemonWorkspaceService(deps) {
     },
     async setWorkspaceSkillEnabled(ctx, requestedSkillName, enabled) {
       assertActiveGeneration();
-      const normalizedName = requestedSkillName.trim().toLowerCase();
-      const status = await getWorkspaceSkillsStatus();
-      const skill = status.skills.find(
-        (candidate) => candidate.name.trim().toLowerCase() === normalizedName
-      );
-      if (!skill) throw new WorkspaceSkillNotFoundError(requestedSkillName);
-      if (skill.userInvocable === false) {
-        throw new WorkspaceSkillNotToggleableError(
-          skill.name,
-          "not_user_invocable"
-        );
-      }
-      const needsLegacyInactiveCheck = skill.level === "extension" && skill.status === "disabled" && skill.disabledReason === void 0;
-      const disabledBySettings = needsLegacyInactiveCheck && resolveSkillSettings(loadBoundSettings(true)).disabledNames.has(
-        normalizedName
-      );
-      if (skill.level === "extension" && skill.status === "disabled" && (skill.disabledReason === "inactive_extension" || skill.disabledReason === void 0 && !disabledBySettings)) {
-        throw new WorkspaceSkillNotToggleableError(
-          skill.name,
-          "inactive_extension"
-        );
-      }
+      const skillName = requestedSkillName.trim();
       const persisted = await persistDisabledSkills(
         boundWorkspace,
-        skill.name,
+        skillName,
         enabled,
         assertGenerationOpen
       );
@@ -1669,7 +1637,7 @@ function createDaemonWorkspaceService(deps) {
           }
         ];
         const mutation = createSkillToggleMutation({
-          skills: [{ name: skill.name, enabled }],
+          skills: [{ name: skillName, enabled }],
           activation,
           sessionsRefreshed,
           sessionsFailed
@@ -1688,7 +1656,7 @@ function createDaemonWorkspaceService(deps) {
         }
       }
       return {
-        skillName: skill.name,
+        skillName,
         enabled,
         changed: persisted.changed,
         activation,
@@ -1698,54 +1666,10 @@ function createDaemonWorkspaceService(deps) {
     },
     async setWorkspaceSkillsEnabled(ctx, requestedSkillNames, enabled) {
       assertActiveGeneration();
-      const status = await getWorkspaceSkillsStatus();
-      const skillsByName = /* @__PURE__ */ new Map();
-      for (const skill of status.skills) {
-        const normalizedName = skill.name.trim().toLowerCase();
-        if (!skillsByName.has(normalizedName)) {
-          skillsByName.set(normalizedName, skill);
-        }
-      }
-      const disabledNames = resolveSkillSettings(
-        loadBoundSettings(true)
-      ).disabledNames;
-      const targets = [];
-      for (const requestedName of requestedSkillNames) {
-        const normalizedName = requestedName.trim().toLowerCase();
-        const skill = skillsByName.get(normalizedName);
-        if (!skill) {
-          targets.push({ requestedName, skillName: requestedName });
-          continue;
-        }
-        let domainError;
-        if (skill.userInvocable === false) {
-          domainError = new WorkspaceSkillNotToggleableError(
-            skill.name,
-            "not_user_invocable"
-          );
-        } else {
-          const legacyInactive = skill.level === "extension" && skill.status === "disabled" && skill.disabledReason === void 0 && !disabledNames.has(normalizedName);
-          if (skill.level === "extension" && skill.status === "disabled" && (skill.disabledReason === "inactive_extension" || legacyInactive)) {
-            domainError = new WorkspaceSkillNotToggleableError(
-              skill.name,
-              "inactive_extension"
-            );
-          }
-        }
-        if (domainError) {
-          const error = mapWorkspaceSkillToggleError(domainError);
-          if (!error) throw domainError;
-          targets.push({ requestedName, error });
-        } else {
-          targets.push({ requestedName, skillName: skill.name });
-        }
-      }
-      const validSkillNames = targets.flatMap(
-        (target) => "skillName" in target ? [target.skillName] : []
-      );
-      const persisted = validSkillNames.length > 0 ? await persistDisabledSkillsBatch(
+      const skillNames = requestedSkillNames.map((name) => name.trim());
+      const persisted = skillNames.length > 0 ? await persistDisabledSkillsBatch(
         boundWorkspace,
-        validSkillNames,
+        skillNames,
         enabled,
         assertGenerationOpen
       ) : { outcomes: [], settingsChanges: [] };
@@ -1757,31 +1681,18 @@ function createDaemonWorkspaceService(deps) {
         ])
       );
       const results = [];
-      const errors = [];
-      for (const target of targets) {
-        if ("error" in target) {
-          errors.push(target.error);
-          continue;
-        }
-        const outcome = persistedByName.get(
-          target.skillName.trim().toLowerCase()
-        );
+      for (const skillName of skillNames) {
+        const outcome = persistedByName.get(skillName.toLowerCase());
         if (!outcome) {
           throw new Error(
-            `Missing persisted Skill batch outcome: ${target.skillName}`
+            `Missing persisted Skill batch outcome: ${skillName}`
           );
         }
-        if ("error" in outcome) {
-          const error = mapWorkspaceSkillToggleError(outcome.error);
-          if (!error) throw outcome.error;
-          errors.push(error);
-        } else {
-          results.push({
-            skillName: outcome.skillName,
-            enabled,
-            changed: outcome.changed
-          });
-        }
+        results.push({
+          skillName: outcome.skillName,
+          enabled,
+          changed: outcome.changed
+        });
       }
       const changed = results.some((result) => result.changed);
       const channelLive = isChannelLive?.() ?? false;
@@ -1837,7 +1748,7 @@ function createDaemonWorkspaceService(deps) {
         sessionsRefreshed,
         sessionsFailed,
         results,
-        errors
+        errors: []
       };
     },
     async installWorkspaceSkill(_ctx, request) {
@@ -2096,10 +2007,16 @@ function createDaemonWorkspaceService(deps) {
     },
     async reload(ctx) {
       assertActiveGeneration();
+      let runtimeEnvironmentApplied;
       if (deps.reloadDaemonEnv) {
         try {
-          await deps.reloadDaemonEnv(boundWorkspace, assertGenerationOpen);
+          const result = await deps.reloadDaemonEnv(
+            boundWorkspace,
+            assertGenerationOpen
+          );
+          runtimeEnvironmentApplied = result.runtimeEnvironmentApplied;
         } catch (err) {
+          runtimeEnvironmentApplied = false;
           writeStderrLine(
             `qwen serve: daemon reload failed: ${err instanceof Error ? err.message : String(err)}`
           );
@@ -2143,7 +2060,8 @@ function createDaemonWorkspaceService(deps) {
           childReloaded,
           sessionsRefreshed,
           sessionsSkipped,
-          childError
+          childError,
+          ...runtimeEnvironmentApplied === void 0 ? {} : { runtimeEnvironmentApplied }
         },
         originatorClientId: ctx.originatorClientId
       });
@@ -2153,9 +2071,47 @@ function createDaemonWorkspaceService(deps) {
         childReloaded,
         sessionsRefreshed,
         sessionsSkipped,
-        childError
+        childError,
+        ...runtimeEnvironmentApplied === void 0 ? {} : { runtimeEnvironmentApplied }
       };
     },
+    async reloadModelProviders(_ctx) {
+      assertActiveGeneration();
+      let failed = false;
+      const reloadModelProvidersDaemonEnv = deps.reloadModelProvidersDaemonEnv ?? deps.reloadDaemonEnv;
+      if (reloadModelProvidersDaemonEnv) {
+        try {
+          const result = await reloadModelProvidersDaemonEnv(
+            boundWorkspace,
+            assertGenerationOpen
+          );
+          failed = result.runtimeEnvironmentApplied === false;
+        } catch {
+          assertActiveGeneration();
+          failed = true;
+          writeStderrLine(
+            "qwen serve: model-provider parent environment sync failed"
+          );
+        }
+      }
+      assertActiveGeneration();
+      try {
+        const child = await invokeWorkspaceCommand(
+          SERVE_CONTROL_EXT_METHODS.workspaceModelProvidersReload,
+          { cwd: boundWorkspace },
+          { timeoutMs: 3e4 }
+        );
+        if ((child.configsFailed ?? 0) > 0) failed = true;
+        return { status: failed ? "failed" : "applied" };
+      } catch (err) {
+        assertActiveGeneration();
+        if (err instanceof SessionNotFoundError || err instanceof BridgeChannelClosedError) {
+          return { status: failed ? "failed" : "deferred" };
+        }
+        writeStderrLine("qwen serve: model-provider ACP child sync failed");
+        return { status: "failed" };
+      }
+    },
     invalidateWorkspaceSkillsStatus() {
       invalidateWorkspaceSkillsSnapshot();
     },

package/chunks/{chunk-TTX2JUE6.js → chunk-U6D2PPMN.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-UHQFIS7N.js";
+} from "./chunk-EAHOJF6V.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-D5LUXLUH.js → chunk-UJ4DUYIH.js}

@@ -5,11 +5,11 @@ import {
 } from "./chunk-VGC4I5JJ.js";
 import {
   atomicWriteJSON
-} from "./chunk-23RFD54N.js";
+} from "./chunk-KHP66DFN.js";
 import {
   Storage,
   getProjectHash
-} from "./chunk-UHQFIS7N.js";
+} from "./chunk-EAHOJF6V.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -24,6 +24,19 @@ import * as path from "node:path";
 var MAX_TASK_RUNS = 20;
 var MAX_CHANNEL_DELIVERY_NAME_LENGTH = 2048;
 var MAX_CHANNEL_DELIVERY_TARGET_ID_LENGTH = 2048;
+function annotateCronRunSession(task, firedAt, outcome) {
+  const index = task.runs?.findIndex((run2) => run2.at === firedAt) ?? -1;
+  if (index < 0 || !task.runs) return task;
+  const run = { ...task.runs[index] };
+  delete run.sessionId;
+  delete run.sessionDispatchFailed;
+  if (outcome.sessionId) run.sessionId = outcome.sessionId;
+  if (outcome.dispatchFailed) run.sessionDispatchFailed = true;
+  const runs = [...task.runs];
+  runs[index] = run;
+  return { ...task, runs };
+}
+__name(annotateCronRunSession, "annotateCronRunSession");
 function appendCronRun(runs, entry) {
   const base = Array.isArray(runs) ? runs : [];
   const next = [...base, entry];
@@ -200,7 +213,7 @@ function isValidRuns(value) {
   return value.every((entry) => {
     if (typeof entry !== "object" || entry === null) return false;
     const run = entry;
-    return isFiniteTimestamp(run["at"]) && (run["kind"] === void 0 || typeof run["kind"] === "string") && (run["sessionId"] === void 0 || typeof run["sessionId"] === "string") && // Read-only legacy compat: validate so a stored `withheld` marker isn't
+    return isFiniteTimestamp(run["at"]) && (run["kind"] === void 0 || typeof run["kind"] === "string") && (run["sessionId"] === void 0 || typeof run["sessionId"] === "string") && (run["sessionDispatchFailed"] === void 0 || typeof run["sessionDispatchFailed"] === "boolean") && // Read-only legacy compat: validate so a stored `withheld` marker isn't
     // rejected on read (it is never written anymore).
     (run["withheld"] === void 0 || typeof run["withheld"] === "boolean");
   });
@@ -229,13 +242,14 @@ function isValidTask(value) {
   (obj["name"] === void 0 || typeof obj["name"] === "string") && (obj["enabled"] === void 0 || typeof obj["enabled"] === "boolean") && (obj["disabledByArchive"] === void 0 || typeof obj["disabledByArchive"] === "boolean") && // A bound sessionId must be a NON-EMPTY string: an empty string would pass
   // a bare `typeof` check but the scheduler's truthy `task.sessionId` guard
   // would treat it as unbound, so a "bound" task would silently run unbound.
-  (obj["sessionId"] === void 0 || typeof obj["sessionId"] === "string" && obj["sessionId"].length > 0) && (obj["sessionOwnedByTask"] === void 0 || typeof obj["sessionOwnedByTask"] === "boolean") && (obj["delivery"] === void 0 || isValidDelivery(obj["delivery"])) && (obj["runs"] === void 0 || isValidRuns(obj["runs"]));
+  (obj["sessionId"] === void 0 || typeof obj["sessionId"] === "string" && obj["sessionId"].length > 0) && (obj["sessionOwnedByTask"] === void 0 || typeof obj["sessionOwnedByTask"] === "boolean") && (obj["sessionMode"] === void 0 || obj["sessionMode"] === "persistent" || obj["sessionMode"] === "per_run") && (obj["delivery"] === void 0 || isValidDelivery(obj["delivery"])) && (obj["runs"] === void 0 || isValidRuns(obj["runs"]));
 }
 __name(isValidTask, "isValidTask");
 
 export {
   MAX_CHANNEL_DELIVERY_NAME_LENGTH,
   MAX_CHANNEL_DELIVERY_TARGET_ID_LENGTH,
+  annotateCronRunSession,
   appendCronRun,
   taskHasLegacyCondition,
   taskHasLegacyRunMode,

package/chunks/{chunk-A7YP63XN.js → chunk-UKB2TZAO.js}

@@ -2,23 +2,23 @@
 "use strict";
 import {
   getErrorMessage
-} from "./chunk-L6YT5H34.js";
+} from "./chunk-MJBHSZEJ.js";
 import {
   extensionToOutputString,
   getExtensionManager
-} from "./chunk-PFCQ62V4.js";
+} from "./chunk-H2A2GJGL.js";
 import {
   loadSettings
-} from "./chunk-F7TNAPZ4.js";
+} from "./chunk-AAX236AR.js";
 import {
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-EU2B4P3D.js";
 import {
   writeStderrLine,
   writeStdoutLine
-} from "./chunk-KGJGEEVR.js";
+} from "./chunk-7FA2II6K.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-VTHREBQM.js → chunk-UKYXYWI2.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   isTeamAutoMemPath
-} from "./chunk-6PJOTWAN.js";
+} from "./chunk-HT5S5TRQ.js";
 import {
   createDebugLogger
-} from "./chunk-UHQFIS7N.js";
+} from "./chunk-EAHOJF6V.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-2NYCN6F2.js → chunk-UVYKCRJZ.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   theme
-} from "./chunk-WAOIHTJS.js";
+} from "./chunk-PDAKFU7M.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -20,11 +20,11 @@ import {
 import {
   collectInlineImages,
   extractInlineContentRuns
-} from "./chunk-TPI7O7HR.js";
+} from "./chunk-7DDTI7Q3.js";
 import {
   formatHistoryGapNotice,
   indexGapsByChild
-} from "./chunk-XDLEZ5HX.js";
+} from "./chunk-OQYXJK2V.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -33,24 +33,26 @@ import {
 } from "./chunk-QHTIBUWB.js";
 import {
   t
-} from "./chunk-LDP5OD6N.js";
+} from "./chunk-EU2B4P3D.js";
 import {
   isGoalCheckpointBookkeepingRecord
-} from "./chunk-KUX5D6DK.js";
+} from "./chunk-NT7LXVV5.js";
 import {
   getToolResponseDisplayText
-} from "./chunk-TGWAQ5RB.js";
+} from "./chunk-ZBDYI7VM.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import {
   GoalPersistenceUnavailableError,
-  parseGoalStateRecordPayloadV2,
+  parseGoalStateRecordPayloadV2
+} from "./chunk-4P7PPAHN.js";
+import {
   projectUserTranscriptForDisplay
-} from "./chunk-WKK5BQNP.js";
+} from "./chunk-7J6OTNGO.js";
 import {
   ToolDisplayNames
-} from "./chunk-UTLCH2FK.js";
+} from "./chunk-LYSZVCCD.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2423,7 +2425,7 @@ var ICON = {
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 init_esbuild_shims();
 
-// packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
+// packages/cli/src/ui/components/RespondingSpinner.tsx
 init_esbuild_shims();
 var import_react3 = __toESM(require_react(), 1);
 
@@ -2473,27 +2475,24 @@ var SCREEN_READER_MODEL_PREFIX = "Model: ";
 var SCREEN_READER_LOADING = "loading";
 var SCREEN_READER_RESPONDING = "responding";
 
-// packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
+// packages/cli/src/ui/components/RespondingSpinner.tsx
 var import_jsx_runtime = __toESM(require_jsx_runtime(), 1);
 var TMUX_SPINNER_INTERVAL_MS = 750;
 var TMUX_SPINNER_FRAMES = [". ", ".."];
-var GeminiRespondingSpinner = /* @__PURE__ */ __name(({ nonRespondingDisplay, spinnerType = "dots" }) => {
+var RespondingSpinner = /* @__PURE__ */ __name(({
+  nonRespondingDisplay,
+  spinnerType = "dots"
+}) => {
   const streamingState = useStreamingContext();
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   if (streamingState === "responding" /* Responding */) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      GeminiSpinner,
-      {
-        spinnerType,
-        altText: SCREEN_READER_RESPONDING
-      }
-    );
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Spinner2, { spinnerType, altText: SCREEN_READER_RESPONDING });
   } else if (nonRespondingDisplay) {
     return isScreenReaderEnabled ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { children: SCREEN_READER_LOADING }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: nonRespondingDisplay });
   }
   return null;
-}, "GeminiRespondingSpinner");
-var GeminiSpinner = /* @__PURE__ */ __name(({
+}, "RespondingSpinner");
+var Spinner2 = /* @__PURE__ */ __name(({
   spinnerType = "dots",
   altText
 }) => {
@@ -2516,7 +2515,7 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: TMUX_SPINNER_FRAMES[tmuxFrameIndex] });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: theme.text.primary, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(build_default, { type: spinnerType }) });
-}, "GeminiSpinner");
+}, "Spinner");
 
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 var import_jsx_runtime2 = (
@@ -2534,7 +2533,7 @@ var ToolStatusIndicator = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { minWidth: STATUS_INDICATOR_WIDTH, flexShrink: 0, children: [
     status === "Pending" /* Pending */ && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: theme.status.success, children: TOOL_STATUS.PENDING }),
     status === "Executing" /* Executing */ && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-      GeminiRespondingSpinner,
+      RespondingSpinner,
       {
         spinnerType: "toggle",
         nonRespondingDisplay: TOOL_STATUS.EXECUTING
@@ -2988,11 +2987,29 @@ function shouldDisplayGoalStateCause(cause) {
   }
 }
 __name(shouldDisplayGoalStateCause, "shouldDisplayGoalStateCause");
-async function waitForGoalRuntime(config) {
+async function waitForGoalRuntime(config, options = {}) {
+  const awaitReady = /* @__PURE__ */ __name(async () => {
+    try {
+      await config.getGoalRuntimeReady();
+    } catch (error) {
+      if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
+    }
+  }, "awaitReady");
+  const { timeoutMs } = options;
+  if (timeoutMs == null || timeoutMs <= 0) {
+    await awaitReady();
+    return true;
+  }
+  let timer;
+  const timeout = new Promise((resolve) => {
+    timer = setTimeout(() => resolve("timeout"), timeoutMs);
+    timer.unref?.();
+  });
   try {
-    await config.getGoalRuntimeReady();
-  } catch (error) {
-    if (!(error instanceof GoalPersistenceUnavailableError)) throw error;
+    const winner = await Promise.race([awaitReady(), timeout]);
+    return winner !== "timeout";
+  } finally {
+    if (timer) clearTimeout(timer);
   }
 }
 __name(waitForGoalRuntime, "waitForGoalRuntime");
@@ -3481,8 +3498,8 @@ export {
   build_default,
   StreamingContext,
   useStreamingContext,
-  GeminiRespondingSpinner,
-  GeminiSpinner,
+  RespondingSpinner,
+  Spinner2 as Spinner,
   STATUS_INDICATOR_WIDTH,
   ToolStatusIndicator,
   ToolElapsedTime,