openship 0.5.0 → 0.6.1

package/dist/{chunk-EI575GHN.js → chunk-PDW4L3NV.js}

@@ -1,13 +1,13 @@
 #!/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 {
   collectBody
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 import {
   toUtf8
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@aws-sdk/core/dist-es/submodules/protocols/common.js
 var collectBodyString = (streamBody, context) => collectBody(streamBody, context).then((body) => (context?.utf8Encoder ?? toUtf8)(body));

package/dist/{chunk-KI2EY3WB.js → chunk-PXKCZB2I.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);
 var __create = Object.create;

package/dist/{chunk-6APIPIJY.js → chunk-QWHBRY2K.js}

@@ -1,22 +1,22 @@
 #!/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 {
   SerdeContextConfig,
   SignatureV4,
   UnionSerde
-} from "./chunk-IXCHURVK.js";
+} from "./chunk-DOD2BXHQ.js";
 import {
   getValueFromTextNode
-} from "./chunk-VWPEKOH6.js";
+} from "./chunk-DRK3MEDS.js";
 import {
   FromStringShapeDeserializer,
   NormalizedSchema
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 import {
   toUtf8
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@smithy/signature-v4/dist-es/signature-v4a-container.js
 var signatureV4aContainer = {

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

@@ -1,32 +1,32 @@
 #!/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 {
   checkGit,
   installGit
-} from "./chunk-NXFIRK2Z.js";
+} from "./chunk-IOT5ZX23.js";
 import {
   createDockerBuildContext,
   normalizeDockerRelativePath,
   resolveDockerfileCandidates
-} from "./chunk-V7BZMGOT.js";
+} from "./chunk-EMXI4UCU.js";
 import {
   prepareStackOutput,
   resolveProjectDir,
   resolveStaticOutputPath,
   runLocalBuild
-} from "./chunk-KNTJ7PSF.js";
+} from "./chunk-JIMUYEKN.js";
 import {
   BuildLogger,
   injectGitToken,
   runBuildPipeline,
   sq,
   transferLocalDirectory
-} from "./chunk-I6PSTQIR.js";
+} from "./chunk-VDDMADOF.js";
 import {
   isRuntimeNotFoundError
-} from "./chunk-RPHRPFEH.js";
+} from "./chunk-ZCFVHA25.js";
 import {
   STACKS,
   SYSTEM,
@@ -36,7 +36,7 @@ import {
   packageManagerEnsureCommand,
   safeErrorMessage,
   shellSplitWords
-} from "./chunk-UMQP7SYT.js";
+} from "./chunk-OTLSJYAC.js";
 
 // ../../packages/adapters/src/runtime/cloud.ts
 import { readFile } from "fs/promises";

package/dist/{chunk-6B5YCFFV.js → chunk-RVER2EOO.js}

@@ -1,22 +1,22 @@
 #!/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 {
   collectBodyString
-} from "./chunk-EI575GHN.js";
+} from "./chunk-PDW4L3NV.js";
 import {
   ProtocolLib,
   SerdeContextConfig,
   UnionSerde
-} from "./chunk-IXCHURVK.js";
+} from "./chunk-DOD2BXHQ.js";
 import {
   HttpBindingProtocol,
   HttpInterceptingShapeDeserializer,
   HttpInterceptingShapeSerializer,
   NormalizedSchema,
   determineTimestampFormat
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 import {
   LazyJsonString,
   NumericValue,
@@ -27,7 +27,7 @@ import {
   parseRfc3339DateTimeWithOffset,
   parseRfc7231DateTime,
   toBase64
-} from "./chunk-JYGD5WSN.js";
+} from "./chunk-ZWLDLTJP.js";
 
 // ../../node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReviver.js
 function jsonReviver(key, value, context) {

package/dist/{chunk-Q2CIRAOK.js → chunk-RXQBD4ZY.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-6LKHXB6T.js → chunk-TWJCLD4W.js}

@@ -1,28 +1,26 @@
 #!/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 {
   LocalExecutor
-} from "./chunk-TYVME3XD.js";
+} from "./chunk-6FH4AXVY.js";
+import {
+  explainEdgeDown,
+  isEdgeDownFailure
+} from "./chunk-I3DPMTSF.js";
+import {
+  edgeFailureReason
+} from "./chunk-VZ2ZHPS2.js";
 import {
   logEntry,
   sq
-} from "./chunk-FPRHYBY2.js";
+} from "./chunk-ZFJXPCQP.js";
 
 // ../../packages/adapters/src/system/docker-edge-executor.ts
 import Dockerode from "dockerode";
 import { PassThrough } from "stream";
 var DEFAULT_SOCKET = "/var/run/docker.sock";
-function explainEdgeExecError(err, containerName) {
-  const msg = err?.message ?? String(err);
-  if (/is not running|not running|409/i.test(msg)) {
-    return new Error(
-      `edge container "${containerName}" is not running yet (still starting, or stopped) \u2014 wait for it to be up (docker start ${containerName}) and retry.`
-    );
-  }
-  return err instanceof Error ? err : new Error(msg);
-}
 var WRITE_CHUNK = 6e4;
 var DockerEdgeExecutor = class {
   docker;
@@ -36,6 +34,34 @@ var DockerEdgeExecutor = class {
     this.docker = opts.docker ?? new Dockerode({ socketPath: opts.socketPath ?? DEFAULT_SOCKET });
     this.fileMode = opts.fileMode ?? "mounted";
   }
+  /**
+   * Why the edge refused (or couldn't answer) a command, in one operator-facing
+   * line — the dockerode counterpart of `edgeContainerExecutor`'s host-shell probe.
+   *
+   * Reads the state and the log through the daemon API rather than a shell, which is
+   * the whole reason `edgeFailureReason` is a pure parser: the two transports agree
+   * on what counts as the cause without sharing a channel. Best-effort — a probe
+   * that fails must not replace the real failure with an error about diagnosing it.
+   *
+   * The condition this exists for used to be reported as `(HTTP code 409) … container
+   * <64-hex-id> is not running`: the RESOLVED id, no name, no cause. During `openship
+   * up` migration that surfaced as six identical 409s against the edge's own id while
+   * it was still starting, and from the cert flow it surfaced as a container the
+   * operator had no reason to think was involved at all.
+   */
+  async explainDown(err) {
+    const message = err?.message ?? String(err);
+    const container = this.docker.getContainer(this.containerName);
+    const status = await container.inspect().then((info) => info.State?.Status ?? null).catch(() => null);
+    const logs = await container.logs({ stdout: true, stderr: true, tail: 40, follow: false }).then((out) => Buffer.isBuffer(out) ? out.toString("utf8") : String(out)).catch(() => null);
+    const explanation = explainEdgeDown({
+      container: this.containerName,
+      status,
+      reason: logs ? edgeFailureReason(logs) : null
+    });
+    return new Error(`${explanation}
+${message}`);
+  }
   /** Run one command inside the edge container, capturing stdout/stderr + exit. */
   async run(command) {
     const container = this.docker.getContainer(this.containerName);
@@ -50,7 +76,9 @@ var DockerEdgeExecutor = class {
       });
       stream = await exec.start({ stdin: false });
     } catch (err) {
-      throw explainEdgeExecError(err, this.containerName);
+      const message = err?.message ?? String(err);
+      if (isEdgeDownFailure(message) || /\b409\b/.test(message)) throw await this.explainDown(err);
+      throw err instanceof Error ? err : new Error(message);
     }
     const outStream = new PassThrough();
     const errStream = new PassThrough();
@@ -76,6 +104,7 @@ var DockerEdgeExecutor = class {
     const { code, stdout, stderr } = await this.run(command);
     if (code !== 0) {
       const detail = [stderr.trim(), stdout.trim()].filter(Boolean).join("\n");
+      if (isEdgeDownFailure(detail)) throw await this.explainDown(new Error(detail));
       throw new Error(
         detail || `command exited ${code} in edge container ${this.containerName}`
       );
@@ -86,6 +115,12 @@ var DockerEdgeExecutor = class {
     const { code, stdout, stderr } = await this.run(command);
     const output = [stdout, stderr].filter(Boolean).join("");
     if (output) onLog(logEntry(output, code === 0 ? "info" : "error"));
+    if (code !== 0 && isEdgeDownFailure(output)) {
+      const explanation = (await this.explainDown(new Error(output))).message.split("\n")[0];
+      onLog(logEntry(explanation, "error"));
+      return { code, output: `${explanation}
+${output}` };
+    }
     return { code, output };
   }
   // ── File ops ─────────────────────────────────────────────────────────────

package/dist/{chunk-K2RPVGPN.js → chunk-UC7YIEHT.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-ZCOQJCZO.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-UMQP7SYT.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)));
@@ -425,30 +426,47 @@ var SshExecutor = class _SshExecutor {
       });
     });
   }
-  streamExec(command, onLog) {
-    return this._streamExec(command, onLog).catch((err) => {
+  streamExec(command, onLog, opts) {
+    return this._streamExec(command, onLog, opts).catch((err) => {
       if (_SshExecutor.isChannelError(err)) {
         this.recoverFromChannelError();
-        return this._streamExec(command, onLog);
+        return this._streamExec(command, onLog, opts);
       }
       throw err;
     });
   }
-  async _streamExec(command, onLog) {
+  async _streamExec(command, onLog, opts) {
     const client = await this.connect();
+    const signal = opts?.signal;
     return new Promise((resolve, reject) => {
       let settled = false;
+      const chunks = [];
       const abort = (err) => finish(() => reject(err));
       const finish = (act) => {
         if (settled) return;
         settled = true;
         this.inflight.delete(abort);
+        signal?.removeEventListener("abort", onSignalAbort);
         act();
       };
       this.inflight.add(abort);
+      let channel = null;
+      const onSignalAbort = () => {
+        finish(() => resolve({ code: 0, output: chunks.join("") }));
+        try {
+          channel?.close();
+        } catch {
+        }
+      };
+      if (signal?.aborted) {
+        finish(() => resolve({ code: 0, output: "" }));
+        return;
+      }
       client.exec(_SshExecutor.ENV_PREFIX + command, (err, stream) => {
         if (err) return finish(() => reject(err));
-        const chunks = [];
+        channel = stream;
+        if (signal?.aborted) return onSignalAbort();
+        signal?.addEventListener("abort", onSignalAbort, { once: true });
         const onChunk = (data, level) => {
           const text = data.toString();
           if (!text) return;
@@ -479,7 +497,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 +812,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 +938,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 +1046,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 +1238,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 +1309,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-I6PSTQIR.js → chunk-VDDMADOF.js}

@@ -1,16 +1,16 @@
 #!/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 {
   getTarCreateEnv,
   prepareSourceTarArgs
-} from "./chunk-ZCOQJCZO.js";
+} from "./chunk-6ODUBKUB.js";
 import {
   TRANSFER_EXCLUDES,
   packageManagerEnsureCommand,
   safeErrorMessage
-} from "./chunk-UMQP7SYT.js";
+} from "./chunk-OTLSJYAC.js";
 
 // ../../packages/adapters/src/runtime/git-clone.ts
 function sq(value) {

package/dist/{chunk-6PIYRG5I.js → chunk-VZ2ZHPS2.js}

@@ -1,17 +1,15 @@
 #!/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 {
   describeProcess,
-  probeListeningPort
-} from "./chunk-ILFETZOM.js";
-import {
-  OPENRESTY_LUA_DIR
-} from "./chunk-EAAGSQXN.js";
+  probeListeningPort,
+  waitForPortFree
+} from "./chunk-3LDWWY7U.js";
 import {
   AppError
-} from "./chunk-UMQP7SYT.js";
+} from "./chunk-OTLSJYAC.js";
 
 // ../../packages/adapters/src/system/proxy/detect.ts
 var EDGE_PORTS = [80, 443];
@@ -105,19 +103,16 @@ async function sanitizeEdgeVhosts(executor, sitesDir, onLog) {
     }
   }
 }
-async function edgeIsBroken(executor) {
+async function edgeIsBroken(executor, container = EDGE_CONTAINER_NAME) {
   const status = await tryExec(
     executor,
-    `docker inspect -f '{{.State.Status}}' ${sq(EDGE_CONTAINER_NAME)} 2>/dev/null`
+    `docker inspect -f '{{.State.Status}}' ${sq(container)} 2>/dev/null`
   );
   const state = (status ?? "").trim();
   return state === "restarting" || state === "exited" || state === "dead";
 }
-async function edgeCrashReason(executor) {
-  const logs = await tryExec(
-    executor,
-    `docker logs --tail 40 ${sq(EDGE_CONTAINER_NAME)} 2>&1`
-  );
+async function edgeCrashReason(executor, container = EDGE_CONTAINER_NAME) {
+  const logs = await tryExec(executor, `docker logs --tail 40 ${sq(container)} 2>&1`);
   return logs ? edgeFailureReason(logs) : null;
 }
 function edgeFailureReason(containerLog) {
@@ -152,6 +147,22 @@ async function resolveOurEdgeContainer(executor, opts) {
   });
   return resolved;
 }
+async function detectEdgeContainer(executor) {
+  const out = await tryExec(
+    executor,
+    `docker ps -a --format '{{.Names}}	{{.Image}}	{{.State}}' 2>/dev/null`
+  );
+  if (out === null) return null;
+  const absent = { name: null, running: false, image: null, exists: false };
+  for (const line of out.split("\n").map((l) => l.trim()).filter(Boolean)) {
+    const [name, image, state] = line.split("	");
+    if (!name) continue;
+    if (name === EDGE_CONTAINER_NAME || isOurEdgeContainer(name, image)) {
+      return { name, image: image || null, running: state === "running", exists: true };
+    }
+  }
+  return absent;
+}
 async function probeOurEdgeContainer(executor) {
   const byName = await tryExec(
     executor,
@@ -166,13 +177,6 @@ async function probeOurEdgeContainer(executor) {
   }
   return null;
 }
-async function ourLuaOnHost(executor) {
-  const lua = await tryExec(
-    executor,
-    `test -f ${OPENRESTY_LUA_DIR}/site_logger.lua && echo ok`
-  );
-  return Boolean(lua && lua.includes("ok"));
-}
 async function detectDockerOnPort(executor, port) {
   const out = await tryExec(
     executor,
@@ -184,15 +188,6 @@ async function detectDockerOnPort(executor, port) {
   if (!name) return null;
   return { name, image: image ?? "" };
 }
-async function listenerIsOurOpenResty(executor, listener) {
-  if (!listener) return false;
-  if (/openresty/i.test(`${listener.rawCommand ?? ""} ${listener.command ?? ""}`)) return true;
-  if (listener.pid) {
-    const exe = await tryExec(executor, `readlink -f /proc/${listener.pid}/exe 2>/dev/null || true`);
-    if (exe && /openresty/i.test(exe)) return true;
-  }
-  return false;
-}
 var WORKER_RE = /\b(?:nginx|openresty)\s*:\s*worker process/i;
 var MASTER_RE = /\b(?:nginx|openresty)\s*:\s*master process/i;
 async function resolveProxyMaster(executor, listener) {
@@ -224,7 +219,7 @@ async function probeEdgePort(executor, port, ours) {
     ].filter(Boolean).join(" ")
   );
   const foreignDockerProxy = Boolean(docker) && !isOurEdgeContainer(docker?.name, docker?.image);
-  const managedByOpenship = isOurEdgeContainer(docker?.name, docker?.image) || ours.containerRunning && !foreignDockerProxy || !docker && ours.luaOnHost && await listenerIsOurOpenResty(executor, listener);
+  const managedByOpenship = isOurEdgeContainer(docker?.name, docker?.image) || ours.containerRunning && !foreignDockerProxy;
   return {
     port,
     pid: listener?.pid ?? void 0,
@@ -239,18 +234,18 @@ async function probeEdgePort(executor, port, ours) {
   };
 }
 async function probeEdge(executor) {
-  const containerRunning = await ourEdgeContainerRunning(executor);
-  const luaOnHost = await ourLuaOnHost(executor);
-  const all = [];
+  const container = await resolveOurEdgeContainer(executor);
+  const containerRunning = Boolean(container) && !await edgeIsBroken(executor, container);
+  const occupants = [];
   for (const port of EDGE_PORTS) {
-    const occ = await probeEdgePort(executor, port, { containerRunning, luaOnHost });
-    if (occ) all.push(occ);
+    const occ = await probeEdgePort(executor, port, { containerRunning });
+    if (occ) occupants.push(occ);
   }
-  const foreign = all.filter((o) => !o.managedByOpenship);
+  const foreign = occupants.filter((o) => !o.managedByOpenship);
   let classification;
-  if (all.length === 0) classification = "free";
+  if (occupants.length === 0) classification = "free";
   else if (foreign.length === 0) classification = "ours";
-  else if (foreign.every((o) => o.proxy && o.proxy !== "openresty")) classification = "known";
+  else if (foreign.every((o) => o.proxy)) classification = "known";
   else classification = "unknown";
   return {
     classification,
@@ -277,7 +272,7 @@ function stopTargetsForStatus(status) {
   }
   return out;
 }
-async function freeEdgeTargets(executor, targets, onLog) {
+async function freeEdgeTargets(executor, targets, onLog, opts = {}) {
   for (const t of targets) {
     const where = t.port ? ` (port ${t.port})` : "";
     if (t.container) {
@@ -297,7 +292,22 @@ async function freeEdgeTargets(executor, targets, onLog) {
       await tryExec(executor, `kill -9 ${t.pid} 2>/dev/null || true`);
     }
   }
-  await new Promise((r) => setTimeout(r, 1e3));
+  const named = [...new Set(targets.map((t) => t.port).filter((p) => typeof p === "number"))];
+  const stillBound = [];
+  for (const port of named.length ? named : [...EDGE_PORTS]) {
+    const { free, checked } = await waitForPortFree(executor, port, {
+      ...opts.timeoutMs === void 0 ? {} : { timeoutMs: opts.timeoutMs }
+    });
+    if (!checked) {
+      onLog(`Couldn't confirm port ${port} was released (socket table unreadable) \u2014 continuing.`, "warn");
+      continue;
+    }
+    if (!free) {
+      stillBound.push(port);
+      onLog(`Port ${port} is STILL bound after stopping its owner.`, "error");
+    }
+  }
+  return { freed: stillBound.length === 0, stillBound };
 }
 
 export {
@@ -314,7 +324,7 @@ export {
   ourEdgeContainerRunning,
   invalidateEdgeContainer,
   resolveOurEdgeContainer,
-  ourLuaOnHost,
+  detectEdgeContainer,
   probeEdge,
   stopTargetsForStatus,
   freeEdgeTargets

package/dist/{chunk-AVIB7CT7.js → chunk-WNWQBB7F.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 {
   __commonJS,
   __require,
   __toESM
-} from "./chunk-KI2EY3WB.js";
+} from "./chunk-PXKCZB2I.js";
 
 // ../../node_modules/ws/lib/constants.js
 var require_constants = __commonJS({

package/dist/{chunk-FRNAR33O.js → chunk-XZYFZ6A5.js}

@@ -1,13 +1,13 @@
 #!/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 {
   setCredentialFeature
-} from "./chunk-VWPEKOH6.js";
+} from "./chunk-DRK3MEDS.js";
 import {
   CredentialsProviderError
-} from "./chunk-W73X43R7.js";
+} from "./chunk-3NQQXMDR.js";
 
 // ../../node_modules/@aws-sdk/credential-provider-env/dist-es/fromEnv.js
 var ENV_KEY = "AWS_ACCESS_KEY_ID";