Sync polish round 4: mobile suspension and portability, conflict-copy collision recovery, accessibility and recovery wording

docs/sync-ux-acceptance.md

@@ -23,6 +23,6 @@ node scripts/test-sync-layout.cjs after-layout
 
 `MDBASE_UX_PLAYWRIGHT` can be omitted if Playwright is already resolvable. It is not a plugin runtime dependency.
 
-The audit captures 23 states at 1100px and 390px, in dark and light themes: healthy, long excluded-folder scope, local file issue, offline, sign-in, copied device, paused, unexpected failure, progress, first-sync review, deletion-burst review, rebuild, unresolved conflict (both versions present, local absent, or hosted absent), pinned conflict history, enrollment, and local upload, plus five sync problems viewed from Issues (where mobile needs an in-workspace indicator). Desktop sidebars are collapsed for realistic narrow panes. Assertions reject horizontal overflow, hidden sync problems when viewing another destination, and primary/dismiss targets below 44px in narrow panes. Long, unbroken paths are intentional. `*-checks.json` records the measured bounds; the command exits nonzero on a regression.
+The audit captures 24 states at 1100px and 390px, in dark and light themes: healthy, long excluded-folder scope, local file issue, offline, sign-in, copied device, paused, unexpected failure, progress, first-sync review, deletion-burst review, rebuild, unresolved conflict (both versions present, local absent, hosted absent, or active sync), pinned conflict history, enrollment, and local upload, plus five sync problems viewed from Issues (where mobile needs an in-workspace indicator). Desktop sidebars are collapsed for realistic narrow panes. Assertions reject horizontal overflow, hidden sync problems when viewing another destination, conflict decisions enabled while sync is active, and primary/dismiss targets below 44px in narrow panes. Long, unbroken paths are intentional. `*-checks.json` records the measured bounds; the command exits nonzero on a regression.
 
 Review the PNGs as well as the assertions. Diff panels may scroll horizontally within their own surface; the workspace itself must not. Stop the isolated instance after testing and discard its app/profile/vault. Injected profile state is ephemeral and must never be saved as real credentials.

main.ts

@@ -129,6 +129,7 @@ export default class MdbasePlugin extends Plugin {
   private syncScheduler: SyncScheduler | null = null;
   private recordCache: Map<string, CollectionRecord> | null = null;
   private recordCacheSettings = "";
+  private recordCacheEpoch = 0;
   private recordList: CollectionRecord[] | null = null;
   private recordLoadPromise: Promise<CollectionRecord[]> | null = null;
   private readonly dirtyRecordPaths = new Set<string>();
@@ -770,7 +771,9 @@ export default class MdbasePlugin extends Plugin {
 
   private markRecordChanged(path: string): void {
     this.validation.changed(path);
-    if (!this.recordCache) return;
+    // A yielded initial scan can already have read this path. Keep its change
+    // even before the completed cache is installed, then reconcile it below.
+    if (!this.recordCache && !this.recordLoadPromise) return;
     this.dirtyRecordPaths.add(normalizePath(path));
     this.recordList = null;
   }
@@ -787,28 +790,33 @@ export default class MdbasePlugin extends Plugin {
   }
 
   private async readRecords(): Promise<CollectionRecord[]> {
+    const epoch = this.recordCacheEpoch;
     const loaded = await this.getConfigAndTypes();
     if (!loaded) return [];
     const settingsKey = JSON.stringify(loaded.config.settings);
     if (!this.recordCache || settingsKey !== this.recordCacheSettings) {
       this.dirtyRecordPaths.clear();
       const records = await readCollectionRecords(this.app.vault, loaded.config);
+      if (epoch !== this.recordCacheEpoch) return this.readRecords();
       this.recordCache = new Map(records.map((record) => [record.path, record]));
       this.recordCacheSettings = settingsKey;
       this.recordList = null;
-    } else if (this.dirtyRecordPaths.size) {
+    }
+    const cache = this.recordCache;
+    if (this.dirtyRecordPaths.size) {
       const paths = [...this.dirtyRecordPaths];
       this.dirtyRecordPaths.clear();
       for (const path of paths) {
-        this.recordCache.delete(path);
+        cache.delete(path);
         const file = this.app.vault.getAbstractFileByPath(path);
         if (!(file instanceof TFile) || file.extension !== "md" || isExcluded(path, loaded.config)) continue;
         const parsed = parseFrontmatter(await this.app.vault.cachedRead(file));
-        if (!parsed.error) this.recordCache.set(path, { path, frontmatter: parsed.frontmatter });
+        if (!parsed.error) cache.set(path, { path, frontmatter: parsed.frontmatter });
       }
       this.recordList = null;
     }
-    this.recordList ??= [...this.recordCache.values()].sort((a, b) => a.path.localeCompare(b.path));
+    if (epoch !== this.recordCacheEpoch) return this.readRecords();
+    this.recordList ??= [...cache.values()].sort((a, b) => a.path.localeCompare(b.path));
     return this.recordList;
   }
 
@@ -824,6 +832,7 @@ export default class MdbasePlugin extends Plugin {
       validationIssues,
       localChangeObserved: state.localChangeObserved,
       paused: state.paused,
+      busy: state.busy,
       reviewChanges: safety && !safety.safe ? state.preview?.plan.actions.length ?? 0 : 0,
     });
   }
@@ -947,20 +956,30 @@ export default class MdbasePlugin extends Plugin {
     if (this.schemaCache) return this.schemaCache;
     if (this.schemaLoadPromise) return this.schemaLoadPromise;
 
-    this.schemaLoadPromise = (async () => {
-      const config = await loadMdbaseConfig(this.app.vault);
-      if (!config) return null;
-      const types = await loadTypeDefinitions(this.app.vault, config);
-      const contracts = await loadContractDefinitions(this.app.vault, config);
-      return { config, types, contracts };
-    })();
+    // Store the fenced promise itself: all coalesced callers must reject a
+    // result invalidated while its asynchronous config/type reads were running.
+    const loading: Promise<LoadedSchema | null> = Promise.resolve().then(async () => {
+      try {
+        const config = await loadMdbaseConfig(this.app.vault);
+        const loaded = config ? {
+          config,
+          types: await loadTypeDefinitions(this.app.vault, config),
+          contracts: await loadContractDefinitions(this.app.vault, config),
+        } : null;
+        if (this.schemaLoadPromise !== loading) return this.getConfigAndTypes();
+        if (loaded) this.schemaCache = loaded;
+        return loaded;
+      } catch (error) {
+        if (this.schemaLoadPromise !== loading) return this.getConfigAndTypes();
+        throw error;
+      }
+    });
+    this.schemaLoadPromise = loading;
 
     try {
-      const loaded = await this.schemaLoadPromise;
-      if (loaded) this.schemaCache = loaded;
-      return loaded;
+      return await loading;
     } finally {
-      this.schemaLoadPromise = null;
+      if (this.schemaLoadPromise === loading) this.schemaLoadPromise = null;
     }
   }
 
@@ -1002,6 +1021,8 @@ export default class MdbasePlugin extends Plugin {
     for (const path of paths) this.observeLocalMirrorChange(path);
     // A folder event need not be accompanied by child-file events. The old
     // descendant paths are no longer a valid incremental record/schema cache.
+    // An older in-flight read must not reinstall those invalidated paths.
+    this.recordCacheEpoch++;
     this.recordCache = null;
     this.recordList = null;
     this.dirtyRecordPaths.clear();

scripts/test-sync-layout.cjs

@@ -25,7 +25,7 @@ fs.mkdirSync(shots, {recursive:true});
    app.workspace.leftSplit.collapse();app.workspace.rightSplit.collapse();
    window.open=()=>null;
  });
- const states=['healthy','scope','local-issue','offline','auth','copied','paused','internal','progress','first-sync','deletions','rebuild','conflict','conflict-local-absent','conflict-hosted-absent','history','enrollment','upload','away-offline','away-auth','away-copied','away-paused','away-internal'];
+ const states=['healthy','scope','local-issue','offline','auth','copied','paused','internal','progress','first-sync','deletions','rebuild','conflict','conflict-busy','conflict-local-absent','conflict-hosted-absent','history','enrollment','upload','away-offline','away-auth','away-copied','away-paused','away-internal'];
  const results=[];
  for(const state of states) {
   await page.evaluate(state=>{
@@ -63,6 +63,7 @@ fs.mkdirSync(shots, {recursive:true});
     p.sync.update({status:{state:'attention',conflicts:[{entity:'record',object_id:'record',decision_id:'decision',path:longPath,message:'Both versions changed. Choose which version to sync.'}],local_issues:[]}});
     view.sync.conflictComparisons.set('record:decision',{entity:'record',objectId:'record',decisionId:'decision',local:state==='conflict-local-absent'?{state:'absent'}:{state:'exact',document:'Line from this device'},remote:state==='conflict-hosted-absent'?{state:'absent'}:{state:'exact',document:'Line from another device'}});
    }
+   if(state==='conflict-busy')p.sync.update({busy:true});
    if(state==='history') {
     const at=new Date().toISOString();
     window.fixtureRuns=[{id:'fixture-conflict',collectionId:'ux-fixture',startedAt:at,finishedAt:at,outcome:'event',files:[],summary:'Kept both versions of '+longPath.split('/').pop(),message:"This device's version was saved as "+longPath.replace('.md',' (local conflict copy).md'),path:longPath,tone:'attention',needsAcknowledgement:true}];
@@ -80,8 +81,9 @@ fs.mkdirSync(shots, {recursive:true});
    const checks=await page.locator('.mdbase-sync-document, .mdbase-issues-document').evaluate(el=>{
     const content=el.closest('.mdbase-workspace-content');
     const buttons=[...el.querySelectorAll('.mod-cta, .mod-warning, .mdbase-conflict-row button, .mdbase-activity-row > button')].map(b=>({text:b.textContent,height:b.getBoundingClientRect().height}));
+    const choices=[...el.querySelectorAll('button[data-focus-key^="resolve-"]')].map(b=>({text:b.textContent,disabled:b.disabled}));
     const topbar=el.closest('.mdbase-workspace').querySelector('.mdbase-topbar');
-    return {topbarOverflow:topbar.scrollWidth>topbar.clientWidth+1,tabStatus:topbar.querySelector('.mdbase-nav-status')?.textContent,paneWidth:content.clientWidth,headingWidth:el.querySelector('.mdbase-sync-heading')?.getBoundingClientRect().width,scrollWidth:content.scrollWidth,overflow:content.scrollWidth>content.clientWidth+1,buttons};
+    return {topbarOverflow:topbar.scrollWidth>topbar.clientWidth+1,tabStatus:topbar.querySelector('.mdbase-nav-status')?.textContent,paneWidth:content.clientWidth,headingWidth:el.querySelector('.mdbase-sync-heading')?.getBoundingClientRect().width,scrollWidth:content.scrollWidth,overflow:content.scrollWidth>content.clientWidth+1,buttons,choices};
    });
    const box=await page.locator('.mdbase-workspace').boundingBox();
    const cdp=await page.context().newCDPSession(page);
@@ -91,6 +93,7 @@ fs.mkdirSync(shots, {recursive:true});
    if(checks.overflow)failures.push('Horizontal overflow');
    if(checks.topbarOverflow)failures.push('Destination bar overflow');
    if(state.startsWith('away-')&&!checks.tabStatus)failures.push('Problem hidden outside Sync');
+   if(state==='conflict-busy'&&(checks.choices.length!==3||checks.choices.some(b=>!b.disabled)))failures.push('Conflict decisions enabled during sync');
    if(width===390&&checks.headingWidth!=null&&checks.headingWidth<checks.paneWidth-30)failures.push('Narrow heading squeezed by the action');
    if(width===390&&checks.buttons.some(b=>b.height<43.5))failures.push('Primary/dismiss target below 44px');
    results.push({state,width,theme,...checks,failures});