Remove disabmiguation clause check

Author: JasonYeMSFT

scripts/src/frontmatter/__tests__/frontmatter.test.ts

@@ -19,8 +19,6 @@ import {
   extractTriggerPhrases,
   hasDoNotUseForClause,
   hasPreferOverClause,
-  isDisambiguationClauseRemoved,
-  buildDisambiguationRemovalIssues,
   validateTriggerOverlapDisambiguation,
   validateSkillFile,
 } from "../cli.js";
@@ -583,39 +581,6 @@ describe("Frontmatter Spec Validator", () => {
 
       expect(issues).toEqual([]);
     });
-
-    it("detects disambiguation clause removal", () => {
-      expect(
-        isDisambiguationClauseRemoved(
-          "PREFER OVER azure-prepare when copilot sdk markers exist.",
-          "WHEN: deploy to Azure, copilot sdk",
-        ),
-      ).toBe(true);
-
-      expect(
-        isDisambiguationClauseRemoved(
-          "DO NOT USE FOR: generic web apps",
-          "DO NOT USE FOR: generic web apps",
-        ),
-      ).toBe(false);
-    });
-
-    it("emits error issue when disambiguation clause is removed", () => {
-      const issues = buildDisambiguationRemovalIssues(
-        "DO NOT USE FOR: generic web apps",
-        "WHEN: deploy to Azure",
-      );
-      expect(issues).toHaveLength(1);
-      expect(issues[0].check).toBe("disambiguation-removal");
-      expect(issues[0].severity).toBe("error");
-      expect(issues[0].message).toContain("DO NOT USE FOR");
-      expect(issues[0].message).toContain("Re-add");
-    });
-
-    it("emits no warning issue when previous description is unavailable", () => {
-      const issues = buildDisambiguationRemovalIssues(null, "WHEN: deploy to Azure");
-      expect(issues).toEqual([]);
-    });
   });
 
   // ── validateSkillFile (integration) ──────────────────────────────────────

scripts/src/frontmatter/cli.ts

@@ -542,19 +542,6 @@ export function validateTriggerOverlapDisambiguation(
   return issues;
 }
 
-function validateDisambiguationRemoval(skill: SkillRoutingContext, mergeBaseRef: string | null): ValidationIssue[] {
-  if (mergeBaseRef === null) return [];
-
-  const previousDescription = getDescriptionFromGitRef(skill.file, mergeBaseRef);
-  return buildDisambiguationRemovalIssues(previousDescription, skill.description);
-}
-
-export function isDisambiguationClauseRemoved(previousDescription: string | null, currentDescription: string | null): boolean {
-  const previousHasDisambiguation = hasDoNotUseForClause(previousDescription) || hasAnyPreferOverClause(previousDescription);
-  const currentHasDisambiguation = hasDoNotUseForClause(currentDescription) || hasAnyPreferOverClause(currentDescription);
-  return previousHasDisambiguation && !currentHasDisambiguation;
-}
-
 function getRemovedDisambiguationClauses(previousDescription: string | null, currentDescription: string | null): string[] {
   const removed: string[] = [];
   if (hasDoNotUseForClause(previousDescription) && !hasDoNotUseForClause(currentDescription)) {
@@ -566,22 +553,6 @@ function getRemovedDisambiguationClauses(previousDescription: string | null, cur
   return removed;
 }
 
-export function buildDisambiguationRemovalIssues(
-  previousDescription: string | null,
-  currentDescription: string | null,
-): ValidationIssue[] {
-  if (previousDescription === null) return [];
-  if (!isDisambiguationClauseRemoved(previousDescription, currentDescription)) return [];
-  const removedClauses = getRemovedDisambiguationClauses(previousDescription, currentDescription);
-  const clauseLabel = removedClauses.length === 1 ? removedClauses[0] : removedClauses.join(" and ");
-  const clauseWord = removedClauses.length === 1 ? "clause" : "clauses";
-  return [{
-    check: "disambiguation-removal",
-    severity: "error",
-    message: `Removed disambiguation ${clauseWord}: ${clauseLabel}. Re-add a DO NOT USE FOR or PREFER OVER clause if trigger overlap still exists.`,
-  }];
-}
-
 // ── Validate a single SKILL.md ──────────────────────────────────────────────
 
 export function validateSkillFile(filePath: string): ValidationResult {
@@ -797,7 +768,6 @@ function main(): void {
     const routingContext = routingContextByName.get(result.skill);
     if (routingContext) {
       result.issues.push(...validateTriggerOverlapDisambiguation(routingContext, routingContexts));
-      result.issues.push(...validateDisambiguationRemoval(routingContext, mergeBaseRef));
     }
     results.push(result);
   }