@gitkraken/conflict-tools 0.2.4-beta.12 → 0.2.4-beta.13

package/CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Added
 
+- Cross-file fixes in the fix phase (opt-in `ResolverConfig.fix`). After per-file convergence, a project-tier broken reference (an import/cross-file use whose target stopped resolving) is routed to the refine of its **use-site** file: the finding becomes a fix instruction, and the whole set is re-detected, up to `crossFileMaxIterations` rounds (default 2). Each cross-file fix is a single refine pass plus a mandatory per-file re-validation; the final whole-set detection also re-checks per-file for files a cross-file fix touched. **Limitation:** only use-site files that have an AI resolution are routed — a cross-file break landing on an auto-merged file (no resolution to carry the edit) is reported but not auto-fixed yet (needs a patches channel). The definition side, if broken, arrives as its own finding on its own file. Report-only (fix off) is unchanged.
 - Per-file fix loop (opt-in via `ResolverConfig.fix`, default `false`). When enabled, an AI-resolved (`strategy: 'ai'`) text file that carries error-severity per-file findings is routed back through refine: the findings become fix instructions, the file is re-analyzed after each edit, and the loop repeats until the file is clean, a round makes no progress, or `fixLoopMaxIterations` (default 3) is reached. Whatever it cannot fix stays in the findings, so the verdict reflects the post-fix state. The no-markers invariant holds (a fix that reintroduces markers is discarded). New progress events `fix:started` / `fix:completed`. Report-only (fix off) is unchanged. Deferred for the opt-in fix path: rebase per-step-ref/transient discipline, parser/validator call caching, cross-file fixes, and a full finding-lifecycle model (double-counting is handled here by fingerprint dedup when folding findings into the report).
 - `collectFileFindings` — a per-file detection unit (structural + intra-file broken references + consumer validator issues, all `tier: 'file'`) over already-loaded parent snapshots; the fix loop re-runs it after each edit. `detect()` remains the authoritative whole-set report.
 - Reference-integrity detection. `resolveConflicts` now attaches a `StepResult.detection` report listing broken references (symbols that resolved in a pre-merge parent but no longer resolve in the merged result, with provenance), duplicate definitions, and syntax errors in the resolved files. Detection is opt-in via a new `ParserPort` (`ResolverDeps.parser`) that supplies parsing/symbol resolution per surface (tree-sitter, language server); when it is absent, unavailable, or a file's language is unsupported, the report says so rather than implying a clean result. Report-only in this release — no automatic fixing.

package/dist/ports/model.d.ts

@@ -41,6 +41,9 @@ interface ResolverConfig {
   fix?: boolean;
   /** Max per-file fix iterations (refine → re-detect the file) when `fix` is on. Default 3. */
   fixLoopMaxIterations?: number;
+  /** Max cross-file fix rounds (route project-level breaks to their use-site file → re-detect the whole
+   *  set) when `fix` is on. Default 2. */
+  crossFileMaxIterations?: number;
 }
 //#endregion
 export { ConflictModelMessage, ConflictModelParams, ConflictModelPort, ConflictModelResult, ResolverConfig };

package/dist/resolver/fix-loop.d.ts

@@ -1,4 +1,6 @@
-import { Resolution } from "../types/resolution.js";
+import { ConflictGitPort } from "../ports/git.js";
+import { DetectionReport } from "../types/findings.js";
+import { Resolution, ResolutionContext } from "../types/resolution.js";
 import { ConflictModelPort, ResolverConfig } from "../ports/model.js";
 import { ParserPort } from "../ports/parser.js";
 import { Validator } from "../ports/verify.js";
@@ -24,5 +26,25 @@ interface FixLoopDeps {
  * caller should invoke this only for AI-resolved (`strategy: 'ai'`) text files.
  */
 declare function runFixLoop(resolution: Resolution, oursContent: string | undefined, theirsContent: string | undefined, deps: FixLoopDeps): Promise<Resolution>;
+interface FixPhaseDeps {
+  model: ConflictModelPort;
+  git: ConflictGitPort;
+  parser: ParserPort;
+  validator?: Validator;
+  config?: ResolverConfig;
+  onProgress?: (event: ConflictProgressEvent) => void;
+  signal?: AbortSignal;
+}
+/**
+ * The fix phase (opt-in). Stage 2: per-file convergence over each AI resolution ({@link runFixLoop}).
+ * Stage 3: route cross-file (`tier: 'project'`) broken references back to the refine of their use-site
+ * file and re-detect over the whole set, up to `crossFileMaxIterations` rounds. Mutates `resolutions`
+ * in place and returns the final whole-set {@link DetectionReport} — which, being whole-set, also
+ * re-checks per-file for files touched by cross-file fixes.
+ *
+ * Cross-file findings on files without an AI resolution (e.g. auto-merged) are not routed: they have no
+ * carrier for an edit yet (needs a patches channel), so they remain in the report unchanged.
+ */
+declare function runFixPhase(resolutions: Resolution[], context: ResolutionContext, deps: FixPhaseDeps): Promise<DetectionReport>;
 //#endregion
-export { FixLoopDeps, runFixLoop };
+export { FixLoopDeps, FixPhaseDeps, runFixLoop, runFixPhase };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitkraken/conflict-tools",
-  "version": "0.2.4-beta.12",
+  "version": "0.2.4-beta.13",
   "description": "AI-powered git conflict resolution.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Axosoft, LLC dba GitKraken",