Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 93 additions & 8 deletions packages/cloud-agents/src/server/__tests__/enqueue-task.test.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 62 additions & 7 deletions packages/cloud-agents/src/server/cloud-agent-workflow.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
ALL_REPOSITORIES,
type TaskSpec,
type TaskSurface,
TaskPayloadKind,
Expand All @@ -12,17 +13,19 @@ import {
getSlackChannelFromTaskPayload,
getSlackTeamDomainFromTaskPayload,
getSlackThreadTsFromTaskPayload,
resolveSourceControlProviderFromPayload,
resolveSourceControlHostFromPayload,
} from '@roomote/types';
import {
type TaskRun,
type RepositorySourceControl,
db,
eq,
tasks,
getBackgroundAgentSettings,
DEFAULT_CONFLICT_RESOLVER_LABEL,
getDeploymentPrAction,
getReviewCodeAutomationSettings,
resolveRepositorySourceControl,
resolveTelegramRuntimeCredentials,
} from '@roomote/db/server';
import { Env } from '@roomote/env';
Expand Down Expand Up @@ -105,6 +108,51 @@ export function resolveStandardTaskSurface({
}
}

export function resolveAggregateSourceControl({
sourceControlProvider,
sourceControlHost,
repositoryProviders,
selectedRepositories,
}: Pick<
TaskSpec['payload'],
| 'sourceControlProvider'
| 'sourceControlHost'
| 'repositoryProviders'
| 'selectedRepositories'
>): RepositorySourceControl | undefined {
if (!sourceControlProvider) {
return undefined;
}

const providers = repositoryProviders
Comment thread
roomote-roomote[bot] marked this conversation as resolved.
? new Set(Object.values(repositoryProviders))
: null;
const selectedRepositoryNames = selectedRepositories
? [...new Set(selectedRepositories)]
: [];
const hasCompleteSelection =
selectedRepositoryNames.length === 0 ||
(Object.keys(repositoryProviders ?? {}).length ===
selectedRepositoryNames.length &&
selectedRepositoryNames.every((repository) =>
Object.hasOwn(repositoryProviders ?? {}, repository),
));

if (
!hasCompleteSelection ||
(providers &&
(providers.size !== 1 || !providers.has(sourceControlProvider)))
) {
return undefined;
}

const host = resolveSourceControlHostFromPayload({ sourceControlHost });
return {
provider: sourceControlProvider,
...(host ? { host } : {}),
};
}

export async function generatePrompt({
taskRun,
taskSpec,
Expand Down Expand Up @@ -149,9 +197,18 @@ export async function generatePrompt({
surface: true,
},
});
const commitAuthor = taskRow
? await resolveRunCommitAuthor(db, taskRun)
: DEFAULT_ROOMOTE_COMMIT_AUTHOR;
const targetSourceControl =
taskSpec.payload.repo === ALL_REPOSITORIES
? resolveAggregateSourceControl(taskSpec.payload)
: await resolveRepositorySourceControl(
db,
taskSpec.payload.repo,
resolveSourceControlHostFromPayload(taskSpec.payload),
);
const commitAuthor =
taskRow && targetSourceControl
? await resolveRunCommitAuthor(db, taskRun, targetSourceControl)
: DEFAULT_ROOMOTE_COMMIT_AUTHOR;
const {
conflictResolverFrequency,
conflictResolverLabel,
Expand Down Expand Up @@ -392,9 +449,7 @@ export async function generatePrompt({
codeReviewsEnabled,
codeReviewReviewOnCommit,
codeReviewReviewDraftPrs,
sourceControlProvider: resolveSourceControlProviderFromPayload(
taskSpec.payload,
),
sourceControlProvider: targetSourceControl?.provider,
prAction,
});

Expand Down
2 changes: 1 addition & 1 deletion packages/cloud-agents/src/server/commit-author.ts
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ export async function resolveRunCommitAuthor(
displayName,
publicDisplayName: username ? `@${username}` : null,
githubLogin: null,
prAssigneeLogin: null,
prAssigneeLogin: sourceControl.provider === 'gitea' ? username : null,
gitAuthor: {
name: displayName,
email: commitEmail,
Expand Down
Loading
Loading