pch/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve conflicts

Browse source
This commit is contained in:
afjcjsbx 2026-03-22 20:58:46 +01:00
parent d3ba40090b
commit be59133ce9
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/agent/loop.go
View file

@ -78,7 +78,7 @@ type processOptions struct {
SenderID string // Current sender ID for dynamic context SenderID string // Current sender ID for dynamic context
SenderDisplayName string // Current sender display name for dynamic context SenderDisplayName string // Current sender display name for dynamic context
UserMessage string // User message content (may include prefix) UserMessage string // User message content (may include prefix)
ForcedSkills []string // Skills explicitly requested for this message ForcedSkills []string // Skills explicitly requested for this message
SystemPromptOverride string // Override the default system prompt (Used by SubTurns) SystemPromptOverride string // Override the default system prompt (Used by SubTurns)
Media []string // media:// refs from inbound message Media []string // media:// refs from inbound message
InitialSteeringMessages []providers.Message // Steering messages from refactor/agent InitialSteeringMessages []providers.Message // Steering messages from refactor/agent
@ -1614,6 +1614,7 @@ func (al *AgentLoop) runTurn(ctx context.Context, ts *turnState) (turnResult, er
ts.chatID, ts.chatID,
ts.opts.SenderID, ts.opts.SenderID,
ts.opts.SenderDisplayName, ts.opts.SenderDisplayName,
activeSkillNames(ts.agent, ts.opts)...,
) )
cfg := al.GetConfig() cfg := al.GetConfig()
@ -1643,6 +1644,7 @@ func (al *AgentLoop) runTurn(ctx context.Context, ts *turnState) (turnResult, er
newHistory, newSummary, ts.userMessage, newHistory, newSummary, ts.userMessage,
ts.media, ts.channel, ts.chatID, ts.media, ts.channel, ts.chatID,
ts.opts.SenderID, ts.opts.SenderDisplayName, ts.opts.SenderID, ts.opts.SenderDisplayName,
activeSkillNames(ts.agent, ts.opts)...,
) )
messages = resolveMediaRefs(messages, al.mediaStore, maxMediaSize) messages = resolveMediaRefs(messages, al.mediaStore, maxMediaSize)
} }
@ -2007,8 +2009,8 @@ turnLoop:
newSummary := ts.agent.Sessions.GetSummary(ts.sessionKey) newSummary := ts.agent.Sessions.GetSummary(ts.sessionKey)
messages = ts.agent.ContextBuilder.BuildMessages( messages = ts.agent.ContextBuilder.BuildMessages(
newHistory, newSummary, "", newHistory, newSummary, "",
nil, opts.Channel, opts.ChatID, opts.SenderID, opts.SenderDisplayName, nil, ts.channel, ts.chatID, ts.opts.SenderID, ts.opts.SenderDisplayName,
activeSkillNames(agent, opts)..., activeSkillNames(ts.agent, ts.opts)...,
) )
callMessages = messages callMessages = messages
if gracefulTerminal { if gracefulTerminal {