⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.
TypeScript honoissue-managementissue-trackerjira-alternativekanbanlinear-alternativemcpproject-managementreactself-hostedtypescript
fix(integrations): confirm colliding reversed deliveries
Tin719a78b54577
diff --git a/apps/api/src/plugins/gitea/webhooks/issue-closed.ts b/apps/api/src/plugins/gitea/webhooks/issue-closed.tsindex 8be080ddf..c0c2b6f46 100644--- a/apps/api/src/plugins/gitea/webhooks/issue-closed.ts+++ b/apps/api/src/plugins/gitea/webhooks/issue-closed.ts@@ -78,16 +78,12 @@ export async function handleGiteaIssueClosed(}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GiteaConfig;- return await createGiteaClient(config).getIssue(- config.repositoryOwner,- config.repositoryName,- issue.number,- );- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GiteaConfig;+ return await createGiteaClient(config).getIssue(+ config.repositoryOwner,+ config.repositoryName,+ issue.number,+ );};await withEchoConfirmation(readCurrent,diff --git a/apps/api/src/plugins/gitea/webhooks/issue-edited.ts b/apps/api/src/plugins/gitea/webhooks/issue-edited.tsindex 297311165..0961746eb 100644--- a/apps/api/src/plugins/gitea/webhooks/issue-edited.ts+++ b/apps/api/src/plugins/gitea/webhooks/issue-edited.ts@@ -74,16 +74,12 @@ export async function handleGiteaIssueEdited(}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GiteaConfig;- return await createGiteaClient(config).getIssue(- config.repositoryOwner,- config.repositoryName,- issue.number,- );- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GiteaConfig;+ return await createGiteaClient(config).getIssue(+ config.repositoryOwner,+ config.repositoryName,+ issue.number,+ );};await withEchoConfirmation(readCurrent,diff --git a/apps/api/src/plugins/gitea/webhooks/issue-reopened.ts b/apps/api/src/plugins/gitea/webhooks/issue-reopened.tsindex dcb9423fb..9727cec87 100644--- a/apps/api/src/plugins/gitea/webhooks/issue-reopened.ts+++ b/apps/api/src/plugins/gitea/webhooks/issue-reopened.ts@@ -80,16 +80,12 @@ export async function handleGiteaIssueReopened(}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GiteaConfig;- return await createGiteaClient(config).getIssue(- config.repositoryOwner,- config.repositoryName,- issue.number,- );- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GiteaConfig;+ return await createGiteaClient(config).getIssue(+ config.repositoryOwner,+ config.repositoryName,+ issue.number,+ );};await withEchoConfirmation(readCurrent,diff --git a/apps/api/src/plugins/github/utils/inbound-echo.ts b/apps/api/src/plugins/github/utils/inbound-echo.tsindex e5c8a458e..979253828 100644--- a/apps/api/src/plugins/github/utils/inbound-echo.ts+++ b/apps/api/src/plugins/github/utils/inbound-echo.ts@@ -29,7 +29,16 @@ export function inboundEcho() {const pending = pendingOutboundIntent(stamp, value);if (pending) throw new PendingEcho(pending.intentId, updatedAt, context);- if (!isOutboundEcho(stamp, value, updatedAt)) return false;+ if (!isOutboundEcho(stamp, value, updatedAt)) {+ const colliding =+ updatedAt &&+ stamp?.outbound?.some(+ (entry) => !entry.cancelled && entry.updatedAt === updatedAt,+ );+ if (!colliding) return false;+ if (providerValue === undefined) throw new ConfirmationRequired();+ return providerValue !== value;+ }if (stamp?.value === value && !ambiguousOutboundEcho(stamp, value, updatedAt))return true;if (providerValue === undefined) throw new ConfirmationRequired();@@ -92,7 +101,20 @@ export async function withEchoConfirmation<Provider, Result>(error instanceof ConfirmationRequired &¤t === undefined) {- current = await read();+ try {+ current = await read();+ } catch (error) {+ if (!defer) throw error;+ try {+ await defer();+ return;+ } catch (cause) {+ throw new PendingResponseTimeout(+ "Could not persist deferred webhook delivery",+ { cause },+ );+ }+ }} else {throw error;}diff --git a/apps/api/src/plugins/github/webhooks/issue-closed.ts b/apps/api/src/plugins/github/webhooks/issue-closed.tsindex 94cf95742..1f4056408 100644--- a/apps/api/src/plugins/github/webhooks/issue-closed.ts+++ b/apps/api/src/plugins/github/webhooks/issue-closed.ts@@ -54,19 +54,15 @@ export async function handleIssueClosed(payload: IssueClosedPayload) {}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GitHubConfig;- const octokit = await getVerifiedInstallationOctokit(config);- return (- await octokit.rest.issues.get({- owner: config.repositoryOwner,- repo: config.repositoryName,- issue_number: issue.number,- })- ).data;- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GitHubConfig;+ const octokit = await getVerifiedInstallationOctokit(config);+ return (+ await octokit.rest.issues.get({+ owner: config.repositoryOwner,+ repo: config.repositoryName,+ issue_number: issue.number,+ })+ ).data;};await withEchoConfirmation(readCurrent,diff --git a/apps/api/src/plugins/github/webhooks/issue-edited.ts b/apps/api/src/plugins/github/webhooks/issue-edited.tsindex 317702eaa..22b117ba8 100644--- a/apps/api/src/plugins/github/webhooks/issue-edited.ts+++ b/apps/api/src/plugins/github/webhooks/issue-edited.ts@@ -73,19 +73,15 @@ export async function handleIssueEdited(payload: IssueEditedPayload) {}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GitHubConfig;- const octokit = await getVerifiedInstallationOctokit(config);- return (- await octokit.rest.issues.get({- owner: config.repositoryOwner,- repo: config.repositoryName,- issue_number: issue.number,- })- ).data;- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GitHubConfig;+ const octokit = await getVerifiedInstallationOctokit(config);+ return (+ await octokit.rest.issues.get({+ owner: config.repositoryOwner,+ repo: config.repositoryName,+ issue_number: issue.number,+ })+ ).data;};await withEchoConfirmation(readCurrent,diff --git a/apps/api/src/plugins/github/webhooks/issue-reopened.ts b/apps/api/src/plugins/github/webhooks/issue-reopened.tsindex 4a05a36d2..be81fff5a 100644--- a/apps/api/src/plugins/github/webhooks/issue-reopened.ts+++ b/apps/api/src/plugins/github/webhooks/issue-reopened.ts@@ -54,19 +54,15 @@ export async function handleIssueReopened(payload: IssueReopenedPayload) {}const readCurrent = async () => {- try {- const config = JSON.parse(integration.config) as GitHubConfig;- const octokit = await getVerifiedInstallationOctokit(config);- return (- await octokit.rest.issues.get({- owner: config.repositoryOwner,- repo: config.repositoryName,- issue_number: issue.number,- })- ).data;- } catch {- return issue;- }+ const config = JSON.parse(integration.config) as GitHubConfig;+ const octokit = await getVerifiedInstallationOctokit(config);+ return (+ await octokit.rest.issues.get({+ owner: config.repositoryOwner,+ repo: config.repositoryName,+ issue_number: issue.number,+ })+ ).data;};await withEchoConfirmation(readCurrent,diff --git a/tests/api-integration/deferred-issue-edits.test.ts b/tests/api-integration/deferred-issue-edits.test.tsindex 970ef58f4..8cf56d37f 100644--- a/tests/api-integration/deferred-issue-edits.test.ts+++ b/tests/api-integration/deferred-issue-edits.test.ts@@ -7,6 +7,7 @@ import {replayDeferredIssueEdits,} from "../../apps/api/src/plugins/github/services/deferred-issue-edits";import { updateExternalLink } from "../../apps/api/src/plugins/github/services/link-manager";+import { handleGiteaIssueEdited } from "../../apps/api/src/plugins/gitea/webhooks/issue-edited";import { handleIssueEdited } from "../../apps/api/src/plugins/github/webhooks/issue-edited";import {inboundStamp,@@ -416,3 +417,58 @@ it("repairs an orphaned write using a newer local value whose subscriber has notexpect(m.write).toHaveBeenCalledWith(expect.objectContaining({ title: "C" }));expect((await metadata(link.id)).deferredIssueEdit).toBeUndefined();});++it.each(["github", "gitea"])(+ "preserves the final %s value when colliding-version webhooks arrive in reverse",+ async (provider) => {+ const { task, integration, link } = await seed(provider);+ await db+ .update(schema.taskTable)+ .set({ title: "A" })+ .where(eq(schema.taskTable.id, task.id));+ await db+ .update(schema.externalLinkTable)+ .set({+ metadata: JSON.stringify({+ lastSync: {+ title: outboundStamp(undefined, "A", "2026-09-30T00:00:03Z"),+ },+ }),+ })+ .where(eq(schema.externalLinkTable.id, link.id));+ const apply = async (title: string, from: string) => {+ const payload = {+ action: "edited",+ issue: {+ number: 1,+ title,+ body: "body",+ updated_at: "2026-09-30T00:00:03Z",+ html_url: link.url,+ },+ changes: { title: { from } },+ repository: {+ id: 20,+ name: "repo",+ full_name: "owner/repo",+ owner: { login: "owner" },+ html_url: "https://git.example/owner/repo",+ },+ };+ if (provider === "github") await handleIssueEdited(payload);+ else await handleGiteaIssueEdited(payload, integration.id);+ };+ await apply("A", "B");+ await apply("B", "A");+ expect((await current(task.id))?.title).toBe("A");+ expect(m.read).toHaveBeenCalledOnce();+ m.read.mockResolvedValueOnce({+ title: "B",+ body: "body",+ state: "open",+ updated_at: "2026-09-30T00:00:03Z",+ });+ await apply("B", "A");+ expect((await current(task.id))?.title).toBe("B");+ },+);diff --git a/tests/api/plugins/github/outbound-intent.test.ts b/tests/api/plugins/github/outbound-intent.test.tsindex 92afe6f8d..36a0945f0 100644--- a/tests/api/plugins/github/outbound-intent.test.ts+++ b/tests/api/plugins/github/outbound-intent.test.ts@@ -365,3 +365,30 @@ it("does not PATCH when the link disappears before its pending intent commits",await syncLatestTaskValue("task", "project", link, "title", "B", write);expect(write).not.toHaveBeenCalled();});++it("confirms a delayed different value sharing an outbound provider version", async () => {+ const stamp = outboundStamp(undefined, "A", "shared-version", {+ intentId: "completed",+ });+ expect(inboundEcho(stamp, "A", "shared-version")).toBe(true);+ const read = vi.fn(async () => "A");+ expect(+ await withEchoConfirmation(read, async (current) =>+ inboundEcho(stamp, "B", "shared-version", current),+ ),+ ).toBe(true);+ expect(read).toHaveBeenCalledOnce();+ expect(inboundEcho(stamp, "B", "shared-version", "B")).toBe(false);+});+it("durably defers a colliding event when provider confirmation fails", async () => {+ const stamp = outboundStamp(undefined, "A", "shared-version");+ const defer = vi.fn(async () => undefined);+ await withEchoConfirmation(+ async () => {+ throw new Error("provider unavailable");+ },+ async (current) => inboundEcho(stamp, "B", "shared-version", current),+ defer,+ );+ expect(defer).toHaveBeenCalledOnce();+});