@qwen-code/qwen-code 0.19.12 → 0.20.0-nightly.20260721.cda0e0348

package/chunks/{server-3RW3FYOH.js → server-QB6CHRZN.js}

@@ -1,5 +1,10 @@
 // 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,
@@ -14,12 +19,7 @@ import {
   shouldSuppressRememberErrorDetails,
   workspaceMemoryFailureCode,
   workspaceMemoryFailureDiagnostics
-} from "./chunk-KRMARA3A.js";
-import {
-  openQwenAsrRealtimeStream,
-  openVoiceStream,
-  openVoiceStreamWithRetry
-} from "./chunk-KANTXY7B.js";
+} from "./chunk-CG2HPAVD.js";
 import {
   SetupGithubError,
   collectSessionData,
@@ -30,16 +30,16 @@ import {
   toJson,
   toJsonl,
   toMarkdown
-} from "./chunk-GXFYV7MP.js";
+} from "./chunk-PFKNXN67.js";
 import {
   OBSERVED_CONTACT_MAX_FRESH_WITHIN_SECONDS,
   ObservedChannelContactStore
-} from "./chunk-QSG4ZFG4.js";
-import "./chunk-HZ4M2UQD.js";
-import "./chunk-J6NT5YTN.js";
+} from "./chunk-KTUQMDEP.js";
+import "./chunk-6RVJRVQR.js";
+import "./chunk-RS7MT2QG.js";
+import "./chunk-H2XVO6NE.js";
 import "./chunk-QHTIBUWB.js";
-import "./chunk-76BFY7AF.js";
-import "./chunk-HTHUX2T5.js";
+import "./chunk-QTERJVPZ.js";
 import "./chunk-L573Z2QZ.js";
 import {
   createSingleWorkspaceRegistry,
@@ -77,6 +77,7 @@ import {
   getDeferredRuntimeRequestTiming,
   getServeProtocolVersions,
   hostAllowlist,
+  installAccessLogMiddleware,
   isBrowserAutomationMcpAvailable,
   isDeepHealthQuery,
   parseAllowOriginPatterns,
@@ -99,29 +100,29 @@ import {
   setRateLimiter,
   unsafeRevealSecret,
   validateMcpRuntimeServerName
-} from "./chunk-BEZPRKD3.js";
+} from "./chunk-LC5CAVMS.js";
 import {
   isLoopbackBind
 } from "./chunk-RXFQM6FQ.js";
 import {
   createDaemonStatusProvider
-} from "./chunk-67Q33DQY.js";
+} from "./chunk-LLDGOZMJ.js";
 import "./chunk-LXXMOYPL.js";
-import "./chunk-3B6PSWHE.js";
+import "./chunk-GH7OEOYU.js";
 import "./chunk-E5Z2AVNV.js";
 import {
   createWorkspaceProvidersStatusProvider
-} from "./chunk-XSEWNUMZ.js";
+} from "./chunk-2CWOJ2FA.js";
 import {
   getAuthTypeFromEnv,
   resolveCliGenerationConfig
-} from "./chunk-HVGJWOR6.js";
+} from "./chunk-L4YSPHR4.js";
 import {
   snapshotProcessEnv
-} from "./chunk-5QSVANRT.js";
+} from "./chunk-JR6UJ24K.js";
 import {
   createWorkspaceSkillsStatusProvider
-} from "./chunk-VLHQMOZK.js";
+} from "./chunk-JRW46GQX.js";
 import "./chunk-2W3OOD4W.js";
 import {
   EMPTY_WORKSPACE_VOICE_UPDATE_ERROR,
@@ -136,14 +137,14 @@ import {
   validateWorkspaceSkillName,
   validateWorkspaceVoiceState,
   voiceSettingsScopeToWire
-} from "./chunk-DUR7BZYK.js";
+} from "./chunk-KRI4VCHX.js";
 import {
   PermissionRulesValidationError,
   buildPermissionSettings,
   isPermissionRuleType,
   normalizePermissionRules,
   readPermissionRuleSet
-} from "./chunk-QIFTJDBY.js";
+} from "./chunk-IM2A6YO3.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isStreamingVoiceModel,
@@ -151,13 +152,13 @@ import {
   resolveVoiceTranscriptionConfig,
   sanitizeVoiceErrorMessage,
   transcribeVoiceAudio
-} from "./chunk-3ESL7JXA.js";
+} from "./chunk-U4VGYZN7.js";
 import {
   isVoiceEnabled,
   isVoiceMode,
   readVoiceModel
-} from "./chunk-2476XGOU.js";
-import "./chunk-F2RR4HO2.js";
+} from "./chunk-GPILFVPY.js";
+import "./chunk-BVLROR2T.js";
 import {
   WorkspacePermissionRulesSessionRequiredError,
   WorkspaceSettingsPartialPersistError,
@@ -173,14 +174,14 @@ import {
   SessionArtifactValidationError,
   createAcpSessionBridge,
   parseSessionSource
-} from "./chunk-W4UN42YP.js";
+} from "./chunk-R3VZNHRX.js";
 import {
   EVENT_SCHEMA_VERSION,
   SubscriberLimitExceededError
 } from "./chunk-6RLROE6G.js";
 import "./chunk-COH43MRJ.js";
 import "./chunk-QR6U5QPP.js";
-import "./chunk-PUKUUASO.js";
+import "./chunk-DMRO4GU2.js";
 import {
   BranchWhilePromptActiveError,
   CancelSentinelCollisionError,
@@ -217,25 +218,27 @@ import {
   STATUS_SCHEMA_VERSION,
   createIdleWorkspaceMemoryStatus,
   mapDomainErrorToErrorKind
-} from "./chunk-64GC5EMF.js";
+} from "./chunk-DZZIOIVF.js";
 import "./chunk-WBL3FJEU.js";
 import {
   daemonObservedContactsPath,
   loadChannelsConfig
-} from "./chunk-HD6EGS5K.js";
-import "./chunk-RKUMFUFM.js";
+} from "./chunk-CUJX3F4X.js";
+import "./chunk-6MC5ASQK.js";
 import "./chunk-57OAHC2Y.js";
 import {
   parseChannelWebhookConfigLenient
-} from "./chunk-EFAXBOQO.js";
-import "./chunk-W6CQPLWM.js";
+} from "./chunk-32F7BZSK.js";
+import "./chunk-6ZBPS62S.js";
 import "./chunk-V6WHFGST.js";
 import {
   MAX_REGISTERED_WORKSPACES,
+  WorkspaceDisplayNameValidationError,
   WorkspaceRegistrationStoreCommittedError,
   WorkspaceRegistrationStoreLimitError,
+  normalizeWorkspaceDisplayName,
   workspaceRegistrationId
-} from "./chunk-UCTCDLDS.js";
+} from "./chunk-LWQ4IAOJ.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH,
   canonicalizeWorkspace,
@@ -249,7 +252,7 @@ import {
   QWEN_SERVER_TOKEN_ENV,
   isChannelWebhookEnqueueError,
   normalizeWorkerDiagnostic
-} from "./chunk-I7RRHHYG.js";
+} from "./chunk-QKTHJXCS.js";
 import {
   normalizeServeChannelSelection
 } from "./chunk-TJTKSVIV.js";
@@ -260,7 +263,7 @@ import "./chunk-5HBA2Z7V.js";
 import "./chunk-T2NCM2ET.js";
 import {
   sanitizeLogText
-} from "./chunk-BKNPMEN6.js";
+} from "./chunk-RVLZCXEE.js";
 import "./chunk-UDXSXLER.js";
 import {
   getDialogSettingKeys,
@@ -271,20 +274,23 @@ import {
   getWritableScopes,
   loadSettings,
   validateSettingValue
-} from "./chunk-6IITZE7O.js";
+} from "./chunk-5JX5EWR5.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
 import {
-  SUPPORTED_LANGUAGES
-} from "./chunk-TKASNYDS.js";
-import "./chunk-PR5XQ73G.js";
+  SUPPORTED_LANGUAGES,
+  detectSystemLanguage,
+  resolveLanguageSetting,
+  resolveSupportedLanguage
+} from "./chunk-6DHWO5ZF.js";
+import "./chunk-KTNIZG2C.js";
 import "./chunk-QRUIS3DN.js";
-import "./chunk-GLH2NTPB.js";
+import "./chunk-XCHUDLER.js";
 import "./chunk-VJNBRRZG.js";
 import {
   getWorkspaceTrustStatus
-} from "./chunk-GMUPIMHF.js";
+} from "./chunk-4RA7PWIY.js";
 import "./chunk-ALGGS7UH.js";
 import {
   isWithinRoot as isWithinRoot2
@@ -298,10 +304,13 @@ import {
   BuiltinAgentRegistry,
   Client,
   ClientMcpRegistrar,
+  DEFAULT_LOG_LIMIT,
   ExtensionManager,
   GROUP_COLOR_OPTIONS,
+  GitWorktreeService,
   IMAGE_CAPABILITY,
   InvalidSessionTranscriptCursorError,
+  MAX_LOG_LIMIT,
   ModelsConfig,
   RUNTIME_MCP_IF_ABSENT_CONFIG_FLAG,
   SESSION_TRANSCRIPT_MAX_INDEX_BYTES,
@@ -325,13 +334,16 @@ import {
   buildUsageDashboard,
   detectLineEnding,
   encodeTextFileContent,
+  fetchGitCommitDetail,
   fetchGitDiff,
   fetchGitDiffHunksForFile,
+  fetchGitLog,
   getGitWorkingTreeStatus,
   glob,
   loadIgnoreRules,
   loadUsageHistoryWithLive,
   parseInstallSource,
+  readWorktreeSession,
   redactUrlCredentials,
   resolveBranchName,
   resolveProviderProtocol,
@@ -339,18 +351,20 @@ import {
   stripAnsiAndControl,
   stripTerminalControlSequences,
   watchRepoBranch,
-  writeWorkspaceContextFile
-} from "./chunk-GCY7QTCE.js";
+  writeWorkspaceContextFile,
+  writeWorktreeSession,
+  writeWorktreeSessionMarker
+} from "./chunk-NO6XTCYT.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-T4TZQJ7W.js";
 import "./chunk-H6XPXXMH.js";
 import {
   MAX_JOBS,
   nextDurableFireMs
-} from "./chunk-LKR7QQ63.js";
-import "./chunk-4XCVGEEX.js";
-import "./chunk-XSPFQQRE.js";
-import "./chunk-4RPARQ5D.js";
+} from "./chunk-EAUYY7SS.js";
+import "./chunk-FSL5W5TI.js";
+import "./chunk-OONJNQ42.js";
+import "./chunk-D2VIDMVM.js";
 import "./chunk-E2UVIFI2.js";
 import {
   nextFireTime,
@@ -364,7 +378,7 @@ import {
   readCronTasks,
   taskHasLegacyCondition,
   updateCronTasks
-} from "./chunk-J2MKYJKZ.js";
+} from "./chunk-EIAK6Q2B.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
@@ -372,12 +386,12 @@ import {
   APPROVAL_MODES,
   SubagentError,
   SubagentErrorCode
-} from "./chunk-UOA2IHRI.js";
+} from "./chunk-CPCVCKKF.js";
 import "./chunk-6AM5D4ME.js";
-import "./chunk-OSSDHJDU.js";
-import "./chunk-SGPFJMRP.js";
-import "./chunk-335ECZTA.js";
-import "./chunk-JCJPZMJV.js";
+import "./chunk-G45X5TRN.js";
+import "./chunk-PBATSWUQ.js";
+import "./chunk-ZEOZL37W.js";
+import "./chunk-OOCI5VVU.js";
 import {
   QwenOAuth2Client,
   QwenOAuthPollError,
@@ -386,8 +400,8 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-2CCDMJM7.js";
-import "./chunk-6ETOSWAO.js";
+} from "./chunk-25Y6JSH2.js";
+import "./chunk-246TW4IX.js";
 import "./chunk-JESCGQM3.js";
 import {
   addDaemonRequestAttribute,
@@ -402,20 +416,20 @@ import {
   recordDaemonHttpRequest,
   recordDaemonHttpResponse,
   withDaemonRequestSpan
-} from "./chunk-CPU6I5YV.js";
+} from "./chunk-P64HXIC5.js";
 import "./chunk-4WKAA4KS.js";
 import "./chunk-CR3C7WXL.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-LPHGXXZX.js";
-import "./chunk-4CA4WUMS.js";
-import "./chunk-VAJS2E2D.js";
-import "./chunk-WEPXQKGP.js";
-import "./chunk-ANRANWVE.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-4CHDYDG3.js";
-import "./chunk-V4PCIS25.js";
+import "./chunk-6EFTQYW7.js";
+import "./chunk-FZVSFBNW.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
 import "./chunk-TYQMGACW.js";
@@ -428,7 +442,7 @@ import {
   Storage,
   createDebugLogger,
   runWithoutDebugLogSession
-} from "./chunk-UE5TZ55T.js";
+} from "./chunk-C27BYUX6.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -1742,17 +1756,17 @@ var WorkspaceFileSystemImpl = class {
    *     for their `sendFsError` serializer.
    */
   recordAndWrap(err, intent, input) {
-    const fs3 = wrapAsFsError(err);
+    const fs5 = wrapAsFsError(err);
     this.deps.audit.recordDenied(this.deps.ctx, {
       intent,
       input,
-      errorKind: fs3.kind,
-      hint: fs3.hint,
+      errorKind: fs5.kind,
+      hint: fs5.hint,
       // Quote the underlying OS / FsError message so audit
       // consumers debugging a production incident can see the
       // actual cause (errno text, byte counts, glob pattern,
       // etc.) rather than just `errorKind` + `hint`.
-      message: fs3.message,
+      message: fs5.message,
       // For glob denials (parse_error pattern rejection,
       // catastrophic walk failures) the input IS the pattern
       // already; surfacing it on the dedicated `pattern` field
@@ -1761,7 +1775,7 @@ var WorkspaceFileSystemImpl = class {
       // branching on intent.
       pattern: intent === "glob" ? input : void 0
     });
-    return fs3;
+    return fs5;
   }
 };
 var CONTENT_HASH_RE = /^sha256:[0-9a-f]{64}$/;
@@ -2243,7 +2257,7 @@ async function renameWithRetryLocal(src, dest, retries, delayMs) {
       const retryable = code === "EPERM" || code === "EACCES";
       if (!retryable || attempt === retries) throw err;
       await new Promise(
-        (resolve5) => setTimeout(resolve5, delayMs * 2 ** attempt)
+        (resolve6) => setTimeout(resolve6, delayMs * 2 ** attempt)
       );
     }
   }
@@ -2498,12 +2512,12 @@ __name(applyReadHeaders, "applyReadHeaders");
 function sendFsError(res, err, route) {
   applyReadHeaders(res);
   if (isFsError(err)) {
-    const fs3 = err;
-    res.status(fs3.status).json({
-      errorKind: fs3.kind,
-      error: fs3.message,
-      hint: fs3.hint,
-      status: fs3.status
+    const fs5 = err;
+    res.status(fs5.status).json({
+      errorKind: fs5.kind,
+      error: fs5.message,
+      hint: fs5.hint,
+      status: fs5.status
     });
     return;
   }
@@ -2605,13 +2619,13 @@ async function handleGetFile(req, res, deps) {
     });
     return;
   }
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "read");
-    const out = await fs3.readText(resolved, { maxBytes, line, limit });
+    const resolved = await fs5.resolve(queryPath, "read");
+    const out = await fs5.readText(resolved, { maxBytes, line, limit });
     const returnedBytes = Buffer.byteLength(out.content, "utf-8");
     applyReadHeaders(res);
     res.status(200).json({
@@ -2665,13 +2679,13 @@ async function handleGetFileBytes(req, res, deps) {
     });
     return;
   }
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "read");
-    const out = await fs3.readBytesWindow(resolved, {
+    const resolved = await fs5.resolve(queryPath, "read");
+    const out = await fs5.readBytesWindow(resolved, {
       offset: offset ?? 0,
       maxBytes: maxBytes ?? DEFAULT_FILE_BYTES_MAX_BYTES
     });
@@ -2699,13 +2713,13 @@ async function handleGetStat(req, res, deps) {
   if (clientId === null) return;
   const queryPath = requireStringQuery(res, req.query["path"], "path", ROUTE2);
   if (queryPath === null) return;
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "stat");
-    const st = await fs3.stat(resolved);
+    const resolved = await fs5.resolve(queryPath, "stat");
+    const st = await fs5.stat(resolved);
     applyReadHeaders(res);
     res.status(200).json({
       kind: "stat",
@@ -2728,13 +2742,13 @@ async function handleGetList(req, res, deps) {
   const queryPath = requireStringQuery(res, req.query["path"], "path", ROUTE2);
   if (queryPath === null) return;
   const includeIgnored = parseBoolFlag(req.query["includeIgnored"]);
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "list");
-    const entries = await fs3.list(resolved, {
+    const resolved = await fs5.resolve(queryPath, "list");
+    const entries = await fs5.list(resolved, {
       includeIgnored,
       maxEntries: MAX_LIST_ENTRIES + 1
     });
@@ -2787,15 +2801,15 @@ async function handleGetGlob(req, res, deps) {
   }
   const cwdRaw = req.query["cwd"];
   const cwdString = typeof cwdRaw === "string" && cwdRaw.length > 0 ? cwdRaw : void 0;
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId: clientId ?? void 0,
     route: ROUTE2
   });
   const start = performance.now();
   try {
-    const cwdResolved = cwdString ? await fs3.resolve(cwdString, "list") : void 0;
+    const cwdResolved = cwdString ? await fs5.resolve(cwdString, "list") : void 0;
     const cap = maxResults ?? DEFAULT_GLOB_MAX_RESULTS;
-    const probe = await fs3.glob(pattern, {
+    const probe = await fs5.glob(pattern, {
       cwd: cwdResolved,
       includeIgnored,
       maxResults: cap + 1
@@ -2857,7 +2871,7 @@ function registerWorkspaceFileReadRoutes(app, deps) {
 }
 __name(registerWorkspaceFileReadRoutes, "registerWorkspaceFileReadRoutes");
 function registerWorkspaceQualifiedFileReadRoutes(app, deps) {
-  const resolve5 = /* @__PURE__ */ __name((req, res) => {
+  const resolve6 = /* @__PURE__ */ __name((req, res) => {
     const runtime = resolveWorkspaceRuntimeFromParam(
       deps.workspaceRegistry,
       req,
@@ -2871,23 +2885,23 @@ function registerWorkspaceQualifiedFileReadRoutes(app, deps) {
     return true;
   }, "resolve");
   app.get("/workspaces/:workspace/file", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetFile(req, res, deps);
   });
   app.get("/workspaces/:workspace/file/bytes", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetFileBytes(req, res, deps);
   });
   app.get("/workspaces/:workspace/stat", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetStat(req, res, deps);
   });
   app.get("/workspaces/:workspace/list", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetList(req, res, deps);
   });
   app.get("/workspaces/:workspace/glob", (req, res) => {
-    if (!resolve5(req, res)) return;
+    if (!resolve6(req, res)) return;
     void handleGetGlob(req, res, deps);
   });
 }
@@ -2969,7 +2983,7 @@ function validateClientId(clientId, deps, res) {
 }
 __name(validateClientId, "validateClientId");
 function createSetupGithubFileOps(factory, route, originatorClientId) {
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     route,
     ...originatorClientId ? { originatorClientId } : {}
   });
@@ -2992,14 +3006,14 @@ function createSetupGithubFileOps(factory, route, originatorClientId) {
       ]);
     },
     async writeTextFile(_gitRepoRoot, relativePath, content) {
-      const resolved = await fs3.resolve(relativePath, "write");
-      const out = await fs3.writeTextOverwrite(resolved, content);
+      const resolved = await fs5.resolve(relativePath, "write");
+      const out = await fs5.writeTextOverwrite(resolved, content);
       return { sizeBytes: out.sizeBytes };
     },
     async readTextFile(_gitRepoRoot, relativePath) {
       try {
-        const resolved = await fs3.resolve(relativePath, "read");
-        const out = await fs3.readText(resolved);
+        const resolved = await fs5.resolve(relativePath, "read");
+        const out = await fs5.readText(resolved);
         return out.content;
       } catch (error2) {
         if (isFsError(error2) && error2.kind === "path_not_found") {
@@ -8973,7 +8987,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9025,8 +9039,8 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const resolved = await fs3.resolve(p, "read");
-          const out = await fs3.readText(resolved, { maxBytes, line, limit });
+          const resolved = await fs5.resolve(p, "read");
+          const out = await fs5.readText(resolved, { maxBytes, line, limit });
           this.replyConn(conn, id, {
             path: p,
             content: out.content,
@@ -9048,7 +9062,7 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9084,8 +9098,8 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const resolved = await fs3.resolve(p, "read");
-          const buf = await fs3.readBytesWindow(resolved, { offset, maxBytes });
+          const resolved = await fs5.resolve(p, "read");
+          const buf = await fs5.readBytesWindow(resolved, { offset, maxBytes });
           this.replyConn(conn, id, { path: p, ...buf });
           return;
         }
@@ -9103,12 +9117,12 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "read");
-          const result = await fs3.stat(resolved);
+          const resolved = await fs5.resolve(p, "read");
+          const result = await fs5.stat(resolved);
           this.replyConn(conn, id, { path: p, ...result });
           return;
         }
@@ -9126,13 +9140,13 @@ var AcpDispatcher = class {
               conn.sendConn(error(id, RPC.INVALID_PARAMS, "`path` required"));
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "read");
+          const resolved = await fs5.resolve(p, "read");
           const MAX_LIST = 2e3;
-          const entries = await fs3.list(resolved, { maxEntries: MAX_LIST + 1 });
+          const entries = await fs5.list(resolved, { maxEntries: MAX_LIST + 1 });
           const truncated = entries.length > MAX_LIST;
           this.replyConn(conn, id, {
             path: p,
@@ -9157,7 +9171,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
@@ -9177,7 +9191,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const matches = await fs3.glob(pattern, {
+          const matches = await fs5.glob(pattern, {
             maxResults: maxResults + 1
           });
           const truncated = matches.length > maxResults;
@@ -9209,11 +9223,11 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "write");
+          const resolved = await fs5.resolve(p, "write");
           if (Buffer.byteLength(params["content"], "utf8") > 10 * 1024 * 1024) {
             if (id !== void 0)
               conn.sendConn(
@@ -9221,7 +9235,7 @@ var AcpDispatcher = class {
               );
             return;
           }
-          await fs3.writeTextOverwrite(resolved, params["content"]);
+          await fs5.writeTextOverwrite(resolved, params["content"]);
           this.replyConn(conn, id, { ok: true, path: p });
           return;
         }
@@ -9250,12 +9264,12 @@ var AcpDispatcher = class {
               );
             return;
           }
-          const fs3 = this.fsFactory.forRequest({
+          const fs5 = this.fsFactory.forRequest({
             originatorClientId: conn.clientId,
             route: `ACP ${method}`
           });
-          const resolved = await fs3.resolve(p, "write");
-          const result = await fs3.edit(
+          const resolved = await fs5.resolve(p, "write");
+          const result = await fs5.edit(
             resolved,
             params["oldText"],
             params["newText"]
@@ -10798,9 +10812,9 @@ var SseStream = class {
     return next;
   }
   doWrite(chunk) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.closed || this.res.writableEnded) {
-        resolve5();
+        resolve6();
         return;
       }
       let ok;
@@ -10811,7 +10825,7 @@ var SseStream = class {
         return;
       }
       if (ok) {
-        resolve5();
+        resolve6();
         return;
       }
       const cleanup = /* @__PURE__ */ __name(() => {
@@ -10821,11 +10835,11 @@ var SseStream = class {
       }, "cleanup");
       const onDrain = /* @__PURE__ */ __name(() => {
         cleanup();
-        resolve5();
+        resolve6();
       }, "onDrain");
       const onCloseEv = /* @__PURE__ */ __name(() => {
         cleanup();
-        resolve5();
+        resolve6();
       }, "onCloseEv");
       const onErrorEv = /* @__PURE__ */ __name((err) => {
         cleanup();
@@ -10887,14 +10901,14 @@ var WsStream = class {
   send(message, _id) {
     const data = JSON.stringify(message);
     const next = this.writeChain.then(
-      () => new Promise((resolve5, reject) => {
+      () => new Promise((resolve6, reject) => {
         if (this._closed) {
-          resolve5();
+          resolve6();
           return;
         }
         this.ws.send(data, (err) => {
           if (err) reject(err);
-          else resolve5();
+          else resolve6();
         });
       })
     );
@@ -11199,7 +11213,7 @@ var CdpReverseLink = class {
       throw { code: -32e3, message: "CDP tunnel closed" };
     }
     await this.attach();
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.disposed) {
         reject({ code: -32e3, message: "CDP tunnel closed" });
         return;
@@ -11210,7 +11224,7 @@ var CdpReverseLink = class {
         `CDP command id=${id} method=${method} timed out after ${this.commandTimeoutMs}ms`
       );
       const progressTimer = this.armProgressLog(id, method);
-      this.pending.set(id, { resolve: resolve5, reject, timer, progressTimer });
+      this.pending.set(id, { resolve: resolve6, reject, timer, progressTimer });
       try {
         this.log?.(
           `qwen serve: /cdp forwarded command id=${id} method=${method} to extension`
@@ -11237,7 +11251,7 @@ var CdpReverseLink = class {
     if (this.attached) return Promise.resolve({});
     if (this.attachPromise) return this.attachPromise;
     this.attachPromise = new Promise(
-      (resolve5, reject) => {
+      (resolve6, reject) => {
         if (this.disposed) {
           reject({ code: -32e3, message: "CDP tunnel closed" });
           return;
@@ -11247,7 +11261,7 @@ var CdpReverseLink = class {
         this.pendingAttach = {
           id,
           pending: {
-            resolve: /* @__PURE__ */ __name((result) => resolve5(result ?? {}), "resolve"),
+            resolve: /* @__PURE__ */ __name((result) => resolve6(result ?? {}), "resolve"),
             reject,
             timer
           }
@@ -11815,7 +11829,7 @@ function isAcpChannelUnavailable(err) {
 }
 __name(isAcpChannelUnavailable, "isAcpChannelUnavailable");
 function delay(ms) {
-  return new Promise((resolve5) => setTimeout(resolve5, ms));
+  return new Promise((resolve6) => setTimeout(resolve6, ms));
 }
 __name(delay, "delay");
 function buildChromeDevToolsMcpRuntimeConfig(localPort, hostname, env) {
@@ -11940,7 +11954,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 path15 = opts.path ?? "/acp";
+  const path16 = opts.path ?? "/acp";
   const dispatcherRef = {};
   let disposed = false;
   const rejectIfDisposed = /* @__PURE__ */ __name((res) => {
@@ -12102,7 +12116,7 @@ function mountAcpHttp(app, bridge, opts) {
   const primaryMount = {
     primary: true,
     workspaceCwd: opts.boundWorkspace,
-    routeLabel: logSafe(path15),
+    routeLabel: logSafe(path16),
     rateLimitScope: opts.workspaceRegistry?.primary.workspaceId ?? "primary",
     registry,
     dispatcher,
@@ -12256,7 +12270,7 @@ function mountAcpHttp(app, bridge, opts) {
     });
   }, "handleAcpPost");
   app.post(
-    path15,
+    path16,
     (req, res) => handleAcpPost(primaryMount, req, res)
   );
   const handleAcpGet = /* @__PURE__ */ __name((mount, req, res) => {
@@ -12346,10 +12360,10 @@ function mountAcpHttp(app, bridge, opts) {
       onPumpSettled();
     });
   }, "handleAcpGet");
-  app.get(path15, (req, res) => {
+  app.get(path16, (req, res) => {
     handleAcpGet(primaryMount, req, res);
   });
-  app.delete(path15, (req, res) => {
+  app.delete(path16, (req, res) => {
     handleAcpDelete(primaryMount, req, res);
   });
   const createSecondaryAcpMount = /* @__PURE__ */ __name((rt) => {
@@ -12541,7 +12555,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 !== path15 && !isCdpPath && !extraRoute && !isPluralAcpShape && !isPluralVoiceShape) {
+      if (rawPath !== path16 && !isCdpPath && !extraRoute && !isPluralAcpShape && !isPluralVoiceShape) {
         logReject(`unknown-path ${logSafe(rawPath)}`);
         socket.destroy();
         return;
@@ -13066,7 +13080,7 @@ function mountAcpHttp(app, bridge, opts) {
       });
     }, "upgradeListener");
     httpServer.on("upgrade", upgradeListener);
-    writeStderrLine(`qwen serve: /acp WebSocket transport enabled on ${path15}`);
+    writeStderrLine(`qwen serve: /acp WebSocket transport enabled on ${path16}`);
   }
   __name(setupWebSocket, "setupWebSocket");
   return {
@@ -15105,7 +15119,7 @@ function createFifoTaskQueue(limit) {
       Promise.resolve().then(() => item.task(release)).then(item.resolve, item.reject).finally(release);
     }
   }, "pump");
-  const enqueue = /* @__PURE__ */ __name((task, options = {}) => new Promise((resolve5, reject) => {
+  const enqueue = /* @__PURE__ */ __name((task, options = {}) => new Promise((resolve6, reject) => {
     if (options.signal?.aborted) {
       reject(abortReason(options.signal));
       return;
@@ -15114,7 +15128,7 @@ function createFifoTaskQueue(limit) {
       task,
       ...options.signal ? { signal: options.signal } : {},
       ...options.onStart ? { onStart: options.onStart } : {},
-      resolve: resolve5,
+      resolve: resolve6,
       reject
     };
     if (options.signal) {
@@ -15156,6 +15170,14 @@ var redactExtensionDisplaySource = /* @__PURE__ */ __name((source) => {
 var EXTENSION_PREPARATION_CONCURRENCY = 2;
 var EXTENSION_REFRESH_TIMEOUT_MS = 3e4;
 var RECONCILE_SLOW_MS = 3e4;
+var resolveExtensionLocale = /* @__PURE__ */ __name((workspaceDir) => {
+  const configuredLanguage = loadSettings(workspaceDir).merged.general?.language;
+  const requestedLocale = resolveLanguageSetting(configuredLanguage);
+  if (requestedLocale === "auto") {
+    return detectSystemLanguage();
+  }
+  return resolveSupportedLanguage(requestedLocale) ?? requestedLocale;
+}, "resolveExtensionLocale");
 var EXTENSION_QUEUE_FULL_MESSAGE = "Extension operation queue is full";
 function createExtensionsController(deps) {
   const { boundWorkspace, bridge, workspace } = deps;
@@ -15183,6 +15205,7 @@ function createExtensionsController(deps) {
   }, "acquireOperationSlot");
   const createExtensionManager = /* @__PURE__ */ __name((workspaceDir = boundWorkspace, trustedOverride, interactions) => new ExtensionManager({
     workspaceDir,
+    locale: resolveExtensionLocale(workspaceDir),
     isWorkspaceTrusted: trustedOverride ?? getWorkspaceTrustStatus(loadSettings(workspaceDir).merged, workspaceDir).effective.state === "trusted",
     requestConsent: /* @__PURE__ */ __name(() => Promise.resolve(), "requestConsent"),
     networkPolicy: "public",
@@ -15710,8 +15733,9 @@ function createExtensionsController(deps) {
     })();
   }, "runQueuedExtensionMutation");
   const buildLocalExtensionsStatus = /* @__PURE__ */ __name(async () => {
+    const locale = resolveExtensionLocale(boundWorkspace);
     const now = Date.now();
-    if (extensionsStatusCache && extensionsStatusCache.expiresAt > now) {
+    if (extensionsStatusCache?.locale === locale && extensionsStatusCache.expiresAt > now) {
       return extensionsStatusCache.value;
     }
     const extensionManager = createExtensionManager();
@@ -15767,6 +15791,7 @@ function createExtensionsController(deps) {
       extensions: entries
     };
     extensionsStatusCache = {
+      locale,
       expiresAt: Date.now() + 2e3,
       value: status
     };
@@ -15935,7 +15960,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       ...interaction,
       id: crypto2.randomUUID()
     };
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const timeout = setTimeout(() => {
         pendingExtensionInteractions.delete(operationId);
         controller.updateOperation(operationId, {
@@ -15949,7 +15974,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       timeout.unref?.();
       pendingExtensionInteractions.set(operationId, {
         interaction: pendingInteraction,
-        resolve: resolve5,
+        resolve: resolve6,
         reject,
         timeout
       });
@@ -15994,8 +16019,8 @@ function registerWorkspaceExtensionRoutes(app, deps) {
   const reserveRuntimeReconciliation = /* @__PURE__ */ __name(() => {
     let provideTask;
     const task = new Promise(
-      (resolve5) => {
-        provideTask = resolve5;
+      (resolve6) => {
+        provideTask = resolve6;
       }
     );
     const queued = runtimeReconciliationQueue.run(async () => {
@@ -16096,9 +16121,9 @@ function registerWorkspaceExtensionRoutes(app, deps) {
     generationPoller.unref();
     app.locals.stopExtensionGenerationReconciler = () => clearInterval(generationPoller);
   }
-  const registerFor = /* @__PURE__ */ __name((base, resolve5) => {
+  const registerFor = /* @__PURE__ */ __name((base, resolve6) => {
     app.get(base, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       try {
         res.status(200).json(await ctrl.buildLocalExtensionsStatus());
@@ -16107,12 +16132,12 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     });
     app.get(`${base}/operations`, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       res.status(200).json({ v: 1, operations: ctrl.getActiveOperations() });
     });
     app.get(`${base}/operations/:operationId`, async (req, res) => {
-      const ctrl = resolve5(req, res, false);
+      const ctrl = resolve6(req, res, false);
       if (!ctrl) return;
       try {
         const operationId = req.params["operationId"];
@@ -16156,7 +16181,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/operations/:operationId/interactions/:interactionId`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, false);
+        const ctrl = resolve6(req, res, false);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16225,7 +16250,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.post(`${base}/install`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16408,7 +16433,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/check-updates`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         let timer;
         let releaseOperationSlot;
@@ -16472,7 +16497,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.post(`${base}/refresh`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16496,7 +16521,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/enable`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16543,7 +16568,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/disable`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16590,7 +16615,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       `${base}/:name/update`,
       mutate({ strict: true }),
       async (req, res) => {
-        const ctrl = resolve5(req, res, true);
+        const ctrl = resolve6(req, res, true);
         if (!ctrl) return;
         try {
           if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -16673,7 +16698,7 @@ function registerWorkspaceExtensionRoutes(app, deps) {
       }
     );
     app.delete(`${base}/:name`, mutate({ strict: true }), async (req, res) => {
-      const ctrl = resolve5(req, res, true);
+      const ctrl = resolve6(req, res, true);
       if (!ctrl) return;
       try {
         if (!ctrl.validateExtensionMutationClient(req, res, {
@@ -17435,13 +17460,13 @@ async function handlePostFileWrite(req, res, deps) {
     req
   );
   if (originatorClientId === null) return;
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "write");
-    const out = await fs3.writeTextAtomic(resolved, content, {
+    const resolved = await fs5.resolve(queryPath, "write");
+    const out = await fs5.writeTextAtomic(resolved, content, {
       mode,
       ...expectedHash ? { expectedHash } : {},
       ...bom !== void 0 ? { bom } : {},
@@ -17494,13 +17519,13 @@ async function handlePostFileEdit(req, res, deps) {
     req
   );
   if (originatorClientId === null) return;
-  const fs3 = factory.forRequest({
+  const fs5 = factory.forRequest({
     originatorClientId,
     route: ROUTE2
   });
   try {
-    const resolved = await fs3.resolve(queryPath, "edit");
-    const out = await fs3.editAtomic(resolved, oldText, newText, {
+    const resolved = await fs5.resolve(queryPath, "edit");
+    const out = await fs5.editAtomic(resolved, oldText, newText, {
       expectedHash
     });
     applyReadHeaders(res);
@@ -17534,7 +17559,7 @@ function registerWorkspaceFileWriteRoutes(app, deps) {
 }
 __name(registerWorkspaceFileWriteRoutes, "registerWorkspaceFileWriteRoutes");
 function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
-  const resolve5 = /* @__PURE__ */ __name((req, res) => {
+  const resolve6 = /* @__PURE__ */ __name((req, res) => {
     const runtime = resolveWorkspaceRuntimeFromParam(
       deps.workspaceRegistry,
       req,
@@ -17552,7 +17577,7 @@ function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
     "/workspaces/:workspace/file/write",
     deps.mutate({ strict: true }),
     (req, res) => {
-      if (!resolve5(req, res)) return;
+      if (!resolve6(req, res)) return;
       void handlePostFileWrite(req, res, deps);
     }
   );
@@ -17560,7 +17585,7 @@ function registerWorkspaceQualifiedFileWriteRoutes(app, deps) {
     "/workspaces/:workspace/file/edit",
     deps.mutate({ strict: true }),
     (req, res) => {
-      if (!resolve5(req, res)) return;
+      if (!resolve6(req, res)) return;
       void handlePostFileEdit(req, res, deps);
     }
   );
@@ -18043,8 +18068,8 @@ function decodePathSegment(value) {
 }
 __name(decodePathSegment, "decodePathSegment");
 function matchLegacySessionTelemetryRoute(method, requestPath) {
-  const path15 = requestPath.length > 1 && requestPath.endsWith("/") ? requestPath.slice(0, -1) : requestPath;
-  const requestSegments = path15.split("/").slice(1);
+  const path16 = requestPath.length > 1 && requestPath.endsWith("/") ? requestPath.slice(0, -1) : requestPath;
+  const requestSegments = path16.split("/").slice(1);
   const prefix = requestSegments[0]?.toLowerCase();
   if (prefix !== "session" && prefix !== "sessions" && prefix !== "permission") {
     return void 0;
@@ -18096,23 +18121,23 @@ __name(setDaemonTelemetryWorkspace, "setDaemonTelemetryWorkspace");
 function resolveDaemonTelemetryRoute(req) {
   const legacyRoute = matchLegacySessionTelemetryRoute(req.method, req.path);
   if (legacyRoute) return legacyRoute;
-  const path15 = req.path.replace(/\/$/, "") || "/";
-  if (req.method === "GET" && path15 === "/daemon/status") {
+  const path16 = req.path.replace(/\/$/, "") || "/";
+  if (req.method === "GET" && path16 === "/daemon/status") {
     return { route: "GET /daemon/status" };
   }
-  if (req.method === "GET" && /^\/workspace\/[^/]+\/sessions$/.test(path15)) {
+  if (req.method === "GET" && /^\/workspace\/[^/]+\/sessions$/.test(path16)) {
     return { route: "GET /workspace/:id/sessions" };
   }
-  if (req.method === "GET" && /^\/workspaces\/[^/]+\/sessions$/.test(path15)) {
+  if (req.method === "GET" && /^\/workspaces\/[^/]+\/sessions$/.test(path16)) {
     return { route: "GET /workspace/:id/sessions" };
   }
-  if (req.method === "GET" && /^\/workspace\/[^/]+\/session-info$/.test(path15)) {
+  if (req.method === "GET" && /^\/workspace\/[^/]+\/session-info$/.test(path16)) {
     return { route: "GET /workspace/:id/session-info" };
   }
-  if (req.method === "GET" && /^\/workspaces\/[^/]+\/session-info$/.test(path15)) {
+  if (req.method === "GET" && /^\/workspaces\/[^/]+\/session-info$/.test(path16)) {
     return { route: "GET /workspace/:id/session-info" };
   }
-  const workspaceTranscript = path15.match(
+  const workspaceTranscript = path16.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/transcript$/
   );
   if (workspaceTranscript?.[1] && req.method === "GET") {
@@ -18121,7 +18146,7 @@ function resolveDaemonTelemetryRoute(req) {
       sessionId: decodePathSegment(workspaceTranscript[1])
     };
   }
-  const workspaceExport = path15.match(
+  const workspaceExport = path16.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/export$/
   );
   if (workspaceExport?.[1] && req.method === "GET") {
@@ -18130,7 +18155,7 @@ function resolveDaemonTelemetryRoute(req) {
       sessionId: decodePathSegment(workspaceExport[1])
     };
   }
-  const workspaceArchivedExport = path15.match(
+  const workspaceArchivedExport = path16.match(
     /^\/workspaces\/[^/]+\/session\/([^/]+)\/archive\/export$/
   );
   if (workspaceArchivedExport?.[1] && req.method === "GET") {
@@ -18140,8 +18165,8 @@ function resolveDaemonTelemetryRoute(req) {
     };
   }
   const pluralWorkspacePrefix = /^\/workspaces\/[^/]+/;
-  if (pluralWorkspacePrefix.test(path15)) {
-    const suffix = path15.replace(pluralWorkspacePrefix, "/workspace");
+  if (pluralWorkspacePrefix.test(path16)) {
+    const suffix = path16.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}` };
@@ -18200,58 +18225,58 @@ function resolveDaemonTelemetryRoute(req) {
       return { route: "DELETE /workspace/session-groups/:groupId" };
     }
   }
-  if (req.method === "POST" && path15 === "/workspace/init") {
+  if (req.method === "POST" && path16 === "/workspace/init") {
     return { route: "POST /workspace/init" };
   }
-  if (req.method === "POST" && path15 === "/workspace/setup-github") {
+  if (req.method === "POST" && path16 === "/workspace/setup-github") {
     return { route: "POST /workspace/setup-github" };
   }
-  if (req.method === "POST" && path15 === "/workspace/reload") {
+  if (req.method === "POST" && path16 === "/workspace/reload") {
     return { route: "POST /workspace/reload" };
   }
-  const mcpRestart = path15.match(/^\/workspace\/mcp\/([^/]+)\/restart$/);
+  const mcpRestart = path16.match(/^\/workspace\/mcp\/([^/]+)\/restart$/);
   if (mcpRestart?.[1] && req.method === "POST") {
     return { route: "POST /workspace/mcp/:server/restart" };
   }
-  if (req.method === "POST" && path15 === "/workspace/mcp/servers") {
+  if (req.method === "POST" && path16 === "/workspace/mcp/servers") {
     return { route: "POST /workspace/mcp/servers" };
   }
-  const mcpDelete = path15.match(/^\/workspace\/mcp\/servers\/([^/]+)$/);
+  const mcpDelete = path16.match(/^\/workspace\/mcp\/servers\/([^/]+)$/);
   if (mcpDelete?.[1] && req.method === "DELETE") {
     return { route: "DELETE /workspace/mcp/servers/:name" };
   }
-  if (req.method === "POST" && path15 === "/workspace/auth/device-flow") {
+  if (req.method === "POST" && path16 === "/workspace/auth/device-flow") {
     return { route: "POST /workspace/auth/device-flow" };
   }
-  const deviceFlowDelete = path15.match(
+  const deviceFlowDelete = path16.match(
     /^\/workspace\/auth\/device-flow\/([^/]+)$/
   );
   if (deviceFlowDelete?.[1] && req.method === "DELETE") {
     return { route: "DELETE /workspace/auth/device-flow/:id" };
   }
-  const toolEnable = path15.match(/^\/workspace\/tools\/([^/]+)\/enable$/);
+  const toolEnable = path16.match(/^\/workspace\/tools\/([^/]+)\/enable$/);
   if (toolEnable?.[1] && req.method === "POST") {
     return { route: "POST /workspace/tools/:name/enable" };
   }
-  if (path15 === "/workspace/settings") {
+  if (path16 === "/workspace/settings") {
     if (req.method === "GET") return { route: "GET /workspace/settings" };
     if (req.method === "POST") return { route: "POST /workspace/settings" };
   }
-  if (path15 === "/workspace/permissions") {
+  if (path16 === "/workspace/permissions") {
     if (req.method === "GET") return { route: "GET /workspace/permissions" };
     if (req.method === "POST") return { route: "POST /workspace/permissions" };
   }
-  if (path15 === "/workspace/trust") {
+  if (path16 === "/workspace/trust") {
     if (req.method === "GET") return { route: "GET /workspace/trust" };
   }
-  if (req.method === "POST" && path15 === "/workspace/trust/request") {
+  if (req.method === "POST" && path16 === "/workspace/trust/request") {
     return { route: "POST /workspace/trust/request" };
   }
-  if (path15 === "/workspace/voice") {
+  if (path16 === "/workspace/voice") {
     if (req.method === "GET") return { route: "GET /workspace/voice" };
     if (req.method === "POST") return { route: "POST /workspace/voice" };
   }
-  if (req.method === "POST" && path15 === "/workspace/voice/transcribe") {
+  if (req.method === "POST" && path16 === "/workspace/voice/transcribe") {
     return { route: "POST /workspace/voice/transcribe" };
   }
   return void 0;
@@ -18305,7 +18330,7 @@ function daemonTelemetryMiddleware(resolveWorkspaceCwd, recordRequest) {
           deferredRuntimePath: deferredRuntime.path
         } : {}
       },
-      async (span) => await new Promise((resolve5, reject) => {
+      async (span) => await new Promise((resolve6, reject) => {
         let done = false;
         const finish = /* @__PURE__ */ __name(() => {
           if (done) return;
@@ -18335,7 +18360,7 @@ function daemonTelemetryMiddleware(resolveWorkspaceCwd, recordRequest) {
           if (!successfulSse && route.route !== "GET /daemon/status" && route.route !== "POST /session/:id/heartbeat") {
             recordRequest?.(durationMs, res.statusCode);
           }
-          resolve5();
+          resolve6();
         }, "finish");
         res.once("finish", finish);
         res.once("close", finish);
@@ -18510,6 +18535,7 @@ __name(registerPermissionRoutes, "registerPermissionRoutes");
 // packages/cli/src/serve/routes/session.ts
 init_esbuild_shims();
 import * as crypto3 from "node:crypto";
+import * as fs3 from "node:fs";
 import * as path11 from "node:path";
 
 // packages/cli/src/serve/server/prompt-deadline.ts
@@ -18634,6 +18660,25 @@ function encodeMetadataSessionCursor(last, filter, archiveState) {
   ).toString("base64url");
 }
 __name(encodeMetadataSessionCursor, "encodeMetadataSessionCursor");
+async function enrichWorktreeSidecars(bySessionId, sessionService, archiveState = "active") {
+  for (const [sessionId, summary] of bySessionId) {
+    if (summary.worktree) continue;
+    const sidecar = await readWorktreeSession(
+      sessionService.getWorktreeSessionPathForArchiveState(
+        sessionId,
+        archiveState
+      )
+    ).catch(() => null);
+    if (sidecar) {
+      summary.worktree = {
+        slug: sidecar.slug,
+        path: sidecar.worktreePath,
+        branch: sidecar.worktreeBranch
+      };
+    }
+  }
+}
+__name(enrichWorktreeSidecars, "enrichWorktreeSidecars");
 function toSummary2(item) {
   return {
     sessionId: item.sessionId,
@@ -18779,6 +18824,7 @@ async function listOrganizedWorkspaceSessionsForResponse(bridge, workspaceCwd, o
       applyOrganization(session, snapshot.sessions.get(session.sessionId))
     );
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   if (readOptions.mergeLive !== false && archiveState !== "archived" && isFirstPage) {
     try {
       const liveSessions = bridge.listWorkspaceSessions(workspaceCwd);
@@ -18864,6 +18910,7 @@ async function listWorkspaceSessionsByMetadataForResponse(bridge, workspaceCwd,
   for (const session of persisted.sessions) {
     bySessionId.set(session.sessionId, session);
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   let liveMergeFailed = false;
   if (readOptions.mergeLive !== false && archiveState !== "archived") {
     try {
@@ -18966,6 +19013,7 @@ async function listWorkspaceSessionsForResponse(bridge, workspaceCwd, options, r
   for (const item of persisted.items) {
     bySessionId.set(item.sessionId, toSummary2(item));
   }
+  await enrichWorktreeSidecars(bySessionId, sessionService, archiveState);
   if (archiveState === "archived" || readOptions.mergeLive === false) {
     const sessions2 = [...bySessionId.values()];
     const nextCursor2 = persisted.nextCursor != null ? String(persisted.nextCursor) : void 0;
@@ -19137,7 +19185,7 @@ function writeGenerationSseChunk(res, chunk) {
   if (writable) {
     return res.destroyed ? Promise.reject(new Error("Generation SSE connection destroyed")) : Promise.resolve();
   }
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const cleanup = /* @__PURE__ */ __name(() => {
       res.off("drain", onDrain);
       res.off("close", onClose);
@@ -19145,7 +19193,7 @@ function writeGenerationSseChunk(res, chunk) {
     }, "cleanup");
     const onDrain = /* @__PURE__ */ __name(() => {
       cleanup();
-      resolve5();
+      resolve6();
     }, "onDrain");
     const onClose = /* @__PURE__ */ __name(() => {
       cleanup();
@@ -19915,6 +19963,68 @@ function registerSessionRoutes(app, deps) {
     }
     const clientId = parseClientIdHeader(req, res);
     if (clientId === null) return;
+    let worktreeMeta;
+    const rawWorktree = body["worktree"];
+    if (rawWorktree !== void 0 && rawWorktree !== null) {
+      if (typeof rawWorktree !== "object" || Array.isArray(rawWorktree)) {
+        res.status(400).json({
+          error: '`worktree` must be an object (e.g. `{}` or `{"slug":"my-task"}`)',
+          code: "invalid_worktree"
+        });
+        return;
+      }
+      const wtReq = rawWorktree;
+      let wtService;
+      try {
+        wtService = new GitWorktreeService(workspaceCwd);
+      } catch {
+        res.status(500).json({
+          error: "Failed to initialize worktree service",
+          code: "worktree_init_failed"
+        });
+        return;
+      }
+      if (!await wtService.isGitRepository()) {
+        res.status(400).json({
+          error: "Worktree isolation requires a git repository",
+          code: "worktree_not_git_repo"
+        });
+        return;
+      }
+      const rawSlug = wtReq["slug"];
+      let slug;
+      if (rawSlug === void 0 || rawSlug === null) {
+        slug = GitWorktreeService.generateAutoSlug();
+      } else if (typeof rawSlug !== "string" || rawSlug.length === 0) {
+        res.status(400).json({
+          error: "`worktree.slug` must be a non-empty string when provided",
+          code: "worktree_invalid_slug"
+        });
+        return;
+      } else {
+        slug = rawSlug;
+      }
+      const slugError = GitWorktreeService.validateUserWorktreeSlug(slug);
+      if (slugError) {
+        res.status(400).json({ error: slugError, code: "worktree_invalid_slug" });
+        return;
+      }
+      const baseBranch = await wtService.getCurrentBranch().catch(() => void 0);
+      const wtResult = await wtService.createUserWorktree(slug, baseBranch);
+      if (!wtResult.success || !wtResult.worktree) {
+        res.status(500).json({
+          error: wtResult.error ?? "Failed to create worktree",
+          code: "worktree_create_failed"
+        });
+        return;
+      }
+      worktreeMeta = {
+        slug,
+        path: wtResult.worktree.path,
+        branch: wtResult.worktree.branch
+      };
+      sessionScope = "thread";
+    }
     try {
       const session = await runtime.bridge.spawnOrAttach({
         workspaceCwd,
@@ -19923,7 +20033,8 @@ function registerSessionRoutes(app, deps) {
         ...sessionScope !== void 0 ? { sessionScope } : {},
         ...approvalMode !== void 0 ? { approvalMode } : {},
         ...source.sourceType !== void 0 ? { sourceType: source.sourceType } : {},
-        ...source.sourceId !== void 0 ? { sourceId: source.sourceId } : {}
+        ...source.sourceId !== void 0 ? { sourceId: source.sourceId } : {},
+        ...worktreeMeta ? { worktree: worktreeMeta } : {}
       });
       if (daemonLog) {
         daemonLog.info(
@@ -19950,6 +20061,10 @@ function registerSessionRoutes(app, deps) {
               await new SessionService(runtime.workspaceCwd).removeSession(
                 session.sessionId
               );
+              if (worktreeMeta) {
+                await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+                });
+              }
             }
           } catch {
           }
@@ -19959,8 +20074,73 @@ function registerSessionRoutes(app, deps) {
         }
         return;
       }
+      if (worktreeMeta) {
+        try {
+          const createAllowedRoots = [
+            path11.join(workspaceCwd, ".qwen", "worktrees")
+          ];
+          let createRepoTop = null;
+          try {
+            createRepoTop = await new GitWorktreeService(
+              workspaceCwd
+            ).getRepoTopLevel();
+          } catch {
+          }
+          if (createRepoTop && createRepoTop !== workspaceCwd) {
+            createAllowedRoots.push(
+              path11.join(createRepoTop, ".qwen", "worktrees")
+            );
+          }
+          await runtime.bridge.changeSessionCwd(session.sessionId, {
+            path: worktreeMeta.path,
+            allowedRoots: createAllowedRoots
+          });
+          await writeWorktreeSessionMarker(
+            worktreeMeta.path,
+            session.sessionId
+          ).catch(() => {
+          });
+          await writeWorktreeSession(
+            new SessionService(workspaceCwd).getWorktreeSessionPath(
+              session.sessionId
+            ),
+            {
+              slug: worktreeMeta.slug,
+              worktreePath: worktreeMeta.path,
+              worktreeBranch: worktreeMeta.branch,
+              originalCwd: workspaceCwd,
+              originalBranch: "",
+              originalHeadCommit: ""
+            }
+          ).catch(() => {
+          });
+        } catch (cdErr) {
+          if (daemonLog) {
+            daemonLog.warn("worktree cd failed, rolling back", {
+              sessionId: session.sessionId,
+              error: cdErr instanceof Error ? cdErr.message : String(cdErr)
+            });
+          }
+          const killed = await runtime.bridge.killSession(session.sessionId, { requireZeroAttaches: true }).catch(() => false);
+          if (killed) {
+            await new SessionService(workspaceCwd).removeSession(session.sessionId).catch(() => {
+            });
+          }
+          await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+          });
+          res.status(500).json({
+            error: "Failed to relocate session into worktree",
+            code: "worktree_relocate_failed"
+          });
+          return;
+        }
+      }
       res.status(200).json(session);
     } catch (err) {
+      if (worktreeMeta) {
+        await new GitWorktreeService(workspaceCwd).removeUserWorktree(worktreeMeta.slug, { deleteBranch: true }).catch(() => {
+        });
+      }
       sendBridgeError2(res, err, { route: "POST /session" });
     }
   });
@@ -20046,6 +20226,70 @@ function registerSessionRoutes(app, deps) {
         }
         return;
       }
+      if (!session.worktree) {
+        const sidecar = await readWorktreeSession(
+          new SessionService(workspaceCwd).getWorktreeSessionPath(sessionId)
+        ).catch(() => null);
+        if (sidecar) {
+          let realTarget;
+          const candidateRoots = [
+            path11.join(workspaceCwd, ".qwen", "worktrees")
+          ];
+          try {
+            realTarget = fs3.realpathSync(sidecar.worktreePath);
+            let repoTop = null;
+            try {
+              repoTop = await new GitWorktreeService(
+                workspaceCwd
+              ).getRepoTopLevel();
+            } catch {
+            }
+            if (repoTop && repoTop !== workspaceCwd) {
+              candidateRoots.push(path11.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);
+              } catch {
+                return false;
+              }
+            });
+            if (!contained) {
+              realTarget = void 0;
+            }
+          } catch {
+            realTarget = void 0;
+          }
+          if (!realTarget) {
+            daemonLog?.warn("worktree sidecar path failed containment", {
+              sessionId,
+              path: sidecar.worktreePath
+            });
+          } else {
+            const wt = {
+              slug: sidecar.slug,
+              path: realTarget,
+              branch: sidecar.worktreeBranch
+            };
+            try {
+              await runtime.bridge.changeSessionCwd(sessionId, {
+                path: wt.path,
+                allowedRoots: candidateRoots
+              });
+              runtime.bridge.setSessionWorktree(sessionId, wt);
+              session.worktree = wt;
+            } catch (restoreErr) {
+              daemonLog?.warn("worktree restore failed on load/resume", {
+                sessionId,
+                worktreePath: wt.path,
+                error: restoreErr instanceof Error ? restoreErr.message : String(restoreErr)
+              });
+            }
+          }
+        }
+      }
       res.status(200).json(session);
     } catch (err) {
       sendBridgeError2(res, err, {
@@ -22877,7 +23121,7 @@ async function rehydrateScheduledTaskSessions(deps) {
 }
 __name(rehydrateScheduledTaskSessions, "rehydrateScheduledTaskSessions");
 function withTimeout(p, ms, label) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const timer = setTimeout(() => {
       reject(new Error(`${label} timed out after ${ms}ms`));
     }, ms);
@@ -22885,7 +23129,7 @@ function withTimeout(p, ms, label) {
     p.then(
       (v) => {
         clearTimeout(timer);
-        resolve5(v);
+        resolve6(v);
       },
       (e) => {
         clearTimeout(timer);
@@ -22969,7 +23213,7 @@ function registerWorkspaceStatusRoutes(app, deps) {
       const ctx = buildWorkspaceCtx("POST /workspace/acp/preheat");
       const timeoutMsRaw = req.query["timeoutMs"];
       const timeoutMs = typeof timeoutMsRaw === "string" && timeoutMsRaw.trim() ? Number(timeoutMsRaw) : void 0;
-      if (timeoutMs !== void 0 && (!Number.isFinite(timeoutMs) || !Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_ACP_PREHEAT_TIMEOUT_MS)) {
+      if (timeoutMsRaw !== void 0 && (timeoutMs === void 0 || !Number.isFinite(timeoutMs) || !Number.isInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_ACP_PREHEAT_TIMEOUT_MS)) {
         res.status(400).json({
           error: "`timeoutMs` must be a positive integer no greater than 60000",
           code: "invalid_timeout"
@@ -23303,6 +23547,7 @@ function registerCapabilitiesRoutes(app, deps) {
       workspaces: runtimes.map((runtime) => ({
         id: runtime.workspaceId,
         cwd: runtime.workspaceCwd,
+        ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
         primary: runtime.primary,
         trusted: runtime.trusted,
         ...runtimeRemoval ? { removable: runtime.removable === true } : {}
@@ -24615,9 +24860,9 @@ function registerSseEventsRoutes(app, deps) {
     let writeChain = Promise.resolve();
     const trackWriterIdle = writerIdleTimeoutMs !== void 0 && writerIdleTimeoutMs > 0;
     let lastWriteAt = trackWriterIdle ? Date.now() : 0;
-    const doWrite = /* @__PURE__ */ __name((chunk) => new Promise((resolve5, reject) => {
+    const doWrite = /* @__PURE__ */ __name((chunk) => new Promise((resolve6, reject) => {
       if (res.writableEnded) {
-        resolve5();
+        resolve6();
         return;
       }
       let ok;
@@ -24629,19 +24874,19 @@ function registerSseEventsRoutes(app, deps) {
       }
       if (ok) {
         if (trackWriterIdle) lastWriteAt = Date.now();
-        resolve5();
+        resolve6();
         return;
       }
       const onDrain = /* @__PURE__ */ __name(() => {
         res.off("close", onClose);
         res.off("error", onError);
         if (trackWriterIdle) lastWriteAt = Date.now();
-        resolve5();
+        resolve6();
       }, "onDrain");
       const onClose = /* @__PURE__ */ __name(() => {
         res.off("drain", onDrain);
         res.off("error", onError);
-        resolve5();
+        resolve6();
       }, "onClose");
       const onError = /* @__PURE__ */ __name((err) => {
         res.off("drain", onDrain);
@@ -25234,47 +25479,6 @@ function dropNestedWorkspacesPreservingPrimary(workspaces) {
 }
 __name(dropNestedWorkspacesPreservingPrimary, "dropNestedWorkspacesPreservingPrimary");
 
-// packages/cli/src/serve/server/access-log.ts
-init_esbuild_shims();
-var SESSION_ID_RE = /\/session\/([^/]+)/;
-function installAccessLogMiddleware(app, daemonLog) {
-  if (!daemonLog) return;
-  app.use((req, res, next) => {
-    const { method, path: reqPath } = req;
-    if (method === "GET" && reqPath === "/health" || method === "POST" && reqPath.endsWith("/heartbeat")) {
-      return next();
-    }
-    const startMs = Date.now();
-    res.on("finish", () => {
-      try {
-        const status = res.statusCode;
-        if (method === "GET" && reqPath.endsWith("/events") && status === 200) {
-          return;
-        }
-        const durationMs = Date.now() - startMs;
-        const sessionMatch = reqPath.match(SESSION_ID_RE);
-        const sessionId = sessionMatch?.[1];
-        const clientId = req.headers["x-qwen-client-id"];
-        const ctx = {
-          route: `${method} ${reqPath}`,
-          ...sessionId ? { sessionId } : {},
-          ...clientId ? { clientId } : {},
-          status,
-          durationMs
-        };
-        if (status >= 400) {
-          daemonLog.warn("request completed", ctx);
-        } else {
-          daemonLog.info("request completed", ctx);
-        }
-      } catch {
-      }
-    });
-    next();
-  });
-}
-__name(installAccessLogMiddleware, "installAccessLogMiddleware");
-
 // packages/cli/src/serve/server/device-flow-registry.ts
 init_esbuild_shims();
 
@@ -25576,10 +25780,10 @@ function installRateLimiter(app, opts, daemonLog, options = {}) {
         { tier, key: key.slice(0, 64) }
       );
     } : void 0,
-    onError: daemonLog ? (err, path15) => {
+    onError: daemonLog ? (err, path16) => {
       daemonLog.warn(
         `rate limiter error (fail-open): ${err instanceof Error ? err.message : String(err)}`,
-        { path: path15 }
+        { path: path16 }
       );
     } : void 0
   });
@@ -25758,8 +25962,8 @@ __name(registerWorkspaceQualifiedLifecycleRoutes, "registerWorkspaceQualifiedLif
 // packages/cli/src/serve/routes/workspace-management.ts
 init_esbuild_shims();
 import { readdir, stat } from "node:fs/promises";
-import { realpathSync } from "node:fs";
-import { basename as basename4, dirname as dirname4, isAbsolute as isAbsolute7, join as join7, resolve as resolve4, sep as sep3 } from "node:path";
+import { realpathSync as realpathSync2 } from "node:fs";
+import { basename as basename4, dirname as dirname4, isAbsolute as isAbsolute7, join as join8, resolve as resolve4, sep as sep3 } from "node:path";
 var MAX_PATH_SUGGESTIONS = 50;
 function registerWorkspaceManagementRoutes(app, deps) {
   const {
@@ -25790,6 +25994,31 @@ function registerWorkspaceManagementRoutes(app, deps) {
       code: "daemon_shutting_down"
     });
   }, "sendSealed");
+  const attachRegistrationIds = /* @__PURE__ */ __name((runtime, registrationIds) => {
+    runtime.registrationIds ??= [];
+    for (const registrationId of registrationIds) {
+      if (!runtime.registrationIds.includes(registrationId)) {
+        runtime.registrationIds.push(registrationId);
+      }
+    }
+  }, "attachRegistrationIds");
+  const restorePersistedDisplayName = /* @__PURE__ */ __name(async (runtime, canonical) => {
+    const snapshot = await workspaceRegistrationStore.read();
+    const storedWorkspace = snapshot.workspaces.find(
+      (stored) => process.platform === "win32" ? stored.toLowerCase() === canonical.toLowerCase() : stored === canonical
+    );
+    const storedDisplayName = storedWorkspace ? snapshot.displayNames?.[workspaceRegistrationId(storedWorkspace)] : void 0;
+    if (storedWorkspace) {
+      attachRegistrationIds(runtime, [
+        workspaceRegistrationId(storedWorkspace)
+      ]);
+    }
+    if (storedDisplayName === void 0) {
+      delete runtime.displayName;
+    } else {
+      runtime.displayName = storedDisplayName;
+    }
+  }, "restorePersistedDisplayName");
   app.get(
     "/workspace-path-suggestions",
     async (req, res) => {
@@ -25817,7 +26046,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
         return;
       }
       const endsWithSep = prefix.endsWith("/") || process.platform === "win32" && prefix.endsWith("\\");
-      const dir = endsWithSep ? join7(prefix, ".") : dirname4(prefix);
+      const dir = endsWithSep ? join8(prefix, ".") : dirname4(prefix);
       const filter = endsWithSep ? "" : basename4(prefix);
       const filterLower = filter.toLowerCase();
       const suggestions = [];
@@ -25833,7 +26062,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           let isDir = entry.isDirectory();
           if (!isDir && entry.isSymbolicLink()) {
             try {
-              isDir = (await stat(join7(dir, entry.name))).isDirectory();
+              isDir = (await stat(join8(dir, entry.name))).isDirectory();
             } catch {
               continue;
             }
@@ -25843,7 +26072,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
             truncated = true;
             break;
           }
-          suggestions.push({ name: entry.name, path: join7(dir, entry.name) });
+          suggestions.push({ name: entry.name, path: join8(dir, entry.name) });
         }
       } catch {
       }
@@ -25863,6 +26092,20 @@ function registerWorkspaceManagementRoutes(app, deps) {
       const body = safeBody2(req);
       const cwd = body["cwd"];
       const persist = body["persist"] ?? false;
+      const hasDisplayName = Object.hasOwn(body, "displayName");
+      let displayName;
+      if (hasDisplayName) {
+        try {
+          displayName = normalizeWorkspaceDisplayName(body["displayName"]);
+        } catch (err) {
+          if (!(err instanceof WorkspaceDisplayNameValidationError)) throw err;
+          res.status(400).json({
+            error: err.message,
+            code: "invalid_display_name"
+          });
+          return;
+        }
+      }
       if (typeof cwd !== "string" || cwd.trim().length === 0) {
         res.status(400).json({
           error: "`cwd` must be a non-empty string",
@@ -25907,7 +26150,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
       }
       let canonical;
       try {
-        canonical = realpathSync.native(resolve4(cwd));
+        canonical = realpathSync2.native(resolve4(cwd));
       } catch {
         res.status(400).json({
           error: "Path does not exist or is not accessible",
@@ -25982,11 +26225,12 @@ function registerWorkspaceManagementRoutes(app, deps) {
         operationStarted();
         try {
           const snapshot = await workspaceRegistrationStore.read();
-          const alreadyPersisted = snapshot.workspaces.some(
+          const persistedWorkspaces = snapshot.workspaces.filter(
             (stored) => existingRuntime.registrationIds?.includes(
               workspaceRegistrationId(stored)
             ) === true || (process.platform === "win32" ? stored.toLowerCase() === canonical.toLowerCase() : stored === canonical)
           );
+          const alreadyPersisted = persistedWorkspaces.length > 0;
           if (!alreadyPersisted && snapshot.workspaces.length >= MAX_REGISTERED_WORKSPACES - 1) {
             res.status(409).json({
               error: "Workspace registration limit reached",
@@ -25994,22 +26238,56 @@ function registerWorkspaceManagementRoutes(app, deps) {
             });
             return;
           }
-          if (!alreadyPersisted) {
+          if (alreadyPersisted) {
+            attachRegistrationIds(
+              existingRuntime,
+              persistedWorkspaces.map(workspaceRegistrationId)
+            );
+            const storedDisplayName = persistedWorkspaces.map(
+              (stored) => snapshot.displayNames?.[workspaceRegistrationId(stored)]
+            ).find((name) => name !== void 0);
+            if (storedDisplayName === void 0) {
+              delete existingRuntime.displayName;
+            } else {
+              existingRuntime.displayName = storedDisplayName;
+            }
+          } else {
+            let added = false;
             try {
-              await workspaceRegistrationStore.add(canonical);
+              const persistedDisplayName = hasDisplayName ? displayName : existingRuntime.displayName;
+              added = persistedDisplayName === void 0 ? await workspaceRegistrationStore.add(canonical) : await workspaceRegistrationStore.add(
+                canonical,
+                persistedDisplayName
+              );
             } catch (err) {
               if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
                 throw err;
               }
+              added = true;
               try {
                 writeStderrLine(`qwen serve: ${err.message}`);
               } catch {
               }
             }
+            if (added) {
+              attachRegistrationIds(existingRuntime, [
+                workspaceRegistrationId(canonical)
+              ]);
+            }
+            if (added && hasDisplayName) {
+              if (displayName === void 0) {
+                delete existingRuntime.displayName;
+              } else {
+                existingRuntime.displayName = displayName;
+              }
+            } else if (!added) {
+              await restorePersistedDisplayName(existingRuntime, canonical);
+            }
           }
           res.status(200).json({
             id: existingRuntime.workspaceId,
             cwd: existingRuntime.workspaceCwd,
+            ...existingRuntime.displayName !== void 0 ? { displayName: existingRuntime.displayName } : {},
             primary: existingRuntime.primary,
             trusted: existingRuntime.trusted,
             persisted: true
@@ -26082,12 +26360,18 @@ function registerWorkspaceManagementRoutes(app, deps) {
       let persistenceFailed = false;
       try {
         const runtime = await createWorkspaceRuntime(canonical);
+        if (!persist && displayName !== void 0) {
+          runtime.displayName = displayName;
+        }
         let persistedRecordAdded = false;
         try {
           if (persist) {
             try {
               try {
-                persistedRecordAdded = await workspaceRegistrationStore.add(canonical);
+                persistedRecordAdded = displayName === void 0 ? await workspaceRegistrationStore.add(canonical) : await workspaceRegistrationStore.add(
+                  canonical,
+                  displayName
+                );
               } catch (err) {
                 if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
                   throw err;
@@ -26098,6 +26382,16 @@ function registerWorkspaceManagementRoutes(app, deps) {
                 } catch {
                 }
               }
+              if (persistedRecordAdded) {
+                attachRegistrationIds(runtime, [
+                  workspaceRegistrationId(canonical)
+                ]);
+                if (displayName !== void 0) {
+                  runtime.displayName = displayName;
+                }
+              } else {
+                await restorePersistedDisplayName(runtime, canonical);
+              }
             } catch (err) {
               persistenceFailed = true;
               throw err;
@@ -26141,6 +26435,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
         res.status(201).json({
           id: runtime.workspaceId,
           cwd: runtime.workspaceCwd,
+          ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
           primary: runtime.primary,
           trusted: runtime.trusted,
           ...persist ? { persisted: true } : {}
@@ -26208,6 +26503,98 @@ function registerWorkspaceManagementRoutes(app, deps) {
     });
     return void 0;
   }, "resolveManagedRuntime");
+  app.patch(
+    "/workspaces/:workspace",
+    mutate({ strict: true }),
+    async (req, res) => {
+      const body = safeBody2(req);
+      const unsupportedField = Object.keys(body).find(
+        (field) => field !== "displayName"
+      );
+      if (unsupportedField) {
+        res.status(400).json({
+          error: `\`${unsupportedField}\` is not an updatable workspace field`,
+          code: "unsupported_field"
+        });
+        return;
+      }
+      if (!Object.hasOwn(body, "displayName")) {
+        res.status(400).json({
+          error: "No updatable fields provided",
+          code: "empty_patch"
+        });
+        return;
+      }
+      let displayName;
+      try {
+        displayName = body["displayName"] === null ? void 0 : normalizeWorkspaceDisplayName(body["displayName"]);
+      } catch (err) {
+        if (!(err instanceof WorkspaceDisplayNameValidationError)) throw err;
+        res.status(400).json({
+          error: err.message,
+          code: "invalid_display_name"
+        });
+        return;
+      }
+      if (sealed) {
+        sendSealed(res);
+        return;
+      }
+      const runtime = resolveManagedRuntime(req, res);
+      if (!runtime) return;
+      if (inFlight.has(runtime.workspaceCwd)) {
+        res.status(409).json({
+          error: "Workspace registration is in progress",
+          code: "workspace_registration_in_progress"
+        });
+        return;
+      }
+      inFlight.set(runtime.workspaceCwd, "update");
+      operationStarted();
+      try {
+        if (workspaceRegistrationStore && runtime.registrationIds !== void 0 && runtime.registrationIds.length > 0) {
+          try {
+            await workspaceRegistrationStore.setDisplayNameByIds(
+              runtime.registrationIds,
+              displayName
+            );
+          } catch (err) {
+            if (!(err instanceof WorkspaceRegistrationStoreCommittedError)) {
+              throw err;
+            }
+            try {
+              writeStderrLine(`qwen serve: ${err.message}`);
+            } catch {
+            }
+          }
+        }
+        if (displayName === void 0) {
+          delete runtime.displayName;
+        } else {
+          runtime.displayName = displayName;
+        }
+        res.status(200).json({
+          id: runtime.workspaceId,
+          cwd: runtime.workspaceCwd,
+          ...runtime.displayName !== void 0 ? { displayName: runtime.displayName } : {},
+          primary: runtime.primary,
+          trusted: runtime.trusted,
+          ...runtimeRemoval ? { removable: runtime.removable === true } : {}
+        });
+      } catch (err) {
+        writeStderrLine(
+          `qwen serve: failed to persist workspace display name: ${err instanceof Error ? err.message : String(err)}`
+        );
+        res.status(500).json({
+          error: "Failed to persist workspace display name",
+          code: "workspace_registration_store_error"
+        });
+      } finally {
+        inFlight.delete(runtime.workspaceCwd);
+        operationFinished();
+      }
+    }
+  );
   app.delete(
     "/workspaces/:workspace",
     mutate({ strict: true }),
@@ -26443,11 +26830,13 @@ function registerWorkspaceManagementRoutes(app, deps) {
         schemaVersion: snapshot.schemaVersion,
         primaryWorkspace: snapshot.primaryWorkspace,
         entries: snapshot.workspaces.map((cwd) => {
+          const registrationId = workspaceRegistrationId(cwd);
           const runtime = workspaceRegistry.getByWorkspaceCwd(cwd);
           return {
-            id: workspaceRegistrationId(cwd),
+            id: registrationId,
             cwd,
-            active: runtime !== void 0 || registrationIsActive(workspaceRegistrationId(cwd)),
+            ...snapshot.displayNames?.[registrationId] !== void 0 ? { displayName: snapshot.displayNames[registrationId] } : {},
+            active: runtime !== void 0 || registrationIsActive(registrationId),
             persisted: true
           };
         })
@@ -26505,7 +26894,7 @@ function registerWorkspaceManagementRoutes(app, deps) {
           }
           if (storedCwd) {
             try {
-              operationCwd = realpathSync.native(resolve4(storedCwd));
+              operationCwd = realpathSync2.native(resolve4(storedCwd));
             } catch {
               operationCwd = resolve4(storedCwd);
             }
@@ -26545,6 +26934,11 @@ function registerWorkspaceManagementRoutes(app, deps) {
           });
           return;
         }
+        if (runtime?.registrationIds) {
+          runtime.registrationIds = runtime.registrationIds.filter(
+            (id) => id !== registrationId
+          );
+        }
         res.json({
           removed: true,
           active,
@@ -26576,6 +26970,8 @@ __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";
 function registerWorkspaceGitRoutes(app, deps) {
   app.get("/workspace/git", async (_req, res) => {
     try {
@@ -26597,10 +26993,43 @@ function registerWorkspaceQualifiedGitRoutes(app, deps) {
     const runtime = resolveTrustedRuntime2(deps.workspaceRegistry, req, res);
     if (!runtime) return;
     const route = "GET /workspaces/:workspace/git";
+    const rawCwd = req.query["cwd"];
+    let gitCwd = runtime.workspaceCwd;
+    if (typeof rawCwd === "string" && rawCwd.length > 0) {
+      try {
+        const resolved = fs4.realpathSync(path15.resolve(rawCwd));
+        const root = fs4.realpathSync(runtime.workspaceCwd);
+        const rel = path15.relative(root, resolved);
+        if (!rel.startsWith("..") && !path15.isAbsolute(rel)) {
+          gitCwd = resolved;
+        }
+      } catch {
+      }
+    }
     try {
-      res.status(200).json(
-        await deps.gitState.getStatus(runtime.workspaceCwd, runtime.bridge)
-      );
+      if (gitCwd !== runtime.workspaceCwd) {
+        const status = await getGitWorkingTreeStatus(gitCwd).catch(() => null);
+        res.status(200).json(
+          status ? {
+            v: 2,
+            workspaceCwd: gitCwd,
+            branch: status.branch ?? null,
+            detached: status.detached,
+            staged: status.staged,
+            unstaged: status.unstaged,
+            untracked: status.untracked,
+            conflicted: status.conflicted,
+            hasUpstream: status.hasUpstream,
+            ahead: status.ahead,
+            behind: status.behind,
+            stashCount: status.stashCount,
+            ...status.operation ? { operation: status.operation } : {},
+            computedAt: Date.now()
+          } : { v: 2, workspaceCwd: gitCwd, branch: null }
+        );
+      } else {
+        res.status(200).json(await deps.gitState.getStatus(gitCwd, runtime.bridge));
+      }
     } catch (err) {
       deps.sendBridgeError(res, err, { route });
     }
@@ -26623,8 +27052,8 @@ function buildDiffList(workspaceCwd, result) {
       hiddenCount: 0
     };
   }
-  const files = [...result.perFileStats.entries()].map(([path15, s]) => ({
-    path: path15,
+  const files = [...result.perFileStats.entries()].map(([path16, s]) => ({
+    path: path16,
     oldPath: s.oldPath,
     added: s.added,
     removed: s.removed,
@@ -26753,6 +27182,163 @@ function registerWorkspaceQualifiedGitDiffRoutes(app, deps) {
 }
 __name(registerWorkspaceQualifiedGitDiffRoutes, "registerWorkspaceQualifiedGitDiffRoutes");
 
+// packages/cli/src/serve/routes/workspace-git-log.ts
+init_esbuild_shims();
+function buildLogList(workspaceCwd, result) {
+  if (!result) {
+    return {
+      v: 1,
+      workspaceCwd,
+      available: false,
+      entries: [],
+      hasMore: false
+    };
+  }
+  return {
+    v: 1,
+    workspaceCwd,
+    available: true,
+    entries: result.entries.map((e) => ({
+      sha: e.sha,
+      shortSha: e.shortSha,
+      authorName: e.authorName,
+      authorEmail: e.authorEmail,
+      authorDate: e.authorDate,
+      subject: e.subject,
+      ...e.refs ? { refs: e.refs } : {},
+      parents: e.parents
+    })),
+    hasMore: result.hasMore
+  };
+}
+__name(buildLogList, "buildLogList");
+function buildCommitDetail(workspaceCwd, result) {
+  if (!result) {
+    return { v: 1, workspaceCwd, available: false };
+  }
+  return {
+    v: 1,
+    workspaceCwd,
+    available: true,
+    sha: result.sha,
+    shortSha: result.shortSha,
+    authorName: result.authorName,
+    authorEmail: result.authorEmail,
+    authorDate: result.authorDate,
+    subject: result.subject,
+    body: result.body,
+    ...result.refs ? { refs: result.refs } : {},
+    parents: result.parents,
+    files: result.files.map((f) => ({
+      path: f.path,
+      added: f.added,
+      removed: f.removed,
+      isBinary: f.isBinary
+    })),
+    filesCount: result.filesCount,
+    linesAdded: result.linesAdded,
+    linesRemoved: result.linesRemoved,
+    hiddenCount: result.hiddenCount
+  };
+}
+__name(buildCommitDetail, "buildCommitDetail");
+function parsePagination(req) {
+  const rawLimit = req.query["limit"];
+  const rawSkip = req.query["skip"];
+  const parsedLimit = typeof rawLimit === "string" ? parseInt(rawLimit, 10) : NaN;
+  const parsedSkip = typeof rawSkip === "string" ? parseInt(rawSkip, 10) : NaN;
+  const limit = Math.min(
+    Math.max(Number.isNaN(parsedLimit) ? DEFAULT_LOG_LIMIT : parsedLimit, 1),
+    MAX_LOG_LIMIT
+  );
+  const skip = Math.max(Number.isNaN(parsedSkip) ? 0 : parsedSkip, 0);
+  return { limit, skip };
+}
+__name(parsePagination, "parsePagination");
+async function handleLogList(req, res, workspaceCwd, sendBridgeError2, route) {
+  try {
+    applyReadHeaders(res);
+    const { limit, skip } = parsePagination(req);
+    const result = await fetchGitLog(workspaceCwd, { limit, skip });
+    res.status(200).json(buildLogList(workspaceCwd, result));
+  } catch (err) {
+    sendBridgeError2(res, err, { route });
+  }
+}
+__name(handleLogList, "handleLogList");
+async function handleCommitDetail(req, res, workspaceCwd, sendBridgeError2, route) {
+  const sha = req.query["sha"];
+  if (typeof sha !== "string" || sha.length === 0 || !/^[0-9a-f]{7,40}$/i.test(sha)) {
+    applyReadHeaders(res);
+    res.status(400).json({
+      errorKind: "parse_error",
+      error: "sha query parameter is required",
+      status: 400
+    });
+    return;
+  }
+  try {
+    applyReadHeaders(res);
+    const result = await fetchGitCommitDetail(workspaceCwd, sha);
+    res.status(200).json(buildCommitDetail(workspaceCwd, result));
+  } catch (err) {
+    sendBridgeError2(res, err, { route });
+  }
+}
+__name(handleCommitDetail, "handleCommitDetail");
+function registerWorkspaceGitLogRoutes(app, deps) {
+  app.get("/workspace/git/log", (req, res) => {
+    void handleLogList(
+      req,
+      res,
+      deps.boundWorkspace,
+      deps.sendBridgeError,
+      "GET /workspace/git/log"
+    );
+  });
+  app.get("/workspace/git/log/commit", (req, res) => {
+    void handleCommitDetail(
+      req,
+      res,
+      deps.boundWorkspace,
+      deps.sendBridgeError,
+      "GET /workspace/git/log/commit"
+    );
+  });
+}
+__name(registerWorkspaceGitLogRoutes, "registerWorkspaceGitLogRoutes");
+function resolveTrustedRuntime4(registry, req, res) {
+  const runtime = resolveWorkspaceRuntimeFromParam(registry, req, res);
+  if (!runtime) return null;
+  return requireTrustedWorkspaceRuntime(runtime, res) ? runtime : null;
+}
+__name(resolveTrustedRuntime4, "resolveTrustedRuntime");
+function registerWorkspaceQualifiedGitLogRoutes(app, deps) {
+  app.get("/workspaces/:workspace/git/log", (req, res) => {
+    const runtime = resolveTrustedRuntime4(deps.workspaceRegistry, req, res);
+    if (!runtime) return;
+    void handleLogList(
+      req,
+      res,
+      runtime.workspaceCwd,
+      deps.sendBridgeError,
+      "GET /workspaces/:workspace/git/log"
+    );
+  });
+  app.get("/workspaces/:workspace/git/log/commit", (req, res) => {
+    const runtime = resolveTrustedRuntime4(deps.workspaceRegistry, req, res);
+    if (!runtime) return;
+    void handleCommitDetail(
+      req,
+      res,
+      runtime.workspaceCwd,
+      deps.sendBridgeError,
+      "GET /workspaces/:workspace/git/log/commit"
+    );
+  });
+}
+__name(registerWorkspaceQualifiedGitLogRoutes, "registerWorkspaceQualifiedGitLogRoutes");
+
 // packages/cli/src/serve/workspace-git-state.ts
 init_esbuild_shims();
 var WorkspaceGitState = class {
@@ -28483,6 +29069,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     maxPendingPromptsPerSession: opts.maxPendingPromptsPerSession,
     eventRingSize: opts.eventRingSize,
     compactedReplayMaxBytes: opts.compactedReplayMaxBytes,
+    initializeTimeoutMs: opts.initializeTimeoutMs,
     permissionResponseTimeoutMs: opts.permissionResponseTimeoutMs,
     boundWorkspace,
     sessionShellCommandEnabled,
@@ -28759,6 +29346,14 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     workspaceRegistry,
     sendBridgeError: sendBridgeError2
   });
+  registerWorkspaceGitLogRoutes(app, {
+    boundWorkspace: primaryBoundWorkspace,
+    sendBridgeError: sendBridgeError2
+  });
+  registerWorkspaceQualifiedGitLogRoutes(app, {
+    workspaceRegistry,
+    sendBridgeError: sendBridgeError2
+  });
   mountWorkspaceMemoryRoutes(app, {
     bridge: primaryBridge,
     boundWorkspace: primaryBoundWorkspace,