Clean up decide turn policy

Author: MaxLinCode

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

@@ -1,10 +1,10 @@
 import {
+  containsWriteVerb,
   deriveAmbiguity,
+  deriveConsentRequirement,
   type CommitPolicyOutput,
-  type ConversationEntity,
   type TurnAmbiguity,
   type TurnClassifierOutput,
-  type TurnInterpretationType,
   type TurnPolicyDecision,
   type TurnRoutingInput
 } from "@atlas/core";
@@ -147,8 +147,6 @@ function deriveStructuredWriteReadiness(
     };
   }
 
-  // Bug 4 fix: if this is a clarification answer and the proposal is already confirmed,
-  // skip re-presenting and go straight to execution
   if (classification.turnType === "clarification_answer") {
     const entityRegistry = input.routingContext.entityRegistry ?? [];
     const alreadyConfirmed = entityRegistry.some(
@@ -166,13 +164,19 @@ function deriveStructuredWriteReadiness(
     }
   }
 
-  const consentRequirement = deriveConsentRequirement(input);
+  const consentRequirement = deriveConsentRequirement({
+    classification,
+    entityRegistry: input.routingContext.entityRegistry ?? [],
+    normalizedText: input.routingContext.normalizedText
+  });
 
   if (consentRequirement.required) {
     return {
       state: "ready_needs_consent",
       reason: consentRequirement.reason,
-      ...(consentRequirement.targetProposalId ? { targetProposalId: consentRequirement.targetProposalId } : {})
+      ...(consentRequirement.required && "targetProposalId" in consentRequirement
+        ? { targetProposalId: consentRequirement.targetProposalId }
+        : {})
     };
   }
 
@@ -226,145 +230,3 @@ function buildPolicyFromStructuredReadiness(
       };
   }
 }
-
-function deriveConsentRequirement(input: DecideTurnPolicyInput) {
-  const { classification } = input;
-  // Bug 2 fix: match "presented" status in addition to "active"
-  const activeProposal = (input.routingContext.entityRegistry ?? []).find(
-    (entity): entity is Extract<ConversationEntity, { kind: "proposal_option" }> =>
-      entity.kind === "proposal_option" &&
-      (entity.status === "active" || entity.status === "presented") &&
-      entity.id === classification.resolvedProposalId &&
-      entity.data.confirmationRequired === true
-  );
-
-  if (!activeProposal) {
-    return {
-      required: false,
-      reason: "Deterministic product rules do not require additional consent."
-    };
-  }
-
-  if (!matchesProposalTarget(activeProposal.data.targetEntityId ?? null, classification.resolvedEntityIds)) {
-    return {
-      required: false,
-      reason: "Deterministic product rules do not require additional consent."
-    };
-  }
-
-  const compatibility = deriveProposalCompatibility(input, activeProposal);
-
-  if (!compatibility.compatible) {
-    return {
-      required: true,
-      reason: compatibility.reason
-    };
-  }
-
-  return {
-    required: true,
-    reason: "Write request is ready, but deterministic product policy still requires user consent.",
-    targetProposalId: activeProposal.id
-  };
-}
-
-function matchesProposalTarget(targetEntityId: string | null, resolvedEntityIds: string[]) {
-  if (!targetEntityId || resolvedEntityIds.length === 0) {
-    return true;
-  }
-
-  return resolvedEntityIds.includes(targetEntityId);
-}
-
-function deriveProposalCompatibility(
-  input: DecideTurnPolicyInput,
-  proposal: Extract<ConversationEntity, { kind: "proposal_option" }>
-) {
-  if (input.classification.turnType === "clarification_answer") {
-    return {
-      compatible: true,
-      reason: "Clarification answers may continue the same consent-required proposal."
-    };
-  }
-
-  const currentActionKind = deriveActionKind(input.routingContext.normalizedText, input.classification.turnType);
-  const proposalActionKind = deriveActionKind(
-    proposal.data.originatingTurnText ?? proposal.data.replyText,
-    inferProposalTurnType(proposal)
-  );
-
-  if (currentActionKind !== proposalActionKind) {
-    return {
-      compatible: false,
-      reason: "The new turn changes the action type, so it needs fresh consent."
-    };
-  }
-
-  const currentFingerprint = deriveParameterFingerprint(input.routingContext.normalizedText);
-  const proposalFingerprint = deriveParameterFingerprint(proposal.data.originatingTurnText ?? proposal.data.replyText);
-
-  if (currentFingerprint.explicit && proposalFingerprint.explicit && currentFingerprint.value !== proposalFingerprint.value) {
-    return {
-      compatible: false,
-      reason: "The new turn changes proposal parameters, so it needs fresh consent."
-    };
-  }
-
-  return {
-    compatible: true,
-    reason: "The pending proposal still matches the current turn."
-  };
-}
-
-function inferProposalTurnType(
-  proposal: Extract<ConversationEntity, { kind: "proposal_option" }>
-): TurnInterpretationType {
-  const source = (proposal.data.originatingTurnText ?? proposal.data.replyText).toLowerCase();
-
-  if (/\b(move|reschedule|shift|push|pull|complete|archive|cancel|delete|update|change|mark)\b/.test(source)) {
-    return "edit_request";
-  }
-
-  return "planning_request";
-}
-
-function deriveActionKind(text: string, turnType: TurnInterpretationType) {
-  if (turnType === "edit_request") {
-    return "edit";
-  }
-
-  if (turnType === "planning_request") {
-    return "plan";
-  }
-
-  const lower = text.toLowerCase();
-
-  if (/\b(move|reschedule|shift|push|pull|complete|archive|cancel|delete|update|change|mark)\b/.test(lower)) {
-    return "edit";
-  }
-
-  return "plan";
-}
-
-function deriveParameterFingerprint(text: string) {
-  const lower = text.toLowerCase();
-  const dayTokens = lower.match(
-    /\b(today|tonight|tomorrow|tmr|monday|tuesday|wednesday|thursday|friday|saturday|sunday|weekend|next week|next month|morning|afternoon|evening)\b/g
-  ) ?? [];
-  const timeTokens =
-    lower.match(/\b\d{1,2}(?::\d{2})?\s?(?:am|pm)?\b|\bnoon\b|\bmidnight\b/g) ?? [];
-  const durationTokens =
-    lower.match(/\bfor\s+\d+\s*(?:minutes?|mins?|hours?|hrs?)\b|\b\d+\s*(?:minutes?|mins?|hours?|hrs?)\b/g) ?? [];
-  const fingerprintParts = [...dayTokens, ...timeTokens, ...durationTokens].map((part) => part.trim()).sort();
-
-  return {
-    explicit: fingerprintParts.length > 0,
-    value: fingerprintParts.join("|")
-  };
-}
-
-function containsWriteVerb(text: string) {
-  return /\b(schedule|plan|move|reschedule|shift|create|add|book|put|mark|complete|archive|cancel|delete|change|update)\b/i.test(
-    text
-  );
-}

packages/core/src/index.ts

@@ -10,6 +10,7 @@ import {
 export * from "./ambiguity";
 export * from "./commit-policy";
 export * from "./discourse-state";
+export * from "./proposal-rules";
 export * from "./slot-normalizer";
 export * from "./telegram";
 

packages/core/src/proposal-rules.ts

@@ -0,0 +1,159 @@
+import type {
+  ConversationEntity,
+  TurnClassifierOutput,
+  TurnInterpretationType
+} from "./index";
+
+type ProposalOption = Extract<ConversationEntity, { kind: "proposal_option" }>;
+
+export type ConsentRequirementInput = {
+  classification: TurnClassifierOutput;
+  entityRegistry: ConversationEntity[];
+  normalizedText: string;
+};
+
+export function deriveConsentRequirement(input: ConsentRequirementInput) {
+  const { classification } = input;
+  const activeProposal = input.entityRegistry.find(
+    (entity): entity is ProposalOption =>
+      entity.kind === "proposal_option" &&
+      (entity.status === "active" || entity.status === "presented") &&
+      entity.id === classification.resolvedProposalId &&
+      entity.data.confirmationRequired === true
+  );
+
+  if (!activeProposal) {
+    return {
+      required: false as const,
+      reason: "Deterministic product rules do not require additional consent."
+    };
+  }
+
+  if (!matchesProposalTarget(activeProposal.data.targetEntityId ?? null, classification.resolvedEntityIds)) {
+    return {
+      required: false as const,
+      reason: "Deterministic product rules do not require additional consent."
+    };
+  }
+
+  const compatibility = deriveProposalCompatibility(
+    classification.turnType,
+    input.normalizedText,
+    activeProposal
+  );
+
+  if (!compatibility.compatible) {
+    return {
+      required: true as const,
+      reason: compatibility.reason
+    };
+  }
+
+  return {
+    required: true as const,
+    reason: "Write request is ready, but deterministic product policy still requires user consent.",
+    targetProposalId: activeProposal.id
+  };
+}
+
+export function matchesProposalTarget(targetEntityId: string | null, resolvedEntityIds: string[]) {
+  if (!targetEntityId || resolvedEntityIds.length === 0) {
+    return true;
+  }
+
+  return resolvedEntityIds.includes(targetEntityId);
+}
+
+export function deriveProposalCompatibility(
+  turnType: TurnInterpretationType,
+  normalizedText: string,
+  proposal: ProposalOption
+) {
+  if (turnType === "clarification_answer") {
+    return {
+      compatible: true,
+      reason: "Clarification answers may continue the same consent-required proposal."
+    };
+  }
+
+  const currentActionKind = deriveActionKind(normalizedText, turnType);
+  const proposalActionKind = deriveActionKind(
+    proposal.data.originatingTurnText ?? proposal.data.replyText,
+    inferProposalTurnType(proposal)
+  );
+
+  if (currentActionKind !== proposalActionKind) {
+    return {
+      compatible: false,
+      reason: "The new turn changes the action type, so it needs fresh consent."
+    };
+  }
+
+  const currentFingerprint = deriveParameterFingerprint(normalizedText);
+  const proposalFingerprint = deriveParameterFingerprint(proposal.data.originatingTurnText ?? proposal.data.replyText);
+
+  if (currentFingerprint.explicit && proposalFingerprint.explicit && currentFingerprint.value !== proposalFingerprint.value) {
+    return {
+      compatible: false,
+      reason: "The new turn changes proposal parameters, so it needs fresh consent."
+    };
+  }
+
+  return {
+    compatible: true,
+    reason: "The pending proposal still matches the current turn."
+  };
+}
+
+export function inferProposalTurnType(
+  proposal: ProposalOption
+): TurnInterpretationType {
+  const source = (proposal.data.originatingTurnText ?? proposal.data.replyText).toLowerCase();
+
+  if (/\b(move|reschedule|shift|push|pull|complete|archive|cancel|delete|update|change|mark)\b/.test(source)) {
+    return "edit_request";
+  }
+
+  return "planning_request";
+}
+
+export function deriveActionKind(text: string, turnType: TurnInterpretationType) {
+  if (turnType === "edit_request") {
+    return "edit";
+  }
+
+  if (turnType === "planning_request") {
+    return "plan";
+  }
+
+  const lower = text.toLowerCase();
+
+  if (/\b(move|reschedule|shift|push|pull|complete|archive|cancel|delete|update|change|mark)\b/.test(lower)) {
+    return "edit";
+  }
+
+  return "plan";
+}
+
+export function deriveParameterFingerprint(text: string) {
+  const lower = text.toLowerCase();
+  const dayTokens = lower.match(
+    /\b(today|tonight|tomorrow|tmr|monday|tuesday|wednesday|thursday|friday|saturday|sunday|weekend|next week|next month|morning|afternoon|evening)\b/g
+  ) ?? [];
+  const timeTokens =
+    lower.match(/\b\d{1,2}(?::\d{2})?\s?(?:am|pm)?\b|\bnoon\b|\bmidnight\b/g) ?? [];
+  const durationTokens =
+    lower.match(/\bfor\s+\d+\s*(?:minutes?|mins?|hours?|hrs?)\b|\b\d+\s*(?:minutes?|mins?|hours?|hrs?)\b/g) ?? [];
+  const fingerprintParts = [...dayTokens, ...timeTokens, ...durationTokens].map((part) => part.trim()).sort();
+
+  return {
+    explicit: fingerprintParts.length > 0,
+    value: fingerprintParts.join("|")
+  };
+}
+
+export function containsWriteVerb(text: string) {
+  return /\b(schedule|plan|move|reschedule|shift|create|add|book|put|mark|complete|archive|cancel|delete|change|update)\b/i.test(
+    text
+  );
+}