@alpsckr/unitycli 0.4.2 → 0.4.4

package/unitypkg/Editor/Infrastructure/UnityCliWaiter.cs

@@ -20,7 +20,7 @@ namespace UnityCli
         UnityCliMainThreadAwaitable<bool> UntilStable(Func<bool> predicate, TimeSpan timeout, int minimumFrames = 2, TimeSpan minimumDuration = default, CancellationToken ct = default);
         UnityCliMainThreadAwaitable<bool> UntilEditorReady(TimeSpan timeout, CancellationToken ct = default);
         UnityCliMainThreadAwaitable<bool> UntilPlayModeState(PlayModeStateChange state, TimeSpan timeout, CancellationToken ct = default);
-        UnityCliMainThreadAwaitable<T> ForCallback<T>(Action<Action<T>, Action<Exception>> start, TimeSpan timeout, CancellationToken ct = default);
+        UnityCliMainThreadAwaitable<T> ForCallback<T>(Action<Func<Func<T>, bool>, Func<Exception, bool>> start, TimeSpan timeout, CancellationToken ct = default, Action onAbandoned = null);
     }
 
     internal interface IMainThreadAwaitableSource<out T>
@@ -60,6 +60,78 @@ namespace UnityCli
         }
     }
 
+    /// <summary>callback 结果工厂必须先赢得一次性 terminal ownership；迟到 callback 不能执行 publication。</summary>
+    internal sealed class UnityCliCallbackPublication<T>
+    {
+        private readonly object sync = new object();
+        private bool terminal;
+        private bool completed;
+        private bool failed;
+        private T result;
+        private Exception exception;
+
+        internal bool TryComplete(Func<T> createResult, Func<bool> unavailable = null)
+        {
+            lock (sync)
+            {
+                if (terminal || unavailable != null && unavailable())
+                {
+                    terminal = true;
+                    return false;
+                }
+                terminal = true;
+                try
+                {
+                    result = createResult == null ? default : createResult();
+                    completed = true;
+                }
+                catch (Exception error)
+                {
+                    exception = error;
+                    failed = true;
+                }
+                return true;
+            }
+        }
+
+        internal bool TryFail(Exception error, Func<bool> unavailable = null)
+        {
+            lock (sync)
+            {
+                if (terminal || unavailable != null && unavailable())
+                {
+                    terminal = true;
+                    return false;
+                }
+                terminal = true;
+                exception = error;
+                failed = true;
+                return true;
+            }
+        }
+
+        internal bool TryAbandon()
+        {
+            lock (sync)
+            {
+                if (terminal) return false;
+                terminal = true;
+                return true;
+            }
+        }
+
+        internal void Read(out bool isCompleted, out bool isFailed, out T value, out Exception error)
+        {
+            lock (sync)
+            {
+                isCompleted = completed;
+                isFailed = failed;
+                value = result;
+                error = exception;
+            }
+        }
+    }
+
     internal sealed class UnityCliWaiter : IUnityCliWaiter
     {
         private readonly string requestId;
@@ -101,9 +173,9 @@ namespace UnityCli
             return UnityCliWaitScheduler.UntilPlayModeState(requestId, owner, state, timeout, ct);
         }
 
-        public UnityCliMainThreadAwaitable<T> ForCallback<T>(Action<Action<T>, Action<Exception>> start, TimeSpan timeout, CancellationToken ct = default)
+        public UnityCliMainThreadAwaitable<T> ForCallback<T>(Action<Func<Func<T>, bool>, Func<Exception, bool>> start, TimeSpan timeout, CancellationToken ct = default, Action onAbandoned = null)
         {
-            return UnityCliWaitScheduler.ForCallback(requestId, owner, start, timeout, ct);
+            return UnityCliWaitScheduler.ForCallback(requestId, owner, start, timeout, ct, onAbandoned);
         }
     }
 
@@ -224,7 +296,7 @@ namespace UnityCli
                 }
             }
 
-            public void Cancel(Exception exception)
+            public virtual void Cancel(Exception exception)
             {
                 if (IsCompleted) return;
                 Fail(exception);
@@ -392,35 +464,38 @@ namespace UnityCli
 
         private sealed class CallbackWait<T> : PendingWaitBase<T>
         {
-            private readonly object callbackLock = new object();
             private readonly DateTime deadlineUtc;
-            private bool callbackCompleted;
-            private bool callbackFailed;
-            private bool callbackTerminal;
-            private T callbackResult;
-            private Exception callbackException;
+            private readonly CancellationToken callbackCancellationToken;
+            private readonly UnityCliCallbackPublication<T> publication = new UnityCliCallbackPublication<T>();
+            private readonly Action onAbandoned;
 
-            public CallbackWait(string requestId, string owner, Action<Action<T>, Action<Exception>> start, TimeSpan timeout, CancellationToken cancellationToken)
+            public CallbackWait(string requestId, string owner, Action<Func<Func<T>, bool>, Func<Exception, bool>> start, TimeSpan timeout, CancellationToken cancellationToken, Action onAbandoned)
                 : base(requestId, owner, cancellationToken)
             {
+                this.onAbandoned = onAbandoned;
+                callbackCancellationToken = cancellationToken;
                 deadlineUtc = DateTime.UtcNow.Add(timeout < TimeSpan.Zero ? TimeSpan.Zero : timeout);
                 start?.Invoke(OnComplete, OnFail);
             }
 
             protected override bool Advance(DateTime utcNow)
             {
+                if (utcNow >= deadlineUtc && publication.TryAbandon())
+                {
+                    NotifyAbandoned();
+                    return Fail(new UnityCliBridge.BridgeCommandException(
+                        "E_EXECUTION_TIMEOUT",
+                        "Callback wait timed out.",
+                        "Retry or reduce scope.",
+                        transient: false,
+                        retryAfterMs: 0));
+                }
+
                 bool completed;
                 bool failed;
                 T result;
                 Exception exception;
-                lock (callbackLock)
-                {
-                    completed = callbackCompleted;
-                    failed = callbackFailed;
-                    result = callbackResult;
-                    exception = callbackException;
-                    if (!completed && !failed && utcNow >= deadlineUtc) callbackTerminal = true;
-                }
+                publication.Read(out completed, out failed, out result, out exception);
                 if (failed) return Fail(exception ?? new Exception("Callback wait failed."));
                 if (completed) return Succeed(result);
                 if (utcNow >= deadlineUtc)
@@ -435,26 +510,44 @@ namespace UnityCli
                 return false;
             }
 
-            private void OnComplete(T result)
+            public override void Cancel(Exception exception)
             {
-                lock (callbackLock)
+                if (publication.TryAbandon())
                 {
-                    if (callbackTerminal || IsCompleted) return;
-                    callbackTerminal = true;
-                    callbackResult = result;
-                    callbackCompleted = true;
+                    NotifyAbandoned();
+                    base.Cancel(exception);
+                    return;
                 }
+
+                bool completed;
+                bool failed;
+                T result;
+                Exception callbackError;
+                publication.Read(out completed, out failed, out result, out callbackError);
+                if (completed) { Succeed(result); return; }
+                if (failed) { Fail(callbackError ?? exception); return; }
+                base.Cancel(exception);
             }
 
-            private void OnFail(Exception exception)
+            private void NotifyAbandoned()
             {
-                lock (callbackLock)
-                {
-                    if (callbackTerminal || IsCompleted) return;
-                    callbackTerminal = true;
-                    callbackException = exception;
-                    callbackFailed = true;
-                }
+                try { onAbandoned?.Invoke(); }
+                catch { /* abandonment cleanup must not replace the scheduler terminal */ }
+            }
+
+            private bool OnComplete(Func<T> createResult)
+            {
+                return publication.TryComplete(createResult, CallbackUnavailable);
+            }
+
+            private bool OnFail(Exception exception)
+            {
+                return publication.TryFail(exception, CallbackUnavailable);
+            }
+
+            private bool CallbackUnavailable()
+            {
+                return IsCompleted || callbackCancellationToken.IsCancellationRequested || DateTime.UtcNow >= deadlineUtc;
             }
         }
 
@@ -521,9 +614,9 @@ namespace UnityCli
             }
         }
 
-        public static UnityCliMainThreadAwaitable<T> ForCallback<T>(string requestId, string owner, Action<Action<T>, Action<Exception>> start, TimeSpan timeout, CancellationToken cancellationToken)
+        public static UnityCliMainThreadAwaitable<T> ForCallback<T>(string requestId, string owner, Action<Func<Func<T>, bool>, Func<Exception, bool>> start, TimeSpan timeout, CancellationToken cancellationToken, Action onAbandoned = null)
         {
-            var wait = new CallbackWait<T>(requestId, owner, start, timeout, cancellationToken);
+            var wait = new CallbackWait<T>(requestId, owner, start, timeout, cancellationToken, onAbandoned);
             Register(wait);
             return new UnityCliMainThreadAwaitable<T>(wait);
         }

package/unitypkg/Editor/ProjectTools/IUnityCliTool.cs

@@ -6,6 +6,14 @@ using System.Threading.Tasks;
 
 namespace UnityCli
 {
+    /// <summary>Extension asmdef 的编译期 owner claim；runtime 仍需与 generated exact inventory 全集一致。</summary>
+    [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = false)]
+    public sealed class UnityCliExtensionAssemblyAttribute : Attribute
+    {
+        public UnityCliExtensionAssemblyAttribute(string extensionId) { ExtensionId = extensionId; }
+        public string ExtensionId { get; private set; }
+    }
+
     /// <summary>
     /// 工具统一为语言原生异步接口。实现本接口即声明一个工具。
     /// desc 只声明人写字段；schema 由框架从 TReq/TRes 派生。
@@ -91,7 +99,6 @@ namespace UnityCli
         public string[] Permissions { get; set; }
         public string[] RequiresPackages { get; set; }
         public ToolExample[] Examples { get; set; }
-        public string Fingerprint { get; set; }
         public ToolCompletionDescriptor Completion { get; set; }
     }
 
@@ -148,5 +155,6 @@ namespace UnityCli
         public UnityCliStringEnumAttribute(params string[] values) { Values = values ?? Array.Empty<string>(); }
         public string[] Values { get; private set; }
     }
+
 }
 #endif

package/unitypkg/Editor/ProjectTools/OfficialAttributeToolRegistry.cs

@@ -95,7 +95,7 @@ namespace UnityCli
         /// 扫描一个类型声明的官方 attributed static method。所有候选都先写入 pending registry；
         /// 任一签名、schema、ownership 或名称冲突都会阻止本轮目录发布。
         /// </summary>
-        private static void TryRegisterOfficialAttributeTools(Assembly assembly, Type type)
+        private static void TryRegisterOfficialAttributeTools(UnityCliToolCatalogBuilder builder, RegistryOwnershipResolver ownershipResolver, Assembly assembly, Type type)
         {
             var methods = type.GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance | BindingFlags.DeclaredOnly)
                 .Where(method => FindAttribute(method, OfficialCliCommandAttribute) != null)
@@ -111,9 +111,8 @@ namespace UnityCli
 
             foreach (var method in methods)
             {
-                var definition = CreateOfficialAttributeTool(assembly, type, method);
-                RegisterProjectTool(definition);
-                WriteLog("custom_tool_registered name=" + definition.Name + " source=official-attribute type=" + type.FullName + " method=" + method.Name);
+                var definition = CreateOfficialAttributeTool(ownershipResolver, type, method);
+                RegisterProjectTool(builder, definition, UnityCliToolProviderKind.OfficialAttribute);
             }
         }
 
@@ -139,9 +138,10 @@ namespace UnityCli
             return suppressed;
         }
 
-        /// <summary>从 CustomAttributeData 构造保守 descriptor、严格输入 schema 与方法返回完成契约。</summary>
-        private static RegisteredTool CreateOfficialAttributeTool(Assembly assembly, Type implementationType, MethodInfo method)
+        /// <summary>签名和返回形态只读取编译元数据；任一不支持形态在pending publish前失败。</summary>
+        private static void ValidateOfficialMethodSignature(MethodInfo method)
         {
+            if (method == null) throw new ArgumentNullException("method");
             if (!method.IsStatic) throw new InvalidOperationException("Official CLI command method must be static: " + MethodIdentity(method) + ".");
             if (method.IsGenericMethodDefinition || method.ContainsGenericParameters)
                 throw new InvalidOperationException("Official CLI command method cannot be generic: " + MethodIdentity(method) + ".");
@@ -149,13 +149,18 @@ namespace UnityCli
                 throw new InvalidOperationException("Official CLI command return type is unsupported: " + MethodIdentity(method) + ".");
             if (method.ReturnType == typeof(void) && method.IsDefined(typeof(AsyncStateMachineAttribute), false))
                 throw new InvalidOperationException("Official CLI command cannot use async void: " + MethodIdentity(method) + ".");
+        }
+
+        /// <summary>从 CustomAttributeData 构造保守 descriptor、严格输入 schema 与方法返回完成契约。</summary>
+        private static RegisteredTool CreateOfficialAttributeTool(RegistryOwnershipResolver ownershipResolver, Type implementationType, MethodInfo method)
+        {
+            ValidateOfficialMethodSignature(method);
 
             var command = FindAttribute(method, OfficialCliCommandAttribute);
             var name = ConstructorString(command, 0, "name", method);
             var description = ConstructorString(command, 1, "description", method);
-            if (string.IsNullOrWhiteSpace(name) || !string.Equals(name, name.Trim(), StringComparison.Ordinal) || name.Any(char.IsWhiteSpace))
-                throw new InvalidOperationException("Official CLI command name must be one non-empty token without whitespace: " + MethodIdentity(method) + ".");
-            var toolName = OfficialAttributeToolPrefix + name;
+            var toolName = OfficialAttributeToolPrefix + (name ?? string.Empty);
+            UnityCliToolName.Validate(toolName, "official-attribute");
             if (string.IsNullOrWhiteSpace(description))
                 throw new InvalidOperationException("Official CLI command description is required: " + MethodIdentity(method) + ".");
 
@@ -179,8 +184,8 @@ namespace UnityCli
                 NormalizeResultWithNewtonsoft = output.NormalizeWithNewtonsoft,
                 Parameters = parameters
             };
-            var ownership = registryOwnership.Resolve(implementationType);
-            if (!string.Equals(ownership, "project", StringComparison.Ordinal))
+            var ownership = ownershipResolver.Resolve(implementationType, toolName);
+            if (!string.Equals(ownership.Source, "project", StringComparison.Ordinal))
                 throw new InvalidOperationException("Official attribute Tool ownership must resolve to project or third-party code: " + MethodIdentity(method) + ".");
 
             var completion = new UnityCliToolCompletionContract(
@@ -197,16 +202,12 @@ namespace UnityCli
                 "required",
                 true);
 
-            return new RegisteredTool
+            var descriptor = new ToolDescriptor
             {
                 Name = toolName,
                 Summary = OfficialSummary(description),
                 Description = description + " Imported from Unity.Pipeline.Commands.CliCommandAttribute. Risk, PlayMode, dry-run and completion semantics use the conservative official-attribute contract. Schema defaults and examples describe valid default behavior, not caller intent; use caller-requested business values on the first execution.",
                 Group = OfficialAttributeToolGroup,
-                Source = "project",
-                Ownership = "project",
-                InputSchema = UnityCliSerializer.Serialize(inputSchema),
-                OutputSchema = output.Schema,
                 DestructiveHint = true,
                 SideEffects = new[] { "arbitrary-method-invocation" },
                 SupportsDryRun = false,
@@ -221,22 +222,22 @@ namespace UnityCli
                     }
                 },
                 Target = "editor",
-                AvailabilityScope = runtimeOnly ? "playModeSession" : "editorSession",
                 PlayModeSupport = playModeSupport,
-                ContractProfile = "official-attribute",
                 DefaultTimeoutMs = 30000,
-                MaxTimeoutMs = 600000,
-                RequiredInput = parameters.Where(parameter => parameter.Required).Select(parameter => parameter.Name).ToArray(),
-                RegisteredBy = "official-pipeline-attribute",
-                DescriptorSource = OfficialCliCommandAttribute,
-                Assembly = assembly.GetName().Name,
-                Method = MethodIdentity(method),
-                RequestType = typeof(Dictionary<string, object>),
-                ResultType = output.ValidationType,
-                CompletionContract = completion,
-                OfficialAttributeBinding = binding,
-                InvokeAsync = (request, context, cancellationToken) => InvokeOfficialAttributeTool(binding, request, context, cancellationToken)
+                MaxTimeoutMs = 600000
             };
+            return new RegisteredTool(
+                descriptor,
+                ownership,
+                UnityCliSerializer.Serialize(inputSchema),
+                output.Schema,
+                runtimeOnly ? "playModeSession" : "editorSession",
+                "official-attribute",
+                typeof(Dictionary<string, object>),
+                output.ValidationType,
+                completion,
+                binding,
+                (request, context, cancellationToken) => InvokeOfficialAttributeTool(binding, request, context, cancellationToken));
         }
 
         /// <summary>解析参数 attribute，严格验证签名和默认值可转换性。</summary>
@@ -631,8 +632,8 @@ namespace UnityCli
                     : Failure(path, "single-character string", ActualType(value));
             }
             if (type == typeof(bool)) return value is bool ? null : Failure(path, "boolean", ActualType(value));
-            if (UnityCliSchemaDeriver.IsInteger(type)) return ValidateInteger(value, type, path);
-            if (UnityCliSchemaDeriver.IsNumber(type)) return ValidateNumber(value, type, path);
+            if (UnityCliSchemaDeriver.IsInteger(type)) return ValidateInteger(value, type, path, null);
+            if (UnityCliSchemaDeriver.IsNumber(type)) return ValidateNumber(value, type, path, null);
             if (type.IsEnum)
             {
                 var enumName = value as string;