@qwen-code/qwen-code 0.22.2-preview.0 → 0.22.2

package/chunks/{chunk-UX3IFLJM.js → chunk-L2M46FP5.js}

@@ -14,23 +14,23 @@ import {
   isCacheableReadResult,
   parsePDFPageRange,
   processSingleFileContent
-} from "./chunk-WBT3STGU.js";
+} from "./chunk-3I6UTTDX.js";
 import {
   isAnyAutoMemPath
-} from "./chunk-PVBT5QPD.js";
+} from "./chunk-6PJOTWAN.js";
 import {
   runSideQuery
-} from "./chunk-IPQA4SR5.js";
+} from "./chunk-BWORX6FA.js";
 import {
   generateLegacyMcpToolName,
   normalizeToolNameForProvider
 } from "./chunk-WZAD4ZNJ.js";
 import {
   InstallationManager
-} from "./chunk-SLEWBQWM.js";
+} from "./chunk-6DIGWMGT.js";
 import {
   atomicWriteFile
-} from "./chunk-7QGEJI7M.js";
+} from "./chunk-23RFD54N.js";
 import {
   safeJsonStringify
 } from "./chunk-HHJLM3WQ.js";
@@ -102,7 +102,7 @@ import {
   recordTokenUsageMetrics,
   recordToolCallMetrics,
   recordToolExecutionMetrics
-} from "./chunk-6US7BF3G.js";
+} from "./chunk-L6BZRIUL.js";
 import {
   SemanticAttributes,
   init_esm,
@@ -110,14 +110,14 @@ import {
 } from "./chunk-74TONY4F.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-VL4YX3FH.js";
+} from "./chunk-XF63PKEN.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   StructuredToolError,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-KOJ6MHD5.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   Storage,
   createDebugLogger,
@@ -128,7 +128,7 @@ import {
   realpathNearestExisting,
   shortenPath,
   unescapePath
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   require_dist
 } from "./chunk-75DOP5OR.js";
@@ -2757,6 +2757,7 @@ init_esbuild_shims();
 import { AsyncLocalStorage } from "node:async_hooks";
 var MAIN_SOURCE = "main";
 var subagentNameContext = new AsyncLocalStorage();
+var subagentIdentityContext = new AsyncLocalStorage();
 
 // packages/core/src/telemetry/uiTelemetry.ts
 var createInitialModelMetricsCore = /* @__PURE__ */ __name(() => ({
@@ -2785,6 +2786,24 @@ var cloneSessionMetrics = /* @__PURE__ */ __name((metrics) => {
       model.bySource
     );
   }
+  if (clone.sourceMeta) {
+    clone.sourceMeta = Object.assign(
+      /* @__PURE__ */ Object.create(null),
+      clone.sourceMeta
+    );
+  }
+  if (clone.sourceMetrics) {
+    clone.sourceMetrics = Object.assign(
+      /* @__PURE__ */ Object.create(null),
+      clone.sourceMetrics
+    );
+  }
+  if (clone.statsModels) {
+    clone.statsModels = Object.assign(
+      /* @__PURE__ */ Object.create(null),
+      clone.statsModels
+    );
+  }
   return clone;
 }, "cloneSessionMetrics");
 var createInitialSkillMetrics = /* @__PURE__ */ __name(() => ({
@@ -2799,6 +2818,21 @@ var createInitialGenerationMetrics = /* @__PURE__ */ __name(() => ({
   totalGenerationDurationMs: 0,
   totalThroughputOutputTokens: 0
 }), "createInitialGenerationMetrics");
+var getEventTotalTokenCount = /* @__PURE__ */ __name((event) => {
+  if (event.total_token_count > 0) return event.total_token_count;
+  const input = event.input_token_count > 0 ? event.input_token_count : event.cached_content_token_count;
+  const thoughtsIncludedInOutput = event.auth_type === "openai" || event.auth_type === "qwen-oauth";
+  return input + event.output_token_count + (thoughtsIncludedInOutput ? 0 : event.thoughts_token_count);
+}, "getEventTotalTokenCount");
+var getLegacySubagentId = /* @__PURE__ */ __name((event, sessionId) => {
+  if (!sessionId || !event.subagent_name || !event.prompt_id || isInternalPromptId(event.prompt_id)) {
+    return void 0;
+  }
+  const parts = event.prompt_id.split("#");
+  if (parts.length !== 3) return void 0;
+  const [promptSessionId, subagentId, round] = parts;
+  return promptSessionId === sessionId && subagentId && /^\d+$/.test(round) ? subagentId : void 0;
+}, "getLegacySubagentId");
 var createInitialMetrics = /* @__PURE__ */ __name(() => ({
   models: {},
   tools: {
@@ -2837,7 +2871,11 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
       if (!this.#sessionMetrics.has(sessionId)) {
         this.#sessionMetrics.set(sessionId, createInitialMetrics());
       }
-      this.#accumulateEvent(this.#sessionMetrics.get(sessionId), event);
+      this.#accumulateEvent(
+        this.#sessionMetrics.get(sessionId),
+        event,
+        sessionId
+      );
     }
     this.emit("update", {
       metrics: this.#metrics,
@@ -2987,13 +3025,13 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
       if (oldest) this.#closedSessions.delete(oldest);
     }
   }
-  #accumulateEvent(metrics, event) {
+  #accumulateEvent(metrics, event, sessionId) {
     switch (event["event.name"]) {
       case EVENT_API_RESPONSE:
-        this.#accumulateApiResponse(metrics, event);
+        this.#accumulateApiResponse(metrics, event, sessionId);
         return true;
       case EVENT_API_ERROR:
-        this.#accumulateApiError(metrics, event);
+        this.#accumulateApiError(metrics, event, sessionId);
         return true;
       case EVENT_TOOL_CALL:
         this.#accumulateToolCall(metrics, event);
@@ -3002,20 +3040,40 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
         return false;
     }
   }
-  #accumulateApiResponse(metrics, event) {
+  #accumulateApiResponse(metrics, event, sessionId) {
     const modelMetrics = this.#getOrCreateModelMetrics(metrics, event.model);
+    const statsModelMetrics = sessionId ? this.#getOrCreateStatsModelMetrics(metrics, event.model) : void 0;
     const sourceMetrics = this.#getOrCreateSourceMetrics(
       modelMetrics,
       event.subagent_name ?? MAIN_SOURCE
     );
-    for (const bucket of [modelMetrics, sourceMetrics]) {
+    const invocationMetrics = sessionId ? this.#getOrCreateInvocationMetrics(metrics, event, sessionId) : void 0;
+    const normalizedPromptTokens = event.input_token_count > 0 ? event.input_token_count : event.cached_content_token_count;
+    const normalizedTotalTokens = getEventTotalTokenCount(event);
+    const accumulate = /* @__PURE__ */ __name((bucket, prompt, total) => {
       bucket.api.totalRequests++;
       bucket.api.totalLatencyMs += event.duration_ms;
-      bucket.tokens.prompt += event.input_token_count;
+      bucket.tokens.prompt += prompt;
       bucket.tokens.candidates += event.output_token_count;
-      bucket.tokens.total += event.total_token_count;
+      bucket.tokens.total += total;
       bucket.tokens.cached += event.cached_content_token_count;
       bucket.tokens.thoughts += event.thoughts_token_count;
+    }, "accumulate");
+    accumulate(modelMetrics, event.input_token_count, event.total_token_count);
+    accumulate(sourceMetrics, event.input_token_count, event.total_token_count);
+    if (statsModelMetrics) {
+      accumulate(
+        statsModelMetrics,
+        normalizedPromptTokens,
+        normalizedTotalTokens
+      );
+    }
+    if (invocationMetrics) {
+      accumulate(
+        invocationMetrics,
+        normalizedPromptTokens,
+        normalizedTotalTokens
+      );
     }
     if (event.ttft_ms === void 0 || !Number.isFinite(event.ttft_ms) || event.ttft_ms < 0 || isInternalPromptId(event.prompt_id)) {
       return;
@@ -3035,18 +3093,40 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
       outputTokens: event.output_token_count
     };
   }
-  #accumulateApiError(metrics, event) {
+  #accumulateApiError(metrics, event, sessionId) {
     const modelMetrics = this.#getOrCreateModelMetrics(metrics, event.model);
+    const statsModelMetrics = sessionId ? this.#getOrCreateStatsModelMetrics(metrics, event.model) : void 0;
     const sourceMetrics = this.#getOrCreateSourceMetrics(
       modelMetrics,
       event.subagent_name ?? MAIN_SOURCE
     );
-    for (const bucket of [modelMetrics, sourceMetrics]) {
+    const invocationMetrics = sessionId ? this.#getOrCreateInvocationMetrics(metrics, event, sessionId) : void 0;
+    const buckets = [
+      modelMetrics,
+      ...statsModelMetrics ? [statsModelMetrics] : [],
+      sourceMetrics,
+      ...invocationMetrics ? [invocationMetrics] : []
+    ];
+    for (const bucket of buckets) {
       bucket.api.totalRequests++;
       bucket.api.totalErrors++;
       bucket.api.totalLatencyMs += event.duration_ms;
     }
   }
+  #getOrCreateInvocationMetrics(metrics, event, sessionId) {
+    const id = event.subagent_id ?? getLegacySubagentId(event, sessionId);
+    if (!id) return void 0;
+    const meta = metrics.sourceMeta ??= /* @__PURE__ */ Object.create(null);
+    const existingMeta = meta[id];
+    meta[id] = {
+      name: event.subagent_task_name ?? existingMeta?.name ?? event.subagent_name ?? id,
+      type: event.subagent_type ?? existingMeta?.type ?? event.subagent_name ?? ""
+    };
+    const sourceMetrics = metrics.sourceMetrics ??= /* @__PURE__ */ Object.create(
+      null
+    );
+    return sourceMetrics[id] ??= createInitialModelMetricsCore();
+  }
   #accumulateToolCall(metrics, event) {
     const { tools, files } = metrics;
     tools.totalCalls++;
@@ -3129,6 +3209,10 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
     }
     return metrics.models[modelName];
   }
+  #getOrCreateStatsModelMetrics(metrics, modelName) {
+    const statsModels = metrics.statsModels ??= /* @__PURE__ */ Object.create(null);
+    return statsModels[modelName] ??= createInitialModelMetricsCore();
+  }
   #getOrCreateSourceMetrics(modelMetrics, source) {
     if (!modelMetrics.bySource[source]) {
       modelMetrics.bySource[source] = createInitialModelMetricsCore();
@@ -4087,9 +4171,14 @@ function logRipgrepRuntimeRecovery(config, event) {
   logger.emit(logRecord);
 }
 __name(logRipgrepRuntimeRecovery, "logRipgrepRuntimeRecovery");
-function logApiError(config, event, sessionId) {
+function logApiError(config, event, sessionId, uiSubagentIdentity) {
   const uiEvent = {
     ...event,
+    ...uiSubagentIdentity ? {
+      subagent_id: uiSubagentIdentity.id,
+      subagent_type: uiSubagentIdentity.type,
+      subagent_task_name: uiSubagentIdentity.taskName
+    } : {},
     "event.name": EVENT_API_ERROR,
     "event.timestamp": (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -4153,9 +4242,14 @@ function logApiCancel(config, event) {
   logger.emit(logRecord);
 }
 __name(logApiCancel, "logApiCancel");
-function logApiResponse(config, event, sessionId) {
+function logApiResponse(config, event, sessionId, uiSubagentIdentity) {
   const uiEvent = {
     ...event,
+    ...uiSubagentIdentity ? {
+      subagent_id: uiSubagentIdentity.id,
+      subagent_type: uiSubagentIdentity.type,
+      subagent_task_name: uiSubagentIdentity.taskName
+    } : {},
     "event.name": EVENT_API_RESPONSE,
     "event.timestamp": (/* @__PURE__ */ new Date()).toISOString()
   };
@@ -5215,6 +5309,15 @@ __name(buildStub, "buildStub");
 // packages/core/src/tools/mcp-status.ts
 init_esbuild_shims();
 var serverStatuses = /* @__PURE__ */ new Map();
+var serverLastErrors = /* @__PURE__ */ new Map();
+function recordMCPServerLastError(serverName, message) {
+  serverLastErrors.set(serverName, message);
+}
+__name(recordMCPServerLastError, "recordMCPServerLastError");
+function getMCPServerLastError(serverName) {
+  return serverLastErrors.get(serverName);
+}
+__name(getMCPServerLastError, "getMCPServerLastError");
 var statusChangeListeners = [];
 function addMCPStatusChangeListener(listener) {
   statusChangeListeners.push(listener);
@@ -5229,12 +5332,16 @@ function removeMCPStatusChangeListener(listener) {
 __name(removeMCPStatusChangeListener, "removeMCPStatusChangeListener");
 function updateMCPServerStatus(serverName, status) {
   serverStatuses.set(serverName, status);
+  if (status === "connected" /* CONNECTED */) {
+    serverLastErrors.delete(serverName);
+  }
   for (const listener of [...statusChangeListeners]) {
     listener(serverName, status);
   }
 }
 __name(updateMCPServerStatus, "updateMCPServerStatus");
 function removeMCPServerStatus(serverName) {
+  serverLastErrors.delete(serverName);
   if (!serverStatuses.has(serverName)) {
     return;
   }
@@ -5376,6 +5483,7 @@ __name(collectText, "collectText");
 
 // packages/core/src/tools/mcp-tool.ts
 var debugLogger5 = createDebugLogger("MCP_TOOL");
+var MCP_DEAD_SESSION_ERROR_PATTERN = /session (not found|terminated|expired)/i;
 var MCP_CONNECTION_ERROR_PATTERNS = [
   /ECONNREFUSED/i,
   /ENOTFOUND/i,
@@ -5384,16 +5492,28 @@ var MCP_CONNECTION_ERROR_PATTERNS = [
   /connection (closed|lost)/i,
   /not connected/i,
   /disconnected/i,
-  /transport closed/i
+  /transport closed/i,
+  // The server no longer knows our session id (see
+  // `MCP_DEAD_SESSION_ERROR_PATTERN`) — the canonical failure right after an
+  // HTTP server restart. Reconnect (a fresh `initialize`) is the remedy.
+  MCP_DEAD_SESSION_ERROR_PATTERN
 ];
 var MCP_REQUEST_TIMEOUT_CODE = -32001;
+var MCP_DEAD_SESSION_HTTP_CODE = 404;
 function isMcpRequestTimeout(error) {
   return typeof error === "object" && error !== null && "code" in error && error.code === MCP_REQUEST_TIMEOUT_CODE;
 }
 __name(isMcpRequestTimeout, "isMcpRequestTimeout");
+function isMcpDeadSessionHttpError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === MCP_DEAD_SESSION_HTTP_CODE;
+}
+__name(isMcpDeadSessionHttpError, "isMcpDeadSessionHttpError");
 function isExecutionTimeoutFailure(error, serverName, signal) {
   if (signal.aborted) return false;
   if (!isMcpRequestTimeout(error)) return false;
+  if (MCP_DEAD_SESSION_ERROR_PATTERN.test(getErrorMessage(error))) {
+    return false;
+  }
   const statuses = getAllMCPServerStatuses();
   return !(statuses.has(serverName) && statuses.get(serverName) === "disconnected" /* DISCONNECTED */);
 }
@@ -5538,6 +5658,7 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
       throw error;
     }
     if (!this.canSafelyReplay()) {
+      await this.attemptReconnect();
       throw new Error(_DiscoveredMCPToolInvocation.UNSAFE_REPLAY_ERROR_MESSAGE);
     }
     if (this.retryCount < _DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES) {
@@ -5598,6 +5719,9 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
     if (getMCPServerStatus(this.serverName) === "disconnected" /* DISCONNECTED */) {
       return true;
     }
+    if (isMcpDeadSessionHttpError(error)) {
+      return true;
+    }
     const message = getErrorMessage(error);
     return MCP_CONNECTION_ERROR_PATTERNS.some(
       (pattern) => pattern.test(message)
@@ -8159,6 +8283,7 @@ export {
   runVisionBridge,
   MAIN_SOURCE,
   subagentNameContext,
+  subagentIdentityContext,
   isInternalPromptId,
   UiTelemetryService,
   uiTelemetryService,
@@ -8238,6 +8363,8 @@ export {
   isAlreadyTruncated,
   normalizeToolResultCallId,
   persistAndTruncateToolResult,
+  recordMCPServerLastError,
+  getMCPServerLastError,
   addMCPStatusChangeListener,
   removeMCPStatusChangeListener,
   updateMCPServerStatus,

package/chunks/{chunk-6US7BF3G.js → chunk-L6BZRIUL.js}

@@ -12,7 +12,7 @@ import {
   setSessionContext,
   setSessionIdOnContext,
   setShellTracePropagation
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   DiagLogLevel,
   ROOT_CONTEXT,
@@ -1054,7 +1054,7 @@ function initializeTelemetry(config) {
   telemetryInitPromise ??= (async () => {
     const debugLogger3 = createDebugLogger("OTEL");
     try {
-      const { startTelemetrySdk } = await import("./sdk-impl-VPNBLV7I.js");
+      const { startTelemetrySdk } = await import("./sdk-impl-HLSEDAEP.js");
       if (telemetryInitialized) return;
       const started = await startTelemetrySdk(config);
       if (!started) return;

package/chunks/{chunk-BGWT7VBV.js → chunk-L6YT5H34.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   JsonFormatter
-} from "./chunk-RUQBJS34.js";
+} from "./chunk-KUX5D6DK.js";
 import {
   parseAndFormatApiError
-} from "./chunk-D6XO27Z5.js";
+} from "./chunk-TGWAQ5RB.js";
 import {
   FatalBudgetExceededError,
   FatalCancellationError,
   FatalTurnLimitedError,
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   runExitCleanup
-} from "./chunk-RCDXSEJ5.js";
+} from "./chunk-Y6LSMB6J.js";
 import {
   writeStderrLine
 } from "./chunk-KGJGEEVR.js";

package/chunks/{chunk-W2WRNJKX.js → chunk-LDP5OD6N.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-5EJZE3FP.js";
 import {
   resolveBundleDir
-} from "./chunk-77TOMRBG.js";
+} from "./chunk-43GGFFLY.js";
 import {
   Storage
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   writeStderrLine
 } from "./chunk-KGJGEEVR.js";
@@ -167,13 +167,13 @@ var MUST_TRANSLATE_KEYS = [
 var globImport_locales_js = __glob({
   "./locales/ca.js": () => import("./ca-7HPYOYSZ.js"),
   "./locales/de.js": () => import("./de-X6HLSIFE.js"),
-  "./locales/en.js": () => import("./en-6MDBWMTG.js"),
+  "./locales/en.js": () => import("./en-YLXBXM4Z.js"),
   "./locales/fr.js": () => import("./fr-FTZWF462.js"),
   "./locales/ja.js": () => import("./ja-2GL5FKYJ.js"),
   "./locales/pt.js": () => import("./pt-XN2YWJVM.js"),
   "./locales/ru.js": () => import("./ru-OLTMFJEW.js"),
-  "./locales/zh-TW.js": () => import("./zh-TW-MV4FWFB6.js"),
-  "./locales/zh.js": () => import("./zh-X3WGU6SI.js")
+  "./locales/zh-TW.js": () => import("./zh-TW-RPTMRTHG.js"),
+  "./locales/zh.js": () => import("./zh-UNY63FR3.js")
 });
 
 // packages/cli/src/i18n/index.ts

package/chunks/{chunk-QB5DD75E.js → chunk-LXIBMVRN.js}

@@ -11,28 +11,28 @@ import {
   parseAcpBaseModelId,
   resolveCliGenerationConfig,
   sanitizeProviderBaseUrl
-} from "./chunk-HOANA6GC.js";
+} from "./chunk-Q26AYA62.js";
 import {
   snapshotProcessEnv
-} from "./chunk-5NV2AN56.js";
+} from "./chunk-IOPCFOTF.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-CITGRGCM.js";
+} from "./chunk-JHS74YAB.js";
 import {
   loadSettings
-} from "./chunk-C2BAEV64.js";
+} from "./chunk-F7TNAPZ4.js";
 import {
   ModelsConfig
-} from "./chunk-D6XO27Z5.js";
+} from "./chunk-TGWAQ5RB.js";
 import {
   APPROVAL_MODES
-} from "./chunk-BVE5EMIG.js";
+} from "./chunk-V5J4J5TP.js";
 import {
   tokenLimit
 } from "./chunk-FPGTNKCP.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-GNMJNDZE.js → chunk-M6FOJXW3.js}

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

package/chunks/{chunk-OX44MOAN.js → chunk-MIIVI25Q.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   getRateLimitErrorDetails
-} from "./chunk-EB4VDXNI.js";
+} from "./chunk-4FTKQNWJ.js";
 import {
   isInternalPromptId
-} from "./chunk-UX3IFLJM.js";
+} from "./chunk-L2M46FP5.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-K3LPAED5.js → chunk-MQM5PJML.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-NYWWQ437.js";
 import {
   SessionNotFoundError
-} from "./chunk-624NHDGB.js";
+} from "./chunk-ERFDKH32.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -42,6 +42,7 @@ function createWorkspaceGenerationGuard() {
 __name(createWorkspaceGenerationGuard, "createWorkspaceGenerationGuard");
 function createWorkspaceSessionOwnerIndex() {
   const bySessionId = /* @__PURE__ */ new Map();
+  const unavailableWorkspaces = /* @__PURE__ */ new Set();
   const register = /* @__PURE__ */ __name((sessionId, workspaceCwd) => {
     let owners = bySessionId.get(sessionId);
     if (!owners) {
@@ -52,9 +53,15 @@ function createWorkspaceSessionOwnerIndex() {
   }, "register");
   const remove = /* @__PURE__ */ __name((sessionId, workspaceCwd) => {
     if (workspaceCwd === void 0) {
-      bySessionId.delete(sessionId);
+      const owners2 = bySessionId.get(sessionId);
+      if (!owners2) return;
+      for (const owner of owners2) {
+        if (!unavailableWorkspaces.has(owner)) owners2.delete(owner);
+      }
+      if (owners2.size === 0) bySessionId.delete(sessionId);
       return;
     }
+    if (unavailableWorkspaces.has(workspaceCwd)) return;
     const owners = bySessionId.get(sessionId);
     if (!owners) return;
     owners.delete(workspaceCwd);
@@ -66,7 +73,12 @@ function createWorkspaceSessionOwnerIndex() {
     register,
     remove,
     getWorkspaceCwds: /* @__PURE__ */ __name((sessionId) => [...bySessionId.get(sessionId) ?? []], "getWorkspaceCwds"),
+    markWorkspaceUnavailable: /* @__PURE__ */ __name((workspaceCwd) => {
+      unavailableWorkspaces.add(workspaceCwd);
+    }, "markWorkspaceUnavailable"),
+    isWorkspaceUnavailable: /* @__PURE__ */ __name((workspaceCwd) => unavailableWorkspaces.has(workspaceCwd), "isWorkspaceUnavailable"),
     removeWorkspace: /* @__PURE__ */ __name((workspaceCwd) => {
+      if (unavailableWorkspaces.has(workspaceCwd)) return;
       for (const [sessionId, owners] of bySessionId) {
         owners.delete(workspaceCwd);
         if (owners.size === 0) bySessionId.delete(sessionId);
@@ -345,7 +357,9 @@ function createWorkspaceRegistry(inputRuntimes, options = {}) {
       const entry = entryForRuntime(runtime);
       if (!entry || runtime.primary || entry.state !== "draining") return;
       entry.current?.guard.close();
-      if (!entry.internal) {
+      if (entry.internal) {
+        sessionOwnerIndex?.markWorkspaceUnavailable(runtime.workspaceCwd);
+      } else {
         sessionOwnerIndex?.removeWorkspace(runtime.workspaceCwd);
       }
     }, "commitDrain"),
@@ -358,7 +372,9 @@ function createWorkspaceRegistry(inputRuntimes, options = {}) {
       byId.delete(runtime.workspaceId);
       const index = entries.indexOf(entry);
       if (index >= 0) entries.splice(index, 1);
-      sessionOwnerIndex?.removeWorkspace(runtime.workspaceCwd);
+      if (!entry.internal) {
+        sessionOwnerIndex?.removeWorkspace(runtime.workspaceCwd);
+      }
     }, "completeDrain"),
     resolveLiveSessionOwner: /* @__PURE__ */ __name((sessionId) => {
       const indexedCwds = sessionOwnerIndex?.getWorkspaceCwds(sessionId) ?? [];
@@ -369,6 +385,10 @@ function createWorkspaceRegistry(inputRuntimes, options = {}) {
           const entry = byCwd.get(workspaceCwd);
           const runtime = entry?.current?.runtime;
           if (!entry || !runtime || entry.state === "removed") {
+            if (sessionOwnerIndex?.isWorkspaceUnavailable(workspaceCwd)) {
+              internalUnavailable = true;
+              continue;
+            }
             sessionOwnerIndex?.remove(sessionId, workspaceCwd);
             continue;
           }

package/chunks/{chunk-27ONXAFY.js → chunk-NIFYWDYN.js}

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

package/chunks/{chunk-IJVDHPKD.js → chunk-NU7RKEZR.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   theme
-} from "./chunk-FPH6TXD3.js";
+} from "./chunk-WAOIHTJS.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -21,7 +21,7 @@ import {
 } from "./chunk-2MIN6GRR.js";
 import {
   createDebugLogger
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-MB4OCRQ2.js → chunk-O2UN57NX.js}

@@ -3,11 +3,11 @@
 import {
   UNSAFE_OBJECT_KEYS,
   getPlugin
-} from "./chunk-IKN3IUJP.js";
+} from "./chunk-5XBFCMWD.js";
 import {
   loadSettings,
   saveSettings
-} from "./chunk-C2BAEV64.js";
+} from "./chunk-F7TNAPZ4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-TWUA5EIL.js → chunk-OIP7C4FE.js}

@@ -2,11 +2,11 @@
 "use strict";
 import {
   t
-} from "./chunk-W2WRNJKX.js";
+} from "./chunk-LDP5OD6N.js";
 import {
   SessionReferenceService,
   readManyFiles
-} from "./chunk-RUQBJS34.js";
+} from "./chunk-KUX5D6DK.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,
@@ -15,10 +15,10 @@ import {
 import {
   SessionService,
   stripTerminalControlSequences
-} from "./chunk-D6XO27Z5.js";
+} from "./chunk-TGWAQ5RB.js";
 import {
   shouldRunVisionBridge
-} from "./chunk-UX3IFLJM.js";
+} from "./chunk-L2M46FP5.js";
 import {
   Storage,
   getErrorMessage,
@@ -26,7 +26,7 @@ import {
   isSubpath,
   unescapePath,
   unescapeShellSpecials
-} from "./chunk-2NNTE2ED.js";
+} from "./chunk-UHQFIS7N.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";