@gitkraken/conflict-tools 0.2.2-beta.5 → 0.2.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [0.2.3] - 2026-07-06
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- `summarizeOperation(result, opts)` returns an `OperationSummary` for a resolve operation: a deterministic `digest` (file/conflict counts, per-strategy tallies, lowest confidence, and a `needsReview` list of files below the confidence threshold), plus an optional prose narrative when a model is passed via `opts.model`.
|
|
15
|
+
- `buildOperationDigest(result, reviewThreshold?)` computes that digest without a model. The review threshold defaults to 0.8.
|
|
16
|
+
- `ResolvedChunk` now carries optional per-marker `confidence` and `reason` for AI-decided chunks.
|
|
17
|
+
- Exported `OperationDigest`, `OperationSummary`, `ReviewItem`, and `SummarizeOperationOptions` types.
|
|
18
|
+
|
|
19
|
+
## [0.2.2] - 2026-06-29
|
|
20
|
+
|
|
10
21
|
### Fixed
|
|
11
22
|
|
|
12
23
|
- The emergency fallback (taken when the resolver exhausts its steps and a `fallbackStrategy` is configured) now reports `confidence: 0` instead of `1`, so a blind take-one-side result no longer masquerades as a fully-confident resolution. The taken side's `strategy` and `content` are unchanged.
|