Skip to content

fix(mcp): skip conflict candidates for session summaries #1023

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

Merged
dnlrsls merged 2 commits into from
Sep 5, 2026
Merged

fix(mcp): skip conflict candidates for session summaries #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d88b8b7
fix(mcp): skip conflict candidates for session summaries
dnlrsls Sep 5, 2026
0597c7b
Merge branch 'main' into fix/mem-session-summary-conflict
dnlrsls Sep 5, 2026
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
89 changes: 9 additions & 80 deletions internal/mcp/mcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ var addPromptIfMissing = func(s *store.Store, params store.AddPromptParams) (int
return s.AddPromptIfMissing(params)
}

var findSessionSummaryCandidates = func(s *store.Store, savedID int64, opts store.CandidateOptions) ([]store.Candidate, error) {
return s.FindCandidates(savedID, opts)
}

var loadMCPStats = func(s *store.Store) (*store.Stats, error) {
return s.Stats()
}
Expand Down Expand Up @@ -1424,81 +1420,6 @@ func handleSave(s *store.Store, cfg MCPConfig, activity *SessionActivity) server
}
}

// sessionSummaryCandidateResponse runs candidate detection only for a persisted
// session summary and builds its conflict-review response metadata.
func sessionSummaryCandidateResponse(s *store.Store, cfg MCPConfig, savedID int64, project string, msg *string) map[string]any {
extra := map[string]any{}
obs, obsErr := s.GetObservation(savedID)
if obsErr == nil {
extra["id"] = savedID
extra["sync_id"] = obs.SyncID
extra["state"] = obs.State()
if obs.ReviewAfter != nil {
extra["review_after"] = *obs.ReviewAfter
}
}
if obsErr != nil {
extra["judgment_required"] = false
return extra
}
query := sessionSummaryCandidateQuery(obs.Content)
if strings.TrimSpace(query) == "" {
extra["judgment_required"] = false
return extra
}
candOpts := store.CandidateOptions{Project: project, BM25Floor: cfg.BM25Floor, Query: query}
if cfg.Limit != nil {
candOpts.Limit = *cfg.Limit
}
candidates, candErr := findSessionSummaryCandidates(s, savedID, candOpts)
if candErr != nil {
// Candidate discovery is non-fatal after the source observation is saved.
fmt.Fprintf(os.Stderr, "engram: FindCandidates error (non-fatal): %v\n", candErr)
}

if len(candidates) == 0 {
extra["judgment_required"] = false
return extra
}

extra["judgment_required"] = true
extra["judgment_status"] = "pending"
extra["judgment_id"] = candidates[0].JudgmentID
candList := make([]map[string]any, 0, len(candidates))
for _, c := range candidates {
entry := map[string]any{"id": c.ID, "sync_id": c.SyncID, "title": c.Title, "type": c.Type, "score": c.Score, "judgment_id": c.JudgmentID}
if c.TopicKey != nil {
entry["topic_key"] = *c.TopicKey
}
candList = append(candList, entry)
}
extra["candidates"] = candList
*msg += fmt.Sprintf("\nCONFLICT REVIEW PENDING — %d candidate(s); use mem_judge to record verdicts.", len(candidates))
return extra
}

// sessionSummaryCandidateQuery removes the required protocol headings before
// OR-based FTS matching so they cannot create candidates by themselves.
func sessionSummaryCandidateQuery(content string) string {
mandatoryHeadings := map[string]struct{}{
"goal": {}, "instructions": {}, "discoveries": {}, "accomplished": {},
"next steps": {}, "relevant files": {},
}
lines := strings.Split(content, "\n")
retained := make([]string, 0, len(lines))
for _, line := range lines {
heading := strings.TrimSpace(line)
if strings.HasPrefix(heading, "#") {
heading = strings.TrimSpace(strings.TrimLeft(heading, "#"))
if _, mandatory := mandatoryHeadings[strings.ToLower(heading)]; mandatory {
continue
}
}
retained = append(retained, line)
}
return strings.Join(retained, "\n")
}

func handleSuggestTopicKey() server.ToolHandlerFunc {
return func(ctx context.Context, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
typ, _ := req.GetArguments()["type"].(string)
Expand Down Expand Up @@ -2094,7 +2015,15 @@ func handleSessionSummary(s *store.Store, cfg MCPConfig, activity *SessionActivi
msg += "\n" + score
}
detRes.Project = project
extra := sessionSummaryCandidateResponse(s, cfg, savedID, project, &msg)
extra := map[string]any{"judgment_required": false}
if obs, obsErr := s.GetObservation(savedID); obsErr == nil {
extra["id"] = savedID
extra["sync_id"] = obs.SyncID
extra["state"] = obs.State()
if obs.ReviewAfter != nil {
extra["review_after"] = *obs.ReviewAfter
}
}
return respondWithProject(detRes, msg, extra), nil
}
}
Expand Down
Loading