Merge pull request #64 from MaxLinCode/claude/fix-slot-override

Claude/fix slot override

Author: MaxLinCode

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

@@ -1,35 +1,41 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type {
+  ConversationEntity,
   InboxPlanningOutput,
   RoutedTurn,
-  TurnPolicyAction,
+  TimeSpec,
   TurnInterpretationType,
-  ConversationEntity,
+  TurnPolicyAction,
 } from "@atlas/core";
+
+function t(hour: number, minute: number): TimeSpec {
+  return { kind: "absolute", hour, minute };
+}
+
 import {
-  getDefaultGoogleCalendarConnectionStore,
   getDefaultFollowUpRuntimeStore,
+  getDefaultGoogleCalendarConnectionStore,
   getDefaultInboxProcessingStore,
-  listPlannerRunsForTests,
-  listScheduleBlocksForTests,
-  listTasksForTests,
   listInboxItemsForTests,
   listIncomingBotEventsForTests,
   listOutgoingBotEventsForTests,
+  listPlannerRunsForTests,
+  listScheduleBlocksForTests,
+  listTasksForTests,
   recordIncomingTelegramMessageIfNew,
   recordOutgoingTelegramMessageIfNew,
   resetConversationStateStoreForTests,
   resetGoogleCalendarConnectionStoreForTests,
   resetInboxProcessingStoreForTests,
   resetIncomingTelegramIngressStoreForTests,
-  seedInboxItemForProcessingTests,
   saveConversationState,
+  seedInboxItemForProcessingTests,
   updateOutgoingTelegramMessage,
 } from "@atlas/db";
 import {
   getDefaultCalendarAdapter,
   resetCalendarAdapterForTests,
 } from "@atlas/integrations";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { handleTelegramWebhook } from "@/lib/server/telegram-webhook";
 
@@ -149,7 +155,7 @@ function buildRoutedTurn(input: {
   confidence?: number;
   ambiguity?: "none" | "low" | "high";
   resolvedProposalId?: string;
-  committedSlots?: Record<string, string | number>;
+  committedSlots?: Record<string, string | number | TimeSpec>;
 }): RoutedTurn {
   return {
     interpretation: {
@@ -361,7 +367,7 @@ beforeEach(async () => {
   recoverConfirmedMutationWithResponsesMock.mockReset();
   extractSlotsWithResponsesMock.mockReset();
   extractSlotsWithResponsesMock.mockResolvedValue({
-    time: { hour: 9, minute: 0 },
+    time: { kind: "absolute", hour: 9, minute: 0 },
     day: { kind: "relative", value: "tomorrow" },
     duration: null,
     target: null,
@@ -973,7 +979,7 @@ describe("telegram webhook route", () => {
   it("does not keep clear scheduling requests in discuss-first mode", async () => {
     process.env.TELEGRAM_WEBHOOK_SECRET = "test-webhook-secret";
     extractSlotsWithResponsesMock.mockResolvedValueOnce({
-      time: { hour: 18, minute: 0 },
+      time: { kind: "absolute", hour: 18, minute: 0 },
       day: { kind: "relative", value: "tomorrow" },
       duration: { minutes: 60 },
       target: null,
@@ -1104,7 +1110,7 @@ describe("telegram webhook route", () => {
             turnType: "confirmation",
             action: "recover_and_execute",
             resolvedProposalId: "proposal-1",
-            committedSlots: { time: "15:00" },
+            committedSlots: { time: t(15, 0) },
           }),
       },
     );

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

@@ -1,6 +1,10 @@
-import { describe, expect, it } from "vitest";
-import type { ConversationStateSnapshot } from "@atlas/core";
+import type { ConversationStateSnapshot, TimeSpec } from "@atlas/core";
 import type { ProcessedInboxResult } from "@atlas/db";
+import { describe, expect, it } from "vitest";
+
+function t(hour: number, minute: number): TimeSpec {
+  return { kind: "absolute", hour, minute };
+}
 
 import {
   deriveConversationReplyState,
@@ -290,7 +294,7 @@ describe("deriveConversationReplyState", () => {
       snapshot,
       policy: {
         action: "present_proposal",
-        committedSlots: { day: "tomorrow", time: "17:00" },
+        committedSlots: { day: "tomorrow", time: t(17, 0) },
       },
       interpretation: {
         turnType: "clarification_answer",
@@ -428,7 +432,7 @@ describe("deriveMutationState", () => {
     const snapshot = buildSnapshot();
     snapshot.discourseState = {
       ...snapshot.discourseState!,
-      resolved_slots: { day: "tomorrow", time: "17:00" },
+      resolved_slots: { day: "tomorrow", time: t(17, 0) },
       pending_write_contract: {
         requiredSlots: ["day", "time"],
         intentKind: "plan",

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

@@ -1,10 +1,17 @@
+import type {
+  CommitPolicyOutput,
+  TimeSpec,
+  TurnClassifierOutput,
+} from "@atlas/core";
 import { describe, expect, it } from "vitest";
 
-import type { CommitPolicyOutput, TurnClassifierOutput } from "@atlas/core";
+function t(hour: number, minute: number): TimeSpec {
+  return { kind: "absolute", hour, minute };
+}
 
 import {
-  decideTurnPolicy,
   type DecideTurnPolicyInput,
+  decideTurnPolicy,
 } from "./decide-turn-policy";
 
 const emptyCommit: CommitPolicyOutput = {
@@ -89,7 +96,7 @@ describe("decideTurnPolicy", () => {
       decideTurnPolicy(
         input(
           { turnType: "planning_request", confidence: 0.68 },
-          { committedSlots: { day: "tomorrow", time: "18:00" } },
+          { committedSlots: { day: "tomorrow", time: t(18, 0) } },
           {
             rawText: "Schedule gym tomorrow at 6pm",
             normalizedText: "Schedule gym tomorrow at 6pm",
@@ -318,7 +325,7 @@ describe("decideTurnPolicy", () => {
           resolvedEntityIds: ["task-1"],
           resolvedProposalId: "proposal-1",
         },
-        { committedSlots: { time: "15:00", day: "tomorrow" } },
+        { committedSlots: { time: t(15, 0), day: "tomorrow" } },
         {
           rawText: "make it 3 instead",
           normalizedText: "make it 3 instead",
@@ -338,7 +345,7 @@ describe("decideTurnPolicy", () => {
                 confirmationRequired: true,
                 targetEntityId: "task-1",
                 originatingTurnText: "move it to tomorrow 2pm",
-                slotSnapshot: { time: "14:00", day: "tomorrow" },
+                slotSnapshot: { time: t(14, 0), day: "tomorrow" },
               },
             },
           ],
@@ -492,7 +499,7 @@ describe("decideTurnPolicy", () => {
           confidence: 0.9,
           resolvedEntityIds: ["task-1"],
         },
-        { committedSlots: { day: "tomorrow", time: "17:00" } },
+        { committedSlots: { day: "tomorrow", time: t(17, 0) } },
         {
           rawText: "ok but make it 5pm",
           normalizedText: "ok but make it 5pm",
@@ -511,7 +518,7 @@ describe("decideTurnPolicy", () => {
                 replyText: "Would you like me to schedule it tomorrow at 3pm?",
                 confirmationRequired: true,
                 targetEntityId: "task-1",
-                slotSnapshot: { day: "tomorrow", time: "15:00" },
+                slotSnapshot: { day: "tomorrow", time: t(15, 0) },
               },
             },
           ],
@@ -554,7 +561,7 @@ describe("decideTurnPolicy", () => {
                   route: "conversation_then_mutation",
                   replyText: "Would you like me to schedule it at 3pm?",
                   confirmationRequired: true,
-                  slotSnapshot: { time: "15:00" },
+                  slotSnapshot: { time: t(15, 0) },
                 },
               },
             ],
@@ -568,7 +575,7 @@ describe("decideTurnPolicy", () => {
   });
 
   it("returns committedSlots on every policy decision", () => {
-    const slots = { day: "tomorrow", time: "17:00" };
+    const slots = { day: "tomorrow", time: t(17, 0) };
     const result = decideTurnPolicy(
       input(
         { turnType: "planning_request", confidence: 0.95 },

apps/web/src/lib/server/slot-extractor.test.ts

@@ -1,6 +1,13 @@
+import type {
+  RawSlotExtraction,
+  SlotExtractorInput,
+  TimeSpec,
+} from "@atlas/core";
 import { describe, expect, it, vi } from "vitest";
 
-import type { RawSlotExtraction, SlotExtractorInput } from "@atlas/core";
+function t(hour: number, minute: number): TimeSpec {
+  return { kind: "absolute", hour, minute };
+}
 
 import { extractSlots } from "./slot-extractor";
 
@@ -38,14 +45,14 @@ const baseInput: SlotExtractorInput = {
 describe("extractSlots", () => {
   it("normalizes a successful time extraction", async () => {
     const client = mockClient({
-      time: { hour: 17, minute: 0 },
+      time: { kind: "absolute", hour: 17, minute: 0 },
       confidence: { time: 0.9 },
       unresolvable: [],
     });
 
     const result = await extractSlots(baseInput, client);
 
-    expect(result.extractedValues).toEqual({ time: "17:00" });
+    expect(result.extractedValues).toEqual({ time: t(17, 0) });
     expect(result.confidence).toEqual({ time: 0.9 });
     expect(result.unresolvable).toEqual([]);
   });
@@ -64,7 +71,7 @@ describe("extractSlots", () => {
 
   it("handles multiple slots", async () => {
     const client = mockClient({
-      time: { hour: 14, minute: 30 },
+      time: { kind: "absolute", hour: 14, minute: 30 },
       day: { kind: "relative", value: "Tomorrow" },
       confidence: { time: 0.95, day: 0.92 },
       unresolvable: [],
@@ -78,7 +85,10 @@ describe("extractSlots", () => {
 
     const result = await extractSlots(input, client);
 
-    expect(result.extractedValues).toEqual({ time: "14:30", day: "tomorrow" });
+    expect(result.extractedValues).toEqual({
+      time: t(14, 30),
+      day: "tomorrow",
+    });
   });
 
   it("degrades gracefully on LLM failure", async () => {
@@ -111,7 +121,7 @@ describe("extractSlots", () => {
 
   it("passes conversation context to the client", async () => {
     const client = mockClient({
-      time: { hour: 9, minute: 30 },
+      time: { kind: "absolute", hour: 9, minute: 30 },
       confidence: { time: 0.88 },
       unresolvable: [],
     });
@@ -125,7 +135,7 @@ describe("extractSlots", () => {
 
     const result = await extractSlots(input, client);
 
-    expect(result.extractedValues).toEqual({ time: "09:30" });
+    expect(result.extractedValues).toEqual({ time: t(9, 30) });
     expect(client.responses.parse).toHaveBeenCalledOnce();
   });
 });

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

@@ -1,8 +1,11 @@
+import type { TimeSpec, TurnClassifierOutput } from "@atlas/core";
 import { describe, expect, it, vi } from "vitest";
 
-import type { TurnClassifierOutput } from "@atlas/core";
+function t(hour: number, minute: number): TimeSpec {
+  return { kind: "absolute", hour, minute };
+}
 
-import { routeMessageTurn, containsModificationPayload } from "./turn-router";
+import { containsModificationPayload, routeMessageTurn } from "./turn-router";
 
 vi.mock("./llm-classifier", () => ({
   classifyTurn: vi.fn(),
@@ -39,7 +42,7 @@ describe("turn router", () => {
       confidence: 0.95,
     });
     mockExtractSlots.mockResolvedValueOnce({
-      extractedValues: { day: "tomorrow", time: "18:00" },
+      extractedValues: { day: "tomorrow", time: t(18, 0) },
       confidence: { day: 0.95, time: 0.95 },
       unresolvable: [],
     });
@@ -186,7 +189,7 @@ describe("turn router", () => {
       confidence: 0.95,
     });
     mockExtractSlots.mockResolvedValueOnce({
-      extractedValues: { day: "tomorrow", time: "18:00" },
+      extractedValues: { day: "tomorrow", time: t(18, 0) },
       confidence: { day: 0.95, time: 0.95 },
       unresolvable: [],
     });
@@ -214,7 +217,7 @@ describe("turn router", () => {
       confidence: 0.9,
     });
     mockExtractSlots.mockResolvedValueOnce({
-      extractedValues: { time: "17:00" },
+      extractedValues: { time: t(17, 0) },
       confidence: { time: 0.92 },
       unresolvable: [],
     });
@@ -243,7 +246,7 @@ describe("turn router", () => {
       confidence: 0.9,
     });
     mockExtractSlots.mockResolvedValueOnce({
-      extractedValues: { time: "17:00" },
+      extractedValues: { time: t(17, 0) },
       confidence: { time: 0.92 },
       unresolvable: [],
     });
@@ -267,7 +270,7 @@ describe("turn router", () => {
       resolvedProposalId: "proposal-1",
     });
     mockExtractSlots.mockResolvedValueOnce({
-      extractedValues: { time: "17:00" },
+      extractedValues: { time: t(17, 0) },
       confidence: { time: 0.92 },
       unresolvable: [],
     });