Make sure clarification answer emits new proposal

Author: MaxLinCode

apps/web/src/lib/server/decide-turn-policy.test.ts

@@ -415,7 +415,7 @@ describe("decideTurnPolicy", () => {
     });
   });
 
-  it("routes compound confirmation (classified as clarification_answer) with enough info to execute_mutation when proposal ID cleared", () => {
+  it("routes compound confirmation (classified as clarification_answer) with enough info to present_proposal for modified proposal", () => {
     const result = decideTurnPolicy(
       input(
         // resolvedProposalId is cleared by the guard — no stale proposal binding
@@ -446,11 +446,12 @@ describe("decideTurnPolicy", () => {
       )
     );
 
+    // Modified proposal still requires consent — emits new proposal, not the old ID
     expect(result).toMatchObject({
-      action: "execute_mutation",
-      mutationInputSource: "direct_user_turn"
+      action: "present_proposal",
+      requiresWrite: true,
+      requiresConfirmation: true
     });
-    expect(result.targetProposalId).toBeUndefined();
   });
 
   it("routes compound confirmation (classified as clarification_answer) with missing slots to ask_clarification", () => {

apps/web/src/lib/server/decide-turn-policy.ts

@@ -104,10 +104,10 @@ export function decideTurnPolicy(input: DecideTurnPolicyInput): TurnPolicyDecisi
       );
     case "unknown": {
       const isNonWrite = ambiguity === "none" && !containsWriteVerb(input.routingContext.normalizedText);
-      const clarificationSlots = [
+      const clarificationSlots = Array.from(new Set([
         ...commitResult.missingSlots,
         ...commitResult.needsClarification
-      ];
+      ]));
       return {
         action: isNonWrite ? "reply_only" : "ask_clarification",
         reason: isNonWrite
@@ -128,10 +128,10 @@ function deriveStructuredWriteReadiness(
   ambiguity: TurnAmbiguity
 ): StructuredWriteReadiness {
   const { classification, commitResult } = input;
-  const allClarificationSlots = [
+  const allClarificationSlots = Array.from(new Set([
     ...commitResult.missingSlots,
     ...commitResult.needsClarification
-  ];
+  ]));
 
   if (ambiguity === "high") {
     return {
@@ -218,7 +218,7 @@ function buildPolicyFromStructuredReadiness(
       return {
         action: "present_proposal",
         reason: readiness.reason,
-        requiresWrite: false,
+        requiresWrite: true,
         requiresConfirmation: true,
         useMutationPipeline: false,
         ...(targetEntityId ? { targetEntityId } : {}),

packages/core/src/proposal-rules.ts

@@ -14,14 +14,25 @@ export type ConsentRequirementInput = {
 
 export function deriveConsentRequirement(input: ConsentRequirementInput) {
   const { classification } = input;
-  const activeProposal = input.entityRegistry.find(
+
+  const consentRequiringProposals = input.entityRegistry.filter(
     (entity): entity is ProposalOption =>
       entity.kind === "proposal_option" &&
       (entity.status === "active" || entity.status === "presented") &&
-      entity.id === classification.resolvedProposalId &&
       entity.data.confirmationRequired === true
   );
 
+  // Match by resolvedProposalId if available, otherwise fall back to the
+  // single active/presented proposal (covers modified-proposal case where
+  // the guard cleared resolvedProposalId).
+  const matchedById = classification.resolvedProposalId
+    ? consentRequiringProposals.find((p) => p.id === classification.resolvedProposalId)
+    : undefined;
+  const inferredProposal = !matchedById && consentRequiringProposals.length === 1
+    ? consentRequiringProposals[0]
+    : undefined;
+  const activeProposal = matchedById ?? inferredProposal;
+
   if (!activeProposal) {
     return {
       required: false as const,
@@ -49,6 +60,16 @@ export function deriveConsentRequirement(input: ConsentRequirementInput) {
     };
   }
 
+  // When the proposal was inferred (not matched by ID), consent is required
+  // but we do NOT return targetProposalId — the caller should emit a new
+  // proposal rather than resurrecting the old one for direct execution.
+  if (inferredProposal) {
+    return {
+      required: true as const,
+      reason: "Write request is ready, but the proposal was modified and needs fresh consent."
+    };
+  }
+
   return {
     required: true as const,
     reason: "Write request is ready, but deterministic product policy still requires user consent.",