@geekmidas/cli 10.0.0-alpha.113 → 10.0.0-alpha.115

package/dist/{seeds-Dk8YkLkM.cjs → seeds-DbKNcs3o.cjs}

@@ -8,7 +8,7 @@ const require_identity = require("./identity-CbLfgQNT.cjs");
 const require_EndpointGenerator = require("./EndpointGenerator-BwbYTMtB.cjs");
 const require_discover = require("./discover-Bsr7HjqJ.cjs");
 const require_config = require("./config.cjs");
-const require_resolve = require("./resolve-wG49Woex.cjs");
+const require_resolve = require("./resolve-DdFKTx8l.cjs");
 let node_path = require("node:path");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
@@ -4705,8 +4705,9 @@ const dockerCli = {
 			};
 		}
 	},
-	async healthy(composePath, services) {
+	async healthy(composePath, services, { mounted = [] } = {}) {
 		if (services.length === 0) return true;
+		const checkout = (0, node_path.dirname)(composePath);
 		try {
 			const { stdout } = await run("docker", [
 				"compose",
@@ -4719,7 +4720,9 @@ const dockerCli = {
 			const running = /* @__PURE__ */ new Set();
 			for (const line of stdout.trim().split("\n").filter(Boolean)) {
 				const entry = JSON.parse(line);
-				if (entry.State === "running" && (entry.Health === void 0 || entry.Health === "" || entry.Health === "healthy") && entry.Service) running.add(entry.Service);
+				const ok = entry.State === "running" && (entry.Health === void 0 || entry.Health === "" || entry.Health === "healthy");
+				const fromHere = !entry.Service || !mounted.includes(entry.Service) || label(entry.Labels, "com.docker.compose.project.working_dir") === checkout;
+				if (ok && fromHere && entry.Service) running.add(entry.Service);
 			}
 			return services.every((service) => running.has(service));
 		} catch {
@@ -4727,6 +4730,11 @@ const dockerCli = {
 		}
 	}
 };
+/** One label's value out of `docker compose ps`'s comma-joined `Labels`. */
+function label(labels, name) {
+	const prefix = `${name}=`;
+	return labels?.split(",").find((pair) => pair.startsWith(prefix))?.slice(prefix.length);
+}
 //#endregion
 //#region src/reconcile/lan.ts
 /**
@@ -5293,6 +5301,11 @@ const COMPOSE_PATH = "docker-compose.constructs.yml";
 */
 const CADDYFILE_PATH = ".gkm/Caddyfile";
 /**
+* The containers that mount this checkout's files: Caddy reads its routes out
+* of `.gkm/`, so one started from a worktree serves that worktree's ports.
+*/
+const CHECKOUT_MOUNTS = ["caddy"];
+/**
 * Where one stage's routes live, imported by the file above.
 *
 * Per stage because one edge serves every stage, the same way one Postgres
@@ -5393,7 +5406,7 @@ async function reconcile(options) {
 	};
 	const recorded = await loadState(root, stage);
 	const postgresPort = ports[primaryPortKey("postgres")];
-	if (recorded?.hash === hash && (0, node_fs.existsSync)(composePath) && (!start || await docker.healthy(composePath, running)) && (!start || !provision || postgresPort === void 0 || await databasesExist(sql(postgresPort, options.credentials.postgres), postgresDatabaseNames(plan)))) return result;
+	if (recorded?.hash === hash && (0, node_fs.existsSync)(composePath) && (!start || await docker.healthy(composePath, running, { mounted: CHECKOUT_MOUNTS })) && (!start || !provision || postgresPort === void 0 || await databasesExist(sql(postgresPort, options.credentials.postgres), postgresDatabaseNames(plan)))) return result;
 	await write(composePath, toYaml(compose), 384);
 	if (plan.containers.includes("caddy")) {
 		await write((0, node_path.join)(root, CADDYFILE_PATH), caddyfileRoot());
@@ -7345,7 +7358,7 @@ async function createDnsProvider(options) {
 		});
 	}
 	if (provider === "godaddy") {
-		const { GoDaddyProvider } = await Promise.resolve().then(() => require("./GoDaddyProvider-DWrDIXzQ.cjs"));
+		const { GoDaddyProvider } = await Promise.resolve().then(() => require("./GoDaddyProvider-BDvIMTO-.cjs"));
 		return new GoDaddyProvider(options.godaddy ?? {});
 	}
 	if (provider === "cloudflare") throw new DnsProviderNotImplemented("cloudflare");
@@ -9173,4 +9186,4 @@ Object.defineProperty(exports, "workspace_exports", {
 	}
 });
 
-//# sourceMappingURL=seeds-Dk8YkLkM.cjs.map
+//# sourceMappingURL=seeds-DbKNcs3o.cjs.map