[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 1 commit into from
Jun 20, 2026
Merged

[codex] Migrate server source control Effect services #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions apps/server/src/git/GitManager.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
service: GitHubCli.GitHubCliShape;
service: GitHubCli.GitHubCli["Service"];
ghCalls: string[];
} {
const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
);
const ghCalls: string[] = [];

const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
const args = [...input.args];
ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
manager: GitManager.GitManagerShape,
manager: GitManager.GitManager["Service"],
input: {
cwd: string;
action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
featureBranch?: boolean;
filePaths?: readonly string[];
},
options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
return manager.runStackedAction(
{
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
manager: GitManager.GitManagerShape,
manager: GitManager.GitManager["Service"],
input: { cwd: string; reference: string },
) {
return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
manager: GitManager.GitManagerShape,
manager: GitManager.GitManager["Service"],
input: GitPreparePullRequestThreadInput,
) {
return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
ghScenario?: FakeGhScenario;
textGeneration?: Partial<FakeGitTextGeneration>;
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
const textGeneration = createTextGeneration(input?.textGeneration);
const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
prefix: "t3-git-manager-test-",
});

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
);
const sourceControlRegistryLayer = Layer.effect(
SourceControlProviderRegistry.SourceControlProviderRegistry,
GitHubSourceControlProvider.make().pipe(
GitHubSourceControlProvider.make.pipe(
Effect.map((provider) =>
SourceControlProviderRegistry.SourceControlProviderRegistry.of({
get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
serverSettingsLayer,
).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

return GitManager.makeGitManager().pipe(
return GitManager.make.pipe(
Effect.provide(managerLayer),
Effect.map((manager) => ({ manager, ghCalls })),
);
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
Layer.provide(
ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
),
Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
Layer.provideMerge(VcsProcess.layer),
Layer.provideMerge(NodeServices.layer),
);
Expand Down
139 changes: 68 additions & 71 deletions apps/server/src/git/GitManager.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
GitVcsDriver,
type GitRemoteStatusOptions,
type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
readonly status: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
readonly localStatus: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
readonly remoteStatus: (
input: VcsStatusInput,
options?: GitRemoteStatusOptions,
) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
readonly resolvePullRequest: (
input: GitPullRequestRefInput,
) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
readonly preparePullRequestThread: (
input: GitPreparePullRequestThreadInput,
) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
readonly runStackedAction: (
input: GitRunStackedActionInput,
options?: GitRunStackedActionOptions,
) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
"t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
GitManager,
{
readonly status: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
readonly localStatus: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
readonly remoteStatus: (
input: VcsStatusInput,
options?: GitVcsDriver.GitRemoteStatusOptions,
) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
readonly resolvePullRequest: (
input: GitPullRequestRefInput,
) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
readonly preparePullRequestThread: (
input: GitPreparePullRequestThreadInput,
) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
readonly runStackedAction: (
input: GitRunStackedActionInput,
options?: GitRunStackedActionOptions,
) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
};
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
const gitCore = yield* GitVcsDriver;
const sourceControlProviders = yield* SourceControlProviderRegistry;
const textGeneration = yield* TextGeneration;
const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
const gitCore = yield* GitVcsDriver.GitVcsDriver;
const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
const textGeneration = yield* TextGeneration.TextGeneration;
const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
const crypto = yield* Crypto.Crypto;

const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
const serverSettingsService = yield* ServerSettingsService;
const serverSettingsService = yield* ServerSettings.ServerSettingsService;
const randomUUIDv4 = crypto.randomUUIDv4.pipe(
Effect.mapError((cause) =>
gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
aheadCount: 0,
behindCount: 0,
aheadOfDefaultCount: 0,
} satisfies GitStatusDetails;
} satisfies GitVcsDriver.GitStatusDetails;
const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
const details = yield* gitCore
.statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
);
const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
cwd: string,
options?: GitRemoteStatusOptions,
options?: GitVcsDriver.GitRemoteStatusOptions,
) {
const details = yield* gitCore
.statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
};
});

const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
return yield* Cache.get(localStatusResultCache, cacheKey);
});
const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
function* (input) {
const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
return yield* Cache.get(localStatusResultCache, cacheKey);
},
);
const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
function* (input, options) {
const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
return yield* Cache.get(remoteStatusResultCache, cacheKey);
},
);
const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
concurrency: "unbounded",
});
return mergeGitStatusParts(local, remote);
});
const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
"invalidateLocalStatus",
)(function* (cwd) {
yield* invalidateLocalStatusResultCache(cwd);
});
const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
"invalidateRemoteStatus",
)(function* (cwd) {
yield* invalidateRemoteStatusResultCache(cwd);
});
const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
function* (cwd) {
yield* invalidateLocalStatusResultCache(cwd);
yield* invalidateRemoteStatusResultCache(cwd);
},
);

const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
function* (input) {
const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
.getChangeRequest({
cwd: input.cwd,
reference: normalizePullRequestReference(input.reference),
})
.pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
"resolvePullRequest",
)(function* (input) {
const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
.getChangeRequest({
cwd: input.cwd,
reference: normalizePullRequestReference(input.reference),
})
.pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

return { pullRequest };
},
);
return { pullRequest };
});

const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
"preparePullRequestThread",
)(function* (input) {
const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
};
});

const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
function* (input, options) {
const progress = yield* createProgressEmitter(input, options);
const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
},
);

return {
return GitManager.of({
localStatus,
remoteStatus,
status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
resolvePullRequest,
preparePullRequestThread,
runStackedAction,
} satisfies GitManagerShape;
});
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);
4 changes: 3 additions & 1 deletion apps/server/src/git/GitWorkflowService.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
return GitWorkflowService.layer.pipe(
Layer.provide(
Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[codex] Migrate server source control Effect services#3186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 1 commit into

from

Jun 20, 2026
 Merged


[codex] Migrate server source control Effect services
#3186
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


24 changes: 11 additions & 13 deletions
apps/server/src/git/GitManager.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -376,7 +376,7 @@ function createTextGeneration(
}

function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 service: GitHubCli.GitHubCliShape;
 service: GitHubCli.GitHubCli["Service"];
 ghCalls: string[];
} {
 const prListQueue = [...(scenario.prListSequence ?? [])];
Expand All@@ -388,7 +388,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
 );
 const ghCalls: string[] = [];

 const execute: GitHubCli.GitHubCliShape["execute"] = (input) => {
 const execute: GitHubCli.GitHubCli["Service"]["execute"] = (input) => {
 const args = [...input.args];
 ghCalls.push(args.join(" "));

Expand DownExpand Up@@ -609,7 +609,7 @@ function createGitHubCliWithFakeGh(scenario: FakeGhScenario = {}): {
}

function runStackedAction(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: {
 cwd: string;
 action: "commit" | "push" | "create_pr" | "commit_push" | "commit_push_pr";
Expand All@@ -618,7 +618,7 @@ function runStackedAction(
 featureBranch?: boolean;
 filePaths?: readonly string[];
 },
 options?: Parameters<GitManager.GitManagerShape["runStackedAction"]>[1],
 options?: Parameters<GitManager.GitManager["Service"]["runStackedAction"]>[1],
) {
 return manager.runStackedAction(
 {
Expand All@@ -630,14 +630,14 @@ function runStackedAction(
}

function resolvePullRequest(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: { cwd: string; reference: string },
) {
 return manager.resolvePullRequest(input);
}

function preparePullRequestThread(
 manager: GitManager.GitManagerShape,
 manager: GitManager.GitManager["Service"],
 input: GitPreparePullRequestThreadInput,
) {
 return manager.preparePullRequestThread(input);
Expand All@@ -646,11 +646,11 @@ function preparePullRequestThread(
function makeManager(input?: {
 ghScenario?: FakeGhScenario;
 textGeneration?: Partial<FakeGitTextGeneration>;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunnerShape;
 setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
}) {
 const { service: gitHubCli, ghCalls } = createGitHubCliWithFakeGh(input?.ghScenario);
 const textGeneration = createTextGeneration(input?.textGeneration);
 const serverConfigLayer = ServerConfig.ServerConfig.layerTest(process.cwd(), {
 const serverConfigLayer = ServerConfig.layerTest(process.cwd(), {
 prefix: "t3-git-manager-test-",
 });

Expand All@@ -663,7 +663,7 @@ function makeManager(input?: {
 );
 const sourceControlRegistryLayer = Layer.effect(
 SourceControlProviderRegistry.SourceControlProviderRegistry,
 GitHubSourceControlProvider.make().pipe(
 GitHubSourceControlProvider.make.pipe(
 Effect.map((provider) =>
 SourceControlProviderRegistry.SourceControlProviderRegistry.of({
 get: () => Effect.succeed(provider),
Expand All@@ -688,7 +688,7 @@ function makeManager(input?: {
 serverSettingsLayer,
 ).pipe(Layer.provideMerge(sourceControlRegistryLayer), Layer.provideMerge(NodeServices.layer));

 return GitManager.makeGitManager().pipe(
 return GitManager.make.pipe(
 Effect.provide(managerLayer),
 Effect.map((manager) => ({ manager, ghCalls })),
 );
Expand All@@ -697,9 +697,7 @@ function makeManager(input?: {
const asThreadId = (threadId: string) => threadId as ThreadId;

const GitManagerTestLayer = GitVcsDriver.layer.pipe(
 Layer.provide(
 ServerConfig.ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" }),
 ),
 Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
 Layer.provideMerge(VcsProcess.layer),
 Layer.provideMerge(NodeServices.layer),
);
Expand Down

139 changes: 68 additions & 71 deletions
apps/server/src/git/GitManager.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,17 +42,13 @@ import {
} from "@t3tools/shared/sourceControl";

import { GitManagerError } from "@t3tools/contracts";
import { TextGeneration } from "../textGeneration/TextGeneration.ts";
import { ProjectSetupScriptRunner } from "../project/Services/ProjectSetupScriptRunner.ts";
import * as TextGeneration from "../textGeneration/TextGeneration.ts";
import * as ProjectSetupScriptRunner from "../project/Services/ProjectSetupScriptRunner.ts";
import { extractBranchNameFromRemoteRef } from "./remoteRefs.ts";
import { ServerSettingsService } from "../serverSettings.ts";
import * as ServerSettings from "../serverSettings.ts";
import type { GitManagerServiceError } from "@t3tools/contracts";
import {
 GitVcsDriver,
 type GitRemoteStatusOptions,
 type GitStatusDetails,
} from "../vcs/GitVcsDriver.ts";
import { SourceControlProviderRegistry } from "../sourceControl/SourceControlProviderRegistry.ts";
import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
import type { ChangeRequest } from "@t3tools/contracts";

export interface GitActionProgressReporter {
Expand All@@ -64,35 +60,34 @@ export interface GitRunStackedActionOptions {
 readonly progressReporter?: GitActionProgressReporter;
}

export interface GitManagerShape {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
}

export class GitManager extends Context.Service<GitManager, GitManagerShape>()(
 "t3/git/GitManager",
) {}
export class GitManager extends Context.Service<
 GitManager,
 {
 readonly status: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
 readonly localStatus: (
 input: VcsStatusInput,
 ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
 readonly remoteStatus: (
 input: VcsStatusInput,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
 readonly invalidateLocalStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateRemoteStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly invalidateStatus: (cwd: string) => Effect.Effect<void, never>;
 readonly resolvePullRequest: (
 input: GitPullRequestRefInput,
 ) => Effect.Effect<GitResolvePullRequestResult, GitManagerServiceError>;
 readonly preparePullRequestThread: (
 input: GitPreparePullRequestThreadInput,
 ) => Effect.Effect<GitPreparePullRequestThreadResult, GitManagerServiceError>;
 readonly runStackedAction: (
 input: GitRunStackedActionInput,
 options?: GitRunStackedActionOptions,
 ) => Effect.Effect<GitRunStackedActionResult, GitManagerServiceError>;
 }
>()("t3/git/GitManager") {}

const COMMIT_TIMEOUT_MS = 10 * 60_000;
const MAX_PROGRESS_TEXT_LENGTH = 500;
Expand DownExpand Up@@ -531,15 +526,15 @@ function toPullRequestHeadRemoteInfo(pr: {
 };
}

export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 const gitCore = yield* GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner;
export const make = Effect.gen(function* () {
 const gitCore = yield* GitVcsDriver.GitVcsDriver;
 const sourceControlProviders = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
 const textGeneration = yield* TextGeneration.TextGeneration;
 const projectSetupScriptRunner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
 const crypto = yield* Crypto.Crypto;

 const sourceControlProvider = (cwd: string) => sourceControlProviders.resolve({ cwd });
 const serverSettingsService = yield* ServerSettingsService;
 const serverSettingsService = yield* ServerSettings.ServerSettingsService;
 const randomUUIDv4 = crypto.randomUUIDv4.pipe(
 Effect.mapError((cause) =>
 gitManagerError("randomUUIDv4", "Failed to generate Git operation identifier.", cause),
Expand DownExpand Up@@ -721,7 +716,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 aheadCount: 0,
 behindCount: 0,
 aheadOfDefaultCount: 0,
 } satisfies GitStatusDetails;
 } satisfies GitVcsDriver.GitStatusDetails;
 const readLocalStatus = Effect.fn("readLocalStatus")(function* (cwd: string) {
 const details = yield* gitCore
 .statusDetailsLocal(cwd)
Expand DownExpand Up@@ -752,7 +747,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 );
 const readRemoteStatus = Effect.fn("readRemoteStatus")(function* (
 cwd: string,
 options?: GitRemoteStatusOptions,
 options?: GitVcsDriver.GitRemoteStatusOptions,
 ) {
 const details = yield* gitCore
 .statusDetailsRemote(cwd, options)
Expand DownExpand Up@@ -1358,11 +1353,13 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const localStatus: GitManagerShape["localStatus"] = Effect.fn("localStatus")(function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 });
 const remoteStatus: GitManagerShape["remoteStatus"] = Effect.fn("remoteStatus")(
 const localStatus: GitManager["Service"]["localStatus"] = Effect.fn("localStatus")(
 function* (input) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 return yield* Cache.get(localStatusResultCache, cacheKey);
 },
 );
 const remoteStatus: GitManager["Service"]["remoteStatus"] = Effect.fn("remoteStatus")(
 function* (input, options) {
 const cacheKey = yield* normalizeStatusCacheKey(input.cwd);
 if (options?.refreshUpstream === false) {
Expand All@@ -1371,43 +1368,43 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 return yield* Cache.get(remoteStatusResultCache, cacheKey);
 },
 );
 const status: GitManagerShape["status"] = Effect.fn("status")(function* (input) {
 const status: GitManager["Service"]["status"] = Effect.fn("status")(function* (input) {
 const [local, remote] = yield* Effect.all([localStatus(input), remoteStatus(input)], {
 concurrency: "unbounded",
 });
 return mergeGitStatusParts(local, remote);
 });
 const invalidateLocalStatus: GitManagerShape["invalidateLocalStatus"] = Effect.fn(
 const invalidateLocalStatus: GitManager["Service"]["invalidateLocalStatus"] = Effect.fn(
 "invalidateLocalStatus",
 )(function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 });
 const invalidateRemoteStatus: GitManagerShape["invalidateRemoteStatus"] = Effect.fn(
 const invalidateRemoteStatus: GitManager["Service"]["invalidateRemoteStatus"] = Effect.fn(
 "invalidateRemoteStatus",
 )(function* (cwd) {
 yield* invalidateRemoteStatusResultCache(cwd);
 });
 const invalidateStatus: GitManagerShape["invalidateStatus"] = Effect.fn("invalidateStatus")(
 const invalidateStatus: GitManager["Service"]["invalidateStatus"] = Effect.fn("invalidateStatus")(
 function* (cwd) {
 yield* invalidateLocalStatusResultCache(cwd);
 yield* invalidateRemoteStatusResultCache(cwd);
 },
 );

 const resolvePullRequest: GitManagerShape["resolvePullRequest"] = Effect.fn("resolvePullRequest")(
 function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));
 const resolvePullRequest: GitManager["Service"]["resolvePullRequest"] = Effect.fn(
 "resolvePullRequest",
 )(function* (input) {
 const pullRequest = yield* (yield* sourceControlProvider(input.cwd))
 .getChangeRequest({
 cwd: input.cwd,
 reference: normalizePullRequestReference(input.reference),
 })
 .pipe(Effect.map((resolved) => toResolvedPullRequest(resolved)));

 return { pullRequest };
 },
 );
 return { pullRequest };
 });

 const preparePullRequestThread: GitManagerShape["preparePullRequestThread"] = Effect.fn(
 const preparePullRequestThread: GitManager["Service"]["preparePullRequestThread"] = Effect.fn(
 "preparePullRequestThread",
 )(function* (input) {
 const maybeRunSetupScript = (worktreePath: string) => {
Expand DownExpand Up@@ -1608,7 +1605,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 };
 });

 const runStackedAction: GitManagerShape["runStackedAction"] = Effect.fn("runStackedAction")(
 const runStackedAction: GitManager["Service"]["runStackedAction"] = Effect.fn("runStackedAction")(
 function* (input, options) {
 const progress = yield* createProgressEmitter(input, options);
 const currentPhase = yield* Ref.make<Option.Option<GitActionProgressPhase>>(Option.none());
Expand DownExpand Up@@ -1787,7 +1784,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 },
 );

 return {
 return GitManager.of({
 localStatus,
 remoteStatus,
 status,
Expand All@@ -1797,7 +1794,7 @@ export const makeGitManager = Effect.fn("makeGitManager")(function* () {
 resolvePullRequest,
 preparePullRequestThread,
 runStackedAction,
 } satisfies GitManagerShape;
 });
});

export const layer = Layer.effect(GitManager, makeGitManager());
export const layer = Layer.effect(GitManager, make);

4 changes: 3 additions & 1 deletion
apps/server/src/git/GitWorkflowService.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,9 @@ 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: VcsDriverRegistry.VcsDriverRegistryShape["detect"] }) {
function makeLayer(input: {
 readonly detect: VcsDriverRegistry.VcsDriverRegistry["Service"]["detect"];
}) {
 return GitWorkflowService.layer.pipe(
 Layer.provide(
 Layer.mock(VcsDriverRegistry.VcsDriverRegistry)({
Expand Down
Loading
Loading