unity-agentic-tools 0.4.2 → 0.5.0

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.2",
+    version: "0.5.0",
     description: "Fast, token-efficient Unity YAML parser for AI agents",
     exports: {
       ".": {
@@ -232,7 +232,8 @@ var require_package = __commonJS((exports2, module2) => {
       rebuild: "bun run clean && bun run build",
       test: "bun test",
       "test:watch": "bun test --watch",
-      "test:coverage": "bun test --coverage"
+      "test:coverage": "bun test --coverage",
+      "test:unity-headless": "bun test/run-headless-validation.ts"
     },
     dependencies: {
       commander: "^14.0.2"
@@ -383,11 +384,11 @@ function setup(options = {}) {
   const nativeLocalPkgBuild = getNativeBuildLocalPackageGuidCache();
   if (nativeLocalPkgBuild) {
     try {
-      const localPkgCache = nativeLocalPkgBuild(projectPath);
-      const localPkgCount = Object.keys(localPkgCache).length;
+      const localPackageCache = nativeLocalPkgBuild(projectPath);
+      const localPkgCount = Object.keys(localPackageCache).length;
       if (localPkgCount > 0) {
         const localPkgCachePath = import_path2.join(configPath, LOCAL_PACKAGE_CACHE_FILE);
-        import_fs2.writeFileSync(localPkgCachePath, JSON.stringify(localPkgCache, null, 2));
+        import_fs2.writeFileSync(localPkgCachePath, JSON.stringify(localPackageCache, null, 2));
       }
     } catch {}
   }
@@ -473,6 +474,8 @@ var CONFIG_DIR2 = ".unity-agentic";
 var CONFIG_FILE2 = "config.json";
 var GUID_CACHE_FILE2 = "guid-cache.json";
 var DOC_INDEX_FILE2 = "doc-index.json";
+var EDITOR_LOCK_FILE = "editor.json";
+var LAST_EDITOR_CONFIG_FILE = "editor.last.json";
 function cleanup(options = {}) {
   const projectPath = import_path3.resolve(options.project || process.cwd());
   const configPath = import_path3.join(projectPath, CONFIG_DIR2);
@@ -481,8 +484,7 @@ function cleanup(options = {}) {
       success: true,
       project_path: projectPath,
       files_removed: [],
-      directory_removed: false,
-      error: `No ${CONFIG_DIR2} directory found`
+      directory_removed: false
     };
   }
   const filesRemoved = [];
@@ -502,7 +504,12 @@ function cleanup(options = {}) {
       };
     }
   } else {
-    const filesToRemove = [GUID_CACHE_FILE2, DOC_INDEX_FILE2];
+    const filesToRemove = [
+      GUID_CACHE_FILE2,
+      DOC_INDEX_FILE2,
+      EDITOR_LOCK_FILE,
+      LAST_EDITOR_CONFIG_FILE
+    ];
     for (const file of filesToRemove) {
       const filePath = import_path3.join(configPath, file);
       if (import_fs3.existsSync(filePath)) {
@@ -1806,75 +1813,6 @@ function grep_project_js(options) {
 var import_fs10 = require("fs");
 var path5 = __toESM(require("path"));
 
-// src/guid-cache.ts
-var import_fs7 = require("fs");
-var import_path5 = require("path");
-var _cache_store = new Map;
-function build_guid_cache(project_path, raw) {
-  return {
-    project_path,
-    cache: raw,
-    count: Object.keys(raw).length,
-    resolve(guid) {
-      return raw[guid] ?? null;
-    },
-    resolve_absolute(guid) {
-      const rel = raw[guid];
-      if (!rel)
-        return null;
-      if (import_path5.isAbsolute(rel))
-        return rel;
-      return import_path5.join(project_path, rel);
-    },
-    resolve_many(guids) {
-      const result = {};
-      for (const guid of guids) {
-        result[guid] = raw[guid] ?? null;
-      }
-      return result;
-    },
-    find_by_name(name, extension) {
-      const nameLower = name.toLowerCase().replace(/\.[^.]+$/, "");
-      let substringMatch = null;
-      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) {
-          return { guid, path: assetPath };
-        }
-        if (!substringMatch && assetPath.toLowerCase().includes(nameLower)) {
-          substringMatch = { guid, path: assetPath };
-        }
-      }
-      return substringMatch;
-    }
-  };
-}
-function load_guid_cache(project_path) {
-  const resolved = project_path;
-  const existing = _cache_store.get(resolved);
-  if (existing)
-    return existing;
-  const cachePath = import_path5.join(resolved, ".unity-agentic", "guid-cache.json");
-  if (!import_fs7.existsSync(cachePath))
-    return null;
-  try {
-    const raw = JSON.parse(import_fs7.readFileSync(cachePath, "utf-8"));
-    const cache = build_guid_cache(resolved, raw);
-    _cache_store.set(resolved, cache);
-    return cache;
-  } catch {
-    return null;
-  }
-}
-function load_guid_cache_for_file(file_path, explicit_project) {
-  const project_path = explicit_project || find_unity_project_root(import_path5.dirname(file_path));
-  if (!project_path)
-    return null;
-  return load_guid_cache(project_path);
-}
-
 // src/class-ids.ts
 var UNITY_CLASS_IDS = {
   1: "GameObject",
@@ -1946,15 +1884,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 +1918,7 @@ var UNITY_CLASS_IDS = {
   164: "AudioReverbFilter",
   165: "AudioHighPassFilter",
   166: "AudioChorusFilter",
+  1660057539: "SceneRoots",
   167: "AudioReverbZone",
   168: "AudioEchoFilter",
   169: "AudioLowPassFilter",
@@ -2051,50 +1989,365 @@ 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) {
-  return UNITY_CLASS_IDS[class_id] || `Unknown_${class_id}`;
+var UNITY_COMPONENT_CLASS_IDS = new Set([
+  4,
+  8,
+  20,
+  23,
+  25,
+  33,
+  50,
+  53,
+  54,
+  56,
+  57,
+  58,
+  59,
+  60,
+  61,
+  64,
+  65,
+  66,
+  68,
+  70,
+  75,
+  81,
+  82,
+  95,
+  96,
+  102,
+  108,
+  111,
+  114,
+  119,
+  120,
+  124,
+  135,
+  136,
+  137,
+  138,
+  143,
+  144,
+  145,
+  146,
+  153,
+  154,
+  164,
+  165,
+  166,
+  167,
+  168,
+  169,
+  170,
+  180,
+  181,
+  182,
+  183,
+  191,
+  192,
+  193,
+  195,
+  198,
+  199,
+  205,
+  208,
+  210,
+  212,
+  215,
+  220,
+  222,
+  223,
+  224,
+  225,
+  229,
+  230,
+  231,
+  232,
+  233,
+  234,
+  235,
+  247,
+  248,
+  249,
+  250,
+  251,
+  252,
+  253,
+  254,
+  255,
+  256,
+  257,
+  259,
+  300,
+  320,
+  328,
+  330,
+  331,
+  156049354,
+  1742807556,
+  1839735485,
+  19719996,
+  483693784,
+  1839735486,
+  1839735487
+]);
+var UNITY_ADDABLE_COMPONENT_CLASS_IDS = new Set([
+  20,
+  23,
+  33,
+  50,
+  54,
+  58,
+  59,
+  60,
+  61,
+  64,
+  65,
+  66,
+  68,
+  70,
+  75,
+  81,
+  82,
+  95,
+  96,
+  102,
+  108,
+  111,
+  119,
+  120,
+  124,
+  135,
+  136,
+  137,
+  138,
+  143,
+  144,
+  145,
+  146,
+  153,
+  154,
+  164,
+  165,
+  166,
+  167,
+  168,
+  169,
+  170,
+  182,
+  183,
+  191,
+  192,
+  193,
+  195,
+  198,
+  199,
+  205,
+  208,
+  210,
+  212,
+  215,
+  220,
+  222,
+  223,
+  225,
+  231,
+  232,
+  233,
+  234,
+  235,
+  247,
+  249,
+  250,
+  251,
+  252,
+  253,
+  254,
+  255,
+  256,
+  257,
+  259,
+  300,
+  320,
+  328,
+  330,
+  331,
+  156049354,
+  1742807556,
+  1839735485,
+  19719996,
+  483693784
+]);
+var UNITY_BUILTIN_NAMESPACE_PREFIXES = ["UnityEngine", "UnityEditor"];
+function find_namespaced_class_id(component_name, allowed_class_ids) {
+  const dot_index = component_name.lastIndexOf(".");
+  if (dot_index <= 0)
+    return null;
+  const namespace_name = component_name.slice(0, dot_index);
+  const short_name = component_name.slice(dot_index + 1);
+  const is_unity_namespace = UNITY_BUILTIN_NAMESPACE_PREFIXES.some((prefix) => namespace_name === prefix || namespace_name.startsWith(`${prefix}.`));
+  if (!is_unity_namespace || short_name.length === 0) {
+    return null;
+  }
+  return find_class_id(short_name, allowed_class_ids);
 }
-function get_class_id(component_name) {
+function find_class_id(component_name, allowed_class_ids) {
+  const matches_allowed = (class_id) => {
+    return allowed_class_ids ? allowed_class_ids.has(class_id) : true;
+  };
   if (UNITY_CLASS_NAMES[component_name] !== undefined) {
-    return UNITY_CLASS_NAMES[component_name];
+    const class_id = UNITY_CLASS_NAMES[component_name];
+    return matches_allowed(class_id) ? class_id : null;
   }
   const lowerName = component_name.toLowerCase();
   for (const [name, id] of Object.entries(UNITY_CLASS_NAMES)) {
     if (name.toLowerCase() === lowerName) {
-      return id;
+      return matches_allowed(id) ? id : null;
     }
   }
+  const namespaced_match = find_namespaced_class_id(component_name, allowed_class_ids);
+  if (namespaced_match !== null) {
+    return namespaced_match;
+  }
   return null;
 }
+function get_class_id_name(class_id) {
+  return UNITY_CLASS_IDS[class_id] || `Unknown_${class_id}`;
+}
+function get_class_id(component_name) {
+  return find_class_id(component_name);
+}
+function get_component_class_id(component_name) {
+  return find_class_id(component_name, UNITY_COMPONENT_CLASS_IDS);
+}
+function get_addable_component_class_id(component_name) {
+  return find_class_id(component_name, UNITY_ADDABLE_COMPONENT_CLASS_IDS);
+}
 
 // src/editor/shared.ts
 var import_fs8 = require("fs");
 var path3 = __toESM(require("path"));
+
+// src/guid-cache.ts
+var import_fs7 = require("fs");
+var import_path5 = require("path");
+var _cache_store = new Map;
+function build_guid_cache(project_path, raw) {
+  return {
+    project_path,
+    cache: raw,
+    count: Object.keys(raw).length,
+    resolve(guid) {
+      return raw[guid] ?? null;
+    },
+    resolve_absolute(guid) {
+      const rel = raw[guid];
+      if (!rel)
+        return null;
+      if (import_path5.isAbsolute(rel))
+        return rel;
+      return import_path5.join(project_path, rel);
+    },
+    resolve_many(guids) {
+      const result = {};
+      for (const guid of guids) {
+        result[guid] = raw[guid] ?? null;
+      }
+      return result;
+    },
+    find_by_name(name, extension) {
+      const nameLower = name.toLowerCase().replace(/\.[^.]+$/, "");
+      let substringMatch = null;
+      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) {
+          return { guid, path: assetPath };
+        }
+        if (!substringMatch && assetPath.toLowerCase().includes(nameLower)) {
+          substringMatch = { guid, path: assetPath };
+        }
+      }
+      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;
+    }
+  };
+}
+function load_guid_cache(project_path) {
+  const resolved = project_path;
+  const existing = _cache_store.get(resolved);
+  if (existing)
+    return existing;
+  const cachePath = import_path5.join(resolved, ".unity-agentic", "guid-cache.json");
+  if (!import_fs7.existsSync(cachePath))
+    return null;
+  try {
+    const raw = JSON.parse(import_fs7.readFileSync(cachePath, "utf-8"));
+    const cache = build_guid_cache(resolved, raw);
+    _cache_store.set(resolved, cache);
+    return cache;
+  } catch {
+    return null;
+  }
+}
+function load_guid_cache_for_file(file_path, explicit_project) {
+  const project_path = explicit_project || find_unity_project_root(import_path5.dirname(file_path));
+  if (!project_path)
+    return null;
+  return load_guid_cache(project_path);
+}
+
+// src/editor/shared.ts
 function validateUnityYAML(content) {
   if (!content.startsWith("%YAML 1.1")) {
     return "Missing or invalid YAML header";
@@ -2147,8 +2400,104 @@ function resolve_source_prefab(doc, file_path, project_path) {
     prefab_instance_block: pi_block
   };
 }
-function resolveScriptGuid(script, projectPath) {
+function load_type_registry(projectPath) {
+  const registryPath = path3.join(projectPath, ".unity-agentic", "type-registry.json");
+  if (!import_fs8.existsSync(registryPath))
+    return null;
+  try {
+    return JSON.parse(import_fs8.readFileSync(registryPath, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function parse_type_query(script) {
+  const dotIndex = script.lastIndexOf(".");
+  if (dotIndex > 0) {
+    return {
+      targetNamespace: script.substring(0, dotIndex),
+      targetName: script.substring(dotIndex + 1)
+    };
+  }
+  return { targetName: script, targetNamespace: null };
+}
+function format_qualified_type(entry) {
+  return entry.namespace ? `${entry.namespace}.${entry.name}` : entry.name;
+}
+function resolve_registry_entry_guid(match, projectPath) {
+  if (match.guid) {
+    return match.guid;
+  }
+  if (!match.filePath)
+    return null;
+  const fullFilePath = path3.isAbsolute(match.filePath) ? match.filePath : path3.join(projectPath, match.filePath);
+  const metaPath = fullFilePath + ".meta";
+  if (import_fs8.existsSync(metaPath)) {
+    const guid = extractGuidFromMeta(metaPath);
+    if (guid)
+      return guid;
+  }
+  return null;
+}
+function materialize_registry_match(match, guid) {
+  return { guid, path: match.filePath };
+}
+function dedupe_script_resolutions(resolutions) {
+  const unique = new Map;
+  for (const resolution of resolutions) {
+    unique.set(`${resolution.guid}|${resolution.path ?? ""}`, resolution);
+  }
+  return [...unique.values()];
+}
+function resolve_script_guid_from_registry(script, projectPath, registry) {
+  const { targetName, targetNamespace } = parse_type_query(script);
+  const targetNameLower = targetName.toLowerCase();
+  const matchingEntries = registry.filter((entry) => {
+    if (entry.name.toLowerCase() !== targetNameLower)
+      return false;
+    if (targetNamespace && entry.namespace?.toLowerCase() !== targetNamespace.toLowerCase())
+      return false;
+    return true;
+  });
+  if (matchingEntries.length === 0) {
+    return null;
+  }
+  const qualifiedMatches = [...new Set(matchingEntries.map(format_qualified_type))];
+  if (!targetNamespace && qualifiedMatches.length > 1) {
+    throw new Error(`Ambiguous type "${script}": found multiple qualified matches (${qualifiedMatches.join(", ")}). ` + `Specify which ${targetName} to use by qualified name (for example, "${qualifiedMatches[0]}") or provide the full script path.`);
+  }
+  const resolvedEntries = matchingEntries.map((entry) => ({
+    entry,
+    guid: resolve_registry_entry_guid(entry, projectPath)
+  }));
+  const sourceGuidCandidates = [...new Set(resolvedEntries.filter(({ entry, guid }) => entry.filePath && !entry.filePath.endsWith(".dll") && guid).map(({ guid }) => guid))];
+  const dllMaterializedMatches = dedupe_script_resolutions(resolvedEntries.filter(({ entry }) => entry.filePath?.endsWith(".dll")).flatMap(({ entry, guid }) => {
+    if (guid) {
+      return [materialize_registry_match(entry, guid)];
+    }
+    return sourceGuidCandidates.map((sourceGuid) => materialize_registry_match(entry, sourceGuid));
+  }));
+  if (dllMaterializedMatches.length === 1) {
+    return dllMaterializedMatches[0];
+  }
+  if (dllMaterializedMatches.length > 1) {
+    const paths = dllMaterializedMatches.map((match) => match.path ?? match.guid).join(", ");
+    throw new Error(`Ambiguous type "${script}": found ${dllMaterializedMatches.length} matches (${paths}). ` + `Use a qualified name (e.g., "Namespace.${targetName}") or provide the full path.`);
+  }
+  const materializedMatches = dedupe_script_resolutions(resolvedEntries.filter(({ entry, guid }) => !entry.filePath?.endsWith(".dll") && guid).map(({ entry, guid }) => materialize_registry_match(entry, guid)));
+  if (materializedMatches.length === 1) {
+    return materializedMatches[0];
+  }
+  if (materializedMatches.length > 1) {
+    const paths = materializedMatches.map((match) => match.path ?? match.guid).join(", ");
+    throw new Error(`Ambiguous type "${script}": found ${materializedMatches.length} matches (${paths}). ` + `Use a qualified name (e.g., "Namespace.${targetName}") or provide the full path.`);
+  }
+  return null;
+}
+function resolveScriptGuid(script, projectPath, _options) {
   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")) {
@@ -2171,189 +2520,14 @@ 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;
-    }
-    const registryPath = path3.join(projectPath, ".unity-agentic", "type-registry.json");
-    if (import_fs8.existsSync(registryPath)) {
-      try {
-        const registry = JSON.parse(import_fs8.readFileSync(registryPath, "utf-8"));
-        let targetName = script;
-        let targetNamespace = null;
-        const dotIndex = script.lastIndexOf(".");
-        if (dotIndex > 0) {
-          targetNamespace = script.substring(0, dotIndex);
-          targetName = script.substring(dotIndex + 1);
-        }
-        const targetNameLower = targetName.toLowerCase();
-        const matches = registry.filter((t) => {
-          if (t.name.toLowerCase() !== targetNameLower)
-            return false;
-          if (targetNamespace && t.namespace?.toLowerCase() !== targetNamespace.toLowerCase())
-            return false;
-          return true;
-        });
-        if (matches.length === 1) {
-          if (matches[0].guid) {
-            return { guid: matches[0].guid, path: matches[0].filePath };
-          }
-          if (matches[0].filePath && projectPath) {
-            const fullFilePath = path3.isAbsolute(matches[0].filePath) ? matches[0].filePath : path3.join(projectPath, matches[0].filePath);
-            const metaPath = fullFilePath + ".meta";
-            if (import_fs8.existsSync(metaPath)) {
-              const guid = extractGuidFromMeta(metaPath);
-              if (guid)
-                return { guid, path: matches[0].filePath };
-            }
-            if (matches[0].filePath.startsWith("Packages/")) {
-              const pkgPath = path3.join(projectPath, matches[0].filePath);
-              const pkgMetaPath = pkgPath + ".meta";
-              if (import_fs8.existsSync(pkgMetaPath)) {
-                const guid = extractGuidFromMeta(pkgMetaPath);
-                if (guid)
-                  return { guid, path: matches[0].filePath };
-              }
-            }
-            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);
-                if (!import_fs8.existsSync(cachePath))
-                  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 };
-                    }
-                  }
-                } catch {}
-              }
-            }
-          }
-        }
-        if (matches.length > 1) {
-          const withGuid = matches.filter((m) => m.guid);
-          if (withGuid.length === 1) {
-            return { guid: withGuid[0].guid, path: withGuid[0].filePath };
-          }
-          const resolvedFromMeta = matches.filter((m) => !m.guid && m.filePath).map((m) => {
-            const fullPath = path3.isAbsolute(m.filePath) ? m.filePath : path3.join(projectPath, m.filePath);
-            let guid = import_fs8.existsSync(fullPath + ".meta") ? extractGuidFromMeta(fullPath + ".meta") : null;
-            if (!guid && m.filePath.startsWith("Packages/")) {
-              const pkgPath = path3.join(projectPath, m.filePath);
-              if (import_fs8.existsSync(pkgPath + ".meta")) {
-                guid = extractGuidFromMeta(pkgPath + ".meta");
-              }
-            }
-            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);
-                if (!import_fs8.existsSync(cp))
-                  continue;
-                try {
-                  const c = JSON.parse(import_fs8.readFileSync(cp, "utf-8"));
-                  for (const [g, p] of Object.entries(c)) {
-                    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;
-              }
-            }
-            return guid ? { guid, path: m.filePath } : null;
-          }).filter((r) => r !== null);
-          const allResolved = [...withGuid.map((m) => ({ guid: m.guid, path: m.filePath })), ...resolvedFromMeta];
-          if (allResolved.length === 1) {
-            return allResolved[0];
-          }
-          if (allResolved.length > 1) {
-            const pkgCachePaths = [
-              path3.join(projectPath, ".unity-agentic", "package-cache.json"),
-              path3.join(projectPath, ".unity-agentic", "local-package-cache.json")
-            ];
-            for (const cachePath of pkgCachePaths) {
-              if (!import_fs8.existsSync(cachePath))
-                continue;
-              try {
-                const cache = JSON.parse(import_fs8.readFileSync(cachePath, "utf-8"));
-                const inCache = allResolved.filter((r) => (r.guid in cache));
-                if (inCache.length === 1)
-                  return inCache[0];
-              } catch {}
-            }
-            const paths = allResolved.map((m) => m.path).join(", ");
-            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 (err) {
-        if (err instanceof Error && err.message.startsWith("Ambiguous type")) {
-          throw err;
-        }
+    const registry = load_type_registry(projectPath);
+    if (registry) {
+      const resolvedFromRegistry = resolve_script_guid_from_registry(script, projectPath, registry);
+      if (resolvedFromRegistry) {
+        return resolvedFromRegistry;
       }
+      return null;
     }
-    const scriptNameLower = script.toLowerCase().replace(/\.cs$/, "");
-    const dotIdx = scriptNameLower.lastIndexOf(".");
-    const classNameOnly = dotIdx > 0 ? scriptNameLower.substring(dotIdx + 1) : null;
-    const cachePaths = [
-      path3.join(projectPath, ".unity-agentic", "package-cache.json"),
-      path3.join(projectPath, ".unity-agentic", "local-package-cache.json")
-    ];
-    for (const cachePath of cachePaths) {
-      if (!import_fs8.existsSync(cachePath))
-        continue;
-      try {
-        const cache = JSON.parse(import_fs8.readFileSync(cachePath, "utf-8"));
-        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 };
-          }
-        }
-      } catch {}
-    }
-    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;
 }
@@ -2405,19 +2579,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")) {
@@ -2431,6 +2624,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";
@@ -2508,8 +2705,8 @@ function build_type_lookup(project_path) {
   const assetsDir = path3.join(project_path, "Assets");
   const csIndex = new Map;
   try {
-    const { readdirSync: readdirSync5 } = require("fs");
-    const entries = readdirSync5(assetsDir, { recursive: true, withFileTypes: false });
+    const { readdirSync: readdirSync4 } = require("fs");
+    const entries = readdirSync4(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$/, "");
@@ -3530,7 +3727,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)) {
@@ -3559,10 +3770,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) {
@@ -3575,15 +3783,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) {
@@ -3611,7 +3844,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();
@@ -3764,7 +3997,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*\[\]/;
@@ -3800,7 +4033,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}\\}`);
@@ -3821,7 +4054,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)
@@ -3856,14 +4131,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) {
@@ -3896,19 +4178,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) {
@@ -5435,11 +5795,8 @@ function createScriptableObject(options) {
   if (!resolved) {
     const hints = [];
     if (project_path) {
-      const cacheExists = load_guid_cache(project_path) !== null;
       const registryExists = import_fs10.existsSync(path5.join(project_path, ".unity-agentic", "type-registry.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.`);
-      } else if (!registryExists) {
+      if (!registryExists) {
         hints.push('Type registry not found. Re-run "unity-agentic-tools setup" to rebuild.');
       }
     } else {
@@ -5450,6 +5807,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.` };
   }
@@ -5732,7 +6092,39 @@ function addComponent(options) {
     gameObjectIdStr = goResult.file_id;
   }
   const gameObjectId = gameObjectIdStr;
-  const classId = get_class_id(component_type);
+  const shortComponentType = component_type.includes(".") ? component_type.slice(component_type.lastIndexOf(".") + 1) : component_type;
+  const explicitBuiltInClassId = component_type.includes(".") ? get_addable_component_class_id(component_type) : null;
+  const fallbackBuiltInClassId = component_type.includes(".") ? null : get_addable_component_class_id(component_type);
+  const serializedTypeId = get_class_id(component_type) ?? get_class_id(shortComponentType);
+  if (serializedTypeId === 114 && shortComponentType.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).'
+    };
+  }
+  const componentIdStr = doc.generate_file_id();
+  const componentId = componentIdStr;
+  let componentYAML;
+  let scriptGuid;
+  let scriptPath;
+  let extractionError;
+  let classId = explicitBuiltInClassId;
+  let resolved = null;
+  if (classId === null) {
+    try {
+      resolved = resolve_script_with_fields(component_type, project_path, { strict_exact_name: true });
+    } catch (e) {
+      return {
+        success: false,
+        file_path,
+        error: e instanceof Error ? e.message : String(e)
+      };
+    }
+  }
+  if (!resolved && classId === null) {
+    classId = fallbackBuiltInClassId;
+  }
   let duplicateWarning;
   const goBlock = doc.find_by_file_id(gameObjectIdStr);
   if (goBlock && classId !== null) {
@@ -5745,39 +6137,20 @@ function addComponent(options) {
       }
     }
   }
-  const componentIdStr = doc.generate_file_id();
-  const componentId = componentIdStr;
-  let componentYAML;
-  let scriptGuid;
-  let scriptPath;
-  let extractionError;
   if (classId !== null) {
     const componentName = UNITY_CLASS_IDS[classId] || component_type;
     componentYAML = createGenericComponentYAML(componentName, classId, componentId, gameObjectId);
   } else {
-    let resolved;
-    try {
-      resolved = resolve_script_with_fields(component_type, project_path);
-    } catch (e) {
-      return {
-        success: false,
-        file_path,
-        error: e instanceof Error ? e.message : String(e)
-      };
-    }
     if (!resolved) {
       const hints = [];
+      if (serializedTypeId !== null) {
+        hints.push(`"${component_type}" matches Unity serialized type class ${serializedTypeId}, but that type is not an addable GameObject component.`);
+      }
       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(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 ${agenticDir}/. Run "unity-agentic-tools setup" first.`);
-        } else if (!registryExists) {
+        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.");
@@ -5795,6 +6168,13 @@ function addComponent(options) {
         error: `"${component_type}" is ${resolved.kind === "enum" ? "an enum" : "an interface"}, not a MonoBehaviour. Cannot add as a component.`
       };
     }
+    if (resolved.is_abstract) {
+      return {
+        success: false,
+        file_path,
+        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)
@@ -6020,6 +6400,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;
@@ -6030,17 +6460,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;
-    const fatherMatch = block.raw.match(/m_Father:\s*\{fileID:\s*(-?\d+)\}/);
-    currentId = fatherMatch ? fatherMatch[1] : "0";
+    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;
+    }
   }
   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) {
@@ -6233,12 +6680,12 @@ 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,
         file_path,
-        error: `Component with file ID ${file_id} not found. This file contains prefab instances \u2014 the fileID may be from the source prefab. Use \`update override\` to edit variant properties.`
+        error: `Component with file ID ${file_id} not found. This file contains prefab instances \u2014 the fileID may be from the source prefab. Use \`unity-agentic-tools editor invoke UnityAgenticTools.Update.Prefabs PrefabOverride ...\` to edit variant properties.`
       };
     }
     return {
@@ -6251,7 +6698,7 @@ function editComponentByFileId(options) {
     return {
       success: false,
       file_path,
-      error: `Component ${file_id} is a stripped reference in a prefab variant. Use \`update override <file> <prefab_instance_id> <property_path> <value>\` to modify overrides.`
+      error: `Component ${file_id} is a stripped reference in a prefab variant. Use \`unity-agentic-tools editor invoke UnityAgenticTools.Update.Prefabs PrefabOverride ...\` to modify overrides.`
     };
   }
   const classId = targetBlock.class_id;
@@ -6474,7 +6921,7 @@ function editTransform(options) {
     return {
       success: false,
       file_path,
-      error: `Transform ${transform_id} is a stripped reference in a prefab variant. Use \`update prefab override <file> <prefab_instance_id> <property_path> <value>\` to modify transform overrides (e.g., "m_LocalPosition.x").`
+      error: `Transform ${transform_id} is a stripped reference in a prefab variant. Use \`unity-agentic-tools editor invoke UnityAgenticTools.Update.Prefabs PrefabOverride ...\` to modify transform overrides (for example, "m_LocalPosition.x").`
     };
   }
   let blockText = targetBlock.raw;
@@ -6586,10 +7033,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)) {
@@ -6616,11 +7079,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") {
@@ -6628,10 +7135,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" };
@@ -6650,9 +7172,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) {
@@ -7222,29 +7744,32 @@ function find_component_by_type(doc, type_name, game_object, project_path) {
     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);
+  const explicit_class_id = type_name.includes(".") ? get_component_class_id(type_name) : null;
+  let resolved = null;
+  if (explicit_class_id === null) {
+    try {
+      resolved = resolveScriptGuid(type_name, project_path, { strict_exact_name: true });
+    } catch (error) {
+      return { error: error instanceof Error ? error.message : String(error) };
+    }
+  }
+  const class_id = resolved ? null : explicit_class_id ?? (!type_name.includes(".") ? get_component_class_id(type_name) : null);
   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 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.` };
     }
+  } else {
+    return { error: `Component type "${type_name}" not found. For MonoBehaviour scripts, ensure the type registry has been built with "unity-agentic-tools setup".` };
   }
   if (candidates.length === 0) {
     return { error: `No "${type_name}" component found${game_object ? ` on "${game_object}"` : ""} in ${doc.file_path}` };
@@ -7675,7 +8200,7 @@ function duplicateGameObject(options) {
   if ("error" in goResult) {
     const piMatch = findPrefabInstanceByName(doc, object_name);
     if (piMatch) {
-      return { success: false, file_path, error: `"${object_name}" is a PrefabInstance (fileID: ${piMatch.id}). Cloning PrefabInstances is not yet supported. Consider unpacking it first with \`update prefab\`.` };
+      return { success: false, file_path, error: `"${object_name}" is a PrefabInstance (fileID: ${piMatch.id}). Cloning PrefabInstances is not yet supported. Consider unpacking it first with \`unity-agentic-tools editor invoke UnityAgenticTools.Update.Prefabs PrefabUnpack ...\`.` };
     }
     return { success: false, file_path, error: goResult.error };
   }