@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.AI;
 
 namespace AGUI.Abstractions;
@@ -40,9 +38,8 @@ public static IEnumerable<AGUITool> AsAGUITools(this IEnumerable<AITool> tools)
     }
 
     /// <summary>
-    /// Converts a sequence of <see cref="AGUITool"/> instances to invocable <see cref="AIFunction"/> proxies.
-    /// The actual implementation remains on the client side; the proxies are intended to be wrapped with
-    /// <see cref="ApprovalRequiredAIFunction"/> before they are supplied to a function-invoking chat client.
+    /// Converts a sequence of <see cref="AGUITool"/> instances to <see cref="AITool"/> declarations.
+    /// These are declaration-only and cannot be invoked, as the actual implementation exists on the client side.
     /// </summary>
     /// <param name="tools">The AG-UI tool definitions.</param>
     /// <returns>A sequence of <see cref="AITool"/> declarations.</returns>
@@ -60,31 +57,10 @@ private static IEnumerable<AITool> ConvertTools(IList<AGUITool> tools)
     {
         foreach (var tool in tools)
         {
-            yield return new ClientToolAIFunction(tool);
-        }
-    }
-
-    private sealed class ClientToolAIFunction : AIFunction
-    {
-        private readonly AGUITool _tool;
-
-        internal ClientToolAIFunction(AGUITool tool)
-        {
-            _tool = tool;
-        }
-
-        public override string Name => _tool.Name;
-
-        public override string Description => _tool.Description ?? string.Empty;
-
-        public override System.Text.Json.JsonElement JsonSchema => _tool.Parameters;
-
-        protected override ValueTask<object?> InvokeCoreAsync(
-            AIFunctionArguments arguments,
-            CancellationToken cancellationToken)
-        {
-            return new ValueTask<object?>(Task.FromException<object?>(
-                new InvalidOperationException($"Client tool '{Name}' cannot be invoked on the server without a client-produced result.")));
+            yield return AIFunctionFactory.CreateDeclaration(
+                name: tool.Name,
+                description: tool.Description,
+                jsonSchema: tool.Parameters);
         }
     }
 }
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.AI" />
+    <PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
   </ItemGroup>
 
 </Project>
@@ -464,16 +464,17 @@ private static async IAsyncEnumerable<BaseEvent> CoreAsync(
 
                         yield return ToolCallEndEvent.Create(toolCall.CallId, raw);
 
-                        // Client tools are always represented to FICC as approval-required proxies,
-                        // so unwrap their approval requests back into ordinary AG-UI tool calls.
+                        // A client tool is owned and gated by the client, never the server. Always
+                        // surface its call as a plain TOOL_CALL (the run finishes with success) so
+                        // the client executes it — including when the model re-invokes it on a
+                        // continuation (where it arrives wrapped as an approval request).
                         if (clientToolNames.Contains(toolCall.Name))
                         {
                             break;
                         }
 
-                        // FICC wraps every peer in a mixed batch when one function requires approval.
-                        // A false value identifies a collateral server call: unwrap it so clients can
-                        // preserve the call as informational history without prompting for approval.
+                        // FICC also wraps server calls when a peer requires approval. Those collateral
+                        // calls don't require confirmation, so unwrap them without prompting.
 #pragma warning disable MEAI001
                         if (!ar.RequiresConfirmation)
 #pragma warning restore MEAI001