fix: address mixed-provider review follow-ups

Author: mrubens

apps/api/src/handlers/environments/__tests__/createEnvironment.validation.test.ts

@@ -14,6 +14,7 @@ import {
 import {
   type TaskPayload,
   environmentConfigSchema,
+  getAmbiguousEnvironmentRepositoryError,
   getMissingEnvironmentRepositoryError,
   getEnvironmentRepositoryInstallationError,
 } from '@roomote/types';
@@ -69,7 +70,10 @@ export function getEnvironmentRepositoryConfigError(
     installationId: string | number | null | undefined;
   }>,
 ): string | null {
-  return getEnvironmentRepositoryInstallationError(repositoryRows);
+  return (
+    getAmbiguousEnvironmentRepositoryError(repositoryRows) ??
+    getEnvironmentRepositoryInstallationError(repositoryRows)
+  );
 }
 
 function extractRunId(auth: McpAuth): number | null {

apps/api/src/handlers/environments/createEnvironment.ts

@@ -6,9 +6,11 @@ import {
   completeClaimedLatestUserMessageForReplyQuote,
   restoreClaimedLatestUserMessageForReplyQuote,
 } from '@roomote/communication/messages';
+import { resolveRepositoryProvidersFromPayload } from '@roomote/types';
 import {
   createOrUpdateSourceControlPullRequestForTaskRun,
   findTaskRunForSourceControlMutation,
+  getPayloadRecord,
   manageSourceControlIssueForTaskRun,
   readSourceControlPullRequestForTaskRun,
   resolveSourceControlProviderForRepositoryFromPayload,
@@ -92,18 +94,19 @@ export async function manageSourceControl(
       runId: auth.authContext.runId,
       taskId,
     });
-    const payload =
-      taskRun.payload &&
-      typeof taskRun.payload === 'object' &&
-      !Array.isArray(taskRun.payload)
-        ? (taskRun.payload as Record<string, unknown>)
-        : {};
-    const targetProvider =
-      input.sourceControlProvider ??
-      resolveSourceControlProviderForRepositoryFromPayload(
+    const payload = getPayloadRecord(taskRun.payload);
+    let targetProvider = input.sourceControlProvider;
+    const repositoryProviders = resolveRepositoryProvidersFromPayload(payload);
+
+    if (
+      !targetProvider &&
+      (!repositoryProviders || input.repositoryFullName in repositoryProviders)
+    ) {
+      targetProvider = resolveSourceControlProviderForRepositoryFromPayload(
         payload,
         input.repositoryFullName,
       );
+    }
     const bodyInput = 'body' in input ? input : null;
     const shouldQuote =
       targetProvider === 'github' &&

apps/api/src/handlers/tasks/__tests__/manageSourceControl.test.ts

@@ -32,12 +32,6 @@ export function resolveSelectedRepositorySourceControlProvider(
   return undefined;
 }
 
-export function resolvePrimarySourceControlProvider(
-  providers: SourceControlProvider[],
-): SourceControlProvider | undefined {
-  return providers[0];
-}
-
 /**
  * Resolve the provider for an environment-backed launch by delegating to the
  * shared resolver (single source of truth for the environment-repository join).

apps/api/src/handlers/tasks/manageSourceControl.ts

@@ -1,4 +1,5 @@
 import { enqueueTask } from '@roomote/cloud-agents/server';
+import { TRPCError } from '@trpc/server';
 import {
   createEnvironmentConfigVersionSnapshot,
   db,
@@ -37,6 +38,7 @@ import {
   type ComputeProvider,
   type EnvironmentConfig,
   environmentConfigSchema,
+  getAmbiguousEnvironmentRepositoryError,
   getEnvironmentRepositoryInstallationError,
   getMissingEnvironmentRepositoryError,
   isExitedRunStatus,
@@ -140,14 +142,17 @@ type EnvironmentRepositoryRow = {
   installationId: string | null;
 };
 
-function getEnvironmentRepositoryConfigError(
+export function getEnvironmentRepositoryConfigError(
   repositoriesToValidate: EnvironmentRepositoryRow[],
 ): string | null {
-  return getEnvironmentRepositoryInstallationError(
-    repositoriesToValidate.map((repository) => ({
-      fullName: repository.fullName,
-      installationId: repository.installationId,
-    })),
+  return (
+    getAmbiguousEnvironmentRepositoryError(repositoriesToValidate) ??
+    getEnvironmentRepositoryInstallationError(
+      repositoriesToValidate.map((repository) => ({
+        fullName: repository.fullName,
+        installationId: repository.installationId,
+      })),
+    )
   );
 }
 
@@ -197,7 +202,10 @@ async function resolveSelectedRepositories(
     const repository = repositoriesById.get(repositoryId);
 
     if (!repository) {
-      throw new Error('Selected repositories are no longer available.');
+      throw new TRPCError({
+        code: 'BAD_REQUEST',
+        message: 'Selected repositories are no longer available.',
+      });
     }
 
     return {
@@ -211,7 +219,10 @@ async function resolveSelectedRepositories(
     getEnvironmentRepositoryConfigError(selectedRepositories);
 
   if (repositoryConfigError) {
-    throw new Error(repositoryConfigError);
+    throw new TRPCError({
+      code: 'BAD_REQUEST',
+      message: repositoryConfigError,
+    });
   }
 
   return {
@@ -815,9 +826,23 @@ export async function startEnvironmentDefinitionTaskCommand(
     (repository) => repository.fullName,
   );
   const title = buildSetupEnvironmentTaskTitle(selectedRepositoryFullNames);
-  const workspacePayload = buildEnvironmentDefinitionWorkspacePayload(
-    selectedRepositoryFullNames,
-  );
+  let workspacePayload: ReturnType<
+    typeof buildEnvironmentDefinitionWorkspacePayload
+  >;
+  try {
+    workspacePayload = buildEnvironmentDefinitionWorkspacePayload(
+      selectedRepositoryFullNames,
+    );
+  } catch (error) {
+    throw new TRPCError({
+      code: 'BAD_REQUEST',
+      message:
+        error instanceof Error
+          ? error.message
+          : 'The selected repositories are invalid.',
+      cause: error,
+    });
+  }
   const modelSelection = resolveEvalHarnessSelection({
     model: input.selectedModelId,
   });