@wix/himalaya-cli 0.1068.0 → 0.1069.0

package/dist/cli.mjs

@@ -484,6 +484,36 @@ var init_ownership = __esm({
   }
 });
 
+// ../../core/serve-storage/src/wip-pointer.ts
+function wipSupported(store) {
+  if (!store.getWipRecord || !store.updateWipRecord) return false;
+  return store.supportsWip ? store.supportsWip() : true;
+}
+function normalizeWipRecord(value) {
+  if (!value || typeof value !== "object") return { wip: null, promoted: [], evictedBefore: null };
+  const v = value;
+  const wip = v.wip && typeof v.wip.releaseId === "string" ? v.wip : null;
+  const promoted = (Array.isArray(v.promoted) ? v.promoted : []).flatMap((entry) => {
+    if (typeof entry === "string") return [{ id: entry, at: null }];
+    const e = entry;
+    return e && typeof e.id === "string" ? [{ id: e.id, at: storedTime(e.at) }] : [];
+  });
+  return { wip, promoted, evictedBefore: storedTime(v.evictedBefore) };
+}
+async function readWip(store, app) {
+  if (!wipSupported(store)) return "unsupported";
+  const { wip, promoted } = normalizeWipRecord(await store.getWipRecord(app));
+  if (!wip || promoted.some((p) => p.id === wip.releaseId)) return null;
+  const live2 = await store.getManifest(app);
+  return live2?.releaseId === wip.releaseId ? null : wip;
+}
+var storedTime;
+var init_wip_pointer = __esm({
+  "../../core/serve-storage/src/wip-pointer.ts"() {
+    storedTime = (value) => typeof value === "string" && !Number.isNaN(Date.parse(value)) ? value : null;
+  }
+});
+
 // ../../core/serve-storage/src/store.ts
 function validateFunctionManifest(manifest) {
   const dataErrors = validateDataResources(manifest.functionDataResources, manifest.app).filter((issue2) => issue2.severity === "error");
@@ -526,6 +556,14 @@ async function retainedReleaseRefs(store, app, keepRecent = 20, keepReleaseIds =
       }
     }
   }
+  const offered = await readWip(store, app);
+  if (offered && offered !== "unsupported" && !loaded.has(offered.releaseId) && store.getManifestById) {
+    const m = await store.getManifestById(app, offered.releaseId);
+    if (m) {
+      manifests.push(m);
+      loaded.add(m.releaseId);
+    }
+  }
   for (const releaseId of new Set(keepReleaseIds)) {
     if (loaded.has(releaseId)) continue;
     if (!store.getManifestById) throw new Error(`cannot retain function job release ${releaseId}: versioned manifest lookup is unsupported`);
@@ -554,6 +592,7 @@ var TEMPLATE_APP_PREFIX;
 var init_store = __esm({
   "../../core/serve-storage/src/store.ts"() {
     init_ownership();
+    init_wip_pointer();
     TEMPLATE_APP_PREFIX = "himi-template-";
   }
 });
@@ -764,34 +803,28 @@ var init_file_store = __esm({
         else ledger.push(entry);
         writeFileSync2(this.ledgerPath(app), JSON.stringify(ledger, null, 2));
       }
-      // ---- RFC 0061 §3.1 owner-follow `wip` pointer ----
-      // Inside the app directory, so `remove` and `reset` take it with the app. `clearWipIf` is a CAS
-      // for the way this backend is deployed — ONE writer process (serve-control; serve only reads):
-      // the read, compare and delete below are synchronous with no await between them, so no other
+      // ---- RFC 0061 §3.1 owner-follow `wip` record ----
+      // Inside the app directory, so `remove` and `reset` take it with the app. `updateWipRecord` is a
+      // CAS for the way this backend is deployed — ONE writer process (serve-control; serve only
+      // reads): the read, `fn` and write below are synchronous with no await between them, so no other
       // request in that process can land in the middle. It is not a cross-process lock.
-      wipPath(app) {
-        return join2(this.appDir(app), "_wip.json");
-      }
       readWipSync(app) {
         const b = this.read(app, "_wip.json");
         if (!b) return null;
         try {
-          const wip = JSON.parse(b.toString("utf8"));
-          return wip && typeof wip.releaseId === "string" ? wip : null;
+          return JSON.parse(b.toString("utf8"));
         } catch {
           return null;
         }
       }
-      async putWip(app, wip) {
-        mkdirSync2(this.appDir(app), { recursive: true });
-        writeFileSync2(this.wipPath(app), JSON.stringify(wip, null, 2));
-      }
-      async getWip(app) {
+      async getWipRecord(app) {
         return this.readWipSync(app);
       }
-      async clearWipIf(app, releaseId) {
-        if (this.readWipSync(app)?.releaseId !== releaseId) return false;
-        rmSync(this.wipPath(app), { force: true });
+      async updateWipRecord(app, fn) {
+        const next = fn(this.readWipSync(app));
+        if (next === void 0) return false;
+        mkdirSync2(this.appDir(app), { recursive: true });
+        writeFileSync2(join2(this.appDir(app), "_wip.json"), JSON.stringify(next, null, 2));
         return true;
       }
       bundleUrl(_app, sha2565) {
@@ -38224,12 +38257,6 @@ var init_src6 = __esm({
   }
 });
 
-// ../../core/serve-storage/src/wip-pointer.ts
-var init_wip_pointer = __esm({
-  "../../core/serve-storage/src/wip-pointer.ts"() {
-  }
-});
-
 // ../../core/serve-storage/src/release-patch.ts
 import { createHash as createHash17 } from "node:crypto";
 function sha256hex(b) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1068.0",
+  "version": "0.1069.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": [
@@ -65,5 +65,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "d27d980f58b63c6236045887c8cfe93d017ac0d63ffdb1bcba762d90"
+  "falconPackageHash": "d66a8a95769c3eb84b52d4da2233db6689f1f833a2b254304aff2bc0"
 }