@fern-api/generator-cli 0.6.8 → 0.6.9

package/dist/api.js

@@ -9938,85 +9938,6 @@ function formatReplayPrBody(result, options) {
   return parts.join("\n");
 }
 
-// src/pipeline/github/postConflictComments.ts
-function resolveGuidance(conflictReason) {
-  switch (conflictReason) {
-    case "same-line-edit":
-      return "You likely want to combine both -- keep your logic while incorporating the generation's structural changes.";
-    case "new-file-both":
-      return "Compare both versions and merge any unique content. If you created the file intentionally, your version is likely correct.";
-    case "base-generation-mismatch":
-      return "Review carefully -- the generated code changed significantly. You may need to re-apply your customization on top of the new structure.";
-    case "patch-apply-failed":
-      return "Your customization could not be applied automatically. Re-apply your changes manually on top of the new generated code.";
-    default:
-      return "Review both sides and keep whichever version (or combination) is correct for your use case.";
-  }
-}
-function buildConflictCommentBody(conflictDetails) {
-  const entries2 = [];
-  for (const detail of conflictDetails) {
-    const description = patchDescription(detail);
-    for (const file of detail.files) {
-      if (file.status === "conflict") {
-        entries2.push({
-          file: file.file,
-          customization: description,
-          reason: formatConflictReason(file.conflictReason),
-          guidance: resolveGuidance(file.conflictReason)
-        });
-      }
-    }
-  }
-  if (entries2.length === 0) {
-    return void 0;
-  }
-  const parts = [];
-  parts.push("## Conflict Resolution Guide\n");
-  parts.push(
-    `This PR has **${entries2.length} file${entries2.length === 1 ? "" : "s"}** where your customizations conflict with the new SDK generation. Below is per-file guidance to help you resolve each conflict.
-`
-  );
-  parts.push(
-    '> In GitHub\'s conflict editor, `<<<<<<< HEAD` ("Accept current") = **new generated code**, `>>>>>>> main` ("Accept incoming") = **your customization**.\n'
-  );
-  parts.push("| File | Your customization | Why it conflicted | Suggested resolution |");
-  parts.push("|------|-------------------|-------------------|---------------------|");
-  for (const entry of entries2) {
-    parts.push(`| \`${entry.file}\` | ${entry.customization} | ${entry.reason} | ${entry.guidance} |`);
-  }
-  parts.push("\n---");
-  parts.push("*Posted by Fern Replay to help resolve SDK customization conflicts.*");
-  return parts.join("\n");
-}
-async function postConflictComments(octokit, owner, repo, prNumber, replayResult, logger) {
-  if (replayResult == null) {
-    return;
-  }
-  const conflictDetails = replayResult.conflictDetails;
-  if (conflictDetails == null || conflictDetails.length === 0) {
-    return;
-  }
-  const body = buildConflictCommentBody(conflictDetails);
-  if (body == null) {
-    logger.debug("No conflict files to comment on -- skipping conflict comment");
-    return;
-  }
-  try {
-    await octokit.issues.createComment({
-      owner,
-      repo,
-      issue_number: prNumber,
-      body
-    });
-    logger.debug(`Posted conflict resolution guide comment on PR #${prNumber}`);
-  } catch (error) {
-    logger.debug(
-      `Could not post conflict comment on PR #${prNumber}: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
 // src/pipeline/steps/BaseStep.ts
 var BaseStep = class {
   constructor(outputDir, logger) {
@@ -10202,9 +10123,6 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    if (!this.config.previewMode && replayConflictInfo?.hasConflicts === true && result.prNumber != null) {
-      await postConflictComments(octokit, owner, repo, result.prNumber, replayResult, this.logger);
-    }
     if (!this.config.previewMode && result.prNumber != null && replayConflictInfo?.hasConflicts === true && replayResult != null) {
       await this.postWebEditorFallbackComment(
         octokit,

package/dist/cli.js

@@ -31065,85 +31065,6 @@ function formatReplayPrBody(result, options) {
   return parts.join("\n");
 }
 
-// src/pipeline/github/postConflictComments.ts
-function resolveGuidance(conflictReason) {
-  switch (conflictReason) {
-    case "same-line-edit":
-      return "You likely want to combine both -- keep your logic while incorporating the generation's structural changes.";
-    case "new-file-both":
-      return "Compare both versions and merge any unique content. If you created the file intentionally, your version is likely correct.";
-    case "base-generation-mismatch":
-      return "Review carefully -- the generated code changed significantly. You may need to re-apply your customization on top of the new structure.";
-    case "patch-apply-failed":
-      return "Your customization could not be applied automatically. Re-apply your changes manually on top of the new generated code.";
-    default:
-      return "Review both sides and keep whichever version (or combination) is correct for your use case.";
-  }
-}
-function buildConflictCommentBody(conflictDetails) {
-  const entries2 = [];
-  for (const detail of conflictDetails) {
-    const description = patchDescription(detail);
-    for (const file of detail.files) {
-      if (file.status === "conflict") {
-        entries2.push({
-          file: file.file,
-          customization: description,
-          reason: formatConflictReason(file.conflictReason),
-          guidance: resolveGuidance(file.conflictReason)
-        });
-      }
-    }
-  }
-  if (entries2.length === 0) {
-    return void 0;
-  }
-  const parts = [];
-  parts.push("## Conflict Resolution Guide\n");
-  parts.push(
-    `This PR has **${entries2.length} file${entries2.length === 1 ? "" : "s"}** where your customizations conflict with the new SDK generation. Below is per-file guidance to help you resolve each conflict.
-`
-  );
-  parts.push(
-    '> In GitHub\'s conflict editor, `<<<<<<< HEAD` ("Accept current") = **new generated code**, `>>>>>>> main` ("Accept incoming") = **your customization**.\n'
-  );
-  parts.push("| File | Your customization | Why it conflicted | Suggested resolution |");
-  parts.push("|------|-------------------|-------------------|---------------------|");
-  for (const entry of entries2) {
-    parts.push(`| \`${entry.file}\` | ${entry.customization} | ${entry.reason} | ${entry.guidance} |`);
-  }
-  parts.push("\n---");
-  parts.push("*Posted by Fern Replay to help resolve SDK customization conflicts.*");
-  return parts.join("\n");
-}
-async function postConflictComments(octokit, owner, repo, prNumber, replayResult, logger) {
-  if (replayResult == null) {
-    return;
-  }
-  const conflictDetails = replayResult.conflictDetails;
-  if (conflictDetails == null || conflictDetails.length === 0) {
-    return;
-  }
-  const body = buildConflictCommentBody(conflictDetails);
-  if (body == null) {
-    logger.debug("No conflict files to comment on -- skipping conflict comment");
-    return;
-  }
-  try {
-    await octokit.issues.createComment({
-      owner,
-      repo,
-      issue_number: prNumber,
-      body
-    });
-    logger.debug(`Posted conflict resolution guide comment on PR #${prNumber}`);
-  } catch (error) {
-    logger.debug(
-      `Could not post conflict comment on PR #${prNumber}: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-}
-
 // src/pipeline/steps/BaseStep.ts
 var BaseStep = class {
   constructor(outputDir, logger) {
@@ -31329,9 +31250,6 @@ var GithubStep = class extends BaseStep {
         }
       }
     }
-    if (!this.config.previewMode && replayConflictInfo?.hasConflicts === true && result.prNumber != null) {
-      await postConflictComments(octokit, owner, repo, result.prNumber, replayResult, this.logger);
-    }
     if (!this.config.previewMode && result.prNumber != null && replayConflictInfo?.hasConflicts === true && replayResult != null) {
       await this.postWebEditorFallbackComment(
         octokit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fern-api/generator-cli",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/fern-api/fern.git",