From 3062286cd0ba0077abb009aeb7b300d225f21581 Mon Sep 17 00:00:00 2001
From: Sylvie Crowe <107814465+oneirocosm@users.noreply.github.com>
Date: Fri, 14 Feb 2025 00:30:46 -0800
Subject: [PATCH] fix: decouple AiSettingsType from SettingsType (#1961)

While there is significant overlap between SettingsType and
AiSettingsType, they are distinct entities and should be treated as such
until more changes have been made.
---
 pkg/wconfig/settingsconfig.go | 16 +++++++++++++++-
 schema/aipresets.json         |  6 ++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkg/wconfig/settingsconfig.go b/pkg/wconfig/settingsconfig.go
index ff4aae89a..814d3d46a 100644
--- a/pkg/wconfig/settingsconfig.go
+++ b/pkg/wconfig/settingsconfig.go
@@ -46,6 +46,8 @@ type AiSettingsType struct {
 	AiTimeoutMs     float64 `json:"ai:timeoutms,omitempty"`
 	AiFontSize      float64 `json:"ai:fontsize,omitempty"`
 	AiFixedFontSize float64 `json:"ai:fixedfontsize,omitempty"`
+	DisplayName     string  `json:"display:name,omitempty"`
+	DisplayOrder    float64 `json:"display:order,omitempty"`
 }
 
 type SettingsType struct {
@@ -54,7 +56,19 @@ type SettingsType struct {
 	AppDismissArchitectureWarning bool   `json:"app:dismissarchitecturewarning,omitempty"`
 	AppDefaultNewBlock            string `json:"app:defaultnewblock,omitempty"`
 
-	AiSettingsType
+	AiClear         bool    `json:"ai:*,omitempty"`
+	AiPreset        string  `json:"ai:preset,omitempty"`
+	AiApiType       string  `json:"ai:apitype,omitempty"`
+	AiBaseURL       string  `json:"ai:baseurl,omitempty"`
+	AiApiToken      string  `json:"ai:apitoken,omitempty"`
+	AiName          string  `json:"ai:name,omitempty"`
+	AiModel         string  `json:"ai:model,omitempty"`
+	AiOrgID         string  `json:"ai:orgid,omitempty"`
+	AIApiVersion    string  `json:"ai:apiversion,omitempty"`
+	AiMaxTokens     float64 `json:"ai:maxtokens,omitempty"`
+	AiTimeoutMs     float64 `json:"ai:timeoutms,omitempty"`
+	AiFontSize      float64 `json:"ai:fontsize,omitempty"`
+	AiFixedFontSize float64 `json:"ai:fixedfontsize,omitempty"`
 
 	TermClear               bool     `json:"term:*,omitempty"`
 	TermFontSize            float64  `json:"term:fontsize,omitempty"`
diff --git a/schema/aipresets.json b/schema/aipresets.json
index 4e88007ac..db6d2b052 100644
--- a/schema/aipresets.json
+++ b/schema/aipresets.json
@@ -41,6 +41,12 @@
         },
         "ai:fixedfontsize": {
           "type": "number"
+        },
+        "display:name": {
+          "type": "string"
+        },
+        "display:order": {
+          "type": "number"
         }
       },
       "additionalProperties": false,