openship 0.4.7 → 0.5.0

package/dist/{chunk-XFCDYZUQ.js → chunk-JLKKYUZA.js}

@@ -5,25 +5,25 @@ const require = __ospCreateRequire(import.meta.url);
 import {
   checkGit,
   installGit
-} from "./chunk-UXWAVM4C.js";
+} from "./chunk-NXFIRK2Z.js";
 import {
   createDockerBuildContext,
   normalizeDockerRelativePath,
   resolveDockerfileCandidates
-} from "./chunk-V6AN6XLZ.js";
+} from "./chunk-V7BZMGOT.js";
 import {
   prepareStackOutput,
   resolveProjectDir,
   resolveStaticOutputPath,
   runLocalBuild
-} from "./chunk-MZ2WEHHY.js";
+} from "./chunk-KNTJ7PSF.js";
 import {
   BuildLogger,
   injectGitToken,
   runBuildPipeline,
   sq,
   transferLocalDirectory
-} from "./chunk-4Z5QO7N6.js";
+} from "./chunk-I6PSTQIR.js";
 import {
   isRuntimeNotFoundError
 } from "./chunk-RPHRPFEH.js";
@@ -34,8 +34,9 @@ import {
   buildOutputTransferExcludes,
   missingOutputDirectoryMessage,
   packageManagerEnsureCommand,
-  safeErrorMessage
-} from "./chunk-6APULWSU.js";
+  safeErrorMessage,
+  shellSplitWords
+} from "./chunk-UMQP7SYT.js";
 
 // ../../packages/adapters/src/runtime/cloud.ts
 import { readFile } from "fs/promises";
@@ -202,47 +203,7 @@ function parseJsonArray(value) {
     return null;
   }
 }
-function splitWords(value) {
-  const words = [];
-  let current = "";
-  let inSingle = false;
-  let inDouble = false;
-  let escaped = false;
-  for (const char of value.trim()) {
-    if (escaped) {
-      current += char;
-      escaped = false;
-      continue;
-    }
-    if (char === "\\") {
-      escaped = true;
-      continue;
-    }
-    if (char === "'" && !inDouble) {
-      inSingle = !inSingle;
-      continue;
-    }
-    if (char === '"' && !inSingle) {
-      inDouble = !inDouble;
-      continue;
-    }
-    if (/\s/.test(char) && !inSingle && !inDouble) {
-      if (current) {
-        words.push(current);
-        current = "";
-      }
-      continue;
-    }
-    current += char;
-  }
-  if (escaped) {
-    current += "\\";
-  }
-  if (current) {
-    words.push(current);
-  }
-  return words;
-}
+var splitWords = shellSplitWords;
 function shellQuote(value) {
   if (PATHLIKE_RE.test(value)) {
     return value;
@@ -752,6 +713,11 @@ function restartPolicyForWorkload(policy) {
   if (base === "on-failure") return "on-failure";
   return "always";
 }
+function resolveCloudWorkloadCmd(opts) {
+  const { commandArgv, startCommand, workdir } = opts;
+  if (commandArgv != null) return commandArgv.length > 0 ? commandArgv : void 0;
+  return startCommand ? ["sh", "-c", `cd ${sq(workdir)} && ${startCommand}`] : void 0;
+}
 function exposeTarget(port, serviceName, slug, domain = SYSTEM.DOMAINS.CLOUD_DOMAIN) {
   const service = `service "${serviceName}" on port ${port}`;
   return slug ? `${service} for slug "${slug}" (${slug}.${domain})` : service;
@@ -839,13 +805,18 @@ var CloudComposeSupport = class {
       const port = config.publicPort ?? firstContainerPort(config.ports) ?? builtArtifact?.runtime.exposedPort;
       const workdir = builtArtifact?.runtime.workdir ?? "/";
       const startCommand = config.command ?? builtArtifact?.runtime.startCommand;
+      const workloadCmd = resolveCloudWorkloadCmd({
+        commandArgv: config.commandArgv,
+        startCommand,
+        workdir
+      });
       log({
         timestamp: now(),
         message: `Deploying cloud service "${config.serviceName}" in workspace ${workspaceId}...
 `,
         level: "info"
       });
-      if (startCommand) {
+      if (workloadCmd) {
         log({
           timestamp: now(),
           message: `Creating workload for service "${config.serviceName}"...
@@ -861,7 +832,7 @@ var CloudComposeSupport = class {
           ws.workloads.create({
             id: "app",
             name: "app",
-            cmd: ["sh", "-c", `cd ${sq(workdir)} && ${startCommand}`],
+            cmd: workloadCmd,
             working_dir: workdir,
             env: [...toEnvArray(runtimeEnv), ...port ? [`PORT=${port}`] : []],
             restart_policy: restartPolicyForWorkload(config.restart),
@@ -1412,6 +1383,9 @@ var CloudRuntime = class {
     "usage",
     "containerIp",
     "rollback",
+    // One workspace per deployment, stopped-not-deleted on archive, so its
+    // disk is still there to start back up (see makeActive).
+    "unitRestore",
     "serviceShell",
     "inContainerExec"
   ]);
@@ -2259,6 +2233,14 @@ var CloudRuntime = class {
     const ws = this.ws(workspaceId);
     const log = onLog ?? (() => {
     });
+    if (config.volumes?.length) {
+      log({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        level: "warn",
+        message: `Persistent storage (${config.volumes.join(", ")}) is not supported on Openship Cloud \u2014 the workspace disk is the only durable storage. Use object storage for uploads, or deploy to a server.
+`
+      });
+    }
     try {
       await ws.lifecycle.makePermanent();
     } catch (err) {

package/dist/{chunk-4TJC4JZQ.js → chunk-K2RPVGPN.js}

@@ -9,7 +9,7 @@ import {
   openSshUnixSocket,
   prepareSourceTarArgs,
   reconcileKnownHosts
-} from "./chunk-OXWDY22G.js";
+} from "./chunk-ZCOQJCZO.js";
 import {
   SshDisconnectedError
 } from "./chunk-RPHRPFEH.js";
@@ -27,10 +27,10 @@ import {
   TRANSFER_EXCLUDES,
   formatBytes,
   safeErrorMessage
-} from "./chunk-6APULWSU.js";
+} from "./chunk-UMQP7SYT.js";
 
 // ../../packages/adapters/src/system/executor.ts
-import { readFileSync } from "fs";
+import { existsSync, readFileSync } from "fs";
 
 // ../../packages/adapters/src/system/ssh-executor.ts
 import { createReadStream } from "fs";
@@ -1508,6 +1508,18 @@ function createExecutor(ssh) {
 function hostControlDisabled() {
   return process.env.OPENSHIP_HOST_CONTROL?.trim().toLowerCase() === "false";
 }
+function runningInContainer() {
+  if (process.env.OPENSHIP_IN_CONTAINER?.trim().toLowerCase() === "true") return true;
+  try {
+    if (existsSync("/.dockerenv")) return true;
+  } catch {
+  }
+  try {
+    return /\b(docker|containerd|podman|kubepods)\b/.test(readFileSync("/proc/1/cgroup", "utf8"));
+  } catch {
+    return false;
+  }
+}
 function createHostExecutor() {
   if (hostControlDisabled()) {
     throw new Error(
@@ -1515,7 +1527,14 @@ function createHostExecutor() {
     );
   }
   const host = process.env.OPENSHIP_HOST_SSH_HOST?.trim();
-  if (!host) return localExecutor;
+  if (!host) {
+    if (runningInContainer()) {
+      throw new Error(
+        "This operation targets the HOST machine, but no host channel is configured (OPENSHIP_HOST_SSH_HOST is unset) and Openship is running in a container \u2014 so it would have run inside the container instead, against the wrong filesystem. Re-run `openship up` to provision the host channel."
+      );
+    }
+    return localExecutor;
+  }
   const keyPath = process.env.OPENSHIP_HOST_SSH_KEY?.trim();
   const portRaw = Number(process.env.OPENSHIP_HOST_SSH_PORT || "22");
   const port = Number.isInteger(portRaw) && portRaw > 0 && portRaw < 65536 ? portRaw : 22;

package/dist/{chunk-MZ2WEHHY.js → chunk-KNTJ7PSF.js}

@@ -6,7 +6,7 @@ import {
   detectBuildKillHint,
   runBuildPipeline,
   transferLocalDirectory
-} from "./chunk-4Z5QO7N6.js";
+} from "./chunk-I6PSTQIR.js";
 import {
   LocalExecutor
 } from "./chunk-TYVME3XD.js";

package/dist/{chunk-L2VOGB2X.js → chunk-KZOBYJUW.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-RPHRPFEH.js";
 import {
   safeErrorMessage
-} from "./chunk-6APULWSU.js";
+} from "./chunk-UMQP7SYT.js";
 
 // ../../packages/adapters/src/system/environment.ts
 var profileCache = /* @__PURE__ */ new WeakMap();

package/dist/{chunk-IPYPMI3S.js → chunk-NNPEG6HM.js}

@@ -6,7 +6,7 @@ import {
   COMPONENT_INSTALLERS,
   checkAll,
   checkComponents
-} from "./chunk-UXWAVM4C.js";
+} from "./chunk-NXFIRK2Z.js";
 
 // ../../packages/adapters/src/system/state.ts
 var DEFAULT_STATE_PATH = "/etc/openship/setup-state.json";