Merge pull request #75 from MaxLinCode/claude/phase3-pipeline

Phase 3: Move entity resolution out of classifier

Author: MaxLinCode

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

@@ -24,19 +24,27 @@ const emptyCommit: CommitPolicyOutput = {
 };
 
 function input(
-  classification: Partial<TurnClassifierOutput>,
+  classification: Partial<TurnClassifierOutput> & {
+    resolvedEntityIds?: string[];
+    resolvedProposalId?: string;
+  },
   commitResult: Partial<CommitPolicyOutput>,
   routingContext: DecideTurnPolicyInput["routingContext"],
 ): DecideTurnPolicyInput {
+  const { resolvedEntityIds, resolvedProposalId, ...classificationRest } =
+    classification;
   return {
     classification: {
       turnType: "unknown",
       confidence: 0.5,
-      resolvedEntityIds: [],
-      ...classification,
+      ...classificationRest,
     },
     commitResult: { ...emptyCommit, ...commitResult },
     routingContext,
+    ...(resolvedEntityIds?.[0]
+      ? { targetEntityId: resolvedEntityIds[0] }
+      : {}),
+    ...(resolvedProposalId ? { resolvedProposalId } : {}),
   };
 }
 

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

@@ -14,6 +14,8 @@ export type DecideTurnPolicyInput = {
   classification: TurnClassifierOutput;
   commitResult: CommitPolicyOutput;
   routingContext: TurnRoutingInput;
+  targetEntityId?: string;
+  resolvedProposalId?: string;
 };
 
 type StructuredWriteReadiness =
@@ -36,7 +38,7 @@ export function decideTurnPolicy(
   input: DecideTurnPolicyInput,
 ): TurnPolicyDecision {
   const { classification, commitResult } = input;
-  const targetEntityId = classification.resolvedEntityIds[0];
+  const targetEntityId = input.targetEntityId;
   const ambiguity = deriveAmbiguity({
     classifierConfidence: classification.confidence,
     missingFields: commitResult.missingFields,
@@ -65,7 +67,7 @@ export function decideTurnPolicy(
       };
     case "confirmation": {
       const proposalId =
-        classification.resolvedProposalId ??
+        input.resolvedProposalId ??
         resolveSingleActiveProposalId(
           input.routingContext.entityRegistry ?? [],
         );
@@ -167,7 +169,7 @@ function deriveStructuredWriteReadiness(
     const alreadyConfirmed = entityRegistry.some(
       (e) =>
         e.kind === "proposal_option" &&
-        e.id === classification.resolvedProposalId &&
+        e.id === input.resolvedProposalId &&
         e.status === "confirmed",
     );
 
@@ -181,9 +183,13 @@ function deriveStructuredWriteReadiness(
   }
 
   const consentRequirement = deriveConsentRequirement({
-    classification,
+    resolvedEntityIds: input.targetEntityId ? [input.targetEntityId] : [],
+    ...(input.resolvedProposalId
+      ? { resolvedProposalId: input.resolvedProposalId }
+      : {}),
     entityRegistry: input.routingContext.entityRegistry ?? [],
     resolvedFields: commitResult.resolvedFields,
+    turnType: classification.turnType,
   });
 
   if (consentRequirement.required) {

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

@@ -48,8 +48,6 @@ describe("classifyTurn", () => {
       expect(result).toMatchObject({
         turnType: "confirmation",
         confidence: 0.97,
-        resolvedEntityIds: ["task-1"],
-        resolvedProposalId: "proposal-1",
       });
     });
 
@@ -78,7 +76,7 @@ describe("classifyTurn", () => {
 
       expect(result).toMatchObject({
         turnType: "confirmation",
-        resolvedProposalId: "proposal-1",
+        confidence: 0.97,
       });
     });
 
@@ -242,7 +240,6 @@ describe("classifyTurn", () => {
       expect(result).toMatchObject({
         turnType: "edit_request",
         confidence: 0.88,
-        resolvedEntityIds: ["task-1"],
       });
     });
 
@@ -284,7 +281,7 @@ describe("classifyTurn", () => {
       });
     });
 
-    it("attaches resolvedProposalId when single proposal exists", async () => {
+    it("does not attach resolvedProposalId (entity resolution moved to router)", async () => {
       const client = mockClient({
         turnType: "clarification_answer",
         confidence: 0.88,
@@ -316,7 +313,11 @@ describe("classifyTurn", () => {
         client,
       );
 
-      expect(result.resolvedProposalId).toBe("proposal-1");
+      expect(result).toMatchObject({
+        turnType: "clarification_answer",
+        confidence: 0.88,
+      });
+      expect((result as Record<string, unknown>).resolvedProposalId).toBeUndefined();
     });
 
     it("clamps confidence to 0-1 range", async () => {

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

@@ -1,6 +1,5 @@
 import {
   type ConversationEntity,
-  getActivePendingClarifications,
   type TurnClassifierInput,
   type TurnClassifierOutput,
 } from "@atlas/core";
@@ -14,7 +13,6 @@ export async function classifyTurn(
   client?: OpenAIResponsesClient,
 ): Promise<TurnClassifierOutput> {
   const entityRegistry = input.entityRegistry ?? [];
-  const discourseState = input.discourseState ?? null;
   const normalizedText = input.normalizedText.trim();
   const lower = normalizedText.toLowerCase();
 
@@ -26,11 +24,6 @@ export async function classifyTurn(
       (entity.status === "active" || entity.status === "presented"),
   );
 
-  const resolvedEntityIds = compactResolvedEntityIds([
-    discourseState?.currently_editable_entity_id ?? null,
-    discourseState?.focus_entity_id ?? null,
-  ]);
-
   const singleProposal =
     activeProposals.length === 1 ? activeProposals[0] : null;
 
@@ -39,43 +32,22 @@ export async function classifyTurn(
     return {
       turnType: "confirmation",
       confidence: 0.97,
-      resolvedEntityIds: singleProposal.data.targetEntityId
-        ? [singleProposal.data.targetEntityId]
-        : resolvedEntityIds,
-      resolvedProposalId: singleProposal.id,
     };
   }
 
-  // TEMP: disabled informational fast-exit until routing stabilizes
-  // Fast-exit informational: question lead + no write verbs + no active clarifications
-  // const activeClarifications = discourseState
-  //   ? getActivePendingClarifications(discourseState)
-  //   : [];
-
-  // if (isInformationalTurn(lower) && activeClarifications.length === 0 && !containsWriteVerb(lower)) {
-  //   return {
-  //     turnType: "informational",
-  //     confidence: 0.93,
-  //     resolvedEntityIds
-  //   };
-  // }
-
   // Everything else → LLM
   try {
     const llmResponse = await classifyTurnWithResponses(input, client);
 
     return {
       turnType: llmResponse.turnType,
       confidence: Math.max(0, Math.min(1, llmResponse.confidence)),
-      resolvedEntityIds,
-      ...(singleProposal ? { resolvedProposalId: singleProposal.id } : {}),
     };
   } catch {
     // Degrade gracefully: return unknown with low confidence
     return {
       turnType: "unknown",
       confidence: 0.3,
-      resolvedEntityIds,
     };
   }
 }
@@ -86,20 +58,3 @@ function isPureConfirmationTurn(lower: string) {
   );
 }
 
-function isInformationalTurn(lower: string) {
-  return /^(what|when|where|why|how|who|which|can you explain|tell me)\b/.test(
-    lower,
-  );
-}
-
-function containsWriteVerb(lower: string) {
-  return /\b(schedule|plan|move|reschedule|shift|create|add|book|put|mark|complete|archive|cancel|delete|change|update)\b/.test(
-    lower,
-  );
-}
-
-function compactResolvedEntityIds(entityIds: Array<string | null>) {
-  return Array.from(
-    new Set(entityIds.filter((id): id is string => Boolean(id))),
-  );
-}