@overdeck/desktop 0.45.22 → 0.45.24

package/server/{inspect-agent-BXCgNeZ4.js → inspect-agent-BLuJ1AkT.js}

@@ -1,12 +1,14 @@
-import { D as resolveTieredExecutionEnabled, Dr as ProcessSpawnError, G as setupCredentialFileAuthSync, H as init_providers, L as clearCredentialFileAuthSync, Sr as GitError, T as init_tier_table, V as getProviderForModelSync, f as loadConfigSync, jr as init_errors, t as init_config_yaml, tt as resolveModel } from "./config-yaml-ig8Nwtiw.js";
-import { D as killSession, V as sessionExists, s as createSession, w as init_tmux } from "./tmux-L5LgvGLp.js";
-import { c as init_review_status, y as setReviewStatusSync } from "./review-status-DFRjDFef.js";
-import { Wn as saveAgentState, _ as spawnTierSupervisor, fr as saveAgentRuntimeState, h as loadPrdDraft, m as init_tier_supervisor, on as getProviderEnvForModel, p as deliverCommitForReview, s as init_agents, v as supervisorAgentId } from "./queries-ZABd5aXP.js";
-import { m as readWorkspacePlanSync, o as init_io } from "./io-DQR9PMgS.js";
-import { n as init_launcher_generator, t as generateLauncherScriptSync } from "./launcher-generator-COgR2By1.js";
-import { a as init_claude_permissions, i as getClaudePermissionFlagsSync } from "./claude-permissions-nSFKH78M.js";
-import { n as init_harness_binary, r as prepareHarnessLaunch } from "./harness-binary-B2CTcD84.js";
-import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-DtmJM0D0.js";
+import { D as resolveTieredExecutionEnabled, G as setupCredentialFileAuthSync, H as init_providers, L as clearCredentialFileAuthSync, T as init_tier_table, V as getProviderForModelSync, f as loadConfigSync, mr as init_errors, t as init_config_yaml, tt as resolveModel, ur as ProcessSpawnError } from "./config-yaml-DySPNmKN.js";
+import { D as killSession, H as sessionExists, s as createSession, w as init_tmux } from "./tmux-R7N7y-Mh.js";
+import { b as setReviewStatusSync, l as init_review_status } from "./review-status-kZj_KyCk.js";
+import { A as spawnTierSupervisor, Ar as saveAgentRuntimeState, Cn as getProviderEnvForModel, D as init_tier_supervisor, E as deliverCommitForReview, O as loadPrdDraft, b as init_agents, cr as saveAgentState, j as supervisorAgentId } from "./queries-CjNIf-Ub.js";
+import { c as resolveWorkspaceRepoRootsSync, r as init_project_repos } from "./project-repos-B6GycDh9.js";
+import { m as readWorkspacePlanSync, o as init_io } from "./io-C9kF1wtJ.js";
+import { n as init_launcher_generator, t as generateLauncherScriptSync } from "./launcher-generator-BBWG_SiS.js";
+import { a as init_claude_permissions, i as getClaudePermissionFlagsSync } from "./claude-permissions-DNWEVV6z.js";
+import { i as prepareHarnessLaunch, r as init_harness_binary } from "./harness-binary-DPUi-Pv8.js";
+import { i as init_git_utils, s as snapshotWorkspaceHeadsPromise } from "./git-utils-CRw2zLPC.js";
+import { n as init_issue_closed, r as isIssueClosed } from "./issue-closed-CDJk4pIp.js";
 import { Effect } from "effect";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
 import { dirname, join } from "path";
@@ -16,6 +18,7 @@ import { randomUUID } from "crypto";
 import { exec } from "child_process";
 import { promisify } from "util";
 //#region ../../lib/cloister/inspect-checkpoints.ts
+init_errors();
 /**
 * PAN-382: Inspection checkpoint system.
 *
@@ -23,7 +26,8 @@ import { promisify } from "util";
 * scoped to the parent of HEAD because the work role contract is one bead per
 * commit; checkpoints remain the durable record after a pass.
 */
-init_errors();
+init_project_repos();
+init_git_utils();
 const execAsync = promisify(exec);
 const OVERDECK_HOME = join(homedir(), ".overdeck");
 /**
@@ -51,6 +55,14 @@ function loadCheckpoints(projectKey, issueId) {
 	}
 }
 /**
+* Get the last checkpoint for an issue, or null if none exist.
+*/
+function getLastCheckpoint(projectKey, issueId) {
+	const data = loadCheckpoints(projectKey, issueId);
+	if (!data || data.checkpoints.length === 0) return null;
+	return data.checkpoints[data.checkpoints.length - 1];
+}
+/**
 * Save a new checkpoint after a successful inspection.
 */
 function saveCheckpoint(projectKey, issueId, itemId, commitSha) {
@@ -69,72 +81,118 @@ function saveCheckpoint(projectKey, issueId, itemId, commitSha) {
 	writeFileSync(getCheckpointPath(projectKey, issueId), JSON.stringify(data, null, 2));
 	return checkpoint;
 }
-/**
-* Effect-typed variant of {@link getDiffBase}. Always succeeds — falls back to
-* `'main'` if `git merge-base` fails, matching the Promise version's behavior.
-*/
-function getDiffBase(_projectKey, _issueId, workspacePath) {
-	return Effect.tryPromise({
-		try: () => execAsync("git rev-parse HEAD^", {
-			cwd: workspacePath,
-			encoding: "utf-8"
-		}),
-		catch: (cause) => new GitError({
-			command: [
-				"git",
-				"rev-parse",
-				"HEAD^"
-			],
-			stderr: String(cause),
-			exitCode: -1,
-			cause
-		})
-	}).pipe(Effect.map(({ stdout }) => stdout.trim()), Effect.orElseSucceed(() => "main"));
+function shellQuote(value) {
+	return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
-/**
-* Effect-typed variant of {@link getDiffStats}. Always succeeds — returns a
-* human-readable fallback string when the diff command fails.
-*/
-function getDiffStats(workspacePath, diffBase) {
-	return Effect.tryPromise({
-		try: () => execAsync(`git diff --stat ${diffBase}...HEAD`, {
-			cwd: workspacePath,
-			encoding: "utf-8"
-		}),
-		catch: (cause) => new GitError({
-			command: [
-				"git",
-				"diff",
-				"--stat",
-				`${diffBase}...HEAD`
-			],
-			stderr: String(cause),
-			exitCode: -1,
-			cause
-		})
-	}).pipe(Effect.map(({ stdout }) => stdout.trim() || "No changes detected"), Effect.orElseSucceed(() => "Unable to compute diff stats"));
+function parseCompositeSnapshot(snapshot) {
+	const heads = /* @__PURE__ */ new Map();
+	if (!snapshot) return heads;
+	for (const token of snapshot.split(/\s+/)) {
+		const separator = token.lastIndexOf("@");
+		if (separator <= 0 || separator === token.length - 1) continue;
+		heads.set(token.slice(0, separator), token.slice(separator + 1));
+	}
+	return heads;
+}
+async function readHead(root) {
+	try {
+		const { stdout } = await execAsync("git rev-parse HEAD", {
+			cwd: root.dir,
+			encoding: "utf-8",
+			timeout: 1e4
+		});
+		return stdout.trim() || null;
+	} catch {
+		return null;
+	}
+}
+async function resolveTargetBase(root) {
+	for (const target of [`origin/${root.targetBranch}`, root.targetBranch]) try {
+		const { stdout } = await execAsync(`git merge-base ${shellQuote(target)} HEAD`, {
+			cwd: root.dir,
+			encoding: "utf-8",
+			timeout: 1e4
+		});
+		const base = stdout.trim();
+		if (base) return base;
+	} catch {}
+	try {
+		const { stdout } = await execAsync("git rev-parse HEAD^", {
+			cwd: root.dir,
+			encoding: "utf-8",
+			timeout: 1e4
+		});
+		return stdout.trim();
+	} catch {
+		return root.targetBranch;
+	}
 }
 /**
-* Effect-typed variant of {@link getCurrentHead}. Always succeeds — returns
-* `'unknown'` on failure to preserve the Promise version's contract.
+* Resolve the per-item inspection diff across the actual workspace repositories.
+* Polyrepo checkpoints store composite `repo@sha` snapshots so unchanged repos
+* are omitted instead of reviewing their previous, unrelated commit.
 */
-function getCurrentHead(workspacePath) {
-	return Effect.tryPromise({
-		try: () => execAsync("git rev-parse HEAD", {
-			cwd: workspacePath,
-			encoding: "utf-8"
-		}),
-		catch: (cause) => new GitError({
-			command: [
-				"git",
-				"rev-parse",
-				"HEAD"
-			],
-			stderr: String(cause),
-			exitCode: -1,
-			cause
-		})
-	}).pipe(Effect.map(({ stdout }) => stdout.trim()), Effect.orElseSucceed(() => "unknown"));
+async function getInspectDiffContextPromise(projectKey, issueId, workspacePath) {
+	const roots = resolveWorkspaceRepoRootsSync(issueId, workspacePath);
+	const isPolyrepo = roots.some((root) => root.isPolyrepo);
+	const previousHeads = isPolyrepo ? parseCompositeSnapshot(getLastCheckpoint(projectKey, issueId)?.commitSha) : /* @__PURE__ */ new Map();
+	const repos = [];
+	for (const root of roots) {
+		const headSha = await readHead(root);
+		if (!headSha) continue;
+		let diffBase;
+		if (isPolyrepo) {
+			const previousHead = previousHeads.get(root.repoKey);
+			if (previousHead === headSha) continue;
+			diffBase = previousHead ?? await resolveTargetBase(root);
+			if (diffBase === headSha) continue;
+		} else try {
+			const { stdout } = await execAsync("git rev-parse HEAD^", {
+				cwd: root.dir,
+				encoding: "utf-8",
+				timeout: 1e4
+			});
+			diffBase = stdout.trim();
+		} catch {
+			diffBase = root.targetBranch;
+		}
+		repos.push({
+			repoKey: root.repoKey,
+			dir: root.dir,
+			headSha,
+			diffBase
+		});
+	}
+	const statSections = [];
+	const commands = [];
+	for (const repo of repos) {
+		let stat = "Unable to compute diff stats";
+		try {
+			const { stdout } = await execAsync(`git diff --stat ${shellQuote(repo.diffBase)}...HEAD`, {
+				cwd: repo.dir,
+				encoding: "utf-8",
+				timeout: 15e3
+			});
+			stat = stdout.trim() || "No changes detected";
+		} catch {}
+		statSections.push(isPolyrepo ? `── ${repo.repoKey} ──\n${stat}` : stat);
+		commands.push(`${isPolyrepo ? `printf '\\n── ${repo.repoKey} ──\\n'\n` : ""}git -C ${shellQuote(repo.dir)} diff ${shellQuote(repo.diffBase)}...HEAD`);
+	}
+	const currentHead = await snapshotWorkspaceHeadsPromise(issueId, workspacePath) ?? "unknown";
+	return {
+		currentHead,
+		checkpoint: repos.length > 0 ? repos.map((repo) => isPolyrepo ? `${repo.repoKey}@${repo.diffBase.slice(0, 8)}` : repo.diffBase).join(" ") : currentHead,
+		diffStats: statSections.join("\n") || "No changes detected across workspace repositories",
+		diffCommand: commands.join("\n") || `printf '%s\\n' 'No changes detected across workspace repositories'`,
+		repos
+	};
+}
+function getInspectDiffContext(projectKey, issueId, workspacePath) {
+	return Effect.promise(() => getInspectDiffContextPromise(projectKey, issueId, workspacePath));
+}
+/** Resolve the code HEAD(s), never the polyrepo wrapper commit. */
+function getCurrentHead(issueId, workspacePath) {
+	return Effect.promise(async () => await snapshotWorkspaceHeadsPromise(issueId, workspacePath) ?? "unknown");
 }
 //#endregion
 //#region ../../lib/cloister/inspect-agent.ts
@@ -145,7 +203,6 @@ function getCurrentHead(workspacePath) {
 * its specification and architectural constraints before the agent
 * proceeds to the next item.
 */
-init_errors();
 init_review_status();
 init_harness_binary();
 init_launcher_generator();
@@ -165,12 +222,11 @@ async function buildInspectPromptPromise(context) {
 	if (!existsSync(templatePath)) throw new Error(`Inspect agent prompt template not found at ${templatePath}`);
 	const template = readFileSync(templatePath, "utf-8");
 	const item = readWorkspacePlanSync(context.workspace)?.plan.items.find((candidate) => candidate.id === context.itemId);
-	if (!item) throw new Error(`Item ${context.itemId} requires a readable vBRIEF entry in ${context.workspace}.`);
+	if (!item) throw new Error(`Item ${context.itemId} requires a readable xBRIEF entry in ${context.workspace}.`);
 	const itemDescription = `**Title:** ${item.title}\n\n**Action:** ${item.narrative?.Action ?? "No narrative provided."}`;
-	const diffBase = await Effect.runPromise(getDiffBase(context.projectKey, context.issueId, context.workspace));
-	const diffStats = await Effect.runPromise(getDiffStats(context.workspace, diffBase));
+	const diffContext = await Effect.runPromise(getInspectDiffContext(context.projectKey, context.issueId, context.workspace));
 	const apiUrl = process.env.OVERDECK_DASHBOARD_URL || process.env.DASHBOARD_URL || `http://localhost:${process.env.API_PORT || process.env.PORT || "3011"}`;
-	return `<!-- overdeck:orchestration-context-start -->\n${template.replace(/\{\{apiUrl\}\}/g, apiUrl).replace(/\{\{projectPath\}\}/g, context.projectPath).replace(/\{\{issueId\}\}/g, context.issueId).replace(/\{\{itemId\}\}/g, context.itemId).replace(/\{\{workspacePath\}\}/g, context.workspace).replace(/\{\{checkpoint\}\}/g, diffBase.substring(0, 8)).replace(/\{\{diffBase\}\}/g, diffBase).replace(/\{\{diffStats\}\}/g, diffStats).replace(/\{\{itemDescription\}\}/g, itemDescription).replace(/\{\{resultStatus\}\}/g, "${RESULT_STATUS}").replace(/\{\{resultNotes\}\}/g, "${RESULT_NOTES}")}\n<!-- overdeck:orchestration-context-end -->`;
+	return `<!-- overdeck:orchestration-context-start -->\n${template.replace(/\{\{apiUrl\}\}/g, apiUrl).replace(/\{\{projectPath\}\}/g, context.projectPath).replace(/\{\{issueId\}\}/g, context.issueId).replace(/\{\{itemId\}\}/g, context.itemId).replace(/\{\{workspacePath\}\}/g, context.workspace).replace(/\{\{checkpoint\}\}/g, diffContext.checkpoint).replace(/\{\{diffCommand\}\}/g, diffContext.diffCommand).replace(/\{\{diffStats\}\}/g, diffContext.diffStats).replace(/\{\{itemDescription\}\}/g, itemDescription).replace(/\{\{resultStatus\}\}/g, "${RESULT_STATUS}").replace(/\{\{resultNotes\}\}/g, "${RESULT_NOTES}")}\n<!-- overdeck:orchestration-context-end -->`;
 }
 async function routeInspectToStandingSupervisorIfEnabled(context) {
 	const { config } = loadConfigSync();
@@ -179,7 +235,7 @@ async function routeInspectToStandingSupervisorIfEnabled(context) {
 	const doc = readWorkspacePlanSync(context.workspace);
 	if (!resolveTieredExecutionEnabled(tiered, doc?.plan.metadata)) return void 0;
 	const item = doc?.plan.items.find((candidate) => candidate.id === context.itemId);
-	if (!doc || !item) throw new Error(`Standing supervisor inspection for ${context.issueId} item ${context.itemId} requires a readable vBRIEF item in ${context.workspace}.`);
+	if (!doc || !item) throw new Error(`Standing supervisor inspection for ${context.issueId} item ${context.itemId} requires a readable xBRIEF item in ${context.workspace}.`);
 	const agentId = supervisorAgentId(context.issueId);
 	if (!await Effect.runPromise(sessionExists(agentId))) await spawnTierSupervisor(context.issueId, tiered.supervisor, { workspace: context.workspace });
 	setReviewStatusSync(context.issueId.toUpperCase(), {
@@ -189,7 +245,7 @@ async function routeInspectToStandingSupervisorIfEnabled(context) {
 		inspectBeadId: context.itemId,
 		inspectOwnerSession: agentId
 	});
-	const sha = await Effect.runPromise(getCurrentHead(context.workspace));
+	const sha = await Effect.runPromise(getCurrentHead(context.issueId, context.workspace));
 	const prdMarkdown = await loadPrdDraft(context.projectPath, context.issueId);
 	await deliverCommitForReview({
 		supervisorAgentId: agentId,
@@ -303,7 +359,7 @@ async function spawnInspectAgentPromise(context, opts = {}) {
 }
 async function onInspectCompletePromise(projectKey, issueId, itemId, status, workspacePath) {
 	if (status === "passed") {
-		const commitSha = await Effect.runPromise(getCurrentHead(workspacePath));
+		const commitSha = await Effect.runPromise(getCurrentHead(issueId, workspacePath));
 		saveCheckpoint(projectKey, issueId, itemId, commitSha);
 		console.log(`[inspect] Checkpoint saved for ${issueId} item ${itemId} at ${commitSha.substring(0, 8)}`);
 	} else console.log(`[inspect] Item ${itemId} blocked for ${issueId} — no checkpoint saved`);
@@ -341,4 +397,4 @@ function onInspectComplete(projectKey, issueId, itemId, status, workspacePath) {
 //#endregion
 export { onInspectComplete as n, spawnInspectAgent as r, buildInspectPrompt as t };
 
-//# sourceMappingURL=inspect-agent-BXCgNeZ4.js.map
+//# sourceMappingURL=inspect-agent-BLuJ1AkT.js.map

package/server/inspect-agent-Brtz0URj.js

@@ -0,0 +1,2 @@
+import { n as onInspectComplete } from "./inspect-agent-BLuJ1AkT.js";
+export { onInspectComplete };

package/server/{internal-token-C9DdEOKY.js → internal-token-BrcU6qfe.js}

@@ -1,3 +1,3 @@
-import { a as getInternalToken, i as ensureInternalTokenSync, n as _resetInternalTokenCacheForTests, o as getInternalTokenSync, r as ensureInternalToken, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-CXsfxslp.js";
+import { a as getInternalToken, i as ensureInternalTokenSync, n as _resetInternalTokenCacheForTests, o as getInternalTokenSync, r as ensureInternalToken, s as init_internal_token, t as INTERNAL_TOKEN_HEADER } from "./internal-token-s0-oKybJ.js";
 init_internal_token();
 export { INTERNAL_TOKEN_HEADER, _resetInternalTokenCacheForTests, ensureInternalToken, ensureInternalTokenSync, getInternalToken, getInternalTokenSync };

package/server/{internal-token-CXsfxslp.js → internal-token-s0-oKybJ.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { ii as init_paths, jr as init_errors, ri as getOverdeckHome, xr as FsError } from "./config-yaml-ig8Nwtiw.js";
+import { Br as getOverdeckHome, Vr as init_paths, ir as FsError, mr as init_errors } from "./config-yaml-DySPNmKN.js";
 import { join } from "node:path";
 import { Effect } from "effect";
 import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -101,4 +101,4 @@ var init_internal_token = __esmMin((() => {
 //#endregion
 export { getInternalToken as a, ensureInternalTokenSync as i, _resetInternalTokenCacheForTests as n, getInternalTokenSync as o, ensureInternalToken as r, init_internal_token as s, INTERNAL_TOKEN_HEADER as t };
 
-//# sourceMappingURL=internal-token-CXsfxslp.js.map
+//# sourceMappingURL=internal-token-s0-oKybJ.js.map