run go generate, fix baseds import

Author: sawka

cmd/generatego/main-generatego.go

@@ -24,14 +24,15 @@ func GenerateWshClient() error {
 	fmt.Fprintf(os.Stderr, "generating wshclient file to %s\n", WshClientFileName)
 	var buf strings.Builder
 	gogen.GenerateBoilerplate(&buf, "wshclient", []string{
+		"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes",
+		"github.com/wavetermdev/waveterm/pkg/baseds",
 		"github.com/wavetermdev/waveterm/pkg/telemetry/telemetrydata",
-		"github.com/wavetermdev/waveterm/pkg/wshutil",
-		"github.com/wavetermdev/waveterm/pkg/wshrpc",
-		"github.com/wavetermdev/waveterm/pkg/wconfig",
+		"github.com/wavetermdev/waveterm/pkg/vdom",
 		"github.com/wavetermdev/waveterm/pkg/waveobj",
+		"github.com/wavetermdev/waveterm/pkg/wconfig",
 		"github.com/wavetermdev/waveterm/pkg/wps",
-		"github.com/wavetermdev/waveterm/pkg/vdom",
-		"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes",
+		"github.com/wavetermdev/waveterm/pkg/wshrpc",
+		"github.com/wavetermdev/waveterm/pkg/wshutil",
 	})
 	wshDeclMap := wshrpc.GenerateWshCommandDeclMap()
 	for _, key := range utilfn.GetOrderedMapKeys(wshDeclMap) {

frontend/app/store/wshclientapi.ts

@@ -317,6 +317,11 @@ class RpcApiType {
         return client.wshRpcCall("focuswindow", data, opts);
     }
 
+    // command "getallbadges" [call]
+    GetAllBadgesCommand(client: WshClient, opts?: RpcOpts): Promise<BadgeEvent[]> {
+        return client.wshRpcCall("getallbadges", null, opts);
+    }
+
     // command "getalltabindicators" [call]
     GetAllTabIndicatorsCommand(client: WshClient, opts?: RpcOpts): Promise<{[key: string]: TabIndicator}> {
         return client.wshRpcCall("getalltabindicators", null, opts);

frontend/types/gotypes.d.ts

@@ -25,6 +25,7 @@ declare global {
         "ai:thinkinglevel"?: string;
         "ai:verbosity"?: string;
         "ai:endpoint"?: string;
+        "ai:proxyurl"?: string;
         "ai:azureapiversion"?: string;
         "ai:apitoken"?: string;
         "ai:apitokensecretname"?: string;
@@ -107,13 +108,29 @@ declare global {
         iconcolor: string;
     };
 
+    // baseds.Badge
+    type Badge = {
+        icon: string;
+        color?: string;
+        priority: number;
+    };
+
+    // baseds.BadgeEvent
+    type BadgeEvent = {
+        oref: string;
+        persistent?: boolean;
+        clear?: boolean;
+        badge?: Badge;
+    };
+
     // waveobj.Block
     type Block = WaveObj & {
         parentoref?: string;
         runtimeopts?: RuntimeOpts;
         stickers?: StickerType[];
         subblockids?: string[];
         jobid?: string;
+        badge?: Badge;
     };
 
     // blockcontroller.BlockControllerRuntimeStatus
@@ -1559,6 +1576,7 @@ declare global {
         name: string;
         layoutstate: string;
         blockids: string[];
+        badge?: Badge;
     };
 
     // wshrpc.TabIndicator

frontend/types/waveevent.d.ts

@@ -6,7 +6,7 @@
 declare global {
 
     // wps.WaveEvent
-    type WaveEventName = "blockclose" | "connchange" | "sysinfo" | "controllerstatus" | "builderstatus" | "builderoutput" | "waveobj:update" | "blockfile" | "config" | "userinput" | "route:down" | "route:up" | "workspace:update" | "waveai:ratelimit" | "waveapp:appgoupdated" | "tsunami:updatemeta" | "waveai:modeconfig" | "tab:indicator" | "block:jobstatus";
+    type WaveEventName = "blockclose" | "connchange" | "sysinfo" | "controllerstatus" | "builderstatus" | "builderoutput" | "waveobj:update" | "blockfile" | "config" | "userinput" | "route:down" | "route:up" | "workspace:update" | "waveai:ratelimit" | "waveapp:appgoupdated" | "tsunami:updatemeta" | "waveai:modeconfig" | "tab:indicator" | "block:jobstatus" | "badge";
 
     type WaveEvent = {
         event: WaveEventName;
@@ -33,7 +33,8 @@ declare global {
         { event: "tsunami:updatemeta"; data?: AppMeta; } | 
         { event: "waveai:modeconfig"; data?: AIModeConfigUpdate; } | 
         { event: "tab:indicator"; data?: TabIndicatorEventData; } | 
-        { event: "block:jobstatus"; data?: BlockJobStatusData; }
+        { event: "block:jobstatus"; data?: BlockJobStatusData; } | 
+        { event: "badge"; data?: BadgeEvent; }
     );
 
 }

pkg/tsgen/tsgenevent.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 
 	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
+	"github.com/wavetermdev/waveterm/pkg/baseds"
 	"github.com/wavetermdev/waveterm/pkg/blockcontroller"
 	"github.com/wavetermdev/waveterm/pkg/userinput"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
@@ -40,6 +41,7 @@ var WaveEventDataTypes = map[string]reflect.Type{
 	wps.Event_AIModeConfig:        reflect.TypeOf(wconfig.AIModeConfigUpdate{}),
 	wps.Event_TabIndicator:        reflect.TypeOf(wshrpc.TabIndicatorEventData{}),
 	wps.Event_BlockJobStatus:      reflect.TypeOf(wshrpc.BlockJobStatusData{}),
+	wps.Event_Badge:               reflect.TypeOf(baseds.BadgeEvent{}),
 }
 
 func getWaveEventDataTSType(eventName string, tsTypesMap map[reflect.Type]string) string {

pkg/wshrpc/wshclient/wshclient.go

@@ -6,14 +6,15 @@
 package wshclient
 
 import (
+	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
+	"github.com/wavetermdev/waveterm/pkg/baseds"
 	"github.com/wavetermdev/waveterm/pkg/telemetry/telemetrydata"
-	"github.com/wavetermdev/waveterm/pkg/wshutil"
-	"github.com/wavetermdev/waveterm/pkg/wshrpc"
-	"github.com/wavetermdev/waveterm/pkg/wconfig"
+	"github.com/wavetermdev/waveterm/pkg/vdom"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
+	"github.com/wavetermdev/waveterm/pkg/wconfig"
 	"github.com/wavetermdev/waveterm/pkg/wps"
-	"github.com/wavetermdev/waveterm/pkg/vdom"
-	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
+	"github.com/wavetermdev/waveterm/pkg/wshrpc"
+	"github.com/wavetermdev/waveterm/pkg/wshutil"
 )
 
 // command "activity", wshserver.ActivityCommand
@@ -386,6 +387,12 @@ func FocusWindowCommand(w *wshutil.WshRpc, data string, opts *wshrpc.RpcOpts) er
 	return err
 }
 
+// command "getallbadges", wshserver.GetAllBadgesCommand
+func GetAllBadgesCommand(w *wshutil.WshRpc, opts *wshrpc.RpcOpts) ([]baseds.BadgeEvent, error) {
+	resp, err := sendRpcRequestCallHelper[[]baseds.BadgeEvent](w, "getallbadges", nil, opts)
+	return resp, err
+}
+
 // command "getalltabindicators", wshserver.GetAllTabIndicatorsCommand
 func GetAllTabIndicatorsCommand(w *wshutil.WshRpc, opts *wshrpc.RpcOpts) (map[string]*wshrpc.TabIndicator, error) {
 	resp, err := sendRpcRequestCallHelper[map[string]*wshrpc.TabIndicator](w, "getalltabindicators", nil, opts)

schema/waveai.json

@@ -113,4 +113,4 @@
     "$ref": "#/$defs/AIModeConfigType"
   },
   "type": "object"
-}
+}