@kody-ade/kody-engine-lite 0.1.119 → 0.1.121

package/dist/bin/cli.js

@@ -4414,7 +4414,7 @@ async function executeVerifyWithAutofix(ctx, def) {
       const defaultRunner = getRunnerForStage(ctx, "taskify");
       const diagConfig = getProjectConfig();
       const diagEnv = {};
-      if (needsLitellmProxy(diagConfig)) {
+      if (anyStageNeedsProxy(diagConfig)) {
         diagEnv.ANTHROPIC_BASE_URL = getLitellmUrl();
       }
       const diagnosis = await diagnoseFailure(
@@ -5988,7 +5988,7 @@ async function runResolve(options) {
   }
   const model = resolveModel("mid");
   const extraEnv = {};
-  if (needsLitellmProxy(config)) {
+  if (anyStageNeedsProxy(config)) {
     extraEnv.ANTHROPIC_BASE_URL = getLitellmUrl();
   }
   logger.info(`  Running agent to resolve conflicts (model=${model})...`);
@@ -6002,13 +6002,24 @@ async function runResolve(options) {
   logger.info("  Verifying resolution...");
   const verify = runQualityGates(projectDir, projectDir);
   if (!verify.pass) {
-    const errorSummary = verify.errors.slice(0, 5).join("\n");
-    logger.error(`  Verification failed:
+    const errorText = verify.errors.join("\n");
+    const errorFilePaths = errorText.match(/src\/[^\s(:]+\.[a-z]+/g) ?? [];
+    const resolvedSet = new Set(conflictedFiles);
+    const allPreExisting = errorFilePaths.length > 0 && errorFilePaths.every(
+      (f) => !resolvedSet.has(f) && !conflictedFiles.some((c) => c.endsWith(f))
+    );
+    if (allPreExisting) {
+      logger.warn("  Verification: all errors in files not touched by resolution \u2014 treating as pre-existing, proceeding");
+    } else {
+      const errorSummary = verify.errors.slice(0, 5).join("\n");
+      logger.error(`  Verification failed:
 ${errorSummary}`);
-    return { outcome: "failed", error: `Conflict resolution failed verification:
+      return { outcome: "failed", error: `Conflict resolution failed verification:
 ${errorSummary}` };
+    }
+  } else {
+    logger.info("  Verification passed");
   }
-  logger.info("  Verification passed");
   commitAll(`chore: resolve merge conflicts with ${defaultBranch}`, projectDir);
   if (!local) {
     pushBranch(projectDir);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kody-ade/kody-engine-lite",
 
-  "version": "0.1.119",
+  "version": "0.1.121",
   "description": "Autonomous SDLC pipeline: Kody orchestration + Claude Code + LiteLLM",
   "license": "MIT",
   "type": "module",