fix(git-sync): screen non-page files out of PUSH (CRITICAL — review)

Self-review of phase 3 caught a data-corruption regression: nativeMeta always
supplies the run's spaceId, so the planner's 'create-without-spaceId' skip — which
had doubled as the only filter for non-page files — went dead. An ADDED
.obsidian/*.json, attachment, or dotfile (committed to the vault, no .gitignore)
would then be classified as a CREATE: a junk Docmost page, plus a gitmost_id
frontmatter written INTO the file, corrupting it.

Fix: isPageFile(path) — a .md file with NO dot-segment anywhere — and filter the
diff to page files at the very top of computePushActions, BEFORE any
classification, so non-page A/M/D/R are ignored (design §Адопция). 2 unit tests
pin it (.obsidian/json, attachment, dotfile, dot-segment, .md dotfile all ignored;
real pages still created). 614 engine tests green.

Also: refreshed stale docmost:meta comments to gitmost_id (review SUGGESTION), and
documented the deferred adoption frontmatter-preservation gap (review WARNING) in
page-file.ts + the design doc (do NOT roll native onto a real vault with Obsidian
properties until phase 4 round-trips them).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

docs/backlog/git-sync-thin-meta.md

@@ -122,6 +122,12 @@ Obsidian резолвит `[[Заметка]]` по **basename** (не по по
    пути (`parentFolderFile` folder-note-aware). CREATE пишет `gitmost_id` обратно;
    UPDATE шлёт чистое тело (без frontmatter) на обе стороны 3-way merge. (готово)
 4. Адопция голых файлов/папок (частично в фазе 3: файл без `gitmost_id` → create).
+   ВАЖНО: тут же сохранить пользовательский frontmatter (Obsidian properties) при
+   адопции — `parsePageFile` сейчас срезает ведущий frontmatter даже без
+   `gitmost_id`, а write-back пишет только `gitmost_id`; нужно врезать `gitmost_id`
+   в существующий frontmatter и сохранять остальные поля И при write-back, И при
+   следующем pull (иначе pull перезатрёт). До этого native-формат НЕ катить на
+   реальный Obsidian-волт с properties.
 5. Чистка: выпилить старый `docmost:meta` формат-код целиком.
 6. Ссылки: конвертер Docmost-mention ↔ `[[wikilink]]` + переписывание при retitle.
 

packages/git-sync/src/engine/push.ts

@@ -96,7 +96,8 @@ export interface RenameMoveActionClassified {
  * given a path + side; the real `main` (a follow-up) wires them to the file tree
  * (`readFile` for `current`, `git.showFileAtRef` for `prev`), tests pass plain
  * lookups. SPEC §5 path-as-truth:
- *   - `metaAt`: the file's `docmost:meta` at that side (for the title).
+ *   - `metaAt`: the file's synthetic native meta at that side (title from the
+ *     filename, pageId from the `gitmost_id` frontmatter).
  *   - `resolveParentPageId`: the pageId of the page whose FILE is the parent
  *     FOLDER's `.md` (one level up from the given path), or `null` for ROOT.
  */
@@ -177,7 +178,7 @@ export interface PushActions {
 }
 
 /**
- * Which tree a `metaAt` lookup reads the file's `docmost:meta` from:
+ * Which tree a `metaAt` lookup reads the file's native meta from:
  *   - `current`: the current `main` tree (the live file content) — used for
  *     A/M/R, where the file still exists.
  *   - `prev`: the last-pushed PRE-IMAGE (e.g. `refs/docmost/last-pushed:<path>`)
@@ -191,7 +192,7 @@ export interface PushActionsInput {
   /** Diff rows of `main` vs `refs/docmost/last-pushed` (SPEC §6 step 2). */
   changes: DiffEntry[];
   /**
-   * Resolve a file's `docmost:meta` at a given side, or `null` if the file is
+   * Resolve a file's synthetic native meta at a given side, or `null` if the file is
    * absent there / has no parseable meta. PURE injection: the real `main` reads
    * the working tree (current) or `git show <last-pushed>:<path>` (prev); tests
    * pass a plain lookup.
@@ -234,7 +235,16 @@ export interface PushActionsInput {
  *       (`C` copy is treated the same as `R` for recording purposes.)
  */
 export function computePushActions(input: PushActionsInput): PushActions {
-  const { changes, metaAt, currentPageIds } = input;
+  const { metaAt, currentPageIds } = input;
+  // PAGE-FILE FILTER (design §"Адопция"): only `.md` files OUTSIDE any dot-folder
+  // are Docmost pages. `.obsidian/*`, attachments, and other non-page files are
+  // committed to the vault (no `.gitignore`) and so appear in the diff, but they
+  // are NEVER pages — Obsidian owns them. Without this filter every ADDED such
+  // file would be mis-classified as a CREATE (nativeMeta always supplies a
+  // spaceId, so the old `create-without-spaceId` skip no longer screens them),
+  // creating junk pages in Docmost and corrupting the file with a `gitmost_id`
+  // frontmatter. Filter BEFORE any classification so non-page A/M/D/R are ignored.
+  const changes = input.changes.filter((c) => isPageFile(c.path));
   const actions: PushActions = {
     creates: [],
     updates: [],
@@ -245,7 +255,7 @@ export function computePushActions(input: PushActionsInput): PushActions {
 
   // GHOST-MOVE coalescing (⭐ data-loss guard). git's rename detection (`-M`)
   // can miss a move when the two files are too dissimilar — which is exactly the
-  // case for the tiny `docmost:meta`-only files a layout RESHUFFLE produces (e.g.
+  // case for the tiny meta-only files a layout RESHUFFLE produces (e.g.
   // several untitled pages sharing the `_` fallback name; retitling one frees the
   // bare `_` and another page's file relocates `_ ~slug.md` -> `_.md`). git then
   // reports the move as a DELETE of the old path + an ADD of the new one. Taken
@@ -523,7 +533,7 @@ export interface ApplyPushResult {
   /** Pages retitled in Docmost via `rename_page` (push #3, SPEC §5/§6). */
   renamed: number;
   /**
-   * Files whose `docmost:meta` was rewritten with the pageId Docmost assigned on
+   * Files whose `gitmost_id` frontmatter was written with the pageId Docmost assigned on
    * create — these now need a FOLLOW-UP commit (the meta on disk changed). The
    * commit itself is the caller's job (NEXT increment); recorded here so it is
    * not lost.
@@ -570,8 +580,8 @@ export interface ApplyPushResult {
  *     `importPageMarkdown` parses the meta/body itself.
  *   - CREATE: derive title/spaceId/parentPageId from the file's current meta,
  *     `client.createPage(...)`, take the assigned pageId from the result, and
- *     write it BACK into the file's `docmost:meta` (re-serialized via
+ *     write it BACK as the file's `gitmost_id` frontmatter (re-serialized via
- *     `serializeDocmostMarkdownBody`, body preserved) so the file becomes
+ *     `serializePageFile`, body preserved) so the file becomes
  *     tracked. The write-back is recorded in `writtenBack` (a follow-up commit
  *     is needed — NEXT increment).
  *   - DELETE: `client.deletePage(pageId)` — soft-delete to Trash (SPEC §8).
@@ -886,6 +896,19 @@ export function parentFolderFile(path: string): string | null {
   return folderNote;
 }
 
+/**
+ * Whether a vault path is a Docmost PAGE file (design §"Адопция"): a `.md` file
+ * with NO dot-segment anywhere in its path. This excludes `.obsidian/` config,
+ * `.trash/`, dotfiles (`.foo.md`), and every non-`.md` file (attachments, JSON,
+ * …) — Obsidian owns those; they live in the vault but are never pages. Used to
+ * screen the PUSH diff so non-page files are never created/updated/deleted in
+ * Docmost (and never get a `gitmost_id` frontmatter written into them).
+ */
+export function isPageFile(path: string): boolean {
+  if (!path.endsWith(".md")) return false;
+  return !path.split("/").some((seg) => seg.startsWith("."));
+}
+
 /** The last path segment of a forward-slash path (the folder/file base name). */
 function baseSegment(path: string): string {
   const slash = path.lastIndexOf("/");
@@ -929,7 +952,7 @@ function nativeMeta(
  *   - `current` -> `deps.readFile(<dir>.md)` (the live working tree),
  *   - `prev`    -> `git.showFileAtRef('refs/docmost/last-pushed', <dir>.md)` (the
  *     last-pushed pre-image),
- * then parse its `docmost:meta` and return that page's pageId. A root-level path
+ * then read its `gitmost_id` frontmatter and return that page's pageId. A root-level path
  * (no enclosing folder), a missing/unreadable parent file, or a parent file with
  * no parseable pageId all resolve to `null` (parent is ROOT / unknown ->
  * `parentPageId: null`, SPEC §16 "parentPageId: null -> в корень").

packages/git-sync/src/lib/page-file.ts

@@ -43,9 +43,18 @@ function readIdFromYaml(yaml: string): string | null {
 
 /**
  * Parse a page file into its identity (`id`) and clean markdown `body`. Tolerant:
- * a file with neither frontmatter nor legacy meta (a hand-written third-party
+ * a file with no frontmatter (a hand-written third-party file) returns `id: null`
- * file) returns `id: null` and the whole text as the body — the caller then
+ * and the whole text as the body — the caller then ADOPTS it (creates a page,
- * ADOPTS it (creates a page, writes the id back).
+ * writes the id back).
+ *
+ * KNOWN LIMITATION (phase 4 — adoption, see docs/backlog/git-sync-thin-meta.md):
+ * a leading frontmatter block is stripped from `body` even when it carries NO
+ * `gitmost_id` but DOES carry the user's own Obsidian properties (`tags:` etc.).
+ * On adoption those fields are not yet round-tripped — `serializePageFile`
+ * write-back persists only `gitmost_id`. Preserving arbitrary user frontmatter
+ * across the Docmost round-trip (BOTH adoption write-back AND the next pull's
+ * re-serialize) is deferred to the adoption phase; until then, do NOT roll the
+ * native format onto a real Obsidian vault whose notes carry properties.
  */
 export function parsePageFile(full: string): {
   id: string | null;

packages/git-sync/test/compute-push-actions.test.ts

@@ -318,3 +318,47 @@ describe('computePushActions — currentPageIds guard (cross-cycle move)', () =>
     expect(actions.skipped).toEqual([]);
   });
 });
+
+describe('computePushActions — page-file filter (non-page files ignored)', () => {
+  it('IGNORES added/modified/deleted non-page files (.obsidian, dotfiles, non-.md)', () => {
+    // A vault commits `.obsidian/*`, attachments, dotfiles (no .gitignore), so
+    // they show up in the diff — but they are NEVER Docmost pages. Even though a
+    // synthetic metaAt would hand back a spaceId (the vault's), none of these may
+    // become a CREATE/UPDATE/DELETE. This pins the data-corruption guard: an
+    // added `.obsidian/workspace.json` must NOT create a page nor get a gitmost_id.
+    const changes: DiffEntry[] = [
+      { status: 'A', path: '.obsidian/workspace.json' },
+      { status: 'M', path: '.obsidian/app.json' },
+      { status: 'A', path: 'attachments/diagram.png' },
+      { status: 'A', path: '.hidden.md' }, // dotfile, even with .md
+      { status: 'A', path: 'Notes/.config/x.md' }, // dot-segment mid-path
+      { status: 'D', path: '.obsidian/old.json' },
+    ];
+    // Every path resolves to a spaceId-bearing meta (the vault's space) — proving
+    // the filter, not a missing spaceId, is what screens them out.
+    const metaAt = (path: string): DocmostMdMeta =>
+      ({ version: 1, title: 'x', spaceId: 'sp-vault' }) as DocmostMdMeta;
+    const actions = computePushActions({ changes, metaAt });
+    expect(actions.creates).toEqual([]);
+    expect(actions.updates).toEqual([]);
+    expect(actions.deletes).toEqual([]);
+    expect(actions.renamesMoves).toEqual([]);
+    expect(actions.skipped).toEqual([]); // not even recorded as skipped — ignored
+  });
+
+  it('still processes a normal .md page alongside ignored non-page files', () => {
+    const changes: DiffEntry[] = [
+      { status: 'A', path: '.obsidian/workspace.json' },
+      { status: 'A', path: 'Real Page.md' },
+      { status: 'A', path: 'Folder/Note.md' },
+    ];
+    const metaAt = (path: string): DocmostMdMeta =>
+      ({ version: 1, title: 'x', spaceId: 'sp-vault' }) as DocmostMdMeta;
+    const actions = computePushActions({ changes, metaAt });
+    // Only the two real .md pages become creates; the .obsidian file is ignored.
+    expect(actions.creates).toEqual([
+      { path: 'Real Page.md' },
+      { path: 'Folder/Note.md' },
+    ]);
+  });
+});