(human) more work on tui, chat starting to work again

Author: verdverm

.veg/tools.cue

@@ -12,9 +12,9 @@ tools: [n=string]: {
 
 TOOLS=tools: {
 	cache_put: description:    embed["tools/cache_put.md"]
-	cache_write: description:  embed["tools/cache_put.md"]
-	cache_edit: description:   embed["tools/cache_edit.md"]
-	cache_remove: description: embed["tools/cache_del.md"]
+	// cache_write: description:  embed["tools/cache_put.md"]
+	// cache_edit: description:   embed["tools/cache_edit.md"]
+	// cache_remove: description: embed["tools/cache_del.md"]
 	cache_del: description:    embed["tools/cache_del.md"]
 
 	fs_read: description:  embed["tools/fs_read.md"]

go.mod

@@ -3,7 +3,7 @@ module github.com/hofstadter-io/hof
 go 1.24.4
 
 require (
-	cuelang.org/go v0.15.3
+	cuelang.org/go v0.15.4
 	dagger.io/dagger v0.19.10
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/BurntSushi/toml v1.5.0

go.sum

@@ -9,6 +9,8 @@ cuelabs.dev/go/oci/ociregistry v0.0.0-20250722084951-074d06050084 h1:4k1yAtPvZJZ
 cuelabs.dev/go/oci/ociregistry v0.0.0-20250722084951-074d06050084/go.mod h1:4WWeZNxUO1vRoZWAHIG0KZOd6dA25ypyWuwD3ti0Tdc=
 cuelang.org/go v0.15.3 h1:JKR/lZVwuIGlLTGIaJ0jONz9+CK3UDx06sQ6DDxNkaE=
 cuelang.org/go v0.15.3/go.mod h1:NYw6n4akZcTjA7QQwJ1/gqWrrhsN4aZwhcAL0jv9rZE=
+cuelang.org/go v0.15.4 h1:lrkTDhqy8dveHgX1ZLQ6WmgbhD8+rXa0fD25hxEKYhw=
+cuelang.org/go v0.15.4/go.mod h1:NYw6n4akZcTjA7QQwJ1/gqWrrhsN4aZwhcAL0jv9rZE=
 cyphar.com/go-pathrs v0.2.1 h1:9nx1vOgwVvX1mNBWDu93+vaceedpbsDqo+XuBGL40b8=
 cyphar.com/go-pathrs v0.2.1/go.mod h1:y8f1EMG7r+hCuFf/rXsKqMJrJAUoADZGNh5/vZPKcGc=
 dagger.io/dagger v0.19.10 h1:farO4CggSoWCId92QeZWKpP5mY9YwsVhNYuUzpqsKqw=

lib/agent/agents/cue.go

@@ -7,7 +7,6 @@ import (
 	"path"
 	"slices"
 	"sort"
-	"strconv"
 	"strings"
 
 	"cuelang.org/go/cue/cuecontext"
@@ -125,7 +124,7 @@ func BuildAgent(
 	if modelName == "" || modelName == "default" {
 		modelName = agt.Model
 	}
-	fmt.Println("BuildAgent", agentName, modelName)
+	// fmt.Println("BuildAgent", agentName, modelName)
 	mdl, ok := models[modelName]
 	if !ok {
 		return nil, fmt.Errorf("unknown model %q in agent %q", modelName, agt.Name)
@@ -198,13 +197,13 @@ func buildMcp(cfg *config.Config, agt config.Agent, models map[string]model.LLM)
 func buildTools(cfg *config.Config, agt config.Agent, models map[string]model.LLM, environMDs map[string]string) ([]tool.Tool, error) {
 	var ts []tool.Tool
 	for _, t := range agt.Tools {
-		fmt.Printf("%s.tool: %q\n", agt.Name, t)
+		// fmt.Printf("%s.tool: %q\n", agt.Name, t)
 		var T tool.Tool
 		var err error
 
 		// @<agent> handling
 		agentAsTool, found := strings.CutPrefix(t, "@")
-		fmt.Printf("%s.tool.agent: %q ? %v\n", agt.Name, agentAsTool, found)
+		// fmt.Printf("%s.tool.agent: %q ? %v\n", agt.Name, agentAsTool, found)
 		if found {
 			A, aerr := BuildAgent(cfg, agentAsTool, "default", models, environMDs)
 			if aerr != nil {
@@ -275,14 +274,14 @@ func buildTools(cfg *config.Config, agt config.Agent, models map[string]model.LL
 func addCallbacks(cfg *config.Config, agt config.Agent, environMDs map[string]string, c *llmagent.Config) {
 	c.BeforeAgentCallbacks = []agent.BeforeAgentCallback{
 		func(ctx agent.CallbackContext) (*genai.Content, error) {
-			fmt.Printf("\nBAC.%s\n", ctx.AgentName())
+			// fmt.Printf("\nBAC.%s\n", ctx.AgentName())
 			return nil, nil
 		},
 	}
 
 	c.BeforeModelCallbacks = []llmagent.BeforeModelCallback{
 		func(ctx agent.CallbackContext, req *model.LLMRequest) (*model.LLMResponse, error) {
-			fmt.Printf("\nBMC.%s\n", ctx.AgentName())
+			// fmt.Printf("\nBMC.%s\n", ctx.AgentName())
 
 			// This next section is all about making sure the state is in a good place
 			// to match the data we are about to render instructions with
@@ -323,23 +322,23 @@ func addCallbacks(cfg *config.Config, agt config.Agent, environMDs map[string]st
 
 			// hmmm, little utils like this could get spread throughout the code
 			// TODO, make a schema somewhere for the various config (cli, system, per-user, per-session, state)
-			showStr, err := ctx.State().Get("showSystemPrompt")
-			fmt.Println("showSystemPrompt.1?", showStr, err)
-			if showStr != nil {
-				show, err := strconv.ParseBool(showStr.(string))
-				fmt.Println("showSystemPrompt.2?", show, err)
-				if err == nil && show {
-					fmt.Println(req.Config.SystemInstruction.Parts[0].Text)
-				}
-			}
+			// showStr, err := ctx.State().Get("showSystemPrompt")
+			// fmt.Println("showSystemPrompt.1?", showStr, err)
+			// if showStr != nil {
+			// 	show, err := strconv.ParseBool(showStr.(string))
+			// 	fmt.Println("showSystemPrompt.2?", show, err)
+			// 	if err == nil && show {
+			// 		fmt.Println(req.Config.SystemInstruction.Parts[0].Text)
+			// 	}
+			// }
 
 			return nil, nil
 		},
 	}
 
 	c.BeforeToolCallbacks = []llmagent.BeforeToolCallback{
 		func(ctx tool.Context, t tool.Tool, args map[string]any) (map[string]any, error) {
-			fmt.Printf("\nBTC.%s.%s\n", ctx.AgentName(), t.Name())
+			// fmt.Printf("\nBTC.%s.%s\n", ctx.AgentName(), t.Name())
 			return nil, nil
 		},
 	}
@@ -350,21 +349,21 @@ func addCallbacks(cfg *config.Config, agt config.Agent, environMDs map[string]st
 
 	c.AfterToolCallbacks = []llmagent.AfterToolCallback{
 		func(ctx tool.Context, t tool.Tool, args, result map[string]any, err error) (map[string]any, error) {
-			fmt.Printf("\nATC.%s.%s %v\n", ctx.AgentName(), t.Name(), err)
+			// fmt.Printf("\nATC.%s.%s %v\n", ctx.AgentName(), t.Name(), err)
 			return result, err
 		},
 	}
 
 	c.AfterModelCallbacks = []llmagent.AfterModelCallback{
 		func(ctx agent.CallbackContext, res *model.LLMResponse, err error) (*model.LLMResponse, error) {
-			fmt.Printf("\nAMC.%s %v\n", ctx.AgentName(), err)
+			// fmt.Printf("\nAMC.%s %v\n", ctx.AgentName(), err)
 			return res, err
 		},
 	}
 
 	c.AfterAgentCallbacks = []agent.AfterAgentCallback{
 		func(ctx agent.CallbackContext) (*genai.Content, error) {
-			fmt.Printf("\nAAC.%s\n", ctx.AgentName())
+			// fmt.Printf("\nAAC.%s\n", ctx.AgentName())
 			return nil, nil
 		},
 	}

lib/agent/cmd/chat.go

@@ -21,7 +21,11 @@ func Chat(args []string, rflags flags.RootPflagpole, aflags flags.AgentPflagpole
 		return fmt.Errorf("expected one match as an agent, matched %d of %d", len(matches), len(R.Agentics))
 	}
 
-	m := tui.InitialModel(R, AR)
+	m, err := tui.InitialModel(R, AR, "chat")
+	if err != nil {
+		return err
+	}
+
 	p := tea.NewProgram(m, tea.WithAltScreen())
 
 	if _, err := p.Run(); err != nil {

lib/agent/cmd/main.go

@@ -7,8 +7,6 @@ import (
 	"github.com/hofstadter-io/hof/lib/agent/cmd/tui"
 )
 
-const gap = "\n\n"
-
 func Main(args []string, rflags flags.RootPflagpole, aflags flags.AgentPflagpole, cflags flags.Agent__ChatPflagpole) error {
 	R, AR, _, err := commonStart(args, rflags, aflags)
 	if err != nil {
@@ -24,7 +22,10 @@ func Main(args []string, rflags flags.RootPflagpole, aflags flags.AgentPflagpole
 	// 	AR.Run()
 	// }()
 
-	m := tui.InitialModel(R, AR)
+	m, err := tui.InitialModel(R, AR, "list")
+	if err != nil {
+		return err
+	}
 	p := tea.NewProgram(m, tea.WithAltScreen())
 
 	if _, err := p.Run(); err != nil {

lib/agent/cmd/runtime.go

@@ -6,22 +6,20 @@ import (
 	"maps"
 	"net/url"
 	"os"
-	"path/filepath"
 	"regexp"
 	"slices"
 	"sort"
+	"strconv"
 	"strings"
 
 	"cuelang.org/go/cue"
 	"github.com/hofstadter-io/hof/cmd/hof/flags"
 	"github.com/hofstadter-io/hof/lib/agent"
-	"github.com/hofstadter-io/hof/lib/agent/config"
 	aruntime "github.com/hofstadter-io/hof/lib/agent/runtime"
 	"github.com/hofstadter-io/hof/lib/agent/runtime/handlers/ws"
 	"github.com/hofstadter-io/hof/lib/cuetils"
 	"github.com/hofstadter-io/hof/lib/env/incept"
 	"github.com/hofstadter-io/hof/lib/runtime"
-	"github.com/hofstadter-io/hof/lib/templates"
 )
 
 type agentFilter func(*agent.Agentic) bool
@@ -58,6 +56,8 @@ func prepRuntime(args []string, rflags flags.RootPflagpole) (*runtime.Runtime, *
 		return nil, nil, fmt.Errorf("failed to create agent runtime: %v", err)
 	}
 
+	ar.BackfillAgentic()
+
 	ws.SetupHandlers(ar)
 	return r, ar, nil
 }
@@ -213,42 +213,6 @@ func commonStart(
 	return R, AR, matches, err
 }
 
-// TODO, we still need to do this, through probably on a per-request basis, or at least with watch/config changes
-func prepareTemplates(cfg *config.Config) error {
-
-	cwd, _ := os.Getwd()
-	// todo, also put this on the Session
-	dir := filepath.Join(cwd, cfg.EmbedDir)
-	glob := filepath.Join(dir, "**/*.*")
-	cfg.Templates = templates.NewTemplateMap()
-	// fmt.Printf("found %d templates in %q\n", len(config.Templates), dir)
-	err := cfg.Templates.ImportFromFolder(glob, dir, templates.Delims{}, nil)
-	if err != nil {
-		return fmt.Errorf("while loading instruction templates (%s,%s): %w", cwd, cfg.EmbedDir, err)
-	}
-	// fmt.Printf("found %d templates in %s\n", len(config.Templates), dir)
-
-	for _, T1 := range cfg.Templates {
-		for _, T2 := range cfg.Templates {
-			if T1.Name == T2.Name {
-				continue
-			}
-			t := T1.T.New(T2.Name)
-			_, err := t.Parse(T2.Source)
-			if err != nil {
-				return fmt.Errorf("while cross registering templates (%s,%s): %w", T1.Name, T2.Name, err)
-			}
-		}
-
-		// fmt.Println(T1.Name)
-		// for _, t := range T1.T.Templates() {
-		// 	fmt.Printf(" - %s\n", t.Name())
-		// }
-	}
-
-	return nil
-}
-
 func daggerInceptFlags(rflags flags.RootPflagpole, eflags flags.EnvPflagpole) (bool, error) {
 	return daggerInceptOpts(&incept.InceptOptions{
 		Verbose:     rflags.Verbosity,
@@ -281,6 +245,8 @@ func extractMeta(a *agent.Agentic) (aname, akind, mname string) {
 	if aname == "" {
 		aname = mname
 	}
+	aname, _ = strconv.Unquote(aname)
+	mname, _ = strconv.Unquote(mname)
 	return aname, akind, mname
 }