Revert last two commits

Author: samruddha8

packages/mcp-provider-devops/src/resolveDeploymentFailure.ts

@@ -18,26 +18,19 @@ function isMergeConflict(errorSummary: string): boolean {
 export interface ResolveDeploymentFailureOptions {
   localPath: string;
   sourceBranchName: string;
-  targetBranchName?: string;
 }
 
 /**
  * Can full promotion fix this failure?
  * - Merge conflict → no; use merge conflict tool.
  * - Missing dependency (e.g. "Variable does not exist: X"): need localPath to check source branch;
- *   if not provided → local_path_required; if provided and dependency in source → yes; else no.
- *   When targetBranchName is provided, also checks target branch and returns inTargetBranch for comparison.
+ *   if not provided → local_path_required; if provided and dependency in branch → yes; else no.
  * - All other errors → yes.
  */
 export function canFullPromotionFixFailure(
   errorDetails: string,
   options?: ResolveDeploymentFailureOptions
-): {
-  canFix: boolean;
-  reason: string;
-  missingDependencyName?: string;
-  inTargetBranch?: boolean;
-} {
+): { canFix: boolean; reason: string; missingDependencyName?: string } {
   if (isMergeConflict(errorDetails)) {
     return { canFix: false, reason: "merge_conflict" };
   }
@@ -52,30 +45,17 @@ export function canFullPromotionFixFailure(
       };
     }
     const paths = getSourcePathsForDependency(dependency.type, dependency.name);
-    const inSource =
+    const inBranch =
       paths.length > 0 &&
       isDependencyPresentInBranch(options.localPath, options.sourceBranchName, paths);
-    if (!inSource) {
+    if (!inBranch) {
       return {
         canFix: false,
         reason: "dependency_not_in_source_branch",
         missingDependencyName: dependency.name,
       };
     }
-    let inTargetBranch: boolean | undefined;
-    if (options.targetBranchName && paths.length > 0) {
-      inTargetBranch = isDependencyPresentInBranch(
-        options.localPath,
-        options.targetBranchName,
-        paths
-      );
-    }
-    return {
-      canFix: true,
-      reason: "dependency_in_source_branch",
-      missingDependencyName: dependency.name,
-      inTargetBranch,
-    };
+    return { canFix: true, reason: "dependency_in_source_branch" };
   }
 
   return { canFix: true, reason: "full_promotion_can_fix" };

packages/mcp-provider-devops/src/shared/dependencyInBranch.ts

@@ -71,36 +71,22 @@ export function getSourcePathsForDependency(type: string, name: string): string[
 }
 
 /**
- * Try to run git show for a ref:path; try ref first, then origin/ref if ref is not a valid ref.
+ * Check whether at least one of the given paths exists in the given git branch.
+ * Paths must use forward slashes (git convention).
  */
-function gitShowInBranch(repoPath: string, branch: string, relativePath: string): boolean {
-  const normalized = relativePath.split(path.sep).join("/");
-  const refsToTry = [branch, `origin/${branch}`];
-  for (const ref of refsToTry) {
+export function isDependencyPresentInBranch(repoPath: string, branch: string, relativePaths: string[]): boolean {
+  for (const p of relativePaths) {
+    const normalized = p.split(path.sep).join("/");
     try {
-      execSync(`git show "${ref}:${normalized}"`, {
+      execSync(`git show "${branch}:${normalized}"`, {
         cwd: repoPath,
         stdio: ["ignore", "pipe", "pipe"],
         encoding: "utf8",
         maxBuffer: 1024 * 1024,
       });
       return true;
     } catch {
-      // ref invalid or file not in branch
-    }
-  }
-  return false;
-}
-
-/**
- * Check whether at least one of the given paths exists in the given git branch.
- * Paths must use forward slashes (git convention).
- * Tries branch name first, then origin/branch when branch is only available as a remote ref.
- */
-export function isDependencyPresentInBranch(repoPath: string, branch: string, relativePaths: string[]): boolean {
-  for (const p of relativePaths) {
-    if (gitShowInBranch(repoPath, branch, p)) {
-      return true;
+      // file not in branch or path invalid
     }
   }
   return false;

packages/mcp-provider-devops/src/tools/sfDevopsResolveDeploymentFailure.ts

@@ -9,9 +9,8 @@ const inputSchema = z.object({
   usernameOrAlias: usernameOrAliasParam,
   workItemName: z.string().min(1).describe("Work Item name (mandatory). Exact name of the work item that failed deployment."),
   sourceBranchName: z.string().min(1).describe("Source branch name (mandatory). The work item branch where the change lives."),
-  targetBranchName: z.string().min(1).optional().describe("Target branch name (optional). When provided with localPath, the tool compares source and target to determine if the missing dependency is in source but not in target, confirming full promotion will resolve the failure."),
   errorDetails: z.string().min(1).describe("Error details from the failed deployment (mandatory). Used to determine if full promotion can fix the failure."),
-  localPath: z.string().optional().describe("Local path to the repository (defaults to current working directory)")
+  localPath: z.string().optional().describe("Local path to the repository (optional). Required only for dependency-type errors: used to check if the source branch contains the missing dependency. If provided and valid, the tool checks the branch; if dependency is present, full promotion can fix.")
 });
 type InputArgs = z.infer<typeof inputSchema>;
 type InputArgsShape = typeof inputSchema.shape;
@@ -42,12 +41,12 @@ export class SfDevopsResolveDeploymentFailure extends McpTool<InputArgsShape, Ou
       title: "Resolve Deployment Failure",
       description: `Determine if **full promotion** can fix a deployment failure and guide the user.
 
-**Inputs:** workItemName (mandatory), sourceBranchName (mandatory), errorDetails (mandatory), localPath (optional; defaults to current working directory), targetBranchName (optional; when provided, source and target are compared to confirm if full promotion will resolve).
+**Inputs:** workItemName (mandatory), sourceBranchName (mandatory), errorDetails (mandatory), localPath (optional).
 
 **Behavior:**
 1. **If full promotion cannot fix** (e.g. merge conflict): Return instructions to use **resolve_devops_center_merge_conflict** or to add the missing dependency in a separate work item.
 2. **If full promotion can fix** (anything other than merge conflict):
-   - For dependency-type errors (e.g. "Variable does not exist"): Use **localPath** to check whether the missing dependency exists in the source branch. If **targetBranchName** is provided, the tool compares source and target (dependency in source but not in target → full promotion will resolve). If **present in source** → ask the user for confirmation (see below). If **not present in source** → instruct the user to create a new work item for the missing dependency, promote it first, then retry.
+   - For dependency-type errors (e.g. "Variable does not exist"): If **localPath** is not provided, ask the user for the local path of the source branch. If provided, check whether the missing dependency exists in the source branch. If **present** → ask the user for confirmation (see below). If **not present** → instruct the user to create a new work item for the missing dependency, promote it first, then retry.
    - For other errors: Ask the user for confirmation (see below).
 
 **MANDATORY – Ask for confirmation; do NOT run full promotion without it:**
@@ -60,13 +59,20 @@ export class SfDevopsResolveDeploymentFailure extends McpTool<InputArgsShape, Ou
   }
 
   public async exec(input: InputArgs): Promise<CallToolResult> {
-    const options = {
-      localPath: normalizeAndValidateRepoPath(input.localPath?.trim() || undefined),
-      sourceBranchName: input.sourceBranchName,
-      ...(input.targetBranchName?.trim() && { targetBranchName: input.targetBranchName.trim() }),
-    };
+    let options: { localPath: string; sourceBranchName: string } | undefined;
+    let pathInvalid = false;
+    if (input.localPath?.trim()) {
+      try {
+        options = {
+          localPath: normalizeAndValidateRepoPath(input.localPath),
+          sourceBranchName: input.sourceBranchName,
+        };
+      } catch {
+        pathInvalid = true;
+      }
+    }
 
-    const { canFix, reason, missingDependencyName, inTargetBranch } = canFullPromotionFixFailure(input.errorDetails, options);
+    const { canFix, reason, missingDependencyName } = canFullPromotionFixFailure(input.errorDetails, options);
 
     // Full promotion cannot fix: merge conflict → use merge conflict tool
     if (!canFix && reason === "merge_conflict") {
@@ -81,6 +87,23 @@ export class SfDevopsResolveDeploymentFailure extends McpTool<InputArgsShape, Ou
       };
     }
 
+    // Dependency-type error but no valid localPath: ask for path or suggest new work item
+    if (reason === "local_path_required" || (pathInvalid && !canFix)) {
+      return {
+        content: [{
+          type: "text",
+          text: `The error suggests a missing dependency${missingDependencyName ? ` (e.g. ${missingDependencyName})` : ""}. To see if full promotion can fix it, the tool must check whether that dependency exists in the source branch.
+
+**Please provide the local path** to your repo (**localPath**). The tool will check branch "${input.sourceBranchName}":
+- If the dependency is in the branch → full promotion can fix (you'll be asked to confirm).
+- If not → create a new work item for the missing dependency, promote it first, then retry "${input.workItemName}".
+
+If you cannot provide a path, create a new work item that adds the missing dependency, promote it, then retry.`
+        }],
+        isError: false
+      };
+    }
+
     // Dependency missing in source branch
     if (!canFix && reason === "dependency_not_in_source_branch") {
       return {
@@ -106,16 +129,10 @@ export class SfDevopsResolveDeploymentFailure extends McpTool<InputArgsShape, Ou
     }
 
     // Full promotion can fix — ask for confirmation; do NOT call promote until user explicitly confirms
-    const comparisonNote =
-      reason === "dependency_in_source_branch" && missingDependencyName && input.targetBranchName?.trim()
-        ? inTargetBranch === false
-          ? ` The missing dependency "${missingDependencyName}" is in source branch "${input.sourceBranchName}" but not in target branch "${input.targetBranchName}"; full promotion will resolve this.`
-          : ` The dependency "${missingDependencyName}" is present in both source and target branches; full promotion will resolve.`
-        : "";
     return {
       content: [{
         type: "text",
-        text: `**Full promotion can resolve this failure** based on the error details.${comparisonNote}
+        text: `**Full promotion can resolve this failure** based on the error details.
 
 **Ask for confirmation:** Do not run full promotion until the user explicitly confirms. Present this to the user: