@qwen-code/qwen-code 0.23.3-nightly.20260913.faa395885e → 0.23.4-dev.codemode-responses.20260914.87437db784

package/chunks/{acpAgent-ESNFMMRE.js → acpAgent-WJ45JV2S.js}

@@ -3,7 +3,7 @@
 import {
   PeerMessaging,
   classifyApiError
-} from "./chunk-Y5SVC2KK.js";
+} from "./chunk-DNVA2MQ2.js";
 import {
   fireSessionDeleteHook
 } from "./chunk-L34XSHIZ.js";
@@ -19,7 +19,7 @@ import {
   matchMcpServerByRef,
   parseExtensionRef,
   parseMcpServerRef
-} from "./chunk-KW6TSO4B.js";
+} from "./chunk-6MLDTOHU.js";
 import {
   getAvailableCommands,
   getSlashCommandFirstToken,
@@ -29,10 +29,10 @@ import {
   pLimit,
   recordDaemonSessionModel,
   restoreSessionModelThenAuthenticate
-} from "./chunk-YSCL5S2A.js";
+} from "./chunk-GCV4NOHV.js";
 import {
   recomputeMcpGating
-} from "./chunk-LLMV3I4Q.js";
+} from "./chunk-PHSQVB6D.js";
 import {
   SessionIdConflictError,
   appEvents,
@@ -42,35 +42,35 @@ import {
   loadCliConfig,
   normalizeDisabledToolList,
   parseApprovalModeValue
-} from "./chunk-W2XHDSPB.js";
+} from "./chunk-JBFC2644.js";
 import {
   getCommandSubcommandNames,
   getEffectiveSupportedModes
-} from "./chunk-MG27DO5F.js";
+} from "./chunk-WLLRNQVT.js";
 import "./chunk-YGFJ6BRT.js";
 import "./chunk-NYX53SV4.js";
 import "./chunk-FBDHP23D.js";
 import {
   collectContextData,
   formatContextUsageText
-} from "./chunk-Y7WJKZVZ.js";
+} from "./chunk-S3PU3CNW.js";
 import "./chunk-4WGODMVR.js";
 import {
   startNonInteractiveOpenAILogHousekeeping
-} from "./chunk-GVZCLTML.js";
+} from "./chunk-WMSP3XZK.js";
 import "./chunk-KW7NOTN6.js";
 import "./chunk-2XRE4KE4.js";
-import "./chunk-PWFDZN4R.js";
+import "./chunk-BNYQHLPR.js";
 import {
   isGoalStatusKind
 } from "./chunk-EKTCKZV5.js";
-import "./chunk-K7NMO6MP.js";
+import "./chunk-HWRXJQ6B.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   computeCpuPercent
 } from "./chunk-LBOVL47Y.js";
 import "./chunk-24FVUD5P.js";
-import "./chunk-XZLBVMZV.js";
+import "./chunk-A6QMKS5S.js";
 import "./chunk-6H67XLET.js";
 import {
   beginAcpBootstrapConfigProfiling,
@@ -78,8 +78,8 @@ import {
   endAcpBootstrapConfigProfiling,
   markAcpStartup
 } from "./chunk-DOTF2PF2.js";
-import "./chunk-FT6AVCMQ.js";
-import "./chunk-NBROLZHT.js";
+import "./chunk-B776VKDA.js";
+import "./chunk-EZSSJSKR.js";
 import {
   GENERATION_MAX_PROMPT_BYTES,
   GENERATION_TIMEOUT_MS,
@@ -100,7 +100,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-V2A55RJB.js";
+} from "./chunk-CL7JONZN.js";
 import {
   BaseEmitter,
   HistoryReplayer,
@@ -111,7 +111,7 @@ import {
   hasFullSessionContext,
   observeAcpToolResultProjection,
   observeAcpToolResultWire
-} from "./chunk-V2CJ5ACV.js";
+} from "./chunk-L3S2Y2FF.js";
 import "./chunk-M3JGHRMQ.js";
 import "./chunk-VFFQAOPR.js";
 import "./chunk-2S2WIGCM.js";
@@ -141,7 +141,7 @@ import {
   normalizeChannelDeliveryText,
   scheduledTaskRunSessionName,
   scheduledTaskRunSourceId
-} from "./chunk-EER454EK.js";
+} from "./chunk-JAYWZWZF.js";
 import {
   normalizeSessionIdForLookup,
   parseCallerSuppliedSessionId
@@ -152,7 +152,7 @@ import {
   buildPermissionSettings,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-4HXMRKIV.js";
+} from "./chunk-GMN73IMT.js";
 import {
   MAX_AUDIO_BYTES,
   sanitizeVoiceErrorMessage,
@@ -185,16 +185,16 @@ import {
 import {
   resolveSkillSettings
 } from "./chunk-LMJSPC55.js";
-import "./chunk-PJHSJB57.js";
+import "./chunk-Q3TFRP5G.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-B6OHBZER.js";
-import "./chunk-O5B74SLD.js";
-import "./chunk-IRNPT6YS.js";
+} from "./chunk-GXN7DWZZ.js";
+import "./chunk-LBDASOPR.js";
+import "./chunk-MDG6GKSE.js";
 import "./chunk-JS73NNWF.js";
 import {
   SCHEDULED_TASK_RUN_SOURCE_TYPE
-} from "./chunk-YWJEEA4M.js";
+} from "./chunk-63WKMKVD.js";
 import "./chunk-7U5G6JXI.js";
 import "./chunk-WCCLLK7X.js";
 import "./chunk-OCPBI7J5.js";
@@ -210,7 +210,7 @@ import {
   STATUS_SCHEMA_VERSION,
   mapDomainErrorToErrorKind
 } from "./chunk-54B2LTKP.js";
-import "./chunk-JL2RATSH.js";
+import "./chunk-K7CQWBLT.js";
 import {
   ACP_ROUTE_ID_PREFIX,
   buildAcpModelOptions,
@@ -220,11 +220,11 @@ import {
   resolveAcpModelOption,
   sanitizeProviderBaseUrl
 } from "./chunk-INGBUYL6.js";
-import "./chunk-CUQM374L.js";
-import "./chunk-FZRRIJPC.js";
+import "./chunk-JZKBMADP.js";
+import "./chunk-H23UWPF7.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-EZXKE7ZR.js";
-import "./chunk-JPYGGOLB.js";
+import "./chunk-IAS753HG.js";
+import "./chunk-5ODRE7E5.js";
 import "./chunk-ABNX6E6K.js";
 import "./chunk-V6WHFGST.js";
 import {
@@ -306,7 +306,7 @@ import {
 import {
   assembleMcpServers,
   loadMcpApprovals
-} from "./chunk-B2HMDSZO.js";
+} from "./chunk-457DR2MC.js";
 import {
   deleteNestedPropertySafe,
   getOutputLanguageFilePath,
@@ -318,8 +318,8 @@ import {
   settingExistsInScope,
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-GX4SZXNA.js";
-import "./chunk-ZZO262KG.js";
+} from "./chunk-J73WJIMT.js";
+import "./chunk-KSIOXYVX.js";
 import "./chunk-RKUWKYED.js";
 import {
   getCurrentLanguage,
@@ -332,7 +332,7 @@ import {
   findEnvFiles,
   preResolveHomeEnvOverrides,
   reloadEnvironment
-} from "./chunk-QBOQHWSY.js";
+} from "./chunk-A6YU6R5N.js";
 import "./chunk-SFL6U7U7.js";
 import "./chunk-BW4333PP.js";
 import {
@@ -346,12 +346,12 @@ import {
 import "./chunk-XFSFZCM5.js";
 import "./chunk-2EAZ43JQ.js";
 import "./chunk-NF5J2WFA.js";
-import "./chunk-CMHCIJV6.js";
+import "./chunk-DLJBYORJ.js";
 import "./chunk-W3N5XAZ6.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-FQ366CXY.js";
+} from "./chunk-NTCFKGQF.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import {
@@ -380,7 +380,7 @@ import {
   readManyFiles,
   runManagedRememberByAgent,
   subagentGenerator
-} from "./chunk-U67XI6DF.js";
+} from "./chunk-BS7ON54G.js";
 import {
   buildToolWriteOriginMeta
 } from "./chunk-GELRJXE2.js";
@@ -399,16 +399,16 @@ import {
   getDefaultModelIds,
   resolveBaseUrl,
   resolveOwnsModel
-} from "./chunk-35FHAAKR.js";
-import "./chunk-AWIDTT6L.js";
+} from "./chunk-ZRZZLM37.js";
+import "./chunk-YVF4PKCV.js";
 import "./chunk-EKMJR7M3.js";
 import "./chunk-EDB556X7.js";
 import {
   restoreWorktreeContext
-} from "./chunk-2WXEMERX.js";
-import "./chunk-SJM77TB6.js";
+} from "./chunk-QR4Q425T.js";
+import "./chunk-C5ABXOC2.js";
 import "./chunk-DJXSOEFB.js";
-import "./chunk-U5RT4WTL.js";
+import "./chunk-5VQR2DD7.js";
 import "./chunk-BUQN5LTI.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-YM6KUQ2S.js";
@@ -420,8 +420,8 @@ import {
   listWorkflowSnapshots,
   resolveSavedWorkflowScript,
   toSnapshot
-} from "./chunk-U5MXMLTQ.js";
-import "./chunk-7NVASIXD.js";
+} from "./chunk-FFBP5POK.js";
+import "./chunk-C3VNHDWJ.js";
 import {
   APPROVAL_MODE_INFO,
   BranchPointInvalidError,
@@ -560,9 +560,9 @@ import {
   updateSetting,
   validatePlanModeShellApproval,
   validatePlanModeShellContext
-} from "./chunk-BL7ND5BF.js";
+} from "./chunk-CFSBWJBB.js";
 import "./chunk-GOFAQQZA.js";
-import "./chunk-6HUXPLB5.js";
+import "./chunk-HEOH7JZY.js";
 import "./chunk-TWPJO254.js";
 import {
   external_exports
@@ -575,13 +575,13 @@ import {
 } from "./chunk-6PVPNMXU.js";
 import {
   RUNTIME_SNAPSHOT_PREFIX
-} from "./chunk-DPFPIOT7.js";
+} from "./chunk-QQL5BFOL.js";
 import {
   SESSION_ARTIFACT_PERSISTENCE_VERSION,
   normalizeEventPayload,
   normalizeSnapshotPayload,
   wrapUserPromptSubmitContext
-} from "./chunk-EYN3G5XD.js";
+} from "./chunk-ME4JBHSB.js";
 import "./chunk-GNV2SFO7.js";
 import "./chunk-5EZRLTLQ.js";
 import "./chunk-QHWCP53L.js";
@@ -616,7 +616,7 @@ import "./chunk-ACHCT36C.js";
 import {
   escapeJsonTagCharacters
 } from "./chunk-CHEIIBT3.js";
-import "./chunk-77A22NFK.js";
+import "./chunk-AEWCOE64.js";
 import {
   registerSession
 } from "./chunk-OWUAZXXN.js";
@@ -640,14 +640,14 @@ import {
 import "./chunk-GSS4SZNG.js";
 import {
   runWithRuntimeContentGenerator
-} from "./chunk-DBRCSM4Q.js";
+} from "./chunk-BW2SMO6L.js";
 import "./chunk-S6LOFUVP.js";
 import {
   FORK_SUBAGENT_TYPE,
   isSystemReminderContent,
   wrapSystemReminder
-} from "./chunk-ZZFRNF5K.js";
-import "./chunk-ESW2J7ON.js";
+} from "./chunk-VVI7MK3V.js";
+import "./chunk-WBSJ6VPZ.js";
 import {
   HookEventName,
   createHookOutput
@@ -703,7 +703,7 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-PVY7BXFE.js";
+} from "./chunk-NRUKL236.js";
 import {
   INVOCATION_CONTEXT_META_KEY,
   PRIVATE_ACP_CAPABILITY_ENV,
@@ -742,7 +742,7 @@ import "./chunk-TIGXX4PA.js";
 import {
   hasVertexProjectConfigured,
   preloadContentGenerator
-} from "./chunk-LHLLMSQT.js";
+} from "./chunk-6TMXX4Z4.js";
 import "./chunk-XFFRI3WM.js";
 import {
   AuthType
@@ -779,13 +779,13 @@ import {
   sessionIdContext
 } from "./chunk-ZAFYHRVY.js";
 import "./chunk-TBWQLLFO.js";
-import "./chunk-PJ4NVBFL.js";
+import "./chunk-LATAUG2M.js";
 import "./chunk-V5U2NZNJ.js";
 import "./chunk-BSIOCNDK.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-YVUZYCZC.js";
+} from "./chunk-DBUOMHLZ.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -1046,6 +1046,7 @@ var AcpFileSystemService = class {
 
 // packages/cli/src/acp-integration/acpAgent.ts
 import { Readable as Readable2, Writable as Writable2 } from "node:stream";
+import { realpathSync as realpathSync3 } from "node:fs";
 import * as fs4 from "node:fs/promises";
 import * as os3 from "node:os";
 import * as path7 from "node:path";
@@ -18570,7 +18571,7 @@ var QwenAgent = class _QwenAgent {
     }
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version = "0.23.3-nightly.20260913.faa395885e";
+    const version = "0.23.4-dev.codemode-responses.20260914.87437db784";
     const response = {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -19752,8 +19753,105 @@ var QwenAgent = class _QwenAgent {
     });
   }
   loadPermissionSettings(cwd) {
-    this.settings = loadSettings(cwd);
-    return this.settings;
+    return this.adoptRequestSettings(this.loadRequestSettings(cwd), cwd);
+  }
+  /**
+   * Publish a freshly loaded `LoadedSettings` into the process-wide
+   * `this.settings` cache only when it was loaded for the daemon's own
+   * workspace. `this.settings` is the "latest loaded" cache read by the
+   * daemon-global control handlers (`workspaceReload`,
+   * `workspaceModelProvidersReload`, `qwen/settings/getPath`, workspace
+   * status): a session-scoped load for a foreign workspace (worktree) must
+   * stay request-local, or that workspace's settings, approval mode, MCP
+   * servers, hooks and permission rules would bleed into every other live
+   * session. The load still returns the caller's instance either way.
+   */
+  adoptRequestSettings(settings, settingsCwd) {
+    if (this.canonicalWorkspacePath(settingsCwd) === this.canonicalWorkspacePath(this.config.getTargetDir())) {
+      this.settings = settings;
+    }
+    return settings;
+  }
+  /**
+   * Canonical spelling for workspace-coordinate comparisons. A session's
+   * admission root and a request's settings cwd can name the same directory
+   * through a symlink (`/tmp` vs `/private/tmp` on macOS) or a different case
+   * on a case-insensitive volume; a plain string compare then turns a
+   * workspace grant's *revocation* into a no-op on the live session while the
+   * caller is told it saved (fail-open). `realpathSync.native()` resolves
+   * both through the filesystem — including the on-disk casing on macOS and
+   * Windows — and deliberately does NOT fold case itself: on a case-sensitive
+   * volume `proj` and `PROJ` are genuinely different workspaces, and folding
+   * would silently authorise one under a rule written for the other.
+   */
+  canonicalWorkspacePath(workspacePath) {
+    const resolved = path7.resolve(workspacePath);
+    try {
+      return realpathSync3.native(resolved);
+    } catch {
+      return resolved;
+    }
+  }
+  /**
+   * Load settings for a single `qwen/settings/*` / `qwen/permissions/*`
+   * request. `skipLoadEnvironment` is set because a per-request read — and, for
+   * session-scoped calls, a foreign-workspace read — must not inject that
+   * workspace's `.env` into the daemon's process-wide `process.env`; env
+   * application stays with the daemon-global reload handlers that call
+   * `reloadEnvironment` deliberately. `consumeCorruptionEnvVars` is stated
+   * explicitly because passing an options object replaces `loadSettings`'s
+   * `= true` default.
+   */
+  loadRequestSettings(settingsCwd) {
+    return loadSettings(settingsCwd, {
+      consumeCorruptionEnvVars: true,
+      skipLoadEnvironment: true
+    });
+  }
+  /**
+   * Resolve the workspace root for the session-aware `qwen/settings/*` +
+   * `qwen/permissions/*` handlers — the ones whose write and read-back share
+   * the resolved coordinate. The handlers whose status/apply routes are
+   * workspace-global (`setMcpServer`, `removeMcpServer`, `setHook`,
+   * `removeHook`, `setExtensionSetting`) deliberately do NOT resolve
+   * `sessionId`: their write would land in the session's worktree while the
+   * status and reload routes keep reading the bootstrap workspace, so the
+   * handler would answer "saved" for a server no route ever lists or applies.
+   * Those five resolve `requestedCwd || this.config.getTargetDir()` instead
+   * (`||`, not `??`: a present-but-empty `cwd` is not a workspace and falls to
+   * the bootstrap dir like an absent one).
+   *
+   * `sessionId` names the requesting session, whose own Config is
+   * relocated to its worktree; without one the daemon's bootstrap
+   * `this.config` is used — nothing relocates the agent-level Config, so that
+   * is the boot workspace and swapping `process.cwd()` for
+   * `this.config.getTargetDir()` is a no-op there. An unresolvable `sessionId`
+   * is rejected rather than silently retargeting the read/write to the
+   * bootstrap workspace, whose trust decision and settings the caller never
+   * selected.
+   */
+  settingsCwdFor(requestedCwd, params) {
+    if (requestedCwd) {
+      return requestedCwd;
+    }
+    const sessionId = params["sessionId"];
+    if (sessionId !== void 0 && sessionId !== null) {
+      if (typeof sessionId !== "string" || sessionId.length === 0) {
+        throw RequestError.invalidParams(
+          void 0,
+          "Invalid sessionId: expected a non-empty string"
+        );
+      }
+      const session = this.sessions.get(sessionId);
+      if (!session) {
+        throw new RequestError(-32004, `Session not found: ${sessionId}`, {
+          errorKind: "session_not_found",
+          sessionId
+        });
+      }
+      return this.sessionWorkspaceRoot(session.getConfig());
+    }
+    return this.config.getTargetDir();
   }
   async buildCoreSettings(settings, cwd) {
     const userSettings = settings.user.settings;
@@ -19877,7 +19975,7 @@ var QwenAgent = class _QwenAgent {
       isTrusted: settings.isTrusted
     };
   }
-  syncLivePermissionManagers(before, after) {
+  syncLivePermissionManagers(before, after, settingScope, settingsCwd) {
     for (const ruleType of PERMISSION_RULE_TYPES) {
       const oldRules = new Set(before[ruleType]);
       const newRules = new Set(after[ruleType]);
@@ -19885,6 +19983,14 @@ var QwenAgent = class _QwenAgent {
       const added = after[ruleType].filter((rule) => !oldRules.has(rule));
       if (removed.length === 0 && added.length === 0) continue;
       for (const session of this.sessions.values()) {
+        if (settingScope === "Workspace" /* Workspace */) {
+          const sessionWorkspace = this.sessionWorkspaceRoot(
+            session.getConfig()
+          );
+          if (this.canonicalWorkspacePath(sessionWorkspace) !== this.canonicalWorkspacePath(settingsCwd)) {
+            continue;
+          }
+        }
         const pm = session.getConfig().getPermissionManager?.();
         if (!pm) continue;
         try {
@@ -19905,6 +20011,20 @@ var QwenAgent = class _QwenAgent {
   workspaceCwd(config) {
     return config.getTargetDir();
   }
+  /**
+   * The stable workspace root a session was admitted under. Unlike
+   * `workspaceCwd` (the live `getTargetDir()`) and `Config.getProjectRoot()`
+   * (also live `targetDir`), this reads the admission-bound `storage`, which
+   * `relocateWorkingDirectory` leaves untouched when `session/cd` moves a
+   * session into a subdirectory (`skipArtifactMigration: true`). Keying the
+   * twelve `qwen/settings/*` / `qwen/permissions/*` handlers and the
+   * workspace-scoped permission fan-out on this root — rather than the live
+   * cwd — is what keeps a post-`cd` request from reading/writing a stray
+   * `<subdir>/.qwen/settings.json`.
+   */
+  sessionWorkspaceRoot(config) {
+    return config.storage.getProjectRoot();
+  }
   safeWorkspaceCwd(config) {
     try {
       return this.workspaceCwd(config);
@@ -21707,15 +21827,17 @@ var QwenAgent = class _QwenAgent {
         return setManagedSkillEnabled(this.config, params, requestedCwd);
       }
       case "qwen/settings/getMemory": {
-        const settings = loadSettings(cwd);
-        this.settings = settings;
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
+        this.adoptRequestSettings(settings, settingsCwd);
         return {
           settings: normalizeQwenMemorySettings(settings.merged.memory)
         };
       }
       case "qwen/settings/setMemory": {
         const updates = toRecord3(params["updates"]);
-        const settings = loadSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
         for (const key of QWEN_MEMORY_SETTING_KEYS) {
           if (updates[key] === void 0) continue;
           if (typeof updates[key] !== "boolean") {
@@ -21726,7 +21848,7 @@ var QwenAgent = class _QwenAgent {
           }
           settings.setValue("User" /* User */, `memory.${key}`, updates[key]);
         }
-        this.settings = settings;
+        this.adoptRequestSettings(settings, settingsCwd);
         return {
           settings: normalizeQwenMemorySettings(settings.merged.memory)
         };
@@ -21735,9 +21857,13 @@ var QwenAgent = class _QwenAgent {
         return { path: this.settings.user.path };
       }
       case "qwen/settings/getMemoryPaths": {
-        const projectRoot = typeof params["projectRoot"] === "string" ? params["projectRoot"] : cwd;
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const projectRoot = typeof params["projectRoot"] === "string" ? params["projectRoot"] : settingsCwd;
         return {
-          paths: await resolveQwenMemoryPaths({ cwd, projectRoot })
+          paths: await resolveQwenMemoryPaths({
+            cwd: settingsCwd,
+            projectRoot
+          })
         };
       }
       case SERVE_STATUS_EXT_METHODS.workspaceMcp:
@@ -25299,9 +25425,10 @@ ${outputText}
         return { newSessionId, title, displayName: title };
       }
       case "qwen/settings/getCore": {
-        const settings = loadSettings(cwd);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setCoreValue": {
         const key = params["key"];
@@ -25311,7 +25438,8 @@ ${outputText}
             "Unsupported Qwen setting key"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingKey = key;
         const normalizedValue = normalizeCoreSettingValue(
           settingKey,
@@ -25325,8 +25453,8 @@ ${outputText}
         if (settingKey === "general.outputLanguage" && typeof normalizedValue === "string" && scope === "User" /* User */) {
           updateOutputLanguageFile(normalizedValue);
         }
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setMcpServer": {
         const name = params["name"];
@@ -25336,7 +25464,8 @@ ${outputText}
             "MCP server name is required"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -25351,8 +25480,8 @@ ${outputText}
           )
         };
         settings.setValue(settingScope, "mcpServers", mcpServers);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/removeMcpServer": {
         const name = params["name"];
@@ -25362,22 +25491,24 @@ ${outputText}
             "MCP server name is required"
           );
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
         const mcpServers = { ...toRecord3(existing["mcpServers"]) };
         delete mcpServers[name.trim()];
         settings.setValue(settingScope, "mcpServers", mcpServers);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setHook": {
         const event = params["event"];
         if (!isHookEvent(event)) {
           throw RequestError.invalidParams(void 0, "Invalid hook event");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -25397,8 +25528,8 @@ ${outputText}
         }
         hooksRoot[event] = eventHooks;
         settings.setValue(settingScope, "hooks", hooksRoot);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/removeHook": {
         const event = params["event"];
@@ -25409,7 +25540,8 @@ ${outputText}
         if (typeof index !== "number" || !Number.isInteger(index) || index < 0) {
           throw RequestError.invalidParams(void 0, "Invalid hook index");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const settingScope = toSettingsScope(params["scope"]);
         const scope = settingScope === "Workspace" /* Workspace */ ? "workspace" : "user";
         const existing = readScopeSettings(settings, scope);
@@ -25424,8 +25556,8 @@ ${outputText}
         eventHooks.splice(index, 1);
         hooksRoot[event] = eventHooks;
         settings.setValue(settingScope, "hooks", hooksRoot);
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/settings/setExtensionSetting": {
         const extensionId = params["extensionId"];
@@ -25443,9 +25575,10 @@ ${outputText}
         if (typeof value !== "string") {
           throw RequestError.invalidParams(void 0, "value must be a string");
         }
-        const settings = loadSettings(cwd);
+        const settingsCwd = requestedCwd || this.config.getTargetDir();
+        const settings = this.loadRequestSettings(settingsCwd);
         const extensionManager = new ExtensionManager({
-          workspaceDir: cwd,
+          workspaceDir: settingsCwd,
           isWorkspaceTrusted: isWorkspaceTrusted(settings.merged).isTrusted ?? true,
           locale: getCurrentLanguage()
         });
@@ -25462,11 +25595,12 @@ ${outputText}
           async () => value,
           extScope
         );
-        this.settings = settings;
-        return this.buildCoreSettings(settings, cwd);
+        this.adoptRequestSettings(settings, settingsCwd);
+        return this.buildCoreSettings(settings, settingsCwd);
       }
       case "qwen/permissions/getSettings": {
-        const settings = this.loadPermissionSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadPermissionSettings(settingsCwd);
         return buildPermissionSettings(settings);
       }
       case "qwen/permissions/setRules": {
@@ -25484,7 +25618,8 @@ ${outputText}
             'ruleType must be "allow", "ask", or "deny"'
           );
         }
-        const settings = this.loadPermissionSettings(cwd);
+        const settingsCwd = this.settingsCwdFor(requestedCwd, params);
+        const settings = this.loadPermissionSettings(settingsCwd);
         const before = readPermissionRuleSet(settings.merged);
         const settingScope = scope === "workspace" ? "Workspace" /* Workspace */ : "User" /* User */;
         const scopeSettings = scope === "workspace" ? settings.workspace.settings : settings.user.settings;
@@ -25502,7 +25637,12 @@ ${outputText}
         }
         settings.setValue(settingScope, `permissions.${ruleType}`, rules);
         const after = readPermissionRuleSet(settings.merged);
-        this.syncLivePermissionManagers(before, after);
+        this.syncLivePermissionManagers(
+          before,
+          after,
+          settingScope,
+          settingsCwd
+        );
         return buildPermissionSettings(settings);
       }
       case SERVE_CONTROL_EXT_METHODS.workspaceModelProvidersReload: {