@qwen-code/qwen-code 0.20.0-nightly.20260721.cda0e0348 → 0.20.0-preview.0

package/chunks/{server-QB6CHRZN.js → server-JKAQBE2E.js}

@@ -1,10 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  openQwenAsrRealtimeStream,
-  openVoiceStream,
-  openVoiceStreamWithRetry
-} from "./chunk-GKY2OJ7R.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   MAX_REMEMBER_CONTENT_BYTES,
@@ -19,7 +14,12 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-CG2HPAVD.js";
+} from "./chunk-EPN5MKRH.js";
+import {
+  openQwenAsrRealtimeStream,
+  openVoiceStream,
+  openVoiceStreamWithRetry
+} from "./chunk-ZHERRXZJ.js";
 import {
   SetupGithubError,
   collectSessionData,
@@ -30,21 +30,17 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-PFKNXN67.js";
+} from "./chunk-SOMSZ6W3.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
-} from "./chunk-KTUQMDEP.js";
-import "./chunk-6RVJRVQR.js";
+} from "./chunk-4K7VDKAD.js";
 import "./chunk-RS7MT2QG.js";
+import "./chunk-QF4DPYPH.js";
 import "./chunk-H2XVO6NE.js";
 import "./chunk-QHTIBUWB.js";
 import "./chunk-QTERJVPZ.js";
 import "./chunk-L573Z2QZ.js";
-import {
-  createSingleWorkspaceRegistry,
-  createWorkspaceSessionOwnerIndex
-} from "./chunk-W7H223ZZ.js";
 import {
   CAPABILITIES_SCHEMA_VERSION,
   CLIENT_ID_HEADER,
@@ -100,29 +96,29 @@ import {
   setRateLimiter,
   unsafeRevealSecret,
   validateMcpRuntimeServerName
-} from "./chunk-LC5CAVMS.js";
+} from "./chunk-BKZEHVPV.js";
 import {
   isLoopbackBind
 } from "./chunk-RXFQM6FQ.js";
 import {
   createDaemonStatusProvider
-} from "./chunk-LLDGOZMJ.js";
+} from "./chunk-VI7UU7ZI.js";
 import "./chunk-LXXMOYPL.js";
-import "./chunk-GH7OEOYU.js";
+import "./chunk-NYPUWHHC.js";
 import "./chunk-E5Z2AVNV.js";
 import {
   createWorkspaceProvidersStatusProvider
-} from "./chunk-2CWOJ2FA.js";
+} from "./chunk-KNTYRZD4.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-L4YSPHR4.js";
+} from "./chunk-6AWRQ4T2.js";
 import {
   snapshotProcessEnv
-} from "./chunk-JR6UJ24K.js";
+} from "./chunk-5JX7FPHW.js";
 import {
   createWorkspaceSkillsStatusProvider
-} from "./chunk-JRW46GQX.js";
+} from "./chunk-CJTAUXKG.js";
 import "./chunk-2W3OOD4W.js";
 import {
   EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
@@ -137,14 +133,14 @@ import {
   validateWorkspaceSkillName,
   validateWorkspaceVoiceState,
   voiceSettingsScopeToWire
-} from "./chunk-KRI4VCHX.js";
+} from "./chunk-45AIVIUL.js";
 import {
   PermissionRulesValidationError,
   buildPermissionSettings,
   isPermissionRuleType,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-IM2A6YO3.js";
+} from "./chunk-VLBJ7ZUG.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isStreamingVoiceModel,
@@ -152,13 +148,13 @@ import {
   resolveVoiceTranscriptionConfig,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-U4VGYZN7.js";
+} from "./chunk-JD5FHQ3N.js";
 import {
   isVoiceEnabled,
   isVoiceMode,
   readVoiceModel
-} from "./chunk-GPILFVPY.js";
-import "./chunk-BVLROR2T.js";
+} from "./chunk-66RKDODM.js";
+import "./chunk-QLJUC7TG.js";
 import {
   WorkspacePermissionRulesSessionRequiredError,
   WorkspaceSettingsPartialPersistError,
@@ -167,21 +163,35 @@ import {
 } from "./chunk-OA4JVLSA.js";
 import {
   createTotalSessionAdmissionController
-} from "./chunk-R3VWUU2E.js";
+} from "./chunk-VYPFXUCB.js";
+import {
+  createSingleWorkspaceRegistry,
+  createWorkspaceSessionOwnerIndex
+} from "./chunk-UGYMA4EI.js";
 import "./chunk-GRC5HGPI.js";
+import {
+  daemonObservedContactsPath,
+  loadChannelsConfig
+} from "./chunk-VTKWURCJ.js";
+import "./chunk-GOWMC4CS.js";
+import "./chunk-57OAHC2Y.js";
+import {
+  parseChannelWebhookConfigLenient
+} from "./chunk-QD6BRERJ.js";
+import "./chunk-6ZBPS62S.js";
+import "./chunk-V6WHFGST.js";
 import {
   SessionArtifactAuthorizationError,
   SessionArtifactValidationError,
   createAcpSessionBridge,
   parseSessionSource
-} from "./chunk-R3VZNHRX.js";
+} from "./chunk-IT27F3ES.js";
 import {
   EVENT_SCHEMA_VERSION,
   SubscriberLimitExceededError
 } from "./chunk-6RLROE6G.js";
 import "./chunk-COH43MRJ.js";
 import "./chunk-QR6U5QPP.js";
-import "./chunk-DMRO4GU2.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -195,6 +205,7 @@ import {
   McpServerRestartFailedError,
   PermissionForbiddenError,
   PermissionPolicyNotImplementedError,
+  PromptDeadlineExceededError,
   PromptQueueFullError,
   RestoreInProgressError,
   SessionArchivedError,
@@ -213,37 +224,13 @@ import {
   WorkspaceInitRaceError,
   WorkspaceInitSymlinkError,
   WorkspaceMismatchError
-} from "./chunk-X6YQWCIJ.js";
+} from "./chunk-UH3WSE5L.js";
+import "./chunk-OAGG6CRR.js";
 import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceMemoryStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-DZZIOIVF.js";
-import "./chunk-WBL3FJEU.js";
-import {
-  daemonObservedContactsPath,
-  loadChannelsConfig
-} from "./chunk-CUJX3F4X.js";
-import "./chunk-6MC5ASQK.js";
-import "./chunk-57OAHC2Y.js";
-import {
-  parseChannelWebhookConfigLenient
-} from "./chunk-32F7BZSK.js";
-import "./chunk-6ZBPS62S.js";
-import "./chunk-V6WHFGST.js";
-import {
-  MAX_REGISTERED_WORKSPACES,
-  WorkspaceDisplayNameValidationError,
-  WorkspaceRegistrationStoreCommittedError,
-  WorkspaceRegistrationStoreLimitError,
-  normalizeWorkspaceDisplayName,
-  workspaceRegistrationId
-} from "./chunk-LWQ4IAOJ.js";
-import {
-  MAX_WORKSPACE_PATH_LENGTH,
-  canonicalizeWorkspace,
-  canonicalizeWorkspaces
-} from "./chunk-W7FJ3N32.js";
+} from "./chunk-FSXCGBXB.js";
 import {
   MAX_CHANNEL_STARTUP_FAILURES,
   MAX_CHANNEL_STARTUP_FAILURE_CHANNEL_LENGTH,
@@ -259,7 +246,7 @@ import {
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
-import "./chunk-5HBA2Z7V.js";
+import "./chunk-WBL3FJEU.js";
 import "./chunk-T2NCM2ET.js";
 import {
   sanitizeLogText
@@ -274,23 +261,38 @@ import {
   getWritableScopes,
   loadSettings,
   validateSettingValue
-} from "./chunk-5JX5EWR5.js";
+} from "./chunk-J3VSRG5Y.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-GOXKNSDZ.js";
-import "./chunk-IDS7MSUP.js";
 import {
   SUPPORTED_LANGUAGES,
   detectSystemLanguage,
   resolveLanguageSetting,
   resolveSupportedLanguage
-} from "./chunk-6DHWO5ZF.js";
-import "./chunk-KTNIZG2C.js";
+} from "./chunk-K4VB66QF.js";
+import "./chunk-CMRYLH67.js";
+import "./chunk-GOXKNSDZ.js";
 import "./chunk-QRUIS3DN.js";
-import "./chunk-XCHUDLER.js";
+import {
+  MAX_REGISTERED_WORKSPACES,
+  WorkspaceDisplayNameValidationError,
+  WorkspaceRegistrationStoreCommittedError,
+  WorkspaceRegistrationStoreLimitError,
+  normalizeWorkspaceDisplayName,
+  workspaceRegistrationId
+} from "./chunk-H4OWOFZL.js";
+import {
+  MAX_WORKSPACE_PATH_LENGTH,
+  canonicalizeWorkspace,
+  canonicalizeWorkspaces,
+  translateAndCheckAbsoluteWorkspacePath
+} from "./chunk-2RFKHEXL.js";
+import "./chunk-5HBA2Z7V.js";
+import "./chunk-IDS7MSUP.js";
+import "./chunk-CHLNJN3C.js";
 import "./chunk-VJNBRRZG.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-4RA7PWIY.js";
+} from "./chunk-LMQNDPVP.js";
 import "./chunk-ALGGS7UH.js";
 import {
   isWithinRoot as isWithinRoot2
@@ -316,6 +318,7 @@ import {
   SESSION_TRANSCRIPT_MAX_INDEX_BYTES,
   SESSION_TRANSCRIPT_MAX_LIMIT,
   SESSION_TRANSCRIPT_MAX_PAGE_BYTES,
+  SESSION_WRITER_RPC_CODES,
   SessionOrganizationError,
   SessionOrganizationService,
   SessionService,
@@ -324,6 +327,7 @@ import {
   SessionTranscriptReader,
   SessionTranscriptSnapshotUnavailableError,
   SessionTranscriptTooLargeError,
+  SessionWriterError,
   StandardFileSystemService,
   StdioClientTransport,
   StreamableHTTPClientTransport,
@@ -354,18 +358,18 @@ import {
   writeWorkspaceContextFile,
   writeWorktreeSession,
   writeWorktreeSessionMarker
-} from "./chunk-NO6XTCYT.js";
-import "./chunk-5M6IDOMF.js";
+} from "./chunk-6RQ5IPUX.js";
 import "./chunk-T4TZQJ7W.js";
 import "./chunk-H6XPXXMH.js";
+import "./chunk-5M6IDOMF.js";
+import "./chunk-T2L47JJK.js";
+import "./chunk-GPSKDNEE.js";
+import "./chunk-X6N25LXS.js";
+import "./chunk-E2UVIFI2.js";
 import {
   MAX_JOBS,
   nextDurableFireMs
-} from "./chunk-EAUYY7SS.js";
-import "./chunk-FSL5W5TI.js";
-import "./chunk-OONJNQ42.js";
-import "./chunk-D2VIDMVM.js";
-import "./chunk-E2UVIFI2.js";
+} from "./chunk-Q2YKNMLS.js";
 import {
   nextFireTime,
   parseCron
@@ -378,20 +382,27 @@ import {
   readCronTasks,
   taskHasLegacyCondition,
   updateCronTasks
-} from "./chunk-EIAK6Q2B.js";
+} from "./chunk-KHOVYUHX.js";
 import "./chunk-SZRN75WQ.js";
-import "./chunk-HTO4JFDZ.js";
+import "./chunk-6PVPNMXU.js";
+import "./chunk-TJQXJJX7.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-NABLFI57.js";
+import "./chunk-QBUDF33N.js";
+import "./chunk-LIZRAKPB.js";
 import {
   APPROVAL_MODES,
   SubagentError,
   SubagentErrorCode
-} from "./chunk-CPCVCKKF.js";
+} from "./chunk-WHGVTP7Q.js";
 import "./chunk-6AM5D4ME.js";
-import "./chunk-G45X5TRN.js";
-import "./chunk-PBATSWUQ.js";
-import "./chunk-ZEOZL37W.js";
-import "./chunk-OOCI5VVU.js";
+import "./chunk-JCW2R7WC.js";
+import "./chunk-57FIIFJN.js";
+import "./chunk-HTO4JFDZ.js";
+import "./chunk-XVNQMZ2I.js";
+import "./chunk-CR3C7WXL.js";
+import "./chunk-FODK6UMO.js";
+import "./chunk-GLNBDYUX.js";
 import {
   QwenOAuth2Client,
   QwenOAuthPollError,
@@ -400,9 +411,12 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-25Y6JSH2.js";
-import "./chunk-246TW4IX.js";
+} from "./chunk-5MZSD2JX.js";
 import "./chunk-JESCGQM3.js";
+import "./chunk-OZYV6F53.js";
+import "./chunk-BEKZWVJJ.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-5I5BM454.js";
 import {
   addDaemonRequestAttribute,
   decodeBufferWithEncodingInfo,
@@ -416,37 +430,35 @@ import {
   recordDaemonHttpRequest,
   recordDaemonHttpResponse,
   withDaemonRequestSpan
-} from "./chunk-P64HXIC5.js";
-import "./chunk-4WKAA4KS.js";
-import "./chunk-CR3C7WXL.js";
+} from "./chunk-ZJVVETCV.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-JD3MKVKL.js";
-import "./chunk-UEY4AYUL.js";
-import "./chunk-BDBMYST4.js";
-import "./chunk-EZVDJFZ7.js";
-import "./chunk-OP4MOGXF.js";
-import "./chunk-XVNQMZ2I.js";
-import "./chunk-FEOZBUMT.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-6EFTQYW7.js";
-import "./chunk-FZVSFBNW.js";
+import "./chunk-4K56OJFJ.js";
+import "./chunk-JYS55H6Z.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
+import "./chunk-QNLNLENL.js";
+import "./chunk-6X4GWOPW.js";
 import "./chunk-TYQMGACW.js";
 import {
   import_websocket_server
 } from "./chunk-TYAMGABM.js";
 import "./chunk-FCMNKVXT.js";
+import "./chunk-7362QS5B.js";
+import "./chunk-HTR4WV6U.js";
+import "./chunk-M7WBGLYP.js";
+import "./chunk-U7ZFW55U.js";
+import "./chunk-NPQDJGKU.js";
+import "./chunk-YM3SZTH4.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   runWithoutDebugLogSession
-} from "./chunk-C27BYUX6.js";
+} from "./chunk-OQB4EXO4.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-TB6UDU4T.js";
+import "./chunk-THJNPLI4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -465,7 +477,6 @@ import { createHash as createHash3, timingSafeEqual } from "node:crypto";
 
 // packages/cli/src/serve/acp-http/dispatch.ts
 init_esbuild_shims();
-import path9 from "node:path";
 
 // packages/cli/src/serve/fs/errors.ts
 init_esbuild_shims();
@@ -6573,6 +6584,43 @@ function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
 __name(errMsg, "errMsg");
+var SESSION_WRITER_RPC_ERRORS = {
+  session_writer_conflict: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_conflict,
+    message: "This session is already open in another Qwen process."
+  },
+  session_writer_lost: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_lost,
+    message: "Write ownership for this session was lost."
+  },
+  session_transcript_changed: {
+    code: SESSION_WRITER_RPC_CODES.session_transcript_changed,
+    message: "The session transcript changed outside its active writer."
+  },
+  session_writer_unavailable: {
+    code: SESSION_WRITER_RPC_CODES.session_writer_unavailable,
+    message: "Session write ownership could not be verified."
+  }
+};
+function sessionWriterRpcError(err) {
+  if (!err || typeof err !== "object") return void 0;
+  const candidate = err;
+  const data = isObject(candidate["data"]) ? candidate["data"] : void 0;
+  const errorKind = data?.["errorKind"] ?? candidate["errorKind"];
+  if (typeof errorKind !== "string" || !(errorKind in SESSION_WRITER_RPC_ERRORS)) {
+    return void 0;
+  }
+  const typedKind = errorKind;
+  const expected = SESSION_WRITER_RPC_ERRORS[typedKind];
+  const code = candidate["code"] ?? candidate["rpcCode"];
+  if (code !== expected.code) return void 0;
+  return {
+    code: expected.code,
+    message: expected.message,
+    data: { errorKind: typedKind }
+  };
+}
+__name(sessionWriterRpcError, "sessionWriterRpcError");
 var debugLogger2 = createDebugLogger("ACP_HTTP_DISPATCH");
 var SESSION_SHELL_METHOD = `${QWEN_METHOD_NS}session/shell`;
 var INVALID_PERMISSION_OUTCOME_ERROR = '`outcome` must be `{ outcome: "cancelled" }` or `{ outcome: "selected", optionId: string }`';
@@ -6705,10 +6753,11 @@ function parseOptionalWorkspaceCwd2(params, boundWorkspace) {
       `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`
     );
   }
-  if (!path9.isAbsolute(cwd)) {
+  const sandboxCwd = translateAndCheckAbsoluteWorkspacePath(cwd);
+  if (sandboxCwd === null) {
     throw new AcpParamError("`cwd` must be an absolute path when provided");
   }
-  return cwd;
+  return sandboxCwd;
 }
 __name(parseOptionalWorkspaceCwd2, "parseOptionalWorkspaceCwd");
 function validatePrompt(params) {
@@ -6785,6 +6834,8 @@ function pickSessionArtifactInput(params) {
 }
 __name(pickSessionArtifactInput, "pickSessionArtifactInput");
 function toRpcError(err) {
+  const writerError = sessionWriterRpcError(err);
+  if (writerError) return writerError;
   if (err instanceof AcpParamError || err instanceof InvalidCursorError) {
     return { code: RPC.INVALID_PARAMS, message: err.message };
   }
@@ -7521,22 +7572,21 @@ var AcpDispatcher = class {
           conn.ownedSessions.delete(sessionId);
           conn.closingSessions.add(sessionId);
           let closeStarted = false;
-          const closeSession = /* @__PURE__ */ __name(async () => {
-            closeStarted = true;
+          const closeLocalSessionStream = /* @__PURE__ */ __name(() => {
             try {
-              await this.bridge.closeSession(
-                sessionId,
-                this.sessionCtx(conn, sessionId, loopback)
+              conn.closeSessionStream(sessionId);
+            } catch (teardownErr) {
+              writeStderrLine(
+                `qwen serve: /acp session/close local teardown failed (${logSafe(sessionId)}): ${logSafe(errMsg(teardownErr))}`
               );
-            } finally {
-              try {
-                conn.closeSessionStream(sessionId);
-              } catch (teardownErr) {
-                writeStderrLine(
-                  `qwen serve: /acp session/close local teardown failed (${logSafe(sessionId)}): ${logSafe(errMsg(teardownErr))}`
-                );
-              }
             }
+          }, "closeLocalSessionStream");
+          const closeSession = /* @__PURE__ */ __name(async () => {
+            closeStarted = true;
+            await this.bridge.closeSession(
+              sessionId,
+              this.sessionCtx(conn, sessionId, loopback)
+            );
           }, "closeSession");
           try {
             try {
@@ -7558,11 +7608,19 @@ var AcpDispatcher = class {
           } catch (err) {
             if (!closeStarted) {
               conn.ownedSessions.add(sessionId);
+            } else {
+              try {
+                this.bridge.getSessionSummary(sessionId);
+                conn.ownedSessions.add(sessionId);
+              } catch {
+                closeLocalSessionStream();
+              }
             }
             throw err;
           } finally {
             conn.closingSessions.delete(sessionId);
           }
+          closeLocalSessionStream();
           this.replyConn(conn, id, {});
           return;
         }
@@ -11954,7 +12012,7 @@ function mountAcpHttp(app, bridge, opts) {
   if (!enabled) return void 0;
   const daemonEnv = opts.daemonEnv ?? process.env;
   const primaryEnv = opts.workspaceRegistry ? runtimeEffectiveEnv(opts.workspaceRegistry.primary, daemonEnv) : daemonEnv;
-  const path16 = opts.path ?? "/acp";
+  const path15 = opts.path ?? "/acp";
   const dispatcherRef = {};
   let disposed = false;
   const rejectIfDisposed = /* @__PURE__ */ __name((res) => {
@@ -12116,7 +12174,7 @@ function mountAcpHttp(app, bridge, opts) {
   const primaryMount = {
     primary: true,
     workspaceCwd: opts.boundWorkspace,
-    routeLabel: logSafe(path16),
+    routeLabel: logSafe(path15),
     rateLimitScope: opts.workspaceRegistry?.primary.workspaceId ?? "primary",
     registry,
     dispatcher,
@@ -12270,7 +12328,7 @@ function mountAcpHttp(app, bridge, opts) {
     });
   }, "handleAcpPost");
   app.post(
-    path16,
+    path15,
     (req, res) => handleAcpPost(primaryMount, req, res)
   );
   const handleAcpGet = /* @__PURE__ */ __name((mount, req, res) => {
@@ -12360,10 +12418,10 @@ function mountAcpHttp(app, bridge, opts) {
       onPumpSettled();
     });
   }, "handleAcpGet");
-  app.get(path16, (req, res) => {
+  app.get(path15, (req, res) => {
     handleAcpGet(primaryMount, req, res);
   });
-  app.delete(path16, (req, res) => {
+  app.delete(path15, (req, res) => {
     handleAcpDelete(primaryMount, req, res);
   });
   const createSecondaryAcpMount = /* @__PURE__ */ __name((rt) => {
@@ -12555,7 +12613,7 @@ function mountAcpHttp(app, bridge, opts) {
       const isPluralAcpShape = pluralRawSelector !== null;
       const pluralVoiceRawSelector = opts.workspaceVoiceConnection ? pluralWorkspaceRawSelector(rawPath, PLURAL_VOICE_WS_SUFFIX) : null;
       const isPluralVoiceShape = pluralVoiceRawSelector !== null;
-      if (rawPath !== path16 && !isCdpPath && !extraRoute && !isPluralAcpShape && !isPluralVoiceShape) {
+      if (rawPath !== path15 && !isCdpPath && !extraRoute && !isPluralAcpShape && !isPluralVoiceShape) {
         logReject(`unknown-path ${logSafe(rawPath)}`);
         socket.destroy();
         return;
@@ -13080,7 +13138,7 @@ function mountAcpHttp(app, bridge, opts) {
       });
     }, "upgradeListener");
     httpServer.on("upgrade", upgradeListener);
-    writeStderrLine(`qwen serve: /acp WebSocket transport enabled on ${path16}`);
+    writeStderrLine(`qwen serve: /acp WebSocket transport enabled on ${path15}`);
   }
   __name(setupWebSocket, "setupWebSocket");
   return {
@@ -13710,7 +13768,7 @@ var CdpTunnelRegistry = class {
 // packages/cli/src/serve/web-shell-static.ts
 init_esbuild_shims();
 var import_express2 = __toESM(require_express(), 1);
-import * as path10 from "node:path";
+import * as path9 from "node:path";
 var WEB_SHELL_CSP_DIRECTIVES = [
   "default-src 'self'",
   "script-src 'self' 'unsafe-inline' 'unsafe-eval' 'wasm-unsafe-eval'",
@@ -13738,7 +13796,7 @@ function isDocumentNavigation(req) {
 }
 __name(isDocumentNavigation, "isDocumentNavigation");
 function createSendIndex(webShellDir, frameAncestors = []) {
-  const indexPath = path10.join(webShellDir, "index.html");
+  const indexPath = path9.join(webShellDir, "index.html");
   const csp = buildWebShellCsp(frameAncestors);
   return (res) => {
     res.status(200).set("Content-Security-Policy", csp).set("X-Content-Type-Options", "nosniff").set("Referrer-Policy", "no-referrer").set(
@@ -13774,7 +13832,7 @@ function mountWebShellAssets(app, webShellDir, frameAncestors = []) {
   const sendIndex = createSendIndex(webShellDir, frameAncestors);
   app.use(
     "/assets",
-    import_express2.default.static(path10.join(webShellDir, "assets"), {
+    import_express2.default.static(path9.join(webShellDir, "assets"), {
       index: false,
       immutable: true,
       maxAge: "1y"
@@ -18068,8 +18126,8 @@ function decodePathSegment(value) {
 }
 __name(decodePathSegment, "decodePathSegment");
 function matchLegacySessionTelemetryRoute(method, requestPath) {
-  const path16 = requestPath.length > 1 && requestPath.endsWith("/") ? requestPath.slice(0, -1) : requestPath;
-  const requestSegments = path16.split("/").slice(1);
+  const path15 = requestPath.length > 1 && requestPath.endsWith("/") ? requestPath.slice(0, -1) : requestPath;
+  const requestSegments = path15.split("/").slice(1);
   const prefix = requestSegments[0]?.toLowerCase();
   if (prefix !== "session" && prefix !== "sessions" && prefix !== "permission") {
     return void 0;
@@ -18121,23 +18179,23 @@ __name(setDaemonTelemetryWorkspace, "setDaemonTelemetryWorkspace");
 function resolveDaemonTelemetryRoute(req) {
   const legacyRoute = matchLegacySessionTelemetryRoute(req.method, req.path);
   if (legacyRoute) return legacyRoute;
-  const path16 = req.path.replace(/\/$/, "") || "/";
-  if (req.method === "GET" && path16 === "/daemon/status") {
+  const path15 = req.path.replace(/\/$/, "") || "/";
+  if (req.method === "GET" && path15 === "/daemon/status") {
     return { route: "GET /daemon/status" };
   }
-  if (req.method === "GET" && /^\/workspace\/[^/]+\/sessions$/.test(path16)) {
+  if (req.method === "GET" && /^\/workspace\/[^/]+\/sessions$/.test(path15)) {
     return { route: "GET /workspace/:id/sessions" };
   }
-  if (req.method === "GET" && /^\/workspaces\/[^/]+\/sessions$/.test(path16)) {
+  if (req.method === "GET" && /^\/workspaces\/[^/]+\/sessions$/.test(path15)) {
     return { route: "GET /workspace/:id/sessions" };
   }
-  if (req.method === "GET" && /^\/workspace\/[^/]+\/session-info$/.test(path16)) {
+  if (req.method === "GET" && /^\/workspace\/[^/]+\/session-info$/.test(path15)) {
     return { route: "GET /workspace/:id/session-info" };
   }
-  if (req.method === "GET" && /^\/workspaces\/[^/]+\/session-info$/.test(path16)) {
+  if (req.method === "GET" && /^\/workspaces\/[^/]+\/session-info$/.test(path15)) {
     return { route: "GET /workspace/:id/session-info" };
   }
-  const workspaceTranscript = path16.match(
+  const workspaceTranscript = path15.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/transcript$/
   );
   if (workspaceTranscript?.[1] && req.method === "GET") {
@@ -18146,7 +18204,7 @@ function resolveDaemonTelemetryRoute(req) {
       sessionId: decodePathSegment(workspaceTranscript[1])
     };
   }
-  const workspaceExport = path16.match(
+  const workspaceExport = path15.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/export$/
   );
   if (workspaceExport?.[1] && req.method === "GET") {
@@ -18155,7 +18213,7 @@ function resolveDaemonTelemetryRoute(req) {
       sessionId: decodePathSegment(workspaceExport[1])
     };
   }
-  const workspaceArchivedExport = path16.match(
+  const workspaceArchivedExport = path15.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/archive\/export$/
   );
   if (workspaceArchivedExport?.[1] && req.method === "GET") {
@@ -18165,8 +18223,8 @@ function resolveDaemonTelemetryRoute(req) {
     };
   }
   const pluralWorkspacePrefix = /^\/workspaces\/[^/]+/;
-  if (pluralWorkspacePrefix.test(path16)) {
-    const suffix = path16.replace(pluralWorkspacePrefix, "/workspace");
+  if (pluralWorkspacePrefix.test(path15)) {
+    const suffix = path15.replace(pluralWorkspacePrefix, "/workspace");
     if (req.method === "GET") {
       if (suffix === "/workspace/mcp" || suffix === "/workspace/skills" || suffix === "/workspace/tools" || suffix === "/workspace/providers" || suffix === "/workspace/env" || suffix === "/workspace/preflight" || suffix === "/workspace/hooks" || suffix === "/workspace/settings" || suffix === "/workspace/voice" || suffix === "/workspace/permissions" || suffix === "/workspace/trust" || suffix === "/workspace/memory" || suffix === "/workspace/agents") {
         return { route: `GET ${suffix}` };
@@ -18225,58 +18283,58 @@ function resolveDaemonTelemetryRoute(req) {
       return { route: "DELETE /workspace/session-groups/:groupId" };
     }
   }
-  if (req.method === "POST" && path16 === "/workspace/init") {
+  if (req.method === "POST" && path15 === "/workspace/init") {
     return { route: "POST /workspace/init" };
   }
-  if (req.method === "POST" && path16 === "/workspace/setup-github") {
+  if (req.method === "POST" && path15 === "/workspace/setup-github") {
     return { route: "POST /workspace/setup-github" };
   }
-  if (req.method === "POST" && path16 === "/workspace/reload") {
+  if (req.method === "POST" && path15 === "/workspace/reload") {
     return { route: "POST /workspace/reload" };
   }
-  const mcpRestart = path16.match(/^\/workspace\/mcp\/([^/]+)\/restart$/);
+  const mcpRestart = path15.match(/^\/workspace\/mcp\/([^/]+)\/restart$/);
   if (mcpRestart?.[1] && req.method === "POST") {
     return { route: "POST /workspace/mcp/:server/restart" };
   }
-  if (req.method === "POST" && path16 === "/workspace/mcp/servers") {
+  if (req.method === "POST" && path15 === "/workspace/mcp/servers") {
     return { route: "POST /workspace/mcp/servers" };
   }
-  const mcpDelete = path16.match(/^\/workspace\/mcp\/servers\/([^/]+)$/);
+  const mcpDelete = path15.match(/^\/workspace\/mcp\/servers\/([^/]+)$/);
   if (mcpDelete?.[1] && req.method === "DELETE") {
     return { route: "DELETE /workspace/mcp/servers/:name" };
   }
-  if (req.method === "POST" && path16 === "/workspace/auth/device-flow") {
+  if (req.method === "POST" && path15 === "/workspace/auth/device-flow") {
     return { route: "POST /workspace/auth/device-flow" };
   }
-  const deviceFlowDelete = path16.match(
+  const deviceFlowDelete = path15.match(
     /^\/workspace\/auth\/device-flow\/([^/]+)$/
   );
   if (deviceFlowDelete?.[1] && req.method === "DELETE") {
     return { route: "DELETE /workspace/auth/device-flow/:id" };
   }
-  const toolEnable = path16.match(/^\/workspace\/tools\/([^/]+)\/enable$/);
+  const toolEnable = path15.match(/^\/workspace\/tools\/([^/]+)\/enable$/);
   if (toolEnable?.[1] && req.method === "POST") {
     return { route: "POST /workspace/tools/:name/enable" };
   }
-  if (path16 === "/workspace/settings") {
+  if (path15 === "/workspace/settings") {
     if (req.method === "GET") return { route: "GET /workspace/settings" };
     if (req.method === "POST") return { route: "POST /workspace/settings" };
   }
-  if (path16 === "/workspace/permissions") {
+  if (path15 === "/workspace/permissions") {
     if (req.method === "GET") return { route: "GET /workspace/permissions" };
     if (req.method === "POST") return { route: "POST /workspace/permissions" };
   }
-  if (path16 === "/workspace/trust") {
+  if (path15 === "/workspace/trust") {
     if (req.method === "GET") return { route: "GET /workspace/trust" };
   }
-  if (req.method === "POST" && path16 === "/workspace/trust/request") {
+  if (req.method === "POST" && path15 === "/workspace/trust/request") {
     return { route: "POST /workspace/trust/request" };
   }
-  if (path16 === "/workspace/voice") {
+  if (path15 === "/workspace/voice") {
     if (req.method === "GET") return { route: "GET /workspace/voice" };
     if (req.method === "POST") return { route: "POST /workspace/voice" };
   }
-  if (req.method === "POST" && path16 === "/workspace/voice/transcribe") {
+  if (req.method === "POST" && path15 === "/workspace/voice/transcribe") {
     return { route: "POST /workspace/voice/transcribe" };
   }
   return void 0;
@@ -18536,21 +18594,10 @@ __name(registerPermissionRoutes, "registerPermissionRoutes");
 init_esbuild_shims();
 import * as crypto3 from "node:crypto";
 import * as fs3 from "node:fs";
-import * as path11 from "node:path";
+import * as path10 from "node:path";
 
 // packages/cli/src/serve/server/prompt-deadline.ts
 init_esbuild_shims();
-var PromptDeadlineExceededError = class extends Error {
-  static {
-    __name(this, "PromptDeadlineExceededError");
-  }
-  deadlineMs;
-  constructor(deadlineMs) {
-    super(`prompt exceeded the ${deadlineMs}ms deadline`);
-    this.name = "PromptDeadlineExceededError";
-    this.deadlineMs = deadlineMs;
-  }
-};
 function resolvePromptDeadlineMs(serverMs, requestMs) {
   if (serverMs === void 0 || !Number.isFinite(serverMs) || serverMs <= 0) {
     return void 0;
@@ -19477,7 +19524,7 @@ function registerSessionRoutes(app, deps) {
     const workspaceParam = req.params[paramName] ?? "";
     const byId = workspaceRegistry.getByWorkspaceId(workspaceParam);
     if (byId) return byId;
-    if (!path11.isAbsolute(workspaceParam)) {
+    if (!path10.isAbsolute(workspaceParam)) {
       res.status(400).json({
         error: `\`:${paramName}\` must decode to a workspace id or absolute path`
       });
@@ -19891,7 +19938,7 @@ function registerSessionRoutes(app, deps) {
   })), "serializeSessionErrors");
   const resolveWorkspaceParam = /* @__PURE__ */ __name((req, res) => {
     const workspaceCwd = req.params["id"] ?? "";
-    if (!path11.isAbsolute(workspaceCwd)) {
+    if (!path10.isAbsolute(workspaceCwd)) {
       res.status(400).json({ error: "`:id` must decode to an absolute workspace path" });
       return null;
     }
@@ -20077,7 +20124,7 @@ function registerSessionRoutes(app, deps) {
       if (worktreeMeta) {
         try {
           const createAllowedRoots = [
-            path11.join(workspaceCwd, ".qwen", "worktrees")
+            path10.join(workspaceCwd, ".qwen", "worktrees")
           ];
           let createRepoTop = null;
           try {
@@ -20088,7 +20135,7 @@ function registerSessionRoutes(app, deps) {
           }
           if (createRepoTop && createRepoTop !== workspaceCwd) {
             createAllowedRoots.push(
-              path11.join(createRepoTop, ".qwen", "worktrees")
+              path10.join(createRepoTop, ".qwen", "worktrees")
             );
           }
           await runtime.bridge.changeSessionCwd(session.sessionId, {
@@ -20233,7 +20280,7 @@ function registerSessionRoutes(app, deps) {
         if (sidecar) {
           let realTarget;
           const candidateRoots = [
-            path11.join(workspaceCwd, ".qwen", "worktrees")
+            path10.join(workspaceCwd, ".qwen", "worktrees")
           ];
           try {
             realTarget = fs3.realpathSync(sidecar.worktreePath);
@@ -20245,13 +20292,13 @@ function registerSessionRoutes(app, deps) {
             } catch {
             }
             if (repoTop && repoTop !== workspaceCwd) {
-              candidateRoots.push(path11.join(repoTop, ".qwen", "worktrees"));
+              candidateRoots.push(path10.join(repoTop, ".qwen", "worktrees"));
             }
             const contained = candidateRoots.some((root) => {
               try {
                 const realRoot = fs3.realpathSync(root);
-                const rel = path11.relative(realRoot, realTarget);
-                return !rel.startsWith("..") && !path11.isAbsolute(rel);
+                const rel = path10.relative(realRoot, realTarget);
+                return !rel.startsWith("..") && !path10.isAbsolute(rel);
               } catch {
                 return false;
               }
@@ -20274,10 +20321,12 @@ function registerSessionRoutes(app, deps) {
               branch: sidecar.worktreeBranch
             };
             try {
-              await runtime.bridge.changeSessionCwd(sessionId, {
-                path: wt.path,
-                allowedRoots: candidateRoots
-              });
+              if (!session.hasActivePrompt) {
+                await runtime.bridge.changeSessionCwd(sessionId, {
+                  path: wt.path,
+                  allowedRoots: candidateRoots
+                });
+              }
               runtime.bridge.setSessionWorktree(sessionId, wt);
               session.worktree = wt;
             } catch (restoreErr) {
@@ -20371,7 +20420,7 @@ function registerSessionRoutes(app, deps) {
       async (req, res, sessionId) => {
         const body = safeBody(req);
         const targetPath = body["path"];
-        if (typeof targetPath !== "string" || targetPath.length === 0 || !path11.isAbsolute(targetPath)) {
+        if (typeof targetPath !== "string" || targetPath.length === 0 || !path10.isAbsolute(targetPath)) {
           res.status(400).json({
             error: "`path` is required and must be an absolute path",
             code: "invalid_path"
@@ -20873,15 +20922,6 @@ function registerSessionRoutes(app, deps) {
           promptDeadlineMs,
           requestDeadlineMs
         );
-        let deadlineTimer;
-        if (effectiveDeadlineMs !== void 0) {
-          deadlineTimer = setTimeout(() => {
-            if (!abort.signal.aborted) {
-              abort.abort(new PromptDeadlineExceededError(effectiveDeadlineMs));
-            }
-          }, effectiveDeadlineMs);
-          deadlineTimer.unref();
-        }
         let promptPromise;
         try {
           promptPromise = ownerBridge.sendPrompt(
@@ -20894,11 +20934,11 @@ function registerSessionRoutes(app, deps) {
             abort.signal,
             {
               ...clientId !== void 0 ? { clientId } : {},
-              promptId
+              promptId,
+              ...effectiveDeadlineMs !== void 0 ? { deadlineMs: effectiveDeadlineMs } : {}
             }
           );
         } catch (err) {
-          if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
           res.off("close", onResClose);
           res.off("finish", onResFinish);
           if (daemonLog && err instanceof PromptQueueFullError) {
@@ -20943,9 +20983,7 @@ function registerSessionRoutes(app, deps) {
               );
             }
           }
-        ).finally(() => {
-          if (deadlineTimer !== void 0) clearTimeout(deadlineTimer);
-        }).catch(() => {
+        ).catch(() => {
         });
         if (daemonLog) {
           daemonLog.info("prompt enqueued", { sessionId, promptId, clientId });
@@ -22818,7 +22856,7 @@ __name(registerUsageStatsRoutes, "registerUsageStatsRoutes");
 // packages/cli/src/serve/scheduled-task-keepalive.ts
 init_esbuild_shims();
 import * as fsSync from "node:fs";
-import * as path12 from "node:path";
+import * as path11 from "node:path";
 var log = createDebugLogger("SCHED_KEEPALIVE");
 function collectBoundSessionIds(tasks) {
   const seen = /* @__PURE__ */ new Set();
@@ -23029,8 +23067,8 @@ function startScheduledTaskKeepalive(opts) {
   timer.unref?.();
   let bindDebounce;
   const cronFilePath = getCronFilePath(boundWorkspace);
-  const cronDir = path12.dirname(cronFilePath);
-  const cronFileName = path12.basename(cronFilePath);
+  const cronDir = path11.dirname(cronFilePath);
+  const cronFileName = path11.basename(cronFilePath);
   let fileWatcher;
   try {
     fsSync.mkdirSync(cronDir, { recursive: true });
@@ -24220,6 +24258,12 @@ init_esbuild_shims();
 
 // packages/cli/src/serve/server/error-response.ts
 init_esbuild_shims();
+var SESSION_WRITER_ERROR_MESSAGES = {
+  session_writer_conflict: "This session is already open in another Qwen process.",
+  session_writer_lost: "Write ownership for this session was lost.",
+  session_transcript_changed: "The session transcript changed outside its active writer.",
+  session_writer_unavailable: "Session write ownership could not be verified."
+};
 function bridgeErrorExtraContext(ctx) {
   const extra = {};
   for (const [key, value] of Object.entries(ctx ?? {})) {
@@ -24272,6 +24316,14 @@ function sendPermissionVoteError(res, err, ctx, daemonLog) {
 }
 __name(sendPermissionVoteError, "sendPermissionVoteError");
 function sendBridgeError(res, err, ctx, daemonLog) {
+  if (err instanceof SessionWriterError) {
+    res.status(err.httpStatus).json({
+      error: err.message,
+      code: err.errorKind,
+      errorKind: err.errorKind
+    });
+    return;
+  }
   if (err instanceof WorkspaceSkillNotFoundError) {
     res.status(404).json({
       error: err.message,
@@ -24584,6 +24636,22 @@ function sendBridgeError(res, err, ctx, daemonLog) {
     const data = err.data;
     if (data && typeof data === "object") {
       const kind = data.errorKind;
+      if (kind === "session_writer_conflict" || kind === "session_writer_lost" || kind === "session_transcript_changed") {
+        res.status(409).json({
+          error: SESSION_WRITER_ERROR_MESSAGES[kind],
+          code: kind,
+          errorKind: kind
+        });
+        return;
+      }
+      if (kind === "session_writer_unavailable") {
+        res.status(503).json({
+          error: SESSION_WRITER_ERROR_MESSAGES[kind],
+          code: kind,
+          errorKind: kind
+        });
+        return;
+      }
       if (kind === "mcp_budget_would_exceed") {
         const d = data;
         res.status(409).json({
@@ -25215,7 +25283,7 @@ __name(registerWorkspaceModelsRoutes, "registerWorkspaceModelsRoutes");
 // packages/cli/src/serve/routes/a2ui-action.ts
 init_esbuild_shims();
 import * as fsp4 from "node:fs/promises";
-import * as path13 from "node:path";
+import * as path12 from "node:path";
 var A2UI_MIME = "application/a2ui+json";
 var ACTION_TOOL = "action";
 var CALL_TIMEOUT_MS = 15e3;
@@ -25238,7 +25306,7 @@ __name(usableServerConfig, "usableServerConfig");
 async function findFromSettingsFile(workspaceCwd) {
   try {
     const raw = await fsp4.readFile(
-      path13.join(workspaceCwd, ".qwen", "settings.json"),
+      path12.join(workspaceCwd, ".qwen", "settings.json"),
       "utf8"
     );
     const settings = JSON.parse(raw);
@@ -25375,7 +25443,7 @@ __name(registerA2uiActionRoutes, "registerA2uiActionRoutes");
 
 // packages/cli/src/serve/server/fs-factory.ts
 init_esbuild_shims();
-import * as path14 from "node:path";
+import * as path13 from "node:path";
 var IDE_WORKSPACE_PATH_ENV_VAR = "QWEN_CODE_IDE_WORKSPACE_PATH";
 function createDefaultFsAuditEmit() {
   const WARN_EVERY = 100;
@@ -25449,14 +25517,14 @@ function parseIdeWorkspacePathEnv(value) {
       const parsed = JSON.parse(value);
       if (Array.isArray(parsed) && parsed.every((item) => typeof item === "string")) {
         return parsed.filter(
-          (workspace) => workspace.length > 0 && path14.isAbsolute(workspace)
+          (workspace) => workspace.length > 0 && path13.isAbsolute(workspace)
         );
       }
       throw new Error("IDE workspace path JSON must be a string array");
     } catch {
     }
   }
-  return value.split(path14.delimiter).filter((workspace) => workspace.length > 0 && path14.isAbsolute(workspace));
+  return value.split(path13.delimiter).filter((workspace) => workspace.length > 0 && path13.isAbsolute(workspace));
 }
 __name(parseIdeWorkspacePathEnv, "parseIdeWorkspacePathEnv");
 function dropNestedWorkspacesPreservingPrimary(workspaces) {
@@ -25780,10 +25848,10 @@ function installRateLimiter(app, opts, daemonLog, options = {}) {
         { tier, key: key.slice(0, 64) }
       );
     } : void 0,
-    onError: daemonLog ? (err, path16) => {
+    onError: daemonLog ? (err, path15) => {
       daemonLog.warn(
         `rate limiter error (fail-open): ${err instanceof Error ? err.message : String(err)}`,
-        { path: path16 }
+        { path: path15 }
       );
     } : void 0
   });
@@ -26134,23 +26202,24 @@ function registerWorkspaceManagementRoutes(app, deps) {
         });
         return;
       }
-      if (!isAbsolute7(cwd)) {
+      if (cwd.length > MAX_WORKSPACE_PATH_LENGTH) {
         res.status(400).json({
-          error: "`cwd` must be an absolute path",
+          error: `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`,
           code: "invalid_path"
         });
         return;
       }
-      if (cwd.length > MAX_WORKSPACE_PATH_LENGTH) {
+      const sandboxCwd = translateAndCheckAbsoluteWorkspacePath(cwd);
+      if (sandboxCwd === null) {
         res.status(400).json({
-          error: `\`cwd\` exceeds the ${MAX_WORKSPACE_PATH_LENGTH}-character limit`,
+          error: "`cwd` must be an absolute path",
           code: "invalid_path"
         });
         return;
       }
       let canonical;
       try {
-        canonical = realpathSync2.native(resolve4(cwd));
+        canonical = realpathSync2.native(resolve4(sandboxCwd));
       } catch {
         res.status(400).json({
           error: "Path does not exist or is not accessible",
@@ -26971,7 +27040,7 @@ __name(registerWorkspaceManagementRoutes, "registerWorkspaceManagementRoutes");
 // packages/cli/src/serve/routes/workspace-git.ts
 init_esbuild_shims();
 import * as fs4 from "node:fs";
-import * as path15 from "node:path";
+import * as path14 from "node:path";
 function registerWorkspaceGitRoutes(app, deps) {
   app.get("/workspace/git", async (_req, res) => {
     try {
@@ -26997,10 +27066,10 @@ function registerWorkspaceQualifiedGitRoutes(app, deps) {
     let gitCwd = runtime.workspaceCwd;
     if (typeof rawCwd === "string" && rawCwd.length > 0) {
       try {
-        const resolved = fs4.realpathSync(path15.resolve(rawCwd));
+        const resolved = fs4.realpathSync(path14.resolve(rawCwd));
         const root = fs4.realpathSync(runtime.workspaceCwd);
-        const rel = path15.relative(root, resolved);
-        if (!rel.startsWith("..") && !path15.isAbsolute(rel)) {
+        const rel = path14.relative(root, resolved);
+        if (!rel.startsWith("..") && !path14.isAbsolute(rel)) {
           gitCwd = resolved;
         }
       } catch {
@@ -27052,8 +27121,8 @@ function buildDiffList(workspaceCwd, result) {
       hiddenCount: 0
     };
   }
-  const files = [...result.perFileStats.entries()].map(([path16, s]) => ({
-    path: path16,
+  const files = [...result.perFileStats.entries()].map(([path15, s]) => ({
+    path: path15,
     oldPath: s.oldPath,
     added: s.added,
     removed: s.removed,