openship 0.4.8 → 0.6.0

package/dist/{chunk-ILFETZOM.js → chunk-3LDWWY7U.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 
@@ -54,6 +54,25 @@ async function waitForPortListening(executor, port, opts = {}) {
   }
   return anyConclusive ? { listening: false, checked: true } : { listening: false, checked: false };
 }
+async function waitForPortFree(executor, port, opts = {}) {
+  const timeoutMs = opts.timeoutMs ?? 15e3;
+  const intervalMs = opts.intervalMs ?? 500;
+  const deadline = Date.now() + timeoutMs;
+  let anyConclusive = false;
+  try {
+    for (; ; ) {
+      const result = await probePortListeningOnce(executor, port);
+      if (result === false) return { free: true, checked: true };
+      if (result === true) anyConclusive = true;
+      const remaining = deadline - Date.now();
+      if (remaining <= 0) break;
+      await delay(Math.min(intervalMs, remaining));
+    }
+  } catch {
+    return { free: false, checked: false };
+  }
+  return anyConclusive ? { free: false, checked: true } : { free: false, checked: false };
+}
 
 // ../../packages/adapters/src/runtime/port-conflict.ts
 async function tryExec(executor, command) {
@@ -126,6 +145,7 @@ async function describeProcess(executor, pid) {
 
 export {
   waitForPortListening,
+  waitForPortFree,
   probeListeningPort,
   describeProcess
 };

package/dist/{chunk-W73X43R7.js → chunk-3NQQXMDR.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -19,7 +19,7 @@ import {
   splitHeader,
   toBase64,
   toUtf8
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@smithy/types/dist-es/middleware.js
 var SMITHY_CONTEXT_KEY = "__smithy_context";
@@ -1386,7 +1386,7 @@ var HttpProtocol = class extends SerdeContext {
     });
   }
   async loadEventStreamCapability() {
-    const { EventStreamSerde } = await import("./event-streams-EHRAKL75.js");
+    const { EventStreamSerde } = await import("./event-streams-TR4GAC53.js");
     return new EventStreamSerde({
       marshaller: this.getEventStreamMarshaller(),
       serializer: this.serializer,

package/dist/{chunk-OWED2GRM.js → chunk-42WQABXM.js}

@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   HttpResponse,
   buildQueryString
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 
 // ../../node_modules/@smithy/node-http-handler/dist-es/build-abort-error.js
 function buildAbortError(abortSignal) {

package/dist/{chunk-TYVME3XD.js → chunk-6FH4AXVY.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -8,7 +8,7 @@ import {
   getLocalShellPath,
   logEntry,
   sq
-} from "./chunk-FPRHYBY2.js";
+} from "./chunk-ZFJXPCQP.js";
 
 // ../../packages/adapters/src/system/local-executor.ts
 import { exec, spawn } from "child_process";
@@ -41,25 +41,42 @@ var LocalExecutor = class {
       );
     });
   }
-  streamExec(command, onLog) {
+  streamExec(command, onLog, opts) {
     return new Promise((resolve) => {
+      if (opts?.signal?.aborted) {
+        resolve({ code: 0, output: "" });
+        return;
+      }
       const child = spawn(getLocalShellPath(), getLocalShellArgs(command), {
         stdio: ["ignore", "pipe", "pipe"],
         env: getLocalExecEnv()
       });
+      const MAX_RETAINED_CHUNKS = 200;
       const chunks = [];
       const onChunk = (data, level) => {
         const text = data.toString();
         if (!text) return;
         chunks.push(text);
+        if (chunks.length > MAX_RETAINED_CHUNKS) chunks.shift();
         onLog(logEntry(text, level, data.toString("base64")));
       };
+      const signal = opts?.signal;
+      const onAbort = () => {
+        try {
+          child.kill("SIGTERM");
+        } catch {
+        }
+      };
+      signal?.addEventListener("abort", onAbort, { once: true });
+      const cleanup = () => signal?.removeEventListener("abort", onAbort);
       child.stdout.on("data", (data) => onChunk(data, "info"));
       child.stderr.on("data", (data) => onChunk(data, "warn"));
       child.on("close", (code) => {
+        cleanup();
         resolve({ code: code ?? 1, output: chunks.join("") });
       });
       child.on("error", (err) => {
+        cleanup();
         onLog(logEntry(`Process error: ${err.message}`, "error"));
         resolve({ code: 1, output: err.message });
       });

package/dist/{chunk-OXWDY22G.js → chunk-6ODUBKUB.js}

@@ -1,14 +1,14 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   isSshAuthError,
   systemDebug
-} from "./chunk-RPHRPFEH.js";
+} from "./chunk-ZCFVHA25.js";
 import {
   PACKAGE_ROOT_ONLY_EXCLUDES
-} from "./chunk-6APULWSU.js";
+} from "./chunk-OTLSJYAC.js";
 
 // ../../packages/adapters/src/archive.ts
 import { execFile } from "child_process";

package/dist/{chunk-DYPH4HCI.js → chunk-AO252K7Z.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 

package/dist/{chunk-XPPZ7B2J.js → chunk-B3CE2OMR.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -9,25 +9,25 @@ import {
   openSshUnixSocket,
   prepareSourceTarArgs,
   reconcileKnownHosts
-} from "./chunk-OXWDY22G.js";
+} from "./chunk-6ODUBKUB.js";
 import {
   SshDisconnectedError
-} from "./chunk-RPHRPFEH.js";
+} from "./chunk-ZCFVHA25.js";
 import {
   LocalExecutor
-} from "./chunk-TYVME3XD.js";
+} from "./chunk-6FH4AXVY.js";
 import {
   emitBufferedLines,
   flushBufferedLines,
   hasLocalCommand,
   logEntry,
   sq
-} from "./chunk-FPRHYBY2.js";
+} from "./chunk-ZFJXPCQP.js";
 import {
   TRANSFER_EXCLUDES,
   formatBytes,
   safeErrorMessage
-} from "./chunk-6APULWSU.js";
+} from "./chunk-OTLSJYAC.js";
 
 // ../../packages/adapters/src/system/executor.ts
 import { existsSync, readFileSync } from "fs";
@@ -36,7 +36,7 @@ import { existsSync, readFileSync } from "fs";
 import { createReadStream } from "fs";
 import { mkdtemp as mkdtemp2, rm as fsRm2, stat } from "fs/promises";
 import { tmpdir as tmpdir2 } from "os";
-import { dirname, join as join2 } from "path";
+import { join as join2, posix } from "path";
 
 // ../../packages/adapters/src/system/remote-transfer.ts
 import { spawn } from "child_process";
@@ -211,6 +211,7 @@ async function uploadFileWithRsync(localFile, remoteFile, deps, onLog, opts) {
 }
 
 // ../../packages/adapters/src/system/ssh-executor.ts
+var remoteDirname = posix.dirname;
 function clampWindow(value, fallback, min, max) {
   if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
   return Math.max(min, Math.min(max, Math.floor(value)));
@@ -479,7 +480,7 @@ var SshExecutor = class _SshExecutor {
     });
   }
   async writeFile(path, content) {
-    const dir = dirname(path);
+    const dir = remoteDirname(path);
     try {
       await this.exec(`mkdir -p ${sq(dir)}`);
     } catch {
@@ -794,7 +795,7 @@ var SshExecutor = class _SshExecutor {
       onLog?.(logEntry("Packing source into a single archive..."));
       await packLocalArchive(tarArgs, localArchive);
       const totalBytes = (await stat(localArchive)).size;
-      await this.exec(`mkdir -p ${sq(dirname(remoteArchive))}`);
+      await this.exec(`mkdir -p ${sq(remoteDirname(remoteArchive))}`);
       const rsync = await canUseRemoteRsync(deps);
       if (rsync.ok) {
         onLog?.(logEntry(`Uploading ${formatBytes(totalBytes)} archive via rsync (resumable)...`));
@@ -920,7 +921,7 @@ import { once } from "events";
 import { mkdtemp as mkdtemp3, rm as fsRm3, stat as stat2, unlink } from "fs/promises";
 import { connect as netConnect } from "net";
 import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname2, join as join3 } from "path";
+import { join as join3, posix as posix2 } from "path";
 import { Duplex } from "stream";
 import { promisify as promisify2 } from "util";
 import { randomBytes as randomBytes2 } from "crypto";
@@ -1028,6 +1029,7 @@ async function openSystemSshReverseTunnel(opts) {
 
 // ../../packages/adapters/src/system/system-ssh-executor.ts
 var execFileAsync2 = promisify2(execFile2);
+var remoteDirname2 = posix2.dirname;
 function clampWindow2(value, fallback, min, max) {
   if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
   return Math.max(min, Math.min(max, Math.floor(value)));
@@ -1219,7 +1221,7 @@ var SystemSshExecutor = class _SystemSshExecutor {
     });
   }
   async writeFile(path, content) {
-    const remoteCommand = `mkdir -p ${sq(dirname2(path))} && cat > ${sq(path)}`;
+    const remoteCommand = `mkdir -p ${sq(remoteDirname2(path))} && cat > ${sq(path)}`;
     const res = await this.runSsh(remoteCommand, { input: content });
     if (res.code !== 0) {
       throw new Error(res.stderr.trim() || `Failed to write ${path} (exit ${res.code})`);
@@ -1290,7 +1292,7 @@ var SystemSshExecutor = class _SystemSshExecutor {
       onLog?.(logEntry("Packing source into a single archive..."));
       await packLocalArchive(tarArgs, localArchive);
       const totalBytes = (await stat2(localArchive)).size;
-      await this.exec(`mkdir -p ${sq(dirname2(remoteArchive))}`);
+      await this.exec(`mkdir -p ${sq(remoteDirname2(remoteArchive))}`);
       const rsync = await canUseRemoteRsync(deps);
       if (rsync.ok) {
         onLog?.(logEntry(`Uploading ${formatBytes(totalBytes)} archive via rsync (resumable)...`));

package/dist/{chunk-IXCHURVK.js → chunk-DOD2BXHQ.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   decorateServiceException,
   normalizeProvider as normalizeProvider2,
   setCredentialFeature
-} from "./chunk-VWPEKOH6.js";
+} from "./chunk-DRK3MEDS.js";
 import {
   HttpRequest,
   HttpResponse,
@@ -17,14 +17,14 @@ import {
   getSmithyContext,
   normalizeProvider,
   toEndpointV1
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 import {
   fromHex,
   fromUtf8,
   isArrayBuffer,
   toHex,
   toUint8Array
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@smithy/core/dist-es/submodules/schema/schemas/operation.js
 var operation = (namespace, name, traits, input, output) => ({

package/dist/{chunk-VWPEKOH6.js → chunk-DRK3MEDS.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -17,11 +17,11 @@ import {
   loadConfig,
   normalizeProvider,
   toEndpointV1
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 import {
   parseRfc7231DateTime,
   v4
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@smithy/core/dist-es/submodules/client/middleware-stack/MiddlewareStack.js
 var getAllAliases = (name, aliases) => {

package/dist/{chunk-V6AN6XLZ.js → chunk-EMXI4UCU.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
@@ -7,18 +7,18 @@ import {
   localGitSshWriter,
   materializeGitSsh,
   sq
-} from "./chunk-4Z5QO7N6.js";
+} from "./chunk-VDDMADOF.js";
 import {
   getTarCreateEnv,
   prepareSourceTarArgs
-} from "./chunk-OXWDY22G.js";
+} from "./chunk-6ODUBKUB.js";
 import {
   packageManagerEnsureCommand
-} from "./chunk-6APULWSU.js";
+} from "./chunk-OTLSJYAC.js";
 import {
   __commonJS,
   __toESM
-} from "./chunk-KI2EY3WB.js";
+} from "./chunk-PXKCZB2I.js";
 
 // ../../node_modules/ignore/index.js
 var require_ignore = __commonJS({
@@ -690,66 +690,115 @@ function workspacePrepareRunLine(config, envPrefix, workspacePrepare) {
   const body = pmEnsure ? `${pmEnsure} && ${workspacePrepare}` : workspacePrepare;
   return `RUN ${envPrefix}${body}`;
 }
-function installBuildRunLine(config, envPrefix) {
+function stepsRunLine(config, envPrefix, opts) {
+  const install = opts.install ? config.installCommand : "";
+  const build = opts.build ? config.buildCommand : "";
   const steps = [];
-  const pmEnsure = packageManagerEnsureCommand(config.packageManager);
-  if (pmEnsure && (config.installCommand || config.buildCommand)) {
+  const pmEnsure = packageManagerEnsureCommand(opts.packageManager ?? config.packageManager);
+  if (pmEnsure && (install || build)) {
     steps.push(pmEnsure);
   }
-  if (config.installCommand) {
+  if (install) {
     steps.push(`printf '${formatDockerBuildEvent("install", "running")}\\n'`);
-    steps.push(buildRunCommand(config.installCommand, envPrefix));
+    steps.push(buildRunCommand(install, envPrefix));
     steps.push(`printf '${formatDockerBuildEvent("install", "completed")}\\n'`);
   }
-  if (config.buildCommand) {
+  if (build) {
     steps.push(`printf '${formatDockerBuildEvent("build", "running")}\\n'`);
-    steps.push(buildRunCommand(config.buildCommand, envPrefix));
+    steps.push(buildRunCommand(build, envPrefix));
     steps.push(`printf '${formatDockerBuildEvent("build", "completed")}\\n'`);
   }
   return steps.length > 0 ? `RUN ${steps.join(" && ")}` : null;
 }
+function installBuildRunLine(config, envPrefix) {
+  return stepsRunLine(config, envPrefix, { install: true, build: true });
+}
+function installRunLine(config, envPrefix) {
+  return stepsRunLine(config, envPrefix, { install: true });
+}
+var JS_PACKAGE_MANAGERS = ["pnpm", "yarn", "bun", "npm"];
+function buildOnlyRunLine(config, envPrefix) {
+  const command = config.buildCommand?.trim() ?? "";
+  const packageManager = JS_PACKAGE_MANAGERS.find(
+    (pm) => new RegExp(`(^|\\s|&&\\s*)${pm}\\s`).test(command)
+  );
+  return stepsRunLine(config, envPrefix, { build: true, packageManager });
+}
 function isPhpRuntime(config) {
-  return /^php:/.test(config.runtimeImage);
+  return /^php:/.test(config.runtimeImage) || /frankenphp/i.test(config.runtimeImage);
 }
-var PHP_NGINX_TEMPLATE_LINES = [
-  "server {",
-  "    listen ${PORT} default_server;",
-  "    root /app/public;",
-  "    index index.php index.html;",
-  "    location / { try_files $uri $uri/ /index.php?$query_string; }",
-  "    location ~ \\.php$ {",
-  "        fastcgi_pass 127.0.0.1:9000;",
-  "        fastcgi_index index.php;",
-  "        include fastcgi_params;",
-  "        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;",
-  "    }",
-  "}"
+var PHP_EXTENSIONS = [
+  "pdo_mysql",
+  "pdo_pgsql",
+  "redis",
+  "pcntl",
+  "bcmath",
+  "intl",
+  "zip",
+  "gd",
+  "opcache"
 ];
+var PHP_EXT_INSTALLER_IMAGE = "mlocati/php-extension-installer:2";
+var PHP_ASSET_BUILD_IMAGE = "node:22-bookworm-slim";
+var PHP_EXT_INSTALL_LINE = `RUN install-php-extensions ${PHP_EXTENSIONS.join(" ")} > /dev/null`;
 function generatePhpDockerfile(config) {
   const sourceDir = builderSourceDir(
     normalizeDockerRootDirectory(config.rootDirectory, config.localPath)
   );
   const envPrefix = buildEnvPrefix(config.envVars);
-  const stepsLine = installBuildRunLine(config, envPrefix);
-  const nginxTemplate = PHP_NGINX_TEMPLATE_LINES.map((line) => `'${line}'`).join(" ");
+  const installLine = installRunLine(config, envPrefix);
+  const assetBuildLine = buildOnlyRunLine(config, envPrefix);
   const lines = [
     `FROM ${config.buildImage} AS builder`,
-    `WORKDIR /workspace`,
-    `COPY . /workspace`,
     // php:*-cli ships no Composer — pull the binary from the official image.
     `COPY --from=composer:2 /usr/bin/composer /usr/bin/composer`,
-    // pdo_mysql is the common denominator (Laravel/Symfony + MySQL/MariaDB);
-    // app-specific extensions are a per-project follow-on.
-    `RUN docker-php-ext-install pdo_mysql > /dev/null`,
+    `COPY --from=${PHP_EXT_INSTALLER_IMAGE} /usr/bin/install-php-extensions /usr/bin/install-php-extensions`,
+    PHP_EXT_INSTALL_LINE,
+    `WORKDIR /workspace`,
+    `COPY . /workspace`,
     `WORKDIR ${sourceDir}`
   ];
-  if (stepsLine) lines.push(stepsLine);
+  if (installLine) lines.push(installLine);
+  if (assetBuildLine) {
+    lines.push(
+      `FROM ${PHP_ASSET_BUILD_IMAGE} AS assets`,
+      `WORKDIR /workspace`,
+      `COPY . /workspace`,
+      `WORKDIR ${sourceDir}`,
+      assetBuildLine
+    );
+  }
+  const docroot = normalizeRelativePath(config.outputDirectory) || "public";
   lines.push(
     `FROM ${config.runtimeImage} AS runtime`,
-    `RUN apt-get update && apt-get install -y --no-install-recommends nginx gettext-base && rm -rf /var/lib/apt/lists/* && rm -f /etc/nginx/sites-enabled/default && docker-php-ext-install pdo_mysql > /dev/null`,
-    `COPY --from=builder ${sourceDir} /app`,
+    PHP_EXT_INSTALL_LINE,
+    // --chown on the COPY instead of a trailing `chown -R`: the recursive form
+    // rewrites every file into a second layer, doubling the app's size on disk.
+    // Ownership has to be settled HERE, before anything mounts: Docker seeds a
+    // fresh named volume from the image directory it covers, ownership included,
+    // so `/app/storage` is only writable by the runtime user if it was already
+    // owned by them in the image (see @repo/core volumes.ts).
+    `COPY --from=builder --chown=www-data:www-data ${sourceDir} /app`
+  );
+  if (assetBuildLine) {
+    lines.push(
+      `COPY --from=assets --chown=www-data:www-data ${sourceDir}/${docroot} /app/${docroot}`
+    );
+  }
+  lines.push(
     `WORKDIR /app`,
-    `RUN printf '%s\\n' ${nginxTemplate} > /etc/nginx/app.conf.template`,
+    // FrankenPHP's bundled Caddyfile reads the docroot from SERVER_ROOT (default
+    // `public/`, resolved against WORKDIR). Setting it keeps the project's
+    // outputDirectory authoritative for BOTH what gets served and where the asset
+    // stage's output lands — otherwise a project that renamed its docroot builds
+    // assets into one directory and serves another.
+    `ENV SERVER_ROOT=${docroot}/`,
+    // Caddy's config + data dirs are root-owned in the base image, and it writes
+    // to both on startup — without this the non-root switch below fails at boot.
+    `RUN mkdir -p /data/caddy /config/caddy && chown -R www-data:www-data /data/caddy /config/caddy`,
+    // The frankenphp binary carries cap_net_bind_service, so dropping root here
+    // still leaves any port bindable.
+    `USER www-data`,
     `EXPOSE ${config.port}`
   );
   if (config.startCommand) {
@@ -914,23 +963,45 @@ var GENERATED_DOCKERFILE_NAME = "Dockerfile.openship";
 function toPosixPath2(value) {
   return value.split(sep2).filter(Boolean).join("/");
 }
+function anchorDockerignorePattern(line) {
+  const trimmed = line.trim();
+  if (!trimmed || trimmed.startsWith("#")) return line;
+  const negated = trimmed.startsWith("!");
+  const pattern = negated ? trimmed.slice(1) : trimmed;
+  if (!pattern || pattern.startsWith("/") || pattern.startsWith("**/")) return line;
+  if (pattern.replace(/\/+$/, "").includes("/")) return line;
+  return `${negated ? "!" : ""}/${pattern}`;
+}
 async function loadDockerignoreMatcher(rootPath) {
   try {
-    return (0, import_ignore.default)().add(await readFile(join2(rootPath, ".dockerignore"), "utf-8"));
+    const contents = await readFile(join2(rootPath, ".dockerignore"), "utf-8");
+    return (0, import_ignore.default)().add(contents.split(/\r?\n/).map(anchorDockerignorePattern));
   } catch {
     return void 0;
   }
 }
-async function applyDockerignore(contextDir) {
+function buildFilePaths(config) {
+  const paths = /* @__PURE__ */ new Set([".dockerignore"]);
+  const candidates = resolveDockerfileCandidates(config.rootDirectory, config.dockerfilePath);
+  for (const candidate of candidates) {
+    const segments = candidate.split("/");
+    for (let depth = 1; depth <= segments.length; depth += 1) {
+      paths.add(segments.slice(0, depth).join("/"));
+    }
+  }
+  return paths;
+}
+async function applyDockerignore(contextDir, config) {
   const matcher = await loadDockerignoreMatcher(contextDir);
   if (!matcher) return;
+  const buildFiles = buildFilePaths(config);
   const prune = async (currentPath) => {
     const entries = await readdir2(currentPath, { withFileTypes: true });
     await Promise.all(
       entries.map(async (entry) => {
         const absolutePath = join2(currentPath, entry.name);
-        const relativePath = relative2(contextDir, absolutePath);
-        if (matcher.ignores(toPosixPath2(relativePath))) {
+        const relativePath = toPosixPath2(relative2(contextDir, absolutePath));
+        if (!buildFiles.has(relativePath) && matcher.ignores(relativePath)) {
           await rm(absolutePath, { recursive: true, force: true });
           return;
         }
@@ -947,15 +1018,22 @@ async function materializeLocalSource(sourcePath, targetPath) {
       const create = spawn("tar", args, { env: getTarCreateEnv() });
       const extract = spawn("tar", ["-xzf", "-", "-C", targetPath]);
       let err = "";
-      create.stderr.on("data", (d) => err += d.toString());
+      let createErr = "";
+      let createCode = null;
+      create.stderr.on("data", (d) => createErr += d.toString());
       extract.stderr.on("data", (d) => err += d.toString());
       create.on("error", reject);
       extract.on("error", reject);
+      create.on("close", (code) => createCode = code);
       create.stdout.pipe(extract.stdin);
-      extract.on(
-        "close",
-        (code) => code === 0 ? resolve() : reject(new Error(`context materialize failed (tar ${code}): ${err.trim().slice(-500)}`))
-      );
+      extract.on("close", (code) => {
+        if (code === 0 && (createCode ?? 0) === 0) return resolve();
+        const parts = [
+          createCode ? `pack exited ${createCode}: ${createErr.trim().slice(-500)}` : "",
+          code ? `extract exited ${code}: ${err.trim().slice(-500)}` : ""
+        ].filter(Boolean);
+        reject(new Error(`context materialize failed (${parts.join(" | ")})`));
+      });
     });
   } finally {
     await cleanup();
@@ -1021,7 +1099,7 @@ async function prepareSourceTree(config, opts) {
     } else {
       await cloneGitSource(config, contextDir, opts?.onLog);
     }
-    await applyDockerignore(contextDir);
+    await applyDockerignore(contextDir, config);
     return {
       contextDir,
       cleanup: async () => {

package/dist/{chunk-GKHUSZCD.js → chunk-EP2TNALB.js}

@@ -1,12 +1,12 @@
 #!/usr/bin/env sh
-":" //# ; exec "$(command -v bun || command -v node)" "$0" "$@"
+":" //# ; exec "$(command -v node || command -v bun)" "$0" "$@"
 import { createRequire as __ospCreateRequire } from "node:module";
 const require = __ospCreateRequire(import.meta.url);
 import {
   COMPONENT_INSTALLERS,
   checkAll,
   checkComponents
-} from "./chunk-SLTYVHU7.js";
+} from "./chunk-GUQ3QCJ7.js";
 
 // ../../packages/adapters/src/system/state.ts
 var DEFAULT_STATE_PATH = "/etc/openship/setup-state.json";