isomorphic-jj 1.12.0 → 1.13.0

package/CHANGELOG.md

@@ -1,5 +1,113 @@
 # Changelog
 
+## 1.13.0 — 2026-10-05 — Write-path fixes: converge on a fresh instance, new files lost on edit(), rebase content
+
+Fixed in [PR #52](https://github.com/johnhenry/isomorphic-jj/pull/52).
+
+Three bugs found while wiring a consumer (JJHub's isomorphic jj engine)
+to write through this library, constructing one fresh `createJJ()`
+instance per call so no read is ever served from a stale cache. Two of
+them change observable behavior, hence a minor bump.
+
+### Fixed
+
+- **`converge()` threw `WORKING_COPY_NOT_LOADED` on a fresh instance.**
+  Both outcomes record the working copy in their operation, but
+  `converge()` loaded only the graph and user config — so it only worked
+  after some earlier call on the same instance had loaded the working
+  copy. It now loads it itself. Regression tests: "on a fresh instance"
+  in `tests/integration/converge.test.js`.
+- **A new file `write()` created was deleted by the next `edit()` away.**
+  `write()` tracks a file without recording it in the working-copy
+  change (the next command commits it, as in jj), but `edit()` first
+  deleted every tracked file missing from the change being left, as
+  cross-branch "pollution" from an earlier checkout. Since issue #30 every
+  switch fully syncs the working directory to its target, so nothing
+  leaks that way any more; what the cleanup actually removed was every new
+  file — top-level or nested — written into that change. Edits to files
+  already recorded survived, which made it look path-dependent. `edit()`
+  now commits every tracked file into the change it leaves, like
+  `new()`/`describe()`. **Behavior change:** a tracked file on disk is
+  now always the checked-out change's content when `edit()` leaves it;
+  code that removed a file from a change by editing the graph alone (not
+  `remove()`) must now remove it from disk too —
+  `tests/integration/issue-43-restore-reliability.test.js`'s
+  descendant-deletion test did exactly that and now uses `remove()`.
+  Regression tests: "write() then edit() away" in
+  `tests/integration/file-operations.test.js`.
+- **`moveChange()`/`rebase()` kept the change's own tree verbatim.** The
+  three-way conflict check from issue #31 ran, but the rebased content
+  was never derived from it: the change kept every file only its OLD
+  parent had and never picked up what only the NEW parent changed. Its
+  content is now jj's rebase, path by path — the new parent's value
+  wherever the change didn't touch a path relative to its old parent,
+  the change's own value wherever it did (a path both sides changed
+  differently is the conflict #31 already reports, with markers). When
+  the moved change is checked out, its files on disk are synced to the
+  result. **Behavior change:** a rebased change's `fileSnapshot` now
+  differs from before for any path its old and new parents disagree on.
+  Regression tests: "content of the rebased change" in
+  `tests/integration/rebase-conflict-detection.test.js`.
+
+### Not changed
+
+- `moveChange()` still re-derives only the moved change's own content,
+  not that of its descendants (they follow it structurally, by parent
+  change id, but keep their trees) — see the README's status section.
+- Conflict detection still compares whole files, not lines: two sides
+  changing different lines of one file is a conflict.
+
+### Testing
+
+1882 tests passing, 0 skipped; lint, format:check, typecheck, and all 12
+`examples/*.mjs` green; coverage 97.39% statements / 90.13% branches
+(gate 90%). Each new regression test fails against 1.12.1's source.
+
+## 1.12.1 — 2026-09-27 — Conflict type shape + README status refresh
+
+A cross-library documentation/typing audit flagged four things to verify
+against current code; two turned out already fixed (`converge()`'s JSDoc
+already documents N-way behavior as of #32/#35's 0.4.0 follow-up), one is
+tracked as a design question instead of guessed at (see the "public,
+untyped internal components" issue on `jj.graph` and its siblings), and
+this release covers the two that were genuinely stale.
+
+### Fixed
+
+- **`Conflict`/`ConflictType` in `src/types.d.ts` didn't match the shape
+  `ConflictModel` actually constructs.** `sides` was typed as `TreeRef[]`
+  (an array of tree hashes); every real `Conflict` object has `sides` as
+  an *object* — `{ left, right }`, `{ base, left, right }`, or (for
+  `converge()`'s N-way case, `ConflictModel.createNWayConflict()`)
+  `{ base, versions }` where `versions` is
+  `Array<{ commitId, content }>`. The interface was also missing
+  `message`, `timestamp`, and the optional `driverFailed`/`driverError`
+  fields that `_createConflict()` actually sets, and `ConflictType` was
+  missing the `'path'` and `'driver-conflict'` values `ConflictModel`
+  uses. Added a `ConflictSides` type covering both the two-way and N-way
+  shapes and corrected `Conflict` to match reality. Type-only change (the
+  `.d.ts` file has no runtime code), so nothing about the library's actual
+  behavior changes — this only fixes what TypeScript consumers see.
+- **README's "Project Status" section was frozen at the pre-`@johnhenry`
+  rename numbering.** It read "Current Version: 0.3.0" (actual:
+  1.12.0), cited "1823 tests" (actual: 1874), and its roadmap stopped at
+  0.3.0 with no mention of 0.4.0's N-way `converge()` (#32/#35), the
+  1.9.0 scoped/unscoped version-lineage merge (#36), or the 1.9.1–1.12.0
+  operation-log reliability pass (#37–#39, #41, #43, #45, #48). Also
+  corrected the provenance note's "reached v1.7.0 before the rename" to
+  the CHANGELOG's own recorded **v1.8.0** ceiling (see the 1.9.0 entry
+  below), and clarified that "Not yet 1.0" refers to API stability, not
+  the version number (which is already past 1.0 purely because merging
+  the two lineages forced it above the unscoped side's prior ceiling).
+  The Node 26 / `engines.node` note was checked too and was already
+  accurate — no change needed there.
+
+### Testing
+
+1874 tests passing, 0 skipped; lint (0 errors), format:check, typecheck,
+and all 12 `examples/*.mjs` green; coverage 97.39% statements / 90.11%
+branches / 99.08% functions / 97.63% lines (branch gate is 90%).
+
 ## 1.12.0 — 2026-09-27 — op-recording gaps left by #43/#45's fixes (#48)
 
 Follow-up to #43/#45 (below). Walking every op backward then forward now

package/README.md

@@ -1020,10 +1020,10 @@ repo/
 
 ## Project Status
 
-**Current Version**: 0.3.0 (`@johnhenry/isomorphic-jj`; same library/API lineage as the old `isomorphic-jj`, which reached v1.7.0 before the rename — see the provenance note at the top of this file)
-**Test Coverage**: 1823 tests passing, ~97% statements / 91% branches
+**Current Version**: 1.13.0 (`@johnhenry/isomorphic-jj`; same library/API lineage as the old `isomorphic-jj`, which reached v1.8.0 before the rename — see the provenance note at the top of this file, and the CHANGELOG's `1.9.0` entry for how the scoped/unscoped version lineages were merged back together)
+**Test Coverage**: 1882 tests passing, ~97% statements / 90% branches
 **JJ CLI parity**: tracks Jujutsu through v0.45.1
-**Status**: Actively developed; broad JJ CLI semantic parity, used in the examples/apps in this repo and in [JJHub](#family). Not yet 1.0 — API surface can still shift; pin a version and read the CHANGELOG before upgrading.
+**Status**: Actively developed; broad JJ CLI semantic parity, used in the examples/apps in this repo and in [JJHub](#family). Not yet 1.0 in the API-stability sense (the version number is past 1.0 only because merging the scoped/unscoped lineages forced it above the unscoped side's prior ceiling, not because the API is frozen) — API surface can still shift; pin a version and read the CHANGELOG before upgrading.
 
 **Completed:**
 - ✅ v0.1: Core JJ experience (stable IDs, undo, bookmarks, revsets)
@@ -1036,6 +1036,10 @@ repo/
 - ✅ 0.1.0 (post-rename): Parity refresh tracking jj through **v0.44** — `tag.track()`/`tag.untrack()`, the `builtin_log()` revset alias, and `file.search({ nameOnly: true })`; `git_refs()`/`git_head()` documented as deprecated (jj removed both in v0.43). See [CHANGELOG.md](./CHANGELOG.md) for what was deliberately left for a maintainer call (`jj run`, fetch-time remote tag/bookmark import).
 - ✅ 0.2.0: Storage-layer audit fixes — same-process storage locking, `undo()` reverting in-place graph/tag mutations, ambiguous change-id detection, categorized `push()` error codes, a conflict-marker newline fix, atomic protobuf writes, and open-ended revset ranges (`..b`, `a..`, `::`). See [CHANGELOG.md](./CHANGELOG.md).
 - ✅ 0.3.0: Parity refresh tracking jj through **v0.45.1** — a working `/browser` entry (async `createBrowserFS()`, bundle-safe protobuf schema loading, no stray Node-only imports), `undo()`/`operations.restore()` reverting graph rewrites with real progressive undo/redo, `squash()`/`abandon()`/`edit()`/`new()` fully syncing content instead of only metadata, `rebase()` performing a real three-way merge and recording conflicts, and the new `converge()` command (jj v0.45.0) to auto-resolve divergent commits. See [CHANGELOG.md](./CHANGELOG.md).
+- ✅ 0.4.0: `converge()` generalized from pairwise to N-way — any number of divergent copies of one change id resolve in a single call, matching how jj's own underlying engine already treats divergence internally (issue #32). See [CHANGELOG.md](./CHANGELOG.md).
+- ✅ 1.9.0: Scoped (`@johnhenry/isomorphic-jj`) and unscoped (`isomorphic-jj`) version lineages merged into one shared version going forward, with both names dual-published on every release.
+- ✅ 1.13.0: Write-path fixes — `converge()` works on a fresh instance, `edit()` no longer deletes new files `write()` created in the change it leaves, and `moveChange()`/`rebase()` derives the rebased change's content (new parent + the change's own edits) instead of keeping its tree verbatim. Not done: a rebase re-derives only the moved change's content, not its descendants', and conflicts are detected per whole file, not per line. See [CHANGELOG.md](./CHANGELOG.md).
+- ✅ 1.9.1 – 1.12.0: Operation-log reliability pass — `undo()`/`operations.restore()` correctness across write/snapshot/squash/rebase/abandon/edit, `log()` visibility fixes, and recording gaps in descendant rebases and conflict-resolution ops (issues #37–#39, #41, #43, #45, #48). See [CHANGELOG.md](./CHANGELOG.md) for the full per-fix breakdown.
 
 See [ROADMAP.md](./ROADMAP.md) for detailed plans, and [CHANGELOG.md](./CHANGELOG.md) for the release history.
 

package/dist/index.cjs

@@ -9330,6 +9330,27 @@ async function createJJ(options) {
         await conflicts.addConflict(conflict);
       }
 
+      // The rebased change's content, path by path: (new base) + (what the
+      // change itself did relative to its old base), as jj's rebase. It
+      // used to keep its own full tree verbatim — keeping every file only
+      // the OLD base had and never picking up what only the NEW base
+      // changed. A path both sides changed differently keeps the change's
+      // own value here; if that's a real conflict, detectConflicts() above
+      // reported it and the marker text below replaces it.
+      const contentChanged = Boolean(oldParentChange);
+      if (oldParentChange) {
+        /** @type {Record<string, string>} */
+        const rebased = {};
+        const allPaths = new Set([...baseFiles.keys(), ...leftFiles.keys(), ...rightFiles.keys()]);
+        for (const filePath of allPaths) {
+          const baseValue = baseFiles.get(filePath);
+          const ownValue = leftFiles.get(filePath);
+          const value = ownValue === baseValue ? rightFiles.get(filePath) : ownValue;
+          if (value !== undefined) rebased[filePath] = value;
+        }
+        change.fileSnapshot = rebased;
+      }
+
       // Materialize real conflict-marker text into the moved change's file
       // content — issue #43(3): rebase()/moveChange() used to record the
       // conflict correctly as DATA (via conflicts.addConflict() above) but
@@ -9371,6 +9392,13 @@ async function createJJ(options) {
         }
       }
 
+      // A checked-out change's files on disk are its content: bring them in
+      // line with the rebased snapshot (markers included), tracked, so the
+      // next command's auto-snapshot finds nothing to re-record.
+      if (contentChanged && changeId === workingCopy.getCurrentChangeId()) {
+        await syncWorkingCopyFiles(change.fileSnapshot || {});
+      }
+
       // Update parent
       change.parents = [newParent];
       await graph.updateChange(change);
@@ -10354,29 +10382,18 @@ async function createJJ(options) {
       // see issue #29.
       const fileSnapshotBeforeSwitch = await snapshotFilesystem();
 
-      // CRITICAL FIX: Clean working directory BEFORE snapshotting to prevent cross-branch pollution
-      // Remove files that don't belong to the current changeId before we snapshot it
+      // Commit the change being left: every tracked file on disk is its
+      // content, as in new()/describe(). This used to first DELETE every
+      // tracked file missing from the change's recorded fileSnapshot, as
+      // "pollution" from an earlier checkout — but a switch now fully syncs
+      // the working directory to its target (issue #30, below), so nothing
+      // leaks that way any more, and what that cleanup actually deleted was
+      // every new file write() had created in this change: write() tracks a
+      // file without recording it in the change, so it is only committed
+      // here, by the next command.
       if (previousChangeId !== args.changeId) {
         const previousChange = await graph.getChange(previousChangeId);
         if (previousChange) {
-          const previousSnapshot = previousChange.fileSnapshot || {};
-          const workingDirFiles = await workingCopy.listFiles();
-
-          // Delete files that exist in working dir but NOT in previous changeId's snapshot
-          // This removes pollution from other branches that were previously checked out
-          for (const filePath of workingDirFiles) {
-            if (!previousSnapshot[filePath]) {
-              try {
-                const fullPath = join(dir, filePath);
-                await fs.promises.unlink(fullPath);
-                await workingCopy.untrackFile(filePath);
-              } catch (error) {
-                // Ignore errors - file might already be deleted or inaccessible
-              }
-            }
-          }
-
-          // Now snapshot the CLEAN working directory (no pollution!)
           const currentSnapshot = await snapshotFilesystem();
           if (currentSnapshot && Object.keys(currentSnapshot).length > 0) {
             changeSnapshot[previousChangeId] = structuredClone(previousChange);
@@ -11681,6 +11698,9 @@ async function createJJ(options) {
       }
 
       await graph.load();
+      // Both outcomes below record the working copy in their operation —
+      // a fresh instance hasn't loaded it yet.
+      await workingCopy.load();
       await userConfig.load();
       const siblings = graph.getDivergentSiblings(changeId);