Enhance NOFXi agent workflow and diagnostics

agent/llm_skill_router.go

@@ -16,14 +16,14 @@ type llmSkillRouteDecision struct {
 	Filter string `json:"filter,omitempty"`
 }
 
-func (a *Agent) tryLLMSkillRoute(ctx context.Context, storeUserID string, userID int64, lang, text string, onEvent func(event, data string)) (string, bool) {
+func (a *Agent) tryLLMSkillRoute(ctx context.Context, storeUserID string, userID int64, lang, text string, onEvent func(event, data string)) (string, bool, error) {
 	if a.aiClient == nil {
-		return "", false
+		return "", false, nil
 	}
 
 	text = strings.TrimSpace(text)
 	if text == "" {
-		return "", false
+		return "", false, nil
 	}
 
 	recentConversationCtx := a.buildRecentConversationContext(userID, text)
@@ -47,10 +47,17 @@ Available skills:
 - model_diagnosis
 - strategy_diagnosis
 
-For management skills, choose one action from:
-- query
+For management skills, choose one atomic action from:
+- query_list
+- query_detail
+- query_running
 - create
-- update
+- update_name
+- update_bindings
+- update_status
+- update_endpoint
+- update_config
+- update_prompt
 - delete
 - start
 - stop
@@ -69,7 +76,8 @@ Rules:
 - Prefer route "planner" when uncertain.
 - Prefer route "planner" for market analysis, broad advice, multi-step troubleshooting, or requests that need synthesis.
 - Prefer route "skill" for straightforward management requests like listing, creating, starting, stopping, enabling, disabling, renaming, or deleting known entities.
-- Questions like "当前有运行中的trader吗" and "有没有 trader 在跑" are trader_management with action "query" and filter "running_only".
+- Questions like "当前有运行中的trader吗" and "有没有 trader 在跑" are trader_management with action "query_running".
+- Questions about one entity's details, config, parameters, or prompt should prefer action "query_detail".
 - Do not use route "skill" for casual chat.
 - Consider Recent conversation, Task state, and Execution state JSON before deciding.
 
@@ -88,17 +96,37 @@ Return JSON with this exact shape:
 		Ctx: stageCtx,
 	})
 	if err != nil {
-		return "", false
+		return "", false, nil
 	}
 
 	decision, err := parseLLMSkillRouteDecision(raw)
 	if err != nil || decision.Route != "skill" {
-		return "", false
+		return "", false, nil
 	}
 
-	answer, ok := a.executeLLMSkillRoute(storeUserID, userID, lang, text, decision)
+	outcome, ok := a.executeLLMSkillRoute(storeUserID, userID, lang, text, decision)
 	if !ok {
-		return "", false
+		return "", false, nil
+	}
+
+	review, err := a.reviewTaskCompletion(ctx, userID, lang, text, outcome)
+	if err != nil {
+		if outcome.Status == skillOutcomeRecoverableError || outcome.Status == skillOutcomeFatalError || outcome.Status == skillOutcomeNotHandled {
+			return "", false, nil
+		}
+		review = taskReviewDecision{Route: "complete", Answer: outcome.UserMessage}
+	}
+	if review.Route == "replan" {
+		answer, planErr := a.runPlannedAgent(ctx, storeUserID, userID, lang, fmt.Sprintf("Original user request:\n%s\n\nPrevious skill outcome JSON:\n%s", text, mustMarshalJSON(outcome)), onEvent)
+		return answer, true, planErr
+	}
+
+	answer := strings.TrimSpace(review.Answer)
+	if answer == "" {
+		answer = strings.TrimSpace(outcome.UserMessage)
+	}
+	if answer == "" {
+		return "", false, nil
 	}
 
 	a.recordSkillInteraction(userID, text, answer)
@@ -113,7 +141,7 @@ Return JSON with this exact shape:
 		onEvent(StreamEventTool, label)
 		onEvent(StreamEventDelta, answer)
 	}
-	return answer, true
+	return answer, true, nil
 }
 
 func parseLLMSkillRouteDecision(raw string) (llmSkillRouteDecision, error) {
@@ -140,43 +168,125 @@ func parseLLMSkillRouteDecision(raw string) (llmSkillRouteDecision, error) {
 func normalizeLLMSkillRouteDecision(decision llmSkillRouteDecision) llmSkillRouteDecision {
 	decision.Route = strings.TrimSpace(strings.ToLower(decision.Route))
 	decision.Skill = strings.TrimSpace(strings.ToLower(decision.Skill))
-	decision.Action = strings.TrimSpace(strings.ToLower(decision.Action))
 	decision.Filter = strings.TrimSpace(strings.ToLower(decision.Filter))
+	if decision.Action == "query" && decision.Filter == "running_only" && decision.Skill == "trader_management" {
+		decision.Action = "query_running"
+	} else {
+		decision.Action = normalizeAtomicSkillAction(decision.Skill, decision.Action)
+	}
 	return decision
 }
 
-func (a *Agent) executeLLMSkillRoute(storeUserID string, userID int64, lang, text string, decision llmSkillRouteDecision) (string, bool) {
+func (a *Agent) executeLLMSkillRoute(storeUserID string, userID int64, lang, text string, decision llmSkillRouteDecision) (skillOutcome, bool) {
 	session := skillSession{Name: decision.Skill, Action: decision.Action}
 
 	switch decision.Skill {
 	case "trader_management":
 		if decision.Action == "create" {
-			return a.handleCreateTraderSkill(storeUserID, userID, lang, text, session)
+			answer, handled := a.handleCreateTraderSkill(storeUserID, userID, lang, text, session)
+			if !handled {
+				return skillOutcome{}, false
+			}
+			return inferSkillOutcome(decision.Skill, decision.Action, answer, a.getSkillSession(userID), skillDataForAction(storeUserID, decision.Skill, decision.Action, a)), true
 		}
 		answer, handled := a.handleTraderManagementSkill(storeUserID, userID, lang, text, session)
-		if handled && decision.Action == "query" {
-			return applyTraderQueryFilter(lang, answer, a.toolListTraders(storeUserID), decision.Filter), true
+		if handled && decision.Action == "query_running" {
+			answer = applyTraderQueryFilter(lang, answer, a.toolListTraders(storeUserID), "running_only")
 		}
-		return answer, handled
+		if !handled {
+			return skillOutcome{}, false
+		}
+		return inferSkillOutcome(decision.Skill, decision.Action, answer, a.getSkillSession(userID), skillDataForAction(storeUserID, decision.Skill, decision.Action, a)), true
 	case "exchange_management":
-		return a.handleExchangeManagementSkill(storeUserID, userID, lang, text, session)
+		answer, handled := a.handleExchangeManagementSkill(storeUserID, userID, lang, text, session)
+		if !handled {
+			return skillOutcome{}, false
+		}
+		return inferSkillOutcome(decision.Skill, decision.Action, answer, a.getSkillSession(userID), skillDataForAction(storeUserID, decision.Skill, decision.Action, a)), true
 	case "model_management":
-		return a.handleModelManagementSkill(storeUserID, userID, lang, text, session)
+		answer, handled := a.handleModelManagementSkill(storeUserID, userID, lang, text, session)
+		if !handled {
+			return skillOutcome{}, false
+		}
+		return inferSkillOutcome(decision.Skill, decision.Action, answer, a.getSkillSession(userID), skillDataForAction(storeUserID, decision.Skill, decision.Action, a)), true
 	case "strategy_management":
-		return a.handleStrategyManagementSkill(storeUserID, userID, lang, text, session)
+		answer, handled := a.handleStrategyManagementSkill(storeUserID, userID, lang, text, session)
+		if !handled {
+			return skillOutcome{}, false
+		}
+		return inferSkillOutcome(decision.Skill, decision.Action, answer, a.getSkillSession(userID), skillDataForAction(storeUserID, decision.Skill, decision.Action, a)), true
 	case "model_diagnosis":
-		return a.handleModelDiagnosisSkill(storeUserID, lang, text), true
+		return skillOutcome{
+			Skill:        decision.Skill,
+			Action:       defaultIfEmpty(decision.Action, "diagnose"),
+			Status:       skillOutcomeSuccess,
+			GoalAchieved: true,
+			UserMessage:  a.handleModelDiagnosisSkill(storeUserID, lang, text),
+		}, true
 	case "exchange_diagnosis":
-		return a.handleExchangeDiagnosisSkill(storeUserID, lang, text), true
+		return skillOutcome{
+			Skill:        decision.Skill,
+			Action:       defaultIfEmpty(decision.Action, "diagnose"),
+			Status:       skillOutcomeSuccess,
+			GoalAchieved: true,
+			UserMessage:  a.handleExchangeDiagnosisSkill(storeUserID, lang, text),
+		}, true
 	case "trader_diagnosis":
-		return a.handleTraderDiagnosisSkill(storeUserID, lang, text), true
+		return skillOutcome{
+			Skill:        decision.Skill,
+			Action:       defaultIfEmpty(decision.Action, "diagnose"),
+			Status:       skillOutcomeSuccess,
+			GoalAchieved: true,
+			UserMessage:  a.handleTraderDiagnosisSkill(storeUserID, lang, text),
+		}, true
 	case "strategy_diagnosis":
-		return a.handleStrategyDiagnosisSkill(storeUserID, lang, text), true
+		return skillOutcome{
+			Skill:        decision.Skill,
+			Action:       defaultIfEmpty(decision.Action, "diagnose"),
+			Status:       skillOutcomeSuccess,
+			GoalAchieved: true,
+			UserMessage:  a.handleStrategyDiagnosisSkill(storeUserID, lang, text),
+		}, true
 	default:
-		return "", false
+		return skillOutcome{}, false
 	}
 }
 
+func skillDataForAction(storeUserID, skill, action string, a *Agent) map[string]any {
+	var raw string
+	switch skill {
+	case "trader_management":
+		if strings.HasPrefix(action, "query") {
+			raw = a.toolListTraders(storeUserID)
+		}
+	case "exchange_management":
+		if strings.HasPrefix(action, "query") {
+			raw = a.toolGetExchangeConfigs(storeUserID)
+		}
+	case "model_management":
+		if strings.HasPrefix(action, "query") {
+			raw = a.toolGetModelConfigs(storeUserID)
+		}
+	case "strategy_management":
+		if strings.HasPrefix(action, "query") {
+			raw = a.toolGetStrategies(storeUserID)
+		}
+	}
+	if strings.TrimSpace(raw) == "" {
+		return nil
+	}
+	var data map[string]any
+	if err := json.Unmarshal([]byte(raw), &data); err != nil {
+		return nil
+	}
+	return data
+}
+
+func mustMarshalJSON(v any) string {
+	data, _ := json.Marshal(v)
+	return string(data)
+}
+
 func applyTraderQueryFilter(lang, fallback, raw, filter string) string {
 	filter = strings.TrimSpace(strings.ToLower(filter))
 	if filter == "" {