@datarails-ai/dr-appspace-cli 0.12.12 → 0.12.13

package/dist/cli.js

@@ -13,7 +13,7 @@ import { fileURLToPath as fileURLToPath6 } from "url";
 // package.json
 var package_default = {
   name: "@datarails-ai/dr-appspace-cli",
-  version: "0.12.12",
+  version: "0.12.13",
   description: "Datarails App Space CLI \u2014 build, try, push and publish App Space apps",
   type: "module",
   engines: {
@@ -57,7 +57,7 @@ var package_default = {
 };
 
 // src/buildInfo.ts
-var BUILD_TIME = "2026-10-14T20:08:09.415Z";
+var BUILD_TIME = "2026-10-15T06:27:08.313Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -16373,18 +16373,31 @@ async function writePackage(dir, appId, pkg) {
     ) + "\n"
   );
 }
-async function writeStoredContract(client, appId, dir) {
+async function readStoredContract(client, appId, codeVersion) {
+  const app = `/apps/${encodeURIComponent(appId)}`;
+  const path3 = typeof codeVersion === "number" ? `${app}/versions/${String(codeVersion)}/contract` : `${app}/contract`;
   let stored;
   try {
-    stored = await client.request(`/apps/${encodeURIComponent(appId)}/contract`);
-  } catch {
-    return false;
+    stored = await client.request(path3);
+  } catch (err) {
+    if (err instanceof AppSpaceHttpError) {
+      const detail = err.body?.detail;
+      return { missing: `${String(err.status)}${typeof detail === "string" ? ` ${detail}` : ""}` };
+    }
+    return { missing: err instanceof Error ? err.message.split("\n")[0] ?? "" : String(err) };
+  }
+  if (typeof stored !== "object" || stored === null || Array.isArray(stored)) {
+    return { missing: "the contract read answered no document" };
   }
-  if (typeof stored !== "object" || stored === null || Array.isArray(stored)) return false;
   const held = stored["contract"];
   const document = typeof held === "object" && held !== null && !Array.isArray(held) ? held : stored;
-  if (!("v" in document)) return false;
-  await writeFile5(join10(dir, "contract.json"), JSON.stringify(document, null, 2) + "\n");
+  if (!("v" in document)) return { missing: "the contract read answered no document" };
+  return { document };
+}
+async function writeStoredContract(client, appId, dir, codeVersion) {
+  const read = await readStoredContract(client, appId, codeVersion);
+  if (!("document" in read)) return false;
+  await writeFile5(join10(dir, "contract.json"), JSON.stringify(read.document, null, 2) + "\n");
   return true;
 }
 async function writeOwnedFiles(dir, document, { force = false } = {}) {
@@ -16443,20 +16456,52 @@ async function restoreOwnedFiles(dir, contractWritten, { force }) {
   ];
   return writeOwnedFiles(dir, { owned }, { force });
 }
-async function pullInto(client, appId, dir) {
-  let pkg;
-  try {
-    pkg = await client.request(`/apps/${encodeURIComponent(appId)}/package`);
-  } catch (err) {
-    if (err instanceof AppSpaceHttpError && err.status === 404) return null;
-    throw err;
+var contractWait = { pulls: 7, baseMs: 250, capMs: 4e3 };
+function contractWaitMs(pull) {
+  return Math.min(contractWait.capMs, contractWait.baseMs * 2 ** (pull - 1));
+}
+var LiveContractMissing = class extends Error {
+  constructor(appId, revision, pulls, last) {
+    super(
+      `${appId} is live at revision ${String(revision)}, and its contract could not be read in ${String(pulls)} pulls (the last answered: ${last}). Without it this landing cannot see the cards already live: it would build the app again from the skeleton and replace every one of them. Nothing was landed. Run the same command again. If it fails the same way, the live version has no contract on record: \`app-space get ${appId} --dir <a new folder>\` and then \`app-space push <that folder>\` push the same package back with one, and the next landing builds on it.`
+    );
+    this.appId = appId;
+    this.revision = revision;
+    this.pulls = pulls;
+    this.last = last;
+    this.name = "LiveContractMissing";
+  }
+  appId;
+  revision;
+  pulls;
+  last;
+};
+async function pullInto(client, appId, dir, {
+  onWait,
+  sleep: sleep2 = (ms) => new Promise((done) => setTimeout(done, ms))
+} = {}) {
+  for (let pull = 1; ; pull += 1) {
+    let pkg;
+    try {
+      pkg = await client.request(`/apps/${encodeURIComponent(appId)}/package`);
+    } catch (err) {
+      if (err instanceof AppSpaceHttpError && err.status === 404) return null;
+      throw err;
+    }
+    await rm2(join10(dir, "contract.json"), { force: true });
+    await writePackage(dir, appId, pkg);
+    const read = await readStoredContract(client, appId, pkg.code_version);
+    if ("document" in read) {
+      await writeFile5(join10(dir, "contract.json"), JSON.stringify(read.document, null, 2) + "\n");
+      await restoreOwnedFiles(dir, true, { force: true });
+      await recordPulled(dir, true);
+      return { revision: pkg.revision, stage: pkg.stage };
+    }
+    if (pull >= contractWait.pulls) throw new LiveContractMissing(appId, pkg.revision, pull, read.missing);
+    const ms = contractWaitMs(pull);
+    onWait?.(pull, ms, read.missing);
+    await sleep2(ms);
   }
-  await rm2(join10(dir, "contract.json"), { force: true });
-  await writePackage(dir, appId, pkg);
-  const contract = await writeStoredContract(client, appId, dir);
-  await restoreOwnedFiles(dir, contract, { force: true });
-  await recordPulled(dir, contract);
-  return { revision: pkg.revision, stage: pkg.stage };
 }
 async function runGet(appId, opts) {
   const client = await connect(opts);
@@ -16473,7 +16518,7 @@ async function runGet(appId, opts) {
       return 1;
     }
     await writePackage(dir, appId, pkg);
-    const contract = await writeStoredContract(client, appId, dir);
+    const contract = await writeStoredContract(client, appId, dir, pkg.code_version);
     const restored = await restoreOwnedFiles(dir, contract, { force: opts.force === true });
     await recordPulled(dir, contract);
     if (opts.json === true) {
@@ -27392,7 +27437,7 @@ async function runCompile(dir, opts) {
   if (plan.intruders.length > 0 || plan.strays.length > 0 || plan.edited.length > 0) {
     report.failure = "would-overwrite";
     await writeReport(dir, report);
-    process.stderr.write(refusalOf(dir, plan));
+    process.stderr.write(refusalOf(dir, plan, opts.ontoLive === true));
     return 1;
   }
   const check5 = opts.check === true;
@@ -27731,12 +27776,13 @@ function customHandlerPaths(contract) {
   }
   return out;
 }
-function refusalOf(dir, plan) {
+function refusalOf(dir, plan, ontoLive) {
   const list3 = (paths) => `${paths.slice(0, 3).join(", ")}${paths.length > 3 ? "\u2026" : ""}`;
   let out = "";
   if (plan.intruders.length > 0) {
-    out += `${dir} already holds ${list3(plan.intruders)}, which this compiler did not write. Move them aside, or pass --force to write over them.
-`;
+    out += `${dir} already holds ${list3(plan.intruders)}, ` + // `ship --onto-live` pulled these: they are the live app, and writing
+    // over them is replacing other landings' cards. Never the way past it.
+    (ontoLive ? "which this compiler did not write: they are the live app as pulled, and this landing could not build on them. Nothing was pushed. Run the same command again.\n" : "which this compiler did not write. Move them aside, or pass --force to write over them.\n");
   }
   const handlers = plan.strays.filter((path3) => path3.startsWith("handlers/"));
   const modules = plan.strays.filter((path3) => !path3.startsWith("handlers/"));
@@ -28049,6 +28095,12 @@ async function loadContract(dir, opts) {
     return { contract, assemble: null, headline: resolveExpectations(opts.expect, contract, {}), overlay: {} };
   }
   const baseRaw = await readIfPresent(join15(dir, "contract.json"));
+  if (opts.ontoLive === true && baseRaw === void 0 && await readIfPresent(join15(dir, "manifest.json")) !== void 0) {
+    process.stderr.write(
+      "ship --onto-live: the folder holds the live package but not its contract.json, so this landing cannot see the cards already live, and would replace them. Nothing was written. Run the same command again.\n"
+    );
+    return { exit: 1 };
+  }
   const assembled = assemble({
     drafts: (await Promise.all(drafts.map(readNamed))).flatMap(pageDrafts),
     ...opts.skeleton === void 0 ? {} : { skeleton: await readNamed(opts.skeleton) },
@@ -28416,7 +28468,7 @@ function registerShipCommand(parent) {
   withJsonOption(
     withServerOptions(
       withAssemblyOptions(
-        parent.command("ship [dir]").description("Assemble, compile, push and prove a dashboard pass; print the update block the reply ends with.").option("--seed <file>", "Seed rows, as JSON. Forwarded to the push.").option("--force", "Write over files this compiler did not write (never a custom handler).").option(
+        parent.command("ship [dir]").description("Assemble, compile, push and prove a dashboard pass; print the update block the reply ends with.").option("--seed <file>", "Seed rows, as JSON. Forwarded to the push.").option("--force", "Write over files this compiler did not write (never a custom handler). Refused with --onto-live.").option(
           "--onto-live",
           "Land this pass's cards on the app as it is live now, keeping every card already there: pull it, add them, push against its revision, and start over when another push lands first. Needs --app-id and --skeleton, and a folder of its own."
         )
@@ -28451,6 +28503,11 @@ async function runShipOntoLive(dir, opts) {
   if ((opts.expect ?? []).length > 0) {
     return refuse("--expect holds the headline, which is the build's to confirm; a landing proves its own cards only.");
   }
+  if (opts.force === true) {
+    return refuse(
+      "does not take --force: every landing builds on the cards already live, and --force would let this one replace them. Run the same command without it. If it refuses over files it did not write, the live app could not be read whole: run it again, and report the refusal if it repeats."
+    );
+  }
   const owned = await claimFolder(dir);
   if (owned !== null) return refuse(owned);
   await defaultServerFromSession(opts);
@@ -28462,7 +28519,20 @@ async function runShipOntoLive(dir, opts) {
     const client = await connect(opts);
     let pulled;
     try {
-      pulled = await pullInto(client, appId, dir);
+      pulled = await pullInto(client, appId, dir, {
+        onWait: (pull, ms, missing) => {
+          if (opts.json === true) return;
+          process.stdout.write(
+            `onto ${appId}: the live version's contract is not readable yet (${missing}) \u2014 pulling again in ${String(ms)} ms (pull ${String(pull + 1)})
+`
+          );
+        }
+      });
+    } catch (err) {
+      if (!(err instanceof LiveContractMissing)) throw err;
+      process.stderr.write(`ship --onto-live: ${err.message}
+`);
+      return { code: 1, lost: null, creating: false };
     } finally {
       client.cleanup();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarails-ai/dr-appspace-cli",
-  "version": "0.12.12",
+  "version": "0.12.13",
   "description": "Datarails App Space CLI — build, try, push and publish App Space apps",
   "type": "module",
   "engines": {