Merge pull request #606 from Freeesia/copilot/add-history-function-to-llm-plugin-model

Author: Freeesia

.github/copilot-instructions.md

@@ -120,4 +120,15 @@ dotnet nuget-license -t -ignore ignore-packages.json -override package-informati
 * `IAsyncEnumerable<TextRect>` を `IFilterModule` のパイプラインで使用（ストリーミング処理）
 * Windows固有APIは `#if WINDOWS` で条件コンパイル（`WindowTranslator.Abstractions` はクロスプラットフォームビルド対応）
 
+## 指示の日本語解釈
+
+### 助詞「に」と「を」で既存／新規を区別する
+
+日本語の助詞が対象の存在を示す：
+
+- **「〇〇**に**追加して」「〇〇**で**完結するようにして」** → 〇〇は**既存のもの**。新規作成ではなく、既存の〇〇に機能を追加・変更する
+- **「〇〇**を**追加して」「〇〇**を**作って」** → 〇〇はまだ存在しない。**新規作成**する
+
+この区別を誤ると、既存コンポーネントへの修正指示を新規クラス作成と誤解するため、必ず助詞を確認してから変更範囲を判断する。
+
 

Plugins/WindowTranslator.Plugin.GitHubCopilotPlugin/GitHubCopilotOptions.cs

@@ -7,6 +7,7 @@ namespace WindowTranslator.Plugin.GitHubCopilotPlugin;
 
 public class GitHubCopilotOptions : IPluginParam
 {
+    [EditableItemsSource]
     [LocalizedDescription(typeof(Resources), $"{nameof(Model)}_Desc")]
     public string Model { get; set; } = "gpt-5-mini";
 

Plugins/WindowTranslator.Plugin.LLMPlugin/LLMOptions.cs

@@ -13,6 +13,7 @@ public class LLMOptions : IPluginParam
 
     public bool WaitCorrect { get; set; }
 
+    [EditableItemsSource]
     public string? Model { get; set; } = "gpt-4o-mini";
 
     [DataType(DataType.Password)]

WindowTranslator.Abstractions/ComponentModel/EditableItemsSourceAttribute.cs

@@ -0,0 +1,10 @@
+namespace WindowTranslator.ComponentModel;
+
+/// <summary>
+/// プロパティを編集可能なComboBoxとして表示するためのマーカー属性です。
+/// 候補一覧はView側の履歴ストアから自動的に提供されます。
+/// </summary>
+[AttributeUsage(AttributeTargets.Property)]
+public class EditableItemsSourceAttribute : Attribute
+{
+}

WindowTranslator/Modules/Settings/AllSettingsDialog.xaml.cs

@@ -2,6 +2,7 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Markup;
+using WindowTranslator.Stores;
 using Wpf.Ui;
 using Wpf.Ui.Appearance;
 using Wpf.Ui.Controls;
@@ -13,12 +14,16 @@ namespace WindowTranslator.Modules.Settings;
 /// </summary>
 public partial class AllSettingsDialog : FluentWindow
 {
-    public AllSettingsDialog(IContentDialogService contentDialogService)
+    public AllSettingsDialog(IContentDialogService contentDialogService, IModelHistoryStore modelHistoryStore)
     {
         SystemThemeWatcher.Watch(this);
         InitializeComponent();
         this.Language = XmlLanguage.GetLanguage(CultureInfo.CurrentUICulture.IetfLanguageTag);
         contentDialogService.SetDialogHost(this.RootContentDialog);
+        if (this.Resources["operator"] is SettingsPropertyGridOperator op)
+        {
+            op.HistoryStore = modelHistoryStore;
+        }
     }
 }
 

WindowTranslator/Modules/Settings/AllSettingsViewModel.cs

@@ -301,6 +301,7 @@ public async Task SaveAsync(object window)
         this.autoTargetStore.AutoTargets.Clear();
         this.autoTargetStore.AutoTargets.UnionWith(this.AutoTargets);
         this.autoTargetStore.Save();
+
         this.rootConfig?.Reload();
         if (this.ApplyMode)
         {
@@ -479,6 +480,7 @@ public partial class TargetSettingsViewModel(
         {
             configureMethod.Invoke(configure, [name, p]);
         }
+
         return p;
     }).ToArray();
 }

WindowTranslator/Modules/Settings/SettingsPropertyGridFactory.cs

@@ -1,5 +1,6 @@
 using PropertyTools.DataAnnotations;
 using PropertyTools.Wpf;
+using System.Collections;
 using System.ComponentModel.DataAnnotations;
 using System.Globalization;
 using System.Reflection;
@@ -42,6 +43,19 @@ public override FrameworkElement CreateControl(PropertyItem property, PropertyCo
             fe.SetBinding(TextBox.TextProperty, property.CreateBinding());
         }
 
+        // EditableItemsSourceAttributeが指定されている場合、編集可能ComboBoxを生成
+        if (fe == null && property is IEditableItemsPropertyItem editableItem && editableItem.EditableCandidates != null)
+        {
+            var comboBox = new ComboBox
+            {
+                IsEditable = true,
+                IsTextSearchEnabled = true,
+                ItemsSource = editableItem.EditableCandidates,
+            };
+            comboBox.SetBinding(ComboBox.TextProperty, property.CreateBinding(UpdateSourceTrigger.PropertyChanged));
+            fe = comboBox;
+        }
+
         fe ??= base.CreateControl(property, options);
 
         if (property.Descriptor.Attributes.Matches(enableAttribute))

WindowTranslator/Modules/Settings/SettingsPropertyGridOperator.cs

@@ -1,14 +1,25 @@
 using PropertyTools.Wpf;
+using System.Collections;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel;
 using System.Windows.Data;
 using System.Globalization;
 using System.Windows.Input;
 using PropertyTools.DataAnnotations;
+using WindowTranslator.ComponentModel;
+using WindowTranslator.Stores;
 
 namespace WindowTranslator.Modules.Settings;
+
+internal interface IEditableItemsPropertyItem
+{
+    IEnumerable? EditableCandidates { get; set; }
+}
+
 internal class SettingsPropertyGridOperator : PropertyGridOperator
 {
+    public IModelHistoryStore? HistoryStore { get; set; }
+
     public SettingsPropertyGridOperator()
     {
         this.ModifyCamelCaseDisplayNames = false;
@@ -86,17 +97,35 @@ protected override void SetAttribute(Attribute attribute, PropertyItem pi, objec
         {
             pi.SortIndex = order;
         }
+        if (attribute is EditableItemsSourceAttribute _ && pi is IEditableItemsPropertyItem editableItem)
+        {
+            var key = $"{instance.GetType().Name}.{pi.Descriptor.Name}";
+            editableItem.EditableCandidates = this.HistoryStore?.GetHistory(key) ?? [];
+            if (this.HistoryStore is { } store)
+            {
+                pi.Descriptor.AddValueChanged(instance, (s, e) =>
+                {
+                    if (pi.Descriptor.GetValue(instance) is string value && !string.IsNullOrWhiteSpace(value))
+                    {
+                        store.AddHistory(key, value);
+                        store.Save();
+                    }
+                });
+            }
+        }
         base.SetAttribute(attribute, pi, instance);
     }
 
     protected override PropertyItem CreateCore(PropertyDescriptor pd, PropertyDescriptorCollection propertyDescriptors)
         => new ParentablePropertyItem(pd, propertyDescriptors);
 
     private class ParentablePropertyItem(PropertyDescriptor propertyDescriptor, PropertyDescriptorCollection propertyDescriptors)
-        : PropertyItem(propertyDescriptor, propertyDescriptors)
+        : PropertyItem(propertyDescriptor, propertyDescriptors), IEditableItemsPropertyItem
     {
         private readonly Stack<string> parents = new();
 
+        public IEnumerable? EditableCandidates { get; set; }
+
         public void AddParent(string parent)
             => parents.Push(parent);
 

WindowTranslator/Program.cs

@@ -133,6 +133,7 @@
 
 builder.Services.AddSingleton<IMainWindowModule, MainWindowModule>();
 builder.Services.AddSingleton<IAutoTargetStore, AutoTargetStore>();
+builder.Services.AddSingleton<IModelHistoryStore, ModelHistoryStore>();
 builder.Services.AddHostedService<WindowMonitor>();
 if (builder.Configuration.GetValue<bool>("IgnoreUpdate"))
 {

WindowTranslator/Stores/ModelHistoryStore.cs

@@ -0,0 +1,96 @@
+using System.IO;
+using System.Text.Json;
+
+namespace WindowTranslator.Stores;
+
+/// <summary>
+/// モデル名の利用履歴を管理するストアのインターフェースです。
+/// </summary>
+public interface IModelHistoryStore
+{
+    /// <summary>
+    /// 指定キーの履歴を取得します。
+    /// </summary>
+    IReadOnlyList<string> GetHistory(string key);
+
+    /// <summary>
+    /// 指定キーに値を追加します。既存の値がある場合は先頭に移動します。
+    /// </summary>
+    void AddHistory(string key, string value);
+
+    /// <summary>
+    /// 履歴をファイルに保存します。
+    /// </summary>
+    void Save();
+}
+
+/// <inheritdoc cref="IModelHistoryStore"/>
+public class ModelHistoryStore : IModelHistoryStore
+{
+    private static readonly string historyPath = Path.Combine(PathUtility.UserDir, "model-history.json");
+    private const int MaxHistoryCount = 10;
+
+    private readonly Dictionary<string, List<string>> history;
+
+    /// <summary>
+    /// <see cref="ModelHistoryStore"/> の新しいインスタンスを初期化します。
+    /// </summary>
+    public ModelHistoryStore()
+    {
+        if (File.Exists(historyPath))
+        {
+            try
+            {
+                using var fs = File.OpenRead(historyPath);
+                this.history = JsonSerializer.Deserialize<Dictionary<string, List<string>>>(fs) ?? [];
+            }
+            catch (JsonException)
+            {
+                this.history = [];
+            }
+            catch (IOException)
+            {
+                this.history = [];
+            }
+        }
+        else
+        {
+            this.history = [];
+        }
+    }
+
+    /// <inheritdoc/>
+    public IReadOnlyList<string> GetHistory(string key)
+        => this.history.TryGetValue(key, out var list) ? list.AsReadOnly() : [];
+
+    /// <inheritdoc/>
+    public void AddHistory(string key, string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return;
+        }
+
+        if (!this.history.TryGetValue(key, out var list))
+        {
+            list = [];
+            this.history[key] = list;
+        }
+
+        list.Remove(value);
+        list.Insert(0, value);
+
+        if (list.Count > MaxHistoryCount)
+        {
+            list.RemoveRange(MaxHistoryCount, list.Count - MaxHistoryCount);
+        }
+    }
+
+    /// <inheritdoc/>
+    public void Save()
+    {
+        Directory.CreateDirectory(PathUtility.UserDir);
+        using var fs = File.Create(historyPath);
+        JsonSerializer.Serialize(fs, this.history);
+    }
+}