Merge pull request #620 from phantom5099/main

pref（runtime）: 去掉taskcompletion无用信号

Author: wynxing

internal/promptasset/assets.go

@@ -24,10 +24,6 @@ var coreSections = loadCoreSections()
 
 var repeatCycleReminder = mustReadTemplate("templates/runtime/self_healing_repeat_cycle.txt")
 
-var completionProtocolReminder = mustReadTemplate("templates/runtime/completion_protocol_reminder.md")
-
-var completionProtocolFinalReminder = mustReadTemplate("templates/runtime/completion_protocol_final_reminder.md")
-
 var compactSystemPromptTemplate = mustReadTemplate("templates/context/compact_system_prompt.md")
 
 var planModePlanPrompt = mustReadTemplate("templates/context/plan_mode_plan.md")
@@ -54,16 +50,6 @@ func RepeatCycleReminder() string {
 	return repeatCycleReminder
 }
 
-// CompletionProtocolReminder 返回缺少 task_completion 时的普通协议提示。
-func CompletionProtocolReminder() string {
-	return completionProtocolReminder
-}
-
-// CompletionProtocolFinalReminder 返回缺少 task_completion 时的最终协议提示。
-func CompletionProtocolFinalReminder() string {
-	return completionProtocolFinalReminder
-}
-
 // CompactSystemPrompt 返回 compact 场景使用的静态 system prompt。
 func CompactSystemPrompt(taskStateContract string, summaryFormat string) string {
 	replacer := strings.NewReplacer(

internal/promptasset/assets_test.go

@@ -61,20 +61,6 @@ func TestRuntimeReminderTemplates(t *testing.T) {
 	if !strings.Contains(RepeatCycleReminder(), "exact same arguments") {
 		t.Fatalf("expected repeat-cycle reminder guidance, got %q", RepeatCycleReminder())
 	}
-	for name, prompt := range map[string]string{
-		"completion":       CompletionProtocolReminder(),
-		"final_completion": CompletionProtocolFinalReminder(),
-	} {
-		if !strings.Contains(prompt, "Completion retry rule") {
-			t.Fatalf("%s reminder should contain retry rule, got %q", name, prompt)
-		}
-		if !strings.Contains(prompt, "Do not repeat file lists") {
-			t.Fatalf("%s reminder should prevent repeated summaries, got %q", name, prompt)
-		}
-		if !strings.Contains(prompt, "at most one brief final sentence") {
-			t.Fatalf("%s reminder should keep final prose concise, got %q", name, prompt)
-		}
-	}
 }
 
 func TestPlanModePromptTemplates(t *testing.T) {
@@ -109,6 +95,15 @@ func TestPlanModePromptTemplates(t *testing.T) {
 	if !strings.Contains(PlanModePrompt("build_execute"), "create current-run required todos") {
 		t.Fatalf("expected build prompt to require direct-build todo bootstrap")
 	}
+	if !strings.Contains(PlanModePrompt("build_execute"), "simple conversational inputs") {
+		t.Fatalf("expected build prompt to cover simple conversational completion")
+	}
+	if !strings.Contains(PlanModePrompt("build_execute"), "without an explicit actionable request") {
+		t.Fatalf("expected build prompt to cover non-actionable input completion")
+	}
+	if !strings.Contains(PlanModePrompt("build_execute"), "do not inspect or analyze the project") {
+		t.Fatalf("expected build prompt to prevent needless project analysis for casual chat")
+	}
 	if got := PlanModePrompt("unknown"); got != "" {
 		t.Fatalf("PlanModePrompt(unknown) = %q, want empty", got)
 	}

internal/promptasset/templates/context/plan_mode_build_execute.md

@@ -10,6 +10,9 @@ You are currently in build execution.
 - Do not create or rewrite the current full plan in this stage.
 - If the current plan appears outdated, explain the mismatch and continue, or recommend switching back to planning.
 - Do not output `plan_spec` or `summary_candidate` in build execution.
-- When the task is complete, your final reply MUST start with `{"task_completion":{"completed":true}}` followed by your user-facing message. Without this signal, the runtime will issue up to two protocol reminders and then terminate the run.
-- Do NOT output `task_completion` while you still have tool calls to make. Tools always take priority over completion signals.
-- Acceptance is terminal: once you signal completion, the runtime performs a final yes/no check against the plan's verify criteria. If it fails, the run ends — there is no retry.
+- If your response includes tool calls, the runtime will execute them and give you the results so you can continue working.
+- If your response fully satisfies the user's current input and no tool calls remain, reply directly without any tools. The runtime treats a non-tool response as your final answer and runs acceptance checks against it.
+- This applies to simple conversational inputs too, including greetings, casual chat, short Q&A, acknowledgements, open-ended offers for help, and inputs without an explicit actionable project request.
+- For simple conversational inputs or inputs without an explicit actionable request, answer briefly, do not call tools, and do not inspect or analyze the project just to make progress.
+- Do not stop working while you still have necessary tool calls to make. Tools take priority only when they are actually needed.
+- Acceptance is terminal: your final answer enters a yes/no check against the plan's verify criteria. If it fails, the run ends — there is no retry.

internal/promptasset/templates/runtime/completion_protocol_final_reminder.md

@@ -5,23 +5,12 @@ import (
 	"strings"
 
 	"neo-code/internal/partsrender"
-	"neo-code/internal/promptasset"
 	providertypes "neo-code/internal/provider/types"
 	"neo-code/internal/runtime/acceptgate"
 	runtimefacts "neo-code/internal/runtime/facts"
 	agentsession "neo-code/internal/session"
 )
 
-const missingCompletionSignalLimit = 6
-
-// completionProtocolReminderForStreak 根据连续缺失完成信号的次数返回对应协议提示。
-func completionProtocolReminderForStreak(streak int) string {
-	if streak >= missingCompletionSignalLimit-1 {
-		return promptasset.CompletionProtocolFinalReminder()
-	}
-	return promptasset.CompletionProtocolReminder()
-}
-
 // evaluateAcceptGate 从运行态提取事实快照，并执行最终 Accept Gate。
 func (s *Service) evaluateAcceptGate(ctx context.Context, state *runState, assistantMessage providertypes.Message) acceptgate.Report {
 	if state == nil {
@@ -48,7 +37,7 @@ func (s *Service) evaluateAcceptGate(ctx context.Context, state *runState, assis
 		PlanVerify:        planVerify,
 		Facts:             factsSnapshot,
 		Todos:             todos,
-		LastAssistantText: renderAssistantTextWithoutCompletion(assistantMessage),
+		LastAssistantText: strings.TrimSpace(partsrender.RenderDisplayParts(assistantMessage.Parts)),
 	})
 }
 
@@ -107,25 +96,3 @@ func (s *Service) emitAcceptGateReport(state *runState, report acceptgate.Report
 		Results:    append([]acceptgate.CheckResult(nil), report.Results...),
 	})
 }
-
-func renderAssistantTextWithoutCompletion(message providertypes.Message) string {
-	text := strings.TrimSpace(partsrender.RenderDisplayParts(message.Parts))
-	if text == "" {
-		return ""
-	}
-	candidate, ok := extractPlanningJSONObjectIfPresent(text, "task_completion")
-	if !ok {
-		return text
-	}
-	return strings.TrimSpace(stripPlanningJSONObjectText(text, candidate))
-}
-
-// stripCompletionSignalFromAssistantMessage 移除仅供 runtime 控制使用的 task_completion JSON，保留用户可见回复。
-func stripCompletionSignalFromAssistantMessage(message providertypes.Message) providertypes.Message {
-	text := renderAssistantTextWithoutCompletion(message)
-	if strings.TrimSpace(text) == strings.TrimSpace(partsrender.RenderDisplayParts(message.Parts)) {
-		return message
-	}
-	message.Parts = []providertypes.ContentPart{providertypes.NewTextPart(text)}
-	return message
-}

internal/promptasset/templates/runtime/completion_protocol_reminder.md

@@ -16,8 +16,8 @@ const (
 	StopReasonVerificationFailed StopReason = "verification_failed"
 	// StopReasonAccepted 表示 completion gate 与 verifier gate 均通过并完成收尾。
 	StopReasonAccepted StopReason = "accepted"
-	// StopReasonMissingCompletionSignal 表示模型停止调用工具但没有输出结构化完成信号。
-	StopReasonMissingCompletionSignal StopReason = "missing_completion_signal"
+	// StopReasonEmptyResponse 表示模型返回空文本响应。
+	StopReasonEmptyResponse StopReason = "empty_response"
 	// StopReasonAcceptCheckFailed 表示最终 Accept Gate 的验收项失败。
 	StopReasonAcceptCheckFailed StopReason = "accept_check_failed"
 	// StopReasonTodoNotConverged 表示 required todo 尚未收敛。

internal/runtime/acceptgate_runtime.go

@@ -31,14 +31,6 @@ type planTurnOutput struct {
 	DisplayText      string                `json:"-"`
 }
 
-type taskCompletionSignal struct {
-	Completed bool `json:"completed"`
-}
-
-type completionTurnOutput struct {
-	TaskCompletion taskCompletionSignal `json:"task_completion"`
-}
-
 // resolvePlanningStage 根据当前会话模式映射出活动的 planning stage。
 func resolvePlanningStage(session agentsession.Session) string {
 	if agentsession.NormalizeAgentMode(session.AgentMode) == agentsession.AgentModePlan {
@@ -142,23 +134,6 @@ func maybeParsePlanTurnOutput(message providertypes.Message) (planTurnOutput, bo
 	return output, true, nil
 }
 
-// maybeParseCompletionTurnOutput 仅在 assistant 明确输出结构化完成信号时返回完成标记。
-func maybeParseCompletionTurnOutput(message providertypes.Message) (bool, error) {
-	text := strings.TrimSpace(partsrender.RenderDisplayParts(message.Parts))
-	if text == "" || !strings.Contains(text, `"task_completion"`) {
-		return false, nil
-	}
-	candidate, ok := extractPlanningJSONObjectIfPresent(text, "task_completion")
-	if !ok {
-		return false, nil
-	}
-	var output completionTurnOutput
-	if err := json.Unmarshal([]byte(candidate.Text), &output); err != nil {
-		return false, nil
-	}
-	return output.TaskCompletion.Completed, nil
-}
-
 // extractPlanningJSONObjectIfPresent 在文本中提取首个配平的 JSON 对象。
 type extractedPlanningJSONObject struct {
 	Text  string
@@ -410,14 +385,11 @@ func approveCurrentPlan(session *agentsession.Session, planID string, revision i
 	return nil
 }
 
-// markCurrentPlanCompleted 在结构化完成信号和验收同时通过后推进计划完成态。
-func markCurrentPlanCompleted(session *agentsession.Session, completionSignaled bool) bool {
+// markCurrentPlanCompleted 在验收通过后推进计划完成态。
+func markCurrentPlanCompleted(session *agentsession.Session) bool {
 	if session == nil || session.CurrentPlan == nil {
 		return false
 	}
-	if !completionSignaled {
-		return false
-	}
 	if session.CurrentPlan.Status == agentsession.PlanStatusCompleted {
 		return false
 	}

internal/runtime/controlplane/stop_reason.go

@@ -191,49 +191,6 @@ Explanation still continues.`)},
 	}
 }
 
-func TestMaybeParseCompletionTurnOutput(t *testing.T) {
-	t.Parallel()
-
-	completed, err := maybeParseCompletionTurnOutput(providertypes.Message{
-		Role: providertypes.RoleAssistant,
-		Parts: []providertypes.ContentPart{
-			providertypes.NewTextPart("{\"task_completion\":{\"completed\":true}}\n任务已经完成。"),
-		},
-	})
-	if err != nil {
-		t.Fatalf("maybeParseCompletionTurnOutput() error = %v", err)
-	}
-	if !completed {
-		t.Fatal("expected structured completion signal to be detected")
-	}
-
-	completed, err = maybeParseCompletionTurnOutput(providertypes.Message{
-		Role:  providertypes.RoleAssistant,
-		Parts: []providertypes.ContentPart{providertypes.NewTextPart("plain answer only")},
-	})
-	if err != nil {
-		t.Fatalf("maybeParseCompletionTurnOutput() natural language error = %v", err)
-	}
-	if completed {
-		t.Fatal("expected natural language without completion JSON not to signal completion")
-	}
-}
-
-func TestMaybeParseCompletionTurnOutputIgnoresInvalidStructuredReply(t *testing.T) {
-	t.Parallel()
-
-	completed, err := maybeParseCompletionTurnOutput(providertypes.Message{
-		Role:  providertypes.RoleAssistant,
-		Parts: []providertypes.ContentPart{providertypes.NewTextPart(`{"task_completion":"done"}`)},
-	})
-	if err != nil {
-		t.Fatalf("maybeParseCompletionTurnOutput() error = %v", err)
-	}
-	if completed {
-		t.Fatal("expected invalid completion payload to be ignored")
-	}
-}
-
 func TestExtractPlanningJSONObjectIfPresent(t *testing.T) {
 	t.Parallel()
 
@@ -322,31 +279,22 @@ func TestMarkCurrentPlanCompleted(t *testing.T) {
 			Verify: acceptText("验证一"),
 		},
 	}
-	if !markCurrentPlanCompleted(&session, true) {
-		t.Fatalf("expected draft plan with completion signal to transition to completed")
+	if !markCurrentPlanCompleted(&session) {
+		t.Fatalf("expected draft plan to transition to completed")
 	}
 	if session.CurrentPlan.Status != agentsession.PlanStatusCompleted {
 		t.Fatalf("Status = %q, want completed", session.CurrentPlan.Status)
 	}
 	if !session.PlanCompletionPendingFullReview {
 		t.Fatal("expected completed plan to request one final full-plan review turn")
 	}
-	if markCurrentPlanCompleted(&session, true) {
+	if markCurrentPlanCompleted(&session) {
 		t.Fatalf("expected completed plan not to transition again")
 	}
 
-	session.CurrentPlan = &agentsession.PlanArtifact{
-		ID:       "plan-2",
-		Revision: 1,
-		Status:   agentsession.PlanStatusDraft,
-		Spec: agentsession.PlanSpec{
-			Goal:   "草案计划",
-			Steps:  []string{"步骤一"},
-			Verify: acceptText("验证一"),
-		},
-	}
-	if markCurrentPlanCompleted(&session, false) {
-		t.Fatalf("expected missing completion signal to keep plan unfinished")
+	session2 := agentsession.New("no plan")
+	if markCurrentPlanCompleted(&session2) {
+		t.Fatalf("expected no plan to return false")
 	}
 }