@wix/himalaya-cli 0.835.0 → 0.836.0

package/dist/cli.mjs

@@ -60246,6 +60246,7 @@ function wixPlayerTestflightTarget(requested) {
 }
 var SURFACE_IDS = `${PREVIEW_SURFACES.filter((s) => !s.id.startsWith("widget:")).map((s) => s.id).join("|")}|widget:<family>`;
 var DEVELOPER_PORTAL_URL = `${ADMIN_ORIGIN_BO}/#/developer`;
+var MAX_APP_SOURCE_BYTES_HELP = "4 MiB (4,194,304 bytes)";
 var USAGE = `himi \u2014 the Himalaya authoring CLI (remote dev loop)
 
   himi captcha setup|status --app <name> [--site <msid>] [--content <dir>]
@@ -60391,6 +60392,13 @@ var USAGE = `himi \u2014 the Himalaya authoring CLI (remote dev loop)
                                              Never archives .himi/, .env*, node_modules/, dist/ or key
                                              material, and REFUSES the push if a file it would archive
                                              looks like it holds a credential.
+                                             EVERYTHING ELSE under the content directory IS archived,
+                                             at any depth \u2014 screenshots, notes, fixtures, tests, l10n.
+                                             The archive is capped at ${MAX_APP_SOURCE_BYTES_HELP}, measured
+                                             base64-encoded (~1.33x the zip's own size); over it the
+                                             push refuses, naming archivedBytes/encodedBytes/files \u2014
+                                             trim the directory or push with --no-source. Not the
+                                             same limit as the whole publish body.
   himi pull <app> [--release <id>] [--out <dir>] [--name <new>] [--force|--replace] [--target <t>]
                                            restore an app's SOURCE from the serve plane into an editable
                                            content package \u2014 the other half of push, which archives it.
@@ -60919,8 +60927,27 @@ function serveUnreachableError(target, base, cause) {
 }
 function loopbackTargetWarning(base, explicitTarget) {
   if (explicitTarget) return null;
-  if (!/^https?:\/\/(127\.0\.0\.1|localhost|0\.0\.0\.0|\[::1\])(:|\/|$)/i.test(base)) return null;
-  return `Published to the LOCAL dev serve (${base}). The default target is a local dev plane that only exists in a monorepo checkout, so this release is NOT on the bo.wix.com serve and its preview will 404. Off-repo, publish with \`--target bo\` (after \`himi login --dpx --target bo\`), or set HIMI_TARGET=bo.`;
+  if (!isLoopbackBase(base)) return null;
+  return `Published to the LOCAL dev serve (${base}). The default target is a local dev plane that only exists in a monorepo checkout, so this release is NOT on the bo.wix.com serve and its preview will 404. Off-repo, publish with \`--target bo\` (after \`himi login --dpx --target bo\`), or set HIMI_SERVE_TARGET=bo.`;
+}
+function isLoopbackBase(base) {
+  return /^https?:\/\/(127\.0\.0\.1|localhost|0\.0\.0\.0|\[::1\])(:|\/|$)/i.test(base);
+}
+function foreignPlaneError(target, base) {
+  return {
+    error: `no himi serve plane is running at ${base} \u2014 something else on this machine answered that port, so its response was NOT shown (port 8200 is also Appium UiAutomator2's default systemPort). ` + serveUnreachableHint(target),
+    code: "no_serve_plane",
+    target,
+    base
+  };
+}
+async function servePlaneAnswers(health) {
+  try {
+    const r = await health();
+    return r.ok && r.json?.ok === true;
+  } catch {
+    return false;
+  }
 }
 var PUBLIC_WIX_API_BASE = "https://www.wixapis.com";
 var DOCTOR_TIMEOUT_MS = 4e3;
@@ -61188,7 +61215,8 @@ function isHimalayaMonorepoCheckout(start) {
   }
 }
 function defaultTargetForCommand(command, authoringDir) {
-  return (command === "push" || command === "login") && !isHimalayaMonorepoCheckout(authoringDir) ? "wix" : void 0;
+  void command;
+  return isHimalayaMonorepoCheckout(authoringDir) ? void 0 : "wix";
 }
 function renderDataSource(input) {
   if (!input.live) return input.hydrate ? "worker-initial-state" : "static";
@@ -61521,6 +61549,21 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
     })
   );
   const serveBase = () => resolveTarget({ target: str5(flags.target), defaultTarget: contextualDefaultTarget, serveUrl: str5(flags["serve-url"]) }).serve;
+  const foreignPlaneRefusal = async () => {
+    const base = serveBase();
+    if (!isLoopbackBase(base)) return null;
+    if (await servePlaneAnswers(() => client3().health("serve"))) return null;
+    io.error(JSON.stringify(foreignPlaneError(targetName(), base)));
+    return 1;
+  };
+  const printServeFailure = (r, extra) => {
+    print({ ok: false, ...extra, status: r.status, body: r.json ?? r.text });
+    return 1;
+  };
+  const serveFailure = async (r, extra) => {
+    const refusal = await foreignPlaneRefusal();
+    return refusal !== null ? refusal : printServeFailure(r, extra);
+  };
   try {
     switch (command) {
       case "captcha": {
@@ -61611,14 +61654,11 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           try {
             r = await client3().templates();
           } catch (e) {
-            const target = str5(flags.target) ?? "local";
+            const target = targetName();
             print({ ok: true, templates: embedded, remote: false, note: `remote catalog unreachable (${e.message}); showing embedded. ${serveUnreachableHint(target)}` });
             return 0;
           }
-          if (!r.ok) {
-            print({ ok: false, status: r.status, body: r.json ?? r.text });
-            return 1;
-          }
+          if (!r.ok) return serveFailure(r);
           const remoteTemplates = (r.json?.templates ?? []).map((t) => {
             const prompt = typeof t.name === "string" ? templateStartPrompt(startPromptSkillUrl("door"), { name: t.name, title: typeof t.title === "string" ? t.title : void 0 }) : null;
             return { ...t, source: "remote", ...prompt ? { prompt } : {} };
@@ -61766,7 +61806,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           try {
             r = await client3().publishRelease(payload, publishMeta);
           } catch (e) {
-            const target = str5(flags.target) ?? "local";
+            const target = targetName();
             io.error(JSON.stringify(serveUnreachableError(target, serveBase(), e.message)));
             return 1;
           }
@@ -62206,7 +62246,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             }
             jobWix = { clientId: a.clientId };
           }
-          const authoringBase = resolveTarget({ target: str5(flags.target), serveUrl: str5(flags["serve-url"]) }).serve;
+          const authoringBase = serveBase();
           try {
             const { report } = await runBrowserAuthoring2({
               authoringBase,
@@ -62423,14 +62463,11 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
           } catch (e) {
             io.error(JSON.stringify({
               error: `cannot reach serve for render --remote: ${e.message}. Pass --target bo.`,
-              target: str5(flags.target) ?? "local"
+              target: targetName()
             }));
             return 1;
           }
-          if (!r2.ok) {
-            print({ ok: false, remote: true, status: r2.status, body: r2.json ?? r2.text });
-            return 1;
-          }
+          if (!r2.ok) return serveFailure(r2, { remote: true });
           const body = r2.json ?? {};
           if (wantPng2 && typeof body.pngBase64 === "string") {
             const outPath = typeof flags.png === "string" ? flags.png : `${screenId}.png`;
@@ -63629,6 +63666,9 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         if (!previewToken) {
           const target = resolveTarget({
             target: str5(flags.target),
+            // Same default as `client()` (#2483.1) — without it this resolved a DIFFERENT target
+            // than the request that follows, so off-repo the mint was attempted against `local`.
+            defaultTarget: contextualDefaultTarget,
             serveUrl: str5(flags["serve-url"]),
             telemetryUrl: str5(flags["telemetry-url"]),
             controlUrl: str5(flags["control-url"]),
@@ -63707,14 +63747,11 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         } catch (e) {
           io.error(JSON.stringify({
             error: `cannot reach serve for context: ${e.message}. Pass --target bo.`,
-            target: str5(flags.target) ?? "local"
+            target: targetName()
           }));
           return 1;
         }
-        if (!r.ok) {
-          print({ ok: false, status: r.status, body: r.json ?? r.text });
-          return 1;
-        }
+        if (!r.ok) return serveFailure(r);
         const body = r.json ?? {};
         print(body);
         return body.ok === false ? 1 : 0;
@@ -63741,13 +63778,10 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         try {
           r = subcommand === "list" ? await client3().authoringDocs(app, release) : await client3().fetchAuthoringDoc(app, docName, release);
         } catch (e) {
-          io.error(JSON.stringify({ error: `cannot reach serve for app-docs: ${e.message}`, target: str5(flags.target) ?? "local" }));
-          return 1;
-        }
-        if (!r.ok) {
-          print({ ok: false, status: r.status, body: r.json ?? r.text });
+          io.error(JSON.stringify({ error: `cannot reach serve for app-docs: ${e.message}`, target: targetName() }));
           return 1;
         }
+        if (!r.ok) return serveFailure(r);
         if (subcommand === "get" && flags.json !== true) io.log(r.text);
         else print(r.json ?? {});
         return 0;
@@ -63760,7 +63794,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           return 2;
         }
         const c = client3();
-        const target = str5(flags.target) ?? "local";
+        const target = targetName();
         const level = str5(flags.level);
         const byLevel = (ls) => level ? ls.filter((l) => l.level === level) : ls;
         const includeEvents = flags["no-events"] !== true;
@@ -63860,14 +63894,11 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         } catch (e) {
           io.error(JSON.stringify({
             error: `cannot reach serve for screens: ${e.message}. Pass --target bo.`,
-            target: str5(flags.target) ?? "local"
+            target: targetName()
           }));
           return 1;
         }
-        if (!r.ok) {
-          print({ ok: false, status: r.status, body: r.json ?? r.text });
-          return 1;
-        }
+        if (!r.ok) return serveFailure(r);
         print(r.json ?? {});
         return 0;
       }
@@ -63885,13 +63916,14 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         } catch (e) {
           io.error(JSON.stringify({
             error: `cannot reach serve for diagnose: ${e.message}. Pass --target bo.`,
-            target: str5(flags.target) ?? "local"
+            target: targetName()
           }));
           return 1;
         }
-        if (!r.ok && r.status !== 422) {
-          print({ ok: false, status: r.status, body: r.json ?? r.text });
-          return 1;
+        if (!r.ok) {
+          const refusal = await foreignPlaneRefusal();
+          if (refusal !== null) return refusal;
+          if (r.status !== 422) return printServeFailure(r);
         }
         const body = r.json ?? {};
         print(body);
@@ -63910,14 +63942,11 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         } catch (e) {
           io.error(JSON.stringify({
             error: `cannot reach serve for deeplinks: ${e.message}. Pass --target bo.`,
-            target: str5(flags.target) ?? "local"
+            target: targetName()
           }));
           return 1;
         }
-        if (!r.ok) {
-          print({ ok: false, status: r.status, body: r.json ?? r.text });
-          return 1;
-        }
+        if (!r.ok) return serveFailure(r);
         print(r.json ?? {});
         return 0;
       }
@@ -63942,7 +63971,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
               limit: num2(flags.limit)
             });
           } catch (e) {
-            const target = str5(flags.target) ?? "local";
+            const target = targetName();
             io.error(JSON.stringify({
               error: `cannot reach the telemetry plane for target "${target}": ${e.message}. Worker logs live on the prod plane \u2014 off-repo, pass --target bo and authenticate with \`himi login --dpx --target bo\`.`,
               target
@@ -63978,7 +64007,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
           io.error(JSON.stringify({ error: "promote needs --app and --release" }));
           return 2;
         }
-        const target = str5(flags.target) ?? "local";
+        const target = targetName();
         const r = await client3().activateRelease(app, release, flags.force === true);
         print({
           status: r.status,
@@ -64003,7 +64032,7 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
         try {
           r = value === void 0 ? await client3().appSettings(app) : await client3().setVisibility(app, value);
         } catch (e) {
-          const target = str5(flags.target) ?? "local";
+          const target = targetName();
           io.error(JSON.stringify(serveUnreachableError(target, serveBase(), e.message)));
           return 1;
         }
@@ -64224,7 +64253,7 @@ ${label2}`);
             if (job.status === "SUCCESS") await printDistQrForJob(job, app);
           }
         };
-        const distTarget = str5(flags.target) ?? "local";
+        const distTarget = targetName();
         const distUnreachable = (e) => {
           io.error(JSON.stringify({
             ...serveUnreachableError(distTarget, serveBase(), e.message),
@@ -64636,7 +64665,7 @@ ${label2}`);
       }
       // --- #814 Stage 3: self-serve app ownership + local token introspection -------
       case "apps": {
-        const target = str5(flags.target) ?? "local";
+        const target = targetName();
         let ownerIssue;
         try {
           ownerIssue = resolveTarget({ target, ownerIssueUrl: str5(flags["owner-issue-url"]) }).ownerIssue;
@@ -64716,7 +64745,7 @@ ${label2}`);
         }
       }
       case "whoami": {
-        const target = str5(flags.target) ?? "local";
+        const target = targetName();
         let tok;
         try {
           tok = resolveTarget({ target }).controlToken;
@@ -64755,7 +64784,7 @@ ${label2}`);
         }
       }
       case "logout": {
-        const target = str5(flags.target) ?? "local";
+        const target = targetName();
         let revoked;
         let revokeError;
         try {
@@ -64790,7 +64819,7 @@ ${label2}`);
         return 0;
       }
       case "doctor": {
-        const target = str5(flags.target) ?? process.env.HIMI_SERVE_TARGET ?? "local";
+        const target = targetName();
         const timeoutMs = Number(str5(flags.timeout)) > 0 ? Number(str5(flags.timeout)) : DOCTOR_TIMEOUT_MS;
         const dataUrl = str5(flags["data-url"]) ?? process.env.HIMI_DATA_URL ?? PUBLIC_WIX_API_BASE;
         let resolved2;
@@ -64798,7 +64827,10 @@ ${label2}`);
         let targetError;
         try {
           resolved2 = resolveTarget({
-            target: str5(flags.target),
+            // The ALREADY-RESOLVED name, so the plane doctor probes is the plane it reports.
+            // Passing `str(flags.target)` re-ran resolution without `defaultTarget`, so off-repo
+            // doctor labelled its report `wix` while probing the `local` URLs.
+            target,
             serveUrl: str5(flags["serve-url"]),
             controlUrl: str5(flags["control-url"]),
             controlToken: str5(flags["control-token"])
@@ -65234,10 +65266,12 @@ export {
   decodeControlTokenClaims,
   defaultTargetForCommand,
   doctorVersionReport,
+  foreignPlaneError,
   formatSdkVersionLine,
   humanDuration,
   inspectControlToken,
   isHimalayaMonorepoCheckout,
+  isLoopbackBase,
   isPublicTarget,
   loopbackTargetWarning,
   nativeConfigAdvisories,
@@ -65264,6 +65298,7 @@ export {
   resolveAppSlug,
   resolvedSdkVersion,
   run,
+  servePlaneAnswers,
   serveUnreachableError,
   serveUnreachableHint,
   templatePreviewAuthError,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.835.0",
+  "version": "0.836.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -63,5 +63,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "28f3f50cd02d76203d4daf19d83865ed5be46f5158dc74ca6e1764b1"
+  "falconPackageHash": "8130a755174e0dd9b32e828e9a5328aa479d90c175f0dfa7057c60f6"
 }