Merge pull request #74 from MaxLinCode/claude/pr73-to-main

Land PR #73 entity slot→field renames on main

Author: MaxLinCode

apps/web/src/app/api/telegram/webhook/route.test.ts

@@ -195,7 +195,7 @@ function buildRoutedTurn(input: {
 async function seedProposalEntity(input: {
   proposalId: string;
   originatingTurnText: string;
-  missingSlots?: string[];
+  missingFields?: string[];
   replyText?: string;
 }) {
   const entity: ConversationEntity = {
@@ -210,8 +210,8 @@ async function seedProposalEntity(input: {
       route: "conversation_then_mutation",
       replyText: input.replyText ?? "Shall I schedule that?",
       originatingTurnText: input.originatingTurnText,
-      missingSlots: input.missingSlots ?? [],
-      slotSnapshot: {},
+      missingFields: input.missingFields ?? [],
+      fieldSnapshot: {},
     },
   };
 
@@ -1148,7 +1148,7 @@ describe("telegram webhook route", () => {
     await seedProposalEntity({
       proposalId: "proposal-1",
       originatingTurnText: "Schedule the dentist reminder",
-      missingSlots: ["time"],
+      missingFields: ["time"],
       replyText: "Would you like me to schedule it at 3pm?",
     });
     const planner = vi.fn(

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

@@ -104,9 +104,8 @@ export function deriveConversationReplyState(
           mutationInputSource: null,
           confirmationRequired: true,
           originatingTurnText: input.userTurnText,
-          missingSlots: input.policy.clarificationSlots,
-          slotSnapshot:
-            input.policy.resolvedOperation?.resolvedFields.scheduleFields ?? {},
+          missingFields: input.policy.clarificationSlots,
+          fieldSnapshot: input.policy.resolvedOperation?.resolvedFields ?? {},
         },
       }),
     );

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

@@ -163,7 +163,7 @@ describe("decideTurnPolicy", () => {
                   route: "conversation_then_mutation",
                   replyText: "Would you like me to schedule it at 3pm?",
                   confirmationRequired: true,
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -203,7 +203,7 @@ describe("decideTurnPolicy", () => {
                   route: "conversation_then_mutation",
                   replyText: "Would you like me to schedule it at 3pm?",
                   confirmationRequired: true,
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -246,7 +246,7 @@ describe("decideTurnPolicy", () => {
                   replyText: "Would you like me to move it to 3pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -308,7 +308,7 @@ describe("decideTurnPolicy", () => {
                     "Would you like me to schedule it tomorrow at 6pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -350,7 +350,7 @@ describe("decideTurnPolicy", () => {
                   replyText: "Would you like me to move it to 3:15pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -397,7 +397,9 @@ describe("decideTurnPolicy", () => {
                 confirmationRequired: true,
                 targetEntityId: "task-1",
                 originatingTurnText: "move it to tomorrow 2pm",
-                slotSnapshot: { time: t(14, 0), day: "tomorrow" },
+                fieldSnapshot: {
+                  scheduleFields: { time: t(14, 0), day: "tomorrow" },
+                },
               },
             },
           ],
@@ -441,7 +443,7 @@ describe("decideTurnPolicy", () => {
                   replyText: "Would you like me to move task one to 2pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -485,7 +487,7 @@ describe("decideTurnPolicy", () => {
                     "Would you like me to schedule it tomorrow at 6pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -529,7 +531,7 @@ describe("decideTurnPolicy", () => {
                   replyText: "Would you like me to schedule it at 5pm?",
                   confirmationRequired: true,
                   targetEntityId: "task-1",
-                  slotSnapshot: {},
+                  fieldSnapshot: {},
                 },
               },
             ],
@@ -574,7 +576,9 @@ describe("decideTurnPolicy", () => {
                 replyText: "Would you like me to schedule it tomorrow at 3pm?",
                 confirmationRequired: true,
                 targetEntityId: "task-1",
-                slotSnapshot: { day: "tomorrow", time: t(15, 0) },
+                fieldSnapshot: {
+                  scheduleFields: { day: "tomorrow", time: t(15, 0) },
+                },
               },
             },
           ],
@@ -617,7 +621,7 @@ describe("decideTurnPolicy", () => {
                   route: "conversation_then_mutation",
                   replyText: "Would you like me to schedule it at 3pm?",
                   confirmationRequired: true,
-                  slotSnapshot: { time: t(15, 0) },
+                  fieldSnapshot: { scheduleFields: { time: t(15, 0) } },
                 },
               },
             ],

apps/web/src/lib/server/llm-classifier.test.ts

@@ -39,7 +39,7 @@ describe("classifyTurn", () => {
               replyText: "Would you like me to schedule it at 3pm?",
               confirmationRequired: true,
               targetEntityId: "task-1",
-              slotSnapshot: {},
+              fieldSnapshot: {},
             },
           },
         ],
@@ -70,7 +70,7 @@ describe("classifyTurn", () => {
               route: "conversation_then_mutation",
               replyText: "Move it to 3pm?",
               confirmationRequired: true,
-              slotSnapshot: {},
+              fieldSnapshot: {},
             },
           },
         ],
@@ -106,7 +106,7 @@ describe("classifyTurn", () => {
                 route: "conversation_then_mutation",
                 replyText: "A?",
                 confirmationRequired: true,
-                slotSnapshot: {},
+                fieldSnapshot: {},
               },
             },
             {
@@ -121,7 +121,7 @@ describe("classifyTurn", () => {
                 route: "conversation_then_mutation",
                 replyText: "B?",
                 confirmationRequired: true,
-                slotSnapshot: {},
+                fieldSnapshot: {},
               },
             },
           ],
@@ -308,7 +308,7 @@ describe("classifyTurn", () => {
                 route: "conversation_then_mutation",
                 replyText: "Schedule at 3pm?",
                 confirmationRequired: true,
-                slotSnapshot: {},
+                fieldSnapshot: {},
               },
             },
           ],

apps/web/src/lib/server/telegram-webhook.ts

@@ -453,9 +453,9 @@ export async function handleTelegramWebhook(
     );
 
     const synthesis = synthesizeMutationText({
-      resolvedSlots:
-        routedWithContext.policy.resolvedOperation?.resolvedFields
-          .scheduleFields ?? {},
+      resolvedFields:
+        routedWithContext.policy.resolvedOperation?.resolvedFields ?? {},
+      targetEntityId: routedWithContext.policy.targetEntityId,
       proposalEntity,
       entityRegistry,
     });

apps/web/src/lib/server/turn-router.test.ts

@@ -129,7 +129,7 @@ describe("turn router", () => {
             originatingTurnText: "Schedule dentist reminder tomorrow",
             targetEntityId: null,
             mutationInputSource: null,
-            slotSnapshot: {},
+            fieldSnapshot: {},
           },
         },
       ],
@@ -181,7 +181,7 @@ describe("turn router", () => {
             originatingTurnText: "Schedule Malaysia trip planning at 5pm",
             targetEntityId: null,
             mutationInputSource: null,
-            slotSnapshot: {},
+            fieldSnapshot: {},
           },
         },
       ],
@@ -359,7 +359,7 @@ describe("turn router", () => {
             confirmationRequired: true,
             targetEntityId: null,
             mutationInputSource: null,
-            slotSnapshot: {},
+            fieldSnapshot: {},
           },
         },
       ],
@@ -396,7 +396,7 @@ describe("turn router", () => {
             confirmationRequired: true,
             targetEntityId: null,
             mutationInputSource: null,
-            slotSnapshot: {},
+            fieldSnapshot: {},
           },
         },
       ],

packages/core/src/discourse-state.ts

@@ -71,7 +71,7 @@ export const timeSpecSchema = z.discriminatedUnion("kind", [
 
 export type TimeSpec = z.infer<typeof timeSpecSchema>;
 
-// Kept for entity slotSnapshot fields (proposal_option, task_draft) — not used in discourse state.
+// Kept for slot-extractor schemas — not used in discourse state.
 export const resolvedSlotsSchema = z.object({
   day: z.string().optional(),
   time: timeSpecSchema.optional(),

packages/core/src/index.test.ts

@@ -1146,7 +1146,7 @@ describe("core package", () => {
             route: "conversation_then_mutation",
             replyText:
               "It sounds like you want to move the dentist reminder after lunch.",
-            slotSnapshot: {},
+            fieldSnapshot: {},
           },
         },
       ],

packages/core/src/index.ts

@@ -826,8 +826,8 @@ export const conversationProposalOptionEntitySchema =
         .optional(),
       confirmationRequired: z.boolean().optional(),
       originatingTurnText: z.string().min(1).nullable().optional(),
-      missingSlots: z.array(z.string().min(1)).optional(),
-      slotSnapshot: resolvedSlotsSchema,
+      missingFields: z.array(z.string().min(1)).optional(),
+      fieldSnapshot: resolvedFieldsSchema,
     }),
   });
 

packages/core/src/proposal-rules.test.ts

@@ -1,24 +1,23 @@
 import { describe, expect, it } from "vitest";
-import type {
-  ConversationEntity,
-  ResolvedFields,
-  ResolvedSlots,
-  TimeSpec,
-} from "./index";
+import type { ConversationEntity, ResolvedFields, TimeSpec } from "./index";
 import { deriveProposalCompatibility } from "./proposal-rules";
 
 function t(hour: number, minute: number): TimeSpec {
   return { kind: "absolute", hour, minute };
 }
 
-function sf(slots: ResolvedSlots): ResolvedFields {
-  return { scheduleFields: slots };
+type ScheduleFields = NonNullable<ResolvedFields["scheduleFields"]>;
+
+function sf(fields: ScheduleFields): ResolvedFields {
+  return { scheduleFields: fields };
 }
 
 type ProposalOption = Extract<ConversationEntity, { kind: "proposal_option" }>;
 
 function makeProposal(
-  overrides: Partial<ProposalOption["data"]> & { slotSnapshot: ResolvedSlots },
+  overrides: Partial<ProposalOption["data"]> & {
+    fieldSnapshot: ResolvedFields;
+  },
 ): ProposalOption {
   return {
     id: "proposal-1",
@@ -38,10 +37,10 @@ function makeProposal(
 }
 
 describe("deriveProposalCompatibility", () => {
-  describe("slot-based compatibility", () => {
-    it("is compatible when committed slots match the snapshot", () => {
+  describe("field-based compatibility", () => {
+    it("is compatible when committed fields match the snapshot", () => {
       const proposal = makeProposal({
-        slotSnapshot: { time: t(15, 0), day: "friday" },
+        fieldSnapshot: sf({ time: t(15, 0), day: "friday" }),
       });
 
       const result = deriveProposalCompatibility(
@@ -53,9 +52,9 @@ describe("deriveProposalCompatibility", () => {
       expect(result.compatible).toBe(true);
     });
 
-    it("is incompatible when a committed slot differs from the snapshot", () => {
+    it("is incompatible when a committed field differs from the snapshot", () => {
       const proposal = makeProposal({
-        slotSnapshot: { time: t(15, 0) },
+        fieldSnapshot: sf({ time: t(15, 0) }),
       });
 
       const result = deriveProposalCompatibility(
@@ -68,9 +67,9 @@ describe("deriveProposalCompatibility", () => {
       expect(result.reason).toMatch(/differs from proposal snapshot/);
     });
 
-    it("is compatible when committed slot is new (not in snapshot)", () => {
+    it("is compatible when committed field is new (not in snapshot)", () => {
       const proposal = makeProposal({
-        slotSnapshot: { day: "friday" },
+        fieldSnapshot: sf({ day: "friday" }),
       });
 
       const result = deriveProposalCompatibility(
@@ -82,9 +81,9 @@ describe("deriveProposalCompatibility", () => {
       expect(result.compatible).toBe(true);
     });
 
-    it("is compatible when committed slots are empty", () => {
+    it("is compatible when committed fields are empty", () => {
       const proposal = makeProposal({
-        slotSnapshot: { time: t(15, 0), day: "friday" },
+        fieldSnapshot: sf({ time: t(15, 0), day: "friday" }),
       });
 
       const result = deriveProposalCompatibility(
@@ -98,7 +97,7 @@ describe("deriveProposalCompatibility", () => {
 
     it("detects duration change as incompatible", () => {
       const proposal = makeProposal({
-        slotSnapshot: { duration: 30 },
+        fieldSnapshot: sf({ duration: 30 }),
       });
 
       const result = deriveProposalCompatibility(
@@ -116,7 +115,7 @@ describe("deriveProposalCompatibility", () => {
     it("is incompatible when action kind changes from plan to edit", () => {
       const proposal = makeProposal({
         originatingTurnText: "schedule a meeting",
-        slotSnapshot: { time: t(15, 0) },
+        fieldSnapshot: sf({ time: t(15, 0) }),
       });
 
       const result = deriveProposalCompatibility(
@@ -132,7 +131,7 @@ describe("deriveProposalCompatibility", () => {
     it("skips action kind check for clarification answers", () => {
       const proposal = makeProposal({
         originatingTurnText: "move the meeting",
-        slotSnapshot: { time: t(15, 0) },
+        fieldSnapshot: sf({ time: t(15, 0) }),
       });
 
       const result = deriveProposalCompatibility(