fix(integrations): preserve rapid legitimate edits

apps/api/src/plugins/gitea/events/task-description-changed.ts

@@ -1,3 +1,6 @@
+import db from "../../../database";
+import { linkedTaskScope } from "../../github/services/integration-task-scope";
+import { outboundStamp } from "../../github/utils/sync-echo";
 import {
   findExternalLinksByTask,
   updateExternalLink,
@@ -7,11 +10,7 @@ import type { PluginContext, TaskDescriptionChangedEvent } from "../../types";
 import type { GiteaConfig } from "../config";
 import { createGiteaClient } from "../utils/gitea-api";
 
-type LinkSyncState = {
-  timestamp: string;
-  source: string;
-  value: string;
-};
+type LinkSyncState = import("../../github/utils/sync-echo").SyncStamp;
 
 type LinkMetadata = {
   lastSync?: {
@@ -32,6 +31,16 @@ export async function handleTaskDescriptionChanged(
   const { repositoryOwner, repositoryName } = config;
 
   try {
+    const current = await db.query.taskTable.findFirst({
+      where: linkedTaskScope(event.taskId, context.projectId),
+      columns: { description: true },
+    });
+    if (
+      !current ||
+      (current.description || "") !== (event.newDescription || "")
+    )
+      return;
+
     const links = await findExternalLinksByTask(event.taskId);
     const issueLink = links.find(
       (link) =>
@@ -71,19 +80,6 @@ export async function handleTaskDescriptionChanged(
         console.log("Skipping description sync - already synced from Gitea");
         return;
       }
-
-      const timeSinceLastSync =
-        Date.now() - new Date(lastDescSync.timestamp).getTime();
-      if (
-        timeSinceLastSync < 2000 &&
-        lastDescSync.source === "gitea" &&
-        newDescNormalized === lastDescSync.value
-      ) {
-        console.log(
-          `Skipping description sync - recent sync detected (${timeSinceLastSync}ms ago)`,
-        );
-        return;
-      }
     }
 
     const client = createGiteaClient(config);
@@ -99,20 +95,25 @@ export async function handleTaskDescriptionChanged(
 
     const formattedBody = formatIssueBody(event.newDescription, event.taskId);
 
-    await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
-      body: formattedBody,
-    });
+    const response = await client.updateIssue(
+      repositoryOwner,
+      repositoryName,
+      issueNumber,
+      {
+        body: formattedBody,
+      },
+    );
 
     await updateExternalLink(issueLink.id, {
       metadata: {
         ...metadata,
         lastSync: {
           ...metadata.lastSync,
-          description: {
-            timestamp: new Date().toISOString(),
-            source: "kaneo",
-            value: newDescNormalized,
-          },
+          description: outboundStamp(
+            metadata.lastSync?.description,
+            newDescNormalized,
+            response?.updated_at,
+          ),
         },
       },
     });

apps/api/src/plugins/gitea/events/task-status-changed.ts

@@ -1,3 +1,4 @@
+import { outboundStamp } from "../../github/utils/sync-echo";
 import {
   findExternalLinksByTask,
   updateExternalLink,
@@ -30,6 +31,7 @@ export async function handleTaskStatusChanged(
       return;
     }
 
+    const metadata = issueLink.metadata ? JSON.parse(issueLink.metadata) : {};
     const client = createGiteaClient(config);
     const issueNumber = Number.parseInt(issueLink.externalId, 10);
 
@@ -40,26 +42,52 @@ export async function handleTaskStatusChanged(
     ]);
 
     if (event.newStatus === "done") {
-      await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
-        state: "closed",
-      });
+      const response = await client.updateIssue(
+        repositoryOwner,
+        repositoryName,
+        issueNumber,
+        {
+          state: "closed",
+        },
+      );
 
       await updateExternalLink(issueLink.id, {
         metadata: {
           ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
           state: "closed",
+          lastSync: {
+            ...metadata.lastSync,
+            state: outboundStamp(
+              metadata.lastSync?.state,
+              "closed",
+              response?.updated_at,
+            ),
+          },
           lastOutboundStateSyncAt: Date.now(),
         },
       });
     } else if (event.oldStatus === "done" && event.newStatus !== "done") {
-      await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
-        state: "open",
-      });
+      const response = await client.updateIssue(
+        repositoryOwner,
+        repositoryName,
+        issueNumber,
+        {
+          state: "open",
+        },
+      );
 
       await updateExternalLink(issueLink.id, {
         metadata: {
           ...(issueLink.metadata ? JSON.parse(issueLink.metadata) : {}),
           state: "open",
+          lastSync: {
+            ...metadata.lastSync,
+            state: outboundStamp(
+              metadata.lastSync?.state,
+              "open",
+              response?.updated_at,
+            ),
+          },
           lastOutboundStateSyncAt: Date.now(),
         },
       });

apps/api/src/plugins/gitea/events/task-title-changed.ts

@@ -1,3 +1,6 @@
+import db from "../../../database";
+import { linkedTaskScope } from "../../github/services/integration-task-scope";
+import { outboundStamp } from "../../github/utils/sync-echo";
 import {
   findExternalLinksByTask,
   updateExternalLink,
@@ -6,11 +9,7 @@ import type { PluginContext, TaskTitleChangedEvent } from "../../types";
 import type { GiteaConfig } from "../config";
 import { createGiteaClient } from "../utils/gitea-api";
 
-type LinkSyncState = {
-  timestamp: string;
-  source: string;
-  value: string;
-};
+type LinkSyncState = import("../../github/utils/sync-echo").SyncStamp;
 
 type LinkMetadata = {
   lastSync?: {
@@ -31,6 +30,12 @@ export async function handleTaskTitleChanged(
   const { repositoryOwner, repositoryName } = config;
 
   try {
+    const current = await db.query.taskTable.findFirst({
+      where: linkedTaskScope(event.taskId, context.projectId),
+      columns: { title: true },
+    });
+    if (!current || current.title !== event.newTitle) return;
+
     const links = await findExternalLinksByTask(event.taskId);
     const issueLink = links.find(
       (link) =>
@@ -68,15 +73,6 @@ export async function handleTaskTitleChanged(
         console.log("Skipping title sync - already synced from Gitea");
         return;
       }
-
-      const timeSinceLastSync =
-        Date.now() - new Date(lastTitleSync.timestamp).getTime();
-      if (lastTitleSync.source === "gitea" && timeSinceLastSync < 2000) {
-        console.log(
-          `Skipping title sync - recent sync detected (${timeSinceLastSync}ms ago)`,
-        );
-        return;
-      }
     }
 
     const client = createGiteaClient(config);
@@ -90,21 +86,26 @@ export async function handleTaskTitleChanged(
       return;
     }
 
-    await client.updateIssue(repositoryOwner, repositoryName, issueNumber, {
-      title: event.newTitle,
-    });
+    const response = await client.updateIssue(
+      repositoryOwner,
+      repositoryName,
+      issueNumber,
+      {
+        title: event.newTitle,
+      },
+    );
 
     await updateExternalLink(issueLink.id, {
       title: event.newTitle,
       metadata: {
         ...metadata,
         lastSync: {
           ...metadata.lastSync,
-          title: {
-            timestamp: new Date().toISOString(),
-            source: "kaneo",
-            value: event.newTitle,
-          },
+          title: outboundStamp(
+            metadata.lastSync?.title,
+            event.newTitle,
+            response?.updated_at,
+          ),
         },
       },
     });

apps/api/src/plugins/gitea/utils/gitea-api.ts

@@ -10,6 +10,7 @@ export type GiteaLabel = {
 };
 
 export type GiteaIssue = {
+  updated_at?: string;
   id: number;
   number: number;
   title: string;

apps/api/src/plugins/gitea/webhooks/issue-closed.ts

@@ -1,3 +1,4 @@
+import { isOutboundEcho, type SyncStamp } from "../../github/utils/sync-echo";
 import {
   linkedTaskScope,
   withIntegrationTask,
@@ -100,8 +101,16 @@ export async function handleGiteaIssueClosed(
           }
         }
 
+        const stateStamp = (
+          existingMetadata.lastSync as { state?: SyncStamp } | undefined
+        )?.state;
+        if (isOutboundEcho(stateStamp, "closed", issue.updated_at)) return;
         const lastOutbound = existingMetadata.lastOutboundStateSyncAt;
-        if (typeof lastOutbound === "number" && Number.isFinite(lastOutbound)) {
+        if (
+          typeof lastOutbound === "number" &&
+          Number.isFinite(lastOutbound) &&
+          existingMetadata.state === "closed"
+        ) {
           const eventMs = parseIssueUpdatedAtMs(issue);
           if (
             eventMs !== null &&

apps/api/src/plugins/gitea/webhooks/issue-edited.ts

@@ -1,3 +1,6 @@
+import type { GiteaConfig } from "../config";
+import { createGiteaClient } from "../utils/gitea-api";
+import { confirmedOutboundEcho } from "../../github/utils/sync-echo";
 import {
   linkedTaskScope,
   withIntegrationTask,
@@ -20,6 +23,7 @@ type IssueEditedPayload = {
     number: number;
     title: string;
     body: string | null;
+    updated_at?: string;
     html_url: string;
   };
   changes?: {
@@ -65,6 +69,38 @@ export async function handleGiteaIssueEdited(
       continue;
     }
 
+    const echoMetadata = externalLink.metadata
+      ? JSON.parse(externalLink.metadata)
+      : {};
+    const fetchCurrentIssue = async () => {
+      const config = JSON.parse(integration.config) as GiteaConfig;
+      return createGiteaClient(config).getIssue(
+        config.repositoryOwner,
+        config.repositoryName,
+        issue.number,
+      );
+    };
+    let current: ReturnType<typeof fetchCurrentIssue> | undefined;
+    const currentIssue = () => (current ??= fetchCurrentIssue());
+    // Read the provider before taking task/project locks.
+    const titleEcho = changes.title
+      ? await confirmedOutboundEcho(
+          echoMetadata.lastSync?.title,
+          issue.title,
+          issue.updated_at,
+          async () => (await currentIssue()).title,
+        )
+      : false;
+    const descriptionEcho = changes.body
+      ? await confirmedOutboundEcho(
+          echoMetadata.lastSync?.description,
+          formatTaskDescriptionFromIssue(issue.body),
+          issue.updated_at,
+          async () =>
+            formatTaskDescriptionFromIssue((await currentIssue()).body ?? null),
+        )
+      : false;
+
     await withIntegrationTask(externalLink.taskId, integration, async (db) => {
       const task = await db.query.taskTable.findFirst({
         where: linkedTaskScope(externalLink.taskId, integration.projectId),
@@ -91,22 +127,15 @@ export async function handleGiteaIssueEdited(
         let shouldUpdateTitle = true;
 
         if (lastTitleSync) {
-          if (
-            lastTitleSync.value === issue.title &&
-            lastTitleSync.source === "kaneo"
-          ) {
-            shouldUpdateTitle = false;
-          }
-          const timeSinceLastSync =
-            Date.now() - new Date(lastTitleSync.timestamp).getTime();
-          if (timeSinceLastSync < 2000 && shouldUpdateTitle) {
+          if (titleEcho) {
             shouldUpdateTitle = false;
           }
         }
 
         if (shouldUpdateTitle) {
           updateData.title = issue.title;
           updatedMetadata.lastSync.title = {
+            outbound: metadata.lastSync?.title?.outbound,
             timestamp: new Date().toISOString(),
             source: "gitea",
             value: issue.title,
@@ -121,22 +150,15 @@ export async function handleGiteaIssueEdited(
         let shouldUpdateDescription = true;
 
         if (lastDescSync) {
-          if (
-            lastDescSync.value === formattedDescription &&
-            lastDescSync.source === "kaneo"
-          ) {
-            shouldUpdateDescription = false;
-          }
-          const timeSinceLastSync =
-            Date.now() - new Date(lastDescSync.timestamp).getTime();
-          if (timeSinceLastSync < 2000 && shouldUpdateDescription) {
+          if (descriptionEcho) {
             shouldUpdateDescription = false;
           }
         }
 
         if (shouldUpdateDescription) {
           updateData.description = formattedDescription;
           updatedMetadata.lastSync.description = {
+            outbound: metadata.lastSync?.description?.outbound,
             timestamp: new Date().toISOString(),
             source: "gitea",
             value: formattedDescription,