@wraps.dev/cli 2.10.1 → 2.10.3

package/dist/cli.js

@@ -19425,7 +19425,7 @@ async function templatesPush(options) {
   }
   await pushToSES(compiled, progress);
   const token = await resolveTokenAsync({ token: options.token });
-  const apiResults = await pushToAPI(compiled, token, config2.org, progress);
+  const apiResults = await pushToAPI(compiled, token, config2.org, progress, options.force);
   for (const t of compiled) {
     const apiResult = apiResults.find((r) => r.slug === t.slug);
     lockfile.templates[t.slug] = {
@@ -19664,7 +19664,7 @@ async function pushToSES(templates, progress) {
   }
   return results;
 }
-async function pushToAPI(templates, token, _org, progress) {
+async function pushToAPI(templates, token, _org, progress, force) {
   if (!token) {
     progress.info(
       "No API token \u2014 skipping dashboard sync. Run: wraps auth login"
@@ -19694,19 +19694,45 @@ async function pushToAPI(templates, token, _org, progress) {
             variables: t.variables,
             sourceHash: t.sourceHash,
             sesTemplateName: t.sesTemplateName,
-            cliProjectPath: t.cliProjectPath
+            cliProjectPath: t.cliProjectPath,
+            force: force ?? false
           }))
         })
       });
-      if (!resp.ok) {
+      if (Number(resp.status) === 409) {
+        const data = await resp.json();
+        for (const c of data.conflicts ?? []) {
+          results.push({ slug: c.slug, success: false });
+        }
+        for (const r of data.results ?? []) {
+          results.push({ slug: r.slug, id: r.id, success: true });
+        }
+        const successCount = data.results?.length ?? 0;
+        const conflictCount = data.conflicts?.length ?? 0;
+        if (successCount > 0 && conflictCount > 0) {
+          progress.succeed(`Synced ${successCount} templates to dashboard`);
+          for (const c of data.conflicts ?? []) {
+            progress.fail(
+              `${pc26.cyan(c.slug)} was edited on the dashboard. Use ${pc26.bold("--force")} to overwrite.`
+            );
+          }
+        } else if (conflictCount > 0) {
+          for (const c of data.conflicts ?? []) {
+            progress.fail(
+              `${pc26.cyan(c.slug)} was edited on the dashboard. Use ${pc26.bold("--force")} to overwrite.`
+            );
+          }
+        }
+      } else if (!resp.ok) {
         const body = await resp.text();
         throw new Error(`API returned ${resp.status}: ${body}`);
+      } else {
+        const data = await resp.json();
+        for (const r of data.results) {
+          results.push({ slug: r.slug, id: r.id, success: true });
+        }
+        progress.succeed(`Synced ${templates.length} templates to dashboard`);
       }
-      const data = await resp.json();
-      for (const r of data.results) {
-        results.push({ slug: r.slug, id: r.id, success: true });
-      }
-      progress.succeed(`Synced ${templates.length} templates to dashboard`);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       progress.fail(`Dashboard sync failed: ${msg}`);
@@ -19735,16 +19761,23 @@ async function pushToAPI(templates, token, _org, progress) {
           variables: t.variables,
           sourceHash: t.sourceHash,
           sesTemplateName: t.sesTemplateName,
-          cliProjectPath: t.cliProjectPath
+          cliProjectPath: t.cliProjectPath,
+          force: force ?? false
         })
       });
-      if (!resp.ok) {
+      if (Number(resp.status) === 409) {
+        results.push({ slug: t.slug, success: false });
+        progress.fail(
+          `${pc26.cyan(t.slug)} was edited on the dashboard since your last push. Use ${pc26.bold("--force")} to overwrite.`
+        );
+      } else if (!resp.ok) {
         const body = await resp.text();
         throw new Error(`API returned ${resp.status}: ${body}`);
+      } else {
+        const data = await resp.json();
+        results.push({ slug: data.slug, id: data.id, success: true });
+        progress.succeed(`Synced ${pc26.cyan(t.slug)} to dashboard`);
       }
-      const data = await resp.json();
-      results.push({ slug: data.slug, id: data.id, success: true });
-      progress.succeed(`Synced ${pc26.cyan(t.slug)} to dashboard`);
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       results.push({ slug: t.slug, success: false });
@@ -19776,7 +19809,6 @@ async function findCliNodeModules() {
   const paths = [];
   try {
     const { createRequire } = await import("module");
-    const { fileURLToPath: fileURLToPath6 } = await import("url");
     const { dirname: dirname4 } = await import("path");
     for (const base of [
       // The current file's location (works when running from source)