feat(source-control): add Bitbucket & Azure Devops providers

apps/server/src/git/GitManager.test.ts

@@ -655,6 +655,7 @@ function makeManager(input?: {
           get: () => Effect.succeed(provider),
           resolveHandle: () => Effect.succeed({ provider, context: null }),
           resolve: () => Effect.succeed(provider),
+          discover: Effect.succeed([]),
         }),
       ),
       Effect.provide(Layer.succeed(GitHubCli, gitHubCli)),

apps/server/src/git/GitWorkflowService.test.ts

@@ -1,28 +1,27 @@
-import { assert, it } from "@effect/vitest";
+import { assert, describe, it, vi } from "@effect/vitest";
 import { Effect, Layer } from "effect";
-import { describe, vi } from "vitest";
 
-import { GitManager } from "./GitManager.ts";
-import { GitWorkflowService, layer as GitWorkflowServiceLayer } from "./GitWorkflowService.ts";
-import { GitVcsDriver } from "../vcs/GitVcsDriver.ts";
-import { VcsDriverRegistry, type VcsDriverRegistryShape } from "../vcs/VcsDriverRegistry.ts";
+import * as GitManager from "./GitManager.ts";
+import * as GitWorkflowService from "./GitWorkflowService.ts";
+import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
+import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
 
-function makeLayer(input: { readonly detect: VcsDriverRegistryShape["detect"] }) {
-  return GitWorkflowServiceLayer.pipe(
+function makeLayer(input: { readonly detect: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
+  return GitWorkflowService.layer.pipe(
     Layer.provide(
-      Layer.mock(VcsDriverRegistry)({
+      Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
         detect: input.detect,
       }),
     ),
-    Layer.provide(Layer.mock(GitVcsDriver)({})),
-    Layer.provide(Layer.mock(GitManager)({})),
+    Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
+    Layer.provide(Layer.mock(GitManager.GitManager)({})),
   );
 }
 
 describe("GitWorkflowService", () => {
   it.effect("returns an empty local status when no VCS repository is detected", () =>
     Effect.gen(function* () {
-      const workflow = yield* GitWorkflowService;
+      const workflow = yield* GitWorkflowService.GitWorkflowService;
       const status = yield* workflow.localStatus({ cwd: "/not-a-repo" });
 
       assert.deepStrictEqual(status, {
@@ -48,7 +47,7 @@ describe("GitWorkflowService", () => {
 
   it.effect("returns an empty full status when no VCS repository is detected", () =>
     Effect.gen(function* () {
-      const workflow = yield* GitWorkflowService;
+      const workflow = yield* GitWorkflowService.GitWorkflowService;
       const status = yield* workflow.status({ cwd: "/not-a-repo" });
 
       assert.deepStrictEqual(status, {
@@ -82,15 +81,15 @@ describe("GitWorkflowService", () => {
     const remoteStatus = vi.fn();
     const status = vi.fn();
 
-    const testLayer = GitWorkflowServiceLayer.pipe(
+    const testLayer = GitWorkflowService.layer.pipe(
       Layer.provide(
-        Layer.mock(VcsDriverRegistry)({
+        Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
           detect: () => Effect.succeed(null),
         }),
       ),
-      Layer.provide(Layer.mock(GitVcsDriver)({})),
+      Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
       Layer.provide(
-        Layer.mock(GitManager)({
+        Layer.mock(GitManager.GitManager)({
           localStatus,
           remoteStatus,
           status,
@@ -99,7 +98,7 @@ describe("GitWorkflowService", () => {
     );
 
     return Effect.gen(function* () {
-      const workflow = yield* GitWorkflowService;
+      const workflow = yield* GitWorkflowService.GitWorkflowService;
       yield* workflow.localStatus({ cwd: "/not-a-repo" });
       yield* workflow.remoteStatus({ cwd: "/not-a-repo" });
       yield* workflow.status({ cwd: "/not-a-repo" });
@@ -112,7 +111,7 @@ describe("GitWorkflowService", () => {
 
   it.effect("returns an empty ref list when no VCS repository is detected", () =>
     Effect.gen(function* () {
-      const workflow = yield* GitWorkflowService;
+      const workflow = yield* GitWorkflowService.GitWorkflowService;
       const refs = yield* workflow.listRefs({ cwd: "/not-a-repo" });
 
       assert.deepStrictEqual(refs, {

apps/server/src/server.test.ts

@@ -105,23 +105,12 @@ import { WorkspaceEntriesLive } from "./workspace/Layers/WorkspaceEntries.ts";
 import { WorkspaceFileSystemLive } from "./workspace/Layers/WorkspaceFileSystem.ts";
 import { WorkspacePathsLive } from "./workspace/Layers/WorkspacePaths.ts";
 import * as GitVcsDriver from "./vcs/GitVcsDriver.ts";
-import type { VcsDriverShape } from "./vcs/VcsDriver.ts";
-import {
-  VcsStatusBroadcaster,
-  type VcsStatusBroadcasterShape,
-  layer as VcsStatusBroadcasterLayer,
-} from "./vcs/VcsStatusBroadcaster.ts";
-import {
-  VcsDriverRegistry,
-  type VcsDriverRegistryShape,
-  type VcsDriverHandle,
-} from "./vcs/VcsDriverRegistry.ts";
-import { layer as VcsProvisioningServiceLayer } from "./vcs/VcsProvisioningService.ts";
-import { layer as GitWorkflowServiceLayer } from "./git/GitWorkflowService.ts";
-import {
-  SourceControlRepositoryService,
-  type SourceControlRepositoryServiceShape,
-} from "./sourceControl/SourceControlRepositoryService.ts";
+import * as VcsDriver from "./vcs/VcsDriver.ts";
+import * as VcsStatusBroadcaster from "./vcs/VcsStatusBroadcaster.ts";
+import * as VcsDriverRegistry from "./vcs/VcsDriverRegistry.ts";
+import * as VcsProvisioningService from "./vcs/VcsProvisioningService.ts";
+import * as GitWorkflowService from "./git/GitWorkflowService.ts";
+import * as SourceControlRepositoryService from "./sourceControl/SourceControlRepositoryService.ts";
 import { ServerSecretStoreLive } from "./auth/Layers/ServerSecretStore.ts";
 import { ServerAuthLive } from "./auth/Layers/ServerAuth.ts";
 
@@ -329,12 +318,12 @@ const buildAppUnderTest = (options?: {
     providerRegistry?: Partial<ProviderRegistryShape>;
     serverSettings?: Partial<ServerSettingsShape>;
     open?: Partial<OpenShape>;
-    vcsDriver?: Partial<VcsDriverShape>;
-    vcsDriverRegistry?: Partial<VcsDriverRegistryShape>;
+    vcsDriver?: Partial<VcsDriver.VcsDriverShape>;
+    vcsDriverRegistry?: Partial<VcsDriverRegistry.VcsDriverRegistryShape>;
     gitVcsDriver?: Partial<GitVcsDriver.GitVcsDriverShape>;
     gitManager?: Partial<GitManagerShape>;
-    sourceControlRepositoryService?: Partial<SourceControlRepositoryServiceShape>;
-    vcsStatusBroadcaster?: Partial<VcsStatusBroadcasterShape>;
+    sourceControlRepositoryService?: Partial<SourceControlRepositoryService.SourceControlRepositoryServiceShape>;
+    vcsStatusBroadcaster?: Partial<VcsStatusBroadcaster.VcsStatusBroadcasterShape>;
     projectSetupScriptRunner?: Partial<ProjectSetupScriptRunnerShape>;
     terminalManager?: Partial<TerminalManagerShape>;
     orchestrationEngine?: Partial<OrchestrationEngineShape>;
@@ -382,7 +371,7 @@ const buildAppUnderTest = (options?: {
       ...options?.config,
     };
     const layerConfig = Layer.succeed(ServerConfig, config);
-    const defaultVcsDriver: VcsDriverShape = {
+    const defaultVcsDriver: VcsDriver.VcsDriverShape = {
       capabilities: {
         kind: "git",
         supportsWorktrees: true,
@@ -424,7 +413,7 @@ const buildAppUnderTest = (options?: {
       initRepository: () => Effect.void,
       ...options?.layers?.vcsDriver,
     };
-    const vcsDriverRegistryLayer = Layer.mock(VcsDriverRegistry)({
+    const vcsDriverRegistryLayer = Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
       get: () => Effect.succeed(defaultVcsDriver),
       detect: (input) =>
         defaultVcsDriver.detectRepository(input.cwd).pipe(
@@ -454,7 +443,7 @@ const buildAppUnderTest = (options?: {
                   kind: repository.kind,
                   repository,
                   driver: defaultVcsDriver,
-                } satisfies VcsDriverHandle)
+                } satisfies VcsDriverRegistry.VcsDriverHandle)
               : null,
           ),
         ),
@@ -496,19 +485,19 @@ const buildAppUnderTest = (options?: {
       ),
       ProjectFaviconResolverLive,
     );
-    const gitWorkflowLayer = GitWorkflowServiceLayer.pipe(
+    const gitWorkflowLayer = GitWorkflowService.layer.pipe(
       Layer.provideMerge(vcsDriverRegistryLayer),
       Layer.provideMerge(gitVcsDriverLayer),
       Layer.provideMerge(gitManagerLayer),
     );
-    const vcsProvisioningLayer = VcsProvisioningServiceLayer.pipe(
+    const vcsProvisioningLayer = VcsProvisioningService.layer.pipe(
       Layer.provide(vcsDriverRegistryLayer),
     );
     const vcsStatusBroadcasterLayer = options?.layers?.vcsStatusBroadcaster
-      ? Layer.mock(VcsStatusBroadcaster)({
+      ? Layer.mock(VcsStatusBroadcaster.VcsStatusBroadcaster)({
           ...options.layers.vcsStatusBroadcaster,
         })
-      : VcsStatusBroadcasterLayer.pipe(Layer.provide(gitWorkflowLayer));
+      : VcsStatusBroadcaster.layer.pipe(Layer.provide(gitWorkflowLayer));
 
     const servedRoutesLayer = HttpRouter.serve(makeRoutesLayer, {
       disableListenLog: true,
@@ -552,7 +541,7 @@ const buildAppUnderTest = (options?: {
       Layer.provide(gitWorkflowLayer),
       Layer.provide(vcsProvisioningLayer),
       Layer.provide(
-        Layer.mock(SourceControlRepositoryService)({
+        Layer.mock(SourceControlRepositoryService.SourceControlRepositoryService)({
           ...options?.layers?.sourceControlRepositoryService,
         }),
       ),

apps/server/src/server.ts

@@ -25,6 +25,8 @@ import { ProviderSessionReaperLive } from "./provider/Layers/ProviderSessionReap
 import { OpenCodeRuntimeLive } from "./provider/opencodeRuntime.ts";
 import { CheckpointDiffQueryLive } from "./checkpointing/Layers/CheckpointDiffQuery.ts";
 import { CheckpointStoreLive } from "./checkpointing/Layers/CheckpointStore.ts";
+import * as AzureDevOpsCli from "./sourceControl/AzureDevOpsCli.ts";
+import * as BitbucketApi from "./sourceControl/BitbucketApi.ts";
 import * as GitHubCli from "./sourceControl/GitHubCli.ts";
 import * as GitLabCli from "./sourceControl/GitLabCli.ts";
 import * as TextGeneration from "./textGeneration/TextGeneration.ts";
@@ -164,7 +166,10 @@ const VcsDriverRegistryLayerLive = VcsDriverRegistry.layer.pipe(
 );
 
 const SourceControlProviderRegistryLayerLive = SourceControlProviderRegistry.layer.pipe(
-  Layer.provide(Layer.mergeAll(GitHubCli.layer, GitLabCli.layer)),
+  Layer.provide(
+    Layer.mergeAll(AzureDevOpsCli.layer, BitbucketApi.layer, GitHubCli.layer, GitLabCli.layer),
+  ),
+  Layer.provideMerge(GitVcsDriver.layer),
   Layer.provideMerge(VcsDriverRegistryLayerLive),
 );
 
@@ -235,6 +240,7 @@ const ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(
 const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
   // Core Services
   Layer.provideMerge(CheckpointingLayerLive),
+  Layer.provideMerge(SourceControlProviderRegistryLayerLive),
   Layer.provideMerge(GitLayerLive),
   Layer.provideMerge(VcsLayerLive),
   Layer.provideMerge(ProviderRuntimeLayerLive),