Accept memory recall query aliases

Author: SqlRush

docs/cc-100-roadmap.md

@@ -188,6 +188,8 @@ M6 补充：session-memory recall agent 和 relevant-memory selector 现在递
 
 M6 补充：session-memory recall agent 和 relevant-memory selector 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` response wrapper，可从 `message.content`、content-block array、`content.parts[].text` 和 fenced `json` code block 里递归恢复 JSON selection payload。
 
+M6 补充：session-memory recall agent 和 relevant-memory selector 的 query 解析现在接受 `user_query`/`userQuery`、`question`、`prompt`、`input`、`search`、`search_text`/`searchText` 等相邻别名，模型返回非 canonical query key 时仍能保留改写后的检索语义。
+
 M6 补充：model-backed memory fact extraction 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` response wrapper 以及顶层 `message`/`content`/`text` envelope，可从 `message.content`、content-block array、`content.parts[].text` 和 fenced `json` code block 里递归恢复 JSON facts payload。
 
 M6 补充：model-backed memory fact extraction 现在接受更多 fact source aliases，包括 `sourceMessageUUID`/`source_message_uuid`、`sourceEventId`/`source_event_id`、`originId` 以及 `turn`/`event` source object，并保留 numeric source IDs 为字符串。

docs/claude-code-go-rewrite-plan.md

@@ -299,6 +299,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：model-backed relevant memory selector prompt 现在包含 recent successful tools 和 already-surfaced memory paths 的有界上下文，模型侧选择与 deterministic prefilter 的 tool/surfaced 约束更一致。
 - 本轮补充：session-memory recall agent 和 relevant-memory selector 现在递归解包 `data`/`payload`/`body`、JSON:API `resource`/`attributes`/`properties`/`attrs`、`included`，以及 GraphQL `viewer`/`edge`/`node`/`nodes`/`edges`、`collection`/`list`/`children`/`values` selection wrapper；带明确非 memory/session `type` 的 resource 不再用裸 `id` 污染选择顺序，API-shaped model response 中的 session IDs 和 memory paths 会按模型顺序保留。
 - 本轮补充：session-memory recall agent 和 relevant-memory selector 现在也接受 provider-style `choices`/`outputs`/`candidates`/`generations` response wrapper 以及顶层 `message`/`content`/`text` envelope，可从 `message.content`、content-block array、`content.parts[].text` 和 fenced `json` code block 里递归恢复 JSON selection payload。
+- 本轮补充：session-memory recall agent 和 relevant-memory selector 的 query 解析现在接受 `user_query`/`userQuery`、`question`、`prompt`、`input`、`search`、`search_text`/`searchText` 等相邻别名，模型返回非 canonical query key 时仍能保留改写后的检索语义。
 - 本轮补充：relevant-memory selector 现在接受 `uri`/`url`/`href`、`fileUri`/`fileUrl` 等 memory path aliases，并能从 `file://` URI 或 API URL path basename 恢复候选 memory；顶层 `memories`/`matches`/`filesList` 集合在同时带 `query` 时也会参与 selection 解析，避免 query 快路径丢掉模型选择。
 - 本轮补充：session-memory recall agent 现在接受 `summaries`、`selectedSummaries`、`relevantSummaries`、`candidateSummaries` 等 summary collection aliases，并会继续从嵌套 `summary.sessionId`/`summaryId` 恢复模型排序的 session IDs。
 - 本轮补充：session-memory recall agent 现在也接受 `sessionUri`/`sessionUrl`、`uri`/`url`/`href` 等 summary link aliases，能从 `file://.../summary.md` 或 API URL path 中恢复 session ID 并按模型顺序匹配 summary。

docs/first-second-parity-audit.md

@@ -149,6 +149,7 @@ M6 progress now includes:
 - `internal/memory`: session-memory summary text now falls back to frontmatter aliases such as `summaryText`, `summary`, `content`, `text`, `resultSummary`, and `finalSummary` when the markdown body is empty, while preserving body precedence.
 - `internal/memory`: session-memory recall and relevant-memory model selectors now recurse through GraphQL/JSON:API selection wrappers such as `data`, `payload`, `body`, `resource`, `attributes`, `properties`, `attrs`, `viewer`, `edge`, `node`, `nodes`, and `edges`, preserving model-ranked session IDs and memory paths from API-shaped responses.
 - `internal/memory`: session-memory recall and relevant-memory model selectors now also unwrap provider-style `choices`, `outputs`, `candidates`, and `generations` responses plus top-level `message`/`content`/`text`/`output_text` envelopes, recovering JSON selection payloads from nested `message.content`, content-block arrays, `content.parts[].text`, and fenced `json` code blocks.
+- `internal/memory`: session-memory recall and relevant-memory model selectors now preserve rewritten search text from adjacent query aliases such as `user_query`, `question`, `prompt`, `input`, `search`, and `search_text`, not only canonical `query`/`search_query` keys.
 - `internal/memory`: relevant-memory model selection now accepts URI/link path aliases such as `uri`, `url`, `href`, `fileUri`, and `fileUrl`, matching `file://` URIs and API URL path basenames back to candidate memory files; top-level `memories`, `matches`, and `filesList` collections are also scanned when a response includes `query`.
 - `internal/memory`: relevant-memory model selection now also treats file-selection aliases such as `selectedFiles`, `relevantFiles`, `candidateFiles`, `selectedFilePaths`, and `relevantFilePaths` as memory selections, including nested file objects and link objects.
 - `internal/memory`: session-memory recall model selection now accepts summary collection aliases such as `summaries`, `selectedSummaries`, `relevantSummaries`, and `candidateSummaries`, including nested `summary.sessionId` and `summaryId` fields.

internal/memory/agent.go

@@ -487,6 +487,11 @@ func parseRecallAgentJSON(raw string) (string, []contracts.ID, bool) {
 	if text, ok := selectionProviderResponseText(raw); ok {
 		return parseRecallAgentJSON(text)
 	}
+	var rawObject map[string]json.RawMessage
+	queryFromAliases := ""
+	if err := json.Unmarshal([]byte(raw), &rawObject); err == nil {
+		queryFromAliases = selectionQueryFromRawObject(rawObject)
+	}
 	var object struct {
 		Query                        string            `json:"query"`
 		SearchQuery                  string            `json:"search_query"`
@@ -752,6 +757,9 @@ func parseRecallAgentJSON(raw string) (string, []contracts.ID, bool) {
 		if query == "" {
 			query = strings.TrimSpace(object.ExpandedQueryCamel)
 		}
+		if query == "" {
+			query = queryFromAliases
+		}
 		if len(ids) == 0 {
 			query, ids = recallSelectionFromNestedPayloads(query,
 				object.Selection,
@@ -818,7 +826,7 @@ func parseRelevantMemoryAgentJSON(raw string) (string, []string, bool) {
 	}
 	var rawObject map[string]json.RawMessage
 	if err := json.Unmarshal([]byte(raw), &rawObject); err == nil {
-		query := relevantMemoryQueryFromRawObject(rawObject)
+		query := selectionQueryFromRawObject(rawObject)
 		ids := relevantMemoryIDsFromRawObject(rawObject)
 		if len(ids) == 0 {
 			query, ids = relevantMemorySelectionFromNestedPayloads(query, rawObjectValues(rawObject,
@@ -1020,25 +1028,7 @@ func parseRelevantMemoryAgentJSON(raw string) (string, []string, bool) {
 				object.Resources,
 			)
 		}
-		query := strings.TrimSpace(object.Query)
-		if query == "" {
-			query = strings.TrimSpace(object.SearchQuery)
-		}
-		if query == "" {
-			query = strings.TrimSpace(object.SearchQueryCamel)
-		}
-		if query == "" {
-			query = strings.TrimSpace(object.RewrittenQuery)
-		}
-		if query == "" {
-			query = strings.TrimSpace(object.RewrittenQueryCamel)
-		}
-		if query == "" {
-			query = strings.TrimSpace(object.ExpandedQuery)
-		}
-		if query == "" {
-			query = strings.TrimSpace(object.ExpandedQueryCamel)
-		}
+		query := firstNonEmpty(object.Query, object.SearchQuery, object.SearchQueryCamel, object.RewrittenQuery, object.RewrittenQueryCamel, object.ExpandedQuery, object.ExpandedQueryCamel)
 		if len(ids) == 0 {
 			query, ids = relevantMemorySelectionFromNestedPayloads(query,
 				object.Selected,
@@ -1083,7 +1073,7 @@ func parseRelevantMemoryAgentJSON(raw string) (string, []string, bool) {
 	return "", nil, false
 }
 
-func relevantMemoryQueryFromRawObject(object map[string]json.RawMessage) string {
+func selectionQueryFromRawObject(object map[string]json.RawMessage) string {
 	for _, key := range []string{
 		"query",
 		"search_query",
@@ -1092,6 +1082,14 @@ func relevantMemoryQueryFromRawObject(object map[string]json.RawMessage) string
 		"rewrittenQuery",
 		"expanded_query",
 		"expandedQuery",
+		"user_query",
+		"userQuery",
+		"question",
+		"prompt",
+		"input",
+		"search",
+		"search_text",
+		"searchText",
 	} {
 		if value := stringFromRawJSON(object[key]); value != "" {
 			return value

internal/memory/memory_test.go

@@ -405,6 +405,44 @@ func TestMemoryAgentSelectRelevantMemoriesUsesModelPaths(t *testing.T) {
 	}
 }
 
+func TestMemoryAgentSelectRelevantMemoriesParsesAdditionalQueryAliases(t *testing.T) {
+	dir := t.TempDir()
+	dbPath := filepath.Join(dir, "db.md")
+	opsPath := filepath.Join(dir, "ops.md")
+	writeFile(t, dbPath, "---\ndescription: database permissions migration\n---\ndb rules\n")
+	writeFile(t, opsPath, "---\ndescription: deployment runbook\n---\nops rules\n")
+	client := &fakeMemoryClient{response: &anthropic.Response{
+		ID:      "msg_memory_query_aliases",
+		Type:    "message",
+		Role:    "assistant",
+		Model:   "sonnet",
+		Content: []contracts.ContentBlock{contracts.NewTextBlock(`{"user_query":"database access","memory_paths":["db.md"]}`)},
+	}}
+
+	result, err := (Agent{Client: client}).SelectRelevantMemories(context.Background(), dir, "database permissions", RelevantMemorySelectorOptions{Limit: 1})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Fallback || result.Query != "database access" || strings.Join(result.SelectedIDs, ",") != "db.md" {
+		t.Fatalf("user_query result = %#v", result)
+	}
+	if len(result.Selected) != 1 || result.Selected[0].Path != dbPath {
+		t.Fatalf("user_query selected = %#v", result.Selected)
+	}
+
+	client.response.Content = []contracts.ContentBlock{contracts.NewTextBlock(`{"question":"deployment runbook","memoryPaths":["ops.md"]}`)}
+	result, err = (Agent{Client: client}).SelectRelevantMemories(context.Background(), dir, "deployment", RelevantMemorySelectorOptions{Limit: 1})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Fallback || result.Query != "deployment runbook" || strings.Join(result.SelectedIDs, ",") != "ops.md" {
+		t.Fatalf("question result = %#v", result)
+	}
+	if len(result.Selected) != 1 || result.Selected[0].Path != opsPath {
+		t.Fatalf("question selected = %#v", result.Selected)
+	}
+}
+
 func TestMemoryAgentSelectRelevantMemoriesParsesNestedAliasesAndFallsBack(t *testing.T) {
 	dir := t.TempDir()
 	dbPath := filepath.Join(dir, "db.md")
@@ -1733,6 +1771,56 @@ func TestMemoryAgentRecallParsesAlternateModelResponseKeys(t *testing.T) {
 	}
 }
 
+func TestMemoryAgentRecallParsesAdditionalQueryAliases(t *testing.T) {
+	root := filepath.Join(t.TempDir(), "session-memory")
+	for _, item := range []struct {
+		id      contracts.ID
+		summary string
+		updated int64
+	}{
+		{id: "prior", summary: "database access policy notes", updated: 200},
+		{id: "other", summary: "credential rotation notes", updated: 100},
+	} {
+		if _, err := WriteSessionSummary(SessionSummaryOptions{
+			Root:      root,
+			SessionID: item.id,
+			Summary:   item.summary,
+			UpdatedAt: time.Unix(item.updated, 0).UTC(),
+		}); err != nil {
+			t.Fatal(err)
+		}
+	}
+	client := &fakeMemoryClient{response: &anthropic.Response{
+		ID:      "msg_recall_query_aliases",
+		Type:    "message",
+		Role:    "assistant",
+		Model:   "sonnet",
+		Content: []contracts.ContentBlock{contracts.NewTextBlock(`{"user_query":"database access","session_ids":["prior"]}`)},
+	}}
+	result, err := (Agent{Client: client}).Recall(context.Background(), root, "what did we decide about db access?", RecallOptions{Limit: 1})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Fallback || result.Query != "database access" || strings.Join(contractIDStrings(result.SelectedIDs), ",") != "prior" {
+		t.Fatalf("user_query result = %#v", result)
+	}
+	if len(result.Matches) != 1 || result.Matches[0].Summary.SessionID != "prior" {
+		t.Fatalf("user_query matches = %#v", result.Matches)
+	}
+
+	client.response.Content = []contracts.ContentBlock{contracts.NewTextBlock(`{"question":"credential rotation","selectedSessions":[{"sessionId":"other"}]}`)}
+	result, err = (Agent{Client: client}).Recall(context.Background(), root, "what did we decide about credential rotation?", RecallOptions{Limit: 1})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if result.Fallback || result.Query != "credential rotation" || strings.Join(contractIDStrings(result.SelectedIDs), ",") != "other" {
+		t.Fatalf("question result = %#v", result)
+	}
+	if len(result.Matches) != 1 || result.Matches[0].Summary.SessionID != "other" {
+		t.Fatalf("question matches = %#v", result.Matches)
+	}
+}
+
 func TestMemoryAgentRecallParsesNestedModelSelections(t *testing.T) {
 	root := filepath.Join(t.TempDir(), "session-memory")
 	for _, item := range []struct {