feat: auto-discover live fal and OpenRouter asset models

MCPForUnity/Editor/Services/AssetGen/AssetGenJobManager.cs

@@ -56,6 +56,7 @@ public static class AssetGenJobManager
         internal static Func<AssetGenJob, string, AssetGenJob> ImportOverrideForTests;
         internal static double PollIntervalSeconds = 3.0;
         internal static double TimeoutSeconds = 600.0;
+        internal static bool SkipModelVerificationForTests;
 
         private static readonly Dictionary<string, AssetGenJob> Jobs = new();
         private static readonly Dictionary<string, Runner> Runners = new();
@@ -102,7 +103,15 @@ public static AssetGenJob StartModelGeneration(ModelGenRequest req)
             var runner = new Runner
             {
                 Job = job,
-                SubmitFn = ct => adapter.SubmitAsync(req, apiKey, transport, ct),
+                SubmitFn = async ct =>
+                {
+                    if (string.Equals(provider, "fal", StringComparison.OrdinalIgnoreCase) && !SkipModelVerificationForTests)
+                    {
+                        req.Model = AssetGenModelCatalog.ResolveModel("model", provider, req.Model);
+                        req.CatalogEntry = await FalModelCatalog.VerifyForGeneration(req.Model, "model", req.Mode, ct, apiKey);
+                    }
+                    return await adapter.SubmitAsync(req, apiKey, transport, ct);
+                },
                 PollFn = (pid, ct) => adapter.PollAsync(pid, apiKey, transport, ct),
                 ImportFn = ImportOverrideForTests ?? ModelImportPipeline.ImportInto,
                 Transport = transport,
@@ -132,7 +141,20 @@ public static AssetGenJob StartImageGeneration(ImageGenRequest req)
             var runner = new Runner
             {
                 Job = job,
-                SubmitFn = ct => adapter.SubmitAsync(req, apiKey, transport, ct),
+                SubmitFn = async ct =>
+                {
+                    if (!SkipModelVerificationForTests && string.Equals(provider, "fal", StringComparison.OrdinalIgnoreCase))
+                    {
+                        req.Model = AssetGenModelCatalog.ResolveModel("image", provider, req.Model);
+                        req.CatalogEntry = await FalModelCatalog.VerifyForGeneration(req.Model, "image", req.Mode, ct, apiKey);
+                    }
+                    if (!SkipModelVerificationForTests && string.Equals(provider, "openrouter", StringComparison.OrdinalIgnoreCase))
+                    {
+                        req.Model = AssetGenModelCatalog.ResolveModel("image", provider, req.Model);
+                        req.CatalogEntry = await OpenRouterModelCatalog.VerifyForGeneration(req.Model, req.Mode, ct);
+                    }
+                    return await adapter.SubmitAsync(req, apiKey, transport, ct);
+                },
                 PollFn = (pid, ct) => adapter.PollAsync(pid, apiKey, transport, ct),
                 ImportFn = ImportOverrideForTests ?? ((j, path) => ImageImportPipeline.ImportInto(j, path, asSprite, transparent, isColor: true)),
                 Transport = transport,
@@ -160,7 +182,15 @@ public static AssetGenJob StartAudioGeneration(AudioGenRequest req)
             var runner = new Runner
             {
                 Job = job,
-                SubmitFn = ct => adapter.SubmitAsync(req, apiKey, transport, ct),
+                SubmitFn = async ct =>
+                {
+                    if (!SkipModelVerificationForTests)
+                    {
+                        req.Model = AssetGenModelCatalog.ResolveModel("audio", provider, req.Model);
+                        req.CatalogEntry = await FalModelCatalog.VerifyForGeneration(req.Model, "audio", "text", ct, apiKey);
+                    }
+                    return await adapter.SubmitAsync(req, apiKey, transport, ct);
+                },
                 PollFn = (pid, ct) => adapter.PollAsync(pid, apiKey, transport, ct),
                 ImportFn = ImportOverrideForTests ?? AudioImportPipeline.ImportInto,
                 Transport = transport,
@@ -482,6 +512,13 @@ private static string WriteFile(Runner r, byte[] bytes)
             string ext = string.IsNullOrEmpty(chosen) ? "bin" : chosen.TrimStart('.').ToLowerInvariant();
             if (!IsAllowedResultExtension(r.Job.Kind, ext))
                 throw new Exception($"provider returned a disallowed file type '.{ext}'");
+            if (r.Job.Kind == "image")
+            {
+                string actual = ImageResultFormat.FromBytes(bytes);
+                if (actual == "webp") throw new Exception("Provider returned WebP, which this Unity image importer does not support. Choose a PNG/JPEG model.");
+                if (actual != null) ext = actual;
+                r.Job.Format = ext;
+            }
             string requestedRoot = !string.IsNullOrEmpty(r.OutputFolder) ? r.OutputFolder
                                                                          : (AssetGenPrefs.OutputRoot + "/" + r.Subfolder);
             if (!AssetGenPaths.TryGetAssetsFolder(requestedRoot, out string root))
@@ -597,6 +634,8 @@ internal static void ResetForTests()
             ImportOverrideForTests = null;
             PollIntervalSeconds = 3.0;
             TimeoutSeconds = 600.0;
+            SkipModelVerificationForTests = false;
+            AssetGenModelCatalog.ResetForTests();
         }
     }
 }

MCPForUnity/Editor/Services/AssetGen/AssetGenModelCatalog.cs

@@ -31,15 +31,31 @@ public sealed class ModelEntry
         public float MinDurationSeconds;
         public bool Loopable;
         public string CommercialNote;    // non-null => show a license caveat under the dropdown
-        public bool FromRefresh;         // true => merged from a fal-catalog refresh (Phase 5)
+        public bool FromRefresh;
+        public string PromptField = "prompt";
+        public bool DurationIsInteger = true;
+        public float DurationScale = 1f;  // request units per second (e.g. milliseconds)
+        public string EditModelId;
+        public string ImageInputField = "image_urls";
+        public bool ImageInputIsArray = true;
+        public bool SupportsNumImages = true;
+        public bool EditSupportsNumImages = true;
+        public bool SupportsImageSize = true;
+        public string LicenseType;
+        public string ModelUrl;
+        public string VerifiedAt;
+        public string OutputFormat;
+        public string EditOutputFormat;
+        public string[] Modes;
+        public string ModelOutputField;
+        public string TextureField;
+        public string RouterProviderTag;
+        public Newtonsoft.Json.Linq.JObject RouterParameters;
     }
 
     /// <summary>
-    /// Curated, always-present registry of selectable models per provider+kind, with metadata for
-    /// the Asset Generation panel. The first curated entry per (provider, kind) is the default, and
-    /// each default's <see cref="ModelEntry.Id"/> references the owning adapter's constant directly
-    /// — so the panel's shown default always equals what an omitted <c>model</c> param resolves to
-    /// (a drift-guard test pins the two). A fal-catalog refresh overlay is layered on in Phase 5.
+    /// Shared registry for the panel and tools. Live fal and OpenRouter snapshots replace
+    /// bundled entries, including removals. Discovered entries are verified before generation.
     /// </summary>
     public static class AssetGenModelCatalog
     {
@@ -57,61 +73,74 @@ public static class AssetGenModelCatalog
             new ModelEntry { Id = TripoAdapter.ModelVersion, Label = "Tripo v3.1", Provider = "tripo", Kind = "model", UseCase = "Text / image -> 3D" },
             new ModelEntry { Id = "P1-20260311", Label = "Tripo P1 (premium)", Provider = "tripo", Kind = "model", UseCase = "Premium 3D" },
             new ModelEntry { Id = MeshyAdapter.DefaultModel, Label = "Meshy 6", Provider = "meshy", Kind = "model", UseCase = "Text / image -> 3D" },
+            new ModelEntry { Id = FalModelAdapter.DefaultModel, Label = "Hunyuan3D", Provider = "fal", Kind = "model", UseCase = "Text -> 3D", Modes = new[] { "text" } },
 
             // Audio — fal (order: stable-audio, cassette SFX, cassette music, lyria). DurationField
             // is the request key each endpoint expects; null (Lyria) => prompt-only, no duration knob.
-            new ModelEntry { Id = FalAudioAdapter.DefaultModel, Label = "Stable Audio 2.5", Provider = "fal", Kind = "audio", UseCase = "Music + SFX", PriceLabel = "$0.20/gen", MaxDurationSeconds = 190f,
+            new ModelEntry { Id = FalAudioAdapter.DefaultModel, Label = "Stable Audio 2.5", Provider = "fal", Kind = "audio", UseCase = "Music + SFX", MaxDurationSeconds = 190f,
                 DurationField = "seconds_total", DefaultDurationSeconds = 30f,
-                CommercialNote = "Free under $1M annual revenue (Stability Community License); an Enterprise license is required at or above $1M." },
-            new ModelEntry { Id = "cassetteai/sound-effects-generator", Label = "CassetteAI SFX", Provider = "fal", Kind = "audio", UseCase = "Sound effects", PriceLabel = "$0.01/gen", MaxDurationSeconds = 30f,
+                CommercialNote = "Review the model's license and provider terms before commercial use." },
+            new ModelEntry { Id = "cassetteai/sound-effects-generator", Label = "CassetteAI SFX", Provider = "fal", Kind = "audio", UseCase = "Sound effects", MaxDurationSeconds = 30f,
                 DurationField = "duration", DefaultDurationSeconds = 10f, MinDurationSeconds = 1f },
-            new ModelEntry { Id = "cassetteai/music-generator", Label = "CassetteAI Music", Provider = "fal", Kind = "audio", UseCase = "Background music", PriceLabel = "$0.02/min", MaxDurationSeconds = 180f,
+            new ModelEntry { Id = "cassetteai/music-generator", Label = "CassetteAI Music", Provider = "fal", Kind = "audio", UseCase = "Background music", MaxDurationSeconds = 180f,
                 DurationField = "duration", DefaultDurationSeconds = 10f, MinDurationSeconds = 1f },
-            new ModelEntry { Id = "fal-ai/lyria2", Label = "Google Lyria 2", Provider = "fal", Kind = "audio", UseCase = "Background music", PriceLabel = "$0.10/30s", MaxDurationSeconds = 30f },
+            new ModelEntry { Id = "fal-ai/lyria2", Label = "Google Lyria 2", Provider = "fal", Kind = "audio", UseCase = "Background music", MaxDurationSeconds = 30f },
         };
 
-        /// <summary>Curated entries for a provider+kind, in curated order (default first). Never null.</summary>
+        internal static IReadOnlyList<ModelEntry> Bundled(string provider, string kind)
+            => Curated.Where(e => Eq(e.Provider, provider) && Eq(e.Kind, kind)).ToArray();
+
+        /// <summary>Current entries for a provider+kind. Never null.</summary>
         public static IReadOnlyList<ModelEntry> ForProvider(string provider, string kind)
         {
-            var result = new List<ModelEntry>();
-            foreach (ModelEntry e in Curated)
-                if (Eq(e.Provider, provider) && Eq(e.Kind, kind)) result.Add(e);
-            return result;
+            if (Eq(provider, "fal") && FalModelCatalog.TryGet(kind, out var entries)) return entries;
+            if (Eq(provider, "openrouter") && Eq(kind, "image") && OpenRouterModelCatalog.TryGet(out var images)) return images;
+            return Bundled(provider, kind);
         }
 
-        /// <summary>The curated entry with this exact id, or null.</summary>
+        /// <summary>The current entry with this id, or null.</summary>
         public static ModelEntry Find(string id)
         {
             if (string.IsNullOrEmpty(id)) return null;
-            foreach (ModelEntry e in Curated)
-                if (Eq(e.Id, id)) return e;
+            foreach (string kind in new[] { "audio", "image", "model" })
+                foreach (string provider in new[] { "fal", "openrouter", "tripo", "meshy" })
+                    foreach (ModelEntry e in ForProvider(provider, kind))
+                        if (Eq(e.Id, id)) return e;
             return null;
         }
 
-        /// <summary>The default model id for a provider+kind (the first curated entry), or null.</summary>
+        /// <summary>The first current entry for a provider+kind, or null.</summary>
         public static string DefaultModelId(string provider, string kind)
         {
-            foreach (ModelEntry e in Curated)
-                if (Eq(e.Provider, provider) && Eq(e.Kind, kind)) return e.Id;
-            return null;
+            return ForProvider(provider, kind).FirstOrDefault(e => e.Modes == null || e.Modes.Contains("text"))?.Id;
         }
 
         /// <summary>
         /// The model id a generate_* tool should use: an explicit <paramref name="requested"/> wins,
-        /// else the GUI-selected model for this (kind, provider), else the curated default. Null when
-        /// nothing resolves (the adapter then falls back to its own constant). Single home for the
+        /// else the GUI-selected model for this (kind, provider), else the catalog default. Missing
+        /// saved selections missing from a live catalog are rejected; explicit IDs are verified at submit.
+        /// Single home for the
         /// empty -> GUI-selected -> catalog-default precedence shared by all three generate tools.
         /// </summary>
         public static string ResolveModel(string kind, string provider, string requested)
         {
             string model = requested;
             if (string.IsNullOrWhiteSpace(model)) model = AssetGenPrefs.GetSelectedModel(kind, provider);
             if (string.IsNullOrWhiteSpace(model)) model = DefaultModelId(provider, kind);
+            bool authoritative = Eq(provider, "fal") && FalModelCatalog.Source(kind) != "bundled"
+                || Eq(provider, "openrouter") && kind == "image" && OpenRouterModelCatalog.Source != "bundled";
+            var entries = ForProvider(provider, kind);
+            if (authoritative && string.IsNullOrWhiteSpace(requested)
+                && (string.IsNullOrWhiteSpace(model) || !entries.Any(e => Eq(e.Id, model))))
+                throw new InvalidOperationException($"Model '{model}' is not in the current {kind} catalog. Refresh models and choose an available model; your saved selection has been preserved.");
             return string.IsNullOrWhiteSpace(model) ? null : model;
         }
 
-        /// <summary>Clears any test/refresh state. The refresh overlay is added in Phase 5; no-op today.</summary>
-        internal static void ResetForTests() { }
+        internal static void ResetForTests(bool isolate = false)
+        {
+            FalModelCatalog.ResetForTests(isolate);
+            OpenRouterModelCatalog.ResetForTests(isolate);
+        }
 
         private static bool Eq(string a, string b)
             => string.Equals(a, b, StringComparison.OrdinalIgnoreCase);