remove AppOpts, move title to hook, derrive GlobalKeyboardHandler... update prompt, etc...

Author: sawka

tsunami/app/defaultclient.go

@@ -11,7 +11,7 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-var defaultClient = MakeClient(AppOpts{})
+var defaultClient = MakeClient()
 var assetsFS fs.FS
 var staticFS fs.FS
 var manifestFile *FileHandlerOption
@@ -26,9 +26,6 @@ func SetGlobalEventHandler(handler func(client *Client, event vdom.VDomEvent)) {
 	defaultClient.SetGlobalEventHandler(handler)
 }
 
-func SetAppOpts(appOpts AppOpts) {
-	defaultClient.SetAppOpts(appOpts)
-}
 
 func AddSetupFn(fn func()) {
 	defaultClient.AddSetupFn(fn)

tsunami/app/serverhandlers.go

@@ -49,7 +49,7 @@ func (h *HTTPHandlers) RegisterHandlers(mux *http.ServeMux, opts HandlerOpts) {
 	mux.HandleFunc("/api/data", h.handleData)
 	mux.HandleFunc("/api/config", h.handleConfig)
 	mux.HandleFunc("/api/manifest", h.handleManifest(opts.ManifestFile))
-	mux.HandleFunc("/files/", h.handleAssetsUrl)
+	mux.HandleFunc("/dyn/", h.handleDynContent)
 
 	// Add handler for static files at /static/ path
 	if opts.StaticFS != nil {
@@ -235,24 +235,20 @@ func (h *HTTPHandlers) handleConfigPost(w http.ResponseWriter, r *http.Request)
 	w.WriteHeader(http.StatusOK)
 }
 
-func (h *HTTPHandlers) handleAssetsUrl(w http.ResponseWriter, r *http.Request) {
+func (h *HTTPHandlers) handleDynContent(w http.ResponseWriter, r *http.Request) {
 	defer func() {
-		panicErr := util.PanicHandler("handleAssetsUrl", recover())
+		panicErr := util.PanicHandler("handleDynContent", recover())
 		if panicErr != nil {
 			http.Error(w, fmt.Sprintf("internal server error: %v", panicErr), http.StatusInternalServerError)
 		}
 	}()
 
 	// Strip /assets prefix and update the request URL
-	r.URL.Path = strings.TrimPrefix(r.URL.Path, "/assets")
+	r.URL.Path = strings.TrimPrefix(r.URL.Path, "/dyn")
 	if r.URL.Path == "" {
 		r.URL.Path = "/"
 	}
 
-	if r.URL.Path == "/global.css" && h.Client.GlobalStylesOption != nil {
-		ServeFileOption(w, r, *h.Client.GlobalStylesOption)
-		return
-	}
 	h.Client.UrlHandlerMux.ServeHTTP(w, r)
 }
 

tsunami/app/tsunamiapp.go

@@ -34,14 +34,8 @@ type SSEvent struct {
 	Data  []byte
 }
 
-type AppOpts struct {
-	Title                string // window title
-	GlobalKeyboardEvents bool
-}
-
 type Client struct {
 	Lock               *sync.Mutex
-	AppOpts            AppOpts
 	Root               *comp.RootElem
 	RootElem           *vdom.VDomElem
 	CurrentClientId    string
@@ -56,7 +50,7 @@ type Client struct {
 	SetupFn            func()
 }
 
-func MakeClient(appOpts AppOpts) *Client {
+func MakeClient() *Client {
 	client := &Client{
 		Lock:          &sync.Mutex{},
 		Root:          comp.MakeRoot(),
@@ -66,7 +60,6 @@ func MakeClient(appOpts AppOpts) *Client {
 		ServerId:      uuid.New().String(),
 		RootElem:      vdom.E(DefaultComponentName),
 	}
-	client.SetAppOpts(appOpts)
 	return client
 }
 
@@ -110,12 +103,6 @@ func (c *Client) SetGlobalEventHandler(handler func(client *Client, event vdom.V
 	c.GlobalEventHandler = handler
 }
 
-func (c *Client) SetAppOpts(appOpts AppOpts) {
-	c.Lock.Lock()
-	defer c.Lock.Unlock()
-
-	c.AppOpts = appOpts
-}
 
 func getFaviconPath() string {
 	if staticFS != nil {
@@ -131,8 +118,8 @@ func getFaviconPath() string {
 
 func (c *Client) makeBackendOpts() *rpctypes.VDomBackendOpts {
 	return &rpctypes.VDomBackendOpts{
-		Title:                c.AppOpts.Title,
-		GlobalKeyboardEvents: c.AppOpts.GlobalKeyboardEvents,
+		Title:                c.Root.AppTitle,
+		GlobalKeyboardEvents: c.GlobalEventHandler != nil,
 		FaviconPath:          getFaviconPath(),
 	}
 }
@@ -298,6 +285,7 @@ func (c *Client) incrementalRender() (*rpctypes.VDomBackendUpdate, error) {
 		Type:     "backendupdate",
 		Ts:       time.Now().UnixMilli(),
 		ServerId: c.ServerId,
+		Opts:     c.makeBackendOpts(),
 		RenderUpdates: []rpctypes.VDomRenderUpdate{
 			{UpdateType: "root", VDom: renderedVDom},
 		},

tsunami/build/build.go

@@ -20,6 +20,8 @@ import (
 	"golang.org/x/mod/modfile"
 )
 
+const MinSupportedGoMinorVersion = 22
+
 type BuildOpts struct {
 	Dir            string
 	Verbose        bool
@@ -50,13 +52,13 @@ func verifyEnvironment(verbose bool) (*BuildEnv, error) {
 		return nil, fmt.Errorf("failed to run 'go version': %w", err)
 	}
 
-	// Parse go version output and check for 1.21+
+	// Parse go version output and check for 1.22+
 	versionStr := strings.TrimSpace(string(output))
 	if verbose {
 		log.Printf("Found %s", versionStr)
 	}
 
-	// Extract version like "go1.21.0" from output
+	// Extract version like "go1.22.0" from output
 	versionRegex := regexp.MustCompile(`go(1\.\d+)`)
 	matches := versionRegex.FindStringSubmatch(versionStr)
 	if len(matches) < 2 {
@@ -65,16 +67,16 @@ func verifyEnvironment(verbose bool) (*BuildEnv, error) {
 
 	goVersion := matches[1]
 
-	// Check if version is 1.21+
+	// Check if version is 1.22+
 	minorRegex := regexp.MustCompile(`1\.(\d+)`)
 	minorMatches := minorRegex.FindStringSubmatch(goVersion)
 	if len(minorMatches) < 2 {
 		return nil, fmt.Errorf("unable to parse minor version from: %s", goVersion)
 	}
 
 	minor, err := strconv.Atoi(minorMatches[1])
-	if err != nil || minor < 21 {
-		return nil, fmt.Errorf("go version 1.21 or higher required, found: %s", versionStr)
+	if err != nil || minor < MinSupportedGoMinorVersion {
+		return nil, fmt.Errorf("go version 1.%d or higher required, found: %s", MinSupportedGoMinorVersion, versionStr)
 	}
 
 	// Check if npx is in PATH

tsunami/comp/rootelem.go

@@ -26,6 +26,7 @@ type RootElem struct {
 	OuterCtx        context.Context
 	Root            *ComponentImpl
 	RenderTs        int64
+	AppTitle        string
 	CFuncs          map[string]any
 	CompMap         map[string]*ComponentImpl // component waveid -> component
 	EffectWorkQueue []*vdom.EffectWorkElem

tsunami/comp/vdomcontext.go

@@ -72,3 +72,14 @@ func (vc *VDomContextVal) IsResync() bool {
 	}
 	return vc.RenderOpts.Resync
 }
+
+func (vc *VDomContextVal) GetCompName() string {
+	if vc.Comp == nil || vc.Comp.Elem == nil {
+		return ""
+	}
+	return vc.Comp.Elem.Tag
+}
+
+func (vc *VDomContextVal) SetAppTitle(title string) {
+	vc.Root.AppTitle = title
+}

tsunami/demo/pomodoro/app.go

@@ -9,11 +9,6 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-func init() {
-	app.SetAppOpts(app.AppOpts{
-		Title: "Pomodoro Timer (Tsunami Demo)",
-	})
-}
 
 type Mode struct {
 	Name     string `json:"name"`
@@ -103,6 +98,8 @@ var ControlButtons = app.DefineComponent("ControlButtons",
 
 var App = app.DefineComponent("App",
 	func(ctx context.Context, _ any) any {
+		vdom.UseSetAppTitle(ctx, "Pomodoro Timer (Tsunami Demo)")
+		
 		isRunning, setIsRunning, _ := vdom.UseState(ctx, false)
 		minutes, setMinutes, _ := vdom.UseState(ctx, WorkMode.Duration)
 		seconds, setSeconds, _ := vdom.UseState(ctx, 0)

tsunami/demo/todo/app.go

@@ -9,12 +9,6 @@ import (
 	"github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-func init() {
-	// Set up the default client with embedded Tailwind styles
-	app.SetAppOpts(app.AppOpts{
-		Title: "Todo App (Tsunami Demo)",
-	})
-}
 
 // Basic domain types with json tags for props
 type Todo struct {
@@ -108,6 +102,8 @@ var TodoList = app.DefineComponent("TodoList",
 // Root component showing state management and composition
 var App = app.DefineComponent("App",
 	func(ctx context.Context, _ any) any {
+		vdom.UseSetAppTitle(ctx, "Todo App (Tsunami Demo)")
+		
 		// Multiple state hooks example
 		todos, setTodos, _ := vdom.UseState(ctx, []Todo{
 			{Id: 1, Text: "Learn VDOM", Completed: false},

tsunami/prompt.md

@@ -16,22 +16,26 @@ The included todo-main.go provides a complete example application showing these
 
 ## App Setup and Registration
 
-Tsunami applications use a default client configured through `app.SetAppOpts()` in an `init()` function:
+Tsunami applications define components using the default client:
 
 ```go
-func init() {
-    // Set up the default client with options
-    app.SetAppOpts(app.AppOpts{
-        Title: "My Tsunami App",
-    })
-}
-
 // Components are defined using the default client
 var MyComponent = app.DefineComponent("MyComponent",
     func(ctx context.Context, props MyProps) any {
         // component logic
     },
 )
+
+// The main "App" component can set the app title
+var App = app.DefineComponent("App",
+    func(ctx context.Context, _ struct{}) any {
+        vdom.UseSetAppTitle(ctx, "My Tsunami App")  // Only works in top-level App component
+
+        return vdom.H("div", nil,
+            // app content
+        )
+    },
+)
 ```
 
 ## Building Elements with vdom.H()
@@ -183,7 +187,7 @@ Helper functions:
 
 ## Style Handling
 
-Tsunami applications use Tailwind v4 CSS by default for styling. You can also define inline styles using a map[string]any in the props:
+Tsunami applications use Tailwind v4 CSS by default for styling (className prop). You can also define inline styles using a map[string]any in the props:
 
 ```go
 vdom.H("div", map[string]any{
@@ -385,7 +389,7 @@ func MyComponent(ctx context.Context, props MyProps) any {
     vdom.UseEffect(ctx, func() func() {
         // Example: set counter to 10 on mount
         setCounter(10)
-        
+
         return func() {
             // cleanup
         }
@@ -587,15 +591,9 @@ vdom.H("div", map[string]any{
 2. Global keyboard event handling:
 
 ```go
+// Global keyboard events are automatically enabled when you set a global event handler
 func init() {
-    app.SetAppOpts(app.AppOpts{
-        GlobalKeyboardEvents: true,  // Enable global keyboard events
-        Title:                "My Tsunami App",
-    })
-}
-
-// In main() or an effect:
-app.SetGlobalEventHandler(func(event vdom.VDomEvent) {
+    app.SetGlobalEventHandler(func(event vdom.VDomEvent) {
     if event.EventType != "onKeyDown" || event.KeyData == nil {
         return
     }
@@ -645,10 +643,9 @@ type WaveKeyboardEvent struct {
 }
 ```
 
-When using global keyboard events, remember to:
+When using global keyboard events:
 
-1. Enable GlobalKeyboardEvents in AppOpts
-2. Set up the handler in a place where you have access to necessary state updates
+Global keyboard events are automatically enabled when you set a global event handler. Set up the handler in a place where you have access to necessary state updates.
 
 ## File Handling
 
@@ -712,12 +709,8 @@ import (
     "github.com/wavetermdev/waveterm/tsunami/vdom"
 )
 
-func init() {
-    // Set up the default client with Tailwind styles
-    app.SetAppOpts(app.AppOpts{
-        Title: "My Tsunami App",
-    })
-}
+// Tsunami applications automatically include Tailwind v4 CSS
+// No setup required - just use Tailwind classes in your components
 
 // Basic domain types with json tags for props
 type Todo struct {
@@ -843,17 +836,10 @@ var App = app.DefineComponent("App",
 Key points:
 
 1. Root component must be named "App"
-2. Use `init()` function to configure app options
-3. No main() function is needed - the framework handles app lifecycle
+2. Use `vdom.UseSetAppTitle()` in the main App component to set the window title
+3. Do NOT write a main() function - the framework handles app lifecycle
 4. File handlers can be registered in init() if needed
 
-```
-type AppOpts struct {
-    Title                string // window title
-    GlobalKeyboardEvents bool
-}
-```
-
 ## Important Technical Details
 
 - Props must be defined as Go structs with json tags
@@ -863,7 +849,7 @@ type AppOpts struct {
 - Provide keys when using ForEach() with lists (using WithKey() method)
 - Use Classes() with If() for combining static and conditional class names
 - Consider cleanup functions in UseEffect() for async operations
-- <script> tags are not supported
+- <script> tags are NOT supported
 - Applications consist of a single file: app.go containing all Go code and component definitions
 - Styling is handled through Tailwind v4 CSS classes
 - No main() function is needed - use init() for configuration