unity-agentic-tools 0.3.3 → 0.4.1

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.3.3",
+    version: "0.4.1",
     description: "Fast, token-efficient Unity YAML parser for AI agents",
     exports: {
       ".": {
@@ -284,6 +284,7 @@ __export(exports_src, {
   removeRemovedGameObject: () => removeRemovedGameObject,
   removeRemovedComponent: () => removeRemovedComponent,
   removePrefabOverride: () => removePrefabOverride,
+  removeComponentBatch: () => removeComponentBatch,
   removeComponent: () => removeComponent,
   read_settings: () => read_settings,
   isNativeModuleAvailable: () => isNativeModuleAvailable,
@@ -560,6 +561,12 @@ function find_unity_project_root(startDir) {
   }
   return null;
 }
+function ensure_parent_dir(file_path) {
+  const dir = import_path4.dirname(file_path);
+  if (dir && dir !== "." && !import_fs4.existsSync(dir)) {
+    import_fs4.mkdirSync(dir, { recursive: true });
+  }
+}
 function atomicWrite(filePath, content) {
   if (import_fs4.existsSync(filePath)) {
     try {
@@ -1510,6 +1517,7 @@ function search_project(options) {
   const files = walk_project_files(project_path, extensions);
   const scanner = new UnityScanner;
   const matches = [];
+  let files_with_errors = 0;
   for (const file of files) {
     try {
       let gameObjects;
@@ -1596,6 +1604,7 @@ function search_project(options) {
       if (max_matches !== undefined && matches.length >= max_matches)
         break;
     } catch {
+      files_with_errors++;
       continue;
     }
   }
@@ -1604,6 +1613,7 @@ function search_project(options) {
     project_path,
     total_files_scanned: files.length,
     total_matches: matches.length,
+    files_with_errors: files_with_errors > 0 ? files_with_errors : undefined,
     cursor: 0,
     truncated: max_matches !== undefined && matches.length >= max_matches,
     matches
@@ -2208,6 +2218,7 @@ function resolveScriptGuid(script, projectPath) {
               }
             }
             if (matches[0].filePath?.endsWith(".dll")) {
+              const classNameLower = targetName.toLowerCase();
               const dllBasename = path3.basename(matches[0].filePath).toLowerCase();
               for (const cacheName of ["package-cache.json", "local-package-cache.json"]) {
                 const cachePath = path3.join(projectPath, ".unity-agentic", cacheName);
@@ -2215,6 +2226,11 @@ function resolveScriptGuid(script, projectPath) {
                   continue;
                 try {
                   const cache = JSON.parse(import_fs8.readFileSync(cachePath, "utf-8"));
+                  for (const [guid, assetPath] of Object.entries(cache)) {
+                    if (assetPath.endsWith(".cs") && path3.basename(assetPath, ".cs").toLowerCase() === classNameLower) {
+                      return { guid, path: assetPath };
+                    }
+                  }
                   for (const [guid, assetPath] of Object.entries(cache)) {
                     if (assetPath.toLowerCase().endsWith(".dll") && path3.basename(assetPath).toLowerCase() === dllBasename) {
                       return { guid, path: assetPath };
@@ -2240,6 +2256,7 @@ function resolveScriptGuid(script, projectPath) {
               }
             }
             if (!guid && m.filePath?.endsWith(".dll")) {
+              const clsLower = (m.name ?? targetName).toLowerCase();
               const dllBase = path3.basename(m.filePath).toLowerCase();
               for (const cn of ["package-cache.json", "local-package-cache.json"]) {
                 const cp = path3.join(projectPath, ".unity-agentic", cn);
@@ -2248,11 +2265,19 @@ function resolveScriptGuid(script, projectPath) {
                 try {
                   const c = JSON.parse(import_fs8.readFileSync(cp, "utf-8"));
                   for (const [g, p] of Object.entries(c)) {
-                    if (p.toLowerCase().endsWith(".dll") && path3.basename(p).toLowerCase() === dllBase) {
+                    if (p.endsWith(".cs") && path3.basename(p, ".cs").toLowerCase() === clsLower) {
                       guid = g;
                       break;
                     }
                   }
+                  if (!guid) {
+                    for (const [g, p] of Object.entries(c)) {
+                      if (p.toLowerCase().endsWith(".dll") && path3.basename(p).toLowerCase() === dllBase) {
+                        guid = g;
+                        break;
+                      }
+                    }
+                  }
                 } catch {}
                 if (guid)
                   break;
@@ -2283,7 +2308,11 @@ function resolveScriptGuid(script, projectPath) {
             throw new Error(`Ambiguous type "${script}": found ${allResolved.length} matches (${paths}). ` + `Use a qualified name (e.g., "Namespace.${targetName}") or provide the full path.`);
           }
         }
-      } catch {}
+      } catch (err) {
+        if (err instanceof Error && err.message.startsWith("Ambiguous type")) {
+          throw err;
+        }
+      }
     }
     const scriptNameLower = script.toLowerCase().replace(/\.cs$/, "");
     const dotIdx = scriptNameLower.lastIndexOf(".");
@@ -2310,6 +2339,54 @@ function resolveScriptGuid(script, projectPath) {
   }
   return null;
 }
+var ASSET_PPTR_MAP = {
+  ".inputactions": { fileID: 11400000, type: 2 },
+  ".asset": { fileID: 11400000, type: 2 },
+  ".mat": { fileID: 2100000, type: 2 },
+  ".prefab": { fileID: 100100000, type: 2 },
+  ".controller": { fileID: 9100000, type: 2 },
+  ".anim": { fileID: 7400000, type: 2 }
+};
+var ASSET_EXTENSIONS = new Set(Object.keys(ASSET_PPTR_MAP));
+function resolveAssetPathToPPtr(value, file_path, project_path) {
+  if (value.startsWith("{fileID:") || value.startsWith("{"))
+    return;
+  const ext = path3.extname(value).toLowerCase();
+  if (!ASSET_EXTENSIONS.has(ext))
+    return;
+  const resolved_project = project_path || find_unity_project_root(path3.dirname(file_path));
+  if (!resolved_project)
+    return null;
+  const mapping = ASSET_PPTR_MAP[ext];
+  let guid = null;
+  const basename_val = path3.basename(value, ext);
+  if (value.includes("/") || value.includes("\\")) {
+    const abs = path3.isAbsolute(value) ? value : path3.join(resolved_project, value);
+    guid = extractGuidFromMeta(abs + ".meta");
+  }
+  if (!guid) {
+    const cache = load_guid_cache_for_file(file_path, resolved_project);
+    if (cache) {
+      const found = cache.find_by_name(basename_val, ext);
+      if (found)
+        guid = found.guid;
+    }
+  }
+  if (!guid) {
+    const candidates = [
+      path3.join(resolved_project, "Assets", value),
+      path3.join(resolved_project, value)
+    ];
+    for (const candidate of candidates) {
+      guid = extractGuidFromMeta(candidate + ".meta");
+      if (guid)
+        break;
+    }
+  }
+  if (!guid)
+    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);
   if (!resolved)
@@ -2866,7 +2943,9 @@ ${element_indent2}- ${value}`);
     if (!header) {
       throw new Error(`Invalid Unity YAML block header in replacement text: "${new_text.slice(0, 80)}"`);
     }
-    this._raw = new_text;
+    this._raw = new_text.endsWith(`
+`) ? new_text : new_text + `
+`;
     this._header = header;
     this._dirty = true;
     this._format_cache.clear();
@@ -2876,6 +2955,11 @@ ${element_indent2}- ${value}`);
   }
   _check_dirty(old_raw) {
     if (this._raw !== old_raw) {
+      if (!this._raw.endsWith(`
+`)) {
+        this._raw += `
+`;
+      }
       this._dirty = true;
       return true;
     }
@@ -3937,14 +4021,82 @@ function read_project_version(projectPath) {
 }
 
 // src/editor/create.ts
+function md4(data) {
+  function F(x, y, z) {
+    return x & y | ~x & z;
+  }
+  function G(x, y, z) {
+    return x & y | x & z | y & z;
+  }
+  function H(x, y, z) {
+    return x ^ y ^ z;
+  }
+  function rotl(x, n) {
+    return (x << n | x >>> 32 - n) >>> 0;
+  }
+  const len = data.length;
+  const bitLen = len * 8;
+  const padded_len = len + 9 + 63 & ~63;
+  const buf = Buffer.alloc(padded_len);
+  data.copy(buf);
+  buf[len] = 128;
+  buf.writeUInt32LE(bitLen >>> 0, padded_len - 8);
+  buf.writeUInt32LE(Math.floor(bitLen / 4294967296) >>> 0, padded_len - 4);
+  let a0 = 1732584193;
+  let b0 = 4023233417;
+  let c0 = 2562383102;
+  let d0 = 271733878;
+  const R1_K = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15];
+  const R1_S = [3, 7, 11, 19, 3, 7, 11, 19, 3, 7, 11, 19, 3, 7, 11, 19];
+  const R2_K = [0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15];
+  const R2_S = [3, 5, 9, 13, 3, 5, 9, 13, 3, 5, 9, 13, 3, 5, 9, 13];
+  const R3_K = [0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15];
+  const R3_S = [3, 9, 11, 15, 3, 9, 11, 15, 3, 9, 11, 15, 3, 9, 11, 15];
+  for (let i = 0;i < padded_len; i += 64) {
+    const X = [];
+    for (let j = 0;j < 16; j++)
+      X[j] = buf.readUInt32LE(i + j * 4);
+    let a = a0, b = b0, c = c0, d = d0;
+    for (let j = 0;j < 16; j++) {
+      const t = a + F(b, c, d) + X[R1_K[j]] >>> 0;
+      a = d;
+      d = c;
+      c = b;
+      b = rotl(t, R1_S[j]);
+    }
+    for (let j = 0;j < 16; j++) {
+      const t = a + G(b, c, d) + X[R2_K[j]] + 1518500249 >>> 0;
+      a = d;
+      d = c;
+      c = b;
+      b = rotl(t, R2_S[j]);
+    }
+    for (let j = 0;j < 16; j++) {
+      const t = a + H(b, c, d) + X[R3_K[j]] + 1859775393 >>> 0;
+      a = d;
+      d = c;
+      c = b;
+      b = rotl(t, R3_S[j]);
+    }
+    a0 = a0 + a >>> 0;
+    b0 = b0 + b >>> 0;
+    c0 = c0 + c >>> 0;
+    d0 = d0 + d >>> 0;
+  }
+  const result = Buffer.alloc(16);
+  result.writeUInt32LE(a0, 0);
+  result.writeUInt32LE(b0, 4);
+  result.writeUInt32LE(c0, 8);
+  result.writeUInt32LE(d0, 12);
+  return result;
+}
 function compute_dll_script_file_id(namespace, class_name) {
-  const { createHash } = require("crypto");
   const full_name = namespace ? `${namespace}.${class_name}` : class_name;
   const name_bytes = Buffer.from(full_name, "utf-8");
   const input = Buffer.alloc(4 + name_bytes.length);
   input.writeInt32LE(114, 0);
   name_bytes.copy(input, 4);
-  const hash = createHash("md4").update(input).digest();
+  const hash = md4(input);
   const a = hash.readInt32LE(0);
   const b = hash.readInt32LE(4);
   const c = hash.readInt32LE(8);
@@ -3957,13 +4109,13 @@ function get_layer_from_parent(doc, parentTransformId) {
   const parentTransform = doc.find_by_file_id(parentTransformId);
   if (!parentTransform)
     return 0;
-  const goMatch = parentTransform.raw.match(/m_GameObject:\s*\{fileID:\s*(\d+)\}/);
+  const goMatch = parentTransform.raw.match(/m_GameObject:[ \t]*\{fileID:[ \t]*(\d+)\}/);
   if (!goMatch)
     return 0;
   const parentGo = doc.find_by_file_id(goMatch[1]);
   if (!parentGo)
     return 0;
-  const layerMatch = parentGo.raw.match(/m_Layer:\s*(\d+)/);
+  const layerMatch = parentGo.raw.match(/m_Layer:[ \t]*(\d+)/);
   return layerMatch ? parseInt(layerMatch[1], 10) : 0;
 }
 function createGameObjectYAML(gameObjectId, transformId, name, parentTransformId = "0", rootOrder = 0, layer = 0) {
@@ -4284,11 +4436,14 @@ ${defaults}`;
 function addComponentToGameObject(doc, gameObjectId, componentId) {
   const goBlock = doc.find_by_file_id(gameObjectId);
   if (!goBlock)
-    return;
-  let raw = goBlock.raw;
-  raw = raw.replace(/(m_Component:\s*\n(?:\s*-\s*component:\s*\{fileID:\s*\d+\}\s*\n)*)/, `$1  - component: {fileID: ${componentId}}
+    return false;
+  const raw = goBlock.raw;
+  const updated = raw.replace(/(m_Component:[ \t]*\n(?:[ \t]*-[ \t]*component:[ \t]*\{fileID:[ \t]*\d+\}[ \t]*\n)*)/, `$1  - component: {fileID: ${componentId}}
 `);
-  goBlock.replace_raw(raw);
+  if (updated === raw)
+    return false;
+  goBlock.replace_raw(updated);
+  return true;
 }
 function createMonoBehaviourYAML(componentId, gameObjectId, scriptGuid, fields, version, scriptFileId = 11500000, type_lookup) {
   const field_yaml = fields && fields.length > 0 ? generate_field_yaml(fields, version, "  ", type_lookup) : `
@@ -4360,7 +4515,7 @@ function createGameObject(options) {
       if (parentBlock.class_id === 4) {
         parentTransformIdStr = parentIdStr;
       } else if (parentBlock.class_id === 1) {
-        const compMatch = parentBlock.raw.match(/m_Component:\s*\n\s*-\s*component:\s*\{fileID:\s*(\d+)\}/);
+        const compMatch = parentBlock.raw.match(/m_Component:[ \t]*\n[ \t]*-[ \t]*component:[ \t]*\{fileID:[ \t]*(\d+)\}/);
         if (compMatch) {
           parentTransformIdStr = compMatch[1];
         } else {
@@ -4774,6 +4929,7 @@ Light:
 `;
   }
   try {
+    ensure_parent_dir(output_path);
     import_fs10.writeFileSync(output_path, yaml, "utf-8");
   } catch (err) {
     return {
@@ -4912,6 +5068,7 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: ${sourceGuid}, type: 3}
 `;
   try {
+    ensure_parent_dir(output_path);
     import_fs10.writeFileSync(output_path, variantYaml, "utf-8");
   } catch (err) {
     return {
@@ -5072,6 +5229,7 @@ ${yaml_lines.join(`
     }
   }
   try {
+    ensure_parent_dir(output_path);
     import_fs10.writeFileSync(output_path, assetYaml, "utf-8");
   } catch (err) {
     return { success: false, output_path, error: `Failed to write asset file: ${err instanceof Error ? err.message : String(err)}` };
@@ -5267,7 +5425,7 @@ function addComponent(options) {
   let duplicateWarning;
   const goBlock = doc.find_by_file_id(gameObjectIdStr);
   if (goBlock && classId !== null) {
-    const compRefs = [...goBlock.raw.matchAll(/component:\s*\{fileID:\s*(\d+)\}/g)].map((m) => m[1]);
+    const compRefs = [...goBlock.raw.matchAll(/component:[ \t]*\{fileID:[ \t]*(\d+)\}/g)].map((m) => m[1]);
     for (const refId of compRefs) {
       const compBlock = doc.find_by_file_id(refId);
       if (compBlock && compBlock.class_id === classId) {
@@ -5299,12 +5457,16 @@ function addComponent(options) {
     if (!resolved) {
       const hints = [];
       if (project_path) {
+        const agenticDir = path5.join(project_path, ".unity-agentic");
         const cacheExists = load_guid_cache(project_path) !== null;
-        const registryExists = import_fs10.existsSync(path5.join(project_path, ".unity-agentic", "type-registry.json"));
+        const registryExists = import_fs10.existsSync(path5.join(agenticDir, "type-registry.json"));
+        const pkgCacheExists = import_fs10.existsSync(path5.join(agenticDir, "package-cache.json"));
         if (!cacheExists && !registryExists) {
-          hints.push(`No GUID cache or type registry found at ${path5.join(project_path, ".unity-agentic/")}. Run "unity-agentic-tools setup" first.`);
+          hints.push(`No GUID cache or type registry found at ${agenticDir}/. Run "unity-agentic-tools setup" first.`);
         } else if (!registryExists) {
           hints.push('Type registry not found. Re-run "unity-agentic-tools setup" to rebuild.');
+        } else if (!pkgCacheExists) {
+          hints.push('Package cache not found. Re-run "unity-agentic-tools setup" to index package scripts.');
         }
       } else {
         hints.push("No Unity project detected. Provide --project or run from inside a Unity project directory.");
@@ -5348,9 +5510,33 @@ function addComponent(options) {
   if (variantInfo) {
     appendToAddedComponents(doc, variantInfo.prefab_instance_id, variantInfo.source_ref, componentIdStr);
   } else {
-    addComponentToGameObject(doc, gameObjectIdStr, componentIdStr);
+    const added = addComponentToGameObject(doc, gameObjectIdStr, componentIdStr);
+    if (!added) {
+      return {
+        success: false,
+        file_path,
+        error: `Failed to add component reference to GameObject ${gameObjectIdStr}: m_Component array not found or malformed`
+      };
+    }
   }
   doc.append_raw(componentYAML);
+  if (!doc.validate()) {
+    return {
+      success: false,
+      file_path,
+      error: "Validation failed after adding component. The generated YAML may be malformed."
+    };
+  }
+  if (!variantInfo) {
+    const goBlockAfter = doc.find_by_file_id(gameObjectIdStr);
+    if (!goBlockAfter || !goBlockAfter.raw.includes(`component: {fileID: ${componentIdStr}}`)) {
+      return {
+        success: false,
+        file_path,
+        error: `Component block appended but reference not found in GameObject ${gameObjectIdStr}'s m_Component list`
+      };
+    }
+  }
   const saveResult = doc.save();
   if (!saveResult.success) {
     return {
@@ -5406,8 +5592,11 @@ function copyComponent(options) {
   const newIdStr = doc.generate_file_id();
   const newId = parseInt(newIdStr, 10);
   let clonedBlock = sourceBlock.raw.replace(new RegExp(`^(--- !u!${sourceBlock.class_id} &)${source_file_id}`), `$1${newId}`);
-  clonedBlock = clonedBlock.replace(/m_GameObject:\s*\{fileID:\s*\d+\}/, `m_GameObject: {fileID: ${targetGoId}}`);
-  addComponentToGameObject(doc, targetGoIdStr, newIdStr);
+  clonedBlock = clonedBlock.replace(/m_GameObject:[ \t]*\{fileID:[ \t]*\d+\}/, `m_GameObject: {fileID: ${targetGoId}}`);
+  const added = addComponentToGameObject(doc, targetGoIdStr, newIdStr);
+  if (!added) {
+    return { success: false, file_path, error: `Failed to wire component to target GameObject ${targetGoIdStr}: m_Component array not found or malformed` };
+  }
   doc.append_raw(clonedBlock);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after copying component" };
@@ -5457,7 +5646,17 @@ function validate_value_type(current_value, new_value) {
   const incoming = new_value.trim();
   if (/^\{fileID:/.test(current)) {
     if (/^\{fileID:[ \t]*0[ \t]*\}$/.test(current)) {
-      return null;
+      if (/^\{fileID:/.test(incoming))
+        return null;
+      if (/^-?\d+(\.\d+)?([eE][+-]?\d+)?$/.test(incoming))
+        return null;
+      if (/^(true|false|yes|no|on|off)$/i.test(incoming))
+        return null;
+      if (/^'[^']*'$/.test(incoming) || /^"[^"]*"$/.test(incoming))
+        return null;
+      if (/^\{.*:.*\}$/.test(incoming))
+        return null;
+      return `Current value is a null reference ({fileID: 0}). New value "${incoming}" is not a valid reference, number, boolean, quoted string, or compound value.`;
     }
     if (!/^\{fileID:/.test(incoming)) {
       return `Expected a reference value ({fileID: ...}), got "${incoming}"`;
@@ -5667,7 +5866,19 @@ function editProperty(options) {
   return result;
 }
 function editComponentByFileId(options) {
-  const { file_path, file_id, property, new_value } = options;
+  const { file_path, file_id, property, project_path } = options;
+  let { new_value } = options;
+  const resolved = resolveAssetPathToPPtr(new_value, file_path, project_path);
+  if (resolved === null) {
+    return {
+      success: false,
+      file_path,
+      error: `Could not resolve "${new_value}" to asset reference. Ensure GUID cache exists (run "setup <project>" first).`
+    };
+  }
+  if (resolved !== undefined) {
+    new_value = resolved;
+  }
   const pathError = validate_file_path(file_path, "write");
   if (pathError) {
     return { success: false, file_path, error: pathError };
@@ -6492,8 +6703,56 @@ function removeRemovedGameObject(options) {
 }
 // src/editor/delete.ts
 var import_fs12 = require("fs");
+function find_component_by_type(doc, type_name, game_object, project_path) {
+  let scope_blocks;
+  if (game_object) {
+    const goResult = doc.require_unique_game_object(game_object);
+    if ("error" in goResult)
+      return goResult;
+    const comp_ids = [];
+    const matches = goResult.raw.matchAll(/component:[ \t]*\{fileID:[ \t]*(-?\d+)\}/g);
+    for (const m of matches)
+      comp_ids.push(m[1]);
+    scope_blocks = comp_ids.map((id) => doc.find_by_file_id(id)).filter((b) => b !== null);
+  } else {
+    scope_blocks = doc.blocks.filter((b) => b.class_id !== 1 && b.class_id !== 4 && b.class_id !== 224);
+  }
+  const candidates = [];
+  const class_id = get_class_id(type_name);
+  if (class_id !== null) {
+    for (const block of scope_blocks) {
+      if (block.class_id === class_id)
+        candidates.push(block);
+    }
+  } else {
+    let resolved = null;
+    try {
+      resolved = resolveScriptGuid(type_name, project_path);
+    } catch {}
+    if (resolved) {
+      for (const block of scope_blocks) {
+        if (block.class_id !== 114)
+          continue;
+        const scriptMatch = block.raw.match(/m_Script:[ \t]*\{[^}]*guid:[ \t]*([a-f0-9]+)/);
+        if (scriptMatch && scriptMatch[1] === resolved.guid) {
+          candidates.push(block);
+        }
+      }
+    } else {
+      return { error: `Component type "${type_name}" not found. For MonoBehaviour scripts, ensure "unity-agentic-tools setup" has been run.` };
+    }
+  }
+  if (candidates.length === 0) {
+    return { error: `No "${type_name}" component found${game_object ? ` on "${game_object}"` : ""} in ${doc.file_path}` };
+  }
+  if (candidates.length > 1) {
+    const ids = candidates.map((b) => b.file_id).join(", ");
+    return { error: `Multiple "${type_name}" components found (fileIDs: ${ids}). Use a numeric fileID to specify which one${game_object ? "" : ", or use --on <gameobject> to scope the search"}.` };
+  }
+  return candidates[0];
+}
 function removeComponent(options) {
-  const { file_path, file_id } = options;
+  const { file_path, file_id, game_object, project_path } = options;
   const pathError = validate_file_path(file_path, "write");
   if (pathError) {
     return { success: false, file_path, error: pathError };
@@ -6507,9 +6766,18 @@ function removeComponent(options) {
   } catch (err) {
     return { success: false, file_path, error: `Failed to read file: ${err instanceof Error ? err.message : String(err)}` };
   }
-  const found = doc.find_by_file_id(file_id);
-  if (!found) {
-    return { success: false, file_path, error: `Component with file ID ${file_id} not found` };
+  let found;
+  if (/^-?\d+$/.test(file_id)) {
+    found = doc.find_by_file_id(file_id);
+    if (!found) {
+      return { success: false, file_path, error: `Component with file ID ${file_id} not found` };
+    }
+  } else {
+    const result = find_component_by_type(doc, file_id, game_object, project_path);
+    if ("error" in result) {
+      return { success: false, file_path, error: result.error };
+    }
+    found = result;
   }
   if (found.class_id === 1) {
     return { success: false, file_path, error: "Cannot remove a GameObject with remove-component. Use delete instead." };
@@ -6517,18 +6785,28 @@ function removeComponent(options) {
   if (found.class_id === 4) {
     return { success: false, file_path, error: "Cannot remove a Transform with remove-component. Use delete to remove the entire GameObject." };
   }
-  const goMatch = found.raw.match(/m_GameObject:\s*\{fileID:\s*(-?\d+)\}/);
+  const resolved_file_id = found.file_id;
+  const goMatch = found.raw.match(/m_GameObject:[ \t]*\{fileID:[ \t]*(-?\d+)\}/);
   if (goMatch) {
     const parentGoId = goMatch[1];
     const goBlock = doc.find_by_file_id(parentGoId);
     if (goBlock) {
-      const escaped = file_id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      const escaped = resolved_file_id.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
       const compLinePattern = new RegExp(`^[ \\t]*- component: \\{fileID: ${escaped}\\}[ \\t]*\\n`, "m");
       const modifiedRaw = goBlock.raw.replace(compLinePattern, "");
+      if (modifiedRaw === goBlock.raw) {}
       goBlock.replace_raw(modifiedRaw);
     }
   }
-  doc.remove_block(file_id);
+  const dangling = [];
+  for (const block of doc.blocks) {
+    if (block.file_id === resolved_file_id)
+      continue;
+    if (block.raw.includes(`{fileID: ${resolved_file_id}}`)) {
+      dangling.push(block.file_id);
+    }
+  }
+  doc.remove_block(resolved_file_id);
   if (!doc.validate()) {
     return { success: false, file_path, error: "Validation failed after removing component" };
   }
@@ -6539,8 +6817,45 @@ function removeComponent(options) {
   return {
     success: true,
     file_path,
-    removed_file_id: file_id,
-    removed_class_id: found.class_id
+    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
+  };
+}
+function removeComponentBatch(options) {
+  const { project_path, component_type, game_object } = options;
+  const files = walk_project_files(project_path, [".unity", ".prefab"]);
+  const removals = [];
+  const errors = [];
+  let skipped = 0;
+  for (const file of files) {
+    const result = removeComponent({
+      file_path: file,
+      file_id: component_type,
+      game_object,
+      project_path
+    });
+    if (result.success && result.removed_file_id) {
+      removals.push({
+        file,
+        file_id: result.removed_file_id,
+        class_id: result.removed_class_id ?? 0
+      });
+    } else if (result.error?.includes("not found") || result.error?.startsWith('No "')) {
+      skipped++;
+    } else if (result.error) {
+      errors.push({ file, error: result.error });
+    }
+  }
+  return {
+    success: errors.length === 0,
+    project_path,
+    component: component_type,
+    files_scanned: files.length,
+    files_modified: removals.length,
+    removals,
+    skipped,
+    errors
   };
 }
 function deleteGameObject(options) {
@@ -6565,7 +6880,7 @@ function deleteGameObject(options) {
   const goBlock = goResult;
   const goId = goBlock.file_id;
   const componentIds = new Set;
-  const compMatches = goBlock.raw.matchAll(/component:\s*\{fileID:\s*(-?\d+)\}/g);
+  const compMatches = goBlock.raw.matchAll(/component:[ \t]*\{fileID:[ \t]*(-?\d+)\}/g);
   for (const cm of compMatches) {
     componentIds.add(cm[1]);
   }
@@ -6575,7 +6890,7 @@ function deleteGameObject(options) {
     const block = doc.find_by_file_id(compId);
     if (block && block.class_id === 4) {
       transformId = compId;
-      const fatherMatch = block.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
+      const fatherMatch = block.raw.match(/m_Father:[ \t]*\{fileID:[ \t]*(-?\d+)\}/);
       if (fatherMatch) {
         fatherId = fatherMatch[1];
       }
@@ -6643,7 +6958,7 @@ function deletePrefabInstance(options) {
   }
   const piId = piBlock.file_id;
   const allToRemove = new Set([piId]);
-  const piRefPattern = new RegExp(`m_PrefabInstance:\\s*\\{fileID:\\s*${piId}\\}`);
+  const piRefPattern = new RegExp(`m_PrefabInstance:[ \\t]*\\{fileID:[ \\t]*${piId}\\}`);
   for (const block of doc.blocks) {
     if (block.is_stripped && piRefPattern.test(block.raw)) {
       allToRemove.add(block.file_id);
@@ -6653,13 +6968,13 @@ function deletePrefabInstance(options) {
   const addedGOMatch = piBlock.raw.match(addedGOPattern);
   if (addedGOMatch) {
     const addedGOSection = addedGOMatch[1];
-    const goMatches = addedGOSection.matchAll(/fileID:\s*(\d+)/g);
+    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:\s*\{fileID:\s*(\d+)\}/);
+        const compMatch = goBlock.raw.match(/component:[ \t]*\{fileID:[ \t]*(\d+)\}/);
         if (compMatch) {
           const transformId = compMatch[1];
           allToRemove.add(transformId);
@@ -6675,12 +6990,12 @@ function deletePrefabInstance(options) {
   const addedCompMatch = piBlock.raw.match(addedCompPattern);
   if (addedCompMatch) {
     const addedCompSection = addedCompMatch[1];
-    const compMatches = addedCompSection.matchAll(/fileID:\s*(\d+)/g);
+    const compMatches = addedCompSection.matchAll(/fileID:[ \t]*(\d+)/g);
     for (const match of compMatches) {
       allToRemove.add(match[1]);
     }
   }
-  const parentMatch = piBlock.raw.match(/m_TransformParent:\s*\{fileID:\s*(\d+)\}/);
+  const parentMatch = piBlock.raw.match(/m_TransformParent:[ \t]*\{fileID:[ \t]*(\d+)\}/);
   const parentTransformId = parentMatch ? parentMatch[1] : "0";
   let strippedRootTransformId = null;
   for (const id of allToRemove) {