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): preserve queued field intent ordering

Tin14d1869de026
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 cf467fcc7..82a2268ef 100644
--- a/apps/api/src/plugins/github/services/deferred-issue-edits.ts
+++ b/apps/api/src/plugins/github/services/deferred-issue-edits.ts
@@ -253,7 +253,10 @@ async function replayClaimedIssueEdits() {
: field === "description"
? task.description || ""
: task.title;
- if (job.repairFields?.includes(field)) {
+ if (
+ job.repairFields?.includes(field) &&
+ !job.fields.includes(field)
+ ) {
repairs.push({
field,
value: local,
diff --git a/apps/api/src/plugins/github/services/link-manager.ts b/apps/api/src/plugins/github/services/link-manager.ts
index dd68670b9..570013040 100644
--- a/apps/api/src/plugins/github/services/link-manager.ts
+++ b/apps/api/src/plugins/github/services/link-manager.ts
@@ -175,10 +175,13 @@ export async function updateExternalLink(
delete merged.deferredIssueEdit;
if (params.deferredEdit) {
const { fields, repairFields = [], scope } = params.deferredEdit;
+ // The last queued direction for each field supersedes its older intent.
const repairs = [
...new Set([
...(previousJob?.scope === scope
- ? (previousJob.repairFields ?? [])
+ ? (previousJob.repairFields ?? []).filter(
+ (field) => !fields.includes(field),
+ )
: []),
...repairFields,
]),
@@ -189,7 +192,11 @@ export async function updateExternalLink(
...(repairs.length ? { repairFields: repairs } : {}),
fields: [
...new Set([
- ...(previousJob?.scope === scope ? previousJob.fields : []),
+ ...(previousJob?.scope === scope
+ ? previousJob.fields.filter(
+ (field) => !repairFields.includes(field),
+ )
+ : []),
...fields,
]),
],
diff --git a/tests/api-integration/deferred-issue-edits.test.ts b/tests/api-integration/deferred-issue-edits.test.ts
index 7e4cbde42..a9fc49db7 100644
--- a/tests/api-integration/deferred-issue-edits.test.ts
+++ b/tests/api-integration/deferred-issue-edits.test.ts
@@ -1743,3 +1743,108 @@ it("uses the queued-link partial index without inspecting historical issue metad
);
});
});
+
+it.each(providerFields)(
+ "imports a newer deferred $provider $field webhook over an older queued local repair",
+ async ({ provider, field }) => {
+ const { task, integration, link } = await seed(provider);
+ const version = "2026-09-30T00:00:03Z";
+ const initial = field === "state" ? "open" : "B";
+ const latest = field === "state" ? "closed" : "C";
+ await db
+ .update(schema.taskTable)
+ .set({
+ [field === "state" ? "status" : field]:
+ field === "state" ? "to-do" : initial,
+ })
+ .where(eq(schema.taskTable.id, task.id));
+ await db
+ .update(schema.externalLinkTable)
+ .set({
+ metadata: JSON.stringify({
+ lastSync: {
+ [field]: inboundStamp(undefined, initial, provider, version),
+ },
+ }),
+ })
+ .where(eq(schema.externalLinkTable.id, link.id));
+ await deferTaskSync(link, integration, [field]);
+ m.read.mockRejectedValueOnce(
+ new Error("confirmation temporarily unavailable"),
+ );
+ await deliverField(provider, field, latest, version, integration.id);
+ expect((await metadata(link.id)).deferredIssueEdit.fields).toContain(field);
+ m.read.mockResolvedValue({
+ title: "C",
+ body: "C",
+ state: "closed",
+ updated_at: version,
+ });
+ await replayDeferredIssueEdits();
+ const row = await current(task.id);
+ expect(field === "state" ? row?.status : row?.[field]).toBe(
+ field === "state" ? "done" : latest,
+ );
+ expect(m.write).not.toHaveBeenCalled();
+ expect((await metadata(link.id)).deferredIssueEdit).toBeUndefined();
+ },
+);
+
+it.each(providerFields)(
+ "keeps a newer local $provider $field repair over an older deferred inbound job",
+ async ({ provider, field }) => {
+ const { task, integration, link } = await seed(provider);
+ await db
+ .update(schema.externalLinkTable)
+ .set({ metadata: "{}" })
+ .where(eq(schema.externalLinkTable.id, link.id));
+ await deferIssueEdit(link, integration, [field]);
+ const latest = field === "state" ? "closed" : "C";
+ await db
+ .update(schema.taskTable)
+ .set({
+ [field === "state" ? "status" : field]:
+ field === "state" ? "done" : latest,
+ })
+ .where(eq(schema.taskTable.id, task.id));
+ await deferTaskSync(link, integration, [field]);
+ m.read.mockResolvedValue({
+ title: "A",
+ body: "A",
+ state: "open",
+ updated_at: "2026-09-30T00:00:03Z",
+ });
+ await replayDeferredIssueEdits();
+ expect(m.write).toHaveBeenCalledWith(
+ expect.objectContaining({
+ [field === "description" ? "body" : field]:
+ field === "description" ? expect.stringContaining("C") : latest,
+ }),
+ );
+ expect((await metadata(link.id)).deferredIssueEdit).toBeUndefined();
+ },
+);
+
+it("reconciles an existing overlapping inbound/repair job from the current provider value", async () => {
+ const { task, integration, link } = await seed();
+ await db
+ .update(schema.externalLinkTable)
+ .set({ metadata: "{}" })
+ .where(eq(schema.externalLinkTable.id, link.id));
+ await deferIssueEdit(link, integration, ["title"]);
+ const queued = await metadata(link.id);
+ queued.deferredIssueEdit.repairFields = ["title"];
+ await db
+ .update(schema.externalLinkTable)
+ .set({ metadata: JSON.stringify(queued) })
+ .where(eq(schema.externalLinkTable.id, link.id));
+ m.read.mockResolvedValue({
+ title: "C",
+ body: "body",
+ state: "open",
+ updated_at: "2026-09-30T00:00:03Z",
+ });
+ await replayDeferredIssueEdits();
+ expect((await current(task.id))?.title).toBe("C");
+ expect(m.write).not.toHaveBeenCalled();
+});