Clarify conflict sync completion path

huntercaron · cursoragent · huntercaron · commit 1ebf9257fc28 · 2026-05-06T09:04:52.000+02:00
Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/packages/code-link-cli/src/controller.ts b/packages/code-link-cli/src/controller.ts
@@ -790,6 +790,7 @@ async function applyConflictChange(change: ConflictPromptChange, ctx: ApplyCtx):
         const flushed = await flushPendingSyncComplete(ctx)
         if (flushed !== "empty") return
 
+        // Nothing was queued; all conflicts resolved, emit completion for this batch.
         await applySyncComplete(
             {
                 type: "SYNC_COMPLETE",

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,7 @@ async function applyConflictChange(change: ConflictPromptChange, ctx: ApplyCtx):`
`790`	`790`	`const flushed = await flushPendingSyncComplete(ctx)`
`791`	`791`	`if (flushed !== "empty") return`
`792`	`792`
	`793`	`+ // Nothing was queued; all conflicts resolved, emit completion for this batch.`
`793`	`794`	`await applySyncComplete(`
`794`	`795`	`{`
`795`	`796`	`type: "SYNC_COMPLETE",`