@qwen-code/qwen-code 0.18.5-nightly.20260622.6bc3f853e → 0.18.5-preview.0

package/chunks/{serve-ZIP2GDFY.js → serve-MUROZGCG.js}

@@ -55,7 +55,9 @@ import {
   createIdleWorkspaceProvidersStatus,
   createIdleWorkspaceSkillsStatus,
   createLoadedSettingsAdapter,
+  formatAcpModelId,
   formatMemoryUsage,
+  getAuthTypeFromEnv,
   getCliVersion,
   getDialogSettingKeys,
   getGitVersion,
@@ -66,19 +68,22 @@ import {
   isWorkspaceTrusted,
   loadSettings,
   mapDomainErrorToErrorKind,
-  reloadEnvironment
-} from "./chunk-7Z2O7IBO.js";
+  parseAcpBaseModelId,
+  reloadEnvironment,
+  resolveCliGenerationConfig,
+  sanitizeProviderBaseUrl
+} from "./chunk-EIJYMXXX.js";
+import {
+  SUPPORTED_LANGUAGES,
+  writeStderrLine,
+  writeStdoutLine
+} from "./chunk-ZC675NGC.js";
 import {
   ClientSideConnection,
   PROTOCOL_VERSION,
   RequestError,
   ndJsonStream
 } from "./chunk-UFC57OYT.js";
-import {
-  SUPPORTED_LANGUAGES,
-  writeStderrLine,
-  writeStdoutLine
-} from "./chunk-EJ6NFQ2L.js";
 import {
   ALL_PROVIDERS,
   APPROVAL_MODES,
@@ -86,6 +91,7 @@ import {
   BuiltinAgentRegistry,
   Client,
   ExtensionManager,
+  ModelsConfig,
   SessionService,
   ShellExecutionService,
   StandardFileSystemService,
@@ -114,22 +120,22 @@ import {
   resolveBundleDir,
   shouldShowStep,
   writeWorkspaceContextFile
-} from "./chunk-CXZV4Q4J.js";
+} from "./chunk-ZXNEOCW2.js";
 import "./chunk-K5PGHDBN.js";
-import "./chunk-XU7BKR3B.js";
-import "./chunk-2O3NAOJG.js";
-import "./chunk-XGU3ETVO.js";
+import "./chunk-TXVGVZYR.js";
+import "./chunk-XU5P23GN.js";
+import "./chunk-2BIF2NVV.js";
+import "./chunk-NWLUISRA.js";
+import "./chunk-3BR4OIOE.js";
 import "./chunk-2MPVVENX.js";
 import "./chunk-ZTQ26VBE.js";
-import "./chunk-C6MI2ASN.js";
-import "./chunk-LF6BKGZT.js";
-import "./chunk-26ZYKTYZ.js";
+import "./chunk-GZCJS5WH.js";
 import "./chunk-MLZQVCF3.js";
 import "./chunk-LD2XBG6Z.js";
-import "./chunk-ID533GA3.js";
-import "./chunk-KGV3F6UF.js";
-import "./chunk-77WXWU44.js";
-import "./chunk-AE6RQU6F.js";
+import "./chunk-OTBK43JR.js";
+import "./chunk-HGNSRCRB.js";
+import "./chunk-EEEZIVFJ.js";
+import "./chunk-PRYMDRBV.js";
 import {
   DAEMON_TRACEPARENT_META_KEY,
   DAEMON_TRACESTATE_META_KEY,
@@ -156,19 +162,18 @@ import {
   recordDaemonPromptQueueWait,
   recordDaemonSessionLifecycle,
   registerDaemonGaugeCallbacks,
-  require_safer,
   resolveTelemetrySettings,
   shutdownTelemetry,
   withDaemonRequestSpan
-} from "./chunk-GM3LTU6K.js";
+} from "./chunk-UMRZ7XCR.js";
 import "./chunk-3PJXIDKI.js";
 import "./chunk-UWCTAVOD.js";
 import "./chunk-OFEVLU4C.js";
 import "./chunk-OMX7CUOE.js";
-import "./chunk-FH4P6RQA.js";
-import "./chunk-CTHZVIMD.js";
-import "./chunk-VKILGMZQ.js";
-import "./chunk-GOMVJKBL.js";
+import "./chunk-BNXANYLH.js";
+import "./chunk-T2VDEFUU.js";
+import "./chunk-2QDQTWCI.js";
+import "./chunk-L7U2RI5O.js";
 import {
   QwenOAuth2Client,
   QwenOAuthPollError,
@@ -177,15 +182,20 @@ import {
   isDeviceAuthorizationSuccess,
   isDeviceTokenPending,
   isDeviceTokenSuccess
-} from "./chunk-MSJ2MXJ6.js";
-import "./chunk-ATLUHLZE.js";
+} from "./chunk-BGUDAULQ.js";
+import "./chunk-EW6C27XX.js";
+import "./chunk-22IFUCVR.js";
 import "./chunk-64WXLC72.js";
-import "./chunk-LTN3VYMZ.js";
+import "./chunk-3UALQ56H.js";
 import {
   detectRuntime,
-  redactProxyCredentials
-} from "./chunk-42HGOMED.js";
-import "./chunk-G4BUMVEY.js";
+  redactProxyCredentials,
+  tokenLimit
+} from "./chunk-F6XNTYNE.js";
+import "./chunk-CGEGHF2C.js";
+import {
+  require_safer
+} from "./chunk-EJYJYJZ2.js";
 import "./chunk-55ZMG67I.js";
 import {
   import_websocket_server
@@ -194,7 +204,7 @@ import "./chunk-5IFG2VC4.js";
 import {
   Storage,
   updateSymlink
-} from "./chunk-WE6TNQJU.js";
+} from "./chunk-C4K3FEQ2.js";
 import "./chunk-ZERZSAZL.js";
 import {
   require_src
@@ -15458,7 +15468,7 @@ import * as path13 from "node:path";
 init_esbuild_shims();
 import { createHash, timingSafeEqual } from "node:crypto";
 
-// packages/cli/src/serve/loopbackBinds.ts
+// packages/cli/src/serve/loopback-binds.ts
 init_esbuild_shims();
 var LOOPBACK_BINDS = /* @__PURE__ */ new Set([
   "127.0.0.1",
@@ -15642,7 +15652,7 @@ function createMutationGate(deps) {
 }
 __name(createMutationGate, "createMutationGate");
 
-// packages/cli/src/serve/auth/deviceFlow.ts
+// packages/cli/src/serve/auth/device-flow.ts
 init_esbuild_shims();
 import { randomUUID } from "node:crypto";
 var SANITIZE_FOR_STDERR_RE = new RegExp(
@@ -17214,7 +17224,13 @@ function createSpawnChannelFactory(options = {}) {
     );
     const child = spawn(
       process.execPath,
-      [...execArgs, ...memoryArgs, cliEntry, "--acp"],
+      [
+        ...execArgs,
+        ...memoryArgs,
+        cliEntry,
+        "--acp",
+        ...options.extraArgs ?? []
+      ],
       {
         cwd: workspaceCwd,
         stdio: ["pipe", "pipe", "pipe"],
@@ -19083,6 +19099,14 @@ function createAcpSessionBridge(opts) {
           transportClosed
         ]);
         publishModelSwitched(entry, modelId, originatorClientId);
+        broadcastWorkspaceEvent({
+          type: "settings_changed",
+          data: {
+            key: "model.name",
+            value: modelId
+          },
+          ...originatorClientId ? { originatorClientId } : {}
+        });
         succeeded = true;
       } catch (err) {
         entry.events.publish({
@@ -20160,14 +20184,14 @@ function createAcpSessionBridge(opts) {
         const branchDisplayName = typeof rawBranchName === "string" ? rawBranchName : result.newSessionId.slice(0, 8);
         let restored;
         try {
-          restored = await restoreSession("resume", {
+          restored = await restoreSession("load", {
             sessionId: result.newSessionId,
             workspaceCwd: boundWorkspace,
             clientId: context?.clientId
           });
         } catch (restoreErr) {
           writeStderrLine2(
-            `qwen serve: branchSession resume failed for ${result.newSessionId}, attempting cleanup...`
+            `qwen serve: branchSession load failed for ${result.newSessionId}, attempting cleanup...`
           );
           try {
             await ci.connection.extMethod(
@@ -20193,8 +20217,7 @@ function createAcpSessionBridge(opts) {
           data: eventData,
           ...originatorClientId ? { originatorClientId } : {}
         };
-        entry.events.publish(branchEnvelope);
-        broadcastWorkspaceEvent(branchEnvelope, sessionId);
+        newEntry?.events.publish(branchEnvelope);
         return {
           ...restored,
           displayName: branchDisplayName,
@@ -20428,6 +20451,12 @@ function createAcpSessionBridge(opts) {
         SERVE_STATUS_EXT_METHODS.sessionTasks
       );
     },
+    async getSessionLspStatus(sessionId) {
+      return requestSessionStatus(
+        sessionId,
+        SERVE_STATUS_EXT_METHODS.sessionLspStatus
+      );
+    },
     async cancelSessionTask(sessionId, taskId, taskKind) {
       return requestSessionStatus(
         sessionId,
@@ -20536,6 +20565,14 @@ function createAcpSessionBridge(opts) {
             transportClosed
           ]);
           publishModelSwitched(entry, req.modelId, originatorClientId);
+          broadcastWorkspaceEvent({
+            type: "settings_changed",
+            data: {
+              key: "model.name",
+              value: req.modelId
+            },
+            ...originatorClientId ? { originatorClientId } : {}
+          });
           succeeded = true;
           return result;
         } finally {
@@ -20818,6 +20855,68 @@ function createAcpSessionBridge(opts) {
         answer: response.answer ?? null
       };
     },
+    async launchSessionForkAgent(sessionId, directive, context) {
+      const entry = byId.get(sessionId);
+      if (!entry) throw new SessionNotFoundError(sessionId);
+      const info = channelInfoForEntry(entry);
+      if (!info || info.isDying) throw new SessionNotFoundError(sessionId);
+      resolveTrustedClientId(entry, context?.clientId);
+      const trimmed = directive.trim();
+      if (!trimmed) {
+        throw new Error("Fork directive is required");
+      }
+      if (entry.pendingPromptCount > 0 || entry.promptActive) {
+        throw new SessionBusyError(
+          sessionId,
+          "Cannot fork while a response or tool call is in progress"
+        );
+      }
+      return entry.promptQueue.then(async () => {
+        if (entry.pendingPromptCount > 0 || entry.promptActive) {
+          throw new SessionBusyError(
+            sessionId,
+            "Cannot fork while a response or tool call is in progress"
+          );
+        }
+        opts.onDiagnosticLine?.(
+          `qwen serve: launchSessionForkAgent requested for session=${sessionId}`,
+          "info"
+        );
+        let response;
+        try {
+          response = await Promise.race([
+            withTimeout(
+              entry.connection.extMethod(
+                SERVE_CONTROL_EXT_METHODS.sessionForkAgent,
+                {
+                  sessionId,
+                  directive: trimmed
+                }
+              ),
+              initTimeoutMs,
+              SERVE_CONTROL_EXT_METHODS.sessionForkAgent
+            ),
+            getTransportClosedReject(entry)
+          ]);
+        } catch (error2) {
+          opts.onDiagnosticLine?.(
+            `qwen serve: launchSessionForkAgent failed for session=${sessionId}: ${error2 instanceof Error ? error2.message : String(error2)}`,
+            "warn"
+          );
+          throw error2;
+        }
+        const result = {
+          sessionId: entry.sessionId,
+          description: response.description ?? trimmed.slice(0, 60),
+          launched: response.launched === true
+        };
+        opts.onDiagnosticLine?.(
+          `qwen serve: launchSessionForkAgent completed for session=${sessionId} launched=${result.launched}`,
+          "info"
+        );
+        return result;
+      });
+    },
     async executeShellCommand(sessionId, command, signal, context) {
       opts.onDiagnosticLine?.(
         `qwen serve: bridge executeShellCommand for session=${sessionId}`,
@@ -20952,7 +21051,11 @@ function createAcpSessionBridge(opts) {
           withTimeout(
             entry.connection.extMethod(
               SERVE_CONTROL_EXT_METHODS.sessionRewind,
-              { sessionId, promptId: req.promptId, rewindFiles: true }
+              {
+                sessionId,
+                promptId: req.promptId,
+                rewindFiles: req.rewindFiles !== false
+              }
             ),
             initTimeoutMs,
             SERVE_CONTROL_EXT_METHODS.sessionRewind
@@ -21261,7 +21364,7 @@ var createHttpAcpBridge = createAcpSessionBridge;
 // packages/acp-bridge/src/bridgeFileSystem.ts
 init_esbuild_shims();
 
-// packages/cli/src/serve/auth/qwenDeviceFlowProvider.ts
+// packages/cli/src/serve/auth/qwen-device-flow-provider.ts
 init_esbuild_shims();
 var QWEN_OAUTH_SCOPE = "openid profile email model.completion";
 var STDERR_DETAIL_MAX = 2048;
@@ -21430,7 +21533,7 @@ function mapRfc8628OAuthCode(code) {
 }
 __name(mapRfc8628OAuthCode, "mapRfc8628OAuthCode");
 
-// packages/cli/src/serve/bridgeFileSystemAdapter.ts
+// packages/cli/src/serve/bridge-file-system-adapter.ts
 init_esbuild_shims();
 var ACP_WRITE_ROUTE = "ACP writeTextFile";
 var ACP_READ_ROUTE = "ACP readTextFile";
@@ -21468,11 +21571,11 @@ function createBridgeFileSystemAdapter(factory) {
 }
 __name(createBridgeFileSystemAdapter, "createBridgeFileSystemAdapter");
 
-// packages/cli/src/serve/daemonStatusProvider.ts
+// packages/cli/src/serve/daemon-status-provider.ts
 init_esbuild_shims();
 import { promises as fs2 } from "node:fs";
 
-// packages/cli/src/serve/envSnapshot.ts
+// packages/cli/src/serve/env-snapshot.ts
 init_esbuild_shims();
 import os2 from "node:os";
 var SECRET_ENV_VARS = [
@@ -21603,7 +21706,7 @@ var ENV_SECRET_VARS = SECRET_ENV_VARS;
 var ENV_NONSECRET_VARS = NONSECRET_ENV_VARS;
 var ENV_PROXY_VARS = PROXY_VARS;
 
-// packages/cli/src/serve/daemonStatusProvider.ts
+// packages/cli/src/serve/daemon-status-provider.ts
 var REQUIRED_NODE_MAJOR = 22;
 function createDaemonStatusProvider() {
   return {
@@ -21772,7 +21875,232 @@ async function safeCheck(kind, body) {
 }
 __name(safeCheck, "safeCheck");
 
-// packages/cli/src/serve/debugMode.ts
+// packages/cli/src/serve/workspace-providers-status.ts
+init_esbuild_shims();
+function createWorkspaceProvidersStatusProvider(options = {}) {
+  return async (workspaceCwd, acpChannelLive) => buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options);
+}
+__name(createWorkspaceProvidersStatusProvider, "createWorkspaceProvidersStatusProvider");
+function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
+  try {
+    const loaded = loadSettings(workspaceCwd);
+    const settings = loaded.merged;
+    const env = options.env ?? process.env;
+    const selectedAuthType = settings.security?.auth?.selectedType ?? getAuthTypeFromEnv();
+    const argv = {
+      model: options.argv?.model,
+      openaiApiKey: options.argv?.openaiApiKey,
+      openaiBaseUrl: options.argv?.openaiBaseUrl,
+      openaiLogging: options.argv?.openaiLogging,
+      openaiLoggingDir: options.argv?.openaiLoggingDir
+    };
+    const resolvedCliConfig = resolveCliGenerationConfig({
+      argv,
+      settings,
+      selectedAuthType,
+      env
+    });
+    const modelsConfig = new ModelsConfig({
+      initialAuthType: selectedAuthType,
+      modelProvidersConfig: settings.modelProviders,
+      generationConfig: resolvedCliConfig.generationConfig,
+      generationConfigSources: resolvedCliConfig.sources
+    });
+    const currentAuth = selectedAuthType;
+    const currentModelId = (resolvedCliConfig.model || modelsConfig.getModel() || "").trim();
+    const hasCurrentModel = currentModelId.length > 0;
+    const currentAcpModelId = hasCurrentModel && currentAuth ? formatAcpModelId(currentModelId, currentAuth) : currentModelId || void 0;
+    const currentBaseUrl = resolvedCliConfig.sources["baseUrl"] ? resolvedCliConfig.baseUrl || void 0 : void 0;
+    const fastModelId = typeof settings.fastModel === "string" && settings.fastModel.length > 0 ? settings.fastModel : void 0;
+    const providers = /* @__PURE__ */ new Map();
+    const explicitModelBaseUrls = buildExplicitModelBaseUrls(
+      settings.modelProviders
+    );
+    for (const model of modelsConfig.getAllConfiguredModels()) {
+      if (model.isRuntimeModel) continue;
+      const authType = String(model.authType);
+      let provider = providers.get(authType);
+      if (!provider) {
+        provider = {
+          kind: "model_provider",
+          status: "ok",
+          authType,
+          current: false,
+          models: []
+        };
+        providers.set(authType, provider);
+      }
+      const effectiveModelId = model.id;
+      const modelId = formatAcpModelId(effectiveModelId, model.authType);
+      const isCurrent = currentAuth === model.authType && hasCurrentModel && matchesCurrentModel(currentModelId, effectiveModelId, modelId) && matchesCurrentBaseUrl(
+        currentBaseUrl,
+        model.baseUrl,
+        model.baseUrl !== void 0 && explicitModelBaseUrls.has(
+          modelBaseUrlKey(authType, effectiveModelId, model.baseUrl)
+        )
+      );
+      const providerModel = {
+        modelId,
+        baseModelId: parseAcpBaseModelId(effectiveModelId),
+        name: model.label,
+        ...model.description !== void 0 ? { description: model.description } : {},
+        contextLimit: model.contextWindowSize ?? tokenLimit(effectiveModelId),
+        ...model.modalities !== void 0 ? { modalities: model.modalities } : {},
+        ...model.baseUrl !== void 0 ? { baseUrl: sanitizeProviderBaseUrl(model.baseUrl) } : {},
+        ...model.envKey !== void 0 ? { envKey: model.envKey } : {},
+        isCurrent,
+        isRuntime: false
+      };
+      provider.models.push(providerModel);
+      if (isCurrent) provider.current = true;
+    }
+    const current = buildCurrent(
+      currentAuth,
+      currentAcpModelId,
+      currentBaseUrl,
+      fastModelId
+    );
+    return {
+      v: STATUS_SCHEMA_VERSION,
+      workspaceCwd,
+      initialized: true,
+      acpChannelLive,
+      ...current ? { current } : {},
+      providers: [...providers.values()],
+      ...resolvedCliConfig.warnings.length > 0 ? {
+        errors: resolvedCliConfig.warnings.map((warning) => ({
+          kind: "providers",
+          status: "warning",
+          error: sanitizeProviderWarning(warning)
+        }))
+      } : {}
+    };
+  } catch (error2) {
+    return {
+      v: STATUS_SCHEMA_VERSION,
+      workspaceCwd,
+      initialized: false,
+      acpChannelLive,
+      providers: [],
+      errors: [
+        {
+          kind: "providers",
+          status: "error",
+          error: sanitizeProviderWarning(
+            error2 instanceof Error ? error2.message : String(error2)
+          )
+        }
+      ]
+    };
+  }
+}
+__name(buildWorkspaceProvidersStatus, "buildWorkspaceProvidersStatus");
+function matchesCurrentModel(currentModelId, baseModelId, acpModelId) {
+  return currentModelId === baseModelId || currentModelId === acpModelId;
+}
+__name(matchesCurrentModel, "matchesCurrentModel");
+function matchesCurrentBaseUrl(currentBaseUrl, modelBaseUrl, modelHasExplicitBaseUrl) {
+  if (!currentBaseUrl) return !modelHasExplicitBaseUrl;
+  return currentBaseUrl === modelBaseUrl;
+}
+__name(matchesCurrentBaseUrl, "matchesCurrentBaseUrl");
+function buildExplicitModelBaseUrls(modelProviders) {
+  const baseUrls = /* @__PURE__ */ new Set();
+  if (!modelProviders) return baseUrls;
+  for (const [authType, providerConfig] of Object.entries(modelProviders)) {
+    const models = readProviderModels(providerConfig);
+    for (const model of models) {
+      if (typeof model.id === "string" && typeof model.baseUrl === "string" && model.baseUrl.length > 0) {
+        baseUrls.add(modelBaseUrlKey(authType, model.id, model.baseUrl));
+      }
+    }
+  }
+  return baseUrls;
+}
+__name(buildExplicitModelBaseUrls, "buildExplicitModelBaseUrls");
+function readProviderModels(providerConfig) {
+  if (Array.isArray(providerConfig)) {
+    return providerConfig.filter(isProviderModelBaseUrlConfig);
+  }
+  if (typeof providerConfig !== "object" || providerConfig === null) {
+    return [];
+  }
+  const { models } = providerConfig;
+  return Array.isArray(models) ? models.filter(isProviderModelBaseUrlConfig) : [];
+}
+__name(readProviderModels, "readProviderModels");
+function isProviderModelBaseUrlConfig(value) {
+  return typeof value === "object" && value !== null;
+}
+__name(isProviderModelBaseUrlConfig, "isProviderModelBaseUrlConfig");
+function modelBaseUrlKey(authType, modelId, baseUrl) {
+  return `${authType}\0${modelId}\0${baseUrl}`;
+}
+__name(modelBaseUrlKey, "modelBaseUrlKey");
+var URL_LIKE_PATTERN = /\b[A-Za-z][A-Za-z\d+.-]*:\/\/[^\s'"`<>]+/g;
+var URL_START_PATTERN = /\b[A-Za-z][A-Za-z\d+.-]*:\/\//g;
+function sanitizeProviderWarning(warning) {
+  let result = "";
+  let index = 0;
+  let next = findNextUrlStart(warning, index);
+  while (next) {
+    result += warning.slice(index, next.index);
+    const segmentEnd = findUrlSegmentEnd(warning, next.index, next.marker);
+    const segment = warning.slice(next.index, segmentEnd);
+    result += sanitizeProviderWarningSegment(segment, next.marker.length);
+    index = segmentEnd;
+    next = findNextUrlStart(warning, index);
+  }
+  return result + warning.slice(index);
+}
+__name(sanitizeProviderWarning, "sanitizeProviderWarning");
+function findNextUrlStart(value, from) {
+  URL_START_PATTERN.lastIndex = from;
+  const match = URL_START_PATTERN.exec(value);
+  return match ? { index: match.index, marker: match[0] } : void 0;
+}
+__name(findNextUrlStart, "findNextUrlStart");
+function findUrlSegmentEnd(value, start, marker) {
+  const afterMarker = start + marker.length;
+  const carriageReturn = value.indexOf("\r", afterMarker);
+  const lineFeed = value.indexOf("\n", afterMarker);
+  let lineEnd = value.length;
+  if (carriageReturn !== -1) lineEnd = Math.min(lineEnd, carriageReturn);
+  if (lineFeed !== -1) lineEnd = Math.min(lineEnd, lineFeed);
+  const nextUrl = findNextUrlStart(value, afterMarker);
+  return Math.min(lineEnd, nextUrl?.index ?? value.length);
+}
+__name(findUrlSegmentEnd, "findUrlSegmentEnd");
+function sanitizeProviderWarningSegment(segment, markerLength) {
+  const at = segment.indexOf("@", markerLength);
+  if (at !== -1 && hasCredentialPrefix(segment, markerLength, at) && segment[at + 1] !== void 0 && /[A-Za-z0-9.[\]-]/.test(segment[at + 1])) {
+    return `${segment.slice(0, markerLength)}${segment.slice(at + 1)}`;
+  }
+  return segment.replace(
+    URL_LIKE_PATTERN,
+    (url) => sanitizeProviderBaseUrl(url)
+  );
+}
+__name(sanitizeProviderWarningSegment, "sanitizeProviderWarningSegment");
+function hasCredentialPrefix(segment, markerLength, at) {
+  const colon = segment.indexOf(":", markerLength);
+  if (colon === -1 || colon > at) return false;
+  const username = segment.slice(markerLength, colon);
+  return !/[/?#\s'"`<>]/.test(username);
+}
+__name(hasCredentialPrefix, "hasCredentialPrefix");
+function buildCurrent(authType, modelId, baseUrl, fastModelId) {
+  if (!authType && !modelId && !baseUrl && !fastModelId) return void 0;
+  return {
+    ...authType ? { authType: String(authType) } : {},
+    ...modelId ? { modelId } : {},
+    ...baseUrl ? { baseUrl: sanitizeProviderBaseUrl(baseUrl) } : {},
+    ...fastModelId ? { fastModelId } : {}
+  };
+}
+__name(buildCurrent, "buildCurrent");
+
+// packages/cli/src/serve/debug-mode.ts
 init_esbuild_shims();
 function isServeDebugMode() {
   const value = process.env["QWEN_SERVE_DEBUG"];
@@ -21781,11 +22109,11 @@ function isServeDebugMode() {
 }
 __name(isServeDebugMode, "isServeDebugMode");
 
-// packages/cli/src/serve/acpHttp/index.ts
+// packages/cli/src/serve/acp-http/index.ts
 init_esbuild_shims();
 import { createHash as createHash4, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
 
-// packages/cli/src/serve/acpHttp/dispatch.ts
+// packages/cli/src/serve/acp-http/dispatch.ts
 init_esbuild_shims();
 import path8 from "node:path";
 
@@ -22270,7 +22598,7 @@ function createAuditPublisher(deps) {
 }
 __name(createAuditPublisher, "createAuditPublisher");
 
-// packages/cli/src/serve/fs/workspaceFileSystem.ts
+// packages/cli/src/serve/fs/workspace-file-system.ts
 init_esbuild_shims();
 import { createHash as createHash3, randomBytes } from "node:crypto";
 import { promises as fsp2 } from "node:fs";
@@ -22281,6 +22609,7 @@ function createWorkspaceFileSystemFactory(deps) {
     projectRoot: boundWorkspace,
     useGitignore: true,
     useQwenignore: true,
+    ...deps.customIgnoreFiles !== void 0 ? { customIgnoreFiles: deps.customIgnoreFiles } : {},
     ignoreDirs: []
   });
   Object.freeze(ignore);
@@ -22355,6 +22684,12 @@ var WorkspaceFileSystemImpl = class {
           `line must be a positive integer, got ${opts.line}`
         );
       }
+      if (opts.limit !== void 0 && (!Number.isSafeInteger(opts.limit) || opts.limit < 1)) {
+        throw new FsError(
+          "parse_error",
+          `limit must be a positive integer, got ${opts.limit}`
+        );
+      }
       const snapshot = await readTextSnapshotFromResolvedFile(p, opts);
       const ignoreVerdict = shouldIgnore(
         p,
@@ -22452,6 +22787,12 @@ var WorkspaceFileSystemImpl = class {
     const start = performance.now();
     try {
       assertTrustedForIntent(this.deps.trusted, "list");
+      if (opts.maxEntries !== void 0 && (!Number.isSafeInteger(opts.maxEntries) || opts.maxEntries < 1)) {
+        throw new FsError(
+          "parse_error",
+          `maxEntries must be a positive integer, got ${opts.maxEntries}`
+        );
+      }
       const entries = [];
       const dir = await fsp2.opendir(p);
       for await (const d of dir) {
@@ -23541,7 +23882,7 @@ function buildWriteMeta(opts) {
 }
 __name(buildWriteMeta, "buildWriteMeta");
 
-// packages/cli/src/serve/workspaceMemory.ts
+// packages/cli/src/serve/workspace-memory.ts
 init_esbuild_shims();
 import { promises as fs3 } from "node:fs";
 import * as path7 from "node:path";
@@ -23783,14 +24124,14 @@ function isEnoent(err) {
 }
 __name(isEnoent, "isEnoent");
 
-// packages/cli/src/serve/workspaceAgents.ts
+// packages/cli/src/serve/workspace-agents.ts
 init_esbuild_shims();
 import { promises as fs4 } from "node:fs";
 
-// packages/cli/src/serve/acpSessionBridge.ts
+// packages/cli/src/serve/acp-session-bridge.ts
 init_esbuild_shims();
 
-// packages/cli/src/serve/workspaceAgents.ts
+// packages/cli/src/serve/workspace-agents.ts
 var AGENT_TYPE_PATTERN = /^[\p{L}\p{N}_-]+$/u;
 var AGENT_TYPE_MAX_LENGTH = 64;
 var AGENT_TYPE_MIN_LENGTH = 2;
@@ -24655,7 +24996,7 @@ function createDaemonSubagentManager(boundWorkspace) {
 }
 __name(createDaemonSubagentManager, "createDaemonSubagentManager");
 
-// packages/cli/src/serve/acpHttp/jsonRpc.ts
+// packages/cli/src/serve/acp-http/json-rpc.ts
 init_esbuild_shims();
 var QWEN_METHOD_NS = "_qwen/";
 var QWEN_META_KEY = "qwen";
@@ -24735,7 +25076,7 @@ function parseInbound(raw) {
 }
 __name(parseInbound, "parseInbound");
 
-// packages/cli/src/serve/acpHttp/dispatch.ts
+// packages/cli/src/serve/acp-http/dispatch.ts
 function errMsg(err) {
   return err instanceof Error ? err.message : String(err);
 }
@@ -24761,6 +25102,7 @@ var ALL_QWEN_VENDOR_METHODS = [
   `${QWEN_METHOD_NS}session/detach`,
   `${QWEN_METHOD_NS}session/context_usage`,
   `${QWEN_METHOD_NS}session/tasks`,
+  `${QWEN_METHOD_NS}session/lsp`,
   // Wave 1: memory
   `${QWEN_METHOD_NS}workspace/memory`,
   `${QWEN_METHOD_NS}workspace/memory/write`,
@@ -25816,6 +26158,13 @@ var AcpDispatcher = class {
           this.replyConn(conn, id, result);
           return;
         }
+        case `${QWEN_METHOD_NS}session/lsp`: {
+          const sessionId = String(params["sessionId"] ?? "");
+          if (!this.requireOwned(conn, sessionId, id)) return;
+          const result = await this.bridge.getSessionLspStatus(sessionId);
+          this.replyConn(conn, id, result);
+          return;
+        }
         case `${QWEN_METHOD_NS}workspace/memory`: {
           const result = await collectWorkspaceMemoryStatus(
             this.boundWorkspace
@@ -26904,7 +27253,7 @@ var AcpDispatcher = class {
   }
 };
 
-// packages/cli/src/serve/acpHttp/connectionRegistry.ts
+// packages/cli/src/serve/acp-http/connection-registry.ts
 init_esbuild_shims();
 import { randomUUID as randomUUID4 } from "node:crypto";
 var MAX_BUFFERED_FRAMES = 256;
@@ -27253,7 +27602,7 @@ function sumBy(values, select) {
 }
 __name(sumBy, "sumBy");
 
-// packages/cli/src/serve/acpHttp/sseStream.ts
+// packages/cli/src/serve/acp-http/sse-stream.ts
 init_esbuild_shims();
 var SseStream = class {
   constructor(res, onClose, onHeartbeat) {
@@ -27372,7 +27721,7 @@ var SseStream = class {
   }
 };
 
-// packages/cli/src/serve/acpHttp/wsStream.ts
+// packages/cli/src/serve/acp-http/ws-stream.ts
 init_esbuild_shims();
 var WsStream = class {
   constructor(ws, onClose, onHeartbeat) {
@@ -27460,7 +27809,7 @@ var WsStream = class {
   }
 };
 
-// packages/cli/src/serve/acpHttp/index.ts
+// packages/cli/src/serve/acp-http/index.ts
 var ACP_CONNECTION_HEADER = "acp-connection-id";
 var ACP_SESSION_HEADER = "acp-session-id";
 var CONN_GRACE_MS = 1e4;
@@ -27474,6 +27823,7 @@ var WS_READ_METHODS = /* @__PURE__ */ new Set([
   "_qwen/session/supported_commands",
   "_qwen/session/context_usage",
   "_qwen/session/tasks",
+  "_qwen/session/lsp",
   "_qwen/workspace/mcp",
   "_qwen/workspace/skills",
   "_qwen/workspace/providers",
@@ -28006,7 +28356,7 @@ function isLoopbackReq(req) {
 }
 __name(isLoopbackReq, "isLoopbackReq");
 
-// packages/cli/src/serve/daemonStatus.ts
+// packages/cli/src/serve/daemon-status.ts
 init_esbuild_shims();
 var DEFAULT_LISTENER_MAX_CONNECTIONS = 256;
 var SECTION_TIMEOUT_MS = 1e3;
@@ -28497,6 +28847,7 @@ var SERVE_CAPABILITY_REGISTRY = {
   session_supported_commands: { since: "v1" },
   session_tasks: { since: "v1" },
   session_stats: { since: "v1" },
+  session_lsp: { since: "v1" },
   session_close: { since: "v1" },
   session_metadata: { since: "v1" },
   // Daemon supports the MCP client guardrail surface: an in-process
@@ -29345,7 +29696,7 @@ function getDemoHtml(_port) {
 }
 __name(getDemoHtml, "getDemoHtml");
 
-// packages/cli/src/serve/webShellStatic.ts
+// packages/cli/src/serve/web-shell-static.ts
 init_esbuild_shims();
 var import_express = __toESM(require_express2(), 1);
 import { existsSync } from "node:fs";
@@ -29449,7 +29800,7 @@ function mountWebShellSpaFallback(app, webShellDir) {
 }
 __name(mountWebShellSpaFallback, "mountWebShellSpaFallback");
 
-// packages/cli/src/serve/routes/workspaceFileRead.ts
+// packages/cli/src/serve/routes/workspace-file-read.ts
 init_esbuild_shims();
 import * as path10 from "node:path";
 var MAX_LIST_ENTRIES = 2e3;
@@ -29796,7 +30147,7 @@ function registerWorkspaceFileReadRoutes(app, deps) {
 }
 __name(registerWorkspaceFileReadRoutes, "registerWorkspaceFileReadRoutes");
 
-// packages/cli/src/serve/routes/workspaceFileWrite.ts
+// packages/cli/src/serve/routes/workspace-file-write.ts
 init_esbuild_shims();
 function getFsFactory2(req, res) {
   const factory = req.app.locals.fsFactory;
@@ -30059,6 +30410,7 @@ function createDaemonWorkspaceService(deps) {
     boundWorkspace,
     contextFilename,
     statusProvider,
+    workspaceProvidersStatusProvider,
     isChannelLive,
     persistDisabledTools,
     queryWorkspaceStatus,
@@ -30081,6 +30433,12 @@ function createDaemonWorkspaceService(deps) {
       );
     },
     async getWorkspaceProvidersStatus(_ctx) {
+      if (workspaceProvidersStatusProvider) {
+        return workspaceProvidersStatusProvider(
+          boundWorkspace,
+          isChannelLive?.() ?? false
+        );
+      }
       return queryWorkspaceStatus(
         SERVE_STATUS_EXT_METHODS.workspaceProviders,
         () => createIdleWorkspaceProvidersStatus(boundWorkspace)
@@ -30454,7 +30812,7 @@ function createDaemonWorkspaceService(deps) {
 }
 __name(createDaemonWorkspaceService, "createDaemonWorkspaceService");
 
-// packages/cli/src/serve/routes/workspaceSettings.ts
+// packages/cli/src/serve/routes/workspace-settings.ts
 init_esbuild_shims();
 var TUI_ONLY_SETTINGS = /* @__PURE__ */ new Set([
   "general.vimMode",
@@ -30679,7 +31037,7 @@ function registerWorkspaceSettingsRoutes(app, deps) {
 }
 __name(registerWorkspaceSettingsRoutes, "registerWorkspaceSettingsRoutes");
 
-// packages/cli/src/serve/routes/a2uiAction.ts
+// packages/cli/src/serve/routes/a2ui-action.ts
 init_esbuild_shims();
 import * as fsp3 from "node:fs/promises";
 import * as path12 from "node:path";
@@ -30687,7 +31045,16 @@ var A2UI_MIME = "application/a2ui+json";
 var ACTION_TOOL = "action";
 var CALL_TIMEOUT_MS = 15e3;
 function usableServerConfig(cfg) {
-  return !!cfg && (typeof cfg.command === "string" || typeof cfg.httpUrl === "string");
+  if (!cfg) return false;
+  if (typeof cfg.httpUrl === "string") {
+    try {
+      const parsed = new URL(cfg.httpUrl);
+      return parsed.protocol === "http:" || parsed.protocol === "https:";
+    } catch {
+      return false;
+    }
+  }
+  return typeof cfg.command === "string" && cfg.command.trim().length > 0;
 }
 __name(usableServerConfig, "usableServerConfig");
 async function findFromSettingsFile(workspaceCwd) {
@@ -30816,7 +31183,7 @@ function registerA2uiActionRoutes(app, opts) {
 }
 __name(registerA2uiActionRoutes, "registerA2uiActionRoutes");
 
-// packages/cli/src/serve/rateLimit.ts
+// packages/cli/src/serve/rate-limit.ts
 init_esbuild_shims();
 var MAX_BUCKETS = 1e4;
 var GC_REQUEST_INTERVAL = 1e3;
@@ -31073,7 +31440,8 @@ function resolveBridgeFsFactory(input) {
   return createWorkspaceFileSystemFactory({
     boundWorkspace: input.boundWorkspace,
     trusted: input.trusted,
-    emit: input.emit ?? createDefaultFsAuditEmit()
+    emit: input.emit ?? createDefaultFsAuditEmit(),
+    ...input.customIgnoreFiles !== void 0 ? { customIgnoreFiles: input.customIgnoreFiles } : {}
   });
 }
 __name(resolveBridgeFsFactory, "resolveBridgeFsFactory");
@@ -31088,17 +31456,23 @@ var InvalidCursorError = class extends Error {
     this.name = "InvalidCursorError";
   }
 };
+function parseSessionCursor(cursor) {
+  if (cursor === "") return void 0;
+  const trimmed = cursor.trim();
+  const parsed = Number(trimmed);
+  if (trimmed === "" || !Number.isFinite(parsed) || parsed < 0 || parsed > Number.MAX_SAFE_INTEGER) {
+    throw new InvalidCursorError(cursor);
+  }
+  return parsed;
+}
+__name(parseSessionCursor, "parseSessionCursor");
 async function listWorkspaceSessionsForResponse(bridge, workspaceCwd, options) {
   const rawSize = options?.size;
   const requestedSize = typeof rawSize === "number" && Number.isSafeInteger(rawSize) ? rawSize : DEFAULT_SESSION_PAGE_SIZE;
   const pageSize = Math.min(Math.max(requestedSize, 1), MAX_SESSION_PAGE_SIZE);
   let numericCursor;
-  if (options?.cursor) {
-    const parsed = Number(options.cursor);
-    if (!Number.isFinite(parsed)) {
-      throw new InvalidCursorError(options.cursor);
-    }
-    numericCursor = parsed;
+  if (options?.cursor != null) {
+    numericCursor = parseSessionCursor(options.cursor);
   }
   const isFirstPage = numericCursor === void 0;
   const sessionService = new SessionService(workspaceCwd);
@@ -31673,6 +32047,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     boundWorkspace,
     contextFilename: deps.contextFilename ?? "QWEN.md",
     statusProvider: createDaemonStatusProvider(),
+    workspaceProvidersStatusProvider: createWorkspaceProvidersStatusProvider(),
     isChannelLive: /* @__PURE__ */ __name(() => bridge.isChannelLive(), "isChannelLive"),
     persistDisabledTools: deps.persistDisabledTools ?? (async () => {
       throw new Error(
@@ -31698,7 +32073,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
     extensionInstallQueue = next.catch(() => void 0);
     return next;
   }, "enqueueExtensionInstall");
-  const EXTENSION_MUTATION_TIMEOUT_MS = 12e4;
+  const EXTENSION_MUTATION_TIMEOUT_MS = 10 * 6e4;
   const EXTENSION_REFRESH_TIMEOUT_MS = 3e4;
   const isExtensionQueueFullError = /* @__PURE__ */ __name((err) => err instanceof Error && err.message === "Extension operation queue is full", "isExtensionQueueFullError");
   const sendExtensionQueueFull = /* @__PURE__ */ __name((res) => {
@@ -31832,14 +32207,56 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       (extension) => extension.installMetadata?.source?.toLowerCase() === requested
     );
   }, "findLoadedExtension");
+  const extensionOperations = /* @__PURE__ */ new Map();
+  const MAX_EXTENSION_OPERATION_HISTORY = 100;
+  const isTerminalExtensionOperation = /* @__PURE__ */ __name((operation) => operation.status !== "queued" && operation.status !== "running", "isTerminalExtensionOperation");
+  const redactExtensionOperationResult = /* @__PURE__ */ __name((event) => ({
+    ...event,
+    ...event.source ? { source: redactUrlCredentials(event.source) } : {}
+  }), "redactExtensionOperationResult");
+  const rememberExtensionOperation = /* @__PURE__ */ __name((operation) => {
+    extensionOperations.set(operation.operationId, operation);
+    while (extensionOperations.size > MAX_EXTENSION_OPERATION_HISTORY) {
+      let evicted = false;
+      for (const [id, storedOperation] of extensionOperations) {
+        if (!isTerminalExtensionOperation(storedOperation)) continue;
+        extensionOperations.delete(id);
+        evicted = true;
+        break;
+      }
+      if (!evicted) break;
+    }
+  }, "rememberExtensionOperation");
+  const updateExtensionOperation = /* @__PURE__ */ __name((operationId, patch) => {
+    const current = extensionOperations.get(operationId);
+    if (!current) return;
+    extensionOperations.set(operationId, {
+      ...current,
+      ...patch,
+      updatedAt: Date.now()
+    });
+  }, "updateExtensionOperation");
   const runQueuedExtensionMutation = /* @__PURE__ */ __name((operation, failureContext, res, run) => {
     if (extensionInstallQueueDepth >= MAX_EXTENSION_INSTALL_QUEUE_DEPTH) {
       sendExtensionQueueFull(res);
       return;
     }
-    res.status(202).json({ accepted: true });
+    const operationId = crypto.randomUUID();
+    const now = Date.now();
+    rememberExtensionOperation({
+      v: 1,
+      operationId,
+      operation,
+      status: "queued",
+      createdAt: now,
+      updatedAt: now,
+      ...failureContext.source ? { source: redactUrlCredentials(failureContext.source) } : {},
+      ...failureContext.name ? { name: failureContext.name } : {}
+    });
+    res.status(202).json({ accepted: true, operationId });
     void enqueueExtensionInstall(async () => {
       try {
+        updateExtensionOperation(operationId, { status: "running" });
         const extensionManager = createExtensionManager();
         await extensionManager.refreshCache();
         const event = await withExtensionTimeout(
@@ -31850,6 +32267,14 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
         extensionsStatusCache = void 0;
         try {
           const result = await bridge.refreshExtensionsForAllSessions(event);
+          updateExtensionOperation(operationId, {
+            status: "succeeded",
+            result: {
+              ...redactExtensionOperationResult(event),
+              refreshed: result.refreshed,
+              failed: result.failed
+            }
+          });
           writeStderrLine(
             `qwen serve: extensions ${operation}: refreshed ${result.refreshed} session(s), ${result.failed} failed`
           );
@@ -31857,6 +32282,15 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
           const message = redactUrlCredentials(
             refreshErr instanceof Error ? refreshErr.message : String(refreshErr)
           );
+          updateExtensionOperation(operationId, {
+            status: "succeeded_with_refresh_error",
+            result: {
+              ...redactExtensionOperationResult(event),
+              refreshed: 0,
+              failed: 1,
+              error: message.slice(0, 500)
+            }
+          });
           try {
             bridge.broadcastExtensionsChanged({
               ...event,
@@ -31877,6 +32311,10 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
         const message = redactUrlCredentials(
           err instanceof Error ? err.message : String(err)
         );
+        updateExtensionOperation(operationId, {
+          status: "failed",
+          error: message.slice(0, 500)
+        });
         try {
           bridge.broadcastExtensionsChanged({
             status: "failed",
@@ -31899,9 +32337,16 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
         }
       }
     }).catch((err) => {
+      const message = redactUrlCredentials(
+        err instanceof Error ? err.message : String(err)
+      );
+      updateExtensionOperation(operationId, {
+        status: "failed",
+        error: message.slice(0, 500)
+      });
       try {
         writeStderrLine(
-          `qwen serve: extensions ${operation}: queued task failed: ${err instanceof Error ? err.message : String(err)}`
+          `qwen serve: extensions ${operation}: queued task failed: ${message}`
         );
       } catch {
       }
@@ -32295,6 +32740,32 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       sendBridgeError(res, err, { route: "GET /workspace/extensions" });
     }
   });
+  app.get("/workspace/extensions/operations/:operationId", async (req, res) => {
+    try {
+      buildWorkspaceCtx(
+        req,
+        "GET /workspace/extensions/operations/:operationId"
+      );
+      const operationId = req.params["operationId"];
+      if (!operationId) {
+        res.status(400).json({ error: "Missing extension operation id" });
+        return;
+      }
+      const operation = extensionOperations.get(operationId);
+      if (!operation) {
+        res.status(404).json({
+          error: `Extension operation "${operationId}" not found`,
+          code: "extension_operation_not_found"
+        });
+        return;
+      }
+      res.status(200).json(operation);
+    } catch (err) {
+      sendBridgeError(res, err, {
+        route: "GET /workspace/extensions/operations/:operationId"
+      });
+    }
+  });
   app.post(
     "/workspace/extensions/install",
     mutate({ strict: true }),
@@ -32338,7 +32809,12 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
           res.status(400).json({ error: "`registry` must be a string" });
           return;
         }
-        const registryUrl = registry !== void 0 ? parseExtensionRegistryUrl(registry, res) : void 0;
+        const sourceValue = source;
+        const refValue = typeof ref === "string" ? ref : void 0;
+        const autoUpdateValue = typeof autoUpdate === "boolean" ? autoUpdate : void 0;
+        const allowPreReleaseValue = typeof allowPreRelease === "boolean" ? allowPreRelease : void 0;
+        const registryValue = typeof registry === "string" ? registry : void 0;
+        const registryUrl = registryValue !== void 0 ? parseExtensionRegistryUrl(registryValue, res) : void 0;
         if (registryUrl === null) return;
         if (consent !== true) {
           res.status(400).json({
@@ -32346,24 +32822,24 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
           });
           return;
         }
-        if (!validateExtensionSourceHost(source, res)) {
+        if (!validateExtensionSourceHost(sourceValue, res)) {
           return;
         }
         runQueuedExtensionMutation(
           "install",
-          { source },
+          { source: sourceValue },
           res,
           async (extensionManager) => {
-            const installMetadata = await parseInstallSource(source);
+            const installMetadata = await parseInstallSource(sourceValue);
             if (installMetadata.type !== "git" && installMetadata.type !== "github-release" && installMetadata.type !== "npm") {
               throw new Error(
                 "Only GitHub, Git, and npm extension installs are supported over the daemon endpoint."
               );
             }
-            if (installMetadata.type === "npm" && ref) {
+            if (installMetadata.type === "npm" && refValue) {
               throw new Error("--ref is not applicable for npm extensions.");
             }
-            if (installMetadata.type !== "npm" && registry) {
+            if (installMetadata.type !== "npm" && registryValue) {
               throw new Error(
                 "--registry is only applicable for npm extensions."
               );
@@ -32375,12 +32851,17 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
               installMetadata.registryUrl = registryUrl;
             }
             const extension = await extensionManager.installExtension(
-              { ...installMetadata, ref, autoUpdate, allowPreRelease },
+              {
+                ...installMetadata,
+                ref: refValue,
+                autoUpdate: autoUpdateValue,
+                allowPreRelease: allowPreReleaseValue
+              },
               () => Promise.resolve()
             );
             return {
               status: "installed",
-              source,
+              source: sourceValue,
               name: extension.name,
               version: extension.config.version
             };
@@ -33022,6 +33503,34 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       });
     }
   });
+  app.post("/session/:id/fork", mutate(), async (req, res) => {
+    const sessionId = requireSessionId(req, res);
+    if (sessionId === null) return;
+    const body = safeBody(req);
+    const directive = body["directive"];
+    if (typeof directive !== "string" || directive.trim().length === 0) {
+      res.status(400).json({
+        error: "`directive` is required and must be a non-empty string",
+        code: "missing_directive"
+      });
+      return;
+    }
+    const clientId = parseClientIdHeader(req, res);
+    if (clientId === null) return;
+    try {
+      const result = await bridge.launchSessionForkAgent(
+        sessionId,
+        directive,
+        clientId !== void 0 ? { clientId } : void 0
+      );
+      res.status(202).json(result);
+    } catch (err) {
+      sendBridgeError(res, err, {
+        route: "POST /session/:id/fork",
+        sessionId
+      });
+    }
+  });
   app.get("/session/:id/context", async (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (sessionId === null) return;
@@ -33086,6 +33595,18 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       });
     }
   });
+  app.get("/session/:id/lsp", async (req, res) => {
+    const sessionId = requireSessionId(req, res);
+    if (sessionId === null) return;
+    try {
+      res.status(200).json(await bridge.getSessionLspStatus(sessionId));
+    } catch (err) {
+      sendBridgeError(res, err, {
+        route: "GET /session/:id/lsp",
+        sessionId
+      });
+    }
+  });
   app.get("/session/:id/hooks", async (req, res) => {
     const sessionId = requireSessionId(req, res);
     if (sessionId === null) return;
@@ -33708,7 +34229,7 @@ function createServeApp(opts, getPort = () => opts.port, deps = {}) {
       try {
         const response = await bridge.rewindSession(
           sessionId,
-          { promptId },
+          { promptId, rewindFiles: body["rewindFiles"] !== false },
           clientId !== void 0 ? { clientId } : void 0
         );
         res.status(200).json(response);
@@ -34966,12 +35487,12 @@ function errorPayload(err) {
 }
 __name(errorPayload, "errorPayload");
 
-// packages/cli/src/serve/runQwenServe.ts
+// packages/cli/src/serve/run-qwen-serve.ts
 init_esbuild_shims();
 import * as fs6 from "node:fs";
 import * as path14 from "node:path";
 
-// packages/cli/src/serve/permissionAudit.ts
+// packages/cli/src/serve/permission-audit.ts
 init_esbuild_shims();
 var DEFAULT_PERMISSION_AUDIT_RING_SIZE = 512;
 function takeLast(arr, limit, methodName) {
@@ -35088,7 +35609,7 @@ function createPermissionAuditPublisher(deps) {
 }
 __name(createPermissionAuditPublisher, "createPermissionAuditPublisher");
 
-// packages/cli/src/serve/daemonLogger.ts
+// packages/cli/src/serve/daemon-logger.ts
 init_esbuild_shims();
 import * as nodeFs from "node:fs";
 import * as nodePath from "node:path";
@@ -35228,7 +35749,7 @@ function initDaemonLogger(opts) {
 }
 __name(initDaemonLogger, "initDaemonLogger");
 
-// packages/cli/src/serve/runQwenServe.ts
+// packages/cli/src/serve/run-qwen-serve.ts
 var QWEN_SERVER_TOKEN_ENV = "QWEN_SERVER_TOKEN";
 var QWEN_SERVE_PROMPT_DEADLINE_MS_ENV = "QWEN_SERVE_PROMPT_DEADLINE_MS";
 var QWEN_SERVE_WRITER_IDLE_TIMEOUT_MS_ENV = "QWEN_SERVE_WRITER_IDLE_TIMEOUT_MS";
@@ -35612,15 +36133,18 @@ async function runQwenServe(optsIn, deps = {}) {
     ring: permissionAuditRing
   });
   const trustedWorkspace = deps.trustedWorkspace ?? true;
+  const customIgnoreFiles = bootSettings?.merged.context?.fileFiltering?.customIgnoreFiles;
   const fsFactory = resolveBridgeFsFactory({
     boundWorkspace,
     injected: deps.fsFactory,
     trusted: trustedWorkspace,
-    emit: deps.fsAuditEmit
+    emit: deps.fsAuditEmit,
+    ...customIgnoreFiles !== void 0 ? { customIgnoreFiles } : {}
   });
   const diagnosticSink = /* @__PURE__ */ __name((line, level) => daemonLog.raw(line, level), "diagnosticSink");
   const channelFactory = createSpawnChannelFactory({
-    onDiagnosticLine: diagnosticSink
+    onDiagnosticLine: diagnosticSink,
+    ...opts.experimentalLsp === true ? { extraArgs: ["--experimental-lsp"] } : {}
   });
   const persistDisabledToolsFn = /* @__PURE__ */ __name((workspace, toolName, enabled) => withSettingsLock(workspace, async () => {
     const fresh = loadSettings(workspace);
@@ -35637,6 +36161,7 @@ async function runQwenServe(optsIn, deps = {}) {
     );
   }), "persistDisabledToolsFn");
   const statusProvider = createDaemonStatusProvider();
+  const workspaceProvidersStatusProvider = createWorkspaceProvidersStatusProvider();
   const bridge = deps.bridge ?? createAcpSessionBridge({
     maxSessions: opts.maxSessions,
     ...opts.maxPendingPromptsPerSession !== void 0 ? { maxPendingPromptsPerSession: opts.maxPendingPromptsPerSession } : {},
@@ -35695,6 +36220,7 @@ async function runQwenServe(optsIn, deps = {}) {
     contextFilename: contextFilenameForInit ?? "QWEN.md",
     // Daemon-host status provider for env + preflight cells.
     statusProvider,
+    workspaceProvidersStatusProvider,
     // Channel liveness check — proxied through the bridge's live-channel
     // probe (not session count: a channel can be live with zero attached
     // sessions during the cold-spawn window).
@@ -35961,7 +36487,7 @@ async function runQwenServe(optsIn, deps = {}) {
 }
 __name(runQwenServe, "runQwenServe");
 
-// packages/cli/src/serve/inMemoryChannel.ts
+// packages/cli/src/serve/in-memory-channel.ts
 init_esbuild_shims();
 export {
   ACP_PREFLIGHT_KINDS,