fix: use plain targetRefSchema to avoid monorepo type variance

ZodDefault/ZodOptional wrappers create input vs output type
mismatches that surface as "two different types" errors when
ConversationEntity is resolved through multiple package paths.

Use plain targetRefSchema (no wrappers) and require the field
explicitly. Runtime code uses `"parentTargetRef" in entity.data`
to handle pre-migration entities gracefully.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: MaxLinCode

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

@@ -418,7 +418,7 @@ describe("deriveConversationReplyState", () => {
       last_user_mentioned_entity_ids: [],
       last_presented_items: [],
       pending_clarifications: [
-        { id: "clar-old", slot: "scheduleFields.time", question: "What time?", status: "pending", createdAt: "2026-03-22T16:01:00.000Z", createdTurnId: "assistant:1", parentTargetRef: null },
+        { id: "clar-old", slot: "scheduleFields.time", question: "What time?", status: "pending", createdAt: "2026-03-22T16:01:00.000Z", createdTurnId: "assistant:1" },
       ],
       mode: "clarifying",
     };

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

@@ -778,7 +778,7 @@ describe("resolveWriteTarget", () => {
     expect(result.targetEntityId).toBe("task-1");
   });
 
-  it("returns no targetEntityId when parentTargetRef is null (new plan)", () => {
+  it("uses entity's own ID when parentTargetRef is null", () => {
     const result = resolveWriteTarget(
       {
         focus_entity_id: "clar-1",
@@ -808,7 +808,7 @@ describe("resolveWriteTarget", () => {
       "clarification_answer",
     );
 
-    expect(result.targetEntityId).toBeUndefined();
+    expect(result.targetEntityId).toBe("clar-1");
   });
 
   it("attaches resolvedProposalId for non-confirmation turns when single proposal exists", () => {

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

@@ -34,6 +34,16 @@ export type WriteTarget = {
   resolvedProposalId?: string;
 };
 
+/** Extract the parent entity ID from entity kinds that carry a parentTargetRef. */
+function getParentEntityId(entity: ConversationEntity): string | undefined {
+  switch (entity.kind) {
+    case "clarification":
+      return entity.data.parentTargetRef?.entityId;
+    default:
+      return undefined;
+  }
+}
+
 export function resolveWriteTarget(
   discourseState: ConversationDiscourseState | null,
   entityRegistry: ConversationEntity[],
@@ -44,18 +54,15 @@ export function resolveWriteTarget(
     discourseState?.focus_entity_id ?? null,
   ]);
 
-  // Generic parent ref resolution: if the candidate entity has a
-  // parentTargetRef, follow it to the actual write target.
+  // Generic parent ref resolution: if the candidate entity carries a
+  // non-null parentTargetRef, follow it to the actual write target.
+  // A null parentTargetRef means the entity itself is the target.
   if (resolvedEntityIds[0]) {
     const entity = entityRegistry.find((e) => e.id === resolvedEntityIds[0]);
-    if (entity && "parentTargetRef" in entity.data) {
-      const parentId = (
-        entity.data as { parentTargetRef: { entityId: string } | null }
-      ).parentTargetRef?.entityId;
+    if (entity) {
+      const parentId = getParentEntityId(entity);
       if (parentId) {
         resolvedEntityIds[0] = parentId;
-      } else {
-        resolvedEntityIds.shift();
       }
     }
   }

packages/core/src/clarification-schema.test.ts

@@ -28,11 +28,12 @@ describe("clarification parentTargetRef schema", () => {
     expect(entity.data.parentTargetRef).toEqual({ entityId: "task-1" });
   });
 
-  it("defaults parentTargetRef to null when omitted (backward compat)", () => {
-    const entity = conversationClarificationEntitySchema.parse({
-      ...baseClarification,
-      data: { prompt: "What time?", reason: "scheduleFields.time", open: true },
-    });
-    expect(entity.data.parentTargetRef).toBeNull();
+  it("rejects clarification entity without parentTargetRef", () => {
+    expect(() =>
+      conversationClarificationEntitySchema.parse({
+        ...baseClarification,
+        data: { prompt: "What time?", reason: "scheduleFields.time", open: true },
+      }),
+    ).toThrow();
   });
 });

packages/core/src/entity-context.test.ts

@@ -94,6 +94,7 @@ describe("entity context", () => {
             prompt: "What time should I schedule it?",
             reason: null,
             open: true,
+            parentTargetRef: null,
           },
         }),
         buildEntity({
@@ -156,6 +157,7 @@ describe("entity context", () => {
             prompt: "Closed clarification",
             reason: null,
             open: false,
+            parentTargetRef: null,
           },
         }),
       ],

packages/core/src/index.ts

@@ -852,7 +852,7 @@ export const conversationClarificationEntitySchema =
       prompt: z.string().min(1),
       reason: z.string().min(1).nullable(),
       open: z.boolean(),
-      parentTargetRef: targetRefSchema.optional().default(null),
+      parentTargetRef: targetRefSchema,
     }),
   });