codeplay-common 4.4.6 → 4.4.8

package/files/buildCodeplay/codeplayBeforeBuild-6.2.js

@@ -1921,7 +1921,7 @@ function readInstalledAgentInstructionsVersion() {
   return String(fs.readFileSync(versionFile, "utf8")).trim() || "0";
 }
 
-function validateAgentInstructionsZip(zip) {
+function getAgentInstructionsZipLayout(zip) {
   const entries = zip.getEntries().filter(entry => !entry.isDirectory);
 
   for (const entry of entries) {
@@ -1935,16 +1935,38 @@ function validateAgentInstructionsZip(zip) {
     }
   }
 
-  const hasAgentFile = entries.some(entry => entry.entryName.replace(/\\/g, "/") === AGENT_INSTRUCTIONS_FILE);
-  const hasAgentFolderFiles = entries.some(entry =>
-    entry.entryName.replace(/\\/g, "/").startsWith(`${AGENT_INSTRUCTIONS_DIR}/`)
+  const normalizedEntries = entries.map(entry => ({
+    entry,
+    name: entry.entryName.replace(/\\/g, "/")
+  }));
+  const agentFile = normalizedEntries.find(({ name }) =>
+    name.toLowerCase() === AGENT_INSTRUCTIONS_FILE.toLowerCase()
   );
+  const agentDirectoryPrefix = `${AGENT_INSTRUCTIONS_DIR.toLowerCase()}/`;
+  const nestedSupportFiles = normalizedEntries
+    .filter(({ name }) => name.toLowerCase().startsWith(agentDirectoryPrefix))
+    .map(({ entry, name }) => ({
+      entry,
+      relativePath: name.slice(name.indexOf("/") + 1)
+    }))
+    .filter(({ relativePath }) => relativePath && relativePath !== AGENT_INSTRUCTIONS_VERSION_FILE);
+  const flatSupportFiles = normalizedEntries
+    .filter(({ name }) =>
+      !name.includes("/") &&
+      name.toLowerCase() !== AGENT_INSTRUCTIONS_FILE.toLowerCase() &&
+      name.toLowerCase() !== AGENT_INSTRUCTIONS_VERSION_FILE.toLowerCase() &&
+      name.toLowerCase().endsWith(".md")
+    )
+    .map(({ entry, name }) => ({ entry, relativePath: name }));
+  const supportFiles = nestedSupportFiles.length ? nestedSupportFiles : flatSupportFiles;
 
-  if (!hasAgentFile || !hasAgentFolderFiles) {
+  if (!agentFile || !supportFiles.length) {
     throw new Error(
-      `Agent instructions ZIP must contain ${AGENT_INSTRUCTIONS_FILE} and files inside ${AGENT_INSTRUCTIONS_DIR}/ at its root.`
+      `Agent instructions ZIP must contain ${AGENT_INSTRUCTIONS_FILE} (case-insensitive) and either files inside ${AGENT_INSTRUCTIONS_DIR}/ or supporting Markdown files at the archive root.`
     );
   }
+
+  return { agentFile: agentFile.entry, supportFiles };
 }
 
 async function syncAgentInstructions() {
@@ -1981,12 +2003,19 @@ async function syncAgentInstructions() {
     }
 
     await downloadFile(url, zipPath);
+    console.log(`⬇️ Downloaded agent instructions archive: ${zipName}`);
     const zip = new AdmZip(zipPath);
-    validateAgentInstructionsZip(zip);
-    zip.extractAllTo(extractPath, true);
+    const archiveLayout = getAgentInstructionsZipLayout(zip);
 
     const stagedAgentFile = path.join(extractPath, AGENT_INSTRUCTIONS_FILE);
     const stagedAgentDir = path.join(extractPath, AGENT_INSTRUCTIONS_DIR);
+    fs.mkdirSync(stagedAgentDir, { recursive: true });
+    fs.writeFileSync(stagedAgentFile, archiveLayout.agentFile.getData());
+    archiveLayout.supportFiles.forEach(({ entry, relativePath }) => {
+      const stagedSupportFile = path.join(stagedAgentDir, relativePath);
+      fs.mkdirSync(path.dirname(stagedSupportFile), { recursive: true });
+      fs.writeFileSync(stagedSupportFile, entry.getData());
+    });
 
     fs.mkdirSync(targetAgentDir, { recursive: true });
     fs.copyFileSync(stagedAgentFile, targetAgentFile);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeplay-common",
-  "version": "4.4.6",
+  "version": "4.4.8",
   "description": "Common build scripts and files",
   "scripts": {
 	"postinstall": "node scripts/sync-files.js",