got dynamic tsunami widget descriptions

sawka · sawka · commit 668085c0a095 · 2025-09-22T21:18:17.000-07:00
diff --git a/cmd/wsh/cmd/wshcmd-ssh.go b/cmd/wsh/cmd/wshcmd-ssh.go
@@ -80,15 +80,26 @@ func sshRun(cmd *cobra.Command, args []string) (rtnErr error) {
 	data := wshrpc.CommandSetMetaData{
 		ORef: waveobj.MakeORef(waveobj.OType_Block, blockId),
 		Meta: map[string]any{
-			waveobj.MetaKey_Connection:   sshArg,
-			waveobj.MetaKey_CmdCwd:       nil,
-			waveobj.MetaKey_CmdHasCurCwd: nil,
+			waveobj.MetaKey_Connection: sshArg,
+			waveobj.MetaKey_CmdCwd:     nil,
 		},
 	}
 	err := wshclient.SetMetaCommand(RpcClient, data, nil)
 	if err != nil {
 		return fmt.Errorf("setting connection in block: %w", err)
 	}
+	
+	// Clear the cmd:hascurcwd rtinfo field
+	rtInfoData := wshrpc.CommandSetRTInfoData{
+		ORef: waveobj.MakeORef(waveobj.OType_Block, blockId),
+		Data: map[string]any{
+			"cmd:hascurcwd": nil,
+		},
+	}
+	err = wshclient.SetRTInfoCommand(RpcClient, rtInfoData, nil)
+	if err != nil {
+		return fmt.Errorf("setting RTInfo in block: %w", err)
+	}
 	WriteStderr("switched connection to %q\n", sshArg)
 	return nil
 }
diff --git a/frontend/app/modals/conntypeahead.tsx b/frontend/app/modals/conntypeahead.tsx
@@ -401,8 +401,17 @@ const ChangeConnectionBlockModal = React.memo(
                 }
                 await RpcApi.SetMetaCommand(TabRpcClient, {
                     oref: WOS.makeORef("block", blockId),
-                    meta: { connection: connName, file: newFile, "cmd:cwd": null, "cmd:hascurcwd": null },
+                    meta: { connection: connName, file: newFile, "cmd:cwd": null },
                 });
+                
+                const rtInfo = { "cmd:hascurcwd": null };
+                const rtInfoData: CommandSetRTInfoData = {
+                    oref: WOS.makeORef("block", blockId),
+                    data: rtInfo
+                };
+                RpcApi.SetRTInfoCommand(TabRpcClient, rtInfoData).catch((e) =>
+                    console.log("error setting RT info", e)
+                );
                 try {
                     await RpcApi.ConnEnsureCommand(
                         TabRpcClient,
diff --git a/frontend/app/view/term/termwrap.ts b/frontend/app/view/term/termwrap.ts
@@ -125,12 +125,20 @@ function handleOsc7Command(data: string, blockId: string, loaded: boolean): bool
         data = data.substring(nextSlashIdx);
     }
     setTimeout(() => {
-        fireAndForget(() =>
-            services.ObjectService.UpdateObjectMeta(WOS.makeORef("block", blockId), {
+        fireAndForget(async () => {
+            await services.ObjectService.UpdateObjectMeta(WOS.makeORef("block", blockId), {
                 "cmd:cwd": data,
-                "cmd:hascurcwd": true,
-            })
-        );
+            });
+            
+            const rtInfo = { "cmd:hascurcwd": true };
+            const rtInfoData: CommandSetRTInfoData = {
+                oref: WOS.makeORef("block", blockId),
+                data: rtInfo
+            };
+            await RpcApi.SetRTInfoCommand(TabRpcClient, rtInfoData).catch((e) =>
+                console.log("error setting RT info", e)
+            );
+        });
     }, 0);
     return true;
 }
diff --git a/frontend/types/gotypes.d.ts b/frontend/types/gotypes.d.ts
@@ -557,7 +557,6 @@ declare global {
         "cmd:initscript.zsh"?: string;
         "cmd:initscript.pwsh"?: string;
         "cmd:initscript.fish"?: string;
-        "cmd:hascurcwd"?: boolean;
         "ai:*"?: boolean;
         "ai:preset"?: string;
         "ai:apitype"?: string;
@@ -636,6 +635,8 @@ declare global {
     type ObjRTInfo = {
         "tsunami:title"?: string;
         "tsunami:shortdesc"?: string;
+        "tsunami:schemas"?: any;
+        "cmd:hascurcwd"?: boolean;
     };
 
     // iochantypes.Packet
diff --git a/pkg/aiusechat/tools.go b/pkg/aiusechat/tools.go
@@ -10,10 +10,25 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/wavetermdev/waveterm/pkg/aiusechat/uctypes"
+	"github.com/wavetermdev/waveterm/pkg/blockcontroller"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wstore"
 )
 
+func handleTsunamiBlockDesc(block *waveobj.Block) string {
+	status := blockcontroller.GetBlockControllerRuntimeStatus(block.OID)
+	if status == nil || status.ShellProcStatus != blockcontroller.Status_Running {
+		return "tsunami framework widget that is currently not running"
+	}
+
+	blockORef := waveobj.MakeORef(waveobj.OType_Block, block.OID)
+	rtInfo := wstore.GetRTInfo(blockORef)
+	if rtInfo != nil && rtInfo.TsunamiShortDesc != "" {
+		return fmt.Sprintf("tsunami widget - %s", rtInfo.TsunamiShortDesc)
+	}
+	return "tsunami widget - unknown description"
+}
+
 func MakeBlockShortDesc(block *waveobj.Block) string {
 	if block.Meta == nil {
 		return ""
@@ -28,7 +43,10 @@ func MakeBlockShortDesc(block *waveobj.Block) string {
 	case "term":
 		connection, hasConnection := block.Meta["connection"].(string)
 		cwd, hasCwd := block.Meta["cmd:cwd"].(string)
-		hasCurCwd, _ := block.Meta["cmd:hascurcwd"].(bool)
+
+		blockORef := waveobj.MakeORef(waveobj.OType_Block, block.OID)
+		rtInfo := wstore.GetRTInfo(blockORef)
+		hasCurCwd := rtInfo != nil && rtInfo.CmdHasCurCwd
 
 		var desc string
 		if hasConnection && connection != "" {
@@ -75,7 +93,7 @@ func MakeBlockShortDesc(block *waveobj.Block) string {
 	case "launcher":
 		return "placeholder widget used to launch other widgets"
 	case "tsunami":
-		return "custom 'tsunami' framework widget"
+		return handleTsunamiBlockDesc(block)
 	default:
 		return fmt.Sprintf("unknown widget with type %q", viewType)
 	}
diff --git a/pkg/blockcontroller/tsunamicontroller.go b/pkg/blockcontroller/tsunamicontroller.go
@@ -5,21 +5,25 @@ package blockcontroller
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
+	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/wavetermdev/waveterm/pkg/utilds"
 	"github.com/wavetermdev/waveterm/pkg/wavebase"
 	"github.com/wavetermdev/waveterm/pkg/waveobj"
 	"github.com/wavetermdev/waveterm/pkg/wps"
+	"github.com/wavetermdev/waveterm/pkg/wstore"
 	"github.com/wavetermdev/waveterm/tsunami/build"
 )
 
@@ -81,6 +85,46 @@ func getCachesDir() string {
 	return cacheDir
 }
 
+func (c *TsunamiController) fetchAndSetSchemas(port int) {
+	url := fmt.Sprintf("http://localhost:%d/api/schemas", port)
+	client := &http.Client{
+		Timeout: 10 * time.Second,
+	}
+	
+	resp, err := client.Get(url)
+	if err != nil {
+		log.Printf("TsunamiController: failed to fetch schemas from %s: %v", url, err)
+		return
+	}
+	defer resp.Body.Close()
+	
+	if resp.StatusCode != http.StatusOK {
+		log.Printf("TsunamiController: received non-200 status %d from %s", resp.StatusCode, url)
+		return
+	}
+	
+	var schemas any
+	if err := json.NewDecoder(resp.Body).Decode(&schemas); err != nil {
+		log.Printf("TsunamiController: failed to decode schemas response: %v", err)
+		return
+	}
+	
+	blockRef := waveobj.MakeORef(waveobj.OType_Block, c.blockId)
+	wstore.SetRTInfo(blockRef, map[string]any{
+		"tsunami:schemas": schemas,
+	})
+	
+	log.Printf("TsunamiController: successfully fetched and cached schemas for block %s", c.blockId)
+}
+
+func (c *TsunamiController) clearSchemas() {
+	blockRef := waveobj.MakeORef(waveobj.OType_Block, c.blockId)
+	wstore.SetRTInfo(blockRef, map[string]any{
+		"tsunami:schemas": nil,
+	})
+	log.Printf("TsunamiController: cleared schemas for block %s", c.blockId)
+}
+
 func getTsunamiAppCachePath(scope string, appName string, osArch string) (string, error) {
 	cachesDir := getCachesDir()
 	tsunamiCacheDir := filepath.Join(cachesDir, "tsunami-build-cache")
@@ -229,6 +273,11 @@ func (c *TsunamiController) Start(ctx context.Context, blockMeta waveobj.MetaMap
 	})
 	go c.sendStatusUpdate()
 
+	// Asynchronously fetch schemas after port is detected
+	go func() {
+		c.fetchAndSetSchemas(tsunamiProc.Port)
+	}()
+
 	// Monitor process completion
 	go func() {
 		<-tsunamiProc.WaitCh
@@ -240,6 +289,7 @@ func (c *TsunamiController) Start(ctx context.Context, blockMeta waveobj.MetaMap
 				c.port = 0
 				c.exitCode = exitCodeFromWaitErr(tsunamiProc.WaitRtn)
 			})
+			c.clearSchemas()
 			go c.sendStatusUpdate()
 		}
 		c.runLock.Unlock()
@@ -273,6 +323,7 @@ func (c *TsunamiController) Stop(graceful bool, newStatus string) error {
 		c.status = newStatus
 		c.port = 0
 	})
+	c.clearSchemas()
 	go c.sendStatusUpdate()
 	return nil
 }
diff --git a/pkg/waveobj/blockrtinfo.go b/pkg/waveobj/blockrtinfo.go
@@ -6,4 +6,6 @@ package waveobj
 type ObjRTInfo struct {
 	TsunamiTitle     string `json:"tsunami:title,omitempty"`
 	TsunamiShortDesc string `json:"tsunami:shortdesc,omitempty"`
+	TsunamiSchemas   any    `json:"tsunami:schemas,omitempty"`
+	CmdHasCurCwd     bool   `json:"cmd:hascurcwd,omitempty"`
 }
diff --git a/pkg/waveobj/metaconsts.go b/pkg/waveobj/metaconsts.go
@@ -60,7 +60,6 @@ const (
 	MetaKey_CmdInitScriptZsh                 = "cmd:initscript.zsh"
 	MetaKey_CmdInitScriptPwsh                = "cmd:initscript.pwsh"
 	MetaKey_CmdInitScriptFish                = "cmd:initscript.fish"
-	MetaKey_CmdHasCurCwd                     = "cmd:hascurcwd"
 
 	MetaKey_AiClear                          = "ai:*"
 	MetaKey_AiPresetKey                      = "ai:preset"
diff --git a/pkg/waveobj/wtypemeta.go b/pkg/waveobj/wtypemeta.go
@@ -61,7 +61,6 @@ type MetaTSType struct {
 	CmdInitScriptZsh  string            `json:"cmd:initscript.zsh,omitempty"`
 	CmdInitScriptPwsh string            `json:"cmd:initscript.pwsh,omitempty"`
 	CmdInitScriptFish string            `json:"cmd:initscript.fish,omitempty"`
-	CmdHasCurCwd      bool              `json:"cmd:hascurcwd,omitempty"`
 
 	// AI options match settings
 	AiClear      bool    `json:"ai:*,omitempty"`
diff --git a/tsunami/demo/cpuchart/app.go b/tsunami/demo/cpuchart/app.go
@@ -34,6 +34,12 @@ var (
 	}(), &app.AtomMeta{
 		Desc: "Historical CPU usage data points for charting",
 	})
+	currentCpuUsageAtom = app.DataAtom("currentCpuUsage", 0.0, &app.AtomMeta{
+		Desc:  "Current CPU usage percentage",
+		Units: "%",
+		Min:   app.Ptr(0.0),
+		Max:   app.Ptr(100.0),
+	})
 )
 
 type CPUDataPoint struct {
@@ -156,6 +162,12 @@ var App = app.DefineComponent("App", func(_ struct{}) any {
 	app.UseTicker(time.Second, func() {
 		// Collect new CPU data point and shift the data window
 		newPoint := generateCPUDataPoint()
+
+		// Update current CPU usage atom for easy AI access
+		if newPoint.CPUUsage != nil {
+			currentCpuUsageAtom.Set(*newPoint.CPUUsage)
+		}
+
 		cpuDataAtom.SetFn(func(data []CPUDataPoint) []CPUDataPoint {
 			currentDataPointCount := dataPointCountAtom.Get()
 
@@ -194,6 +206,7 @@ var App = app.DefineComponent("App", func(_ struct{}) any {
 			}
 		}
 		cpuDataAtom.Set(initialData)
+		currentCpuUsageAtom.Set(0.0)
 	}
 
 	// Read atom values once for rendering
diff --git a/tsunami/engine/schema.go b/tsunami/engine/schema.go
@@ -268,13 +268,16 @@ func generateSchemaFromAtoms(atoms map[string]genAtom, title, description string
 	}
 
 	// Build the final schema
+	// schema line unnecessary for AI (and burns tokens)
+	// also dropping title since it is mostly redundant
+	// also dropping additionalProperties (since AI doesn't need that, and it burns tokens)
 	schema := map[string]any{
-		"$schema":              "https://json-schema.org/draft/2020-12/schema",
-		"type":                 "object",
-		"title":                title,
-		"description":          description,
-		"properties":           properties,
-		"additionalProperties": false,
+		// "$schema":              "https://json-schema.org/draft/2020-12/schema",
+		"type": "object",
+		// "title":                title,
+		"description": description,
+		"properties":  properties,
+		// "additionalProperties": false,
 	}
 
 	// Add definitions if any

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@ package waveobj`
`6`	`6`	`type ObjRTInfo struct {`
`7`	`7`	TsunamiTitle string `json:"tsunami:title,omitempty"`
`8`	`8`	TsunamiShortDesc string `json:"tsunami:shortdesc,omitempty"`
	`9`	+ TsunamiSchemas any `json:"tsunami:schemas,omitempty"`
	`10`	+ CmdHasCurCwd bool `json:"cmd:hascurcwd,omitempty"`
`9`	`11`	`}`