@wayai/cli 0.3.175 → 0.3.176

package/dist/index.js

@@ -27037,9 +27037,25 @@ async function pullCommand(args2) {
     wroteFiles = true;
   } else {
     let action = "overwrite";
+    let localPayload;
     try {
-      const localPayload = parseHubFolder(hubFolder);
-      const diffResult = await client.diff(hubId, prepareResourcePayload(localPayload, payload), "pull", organizationId);
+      localPayload = parseHubFolder(hubFolder);
+    } catch (err) {
+      if (isWorkspaceRefusal(err)) throw err;
+    }
+    let diffResult;
+    if (localPayload) {
+      try {
+        diffResult = await client.diff(hubId, prepareResourcePayload(localPayload, payload), "pull", organizationId);
+      } catch (err) {
+        if (!await confirmReplaceWithoutDiff(err, hubFolder, hubId, autoConfirm)) {
+          console.log("Cancelled.");
+          return;
+        }
+      }
+    }
+    if (localPayload && diffResult) {
+      printWarnings(diffResult.warnings);
       const connectionsChanged = !connectionsEqual(localPayload.connections, payload.connections);
       if (!diffResult.has_changes && !connectionsChanged) {
         action = "sync_metadata";
@@ -27058,9 +27074,6 @@ async function pullCommand(args2) {
         }
         action = "apply";
       }
-    } catch (err) {
-      if (isWorkspaceRefusal(err)) throw err;
-      action = "overwrite";
     }
     if (action === "overwrite") console.log("Writing hub configuration...");
     const delta = await materializeHubFolder(hubFolder, payload);
@@ -27082,6 +27095,17 @@ 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:");
+  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?");
+  }
+  console.error(
+    `Nothing was written: -y replaces local files only with changes it can list. To decide, run \`wayai pull\` without -y. To re-pull fresh, move ${hubFolder} out of the workspace and run \`wayai pull --hub ${hubId}\`.`
+  );
+  throw err;
+}
 async function writeProductionMirror2(workspaceDir, prodPayload) {
   const folder = resolveHubFolder(workspaceDir, prodPayload.hub_id, prodPayload.hub.name, "production", null, null);
   fs18.mkdirSync(path24.dirname(folder), { recursive: true });