fix(tickets): finalize normalization conflict semantics

Author: hack-cli-tests

src/control-plane/extensions/linear/commands.ts

@@ -13,6 +13,7 @@ import { openUrl } from "../../../lib/os.ts";
 import { display } from "../../../ui/display.ts";
 import {
   findTicketRemoteLink,
+  normalizeTicketFieldName,
   projectRemoteLinkToCompatibilityFields,
 } from "../tickets/provenance.ts";
 import {
@@ -2984,7 +2985,7 @@ function detectAuthoritativeFieldConflicts(input: {
   });
   if (localBody !== remoteBody) {
     conflicts.push({
-      field: "body",
+      field: normalizeTicketFieldName("body"),
       authority: input.authority,
       summary: `Authoritative ${authorityLabel} body diverged from the other side.`,
       localValue: localBody,
@@ -3188,7 +3189,7 @@ function buildConflictDedupKey(input: {
   readonly remoteValue?: TicketMetadataValue;
 }): string {
   return [
-    input.field,
+    normalizeTicketFieldName(input.field),
     JSON.stringify(input.localValue ?? null),
     JSON.stringify(input.remoteValue ?? null),
   ].join("|");
@@ -3227,7 +3228,7 @@ function buildLinearConflictIdempotencyKey(input: {
   const fingerprint = createHash("sha256")
     .update(
       JSON.stringify({
-        field: input.conflict.field,
+        field: normalizeTicketFieldName(input.conflict.field),
         authority: input.conflict.authority ?? null,
         summary: input.conflict.summary ?? null,
         localValue: input.conflict.localValue ?? null,
@@ -3812,25 +3813,25 @@ async function syncTicketToLinearIssue(input: {
     return { ok: false, error: recordedConflicts.error };
   }
 
-  const effectiveFields =
-    authority === "linear" && existingIssue.issue
-      ? {
-          ...fields.value,
-          title: existingIssue.issue.title,
-          description: existingIssue.issue.description ?? "",
-          ...(existingIssue.issue.assigneeId
-            ? { assigneeId: existingIssue.issue.assigneeId }
-            : {}),
-          ...(input.syncToggles.statuses
-            ? { stateId: existingIssue.issue.state.id }
-            : {}),
-        }
-      : fields.value;
+  const preserveRemoteIssueFields = authority !== "hack" && existingIssue.issue;
+
+  const effectiveFields = preserveRemoteIssueFields
+    ? {
+        ...fields.value,
+        title: existingIssue.issue.title,
+        description: existingIssue.issue.description ?? "",
+        ...(existingIssue.issue.assigneeId
+          ? { assigneeId: existingIssue.issue.assigneeId }
+          : {}),
+        ...(input.syncToggles.statuses
+          ? { stateId: existingIssue.issue.state.id }
+          : {}),
+      }
+    : fields.value;
 
-  const effectiveProjectId =
-    authority === "linear" && existingIssue.issue
-      ? existingIssue.issue.projectId
-      : target.value.projectId;
+  const effectiveProjectId = preserveRemoteIssueFields
+    ? existingIssue.issue.projectId
+    : target.value.projectId;
 
   const syncedIssue = await upsertLinearIssueForTicketSync({
     runtime: input.runtime,

src/control-plane/extensions/tickets/domain.ts

@@ -1,6 +1,10 @@
-import { buildLegacyDescriptionDocument } from "./documents.ts";
+import {
+  buildLegacyDescriptionDocument,
+  getActiveTicketDescription,
+} from "./documents.ts";
 import {
   buildTicketProvenance,
+  normalizeTicketFieldName,
   projectRemoteLinkToCompatibilityFields,
 } from "./provenance.ts";
 
@@ -200,9 +204,9 @@ export function createNormalizedTicket(input: {
 export function projectNormalizedTicketSummary(input: {
   readonly ticket: NormalizedTicket;
 }): TicketSummaryCompatibility {
-  const description = input.ticket.documents.find(
-    (document) => document.role === "description"
-  );
+  const description = getActiveTicketDescription({
+    documents: input.ticket.documents,
+  });
   const primaryRemote = input.ticket.provenance.remotes[0];
 
   return {
@@ -257,17 +261,31 @@ function buildFieldStates(input: {
   readonly fieldAuthorities: readonly TicketFieldAuthorityEntry[];
   readonly conflicts: readonly TicketSyncConflictCompatibility[];
 }): TicketFieldState[] {
-  return input.fieldAuthorities
-    .filter((fieldAuthority) =>
-      ["title", "status", "assignee", "description"].includes(
-        fieldAuthority.field
-      )
-    )
-    .map((fieldAuthority) => ({
-      field: fieldAuthority.field,
+  const trackedFields = new Map<string, TicketFieldState>();
+
+  for (const fieldAuthority of input.fieldAuthorities) {
+    const field = normalizeTicketFieldName(fieldAuthority.field);
+    if (!["title", "status", "assignee", "description"].includes(field)) {
+      continue;
+    }
+    trackedFields.set(field, {
+      field,
       authority: fieldAuthority.authority,
-      conflictIds: input.conflicts
-        .filter((conflict) => conflict.field === fieldAuthority.field)
-        .map((conflict) => conflict.conflictId),
-    }));
+      conflictIds: [],
+    });
+  }
+
+  for (const conflict of input.conflicts) {
+    const field = normalizeTicketFieldName(conflict.field);
+    const current = trackedFields.get(field);
+    if (!current) {
+      continue;
+    }
+    trackedFields.set(field, {
+      ...current,
+      conflictIds: [...current.conflictIds, conflict.conflictId],
+    });
+  }
+
+  return [...trackedFields.values()];
 }

src/control-plane/extensions/tickets/provenance.ts

@@ -93,6 +93,10 @@ export type TicketFieldVersion = {
   readonly value?: TicketMetadataValue;
 };
 
+export function normalizeTicketFieldName(field: string): string {
+  return field === "body" ? "description" : field;
+}
+
 export function inferTicketSourceSystem(input: {
   readonly ticket: Pick<
     TicketProvenanceCompatibility,
@@ -300,9 +304,10 @@ export function buildTicketFieldAuthorities(input: {
   });
 
   for (const conflict of input.conflicts ?? []) {
-    const current = byField.get(conflict.field);
-    byField.set(conflict.field, {
-      field: conflict.field,
+    const field = normalizeTicketFieldName(conflict.field);
+    const current = byField.get(field);
+    byField.set(field, {
+      field,
       authority: conflict.authority ?? current?.authority ?? defaultAuthority,
     });
   }
@@ -345,17 +350,18 @@ export function buildTicketFieldVersions(input: {
   }
 
   for (const conflict of input.conflicts ?? []) {
+    const field = normalizeTicketFieldName(conflict.field);
     if (conflict.localValue !== undefined) {
       versions.push({
-        field: conflict.field,
+        field,
         source: "local",
         recordedAt: conflict.updatedAt,
         value: conflict.localValue,
       });
     }
     if (conflict.remoteValue !== undefined) {
       versions.push({
-        field: conflict.field,
+        field,
         source: "remote",
         provider: conflict.provider,
         recordedAt: conflict.updatedAt,