Bugfix, logic refactor

Author: andystaples

src/FunctionInfoUtilities.cs

@@ -0,0 +1,19 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using System.Linq;
+
+namespace Microsoft.Azure.Functions.PowerShellWorker
+{
+    internal class FunctionInfoUtilities
+    {
+        private const string assistantSkillTriggerName = "assistantSkillTrigger";
+
+        public static bool hasAssistantSkillTrigger(AzFunctionInfo info)
+        {
+            return info.InputBindings.Where(x => x.Value.Type == assistantSkillTriggerName).Any();
+        }
+    }
+}

src/PowerShell/PowerShellManager.cs

@@ -248,8 +248,7 @@ public Hashtable InvokeFunction(
                         {
                             _pwsh.AddCommand(Utils.TracePipelineObjectCmdlet);
                         }
-                        var isOpenAiSkillTrigger = functionInfo.InputBindings.Where(x => x.Value.Type == "assistantSkillTrigger").Any();
-                        return ExecuteUserCode(isActivityFunction || isOpenAiSkillTrigger, outputBindings);
+                        return ExecuteUserCode(isActivityFunction || FunctionInfoUtilities.hasAssistantSkillTrigger(functionInfo), outputBindings);
                     }
                 }
                 catch (RuntimeException e)

src/RequestProcessor.cs

@@ -22,6 +22,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker
     using LogLevel = Microsoft.Azure.WebJobs.Script.Grpc.Messages.RpcLog.Types.Level;
     using System.Runtime.InteropServices;
     using Microsoft.Azure.Functions.PowerShellWorker.OpenTelemetry;
+    using System.Linq;
 
     internal class RequestProcessor
     {
@@ -537,7 +538,7 @@ private static void BindOutputFromResult(InvocationResponse response, AzFunction
                 }
             }
 
-            if (functionInfo.DurableFunctionInfo.ProvidesForcedDollarReturnValue)
+            if (functionInfo.DurableFunctionInfo.ProvidesForcedDollarReturnValue || functionInfo.InputBindings.Where(x => x.Value.Type == "assistantSkillTrigger").Any())
             {
                 response.ReturnValue = results[AzFunctionInfo.DollarReturn].ToTypedData(isDurableData: true);
             }