openship 0.2.3 → 0.3.0

package/dist/index.js

@@ -1216,7 +1216,13 @@ function findClosingBracket(body, start) {
     const ch = body[i];
     const prev = body[i - 1];
     if (inDouble) {
-      if (ch === '"' && prev !== "\\") inDouble = false;
+      if (ch === '"') {
+        let backslashRun = 0;
+        for (let j = i - 1; j >= 0 && body[j] === "\\"; j--) {
+          backslashRun++;
+        }
+        if (backslashRun % 2 === 0) inDouble = false;
+      }
       continue;
     }
     if (inSingle) {
@@ -3840,7 +3846,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.2.3"}`,
+        tag: source ? "local" : opts.uiVersion || `v${"0.3.0"}`,
         onProgress: (received, total) => {
           if (total) {
             uiSpinner.text = `Downloading dashboard\u2026 ${Math.round(received / total * 100)}%`;
@@ -7520,7 +7526,9 @@ function assetForPlatform() {
     return { name: arch === "arm64" ? "Openship-arm64.dmg" : "Openship-x64.dmg", kind: "dmg" };
   }
   if (platform === "win32") return { name: "Openship-win32-x64.zip", kind: "zip" };
-  if (platform === "linux") return { name: "Openship.AppImage", kind: "appimage" };
+  if (platform === "linux") {
+    return { name: arch === "arm64" ? "Openship-arm64.AppImage" : "Openship.AppImage", kind: "appimage" };
+  }
   throw new Error(`Unsupported platform: ${platform} (${arch})`);
 }
 function installDmg(dmg) {
@@ -7715,7 +7723,7 @@ function detectPackageManager2(override) {
   return hasBun ? "bun" : "npm";
 }
 var updateCommand = new Command25("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").action(async (opts) => {
-  const current = "0.2.3";
+  const current = "0.3.0";
   let latest;
   try {
     latest = (await resolveLatestTag()).replace(/^v/, "");
@@ -7743,7 +7751,7 @@ var updateCommand = new Command25("update").description("Update the Openship CLI
   const ref = `openship@${latest}`;
   const argv = pm === "bun" ? ["add", "-g", ref] : ["install", "-g", ref];
   info(`Updating v${current} \u2192 v${latest} (${cliInstallCommand(pm, latest)})...`);
-  const res = spawnSync6(pm, argv, { stdio: "inherit" });
+  const res = spawnSync6(pm, argv, { stdio: "inherit", shell: process.platform === "win32" });
   if (res.status !== 0) {
     err(`Update failed (${pm} exited ${res.status ?? "with a signal"}). Reinstall manually: ${cliInstallCommand(pm, latest)}`);
     process.exitCode = 1;
@@ -8025,12 +8033,13 @@ async function promptLocalAdmin() {
 }
 async function streamProvision(port, sessionId, s) {
   let ok3 = false;
+  let detail;
   try {
     const res = await fetch(`http://127.0.0.1:${port}/api/system/self-register/stream?id=${sessionId}`, {
       headers: { "X-Internal-Token": ensureInternalToken() },
       signal: AbortSignal.timeout(3e5)
     });
-    if (!res.ok || !res.body) return false;
+    if (!res.ok || !res.body) return { ok: false };
     const reader = res.body.getReader();
     const decoder = new TextDecoder();
     let buffer = "";
@@ -8048,23 +8057,29 @@ async function streamProvision(port, sessionId, s) {
         if (event === "log" && dataRaw) {
           try {
             const d = JSON.parse(dataRaw);
-            if (d.message) s.message(String(d.message).replace(/\s+/g, " ").slice(0, 68));
+            if (d.message) {
+              const msg = String(d.message).replace(/\s+/g, " ");
+              s.message(msg.slice(0, 68));
+              if (d.level === "warn" || d.level === "error") detail = msg;
+            }
           } catch {
           }
         } else if (event === "complete" && dataRaw) {
           try {
-            ok3 = JSON.parse(dataRaw).status === "completed";
+            const d = JSON.parse(dataRaw);
+            ok3 = d.status === "completed";
+            if (!ok3 && typeof d.error === "string") detail = d.error;
           } catch {
           }
         } else if (event === "end") {
-          return ok3;
+          return { ok: ok3, detail };
         }
       }
     }
   } catch {
-    return ok3;
+    return { ok: ok3, detail };
   }
-  return ok3;
+  return { ok: ok3, detail };
 }
 async function runWizard() {
   intro2(`${chalk17.bgCyan(chalk17.black(" Openship "))}${chalk17.dim(" setup")}`);
@@ -8269,7 +8284,7 @@ async function runWizard() {
     domainPlan = { type: "byo", hostname };
     break planning;
   }
-  const uiTag = `v${"0.2.3"}`;
+  const uiTag = `v${"0.3.0"}`;
   const dl = spinner2();
   dl.start("Pulling the Openship dist from GitHub");
   try {
@@ -8388,6 +8403,20 @@ async function runWizard() {
     if (status && !status.canProceedClean && status.occupants?.length) {
       const owner = status.occupants.map((o) => o.command ?? `port ${o.port}`).join(", ");
       const known = status.classification === "known";
+      const sites = pf.ok && Array.isArray(pf.data?.sites) ? pf.data.sites : [];
+      if (sites.length > 0) {
+        const lines = sites.map((st) => {
+          const host = (st.serverNames ?? []).join(", ") || "(no server_name)";
+          const dest = st.target?.kind === "static" ? `static: ${st.target?.root ?? ""}` : st.target?.url ?? "";
+          return `${chalk17.bold(host)} \u2192 ${chalk17.dim(dest)}${st.ssl ? chalk17.green(" [TLS]") : ""}`;
+        });
+        note(lines.join("\n"), `Detected ${sites.length} site${sites.length === 1 ? "" : "s"} on ${owner}`);
+      }
+      const warns = pf.ok && Array.isArray(pf.data?.warnings) ? pf.data.warnings : [];
+      if (warns.length > 0) {
+        log2.warn(`${warns.length} config item${warns.length === 1 ? "" : "s"} won't migrate automatically:`);
+        for (const w of warns.slice(0, 8)) log2.message(chalk17.dim(`\u2022 ${w}`));
+      }
       const choice = ensure(
         await select({
           message: known ? `An existing reverse proxy (${owner}) is serving ports 80/443.` : `Ports 80/443 are in use by ${owner}, which we couldn't identify.`,
@@ -8434,10 +8463,13 @@ async function runWizard() {
       if (res.ok && res.data?.sessionId) {
         const s2 = spinner2();
         s2.start("Issuing HTTPS certificate (OpenResty + Let's Encrypt)");
-        const done = await streamProvision(port, res.data.sessionId, s2);
+        const { ok: done, detail } = await streamProvision(port, res.data.sessionId, s2);
         liveUrl = res.data.url ?? liveUrl;
         if (done) s2.stop(`HTTPS ready: ${liveUrl}`);
-        else s2.stop("HTTPS isn't ready yet \u2014 it retries on reboot; the site serves over HTTP meanwhile.", 1);
+        else {
+          s2.stop("HTTPS isn't ready yet \u2014 it retries on reboot; the site serves over HTTP meanwhile.", 1);
+          if (detail) log2.warn(detail);
+        }
       } else {
         log2.warn(`Couldn't start domain provisioning: ${res.data?.error || "failed"}`);
       }
@@ -8545,7 +8577,7 @@ ${chalk17.dim("Dashboard".padEnd(11))}${dashUrl}
 
 // src/index.ts
 var program = new Command27();
-program.name("openship").description("Openship CLI \u2014 install, run, and manage Openship from your terminal").version("0.2.3").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.3.0").option("--json", "Machine-readable JSON output (stdout data only)").hook("preAction", (thisCommand) => {
   if (thisCommand.opts().json) setJsonMode(true);
 }).action(async () => {
   if (serviceStatus().installed) await runControl();

package/dist/server/index.js

@@ -4,43 +4,25 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name2, newValue) {
-  this[name2] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name2 in all)
     __defProp(target, name2, {
       get: all[name2],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name2)
+      set: (newValue) => all[name2] = () => newValue
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -1166,7 +1148,7 @@ function bytesToBase64Url(bytes) {
   return b64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 function slugify(text) {
-  return text.toLowerCase().replace(/[^\w\s-]/g, "").replace(/[\s_]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 100);
+  return text.toLowerCase().replace(/[^\w\s-]/g, "").replace(/[\s_]+/g, "-").slice(0, 100).replace(/^-+|-+$/g, "");
 }
 function normalizeCustomHostname(raw) {
   return raw.trim().toLowerCase().replace(/^https?:\/\//, "").replace(/\/+$/, "");
@@ -1194,11 +1176,11 @@ function generateId(prefix) {
   return prefix ? `${prefix}_${id}` : id;
 }
 function formatBytes(bytes, decimals = 2) {
-  if (bytes === 0)
+  if (bytes <= 0)
     return "0 B";
   const k = 1024;
   const sizes = ["B", "KB", "MB", "GB", "TB"];
-  const i2 = Math.floor(Math.log(bytes) / Math.log(k));
+  const i2 = Math.min(Math.max(Math.floor(Math.log(bytes) / Math.log(k)), 0), sizes.length - 1);
   return `${parseFloat((bytes / Math.pow(k, i2)).toFixed(decimals))} ${sizes[i2]}`;
 }
 
@@ -1408,8 +1390,14 @@ function findClosingBracket(body2, start2) {
     const ch = body2[i2];
     const prev = body2[i2 - 1];
     if (inDouble) {
-      if (ch === '"' && prev !== "\\")
-        inDouble = false;
+      if (ch === '"') {
+        let backslashRun = 0;
+        for (let j = i2 - 1;j >= 0 && body2[j] === "\\"; j--) {
+          backslashRun++;
+        }
+        if (backslashRun % 2 === 0)
+          inDouble = false;
+      }
       continue;
     }
     if (inSingle) {
@@ -12421,15 +12409,17 @@ function certbotInstallPlan(profile) {
 var OPENRESTY_APT_SOURCES, systemCatalog;
 var init_catalog2 = __esm(() => {
   OPENRESTY_APT_SOURCES = [
+    'OR_ARCH="$(dpkg --print-architecture 2>/dev/null || echo amd64)"',
+    'if [ "$OR_ARCH" = arm64 ]; then OR_BASE="http://openresty.org/package/arm64/$REPO"; else OR_BASE="http://openresty.org/package/$REPO"; fi',
     'REPO_CODENAME="$(lsb_release -sc 2>/dev/null || { . /etc/os-release 2>/dev/null && echo "$VERSION_CODENAME"; })" || REPO_CODENAME=""',
     'if [ "$REPO" = debian ]; then OR_FALLBACKS="bookworm bullseye"; else OR_FALLBACKS="noble jammy focal"; fi',
     'OR_CODENAME=""',
     "for c in $REPO_CODENAME $OR_FALLBACKS; do",
-    '  if wget -q --spider --tries=2 --timeout=15 "http://openresty.org/package/$REPO/dists/$c/Release"; then OR_CODENAME="$c"; break; fi',
+    '  if wget -q --spider --tries=2 --timeout=15 "$OR_BASE/dists/$c/Release"; then OR_CODENAME="$c"; break; fi',
     "done",
     'if [ -z "$OR_CODENAME" ]; then case "$REPO" in debian) OR_CODENAME=bookworm ;; *) OR_CODENAME=noble ;; esac; fi',
     '[ "$OR_CODENAME" = "$REPO_CODENAME" ] || echo "[openresty] apt repo has no codename $REPO_CODENAME; using nearest supported LTS $OR_CODENAME" >&2',
-    'echo "deb [signed-by=/usr/share/keyrings/openresty.gpg] http://openresty.org/package/$REPO $OR_CODENAME main" > /etc/apt/sources.list.d/openresty.list'
+    'echo "deb [arch=$OR_ARCH signed-by=/usr/share/keyrings/openresty.gpg] $OR_BASE $OR_CODENAME main" > /etc/apt/sources.list.d/openresty.list'
   ];
   systemCatalog = {
     checks: {
@@ -13509,7 +13499,12 @@ async function ensureEdgeClear(executor, config, onLog) {
       scan = await scanImportableSites(executor, proxy2);
     }
     const migratable = scan && scan.sites.length > 0;
-    const message = migratable ? `Openship needs ports 80 and 443, but ${owner} is already serving them ` + `(${scan.sites.length} site${scan.sites.length === 1 ? "" : "s"}). Migrate those sites ` + `into Openship and take over, just stop it and take over, or cancel?` : known ? `Openship needs ports 80 and 443, but ${owner} is already serving them. ` + `Stop it and take over, or cancel and leave it running?` : `Openship needs ports 80 and 443, but ${owner} is already using them and ` + `we can't identify it. Stop it and take over, or cancel and leave it running?`;
+    const message = migratable ? `Openship runs its own load balancer (OpenResty) on ports 80 and 443, but ${owner} is ` + `already serving them (${scan.sites.length} site${scan.sites.length === 1 ? "" : "s"}). ` + `Migrate those sites into Openship and take over, just stop it and take over, or cancel?` : known ? `Openship runs its own load balancer (OpenResty) on ports 80 and 443, but ${owner} is ` + `already serving them. Stop it and take over, or cancel and leave it running?` : `Openship runs its own load balancer (OpenResty) on ports 80 and 443, but ${owner} is ` + `already using them and we can't identify it. Stop it and take over, or cancel and leave it running?`;
+    const details = {
+      edge: status,
+      sites: scan?.sites ?? [],
+      warnings: scan?.warnings ?? []
+    };
     const action = await config.promptUser({
       promptId: "edge_conflict",
       title: known ? "Existing reverse proxy detected" : "Ports 80/443 are in use",
@@ -13519,7 +13514,7 @@ async function ensureEdgeClear(executor, config, onLog) {
         { id: "override", label: "Stop it & take over", variant: "danger" },
         { id: "cancel", label: "Cancel", variant: "secondary" }
       ],
-      details: { edge: status, sites: scan?.sites ?? [], warnings: scan?.warnings ?? [] }
+      details
     });
     if (action === "migrate" && scan) {
       throw new EdgeMigrateRequested(status, scan.sites, scan.warnings);
@@ -29125,7 +29120,7 @@ var require_serde = __commonJS((exports) => {
     }
     return value.slice(idx);
   };
-  var LazyJsonString = function LazyJsonString2(val) {
+  var LazyJsonString = function LazyJsonString(val) {
     const str = Object.assign(new String(val), {
       deserializeJSON() {
         return JSON.parse(String(val));
@@ -34442,7 +34437,7 @@ var require_dist_cjs5 = __commonJS((exports) => {
       return httpRequest;
     }
   }
-  var createIsIdentityExpiredFunction = (expirationMs) => function isIdentityExpired2(identity2) {
+  var createIsIdentityExpiredFunction = (expirationMs) => function isIdentityExpired(identity2) {
     return doesIdentityRequireRefresh(identity2) && identity2.expiration.getTime() - Date.now() < expirationMs;
   };
   var EXPIRATION_MS = 300000;
@@ -57255,7 +57250,7 @@ var require_checksum = __commonJS((exports) => {
       totalBytesRead += slice.size;
     }
   }
-  var blobHasher = async function blobHasher2(hashCtor, blob) {
+  var blobHasher = async function blobHasher(hashCtor, blob) {
     const hash = new hashCtor;
     await blobReader(blob, (chunk) => {
       hash.update(chunk);
@@ -80888,7 +80883,7 @@ var require_lib = __commonJS((exports, module2) => {
     3793,
     7920
   ];
-  var toUTF8Array = function toUTF8Array2(str) {
+  var toUTF8Array = function toUTF8Array(str) {
     var char;
     var i2 = 0;
     var p = 0;
@@ -80915,7 +80910,7 @@ var require_lib = __commonJS((exports, module2) => {
     }
     return utf8;
   };
-  var generate = module2.exports = function generate2(str) {
+  var generate = module2.exports = function generate(str) {
     var char;
     var i2 = 0;
     var start2 = -1;
@@ -140159,6 +140154,9 @@ var init_infer_result = () => {};
 
 // ../../node_modules/kysely/dist/esm/index.js
 var init_esm = __esm(() => {
+  init_expression_builder();
+  init_log_once();
+  init_query_id();
   init_kysely();
   init_query_creator();
   init_expression();
@@ -172653,8 +172651,9 @@ function createProjectRepo(db5) {
       };
     },
     async create(data) {
-      const id2 = generateId("proj");
-      const row = { id: id2, ...data };
+      const { id: providedId, ...rest } = data;
+      const id2 = providedId ?? generateId("proj");
+      const row = { id: id2, ...rest };
       await db5.insert(project).values(row);
       return { ...row, createdAt: new Date, updatedAt: new Date };
     },
@@ -210866,7 +210865,7 @@ var require_node2 = __commonJS((exports) => {
     readString16 = readString2(3);
     readString32 = readString2(5);
     function readString2(headerLength) {
-      return function readString3(length) {
+      return function readString(length) {
         let string10 = strings[stringPosition++];
         if (string10 == null) {
           if (bundledStrings$1)
@@ -230130,12 +230129,12 @@ var require_expression = __commonJS((exports, module2) => {
     }
     return resultArr.join(" ");
   };
-  CronExpression.parse = function parse17(expression2, options) {
+  CronExpression.parse = function parse(expression2, options) {
     var self2 = this;
     if (typeof options === "function") {
       options = {};
     }
-    function parse18(expression3, options2) {
+    function parse17(expression3, options2) {
       if (!options2) {
         options2 = {};
       }
@@ -230191,7 +230190,7 @@ var require_expression = __commonJS((exports, module2) => {
         return val2;
       }
     }
-    return parse18(expression2, options);
+    return parse17(expression2, options);
   };
   CronExpression.fieldsToExpression = function fieldsToExpression(fields, options) {
     function validateConstraints(field2, values2, constraints) {
@@ -230255,13 +230254,13 @@ var require_parser3 = __commonJS((exports, module2) => {
       throw new Error("Invalid entry: " + entry);
     }
   };
-  CronParser.parseExpression = function parseExpression2(expression2, options) {
+  CronParser.parseExpression = function parseExpression(expression2, options) {
     return CronExpression.parse(expression2, options);
   };
   CronParser.fieldsToExpression = function fieldsToExpression(fields, options) {
     return CronExpression.fieldsToExpression(fields, options);
   };
-  CronParser.parseString = function parseString2(data) {
+  CronParser.parseString = function parseString(data) {
     var blocks = data.split(`
 `);
     var response = {
@@ -231852,7 +231851,7 @@ var require_sandbox = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   var enums_1 = require_enums();
   var sandbox = (processFile, childPool) => {
-    return async function process5(job2, token, signal) {
+    return async function process(job2, token, signal) {
       let child;
       let msgHandler;
       let exitHandler;
@@ -239477,6 +239476,48 @@ async function createProductionProject(data, slug, organizationId) {
     throw err2;
   }
 }
+async function createServicesProjectWithId(opts) {
+  await assertProjectQuota(opts.organizationId);
+  const slug = await uniqueProjectSlug(opts.organizationId, opts.slug);
+  const group = await repos.projectGroup.create({
+    organizationId: opts.organizationId,
+    name: opts.name,
+    slug,
+    gitProvider: opts.gitProvider ?? undefined,
+    gitOwner: opts.gitOwner ?? undefined,
+    gitRepo: opts.gitRepo ?? undefined,
+    gitUrl: projectGitUrl(opts.gitOwner, opts.gitRepo)
+  });
+  try {
+    const routing2 = deriveNextProjectRouteState({ slug }, { slug });
+    const created = await repos.project.create({
+      id: opts.id,
+      organizationId: opts.organizationId,
+      groupId: group.id,
+      name: opts.name,
+      slug,
+      environmentName: "Production",
+      environmentSlug: "production",
+      environmentType: "production",
+      gitProvider: opts.gitProvider ?? "github",
+      gitOwner: opts.gitOwner ?? undefined,
+      gitRepo: opts.gitRepo ?? undefined,
+      gitBranch: opts.gitBranch ?? "main",
+      gitUrl: projectGitUrl(opts.gitOwner, opts.gitRepo),
+      autoDeploy: !!opts.autoDeploy,
+      framework: "unknown",
+      packageManager: "npm",
+      hasServer: true,
+      hasBuild: opts.hasBuild ?? false,
+      runtimeMode: opts.runtimeMode === "bare" ? "bare" : "docker"
+    });
+    await persistProjectRouteState(created.id, routing2.publicEndpoints);
+    return created;
+  } catch (err2) {
+    await repos.projectGroup.softDelete(group.id).catch(() => {});
+    throw err2;
+  }
+}
 async function uniqueProjectSlug(organizationId, baseSlug) {
   let slug = baseSlug;
   let suffix = 2;
@@ -255152,8 +255193,11 @@ async function triggerDeployment(ctx2, data) {
   if (!reuse) {
     snapshot.buildStrategy = await resolveStrategy(snapshot.framework, snapshot.buildStrategy, { deployTarget: snapshot.deployTarget });
   }
+  const { useServicePipeline, servicePreflightServices } = await resolveServicePipelineMode(project2, snapshot);
   await runDeploymentPreflight(snapshot, routeState, {
     ctx: ctx2,
+    composeServices: servicePreflightServices,
+    multiService: useServicePipeline,
     gitOwner: project2.gitOwner,
     projectId: project2.id
   });
@@ -260195,6 +260239,22 @@ async function runEnsure(progress, options) {
       return { ok: false, reason: "migrate_failed" };
     return { ok: true };
   }
+  if (!options?.edgeTakeover) {
+    const status = await probeEdge2(executor);
+    if (!status.canProceedClean && status.occupants.length > 0) {
+      const owner = status.occupants.map((o4) => o4.command ?? `port ${o4.port}`).join(", ");
+      let siteCount = 0;
+      try {
+        const proxy2 = status.occupants.find((o4) => o4.proxy)?.proxy;
+        if (proxy2 && canImportProxy2(proxy2)) {
+          siteCount = (await scanImportableSites2(executor, proxy2)).sites.length;
+        }
+      } catch {}
+      const sitesNote = siteCount > 0 ? ` serving ${siteCount} site${siteCount === 1 ? "" : "s"}` : "";
+      log7(`An existing proxy (${owner})${sitesNote} is using ports 80 and 443. Openship needs its own ` + `load balancer (OpenResty) there for managed HTTPS — left it running. Re-run setup and choose ` + `migrate or take-over to continue.`, "warn");
+      return { ok: false, reason: "edge_conflict", occupants: owner, siteCount };
+    }
+  }
   const installerConfig = options?.edgeTakeover ? { edgePolicy: { mode: "takeover", stopTargets: [] } } : undefined;
   const system2 = new SystemManager2("bare", { executor, installerConfig });
   await system2.ensureFeature("ssl", (entry) => log7(entry.message));
@@ -267880,9 +267940,51 @@ function reconcileStack(opts) {
     networks: networks.map((n3) => ({ name: n3.name, driver: n3.driver })),
     warnings,
     adoptable: services.length > 0,
-    alreadyManaged
+    alreadyManaged,
+    openshipProjects: opts.openshipProjects ?? []
   };
 }
+function reconcileOpenshipProjects(opts) {
+  const { managedDetails, manifestById, knownHereIds, imageDefaults, imageCmds } = opts;
+  const byProject = new Map;
+  for (const d2 of managedDetails) {
+    const projectId = d2.labels["openship.project"];
+    if (!projectId)
+      continue;
+    if (d2.labels["openship.build"])
+      continue;
+    const list9 = byProject.get(projectId) ?? [];
+    list9.push(d2);
+    byProject.set(projectId, list9);
+  }
+  const out2 = [];
+  for (const [projectId, details] of byProject) {
+    const entry = manifestById?.get(projectId);
+    const services = details.map((d2) => {
+      const svc = toDiscoveredService(d2, undefined, imageDefaults?.get(d2.image ?? ""), imageCmds?.get(d2.image ?? ""));
+      const serviceLabel = d2.labels["openship.service"];
+      return serviceLabel ? { ...svc, name: serviceLabel } : svc;
+    });
+    const deploymentId = details.find((d2) => d2.labels["openship.deployment"])?.labels["openship.deployment"] ?? entry?.deployment?.id;
+    out2.push({
+      projectId,
+      knownHere: knownHereIds.has(projectId),
+      suggestedName: entry?.name || entry?.slug || details.find((d2) => d2.composeProject)?.composeProject || `openship-${projectId.replace(/^proj_/, "").slice(0, 8)}`,
+      slug: entry?.slug,
+      domains: entry?.domains,
+      source: entry ? {
+        gitProvider: entry.gitProvider,
+        gitOwner: entry.gitOwner,
+        gitRepo: entry.gitRepo,
+        gitBranch: entry.gitBranch
+      } : undefined,
+      runtimeMode: entry?.runtimeMode ?? undefined,
+      deploymentId,
+      services
+    });
+  }
+  return out2;
+}
 var ENV_DENYLIST, EDGE_PORTS2;
 var init_docker_reconcile = __esm(() => {
   init_src2();
@@ -267964,8 +268066,12 @@ async function discoverServerStack(serverId, organizationId, onProgress) {
     const isOpenshipOwned = (labels) => Object.keys(labels).some((k4) => k4 === "openship" || k4.startsWith("openship."));
     const managed = containers.filter((c2) => isOpenshipOwned(c2.labels));
     const candidates = containers.filter((c2) => !isOpenshipOwned(c2.labels));
+    const managedApp = managed.filter((c2) => c2.labels["openship.project"] && !c2.labels["openship.build"]);
     step(`Inspecting ${candidates.length} container(s)…`);
-    const details = (await mapLimit(candidates, 5, (c2) => rt2.inspectContainer(c2.id))).filter((d2) => d2 !== null);
+    const [details, managedDetails] = await Promise.all([
+      mapLimit(candidates, 5, (c2) => rt2.inspectContainer(c2.id)).then((d2) => d2.filter((x6) => x6 !== null)),
+      mapLimit(managedApp, 5, (c2) => rt2.inspectContainer(c2.id)).then((d2) => d2.filter((x6) => x6 !== null))
+    ]);
     const groups = new Map;
     for (const d2 of details) {
       const key = d2.composeProject ?? "";
@@ -267975,22 +268081,47 @@ async function discoverServerStack(serverId, organizationId, onProgress) {
     }
     step("Reading compose files…");
     const declared = await readComposeDeclarations(serverId, groups);
-    const uniqueImages = [...new Set(details.map((d2) => d2.image).filter(Boolean))];
+    const uniqueImages = [
+      ...new Set([...details, ...managedDetails].map((d2) => d2.image).filter(Boolean))
+    ];
     const imageInfoPairs = await mapLimit(uniqueImages, 4, async (ref) => {
       const [env6, cmd] = await Promise.all([rt2.inspectImageEnv(ref), rt2.inspectImageCmd(ref)]);
       return [ref, { env: new Set(env6), cmd }];
     });
     const imageDefaults = new Map(imageInfoPairs.map(([ref, v3]) => [ref, v3.env]));
     const imageCmds = new Map(imageInfoPairs.map(([ref, v3]) => [ref, v3.cmd]));
+    let openshipProjects = [];
+    let alreadyManaged = 0;
+    const projectIds = [...new Set(managedApp.map((c2) => c2.labels["openship.project"]).filter(Boolean))];
+    if (projectIds.length > 0) {
+      step("Recovering Openship projects…");
+      const manifest = await sshManager.withExecutor(serverId, (exec3) => readManifest2(exec3)).catch(() => null);
+      const manifestById = manifest ? new Map(manifest.projects.map((p4) => [p4.id, p4])) : null;
+      const knownHereIds = new Set;
+      await Promise.all(projectIds.map(async (id2) => {
+        const row = await repos.project.findByIdInOrganization(id2, organizationId);
+        if (row)
+          knownHereIds.add(id2);
+      }));
+      openshipProjects = reconcileOpenshipProjects({
+        managedDetails,
+        manifestById,
+        knownHereIds,
+        imageDefaults,
+        imageCmds
+      });
+      alreadyManaged = managedApp.filter((c2) => knownHereIds.has(c2.labels["openship.project"])).length;
+    }
     return reconcileStack({
       serverId,
       details,
       volumes,
       networks,
       declared,
-      alreadyManaged: managed.length,
+      alreadyManaged,
       imageDefaults,
-      imageCmds
+      imageCmds,
+      openshipProjects
     });
   } finally {
     await rt2.dispose();
@@ -267998,9 +268129,11 @@ async function discoverServerStack(serverId, organizationId, onProgress) {
 }
 var init_docker_inspect_service = __esm(async () => {
   init_compose_parser();
+  init_openship_manifest();
   init_docker_reconcile();
   init_docker_reconcile();
   await __promiseAll([
+    init_src3(),
     init_deployment_runtime(),
     init_ssh_manager()
   ]);
@@ -268031,28 +268164,7 @@ function normalizeHostPorts(ports, claimed) {
   });
   return { ports: out2, droppedDuplicates };
 }
-async function adoptServerStack(opts) {
-  const { serverId, organizationId, projectName, serviceNames, sameServer, volumeStrategies } = opts;
-  const stack = await discoverServerStack(serverId, organizationId);
-  const selected = new Set(serviceNames);
-  const chosen = stack.services.filter((s4) => selected.has(s4.name) && !s4.proxyKind);
-  if (chosen.length === 0) {
-    throw new Error("None of the selected services were found on the server.");
-  }
-  if (!sameServer) {
-    const built = chosen.filter((s4) => Boolean(s4.build)).map((s4) => s4.name);
-    if (built.length > 0) {
-      throw new Error(`Cross-server migration can't move locally-built images yet (${built.join(", ")}). ` + `Take these over in place (migrate to the same server), or rebuild them from a registry image. Cross-server for built images is coming soon.`);
-    }
-  }
-  const anyBuild = chosen.some((s4) => !s4.image && Boolean(s4.build));
-  const ensureBody = {
-    name: projectName,
-    projectType: "services",
-    hasServer: true,
-    hasBuild: anyBuild
-  };
-  const { project_id, created } = await ensureProject(ensureBody, organizationId);
+function buildAdoptedServiceRows(chosen, selected) {
   const nameCounts = new Map;
   const firstUnique = new Map;
   const uniqueNames = chosen.map((s4) => {
@@ -268064,7 +268176,7 @@ async function adoptServerStack(opts) {
     return unique;
   });
   const claimedHostPorts = new Set;
-  const parsed = chosen.map((s4, i3) => {
+  return chosen.map((s4, i3) => {
     const { ports, droppedDuplicates } = normalizeHostPorts(s4.ports, claimedHostPorts);
     if (droppedDuplicates.length > 0) {
       s4.warnings.push(`Host port(s) ${droppedDuplicates.join(", ")} already published by another service — ` + `kept ${uniqueNames[i3]} on the internal network only (reachable as ${uniqueNames[i3]}:<port>).`);
@@ -268084,6 +268196,30 @@ async function adoptServerStack(opts) {
       advanced: s4.healthcheck ? { healthcheck: s4.healthcheck } : undefined
     };
   });
+}
+async function adoptServerStack(opts) {
+  const { serverId, organizationId, projectName, serviceNames, sameServer, volumeStrategies } = opts;
+  const stack = await discoverServerStack(serverId, organizationId);
+  const selected = new Set(serviceNames);
+  const chosen = stack.services.filter((s4) => selected.has(s4.name) && !s4.proxyKind);
+  if (chosen.length === 0) {
+    throw new Error("None of the selected services were found on the server.");
+  }
+  if (!sameServer) {
+    const built = chosen.filter((s4) => Boolean(s4.build)).map((s4) => s4.name);
+    if (built.length > 0) {
+      throw new Error(`Cross-server migration can't move locally-built images yet (${built.join(", ")}). ` + `Take these over in place (migrate to the same server), or rebuild them from a registry image. Cross-server for built images is coming soon.`);
+    }
+  }
+  const anyBuild = chosen.some((s4) => !s4.image && Boolean(s4.build));
+  const ensureBody = {
+    name: projectName,
+    projectType: "services",
+    hasServer: true,
+    hasBuild: anyBuild
+  };
+  const { project_id, created } = await ensureProject(ensureBody, organizationId);
+  const parsed = buildAdoptedServiceRows(chosen, selected);
   const createdServices = await repos.service.syncFromCompose(project_id, parsed);
   for (const svc of createdServices) {
     const copy = Boolean(sameServer) && volumeStrategies?.[svc.name] === "copy";
@@ -268099,13 +268235,66 @@ async function adoptServerStack(opts) {
     adopted: chosen.map((s4) => s4.name)
   };
 }
+async function reimportOpenshipProject(opts) {
+  const { serverId, organizationId, projectId, projectName, serviceNames } = opts;
+  if (!PROJECT_ID_RE.test(projectId)) {
+    throw new Error("Invalid Openship project id.");
+  }
+  const existing = await repos.project.findById(projectId);
+  if (existing) {
+    throw new Error("A project with this id already exists here — nothing to re-import.");
+  }
+  const stack = await discoverServerStack(serverId, organizationId);
+  const group = stack.openshipProjects.find((p4) => p4.projectId === projectId);
+  if (!group) {
+    throw new Error("That Openship project was not found on the server.");
+  }
+  if (group.knownHere) {
+    throw new Error("That Openship project is already managed by this instance.");
+  }
+  const selected = serviceNames?.length ? new Set(serviceNames) : new Set(group.services.map((s4) => s4.name));
+  const chosen = group.services.filter((s4) => selected.has(s4.name) && !s4.proxyKind);
+  if (chosen.length === 0) {
+    throw new Error("None of the selected services were found on the server.");
+  }
+  const name2 = projectName?.trim() || group.suggestedName;
+  const anyBuild = chosen.some((s4) => !s4.image && Boolean(s4.build));
+  const created = await createServicesProjectWithId({
+    id: projectId,
+    name: name2,
+    slug: group.slug || slugify(name2),
+    organizationId,
+    hasBuild: anyBuild,
+    runtimeMode: group.runtimeMode === "bare" ? "bare" : "docker",
+    gitProvider: group.source?.gitProvider ?? undefined,
+    gitOwner: group.source?.gitOwner ?? undefined,
+    gitRepo: group.source?.gitRepo ?? undefined,
+    gitBranch: group.source?.gitBranch ?? undefined
+  });
+  const parsed = buildAdoptedServiceRows(chosen, selected);
+  const createdServices = await repos.service.syncFromCompose(created.id, parsed);
+  for (const svc of createdServices) {
+    if (svc.namespaceVolumes !== false) {
+      await repos.service.update(svc.id, { namespaceVolumes: false });
+    }
+  }
+  return {
+    projectId: created.id,
+    slug: created.slug,
+    reimported: chosen.map((s4) => s4.name),
+    deferredDeployment: true
+  };
+}
+var PROJECT_ID_RE;
 var init_migrate_service = __esm(async () => {
+  init_src();
   init_docker_reconcile();
   await __promiseAll([
     init_src3(),
     init_project_crud_service(),
     init_docker_inspect_service()
   ]);
+  PROJECT_ID_RE = /^proj_[A-Za-z0-9]+$/;
 });
 
 // ../api/src/modules/migration/migration-preflight.ts
@@ -268679,6 +268868,35 @@ async function adoptServer(c2) {
     return c2.json({ error: `Adopt failed: ${safeErrorMessage(err2)}` }, 502);
   }
 }
+async function reimportServer(c2) {
+  const body2 = await c2.req.json();
+  const { serverId, projectId, projectName, serviceNames } = body2;
+  if (!serverId)
+    return c2.json({ error: "serverId is required" }, 400);
+  if (!projectId?.trim())
+    return c2.json({ error: "projectId is required" }, 400);
+  const ctx2 = getRequestContext(c2);
+  await permission.assert(ctx2, {
+    resourceType: "server",
+    resourceId: serverId,
+    action: "write"
+  });
+  if (!await isServerInOrg(ctx2, serverId)) {
+    return c2.json({ error: "Server not found" }, 404);
+  }
+  try {
+    const result2 = await reimportOpenshipProject({
+      serverId,
+      organizationId: ctx2.organizationId,
+      projectId: projectId.trim(),
+      projectName: projectName?.trim() || undefined,
+      serviceNames: Array.isArray(serviceNames) ? serviceNames : undefined
+    });
+    return c2.json({ success: true, ...result2 });
+  } catch (err2) {
+    return c2.json({ error: `Re-import failed: ${safeErrorMessage(err2)}` }, 502);
+  }
+}
 async function previewMigration(c2) {
   const body2 = await c2.req.json();
   const sourceServerId = body2.sourceServerId;
@@ -268821,6 +269039,7 @@ var init_migration_routes = __esm(async () => {
   r26.post("/scan", { tag: "server:write", collection: true }, scanServer2);
   r26.get("/scan/stream", { tag: "server:write", collection: true }, scanServerStream);
   r26.post("/adopt", { tag: "server:write", collection: true }, adoptServer);
+  r26.post("/reimport", { tag: "server:write", collection: true }, reimportServer);
   r26.post("/preview", { tag: "server:write", collection: true }, previewMigration);
   r26.post("/migrate", { tag: "server:write", collection: true }, startMigration);
   r26.get("/migrations/:id", { tag: "server:read", collection: true }, getMigration);
@@ -278693,6 +278912,7 @@ var deploymentRoutes = r4.hono;
 
 // ../api/src/modules/domains/domain.routes.ts
 init_dist2();
+
 // ../../node_modules/@sinclair/typebox/build/esm/errors/function.mjs
 function DefaultErrorFunction(error101) {
   switch (error101.errorType) {
@@ -279970,7 +280190,6 @@ function Errors(...args2) {
   const iterator = args2.length === 3 ? Visit6(args2[0], args2[1], "", args2[2]) : Visit6(args2[0], [], "", args2[1]);
   return new ValueErrorIterator(iterator);
 }
-
 // ../../node_modules/@sinclair/typebox/build/esm/value/assert/assert.mjs
 var __classPrivateFieldSet = function(receiver, state, value, kind, f3) {
   if (kind === "m")
@@ -284822,7 +285041,7 @@ import { hostname as hostname6, userInfo } from "node:os";
 // ../api/package.json
 var package_default = {
   name: "@repo/api",
-  version: "0.2.3",
+  version: "0.3.0",
   license: "Apache-2.0",
   private: true,
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openship",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Openship CLI - deploy, manage, and open your Openship platform from the terminal",
   "license": "Apache-2.0",
   "repository": {