@kody-ade/kody-engine-lite 0.1.120 → 0.1.121
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/dist/bin/cli.js +15 -4
- package/package.json +1 -1
package/dist/bin/cli.js
CHANGED
|
@@ -6002,13 +6002,24 @@ async function runResolve(options) {
|
|
|
6002
6002
|
logger.info(" Verifying resolution...");
|
|
6003
6003
|
const verify = runQualityGates(projectDir, projectDir);
|
|
6004
6004
|
if (!verify.pass) {
|
|
6005
|
-
const
|
|
6006
|
-
|
|
6005
|
+
const errorText = verify.errors.join("\n");
|
|
6006
|
+
const errorFilePaths = errorText.match(/src\/[^\s(:]+\.[a-z]+/g) ?? [];
|
|
6007
|
+
const resolvedSet = new Set(conflictedFiles);
|
|
6008
|
+
const allPreExisting = errorFilePaths.length > 0 && errorFilePaths.every(
|
|
6009
|
+
(f) => !resolvedSet.has(f) && !conflictedFiles.some((c) => c.endsWith(f))
|
|
6010
|
+
);
|
|
6011
|
+
if (allPreExisting) {
|
|
6012
|
+
logger.warn(" Verification: all errors in files not touched by resolution \u2014 treating as pre-existing, proceeding");
|
|
6013
|
+
} else {
|
|
6014
|
+
const errorSummary = verify.errors.slice(0, 5).join("\n");
|
|
6015
|
+
logger.error(` Verification failed:
|
|
6007
6016
|
${errorSummary}`);
|
|
6008
|
-
|
|
6017
|
+
return { outcome: "failed", error: `Conflict resolution failed verification:
|
|
6009
6018
|
${errorSummary}` };
|
|
6019
|
+
}
|
|
6020
|
+
} else {
|
|
6021
|
+
logger.info(" Verification passed");
|
|
6010
6022
|
}
|
|
6011
|
-
logger.info(" Verification passed");
|
|
6012
6023
|
commitAll(`chore: resolve merge conflicts with ${defaultBranch}`, projectDir);
|
|
6013
6024
|
if (!local) {
|
|
6014
6025
|
pushBranch(projectDir);
|