codeplay-common 4.4.8 → 4.4.9

package/files/buildCodeplay/codeplayBeforeBuild-6.2.js

@@ -1910,17 +1910,6 @@ async function fetchVersions() {
 
 }
 
-function readInstalledAgentInstructionsVersion() {
-  const versionFile = path.join(
-    process.cwd(),
-    AGENT_INSTRUCTIONS_DIR,
-    AGENT_INSTRUCTIONS_VERSION_FILE
-  );
-
-  if (!fs.existsSync(versionFile)) return "0";
-  return String(fs.readFileSync(versionFile, "utf8")).trim() || "0";
-}
-
 function getAgentInstructionsZipLayout(zip) {
   const entries = zip.getEntries().filter(entry => !entry.isDirectory);
 
@@ -1969,23 +1958,35 @@ function getAgentInstructionsZipLayout(zip) {
   return { agentFile: agentFile.entry, supportFiles };
 }
 
+function readInstalledAgentInstructionsVersion(projectRoot) {
+  const versionFile = path.join(projectRoot, AGENT_INSTRUCTIONS_DIR, AGENT_INSTRUCTIONS_VERSION_FILE);
+  if (!fs.existsSync(versionFile)) return "0";
+
+  const installedVersion = String(fs.readFileSync(versionFile, "utf8")).trim();
+  return /^\d+(?:\.\d+)*$/.test(installedVersion) ? installedVersion : "0";
+}
+
 async function syncAgentInstructions() {
+  const projectRoot = process.cwd();
+  const targetAgentFile = path.join(projectRoot, AGENT_INSTRUCTIONS_FILE);
+  const targetAgentDir = path.join(projectRoot, AGENT_INSTRUCTIONS_DIR);
+  const hasAgentDirectoryFiles =
+    fs.existsSync(targetAgentDir) &&
+    fs.statSync(targetAgentDir).isDirectory() &&
+    fs.readdirSync(targetAgentDir).some(name => name !== AGENT_INSTRUCTIONS_VERSION_FILE);
+  const requiredFilesExist = fs.existsSync(targetAgentFile) && hasAgentDirectoryFiles;
+  const localVersion = readInstalledAgentInstructionsVersion(projectRoot);
+
   const versions = await fetchVersions();
   const remoteVersion = String(versions?.[AGENT_INSTRUCTIONS_VERSION_KEY] || "").trim();
 
   if (!/^\d+(?:\.\d+)*$/.test(remoteVersion)) {
-    console.log(`ℹ️ No valid "${AGENT_INSTRUCTIONS_VERSION_KEY}" version found on the server. Skipping agent instructions update.`);
-    return;
+    throw new Error(`Required agent instructions could not be resolved from the server.`);
   }
 
-  const projectRoot = process.cwd();
-  const targetAgentFile = path.join(projectRoot, AGENT_INSTRUCTIONS_FILE);
-  const targetAgentDir = path.join(projectRoot, AGENT_INSTRUCTIONS_DIR);
-  const localVersion = readInstalledAgentInstructionsVersion();
-  const filesAreMissing = !fs.existsSync(targetAgentFile) || !fs.existsSync(targetAgentDir);
-
-  if (!filesAreMissing && compareVersionStrings(remoteVersion, localVersion) <= 0) {
-    console.log(`✅ Agent instructions are up to date (version ${localVersion}).`);
+  const remoteIsNewer = compareVersionStrings(remoteVersion, localVersion) > 0;
+  if (requiredFilesExist && !remoteIsNewer) {
+    console.log(`✅ Agent instructions do not need an update (local ${localVersion}, online ${remoteVersion}).`);
     return;
   }
 
@@ -1998,8 +1999,7 @@ async function syncAgentInstructions() {
   try {
     console.log(`🔍 Checking latest agent instructions: ${zipName}`);
     if (!(await urlExists(url))) {
-      console.warn(`⚠️ Agent instructions archive not found: ${url}`);
-      return;
+      throw new Error(`Required agent instructions archive not found: ${url}`);
     }
 
     await downloadFile(url, zipPath);
@@ -2017,6 +2017,7 @@ async function syncAgentInstructions() {
       fs.writeFileSync(stagedSupportFile, entry.getData());
     });
 
+    fs.rmSync(targetAgentDir, { recursive: true, force: true });
     fs.mkdirSync(targetAgentDir, { recursive: true });
     fs.copyFileSync(stagedAgentFile, targetAgentFile);
     fs.cpSync(stagedAgentDir, targetAgentDir, { recursive: true, force: true });
@@ -2027,9 +2028,9 @@ async function syncAgentInstructions() {
     );
 
     writeUpdateLine(`Agent instructions ${localVersion} -> ${remoteVersion}`);
-    console.log(`✅ Agent instructions updated directly in the project root → v${remoteVersion}`);
+    console.log(`✅ Agent instructions replaced in the project root → v${remoteVersion}.`);
   } catch (error) {
-    console.warn(`⚠️ Agent instructions update failed: ${error?.message || error}`);
+    throw new Error(`Required agent instructions installation failed: ${error?.message || error}`);
   } finally {
     fs.rmSync(tempRoot, { recursive: true, force: true });
   }

package/package.json

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