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

package/chunks/{chunk-6OO7QEWV.js → chunk-EVFDRBUM.js}

@@ -23,14 +23,12 @@ import {
   SessionConflictError,
   SessionNotArchivedError,
   SessionNotFoundError
-} from "./chunk-YPISTYEI.js";
-import {
-  gitEnv
-} from "./chunk-NT7LXVV5.js";
+} from "./chunk-F47DITLZ.js";
 import {
   readWorktreeSession
-} from "./chunk-ED7DD7MV.js";
+} from "./chunk-RAFQIHN2.js";
 import {
+  SESSION_PR_LIST_LIMIT,
   SESSION_PR_URL_MAX_LENGTH,
   SessionIdCaseConflictError,
   SessionOrganizationError,
@@ -39,8 +37,10 @@ import {
   SessionTranscriptChangedError,
   SessionWriterUnavailableError,
   canonicalSessionPrUrl,
-  readSessionPrs
-} from "./chunk-ZBDYI7VM.js";
+  gitEnv,
+  readSessionPrs,
+  toSessionPrInfo
+} from "./chunk-4F7GQGXB.js";
 import {
   updateCronTasks
 } from "./chunk-UJ4DUYIH.js";
@@ -49,7 +49,7 @@ import {
 } from "./chunk-ZHO2CW6D.js";
 import {
   addDaemonRequestAttribute
-} from "./chunk-UXEW7TQS.js";
+} from "./chunk-LB3WQQJK.js";
 import {
   Storage
 } from "./chunk-EAHOJF6V.js";
@@ -479,6 +479,7 @@ function toSummary(item) {
     createdAt: item.startTime,
     updatedAt: new Date(item.mtime).toISOString(),
     displayName: item.customTitle || item.prompt,
+    ...item.customTitle && item.titleSource ? { titleSource: item.titleSource } : {},
     ...item.parentSessionId ? { parentSessionId: item.parentSessionId } : {},
     ...item.sourceType ? { sourceType: item.sourceType } : {},
     ...item.sourceId !== void 0 ? { sourceId: item.sourceId } : {},
@@ -511,27 +512,43 @@ function mergeLiveSessionSummary(existing, live) {
 }
 __name(mergeLiveSessionSummary, "mergeLiveSessionSummary");
 function sidecarToPrInfos(sidecar) {
-  return sidecar.map(({ number, url, state }) => ({
-    number,
-    url,
-    ...state ? { state } : {}
-  }));
+  return sidecar.map(toSessionPrInfo);
 }
 __name(sidecarToPrInfos, "sidecarToPrInfos");
 function mergeSummaryPrs(persistedPrs, livePrs) {
   const live = livePrs ?? [];
-  const persistedByNumber = new Map(
-    (persistedPrs ?? []).map((p) => [p.number, p])
-  );
-  return [
-    ...(persistedPrs ?? []).filter(
-      (p) => !live.some((l) => l.number === p.number)
-    ),
-    ...live.map((l) => {
-      const persisted = persistedByNumber.get(l.number);
-      return persisted?.state !== void 0 && persisted.state !== l.state ? { ...l, state: persisted.state } : l;
-    })
-  ];
+  const persisted = persistedPrs ?? [];
+  const liveByNumber = new Map(live.map((l) => [l.number, l]));
+  const persistedNumbers = new Set(persisted.map((p) => p.number));
+  const consumedLive = /* @__PURE__ */ new Set();
+  const ordered = [];
+  for (const p of persisted) {
+    const liveEntry = liveByNumber.get(p.number);
+    if (!liveEntry) {
+      ordered.push(p);
+      continue;
+    }
+    const samePr = canonicalSessionPrUrl(p.url) === canonicalSessionPrUrl(liveEntry.url);
+    const matchedTwinExists = persisted.some(
+      (q) => q.number === p.number && canonicalSessionPrUrl(q.url) === canonicalSessionPrUrl(liveEntry.url)
+    );
+    if (!samePr && matchedTwinExists) continue;
+    if (consumedLive.has(p.number)) continue;
+    consumedLive.add(p.number);
+    ordered.push(
+      samePr ? {
+        ...liveEntry,
+        ...p.state ? { state: p.state } : {},
+        ...p.issues ? { issues: p.issues } : {}
+      } : p
+    );
+  }
+  for (const liveEntry of live) {
+    if (!persistedNumbers.has(liveEntry.number) && persisted.length < SESSION_PR_LIST_LIMIT) {
+      ordered.push(liveEntry);
+    }
+  }
+  return ordered.slice(-SESSION_PR_LIST_LIMIT);
 }
 __name(mergeSummaryPrs, "mergeSummaryPrs");
 async function liveOnlySummary(live, sessionService, signal) {
@@ -1213,6 +1230,55 @@ async function listLiveWorkspaceSessionsForResponse(bridge, workspaceCwd, option
   });
 }
 __name(listLiveWorkspaceSessionsForResponse, "listLiveWorkspaceSessionsForResponse");
+async function searchWorkspaceSessionsForResponse(workspaceCwd, query, options = {}, readOptions = {}) {
+  readOptions.signal?.throwIfAborted();
+  const runtimeBaseDir = new Storage(
+    workspaceCwd,
+    readOptions.runtimeBaseDir
+  ).getRuntimeBaseDir();
+  return Storage.runWithResolvedRuntimeBaseDir(runtimeBaseDir, async () => {
+    const sessionService = new SessionService(workspaceCwd);
+    const hits = await sessionService.searchSessionContent(query, {
+      ...options.maxResults !== void 0 ? { maxResults: options.maxResults } : {},
+      ...readOptions.signal ? { signal: readOptions.signal } : {}
+    });
+    const bySessionId = /* @__PURE__ */ new Map();
+    const organizationSnapshot = await createSessionOrganizationService(workspaceCwd).readSnapshot();
+    readOptions.signal?.throwIfAborted();
+    for (const hit of hits) {
+      readOptions.signal?.throwIfAborted();
+      const item = await sessionService.getSessionListItem(hit.sessionId);
+      if (item)
+        bySessionId.set(
+          hit.sessionId,
+          applyOrganization(
+            toSummary(item),
+            organizationSnapshot.sessions.get(hit.sessionId)
+          )
+        );
+    }
+    await enrichWorktreeSidecars(
+      bySessionId,
+      sessionService,
+      "active",
+      readOptions.signal
+    );
+    await enrichPrSidecars(
+      bySessionId,
+      sessionService,
+      "active",
+      readOptions.signal
+    );
+    readOptions.signal?.throwIfAborted();
+    const results = [];
+    for (const hit of hits) {
+      const session = bySessionId.get(hit.sessionId);
+      if (session) results.push({ session, snippet: hit.snippet });
+    }
+    return { results };
+  });
+}
+__name(searchWorkspaceSessionsForResponse, "searchWorkspaceSessionsForResponse");
 async function getWorkspaceSessionInfoForResponse(bridge, workspaceCwd, options = {}) {
   const counts = await new SessionService(workspaceCwd).getSessionInfoCounts();
   return {
@@ -1817,7 +1883,11 @@ async function deleteDaemonSessionIfOrphan(params) {
     if (!killed) {
       return void 0;
     }
-    return deletePersistedSessionWithLease(service, sessionId);
+    const removal = await deletePersistedSessionWithLease(service, sessionId);
+    if (removal.kind !== "error") {
+      await bridge.deleteSessionAttachments(sessionId);
+    }
+    return removal;
   });
   if (result === void 0) {
     return false;
@@ -2307,8 +2377,6 @@ var GIT_ORIGIN_TIMEOUT_MS = 5e3;
 var A1_VERSION_TIMEOUT_MS = 1e4;
 var A1_ERROR_MESSAGE_MAX = 512;
 var AONE_DETAIL_URL_HOST = "code.alibaba-inc.com";
-var AONE_MR_LIST_PAGE_SIZE = 20;
-var AONE_BACKFILL_PAGES_PER_STATE = 3;
 var AONE_MAX_MR_VIEW_CALLS_PER_RUN = 25;
 var AoneCliUnavailableError = class extends Error {
   static {
@@ -2444,53 +2512,6 @@ async function checkA1Available() {
   a1AvailabilityVerified = true;
 }
 __name(checkA1Available, "checkA1Available");
-function parseAoneMrListPage(raw) {
-  if (!Array.isArray(raw)) {
-    throw new AoneCommandError("unexpected a1 mr list output");
-  }
-  const entries = [];
-  for (const item of raw) {
-    if (item === null || typeof item !== "object") continue;
-    const v = item;
-    if (typeof v["id"] !== "number" || !Number.isInteger(v["id"]) || v["id"] <= 0) {
-      continue;
-    }
-    entries.push({
-      number: v["id"],
-      headRefName: typeof v["sourceBranch"] === "string" ? v["sourceBranch"] : "",
-      state: mapAoneMrState(
-        typeof v["state"] === "string" ? v["state"] : void 0
-      )
-    });
-  }
-  return entries;
-}
-__name(parseAoneMrListPage, "parseAoneMrListPage");
-async function listAoneMergeRequests(repoPath, options) {
-  await checkA1Available();
-  const entries = [];
-  const pages = Math.max(options.pages, 1);
-  for (let page = 1; page <= pages; page++) {
-    const parsed = await runA1Json([
-      "repo",
-      "mr",
-      "list",
-      "--repo",
-      repoPath,
-      "--state",
-      options.state,
-      "--page",
-      String(page)
-    ]);
-    const pageEntries = parseAoneMrListPage(parsed);
-    entries.push(...pageEntries);
-    if (Array.isArray(parsed) && parsed.length < AONE_MR_LIST_PAGE_SIZE) {
-      break;
-    }
-  }
-  return entries;
-}
-__name(listAoneMergeRequests, "listAoneMergeRequests");
 function hasControlCharacter(value) {
   return Array.from(value).some((character) => {
     const code = character.charCodeAt(0);
@@ -2537,7 +2558,6 @@ async function viewAoneMergeRequest(repoPath, id) {
 }
 __name(viewAoneMergeRequest, "viewAoneMergeRequest");
 var defaultAoneMrBackend = {
-  list: /* @__PURE__ */ __name((repoPath, state, pages) => listAoneMergeRequests(repoPath, { state, pages }), "list"),
   view: viewAoneMergeRequest
 };
 
@@ -2548,6 +2568,7 @@ export {
   InvalidCursorError,
   listWorkspaceSessionsForResponse,
   listLiveWorkspaceSessionsForResponse,
+  searchWorkspaceSessionsForResponse,
   getWorkspaceSessionInfoForResponse,
   parseSessionPageSizeQuery,
   runWithWorkspaceRuntimeStorage,
@@ -2563,7 +2584,6 @@ export {
   logSessionArchiveWarning,
   archiveDaemonSessions,
   unarchiveDaemonSessions,
-  AONE_BACKFILL_PAGES_PER_STATE,
   AONE_MAX_MR_VIEW_CALLS_PER_RUN,
   resolveAoneWorkspaceRepo,
   isAoneDetailUrlForRepo,

package/chunks/{chunk-QTMPM6RC.js → chunk-EWRW2WQC.js}

@@ -27,10 +27,10 @@ import {
 } from "./chunk-3VUENPWF.js";
 import {
   loadSettings
-} from "./chunk-AAX236AR.js";
+} from "./chunk-VWTSRH6C.js";
 import {
   MCP_BUDGET_WARN_FRACTION
-} from "./chunk-ZBDYI7VM.js";
+} from "./chunk-4F7GQGXB.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -447,7 +447,7 @@ var serveCommand = {
     delete process.env[EXTERNAL_TOOL_GUARD_TOKEN_ENV];
     const openWithAuth = argv["open-with-auth"];
     const open = argv.open || openWithAuth;
-    const { runQwenServe } = await import("./run-qwen-serve-3LKV7KDC.js");
+    const { runQwenServe } = await import("./run-qwen-serve-OGTEEUR2.js");
     try {
       const serveOptions = {
         port: argv.port,

package/chunks/{chunk-IIFL7QDN.js → chunk-F33GFWPR.js}

@@ -12,7 +12,7 @@ import {
   OpenAIContentConverter,
   TaggedThinkingParser,
   openaiRequestCaptureContext
-} from "./chunk-ID33ZRWH.js";
+} from "./chunk-ZTPGUFQV.js";
 import {
   safeJsonParse
 } from "./chunk-ANVG3BVV.js";
@@ -31,10 +31,10 @@ import {
 import {
   DashScopeOpenAICompatibleProvider,
   DefaultOpenAICompatibleProvider
-} from "./chunk-RT4QNQ5P.js";
+} from "./chunk-FD5SJOWT.js";
 import {
   getCurrentAgentId
-} from "./chunk-26SIKQIC.js";
+} from "./chunk-4LIFGNI4.js";
 import {
   InvalidStreamError,
   getToolCallPreparations
@@ -52,7 +52,7 @@ import {
 import {
   ProtocolTagSanitizedEvent,
   logProtocolTagSanitized
-} from "./chunk-FXUSWLBF.js";
+} from "./chunk-GH2S4GD5.js";
 import {
   isQwenFamilyWireModel,
   isTieredEffortWireModel
@@ -65,7 +65,7 @@ import {
 } from "./chunk-22UH7VTP.js";
 import {
   isInForkExecution
-} from "./chunk-D7D3HSYQ.js";
+} from "./chunk-G7HBEEX7.js";
 import {
   createDebugLogger,
   getErrorMessage,
@@ -75,7 +75,7 @@ import {
 } from "./chunk-EAHOJF6V.js";
 import {
   GenerateContentResponse
-} from "./chunk-64REQJJ2.js";
+} from "./chunk-5H5S4UY5.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1047,6 +1047,18 @@ function isRequiredThinkingError(error) {
   return message.includes("enable_thinking") && /(?:restricted to|must be) true\b/i.test(message);
 }
 __name(isRequiredThinkingError, "isRequiredThinkingError");
+function wireRequestHasMediaContent(wireRequest) {
+  const messages = wireRequest?.["messages"];
+  if (!Array.isArray(messages)) return false;
+  return messages.some((message) => {
+    const content = message.content;
+    return Array.isArray(content) && content.some((part) => {
+      const type = part.type;
+      return type === "image_url" || type === "input_audio" || type === "video_url" || type === "file";
+    });
+  });
+}
+__name(wireRequestHasMediaContent, "wireRequestHasMediaContent");
 var StreamContentError = class extends Error {
   static {
     __name(this, "StreamContentError");
@@ -1331,7 +1343,7 @@ var ContentGenerationPipeline = class {
           ];
           yield response;
         }
-      } else if (context.pendingThinkingTagCandidate) {
+      } else if (context.pendingThinkingTagCandidate || context.responseParsingOptions?.taggedThinkingTagsAfterReasoning && context.taggedThinkingParser?.hasUnclosedThought()) {
         throw new InvalidStreamError(
           "Model response leaked thinking tags.",
           "PROTOCOL_TAG_LEAK"
@@ -1617,17 +1629,17 @@ var ContentGenerationPipeline = class {
   async executeWithErrorHandling(request, userPromptId, isStreaming, executor) {
     const context = this.createRequestContext(request, isStreaming);
     let openaiRequest;
-    const executeAttempt = /* @__PURE__ */ __name(async () => {
+    const executeAttempt = /* @__PURE__ */ __name(async (attemptContext = context) => {
       openaiRequest = await this.buildRequest(
         request,
         userPromptId,
-        context,
+        attemptContext,
         isStreaming
       );
       openaiRequestCaptureContext.getStore()?.(openaiRequest);
       runtimeDiagnostics.recordOpenAIWireRequest(openaiRequest);
       const telemetryAttempt = reportOpenAiRequest(openaiRequest);
-      return executor(openaiRequest, context, telemetryAttempt);
+      return executor(openaiRequest, attemptContext, telemetryAttempt);
     }, "executeAttempt");
     try {
       return await executeAttempt();
@@ -1650,6 +1662,17 @@ var ContentGenerationPipeline = class {
           return await this.handleError(retryError, context, request);
         }
       }
+      if (request.config?.abortSignal?.aborted !== true && getErrorStatus(error) === 400 && wireRequestHasMediaContent(wireRequest)) {
+        debugLogger3.warn(
+          "Media-bearing request rejected with 400; retrying once with media degraded to placeholders",
+          { model, originalError: getErrorMessage(error) }
+        );
+        try {
+          return await executeAttempt({ ...context, modalities: {} });
+        } catch (retryError) {
+          return await this.handleError(retryError, context, request);
+        }
+      }
       return await this.handleError(error, context, request);
     }
   }
@@ -1667,7 +1690,7 @@ var ContentGenerationPipeline = class {
     const effectiveModel = request.model || this.contentGeneratorConfig.model;
     const providerOverrides = this.config.provider.getRequestContextOverrides?.() ?? {};
     const toolCallParser = isStreaming ? new StreamingToolCallParser() : void 0;
-    const responseParsingOptions = this.config.provider.getResponseParsingOptions?.();
+    const responseParsingOptions = this.config.provider.getResponseParsingOptions?.(effectiveModel);
     const taggedThinkingParser = isStreaming && responseParsingOptions?.taggedThinkingTags ? new TaggedThinkingParser() : void 0;
     return {
       model: effectiveModel,

package/chunks/{chunk-YPISTYEI.js → chunk-F47DITLZ.js}

@@ -473,6 +473,15 @@ var CdWhilePromptActiveError = class extends Error {
     this.sessionId = sessionId;
   }
 };
+var McpAuthenticationInProgressError = class extends Error {
+  static {
+    __name(this, "McpAuthenticationInProgressError");
+  }
+  constructor() {
+    super("Another MCP authentication is already in progress");
+    this.name = "McpAuthenticationInProgressError";
+  }
+};
 
 export {
   NOT_CURRENTLY_GENERATING_CANCEL_MESSAGE,
@@ -509,7 +518,8 @@ export {
   BridgeChannelQuarantinedError,
   InvalidRewindTargetError,
   BranchWhilePromptActiveError,
-  CdWhilePromptActiveError
+  CdWhilePromptActiveError,
+  McpAuthenticationInProgressError
 };
 /**
  * @license

package/chunks/{chunk-OE5AQVNB.js → chunk-F7NF2IOE.js}

@@ -2,23 +2,23 @@
 "use strict";
 import {
   getExtensionManager
-} from "./chunk-H2A2GJGL.js";
+} from "./chunk-AZJLY2XZ.js";
 import {
   parseChannelConfig
-} from "./chunk-V4HN35IF.js";
+} from "./chunk-PCRBLMIN.js";
 import {
   getPlugin,
   registerPlugin
-} from "./chunk-CAZADEU7.js";
+} from "./chunk-NXKOVOM5.js";
 import {
   sanitizeLogText
-} from "./chunk-IXEZHTDR.js";
+} from "./chunk-U4DJ5XB3.js";
 import {
   loadSettings
-} from "./chunk-AAX236AR.js";
+} from "./chunk-VWTSRH6C.js";
 import {
   hashDaemonWorkspace
-} from "./chunk-UXEW7TQS.js";
+} from "./chunk-LB3WQQJK.js";
 import {
   Storage
 } from "./chunk-EAHOJF6V.js";

package/chunks/{chunk-RT4QNQ5P.js → chunk-FD5SJOWT.js}

@@ -6890,10 +6890,10 @@ var OPENAI_COMPATIBLE_EFFORTS = [
   "high",
   "xhigh"
 ];
-function shouldMirrorReasoningContentForQwen3(model) {
+function isQwen3Model(model) {
   return model.toLowerCase().includes("qwen3");
 }
-__name(shouldMirrorReasoningContentForQwen3, "shouldMirrorReasoningContentForQwen3");
+__name(isQwen3Model, "isQwen3Model");
 function mirrorReasoningContentToReasoning(message) {
   if (message.role !== "assistant") {
     return message;
@@ -7012,7 +7012,7 @@ var DefaultOpenAICompatibleProvider = class {
     const requestWithTokenLimits = this.clampConfiguredReasoningEffort(
       this.applyOutputTokenLimit(request)
     );
-    const messages = shouldMirrorReasoningContentForQwen3(request.model) ? requestWithTokenLimits.messages.map(mirrorReasoningContentToReasoning) : requestWithTokenLimits.messages;
+    const messages = isQwen3Model(request.model) ? requestWithTokenLimits.messages.map(mirrorReasoningContentToReasoning) : requestWithTokenLimits.messages;
     return {
       ...requestWithTokenLimits,
       messages,
@@ -7022,8 +7022,11 @@ var DefaultOpenAICompatibleProvider = class {
   getDefaultGenerationConfig() {
     return {};
   }
-  getResponseParsingOptions() {
-    return { contentOnlyThinkingTagLeaks: true };
+  getResponseParsingOptions(model) {
+    return {
+      contentOnlyThinkingTagLeaks: true,
+      ...model && isQwen3Model(model) ? { taggedThinkingTagsAfterReasoning: true } : {}
+    };
   }
   /**
    * Apply output token limit to a request's max_tokens parameter.

package/chunks/{chunk-ACZ4YRYK.js → chunk-FRICLXCZ.js}

@@ -16,7 +16,7 @@ import {
   MODIFIER_SHIFT_BIT,
   MODIFIER_SUPER_BIT,
   clipboardHasImage
-} from "./chunk-JLSZT354.js";
+} from "./chunk-M4LBBSVP.js";
 import {
   noteInteraction
 } from "./chunk-KW7NOTN6.js";
@@ -26,14 +26,14 @@ import {
 import {
   use_stdin_default,
   use_stdout_default
-} from "./chunk-5Q372OFJ.js";
+} from "./chunk-O4KNCAX4.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
 import {
   KittySequenceOverflowEvent,
   logKittySequenceOverflow
-} from "./chunk-FXUSWLBF.js";
+} from "./chunk-GH2S4GD5.js";
 import {
   createDebugLogger
 } from "./chunk-EAHOJF6V.js";

package/chunks/{chunk-IBMUI5EV.js → chunk-FUO5V5KI.js}

@@ -9,7 +9,7 @@ import {
 import {
   Box_default,
   Text
-} from "./chunk-5Q372OFJ.js";
+} from "./chunk-O4KNCAX4.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
@@ -125,7 +125,8 @@ var MaxSizedBox = /* @__PURE__ */ __name(({
   maxHeight,
   overflowDirection = "top",
   additionalHiddenLinesCount = 0,
-  sourceBoundaries
+  sourceBoundaries,
+  registerOverflow = true
 }) => {
   const id = (0, import_react2.useId)();
   const { addOverflowingId, removeOverflowingId } = useOverflowActions() || {};
@@ -168,7 +169,7 @@ var MaxSizedBox = /* @__PURE__ */ __name(({
   const hiddenLinesCount = visibleContentHeight !== void 0 ? Math.max(0, laidOutStyledText.length - visibleContentHeight) : 0;
   const totalHiddenLines = hiddenLinesCount + additionalHiddenLinesCount;
   (0, import_react2.useEffect)(() => {
-    if (totalHiddenLines > 0) {
+    if (registerOverflow && totalHiddenLines > 0) {
       addOverflowingId?.(id);
     } else {
       removeOverflowingId?.(id);
@@ -176,7 +177,13 @@ var MaxSizedBox = /* @__PURE__ */ __name(({
     return () => {
       removeOverflowingId?.(id);
     };
-  }, [id, totalHiddenLines, addOverflowingId, removeOverflowingId]);
+  }, [
+    id,
+    registerOverflow,
+    totalHiddenLines,
+    addOverflowingId,
+    removeOverflowingId
+  ]);
   const visibleStyledText = hiddenLinesCount > 0 ? overflowDirection === "top" ? laidOutStyledText.slice(hiddenLinesCount, laidOutStyledText.length) : laidOutStyledText.slice(0, visibleContentHeight) : laidOutStyledText;
   const visibleLines = visibleStyledText.map((line, index) => {
     const metadata = lineMetadata.get(line);

package/chunks/{chunk-T3TL6S3B.js → chunk-G5PBOQWI.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-ZGCKTAL5.js";
 import {
   SessionNotFoundError
-} from "./chunk-YPISTYEI.js";
+} from "./chunk-F47DITLZ.js";
 import {
   ChannelWorkerStartupError
-} from "./chunk-FPMQT2YY.js";
+} from "./chunk-TQHPVKO6.js";
 import {
   ChannelWebhookEnqueueError
 } from "./chunk-STUJ7IMZ.js";
@@ -17,7 +17,7 @@ import {
 } from "./chunk-RKFGE7JH.js";
 import {
   CHANNEL_LOOP_MCP_SERVER_NAME
-} from "./chunk-IXEZHTDR.js";
+} from "./chunk-U4DJ5XB3.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -548,9 +548,11 @@ function createChannelWorkerGroup(opts) {
       const snapshot = entry.supervisor.snapshot();
       return snapshot.state === "starting" || snapshot.state === "running" || snapshot.nextRestartAt !== void 0 ? 1 : 0;
     },
-    removeWorkspace(workspaceCwd) {
+    removeWorkspace(workspaceCwd, options) {
       const existing = removalPromises.get(workspaceCwd);
-      if (existing) return existing;
+      if (existing) {
+        return options?.permanent ? existing.finally(() => groupsByWorkspace.delete(workspaceCwd)) : existing;
+      }
       drainingWorkspaces.add(workspaceCwd);
       const removal = (async () => {
         try {
@@ -573,6 +575,7 @@ function createChannelWorkerGroup(opts) {
           if (killError) throw killError;
         } finally {
           drainingWorkspaces.delete(workspaceCwd);
+          if (options?.permanent) groupsByWorkspace.delete(workspaceCwd);
         }
       })();
       removalPromises.set(workspaceCwd, removal);

package/chunks/{chunk-D7D3HSYQ.js → chunk-G7HBEEX7.js}

@@ -3,7 +3,7 @@
 import {
   collectAvailableSkillEntries,
   renderAvailableSkillsBlock
-} from "./chunk-YKADANK6.js";
+} from "./chunk-QQD2GART.js";
 import {
   escapeSystemReminderTags
 } from "./chunk-AQ37AY7B.js";
@@ -12,7 +12,7 @@ import {
 } from "./chunk-ODZF64DM.js";
 import {
   ToolNames
-} from "./chunk-LYSZVCCD.js";
+} from "./chunk-7JMGTOH7.js";
 import {
   createDebugLogger,
   getErrorMessage,
@@ -406,9 +406,13 @@ function buildChangedMcpToolsReminder(addedTools, removedToolNames) {
 }
 __name(buildChangedMcpToolsReminder, "buildChangedMcpToolsReminder");
 function buildMcpServerInstructionsReminder(toolRegistry) {
-  const serverInstructions = Array.from(
-    toolRegistry.getMcpServerInstructions().entries()
-  ).filter(([, instructions]) => instructions.trim().length > 0).sort(([left], [right]) => left.localeCompare(right));
+  return buildMcpServerInstructionsReminderFromEntries(
+    toolRegistry.getMcpServerInstructions()
+  );
+}
+__name(buildMcpServerInstructionsReminder, "buildMcpServerInstructionsReminder");
+function buildMcpServerInstructionsReminderFromEntries(instructionsByServer) {
+  const serverInstructions = Array.from(instructionsByServer.entries()).filter(([, instructions]) => instructions.trim().length > 0).sort(([left], [right]) => left.localeCompare(right));
   if (serverInstructions.length === 0) {
     return null;
   }
@@ -421,7 +425,7 @@ ${instructions}`
   ];
   return wrapSystemReminder(bodyParts.join("\n\n"));
 }
-__name(buildMcpServerInstructionsReminder, "buildMcpServerInstructionsReminder");
+__name(buildMcpServerInstructionsReminderFromEntries, "buildMcpServerInstructionsReminderFromEntries");
 function trimSkillEntriesTowardsBudget(entries) {
   if (renderAvailableSkillsBlock(entries).length <= MAX_SKILL_LISTING_CHARS) {
     return entries;
@@ -692,7 +696,7 @@ __name(resolveForkExecutionAllowedTools, "resolveForkExecutionAllowedTools");
 function registerForkDisplayImageForCache(config, advertisedToolNames) {
   if (!advertisedToolNames.includes(ToolNames.DISPLAY_IMAGE)) return;
   config.getToolRegistry().registerFactory(ToolNames.DISPLAY_IMAGE, async () => {
-    const { DisplayImageTool } = await import("./display-image-Z4VBQDEJ.js");
+    const { DisplayImageTool } = await import("./display-image-73C7XNRK.js");
     return new DisplayImageTool(config);
   });
 }
@@ -884,6 +888,7 @@ export {
   buildDeferredToolsReminder,
   buildChangedMcpToolsReminder,
   buildMcpServerInstructionsReminder,
+  buildMcpServerInstructionsReminderFromEntries,
   buildAvailableSkillsReminder,
   buildChangedSkillsReminder,
   buildChangedAgentsReminder,