@wayai/cli 0.3.176 → 0.3.177

package/dist/index.js

@@ -23934,7 +23934,9 @@ function guessMimeType(filename) {
 function computeHash(data) {
   return crypto3.createHash("sha256").update(data).digest("hex");
 }
-function scanResourceFiles(dir, prefix = "") {
+function scanResourceFiles(dir, prefix = "", onOversized = (relPath, reason) => {
+  console.warn(`  Warning: skipping ${relPath} (${reason})`);
+}) {
   const files = [];
   const entries = fs9.readdirSync(dir, { withFileTypes: true });
   for (const entry of entries) {
@@ -23942,12 +23944,12 @@ function scanResourceFiles(dir, prefix = "") {
     if (entry.isSymbolicLink()) {
       throw symlinkRefusal(relPath, "file or folder");
     } else if (entry.isDirectory()) {
-      files.push(...scanResourceFiles(path11.join(dir, entry.name), relPath));
+      files.push(...scanResourceFiles(path11.join(dir, entry.name), relPath, onOversized));
     } else if (entry.isFile()) {
       const fullPath = path11.join(dir, entry.name);
       const stat2 = fs9.statSync(fullPath);
       if (stat2.size > MAX_RESOURCE_FILE_SIZE3) {
-        console.warn(`  Warning: skipping ${relPath} (${(stat2.size / 1024 / 1024).toFixed(1)}MB exceeds 10MB limit)`);
+        onOversized(relPath, `${(stat2.size / 1024 / 1024).toFixed(1)}MB exceeds 10MB limit`);
         continue;
       }
       const fileEntry = {
@@ -24469,7 +24471,11 @@ function parseHubFolder(hubFolder, opts) {
       throw expected(`Missing hub_environment in ${yamlPath}`);
     }
   }
-  const agentYamlFiles = scanAgentYamlFiles(hubFolder);
+  const unreadable = (relPath, reason, unreadableOpts) => {
+    if (opts?.strict) throw expected(`${relPath}: ${reason}`);
+    if (!unreadableOpts?.silent) console.warn(`  Warning: skipping ${relPath} (${reason})`);
+  };
+  const agentYamlFiles = scanAgentYamlFiles(hubFolder, unreadable);
   const rawAgents = agentYamlFiles.length > 0 ? agentYamlFiles : config.agents;
   const agents = rawAgents?.map((agent) => {
     const resolved = { ...agent };
@@ -24496,7 +24502,7 @@ function parseHubFolder(hubFolder, opts) {
     }
     return resolved;
   });
-  const resources = parseResources(hubFolder, config.resources || []);
+  const resources = parseResources(hubFolder, config.resources || [], unreadable);
   const payload = {
     version: config.version || 1,
     hub_id: config.hub_id || "",
@@ -24532,11 +24538,11 @@ function parseHubFolder(hubFolder, opts) {
     payload.outbound_schedules = config.outbound_schedules;
   }
   const bytesByHash = /* @__PURE__ */ new Map();
-  const evals = scanEvalYamlFiles(hubFolder, bytesByHash);
+  const evals = scanEvalYamlFiles(hubFolder, bytesByHash, unreadable);
   if (evals.length > 0) {
     payload.evals = evals;
   }
-  const journeys = scanJourneyYamlFiles(hubFolder, bytesByHash);
+  const journeys = scanJourneyYamlFiles(hubFolder, bytesByHash, unreadable);
   if (journeys.length > 0) {
     payload.journeys = journeys;
   }
@@ -24545,7 +24551,7 @@ function parseHubFolder(hubFolder, opts) {
   }
   return payload;
 }
-function scanEvalYamlFiles(hubFolder, bytesByHash) {
+function scanEvalYamlFiles(hubFolder, bytesByHash, unreadable) {
   const evalsDir = path14.join(hubFolder, "evals");
   if (!fs12.existsSync(evalsDir)) return [];
   const evals = [];
@@ -24554,7 +24560,7 @@ function scanEvalYamlFiles(hubFolder, bytesByHash) {
   for (const entry of topEntries) {
     refuseConsumedLink(hubFolder, evalsDir, entry);
     if (entry.isFile() && entry.name.endsWith(".yaml")) {
-      collectEval(evals, seen, path14.join(evalsDir, entry.name), `evals/${entry.name}`, null, hubFolder, bytesByHash);
+      collectEval(evals, seen, path14.join(evalsDir, entry.name), `evals/${entry.name}`, null, hubFolder, bytesByHash, unreadable);
     } else if (entry.isDirectory()) {
       const setName = entry.name;
       const setDir = path14.join(evalsDir, setName);
@@ -24567,16 +24573,19 @@ function scanEvalYamlFiles(hubFolder, bytesByHash) {
           );
         }
         if (sub.isFile() && sub.name.endsWith(".yaml")) {
-          collectEval(evals, seen, path14.join(setDir, sub.name), `evals/${setName}/${sub.name}`, setName, hubFolder, bytesByHash);
+          collectEval(evals, seen, path14.join(setDir, sub.name), `evals/${setName}/${sub.name}`, setName, hubFolder, bytesByHash, unreadable);
         }
       }
     }
   }
   return evals;
 }
-function collectEval(evals, seen, filePath, relPath, setName, hubFolder, bytesByHash) {
+function collectEval(evals, seen, filePath, relPath, setName, hubFolder, bytesByHash, unreadable) {
   const evalEntry = parseEvalYaml(filePath, relPath, setName, hubFolder, bytesByHash);
-  if (!evalEntry) return;
+  if (!evalEntry) {
+    unreadable(relPath, NOT_A_YAML_OBJECT);
+    return;
+  }
   const key = `${evalEntry.name}|${setName ?? ""}`;
   if (seen.has(key)) {
     const where = setName ? `scenario set "${setName}"` : "root";
@@ -24598,10 +24607,7 @@ function parseEvalYaml(filePath, relPath, setName, hubFolder, bytesByHash) {
     }
     throw err;
   }
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    console.warn(`  Warning: skipping ${relPath} (not a YAML object)`);
-    return null;
-  }
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
   const data = raw;
   const fileSlug = path14.basename(filePath, ".yaml");
   const evalName = typeof data.name === "string" && data.name.trim().length > 0 ? data.name : fileSlug;
@@ -24689,7 +24695,7 @@ function parseFixtureField(raw, label, key) {
   const trimmed = raw.trim();
   return trimmed.length > 0 ? trimmed : void 0;
 }
-function scanJourneyYamlFiles(hubFolder, bytesByHash) {
+function scanJourneyYamlFiles(hubFolder, bytesByHash, unreadable) {
   const journeysDir = path14.join(hubFolder, "journeys");
   if (!fs12.existsSync(journeysDir)) return [];
   const journeys = [];
@@ -24704,7 +24710,10 @@ function scanJourneyYamlFiles(hubFolder, bytesByHash) {
     }
     if (!entry.isFile() || !entry.name.endsWith(".yaml")) continue;
     const journeyEntry = parseJourneyYaml(path14.join(journeysDir, entry.name), `journeys/${entry.name}`, hubFolder, bytesByHash);
-    if (!journeyEntry) continue;
+    if (!journeyEntry) {
+      unreadable(`journeys/${entry.name}`, NOT_A_YAML_OBJECT);
+      continue;
+    }
     if (seen.has(journeyEntry.name)) {
       throw expected(
         `Duplicate journey: "${journeyEntry.name}" (in ${entry.name}). Each journey name must be unique.`
@@ -24726,10 +24735,7 @@ function parseJourneyYaml(filePath, relPath, hubFolder, bytesByHash) {
     }
     throw err;
   }
-  if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-    console.warn(`  Warning: skipping ${relPath} (not a YAML object)`);
-    return null;
-  }
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return null;
   const data = raw;
   const fileSlug = path14.basename(filePath, ".yaml");
   const journeyName = typeof data.name === "string" && data.name.trim().length > 0 ? data.name : fileSlug;
@@ -24770,7 +24776,7 @@ function parseJourneyYaml(filePath, relPath, hubFolder, bytesByHash) {
   if (targetBase) journeyEntry.target_base = targetBase;
   return journeyEntry;
 }
-function scanAgentYamlFiles(hubFolder) {
+function scanAgentYamlFiles(hubFolder, unreadable) {
   const agentsDir = path14.join(hubFolder, "agents");
   if (!fs12.existsSync(agentsDir)) return [];
   const yamlFiles = fs12.readdirSync(agentsDir).filter((f) => f.endsWith(".yaml")).sort();
@@ -24788,16 +24794,19 @@ function scanAgentYamlFiles(hubFolder) {
       }
       throw err;
     }
-    if (!agent || typeof agent !== "object") continue;
+    if (!agent || typeof agent !== "object") {
+      unreadable(`agents/${file}`, NOT_A_YAML_OBJECT, { silent: true });
+      continue;
+    }
     if (!agent.name) {
-      console.warn(`  Warning: skipping ${file} (missing 'name' field)`);
+      unreadable(`agents/${file}`, "missing 'name' field");
       continue;
     }
     agents.push(agent);
   }
   return agents;
 }
-function parseResources(hubFolder, configResources) {
+function parseResources(hubFolder, configResources, unreadable) {
   const resourcesDir = path14.join(hubFolder, "resources");
   const results = [];
   for (const res of configResources) {
@@ -24815,7 +24824,7 @@ function parseResources(hubFolder, configResources) {
     const resDir = path14.join(resourcesDir, resSlug);
     requireRealSubdirNoSymlink(hubFolder, resDir, false);
     if (fs12.existsSync(resDir)) {
-      const files = scanResourceFiles(resDir, "");
+      const files = scanResourceFiles(resDir, "", (relPath, reason) => unreadable(`resources/${resSlug}/${relPath}`, reason));
       if (files.length > 0) {
         resource.files = files;
       }
@@ -24824,6 +24833,7 @@ function parseResources(hubFolder, configResources) {
   }
   return results;
 }
+var NOT_A_YAML_OBJECT;
 var init_parser = __esm({
   "src/lib/parser.ts"() {
     "use strict";
@@ -24833,6 +24843,7 @@ var init_parser = __esm({
     init_call_openings();
     init_expected();
     init_fs_safety();
+    NOT_A_YAML_OBJECT = "not a YAML object";
   }
 });
 
@@ -27018,17 +27029,16 @@ async function pullCommand(args2) {
     return;
   }
   assertInScope("hubs", hubId);
-  let hubFolder = existingFolder;
+  const hubFolder = existingFolder ?? resolveHubFolder(
+    workspaceDir,
+    hubId,
+    payload.hub.name,
+    payload.hub_environment,
+    payload.preview_label,
+    payload.branch_name
+  );
   let wroteFiles = false;
-  if (!hubFolder) {
-    hubFolder = resolveHubFolder(
-      workspaceDir,
-      hubId,
-      payload.hub.name,
-      payload.hub_environment,
-      payload.preview_label,
-      payload.branch_name
-    );
+  if (!existingFolder && !resolveHubYamlPath(hubFolder)) {
     fs18.mkdirSync(path24.dirname(hubFolder), { recursive: true });
     console.log("Writing hub configuration...");
     await materializeHubFolder(hubFolder, payload);
@@ -27037,18 +27047,23 @@ async function pullCommand(args2) {
     wroteFiles = true;
   } else {
     let action = "overwrite";
+    const replaceWithoutDiff = (why, err) => confirmReplaceWithoutDiff(why, err, hubFolder, hubId, autoConfirm);
     let localPayload;
     try {
-      localPayload = parseHubFolder(hubFolder);
+      localPayload = parseHubFolder(hubFolder, { strict: true });
     } catch (err) {
       if (isWorkspaceRefusal(err)) throw err;
+      if (!await replaceWithoutDiff(UNREADABLE_LOCAL, err)) {
+        console.log("Cancelled.");
+        return;
+      }
     }
     let diffResult;
     if (localPayload) {
       try {
         diffResult = await client.diff(hubId, prepareResourcePayload(localPayload, payload), "pull", organizationId);
       } catch (err) {
-        if (!await confirmReplaceWithoutDiff(err, hubFolder, hubId, autoConfirm)) {
+        if (!await replaceWithoutDiff(UNCOMPARABLE_LOCAL, err)) {
           console.log("Cancelled.");
           return;
         }
@@ -27095,8 +27110,9 @@ async function pullCommand(args2) {
     await mirrorLinkedProduction2(client, workspaceDir, payload.production_hub_id, organizationId);
   }
 }
-async function confirmReplaceWithoutDiff(err, hubFolder, hubId, autoConfirm) {
-  console.log("\nThe platform could not compare your local files, so the changes cannot be listed:");
+async function confirmReplaceWithoutDiff(why, err, hubFolder, hubId, autoConfirm) {
+  console.log(`
+${why}`);
   console.log(`  ${err instanceof Error ? err.message : String(err)}`);
   if (!autoConfirm) {
     return confirm("Replace the local files with the platform configuration, discarding any local edits?");
@@ -27147,7 +27163,7 @@ function connectionsEqual(a, b) {
   }
   return true;
 }
-var MIRROR_MARKER_PREFIX2;
+var UNREADABLE_LOCAL, UNCOMPARABLE_LOCAL, MIRROR_MARKER_PREFIX2;
 var init_pull = __esm({
   "src/commands/pull.ts"() {
     "use strict";
@@ -27165,6 +27181,8 @@ var init_pull = __esm({
     init_repo_config();
     init_worktree_scope();
     init_subtree_routing();
+    UNREADABLE_LOCAL = "The CLI could not read your local files, so the changes cannot be listed:";
+    UNCOMPARABLE_LOCAL = "The platform could not compare your local files, so the changes cannot be listed:";
     MIRROR_MARKER_PREFIX2 = "# Read-only mirror of production hub";
   }
 });