openship 0.6.0 → 0.6.1

package/dist/{edge-import-CQWHN2Q3.js → edge-import-SAYTRJLO.js}

@@ -6,7 +6,7 @@ import {
   importMigratedSites,
   waitForApiHealth,
   waitForEdgeRunning
-} from "./chunk-VE2YOK4I.js";
+} from "./chunk-2NZSUXOB.js";
 import "./chunk-XZYFZ6A5.js";
 import "./chunk-PDW4L3NV.js";
 import "./chunk-QWHBRY2K.js";
@@ -15,12 +15,12 @@ import "./chunk-42WQABXM.js";
 import "./chunk-DRK3MEDS.js";
 import "./chunk-3NQQXMDR.js";
 import "./chunk-TWJCLD4W.js";
-import "./chunk-PSZSKEPA.js";
+import "./chunk-RRJJGVKE.js";
 import "./chunk-WNWQBB7F.js";
 import "./chunk-2GWYYHOR.js";
 import "./chunk-RXQBD4ZY.js";
-import "./chunk-EP2TNALB.js";
-import "./chunk-GUQ3QCJ7.js";
+import "./chunk-3NZICQHF.js";
+import "./chunk-IOT5ZX23.js";
 import "./chunk-ONKEYSMY.js";
 import "./chunk-ZWLDLTJP.js";
 import "./chunk-3FYIXVX5.js";
@@ -29,15 +29,15 @@ import "./chunk-IXM5245F.js";
 import "./chunk-JIMUYEKN.js";
 import "./chunk-IW2UKBVF.js";
 import "./chunk-VDDMADOF.js";
-import "./chunk-B3CE2OMR.js";
+import "./chunk-UC7YIEHT.js";
 import "./chunk-6ODUBKUB.js";
 import "./chunk-ZCFVHA25.js";
 import "./chunk-6FH4AXVY.js";
-import "./chunk-QEH4QUBX.js";
+import "./chunk-EW6KB2J7.js";
 import "./chunk-I3DPMTSF.js";
 import "./chunk-VZ2ZHPS2.js";
 import "./chunk-3LDWWY7U.js";
-import "./chunk-OGY63DGD.js";
+import "./chunk-YIPMDGG6.js";
 import "./chunk-ZFJXPCQP.js";
 import "./chunk-OTLSJYAC.js";
 import "./chunk-PXKCZB2I.js";

package/dist/{ensure-container-edge-MJVXJQG5.js → ensure-container-edge-CFSCPGZK.js}

@@ -10,14 +10,14 @@ import {
   resolveEdgeImage,
   setDefaultEdgeImage,
   verifyEdgeServing
-} from "./chunk-GUQ3QCJ7.js";
+} from "./chunk-IOT5ZX23.js";
 import "./chunk-IW2UKBVF.js";
 import "./chunk-ZCFVHA25.js";
-import "./chunk-QEH4QUBX.js";
+import "./chunk-EW6KB2J7.js";
 import "./chunk-I3DPMTSF.js";
 import "./chunk-VZ2ZHPS2.js";
 import "./chunk-3LDWWY7U.js";
-import "./chunk-OGY63DGD.js";
+import "./chunk-YIPMDGG6.js";
 import "./chunk-ZFJXPCQP.js";
 import "./chunk-OTLSJYAC.js";
 import "./chunk-PXKCZB2I.js";

package/dist/{executor-JELARVKC.js → executor-PT6UEJ5M.js}

@@ -8,7 +8,7 @@ import {
   createExecutor,
   createHostExecutor,
   hostControlDisabled
-} from "./chunk-B3CE2OMR.js";
+} from "./chunk-UC7YIEHT.js";
 import "./chunk-6ODUBKUB.js";
 import "./chunk-ZCFVHA25.js";
 import {

package/dist/index.js

@@ -46,7 +46,7 @@ import {
   sourceBuildDir,
   storedApiPort,
   storedDashboardPort
-} from "./chunk-VE2YOK4I.js";
+} from "./chunk-2NZSUXOB.js";
 import "./chunk-XZYFZ6A5.js";
 import "./chunk-PDW4L3NV.js";
 import "./chunk-QWHBRY2K.js";
@@ -55,11 +55,11 @@ import "./chunk-42WQABXM.js";
 import "./chunk-DRK3MEDS.js";
 import "./chunk-3NQQXMDR.js";
 import "./chunk-TWJCLD4W.js";
-import "./chunk-PSZSKEPA.js";
+import "./chunk-RRJJGVKE.js";
 import "./chunk-WNWQBB7F.js";
 import "./chunk-2GWYYHOR.js";
 import "./chunk-RXQBD4ZY.js";
-import "./chunk-EP2TNALB.js";
+import "./chunk-3NZICQHF.js";
 import {
   beginEdgeTakeover,
   collectProxyCerts,
@@ -74,7 +74,7 @@ import {
   rollbackEdgeTakeover,
   scanImportableSites,
   unreachableStaticRoots
-} from "./chunk-GUQ3QCJ7.js";
+} from "./chunk-IOT5ZX23.js";
 import "./chunk-ONKEYSMY.js";
 import "./chunk-ZWLDLTJP.js";
 import "./chunk-3FYIXVX5.js";
@@ -83,13 +83,13 @@ import "./chunk-IXM5245F.js";
 import "./chunk-JIMUYEKN.js";
 import "./chunk-IW2UKBVF.js";
 import "./chunk-VDDMADOF.js";
-import "./chunk-B3CE2OMR.js";
+import "./chunk-UC7YIEHT.js";
 import "./chunk-6ODUBKUB.js";
 import "./chunk-ZCFVHA25.js";
 import {
   LocalExecutor
 } from "./chunk-6FH4AXVY.js";
-import "./chunk-QEH4QUBX.js";
+import "./chunk-EW6KB2J7.js";
 import "./chunk-I3DPMTSF.js";
 import {
   edgeCrashReason,
@@ -97,7 +97,7 @@ import {
   ourEdgeContainerRunning
 } from "./chunk-VZ2ZHPS2.js";
 import "./chunk-3LDWWY7U.js";
-import "./chunk-OGY63DGD.js";
+import "./chunk-YIPMDGG6.js";
 import "./chunk-ZFJXPCQP.js";
 import {
   CLOUD_DASHBOARD_URL,
@@ -268,7 +268,7 @@ function getDashboardUrl(name) {
 }
 
 // src/lib/api-client.ts
-var USER_AGENT = `openship-cli/${true ? "0.6.0" : "dev"}`;
+var USER_AGENT = `openship-cli/${true ? "0.6.1" : "dev"}`;
 function getApiUrl2() {
   return `${getApiUrl()}/api`;
 }
@@ -2278,7 +2278,7 @@ async function runForeground(opts, source) {
     const uiSpinner = ora("Preparing the dashboard\u2026").start();
     try {
       const bundle = await ensureDashboard({
-        tag: source ? "local" : opts.uiVersion || `v${"0.6.0"}`,
+        tag: source ? "local" : opts.uiVersion || `v${"0.6.1"}`,
         onProgress: (received, total) => {
           if (total) {
             uiSpinner.text = `Downloading dashboard\u2026 ${Math.round(received / total * 100)}%`;
@@ -6908,7 +6908,7 @@ var installCommand = new Command25("install").description("Download and install
 });
 
 // src/commands/update.ts
-import { Command as Command26 } from "commander";
+import { Command as Command26, Option } from "commander";
 import { spawnSync as spawnSync10 } from "child_process";
 
 // src/lib/cli-payload.ts
@@ -7124,7 +7124,41 @@ async function ensureNodeRuntime(onLog) {
   return { node: await fetchVendoredNode(onLog), source: "vendored" };
 }
 
+// src/lib/update-reexec.ts
+var REEXEC_ENV = "OPENSHIP_UPDATE_REEXEC";
+function isReexecChild(env = process.env) {
+  return env[REEXEC_ENV] === "1";
+}
+function applyOnlyArgv(selfArgs, json) {
+  return [...selfArgs, ...json ? ["--json"] : [], "update", "--apply-only"];
+}
+
 // src/commands/update.ts
+async function runReconcile() {
+  if (readInstallMethod() === "compose") {
+    const applied = await composeUpdate();
+    if (isJsonMode()) printJson({ reconciled: applied, method: "compose" });
+    else if (applied) ok("Compose stack regenerated, images pulled, services recreated.");
+    else err("Bringing the compose stack up failed. Re-run `openship update`, or `openship up` to retry.");
+    if (!applied) process.exitCode = 1;
+    return applied;
+  }
+  const { restarted } = restart();
+  if (isJsonMode()) printJson({ reconciled: restarted, method: "bare" });
+  else if (restarted) ok("Restarted the service onto the new version.");
+  else ok("Restart the server to run the new version: openship up");
+  return restarted;
+}
+function reexecApply() {
+  if (isReexecChild()) return { spawned: false, status: null };
+  const { runtime, args } = selfInvocation();
+  const argv = applyOnlyArgv(args, isJsonMode());
+  const res = spawnSync10(runtime, argv, {
+    stdio: "inherit",
+    env: { ...process.env, [REEXEC_ENV]: "1" }
+  });
+  return { spawned: res.error == null, status: res.status };
+}
 async function runSourceUpdate(source, opts) {
   const current = shortSha(source.dir);
   const remote = remoteSha(source.repo, source.ref);
@@ -7154,18 +7188,24 @@ async function runSourceUpdate(source, opts) {
     process.exitCode = 1;
     return;
   }
+  info(`Rebuilt from source (${source.ref} @ ${sha}).`);
+  const r = reexecApply();
+  if (r.spawned) {
+    process.exitCode = r.status ?? 0;
+    return;
+  }
   const { restarted } = restart();
   if (isJsonMode()) {
     printJson({ updated: true, source: true, ref: source.ref, from: current, to: sha, restarted });
   } else if (restarted) {
-    ok(`Rebuilt from source (${source.ref} @ ${sha}) and restarted the service.`);
+    ok(`Restarted the service \u2014 you're on ${sha}.`);
   } else {
-    ok(`Rebuilt from source (${source.ref} @ ${sha}). Restart to run it: openship up`);
+    ok(`Restart to run it: openship up`);
   }
 }
 var REINSTALL_HINT = "curl -fsSL https://get.openship.io | sh";
 async function runTarballUpdate(install, opts) {
-  const current = "0.6.0";
+  const current = "0.6.1";
   let latest;
   try {
     latest = (await resolveLatestTag()).replace(/^v/, "");
@@ -7206,6 +7246,11 @@ async function runTarballUpdate(install, opts) {
     return;
   }
   writeCliInstall({ ...install, tag, runtime });
+  const applyViaChild = reexecApply();
+  if (applyViaChild.spawned) {
+    process.exitCode = applyViaChild.status ?? 0;
+    return;
+  }
   if (readInstallMethod() === "compose") {
     const applied = await composeUpdate(latest);
     if (isJsonMode()) {
@@ -7232,12 +7277,16 @@ function detectPackageManager2(override) {
   const hasBun = spawnSync10("bun", ["--version"], { stdio: "ignore" }).status === 0;
   return hasBun ? "bun" : "npm";
 }
-var updateCommand = new Command26("update").description("Update the Openship CLI + bundled server to the latest release").option("--check", "Only report the current + latest version; don't install").option("--via <manager>", "Package manager to update with: bun | npm").option("--rebuild", "From-source installs: rebuild even if already at the remote tip").action(async (opts) => {
+var updateCommand = new Command26("update").description("Update the Openship CLI + bundled server to the latest release").option("--check", "Only report the current + latest version; don't install").option("--via <manager>", "Package manager to update with: bun | npm").option("--rebuild", "From-source installs: rebuild even if already at the remote tip").addOption(new Option("--apply-only").hideHelp()).action(async (opts) => {
+  if (opts.applyOnly) {
+    await runReconcile();
+    return;
+  }
   const source = readSourceInstall();
   if (source) return runSourceUpdate(source, opts);
   const cliInstall = readCliInstall();
   if (cliInstall?.method === "tarball") return runTarballUpdate(cliInstall, opts);
-  const current = "0.6.0";
+  const current = "0.6.1";
   let latest;
   try {
     latest = (await resolveLatestTag()).replace(/^v/, "");
@@ -7271,6 +7320,11 @@ var updateCommand = new Command26("update").description("Update the Openship CLI
     process.exitCode = 1;
     return;
   }
+  const applyViaChild = reexecApply();
+  if (applyViaChild.spawned) {
+    process.exitCode = applyViaChild.status ?? 0;
+    return;
+  }
   if (readInstallMethod() === "compose") {
     const applied = await composeUpdate(latest);
     if (isJsonMode()) {
@@ -7823,7 +7877,7 @@ async function runWizard() {
       }
     }
   }
-  const uiTag = `v${"0.6.0"}`;
+  const uiTag = `v${"0.6.1"}`;
   if (method === "bare") {
     const dl = spinner4();
     dl.start("Pulling the Openship dist from GitHub");
@@ -7891,7 +7945,7 @@ async function runWizard() {
       dashboardPort,
       publicUrl,
       trustProxy: behindProxy,
-      version: "0.6.0",
+      version: "0.6.1",
       noHostControl: !allowHostControl
     })) {
       cancel4("Couldn't fetch the Openship images \u2014 nothing on this box was changed.");
@@ -7916,7 +7970,7 @@ async function runWizard() {
       dashboardPort,
       publicUrl,
       trustProxy: behindProxy,
-      version: "0.6.0",
+      version: "0.6.1",
       noHostControl: !allowHostControl
     });
     if (!up.ok) {
@@ -8258,7 +8312,7 @@ function attachCompletion(program2) {
 
 // src/index.ts
 var program = new Command28();
-program.name("openship").description("Openship CLI \u2014 install, run, and manage Openship from your terminal").version("0.6.0").option("--json", "Machine-readable JSON output (stdout data only)").hook("preAction", (thisCommand) => {
+program.name("openship").description("Openship CLI \u2014 install, run, and manage Openship from your terminal").version("0.6.1").option("--json", "Machine-readable JSON output (stdout data only)").hook("preAction", (thisCommand) => {
   if (thisCommand.opts().json) setJsonMode(true);
 }).action(async () => {
   const installed = serviceStatus().installed || readInstallMethod() === "compose";

package/dist/{nginx-AXGNWRKZ.js → nginx-YOEEFBTE.js}

@@ -11,11 +11,11 @@ import {
   renderProxyOptions,
   renderProxyTlsOptions,
   summarizeCertbotFailure
-} from "./chunk-QEH4QUBX.js";
+} from "./chunk-EW6KB2J7.js";
 import "./chunk-I3DPMTSF.js";
 import "./chunk-VZ2ZHPS2.js";
 import "./chunk-3LDWWY7U.js";
-import "./chunk-OGY63DGD.js";
+import "./chunk-YIPMDGG6.js";
 import "./chunk-ZFJXPCQP.js";
 import "./chunk-OTLSJYAC.js";
 import "./chunk-PXKCZB2I.js";

package/dist/{openresty-lua-IE4P5YQX.js → openresty-lua-WGBO2M3Z.js}

@@ -38,7 +38,7 @@ import {
   ensureOpenRestyConfig,
   luaSourceAvailable,
   parseNginxVersion
-} from "./chunk-OGY63DGD.js";
+} from "./chunk-YIPMDGG6.js";
 import "./chunk-ZFJXPCQP.js";
 import "./chunk-OTLSJYAC.js";
 import "./chunk-PXKCZB2I.js";