Skip to content

Fix(go) prompt.excute merge external incoming messages #3545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix(go) prompt.excute merge external incoming messages #3545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e3c66c
Fix the additional message
eric642 Sep 11, 2025
d34e001
update prompt.excute merge external incoming messages
eric642 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion go/ai/prompt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,15 @@ func (p *prompt) Execute(ctx context.Context, opts ...PromptExecuteOption) (*Mod

p.MessagesFn = mergeMessagesFn(p.MessagesFn, execOpts.MessagesFn)

input, err := buildVariables(execOpts.Input)
if err != nil {
return nil, err
}

// Render() should populate all data from the prompt. Prompt fields should
// *not* be referenced in this function as it may have been loaded from
// the registry and is missing the options passed in at definition.
actionOpts, err := p.Render(ctx, execOpts.Input)
actionOpts, err := p.Render(ctx, input)
if err != nil {
return nil, err
}
Expand All @@ -166,6 +171,14 @@ func (p *prompt) Execute(ctx context.Context, opts ...PromptExecuteOption) (*Mod
actionOpts.ReturnToolRequests = *execOpts.ReturnToolRequests
}

if p.MessagesFn != nil {
msg, err := renderMessages(ctx, p.promptOptions, actionOpts.Messages, input, execOpts.Input, p.registry.Dotprompt())
if err != nil {
return nil, err
}
actionOpts.Messages = msg
}

return GenerateWithRequest(ctx, p.registry, actionOpts, execOpts.Middleware, execOpts.Stream)
}

Expand Down