Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

refactor(open-knowledge): remove dead /api/sync/abort-merge endpoint (#1732)

Andrew Mikofalvy60d761dba3f9
diff --git a/packages/app/tests/integration/api-error-envelope/sync-abort-merge.test.ts b/packages/app/tests/integration/api-error-envelope/sync-abort-merge.test.ts
deleted file mode 100644
index 2689b56b0..000000000
--- a/packages/app/tests/integration/api-error-envelope/sync-abort-merge.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
-import { ProblemDetailsSchema, SyncAbortMergeSuccessSchema } from '@inkeep/open-knowledge-core';
-import { createTestServer, type TestServer } from '../test-harness';
-
-let server: TestServer;
-
-beforeAll(async () => {
- server = await createTestServer();
-});
-
-afterAll(async () => {
- await server.cleanup();
-});
-
-describe('sync-abort-merge envelope (RFC 9457)', () => {
- test('happy path emits flat empty body (no merge to abort is a no-op)', async () => {
- const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/abort-merge`, {
- method: 'POST',
- });
- expect([200, 500]).toContain(res.status);
- if (res.status === 200) {
- expect(res.headers.get('content-type')).toBe('application/json');
- const body = await res.json();
- expect(SyncAbortMergeSuccessSchema.safeParse(body).success).toBe(true);
- expect((body as Record<string, unknown>).ok).toBeUndefined();
- } else {
- expect(res.headers.get('content-type')).toBe('application/problem+json');
- const parsed = ProblemDetailsSchema.safeParse(await res.json());
- expect(parsed.success).toBe(true);
- if (parsed.success) {
- expect(parsed.data.type).toBe('urn:ok:error:internal-server-error');
- }
- }
- });
-
- test('method-not-allowed on GET emits problem+json with Allow: POST', async () => {
- const res = await fetch(`http://127.0.0.1:${server.port}/api/sync/abort-merge`);
- expect(res.status).toBe(405);
- expect(res.headers.get('allow')).toBe('POST');
-
- const parsed = ProblemDetailsSchema.safeParse(await res.json());
- expect(parsed.success).toBe(true);
- if (parsed.success) {
- expect(parsed.data.type).toBe('urn:ok:error:method-not-allowed');
- }
- });
-});
diff --git a/packages/app/tests/integration/attribution-sweep-coverage.test.ts b/packages/app/tests/integration/attribution-sweep-coverage.test.ts
index 36773bb19..50225705b 100644
--- a/packages/app/tests/integration/attribution-sweep-coverage.test.ts
+++ b/packages/app/tests/integration/attribution-sweep-coverage.test.ts
@@ -73,7 +73,6 @@ const EXEMPT_HANDLERS = new Set([
'handleSyncConflicts',
'handleSyncConflictContent',
'handleSyncTrigger',
- 'handleSyncAbortMerge',
'handleSyncResolveConflict',
'handleLocalOpClone',
'handleLocalOpOpen',
diff --git a/packages/app/tests/integration/conflict-gate-coverage.test.ts b/packages/app/tests/integration/conflict-gate-coverage.test.ts
index b4d0f057b..14cdfd89e 100644
--- a/packages/app/tests/integration/conflict-gate-coverage.test.ts
+++ b/packages/app/tests/integration/conflict-gate-coverage.test.ts
@@ -57,7 +57,6 @@ const EXEMPT_HANDLERS = new Set([
'handleSyncConflicts',
'handleSyncConflictContent',
'handleSyncTrigger',
- 'handleSyncAbortMerge',
'handleSyncResolveConflict',
'handlePrincipal',
'handleInstalledAgentsRoute',
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index dd342f56f..d5a99ac81 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -731,8 +731,6 @@ export {
type SummaryResponseField,
SummaryResponseFieldSchema,
SYNC_ERROR_CODES,
- type SyncAbortMergeSuccess,
- SyncAbortMergeSuccessSchema,
type SyncConflictContentSuccess,
SyncConflictContentSuccessSchema,
type SyncConflictsSuccess,
diff --git a/packages/core/src/schemas/api/sync-seed.test.ts b/packages/core/src/schemas/api/sync-seed.test.ts
index f51e620a2..db79d5225 100644
--- a/packages/core/src/schemas/api/sync-seed.test.ts
+++ b/packages/core/src/schemas/api/sync-seed.test.ts
@@ -6,7 +6,6 @@ import {
SeedApplyRequestSchema,
SeedApplySuccessSchema,
SeedPlanSuccessSchema,
- SyncAbortMergeSuccessSchema,
SyncConflictContentSuccessSchema,
SyncConflictsSuccessSchema,
SyncRemoteSchema,
@@ -326,10 +325,9 @@ describe('SyncConflictContentSuccessSchema', () => {
});
});
-describe('SyncResolveConflictSuccessSchema and SyncAbortMergeSuccessSchema', () => {
- test('both parse empty body', () => {
+describe('SyncResolveConflictSuccessSchema', () => {
+ test('parses empty body', () => {
expect(SyncResolveConflictSuccessSchema.safeParse({}).success).toBe(true);
- expect(SyncAbortMergeSuccessSchema.safeParse({}).success).toBe(true);
});
});
diff --git a/packages/core/src/schemas/api/sync-seed.ts b/packages/core/src/schemas/api/sync-seed.ts
index 747d8c0eb..f3ef94b1a 100644
--- a/packages/core/src/schemas/api/sync-seed.ts
+++ b/packages/core/src/schemas/api/sync-seed.ts
@@ -135,9 +135,6 @@ export const SyncConflictContentSuccessSchema = z
.loose() satisfies StandardSchemaV1;
export type SyncConflictContentSuccess = z.infer<typeof SyncConflictContentSuccessSchema>;
-export const SyncAbortMergeSuccessSchema = z.object({}).loose() satisfies StandardSchemaV1;
-export type SyncAbortMergeSuccess = z.infer<typeof SyncAbortMergeSuccessSchema>;
-
export const SeedPlanSuccessSchema = z
.object({
plan: z.custom<unknown>((v) => v !== undefined, { message: 'plan is required' }),
diff --git a/packages/server/src/api-extension.ts b/packages/server/src/api-extension.ts
index dcf88e632..a279adc94 100644
--- a/packages/server/src/api-extension.ts
+++ b/packages/server/src/api-extension.ts
@@ -149,7 +149,6 @@ import {
SkillInstallStateSuccessSchema,
SuggestLinksSuccessSchema,
SYSTEM_DOC_NAME,
- SyncAbortMergeSuccessSchema,
SyncConflictContentSuccessSchema,
SyncConflictsSuccessSchema,
SyncResolveConflictRequestSchema,
@@ -9398,41 +9397,6 @@ export function createApiExtension(options: ApiExtensionOptions): Extension {
}
}
- async function handleSyncAbortMerge(req: IncomingMessage, res: ServerResponse): Promise<void> {
- if (!checkLocalOpSecurity(req, res, { handler: 'sync-abort-merge' })) return;
- if (req.method !== 'POST') {
- errorResponse(res, 405, 'urn:ok:error:method-not-allowed', 'Method not allowed.', {
- handler: 'sync-abort-merge',
- extraHeaders: { Allow: 'POST' },
- });
- return;
- }
- const engine = getSyncEngine?.();
- if (!engine) {
- errorResponse(res, 503, 'urn:ok:error:sync-not-active', 'Sync engine not active.', {
- handler: 'sync-abort-merge',
- });
- return;
- }
- try {
- await engine.abortMerge();
- successResponse(
- res,
- 200,
- SyncAbortMergeSuccessSchema,
- {},
- {
- handler: 'sync-abort-merge',
- },
- );
- } catch (e) {
- errorResponse(res, 500, 'urn:ok:error:internal-server-error', 'Failed to abort merge.', {
- handler: 'sync-abort-merge',
- cause: e,
- });
- }
- }
-
const handleTagsList = withValidation(
EmptyRequestSchema,
async (_req, res) => {
@@ -11408,7 +11372,6 @@ export function createApiExtension(options: ApiExtensionOptions): Extension {
'/api/sync/conflicts': handleSyncConflicts,
'/api/sync/conflict-content': handleSyncConflictContent,
'/api/sync/resolve-conflict': handleSyncResolveConflict,
- '/api/sync/abort-merge': handleSyncAbortMerge,
'/api/local-op/clone': handleLocalOpClone,
'/api/local-op/open': handleLocalOpOpen,
'/api/local-op/ok-init': handleLocalOpOkInit,
@@ -11455,7 +11418,6 @@ export function createApiExtension(options: ApiExtensionOptions): Extension {
'/api/rollback',
'/api/sync/trigger',
'/api/sync/resolve-conflict',
- '/api/sync/abort-merge',
'/api/git/checkout',
'/api/test-reset',
'/api/test-rescan-backlinks',
diff --git a/packages/server/src/sync-engine.ts b/packages/server/src/sync-engine.ts
index ecc66f825..3486b4bed 100644
--- a/packages/server/src/sync-engine.ts
+++ b/packages/server/src/sync-engine.ts
@@ -1500,20 +1500,6 @@ export class SyncEngine {
}
}
- async abortMerge(): Promise<void> {
- const handle = createGitInstance(this.projectDir, { credentialArgs: this.credentialArgs });
- try {
- await handle.git.raw(['merge', '--abort']);
- log.info({}, '[sync] merge aborted');
- } catch (e) {
- log.warn({ err: e }, '[sync] git merge --abort failed — conflicts.json still cleared');
- }
- this.conflictStore.clear();
- this.conflictCount = 0;
- this.transitionTo('idle');
- this.scheduleSaveState();
- }
-
private clearPushError(): void {
this.pushError = undefined;
this.pushErrorCode = undefined;