fix: resolve source project path to numeric ID for GitLab MR creation

GitLab's API requires source_project_id to be a numeric project ID, but
sourceProjectIdentifier was returning a string owner/path from the
SourceControlRefSelector. This caused API validation errors when creating
cross-repository merge requests.

Now the createMergeRequest method first resolves the project path to its
numeric ID via the GitLab projects API before passing it as
source_project_id.

Author: cursoragent

apps/server/src/sourceControl/GitLabCli.ts

@@ -147,6 +147,10 @@ const RawGitLabRepositoryCloneUrlsSchema = Schema.Struct({
   ssh_url_to_repo: TrimmedNonEmptyString,
 });
 
+const RawGitLabProjectIdSchema = Schema.Struct({
+  id: Schema.Number,
+});
+
 const RawGitLabDefaultBranchSchema = Schema.Struct({
   default_branch: Schema.optional(Schema.NullOr(TrimmedNonEmptyString)),
 });
@@ -164,7 +168,7 @@ function normalizeRepositoryCloneUrls(
 function decodeGitLabJson<S extends Schema.Top>(
   raw: string,
   schema: S,
-  operation: "getRepositoryCloneUrls" | "getDefaultBranch",
+  operation: "getRepositoryCloneUrls" | "getDefaultBranch" | "createMergeRequest",
   invalidDetail: string,
 ): Effect.Effect<S["Type"], GitLabCliError, S["DecodingServices"]> {
   return Schema.decodeEffect(Schema.fromJsonString(schema))(raw).pipe(
@@ -205,7 +209,7 @@ function sourceRefName(input: {
   return input.source?.refName ?? normalizeHeadSelector(input.headSelector);
 }
 
-function sourceProjectIdentifier(source: SourceControlRefSelector | undefined): string | null {
+function sourceProjectPath(source: SourceControlRefSelector | undefined): string | null {
   return source?.repository ?? source?.owner ?? null;
 }
 
@@ -311,25 +315,50 @@ export const make = Effect.fn("makeGitLabCli")(function* () {
         Effect.map(normalizeRepositoryCloneUrls),
       ),
     createMergeRequest: (input) => {
-      const sourceProject = sourceProjectIdentifier(input.source);
-      return execute({
-        cwd: input.cwd,
-        args: [
-          "api",
-          "--method",
-          "POST",
-          "projects/:fullpath/merge_requests",
-          "--raw-field",
-          `source_branch=${sourceRefName(input)}`,
-          "--raw-field",
-          `target_branch=${input.target?.refName ?? input.baseBranch}`,
-          ...(sourceProject ? ["--raw-field", `source_project_id=${sourceProject}`] : []),
-          "--raw-field",
-          `title=${input.title}`,
-          "--field",
-          `description=@${input.bodyFile}`,
-        ],
-      }).pipe(Effect.asVoid);
+      const projectPath = sourceProjectPath(input.source);
+      const resolveSourceProjectId: Effect.Effect<number | null, GitLabCliError> = projectPath
+        ? execute({
+            cwd: input.cwd,
+            args: ["api", `projects/${encodeURIComponent(projectPath)}`],
+          }).pipe(
+            Effect.map((result) => result.stdout.trim()),
+            Effect.flatMap((raw) =>
+              decodeGitLabJson(
+                raw,
+                RawGitLabProjectIdSchema,
+                "createMergeRequest",
+                "GitLab CLI returned invalid project JSON while resolving source_project_id.",
+              ),
+            ),
+            Effect.map((project) => project.id),
+          )
+        : Effect.succeed(null);
+
+      return resolveSourceProjectId.pipe(
+        Effect.flatMap((sourceProjectId) =>
+          execute({
+            cwd: input.cwd,
+            args: [
+              "api",
+              "--method",
+              "POST",
+              "projects/:fullpath/merge_requests",
+              "--raw-field",
+              `source_branch=${sourceRefName(input)}`,
+              "--raw-field",
+              `target_branch=${input.target?.refName ?? input.baseBranch}`,
+              ...(sourceProjectId != null
+                ? ["--raw-field", `source_project_id=${sourceProjectId}`]
+                : []),
+              "--raw-field",
+              `title=${input.title}`,
+              "--field",
+              `description=@${input.bodyFile}`,
+            ],
+          }),
+        ),
+        Effect.asVoid,
+      );
     },
     getDefaultBranch: (input) =>
       execute({