@keystrokehq/platform 0.1.3 → 0.1.4

package/dist/{start-BX-bkX9K.cjs → start-B90XtxnL.cjs}

@@ -1,10 +1,10 @@
-const require_dist = require("./dist-D1Iv7_7S.cjs");
+const require_dist = require("./dist-CTYXqPDt.cjs");
 let _keystrokehq_database = require("@keystrokehq/database");
 let zod = require("zod");
 require("node:path");
 require("node:fs");
-require("node:url");
 let node_async_hooks = require("node:async_hooks");
+require("node:url");
 let _keystrokehq_platform_database = require("@keystrokehq/platform-database");
 let _hono_node_server = require("@hono/node-server");
 let _keystrokehq_auth = require("@keystrokehq/auth");
@@ -128,20 +128,11 @@ async function promoteProjectDeploy(input) {
 	const webhookRoutes = [...(0, _keystrokehq_runtime.extractWebhookRoutesFromManifest)(manifest), ...ephemeralRoutes];
 	if (webhookRoutes.length > 0) await (0, _keystrokehq_platform_database.ensureWebhookApiKeys)(project.id, webhookRoutes, project.id);
 }
-/** Decide whether a pg-boss job should start runtime, skip as stale, or fail. */
-function resolveRuntimeArtifact(project, jobArtifactId) {
-	if (jobArtifactId && project.pendingArtifactId && jobArtifactId !== project.pendingArtifactId) return { action: "skip" };
-	if (jobArtifactId && !project.pendingArtifactId && project.activeArtifactId && jobArtifactId !== project.activeArtifactId) return { action: "skip" };
-	const artifactId = jobArtifactId ?? project.pendingArtifactId ?? project.activeArtifactId ?? null;
-	if (!artifactId) return {
-		action: "error",
-		message: `Project ${project.id} has no pending artifact`
-	};
-	if (!project.pendingArtifactId && project.activeArtifactId === artifactId && project.status === "active" && project.baseUrl && project.runtimeId) return { action: "skip" };
-	return {
-		action: "run",
-		artifactId
-	};
+/** True when a project still needs an org worker rebuild after a runtime job finishes. */
+function projectNeedsRuntimeFollowUp(project) {
+	if (project.status === "starting" && project.pendingArtifactId) return true;
+	if (project.pendingArtifactId && project.activeArtifactId !== project.pendingArtifactId) return true;
+	return false;
 }
 let runtimeQueue;
 let runtimeQueueInit;
@@ -151,7 +142,7 @@ function configureProjectRuntimeScheduler(plugin) {
 	runtimeQueue = void 0;
 	runtimeQueueInit = void 0;
 }
-async function getProjectRuntimeQueue() {
+async function getOrgRuntimeQueue() {
 	if (runtimeQueue) return runtimeQueue;
 	if (!runtimeQueueInit) runtimeQueueInit = (async () => {
 		const queue = await require_dist.createJobQueue({
@@ -163,27 +154,60 @@ async function getProjectRuntimeQueue() {
 	})();
 	return runtimeQueueInit;
 }
-function toProjectRuntimeJob(payload) {
+function toOrgRuntimeJob(payload) {
 	const job = payload.payload;
-	if (!job?.projectId || !job.name || !job.artifactId) throw new Error("Invalid project runtime job payload");
+	if (!job?.organizationId) throw new Error("Invalid org runtime job payload");
 	return {
-		projectId: job.projectId,
-		name: job.name,
-		artifactId: job.artifactId
+		organizationId: job.organizationId,
+		triggerProjectId: job.triggerProjectId,
+		triggerArtifactId: job.triggerArtifactId
 	};
 }
-async function enqueueProjectRuntime(job) {
-	return (await getProjectRuntimeQueue()).enqueue({
+async function resolveOrgProjects(job) {
+	const projects = await (0, _keystrokehq_platform_database.selectProjectsByOrganizationId)(job.organizationId);
+	const deploys = [];
+	for (const project of projects) {
+		const artifactId = project.id === job.triggerProjectId && job.triggerArtifactId ? job.triggerArtifactId : project.pendingArtifactId ?? project.activeArtifactId;
+		if (!artifactId) continue;
+		const artifact = await (0, _keystrokehq_platform_database.selectProjectArtifactById)(artifactId);
+		if (!artifact || artifact.projectId !== project.id || artifact.status !== "ready") {
+			if (project.id === job.triggerProjectId) throw new Error(`Project ${project.id} pending artifact is not ready`);
+			continue;
+		}
+		deploys.push({
+			projectId: project.id,
+			name: project.name,
+			artifactId,
+			artifactStorageKey: artifact.storageKey
+		});
+	}
+	if (deploys.length === 0) throw new Error(`Organization ${job.organizationId} has no deployable projects`);
+	return deploys;
+}
+async function orgNeedsRuntimeFollowUp(organizationId) {
+	return (await (0, _keystrokehq_platform_database.selectProjectsByOrganizationId)(organizationId)).some(projectNeedsRuntimeFollowUp);
+}
+async function enqueueOrgRuntime(job) {
+	return (await getOrgRuntimeQueue()).enqueue({
 		kind: "runtime",
-		targetId: job.projectId,
-		runId: job.artifactId,
+		targetId: job.organizationId,
+		runId: crypto.randomUUID(),
 		trigger: "api",
 		payload: job,
 		maxAttempts: 5,
-		dedupeKey: job.projectId
+		dedupeKey: job.organizationId
+	});
+}
+async function enqueueProjectRuntime(job) {
+	const project = await (0, _keystrokehq_platform_database.selectProjectById)(job.projectId);
+	if (!project) throw new Error(`Project ${job.projectId} not found`);
+	return enqueueOrgRuntime({
+		organizationId: project.organizationId,
+		triggerProjectId: job.projectId,
+		triggerArtifactId: job.artifactId
 	});
 }
-async function destroyProjectRuntime(runtime, input, runtimeId) {
+async function destroyOrgRuntime(runtime, input, runtimeId) {
 	if (!runtime.destroy) return;
 	try {
 		await runtime.destroy({
@@ -191,49 +215,60 @@ async function destroyProjectRuntime(runtime, input, runtimeId) {
 			hosting: input.hosting
 		});
 	} catch (destroyError) {
-		console.error(`[project.runtime] failed to destroy runtime ${runtimeId}`, destroyError);
+		console.error(`[org.runtime] failed to destroy runtime ${runtimeId}`, destroyError);
 	}
 }
-async function handleProjectRuntimeJob(runtime, resolveStartInput, payload) {
+async function handleOrgRuntimeJob(runtime, resolveStartInput, payload) {
 	if (payload.kind !== "runtime") return;
-	const job = toProjectRuntimeJob(payload);
+	const job = toOrgRuntimeJob(payload);
 	try {
-		const project = await (0, _keystrokehq_platform_database.selectProjectById)(job.projectId);
-		if (!project) throw new Error(`Project ${job.projectId} not found`);
-		const resolved = resolveRuntimeArtifact(project, job.artifactId);
-		if (resolved.action === "skip") return;
-		if (resolved.action === "error") throw new Error(resolved.message);
-		const input = await resolveStartInput({
-			...job,
-			artifactId: resolved.artifactId
-		});
+		const organization = await (0, _keystrokehq_platform_database.selectOrganizationById)(job.organizationId);
+		if (!organization) throw new Error(`Organization ${job.organizationId} not found`);
+		const projects = await resolveOrgProjects(job);
+		const input = await resolveStartInput(job);
+		const mergedInput = {
+			...input,
+			organizationId: job.organizationId,
+			projects,
+			previousRuntimeId: input.previousRuntimeId ?? organization.runtimeId
+		};
 		let result;
 		try {
-			result = await runtime.start(input);
-			await promoteProjectDeploy({
-				projectId: job.projectId,
-				artifactId: resolved.artifactId,
-				baseUrl: result.baseUrl
+			result = await runtime.start(mergedInput);
+			for (const project of projects) {
+				await promoteProjectDeploy({
+					projectId: project.projectId,
+					artifactId: project.artifactId,
+					baseUrl: result.baseUrl
+				});
+				await (0, _keystrokehq_platform_database.updateProjectActive)(project.projectId, {
+					baseUrl: result.baseUrl,
+					runtimeId: result.runtimeId
+				});
+			}
+			await (0, _keystrokehq_platform_database.updateOrganizationActive)(job.organizationId, {
+				baseUrl: result.baseUrl,
+				runtimeId: result.runtimeId
 			});
-			await (0, _keystrokehq_platform_database.updateProjectActive)(job.projectId, result);
-			if (input.previousRuntimeId) await destroyProjectRuntime(runtime, input, input.previousRuntimeId);
+			if (mergedInput.previousRuntimeId) await destroyOrgRuntime(runtime, mergedInput, mergedInput.previousRuntimeId);
+			if (await orgNeedsRuntimeFollowUp(job.organizationId)) await enqueueOrgRuntime({ organizationId: job.organizationId });
 		} catch (error) {
-			if (result) await destroyProjectRuntime(runtime, input, result.runtimeId);
+			if (result) await destroyOrgRuntime(runtime, mergedInput, result.runtimeId);
 			throw error;
 		}
 	} catch (error) {
-		console.error(`[project.runtime] ${job.projectId} failed`, error);
-		if (payload.exhaustedRetries) await (0, _keystrokehq_platform_database.updateProjectFailed)(job.projectId, "Project runtime failed after retries");
+		console.error(`[org.runtime] ${job.organizationId} failed`, error);
+		if (payload.exhaustedRetries) await (0, _keystrokehq_platform_database.updateOrganizationFailed)(job.organizationId, "Org runtime failed after retries");
 		throw error;
 	}
 }
 async function startProjectRuntimeWorker(runtime, options = {}) {
-	const queue = await getProjectRuntimeQueue();
+	const queue = await getOrgRuntimeQueue();
 	const resolveStartInput = options.resolveStartInput ?? (async (job) => {
-		throw new Error(`Project runtime for ${job.projectId} requires resolveStartInput with database credentials`);
+		throw new Error(`Org runtime for ${job.organizationId} requires resolveStartInput with database credentials`);
 	});
 	await queue.startWorker(async (payload) => {
-		await handleProjectRuntimeJob(runtime, resolveStartInput, payload);
+		await handleOrgRuntimeJob(runtime, resolveStartInput, payload);
 	});
 }
 //#endregion
@@ -539,7 +574,7 @@ function requireOrganizationParam() {
 	};
 }
 //#endregion
-//#region ../../packages/http/dist/with-public-project-runtime-BG_6tack.mjs
+//#region ../../packages/http/dist/with-public-project-runtime-B-Xe5GrT.mjs
 const requestBackgroundTasks = new node_async_hooks.AsyncLocalStorage();
 function runWithRequestBackgroundTasks(fn) {
 	return requestBackgroundTasks.run([], fn);
@@ -1577,9 +1612,10 @@ function createProjectReachabilityHandler(hosting) {
 	return async (c) => {
 		const project = c.get("project");
 		if (project.status !== "active") return c.json(require_dist.ProjectReachabilityResponseSchema.parse({ reachable: false }));
+		const organization = await (0, _keystrokehq_platform_database.selectOrganizationById)(project.organizationId);
 		const reachable = await require_dist.pingProjectTarget({
-			baseUrl: project.baseUrl,
-			runtimeId: project.runtimeId
+			baseUrl: organization?.baseUrl ?? project.baseUrl,
+			runtimeId: organization?.runtimeId ?? project.runtimeId
 		}, { plugin: hosting });
 		return c.json(require_dist.ProjectReachabilityResponseSchema.parse({ reachable }));
 	};
@@ -2653,45 +2689,34 @@ async function startPlatformServer(platformConfig, hooks = {}) {
 	if (usesPgBossScheduler(platformConfig)) await (0, _keystrokehq_platform_database.ensureProjectPgBossGrants)();
 	configureProjectRuntimeScheduler(platformConfig.scheduler);
 	await startProjectRuntimeWorker(runtime, { resolveStartInput: async (job) => {
-		const project = await (0, _keystrokehq_platform_database.selectProjectById)(job.projectId);
-		if (!project) throw new Error(`Project ${job.projectId} not found`);
-		const resolved = resolveRuntimeArtifact(project, job.artifactId);
-		if (resolved.action === "error") throw new Error(resolved.message);
-		if (resolved.action === "skip") throw new Error(`Project ${job.projectId} has no deploy artifact to start`);
-		const artifact = await (0, _keystrokehq_platform_database.selectProjectArtifactById)(resolved.artifactId);
-		if (!artifact || artifact.status !== "ready") throw new Error(`Project ${job.projectId} pending artifact is not ready`);
-		const organization = await (0, _keystrokehq_platform_database.selectOrganizationById)(project.organizationId);
-		if (!organization) throw new Error(`Organization not found for project ${job.projectId}`);
+		const organization = await (0, _keystrokehq_platform_database.selectOrganizationById)(job.organizationId);
+		if (!organization) throw new Error(`Organization ${job.organizationId} not found`);
+		const database = await (0, _keystrokehq_platform_database.resolveOrgRuntimeDatabase)(job.organizationId);
 		const workerRuntime = platformConfig.hosting.workerRuntime;
 		return {
-			projectId: job.projectId,
-			name: job.name,
-			artifactId: resolved.artifactId,
-			artifactStorageKey: artifact.storageKey,
-			database: await (0, _keystrokehq_platform_database.resolveProjectRuntimeDatabase)({
-				organizationId: project.organizationId,
-				projectId: project.id
-			}),
+			organizationId: job.organizationId,
+			projects: [],
+			database: {
+				...database,
+				organizationId: job.organizationId
+			},
 			env: {
 				...(0, _keystrokehq_platform_database.orgWorkspacesRuntimeEnv)(organization, { containerEnv: process.env }),
 				...platformConfig.llmProxy?.workerEnv({
 					platformUrl: workerRuntime.platformUrl,
-					workerToken: workerRuntime.workerToken,
-					projectId: project.id
+					workerToken: workerRuntime.workerToken
 				}),
 				...platformConfig.sandboxProxy?.workerEnv({
 					platformUrl: workerRuntime.platformUrl,
-					workerToken: workerRuntime.workerToken,
-					projectId: project.id
+					workerToken: workerRuntime.workerToken
 				}),
 				...platformConfig.workerEnv?.({
 					platformUrl: workerRuntime.platformUrl,
-					workerToken: workerRuntime.workerToken,
-					projectId: project.id
+					workerToken: workerRuntime.workerToken
 				})
 			},
 			hosting: organization.hostingAppName ? { appName: organization.hostingAppName } : void 0,
-			previousRuntimeId: project.runtimeId
+			previousRuntimeId: organization.runtimeId
 		};
 	} });
 	const webUrl = process.env.PUBLIC_WEB_URL;
@@ -2730,4 +2755,4 @@ Object.defineProperty(exports, "startPlatformServer", {
 	}
 });
 
-//# sourceMappingURL=start-BX-bkX9K.cjs.map
+//# sourceMappingURL=start-B90XtxnL.cjs.map