Merge pull request #50 from MaxLinCode/codex/fix-clarification-loop

Fix consent-only write-ready turns routing to proposal instead of clarification

Author: MaxLinCode

apps/web/src/lib/server/conversation-state.test.ts

@@ -0,0 +1,106 @@
+import { describe, expect, it } from "vitest";
+
+import { deriveConversationReplyState } from "./conversation-state";
+
+function buildSnapshot() {
+  return {
+    conversation: {
+      id: "conversation-1",
+      userId: "user-1",
+      title: null,
+      mode: "conversation" as const,
+      summaryText: null,
+      createdAt: "2026-03-22T16:00:00.000Z",
+      updatedAt: "2026-03-22T16:00:00.000Z"
+    },
+    transcript: [],
+    entityRegistry: [],
+    discourseState: {
+      focus_entity_id: null,
+      currently_editable_entity_id: null,
+      last_user_mentioned_entity_ids: [],
+      last_presented_items: [],
+      pending_clarifications: [],
+      mode: "clarifying" as const
+    }
+  };
+}
+
+describe("deriveConversationReplyState", () => {
+  it("keeps clarifications as clarifications when required slots are still missing", () => {
+    const result = deriveConversationReplyState({
+      snapshot: buildSnapshot(),
+      policyAction: "ask_clarification",
+      interpretation: {
+        turnType: "planning_request",
+        confidence: 0.58,
+        resolvedEntityIds: [],
+        ambiguity: "high",
+        missingSlots: ["time"]
+      },
+      reply: "It sounds like you want me to block out time for planning your Malaysia trip. I can proceed with that now once I know the time.",
+      userTurnText: "schedule malaysia trip planning tomorrow",
+      summaryText: null,
+      occurredAt: "2026-03-22T16:05:00.000Z"
+    });
+
+    expect(result.mode).toBe("conversation_then_mutation");
+    expect(result.entityRegistry).toHaveLength(1);
+    expect(result.entityRegistry[0]).toMatchObject({
+      kind: "clarification",
+      status: "active"
+    });
+    expect(result.discourseState?.mode).toBe("clarifying");
+  });
+
+  it("does not upgrade to proposal based on wording alone", () => {
+    const result = deriveConversationReplyState({
+      snapshot: buildSnapshot(),
+      policyAction: "ask_clarification",
+      interpretation: {
+        turnType: "planning_request",
+        confidence: 0.91,
+        resolvedEntityIds: [],
+        ambiguity: "none"
+      },
+      reply: "It sounds like you want me to block out time for planning your Malaysia trip at 3:15 PM for 15 minutes. I can proceed with that now.",
+      userTurnText: "schedule malaysia trip planning at 3:15pm for 15 minutes",
+      summaryText: null,
+      occurredAt: "2026-03-22T16:05:00.000Z"
+    });
+
+    expect(result.entityRegistry[0]).toMatchObject({
+      kind: "clarification"
+    });
+    expect(result.discourseState?.mode).toBe("clarifying");
+  });
+
+  it("persists proposal state only when policy already says present_proposal", () => {
+    const result = deriveConversationReplyState({
+      snapshot: buildSnapshot(),
+      policyAction: "present_proposal",
+      interpretation: {
+        turnType: "edit_request",
+        confidence: 0.94,
+        resolvedEntityIds: ["task-1"],
+        ambiguity: "none"
+      },
+      reply: "I can move the planning block to 3:15 PM for 15 minutes. Would you like me to do that now?",
+      userTurnText: "move it to 3:15pm for 15 minutes",
+      summaryText: null,
+      occurredAt: "2026-03-22T16:05:00.000Z"
+    });
+
+    expect(result.entityRegistry).toHaveLength(1);
+    expect(result.entityRegistry[0]).toMatchObject({
+      kind: "proposal_option",
+      status: "active",
+      data: {
+        targetEntityId: "task-1",
+        policyAction: "present_proposal",
+        confirmationRequired: true
+      }
+    });
+    expect(result.discourseState?.mode).toBe("confirming");
+  });
+});

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

@@ -46,6 +46,28 @@ describe("decideTurnPolicy", () => {
     });
   });
 
+  it("keeps clarification answers in clarification when required slots remain", () => {
+    expect(
+      decideTurnPolicy({
+        interpretation: {
+          turnType: "clarification_answer",
+          confidence: 0.84,
+          resolvedEntityIds: [],
+          ambiguity: "high",
+          missingSlots: ["time"]
+        },
+        routingContext: {
+          rawText: "Tomorrow",
+          normalizedText: "Tomorrow",
+          recentTurns: []
+        }
+      })
+    ).toMatchObject({
+      action: "ask_clarification",
+      clarificationSlots: ["time"]
+    });
+  });
+
   it("does not force proposal mode for low-confidence writes alone", () => {
     expect(
       decideTurnPolicy({
@@ -126,6 +148,46 @@ describe("decideTurnPolicy", () => {
     });
   });
 
+  it("treats affirmative consent on a pending proposal as execution", () => {
+    expect(
+      decideTurnPolicy({
+        interpretation: {
+          turnType: "confirmation",
+          confidence: 0.97,
+          resolvedEntityIds: ["task-1"],
+          resolvedProposalId: "proposal-1",
+          ambiguity: "none"
+        },
+        routingContext: {
+          rawText: "yes",
+          normalizedText: "yes",
+          recentTurns: [],
+          entityRegistry: [
+            {
+              id: "proposal-1",
+              conversationId: "conversation-1",
+              kind: "proposal_option",
+              label: "Move it to 3pm",
+              status: "active",
+              createdAt: "2026-03-20T16:00:00.000Z",
+              updatedAt: "2026-03-20T16:00:00.000Z",
+              data: {
+                route: "conversation_then_mutation",
+                replyText: "Would you like me to move it to 3pm?",
+                confirmationRequired: true,
+                targetEntityId: "task-1"
+              }
+            }
+          ]
+        }
+      })
+    ).toMatchObject({
+      action: "recover_and_execute",
+      targetProposalId: "proposal-1",
+      mutationInputSource: "recovered_proposal"
+    });
+  });
+
   it("asks for clarification on ambiguous write-like turns", () => {
     expect(
       decideTurnPolicy({
@@ -185,4 +247,124 @@ describe("decideTurnPolicy", () => {
       requiresConfirmation: true
     });
   });
+
+  it("routes ready clarification answers to present_proposal when deterministic consent is still required", () => {
+    expect(
+      decideTurnPolicy({
+        interpretation: {
+          turnType: "clarification_answer",
+          confidence: 0.92,
+          resolvedEntityIds: ["task-1"],
+          resolvedProposalId: "proposal-1",
+          ambiguity: "none"
+        },
+        routingContext: {
+          rawText: "3:15pm",
+          normalizedText: "3:15pm",
+          recentTurns: [],
+          entityRegistry: [
+            {
+              id: "proposal-1",
+              conversationId: "conversation-1",
+              kind: "proposal_option",
+              label: "Move it to 3:15pm",
+              status: "active",
+              createdAt: "2026-03-20T16:00:00.000Z",
+              updatedAt: "2026-03-20T16:00:00.000Z",
+              data: {
+                route: "conversation_then_mutation",
+                replyText: "Would you like me to move it to 3:15pm?",
+                confirmationRequired: true,
+                targetEntityId: "task-1"
+              }
+            }
+          ]
+        }
+      })
+    ).toMatchObject({
+      action: "present_proposal",
+      requiresConfirmation: true,
+      targetProposalId: "proposal-1"
+    });
+  });
+
+  it("recomputes a parameter edit on an active proposal instead of executing it", () => {
+    const result = decideTurnPolicy({
+      interpretation: {
+        turnType: "edit_request",
+        confidence: 0.9,
+        resolvedEntityIds: ["task-1"],
+        resolvedProposalId: "proposal-1",
+        ambiguity: "none"
+      },
+      routingContext: {
+        rawText: "make it 3 instead",
+        normalizedText: "make it 3 instead",
+        recentTurns: [],
+        entityRegistry: [
+          {
+            id: "proposal-1",
+            conversationId: "conversation-1",
+            kind: "proposal_option",
+            label: "Move it to tomorrow 2pm",
+            status: "active",
+            createdAt: "2026-03-20T16:00:00.000Z",
+            updatedAt: "2026-03-20T16:00:00.000Z",
+            data: {
+              route: "conversation_then_mutation",
+              replyText: "Would you like me to move it to tomorrow 2pm?",
+              confirmationRequired: true,
+              targetEntityId: "task-1",
+              originatingTurnText: "move it to tomorrow 2pm"
+            }
+          }
+        ]
+      }
+    });
+
+    expect(result).toMatchObject({
+      action: "present_proposal",
+      requiresConfirmation: true
+    });
+    expect(result.targetProposalId).toBeUndefined();
+  });
+
+  it("does not bind consent to a stale proposal with a different target", () => {
+    expect(
+      decideTurnPolicy({
+        interpretation: {
+          turnType: "edit_request",
+          confidence: 0.91,
+          resolvedEntityIds: ["task-2"],
+          resolvedProposalId: "proposal-1",
+          ambiguity: "none"
+        },
+        routingContext: {
+          rawText: "move that to 3pm",
+          normalizedText: "move that to 3pm",
+          recentTurns: [],
+          entityRegistry: [
+            {
+              id: "proposal-1",
+              conversationId: "conversation-1",
+              kind: "proposal_option",
+              label: "Move task one to 2pm",
+              status: "active",
+              createdAt: "2026-03-20T16:00:00.000Z",
+              updatedAt: "2026-03-20T16:00:00.000Z",
+              data: {
+                route: "conversation_then_mutation",
+                replyText: "Would you like me to move task one to 2pm?",
+                confirmationRequired: true,
+                targetEntityId: "task-1"
+              }
+            }
+          ]
+        }
+      })
+    ).toMatchObject({
+      action: "execute_mutation",
+      mutationInputSource: "direct_user_turn"
+    });
+  });
 });