Skip to content

armgit / ax

Public Imported from GitHub
0

Agent Executor (AX) is Google's open agentic orchestration runtime

Go

allow agent to return content and handover in one response (#46)

JoyceLiu9de0519db281
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index 5ce1037..b475896 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -154,11 +154,12 @@ func (d *Controller) TriggerSession(ctx context.Context, sessionID string, incom
d.inFlightSessionsMu.Unlock()
}()
- // Check if session already exists
+ // Always load session from storage to ensure latest state
sess, err := d.sessionManager.LoadSession(ctx, sessionID)
if err != nil {
- return fmt.Errorf("failed to load session: %w", err)
+ return fmt.Errorf("failed to load session from storage: %w", err)
}
+
if sess == nil {
// Session doesn't exist - create new session
// Checkpoint ID is ignored for new sessions
diff --git a/internal/controller/gemini.go b/internal/controller/gemini.go
index a002014..50fa286 100644
--- a/internal/controller/gemini.go
+++ b/internal/controller/gemini.go
@@ -190,6 +190,7 @@ func (p *geminiPlannerAgent) Process(ctx context.Context, sessionID string, inco
Text: &proto.TextContent{Text: output},
},
}},
+ AgentHandoff: plannerAgentID, // Explicitly return to planner in same response
})
default:
return handler(&proto.ProcessResponse{
diff --git a/internal/controller/loop.go b/internal/controller/loop.go
index 73868ab..be268a4 100644
--- a/internal/controller/loop.go
+++ b/internal/controller/loop.go
@@ -117,22 +117,38 @@ func (e *LoopExecutor) runLoop(ctx context.Context, session *Session, incoming *
func (e *LoopExecutor) runAgent(ctx context.Context, session *Session, agentID string, inputs []*proto.Content, handler agent.OutputHandler) (handoff string, err error) {
var buffer []*proto.Content
+
+ // Helper to flush buffer to session
+ flushBuffer := func(checkpointID string) error {
+ if len(buffer) == 0 {
+ return nil
+ }
+ if err := session.WriteContent(ctx, agentID, checkpointID, buffer); err != nil {
+ return fmt.Errorf("failed to write content: %w", err)
+ }
+ buffer = []*proto.Content{} // Clear buffer after successful write
+ return nil
+ }
+
runHandler := func(outgoing *proto.ProcessResponse) error {
+ buffer = append(buffer, outgoing.Contents...)
+
+ if outgoing.CheckpointId != "" {
+ if err := flushBuffer(outgoing.CheckpointId); err != nil {
+ return err
+ }
+ }
+
if outgoing.AgentHandoff != "" {
- // Only support one handoff a time.
+ // Write any pending content before handoff
+ if err := flushBuffer(""); err != nil {
+ return err
+ }
+
handoff = outgoing.AgentHandoff
if err := session.WriteAgentHandoff(ctx, agentID, handoff); err != nil {
return fmt.Errorf("failed to write handoff: %w", err)
}
- return nil
- }
- buffer = append(buffer, outgoing.Contents...)
- if outgoing.CheckpointId != "" {
- // Buffer until checkpoint or to the end.
- if err := session.WriteContent(ctx, agentID, outgoing.CheckpointId, buffer); err != nil {
- return fmt.Errorf("failed to write output content: %w", err)
- }
- buffer = []*proto.Content{}
}
return handler(outgoing)
}
@@ -153,10 +169,9 @@ func (e *LoopExecutor) runAgent(ctx context.Context, session *Session, agentID s
return "", fmt.Errorf("agent process failed: %w", err)
}
- if len(buffer) > 0 {
- if err := session.WriteContent(ctx, agentID, "", buffer); err != nil {
- return "", fmt.Errorf("failed to write output buffer: %w", err)
- }
+ // Final flush of any remaining buffer content
+ if err := flushBuffer(""); err != nil {
+ return "", err
}
return handoff, nil
}