Function resolvePatchPath

src/node/services/tools/task_apply_git_patch.ts:592–669

(params: {
  taskId: string;
  artifactSessionDir: string;
  projectArtifact: SubagentGitProjectPatchArtifact;
  artifactLookupNote?: string;
})

}

async function resolvePatchPath(params: {
  taskId: string;
  artifactSessionDir: string;
  projectArtifact: SubagentGitProjectPatchArtifact;
  artifactLookupNote?: string;
}): Promise<{ patchPath: string; note?: string } | { error: string; note?: string }> {
  const expectedPatchPath = getSubagentGitPatchMboxPath(
    params.artifactSessionDir,
    params.taskId,
    params.projectArtifact.storageKey
  );

  if (!isPathInsideDir(params.artifactSessionDir, expectedPatchPath)) {
    return {
      error: "Invalid task_id.",
      note: "task_id must not contain path traversal segments.",
    };
  }

  const safeMboxPath =
    typeof params.projectArtifact.mboxPath === "string" &&
    params.projectArtifact.mboxPath.length > 0
      ? isPathInsideDir(params.artifactSessionDir, params.projectArtifact.mboxPath)
        ? params.projectArtifact.mboxPath
        : undefined
      : undefined;

  let patchPathNote = mergeNotes(
    params.artifactLookupNote,
    params.projectArtifact.mboxPath && !safeMboxPath
      ? "Ignoring unsafe mboxPath in patch artifact metadata; using canonical patch location."
      : undefined
  );

  const patchCandidates = [safeMboxPath, expectedPatchPath].filter(
    (candidate): candidate is string => typeof candidate === "string"
  );

  let patchPath: string | null = null;
  for (const candidate of patchCandidates) {
    try {
      const stat = await fsPromises.stat(candidate);
      if (stat.isFile()) {
        patchPath = candidate;
        break;
      }
    } catch {
      // try next candidate
    }
  }

  if (!patchPath) {
    const checkedPaths = Array.from(new Set(patchCandidates))
      .map((candidate) =>
        isPathInsideDir(params.artifactSessionDir, candidate)
          ? path.relative(params.artifactSessionDir, candidate) || path.basename(candidate)
          : candidate
      )