heyquilt 0.3.107 → 0.3.108

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.108 — 2026-10-19
+
+- **A git reset over a held file isn't taken as your change.** Moving your branch to a commit from elsewhere (a release made in another clone, say) with `git reset` leaves your files as they were. For a file someone else held, Quilt then measured your copy from the new commit, so it looked as if you had taken that commit's change out: a merge appeared under your name, and the change was briefly removed when they let go. Your copy is now measured from the commit it came from, so nothing is recorded, and the commit's change comes in once they let go.
+
 ## 0.3.107 — 2026-10-19
 
 - **Your cloud AI's sessions stay listed.** Settings → Your AI shows the sessions your cloud AI is in while its machine sleeps and after Quilt's servers restart, instead of "In no session yet". A session nobody named shows as your folder's name, as the rest of the app shows it.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "heyquilt",
-  "version": "0.3.107",
+  "version": "0.3.108",
   "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.js

@@ -2892,7 +2892,7 @@ export class Session extends EventEmitter {
     if (changed.length && this.followsRelay && this.branchLive()) {
       const atHead = await filesAt(this.root, head.sha, changed)
       const has = () => atHead && changed.every((rel) => this.sharedKey(rel) === (atHead.get(rel) ?? undefined))
-      if (atHead && !atHead.failed && (has() || await this.relayHasPull(head.sha, has))) old = atHead
+      if (atHead && !atHead.failed && (has() || await this.relayHasPull(head.sha, has))) old = this.pulledBases(changed, old, atHead)
     }
     if (old.failed) this.log(`⚠️ git could not read ${old.failed} file${old.failed === 1 ? '' : 's'} at the old commit; merged without a base, so where they differ the newer version stays`)
     // A file git made the person resolve (stash pop, rebase) holds their merge of the commits and the
@@ -2927,6 +2927,31 @@ export class Session extends EventEmitter {
     }
   }
 
+  /**
+   * The base of each pulled path once the relay is at the pulled commit (planSettle): the file at that commit,
+   * so the pull's change isn't shared again on top of the relay's. Not for a file the session doesn't have at
+   * that commit (the relay holds GitHub's change while someone holds the file) whose disk doesn't have the
+   * pull's change either (git moved the branch and left the file, as `git reset` does): measured from the
+   * commit, the disk would look like it took the pull's change away. That one is measured from the old commit.
+   */
+  pulledBases (rels, old, atHead) {
+    const out = new Map(atHead)
+    out.failed = 0
+    const text = (k) => typeof k === 'string' && !k.startsWith('bin:')
+    for (const rel of rels) {
+      const pulled = atHead.get(rel) ?? undefined
+      const was = old.get(rel) ?? undefined
+      if (pulled === was || this.sharedKey(rel) === pulled) continue
+      const disk = this.readDisk(rel)
+      const ours = disk && !disk.skip && !disk.tooLarge ? disk.key : null
+      if (ours === pulled) continue
+      // The disk has the pull's change when combining the pull into it changes nothing.
+      const hasPull = text(ours) && text(was) && text(pulled) && (() => { const m = merge3(was, ours, pulled); return !m.conflicts.length && m.text === ours })()
+      if (!hasPull) out.set(rel, old.get(rel))
+    }
+    return out
+  }
+
   onDisk (rel) {
     try { fs.lstatSync(path.join(this.root, ...rel.split('/'))); return true } catch { return false }
   }