@funnycode/myclaude 0.1.166 → 0.1.167

package/dist/myclaude.js

@@ -4,8 +4,8 @@
 // MACRO - build-time constants (injected by build.ts)
 // MACRO injected by build script
 globalThis.MACRO = {
-  VERSION: "0.1.166",
-  BUILD_TIME: "2026-07-31T04:45:19.156Z",
+  VERSION: "0.1.167",
+  BUILD_TIME: "2026-07-31T15:47:37.502Z",
   PACKAGE_URL: "@funnycode/myclaude",
   NATIVE_PACKAGE_URL: "@funnycode/myclaude",
   VERSION_CHANGELOG: '',
@@ -61328,30 +61328,6 @@ function updateSettingsForSource(source, settings) {
   }
   return { error: null };
 }
-function deleteSettingsField(source, field) {
-  if (source === "policySettings" || source === "flagSettings") {
-    return { error: null };
-  }
-  const filePath = getSettingsFilePathForSource(source);
-  if (!filePath) {
-    return { error: null };
-  }
-  try {
-    getFsImplementation().mkdirSync(dirname13(filePath));
-    let existingSettings = getSettingsForSourceUncached(source);
-    if (!existingSettings) {
-      return { error: null };
-    }
-    delete existingSettings[field];
-    writeFileSyncAndFlush_DEPRECATED(filePath, jsonStringify(existingSettings));
-    resetSettingsCache();
-    return { error: null };
-  } catch (e) {
-    const error49 = new Error(`Failed to delete field ${field} from settings source ${source}: ${e}`);
-    logError2(error49);
-    return { error: error49 };
-  }
-}
 function mergeArrays(targetArray, sourceArray) {
   return uniq([...targetArray, ...sourceArray]);
 }
@@ -119971,7 +119947,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@funnycode/myclaude",
-    version: "0.1.166",
+    version: "0.1.167",
     private: false,
     description: "An open-source AI coding assistant in your terminal - powered by Claude",
     license: "MIT",
@@ -275761,7 +275737,12 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   function resolve26(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-    const resolved = resolveComponent(parse9(baseURI, schemelessOptions), parse9(relativeURI, schemelessOptions), schemelessOptions, true);
+    const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
+    const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
+    if (baseMalformed || relativeMalformed) {
+      throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
+    }
+    const resolved = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
     schemelessOptions.skipEscape = true;
     return serialize2(resolved, schemelessOptions);
   }
@@ -275888,6 +275869,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
   var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
+  var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
   function getParseError2(parsed, matches) {
     if (matches[2] !== undefined && parsed.path && parsed.path[0] !== "/") {
       return 'URI path must start with "/" when authority is present.';
@@ -275922,6 +275904,20 @@ var require_fast_uri = __commonJS((exports, module) => {
       parsed.error = "URI authority must not contain a literal backslash.";
       malformedAuthorityOrPort = true;
     }
+    const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
+    if (introducerMatch !== null) {
+      const region = introducerMatch[1];
+      const normalizedRegion = region.replace(/[\t\n\r]/g, "");
+      if (normalizedRegion.length >= 2) {
+        if (normalizedRegion.slice(0, 2) !== "//") {
+          parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
+          malformedAuthorityOrPort = true;
+        } else if (region.length !== normalizedRegion.length) {
+          parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
+          malformedAuthorityOrPort = true;
+        }
+      }
+    }
     const matches = uri.match(URI_PARSE);
     if (matches) {
       parsed.scheme = matches[1];
@@ -410155,20 +410151,32 @@ function isInputModeCharacter(input) {
 import { join as join105 } from "path";
 function getDirectoryFingerprint(dirPath) {
   const fs13 = getFsImplementation();
-  const entries = fs13.readdirStringSync(dirPath);
+  let entries;
+  try {
+    entries = fs13.readdirStringSync(dirPath);
+  } catch {
+    return "";
+  }
   const sortedEntries = entries.sort();
   const fingerprintParts = [];
   for (const entry of sortedEntries) {
     const fullPath = join105(dirPath, entry);
-    const stat37 = fs13.statSync(fullPath);
-    if (stat37.isDirectory()) {
-      if (entry === "node_modules" || entry === ".git" || entry === "dist" || entry === "build" || entry === ".next" || entry === "out" || entry === "coverage") {
+    try {
+      const lstat7 = fs13.lstatSync(fullPath);
+      if (lstat7.isSymbolicLink()) {
         continue;
       }
-      fingerprintParts.push(entry + "/");
-      fingerprintParts.push(getDirectoryFingerprint(fullPath));
-    } else {
-      fingerprintParts.push(entry);
+      if (lstat7.isDirectory()) {
+        if (entry === "node_modules" || entry === ".git" || entry === "dist" || entry === "build" || entry === ".next" || entry === "out" || entry === "coverage") {
+          continue;
+        }
+        fingerprintParts.push(entry + "/");
+        fingerprintParts.push(getDirectoryFingerprint(fullPath));
+      } else {
+        fingerprintParts.push(entry);
+      }
+    } catch {
+      continue;
     }
   }
   return fingerprintParts.join(`
@@ -410178,6 +410186,7 @@ function clearCachedSteps() {
   cachedSteps = null;
   cachedClaudeMdMtime = -1;
   cachedDirFingerprint = "";
+  cachedRootMtime = -1;
   cachedAt = null;
 }
 function isCacheValid() {
@@ -410194,9 +410203,10 @@ function isCacheValid() {
     return false;
   }
   try {
-    const currentFingerprint = getDirectoryFingerprint(cwd2);
-    if (currentFingerprint !== cachedDirFingerprint)
+    const currentRootMtime = Math.floor(fs13.statSync(cwd2).mtimeMs);
+    if (currentRootMtime !== cachedRootMtime) {
       return false;
+    }
   } catch {
     return false;
   }
@@ -410219,6 +410229,11 @@ function getSteps() {
   } catch {
     cachedClaudeMdMtime = -1;
   }
+  try {
+    cachedRootMtime = Math.floor(fs13.statSync(cwd2).mtimeMs);
+  } catch {
+    cachedRootMtime = -1;
+  }
   try {
     cachedDirFingerprint = getDirectoryFingerprint(cwd2);
   } catch {
@@ -410270,7 +410285,7 @@ function incrementProjectOnboardingSeenCount() {
     projectOnboardingSeenCount: current.projectOnboardingSeenCount + 1
   }));
 }
-var cachedSteps = null, cachedClaudeMdMtime = -1, cachedDirFingerprint = "", cachedAt = null, CACHE_MAX_AGE_MS = 300000;
+var cachedSteps = null, cachedClaudeMdMtime = -1, cachedDirFingerprint = "", cachedRootMtime = -1, cachedAt = null, CACHE_MAX_AGE_MS = 300000;
 var init_projectOnboardingState = __esm(() => {
   init_config();
   init_cwd2();
@@ -566543,110 +566558,71 @@ function migrateEnableAllProjectMcpServersToSettings() {
     saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
     return;
   }
-  const originalSettings = getSettingsForSource("localSettings") || {};
-  const originalProjectConfig = { ...projectConfig };
-  const originalSettingsHash = JSON.stringify(originalSettings);
-  const migratedFields = [];
   const updates = {};
-  try {
-    const existingSettings = originalSettings;
-    if (hasEnableAll) {
-      updates.enableAllProjectMcpServers = projectConfig.enableAllProjectMcpServers;
-      migratedFields.push("enableAllProjectMcpServers");
-    }
-    const existingEnabledServers = Array.isArray(existingSettings.enabledMcpjsonServers) ? [...existingSettings.enabledMcpjsonServers] : [];
-    const existingDisabledServers = Array.isArray(existingSettings.disabledMcpjsonServers) ? [...existingSettings.disabledMcpjsonServers] : [];
-    if (hasEnabledServers) {
-      if (Array.isArray(projectConfig.enabledMcpjsonServers) && projectConfig.enabledMcpjsonServers.length > 0) {
-        const seen = new Set(existingEnabledServers);
-        for (const server of projectConfig.enabledMcpjsonServers) {
-          if (!seen.has(server)) {
-            existingEnabledServers.push(server);
-            seen.add(server);
-          }
+  const existingSettings = getSettingsForSource("localSettings") || {};
+  if (hasEnableAll) {
+    updates.enableAllProjectMcpServers = projectConfig.enableAllProjectMcpServers;
+  }
+  const existingEnabledServers = Array.isArray(existingSettings.enabledMcpjsonServers) ? [...existingSettings.enabledMcpjsonServers] : [];
+  const existingDisabledServers = Array.isArray(existingSettings.disabledMcpjsonServers) ? [...existingSettings.disabledMcpjsonServers] : [];
+  if (hasEnabledServers) {
+    if (Array.isArray(projectConfig.enabledMcpjsonServers) && projectConfig.enabledMcpjsonServers.length > 0) {
+      const seen = new Set(existingEnabledServers);
+      for (const server of projectConfig.enabledMcpjsonServers) {
+        if (!seen.has(server)) {
+          existingEnabledServers.push(server);
+          seen.add(server);
         }
       }
-      migratedFields.push("enabledMcpjsonServers");
     }
-    if (hasDisabledServers) {
-      if (Array.isArray(projectConfig.disabledMcpjsonServers) && projectConfig.disabledMcpjsonServers.length > 0) {
-        const seen = new Set(existingDisabledServers);
-        for (const server of projectConfig.disabledMcpjsonServers) {
-          if (!seen.has(server)) {
-            existingDisabledServers.push(server);
-            seen.add(server);
-          }
+  }
+  if (hasDisabledServers) {
+    if (Array.isArray(projectConfig.disabledMcpjsonServers) && projectConfig.disabledMcpjsonServers.length > 0) {
+      const seen = new Set(existingDisabledServers);
+      for (const server of projectConfig.disabledMcpjsonServers) {
+        if (!seen.has(server)) {
+          existingDisabledServers.push(server);
+          seen.add(server);
         }
       }
-      migratedFields.push("disabledMcpjsonServers");
     }
-    const overlappingServers = existingEnabledServers.filter((server) => existingDisabledServers.includes(server));
-    if (overlappingServers.length > 0) {
-      logEvent("tengu_migrate_mcp_server_overlap_in_both_lists", {
-        overlappingServers: overlappingServers.join(","),
-        resolvedBy: "removing_from_disabled_list"
-      });
-      updates.disabledMcpjsonServers = existingDisabledServers.filter((server) => !overlappingServers.includes(server));
-    } else {
-      updates.disabledMcpjsonServers = existingDisabledServers;
-    }
-    updates.enabledMcpjsonServers = existingEnabledServers;
-    saveCurrentProjectConfig((config5) => {
-      const updated = { ...config5 };
-      for (const field of migratedFields) {
-        delete updated[field];
-      }
-      return updated;
+  }
+  const overlappingServers = existingEnabledServers.filter((server) => existingDisabledServers.includes(server));
+  if (overlappingServers.length > 0) {
+    logEvent("tengu_migrate_mcp_server_conflict_resolved", {
+      overlappingServers: overlappingServers.join(","),
+      conflictResolution: "removed_from_disabled"
     });
-    const currentSettings = getSettingsForSource("localSettings") || {};
-    const currentSettingsHash = JSON.stringify(currentSettings);
-    if (currentSettingsHash !== originalSettingsHash) {
-      logError2("MIGRATION WARNING: Settings file was modified concurrently during migration. " + "The migration will abort to prevent data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-      throw new Error("Migration aborted due to concurrent changes to settings file. " + "Please ensure no other processes are modifying the settings file and try again.");
-    }
+  }
+  const finalDisabledServers = existingDisabledServers.filter((server) => !existingEnabledServers.includes(server));
+  if (hasEnabledServers) {
+    updates.enabledMcpjsonServers = existingEnabledServers;
+  }
+  if (hasDisabledServers || existingSettings.disabledMcpjsonServers !== undefined) {
+    updates.disabledMcpjsonServers = finalDisabledServers;
+  }
+  try {
     updateSettingsForSource("localSettings", updates);
-    saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
-    logEvent("tengu_migrate_enable_all_project_mcp_servers_to_settings", {
-      migration: "enableAllProjectMcpServersToSettings",
-      fieldsMigrated: migratedFields.join(",")
-    });
   } catch (error49) {
-    logError2("Failed to migrate MCP server settings, rolling back", error49);
-    let rollbackFailed = false;
-    try {
-      const currentSettings = getSettingsForSource("localSettings") || {};
-      const currentSettingsHash = JSON.stringify(currentSettings);
-      if (currentSettingsHash !== originalSettingsHash) {
-        logError2("MIGRATION WARNING: Settings file was modified concurrently. " + "The rollback will abort to prevent data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-        throw new Error("Rollback aborted due to concurrent changes to settings file. " + "Please ensure no other processes are modifying the settings file.");
-      }
-      const rollbackUpdates = {};
-      for (const field of migratedFields) {
-        if (field in originalSettings) {
-          rollbackUpdates[field] = originalSettings[field];
-        } else {
-          deleteSettingsField("localSettings", field);
-        }
-      }
-      updateSettingsForSource("localSettings", rollbackUpdates);
-      saveCurrentProjectConfig((config5) => {
-        const updated = { ...config5 };
-        for (const field of migratedFields) {
-          if (field in originalProjectConfig) {
-            updated[field] = originalProjectConfig[field];
-          }
-        }
-        return updated;
-      });
-    } catch (rollbackError) {
-      logError2("Rollback of settings failed", rollbackError);
-      rollbackFailed = true;
-    }
-    if (rollbackFailed) {
-      logError2("Migration failed and rollback was incomplete. " + "The settings file may be in an inconsistent state. " + "Please check the settings file manually.");
-      throw error49;
-    }
+    logError2("Failed to migrate MCP server settings to local config", error49);
+    throw error49;
   }
+  saveCurrentProjectConfig((config5) => {
+    const updated = { ...config5 };
+    delete updated.enableAllProjectMcpServers;
+    delete updated.enabledMcpjsonServers;
+    delete updated.disabledMcpjsonServers;
+    return updated;
+  });
+  saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
+  logEvent("tengu_migrate_enable_all_project_mcp_servers_to_settings", {
+    migration: "enableAllProjectMcpServersToSettings",
+    fieldsMigrated: [
+      hasEnableAll && "enableAllProjectMcpServers",
+      hasEnabledServers && "enabledMcpjsonServers",
+      hasDisabledServers && "disabledMcpjsonServers"
+    ].filter(Boolean).join(",")
+  });
 }
 var init_migrateEnableAllProjectMcpServersToSettings = __esm(() => {
   init_analytics();

package/dist/myclaude.mjs

@@ -4,8 +4,8 @@
 // MACRO - build-time constants (injected by build.ts)
 // MACRO injected by build script
 globalThis.MACRO = {
-  VERSION: "0.1.166",
-  BUILD_TIME: "2026-07-31T04:45:19.156Z",
+  VERSION: "0.1.167",
+  BUILD_TIME: "2026-07-31T15:47:37.502Z",
   PACKAGE_URL: "@funnycode/myclaude",
   NATIVE_PACKAGE_URL: "@funnycode/myclaude",
   VERSION_CHANGELOG: '',
@@ -61328,30 +61328,6 @@ function updateSettingsForSource(source, settings) {
   }
   return { error: null };
 }
-function deleteSettingsField(source, field) {
-  if (source === "policySettings" || source === "flagSettings") {
-    return { error: null };
-  }
-  const filePath = getSettingsFilePathForSource(source);
-  if (!filePath) {
-    return { error: null };
-  }
-  try {
-    getFsImplementation().mkdirSync(dirname13(filePath));
-    let existingSettings = getSettingsForSourceUncached(source);
-    if (!existingSettings) {
-      return { error: null };
-    }
-    delete existingSettings[field];
-    writeFileSyncAndFlush_DEPRECATED(filePath, jsonStringify(existingSettings));
-    resetSettingsCache();
-    return { error: null };
-  } catch (e) {
-    const error49 = new Error(`Failed to delete field ${field} from settings source ${source}: ${e}`);
-    logError2(error49);
-    return { error: error49 };
-  }
-}
 function mergeArrays(targetArray, sourceArray) {
   return uniq([...targetArray, ...sourceArray]);
 }
@@ -119971,7 +119947,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@funnycode/myclaude",
-    version: "0.1.166",
+    version: "0.1.167",
     private: false,
     description: "An open-source AI coding assistant in your terminal - powered by Claude",
     license: "MIT",
@@ -275761,7 +275737,12 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   function resolve26(baseURI, relativeURI, options) {
     const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
-    const resolved = resolveComponent(parse9(baseURI, schemelessOptions), parse9(relativeURI, schemelessOptions), schemelessOptions, true);
+    const { parsed: baseParsed, malformedAuthorityOrPort: baseMalformed } = parseWithStatus(baseURI, schemelessOptions);
+    const { parsed: relativeParsed, malformedAuthorityOrPort: relativeMalformed } = parseWithStatus(relativeURI, schemelessOptions);
+    if (baseMalformed || relativeMalformed) {
+      throw new Error(baseParsed.error || relativeParsed.error || "URI is malformed.");
+    }
+    const resolved = resolveComponent(baseParsed, relativeParsed, schemelessOptions, true);
     schemelessOptions.skipEscape = true;
     return serialize2(resolved, schemelessOptions);
   }
@@ -275888,6 +275869,7 @@ var require_fast_uri = __commonJS((exports, module) => {
   }
   var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
   var AUTHORITY_PREFIX = /^(?:[^#/:?]+:)?\/\/([^/?#]*)/;
+  var AUTHORITY_INTRODUCER_REGION = /^(?:[^#/:?]+:)?([/\\\t\n\r]*)/;
   function getParseError2(parsed, matches) {
     if (matches[2] !== undefined && parsed.path && parsed.path[0] !== "/") {
       return 'URI path must start with "/" when authority is present.';
@@ -275922,6 +275904,20 @@ var require_fast_uri = __commonJS((exports, module) => {
       parsed.error = "URI authority must not contain a literal backslash.";
       malformedAuthorityOrPort = true;
     }
+    const introducerMatch = uri.match(AUTHORITY_INTRODUCER_REGION);
+    if (introducerMatch !== null) {
+      const region = introducerMatch[1];
+      const normalizedRegion = region.replace(/[\t\n\r]/g, "");
+      if (normalizedRegion.length >= 2) {
+        if (normalizedRegion.slice(0, 2) !== "//") {
+          parsed.error = parsed.error || "URI authority must not contain a literal backslash.";
+          malformedAuthorityOrPort = true;
+        } else if (region.length !== normalizedRegion.length) {
+          parsed.error = parsed.error || "URI authority introducer must not contain whitespace.";
+          malformedAuthorityOrPort = true;
+        }
+      }
+    }
     const matches = uri.match(URI_PARSE);
     if (matches) {
       parsed.scheme = matches[1];
@@ -410155,20 +410151,32 @@ function isInputModeCharacter(input) {
 import { join as join105 } from "path";
 function getDirectoryFingerprint(dirPath) {
   const fs13 = getFsImplementation();
-  const entries = fs13.readdirStringSync(dirPath);
+  let entries;
+  try {
+    entries = fs13.readdirStringSync(dirPath);
+  } catch {
+    return "";
+  }
   const sortedEntries = entries.sort();
   const fingerprintParts = [];
   for (const entry of sortedEntries) {
     const fullPath = join105(dirPath, entry);
-    const stat37 = fs13.statSync(fullPath);
-    if (stat37.isDirectory()) {
-      if (entry === "node_modules" || entry === ".git" || entry === "dist" || entry === "build" || entry === ".next" || entry === "out" || entry === "coverage") {
+    try {
+      const lstat7 = fs13.lstatSync(fullPath);
+      if (lstat7.isSymbolicLink()) {
         continue;
       }
-      fingerprintParts.push(entry + "/");
-      fingerprintParts.push(getDirectoryFingerprint(fullPath));
-    } else {
-      fingerprintParts.push(entry);
+      if (lstat7.isDirectory()) {
+        if (entry === "node_modules" || entry === ".git" || entry === "dist" || entry === "build" || entry === ".next" || entry === "out" || entry === "coverage") {
+          continue;
+        }
+        fingerprintParts.push(entry + "/");
+        fingerprintParts.push(getDirectoryFingerprint(fullPath));
+      } else {
+        fingerprintParts.push(entry);
+      }
+    } catch {
+      continue;
     }
   }
   return fingerprintParts.join(`
@@ -410178,6 +410186,7 @@ function clearCachedSteps() {
   cachedSteps = null;
   cachedClaudeMdMtime = -1;
   cachedDirFingerprint = "";
+  cachedRootMtime = -1;
   cachedAt = null;
 }
 function isCacheValid() {
@@ -410194,9 +410203,10 @@ function isCacheValid() {
     return false;
   }
   try {
-    const currentFingerprint = getDirectoryFingerprint(cwd2);
-    if (currentFingerprint !== cachedDirFingerprint)
+    const currentRootMtime = Math.floor(fs13.statSync(cwd2).mtimeMs);
+    if (currentRootMtime !== cachedRootMtime) {
       return false;
+    }
   } catch {
     return false;
   }
@@ -410219,6 +410229,11 @@ function getSteps() {
   } catch {
     cachedClaudeMdMtime = -1;
   }
+  try {
+    cachedRootMtime = Math.floor(fs13.statSync(cwd2).mtimeMs);
+  } catch {
+    cachedRootMtime = -1;
+  }
   try {
     cachedDirFingerprint = getDirectoryFingerprint(cwd2);
   } catch {
@@ -410270,7 +410285,7 @@ function incrementProjectOnboardingSeenCount() {
     projectOnboardingSeenCount: current.projectOnboardingSeenCount + 1
   }));
 }
-var cachedSteps = null, cachedClaudeMdMtime = -1, cachedDirFingerprint = "", cachedAt = null, CACHE_MAX_AGE_MS = 300000;
+var cachedSteps = null, cachedClaudeMdMtime = -1, cachedDirFingerprint = "", cachedRootMtime = -1, cachedAt = null, CACHE_MAX_AGE_MS = 300000;
 var init_projectOnboardingState = __esm(() => {
   init_config();
   init_cwd2();
@@ -566543,110 +566558,71 @@ function migrateEnableAllProjectMcpServersToSettings() {
     saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
     return;
   }
-  const originalSettings = getSettingsForSource("localSettings") || {};
-  const originalProjectConfig = { ...projectConfig };
-  const originalSettingsHash = JSON.stringify(originalSettings);
-  const migratedFields = [];
   const updates = {};
-  try {
-    const existingSettings = originalSettings;
-    if (hasEnableAll) {
-      updates.enableAllProjectMcpServers = projectConfig.enableAllProjectMcpServers;
-      migratedFields.push("enableAllProjectMcpServers");
-    }
-    const existingEnabledServers = Array.isArray(existingSettings.enabledMcpjsonServers) ? [...existingSettings.enabledMcpjsonServers] : [];
-    const existingDisabledServers = Array.isArray(existingSettings.disabledMcpjsonServers) ? [...existingSettings.disabledMcpjsonServers] : [];
-    if (hasEnabledServers) {
-      if (Array.isArray(projectConfig.enabledMcpjsonServers) && projectConfig.enabledMcpjsonServers.length > 0) {
-        const seen = new Set(existingEnabledServers);
-        for (const server of projectConfig.enabledMcpjsonServers) {
-          if (!seen.has(server)) {
-            existingEnabledServers.push(server);
-            seen.add(server);
-          }
+  const existingSettings = getSettingsForSource("localSettings") || {};
+  if (hasEnableAll) {
+    updates.enableAllProjectMcpServers = projectConfig.enableAllProjectMcpServers;
+  }
+  const existingEnabledServers = Array.isArray(existingSettings.enabledMcpjsonServers) ? [...existingSettings.enabledMcpjsonServers] : [];
+  const existingDisabledServers = Array.isArray(existingSettings.disabledMcpjsonServers) ? [...existingSettings.disabledMcpjsonServers] : [];
+  if (hasEnabledServers) {
+    if (Array.isArray(projectConfig.enabledMcpjsonServers) && projectConfig.enabledMcpjsonServers.length > 0) {
+      const seen = new Set(existingEnabledServers);
+      for (const server of projectConfig.enabledMcpjsonServers) {
+        if (!seen.has(server)) {
+          existingEnabledServers.push(server);
+          seen.add(server);
         }
       }
-      migratedFields.push("enabledMcpjsonServers");
     }
-    if (hasDisabledServers) {
-      if (Array.isArray(projectConfig.disabledMcpjsonServers) && projectConfig.disabledMcpjsonServers.length > 0) {
-        const seen = new Set(existingDisabledServers);
-        for (const server of projectConfig.disabledMcpjsonServers) {
-          if (!seen.has(server)) {
-            existingDisabledServers.push(server);
-            seen.add(server);
-          }
+  }
+  if (hasDisabledServers) {
+    if (Array.isArray(projectConfig.disabledMcpjsonServers) && projectConfig.disabledMcpjsonServers.length > 0) {
+      const seen = new Set(existingDisabledServers);
+      for (const server of projectConfig.disabledMcpjsonServers) {
+        if (!seen.has(server)) {
+          existingDisabledServers.push(server);
+          seen.add(server);
         }
       }
-      migratedFields.push("disabledMcpjsonServers");
     }
-    const overlappingServers = existingEnabledServers.filter((server) => existingDisabledServers.includes(server));
-    if (overlappingServers.length > 0) {
-      logEvent("tengu_migrate_mcp_server_overlap_in_both_lists", {
-        overlappingServers: overlappingServers.join(","),
-        resolvedBy: "removing_from_disabled_list"
-      });
-      updates.disabledMcpjsonServers = existingDisabledServers.filter((server) => !overlappingServers.includes(server));
-    } else {
-      updates.disabledMcpjsonServers = existingDisabledServers;
-    }
-    updates.enabledMcpjsonServers = existingEnabledServers;
-    saveCurrentProjectConfig((config5) => {
-      const updated = { ...config5 };
-      for (const field of migratedFields) {
-        delete updated[field];
-      }
-      return updated;
+  }
+  const overlappingServers = existingEnabledServers.filter((server) => existingDisabledServers.includes(server));
+  if (overlappingServers.length > 0) {
+    logEvent("tengu_migrate_mcp_server_conflict_resolved", {
+      overlappingServers: overlappingServers.join(","),
+      conflictResolution: "removed_from_disabled"
     });
-    const currentSettings = getSettingsForSource("localSettings") || {};
-    const currentSettingsHash = JSON.stringify(currentSettings);
-    if (currentSettingsHash !== originalSettingsHash) {
-      logError2("MIGRATION WARNING: Settings file was modified concurrently during migration. " + "The migration will abort to prevent data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-      throw new Error("Migration aborted due to concurrent changes to settings file. " + "Please ensure no other processes are modifying the settings file and try again.");
-    }
+  }
+  const finalDisabledServers = existingDisabledServers.filter((server) => !existingEnabledServers.includes(server));
+  if (hasEnabledServers) {
+    updates.enabledMcpjsonServers = existingEnabledServers;
+  }
+  if (hasDisabledServers || existingSettings.disabledMcpjsonServers !== undefined) {
+    updates.disabledMcpjsonServers = finalDisabledServers;
+  }
+  try {
     updateSettingsForSource("localSettings", updates);
-    saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
-    logEvent("tengu_migrate_enable_all_project_mcp_servers_to_settings", {
-      migration: "enableAllProjectMcpServersToSettings",
-      fieldsMigrated: migratedFields.join(",")
-    });
   } catch (error49) {
-    logError2("Failed to migrate MCP server settings, rolling back", error49);
-    let rollbackFailed = false;
-    try {
-      const currentSettings = getSettingsForSource("localSettings") || {};
-      const currentSettingsHash = JSON.stringify(currentSettings);
-      if (currentSettingsHash !== originalSettingsHash) {
-        logError2("MIGRATION WARNING: Settings file was modified concurrently. " + "The rollback will abort to prevent data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-        throw new Error("Rollback aborted due to concurrent changes to settings file. " + "Please ensure no other processes are modifying the settings file.");
-      }
-      const rollbackUpdates = {};
-      for (const field of migratedFields) {
-        if (field in originalSettings) {
-          rollbackUpdates[field] = originalSettings[field];
-        } else {
-          deleteSettingsField("localSettings", field);
-        }
-      }
-      updateSettingsForSource("localSettings", rollbackUpdates);
-      saveCurrentProjectConfig((config5) => {
-        const updated = { ...config5 };
-        for (const field of migratedFields) {
-          if (field in originalProjectConfig) {
-            updated[field] = originalProjectConfig[field];
-          }
-        }
-        return updated;
-      });
-    } catch (rollbackError) {
-      logError2("Rollback of settings failed", rollbackError);
-      rollbackFailed = true;
-    }
-    if (rollbackFailed) {
-      logError2("Migration failed and rollback was incomplete. " + "The settings file may be in an inconsistent state. " + "Please check the settings file manually.");
-      throw error49;
-    }
+    logError2("Failed to migrate MCP server settings to local config", error49);
+    throw error49;
   }
+  saveCurrentProjectConfig((config5) => {
+    const updated = { ...config5 };
+    delete updated.enableAllProjectMcpServers;
+    delete updated.enabledMcpjsonServers;
+    delete updated.disabledMcpjsonServers;
+    return updated;
+  });
+  saveGlobalConfig((c6) => ({ ...c6, hasCompletedMcpServerMigration: true }));
+  logEvent("tengu_migrate_enable_all_project_mcp_servers_to_settings", {
+    migration: "enableAllProjectMcpServersToSettings",
+    fieldsMigrated: [
+      hasEnableAll && "enableAllProjectMcpServers",
+      hasEnabledServers && "enabledMcpjsonServers",
+      hasDisabledServers && "disabledMcpjsonServers"
+    ].filter(Boolean).join(",")
+  });
 }
 var init_migrateEnableAllProjectMcpServersToSettings = __esm(() => {
   init_analytics();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnycode/myclaude",
-  "version": "0.1.166",
+  "version": "0.1.167",
   "private": false,
   "description": "An open-source AI coding assistant in your terminal - powered by Claude",
   "license": "MIT",