(human) more work towards refactoring chat post-env/agent merge, some other random improvements

verdverm · verdverm · commit 4efa407259f1 · 2026-02-01T15:13:14.000-08:00
diff --git a/lib/agent/cmd/runtime.go b/lib/agent/cmd/runtime.go
@@ -58,7 +58,7 @@ func prepRuntime(args []string, rflags flags.RootPflagpole) (*runtime.Runtime, *
 
 	ar.BackfillAgentic()
 
-	ws.SetupHandlers(ar)
+	ws.SetupHandlers(r, ar)
 	return r, ar, nil
 }
 
diff --git a/lib/agent/cmd/tui/msgs.go b/lib/agent/cmd/tui/msgs.go
@@ -45,6 +45,7 @@ func renderMessages(width int, session session.Session) []string {
 			author = agentStyle.Render(evt.Author)
 			if evt.Content != nil {
 				for _, part := range evt.Content.Parts {
+
 					if part.Text != "" {
 						out, err := glam.Render(part.Text)
 						if err != nil {
@@ -53,6 +54,7 @@ func renderMessages(width int, session session.Session) []string {
 							body += out + "\n"
 						}
 					}
+
 					if part.FunctionCall != nil {
 						r := part.FunctionCall
 						var extra string
@@ -75,9 +77,12 @@ func renderMessages(width int, session session.Session) []string {
 								text := dmp.DiffPrettyText(diffs)
 								extra += fmt.Sprintf("-------\n%s\n-------\n\n", text)
 							}
+						case "exec":
+							extra = fmt.Sprintf("`%s`", r.Args["script"])
 						}
 						body += fmt.Sprintf("  %s: %s ...\n", funcStyle.Render("┃"+r.Name), extra)
 					}
+
 					if part.FunctionResponse != nil {
 						r := part.FunctionResponse
 						var extra string
@@ -88,9 +93,12 @@ func renderMessages(width int, session session.Session) []string {
 							extra = fmt.Sprintf("%s %s", r.Response["path"], r.Response["status"])
 						case "fs_edit":
 							extra = fmt.Sprintf("%s %s", r.Response["path"], r.Response["status"])
+						case "exec":
+							extra = fmt.Sprintf("%s %v\n--- stdout ---\n%s\n--- stderr ---\n%s\n--- end ---", r.Response["status"], r.Response["exitCode"], r.Response["stdout"], r.Response["stderr"])
 						}
 						body += fmt.Sprintf("  %s: %s\n", funcStyle.Render("┃"+r.Name), extra)
 					}
+
 				}
 				body = strings.TrimSuffix(body, "\n")
 			}
diff --git a/lib/agent/models/gemini.go b/lib/agent/models/gemini.go
@@ -2,16 +2,40 @@ package models
 
 import (
 	"context"
+	"os"
 
 	"google.golang.org/adk/model"
 	"google.golang.org/adk/model/gemini"
 	"google.golang.org/genai"
 )
 
 func Gemini(ctx context.Context, model string) (model.LLM, error) {
-	return gemini.NewModel(ctx, model, &genai.ClientConfig{
-		// Project:  "gen-lang-client-0911744172",
-		// Location: "us-central1",
-		// Backend:  genai.BackendVertexAI,
-	})
+
+	use := os.Getenv("GOOGLE_GENAI_USE_VERTEXAI")
+	if use != "" { // todo, be more truthy
+		// creds file
+		creds := os.Getenv("GOOGLE_APPLICATION_CREDENTIALS")
+		if creds != "" {
+			return gemini.NewModel(ctx, model, &genai.ClientConfig{
+				Backend: genai.BackendVertexAI,
+			})
+		}
+		proj := os.Getenv("GOOGLE_CLOUD_PROJECT")
+		loc := os.Getenv("GOOGLE_CLOUD_LOCATION")
+		if proj != "" && loc != "" {
+			return gemini.NewModel(ctx, model, &genai.ClientConfig{
+				Project:  proj,
+				Location: loc,
+				Backend:  genai.BackendVertexAI,
+			})
+		}
+
+		// default inference (same as Go SDK) (typically a service account)
+		return gemini.NewModel(ctx, model, &genai.ClientConfig{
+			Backend: genai.BackendVertexAI,
+		})
+	}
+
+	// default inference (same as Go SDK)
+	return gemini.NewModel(ctx, model, &genai.ClientConfig{})
 }
diff --git a/lib/agent/runtime/handlers/ws/chat.go b/lib/agent/runtime/handlers/ws/chat.go
@@ -9,26 +9,66 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hofstadter-io/hof/lib/agent/agents"
-	"github.com/hofstadter-io/hof/lib/agent/runtime"
+	aruntime "github.com/hofstadter-io/hof/lib/agent/runtime"
+	"github.com/hofstadter-io/hof/lib/agent/runtime/handlers/common"
 	"github.com/hofstadter-io/hof/lib/agent/services/environ"
+	"github.com/hofstadter-io/hof/lib/runtime"
 	"google.golang.org/adk/agent"
 	"google.golang.org/adk/model"
 	"google.golang.org/adk/runner"
 	"google.golang.org/adk/session"
 	"google.golang.org/genai"
 )
 
-type ChatPayload struct {
-	Text    string `json:"text"`
-	Sid     string `json:"sid"`
-	Agent   string `json:"agent"`
-	Model   string `json:"model"`
-	Environ string `json:"environ"`
+func makeChatUserMessageHandler(r *runtime.Runtime) aruntime.Handler {
+	return func(ar *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
+		var p common.ChatPayload
+		if err := json.Unmarshal(m.Payload, &p); err != nil {
+			c.Mail("chat.event.error", map[string]any{
+				"agent":         p.Agent,
+				"error_message": fmt.Sprintf("Error unmarshaling 'chat' payload: %v", err),
+			})
+			return
+		}
+
+		p.User = c.User
+
+		log.Printf("Chatting payload: %#+v", p)
+
+		s, err := common.SessionChat(r, ar, &p)
+		if err != nil {
+			log.Printf("chat.msg.error.SessionChat: %v", err)
+			c.Mail("chat.event.error", map[string]any{
+				"agent":         p.Agent,
+				"error_message": fmt.Sprintf("while chatting: %v", err),
+			})
+			return
+		}
+
+		// every time we get an event...
+		for e := range s.EventChan {
+			// send the message
+			c.Mail("chat.event", e)
+
+			// look for any errors
+			select {
+			case err := <-s.ErrorChan:
+				log.Printf("chat.msg.error.SessionChat.loop: %v", err)
+				c.Mail("chat.event.error", map[string]any{
+					"agent":         p.Agent,
+					"error_message": fmt.Sprintf("while chatting: %v", err),
+				})
+			default:
+			}
+		}
+
+	}
+
 }
 
-func chatUserMessage(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func chatUserMessage(r *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 
-	var p ChatPayload
+	var p common.ChatPayload
 	if err := json.Unmarshal(m.Payload, &p); err != nil {
 		c.Mail("chat.event.error", map[string]any{
 			"agent":         p.Agent,
@@ -125,7 +165,7 @@ func chatUserMessage(r *runtime.Runtime, c *runtime.Client, m *runtime.Message)
 	// setup subcontext and wait group
 	chatCtx, chatStop := context.WithCancel(r.Ctx)
 
-	r.SetSession(&runtime.Session{
+	r.SetSession(&aruntime.Session{
 		Sid:      p.Sid,
 		StopFunc: chatStop,
 	})
@@ -151,7 +191,7 @@ func chatUserMessage(r *runtime.Runtime, c *runtime.Client, m *runtime.Message)
 
 }
 
-func sessionCancel(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func sessionCancel(r *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 	var p SidRequest
 	if err := json.Unmarshal(m.Payload, &p); err != nil {
 		log.Printf("Error unmarshaling 'session.cancel' payload: %v", err)
diff --git a/lib/agent/runtime/handlers/ws/index.go b/lib/agent/runtime/handlers/ws/index.go
@@ -5,47 +5,45 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hofstadter-io/hof/lib/agent/runtime"
+	aruntime "github.com/hofstadter-io/hof/lib/agent/runtime"
 	"github.com/hofstadter-io/hof/lib/cuetils"
+	"github.com/hofstadter-io/hof/lib/runtime"
 )
 
-// TODO, we need a good list of message types
-// for both the frontend, backend, and where/how they are used
-
-func SetupHandlers(r *runtime.Runtime) {
+func SetupHandlers(r *runtime.Runtime, ar *aruntime.Runtime) {
 
 	// standard fare
-	r.Handlers["echo"] = echo
-	r.Handlers["hello"] = hello
+	ar.Handlers["echo"] = echo
+	ar.Handlers["hello"] = hello
 
 	// informational handlers
-	r.Handlers["requestSync"] = broadcastSync
-	r.Handlers["config.reload"] = reloadEnvConfig
-	r.Handlers["config.info"] = configInfo
-	r.Handlers["models.list"] = modelsList
-	r.Handlers["agents.list"] = agentsList
+	ar.Handlers["requestSync"] = broadcastSync
+	ar.Handlers["config.reload"] = reloadEnvConfig
+	ar.Handlers["config.info"] = configInfo
+	ar.Handlers["models.list"] = modelsList
+	ar.Handlers["agents.list"] = agentsList
 
 	// chat
-	r.Handlers["chat"] = chatUserMessage
-	r.Handlers["chat.userMessage"] = chatUserMessage
-	r.Handlers["session.cancel"] = sessionCancel
+	ar.Handlers["chat"] = makeChatUserMessageHandler(r)
+	ar.Handlers["chat.userMessage"] = makeChatUserMessageHandler(r)
+	ar.Handlers["session.cancel"] = sessionCancel
 
 	// sessions
-	r.Handlers["session.get"] = sessionGet
-	r.Handlers["session.getList"] = sessionList
-	r.Handlers["session.create"] = sessionCreate
-	r.Handlers["session.delete"] = sessionDelete
-	r.Handlers["session.getStateAll"] = sessionGetStateAll
-	r.Handlers["session.state.get"] = sessionGetState
-	r.Handlers["session.state.put"] = sessionPutState
-	r.Handlers["session.state.del"] = sessionDelState
-
-	r.Handlers["session.merge"] = sessionMerge
-	r.Handlers["session.tag"] = sessionTag
-	r.Handlers["session.push"] = sessionPush
-	r.Handlers["session.pull"] = sessionPull
-	r.Handlers["session.clone"] = sessionClone
-	r.Handlers["session.splice"] = sessionSplice
+	ar.Handlers["session.get"] = sessionGet
+	ar.Handlers["session.getList"] = sessionList
+	ar.Handlers["session.create"] = sessionCreate
+	ar.Handlers["session.delete"] = sessionDelete
+	ar.Handlers["session.getStateAll"] = sessionGetStateAll
+	ar.Handlers["session.state.get"] = sessionGetState
+	ar.Handlers["session.state.put"] = sessionPutState
+	ar.Handlers["session.state.del"] = sessionDelState
+
+	ar.Handlers["session.merge"] = sessionMerge
+	ar.Handlers["session.tag"] = sessionTag
+	ar.Handlers["session.push"] = sessionPush
+	ar.Handlers["session.pull"] = sessionPull
+	ar.Handlers["session.clone"] = sessionClone
+	ar.Handlers["session.splice"] = sessionSplice
 	// r.Handlers["session.environ.set"] = sessionEnvironSet
 
 	//
@@ -65,7 +63,7 @@ type EchoResponsePayload struct {
 	ResponseText string `json:"responseText"`
 }
 
-func echo(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func echo(r *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 	var p EchoPayload
 	if err := json.Unmarshal(m.Payload, &p); err != nil {
 		log.Printf("Error unmarshaling 'echo' payload: %v", err)
@@ -83,7 +81,7 @@ type HelloPayload struct {
 	Version string `json:"version"`
 }
 
-func hello(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func hello(ar *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 	var p HelloPayload
 	if err := json.Unmarshal(m.Payload, &p); err != nil {
 		log.Printf("Error unmarshaling 'hello' payload: %v", err)
@@ -92,28 +90,28 @@ func hello(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
 	log.Printf("Hello from client version: %s (Client: %p)", p.Version, c)
 }
 
-func broadcastSync(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func broadcastSync(ar *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 	// fmt.Println("broadcastSync")
 	// reloadEnvConfig(r, c, m)
-	sessionGet(r, c, m)
-	sessionList(r, c, m)
+	sessionGet(ar, c, m)
+	sessionList(ar, c, m)
 	// sessionFilesysDiff(r, c, m)
 
 	// runtime (runners?)
 	// memory
 	// artifacts
 }
 
-func reloadEnvConfig(r *runtime.Runtime, c *runtime.Client, m *runtime.Message) {
+func reloadEnvConfig(ar *aruntime.Runtime, c *aruntime.Client, m *aruntime.Message) {
 	// todo, this should happen on a per-client/user basis
 	var err error
-	err = r.ReadEnvConfig()
+	err = ar.ReadEnvConfig()
 	if err != nil {
 		err = cuetils.ExpandCueError(err)
 		c.Mail("config.reload.error", map[string]any{
 			"status":        "error",
 			"error_message": fmt.Errorf("while reloading config: %w", err),
 		})
 	}
-	configInfo(r, c, m)
+	configInfo(ar, c, m)
 }
diff --git a/lib/extension/cmd.go b/lib/extension/cmd.go
@@ -48,7 +48,7 @@ func Run(args []string, rflags flags.RootPflagpole) error {
 	ar.BackfillAgentic()
 
 	// fmt.Println("BR.Agentics:", len(ar.Agentics))
-	ws.SetupHandlers(ar)
+	ws.SetupHandlers(r, ar)
 
 	return ar.Run()
 }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func prepRuntime(args []string, rflags flags.RootPflagpole) (runtime.Runtime, `
`58`	`58`
`59`	`59`	`ar.BackfillAgentic()`
`60`	`60`
`61`		`- ws.SetupHandlers(ar)`
	`61`	`+ ws.SetupHandlers(r, ar)`
`62`	`62`	`return r, ar, nil`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ func renderMessages(width int, session session.Session) []string {`
`45`	`45`	`author = agentStyle.Render(evt.Author)`
`46`	`46`	`if evt.Content != nil {`
`47`	`47`	`for _, part := range evt.Content.Parts {`
	`48`	`+`
`48`	`49`	`if part.Text != "" {`
`49`	`50`	`out, err := glam.Render(part.Text)`
`50`	`51`	`if err != nil {`
`@@ -53,6 +54,7 @@ func renderMessages(width int, session session.Session) []string {`
`53`	`54`	`body += out + "\n"`
`54`	`55`	`}`
`55`	`56`	`}`
	`57`	`+`
`56`	`58`	`if part.FunctionCall != nil {`
`57`	`59`	`r := part.FunctionCall`
`58`	`60`	`var extra string`
`@@ -75,9 +77,12 @@ func renderMessages(width int, session session.Session) []string {`
`75`	`77`	`text := dmp.DiffPrettyText(diffs)`
`76`	`78`	`extra += fmt.Sprintf("-------\n%s\n-------\n\n", text)`
`77`	`79`	`}`
	`80`	`+ case "exec":`
	`81`	+ extra = fmt.Sprintf("`%s`", r.Args["script"])
`78`	`82`	`}`
`79`	`83`	`body += fmt.Sprintf(" %s: %s ...\n", funcStyle.Render("┃"+r.Name), extra)`
`80`	`84`	`}`
	`85`	`+`
`81`	`86`	`if part.FunctionResponse != nil {`
`82`	`87`	`r := part.FunctionResponse`
`83`	`88`	`var extra string`
`@@ -88,9 +93,12 @@ func renderMessages(width int, session session.Session) []string {`
`88`	`93`	`extra = fmt.Sprintf("%s %s", r.Response["path"], r.Response["status"])`
`89`	`94`	`case "fs_edit":`
`90`	`95`	`extra = fmt.Sprintf("%s %s", r.Response["path"], r.Response["status"])`
	`96`	`+ case "exec":`
	`97`	`+ extra = fmt.Sprintf("%s %v\n--- stdout ---\n%s\n--- stderr ---\n%s\n--- end ---", r.Response["status"], r.Response["exitCode"], r.Response["stdout"], r.Response["stderr"])`
`91`	`98`	`}`
`92`	`99`	`body += fmt.Sprintf(" %s: %s\n", funcStyle.Render("┃"+r.Name), extra)`
`93`	`100`	`}`
	`101`	`+`
`94`	`102`	`}`
`95`	`103`	`body = strings.TrimSuffix(body, "\n")`
`96`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func Run(args []string, rflags flags.RootPflagpole) error {`
`48`	`48`	`ar.BackfillAgentic()`
`49`	`49`
`50`	`50`	`// fmt.Println("BR.Agentics:", len(ar.Agentics))`
`51`		`- ws.SetupHandlers(ar)`
	`51`	`+ ws.SetupHandlers(r, ar)`
`52`	`52`
`53`	`53`	`return ar.Run()`
`54`	`54`	`}`