heyquilt 0.3.138 → 0.3.141

package/src/session-follow.js

@@ -307,8 +307,9 @@ export class SquareFollower {
     const s = this.session
     // Held before the first await: nothing of the folder reaches the read-only branch document while the block opens.
     const at = this.inPlaceOn() ? squareFor(quilt, s.squareBranchKey ? s.squareBranchKey() : s.branchKey()) : null
-    if (at && s.enterSquare && !(this.here && this.here.square === at.square)) s.enterSquare(at, quilt)
-    const next = this.turn.then(() => this.settle(quilt)).catch((err) => { if (s.log) s.log(`🧵 ${err.message}`) })
+    const entered = at && s.enterSquare && !(this.here && this.here.square === at.square) ? at.square : null
+    if (entered) s.enterSquare(at, quilt)
+    const next = this.turn.then(() => this.settle(quilt, entered)).catch((err) => { if (s.log) s.log(`🧵 ${err.message}`) })
     this.turn = next
     // A merge onto main moves a branch on (quiltNext), and the relay says so: the other squares may be behind now.
     next.then(() => this.catchUpSoon())
@@ -318,7 +319,8 @@ export class SquareFollower {
   /** Seam on for the app, a folder of the session's own, and a session that can hold its sync (a Session). */
   inPlaceOn () { return !!(appSeamUrl() && this.session.root && this.session.enterSquare) }
 
-  async settle (quilt) {
+  /** `entered`: the square onQuilt already held the session's sync for. */
+  async settle (quilt, entered = null) {
     const s = this.session
     const at = this.inPlaceOn() ? squareFor(quilt, s.squareBranchKey ? s.squareBranchKey() : s.branchKey()) : null
     // The separate folder lets go of a square the branch no longer has (switched back, moved).
@@ -340,6 +342,11 @@ export class SquareFollower {
       } else if (s.log) s.log(`🧵 this folder left square ${squareShort(was)}: its branch is on ${squareShort(at.square)} now.`)
     }
     if (!at || (this.here && this.here.square === at.square)) return
+    // The branch may only be known now (a folder without git learns the room's default branch after
+    // the relay's quilt message): the session's own sync holds before the block opens, every time, or
+    // it writes the read-only branch document's older copy over the square's files and the block takes
+    // that for this member's edits (2026-11-01: an agent's new folder put 166 stale files into main's square).
+    if (s.enterSquare && entered !== at.square) s.enterSquare(at, quilt)
     await this.openHere(at, quilt)
   }
 
@@ -349,13 +356,18 @@ export class SquareFollower {
     const here = { square: at.square, quilt, block: null, problem: '', opening: true }
     this.here = here
     if (s.scheduleStatusWrite) s.scheduleStatusWrite()
+    // A folder that joined the quilt empty (Session.joinedEmpty): what it has is the session's sync from
+    // the read-only branch document, an older copy of the square's files. Its first look takes nothing
+    // of that for its edits (no refused writes, boxes or branch work of its own); only a file changed
+    // on disk since the session wrote it is the member's.
+    const empty = !fresh && !!s.joinedEmpty
     try {
       // Edits the read-only branch document refused (they reached it after the switch) are the folder's too.
-      const unsent = !fresh && s.unsentPaths ? await s.unsentPaths().catch(() => null) : null
+      const unsent = !fresh && !empty && s.unsentPaths ? await s.unsentPaths().catch(() => null) : null
       const block = await this.open({
         dir: s.root,
         // A square opened for this folder's branch (Session.openSquareHere: the branch had none) takes the folder as it is: its files are the work.
-        inPlace: fresh ? { edited: () => false, fresh: true } : s.folderWins === at.square ? { edited: () => true } : { edited: (p) => s.editedSinceSync(p) || !!(unsent && unsent.has(p)) || !!(s.boxedHere && s.boxedHere(p)), boxed: (p) => !!(s.boxedHere && s.boxedHere(p)), heldBack: (p) => !!(s.heldBackHere && s.heldBackHere(p)), synced: (p) => !!(s.syncedHere && s.syncedHere(p)), base: s.syncedText ? (p) => s.syncedText(p) : null, own: () => (s.branchOwnPaths ? s.branchOwnPaths() : null), atTip: ((quilt && quilt.atTip) || []).includes(s.squareBranchKey ? s.squareBranchKey() : s.branchKey()) },
+        inPlace: fresh ? { edited: () => false, fresh: true } : empty ? { edited: (p) => !!(s.editedSinceSync && s.editedSinceSync(p)), fresh: true } : s.folderWins === at.square ? { edited: () => true } : { edited: (p) => s.editedSinceSync(p) || !!(unsent && unsent.has(p)) || !!(s.boxedHere && s.boxedHere(p)), boxed: (p) => !!(s.boxedHere && s.boxedHere(p)), heldBack: (p) => !!(s.heldBackHere && s.heldBackHere(p)), synced: (p) => !!(s.syncedHere && s.syncedHere(p)), base: s.syncedText ? (p) => s.syncedText(p) : null, own: () => (s.branchOwnPaths ? s.branchOwnPaths() : null), atTip: ((quilt && quilt.atTip) || []).includes(s.squareBranchKey ? s.squareBranchKey() : s.branchKey()) },
         skip: (p) => !s.syncable(p),
         skipDir: s.ignoredDir ? (p) => s.ignoredDir(p) : null,
         record: path.join(s.stateDir || path.join(s.root, '.quilt'), 'block.json'),
@@ -371,6 +383,7 @@ export class SquareFollower {
         onEdits: s.squareEdits ? (list, doc, held) => { if (this.here === here) s.squareEdits(list, doc, held) } : null
       })
       if (this.here !== here) { await block.close().catch(() => {}); return }
+      if (empty) s.joinedEmpty = false
       here.block = block
       here.opening = false
       if (s.followSquareDoc) s.followSquareDoc(block.doc)