fix(git-sync): address PR #119 review (#1571)

Resolve the code-review findings from comment #1571 on PR #119.

Engine (packages/git-sync):
- Idempotent CREATE on retry: before createPage, look the page up in the
  live Docmost tree by (parentPageId, title) and ADOPT it instead of
  duplicating when a prior cycle created it but failed to persist the
  pageId back to disk. Only trust a COMPLETE tree for the lookup; fall
  back to createPage otherwise. Covered by new tests incl. a complete=false
  regression-lock.
- Route applyPullActions diagnostics through an injected logger instead of
  bare console (thread log from the cycle).
- Add a timeout to the git execFile chokepoint (runRaw) so a hung git
  subprocess cannot wedge a sync cycle.
- Translate remaining Russian code comments to English.
- Remove dead standalone-CLI code (parseArgs/PushParsedArgs,
  parseSettings/envSchema, loadSettingsOrExit + config-errors.ts) and the
  matching index exports/specs; keep the Settings type.
- Fix the dangling docs link in package.json.
- Add a schema-surface snapshot guard so any drift in the vendored
  document schema is a loud, must-review CI failure (+ provenance header).

Server (apps/server):
- Add a configurable watchdog timeout to the spawned git http-backend so a
  stalled push cannot hold the per-space lock forever
  (GIT_SYNC_BACKEND_TIMEOUT_MS).
- Close the in-process TOCTOU window in SpaceLockService.withSpaceLock by
  reserving the slot synchronously before acquire.
- Add tests: removePage git-sync provenance (both branches), ensureServable
  force-push-protection git configs, and the phase-B+ datasource methods.

Docs / build:
- AGENTS.md: list git-sync as the fifth workspace package and note the
  three schema mirrors; fix the dangling git-sync-plan.md backlog link.
- pnpm-lock.yaml: add the missing @docmost/git-sync workspace link so
  pnpm install --frozen-lockfile (CI default) succeeds.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
claude_code
2026-06-26 00:06:44 +03:00
committed by claude code agent 227
parent 52959de2f3
commit 28d2560dfd
31 changed files with 767 additions and 462 deletions
@@ -375,13 +375,109 @@ describe('GitmostDataSourceService', () => {
describe('restorePage', () => {
it('restores via the repo restore path scoped to the workspace', async () => {
const { service, mocks } = build();
await service.bind(CTX).restorePage('p1');
const res = await service.bind(CTX).restorePage('p1');
// Stamps lastUpdatedSource='git-sync' on restore (loop-guard, PR #119).
expect(mocks.pageRepo.restorePage).toHaveBeenCalledWith(
'p1',
'ws-1',
'git-sync',
);
expect(res).toEqual({ id: 'p1' });
});
});
// Phase-B+ continuous-sync methods: not yet called by the engine but wired into
// the GitSyncClient seam (PR #119 review #5). Exercised via the bound client.
describe('listRecentSince', () => {
it('queries non-deleted pages newest-first and ISO-stringifies updatedAt', async () => {
const rows = [
{
id: 'p1',
slugId: 's1',
title: 'A',
parentPageId: null,
spaceId: 'space-1',
updatedAt: new Date('2026-06-20T10:00:00.000Z'),
},
];
const { service, mocks } = build(rows);
const qb = mocks.db.selectFrom.mock.results; // populated after the call
const out = (await service
.bind(CTX)
.listRecentSince('space-1', '2026-06-19T00:00:00.000Z', 100)) as any[];
// Query builder shaped against the `pages` table with the expected chain.
expect(mocks.db.selectFrom).toHaveBeenCalledWith('pages');
const builder = qb[0].value;
expect(builder.select).toHaveBeenCalled();
expect(builder.orderBy).toHaveBeenCalledWith('updatedAt', 'desc');
// deletedAt is null + the conditional spaceId / since / cap clauses.
const whereArgs = builder.where.mock.calls.map((c: any[]) => c[0]);
expect(whereArgs).toContain('deletedAt');
expect(whereArgs).toContain('spaceId');
expect(whereArgs).toContain('updatedAt');
expect(builder.limit).toHaveBeenCalledWith(100);
expect(out).toEqual([
{
id: 'p1',
slugId: 's1',
title: 'A',
parentPageId: null,
spaceId: 'space-1',
updatedAt: '2026-06-20T10:00:00.000Z',
},
]);
});
it('omits the spaceId / since / cap clauses when not supplied', async () => {
const { service, mocks } = build([]);
await service.bind(CTX).listRecentSince(undefined, null);
const builder = mocks.db.selectFrom.mock.results[0].value;
const whereArgs = builder.where.mock.calls.map((c: any[]) => c[0]);
// Only the deletedAt-is-null guard; no spaceId / updatedAt> clauses.
expect(whereArgs).toEqual(['deletedAt']);
expect(builder.limit).not.toHaveBeenCalled();
});
});
describe('listTrash', () => {
it('queries soft-deleted pages and ISO-stringifies deletedAt (null stays null)', async () => {
const rows = [
{
id: 'p1',
slugId: 's1',
title: 'Trashed',
parentPageId: null,
spaceId: 'space-1',
deletedAt: new Date('2026-06-21T09:00:00.000Z'),
},
{
id: 'p2',
slugId: 's2',
title: 'NoDate',
parentPageId: null,
spaceId: 'space-1',
deletedAt: null,
},
];
const { service, mocks } = build(rows);
const out = (await service.bind(CTX).listTrash('space-1')) as any[];
expect(mocks.db.selectFrom).toHaveBeenCalledWith('pages');
const builder = mocks.db.selectFrom.mock.results[0].value;
const whereCalls = builder.where.mock.calls;
// deletedAt is-not null (the trash predicate) + spaceId filter.
expect(whereCalls).toContainEqual(['deletedAt', 'is not', null]);
expect(whereCalls).toContainEqual(['spaceId', '=', 'space-1']);
expect(builder.orderBy).toHaveBeenCalledWith('deletedAt', 'desc');
expect(out[0].deletedAt).toBe('2026-06-21T09:00:00.000Z');
expect(out[1].deletedAt).toBeNull();
});
});
});