@overdeck/desktop 0.45.22 → 0.45.24

package/server/{stack-health-C-ifC7b0.js → stack-health-DxSdG9cW.js}

@@ -1,9 +1,9 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Hn as init_projects, In as getProjectSync, fr as init_issue_id, mr as parseIssueIdSync, nr as resolveProjectFromIssueSync } from "./config-yaml-ig8Nwtiw.js";
+import { Tn as init_projects, Yn as init_issue_id, Zn as parseIssueIdSync, yn as getProjectSync, zn as resolveProjectFromIssueSync } from "./config-yaml-DySPNmKN.js";
 import { a as init_activity_logger, n as emitActivityEntrySync } from "./activity-logger-DDlOIAML.js";
 import { join } from "node:path";
 import { Duration, Effect, Schedule, Stream } from "effect";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { ChildProcess } from "effect/unstable/process";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -177,6 +177,52 @@ var init_docker_stats = __esmMin((() => {
 }));
 //#endregion
 //#region ../../lib/workspace/stack-health.ts
+function declaredComposeProjectName(content, featureFolder) {
+	const templatedMatch = content.match(/COMPOSE_PROJECT_NAME="([^$"]*)\$\{FEATURE_FOLDER\}"/);
+	if (templatedMatch) return `${templatedMatch[1]}${featureFolder}`;
+	return content.match(/COMPOSE_PROJECT_NAME="([^"]+)"/)?.[1] ?? null;
+}
+/**
+* Derive the canonical `COMPOSE_PROJECT_NAME` for a workspace. Throws when the
+* workspace declares a name that does not end in the feature folder — a
+* mismatch means `docker compose down` would target the wrong stack.
+* (Lives here rather than in rebuild-stack so health checks can scope
+* container matching without an import cycle.)
+*/
+function composeProjectNameForWorkspace(workspacePath, issueId) {
+	const featureFolder = `feature-${issueId.toLowerCase()}`;
+	const fallback = `overdeck-${featureFolder}`;
+	for (const devPath of [join(workspacePath, ".devcontainer", "dev"), join(workspacePath, "dev")]) {
+		if (!existsSync(devPath)) continue;
+		try {
+			const declared = declaredComposeProjectName(readFileSync(devPath, "utf-8"), featureFolder);
+			if (!declared) continue;
+			if (!declared.endsWith(featureFolder)) throw new Error(`Refusing workspace rebuild: ${devPath} declares COMPOSE_PROJECT_NAME=${declared}, expected a name ending in ${featureFolder}`);
+			return declared;
+		} catch (err) {
+			if (err instanceof Error && err.message.startsWith("Refusing workspace rebuild:")) throw err;
+		}
+	}
+	return fallback;
+}
+/**
+* Best-effort canonical compose project for a workspace — null when the
+* workspace (or its dev file) is missing or declares a conflicting name, in
+* which case callers fall back to name-token matching.
+*/
+function tryComposeProjectNameForWorkspace(workspacePath, issueId) {
+	if (!workspacePath || !existsSync(workspacePath)) return null;
+	try {
+		return composeProjectNameForWorkspace(workspacePath, issueId);
+	} catch {
+		return null;
+	}
+}
+/** Extract `com.docker.compose.project` from docker ps's comma-joined Labels. */
+function parseComposeProjectLabel(labels) {
+	if (!labels) return void 0;
+	return /(?:^|,)com\.docker\.compose\.project=([^,]+)/.exec(labels)?.[1];
+}
 function normalizeIssue(issueId) {
 	if (!issueId) return "";
 	return parseIssueIdSync(issueId)?.normalized ?? issueId.toLowerCase();
@@ -203,9 +249,14 @@ function escapeRegExp(value) {
 function hasNameToken(name, token) {
 	return new RegExp(`(^|[-_])${escapeRegExp(token)}($|[-_])`).test(name);
 }
-function isStackContainer(container, issueId) {
+function isStackContainer(container, issueId, composeProjectName) {
+	if (composeProjectName && container.composeProject) return container.composeProject === composeProjectName;
+	return hasIssueToken(container.name, issueId);
+}
+/** Name-token match: does this container name belong to the issue's stack? */
+function hasIssueToken(containerName, issueId) {
 	const normalized = normalizeIssue(issueId);
-	const name = container.name.toLowerCase();
+	const name = containerName.toLowerCase();
 	return hasNameToken(name, `feature-${normalized}`) || hasNameToken(name, normalized);
 }
 function isSuccessfulOneShotContainer(name) {
@@ -236,7 +287,7 @@ function evaluateWorkspaceStackHealth(issueId, projectConfig, containers, option
 		lastObserved
 	};
 	const thresholdMs = options.stuckCreatedThresholdMs ?? 12e4;
-	const stackContainers = containers.filter((container) => isStackContainer(container, issueId));
+	const stackContainers = containers.filter((container) => isStackContainer(container, issueId, options.composeProjectName));
 	const reasons = [];
 	if (stackContainers.length === 0 && options.stackExpected !== false) reasons.push(`No Docker containers found for workspace stack ${normalizeIssue(issueId)}`);
 	for (const container of stackContainers) {
@@ -311,7 +362,8 @@ var init_stack_health = __esmMin((() => {
 					name,
 					status: raw.Status ?? "",
 					state: raw.State,
-					createdAt: raw.CreatedAt
+					createdAt: raw.CreatedAt,
+					composeProject: parseComposeProjectLabel(raw.Labels)
 				});
 			} catch {}
 		}
@@ -336,10 +388,12 @@ var init_stack_health = __esmMin((() => {
 			observedAt = observed.toISOString();
 			recordDockerContainerLifecycleSnapshot(containers, observedAt);
 		}
+		const workspacePath = options.workspacePath ?? defaultWorkspacePath(issueId, projectConfig);
 		const health = evaluateWorkspaceStackHealth(issueId, projectConfig, containers, {
 			now: options.now,
 			stuckCreatedThresholdMs: options.stuckCreatedThresholdMs,
-			stackExpected: options.stackExpected ?? isWorkspaceStackExpected(issueId, projectConfig, options.workspacePath)
+			stackExpected: options.stackExpected ?? isWorkspaceStackExpected(issueId, projectConfig, options.workspacePath),
+			composeProjectName: tryComposeProjectNameForWorkspace(workspacePath, issueId)
 		});
 		const observedHealth = observedAt && !options.now ? {
 			...health,
@@ -350,6 +404,6 @@ var init_stack_health = __esmMin((() => {
 	});
 }));
 //#endregion
-export { init_stack_health as a, init_docker_stats as c, getWorkspaceStackHealth as i, recordDockerContainerLifecycleSnapshot as l, collectDockerContainerLifecycleSnapshot as n, recordWorkspaceStackHealthTransition as o, evaluateWorkspaceStackHealth as r, DockerStatsCollector as s, DEFAULT_STUCK_CREATED_THRESHOLD_MS as t };
+export { getWorkspaceStackHealth as a, recordWorkspaceStackHealthTransition as c, init_docker_stats as d, recordDockerContainerLifecycleSnapshot as f, evaluateWorkspaceStackHealth as i, tryComposeProjectNameForWorkspace as l, collectDockerContainerLifecycleSnapshot as n, hasIssueToken as o, composeProjectNameForWorkspace as r, init_stack_health as s, DEFAULT_STUCK_CREATED_THRESHOLD_MS as t, DockerStatsCollector as u };
 
-//# sourceMappingURL=stack-health-C-ifC7b0.js.map
+//# sourceMappingURL=stack-health-DxSdG9cW.js.map

package/server/{stale-task-claims-L7pJkQFL.js → stale-task-claims-KJKxxiiQ.js}

@@ -1,6 +1,6 @@
-import { Hn as init_projects, Kn as listProjectsSync, Nt as init_record, Rt as readIssueRecordSync, kt as getIssueRecordPath } from "./config-yaml-ig8Nwtiw.js";
-import { a as isPidDead, i as init_fs_lock, n as updateIssueRecord, t as init_record_update } from "./record-update-Crz74r-6.js";
-import { c as listAllAgentsSync, o as init_agents } from "./agents-DXdHmRTC.js";
+import { Nt as readIssueRecordSync, Ot as init_record, Tn as init_projects, kn as listProjectsSync, wt as getIssueRecordPath } from "./config-yaml-DySPNmKN.js";
+import { a as isPidDead, i as init_fs_lock, n as updateIssueRecord, t as init_record_update } from "./record-update-dE1Aw83j.js";
+import { c as listAllAgentsSync, o as init_agents } from "./agents-EbI0zCJl.js";
 import { dirname } from "node:path";
 import { hostname } from "node:os";
 import { readdirSync } from "node:fs";
@@ -66,4 +66,4 @@ async function patrolStaleTaskClaims() {
 //#endregion
 export { patrolStaleTaskClaims };
 
-//# sourceMappingURL=stale-task-claims-L7pJkQFL.js.map
+//# sourceMappingURL=stale-task-claims-KJKxxiiQ.js.map

package/server/{staleness-_Tr-GwdA.js → staleness-CT34nwr9.js}

@@ -1,3 +1,3 @@
-import { i as init_staleness, n as _resetForTests, r as computeBuildStaleness, t as BUILD_INPUT_PATHS } from "./staleness-BID1BKdr.js";
+import { i as init_staleness, n as _resetForTests, r as computeBuildStaleness, t as BUILD_INPUT_PATHS } from "./staleness-DPm7ClwA.js";
 init_staleness();
 export { BUILD_INPUT_PATHS, _resetForTests, computeBuildStaleness };

package/server/{staleness-BID1BKdr.js → staleness-DPm7ClwA.js}

@@ -23,6 +23,7 @@ function unknown(buildCommit, computedAt, reason, originMainSha = null) {
 		behindTotal: null,
 		behindBuildInputs: null,
 		originMainLastCommitAt: null,
+		originMainLastBuildInputCommitAt: null,
 		computedAt,
 		reason
 	};
@@ -55,7 +56,7 @@ async function computeBuildStaleness(input) {
 	try {
 		originMainSha = (await run("git", ["rev-parse", "origin/main"], { cwd: repoRoot })).stdout.trim();
 		const range = `${buildCommit}..origin/main`;
-		const [total, buildInputs, lastCommit] = await Promise.all([
+		const [total, buildInputs, lastCommit, lastBuildInputCommit] = await Promise.all([
 			run("git", [
 				"rev-list",
 				"--count",
@@ -73,15 +74,25 @@ async function computeBuildStaleness(input) {
 				"-1",
 				"--format=%ct",
 				"origin/main"
+			], { cwd: repoRoot }),
+			run("git", [
+				"log",
+				"-1",
+				"--format=%ct",
+				"origin/main",
+				"--",
+				...BUILD_INPUT_PATHS
 			], { cwd: repoRoot })
 		]);
 		const behindTotal = Number.parseInt(total.stdout.trim(), 10);
 		const behindBuildInputs = Number.parseInt(buildInputs.stdout.trim(), 10);
 		const originMainLastCommitAt = Number.parseInt(lastCommit.stdout.trim(), 10) * 1e3;
+		const originMainLastBuildInputCommitAt = Number.parseInt(lastBuildInputCommit.stdout.trim(), 10) * 1e3;
 		if (![
 			behindTotal,
 			behindBuildInputs,
-			originMainLastCommitAt
+			originMainLastCommitAt,
+			originMainLastBuildInputCommitAt
 		].every(Number.isFinite)) return unknown(buildCommit, computedAt, "Git returned invalid staleness metadata.", originMainSha);
 		return {
 			status: behindBuildInputs > 0 ? "stale" : "fresh",
@@ -90,6 +101,7 @@ async function computeBuildStaleness(input) {
 			behindTotal,
 			behindBuildInputs,
 			originMainLastCommitAt,
+			originMainLastBuildInputCommitAt,
 			computedAt
 		};
 	} catch (error) {
@@ -129,4 +141,4 @@ var init_staleness = __esmMin((() => {
 //#endregion
 export { init_staleness as i, _resetForTests as n, computeBuildStaleness as r, BUILD_INPUT_PATHS as t };
 
-//# sourceMappingURL=staleness-BID1BKdr.js.map
+//# sourceMappingURL=staleness-DPm7ClwA.js.map

package/server/{state-home-CONQvZR0.js → state-home-Cn_Qu8IX.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Cn as projectKey, Hn as init_projects, Sn as init_project_key, dn as STATE_BRANCH_PATHS, er as resolveInfraRepo, ii as init_paths, mn as init_state_plane, ri as getOverdeckHome } from "./config-yaml-ig8Nwtiw.js";
+import { Br as getOverdeckHome, Kt as STATE_BRANCH_PATHS, Ln as resolveInfraRepo, Tn as init_projects, Vr as init_paths, Yt as init_state_plane, an as init_project_key, on as projectKey } from "./config-yaml-DySPNmKN.js";
 import { dirname, join } from "node:path";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { mkdir, rm } from "node:fs/promises";
 import { execFile } from "node:child_process";
 import { promisify } from "node:util";
@@ -40,8 +40,16 @@ function parseMigrationCompleteMarker(value) {
 	if (!Number.isInteger(marker.version) || (marker.version ?? 0) < 1) return null;
 	return marker;
 }
-async function remoteStateTip(repoPath, signal) {
-	const sha = (await git(repoPath, [
+function readMigrationCompleteMarker(path) {
+	if (!existsSync(path)) return null;
+	try {
+		return parseMigrationCompleteMarker(JSON.parse(readFileSync(path, "utf8")));
+	} catch {
+		return null;
+	}
+}
+async function remoteStateTip(repoPath, signal, runGit = git) {
+	const sha = (await runGit(repoPath, [
 		"ls-remote",
 		"--heads",
 		"origin",
@@ -49,20 +57,32 @@ async function remoteStateTip(repoPath, signal) {
 	], signal)).split(/\s+/)[0];
 	return isSha(sha) ? sha : null;
 }
-async function markerAtRemoteTip(repoPath, tip, signal) {
-	await git(repoPath, [
-		"fetch",
-		"--quiet",
-		"origin",
-		`refs/heads/${STATE_BRANCH}:refs/remotes/origin/${STATE_BRANCH}`
-	], signal);
-	if (await git(repoPath, ["rev-parse", `refs/remotes/origin/overdeck-state`], signal) !== tip) return null;
+async function markerAtRemoteTip(repoPath, initialTip, signal, runGit = git) {
+	let tip = initialTip;
+	for (let attempt = 0; attempt < 3; attempt += 1) {
+		await runGit(repoPath, [
+			"fetch",
+			"--quiet",
+			"origin",
+			`refs/heads/${STATE_BRANCH}:refs/remotes/origin/${STATE_BRANCH}`
+		], signal);
+		const fetchedTip = await runGit(repoPath, ["rev-parse", `refs/remotes/origin/${STATE_BRANCH}`], signal);
+		if (!isSha(fetchedTip)) throw new Error(`Invalid origin/${STATE_BRANCH} tip: ${fetchedTip}`);
+		if (fetchedTip === tip || attempt === 2) {
+			tip = fetchedTip;
+			break;
+		}
+		tip = fetchedTip;
+	}
 	let raw;
 	try {
-		raw = await git(repoPath, ["show", `${tip}:${MIGRATION_COMPLETE_MARKER}`], signal);
+		raw = await runGit(repoPath, ["show", `${tip}:${MIGRATION_COMPLETE_MARKER}`], signal);
 	} catch {
 		signal?.throwIfAborted();
-		return null;
+		return {
+			marker: null,
+			tip
+		};
 	}
 	let marker;
 	try {
@@ -70,46 +90,77 @@ async function markerAtRemoteTip(repoPath, tip, signal) {
 	} catch {
 		marker = null;
 	}
-	if (!marker) return null;
-	return await git(repoPath, [
-		"merge-base",
-		"--is-ancestor",
-		marker.stateBranchSha,
+	if (!marker) return {
+		marker: null,
 		tip
-	], signal).then(() => true).catch(() => {
-		signal?.throwIfAborted();
-		return false;
-	}) ? marker : null;
+	};
+	return {
+		marker: await runGit(repoPath, [
+			"merge-base",
+			"--is-ancestor",
+			marker.stateBranchSha,
+			tip
+		], signal).then(() => true).catch(() => {
+			signal?.throwIfAborted();
+			return false;
+		}) ? marker : null,
+		tip
+	};
 }
 async function inspectStateMigration(project, options = {}) {
 	const { repoPath } = resolveInfraRepo(project);
-	let tip;
+	const cached = migrationCache.get(repoPath);
+	const runGit = options.git ?? git;
 	try {
-		tip = await remoteStateTip(repoPath, options.signal);
+		const listedTip = await remoteStateTip(repoPath, options.signal, runGit);
+		if (cached?.remoteTip === listedTip) return {
+			migrated: cached.migrated,
+			migrationInProgress: listedTip !== null && !cached.migrated,
+			remoteTip: listedTip
+		};
+		if (listedTip === null) {
+			migrationCache.set(repoPath, {
+				remoteTip: null,
+				migrated: false
+			});
+			return {
+				migrated: false,
+				migrationInProgress: false,
+				remoteTip: null
+			};
+		}
+		const remote = await markerAtRemoteTip(repoPath, listedTip, options.signal, runGit);
+		const migrated = remote.marker !== null;
+		migrationCache.set(repoPath, {
+			remoteTip: remote.tip,
+			migrated
+		});
+		return {
+			migrated,
+			migrationInProgress: !migrated,
+			remoteTip: remote.tip
+		};
 	} catch {
 		options.signal?.throwIfAborted();
+		if (cached?.migrated) return {
+			migrated: true,
+			migrationInProgress: false,
+			remoteTip: cached.remoteTip,
+			fallback: "cache"
+		};
+		if (readMigrationCompleteMarker(join(stateWorktreePath(project, options), "migration-complete.json"))) return {
+			migrated: true,
+			migrationInProgress: false,
+			remoteTip: null,
+			fallback: "local"
+		};
 		return {
 			migrated: false,
 			migrationInProgress: false,
-			remoteTip: null
+			remoteTip: null,
+			remoteCheckFailed: true
 		};
 	}
-	const cached = migrationCache.get(repoPath);
-	if (cached?.remoteTip === tip) return {
-		migrated: cached.migrated,
-		migrationInProgress: tip !== null && !cached.migrated,
-		remoteTip: tip
-	};
-	const migrated = tip !== null && await markerAtRemoteTip(repoPath, tip, options.signal) !== null;
-	migrationCache.set(repoPath, {
-		remoteTip: tip,
-		migrated
-	});
-	return {
-		migrated,
-		migrationInProgress: tip !== null && !migrated,
-		remoteTip: tip
-	};
 }
 async function isStateMigrated(project) {
 	return (await inspectStateMigration(project)).migrated;
@@ -150,7 +201,8 @@ async function ensureStateWorktree(project, options = {}) {
 	const path = stateWorktreePath(project, options);
 	if (!migration.migrated) return {
 		status: "legacy",
-		path
+		path,
+		detail: migration.remoteCheckFailed ? "The remote overdeck-state marker check failed transiently and no valid cached or local marker was available." : "The remote overdeck-state branch is reachable but does not contain a valid migration marker."
 	};
 	const { repoPath } = resolveInfraRepo(project);
 	if (!existsSync(path)) {
@@ -221,4 +273,4 @@ var init_state_home = __esmMin((() => {
 //#endregion
 export { findRecreatedLegacyStatePaths as a, isStateMigrated as c, ensureStateWorktree as i, stateWorktreePath as l, STATE_BRANCH as n, init_state_home as o, clearStateMigrationCache as r, inspectStateMigration as s, MIGRATION_COMPLETE_MARKER as t };
 
-//# sourceMappingURL=state-home-CONQvZR0.js.map
+//# sourceMappingURL=state-home-Cn_Qu8IX.js.map

package/server/{state-migrate-BeBW0KXA.js → state-migrate-BGg2ZaOt.js}

@@ -1,11 +1,13 @@
-import { Hn as init_projects, In as getProjectSync, _n as acquireStateMigrationLock, cn as init_auto_commit, dn as STATE_BRANCH_PATHS, er as resolveInfraRepo, mn as init_state_plane, sn as flushAutoCommits, vn as init_state_migration_lock } from "./config-yaml-ig8Nwtiw.js";
-import { l as stateWorktreePath, n as STATE_BRANCH, o as init_state_home, r as clearStateMigrationCache, t as MIGRATION_COMPLETE_MARKER } from "./state-home-CONQvZR0.js";
+import { $t as acquireStateMigrationLock, Ht as flushAutoCommits, Kt as STATE_BRANCH_PATHS, Ln as resolveInfraRepo, Tn as init_projects, Ut as init_auto_commit, Yt as init_state_plane, en as init_state_migration_lock, yn as getProjectSync } from "./config-yaml-DySPNmKN.js";
+import { o as init_lifecycle } from "./lifecycle-yPd___5E.js";
+import { l as stateWorktreePath, n as STATE_BRANCH, o as init_state_home, r as clearStateMigrationCache, t as MIGRATION_COMPLETE_MARKER } from "./state-home-Cn_Qu8IX.js";
 import { dirname, join } from "node:path";
 import { Effect } from "effect";
 import { tmpdir } from "node:os";
 import { createReadStream, createWriteStream, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { chmod, lstat, mkdir, readdir, rename, rm, utimes } from "node:fs/promises";
 import { execFile } from "node:child_process";
+import { promisify } from "node:util";
 import { createHash } from "node:crypto";
 import { pipeline } from "node:stream/promises";
 //#region ../../lib/state-migration-manifest.ts
@@ -41,7 +43,14 @@ async function verifyStateMigrationManifest(entries) {
 	}
 }
 //#endregion
+//#region ../../cli/commands/admin/xbrief-state-migrate.ts
+init_lifecycle();
+promisify(execFile);
+//#endregion
 //#region ../../cli/commands/admin/state-migrate.ts
+init_auto_commit();
+init_projects();
+init_state_home();
 const GIT_COMMAND_TIMEOUT_MS = 3e4;
 const execFileDetached = execFile;
 function killProcessTree(child) {
@@ -475,4 +484,4 @@ async function migrateProjectState(projectKey, options = {}, projectOverride) {
 //#endregion
 export { migrateProjectState };
 
-//# sourceMappingURL=state-migrate-BeBW0KXA.js.map
+//# sourceMappingURL=state-migrate-BGg2ZaOt.js.map