@or3/cloud 0.1.69 → 0.1.72

package/dist/cli.mjs

@@ -31,7 +31,7 @@ import { fileURLToPath } from "node:url";
 import { createGunzip } from "node:zlib";
 var execFile = promisify(execFileCallback);
 var PACKAGE_ROOT = resolve(fileURLToPath(new URL("../", import.meta.url)));
-var PACKAGE_VERSION = "0.1.69";
+var PACKAGE_VERSION = "0.1.72";
 var IMAGE_REPOSITORY = "ghcr.io/saluana/or3-chat";
 var ASSET_ROOT = resolve(fileURLToPath(new URL("../assets/", import.meta.url)));
 var LEGACY_STATE_SCHEMA_VERSION = 1;
@@ -368,8 +368,8 @@ async function run(command, args, cwd, environment) {
     });
     return {
       ok: true,
-      stdout: result.stdout ?? "",
-      stderr: result.stderr ?? "",
+      stdout: result.stdout,
+      stderr: result.stderr,
       command: printable,
       exitCode: 0
     };
@@ -494,7 +494,7 @@ function serializeCredentialValue(value) {
   return serializeEnvValue(value);
 }
 function serializeEnv(values) {
-  return `${Object.entries(values).filter(([, value]) => value !== undefined).map(([key, value]) => `${key}=${serializeEnvValue(value)}`).join(`
+  return `${Object.entries(values).filter((entry) => entry[1] !== undefined).map(([key, value]) => `${key}=${serializeEnvValue(value)}`).join(`
 `)}
 `;
 }
@@ -1036,7 +1036,7 @@ async function removeManagedDataVolumeForRecreation(directory, state) {
   } catch {
     throw new Error(`Docker returned unreadable metadata for managed volume ${state.volumeName}.`);
   }
-  if (volume.Name !== state.volumeName || volume.Labels?.["com.docker.compose.project"] !== state.composeProject || volume.Labels?.["com.docker.compose.volume"] !== "or3-data") {
+  if (volume.Name !== state.volumeName || volume.Labels?.["com.docker.compose.project"] !== state.composeProject || volume.Labels["com.docker.compose.volume"] !== "or3-data") {
     throw new Error(`Volume ${state.volumeName} is not bound to this managed Compose deployment. Refusing to recreate it.`);
   }
   const removedVolume = await run("docker", ["volume", "rm", state.volumeName], directory);
@@ -1269,6 +1269,8 @@ async function assertImageReleaseIdentity(image, version) {
   } catch {
     throw new Error(`OR3 image ${image} has no readable release labels.`);
   }
+  if (!labels || typeof labels !== "object")
+    throw new Error(`OR3 image ${image} has no readable release labels.`);
   assertImageReleaseLabels(image, labels, version, packagedSourceRevision(version));
 }
 async function imageDigest(image) {
@@ -1636,6 +1638,7 @@ async function installManagedAssets(directory, assets) {
   const token = randomBytes(4).toString("hex");
   const staged = [];
   let retainRollbackCopies = false;
+  const canCleanRollback = () => !retainRollbackCopies;
   try {
     for (const [name, contents] of assets) {
       const destination = join(directory, name);
@@ -1687,7 +1690,7 @@ async function installManagedAssets(directory, assets) {
       await rm(entry.replacement, { force: true }).catch(() => {
         return;
       });
-      if (entry.rollback && !retainRollbackCopies)
+      if (entry.rollback && canCleanRollback())
         await rm(entry.rollback, { force: true }).catch(() => {
           return;
         });
@@ -2330,6 +2333,7 @@ async function streamCommandToFile(command, args, destination, cwd, secrets = []
   });
   let stderr = "";
   let timedOut = false;
+  const hasTimedOut = () => timedOut;
   const timeout = setTimeout(() => {
     timedOut = true;
     terminateChildProcess(child);
@@ -2347,7 +2351,7 @@ async function streamCommandToFile(command, args, destination, cwd, secrets = []
       exit,
       pipeline(child.stdout, createWriteStream(temporary, { flags: "wx", mode: 384 }))
     ]);
-    if (timedOut)
+    if (hasTimedOut())
       throw new Error(`${command} exceeded the ${STREAM_COMMAND_TIMEOUT_MS / 1000}-second archive deadline.`);
     if (exitCode !== 0) {
       throw new Error(`${command} ${args.join(" ")} exited with ${exitCode}. ${redact(stderr, secrets)}`.trim());
@@ -2375,6 +2379,7 @@ async function streamFileToCommand(command, args, source, cwd, secrets = []) {
   });
   let stderr = "";
   let timedOut = false;
+  const hasTimedOut = () => timedOut;
   const timeout = setTimeout(() => {
     timedOut = true;
     terminateChildProcess(child);
@@ -2392,7 +2397,7 @@ async function streamFileToCommand(command, args, source, cwd, secrets = []) {
       exit,
       pipeline(createReadStream(source), child.stdin)
     ]);
-    if (timedOut)
+    if (hasTimedOut())
       throw new Error(`${command} exceeded the ${STREAM_COMMAND_TIMEOUT_MS / 1000}-second archive deadline.`);
     if (exitCode !== 0) {
       throw new Error(`${command} ${args.join(" ")} exited with ${exitCode}. ${redact(stderr, secrets)}`.trim());
@@ -3124,12 +3129,19 @@ async function collectTargetReadyChecks(directory, mode, env) {
     }
   }
   checks.push(databasesOk ? { code: "database-integrity", status: "passed", detail: "auth.sqlite and sync.sqlite quick_check passed with managed ownership." } : { code: "database-integrity", status: "failed", detail: `SQLite integrity or ownership verification failed. ${redact(databaseCheck.stderr.trim(), secretValues(env))}` });
-  const baseUrl = new URL(mode === "public" ? `https://${env.OR3_PUBLIC_DOMAIN}` : `http://127.0.0.1:${env.OR3_PORT}`);
-  try {
-    validateVerificationHealth(await verificationJson(baseUrl, "/api/health?deep=true"));
-    checks.push({ code: "public-health", status: "passed", detail: `${baseUrl.origin} deep health reports the managed profile.` });
-  } catch (error) {
-    checks.push({ code: "public-health", status: "failed", detail: redact(error instanceof Error ? error.message : String(error)) });
+  if (mode === "public") {
+    const baseUrl = new URL(`https://${env.OR3_PUBLIC_DOMAIN}`);
+    try {
+      validateVerificationHealth(await verificationJson(baseUrl, "/api/health?deep=true"));
+      checks.push({ code: "public-health", status: "passed", detail: `${baseUrl.origin} deep health reports the managed profile.` });
+    } catch (error) {
+      checks.push({ code: "public-health", status: "failed", detail: redact(error instanceof Error ? error.message : String(error)) });
+    }
+  } else {
+    const internal = await run("docker", [
+      ...composeArgs(directory, mode, ["exec", "-T", "or3", ...containerNodeCommand(HEALTH_SCRIPT)])
+    ], directory);
+    checks.push(internal.ok ? { code: "public-health", status: "passed", detail: "Container-internal deep health reports the managed profile." } : { code: "public-health", status: "failed", detail: `Container-internal deep health failed. ${redact(internal.stderr.trim(), secretValues(env))}` });
   }
   return { containerId, checks };
 }
@@ -3778,7 +3790,7 @@ async function assessUpdate(directory, targetVersion, options = {}) {
   }
   try {
     assertKnownStateSchema(state?.schemaVersion);
-    checks.push({ code: "state-schema", status: "passed", detail: `Managed state schema ${String(state?.schemaVersion)} is supported.` });
+    checks.push({ code: "state-schema", status: "passed", detail: `Managed state schema ${String(state.schemaVersion)} is supported.` });
   } catch (error) {
     findings.push({ code: "state-schema-unsupported", severity: "blocker", message: error instanceof Error ? error.message : String(error) });
   }
@@ -4497,7 +4509,7 @@ async function doctorCommand(directory) {
 }
 function validateVerificationHealth(value) {
   const health = value;
-  if (!health || health.status !== "ok" || health.providers?.auth?.provider !== "basic-auth" || health.providers?.sync?.provider !== "sqlite" || health.providers?.storage?.provider !== "fs") {
+  if (!health || health.status !== "ok" || health.providers?.auth?.provider !== "basic-auth" || health.providers.sync?.provider !== "sqlite" || health.providers.storage?.provider !== "fs") {
     throw new Error("Public deep health does not report the managed Basic Auth + SQLite + filesystem profile.");
   }
   return health;
@@ -4517,7 +4529,7 @@ async function verificationJson(baseUrl, path, options = {}) {
       accept: "application/json",
       ...options.body === undefined ? {} : { "content-type": "application/json" },
       ...options.cookie ? { cookie: options.cookie } : {},
-      ...method === "GET" ? {} : { origin: baseUrl.origin }
+      ...method === "GET" ? {} : { origin: baseUrl.origin, "x-or3-cloud-intent": "mutation" }
     },
     ...options.body === undefined ? {} : { body: JSON.stringify(options.body) }
   });
@@ -4525,7 +4537,11 @@ async function verificationJson(baseUrl, path, options = {}) {
     const detail = (await response.text().catch(() => "")).slice(0, 300);
     throw new Error(`${response.url} returned HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
   }
-  return response.json();
+  const value = await response.json();
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    throw new Error(`${response.url} returned an invalid JSON object.`);
+  }
+  return value;
 }
 function sameOriginVerificationUrl(baseUrl, value, label) {
   if (typeof value !== "string")
@@ -4592,7 +4608,7 @@ async function verifyPublicApplication(baseUrl, credentials) {
     throw new Error("Public Basic Auth sign-in did not set a session cookie.");
   try {
     const session = await verificationJson(baseUrl, "/api/auth/session", { cookie });
-    if (session.session?.user?.email !== email || !session.session?.workspace?.id) {
+    if (session.session?.user?.email !== email || !session.session.workspace?.id) {
       throw new Error("Public session hydration did not return the verification user and workspace.");
     }
     const workspaceId = String(session.session.workspace.id);
@@ -4760,7 +4776,7 @@ async function provisionManagedCredentialsOnce(baseUrl, email, password, adminUs
   const appCookie = responseCookie(appSignIn, "Managed owner provisioning");
   try {
     const session = await verificationJson(baseUrl, "/api/auth/session", { cookie: appCookie });
-    if (session.session?.user?.email !== email || !session.session?.workspace?.id) {
+    if (session.session?.user?.email !== email || !session.session.workspace?.id) {
       throw new Error("Managed owner provisioning did not create the expected account and workspace.");
     }
   } finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@or3/cloud",
-  "version": "0.1.69",
+  "version": "0.1.72",
   "description": "Install and operate the OR3 Cloud container distribution",
   "type": "module",
   "license": "GPL-3.0",
@@ -19,9 +19,9 @@
     "dashboardUpdateProtocol": 1,
     "dashboardUpdateMinimumSourceVersion": "0.1.40",
     "stateSchema": 1,
-    "imageDigest": "sha256:996f32c9cdb811a7bed6ae4f061daf4b08f178ed1dd4afb937a29144413c643b",
-    "operatorImageDigest": "sha256:10768bc90617001265537ba81f8fe0f18056c876195ae6738a630a10636e8baf",
-    "sourceRevision": "5cf6ae829820ad956da9e6a27591ddf54a376b84"
+    "imageDigest": "sha256:c4b408ea3a5fbd647b26d6efe89ddad58f90be7528aa2b5b6ed20d6d41c928ac",
+    "operatorImageDigest": "sha256:05b03560594da28e436977b82a905aa9a7702668b5e4ac4daea8b54376a75813",
+    "sourceRevision": "90c5756fa313331df7be656fcbc1bce5a4164d6e"
   },
   "files": [
     "dist",