@prisma/cli 3.0.0-beta.9 → 3.0.0-dev.102.1

package/dist/lib/auth/login.js

@@ -106,35 +106,42 @@ async function consumePastedCallback(options) {
 	});
 	try {
 		for (;;) {
-			let answer;
-			try {
-				answer = await rl.question("Paste the callback URL here: ", { signal: options.signal });
-			} catch (error) {
-				if (error?.name === "AbortError") return;
-				throw error;
-			}
-			const trimmed = answer.trim().replace(/^["']|["']$/g, "");
-			let url;
-			try {
-				if (!trimmed) throw new Error("empty input");
-				url = new URL(trimmed);
-			} catch {
-				options.output.write("That didn't look like a URL. Paste the full localhost callback URL and try again.\n");
-				continue;
-			}
-			try {
-				await options.complete(url);
-				return;
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				options.output.write(`Sign-in didn't complete (${message}). Paste the callback URL to try again.\n`);
-				continue;
-			}
+			const url = await readPastedCallbackUrl(rl, options);
+			if (url === null) return;
+			if (url === void 0) continue;
+			if (await tryCompletePastedCallback(url, options)) return;
 		}
 	} finally {
 		rl.close();
 	}
 }
+async function readPastedCallbackUrl(rl, options) {
+	let answer;
+	try {
+		answer = await rl.question("Paste the callback URL here: ", { signal: options.signal });
+	} catch (error) {
+		if (error?.name === "AbortError") return null;
+		throw error;
+	}
+	const trimmed = answer.trim().replace(/^["']|["']$/g, "");
+	try {
+		if (!trimmed) throw new Error("empty input");
+		return new URL(trimmed);
+	} catch {
+		options.output.write("That didn't look like a URL. Paste the full localhost callback URL and try again.\n");
+		return;
+	}
+}
+async function tryCompletePastedCallback(url, options) {
+	try {
+		await options.complete(url);
+		return true;
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		options.output.write(`Sign-in didn't complete (${message}). Paste the callback URL to try again.\n`);
+		return false;
+	}
+}
 var LoginState = class {
 	latestVerifier;
 	latestState;
@@ -144,7 +151,7 @@ var LoginState = class {
 	output;
 	constructor(options) {
 		this.options = options;
-		this.tokenStorage = options.tokenStorage ?? new FileTokenStorage(options.env, options.signal);
+		this.tokenStorage = options.tokenStorage ?? new FileTokenStorage(options.env, options.signal, { activateOnSetTokens: true });
 		this.sdk = createManagementApiSdk({
 			clientId: options.clientId ?? "cmm3lndn701oo0uefvxzo0ivw",
 			redirectUri: `http://${options.hostname}:${options.port}/auth/callback`,

package/dist/lib/diagnostics.js

@@ -3,7 +3,7 @@ import { resolveStateDir } from "../shell/runtime.js";
 import { readLocalGitState } from "./git/local-status.js";
 //#region src/lib/diagnostics.ts
 async function collectCommandDiagnostics(context, options = {}) {
-	const stateDir = resolveStateDir(context.runtime);
+	const stateDir = await resolveStateDir(context.runtime);
 	return {
 		cwd: context.runtime.cwd,
 		stateFilePath: resolveLocalStateFilePath(stateDir),

package/dist/lib/fs/home-path.js

@@ -0,0 +1,24 @@
+import path from "node:path";
+//#region src/lib/fs/home-path.ts
+/**
+* Shortens a path under the user's home directory to `~/...` for display,
+* posix-style on every platform. Falls back to the Windows home variables
+* when `HOME` is unset (native cmd/PowerShell sessions).
+*/
+function shortenHomePath(value, env) {
+	const resolved = path.resolve(value);
+	const home = resolveHomeDirectory(env);
+	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
+		const relative = path.relative(home, resolved).split(path.sep).join("/");
+		return relative ? `~/${relative}` : "~";
+	}
+	return resolved;
+}
+function resolveHomeDirectory(env) {
+	if (env.HOME) return path.resolve(env.HOME);
+	if (env.USERPROFILE) return path.resolve(env.USERPROFILE);
+	if (env.HOMEDRIVE && env.HOMEPATH) return path.resolve(`${env.HOMEDRIVE}${env.HOMEPATH}`);
+	return null;
+}
+//#endregion
+export { shortenHomePath };

package/dist/lib/git/local-branch.js

@@ -1,9 +1,22 @@
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/git/local-branch.ts
+/**
+* Resolves the checked-out branch the way git does: the nearest `.git`
+* (directory or worktree file) from `cwd` upward owns the answer, so
+* monorepo commands run from inside a package see the repository branch.
+* Returns null for detached HEAD or when no repository contains `cwd`.
+*/
 async function readLocalGitBranch(cwd, signal) {
-	const headPath = await resolveGitHeadPath(path.join(cwd, ".git"), signal);
-	if (!headPath) return null;
+	for (let directory = path.resolve(cwd);;) {
+		const headPath = await resolveGitHeadPath(path.join(directory, ".git"), signal);
+		if (headPath) return readBranchFromHead(headPath, signal);
+		const parent = path.dirname(directory);
+		if (parent === directory) return null;
+		directory = parent;
+	}
+}
+async function readBranchFromHead(headPath, signal) {
 	try {
 		const head = (await readFile(headPath, {
 			encoding: "utf8",
@@ -12,7 +25,6 @@ async function readLocalGitBranch(cwd, signal) {
 		if (head.startsWith("ref: refs/heads/")) return head.slice(16);
 	} catch (error) {
 		if (signal.aborted) throw error;
-		return null;
 	}
 	return null;
 }

package/dist/lib/project/local-pin.js

@@ -29,6 +29,53 @@ var LocalResolutionPinReadAbortedError = class extends TaggedError("LocalResolut
 		});
 	}
 };
+var LocalResolutionPinSerializationError = class extends TaggedError("LocalResolutionPinSerializationError")() {
+	constructor(cause) {
+		super({
+			message: `Could not serialize ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinWriteAbortedError = class extends TaggedError("LocalResolutionPinWriteAbortedError")() {
+	constructor(cause) {
+		super({
+			message: `Writing ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} was aborted.`,
+			cause,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinWriteFailedError = class extends TaggedError("LocalResolutionPinWriteFailedError")() {
+	constructor(operation, cause) {
+		super({
+			message: `Could not write ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}.`,
+			cause,
+			operation,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalResolutionPinGitignoreUpdateAbortedError = class extends TaggedError("LocalResolutionPinGitignoreUpdateAbortedError")() {
+	constructor(cause) {
+		super({
+			message: "Updating .gitignore for the local Project binding was aborted.",
+			cause,
+			gitignorePath: ".gitignore"
+		});
+	}
+};
+var LocalResolutionPinGitignoreUpdateFailedError = class extends TaggedError("LocalResolutionPinGitignoreUpdateFailedError")() {
+	constructor(operation, cause) {
+		super({
+			message: "Could not update .gitignore for the local Project binding.",
+			cause,
+			operation,
+			gitignorePath: ".gitignore"
+		});
+	}
+};
 async function readLocalResolutionPin(cwd, signal) {
 	return Result.gen(async function* () {
 		yield* ensureLocalResolutionPinReadNotAborted(signal);
@@ -72,41 +119,74 @@ function parseLocalResolutionPin(raw) {
 	});
 }
 async function writeLocalResolutionPin(cwd, pin, signal) {
-	const prismaDir = path.join(cwd, ".prisma");
-	signal?.throwIfAborted();
-	await mkdir(prismaDir, { recursive: true });
-	const pinPath = path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH);
-	const tmpPath = path.join(prismaDir, `local.${process.pid}.${Date.now()}.tmp`);
-	await writeFile(tmpPath, `${JSON.stringify(pin, null, 2)}\n`, {
-		encoding: "utf8",
-		signal
+	return Result.gen(async function* () {
+		const prismaDir = path.join(cwd, ".prisma");
+		yield* ensureLocalResolutionPinWriteNotAborted(signal);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => mkdir(prismaDir, { recursive: true }), "create-directory", signal));
+		const pinPath = path.join(cwd, LOCAL_RESOLUTION_PIN_RELATIVE_PATH);
+		const tmpPath = path.join(prismaDir, `local.${process.pid}.${Date.now()}.tmp`);
+		const serialized = yield* serializeLocalResolutionPin(pin);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => writeFile(tmpPath, serialized, {
+			encoding: "utf8",
+			signal
+		}), "write-temp-file", signal));
+		yield* ensureLocalResolutionPinWriteNotAborted(signal);
+		yield* Result.await(writeLocalResolutionPinBoundary(() => rename(tmpPath, pinPath), "rename-temp-file", signal));
+		return Result.ok(void 0);
 	});
-	signal?.throwIfAborted();
-	await rename(tmpPath, pinPath);
 }
 async function ensureLocalResolutionPinGitignore(cwd, signal) {
 	const gitignorePath = path.join(cwd, ".gitignore");
 	let existing = null;
-	signal?.throwIfAborted();
-	try {
-		existing = await readFile(gitignorePath, {
+	const notAborted = ensureLocalResolutionPinGitignoreUpdateNotAborted(signal);
+	if (notAborted.isErr()) return Result.err(notAborted.error);
+	const existingResult = await Result.tryPromise({
+		try: () => readFile(gitignorePath, {
 			encoding: "utf8",
 			signal
-		});
-	} catch (error) {
-		if (error.code !== "ENOENT") throw error;
-	}
-	if (existing === null) {
-		await writeFile(gitignorePath, ".prisma/\n", {
+		}),
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinGitignoreUpdateAbortedError(cause) : new LocalResolutionPinGitignoreUpdateFailedError("read", cause)
+	});
+	if (existingResult.isErr()) if (existingResult.error instanceof LocalResolutionPinGitignoreUpdateFailedError && existingResult.error.cause.code === "ENOENT") existing = null;
+	else return Result.err(existingResult.error);
+	else existing = existingResult.value;
+	if (existing === null) return writeLocalResolutionPinGitignore(gitignorePath, ".prisma/\n", signal);
+	if (existing.split(/\r?\n/).map((line) => line.trim()).some((line) => line === ".prisma/" || line === ".prisma/local.json")) return Result.ok(void 0);
+	return writeLocalResolutionPinGitignore(gitignorePath, existing.endsWith("\n") ? `${existing}.prisma/\n` : `${existing}\n.prisma/\n`, signal);
+}
+function ensureLocalResolutionPinWriteNotAborted(signal) {
+	return Result.try({
+		try: () => signal?.throwIfAborted(),
+		catch: (cause) => new LocalResolutionPinWriteAbortedError(cause)
+	});
+}
+function serializeLocalResolutionPin(pin) {
+	return Result.try({
+		try: () => `${JSON.stringify(pin, null, 2)}\n`,
+		catch: (cause) => new LocalResolutionPinSerializationError(cause)
+	});
+}
+function writeLocalResolutionPinBoundary(run, operation, signal) {
+	return Result.tryPromise({
+		try: async () => {
+			await run();
+		},
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinWriteAbortedError(cause) : new LocalResolutionPinWriteFailedError(operation, cause)
+	});
+}
+function ensureLocalResolutionPinGitignoreUpdateNotAborted(signal) {
+	return Result.try({
+		try: () => signal?.throwIfAborted(),
+		catch: (cause) => new LocalResolutionPinGitignoreUpdateAbortedError(cause)
+	});
+}
+function writeLocalResolutionPinGitignore(gitignorePath, contents, signal) {
+	return Result.tryPromise({
+		try: () => writeFile(gitignorePath, contents, {
 			encoding: "utf8",
 			signal
-		});
-		return;
-	}
-	if (existing.split(/\r?\n/).map((line) => line.trim()).some((line) => line === ".prisma/" || line === ".prisma/local.json")) return;
-	await writeFile(gitignorePath, existing.endsWith("\n") ? `${existing}.prisma/\n` : `${existing}\n.prisma/\n`, {
-		encoding: "utf8",
-		signal
+		}),
+		catch: (cause) => signal?.aborted ? new LocalResolutionPinGitignoreUpdateAbortedError(cause) : new LocalResolutionPinGitignoreUpdateFailedError("write", cause)
 	});
 }
 function isLocalResolutionPin(value) {

package/dist/lib/project/resolution.js

@@ -1,47 +1,100 @@
 import { CliError } from "../../shell/errors.js";
-import { formatCommandArgument } from "../../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "./local-pin.js";
+import { formatCommandArgument } from "../../shell/command-arguments.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
-import { matchError } from "better-result";
+import { Result, TaggedError, matchError } from "better-result";
 //#region src/lib/project/resolution.ts
+var ProjectNotFoundError = class extends TaggedError("ProjectNotFoundError")() {
+	constructor(projectRef, workspace) {
+		super({
+			message: `Project "${projectRef}" was not found in workspace "${workspace.name}".`,
+			projectRef,
+			workspace
+		});
+	}
+};
+var ProjectAmbiguousError = class extends TaggedError("ProjectAmbiguousError")() {
+	constructor(projectRef, matches) {
+		super({
+			message: projectRef ? `Multiple projects matched "${projectRef}".` : "Multiple projects matched the current directory context.",
+			projectRef,
+			matches
+		});
+	}
+};
+var LocalStateStaleError = class extends TaggedError("LocalStateStaleError")() {
+	constructor() {
+		super({
+			message: `The target recorded in ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} is no longer available in the selected workspace.`,
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH
+		});
+	}
+};
+var LocalProjectWorkspaceMismatchError = class extends TaggedError("LocalProjectWorkspaceMismatchError")() {
+	constructor(options) {
+		super({
+			message: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} links this directory to project ${options.pinnedProjectId} in workspace ${options.pinnedWorkspaceId}, but the active workspace is "${options.activeWorkspace.name}" (${options.activeWorkspace.id}).`,
+			pinnedWorkspaceId: options.pinnedWorkspaceId,
+			pinnedProjectId: options.pinnedProjectId,
+			activeWorkspace: options.activeWorkspace
+		});
+	}
+};
+var ProjectSetupRequiredError = class extends TaggedError("ProjectSetupRequiredError")() {
+	constructor(options) {
+		const commandLabel = options.commandName ? `prisma-cli ${options.commandName}` : "this command";
+		super({
+			message: `This directory is not linked to a Prisma Project, and ${commandLabel} will not choose one from package or directory names.`,
+			commandName: options.commandName,
+			suggestion: options.suggestion
+		});
+	}
+};
 async function resolveProjectTarget(options) {
-	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: true });
-	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, {
-		allowEnvProjectId: true,
-		localPin
-	});
-	if (target) return target;
-	throw await projectSetupRequiredError({
-		cwd: options.context.runtime.cwd,
-		projects,
-		commandName: options.commandName,
-		signal: options.context.runtime.signal
+	return Result.gen(async function* () {
+		const localPin = yield* Result.await(readImplicitLocalPin(options, { allowEnvProjectId: true }));
+		const projects = await options.listProjects();
+		const target = yield* Result.await(resolveBoundProjectTarget(options, projects, {
+			allowEnvProjectId: true,
+			localPin
+		}));
+		if (target) return Result.ok(target);
+		return Result.err(await projectSetupRequiredError({
+			cwd: options.context.runtime.cwd,
+			projects,
+			commandName: options.commandName,
+			signal: options.context.runtime.signal
+		}));
 	});
 }
 async function inspectProjectBinding(options) {
-	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: false });
-	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, {
-		allowEnvProjectId: false,
-		localPin
+	return Result.gen(async function* () {
+		const localPin = yield* Result.await(readImplicitLocalPin(options, { allowEnvProjectId: false }));
+		const projects = await options.listProjects();
+		const target = yield* Result.await(resolveBoundProjectTarget(options, projects, {
+			allowEnvProjectId: false,
+			localPin
+		}));
+		if (target) return Result.ok(target);
+		return Result.ok({
+			workspace: options.workspace,
+			project: null,
+			localBinding: { status: "not-linked" },
+			resolution: { projectSource: "unbound" },
+			...await buildProjectSetupSuggestion({
+				cwd: options.context.runtime.cwd,
+				projects,
+				commandName: options.commandName ?? "project show",
+				signal: options.context.runtime.signal
+			})
+		});
 	});
-	if (target) return target;
-	return {
-		workspace: options.workspace,
-		project: null,
-		localBinding: { status: "not-linked" },
-		resolution: { projectSource: "unbound" },
-		...await buildProjectSetupSuggestion({
-			cwd: options.context.runtime.cwd,
-			projects,
-			commandName: options.commandName ?? "project show",
-			signal: options.context.runtime.signal
-		})
-	};
 }
 function projectNotFoundError(projectRef, workspace) {
+	return projectResolutionErrorToCliError(new ProjectNotFoundError(projectRef, workspace));
+}
+function projectNotFoundCliError(projectRef, workspace) {
 	return new CliError({
 		code: "PROJECT_NOT_FOUND",
 		domain: "project",
@@ -53,6 +106,9 @@ function projectNotFoundError(projectRef, workspace) {
 	});
 }
 function projectAmbiguousError(projectRef, matches) {
+	return projectResolutionErrorToCliError(new ProjectAmbiguousError(projectRef, matches));
+}
+function projectAmbiguousCliError(projectRef, matches) {
 	const firstMatch = matches[0];
 	const nextSteps = ["prisma-cli project list"];
 	if (firstMatch) nextSteps.push(`prisma-cli app deploy --project ${firstMatch.id}`);
@@ -70,7 +126,7 @@ function projectAmbiguousError(projectRef, matches) {
 		nextSteps
 	});
 }
-function localStateStaleError() {
+function localStateStaleCliError() {
 	return new CliError({
 		code: "LOCAL_STATE_STALE",
 		domain: "project",
@@ -83,12 +139,15 @@ function localStateStaleError() {
 	});
 }
 function localProjectWorkspaceMismatchError(options) {
+	return projectResolutionErrorToCliError(new LocalProjectWorkspaceMismatchError(options));
+}
+function localProjectWorkspaceMismatchCliError(options) {
 	return new CliError({
 		code: "LOCAL_PROJECT_WORKSPACE_MISMATCH",
 		domain: "project",
 		summary: "Project link uses another workspace",
 		why: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} links this directory to project ${options.pinnedProjectId} in workspace ${options.pinnedWorkspaceId}, but your current CLI session is workspace "${options.activeWorkspace.name}" (${options.activeWorkspace.id}).`,
-		fix: "Sign in to the linked workspace, or relink this directory to a project in the current workspace.",
+		fix: "Switch to the linked workspace, or relink this directory to a project in the current workspace.",
 		meta: {
 			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
 			pinnedWorkspaceId: options.pinnedWorkspaceId,
@@ -98,12 +157,37 @@ function localProjectWorkspaceMismatchError(options) {
 		},
 		exitCode: 1,
 		nextSteps: [
-			"prisma-cli auth login",
+			`prisma-cli auth workspace use ${options.pinnedWorkspaceId}`,
 			"prisma-cli project list",
 			"prisma-cli project link <id-or-name>"
 		]
 	});
 }
+/**
+* Converts expected project-resolution variants to command-boundary CliErrors.
+* `LocalResolutionPinReadAbortedError` and `UnhandledException` intentionally
+* propagate as exceptions; callers such as `resolveProjectShowInRealMode`
+* throw this helper's result, so passthrough variants should keep bubbling.
+*/
+function projectResolutionErrorToCliError(error) {
+	return matchError(error, {
+		ProjectNotFoundError: (error) => projectNotFoundCliError(error.projectRef, error.workspace),
+		ProjectAmbiguousError: (error) => projectAmbiguousCliError(error.projectRef, error.matches),
+		ProjectSetupRequiredError: (error) => projectSetupRequiredCliError(error),
+		LocalStateStaleError: () => localStateStaleCliError(),
+		LocalProjectWorkspaceMismatchError: (error) => localProjectWorkspaceMismatchCliError({
+			pinnedWorkspaceId: error.pinnedWorkspaceId,
+			pinnedProjectId: error.pinnedProjectId,
+			activeWorkspace: error.activeWorkspace
+		}),
+		LocalResolutionPinReadAbortedError: (error) => {
+			throw error;
+		},
+		UnhandledException: (error) => {
+			throw error;
+		}
+	});
+}
 async function buildProjectSetupSuggestion(options) {
 	const suggestedName = await inferTargetName(options.cwd, options.signal);
 	const candidates = sortProjects(options.projects.filter((project) => projectMatchesSuggestedName(project, suggestedName.name))).map(toProjectSummary);
@@ -116,17 +200,24 @@ async function buildProjectSetupSuggestion(options) {
 }
 async function projectSetupRequiredError(options) {
 	const suggestion = await buildProjectSetupSuggestion(options);
+	return new ProjectSetupRequiredError({
+		commandName: options.commandName,
+		suggestion
+	});
+}
+function projectSetupRequiredCliError(error) {
+	const suggestion = error.suggestion;
 	return new CliError({
 		code: "PROJECT_SETUP_REQUIRED",
 		domain: "project",
 		summary: "Choose a Project before running this command",
-		why: `This directory is not linked to a Prisma Project, and ${options.commandName ? `prisma-cli ${options.commandName}` : "this command"} will not choose one from package or directory names.`,
+		why: error.message,
 		fix: "Link the directory to an existing Project, or pass --project <id-or-name> for this command.",
 		meta: { ...suggestion },
 		exitCode: 1,
 		nextSteps: ["prisma-cli project list", ...suggestion.recoveryCommands],
 		nextActions: buildProjectSetupNextActions({
-			commandName: options.commandName,
+			commandName: error.commandName,
 			suggestedProjectName: suggestion.suggestedProjectName
 		})
 	});
@@ -200,9 +291,9 @@ function sortProjects(projects) {
 }
 function resolveExplicitProject(projectRef, projects, workspace) {
 	const matches = projects.filter((project) => project.id === projectRef || project.name === projectRef);
-	if (matches.length === 1) return matches[0];
-	if (matches.length > 1) throw projectAmbiguousError(projectRef, matches);
-	throw projectNotFoundError(projectRef, workspace);
+	if (matches.length === 1) return Result.ok(matches[0]);
+	if (matches.length > 1) return Result.err(new ProjectAmbiguousError(projectRef, matches));
+	return Result.err(new ProjectNotFoundError(projectRef, workspace));
 }
 function projectMatchesSuggestedName(project, suggestedName) {
 	return project.id === suggestedName || project.name === suggestedName || project.slug === suggestedName;
@@ -211,62 +302,62 @@ async function resolveDurablePlatformMapping() {
 	return null;
 }
 async function resolveBoundProjectTarget(options, projects, settings) {
-	if (options.explicitProject) return resolvedTarget(options.workspace, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
-		targetName: options.explicitProject,
-		targetNameSource: "explicit"
-	});
+	if (options.explicitProject) {
+		const projectResult = resolveExplicitProject(options.explicitProject, projects, options.workspace);
+		if (projectResult.isErr()) return Result.err(projectResult.error);
+		return Result.ok(resolvedTarget(options.workspace, projectResult.value, "explicit", {
+			targetName: options.explicitProject,
+			targetNameSource: "explicit"
+		}));
+	}
 	if (settings.allowEnvProjectId && options.envProjectId) {
 		const project = projects.find((candidate) => candidate.id === options.envProjectId);
-		if (!project) throw projectNotFoundError(options.envProjectId, options.workspace);
-		return resolvedTarget(options.workspace, project, "env", {
+		if (!project) return Result.err(new ProjectNotFoundError(options.envProjectId, options.workspace));
+		return Result.ok(resolvedTarget(options.workspace, project, "env", {
 			targetName: options.envProjectId,
 			targetNameSource: "env"
-		});
+		}));
 	}
 	const localPin = settings.localPin;
-	if (!localPin) return null;
+	if (!localPin) return Result.ok(null);
 	if (localPin.kind === "present") {
-		if (localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+		if (localPin.pin.workspaceId !== options.workspace.id) return Result.err(new LocalProjectWorkspaceMismatchError({
 			pinnedWorkspaceId: localPin.pin.workspaceId,
 			pinnedProjectId: localPin.pin.projectId,
 			activeWorkspace: options.workspace
-		});
+		}));
 		const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
-		if (!project) throw localStateStaleError();
-		return resolvedTarget(options.workspace, project, "local-pin", {
+		if (!project) return Result.err(new LocalStateStaleError());
+		return Result.ok(resolvedTarget(options.workspace, project, "local-pin", {
 			targetName: project.name,
 			targetNameSource: "local-pin"
-		});
+		}));
 	}
 	const platformMapping = await resolveDurablePlatformMapping();
-	if (platformMapping && platformMapping.workspace.id === options.workspace.id) return resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
+	if (platformMapping && platformMapping.workspace.id === options.workspace.id) return Result.ok(resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
 		targetName: platformMapping.name,
 		targetNameSource: "platform-mapping"
-	});
-	return null;
+	}));
+	return Result.ok(null);
 }
 async function readImplicitLocalPin(options, settings) {
-	if (options.explicitProject || settings.allowEnvProjectId && options.envProjectId) return null;
-	const localPinResult = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
-	if (localPinResult.isErr()) throw localPinReadErrorToProjectError(localPinResult.error);
+	if (options.explicitProject || settings.allowEnvProjectId && options.envProjectId) return Result.ok(null);
+	const localPinResult = await readLocalResolutionPin(options.projectDir ?? options.context.runtime.cwd, options.context.runtime.signal);
+	if (localPinResult.isErr()) return Result.err(localPinReadErrorToProjectError(localPinResult.error));
 	const localPin = localPinResult.value;
-	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) return Result.err(new LocalProjectWorkspaceMismatchError({
 		pinnedWorkspaceId: localPin.pin.workspaceId,
 		pinnedProjectId: localPin.pin.projectId,
 		activeWorkspace: options.workspace
-	});
-	return localPin;
+	}));
+	return Result.ok(localPin);
 }
 function localPinReadErrorToProjectError(error) {
 	return matchError(error, {
-		LocalResolutionPinInvalidJsonError: () => localStateStaleError(),
-		LocalResolutionPinInvalidShapeError: () => localStateStaleError(),
-		LocalResolutionPinReadAbortedError: (error) => {
-			throw error;
-		},
-		UnhandledException: (error) => {
-			throw error;
-		}
+		LocalResolutionPinInvalidJsonError: () => new LocalStateStaleError(),
+		LocalResolutionPinInvalidShapeError: () => new LocalStateStaleError(),
+		LocalResolutionPinReadAbortedError: (error) => error,
+		UnhandledException: (error) => error
 	});
 }
 function resolvedTarget(workspace, project, projectSource, resolutionDetails) {
@@ -292,4 +383,4 @@ function toProjectSummary(project) {
 	};
 }
 //#endregion
-export { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, projectAmbiguousError, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects };
+export { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, localProjectWorkspaceMismatchError, projectAmbiguousError, projectNotFoundError, projectResolutionErrorToCliError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects };