From aaa6e03012daf3f45b24a042a07e1a25e5705e8e Mon Sep 17 00:00:00 2001
From: Shawn Yuan <shuaiyuan@microsoft.com>
Date: Tue, 2 Dec 2025 14:58:52 +0800
Subject: [PATCH] init

Signed-off-by: Shawn Yuan <shuaiyuan@microsoft.com>
---
 .../Helpers/DataPackageHelpers.cs             | 18 +++++++++++++
 .../Services/KernelServiceBase.cs             | 26 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
index 2cd7554a50..f5439aecf1 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
@@ -225,6 +225,24 @@ internal static class DataPackageHelpers
     internal static async Task<string> GetHtmlContentAsync(this DataPackageView dataPackageView) =>
         dataPackageView.Contains(StandardDataFormats.Html) ? await dataPackageView.GetHtmlFormatAsync() : string.Empty;
 
+    internal static async Task<byte[]> GetImageAsPngBytesAsync(this DataPackageView dataPackageView)
+    {
+        var bitmap = await dataPackageView.GetImageContentAsync();
+        if (bitmap == null)
+        {
+            return null;
+        }
+
+        using var pngStream = new InMemoryRandomAccessStream();
+        var encoder = await BitmapEncoder.CreateAsync(BitmapEncoder.PngEncoderId, pngStream);
+        encoder.SetSoftwareBitmap(bitmap);
+        await encoder.FlushAsync();
+
+        using var memoryStream = new MemoryStream();
+        await pngStream.AsStreamForRead().CopyToAsync(memoryStream);
+        return memoryStream.ToArray();
+    }
+
     internal static async Task<SoftwareBitmap> GetImageContentAsync(this DataPackageView dataPackageView)
     {
         using var stream = await dataPackageView.GetImageStreamAsync();
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
index 47e208eb49..361caa9740 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
@@ -74,6 +74,16 @@ public abstract class KernelServiceBase(
 
             var outputPackage = kernel.GetDataPackage();
 
+            if (!(await outputPackage.GetView().HasUsableDataAsync()))
+            {
+                var lastMessage = chatHistory.LastOrDefault();
+                if (lastMessage != null && lastMessage.Role == AuthorRole.Assistant && !string.IsNullOrEmpty(lastMessage.Content))
+                {
+                    outputPackage = DataPackageHelpers.CreateFromText(lastMessage.Content);
+                    kernel.SetDataPackage(outputPackage);
+                }
+            }
+
             if (!(await outputPackage.GetView().HasUsableDataAsync()))
             {
                 throw new InvalidOperationException("No data was returned from the kernel operation");
@@ -148,7 +158,21 @@ public abstract class KernelServiceBase(
         var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
         chatHistory.AddSystemMessage(systemPrompt);
         chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
-        chatHistory.AddUserMessage(prompt);
+
+        var imageBytes = await kernel.GetDataPackageView().GetImageAsPngBytesAsync();
+        if (imageBytes != null)
+        {
+            var collection = new ChatMessageContentItemCollection
+            {
+                new TextContent(prompt),
+                new ImageContent(imageBytes, "image/png"),
+            };
+            chatHistory.AddUserMessage(collection);
+        }
+        else
+        {
+            chatHistory.AddUserMessage(prompt);
+        }
 
         if (ShouldModerateAdvancedAI())
         {