@cmmd-center/forge 0.13.144 → 0.13.146

package/dist/bin.cjs

@@ -18122,9 +18122,11 @@ const ThreadTurnStartBootstrapCreateThread = require_Schema$1.Struct({
 	createdAt: IsoDateTime
 });
 const ThreadTurnStartBootstrapPrepareWorktree = require_Schema$1.Struct({
-	projectCwd: TrimmedNonEmptyString,
+	projectId: require_Schema$1.optional(ProjectId),
+	projectCwd: require_Schema$1.optional(TrimmedNonEmptyString),
 	baseBranch: require_Schema$1.NullOr(TrimmedNonEmptyString),
-	branch: require_Schema$1.optional(TrimmedNonEmptyString)
+	branch: require_Schema$1.optional(TrimmedNonEmptyString),
+	startFromOrigin: require_Schema$1.optional(require_Schema$1.Boolean)
 });
 const ThreadTurnStartBootstrap = require_Schema$1.Struct({
 	createThread: require_Schema$1.optional(ThreadTurnStartBootstrapCreateThread),
@@ -66431,7 +66433,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.13.144";
+var version$1 = "0.13.146";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -94617,14 +94619,62 @@ const dispatchBootstrapThreadCreate = (input) => require_Schema$1.gen(function*
 	});
 	return !threadAlreadyExists;
 });
+/** Reject a removed or unknown project before any Git operation uses its checkout. */
+const requireBootstrapProject = (input) => {
+	const project = input.readModel.projects.find((candidate) => candidate.id === input.projectId);
+	return project && project.deletedAt === null ? require_Schema$1.succeed(project) : require_Schema$1.fail(/* @__PURE__ */ new Error(`Worktree project '${input.projectId}' does not exist.`));
+};
+/** Require the target thread to be live before preparing its worktree. */
+const requireBootstrapThread = (input) => {
+	const thread = input.readModel.threads.find((candidate) => candidate.id === input.threadId);
+	return thread && thread.deletedAt === null ? require_Schema$1.succeed(thread) : require_Schema$1.fail(/* @__PURE__ */ new Error(`Worktree thread '${input.threadId}' does not exist.`));
+};
+/** Resolve a CMMD Work Session's checkout from Forge's persisted project identity. */
+const resolveAuthoritativeBootstrapProjectCwd = (input) => require_Schema$1.gen(function* () {
+	const projectId = input.bootstrapWorktree.projectId;
+	if (projectId === void 0) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error("Missing project identity."));
+	const project = yield* requireBootstrapProject({
+		readModel: input.readModel,
+		projectId
+	});
+	const thread = yield* requireBootstrapThread({
+		readModel: input.readModel,
+		threadId: input.command.threadId
+	});
+	if (thread.projectId !== projectId) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error(`Worktree project '${projectId}' does not match thread project '${thread.projectId}'.`));
+	const createdThreadProjectId = input.command.bootstrap?.createThread?.projectId;
+	if (createdThreadProjectId && createdThreadProjectId !== projectId) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error(`Worktree project '${projectId}' does not match created thread project '${createdThreadProjectId}'.`));
+	if (input.bootstrapWorktree.branch === void 0) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error("Authoritative worktree preparation requires a branch."));
+	if (input.bootstrapWorktree.startFromOrigin && input.bootstrapWorktree.baseBranch !== "main") return yield* require_Schema$1.fail(/* @__PURE__ */ new Error("Authoritative Work Session worktrees must start from origin/main."));
+	return project.workspaceRoot;
+});
+/** Keep legacy path-based commands working while routing identified projects through Forge records. */
+const resolveBootstrapProjectCwd = (input) => require_Schema$1.gen(function* () {
+	const { bootstrapWorktree } = input;
+	if (bootstrapWorktree.projectId === void 0) {
+		if (!bootstrapWorktree.projectCwd) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error("Worktree preparation requires a project checkout path."));
+		return bootstrapWorktree.projectCwd;
+	}
+	return yield* resolveAuthoritativeBootstrapProjectCwd({
+		readModel: yield* input.orchestrationEngine.getReadModel(),
+		command: input.command,
+		bootstrapWorktree
+	});
+});
 const prepareBootstrapWorktree = (input) => require_Schema$1.gen(function* () {
 	const bootstrapWorktree = input.command.bootstrap?.prepareWorktree;
 	if (!bootstrapWorktree) return null;
+	const projectCwd = yield* resolveBootstrapProjectCwd({
+		orchestrationEngine: input.orchestrationEngine,
+		command: input.command,
+		bootstrapWorktree
+	});
 	const requestedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const baseBranchLabel = bootstrapWorktree.baseBranch ?? "<default>";
 	const requestedPayload = {
 		turnRequestedAt: input.command.createdAt,
-		projectCwd: bootstrapWorktree.projectCwd,
+		...bootstrapWorktree.projectId ? { projectId: bootstrapWorktree.projectId } : {},
+		projectCwd,
 		baseBranch: bootstrapWorktree.baseBranch,
 		branch: bootstrapWorktree.branch,
 		command: `git worktree add -b ${bootstrapWorktree.branch} <generated-path> ${baseBranchLabel}`
@@ -94639,11 +94689,38 @@ const prepareBootstrapWorktree = (input) => require_Schema$1.gen(function* () {
 		payload: requestedPayload,
 		tone: "info"
 	});
+	if (bootstrapWorktree.startFromOrigin) {
+		if (!input.git.fetch) return yield* require_Schema$1.fail(/* @__PURE__ */ new Error("Git fetch is unavailable for origin worktree preparation."));
+		yield* input.git.fetch({
+			cwd: projectCwd,
+			remote: "origin",
+			ref: bootstrapWorktree.baseBranch ?? "main"
+		}).pipe(require_Schema$1.catchCause((cause) => {
+			if (require_Schema$1.hasInterruptsOnly(cause)) return require_Schema$1.failCause(cause);
+			const error = require_Schema$1.squash(cause);
+			const detail = error instanceof Error ? error.message : "Unknown fetch failure.";
+			return appendWorktreeActivity({
+				orchestrationEngine: input.orchestrationEngine,
+				threadId: input.command.threadId,
+				commandId: bootstrapCommandId(input.command, "bootstrap-worktree-failed"),
+				kind: "worktree.failed",
+				summary: "Worktree preparation failed",
+				createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+				payload: {
+					...requestedPayload,
+					detail,
+					stage: "fetch"
+				},
+				tone: "error"
+			}).pipe(require_Schema$1.andThen(require_Schema$1.failCause(cause)));
+		}));
+	}
 	const worktree = yield* input.git.createWorktree({
-		cwd: bootstrapWorktree.projectCwd,
+		cwd: projectCwd,
 		branch: bootstrapWorktree.baseBranch,
 		newBranch: bootstrapWorktree.branch,
 		path: null,
+		...bootstrapWorktree.startFromOrigin ? { startFromOrigin: true } : {},
 		onStage: (update) => appendWorktreeActivity({
 			orchestrationEngine: input.orchestrationEngine,
 			threadId: input.command.threadId,
@@ -94735,7 +94812,7 @@ const prepareBootstrapWorktree = (input) => require_Schema$1.gen(function* () {
 	});
 	return {
 		worktreePath,
-		projectCwd: bootstrapWorktree.projectCwd
+		projectCwd
 	};
 });
 const dispatchBootstrapTurnStart$1 = (input, command) => require_Schema$1.gen(function* () {
@@ -236026,6 +236103,13 @@ function createGitCommandError(operation, cwd, args, detail, cause) {
 		...cause !== void 0 ? { cause } : {}
 	});
 }
+function isValidGitRef(value) {
+	if (value.length === 0 || value.startsWith("-") || value.endsWith(".") || value.endsWith("/") || value.endsWith(".lock") || value.includes("..") || value.includes("@{") || /[~^:?*[\\]/.test(value) || [...value].some((character) => {
+		const code = character.charCodeAt(0);
+		return code <= 32 || code === 127;
+	})) return false;
+	return value.split("/").every((part) => part.length > 0 && part !== "." && part !== "..");
+}
 function quoteGitCommand(args) {
 	return `git ${args.join(" ")}`;
 }
@@ -237038,7 +237122,7 @@ const makeGitCore = require_Schema$1.fn("makeGitCore")(function* (options) {
 		}) ?? require_Schema$1.void_;
 		yield* report("resolve", "running");
 		const base = input.branch ?? (yield* resolveDefaultBaseBranch(input.cwd));
-		const startPoint = yield* resolveWorktreeStartPoint({
+		const startPoint = input.startFromOrigin ? `origin/${base}` : yield* resolveWorktreeStartPoint({
 			cwd: input.cwd,
 			base,
 			creatingNewBranch: input.newBranch !== void 0
@@ -237108,6 +237192,20 @@ const makeGitCore = require_Schema$1.fn("makeGitCore")(function* (options) {
 			fallbackErrorMessage: "git fetch pull request branch failed"
 		});
 	});
+	const fetch = require_Schema$1.fn("fetch")(function* (input) {
+		if (!isValidGitRef(input.ref)) return yield* require_Schema$1.fail(createGitCommandError("GitCore.fetch", input.cwd, [
+			"fetch",
+			input.remote,
+			input.ref
+		], `Invalid Git ref: ${input.ref}`));
+		yield* runGit("GitCore.fetch", input.cwd, [
+			"fetch",
+			"--quiet",
+			"--no-tags",
+			input.remote,
+			input.ref
+		]);
+	});
 	const fetchRemoteBranch = require_Schema$1.fn("fetchRemoteBranch")(function* (input) {
 		yield* runGit("GitCore.fetchRemoteBranch.fetch", input.cwd, [
 			"fetch",
@@ -237305,6 +237403,7 @@ const makeGitCore = require_Schema$1.fn("makeGitCore")(function* (options) {
 		listBranches,
 		createWorktree,
 		fetchPullRequestBranch,
+		fetch,
 		ensureRemote,
 		fetchRemoteBranch,
 		setBranchUpstream,
@@ -300774,7 +300873,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "eb40895cccd38f2dabaea7ccef109eb3bd22a777";
+	return "13fc600f9068c1aa48fe746802127ae02843b2c9";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;

package/dist/bin.mjs

@@ -18062,9 +18062,11 @@ const ThreadTurnStartBootstrapCreateThread = Struct({
 	createdAt: IsoDateTime
 });
 const ThreadTurnStartBootstrapPrepareWorktree = Struct({
-	projectCwd: TrimmedNonEmptyString,
+	projectId: optional$4(ProjectId),
+	projectCwd: optional$4(TrimmedNonEmptyString),
 	baseBranch: NullOr(TrimmedNonEmptyString),
-	branch: optional$4(TrimmedNonEmptyString)
+	branch: optional$4(TrimmedNonEmptyString),
+	startFromOrigin: optional$4(Boolean$1)
 });
 const ThreadTurnStartBootstrap = Struct({
 	createThread: optional$4(ThreadTurnStartBootstrapCreateThread),
@@ -66139,7 +66141,7 @@ function normalizeNumberish(value) {
 }
 //#endregion
 //#region package.json
-var version$1 = "0.13.144";
+var version$1 = "0.13.146";
 //#endregion
 //#region src/sentry.ts
 const SERVER_APP_NAME = "forge-server";
@@ -94257,14 +94259,62 @@ const dispatchBootstrapThreadCreate = (input) => gen(function* () {
 	});
 	return !threadAlreadyExists;
 });
+/** Reject a removed or unknown project before any Git operation uses its checkout. */
+const requireBootstrapProject = (input) => {
+	const project = input.readModel.projects.find((candidate) => candidate.id === input.projectId);
+	return project && project.deletedAt === null ? succeed(project) : fail(/* @__PURE__ */ new Error(`Worktree project '${input.projectId}' does not exist.`));
+};
+/** Require the target thread to be live before preparing its worktree. */
+const requireBootstrapThread = (input) => {
+	const thread = input.readModel.threads.find((candidate) => candidate.id === input.threadId);
+	return thread && thread.deletedAt === null ? succeed(thread) : fail(/* @__PURE__ */ new Error(`Worktree thread '${input.threadId}' does not exist.`));
+};
+/** Resolve a CMMD Work Session's checkout from Forge's persisted project identity. */
+const resolveAuthoritativeBootstrapProjectCwd = (input) => gen(function* () {
+	const projectId = input.bootstrapWorktree.projectId;
+	if (projectId === void 0) return yield* fail(/* @__PURE__ */ new Error("Missing project identity."));
+	const project = yield* requireBootstrapProject({
+		readModel: input.readModel,
+		projectId
+	});
+	const thread = yield* requireBootstrapThread({
+		readModel: input.readModel,
+		threadId: input.command.threadId
+	});
+	if (thread.projectId !== projectId) return yield* fail(/* @__PURE__ */ new Error(`Worktree project '${projectId}' does not match thread project '${thread.projectId}'.`));
+	const createdThreadProjectId = input.command.bootstrap?.createThread?.projectId;
+	if (createdThreadProjectId && createdThreadProjectId !== projectId) return yield* fail(/* @__PURE__ */ new Error(`Worktree project '${projectId}' does not match created thread project '${createdThreadProjectId}'.`));
+	if (input.bootstrapWorktree.branch === void 0) return yield* fail(/* @__PURE__ */ new Error("Authoritative worktree preparation requires a branch."));
+	if (input.bootstrapWorktree.startFromOrigin && input.bootstrapWorktree.baseBranch !== "main") return yield* fail(/* @__PURE__ */ new Error("Authoritative Work Session worktrees must start from origin/main."));
+	return project.workspaceRoot;
+});
+/** Keep legacy path-based commands working while routing identified projects through Forge records. */
+const resolveBootstrapProjectCwd = (input) => gen(function* () {
+	const { bootstrapWorktree } = input;
+	if (bootstrapWorktree.projectId === void 0) {
+		if (!bootstrapWorktree.projectCwd) return yield* fail(/* @__PURE__ */ new Error("Worktree preparation requires a project checkout path."));
+		return bootstrapWorktree.projectCwd;
+	}
+	return yield* resolveAuthoritativeBootstrapProjectCwd({
+		readModel: yield* input.orchestrationEngine.getReadModel(),
+		command: input.command,
+		bootstrapWorktree
+	});
+});
 const prepareBootstrapWorktree = (input) => gen(function* () {
 	const bootstrapWorktree = input.command.bootstrap?.prepareWorktree;
 	if (!bootstrapWorktree) return null;
+	const projectCwd = yield* resolveBootstrapProjectCwd({
+		orchestrationEngine: input.orchestrationEngine,
+		command: input.command,
+		bootstrapWorktree
+	});
 	const requestedAt = (/* @__PURE__ */ new Date()).toISOString();
 	const baseBranchLabel = bootstrapWorktree.baseBranch ?? "<default>";
 	const requestedPayload = {
 		turnRequestedAt: input.command.createdAt,
-		projectCwd: bootstrapWorktree.projectCwd,
+		...bootstrapWorktree.projectId ? { projectId: bootstrapWorktree.projectId } : {},
+		projectCwd,
 		baseBranch: bootstrapWorktree.baseBranch,
 		branch: bootstrapWorktree.branch,
 		command: `git worktree add -b ${bootstrapWorktree.branch} <generated-path> ${baseBranchLabel}`
@@ -94279,11 +94329,38 @@ const prepareBootstrapWorktree = (input) => gen(function* () {
 		payload: requestedPayload,
 		tone: "info"
 	});
+	if (bootstrapWorktree.startFromOrigin) {
+		if (!input.git.fetch) return yield* fail(/* @__PURE__ */ new Error("Git fetch is unavailable for origin worktree preparation."));
+		yield* input.git.fetch({
+			cwd: projectCwd,
+			remote: "origin",
+			ref: bootstrapWorktree.baseBranch ?? "main"
+		}).pipe(catchCause((cause) => {
+			if (hasInterruptsOnly(cause)) return failCause$1(cause);
+			const error = squash(cause);
+			const detail = error instanceof Error ? error.message : "Unknown fetch failure.";
+			return appendWorktreeActivity({
+				orchestrationEngine: input.orchestrationEngine,
+				threadId: input.command.threadId,
+				commandId: bootstrapCommandId(input.command, "bootstrap-worktree-failed"),
+				kind: "worktree.failed",
+				summary: "Worktree preparation failed",
+				createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+				payload: {
+					...requestedPayload,
+					detail,
+					stage: "fetch"
+				},
+				tone: "error"
+			}).pipe(andThen(failCause$1(cause)));
+		}));
+	}
 	const worktree = yield* input.git.createWorktree({
-		cwd: bootstrapWorktree.projectCwd,
+		cwd: projectCwd,
 		branch: bootstrapWorktree.baseBranch,
 		newBranch: bootstrapWorktree.branch,
 		path: null,
+		...bootstrapWorktree.startFromOrigin ? { startFromOrigin: true } : {},
 		onStage: (update) => appendWorktreeActivity({
 			orchestrationEngine: input.orchestrationEngine,
 			threadId: input.command.threadId,
@@ -94375,7 +94452,7 @@ const prepareBootstrapWorktree = (input) => gen(function* () {
 	});
 	return {
 		worktreePath,
-		projectCwd: bootstrapWorktree.projectCwd
+		projectCwd
 	};
 });
 const dispatchBootstrapTurnStart$1 = (input, command) => gen(function* () {
@@ -235562,6 +235639,13 @@ function createGitCommandError(operation, cwd, args, detail, cause) {
 		...cause !== void 0 ? { cause } : {}
 	});
 }
+function isValidGitRef(value) {
+	if (value.length === 0 || value.startsWith("-") || value.endsWith(".") || value.endsWith("/") || value.endsWith(".lock") || value.includes("..") || value.includes("@{") || /[~^:?*[\\]/.test(value) || [...value].some((character) => {
+		const code = character.charCodeAt(0);
+		return code <= 32 || code === 127;
+	})) return false;
+	return value.split("/").every((part) => part.length > 0 && part !== "." && part !== "..");
+}
 function quoteGitCommand(args) {
 	return `git ${args.join(" ")}`;
 }
@@ -236570,7 +236654,7 @@ const GitCoreLive = effect(GitCore, fn$1("makeGitCore")(function* (options) {
 		}) ?? void_$1;
 		yield* report("resolve", "running");
 		const base = input.branch ?? (yield* resolveDefaultBaseBranch(input.cwd));
-		const startPoint = yield* resolveWorktreeStartPoint({
+		const startPoint = input.startFromOrigin ? `origin/${base}` : yield* resolveWorktreeStartPoint({
 			cwd: input.cwd,
 			base,
 			creatingNewBranch: input.newBranch !== void 0
@@ -236640,6 +236724,20 @@ const GitCoreLive = effect(GitCore, fn$1("makeGitCore")(function* (options) {
 			fallbackErrorMessage: "git fetch pull request branch failed"
 		});
 	});
+	const fetch = fn$1("fetch")(function* (input) {
+		if (!isValidGitRef(input.ref)) return yield* fail(createGitCommandError("GitCore.fetch", input.cwd, [
+			"fetch",
+			input.remote,
+			input.ref
+		], `Invalid Git ref: ${input.ref}`));
+		yield* runGit("GitCore.fetch", input.cwd, [
+			"fetch",
+			"--quiet",
+			"--no-tags",
+			input.remote,
+			input.ref
+		]);
+	});
 	const fetchRemoteBranch = fn$1("fetchRemoteBranch")(function* (input) {
 		yield* runGit("GitCore.fetchRemoteBranch.fetch", input.cwd, [
 			"fetch",
@@ -236837,6 +236935,7 @@ const GitCoreLive = effect(GitCore, fn$1("makeGitCore")(function* (options) {
 		listBranches,
 		createWorktree,
 		fetchPullRequestBranch,
+		fetch,
 		ensureRemote,
 		fetchRemoteBranch,
 		setBranchUpstream,
@@ -300218,7 +300317,7 @@ function resolveBuildCommitFromEnv(env) {
 * environment descriptor down instead of reporting an honest "unknown".
 */
 function readBakedBuildCommit() {
-	return "eb40895cccd38f2dabaea7ccef109eb3bd22a777";
+	return "13fc600f9068c1aa48fe746802127ae02843b2c9";
 }
 async function resolveServerBuildCommit(input) {
 	if (isFullCommitSha(input.baked)) return input.baked;