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
@@ -713,5 +713,65 @@ describe('PageService', () => {
expect(payload.lastUpdatedSource).toBeUndefined();
});
});
describe('removePage()', () => {
// removePage forwards a `source` 4th arg to pageRepo.removePage: 'git-sync'
// for a git-sync-driven soft-delete (so the change-listener loop-guard skips
// its own write), undefined otherwise.
const makeService = () => {
const pageRepo = {
removePage: jest.fn().mockResolvedValue(undefined),
};
const svc = new PageService(
pageRepo as any, // pageRepo
{} as any, // pagePermissionRepo
{} as any, // attachmentRepo
{} as any, // db
{} as any, // storageService
{} as any, // attachmentQueue
{} as any, // aiQueue
{} as any, // generalQueue
{} as any, // eventEmitter
{} as any, // collaborationGateway
{} as any, // watcherService
{} as any, // transclusionService
);
return { svc, pageRepo };
};
it("forwards 'git-sync' as the source for a git-sync soft-delete", async () => {
const { svc, pageRepo } = makeService();
await svc.removePage('page-1', 'user-1', 'ws-1', GIT_SYNC);
expect(pageRepo.removePage).toHaveBeenCalledTimes(1);
const [pageId, userId, workspaceId, source] =
pageRepo.removePage.mock.calls[0];
expect(pageId).toBe('page-1');
expect(userId).toBe('user-1');
expect(workspaceId).toBe('ws-1');
expect(source).toBe('git-sync');
});
it('forwards undefined as the source for a plain user delete', async () => {
const { svc, pageRepo } = makeService();
await svc.removePage('page-1', 'user-1', 'ws-1', USER_PROVENANCE);
const [, , , source] = pageRepo.removePage.mock.calls[0];
expect(source).toBeUndefined();
});
it('forwards undefined as the source when no provenance is given', async () => {
const { svc, pageRepo } = makeService();
await svc.removePage('page-1', 'user-1', 'ws-1');
const [, , , source] = pageRepo.removePage.mock.calls[0];
expect(source).toBeUndefined();
});
});
});
});