Merge pull request #80 from prisma/better-result-project-resolution-errors

Adopt typed result errors for project resolution

Author: luanvdw

.agents/diary/better-result-phase-3.md

@@ -0,0 +1,3 @@
+# Better Result Phase 3
+
+Scope tangent worth pursuing later: Package typecheck now runs after installing dependencies, but it reports unrelated existing errors in `branch-database.ts`, test helper typings, project real-mode mock types, and script module declarations. I did not fix these because phase 3 is limited to project resolution domain errors.

.agents/projects/better-result-error-handling.plan.md

@@ -69,7 +69,7 @@ None.
 
 ### Phase 3: Project Resolution Domain Errors
 
-**Status:** ☐ Not started
+**Status:** ✓ Complete; full package typecheck blocked by unrelated existing errors
 
 **Goal:** Convert project target resolution failures from thrown `CliError` helpers to typed project-domain failures.
 
@@ -87,10 +87,10 @@ None.
 
 **Acceptance Criteria:**
 
-- Migrated project resolution APIs expose typed results rather than throwing expected `CliError` instances.
-- Existing project-related structured error codes and recovery guidance remain stable.
-- `pnpm --filter @prisma/cli exec tsc -p tsconfig.json` passes.
-- Project resolution and project show/list tests pass.
+- [x] Migrated project resolution APIs expose typed results rather than throwing expected `CliError` instances.
+- [x] Existing project-related structured error codes and recovery guidance remain stable.
+- [ ] `pnpm --filter @prisma/cli exec tsc -p tsconfig.json` passes. Blocked by unrelated existing errors in database/test typing surfaces.
+- [x] Project resolution and project show/list tests pass.
 
 ### Phase 4: Project Setup Validation And Creation Errors
 

packages/cli/src/controllers/app-env.ts

@@ -13,7 +13,7 @@ import { readLocalGitBranch } from "../lib/git/local-branch";
 import { authRequiredError, CliError, usageError, workspaceRequiredError } from "../shell/errors";
 import type { CommandSuccess } from "../shell/output";
 import type { CommandContext } from "../shell/runtime";
-import { resolveProjectTarget } from "../lib/project/resolution";
+import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution";
 import type {
   EnvAddResult,
   EnvListTarget,
@@ -416,13 +416,17 @@ async function requireClientAndProject(
     throw workspaceRequiredError();
   }
 
-  const target = await resolveProjectTarget({
+  const targetResult = await resolveProjectTarget({
     context,
     workspace: authState.workspace,
     explicitProject,
     listProjects: () => listRealWorkspaceProjects(client, authState.workspace!, context.runtime.signal),
     commandName,
   });
+  if (targetResult.isErr()) {
+    throw projectResolutionErrorToCliError(targetResult.error);
+  }
+  const target = targetResult.value;
 
   return {
     client,

packages/cli/src/controllers/app.ts

@@ -52,6 +52,7 @@ import {
   buildProjectSetupNextActions,
   inferTargetName,
   projectNotFoundError,
+  projectResolutionErrorToCliError,
   resolveDurablePlatformMapping,
   resolveProjectTarget,
   type InferredTargetName,
@@ -2330,14 +2331,18 @@ async function resolveProjectContext(
     throw workspaceRequiredError();
   }
 
-  const resolved = await resolveProjectTarget({
+  const resolvedResult = await resolveProjectTarget({
     context,
     workspace: authState.workspace,
     explicitProject,
     envProjectId: options?.envProjectId,
     listProjects: () => listRealWorkspaceProjects(client, authState.workspace!, context.runtime.signal),
     commandName: options?.commandName,
   });
+  if (resolvedResult.isErr()) {
+    throw projectResolutionErrorToCliError(resolvedResult.error);
+  }
+  const resolved = resolvedResult.value;
   const branch = options?.branch ?? await resolveDeployBranch(context, undefined);
 
   return {

packages/cli/src/controllers/branch.ts

@@ -7,10 +7,9 @@ import type { BranchListResult, BranchRole, BranchSummary } from "../types/branc
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways";
 import { createBranchUseCases } from "../use-cases/branch";
 import { requireComputeAuth } from "../lib/auth/guard";
-import { resolveProjectTarget } from "../lib/project/resolution";
+import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution";
 import { requireAuthenticatedAuthState } from "./auth";
 import { listRealWorkspaceProjects } from "./project";
-import { createSelectPromptPort } from "./select-prompt-port";
 
 function isRealMode(context: CommandContext): boolean {
   return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
@@ -55,13 +54,15 @@ async function listRealBranches(context: CommandContext): Promise<BranchListResu
     throw workspaceRequiredError();
   }
 
-  const target = await resolveProjectTarget({
+  const targetResult = await resolveProjectTarget({
     context,
     workspace,
     listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
-    prompt: createSelectPromptPort(context),
-    remember: true,
   });
+  if (targetResult.isErr()) {
+    throw projectResolutionErrorToCliError(targetResult.error);
+  }
+  const target = targetResult.value;
 
   const branches = await listBranches(client, target.project.id, context.runtime.signal);
 

packages/cli/src/controllers/database.ts

@@ -7,7 +7,7 @@ import {
   normalizeDatabase,
   type DatabaseProvider,
 } from "../lib/database/provider";
-import { resolveProjectTarget, type ResolvedProjectTarget } from "../lib/project/resolution";
+import { projectResolutionErrorToCliError, resolveProjectTarget, type ResolvedProjectTarget } from "../lib/project/resolution";
 import { authRequiredError, CliError, usageError, workspaceRequiredError } from "../shell/errors";
 import type { CommandSuccess } from "../shell/output";
 import type { CommandContext } from "../shell/runtime";
@@ -277,31 +277,37 @@ async function requireDatabaseContext(
       throw authRequiredError();
     }
 
-    const target = await resolveProjectTarget({
+    const targetResult = await resolveProjectTarget({
       context,
       workspace,
       explicitProject: flags.projectRef,
       listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
       commandName,
     });
+    if (targetResult.isErr()) {
+      throw projectResolutionErrorToCliError(targetResult.error);
+    }
 
     return {
       provider: createManagementDatabaseProvider(client),
-      target,
+      target: targetResult.value,
     };
   }
 
-  const target = await resolveProjectTarget({
+  const targetResult = await resolveProjectTarget({
     context,
     workspace,
     explicitProject: flags.projectRef,
     listProjects: async () => listFixtureWorkspaceProjects(context, workspace),
     commandName,
   });
+  if (targetResult.isErr()) {
+    throw projectResolutionErrorToCliError(targetResult.error);
+  }
 
   return {
     provider: createFixtureDatabaseProvider(context),
-    target,
+    target: targetResult.value,
   };
 }
 

packages/cli/src/controllers/project.ts

@@ -12,6 +12,7 @@ import {
   buildProjectSetupNextActions,
   inferTargetName,
   inspectProjectBinding,
+  projectResolutionErrorToCliError,
   resolveProjectTarget,
   sortProjects,
   type ProjectCandidate,
@@ -563,13 +564,17 @@ async function resolveProjectShowInRealMode(
     throw authRequiredError();
   }
 
-  return inspectProjectBinding({
+  const result = await inspectProjectBinding({
     context,
     workspace,
     explicitProject,
     listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
     commandName: "project show",
   });
+  if (result.isErr()) {
+    throw projectResolutionErrorToCliError(result.error);
+  }
+  return result.value;
 }
 
 async function resolveRequiredProjectInRealMode(
@@ -583,27 +588,35 @@ async function resolveRequiredProjectInRealMode(
     throw authRequiredError();
   }
 
-  return resolveProjectTarget({
+  const result = await resolveProjectTarget({
     context,
     workspace,
     explicitProject,
     listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
     commandName,
   });
+  if (result.isErr()) {
+    throw projectResolutionErrorToCliError(result.error);
+  }
+  return result.value;
 }
 
 async function resolveProjectShowInFixtureMode(
   context: CommandContext,
   workspace: AuthWorkspace,
   explicitProject: string | undefined,
 ): Promise<ProjectShowResult> {
-  return inspectProjectBinding({
+  const result = await inspectProjectBinding({
     context,
     workspace,
     explicitProject,
     listProjects: async () => listFixtureWorkspaceProjects(context, workspace),
     commandName: "project show",
   });
+  if (result.isErr()) {
+    throw projectResolutionErrorToCliError(result.error);
+  }
+  return result.value;
 }
 
 async function resolveRequiredProjectInFixtureMode(
@@ -612,13 +625,17 @@ async function resolveRequiredProjectInFixtureMode(
   explicitProject: string | undefined,
   commandName: string,
 ): Promise<ResolvedProjectTarget> {
-  return resolveProjectTarget({
+  const result = await resolveProjectTarget({
     context,
     workspace,
     explicitProject,
     listProjects: async () => listFixtureWorkspaceProjects(context, workspace),
     commandName,
   });
+  if (result.isErr()) {
+    throw projectResolutionErrorToCliError(result.error);
+  }
+  return result.value;
 }
 
 export async function listRealWorkspaceProjects(