unity-agentic-tools 0.4.1 → 0.4.3

package/dist/index.js

@@ -205,7 +205,7 @@ var require_package = __commonJS((exports2, module2) => {
   module2.exports = {
     name: "unity-agentic-tools",
     packageManager: "bun@latest",
-    version: "0.4.1",
+    version: "0.4.3",
     description: "Fast, token-efficient Unity YAML parser for AI agents",
     exports: {
       ".": {
@@ -1848,6 +1848,19 @@ function build_guid_cache(project_path, raw) {
         }
       }
       return substringMatch;
+    },
+    find_all_by_name_exact(name, extension) {
+      const nameLower = name.toLowerCase().replace(/\.[^.]+$/, "");
+      const matches = [];
+      for (const [guid, assetPath] of Object.entries(raw)) {
+        if (extension && !assetPath.endsWith(extension))
+          continue;
+        const fileName = import_path5.basename(assetPath, import_path5.extname(assetPath)).toLowerCase();
+        if (fileName === nameLower) {
+          matches.push({ guid, path: assetPath });
+        }
+      }
+      return matches;
     }
   };
 }
@@ -1946,15 +1959,14 @@ var UNITY_CLASS_IDS = {
   114: "MonoBehaviour",
   115: "MonoScript",
   117: "Texture3D",
-  119: "NewAnimationTrack",
-  120: "Projector",
-  121: "LineRenderer",
-  122: "Flare",
-  123: "Halo",
-  124: "LensFlare",
-  125: "FlareLayer",
-  126: "HaloLayer",
-  127: "NavMeshProjectSettings",
+  118: "NewAnimationTrack",
+  119: "Projector",
+  120: "LineRenderer",
+  121: "Flare",
+  122: "Halo",
+  123: "LensFlare",
+  124: "FlareLayer",
+  126: "NavMeshProjectSettings",
   128: "Font",
   129: "PlayerSettings",
   130: "NamedObject",
@@ -1981,6 +1993,7 @@ var UNITY_CLASS_IDS = {
   164: "AudioReverbFilter",
   165: "AudioHighPassFilter",
   166: "AudioChorusFilter",
+  1660057539: "SceneRoots",
   167: "AudioReverbZone",
   168: "AudioEchoFilter",
   169: "AudioLowPassFilter",
@@ -2051,29 +2064,41 @@ var UNITY_CLASS_IDS = {
   257: "TargetJoint2D",
   258: "LightProbes",
   259: "LightProbeProxyVolume",
-  260: "SampleClip",
-  261: "AudioMixerSnapshot",
-  262: "AudioMixerGroup",
+  260: "SampleClipLegacy",
+  261: "AudioMixerSnapshotLegacy",
+  262: "AudioMixerGroupLegacy",
   265: "NScreenBridge",
-  271: "AssetBundleManifest",
+  271: "SampleClip",
   272: "UnityAdsManager",
-  273: "RuntimeInitializeOnLoadManager",
-  280: "UnityConnectSettings",
-  281: "AvatarMask",
-  290: "PlayableDirector",
-  292: "VideoPlayer",
-  293: "VideoClip",
-  294: "ParticleSystemForceField",
-  298: "SpriteMask",
+  273: "AudioMixerGroup",
+  280: "UnityConnectSettingsLegacy",
+  281: "AvatarMaskLegacy",
+  290: "AssetBundleManifest",
+  292: "VideoPlayerLegacy",
+  293: "VideoClipLegacy",
+  294: "ParticleSystemForceFieldLegacy",
+  298: "SpriteMaskLegacy",
   300: "WorldAnchor",
-  301: "OcclusionCullingData",
-  310: "PrefabInstance",
-  319: "TextureImporter",
-  363: "Preset",
+  301: "OcclusionCullingDataLegacy",
+  310: "UnityConnectSettings",
+  1001: "PrefabInstance",
+  319: "AvatarMask",
+  320: "PlayableDirector",
+  328: "VideoPlayer",
+  329: "VideoClip",
+  330: "ParticleSystemForceField",
+  331: "SpriteMask",
+  363: "OcclusionCullingData",
+  1006: "TextureImporter",
+  181963792: "Preset",
   687078895: "SpriteAtlas",
+  156049354: "Grid",
+  1742807556: "GridLayout",
   1839735485: "Tilemap",
-  1839735486: "TilemapCollider2D",
-  1839735487: "TilemapRenderer"
+  19719996: "TilemapCollider2D",
+  483693784: "TilemapRenderer",
+  1839735486: "TilemapCollider2DLegacy",
+  1839735487: "TilemapRendererLegacy"
 };
 var UNITY_CLASS_NAMES = Object.fromEntries(Object.entries(UNITY_CLASS_IDS).map(([id, name]) => [name, parseInt(id, 10)]));
 function get_class_id_name(class_id) {
@@ -2147,8 +2172,12 @@ function resolve_source_prefab(doc, file_path, project_path) {
     prefab_instance_block: pi_block
   };
 }
-function resolveScriptGuid(script, projectPath) {
+function resolveScriptGuid(script, projectPath, options) {
+  const strictExactName = options?.strict_exact_name === true;
   if (/^[a-f0-9]{32}$/i.test(script)) {
+    if (/^0{32}$/i.test(script)) {
+      throw new Error(`Invalid script GUID "${script}": all-zero GUID is not allowed. Provide a real script GUID from a .meta file.`);
+    }
     return { guid: script.toLowerCase(), path: null };
   }
   if (script.endsWith(".cs")) {
@@ -2173,9 +2202,20 @@ function resolveScriptGuid(script, projectPath) {
   if (projectPath) {
     const guidCache = load_guid_cache(projectPath);
     if (guidCache) {
-      const result = guidCache.find_by_name(script, ".cs");
-      if (result)
-        return result;
+      if (strictExactName) {
+        const exactMatches = guidCache.find_all_by_name_exact(script, ".cs");
+        if (exactMatches.length === 1) {
+          return exactMatches[0];
+        }
+        if (exactMatches.length > 1) {
+          const paths = exactMatches.map((m) => m.path).join(", ");
+          throw new Error(`Ambiguous type "${script}": found ${exactMatches.length} exact script name matches (${paths}). ` + 'Use a qualified name (e.g., "Namespace.TypeName") or provide the full script path.');
+        }
+      } else {
+        const result = guidCache.find_by_name(script, ".cs");
+        if (result)
+          return result;
+      }
     }
     const registryPath = path3.join(projectPath, ".unity-agentic", "type-registry.json");
     if (import_fs8.existsSync(registryPath)) {
@@ -2326,16 +2366,49 @@ function resolveScriptGuid(script, projectPath) {
         continue;
       try {
         const cache = JSON.parse(import_fs8.readFileSync(cachePath, "utf-8"));
+        const exactMatches = [];
         for (const [guid, assetPath] of Object.entries(cache)) {
           if (!assetPath.endsWith(".cs"))
             continue;
           const fileName = path3.basename(assetPath, ".cs").toLowerCase();
           if (fileName === scriptNameLower || classNameOnly && fileName === classNameOnly) {
-            return { guid, path: assetPath };
+            exactMatches.push({ guid, path: assetPath });
           }
         }
-      } catch {}
+        if (exactMatches.length === 1) {
+          return exactMatches[0];
+        }
+        if (exactMatches.length > 1) {
+          const paths = exactMatches.map((m) => m.path).join(", ");
+          throw new Error(`Ambiguous type "${script}": found ${exactMatches.length} exact script name matches (${paths}). ` + 'Use a qualified name (e.g., "Namespace.TypeName") or provide the full script path.');
+        }
+      } catch (err) {
+        if (err instanceof Error && err.message.startsWith("Ambiguous type")) {
+          throw err;
+        }
+      }
+    }
+    if (strictExactName) {
+      return null;
     }
+    try {
+      const assetsDir = path3.join(projectPath, "Assets");
+      if (import_fs8.existsSync(assetsDir)) {
+        const entries = import_fs8.readdirSync(assetsDir, { recursive: true, withFileTypes: false });
+        for (const entry of entries) {
+          if (!entry.endsWith(".cs"))
+            continue;
+          const fileName = path3.basename(entry, ".cs").toLowerCase();
+          if (fileName === scriptNameLower || classNameOnly && fileName === classNameOnly) {
+            const fullPath = path3.join(assetsDir, entry);
+            const guid = extractGuidFromMeta(fullPath + ".meta");
+            if (guid) {
+              return { guid, path: path3.join("Assets", entry) };
+            }
+          }
+        }
+      }
+    } catch {}
   }
   return null;
 }
@@ -2387,19 +2460,38 @@ function resolveAssetPathToPPtr(value, file_path, project_path) {
     return null;
   return `{fileID: ${mapping.fileID}, guid: ${guid}, type: ${mapping.type}}`;
 }
-function resolve_script_with_fields(script, project_path) {
-  const resolved = resolveScriptGuid(script, project_path);
+function detect_abstract_class_in_source(file_path, class_name) {
+  try {
+    const source = import_fs8.readFileSync(file_path, "utf-8");
+    const escaped_name = class_name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const pattern = new RegExp(`(^|[^\\w])abstract\\s+class\\s+${escaped_name}(?=$|[^\\w])`, "m");
+    return pattern.test(source);
+  } catch {
+    return false;
+  }
+}
+function resolve_script_with_fields(script, project_path, options) {
+  const resolved = resolveScriptGuid(script, project_path, options);
   if (!resolved)
     return null;
   const result = {
     guid: resolved.guid,
     path: resolved.path
   };
+  if (resolved.path && resolved.path.endsWith(".cs")) {
+    const full_path = path3.isAbsolute(resolved.path) ? resolved.path : project_path ? path3.join(project_path, resolved.path) : resolved.path;
+    if (import_fs8.existsSync(full_path)) {
+      const class_name = script.includes(".") ? script.split(".").pop() : script;
+      if (class_name.length > 0) {
+        result.is_abstract = detect_abstract_class_in_source(full_path, class_name);
+      }
+    }
+  }
   if (!project_path)
     return result;
   if (resolved.path) {
     try {
-      const full_path = resolved.path.startsWith("/") ? resolved.path : path3.join(project_path, resolved.path);
+      const full_path = path3.isAbsolute(resolved.path) ? resolved.path : path3.join(project_path, resolved.path);
       if (!import_fs8.existsSync(full_path)) {
         result.extraction_error = `Script file not found at resolved path: ${full_path}`;
       } else if (resolved.path.endsWith(".cs")) {
@@ -2413,6 +2505,10 @@ function resolve_script_with_fields(script, project_path) {
             result.fields = chosen.fields;
             result.base_class = chosen.baseClass ?? undefined;
             result.kind = chosen.kind;
+            result.class_name = chosen.name;
+            if (chosen.name) {
+              result.is_abstract = detect_abstract_class_in_source(full_path, chosen.name);
+            }
           }
         } else {
           result.extraction_error = "Native extractSerializedFields function not available";
@@ -2490,8 +2586,8 @@ function build_type_lookup(project_path) {
   const assetsDir = path3.join(project_path, "Assets");
   const csIndex = new Map;
   try {
-    const { readdirSync: readdirSync4 } = require("fs");
-    const entries = readdirSync4(assetsDir, { recursive: true, withFileTypes: false });
+    const { readdirSync: readdirSync5 } = require("fs");
+    const entries = readdirSync5(assetsDir, { recursive: true, withFileTypes: false });
     for (const entry of entries) {
       if (typeof entry === "string" && entry.endsWith(".cs")) {
         const basename4 = entry.substring(entry.lastIndexOf("/") + 1).replace(/\.cs$/, "");
@@ -3512,7 +3608,21 @@ class UnityDocument {
         }
       }
     }
-    return transform_ids;
+    const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const name_pattern = new RegExp(`propertyPath: m_Name\\s*\\n\\s*value:\\s*${escaped}\\s*$`, "m");
+    for (const block of this._blocks) {
+      if ((block.class_id === 1001 || block.class_id === 310) && name_pattern.test(block.raw)) {
+        const pi_id = block.file_id;
+        const pi_ref_pattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${pi_id}\\}`);
+        const stripped_transform = this._blocks.find((b) => (b.class_id === 4 || b.class_id === 224) && b.is_stripped && pi_ref_pattern.test(b.raw));
+        if (stripped_transform) {
+          transform_ids.push(stripped_transform.file_id);
+        } else {
+          transform_ids.push(pi_id);
+        }
+      }
+    }
+    return Array.from(new Set(transform_ids));
   }
   require_unique_game_object(name_or_id) {
     if (/^-?\d+$/.test(name_or_id)) {
@@ -3541,10 +3651,7 @@ class UnityDocument {
       if (!block) {
         return { error: `Block with fileID ${name_or_id} not found` };
       }
-      if (block.class_id === 4) {
-        return block;
-      }
-      if (block.class_id === 224) {
+      if (block.class_id === 4 || block.class_id === 224 || block.class_id === 1001 || block.class_id === 310) {
         return block;
       }
       if (block.class_id === 1) {
@@ -3557,15 +3664,40 @@ class UnityDocument {
         }
         return { error: `Transform for GameObject fileID ${name_or_id} not found` };
       }
-      return { error: `fileID ${name_or_id} is not a GameObject or Transform (class ${block.class_id})` };
+      return { error: `fileID ${name_or_id} is not a GameObject, Transform, or PrefabInstance (class ${block.class_id})` };
     }
     const transform_ids = this.find_transforms_by_name(name_or_id);
     if (transform_ids.length === 0) {
-      return { error: `GameObject "${name_or_id}" not found` };
+      return { error: `Object "${name_or_id}" not found` };
     }
     if (transform_ids.length > 1) {
-      const go_ids = this.find_game_objects_by_name(name_or_id).map((b) => b.file_id).join(", ");
-      return { error: `Multiple GameObjects named "${name_or_id}" found (fileIDs: ${go_ids}). Use numeric fileID to specify which one.` };
+      const entity_ids = [];
+      for (const tid of transform_ids) {
+        const block = this.find_by_file_id(tid);
+        if (block) {
+          if (block.class_id === 4 || block.class_id === 224) {
+            const go_match = block.raw.match(/m_GameObject:\s*\{fileID:\s*(-?\d+)\}/);
+            if (go_match) {
+              entity_ids.push(go_match[1]);
+            } else {
+              entity_ids.push(tid);
+            }
+          } else if (block.class_id === 1001 || block.class_id === 310) {
+            entity_ids.push(tid);
+          } else if (block.is_stripped) {
+            const pi_match = block.raw.match(/m_PrefabInstance:\s*\{fileID:\s*(-?\d+)\}/);
+            if (pi_match) {
+              entity_ids.push(pi_match[1]);
+            } else {
+              entity_ids.push(tid);
+            }
+          } else {
+            entity_ids.push(tid);
+          }
+        }
+      }
+      const ids_str = Array.from(new Set(entity_ids)).join(", ");
+      return { error: `Multiple GameObjects/PrefabInstances named "${name_or_id}" found (fileIDs: ${ids_str}). Use numeric fileID to specify which one.` };
     }
     const transform = this.find_by_file_id(transform_ids[0]);
     if (!transform) {
@@ -3593,7 +3725,7 @@ class UnityDocument {
           if (t_block.class_id === 4 && t_block.is_stripped) {
             let name = "Variant";
             for (const pi_block of this._blocks) {
-              if (pi_block.class_id === 1001) {
+              if (pi_block.class_id === 1001 || pi_block.class_id === 310) {
                 const name_mod = pi_block.raw.match(/propertyPath: m_Name\s*\n\s*value:\s*(.+)/);
                 if (name_mod) {
                   name = name_mod[1].trim();
@@ -3746,7 +3878,7 @@ class UnityDocument {
   }
   add_child_to_parent(parent_id, child_id) {
     const parent = this.find_by_file_id(parent_id);
-    if (!parent || parent.class_id !== 4)
+    if (!parent || parent.class_id !== 4 && parent.class_id !== 224)
       return false;
     let raw = parent.raw;
     const inline_empty = /m_Children:\s*\[\]/;
@@ -3782,7 +3914,7 @@ class UnityDocument {
   }
   remove_child_from_parent(parent_id, child_id) {
     const parent = this.find_by_file_id(parent_id);
-    if (!parent || parent.class_id !== 4)
+    if (!parent || parent.class_id !== 4 && parent.class_id !== 224)
       return false;
     let raw = parent.raw;
     const child_line = new RegExp(`\\n[ \\t]*- \\{fileID: ${child_id}\\}`);
@@ -3803,7 +3935,49 @@ class UnityDocument {
   }
   _collect_hierarchy_recursive(transform_id, result) {
     const transform = this.find_by_file_id(transform_id);
-    if (!transform || transform.class_id !== 4)
+    if (!transform)
+      return;
+    if (transform.class_id === 1001 || transform.class_id === 310) {
+      const pi_id = transform.file_id;
+      const pi_ref_pattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${pi_id}\\}`);
+      for (const block of this._blocks) {
+        if (block.is_stripped && pi_ref_pattern.test(block.raw)) {
+          result.add(block.file_id);
+          if (block.class_id === 4 || block.class_id === 224) {
+            this._collect_hierarchy_recursive(block.file_id, result);
+          }
+        }
+      }
+      const added_go_matches = transform.raw.matchAll(/addedObject:[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)\}/g);
+      for (const match of added_go_matches) {
+        const added_id = match[1];
+        if (added_id !== "0" && !result.has(added_id)) {
+          result.add(added_id);
+          const added_block = this.find_by_file_id(added_id);
+          if (added_block && added_block.class_id === 1) {
+            const comp_matches = added_block.raw.matchAll(/component:[ \t]*\{fileID:[ \t]*(-?\d+)\}/g);
+            for (const cm of comp_matches) {
+              const comp_block = this.find_by_file_id(cm[1]);
+              if (comp_block && (comp_block.class_id === 4 || comp_block.class_id === 224)) {
+                if (!result.has(cm[1])) {
+                  result.add(cm[1]);
+                  this._collect_hierarchy_recursive(cm[1], result);
+                }
+                break;
+              }
+            }
+          }
+        }
+      }
+      const added_comp_matches = transform.raw.matchAll(/addedObject:[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)\}/g);
+      for (const match of added_comp_matches) {
+        const added_id = match[1];
+        if (added_id !== "0")
+          result.add(added_id);
+      }
+      return;
+    }
+    if (transform.class_id !== 4 && transform.class_id !== 224)
       return;
     const children_section = transform.raw.match(/m_Children:[\s\S]*?(?=\s*m_Father:)/);
     if (!children_section)
@@ -3838,14 +4012,21 @@ class UnityDocument {
     if (parent_id === "0") {
       let count = 0;
       for (const block of this._blocks) {
-        if (block.class_id === 4 && /m_Father:\s*\{fileID:\s*0\}/.test(block.raw)) {
+        if ((block.class_id === 4 || block.class_id === 224) && /m_Father:\s*\{fileID:\s*0\}/.test(block.raw)) {
           count++;
+        } else if ((block.class_id === 1001 || block.class_id === 310) && /m_TransformParent:\s*\{fileID:\s*0\}/.test(block.raw)) {
+          const pi_id = block.file_id;
+          const pi_ref_pattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${pi_id}\\}`);
+          const has_stripped = this._blocks.some((b) => (b.class_id === 4 || b.class_id === 224) && b.is_stripped && pi_ref_pattern.test(b.raw));
+          if (!has_stripped) {
+            count++;
+          }
         }
       }
       return count;
     }
     const parent = this.find_by_file_id(parent_id);
-    if (!parent || parent.class_id !== 4)
+    if (!parent || parent.class_id !== 4 && parent.class_id !== 224)
       return 0;
     const children_match = parent.raw.match(/m_Children:[\s\S]*?(?=\s*m_Father:)/);
     if (children_match) {
@@ -3878,19 +4059,97 @@ ${new_children}`);
     }
     return false;
   }
+  add_root_to_scene_roots(root_id) {
+    const pi_block = this.find_by_file_id(root_id);
+    if (pi_block && (pi_block.class_id === 1001 || pi_block.class_id === 310)) {
+      const pi_ref_pattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${root_id}\\}`);
+      const stripped_root = this._blocks.find((b) => (b.class_id === 4 || b.class_id === 224) && b.is_stripped && pi_ref_pattern.test(b.raw) && /m_Father:\s*\{fileID:\s*0\}/.test(b.raw));
+      if (stripped_root) {
+        root_id = stripped_root.file_id;
+      }
+    }
+    const sr_blocks = [...this.find_by_class_id(166), ...this.find_by_class_id(1660057539)];
+    if (sr_blocks.length === 0)
+      return false;
+    const sr_block = sr_blocks[0];
+    let raw = sr_block.raw;
+    const roots_pattern = /(m_Roots:\s*\n(?:\s*-\s*\{fileID:\s*-?\d+\}\s*\n)*)/;
+    if (roots_pattern.test(raw)) {
+      raw = raw.replace(roots_pattern, `$1  - {fileID: ${root_id}}
+`);
+      sr_block.replace_raw(raw);
+      return true;
+    }
+    const empty_roots = /m_Roots:\s*\[\]/;
+    if (empty_roots.test(raw)) {
+      raw = raw.replace(empty_roots, `m_Roots:
+  - {fileID: ${root_id}}`);
+      sr_block.replace_raw(raw);
+      return true;
+    }
+    return false;
+  }
+  remove_root_from_scene_roots(root_id) {
+    const pi_block = this.find_by_file_id(root_id);
+    if (pi_block && (pi_block.class_id === 1001 || pi_block.class_id === 310)) {
+      const pi_ref_pattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${root_id}\\}`);
+      const stripped_root = this._blocks.find((b) => (b.class_id === 4 || b.class_id === 224) && b.is_stripped && pi_ref_pattern.test(b.raw));
+      if (stripped_root) {
+        this._remove_id_from_scene_roots(stripped_root.file_id);
+      }
+    }
+    return this._remove_id_from_scene_roots(root_id);
+  }
+  _remove_id_from_scene_roots(id) {
+    const sr_blocks = [...this.find_by_class_id(166), ...this.find_by_class_id(1660057539)];
+    if (sr_blocks.length === 0)
+      return false;
+    const sr_block = sr_blocks[0];
+    let raw = sr_block.raw;
+    const root_line = new RegExp(`\\n[ \\t]*- \\{fileID: ${id}\\}`);
+    if (!root_line.test(raw))
+      return false;
+    raw = raw.replace(root_line, "");
+    sr_block.replace_raw(raw);
+    return true;
+  }
   reorder_entities(ordered_transform_ids) {
     const entity_groups = [];
     for (const transform_id of ordered_transform_ids) {
-      const transform = this.find_by_file_id(transform_id);
-      if (!transform)
+      const block = this.find_by_file_id(transform_id);
+      if (!block)
         continue;
-      const go_match = transform.raw.match(/m_GameObject:\s*\{fileID:\s*(-?\d+)\}/);
-      if (!go_match)
+      let pi_block = null;
+      if (block.class_id === 1001 || block.class_id === 310) {
+        pi_block = block;
+      } else if (block.is_stripped) {
+        const pi_match = block.raw.match(/m_PrefabInstance:\s*\{fileID:\s*(-?\d+)\}/);
+        if (pi_match) {
+          const found = this.find_by_file_id(pi_match[1]);
+          if (found && (found.class_id === 1001 || found.class_id === 310)) {
+            pi_block = found;
+          }
+        }
+      }
+      if (pi_block) {
+        const group = [pi_block.file_id];
+        const hierarchy = this.collect_hierarchy(pi_block.file_id);
+        for (const id of hierarchy)
+          group.push(id);
+        entity_groups.push(group);
         continue;
+      }
+      const go_match = block.raw.match(/m_GameObject:\s*\{fileID:\s*(-?\d+)\}/);
+      if (!go_match) {
+        entity_groups.push([transform_id]);
+        continue;
+      }
       const go_id = go_match[1];
       const go = this.find_by_file_id(go_id);
-      if (!go)
+      if (!go) {
+        entity_groups.push([transform_id]);
         continue;
+      }
       const comp_ids = [];
       const comp_matches = go.raw.matchAll(/component:\s*\{fileID:\s*(-?\d+)\}/g);
       for (const m of comp_matches) {
@@ -4252,48 +4511,320 @@ function find_game_object_in_variant(doc, name, file_path, project_path) {
   }
   return null;
 }
-function appendToAddedGameObjects(doc, piId, targetSourceRef, newGoId) {
-  const piBlock = doc.find_by_file_id(piId);
-  if (!piBlock)
-    return;
-  const entry = `
-    - targetCorrespondingSourceObject: ${targetSourceRef}
-      insertIndex: -1
-      addedObject: {fileID: ${newGoId}}`;
-  let raw = piBlock.raw;
-  const emptyPattern = /m_AddedGameObjects:[ \t]*\[\]/;
-  if (emptyPattern.test(raw)) {
-    raw = raw.replace(emptyPattern, `m_AddedGameObjects:${entry}`);
-    piBlock.replace_raw(raw);
-    return;
+function parsePrefabRef(refText) {
+  const fileIdMatch = refText.match(/fileID:[ \t]*(-?\d+)/i);
+  if (!fileIdMatch)
+    return null;
+  const guidMatch = refText.match(/guid:[ \t]*([a-f0-9]{32})/i);
+  const typeMatch = refText.match(/type:[ \t]*(-?\d+)/i);
+  return {
+    file_id: fileIdMatch[1],
+    guid: guidMatch ? guidMatch[1].toLowerCase() : undefined,
+    type: typeMatch ? typeMatch[1] : undefined
+  };
+}
+function extractPrefabSourceGuid(prefabInstanceRaw) {
+  const sourceMatch = prefabInstanceRaw.match(/m_SourcePrefab:[ \t]*\{[^}]*guid:[ \t]*([a-f0-9]{32})/i);
+  return sourceMatch ? sourceMatch[1].toLowerCase() : null;
+}
+function normalizePrefabRef(refText, sourceGuid) {
+  const parsed = parsePrefabRef(refText);
+  if (!parsed) {
+    return { error: `Invalid reference "${refText}". Expected format: {fileID: N, guid: ..., type: T}` };
+  }
+  const guid = parsed.guid ?? sourceGuid;
+  if (!guid) {
+    return { error: `Reference "${refText}" is missing guid and source prefab guid could not be inferred.` };
   }
-  const existingPattern = /(m_AddedGameObjects:[ \t]*\n(?:[ \t]+-[\s\S]*?(?=\n[ \t]+m_|$))*)/;
-  if (existingPattern.test(raw)) {
-    raw = raw.replace(existingPattern, `$1${entry}`);
-    piBlock.replace_raw(raw);
+  if (!/^[a-f0-9]{32}$/i.test(guid)) {
+    return { error: `Invalid guid in reference "${refText}". Expected 32-character hex GUID.` };
   }
+  const type = parsed.type ?? "3";
+  if (!/^-?\d+$/.test(type)) {
+    return { error: `Invalid type in reference "${refText}". Expected an integer type value.` };
+  }
+  return {
+    ref: {
+      file_id: parsed.file_id,
+      guid,
+      type
+    }
+  };
 }
-function appendToAddedComponents(doc, piId, targetSourceRef, newComponentId) {
-  const piBlock = doc.find_by_file_id(piId);
-  if (!piBlock)
-    return;
-  const entry = `
-    - targetCorrespondingSourceObject: ${targetSourceRef}
-      insertIndex: -1
-      addedObject: {fileID: ${newComponentId}}`;
-  let raw = piBlock.raw;
-  const emptyPattern = /m_AddedComponents:[ \t]*\[\]/;
-  if (emptyPattern.test(raw)) {
-    raw = raw.replace(emptyPattern, `m_AddedComponents:${entry}`);
-    piBlock.replace_raw(raw);
-    return;
+function serializePrefabRef(ref) {
+  return `{fileID: ${ref.file_id}, guid: ${ref.guid}, type: ${ref.type}}`;
+}
+function ensurePrefabModificationSerializedVersion(prefabInstanceBlock) {
+  const raw = prefabInstanceBlock.raw;
+  const updated = raw.replace(/(^([ \t]*)m_Modification:[ \t]*\n)(?!\2[ \t]+serializedVersion:[ \t]*\d+)/m, (_match, prefix, indent) => `${prefix}${indent}  serializedVersion: 3
+`);
+  if (updated === raw) {
+    return false;
+  }
+  prefabInstanceBlock.replace_raw(updated);
+  return true;
+}
+function addedOverrideEntryKey(entry) {
+  return `${entry.target.file_id}|${entry.target.guid}|${entry.target.type}|${entry.insert_index}|${entry.added_object_file_id}`;
+}
+function splitPrefabArraySection(rawText, key) {
+  const lines = rawText.split(`
+`);
+  const keyPattern = new RegExp(`^([ 	]*)${key}:[ 	]*(.*)$`);
+  let keyIndex = -1;
+  let indent = "";
+  for (let i = 0;i < lines.length; i++) {
+    const match = lines[i].match(keyPattern);
+    if (match) {
+      keyIndex = i;
+      indent = match[1];
+      break;
+    }
+  }
+  if (keyIndex === -1) {
+    return null;
+  }
+  const keyIndentLen = indent.length;
+  let sectionEnd = keyIndex + 1;
+  for (let i = keyIndex + 1;i < lines.length; i++) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.length === 0) {
+      sectionEnd = i + 1;
+      continue;
+    }
+    const indentLen = (line.match(/^[ \t]*/) || [""])[0].length;
+    if (indentLen < keyIndentLen) {
+      break;
+    }
+    if (indentLen === keyIndentLen && !trimmed.startsWith("-") && /^[A-Za-z_][A-Za-z0-9_]*:/.test(trimmed)) {
+      break;
+    }
+    sectionEnd = i + 1;
+  }
+  return {
+    lines,
+    key_index: keyIndex,
+    section_end: sectionEnd,
+    indent
+  };
+}
+function collectAddedOverrideEntries(lines, key_index, section_end, sourceGuid) {
+  const sectionLines = lines.slice(key_index + 1, section_end);
+  const dedup = new Map;
+  let i = 0;
+  while (i < sectionLines.length) {
+    const line = sectionLines[i];
+    const trimmed = line.trimStart();
+    if (!trimmed.startsWith("-")) {
+      i++;
+      continue;
+    }
+    const entryIndent = (line.match(/^[ \t]*/) || [""])[0].length;
+    const entryLines = [line];
+    i++;
+    while (i < sectionLines.length) {
+      const nextLine = sectionLines[i];
+      const nextTrimmed = nextLine.trim();
+      const nextIndent = (nextLine.match(/^[ \t]*/) || [""])[0].length;
+      if (nextTrimmed.length > 0 && nextIndent === entryIndent && nextTrimmed.startsWith("-")) {
+        break;
+      }
+      entryLines.push(nextLine);
+      i++;
+    }
+    const entryText = entryLines.join(`
+`);
+    const targetMatch = entryText.match(/targetCorrespondingSourceObject:[ \t]*(\{[^}]+\})/);
+    const insertMatch = entryText.match(/insertIndex:[ \t]*(-?\d+)/);
+    const addedObjectMatch = entryText.match(/addedObject:[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)/);
+    if (!targetMatch || !addedObjectMatch) {
+      continue;
+    }
+    const normalizedTarget = normalizePrefabRef(targetMatch[1], sourceGuid).ref;
+    if (!normalizedTarget) {
+      continue;
+    }
+    const insertIndex = insertMatch ? Number.parseInt(insertMatch[1], 10) : -1;
+    const entry = {
+      target: normalizedTarget,
+      insert_index: Number.isNaN(insertIndex) ? -1 : insertIndex,
+      added_object_file_id: addedObjectMatch[1]
+    };
+    const dedupKey = addedOverrideEntryKey(entry);
+    if (!dedup.has(dedupKey)) {
+      dedup.set(dedupKey, entry);
+    }
   }
-  const existingPattern = /(m_AddedComponents:[ \t]*\n(?:[ \t]+-[\s\S]*?(?=\n[ \t]+m_|$))*)/;
-  if (existingPattern.test(raw)) {
-    raw = raw.replace(existingPattern, `$1${entry}`);
-    piBlock.replace_raw(raw);
+  return [...dedup.values()];
+}
+function appendToAddedOverrideArray(doc, piId, key, targetSourceRef, newObjectId) {
+  const piBlock = doc.find_by_file_id(piId);
+  if (!piBlock) {
+    return { success: false, error: `PrefabInstance with fileID ${piId} not found` };
+  }
+  ensurePrefabModificationSerializedVersion(piBlock);
+  const split = splitPrefabArraySection(piBlock.raw, key);
+  if (!split) {
+    return { success: false, error: `${key} property not found in PrefabInstance ${piId}` };
+  }
+  const sourceGuid = extractPrefabSourceGuid(piBlock.raw);
+  const normalizedTarget = normalizePrefabRef(targetSourceRef, sourceGuid);
+  if (!normalizedTarget.ref) {
+    return { success: false, error: normalizedTarget.error };
+  }
+  const candidate = {
+    target: normalizedTarget.ref,
+    insert_index: -1,
+    added_object_file_id: newObjectId
+  };
+  const candidateKey = addedOverrideEntryKey(candidate);
+  const existing = collectAddedOverrideEntries(split.lines, split.key_index, split.section_end, sourceGuid);
+  if (existing.some((entry) => addedOverrideEntryKey(entry) === candidateKey)) {
+    return { success: true, changed: false };
+  }
+  const entryLines = [
+    `${split.indent}- targetCorrespondingSourceObject: ${serializePrefabRef(candidate.target)}`,
+    `${split.indent}  insertIndex: ${candidate.insert_index}`,
+    `${split.indent}  addedObject: {fileID: ${candidate.added_object_file_id}}`
+  ];
+  const keyLine = split.lines[split.key_index].trim();
+  let insertIndex = split.section_end;
+  while (insertIndex > split.key_index + 1 && split.lines[insertIndex - 1].trim().length === 0) {
+    insertIndex--;
+  }
+  let updatedLines;
+  if (keyLine === `${key}: []`) {
+    const replacement = [`${split.indent}${key}:`, ...entryLines];
+    updatedLines = [
+      ...split.lines.slice(0, split.key_index),
+      ...replacement,
+      ...split.lines.slice(split.section_end)
+    ];
+  } else {
+    updatedLines = [
+      ...split.lines.slice(0, insertIndex),
+      ...entryLines,
+      ...split.lines.slice(insertIndex)
+    ];
   }
+  piBlock.replace_raw(updatedLines.join(`
+`));
+  return { success: true, changed: true };
+}
+function appendToAddedGameObjects(doc, piId, targetSourceRef, newGoId) {
+  return appendToAddedOverrideArray(doc, piId, "m_AddedGameObjects", targetSourceRef, newGoId);
 }
+function appendToAddedComponents(doc, piId, targetSourceRef, newComponentId) {
+  return appendToAddedOverrideArray(doc, piId, "m_AddedComponents", targetSourceRef, newComponentId);
+}
+var COMPONENT_FULL_TEMPLATES = {
+  65: (gameObjectId) => `  m_GameObject: {fileID: ${gameObjectId}}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}`,
+  82: (gameObjectId) => `  m_GameObject: {fileID: ${gameObjectId}}
+  m_Enabled: 1
+  serializedVersion: 4
+  OutputAudioMixerGroup: {fileID: 0}
+  m_audioClip: {fileID: 0}
+  m_PlayOnAwake: 1
+  m_Volume: 1
+  m_Pitch: 1
+  Loop: 0
+  Mute: 0
+  Spatialize: 0
+  SpatializePostEffects: 0
+  Priority: 128
+  DopplerLevel: 1
+  MinDistance: 1
+  MaxDistance: 500
+  Pan2D: 0
+  rolloffMode: 0
+  BypassEffects: 0
+  BypassListenerEffects: 0
+  BypassReverbZones: 0
+  rolloffCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  panLevelCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  spreadCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  reverbZoneMixCustomCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4`
+};
 var COMPONENT_DEFAULTS = {
   20: `  serializedVersion: 2
   m_ClearFlags: 1
@@ -4420,6 +4951,17 @@ var COMPONENT_DEFAULTS = {
   m_IgnoreParentGroups: 0`
 };
 function createGenericComponentYAML(componentName, classId, componentId, gameObjectId) {
+  const fullTemplate = COMPONENT_FULL_TEMPLATES[classId];
+  if (fullTemplate) {
+    return `--- !u!${classId} &${componentId}
+${componentName}:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+${fullTemplate(gameObjectId)}
+`;
+  }
   const defaults = COMPONENT_DEFAULTS[classId] ? `
 ` + COMPONENT_DEFAULTS[classId] + `
 ` : "";
@@ -4572,7 +5114,14 @@ function createGameObject(options) {
     doc.add_child_to_parent(parentTransformIdStr, transformIdStr);
   }
   if (variantPiId && strippedSourceRef) {
-    appendToAddedGameObjects(doc, variantPiId, strippedSourceRef, gameObjectIdStr);
+    const appendResult = appendToAddedGameObjects(doc, variantPiId, strippedSourceRef, gameObjectIdStr);
+    if (!appendResult.success) {
+      return {
+        success: false,
+        file_path,
+        error: appendResult.error || `Failed to update m_AddedGameObjects for PrefabInstance ${variantPiId}`
+      };
+    }
   }
   const saveResult = doc.save();
   if (!saveResult.success) {
@@ -5055,6 +5604,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
+    serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
     - target: {fileID: ${rootInfo.game_object.file_id}, guid: ${sourceGuid}, type: 3}
@@ -5141,6 +5691,9 @@ function createScriptableObject(options) {
   if (resolved.kind === "enum" || resolved.kind === "interface") {
     return { success: false, output_path, error: `"${script}" is ${resolved.kind === "enum" ? "an enum" : "an interface"}, not a ScriptableObject.` };
   }
+  if (resolved.is_abstract) {
+    return { success: false, output_path, error: `"${script}" is abstract and cannot be instantiated as a ScriptableObject asset.` };
+  }
   if (resolved.base_class && resolved.base_class !== "ScriptableObject") {
     return { success: false, output_path, error: `"${script}" extends ${resolved.base_class}, not ScriptableObject. Cannot create as a ScriptableObject asset.` };
   }
@@ -5341,6 +5894,8 @@ function is_valid_component_base(base_class, project_path, depth = 0) {
         }
         if (!fullPath.endsWith(".cs") || !import_fs10.existsSync(fullPath)) {
           if (match.kind === "class") {
+            if (fullPath.includes("Assembly-CSharp.dll"))
+              return true;
             return is_likely_component_base_name(base_class);
           }
         }
@@ -5422,6 +5977,13 @@ function addComponent(options) {
   }
   const gameObjectId = gameObjectIdStr;
   const classId = get_class_id(component_type);
+  if (classId === 114 && component_type.toLowerCase() === "monobehaviour") {
+    return {
+      success: false,
+      file_path,
+      error: '"MonoBehaviour" is a base class, not a concrete component script. Provide a script type/path/GUID (for example, "PlayerController", "Assets/Scripts/PlayerController.cs", or a 32-char GUID).'
+    };
+  }
   let duplicateWarning;
   const goBlock = doc.find_by_file_id(gameObjectIdStr);
   if (goBlock && classId !== null) {
@@ -5446,7 +6008,7 @@ function addComponent(options) {
   } else {
     let resolved;
     try {
-      resolved = resolve_script_with_fields(component_type, project_path);
+      resolved = resolve_script_with_fields(component_type, project_path, { strict_exact_name: true });
     } catch (e) {
       return {
         success: false,
@@ -5484,13 +6046,20 @@ function addComponent(options) {
         error: `"${component_type}" is ${resolved.kind === "enum" ? "an enum" : "an interface"}, not a MonoBehaviour. Cannot add as a component.`
       };
     }
-    if (resolved.base_class && !COMPONENT_BASE_CLASSES.has(resolved.base_class) && !is_valid_component_base(resolved.base_class, project_path)) {
+    if (resolved.is_abstract) {
       return {
         success: false,
         file_path,
-        error: `"${component_type}" extends ${resolved.base_class}, which does not inherit from MonoBehaviour. Cannot add as a component. If this is incorrect, ensure the type registry is up to date ("setup" command).`
+        error: `"${component_type}" is abstract and cannot be added as a component.`
       };
     }
+    if (resolved.base_class && !COMPONENT_BASE_CLASSES.has(resolved.base_class) && !is_valid_component_base(resolved.base_class, project_path)) {
+      const warn = `"${component_type}" extends ${resolved.base_class}, which does not inherit from MonoBehaviour. Adding anyway, but ensure the script is a valid component. (Re-run "setup" if the inheritance graph is stale).`;
+      if (!extractionError)
+        extractionError = warn;
+      else
+        extractionError += " " + warn;
+    }
     let version;
     if (project_path) {
       try {
@@ -5505,10 +6074,22 @@ function addComponent(options) {
     componentYAML = createMonoBehaviourYAML(componentId, gameObjectId, resolved.guid, resolved.fields, version, scriptFileId, type_lookup_comp);
     scriptGuid = resolved.guid;
     scriptPath = resolved.path || undefined;
-    extractionError = resolved.extraction_error;
+    if (resolved.extraction_error) {
+      if (!extractionError)
+        extractionError = resolved.extraction_error;
+      else
+        extractionError += " " + resolved.extraction_error;
+    }
   }
   if (variantInfo) {
-    appendToAddedComponents(doc, variantInfo.prefab_instance_id, variantInfo.source_ref, componentIdStr);
+    const appendResult = appendToAddedComponents(doc, variantInfo.prefab_instance_id, variantInfo.source_ref, componentIdStr);
+    if (!appendResult.success) {
+      return {
+        success: false,
+        file_path,
+        error: appendResult.error || `Failed to update m_AddedComponents for PrefabInstance ${variantInfo.prefab_instance_id}`
+      };
+    }
   } else {
     const added = addComponentToGameObject(doc, gameObjectIdStr, componentIdStr);
     if (!added) {
@@ -5697,6 +6278,56 @@ function validate_value_type(current_value, new_value) {
   }
   return null;
 }
+function findStrippedTransformForPrefabInstance(doc, prefabInstanceId) {
+  const piRefPattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${prefabInstanceId}\\}`);
+  for (const block of doc.blocks) {
+    if ((block.class_id === 4 || block.class_id === 224) && block.is_stripped && piRefPattern.test(block.raw)) {
+      return block;
+    }
+  }
+  return null;
+}
+function resolvePrefabRootOrderTarget(prefabInstanceBlock) {
+  const modificationPattern = /- target:\s*(\{[^}]+\})\s*\n\s*propertyPath:\s*('?)([^\n']+)\2/gm;
+  const transformPropertyPattern = /^m_(?:RootOrder|LocalPosition|LocalRotation|LocalScale|ConstrainProportionsScale)(?:\.|$)/;
+  let transformTarget = null;
+  for (const match of prefabInstanceBlock.raw.matchAll(modificationPattern)) {
+    const targetRef = match[1];
+    const propertyPath = match[3].trim();
+    if (propertyPath === "m_RootOrder") {
+      return targetRef;
+    }
+    if (!transformTarget && transformPropertyPattern.test(propertyPath)) {
+      transformTarget = targetRef;
+    }
+  }
+  return transformTarget;
+}
+function upsertPrefabRootOrderOverride(prefabInstanceBlock, newRootOrder) {
+  const existingRootOrderPattern = /(- target:\s*\{[^}]+\}\s*\n\s*propertyPath:\s*'?m_RootOrder'?\s*\n\s*value:\s*)([^\n]*)(\s*\n\s*objectReference:\s*\{[^}]+\})/m;
+  if (existingRootOrderPattern.test(prefabInstanceBlock.raw)) {
+    prefabInstanceBlock.replace_raw(prefabInstanceBlock.raw.replace(existingRootOrderPattern, `$1${newRootOrder}$3`));
+    return true;
+  }
+  const targetRef = resolvePrefabRootOrderTarget(prefabInstanceBlock) ?? "{fileID: 400000}";
+  const rootOrderOverride = `    - target: ${targetRef}
+` + `      propertyPath: m_RootOrder
+` + `      value: ${newRootOrder}
+` + "      objectReference: {fileID: 0}";
+  const removedPattern = /(\n\s*m_RemovedComponents:)/m;
+  if (removedPattern.test(prefabInstanceBlock.raw)) {
+    prefabInstanceBlock.replace_raw(prefabInstanceBlock.raw.replace(removedPattern, `
+${rootOrderOverride}$1`));
+    return true;
+  }
+  const modsPattern = /(m_Modifications:\s*\n)/;
+  if (modsPattern.test(prefabInstanceBlock.raw)) {
+    prefabInstanceBlock.replace_raw(prefabInstanceBlock.raw.replace(modsPattern, `$1${rootOrderOverride}
+`));
+    return true;
+  }
+  return false;
+}
 function isAncestor(doc, childTransformId, candidateAncestorTransformId) {
   let currentId = candidateAncestorTransformId;
   const visited = new Set;
@@ -5707,17 +6338,34 @@ function isAncestor(doc, childTransformId, candidateAncestorTransformId) {
       return false;
     visited.add(currentId);
     const block = doc.find_by_file_id(currentId);
-    if (!block || block.class_id !== 4)
+    if (!block)
+      break;
+    if (block.class_id === 1001 || block.class_id === 310) {
+      const parentMatch = block.raw.match(/m_TransformParent:\s*\{fileID:\s*(-?\d+)\}/);
+      currentId = parentMatch ? parentMatch[1] : "0";
+    } else if (block.class_id === 4 || block.class_id === 224) {
+      const fatherMatch = block.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
+      currentId = fatherMatch ? fatherMatch[1] : "0";
+    } else {
       break;
-    const fatherMatch = block.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
-    currentId = fatherMatch ? fatherMatch[1] : "0";
+    }
   }
   return false;
 }
 function resolveTransformByGameObjectId(doc, gameObjectFileId) {
   const found = doc.find_by_file_id(gameObjectFileId);
-  if (!found || found.class_id !== 1) {
-    return { error: `GameObject with fileID ${gameObjectFileId} not found` };
+  if (!found) {
+    return { error: `Block with fileID ${gameObjectFileId} not found` };
+  }
+  if (found.class_id === 4 || found.class_id === 224) {
+    return { id: gameObjectFileId };
+  }
+  if (found.class_id === 1001 || found.class_id === 310) {
+    const strippedTransform = findStrippedTransformForPrefabInstance(doc, gameObjectFileId);
+    return { id: strippedTransform ? strippedTransform.file_id : gameObjectFileId };
+  }
+  if (found.class_id !== 1) {
+    return { error: `fileID ${gameObjectFileId} is not a GameObject, Transform, or PrefabInstance (class ${found.class_id})` };
   }
   const componentMatch = found.raw.match(/m_Component:\s*\n\s*-\s*component:\s*\{fileID:\s*(-?\d+)\}/);
   if (!componentMatch) {
@@ -5873,7 +6521,7 @@ function editComponentByFileId(options) {
     return {
       success: false,
       file_path,
-      error: `Could not resolve "${new_value}" to asset reference. Ensure GUID cache exists (run "setup <project>" first).`
+      error: `Could not resolve "${new_value}" to asset reference. Ensure GUID cache exists (run "setup" first, or "setup -p <path>").`
     };
   }
   if (resolved !== undefined) {
@@ -5910,7 +6558,7 @@ function editComponentByFileId(options) {
   }
   const targetBlock = doc.find_by_file_id(file_id);
   if (!targetBlock) {
-    const hasPrefabInstance = doc.find_by_class_id(1001).length > 0;
+    const hasPrefabInstance = doc.find_by_class_id(1001).length > 0 || doc.find_by_class_id(310).length > 0;
     if (hasPrefabInstance) {
       return {
         success: false,
@@ -6263,10 +6911,26 @@ function reparentGameObject(options) {
   }
   const childBlock = doc.find_by_file_id(childTransformId);
   if (!childBlock) {
-    return { success: false, file_path, error: `Transform ${childTransformId} not found` };
+    return { success: false, file_path, error: `Transform or PrefabInstance ${childTransformId} not found` };
+  }
+  const childHierarchyTransformId = (() => {
+    if (childBlock.class_id === 4 || childBlock.class_id === 224) {
+      return childBlock.file_id;
+    }
+    if (childBlock.class_id === 1001 || childBlock.class_id === 310) {
+      const stripped = findStrippedTransformForPrefabInstance(doc, childBlock.file_id);
+      return stripped ? stripped.file_id : null;
+    }
+    return null;
+  })();
+  let oldParentTransformId = "0";
+  if (childBlock.class_id === 1001 || childBlock.class_id === 310) {
+    const parentMatch = childBlock.raw.match(/m_TransformParent:\s*\{fileID:\s*(-?\d+)\}/);
+    oldParentTransformId = parentMatch ? parentMatch[1] : "0";
+  } else {
+    const fatherMatch = childBlock.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
+    oldParentTransformId = fatherMatch ? fatherMatch[1] : "0";
   }
-  const fatherMatch = childBlock.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
-  const oldParentTransformId = fatherMatch ? fatherMatch[1] : "0";
   let newParentTransformId = "0";
   if (new_parent.toLowerCase() !== "root") {
     if (by_id || /^-?\d+$/.test(new_parent)) {
@@ -6293,11 +6957,55 @@ function reparentGameObject(options) {
     }
   }
   if (oldParentTransformId !== "0") {
-    doc.remove_child_from_parent(oldParentTransformId, childTransformId);
+    if (childHierarchyTransformId) {
+      doc.remove_child_from_parent(oldParentTransformId, childHierarchyTransformId);
+    } else {
+      doc.remove_child_from_parent(oldParentTransformId, childBlock.file_id);
+    }
+  } else {
+    if (childHierarchyTransformId) {
+      doc.remove_root_from_scene_roots(childHierarchyTransformId);
+    } else {
+      doc.remove_root_from_scene_roots(childBlock.file_id);
+    }
+  }
+  if (childBlock.class_id === 1001 || childBlock.class_id === 310) {
+    const tpPattern = new RegExp(`(m_TransformParent:\\s*)\\{fileID:\\s*(-?\\d+)\\}`);
+    if (tpPattern.test(childBlock.raw)) {
+      let updatedChildRaw = childBlock.raw.replace(tpPattern, `$1{fileID: ${newParentTransformId}}`);
+      childBlock.replace_raw(updatedChildRaw);
+    } else {
+      const modPattern = /(m_Modification:\s*\n)/;
+      const modIndentMatch = childBlock.raw.match(/^([ \t]*)m_Modification:/m);
+      const indent = modIndentMatch ? modIndentMatch[1] : "";
+      let updatedChildRaw = childBlock.raw.replace(modPattern, `$1${indent}  m_TransformParent: {fileID: ${newParentTransformId}}
+`);
+      childBlock.replace_raw(updatedChildRaw);
+    }
+  } else {
+    const fatherPattern = new RegExp(`(m_Father:\\s*)\\{fileID:\\s*\\d+\\}`);
+    if (fatherPattern.test(childBlock.raw)) {
+      let updatedChildRaw = childBlock.raw.replace(fatherPattern, `$1{fileID: ${newParentTransformId}}`);
+      childBlock.replace_raw(updatedChildRaw);
+    } else {
+      const anchorPattern = /^([ \t]*(?:m_GameObject|m_CorrespondingSourceObject|m_PrefabInstance):[ \t]*\{fileID:[ \t]*(-?\d+)[^}]*\}.*)/m;
+      const headerPattern = /(^--- !u!(?:4|224) &-?\d+ stripped\n(?:Rect)?Transform:)/m;
+      if (anchorPattern.test(childBlock.raw)) {
+        let updatedChildRaw = childBlock.raw.replace(anchorPattern, `$1
+  m_Father: {fileID: ${newParentTransformId}}`);
+        childBlock.replace_raw(updatedChildRaw);
+      } else if (headerPattern.test(childBlock.raw)) {
+        let updatedChildRaw = childBlock.raw.replace(headerPattern, `$1
+  m_Father: {fileID: ${newParentTransformId}}`);
+        childBlock.replace_raw(updatedChildRaw);
+      } else {
+        let updatedChildRaw = childBlock.raw.trimEnd() + `
+  m_Father: {fileID: ${newParentTransformId}}
+`;
+        childBlock.replace_raw(updatedChildRaw);
+      }
+    }
   }
-  const fatherPattern = new RegExp(`(m_Father:\\s*)\\{fileID:\\s*\\d+\\}`);
-  let updatedChildRaw = childBlock.raw.replace(fatherPattern, `$1{fileID: ${newParentTransformId}}`);
-  childBlock.replace_raw(updatedChildRaw);
   {
     let newRootOrder;
     if (newParentTransformId === "0") {
@@ -6305,10 +7013,25 @@ function reparentGameObject(options) {
     } else {
       newRootOrder = doc.calculate_root_order(newParentTransformId);
     }
-    childBlock.set_property("m_RootOrder", String(newRootOrder));
+    if (childBlock.class_id === 1001 || childBlock.class_id === 310) {
+      const stripped = doc.blocks.find((b) => (b.class_id === 4 || b.class_id === 224) && b.is_stripped && new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${childTransformId}\\}`).test(b.raw));
+      if (stripped) {
+        stripped.set_property("m_RootOrder", String(newRootOrder));
+      } else {
+        upsertPrefabRootOrderOverride(childBlock, newRootOrder);
+      }
+    } else {
+      childBlock.set_property("m_RootOrder", String(newRootOrder));
+    }
   }
   if (newParentTransformId !== "0") {
-    doc.add_child_to_parent(newParentTransformId, childTransformId);
+    if (childHierarchyTransformId) {
+      doc.add_child_to_parent(newParentTransformId, childHierarchyTransformId);
+    }
+  } else {
+    if (childHierarchyTransformId) {
+      doc.add_root_to_scene_roots(childHierarchyTransformId);
+    }
   }
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after reparent" };
@@ -6327,9 +7050,9 @@ function reparentGameObject(options) {
 }
 function findPrefabInstanceBlock(doc, identifier) {
   const asId = doc.find_by_file_id(identifier);
-  if (asId && asId.class_id === 1001)
+  if (asId && (asId.class_id === 1001 || asId.class_id === 310))
     return asId;
-  const piBlocks = doc.find_by_class_id(1001);
+  const piBlocks = [...doc.find_by_class_id(1001), ...doc.find_by_class_id(310)];
   const escaped = identifier.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   const namePattern = new RegExp(`propertyPath:\\s*m_Name\\s+value:\\s*${escaped}\\s`);
   for (const block of piBlocks) {
@@ -6338,6 +7061,193 @@ function findPrefabInstanceBlock(doc, identifier) {
   }
   return null;
 }
+function parsePrefabRef2(refText) {
+  const fileIdMatch = refText.match(/fileID:[ \t]*(-?\d+)/i);
+  if (!fileIdMatch)
+    return null;
+  const guidMatch = refText.match(/guid:[ \t]*([a-f0-9]{32})/i);
+  const typeMatch = refText.match(/type:[ \t]*(-?\d+)/i);
+  return {
+    file_id: fileIdMatch[1],
+    guid: guidMatch ? guidMatch[1].toLowerCase() : undefined,
+    type: typeMatch ? typeMatch[1] : undefined
+  };
+}
+function extractPrefabSourceGuid2(prefabInstanceRaw) {
+  const sourceMatch = prefabInstanceRaw.match(/m_SourcePrefab:[ \t]*\{[^}]*guid:[ \t]*([a-f0-9]{32})/i);
+  return sourceMatch ? sourceMatch[1].toLowerCase() : null;
+}
+function normalizePrefabRef2(refText, sourceGuid) {
+  const parsed = parsePrefabRef2(refText);
+  if (!parsed) {
+    return { error: `Invalid reference "${refText}". Expected format: {fileID: N, guid: ..., type: T}` };
+  }
+  const guid = parsed.guid ?? sourceGuid;
+  if (!guid) {
+    return { error: `Reference "${refText}" is missing guid and source prefab guid could not be inferred.` };
+  }
+  if (!/^[a-f0-9]{32}$/i.test(guid)) {
+    return { error: `Invalid guid in reference "${refText}". Expected 32-character hex GUID.` };
+  }
+  const type = parsed.type ?? "3";
+  if (!/^-?\d+$/.test(type)) {
+    return { error: `Invalid type in reference "${refText}". Expected an integer type value.` };
+  }
+  return {
+    ref: {
+      file_id: parsed.file_id,
+      guid,
+      type
+    }
+  };
+}
+function parsePrefabRefMatcher(refText) {
+  const parsed = parsePrefabRef2(refText);
+  if (!parsed) {
+    return { error: `Invalid reference "${refText}". Expected format: {fileID: N, guid: ..., type: T}` };
+  }
+  if (parsed.guid && !/^[a-f0-9]{32}$/i.test(parsed.guid)) {
+    return { error: `Invalid guid in reference "${refText}". Expected 32-character hex GUID.` };
+  }
+  if (parsed.type && !/^-?\d+$/.test(parsed.type)) {
+    return { error: `Invalid type in reference "${refText}". Expected an integer type value.` };
+  }
+  return { matcher: parsed };
+}
+function prefabRefKey(ref) {
+  return `${ref.file_id}|${ref.guid}|${ref.type}`;
+}
+function serializePrefabRef2(ref) {
+  return `{fileID: ${ref.file_id}, guid: ${ref.guid}, type: ${ref.type}}`;
+}
+function splitPrefabArraySection2(rawText, key) {
+  const lines = rawText.split(`
+`);
+  const keyPattern = new RegExp(`^([ 	]*)${key}:[ 	]*(.*)$`);
+  let keyIndex = -1;
+  let indent = "";
+  for (let i = 0;i < lines.length; i++) {
+    const match = lines[i].match(keyPattern);
+    if (match) {
+      keyIndex = i;
+      indent = match[1];
+      break;
+    }
+  }
+  if (keyIndex === -1) {
+    return null;
+  }
+  const keyIndentLen = indent.length;
+  let sectionEnd = keyIndex + 1;
+  for (let i = keyIndex + 1;i < lines.length; i++) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.length === 0) {
+      sectionEnd = i + 1;
+      continue;
+    }
+    const indentLen = (line.match(/^[ \t]*/) || [""])[0].length;
+    if (indentLen < keyIndentLen) {
+      break;
+    }
+    if (indentLen === keyIndentLen && !trimmed.startsWith("-") && /^[A-Za-z_][A-Za-z0-9_]*:/.test(trimmed)) {
+      break;
+    }
+    sectionEnd = i + 1;
+  }
+  return {
+    lines,
+    key_index: keyIndex,
+    section_end: sectionEnd,
+    indent
+  };
+}
+function collectNormalizedRefsFromSection(lines, key_index, section_end, sourceGuid) {
+  const sectionText = lines.slice(key_index, section_end).join(`
+`);
+  const refMatches = sectionText.match(/\{[^}]*\}/g) || [];
+  const dedup = new Map;
+  for (const token of refMatches) {
+    const parsed = parsePrefabRef2(token);
+    if (!parsed)
+      continue;
+    const guid = parsed.guid ?? sourceGuid;
+    if (!guid || !/^[a-f0-9]{32}$/i.test(guid))
+      continue;
+    const type = parsed.type ?? "3";
+    if (!/^-?\d+$/.test(type))
+      continue;
+    const normalized = {
+      file_id: parsed.file_id,
+      guid: guid.toLowerCase(),
+      type
+    };
+    const key = prefabRefKey(normalized);
+    if (!dedup.has(key)) {
+      dedup.set(key, normalized);
+    }
+  }
+  return [...dedup.values()];
+}
+function mutatePrefabReferenceList(options) {
+  const { target_block, key, ref_text, action, item_label } = options;
+  const split = splitPrefabArraySection2(target_block.raw, key);
+  if (!split) {
+    return { success: false, error: `${key} property not found in PrefabInstance` };
+  }
+  const sourceGuid = extractPrefabSourceGuid2(target_block.raw);
+  const existing = collectNormalizedRefsFromSection(split.lines, split.key_index, split.section_end, sourceGuid);
+  let next = existing;
+  if (action === "add") {
+    const normalized = normalizePrefabRef2(ref_text, sourceGuid);
+    if (!normalized.ref) {
+      return { success: false, error: normalized.error };
+    }
+    const keyText = prefabRefKey(normalized.ref);
+    if (existing.some((entry) => prefabRefKey(entry) === keyText)) {
+      return { success: true, changed: false };
+    }
+    next = [...existing, normalized.ref];
+  } else {
+    const matcherResult = parsePrefabRefMatcher(ref_text);
+    const matcher = matcherResult.matcher;
+    if (!matcher) {
+      return { success: false, error: matcherResult.error };
+    }
+    next = existing.filter((entry) => {
+      if (entry.file_id !== matcher.file_id)
+        return true;
+      if (matcher.guid && entry.guid !== matcher.guid.toLowerCase())
+        return true;
+      if (matcher.type && entry.type !== matcher.type)
+        return true;
+      return false;
+    });
+    if (next.length === existing.length) {
+      return {
+        success: false,
+        error: `${item_label} reference "${ref_text}" not found in ${key}`
+      };
+    }
+  }
+  const replacement = [];
+  if (next.length === 0) {
+    replacement.push(`${split.indent}${key}: []`);
+  } else {
+    replacement.push(`${split.indent}${key}:`);
+    for (const entry of next) {
+      replacement.push(`${split.indent}- ${serializePrefabRef2(entry)}`);
+    }
+  }
+  const updatedLines = [
+    ...split.lines.slice(0, split.key_index),
+    ...replacement,
+    ...split.lines.slice(split.section_end)
+  ];
+  target_block.replace_raw(updatedLines.join(`
+`));
+  return { success: true, changed: true };
+}
 function editArray(options) {
   const { file_path, file_id, array_property, action, value, index } = options;
   if (!import_fs11.existsSync(file_path)) {
@@ -6548,9 +7458,6 @@ function addRemovedComponent(options) {
   if (!import_fs11.existsSync(file_path)) {
     return { success: false, file_path, error: `File not found: ${file_path}` };
   }
-  if (!/^\{fileID:\s*-?\d+/.test(component_ref)) {
-    return { success: false, file_path, error: `Invalid component reference "${component_ref}". Expected format: {fileID: N, guid: ..., type: T}` };
-  }
   let doc;
   try {
     doc = UnityDocument.from_file(file_path);
@@ -6561,19 +7468,16 @@ function addRemovedComponent(options) {
   if (!targetBlock) {
     return { success: false, file_path, error: `PrefabInstance "${prefab_instance}" not found` };
   }
-  let rawText = targetBlock.raw;
-  if (/m_RemovedComponents:\s*\[\]/.test(rawText)) {
-    rawText = rawText.replace(/m_RemovedComponents:\s*\[\]/, "m_RemovedComponents:");
-  }
-  const removedPattern = /m_RemovedComponents:\s*\n/;
-  if (removedPattern.test(rawText)) {
-    rawText = rawText.replace(removedPattern, `m_RemovedComponents:
-  - ${component_ref}
-`);
-  } else {
-    return { success: false, file_path, error: "m_RemovedComponents property not found in PrefabInstance" };
+  const mutation = mutatePrefabReferenceList({
+    target_block: targetBlock,
+    key: "m_RemovedComponents",
+    ref_text: component_ref,
+    action: "add",
+    item_label: "Component"
+  });
+  if (!mutation.success) {
+    return { success: false, file_path, error: mutation.error };
   }
-  targetBlock.replace_raw(rawText);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after adding removed component" };
   }
@@ -6602,13 +7506,16 @@ function removeRemovedComponent(options) {
   if (!targetBlock) {
     return { success: false, file_path, error: `PrefabInstance "${prefab_instance}" not found` };
   }
-  const escapedRef = component_ref.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const refPattern = new RegExp(`\\s*- ${escapedRef}\\n?`, "m");
-  if (!refPattern.test(targetBlock.raw)) {
-    return { success: false, file_path, error: `Component reference "${component_ref}" not found in m_RemovedComponents` };
+  const mutation = mutatePrefabReferenceList({
+    target_block: targetBlock,
+    key: "m_RemovedComponents",
+    ref_text: component_ref,
+    action: "remove",
+    item_label: "Component"
+  });
+  if (!mutation.success) {
+    return { success: false, file_path, error: mutation.error };
   }
-  const updatedRaw = targetBlock.raw.replace(refPattern, "");
-  targetBlock.replace_raw(updatedRaw);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after removing component" };
   }
@@ -6627,9 +7534,6 @@ function addRemovedGameObject(options) {
   if (!import_fs11.existsSync(file_path)) {
     return { success: false, file_path, error: `File not found: ${file_path}` };
   }
-  if (!/^\{fileID:\s*-?\d+/.test(component_ref)) {
-    return { success: false, file_path, error: `Invalid GameObject reference "${component_ref}". Expected format: {fileID: N, guid: ..., type: T}` };
-  }
   let doc;
   try {
     doc = UnityDocument.from_file(file_path);
@@ -6640,19 +7544,16 @@ function addRemovedGameObject(options) {
   if (!targetBlock) {
     return { success: false, file_path, error: `PrefabInstance "${prefab_instance}" not found` };
   }
-  let rawText = targetBlock.raw;
-  if (/m_RemovedGameObjects:\s*\[\]/.test(rawText)) {
-    rawText = rawText.replace(/m_RemovedGameObjects:\s*\[\]/, "m_RemovedGameObjects:");
-  }
-  const removedPattern = /m_RemovedGameObjects:\s*\n/;
-  if (removedPattern.test(rawText)) {
-    rawText = rawText.replace(removedPattern, `m_RemovedGameObjects:
-  - ${component_ref}
-`);
-  } else {
-    return { success: false, file_path, error: "m_RemovedGameObjects property not found in PrefabInstance" };
+  const mutation = mutatePrefabReferenceList({
+    target_block: targetBlock,
+    key: "m_RemovedGameObjects",
+    ref_text: component_ref,
+    action: "add",
+    item_label: "GameObject"
+  });
+  if (!mutation.success) {
+    return { success: false, file_path, error: mutation.error };
   }
-  targetBlock.replace_raw(rawText);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after adding removed GameObject" };
   }
@@ -6681,13 +7582,16 @@ function removeRemovedGameObject(options) {
   if (!targetBlock) {
     return { success: false, file_path, error: `PrefabInstance "${prefab_instance}" not found` };
   }
-  const escapedRef = component_ref.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const refPattern = new RegExp(`\\s*- ${escapedRef}\\n?`, "m");
-  if (!refPattern.test(targetBlock.raw)) {
-    return { success: false, file_path, error: `GameObject reference "${component_ref}" not found in m_RemovedGameObjects` };
+  const mutation = mutatePrefabReferenceList({
+    target_block: targetBlock,
+    key: "m_RemovedGameObjects",
+    ref_text: component_ref,
+    action: "remove",
+    item_label: "GameObject"
+  });
+  if (!mutation.success) {
+    return { success: false, file_path, error: mutation.error };
   }
-  const updatedRaw = targetBlock.raw.replace(refPattern, "");
-  targetBlock.replace_raw(updatedRaw);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after removing GameObject" };
   }
@@ -6786,6 +7690,7 @@ function removeComponent(options) {
     return { success: false, file_path, error: "Cannot remove a Transform with remove-component. Use delete to remove the entire GameObject." };
   }
   const resolved_file_id = found.file_id;
+  let removed_added_component_overrides = 0;
   const goMatch = found.raw.match(/m_GameObject:[ \t]*\{fileID:[ \t]*(-?\d+)\}/);
   if (goMatch) {
     const parentGoId = goMatch[1];
@@ -6796,6 +7701,19 @@ function removeComponent(options) {
       const modifiedRaw = goBlock.raw.replace(compLinePattern, "");
       if (modifiedRaw === goBlock.raw) {}
       goBlock.replace_raw(modifiedRaw);
+      if (goBlock.is_stripped) {
+        const piMatch = goBlock.raw.match(/m_PrefabInstance:[ \t]*\{fileID:[ \t]*(-?\d+)\}/);
+        if (piMatch) {
+          const piBlock = doc.find_by_file_id(piMatch[1]);
+          if (piBlock && piBlock.class_id === 1001) {
+            const updated = removeAddedComponentOverrideEntries(piBlock.raw, resolved_file_id);
+            if (updated.removed_count > 0) {
+              piBlock.replace_raw(updated.updated_raw);
+              removed_added_component_overrides += updated.removed_count;
+            }
+          }
+        }
+      }
     }
   }
   const dangling = [];
@@ -6819,7 +7737,7 @@ function removeComponent(options) {
     file_path,
     removed_file_id: resolved_file_id,
     removed_class_id: found.class_id,
-    warning: dangling.length > 0 ? `Dangling references to deleted component found in blocks: ${dangling.join(", ")}` : undefined
+    warning: dangling.length > 0 ? `Dangling references to deleted component found in blocks: ${dangling.join(", ")}${removed_added_component_overrides > 0 ? ` (removed ${removed_added_component_overrides} m_AddedComponents override entr${removed_added_component_overrides === 1 ? "y" : "ies"})` : ""}` : undefined
   };
 }
 function removeComponentBatch(options) {
@@ -6937,6 +7855,124 @@ function findPrefabInstanceBlock2(doc, identifier) {
   }
   return null;
 }
+function splitPrefabArraySection3(rawText, key) {
+  const lines = rawText.split(`
+`);
+  const keyPattern = new RegExp(`^[ 	]*${key}:[ 	]*(.*)$`);
+  let keyIndex = -1;
+  let keyIndentLen = 0;
+  for (let i = 0;i < lines.length; i++) {
+    const match = lines[i].match(keyPattern);
+    if (match) {
+      keyIndex = i;
+      keyIndentLen = (lines[i].match(/^[ \t]*/) || [""])[0].length;
+      break;
+    }
+  }
+  if (keyIndex === -1) {
+    return null;
+  }
+  let sectionEnd = keyIndex + 1;
+  for (let i = keyIndex + 1;i < lines.length; i++) {
+    const line = lines[i];
+    const trimmed = line.trim();
+    if (trimmed.length === 0) {
+      sectionEnd = i + 1;
+      continue;
+    }
+    const indentLen = (line.match(/^[ \t]*/) || [""])[0].length;
+    if (indentLen < keyIndentLen) {
+      break;
+    }
+    if (indentLen === keyIndentLen && !trimmed.startsWith("-") && /^[A-Za-z_][A-Za-z0-9_]*:/.test(trimmed)) {
+      break;
+    }
+    sectionEnd = i + 1;
+  }
+  return {
+    lines,
+    key_index: keyIndex,
+    section_end: sectionEnd
+  };
+}
+function collectAddedObjectFileIdsFromArray(rawText, key) {
+  const section = splitPrefabArraySection3(rawText, key);
+  if (!section)
+    return [];
+  const keyLine = section.lines[section.key_index].trim();
+  if (new RegExp(`^${key}:[ 	]*[]$`).test(keyLine)) {
+    return [];
+  }
+  const sectionText = section.lines.slice(section.key_index, section.section_end).join(`
+`);
+  const fileIds = new Set;
+  const addedObjectPattern = /addedObject:[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)/g;
+  let match;
+  while ((match = addedObjectPattern.exec(sectionText)) !== null) {
+    fileIds.add(match[1]);
+  }
+  if (fileIds.size === 0) {
+    const inlineEntryPattern = /^[ \t]*-[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)/gm;
+    while ((match = inlineEntryPattern.exec(sectionText)) !== null) {
+      fileIds.add(match[1]);
+    }
+  }
+  return [...fileIds];
+}
+function removeAddedComponentOverrideEntries(rawText, componentId) {
+  const section = splitPrefabArraySection3(rawText, "m_AddedComponents");
+  if (!section)
+    return { updated_raw: rawText, removed_count: 0 };
+  const keyLine = section.lines[section.key_index].trim();
+  if (/^m_AddedComponents:[ \t]*\[\]$/.test(keyLine)) {
+    return { updated_raw: rawText, removed_count: 0 };
+  }
+  const bodyLines = section.lines.slice(section.key_index + 1, section.section_end);
+  const keptEntries = [];
+  let removed = 0;
+  let i = 0;
+  while (i < bodyLines.length) {
+    const line = bodyLines[i];
+    const trimmed = line.trimStart();
+    if (!trimmed.startsWith("-")) {
+      i++;
+      continue;
+    }
+    const entryIndent = (line.match(/^[ \t]*/) || [""])[0].length;
+    const entryLines = [line];
+    i++;
+    while (i < bodyLines.length) {
+      const nextLine = bodyLines[i];
+      const nextTrimmed = nextLine.trim();
+      const nextIndent = (nextLine.match(/^[ \t]*/) || [""])[0].length;
+      if (nextTrimmed.length > 0 && nextIndent === entryIndent && nextTrimmed.startsWith("-")) {
+        break;
+      }
+      entryLines.push(nextLine);
+      i++;
+    }
+    const entryText = entryLines.join(`
+`);
+    const addedObjectMatch = entryText.match(/addedObject:[ \t]*\{[^}]*fileID:[ \t]*(-?\d+)/);
+    if (addedObjectMatch && addedObjectMatch[1] === componentId) {
+      removed++;
+      continue;
+    }
+    keptEntries.push(entryLines);
+  }
+  if (removed === 0) {
+    return { updated_raw: rawText, removed_count: 0 };
+  }
+  const keyIndent = (section.lines[section.key_index].match(/^[ \t]*/) || [""])[0];
+  const replacement = keptEntries.length === 0 ? [`${keyIndent}m_AddedComponents: []`] : [`${keyIndent}m_AddedComponents:`, ...keptEntries.flat()];
+  const updatedLines = [
+    ...section.lines.slice(0, section.key_index),
+    ...replacement,
+    ...section.lines.slice(section.section_end)
+  ];
+  return { updated_raw: updatedLines.join(`
+`), removed_count: removed };
+}
 function deletePrefabInstance(options) {
   const { file_path, prefab_instance } = options;
   const pathError = validate_file_path(file_path, "write");
@@ -6964,36 +8000,23 @@ function deletePrefabInstance(options) {
       allToRemove.add(block.file_id);
     }
   }
-  const addedGOPattern = /m_AddedGameObjects:\s*\n((?:\s*- \{fileID: \d+\}\n)*)/m;
-  const addedGOMatch = piBlock.raw.match(addedGOPattern);
-  if (addedGOMatch) {
-    const addedGOSection = addedGOMatch[1];
-    const goMatches = addedGOSection.matchAll(/fileID:[ \t]*(\d+)/g);
-    for (const match of goMatches) {
-      const goId = match[1];
-      allToRemove.add(goId);
-      const goBlock = doc.find_by_file_id(goId);
-      if (goBlock) {
-        const compMatch = goBlock.raw.match(/component:[ \t]*\{fileID:[ \t]*(\d+)\}/);
-        if (compMatch) {
-          const transformId = compMatch[1];
-          allToRemove.add(transformId);
-          const descendants = doc.collect_hierarchy(transformId);
-          for (const id of descendants) {
-            allToRemove.add(id);
-          }
+  for (const goId of collectAddedObjectFileIdsFromArray(piBlock.raw, "m_AddedGameObjects")) {
+    allToRemove.add(goId);
+    const goBlock = doc.find_by_file_id(goId);
+    if (goBlock) {
+      const compMatch = goBlock.raw.match(/component:[ \t]*\{fileID:[ \t]*(\d+)\}/);
+      if (compMatch) {
+        const transformId = compMatch[1];
+        allToRemove.add(transformId);
+        const descendants = doc.collect_hierarchy(transformId);
+        for (const id of descendants) {
+          allToRemove.add(id);
         }
       }
     }
   }
-  const addedCompPattern = /m_AddedComponents:\s*\n((?:\s*- \{fileID: \d+\}\n)*)/m;
-  const addedCompMatch = piBlock.raw.match(addedCompPattern);
-  if (addedCompMatch) {
-    const addedCompSection = addedCompMatch[1];
-    const compMatches = addedCompSection.matchAll(/fileID:[ \t]*(\d+)/g);
-    for (const match of compMatches) {
-      allToRemove.add(match[1]);
-    }
+  for (const componentId of collectAddedObjectFileIdsFromArray(piBlock.raw, "m_AddedComponents")) {
+    allToRemove.add(componentId);
   }
   const parentMatch = piBlock.raw.match(/m_TransformParent:[ \t]*\{fileID:[ \t]*(\d+)\}/);
   const parentTransformId = parentMatch ? parentMatch[1] : "0";