heyquilt 0.3.140 → 0.3.142

package/RELEASES.md

@@ -11,6 +11,14 @@ Format: `## <version> — <YYYY-MM-DD>`, an optional one-line summary, then bull
 Lead each bullet with a short bold phrase. Inline `code` and **bold** are rendered;
 nothing else is.
 
+## 0.3.142 — 2026-11-01
+
+- **The source control button names your square by its branch.** It said `sq:09a100d0`, which meant nothing to anyone; it now says `main` (or whichever branch your folder is on), and so do its panel and the Squares list. The panel also says plainly that the files waiting to be committed are everyone's edits on that branch, not only yours.
+
+## 0.3.141 — 2026-11-01
+
+- **A new, empty folder joining a session that is already in Seam takes the square as it is.** Its first files come from the session's old copy of the branch, and before, a folder without git could start following its square while that old copy was still being written to it, so every older file went into the square as its own edits (an agent's new folder put 166 stale files into main's square). Now the folder's own syncing stops before it follows the square, and nothing it got from the session is ever counted as its edits.
+
 ## 0.3.140 — 2026-11-01
 
 0.3.139 was tagged but never published; everything meant for it is here.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heyquilt",
-  "version": "0.3.140",
+  "version": "0.3.142",
   "description": "Real-time, tool-agnostic pair vibe coding: sync a project folder live between collaborators using any AI coding tool.",
   "author": {
     "name": "Daniel Carmichael",

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)

package/src/session.js

@@ -592,6 +592,11 @@ export class Session extends EventEmitter {
     this.loadWebhook()
     this.loadOnMention()
     const hadState = this.loadState()
+    // A folder never synced and empty as the session starts: in a session that is a layout-3 quilt already,
+    // whatever it gets before its block opens is the read-only branch document's older copy, never its
+    // member's edits (session-follow.js openHere; 2026-11-01). Cleared by a first word of the quilt that is
+    // not layout 3, and once the block opens.
+    this.joinedEmpty = !hadState && !walk(this.root, this.ig).some((rel) => this.syncable(rel))
     // Restarted while the folder follows its square: its .git is set aside (session-follow.js) and stays so; its branch is the note's.
     this.gitAside = hasGitDir(this.root) ? null : gitAsideOf(this.root)
     if (hadState) this.loadClaims()
@@ -638,6 +643,7 @@ export class Session extends EventEmitter {
     // Seam (Seam's plans/quilt-source-control/16): the relay says when the session is a quilt, and which.
     this.conn.on('quilt', (q) => {
       this.quilt = q
+      if (!(q && q.layout === 3)) this.joinedEmpty = false
       this.emit('quilt', q)
       // At layout 3 this folder follows its branch's square by itself (session-follow.js).
       if (!this.squareFollower) this.squareFollower = new SquareFollower(this)

package/src/ui/seam-model.js

@@ -17,12 +17,22 @@ const quiltName = (st) => (st.quilt && (st.quilt.slug || st.quilt.id)) || 'the q
 /** The square this folder follows, as Seam names it (`sq:` and the end of its id), or ''. */
 export const squareName = (st) => (st && st.square && st.square.short ? `sq:${st.square.short}` : '')
 
+/** The branch whose square this folder follows (`st.squares` is branch -> square name), or ''. */
+export function squareBranch (st) {
+  const name = squareName(st)
+  const hit = name && Object.entries(st.squares || {}).find(([, sq]) => sq === name)
+  return hit ? hit[0] : (name && st.branch) || ''
+}
+
+/** The square as a person reads it: its branch (a square's id means nothing to anyone), or its id when no branch is known. */
+const squareWords = (st) => squareBranch(st) || squareName(st)
+
 /**
  * The source control button at layout 3: { label, title, aria } for the square this folder follows, or
  * why it follows none yet. `label` '' leaves the button with its icon and count only.
  */
 export function seamChip (st) {
-  const name = squareName(st)
+  const name = squareWords(st)
   const s = st.square
   const label = name
   const title = st.moving ? movingCard(st).text
@@ -30,13 +40,13 @@ export function seamChip (st) {
     : st.readOnly && !(s && !s.opening && !s.problem)
     ? `Your edits here are not reaching anyone: ${st.readOnly.why}`
     : !s ? `This session's code is committed and merged in Seam (${quiltName(st)}), and this folder is not following a square yet.`
-      : s.problem ? `This folder's work belongs in square ${name}, but it can't follow it yet: ${s.problem}`
-        : s.opening ? `This folder is starting to follow square ${name}.`
-          : [`This folder's work is live in square ${name} of ${quiltName(st)}. Click to commit it or merge it onto main.`, ...catchUpWords(s)].join(' ')
-  // The number is the square's work not committed yet (everyone's on it): what a commit takes.
+      : s.problem ? `This folder's work belongs on ${name}, but it can't follow it yet: ${s.problem}`
+        : s.opening ? `This folder is starting to follow ${name}.`
+          : [`This folder's work is live on ${name} in ${quiltName(st)}, with everyone else's there. Click to commit it or merge it onto main.`, ...catchUpWords(s)].join(' ')
+  // The number is the square's work not committed yet (everyone's on it, not only yours): what a commit takes.
   const count = s && s.work ? s.work.count : 0
-  const countLine = count ? `${files(count)} not committed in this square.` : ''
-  return { label, title, aria: `Source control: ${name ? `square ${name}` : 'Seam'}${count ? `, ${files(count)} not committed` : ''}`, count, countLine }
+  const countLine = count ? `${files(count)} changed on ${name} and not committed yet, by everyone on it.` : ''
+  return { label, title, aria: `Source control: ${name || 'Seam'}${count ? `, ${files(count)} not committed` : ''}`, count, countLine }
 }
 
 const files = (n) => `${n} file${n === 1 ? '' : 's'}`
@@ -98,10 +108,10 @@ export function squareCard (st) {
  */
 export function squarePanelHtml (st, { busy = '' } = {}) {
   const s = st.square
-  const name = squareName(st)
+  const name = squareWords(st)
   const following = s && !s.opening && !s.problem
   const viewer = !!(st.access && st.access.role === 'viewer')
-  const head = `<div class="br-here sq-here"><div class="br-title">${name ? `Square <b>${esc(name)}</b> of ${esc(quiltName(st))}` : `Code committed and merged in Seam: <b>${esc(quiltName(st))}</b>`}</div>`
+  const head = `<div class="br-here sq-here"><div class="br-title"${squareName(st) ? ` title="Seam's square ${esc(squareName(st))}"` : ''}>${name ? `Live work on <b>${esc(name)}</b> in ${esc(quiltName(st))}` : `Code committed and merged in Seam: <b>${esc(quiltName(st))}</b>`}</div>`
   // While the session moves, nothing is committed or merged from here: the move is what it waits for.
   if (st.moving) return `${head}<div class="br-sub warn">${esc(movingCard(st).text)}</div></div>`
   if (st.squareless) {
@@ -112,13 +122,13 @@ export function squarePanelHtml (st, { busy = '' } = {}) {
     const why = st.readOnly ? st.readOnly.why : s ? s.line : 'This folder is not following a square yet: Quilt opens it by itself once the session says which.'
     return `${head}<div class="br-sub${st.readOnly || (s && s.problem) ? ' warn' : ''}">${esc(why)}</div></div>`
   }
-  const sub = '<div class="br-sub">Every edit here is live for everyone on this square. Commit it to keep a version; merge it to put it on main (GitHub gets main from Seam by itself).</div>'
+  const sub = `<div class="br-sub">Everyone on ${esc(name)} edits this together, live: the files below are everyone's edits, not only yours. Commit them to keep a version; merge them to put them on main (GitHub gets main from Seam by itself).</div>`
   const caught = catchUpWords(s)
   const work = (caught.length ? `<div class="br-sub${s.conflicted ? ' warn' : ''}">${esc(caught.join(' '))}</div>` : '') + workHtml(s.work)
   if (viewer) return `${head}${sub}${work}</div>`
   return `${head}${sub}${work}
     <form class="cp-commit" data-square-commit><input class="input" name="message" placeholder="What this commit is" aria-label="Commit message" maxlength="2000" required autocomplete="off"${busy ? ' disabled' : ''}><button type="submit" class="btn sm primary"${busy ? ' disabled' : ''}>${busy === 'commit' ? 'Committing…' : 'Commit'}</button></form>
-    <div class="sq-acts"><button type="button" class="btn sm" data-square-merge${busy ? ' disabled' : ''} title="Commits what is not committed yet, then merges ${esc(name)} onto main once its checks pass">${busy === 'merge' ? 'Merging…' : 'Merge onto main'}</button></div>
+    <div class="sq-acts"><button type="button" class="btn sm" data-square-merge${busy ? ' disabled' : ''} title="Commits what is not committed yet, then merges it onto main once its checks pass">${busy === 'merge' ? 'Merging…' : 'Merge onto main'}</button></div>
   </div>`
 }
 
@@ -201,7 +211,7 @@ export function squaresSideHtml (st) {
   add(mine, 'you')
   for (const p of st.peers || []) if (p && p.name && p.branch && squares[p.branch] && !(p.persona && p.of === (st.me && st.me.name))) add(squares[p.branch], p.mine ? 'your AI' : p.name)
   const n = st.square && st.square.work ? st.square.work.count : 0
-  const rows = [...groups].map(([sq, who]) => `<li class="sq-side-row${sq === mine ? ' on' : ''}"><div><b>${esc(sq)}</b>${branchOf[sq] ? ` <span class="hint">${esc(branchOf[sq])}</span>` : ''}</div><div class="hint">${esc(who.join(', '))}${sq === mine ? ` · ${n ? `${files(n)} not committed` : 'all committed'}` : ''}</div></li>`).join('')
+  const rows = [...groups].map(([sq, who]) => `<li class="sq-side-row${sq === mine ? ' on' : ''}"><div title="Seam's square ${esc(sq)}"><b>${esc(branchOf[sq] || sq)}</b></div><div class="hint">${esc(who.join(', '))}${sq === mine ? ` · ${n ? `${files(n)} not committed` : 'all committed'}` : ''}</div></li>`).join('')
   // The pane's own title says Squares already (session.js, as it says Boxes outside Seam): no second heading.
   return rows ? `<ul class="sq-side">${rows}</ul>` : ''
 }