@qwen-code/qwen-code 0.22.0 → 0.22.1

package/chunks/{chunk-WS7PAXXR.js → chunk-KWFP3WV6.js}

@@ -7,32 +7,33 @@ import {
   jsonStringPayloadByteLength,
   observeAcpToolResultProjection,
   truncateJsonStringPayload
-} from "./chunk-MQP3MHWN.js";
+} from "./chunk-HJOWQUE2.js";
 import {
   normalizeSessionIdForLookup
-} from "./chunk-TQOF5KBL.js";
+} from "./chunk-ZEZKIS2K.js";
 import {
   isA2uiToolMeta
-} from "./chunk-X7V3N6YH.js";
+} from "./chunk-I6YW3T3W.js";
 import {
   ChannelDeliveryError,
   MAX_CHANNEL_DELIVERY_TEXT_LENGTH
-} from "./chunk-ND7NOI4P.js";
+} from "./chunk-7CWEZQ6T.js";
 import {
   redactLogCredentials
 } from "./chunk-M5GB774H.js";
 import {
   getResponseText,
+  lastHistoryContentFromRecords,
   restorableAskUserQuestionCallIds
-} from "./chunk-T6XLJRQY.js";
+} from "./chunk-XYX474JQ.js";
 import {
   MAX_CHANNEL_DELIVERY_NAME_LENGTH,
   MAX_CHANNEL_DELIVERY_TARGET_ID_LENGTH
-} from "./chunk-AZF6SME3.js";
+} from "./chunk-JECO75XD.js";
 import {
   parseGoalSnapshotV2,
   parseGoalStateCause
-} from "./chunk-LDGWX737.js";
+} from "./chunk-FN5C6C7G.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -929,22 +930,26 @@ async function collectHistoryReplayUpdates({
   replayState,
   goalBootstrap,
   limits,
-  suppressRestoreAskUserQuestion
+  suppressRestoreAskUserQuestion,
+  finalizeDangling
 }) {
   const updates = [];
   try {
     const initial = parseTranscriptReplayState(replayState, logger);
-    const replayClient = config?.getGeminiClient?.();
-    const skipFinalizeCallIds = suppressRestoreAskUserQuestion !== true && config?.getRestoreAskUserQuestion?.() === true && replayClient?.isInitialized?.() === true ? restorableAskUserQuestionCallIds(
-      replayClient.getChat().peekLastHistoryEntry()
-    ) : void 0;
+    let skipFinalizeCallIds;
+    if (suppressRestoreAskUserQuestion !== true && config?.getRestoreAskUserQuestion?.() === true) {
+      const replayClient = config.getGeminiClient?.();
+      const lastHistoryContent = replayClient?.isInitialized?.() === true ? replayClient.getChat?.()?.peekLastHistoryEntry?.() ?? lastHistoryContentFromRecords(records) : lastHistoryContentFromRecords(records);
+      skipFinalizeCallIds = restorableAskUserQuestionCallIds(lastHistoryContent);
+    }
     await new HistoryReplayer(
       replayContext(sessionId, updates, cumulativeUsage, config, limits)
     ).replay(records, gaps, {
       ...initial.goalState ? { initialGoalState: initial.goalState } : {},
       ...initial.goalCause ? { initialGoalCause: initial.goalCause } : {},
       ...goalBootstrap ? { goalBootstrap } : {},
-      ...skipFinalizeCallIds ? { skipFinalizeCallIds } : {}
+      ...skipFinalizeCallIds ? { skipFinalizeCallIds } : {},
+      ...finalizeDangling === void 0 ? {} : { finalizeDangling }
     });
   } catch (error) {
     if (error instanceof HistoryReplayLimitError) throw error;

package/chunks/{chunk-A5F63FEW.js → chunk-L436XFLJ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-OE52YHCZ.js";
+} from "./chunk-W2WRNJKX.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-KIVGVFMM.js → chunk-LI2HEMKO.js}

@@ -2,20 +2,20 @@
 "use strict";
 import {
   functionResponsePartsToString
-} from "./chunk-PXOJLJ5W.js";
+} from "./chunk-2YEZNBSD.js";
 import {
   observeHeadlessToolResultProjection,
   observeHeadlessToolResultWire,
   projectJsonStringToByteBudget
-} from "./chunk-MQP3MHWN.js";
+} from "./chunk-HJOWQUE2.js";
 import {
   parseAndFormatApiError,
   toolResultBoundaryArtifact
-} from "./chunk-T6XLJRQY.js";
+} from "./chunk-XYX474JQ.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-FDD2IUEL.js";
+} from "./chunk-UX3IFLJM.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -959,6 +959,14 @@ function checkResponsePartsForError(responseParts) {
   return void 0;
 }
 __name(checkResponsePartsForError, "checkResponsePartsForError");
+function mcpAppFallbackText(display) {
+  if (!display || typeof display !== "object" || !("type" in display) || display.type !== "mcp_app" || !("fallbackText" in display) || typeof display.fallbackText !== "string") {
+    return void 0;
+  }
+  const text = display.fallbackText.trim();
+  return text.length > 0 ? display.fallbackText : void 0;
+}
+__name(mcpAppFallbackText, "mcpAppFallbackText");
 function toolResultContent(response) {
   if (response.visionBridgeNotice) {
     const content = toolResultContent({
@@ -994,6 +1002,10 @@ ${functionResponsePartsToString(response.responseParts)}`;
   if (response.error) {
     return response.error.message;
   }
+  const mcpAppFallback = mcpAppFallbackText(response.resultDisplay);
+  if (mcpAppFallback) {
+    return mcpAppFallback;
+  }
   if (typeof response.resultDisplay === "string" && response.resultDisplay.trim().length > 0) {
     return response.resultDisplay;
   }

package/chunks/{chunk-GIWB5QLV.js → chunk-LJP2BBMK.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   isCommandAvailable
-} from "./chunk-FEMQ6Y7W.js";
+} from "./chunk-T6OODF2U.js";
 import {
   fileExists,
   isWithinRoot
-} from "./chunk-IWOWEENB.js";
+} from "./chunk-WBT3STGU.js";
 import {
   atomicWriteJSON
-} from "./chunk-HDKCKCYO.js";
+} from "./chunk-7QGEJI7M.js";
 import {
   Storage,
   createDebugLogger,
   isNodeError
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-2NNTE2ED.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{create-sub-session-XBCVGNFU.js → chunk-LRKMQPMD.js}

@@ -8,9 +8,7 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6NFAEG54.js";
-import "./chunk-A5F2YNO6.js";
-import "./chunk-TBWQLLFO.js";
+} from "./chunk-KOJ6MHD5.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -127,7 +125,7 @@ var CreateSubSessionTool = class _CreateSubSessionTool extends BaseDeclarativeTo
     super(
       _CreateSubSessionTool.Name,
       ToolDisplayNames.CREATE_SUB_SESSION,
-      "Spawn a fresh, independent sub-session (its own clean context and transcript) and run a prompt in it. Use to fan work out into a separate session \u2014 e.g. a self-contained sub-task you want isolated from this conversation.\n\nONLY available when running under `qwen serve` (daemon mode); it is inert in a plain interactive session.\n\n## Completion modes\n- `first-turn` (default): waits for the sub-session's first turn to finish and returns its result to you. Use when you need the answer back.\n- `sent`: returns immediately after dispatching the prompt, without waiting. Use for fire-and-forget launches whose output you do not need inline.\n\nThe sub-session runs the prompt with full tool access, starting from zero context \u2014 brief it completely in `prompt` (it cannot see this conversation).",
+      "Spawn a fresh, independent sub-session (its own clean context and transcript) and run a prompt in it. Use to fan work out into a separate session \u2014 e.g. a self-contained sub-task you want isolated from this conversation.\n\nONLY available when running under `qwen serve` (daemon mode); it is not declared at all in plain interactive or headless sessions.\n\n## Completion modes\n- `first-turn` (default): waits for the sub-session's first turn to finish and returns its result to you. Use when you need the answer back.\n- `sent`: returns immediately after dispatching the prompt, without waiting. Use for fire-and-forget launches whose output you do not need inline.\n\nThe sub-session runs the prompt with full tool access, starting from zero context \u2014 brief it completely in `prompt` (it cannot see this conversation).",
       "other" /* Other */,
       {
         type: "object",
@@ -198,9 +196,9 @@ var CreateSubSessionTool = class _CreateSubSessionTool extends BaseDeclarativeTo
     };
   }
 };
+
 export {
-  CreateSubSessionTool,
-  MAX_SUB_SESSION_PROMPT_CHARS
+  CreateSubSessionTool
 };
 /**
  * @license

package/chunks/{chunk-6UQSU7CQ.js → chunk-MDZO5V2O.js}

@@ -1,24 +1,13 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  getSettingsSchema
-} from "./chunk-7DMTAQJ6.js";
 import {
   DEFAULT_DARK_THEME_NAME,
   DEFAULT_LIGHT_THEME_NAME
 } from "./chunk-RKUWKYED.js";
 import {
-  t
-} from "./chunk-OE52YHCZ.js";
-import {
-  SUPPORTED_LANGUAGES,
-  getLanguageNameFromLocale
-} from "./chunk-5EJZE3FP.js";
-import {
-  getHomeEnvFallbackVars,
-  loadEnvironment,
-  preResolveHomeEnvOverrides
-} from "./chunk-OVH5Y7KS.js";
+  customDeepMerge,
+  getSettingsSchema
+} from "./chunk-BDHLBR46.js";
 import {
   CONSOLIDATED_DISABLE_KEYS,
   V1_INDICATOR_KEYS,
@@ -31,26 +20,38 @@ import {
   getSystemDefaultsPath,
   getSystemSettingsPath
 } from "./chunk-IDS7MSUP.js";
+import {
+  t
+} from "./chunk-W2WRNJKX.js";
+import {
+  SUPPORTED_LANGUAGES,
+  getLanguageNameFromLocale
+} from "./chunk-5EJZE3FP.js";
+import {
+  getHomeEnvFallbackVars,
+  loadEnvironment,
+  preResolveHomeEnvOverrides
+} from "./chunk-2CRNTW2B.js";
 import {
   ENV_CORRUPTED_PATH,
   ENV_WAS_RECOVERED
-} from "./chunk-CXJHQVEK.js";
+} from "./chunk-5PA6UEYA.js";
 import {
   isWorkspaceTrusted,
   updateSettingsFilePreservingFormat
-} from "./chunk-L4HVF7LM.js";
+} from "./chunk-XNXWEGKB.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
 import {
   stripRuntimeSnapshotPrefix
-} from "./chunk-7DYNJFES.js";
+} from "./chunk-AYVIGUUK.js";
 import {
   FatalConfigError,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-2NNTE2ED.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -104,11 +105,11 @@ function getOwnKeyScope(settings, key) {
 }
 __name(getOwnKeyScope, "getOwnKeyScope");
 
-// packages/cli/src/utils/settingsUtils.ts
+// packages/cli/src/config/settingsUtils.ts
 init_esbuild_shims();
 import * as fs2 from "node:fs";
 
-// packages/cli/src/utils/languageUtils.ts
+// packages/cli/src/i18n/languageUtils.ts
 init_esbuild_shims();
 import * as fs from "node:fs";
 import * as path from "node:path";
@@ -287,7 +288,7 @@ function initializeLlmOutputLanguage(outputLanguage) {
 }
 __name(initializeLlmOutputLanguage, "initializeLlmOutputLanguage");
 
-// packages/cli/src/utils/settingsUtils.ts
+// packages/cli/src/config/settingsUtils.ts
 function flattenSchema(schema, prefix = "") {
   let result = {};
   for (const key in schema) {
@@ -432,8 +433,16 @@ function validateSettingValue(def, value) {
   return void 0;
 }
 __name(validateSettingValue, "validateSettingValue");
-function getDialogSettingKeys() {
-  const dialogSettings = Object.values(getFlattenedSchema()).filter((definition) => definition.showInDialog === true).map((definition) => definition.key);
+var WORKSPACE_RESTRICTED_SETTINGS = [
+  { section: "tools", key: "workflowsEnabled" },
+  { section: "security", key: "allowPrivateNetworkHooks" },
+  { section: "security", key: "allowedInsecureVoiceBaseUrls" }
+];
+var WORKSPACE_RESTRICTED_SETTING_KEYS = WORKSPACE_RESTRICTED_SETTINGS.map(({ section, key }) => `${section}.${key}`);
+function getDialogSettingKeys(options) {
+  const dialogSettings = Object.values(getFlattenedSchema()).filter((definition) => definition.showInDialog === true).map((definition) => definition.key).filter(
+    (key) => !options?.excludeWorkspaceRestricted || !WORKSPACE_RESTRICTED_SETTING_KEYS.includes(key)
+  );
   return dialogSettings.sort((a, b) => {
     const indexA = SETTINGS_DIALOG_ORDER.indexOf(a);
     const indexB = SETTINGS_DIALOG_ORDER.indexOf(b);
@@ -628,66 +637,6 @@ function cleanupSettingsBackup(filePath) {
 }
 __name(cleanupSettingsBackup, "cleanupSettingsBackup");
 
-// packages/cli/src/utils/deepMerge.ts
-init_esbuild_shims();
-function isPlainObject(item) {
-  return !!item && typeof item === "object" && !Array.isArray(item);
-}
-__name(isPlainObject, "isPlainObject");
-function mergeRecursively(target, source, getMergeStrategyForPath2, path3 = []) {
-  for (const key of Object.keys(source)) {
-    if (key === "__proto__" || key === "constructor" || key === "prototype") {
-      continue;
-    }
-    const newPath = [...path3, key];
-    const srcValue = source[key];
-    const objValue = target[key];
-    const mergeStrategy = getMergeStrategyForPath2(newPath);
-    if (mergeStrategy === "shallow_merge" /* SHALLOW_MERGE */ && objValue && srcValue) {
-      const obj1 = typeof objValue === "object" && objValue !== null ? objValue : {};
-      const obj2 = typeof srcValue === "object" && srcValue !== null ? srcValue : {};
-      target[key] = { ...obj1, ...obj2 };
-      continue;
-    }
-    if (Array.isArray(objValue)) {
-      const srcArray = Array.isArray(srcValue) ? srcValue : [srcValue];
-      if (mergeStrategy === "concat" /* CONCAT */) {
-        target[key] = objValue.concat(srcArray);
-        continue;
-      }
-      if (mergeStrategy === "union" /* UNION */) {
-        target[key] = [...new Set(objValue.concat(srcArray))];
-        continue;
-      }
-    }
-    if (isPlainObject(objValue) && isPlainObject(srcValue)) {
-      mergeRecursively(objValue, srcValue, getMergeStrategyForPath2, newPath);
-    } else if (isPlainObject(srcValue)) {
-      target[key] = {};
-      mergeRecursively(
-        target[key],
-        srcValue,
-        getMergeStrategyForPath2,
-        newPath
-      );
-    } else {
-      target[key] = srcValue;
-    }
-  }
-  return target;
-}
-__name(mergeRecursively, "mergeRecursively");
-function customDeepMerge(getMergeStrategyForPath2, ...sources) {
-  const result = {};
-  for (const source of sources) {
-    if (source) {
-      mergeRecursively(result, source, getMergeStrategyForPath2);
-    }
-  }
-  return result;
-}
-__name(customDeepMerge, "customDeepMerge");
-
 // packages/cli/src/config/migration/index.ts
 init_esbuild_shims();
 
@@ -1337,12 +1286,12 @@ function getSettingsFileKeyWarnings(settings, settingsFilePath) {
   return warnings;
 }
 __name(getSettingsFileKeyWarnings, "getSettingsFileKeyWarnings");
-function isPlainObject2(value) {
+function isPlainObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-__name(isPlainObject2, "isPlainObject");
+__name(isPlainObject, "isPlainObject");
 function hasAnyProviderEntries(modelProviders) {
-  if (!isPlainObject2(modelProviders)) {
+  if (!isPlainObject(modelProviders)) {
     return false;
   }
   return Object.values(modelProviders).some(
@@ -1361,7 +1310,7 @@ function getModelProvidersOverrideWarnings(loadedSettings) {
   }
   const userModelProviders = userOriginal["modelProviders"];
   const workspaceModelProviders = workspaceOriginal["modelProviders"];
-  const workspaceIsEmptyModelProviders = isPlainObject2(workspaceModelProviders) && Object.keys(workspaceModelProviders).length === 0;
+  const workspaceIsEmptyModelProviders = isPlainObject(workspaceModelProviders) && Object.keys(workspaceModelProviders).length === 0;
   if (!workspaceIsEmptyModelProviders || !hasAnyProviderEntries(userModelProviders)) {
     return [];
   }
@@ -1392,15 +1341,14 @@ function getSettingsWarnings(loadedSettings) {
     warningSet.add(warning);
   }
   const workspaceFile = loadedSettings.forScope("Workspace" /* Workspace */);
-  if (workspaceFile.rawJson !== void 0 && workspaceFile.originalSettings.security?.allowPrivateNetworkHooks !== void 0) {
-    warningSet.add(
-      `Warning: security.allowPrivateNetworkHooks in workspace settings (${workspaceFile.path}) is ignored. This setting is only honored from User, System, or SystemDefaults scope settings.`
-    );
-  }
-  if (workspaceFile.rawJson !== void 0 && workspaceFile.originalSettings.security?.allowedInsecureVoiceBaseUrls !== void 0) {
-    warningSet.add(
-      `Warning: security.allowedInsecureVoiceBaseUrls in workspace settings (${workspaceFile.path}) is ignored. This setting is only honored from User, System, or SystemDefaults scope settings.`
-    );
+  if (workspaceFile.rawJson !== void 0) {
+    for (const { section, key } of WORKSPACE_RESTRICTED_SETTINGS) {
+      const sectionValue = workspaceFile.originalSettings[section];
+      if (sectionValue?.[key] === void 0) continue;
+      warningSet.add(
+        `Warning: ${section}.${key} in workspace settings (${workspaceFile.path}) is ignored. This setting is only honored from User, System, or SystemDefaults scope settings.`
+      );
+    }
   }
   return [...warningSet];
 }
@@ -1417,20 +1365,22 @@ function tagMcpServerScope(settings, scope) {
   return { ...settings, mcpServers: tagged };
 }
 __name(tagMcpServerScope, "tagMcpServerScope");
-function stripWorkspaceSecurityBypasses(settings) {
-  if (settings.security?.allowPrivateNetworkHooks === void 0 && settings.security?.allowedInsecureVoiceBaseUrls === void 0) {
-    return settings;
+function stripWorkspaceRestrictedSettings(settings) {
+  let stripped;
+  for (const { section, key } of WORKSPACE_RESTRICTED_SETTINGS) {
+    const source = (stripped ?? settings)[section];
+    if (source?.[key] === void 0) continue;
+    const { [key]: _restricted, ...rest } = source;
+    stripped = { ...stripped ?? settings, [section]: rest };
   }
-  const {
-    allowPrivateNetworkHooks: _privateHooks,
-    allowedInsecureVoiceBaseUrls: _insecureVoice,
-    ...restSecurity
-  } = settings.security;
-  return { ...settings, security: restSecurity };
+  return stripped ?? settings;
 }
-__name(stripWorkspaceSecurityBypasses, "stripWorkspaceSecurityBypasses");
+__name(stripWorkspaceRestrictedSettings, "stripWorkspaceRestrictedSettings");
 function mergeSettings(system, systemDefaults, user, workspace, isTrusted) {
-  const safeWorkspace = isTrusted ? tagMcpServerScope(stripWorkspaceSecurityBypasses(workspace), "workspace") : {};
+  const safeWorkspace = isTrusted ? tagMcpServerScope(
+    stripWorkspaceRestrictedSettings(workspace),
+    "workspace"
+  ) : {};
   return customDeepMerge(
     getMergeStrategyForPath,
     {},
@@ -1953,6 +1903,7 @@ export {
   getEffectiveValue,
   getAllSettingKeys,
   validateSettingValue,
+  WORKSPACE_RESTRICTED_SETTING_KEYS,
   getDialogSettingKeys,
   settingExistsInScope,
   setPendingSettingValue,

package/chunks/{chunk-AO4M6NMD.js → chunk-MW5AHWOZ.js}

@@ -2,37 +2,37 @@
 "use strict";
 import {
   loadSettings
-} from "./chunk-6UQSU7CQ.js";
+} from "./chunk-MDZO5V2O.js";
 import {
   getCurrentLanguage
-} from "./chunk-OE52YHCZ.js";
+} from "./chunk-W2WRNJKX.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-L4HVF7LM.js";
+} from "./chunk-XNXWEGKB.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
 import {
-  hashMcpServerConfig,
-  runWithTimeout
-} from "./chunk-62JOGZL5.js";
+  hashMcpServerConfig
+} from "./chunk-VMDURMFY.js";
 import {
-  Client,
   Config,
   ExtensionManager,
   FileDiscoveryService,
   MCPOAuthTokenStorage,
+  createMcpClient,
   createTransport,
   isGatedMcpScope,
-  normalizeClaudeMcpServer
-} from "./chunk-T6XLJRQY.js";
+  normalizeClaudeMcpServer,
+  runWithTimeout
+} from "./chunk-XYX474JQ.js";
 import {
   atomicWriteFile
-} from "./chunk-HDKCKCYO.js";
+} from "./chunk-7QGEJI7M.js";
 import {
   Storage,
   getErrorMessage
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-2NNTE2ED.js";
 import {
   writeStderrLine,
   writeStdoutLine
@@ -423,6 +423,7 @@ __name(assembleMcpServers, "assembleMcpServers");
 // packages/cli/src/config/mcpApprovals.ts
 init_esbuild_shims();
 import * as fs2 from "node:fs";
+import * as os from "node:os";
 import * as path2 from "node:path";
 var import_strip_json_comments2 = __toESM(require_strip_json_comments(), 1);
 var MCP_APPROVALS_FILENAME = "mcpApprovals.json";
@@ -434,9 +435,50 @@ function getMcpApprovalsPath() {
 }
 __name(getMcpApprovalsPath, "getMcpApprovalsPath");
 function normalizeProjectRoot(projectRoot) {
-  return path2.resolve(projectRoot);
+  const resolved = path2.resolve(projectRoot);
+  return os.platform() === "win32" ? resolved.toLowerCase() : resolved;
 }
 __name(normalizeProjectRoot, "normalizeProjectRoot");
+function isApprovalRecordMap(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+__name(isApprovalRecordMap, "isApprovalRecordMap");
+function isWin32AbsolutePath(p) {
+  return /^[A-Za-z]:[\\/]/.test(p) || /^\\\\/.test(p);
+}
+__name(isWin32AbsolutePath, "isWin32AbsolutePath");
+function mergeApprovalRecords(existing, incoming) {
+  const merged = Object.assign(
+    /* @__PURE__ */ Object.create(null),
+    existing
+  );
+  for (const [name, record] of Object.entries(incoming)) {
+    if (!isApprovalRecordMap(record)) {
+      continue;
+    }
+    const current = merged[name];
+    if (!current) {
+      merged[name] = record;
+    } else if (current.status !== record.status) {
+      merged[name] = current.status === "rejected" ? current : record;
+    }
+  }
+  return merged;
+}
+__name(mergeApprovalRecords, "mergeApprovalRecords");
+function normalizeStoredProjectKeys(config) {
+  if (os.platform() !== "win32") {
+    return config;
+  }
+  const normalized = /* @__PURE__ */ Object.create(null);
+  for (const [key, value] of Object.entries(config)) {
+    const projectKey = isWin32AbsolutePath(key) ? key.toLowerCase() : key;
+    const existing = normalized[projectKey];
+    normalized[projectKey] = isApprovalRecordMap(existing) && isApprovalRecordMap(value) ? mergeApprovalRecords(existing, value) : isApprovalRecordMap(value) || !isApprovalRecordMap(existing) ? value : existing;
+  }
+  return normalized;
+}
+__name(normalizeStoredProjectKeys, "normalizeStoredProjectKeys");
 var LoadedMcpApprovals = class {
   constructor(file, errors) {
     this.file = file;
@@ -465,7 +507,9 @@ var LoadedMcpApprovals = class {
   async setState(projectRoot, serverName, config, status) {
     const root = normalizeProjectRoot(projectRoot);
     const existing = this.file.config[root];
-    const project = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : /* @__PURE__ */ Object.create(null);
+    const project = isApprovalRecordMap(
+      existing
+    ) ? existing : /* @__PURE__ */ Object.create(null);
     Object.defineProperty(project, serverName, {
       value: { hash: hashMcpServerConfig(config), status },
       enumerable: true,
@@ -494,7 +538,7 @@ function loadMcpApprovals() {
           path: filePath
         });
       } else {
-        config = parsed;
+        config = normalizeStoredProjectKeys(parsed);
       }
     }
   } catch (error) {
@@ -559,7 +603,7 @@ var COLOR_GREEN = "\x1B[32m";
 var COLOR_YELLOW = "\x1B[33m";
 var COLOR_RED = "\x1B[31m";
 var RESET_COLOR = "\x1B[0m";
-var MCP_CONNECT_TIMEOUT_MS = 5e3;
+var MCP_CONNECT_TIMEOUT_MS = 1e4;
 async function getMcpServersFromConfig() {
   const settings = loadSettings();
   const extensionManager = new ExtensionManager({
@@ -592,10 +636,7 @@ async function getMcpServersFromConfig() {
 }
 __name(getMcpServersFromConfig, "getMcpServersFromConfig");
 async function testMCPConnection(serverName, config) {
-  const client = new Client({
-    name: "mcp-test-client",
-    version: "0.0.1"
-  });
+  const client = createMcpClient("mcp-test-client", config);
   let transport;
   try {
     transport = await createTransport(serverName, config, false);
@@ -609,7 +650,6 @@ async function testMCPConnection(serverName, config) {
       MCP_CONNECT_TIMEOUT_MS,
       `MCP connection for ${serverName}`
     );
-    await client.ping();
     await client.close();
     return { status: "connected" /* CONNECTED */, timedOut: false };
   } catch (error) {