rename usechat-types.go (for AI). change display fields to have more consistent names

Author: sawka

frontend/app/aipanel/aitypes.ts

@@ -4,14 +4,14 @@
 import { ChatRequestOptions, FileUIPart, UIMessage, UIMessagePart } from "ai";
 
 type WaveUIDataTypes = {
-    // pkg/aiusechat/uctypes/usechat-types.go UIMessageDataUserFile
+    // pkg/aiusechat/uctypes/uctypes.go UIMessageDataUserFile
     userfile: {
         filename: string;
         size: number;
         mimetype: string;
         previewurl?: string;
     };
-    // pkg/aiusechat/uctypes/usechat-types.go UIMessageDataToolUse
+    // pkg/aiusechat/uctypes/uctypes.go UIMessageDataToolUse
     tooluse: {
         toolcallid: string;
         toolname: string;

frontend/app/aipanel/thinkingmode.tsx

@@ -60,11 +60,11 @@ export const ThinkingLevelDropdown = memo(() => {
                     "group flex items-center gap-1.5 px-2 py-1 text-xs text-gray-300 hover:text-white rounded transition-colors cursor-pointer border border-gray-600/50",
                     isOpen ? "bg-gray-700" : "bg-gray-800/50 hover:bg-gray-700"
                 )}
-                title={`Thinking: ${displayConfig.displayname}`}
+                title={`Thinking: ${displayConfig["display:name"]}`}
             >
-                <i className={cn(makeIconClass(displayConfig.icon, false), "text-[10px]")}></i>
+                <i className={cn(makeIconClass(displayConfig["display:icon"], false), "text-[10px]")}></i>
                 <span className={`text-[11px] ${isOpen ? "inline" : "hidden group-hover:inline @w450:inline"}`}>
-                    {displayConfig.displayname}
+                    {displayConfig["display:name"]}
                 </span>
                 <i className="fa fa-chevron-down text-[8px]"></i>
             </button>
@@ -74,6 +74,7 @@ export const ThinkingLevelDropdown = memo(() => {
                     <div className="fixed inset-0 z-40" onClick={() => setIsOpen(false)} />
                     <div className="absolute top-full left-0 mt-1 bg-gray-800 border border-gray-600 rounded shadow-lg z-50 min-w-[280px]">
                         {thinkingModeConfigs
+                            .sort((a, b) => (a["display:order"] || 0) - (b["display:order"] || 0) || (a["display:name"] || "").localeCompare(b["display:name"] || ""))
                             .filter((config) => !(hideQuick && config.mode === "quick"))
                             .map((config, index, filteredConfigs) => {
                                 const isFirst = index === 0;
@@ -94,9 +95,9 @@ export const ThinkingLevelDropdown = memo(() => {
                                         } transition-colors text-left`}
                                     >
                                         <div className="flex items-center gap-2 w-full">
-                                            <i className={makeIconClass(config.icon, false)}></i>
+                                            <i className={makeIconClass(config["display:icon"], false)}></i>
                                             <span className={`text-sm ${isSelected ? "font-bold" : ""}`}>
-                                                {config.displayname}
+                                                {config["display:name"]}
                                                 {isDisabled && " (premium)"}
                                             </span>
                                             {isSelected && <i className="fa fa-check ml-auto"></i>}

frontend/types/gotypes.d.ts

@@ -16,16 +16,20 @@ declare global {
     // uctypes.AIThinkingModeConfig
     type AIThinkingModeConfig = {
         mode: string;
-        displayname: string;
+        "display:name": string;
+        "display:order"?: number;
+        "display:icon": string;
         apitype: string;
         model: string;
         thinkinglevel: string;
         baseurl?: string;
+        waveaicloud?: boolean;
         apiversion?: string;
         apitoken?: string;
+        apitokensecretname?: string;
         premium: boolean;
-        icon: string;
         description: string;
+        capabilities?: string[];
     };
 
     // wshrpc.ActivityDisplayType

pkg/aiusechat/uctypes/usechat-types.go pkg/aiusechat/uctypes/uctypes.gopkg/aiusechat/uctypes/usechat-types.go renamed to pkg/aiusechat/uctypes/uctypes.go

@@ -152,7 +152,9 @@ const (
 
 type AIThinkingModeConfig struct {
 	Mode               string   `json:"mode"`
-	DisplayName        string   `json:"displayname"`
+	DisplayName        string   `json:"display:name"`
+	DisplayOrder       float64  `json:"display:order,omitempty"`
+	DisplayIcon        string   `json:"display:icon"`
 	APIType            string   `json:"apitype"`
 	Model              string   `json:"model"`
 	ThinkingLevel      string   `json:"thinkinglevel"`
@@ -162,7 +164,6 @@ type AIThinkingModeConfig struct {
 	APIToken           string   `json:"apitoken,omitempty"`
 	APITokenSecretName string   `json:"apitokensecretname,omitempty"`
 	Premium            bool     `json:"premium"`
-	Icon               string   `json:"icon"`
 	Description        string   `json:"description"`
 	Capabilities       []string `json:"capabilities,omitempty"`
 }

pkg/aiusechat/usechat-thinkingmode.go

@@ -5,6 +5,7 @@ package aiusechat
 
 import (
 	"fmt"
+	"sort"
 
 	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
 )
@@ -13,36 +14,39 @@ var thinkingModeConfigs = map[string]uctypes.AIThinkingModeConfig{
 	uctypes.ThinkingModeQuick: {
 		Mode:          uctypes.ThinkingModeQuick,
 		DisplayName:   "Quick",
+		DisplayOrder:  -3,
 		APIType:       APIType_OpenAI,
 		Model:         uctypes.DefaultOpenAIModel,
 		ThinkingLevel: uctypes.ThinkingLevelLow,
 		WaveAICloud:   true,
 		Premium:       false,
-		Icon:          "bolt",
+		DisplayIcon:   "bolt",
 		Description:   "Fastest responses (gpt-5-mini)",
 		Capabilities:  []string{uctypes.AICapabilityTools, uctypes.AICapabilityImages, uctypes.AICapabilityPdfs},
 	},
 	uctypes.ThinkingModeBalanced: {
 		Mode:          uctypes.ThinkingModeBalanced,
 		DisplayName:   "Balanced",
+		DisplayOrder:  -2,
 		APIType:       APIType_OpenAI,
 		Model:         uctypes.PremiumOpenAIModel,
 		ThinkingLevel: uctypes.ThinkingLevelLow,
 		WaveAICloud:   true,
 		Premium:       true,
-		Icon:          "sparkles",
+		DisplayIcon:   "sparkles",
 		Description:   "Good mix of speed and accuracy\n(gpt-5.1 with minimal thinking)",
 		Capabilities:  []string{uctypes.AICapabilityTools, uctypes.AICapabilityImages, uctypes.AICapabilityPdfs},
 	},
 	uctypes.ThinkingModeDeep: {
 		Mode:          uctypes.ThinkingModeDeep,
 		DisplayName:   "Deep",
+		DisplayOrder:  -1,
 		APIType:       APIType_OpenAI,
 		Model:         uctypes.PremiumOpenAIModel,
 		ThinkingLevel: uctypes.ThinkingLevelMedium,
 		WaveAICloud:   true,
 		Premium:       true,
-		Icon:          "lightbulb",
+		DisplayIcon:   "lightbulb",
 		Description:   "Slower but most capable\n(gpt-5.1 with full reasoning)",
 		Capabilities:  []string{uctypes.AICapabilityTools, uctypes.AICapabilityImages, uctypes.AICapabilityPdfs},
 	},
@@ -55,7 +59,7 @@ var thinkingModeConfigs = map[string]uctypes.AIThinkingModeConfig{
 		ThinkingLevel:      uctypes.ThinkingLevelLow,
 		APITokenSecretName: "OPENROUTER_KEY",
 		Premium:            false,
-		Icon:               "bolt",
+		DisplayIcon:        "bolt",
 		Description:        "Fast and capable via OpenRouter\n(Mistral Small 3.2)",
 		Capabilities:       []string{uctypes.AICapabilityTools},
 	},
@@ -76,5 +80,8 @@ func WaveAIGetModes() ([]uctypes.AIThinkingModeConfig, error) {
 	for _, config := range thinkingModeConfigs {
 		modes = append(modes, config)
 	}
+	sort.Slice(modes, func(i, j int) bool {
+		return modes[i].DisplayOrder < modes[j].DisplayOrder
+	})
 	return modes, nil
 }