isomorphic-jj 1.12.0 → 1.12.1

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## 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.12.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**: 1874 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,9 @@ 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.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorphic-jj",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Jujutsu (jj) version control semantics in pure JavaScript — stable change IDs, fearless undo, no staging area — for Node.js and browsers",
   "type": "module",
   "bin": {

package/src/types.d.ts

@@ -144,9 +144,36 @@ export interface Bookmark {
 // ============================================================================
 
 /**
- * Types of conflicts
+ * Types of conflicts. `'driver-conflict'` is used when a registered merge
+ * driver (see `MergeDriverRegistry`) itself reports a conflict, instead of
+ * one of the built-in path-conflict categories.
+ */
+export type ConflictType =
+  | 'content'
+  | 'path'
+  | 'add-add'
+  | 'delete-modify'
+  | 'modify-delete'
+  | 'driver-conflict';
+
+/**
+ * The competing values a conflict is between. The common, two-way case
+ * (from `merge()`/`rebase()`) populates whichever of `base`/`left`/`right`
+ * actually exist for that path (e.g. `{ left, right }` for an add-add
+ * conflict, `{ base, left, right }` for a three-way content conflict).
+ *
+ * `converge()`'s N-way path (more than two divergent copies of one change,
+ * see `ConflictModel.createNWayConflict()`) instead populates `base` and
+ * `versions`: one entry per distinct value found across all copies that
+ * differs from `base`, each paired with (one of) the commitId(s) that has
+ * it.
  */
-export type ConflictType = 'content' | 'add-add' | 'delete-modify' | 'modify-delete';
+export interface ConflictSides {
+  base?: string | Uint8Array;
+  left?: string | Uint8Array;
+  right?: string | Uint8Array;
+  versions?: Array<{ commitId: string; content: string | Uint8Array }>;
+}
 
 /**
  * A conflict in the repository
@@ -155,9 +182,13 @@ export interface Conflict {
   conflictId: string;
   path: string;
   type: ConflictType;
-  base?: TreeRef;
-  sides: TreeRef[];
+  sides: ConflictSides;
+  message: string;
   resolved: boolean;
+  timestamp: string;
+  /** Present when a merge driver attempted and failed to resolve this conflict. */
+  driverFailed?: boolean;
+  driverError?: string;
 }
 
 /**