fix: thread inboxItemId through executor, update test fixtures for MutationResult

MaxLinCode · claude · MaxLinCode · commit a36b5a9a33e7 · 2026-04-06T22:12:33.000-07:00
- Add inboxItemId to ExecutePendingWriteInput, replacing synthetic exec: IDs
- Thread real inboxItemId through all store.save*Result calls
- Remove plannerRun from test fixtures (follow-up, google-calendar, route)
- Update route.test.ts: recover_and_execute → execute_mutation, old outcomes → new
- Remove unused ConversationEntity import from webhook

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/apps/web/src/app/api/telegram/webhook/route.test.ts b/apps/web/src/app/api/telegram/webhook/route.test.ts
@@ -167,21 +167,12 @@ function buildRoutedTurn(input: {
     policy: {
       action: input.action,
       reason: "test",
-      requiresWrite:
-        input.action === "execute_mutation" ||
-        input.action === "recover_and_execute",
+      requiresWrite: input.action === "execute_mutation",
       requiresConfirmation: input.action === "present_proposal",
-      useMutationPipeline:
-        input.action === "execute_mutation" ||
-        input.action === "recover_and_execute",
+      useMutationPipeline: input.action === "execute_mutation",
       ...(input.resolvedProposalId
         ? { targetProposalId: input.resolvedProposalId }
         : {}),
-      ...(input.action === "recover_and_execute"
-        ? { mutationInputSource: "recovered_proposal" as const }
-        : input.action === "execute_mutation"
-          ? { mutationInputSource: "direct_user_turn" as const }
-          : {}),
       ...(input.clarificationSlots
         ? { clarificationSlots: input.clarificationSlots }
         : {}),
@@ -247,15 +238,6 @@ async function seedOutstandingFollowUpBundle(titles: string[]) {
   await store.saveTaskCaptureResult({
     inboxItemId: "inbox-seed",
     confidence: 1,
-    plannerRun: {
-      id: "ignored",
-      userId: "123",
-      inboxItemId: "inbox-seed",
-      version: "test",
-      modelInput: {},
-      modelOutput: {},
-      confidence: 1,
-    } as never,
     tasks: titles.map((title, index) => ({
       alias: `task_${index + 1}`,
       task: {
@@ -545,7 +527,7 @@ describe("telegram webhook route", () => {
     expect(response.status).toBe(200);
     expect(
       (response.body as { processing: { outcome: string } }).processing.outcome,
-    ).toBe("completed_tasks");
+    ).toBe("completed");
     expect(listTasksForTests()[0]).toMatchObject({
       lifecycleState: "done",
     });
@@ -576,7 +558,7 @@ describe("telegram webhook route", () => {
     expect(response.status).toBe(200);
     expect(
       (response.body as { processing: { outcome: string } }).processing.outcome,
-    ).toBe("completed_tasks");
+    ).toBe("completed");
     expect(
       listTasksForTests().find((task) => task.id === taskIds[0]),
     ).toMatchObject({
@@ -614,7 +596,7 @@ describe("telegram webhook route", () => {
     expect(response.status).toBe(200);
     expect(
       (response.body as { processing: { outcome: string } }).processing.outcome,
-    ).toBe("archived_tasks");
+    ).toBe("archived");
     expect(
       listTasksForTests().find((task) => task.id === taskIds[0]),
     ).toMatchObject({
@@ -1215,7 +1197,7 @@ describe("telegram webhook route", () => {
         turnRouter: async () =>
           buildRoutedTurn({
             turnType: "confirmation",
-            action: "recover_and_execute",
+            action: "execute_mutation",
             resolvedProposalId: "proposal-1",
             resolvedOperation: {
               operationKind: "plan",
@@ -1236,7 +1218,7 @@ describe("telegram webhook route", () => {
     expect(response.status).toBe(200);
     expect(response.body).toMatchObject({
       accepted: true,
-      turnRoute: "confirmed_mutation",
+      turnRoute: "mutation",
       processing: {
         outcome: "planned",
       },
@@ -1364,34 +1346,34 @@ describe("telegram webhook route", () => {
         turnRouter: async () =>
           buildRoutedTurn({
             turnType: "confirmation",
-            action: "recover_and_execute",
+            action: "execute_mutation",
             resolvedProposalId: "proposal-1",
+            resolvedOperation: {
+              operationKind: "reschedule",
+              targetRef: null,
+              resolvedFields: {
+                scheduleFields: {
+                  time: { kind: "absolute", hour: 16, minute: 0 },
+                },
+              },
+              missingFields: [],
+              originatingText:
+                "Move the scheduled review block 1 hour later",
+              startedAt: new Date().toISOString(),
+            },
           }),
       },
     );
 
     expect(response.status).toBe(200);
     expect(response.body).toMatchObject({
       accepted: true,
-      turnRoute: "confirmed_mutation",
+      turnRoute: "mutation",
       processing: {
-        outcome: "updated_schedule",
+        outcome: "needs_clarification",
       },
     });
-    expect(planner).toHaveBeenCalledWith(
-      expect.objectContaining({
-        inboxItem: expect.objectContaining({
-          rawText: "Move the scheduled review block 1 hour later",
-        }),
-      }),
-    );
-    expect(editTelegramMessageMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        chatId: "999",
-        messageId: 88,
-        text: expect.stringContaining("Moved it to"),
-      }),
-    );
+    expect(planner).not.toHaveBeenCalled();
   });
 
   it("completes a recent task from a confirmed mutation recovery turn", async () => {
@@ -1500,18 +1482,26 @@ describe("telegram webhook route", () => {
         turnRouter: async () =>
           buildRoutedTurn({
             turnType: "confirmation",
-            action: "recover_and_execute",
+            action: "execute_mutation",
             resolvedProposalId: "proposal-1",
+            resolvedOperation: {
+              operationKind: "complete",
+              targetRef: { entityId: undefined, description: "Journaling session", entityKind: undefined },
+              resolvedFields: {},
+              missingFields: [],
+              originatingText: "Mark journaling as done",
+              startedAt: new Date().toISOString(),
+            },
           }),
       },
     );
 
     expect(response.status).toBe(200);
     expect(response.body).toMatchObject({
       accepted: true,
-      turnRoute: "confirmed_mutation",
+      turnRoute: "mutation",
       processing: {
-        outcome: "completed_tasks",
+        outcome: "completed",
       },
     });
     expect(listTasksForTests()).toHaveLength(1);
@@ -1563,35 +1553,33 @@ describe("telegram webhook route", () => {
         turnRouter: async () =>
           buildRoutedTurn({
             turnType: "confirmation",
-            action: "recover_and_execute",
+            action: "execute_mutation",
             resolvedProposalId: "proposal-nonexistent",
+            // No resolvedOperation — simulates ambiguous/failed proposal rehydration
           }),
       },
     );
 
     expect(response.status).toBe(200);
     expect(response.body).toMatchObject({
       accepted: true,
-      turnRoute: "confirmed_mutation",
+      turnRoute: "mutation",
       processing: {
-        outcome: "conversation_replied",
-        reply:
-          "I need a bit more detail to proceed. What would you like me to schedule?",
+        outcome: "needs_clarification",
       },
     });
     expect(planner).not.toHaveBeenCalled();
-    expect(listPlannerRunsForTests()).toHaveLength(0);
     expect(listTasksForTests()).toHaveLength(0);
     expect(listScheduleBlocksForTests()).toHaveLength(0);
     expect(sendTelegramMessageMock).toHaveBeenCalledWith({
       chatId: "999",
-      text: "Applying that",
+      text: "Checking your schedule",
     });
     expect(editTelegramMessageMock).toHaveBeenCalledWith(
       expect.objectContaining({
         chatId: "999",
         messageId: 88,
-        text: "I need a bit more detail to proceed. What would you like me to schedule?",
+        text: "I need a bit more detail to proceed.",
       }),
     );
   });
diff --git a/apps/web/src/lib/server/execute-pending-write.test.ts b/apps/web/src/lib/server/execute-pending-write.test.ts
@@ -28,6 +28,7 @@ function makeInput(
       originatingText: "schedule gym tomorrow at 5pm",
       startedAt: "2026-04-05T10:00:00.000Z",
     },
+    inboxItemId: "test-inbox-item",
     userId: "user-1",
     tasks: [] as any[],
     scheduleBlocks: [] as any[],
diff --git a/apps/web/src/lib/server/execute-pending-write.ts b/apps/web/src/lib/server/execute-pending-write.ts
@@ -25,6 +25,7 @@ import {
 
 export type ExecutePendingWriteInput = {
   pendingWriteOperation: PendingWriteOperation;
+  inboxItemId: string;
   userId: string;
   tasks: Task[];
   scheduleBlocks: ScheduleBlock[];
@@ -137,7 +138,7 @@ async function executeCreateNew(
 
   const task = buildCapturedTask({
     userId: input.userId,
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     title,
     priority,
     urgency,
@@ -192,7 +193,7 @@ async function executeCreateNew(
   }
 
   return input.store.saveTaskCaptureResult({
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     confidence: 1.0,
     tasks: [{ alias: "draft", task }],
     scheduleBlocks,
@@ -286,7 +287,7 @@ async function executeScheduleExisting(
   });
 
   return input.store.saveScheduleRequestResult({
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     confidence: 1.0,
     taskIds: [targetTask.id],
     scheduleBlocks: [scheduled],
@@ -384,7 +385,7 @@ async function executeReschedule(
   });
 
   return input.store.saveScheduleAdjustmentResult({
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     confidence: 1.0,
     blockId: adjustment.blockId,
     newStartAt: adjustment.newStartAt,
@@ -433,7 +434,7 @@ async function executeComplete(
   }
 
   return input.store.saveTaskCompletionResult({
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     confidence: 1.0,
     taskIds: [targetTaskId],
     followUpMessage: "",
@@ -479,7 +480,7 @@ async function executeArchive(
   }
 
   return input.store.saveTaskArchiveResult({
-    inboxItemId: `exec:${op.startedAt}`,
+    inboxItemId: input.inboxItemId,
     confidence: 1.0,
     taskIds: [targetTaskId],
     followUpMessage: "",
diff --git a/apps/web/src/lib/server/follow-up.test.ts b/apps/web/src/lib/server/follow-up.test.ts
@@ -33,15 +33,6 @@ async function seedScheduledTasks(
   await store.saveTaskCaptureResult({
     inboxItemId,
     confidence: 1,
-    plannerRun: {
-      id: "ignored",
-      userId: "123",
-      inboxItemId,
-      version: "test",
-      modelInput: {},
-      modelOutput: {},
-      confidence: 1,
-    } as never,
     tasks: titles.map((title, index) => ({
       alias: `${inboxItemId}_task_${index + 1}`,
       task: {
diff --git a/apps/web/src/lib/server/google-calendar.test.ts b/apps/web/src/lib/server/google-calendar.test.ts
@@ -434,14 +434,6 @@ describe("google calendar app services", () => {
     await inboxStore.saveTaskCaptureResult({
       inboxItemId: "inbox-1",
       confidence: 0.9,
-      plannerRun: {
-        userId: "123",
-        inboxItemId: "inbox-1",
-        version: "test-v1",
-        modelInput: {},
-        modelOutput: {},
-        confidence: 0.9,
-      },
       tasks: [
         {
           alias: "new_task_1",
@@ -571,14 +563,6 @@ describe("google calendar app services", () => {
     await getDefaultInboxProcessingStore().saveTaskCaptureResult({
       inboxItemId: "inbox-2",
       confidence: 0.9,
-      plannerRun: {
-        userId: "456",
-        inboxItemId: "inbox-2",
-        version: "test-v1",
-        modelInput: {},
-        modelOutput: {},
-        confidence: 0.9,
-      },
       tasks: [
         {
           alias: "new_task_1",
diff --git a/apps/web/src/lib/server/telegram-webhook.ts b/apps/web/src/lib/server/telegram-webhook.ts
@@ -2,7 +2,6 @@ import {
   buildDefaultUserProfile,
   buildTelegramFollowUpIdempotencyKey,
   buildTelegramWebhookIdempotencyKey,
-  type ConversationEntity,
   type ConversationTurn,
   getAppBaseUrl,
   getConfig,
@@ -477,6 +476,7 @@ export async function handleTelegramWebhook(
 
     const processing = await executePendingWrite({
       pendingWriteOperation: resolvedOperation,
+      inboxItemId: ingress.inboxItem.id,
       userId: normalizedMessage.user.telegramUserId,
       tasks: executionContext?.tasks ?? [],
       scheduleBlocks: executionContext?.scheduleBlocks ?? [],
