@funnycode/myclaude 0.1.165 → 0.1.167

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.165",
-  BUILD_TIME: "2026-07-31T00:20:09.749Z",
+  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]);
 }
@@ -101034,12 +101010,18 @@ var require_protocols2 = __commonJS((exports) => {
       const reviver = needsReviver(schema) ? jsonReviver : undefined;
       let parsed;
       if (typeof data === "string") {
+        if (data.length === 0) {
+          return {};
+        }
         parsed = JSON.parse(data, reviver);
       } else if (data instanceof Uint8Array && detectBufferParsing()) {
+        if (data.byteLength === 0) {
+          return {};
+        }
         const buf = Buffer.isBuffer(data) ? data : Buffer.from(data.buffer, data.byteOffset, data.byteLength);
         parsed = JSON.parse(buf, reviver);
       } else {
-        parsed = await parseJsonBody(data, this.serdeContext);
+        parsed = await parseJsonBody(data, this.serdeContext, schema);
       }
       return this._read(schema, parsed);
     }
@@ -101055,19 +101037,23 @@ var require_protocols2 = __commonJS((exports) => {
         }
         if (Array.isArray(value) && ns.isListSchema()) {
           const listMember = ns.getValueSchema();
-          for (let i2 = 0;i2 < value.length; ++i2) {
-            value[i2] = this._read(listMember, value[i2]);
+          if (this.needsTransform(listMember)) {
+            for (let i2 = 0;i2 < value.length; ++i2) {
+              value[i2] = this._read(listMember, value[i2]);
+            }
           }
           return value;
         }
         if (ns.isMapSchema()) {
           const mapMember = ns.getValueSchema();
           const map2 = value;
-          for (const k in map2) {
-            if (k === "__proto__") {
-              writeKey(map2);
+          if (this.needsTransform(mapMember)) {
+            for (const k in map2) {
+              if (k === "__proto__") {
+                writeKey(map2);
+              }
+              map2[k] = this._read(mapMember, map2[k]);
             }
-            map2[k] = this._read(mapMember, map2[k]);
           }
           return map2;
         }
@@ -101142,9 +101128,6 @@ var require_protocols2 = __commonJS((exports) => {
               }
             }
           }
-          return value;
-        } else {
-          return value;
         }
       }
       return value;
@@ -101152,9 +101135,10 @@ var require_protocols2 = __commonJS((exports) => {
     _readStruct(ns, record2) {
       const union2 = ns.isUnionSchema();
       const out = {};
-      let nameMap = undefined;
+      let nameMap;
+      const hasType = typeof record2.__type === "string";
       const { jsonName } = this.settings;
-      if (jsonName) {
+      if (jsonName && hasType) {
         nameMap = {};
       }
       let unionSerde;
@@ -101165,7 +101149,9 @@ var require_protocols2 = __commonJS((exports) => {
         let fromKey = memberName;
         if (jsonName) {
           fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
-          nameMap[fromKey] = memberName;
+          if (hasType) {
+            nameMap[fromKey] = memberName;
+          }
         }
         if (union2) {
           unionSerde.mark(fromKey);
@@ -101176,7 +101162,7 @@ var require_protocols2 = __commonJS((exports) => {
       }
       if (union2) {
         unionSerde.writeUnknown();
-      } else if (typeof record2.__type === "string") {
+      } else if (hasType) {
         for (const k in record2) {
           const v = record2[k];
           const t = jsonName ? nameMap[k] ?? k : k;
@@ -101187,7 +101173,121 @@ var require_protocols2 = __commonJS((exports) => {
       }
       return out;
     }
+    needsTransform(ns) {
+      if (ns.isBlobSchema() || ns.isTimestampSchema() || ns.isBigIntegerSchema() || ns.isBigDecimalSchema()) {
+        return true;
+      }
+      if (ns.isDocumentSchema() || ns.isStructSchema() || ns.isListSchema() || ns.isMapSchema()) {
+        return true;
+      }
+      if (ns.isStringSchema() && ns.getMergedTraits().mediaType) {
+        return true;
+      }
+      return false;
+    }
   }
+
+  class JsonBytesStringAdapter extends Uint8Array {
+    string = null;
+    static allocUnsafe(bytes) {
+      if (typeof Buffer === "function") {
+        const buffer = Buffer.allocUnsafe(bytes);
+        return new JsonBytesStringAdapter(buffer.buffer, buffer.byteOffset, buffer.byteLength);
+      }
+      return new JsonBytesStringAdapter(bytes);
+    }
+    toString() {
+      return this.s();
+    }
+    valueOf() {
+      return this.s();
+    }
+    includes(searchString, position) {
+      if (typeof searchString === "string") {
+        return this.s().includes(searchString, position);
+      }
+      return Uint8Array.prototype.includes.call(this, searchString, position);
+    }
+    indexOf(searchString, position) {
+      if (typeof searchString === "string") {
+        return this.s().indexOf(searchString, position);
+      }
+      return Uint8Array.prototype.indexOf.call(this, searchString, position);
+    }
+    lastIndexOf(searchString, position) {
+      if (typeof searchString === "string") {
+        return this.s().lastIndexOf(searchString, position);
+      }
+      const fn = Uint8Array.prototype.lastIndexOf;
+      if (position !== undefined) {
+        return fn.call(this, searchString, position);
+      }
+      return fn.call(this, searchString);
+    }
+    startsWith(searchString, position) {
+      return this.s().startsWith(searchString, position);
+    }
+    endsWith(searchString, endPosition) {
+      return this.s().endsWith(searchString, endPosition);
+    }
+    match(regexp) {
+      return this.s().match(regexp);
+    }
+    replace(searchValue, replaceValue) {
+      return this.s().replace(searchValue, replaceValue);
+    }
+    search(regexp) {
+      return this.s().search(regexp);
+    }
+    split(separator, limit2) {
+      return this.s().split(separator, limit2);
+    }
+    substring(start, end) {
+      return this.s().substring(start, end);
+    }
+    trim() {
+      return this.s().trim();
+    }
+    trimStart() {
+      return this.s().trimStart();
+    }
+    trimEnd() {
+      return this.s().trimEnd();
+    }
+    charAt(pos) {
+      return this.s().charAt(pos);
+    }
+    charCodeAt(index) {
+      return this.s().charCodeAt(index);
+    }
+    padStart(maxLength, fillString) {
+      return this.s().padStart(maxLength, fillString);
+    }
+    padEnd(maxLength, fillString) {
+      return this.s().padEnd(maxLength, fillString);
+    }
+    repeat(count3) {
+      return this.s().repeat(count3);
+    }
+    toUpperCase() {
+      return this.s().toUpperCase();
+    }
+    toLowerCase() {
+      return this.s().toLowerCase();
+    }
+    s() {
+      if (this.string == null) {
+        const n2 = Date.now();
+        if (n2 > warned + 60000) {
+          console.warn("@aws-sdk/core/protocols - WARN - JsonCodec2: you have called a string method on a Uint8Array request body. " + "It has been automatically converted to string. In a future version this will throw an error.");
+          warned = n2;
+        }
+        this.string = toUtf8(this);
+      }
+      return this.string;
+    }
+  }
+  var warned = 0;
   var encoder2 = new TextEncoder;
   var OPEN_BRACE = 123;
   var CLOSE_BRACE = 125;
@@ -101215,7 +101315,7 @@ var require_protocols2 = __commonJS((exports) => {
   }
   var INITIAL_BUFFER_SIZE = 2048;
   function alloc(size) {
-    return typeof Buffer !== "undefined" ? Buffer.allocUnsafe(size) : new Uint8Array(size);
+    return JsonBytesStringAdapter.allocUnsafe(size);
   }
 
   class JsonShapeSerializer2 extends SerdeContextConfig {
@@ -101234,7 +101334,7 @@ var require_protocols2 = __commonJS((exports) => {
       this.i = 0;
       this.rawValue = value;
       this.rootSchema = NormalizedSchema.of(schema);
-      this.passthrough = !this.rootSchema.isStructSchema() && !this.rootSchema.isDocumentSchema() && (this.rootSchema.isBlobSchema() || this.rootSchema.isStringSchema());
+      this.passthrough = this.rootSchema.isBlobSchema() || this.rootSchema.isStringSchema();
       if (!this.passthrough) {
         this.writeValue(this.rootSchema, value, undefined);
       }
@@ -101244,30 +101344,13 @@ var require_protocols2 = __commonJS((exports) => {
       this.rootSchema = NormalizedSchema.of(schema);
       const ns = this.rootSchema;
       if (ns.isStructSchema() && value != null && typeof value === "object") {
-        this.ensure(2);
-        this.json[this.i++] = OPEN_BRACE;
-        this.writeAsciiQuoted("__type");
-        this.json[this.i++] = COLON;
-        this.writeAsciiQuoted(ns.getName(true) ?? "Unknown");
-        let wroteAny = true;
-        const { jsonName } = this.settings;
-        for (const [memberName, memberSchema] of ns.structIterator()) {
-          const item = value[memberName];
-          if (item == null && !memberSchema.isIdempotencyToken()) {
-            continue;
-          }
-          if (wroteAny) {
-            this.ensure(1);
-            this.json[this.i++] = COMMA;
-          }
-          const targetKey = jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
-          this.writeAsciiQuoted(targetKey);
-          this.json[this.i++] = COLON;
-          this.writeValue(memberSchema, item, ns);
-          wroteAny = true;
-        }
-        this.ensure(1);
-        this.json[this.i++] = CLOSE_BRACE;
+        this.writeValue(ns, value, undefined);
+        const prefix = `"__type":"${ns.getName(true) ?? "Unknown"}",`;
+        const z3 = prefix.length;
+        this.ensure(z3);
+        this.json.copyWithin(1 + z3, 1, this.i);
+        encoder2.encodeInto(prefix, this.json.subarray(1));
+        this.i += z3;
       } else {
         this.writeValue(ns, value, undefined);
       }
@@ -101319,7 +101402,7 @@ var require_protocols2 = __commonJS((exports) => {
       this.i = i2;
     }
     writeJsonString(s) {
-      this.ensure(s.length * 2 + 2);
+      this.ensure(s.length * 3 + 2);
       this.json[this.i++] = QUOTE;
       const z3 = s.length;
       for (let j = 0;j < z3; ++j) {
@@ -101343,7 +101426,7 @@ var require_protocols2 = __commonJS((exports) => {
             this.ensure(4);
             const { written } = encoder2.encodeInto(s.substring(j, j + 2), this.json.subarray(this.i));
             this.i += written;
-            j++;
+            ++j;
           } else {
             this.ensure(6);
             this.writeUnicodeEscape(c5);
@@ -101379,8 +101462,9 @@ var require_protocols2 = __commonJS((exports) => {
     static B64 = (() => {
       const chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
       const table = new Uint8Array(64);
-      for (let i2 = 0;i2 < 64; i2++)
+      for (let i2 = 0;i2 < 64; ++i2) {
         table[i2] = chars.charCodeAt(i2);
+      }
       return table;
     })();
     writeBase64(data) {
@@ -101505,13 +101589,15 @@ var require_protocols2 = __commonJS((exports) => {
       }
       if (typeof value === "boolean") {
         this.ensure(5);
+        let { i: i2, json: json2 } = this;
         if (value) {
-          this.json.set(TRUE, this.i);
-          this.i += 4;
+          json2.set(TRUE, i2);
+          i2 += 4;
         } else {
-          this.json.set(FALSE, this.i);
-          this.i += 5;
+          json2.set(FALSE, i2);
+          i2 += 5;
         }
+        this.i = i2;
         return;
       }
       if (typeof value === "bigint") {
@@ -101523,7 +101609,6 @@ var require_protocols2 = __commonJS((exports) => {
     writeStruct(ns, value) {
       this.ensure(2);
       this.json[this.i++] = OPEN_BRACE;
-      let first = true;
       let wroteAny = false;
       const hasType = typeof value.__type === "string";
       let writtenKeys;
@@ -101532,13 +101617,13 @@ var require_protocols2 = __commonJS((exports) => {
       }
       for (const [memberName, memberSchema] of ns.structIterator()) {
         const item = value[memberName];
-        if (item == null && !memberSchema.isIdempotencyToken())
+        if (item == null && !memberSchema.isIdempotencyToken()) {
           continue;
-        if (!first) {
+        }
+        if (wroteAny) {
           this.ensure(1);
           this.json[this.i++] = COMMA;
         }
-        first = false;
         wroteAny = true;
         const targetKey = this.settings.jsonName ? memberSchema.getMergedTraits().jsonName ?? memberName : memberName;
         if (writtenKeys) {
@@ -101560,17 +101645,17 @@ var require_protocols2 = __commonJS((exports) => {
         }
       } else if (hasType) {
         for (const k in value) {
-          const targetKey = this.settings.jsonName ? writtenKeys.has(k) ? k : k : k;
-          if (writtenKeys.has(targetKey))
+          if (writtenKeys.has(k)) {
             continue;
-          writtenKeys.add(targetKey);
+          }
+          writtenKeys.add(k);
           const v = value[k];
-          if (!first) {
+          if (wroteAny) {
             this.ensure(1);
             this.json[this.i++] = COMMA;
           }
-          first = false;
-          this.writeAsciiQuoted(targetKey);
+          wroteAny = true;
+          this.writeAsciiQuoted(k);
           this.ensure(1);
           this.json[this.i++] = COLON;
           this.writeValue(15, v, undefined);
@@ -101580,20 +101665,30 @@ var require_protocols2 = __commonJS((exports) => {
       this.json[this.i++] = CLOSE_BRACE;
     }
     writeList(ns, value, isDocument) {
-      this.ensure(2);
-      this.json[this.i++] = OPEN_BRACKET;
       const sparse = !!ns.getMergedTraits().sparse;
       const valueSchema = ns.getValueSchema();
+      if (!isDocument) {
+        if (valueSchema.isStringSchema() || valueSchema.isNumericSchema() || valueSchema.isBooleanSchema()) {
+          const json2 = sparse ? JSON.stringify(value) : JSON.stringify(value.filter((_) => _ != null));
+          this.ensure(json2.length * 3);
+          this.i += encoder2.encodeInto(json2, this.json.subarray(this.i)).written;
+          return;
+        }
+      }
+      this.ensure(2);
+      this.json[this.i++] = OPEN_BRACKET;
+      let wroteFirstItem = false;
       for (let i2 = 0;i2 < value.length; ++i2) {
         const item = value[i2];
         if (isDocument ? item === undefined : item == null && !sparse) {
           continue;
         }
-        if (i2 !== 0) {
+        if (wroteFirstItem) {
           this.ensure(1);
           this.json[this.i++] = COMMA;
         }
         this.writeValue(valueSchema, item, undefined);
+        wroteFirstItem = true;
       }
       this.ensure(1);
       this.json[this.i++] = CLOSE_BRACKET;
@@ -101615,8 +101710,7 @@ var require_protocols2 = __commonJS((exports) => {
           }
           const json2 = JSON.stringify(input);
           this.ensure(json2.length * 3);
-          const { written } = encoder2.encodeInto(json2, this.json.subarray(this.i));
-          this.i += written;
+          this.i += encoder2.encodeInto(json2, this.json.subarray(this.i)).written;
           return;
         }
       }
@@ -102728,7 +102822,7 @@ var require_sso_oidc = __commonJS((exports) => {
     Region: { type: "builtInParams", name: "region" },
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" }
   };
-  var version2 = "3.997.37";
+  var version2 = "3.997.38";
   var packageInfo = {
     version: version2
   };
@@ -103625,7 +103719,7 @@ var require_sso = __commonJS((exports) => {
     Region: { type: "builtInParams", name: "region" },
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" }
   };
-  var version2 = "3.997.37";
+  var version2 = "3.997.38";
   var packageInfo = {
     version: version2
   };
@@ -104719,7 +104813,7 @@ var require_sts = __commonJS((exports) => {
     Region: { type: "builtInParams", name: "region" },
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" }
   };
-  var version2 = "3.997.37";
+  var version2 = "3.997.38";
   var packageInfo = {
     version: version2
   };
@@ -105488,7 +105582,7 @@ var require_signin = __commonJS((exports) => {
     Region: { type: "builtInParams", name: "region" },
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" }
   };
-  var version2 = "3.997.37";
+  var version2 = "3.997.38";
   var packageInfo = {
     version: version2
   };
@@ -119853,7 +119947,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@funnycode/myclaude",
-    version: "0.1.165",
+    version: "0.1.167",
     private: false,
     description: "An open-source AI coding assistant in your terminal - powered by Claude",
     license: "MIT",
@@ -275643,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);
   }
@@ -275770,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.';
@@ -275804,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];
@@ -410037,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(`
@@ -410060,6 +410186,7 @@ function clearCachedSteps() {
   cachedSteps = null;
   cachedClaudeMdMtime = -1;
   cachedDirFingerprint = "";
+  cachedRootMtime = -1;
   cachedAt = null;
 }
 function isCacheValid() {
@@ -410076,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;
   }
@@ -410101,6 +410229,11 @@ function getSteps() {
   } catch {
     cachedClaudeMdMtime = -1;
   }
+  try {
+    cachedRootMtime = Math.floor(fs13.statSync(cwd2).mtimeMs);
+  } catch {
+    cachedRootMtime = -1;
+  }
   try {
     cachedDirFingerprint = getDirectoryFingerprint(cwd2);
   } catch {
@@ -410152,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();
@@ -566425,125 +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 enabledSet = new Set(existingEnabledServers);
-    const overlappingServers = existingDisabledServers.filter((server) => enabledSet.has(server));
-    for (const server of overlappingServers) {
-      const index = existingDisabledServers.indexOf(server);
-      if (index !== -1) {
-        existingDisabledServers.splice(index, 1);
-      }
-    }
-    if (overlappingServers.length > 0) {
-      logEvent("tengu_migrate_mcp_server_overlap_in_both_lists", {
-        overlappingServers: overlappingServers.join(",")
-      });
-    }
-    const existingHadEnabledServers = Array.isArray(existingSettings.enabledMcpjsonServers);
-    const existingHadDisabledServers = Array.isArray(existingSettings.disabledMcpjsonServers);
-    const hasEnabledServersArray = hasEnabledServers && Array.isArray(projectConfig.enabledMcpjsonServers);
-    const hasDisabledServersArray = hasDisabledServers && Array.isArray(projectConfig.disabledMcpjsonServers);
-    if (existingHadEnabledServers || hasEnabledServersArray) {
-      updates.enabledMcpjsonServers = existingEnabledServers;
-    }
-    if (existingHadDisabledServers || hasDisabledServersArray) {
-      updates.disabledMcpjsonServers = existingDisabledServers;
-    }
-    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 overwrite concurrent changes, potentially causing data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-    }
+  }
+  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 overwrite concurrent changes, potentially causing data loss. " + "Original settings hash: " + originalSettingsHash + ", Current settings hash: " + currentSettingsHash);
-      }
-      const rollbackUpdates = {};
-      for (const field of migratedFields) {
-        if (field in originalSettings) {
-          rollbackUpdates[field] = originalSettings[field];
-        } else {
-          deleteSettingsField("localSettings", field);
-        }
-      }
-      updateSettingsForSource("localSettings", rollbackUpdates);
-    } catch (rollbackError) {
-      logError2("Rollback of settings failed", rollbackError);
-      rollbackFailed = true;
-    }
-    try {
-      saveCurrentProjectConfig((config5) => {
-        const updated = { ...config5 };
-        for (const field of migratedFields) {
-          updated[field] = originalProjectConfig[field];
-        }
-        return updated;
-      });
-    } catch (rollbackError) {
-      logError2("Rollback of project config failed", rollbackError);
-      rollbackFailed = true;
-    }
-    if (rollbackFailed) {
-      logError2("MIGRATION WARNING: Rollback was incomplete. The system may be in an inconsistent " + "state with duplicate or conflicting MCP server configuration. Manual intervention " + "may be required to restore consistency between project config and settings.", new Error("Migration failed and rollback was incomplete. The system may be in an inconsistent state. " + "Original error: " + (error49 instanceof Error ? error49.message : String(error49))));
-      throw new Error("Migration failed and rollback was incomplete. The system may be in an inconsistent state. " + "Original error: " + (error49 instanceof Error ? error49.message : String(error49)));
-    } else {
-      logError2("Rollback completed successfully: original MCP server settings restored", 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();
@@ -566631,7 +566710,8 @@ function migrateReplBridgeEnabledToRemoteControlAtStartup() {
         replBridgeEnabled: undefined
       };
     }
-    const { replBridgeEnabled: _2, ...next } = prev;
+    const next = { ...prev };
+    delete next.replBridgeEnabled;
     return next;
   });
 }