Merge remote-tracking branch 'origin/main' into codex/household-travel-context-fix

Reviewed-on: #367

cmd/core-runtime/information_request_test.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"testing"
+
+	"git.cin.su/m/Assistant/contracts/interaction"
+)
+
+func TestSpecializedInformationReplyIsNotOverwrittenByResearch(t *testing.T) {
+	for _, kind := range []interaction.InformationRequestKind{
+		interaction.InformationRequestMemoryInventory,
+		interaction.InformationRequestTimeDifference,
+		interaction.InformationRequestCapabilityInventory,
+		interaction.InformationRequestCognitiveModelInventory,
+		interaction.InformationRequestCognitiveChannelStatus,
+		interaction.InformationRequestCognitiveRecovery,
+	} {
+		if shouldRunGeneralResearch(kind) {
+			t.Fatalf("specialized information request %q must bypass general research", kind)
+		}
+	}
+	if !shouldRunGeneralResearch("") {
+		t.Fatal("ordinary research requests must still use general research")
+	}
+}

cmd/core-runtime/main.go

@@ -511,6 +511,7 @@ func main() {
 		}
 		var effectiveTaskMessage = interactiondomain.StripAssistantVocative(utterance.Content)
 		creativeUserRequest := interactiondomain.IsCreativeRequest(utterance.Content)
+		locationReply := interactiondomain.LocationContextReply(utterance.Content)
 		continuationMessage := ""
 		travelContinuation := false
 		var previousTask *interaction.HumanUtterance
@@ -532,7 +533,7 @@ func main() {
 			log.Printf("interaction principal history loaded: %d utterances", len(recentUserHistory))
 		}
 		conversationHistory = append(conversationHistory, recentUserHistory...)
-		if !creativeUserRequest {
+		if !creativeUserRequest && locationReply == "" {
 			if continuation := interactiondomain.ContinueLocalSearch(effectiveTaskMessage, conversationHistory); continuation != "" {
 				continuationMessage = continuation
 				effectiveTaskMessage = continuation
@@ -599,8 +600,11 @@ func main() {
 				}
 			}
 		}
-		locationReply := interactiondomain.LocationContextReply(utterance.Content)
 		if locationReply != "" {
+			continuationMessage = ""
+			travelContinuation = false
+			effectiveTaskMessage = interactiondomain.StripAssistantVocative(utterance.Content)
+			previousTask = nil
 			semantic.Reply = locationReply
 			semantic.NeedsCognition = false
 			semantic.Interpretation.NeedsCognition = false
@@ -769,7 +773,7 @@ func main() {
 			needsCognition = false
 		}
 		researchBacked := false
-		if hasChatRoute(routePlan, chatRouteResearch) && semantic.Interpretation.Clarification != interaction.ClarificationRequired {
+		if hasChatRoute(routePlan, chatRouteResearch) && semantic.Interpretation.Clarification != interaction.ClarificationRequired && shouldRunGeneralResearch(semantic.InformationRequestKind) {
 			if planID, idErr := ids.New(); idErr == nil {
 				parts := interactiondomain.IndependentRequestParts(effectiveTaskMessage)
 				replies := make([]string, 0, len(parts))
@@ -778,7 +782,7 @@ func main() {
 						replies = append(replies, "По запросу «"+part+"»: "+clarification)
 						continue
 					}
-					searchQuery := interactiondomain.TravelSearchQuery(part, now)
+					searchQuery := interactiondomain.TravelResearchQuery(part, conversationHistory, now)
 					researchCtx, cancelResearch := context.WithTimeout(r.Context(), 8*time.Second)
 					result, researchErr := researchClient.SearchWeb(researchCtx, epistemics.WebSearchRequest{
 						Plan:           epistemics.ResearchPlan{ID: epistemics.ResearchPlanID(fmt.Sprintf("plan:%s:%d", planID, index)), Question: searchQuery, SourceClasses: []string{"web-search"}, FreshnessPolicy: "current"},
@@ -1589,6 +1593,10 @@ func main() {
 	}
 }
 
+func shouldRunGeneralResearch(kind interaction.InformationRequestKind) bool {
+	return kind == ""
+}
+
 func creatorSessionHandler(bootstrapToken, creatorUsername, creatorPassword string, sessionKey []byte, now func() time.Time) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		authenticated := identitydomain.BootstrapMatches(bootstrapToken, bearerToken(r))
@@ -1796,7 +1804,13 @@ func humanMemoryInventory(history []interaction.HumanUtterance, assistantName st
 		lower := strings.ToLower(message)
 		if (strings.Contains(lower, "нравится") || strings.Contains(lower, "люблю")) && utterance.ReceivedAtUnixMillis >= latestPreferenceAt {
 			latestPreferenceAt = utterance.ReceivedAtUnixMillis
-			latestPreference = message
+			latestPreference = strings.TrimSpace(message)
+			for _, prefix := range []string{"запомни:", "запомни", "помни:"} {
+				if strings.HasPrefix(strings.ToLower(latestPreference), prefix) {
+					latestPreference = strings.TrimSpace(latestPreference[len(prefix):])
+					break
+				}
+			}
 		}
 	}
 	if latestPreference != "" {

modules/interaction/domain/chat.go

@@ -304,6 +304,10 @@ func semanticScores(tokens []string, hasQuestionMark bool, explicitCorrection bo
 		scores[interaction.SpeechActPreference] += 8
 		scores[interaction.SpeechActAssertion] = 0
 	}
+	if containsToken(tokens, "запомни") && containsStemInTokens(tokens, "нрав", "люб", "предпочит") {
+		scores[interaction.SpeechActPreference] += 6
+		scores[interaction.SpeechActAssertion] = 0
+	}
 	if len(tokens) >= 2 && tokens[0] == "я" && containsStemInTokens(tokens[1:], "настро", "сдела", "исправ", "удал", "созда", "перезапуст", "поменя", "добави") {
 		scores[interaction.SpeechActAssertion] += 5
 	}

modules/interaction/domain/chat_test.go

@@ -254,6 +254,16 @@ func TestMemoryInventoryRequestIsSemantic(t *testing.T) {
 	}
 }
 
+func TestRememberedPreferenceIsNotRenderedAsIdentity(t *testing.T) {
+	result := BuildDeterministicCandidate("запомни: мне нравится красный цвет", "", time.Unix(10, 0).UnixMilli())
+	if result.PrimarySpeechAct != interaction.SpeechActPreference {
+		t.Fatalf("expected remembered preference, got %+v", result)
+	}
+	if got := semanticReply("запомни: мне нравится красный цвет", SemanticResult{Interpretation: interaction.UtteranceInterpretation{SpeechAct: result.PrimarySpeechAct}}, nil); got != "Хорошо, учту это дальше." {
+		t.Fatalf("unexpected preference reply %q", got)
+	}
+}
+
 func TestCreativeRequestsDoNotRouteToWebResearch(t *testing.T) {
 	for _, message := range []string{"нарисуй круг", "расскажи сказку о колобке"} {
 		candidate := BuildDeterministicCandidate(message, "", time.Now().UnixMilli())

modules/interaction/domain/semantics_test.go

@@ -159,6 +159,14 @@ func TestTravelSearchQueryCarriesNearestFlightDate(t *testing.T) {
 	}
 }
 
+func TestTravelResearchQueryUsesKnownOriginForDistance(t *testing.T) {
+	history := []interaction.HumanUtterance{{Content: "я сейчас в Москве"}}
+	got := TravelResearchQuery("сколько километров до Сочи?", history, time.Time{})
+	if !strings.Contains(got, "точка отправления: Москве") || !strings.Contains(got, "расстояние по прямой и по дороге") {
+		t.Fatalf("distance query lost route context: %q", got)
+	}
+}
+
 func TestInterpretUtteranceDirectiveRecordsOutcomeWithoutExecution(t *testing.T) {
 	result := interpretForTest(t, "Поменяй базу на УПО1.", activeFocus("upo", "УПО"), "")
 	if result.Interpretation.SpeechAct != interaction.SpeechActDirective {

modules/interaction/domain/travel.go

@@ -21,6 +21,21 @@ func TravelSearchQuery(message string, now time.Time) string {
 	return cleaned + " сегодня " + now.Format("02.01.2006")
 }
 
+// TravelResearchQuery keeps route and distance questions tied to a known
+// origin before they reach a generic web search. The history is semantic
+// context, not a list of example-specific answers.
+func TravelResearchQuery(message string, history []interaction.HumanUtterance, now time.Time) string {
+	query := TravelSearchQuery(message, now)
+	tokens := semanticTokens(StripAssistantVocative(message))
+	if containsStemInTokens(tokens, "расстоян", "километр", "добрат", "маршрут") {
+		if origin := travelContextOrigin(history); origin != "" && !containsStemInTokens(tokens, "из", "откуда", "от") {
+			query += " точка отправления: " + origin
+		}
+		query += " расстояние по прямой и по дороге"
+	}
+	return query
+}
+
 // StripAssistantVocative removes a leading assistant name used as an address.
 // The original utterance remains the historical source; this value is only for
 // interpretation, cognitive prompts and external queries.