Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(integrations): guard observed recovery against concurrent edits

Tinecda605c81a5
diff --git a/apps/api/src/plugins/github/services/apply-observed-task-value.ts b/apps/api/src/plugins/github/services/apply-observed-task-value.ts
index 94f5ad092..8f8797410 100644
--- a/apps/api/src/plugins/github/services/apply-observed-task-value.ts
+++ b/apps/api/src/plugins/github/services/apply-observed-task-value.ts
@@ -10,7 +10,10 @@ import {
type SyncStamp,
} from "../utils/sync-echo";
import { parseLinkMetadata } from "../utils/parse-link-metadata";
-import { linkedTaskScope } from "./integration-task-scope";
+import {
+ linkedTaskScope,
+ integrationTaskRevision,
+} from "./integration-task-scope";
import { withIntegrationLink } from "./with-integration-link";
import { updateExternalLink } from "./link-manager";
import { updateTaskStatus } from "./task-service";
@@ -24,8 +27,9 @@ export async function applyObservedTaskValue(
value: string,
intentId: string,
updatedAt: string | undefined,
+ expectedRevision: string,
) {
- await withIntegrationLink(
+ return withIntegrationLink(
link,
integration,
async (tx, afterCommit, locked) => {
@@ -36,6 +40,14 @@ export async function applyObservedTaskValue(
source: "observed_provider_edit",
});
const stamp = metadata.lastSync?.[field];
+ if (
+ (await integrationTaskRevision(
+ link.taskId,
+ integration.projectId,
+ tx,
+ )) !== expectedRevision
+ )
+ return false;
if (
!hasNewerObservedEdit(
stamp?.outbound?.find((entry) => entry.intentId === intentId),
@@ -77,6 +89,7 @@ export async function applyObservedTaskValue(
projectId: integration.projectId,
}),
);
+ return true;
},
);
}
diff --git a/apps/api/src/plugins/github/services/deferred-issue-edits.ts b/apps/api/src/plugins/github/services/deferred-issue-edits.ts
index 08778a717..e44a6a19c 100644
--- a/apps/api/src/plugins/github/services/deferred-issue-edits.ts
+++ b/apps/api/src/plugins/github/services/deferred-issue-edits.ts
@@ -1,6 +1,6 @@
-import { and, asc, eq, gt, like, sql } from "drizzle-orm";
+import { and, asc, eq, gt, like } from "drizzle-orm";
import db from "../../../database";
-import { externalLinkTable, taskTable } from "../../../database/schema";
+import { externalLinkTable } from "../../../database/schema";
import { publishEvent } from "../../../events";
import type { GiteaConfig } from "../../gitea/config";
import { createGiteaClient } from "../../gitea/utils/gitea-api";
@@ -28,7 +28,7 @@ import { updateExternalLink } from "./link-manager";
import { syncLatestTaskValue } from "./sync-latest-task-value";
import {
linkedTaskScope,
- type IntegrationDatabase,
+ integrationTaskRevision,
} from "./integration-task-scope";
import { withIntegrationLink } from "./with-integration-link";
@@ -70,18 +70,6 @@ export async function deferIssueEdit(
);
}
-async function taskRevision(
- taskId: string,
- projectId: string,
- database: IntegrationDatabase = db,
-) {
- const [task] = await database
- .select({ revision: sql<string>`${taskTable}.xmin::text` })
- .from(taskTable)
- .where(linkedTaskScope(taskId, projectId));
- return task?.revision;
-}
-
async function issueAccess(
integration: Integration,
link: { externalId: string; taskId: string },
@@ -180,7 +168,10 @@ export async function replayDeferredIssueEdits() {
)
)
continue;
- const revision = await taskRevision(link.taskId, integration.projectId);
+ const revision = await integrationTaskRevision(
+ link.taskId,
+ integration.projectId,
+ );
if (!revision) continue;
const provider = await issueAccess(integration, link);
let issue: Awaited<ReturnType<typeof provider.read>>;
@@ -247,8 +238,11 @@ export async function replayDeferredIssueEdits() {
)
return;
if (
- (await taskRevision(link.taskId, integration.projectId, tx)) !==
- revision
+ (await integrationTaskRevision(
+ link.taskId,
+ integration.projectId,
+ tx,
+ )) !== revision
)
return;
const task = await tx.query.taskTable.findFirst({
diff --git a/apps/api/src/plugins/github/services/integration-task-scope.ts b/apps/api/src/plugins/github/services/integration-task-scope.ts
index 7ddeabcbd..005428e91 100644
--- a/apps/api/src/plugins/github/services/integration-task-scope.ts
+++ b/apps/api/src/plugins/github/services/integration-task-scope.ts
@@ -103,3 +103,15 @@ export function linkedTaskScope(taskId: string, projectId: string) {
export function externalLinkScope() {
return sql`exists (select 1 from ${taskTable} scoped_task join ${integrationTable} scoped_integration on scoped_integration.project_id = scoped_task.project_id where scoped_task.id = ${externalLinkTable.taskId} and scoped_integration.id = ${externalLinkTable.integrationId})`;
}
+
+export async function integrationTaskRevision(
+ taskId: string,
+ projectId: string,
+ database: IntegrationDatabase = db,
+) {
+ const [task] = await database
+ .select({ revision: sql<string>`${taskTable}.xmin::text` })
+ .from(taskTable)
+ .where(linkedTaskScope(taskId, projectId));
+ return task?.revision;
+}
diff --git a/apps/api/src/plugins/github/services/sync-latest-task-value.ts b/apps/api/src/plugins/github/services/sync-latest-task-value.ts
index 4c5097a73..4a5b8f113 100644
--- a/apps/api/src/plugins/github/services/sync-latest-task-value.ts
+++ b/apps/api/src/plugins/github/services/sync-latest-task-value.ts
@@ -3,7 +3,10 @@ import db from "../../../database";
import { parseLinkMetadata } from "../utils/parse-link-metadata";
import { hasNewerObservedEdit, type SyncStamp } from "../utils/sync-echo";
import { applyObservedTaskValue } from "./apply-observed-task-value";
-import { linkedTaskScope } from "./integration-task-scope";
+import {
+ linkedTaskScope,
+ integrationTaskRevision,
+} from "./integration-task-scope";
import { findExternalLinksByTask, updateExternalLink } from "./link-manager";
// Provider requests may complete out of order across API instances. Every late
@@ -89,18 +92,23 @@ export async function syncLatestTaskValue(
if (
hasNewerObservedEdit(observed, updatedAt) &&
currentLink.integration &&
- readCurrent &&
- (await readCurrent()) === value
+ readCurrent
) {
- await applyObservedTaskValue(
- currentLink,
- currentLink.integration,
- field,
- value,
- intentId,
- updatedAt,
- );
- return;
+ const revision = await integrationTaskRevision(taskId, projectId);
+ if (
+ revision &&
+ (await readCurrent()) === value &&
+ (await applyObservedTaskValue(
+ currentLink,
+ currentLink.integration,
+ field,
+ value,
+ intentId,
+ updatedAt,
+ revision,
+ )) === true
+ )
+ return;
}
const task = await db.query.taskTable.findFirst({
where: linkedTaskScope(taskId, projectId),
diff --git a/tests/api-integration/outbound-intent-correlation.test.ts b/tests/api-integration/outbound-intent-correlation.test.ts
index 6c45bd272..6b625c685 100644
--- a/tests/api-integration/outbound-intent-correlation.test.ts
+++ b/tests/api-integration/outbound-intent-correlation.test.ts
@@ -182,3 +182,109 @@ it("stops correction when a disconnect races the post-response task read", async
read.mockRestore();
}
});
+
+it.each(
+ (["title", "description", "state"] as const).flatMap((field) =>
+ [false, true].map((aba) => ({ field, aba })),
+ ),
+)(
+ "preserves a newer local $field edit during observed-value HTTP (ABA=$aba)",
+ async ({ field, aba }) => {
+ const { workspace } = await createWorkspaceMember();
+ const { project } = await createProjectFixture({
+ workspaceId: workspace.id,
+ });
+ const [task] = await db
+ .insert(schema.taskTable)
+ .values({
+ projectId: project.id,
+ number: 1,
+ title: "B",
+ description: "B",
+ status: "to-do",
+ })
+ .returning();
+ const [integration] = await db
+ .insert(schema.integrationTable)
+ .values({ projectId: project.id, type: "github", config: "{}" })
+ .returning();
+ const [link] = await db
+ .insert(schema.externalLinkTable)
+ .values({
+ taskId: task.id,
+ integrationId: integration.id,
+ resourceType: "issue",
+ externalId: "1",
+ url: "https://provider.example/1",
+ })
+ .returning();
+ const older = field === "state" ? "closed" : "A";
+ const prior = field === "state" ? "open" : "B";
+ let first = true;
+ let remote = older;
+ const write = vi.fn(async (value: string) => {
+ remote = value;
+ if (!first) return "2026-09-30T00:00:04Z";
+ first = false;
+ const pending = await db.query.externalLinkTable.findFirst({
+ where: eq(schema.externalLinkTable.id, link.id),
+ });
+ const stamp = JSON.parse(pending?.metadata ?? "{}").lastSync[field];
+ await updateExternalLink(link.id, {
+ metadata: {
+ lastSync: {
+ [field]: inboundStamp(
+ stamp,
+ prior,
+ "github",
+ "2026-09-30T00:00:02Z",
+ ),
+ },
+ },
+ observedOutbound: {
+ field,
+ intentId: stamp.outbound[0].intentId,
+ updatedAt: "2026-09-30T00:00:03Z",
+ },
+ });
+ return "2026-09-30T00:00:01Z";
+ });
+ await syncLatestTaskValue(
+ task.id,
+ project.id,
+ link,
+ field,
+ older,
+ write,
+ async () => {
+ const column = field === "state" ? "status" : field;
+ await db.transaction(async (tx) => {
+ await tx
+ .update(schema.taskTable)
+ .set({
+ [column]: field === "state" ? "in-progress" : "C",
+ updatedAt: task.updatedAt,
+ })
+ .where(eq(schema.taskTable.id, task.id));
+ if (aba)
+ await tx
+ .update(schema.taskTable)
+ .set({
+ [column]: field === "state" ? "to-do" : "B",
+ updatedAt: task.updatedAt,
+ })
+ .where(eq(schema.taskTable.id, task.id));
+ });
+ return remote;
+ },
+ );
+ const current = await db.query.taskTable.findFirst({
+ where: eq(schema.taskTable.id, task.id),
+ });
+ expect(field === "state" ? current?.status : current?.[field]).toBe(
+ field === "state" ? (aba ? "to-do" : "in-progress") : aba ? "B" : "C",
+ );
+ expect(remote).toBe(field === "state" ? "open" : aba ? "B" : "C");
+ expect(write).toHaveBeenCalledTimes(2);
+ },
+);
diff --git a/tests/api/plugins/github/outbound-intent.test.ts b/tests/api/plugins/github/outbound-intent.test.ts
index 80ca42337..a8ee95e1a 100644
--- a/tests/api/plugins/github/outbound-intent.test.ts
+++ b/tests/api/plugins/github/outbound-intent.test.ts
@@ -48,14 +48,28 @@ vi.mock(
_integration: unknown,
field: "title" | "description" | "state",
value: string,
+ _intentId: string,
+ _updatedAt: string | undefined,
+ expectedRevision: string,
) => {
+ if (JSON.stringify(m.current) !== expectedRevision) return false;
if (field === "state")
m.current.status = value === "closed" ? "done" : "to-do";
else m.current[field] = value;
m.stamps[field] = inboundStamp(m.stamps[field], value, "github");
+ return true;
},
}),
);
+vi.mock(
+ "../../../../apps/api/src/plugins/github/services/integration-task-scope",
+ async (original) => ({
+ ...(await original<
+ typeof import("../../../../apps/api/src/plugins/github/services/integration-task-scope")
+ >()),
+ integrationTaskRevision: async () => JSON.stringify(m.current),
+ }),
+);
const link = { id: "link", integrationId: "integration" };
beforeEach(() => {
m.stamps = {};