Merge pull request #1382 from dgageot/agent-info

Add CurrentAgentInfo() to make it easier to not rely on the local runtime

Author: dgageot

pkg/app/app.go

@@ -101,7 +101,7 @@ func (a *App) Runtime() runtime.Runtime {
 
 // CurrentAgentCommands returns the commands for the active agent
 func (a *App) CurrentAgentCommands(ctx context.Context) types.Commands {
-	return a.runtime.CurrentAgentCommands(ctx)
+	return a.runtime.CurrentAgentInfo(ctx).Commands
 }
 
 // CurrentMCPPrompts returns the available MCP prompts for the active agent
@@ -654,13 +654,7 @@ func (a *App) mergeEvents(events []tea.Msg) []tea.Msg {
 
 // ExportHTML exports the current session as a standalone HTML file.
 // If filename is empty, a default name based on the session title and timestamp is used.
-func (a *App) ExportHTML(filename string) (string, error) {
-	// Get agent description from the runtime if available
-	var agentDescription string
-	if localRuntime, ok := a.runtime.(*runtime.LocalRuntime); ok {
-		if agent := localRuntime.CurrentAgent(); agent != nil {
-			agentDescription = agent.Description()
-		}
-	}
-	return export.SessionToFile(a.session, agentDescription, filename)
+func (a *App) ExportHTML(ctx context.Context, filename string) (string, error) {
+	agentInfo := a.runtime.CurrentAgentInfo(ctx)
+	return export.SessionToFile(a.session, agentInfo.Description, filename)
 }

pkg/runtime/commands.go

@@ -33,7 +33,7 @@ func ResolveCommand(ctx context.Context, rt Runtime, userInput string) string {
 	cmd, rest, _ := strings.Cut(userInput, " ")
 	commandName := cmd[1:] // Remove leading "/"
 
-	command, found := rt.CurrentAgentCommands(ctx)[commandName]
+	command, found := rt.CurrentAgentInfo(ctx).Commands[commandName]
 	if !found {
 		return userInput
 	}

pkg/runtime/commands_test.go

@@ -17,14 +17,18 @@ type mockRuntime struct {
 	tools    []tools.Tool
 }
 
-func (m *mockRuntime) CurrentAgentCommands(context.Context) types.Commands {
-	return m.commands
-}
-
 func (m *mockRuntime) CurrentAgentTools(context.Context) ([]tools.Tool, error) {
 	return m.tools, nil
 }
 func (m *mockRuntime) CurrentAgentName() string { return "test" }
+func (m *mockRuntime) CurrentAgentInfo(context.Context) CurrentAgentInfo {
+	return CurrentAgentInfo{
+		Name:        "test",
+		Description: "test description",
+		Commands:    m.commands,
+	}
+}
+
 func (m *mockRuntime) SetCurrentAgent(string) error {
 	return nil
 }

pkg/runtime/remote_runtime.go

@@ -13,7 +13,6 @@ import (
 	"github.com/docker/cagent/pkg/api"
 	"github.com/docker/cagent/pkg/chat"
 	"github.com/docker/cagent/pkg/config/latest"
-	"github.com/docker/cagent/pkg/config/types"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/team"
 	"github.com/docker/cagent/pkg/tools"
@@ -75,18 +74,22 @@ func (r *RemoteRuntime) CurrentAgentName() string {
 	return r.currentAgent
 }
 
+func (r *RemoteRuntime) CurrentAgentInfo(ctx context.Context) CurrentAgentInfo {
+	cfg := r.readCurrentAgentConfig(ctx)
+	return CurrentAgentInfo{
+		Name:        r.currentAgent,
+		Description: cfg.Description,
+		Commands:    cfg.Commands,
+	}
+}
+
 // SetCurrentAgent sets the currently active agent for subsequent user messages
 func (r *RemoteRuntime) SetCurrentAgent(agentName string) error {
 	r.currentAgent = agentName
 	slog.Debug("Switched current agent (remote)", "agent", agentName)
 	return nil
 }
 
-// CurrentAgentCommands returns the commands for the current agent
-func (r *RemoteRuntime) CurrentAgentCommands(ctx context.Context) types.Commands {
-	return r.readCurrentAgentConfig(ctx).Commands
-}
-
 // CurrentAgentTools returns the tools for the current agent.
 // For remote runtime, this returns nil as tools are managed server-side.
 func (r *RemoteRuntime) CurrentAgentTools(_ context.Context) ([]tools.Tool, error) {

pkg/runtime/runtime.go

@@ -90,12 +90,12 @@ type ElicitationRequestHandler func(ctx context.Context, message string, schema
 
 // Runtime defines the contract for runtime execution
 type Runtime interface {
+	// CurrentAgentInfo returns information about the currently active agent
+	CurrentAgentInfo(ctx context.Context) CurrentAgentInfo
 	// CurrentAgentName returns the name of the currently active agent
 	CurrentAgentName() string
 	// SetCurrentAgent sets the currently active agent for subsequent user messages
 	SetCurrentAgent(agentName string) error
-	// CurrentAgentCommands returns the commands for the active agent
-	CurrentAgentCommands(ctx context.Context) types.Commands
 	// CurrentAgentTools returns the tools for the active agent
 	CurrentAgentTools(ctx context.Context) ([]tools.Tool, error)
 	// EmitStartupInfo emits initial agent, team, and toolset information for immediate display
@@ -118,6 +118,12 @@ type Runtime interface {
 	Summarize(ctx context.Context, sess *session.Session, additionalPrompt string, events chan Event)
 }
 
+type CurrentAgentInfo struct {
+	Name        string
+	Description string
+	Commands    types.Commands
+}
+
 type ModelStore interface {
 	GetModel(ctx context.Context, modelID string) (*modelsdev.Model, error)
 }
@@ -372,6 +378,16 @@ func (r *LocalRuntime) CurrentAgentName() string {
 	return r.currentAgent
 }
 
+func (r *LocalRuntime) CurrentAgentInfo(context.Context) CurrentAgentInfo {
+	currentAgent := r.CurrentAgent()
+
+	return CurrentAgentInfo{
+		Name:        currentAgent.Name(),
+		Description: currentAgent.Description(),
+		Commands:    currentAgent.Commands(),
+	}
+}
+
 func (r *LocalRuntime) SetCurrentAgent(agentName string) error {
 	// Validate that the agent exists in the team
 	if _, err := r.team.Agent(agentName); err != nil {

pkg/tui/handlers.go

@@ -123,7 +123,7 @@ func (a *appModel) handleEvalSession(filename string) (tea.Model, tea.Cmd) {
 }
 
 func (a *appModel) handleExportSession(filename string) (tea.Model, tea.Cmd) {
-	exportFile, err := a.application.ExportHTML(filename)
+	exportFile, err := a.application.ExportHTML(context.Background(), filename)
 	if err != nil {
 		return a, notification.ErrorCmd(fmt.Sprintf("Failed to export session: %v", err))
 	}