heyquilt 0.3.141 → 0.3.142

package/RELEASES.md

@@ -11,6 +11,10 @@ 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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heyquilt",
-  "version": "0.3.141",
+  "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/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>` : ''
 }