* refactor(forge): forge-neutral foundation (GitHub-only) Decouple git-hosting from GitHub behind a neutral abstraction (issue #1616), GitHub-only for now; existing GitHub behaviour is unchanged. - Forge manifest, neutral ForgeService contract, forge registry + resolver, and a client forge-module registry. - GitHub code renamed to the neutral shape; PR/Issue attachment wording preserved. - forge.search.response enums parse tolerantly (unknown kind/auth state degrade instead of breaking the client). - createPullRequest reports typed CLI/auth errors instead of a generic message. - forge-resolver host/remote caches are LRU-bounded. - Forge host trust is explicit: only a known cloud host or a CLI-authenticated host is ever talked to; an unauthenticated GitHub Enterprise host fails resolution instead of routing to github.com. - Docs: forge-providers guide, glossary and i18n forge-copy conventions, architecture and rpc-namespacing terminology. - Vitest React Native mocks (unistyles, svg, linking, lucide) consolidated into shared aliased test-stubs. * feat(forge): GitLab adapter, forge-aware UI, pipelines and approvals GitLab adapter over the glab CLI on the neutral contracts: MR status, forge-aware UI, pipeline tree, and N-of-M approvals. - threadIsResolved is part of the neutral timeline item. - Pipeline load failures show an error instead of an empty section. - Manual pipeline jobs render as pending. - Fork/detached MR head pipelines are fetched by MR iid (glab ci get --merge-request). * feat(forge): Gitea family adapter (Gitea, Forgejo, Codeberg) One adapter over the tea CLI serving Gitea, Forgejo, and Codeberg on the neutral contracts. - CI status aggregates commit statuses and Actions runs together. - Gitea's terminal "warning" state maps to failure on server and client. - Gitea Actions check details are reachable from the PR pane by workflowRunId. * refactor(forge): localize compatibility handling * test(forge): expect normalized GitLab facts --------- Co-authored-by: Mohamed Boudra <boudra.moha@gmail.com>
379 lines
11 KiB
TypeScript
379 lines
11 KiB
TypeScript
import type { CheckoutPrMergeMethod } from "@getpaseo/protocol/messages";
|
|
import { create } from "zustand";
|
|
import { queryClient as appQueryClient } from "@/data/query-client";
|
|
import { useSessionStore } from "@/stores/session-store";
|
|
import { invalidateCheckoutGitQueriesForClient } from "@/git/query-keys";
|
|
import { i18n } from "@/i18n/i18next";
|
|
|
|
const SUCCESS_DISPLAY_MS = 1000;
|
|
|
|
export type CheckoutGitActionStatus = "idle" | "pending" | "success";
|
|
|
|
export type CheckoutGitAsyncActionId =
|
|
| "commit"
|
|
| "pull"
|
|
| "push"
|
|
| "pull-and-push"
|
|
| "refresh"
|
|
| "create-pr"
|
|
| "merge-pr-squash"
|
|
| "merge-pr-merge"
|
|
| "merge-pr-rebase"
|
|
| "enable-pr-auto-merge-squash"
|
|
| "enable-pr-auto-merge-merge"
|
|
| "enable-pr-auto-merge-rebase"
|
|
| "disable-pr-auto-merge"
|
|
| "merge-branch"
|
|
| "merge-from-base";
|
|
|
|
type CheckoutKey = string;
|
|
type StatusMap = Partial<Record<CheckoutGitAsyncActionId, CheckoutGitActionStatus>>;
|
|
|
|
function checkoutKey(serverId: string, cwd: string): CheckoutKey {
|
|
return `${serverId}::${cwd}`;
|
|
}
|
|
|
|
function resolveClient(serverId: string) {
|
|
const session = useSessionStore.getState().sessions[serverId];
|
|
const client = session?.client ?? null;
|
|
if (!client) {
|
|
throw new Error(i18n.t("common.errors.daemonClientUnavailable"));
|
|
}
|
|
return client;
|
|
}
|
|
|
|
type AutoMergeActionsRpc = "forge" | "github";
|
|
|
|
function resolveAutoMergeActionsRpc(serverId: string): AutoMergeActionsRpc {
|
|
const session = useSessionStore.getState().sessions[serverId];
|
|
if (session?.serverInfo?.features?.checkoutForgeSetAutoMerge === true) {
|
|
return "forge";
|
|
}
|
|
// COMPAT(githubAutoMergeRpc): added in v0.1.106, remove after 2026-12-28 once
|
|
// all supported clients use checkout.forge.set_auto_merge.*.
|
|
if (session?.serverInfo?.features?.checkoutGithubSetAutoMerge === true) {
|
|
return "github";
|
|
}
|
|
throw new Error("Update the host to use auto-merge actions.");
|
|
}
|
|
|
|
function setStatus(
|
|
key: CheckoutKey,
|
|
actionId: CheckoutGitAsyncActionId,
|
|
status: CheckoutGitActionStatus,
|
|
) {
|
|
useCheckoutGitActionsStore.setState((state) => {
|
|
const current = state.statusByCheckout[key]?.[actionId] ?? "idle";
|
|
if (current === status) {
|
|
return state;
|
|
}
|
|
return {
|
|
...state,
|
|
statusByCheckout: {
|
|
...state.statusByCheckout,
|
|
[key]: {
|
|
...state.statusByCheckout[key],
|
|
[actionId]: status,
|
|
},
|
|
},
|
|
};
|
|
});
|
|
}
|
|
|
|
function invalidateCheckoutGitQueries(serverId: string, cwd: string) {
|
|
return invalidateCheckoutGitQueriesForClient(appQueryClient, { serverId, cwd });
|
|
}
|
|
|
|
const successTimers = new Map<string, ReturnType<typeof setTimeout>>();
|
|
const inFlight = new Map<string, Promise<unknown>>();
|
|
|
|
function inFlightKey(key: CheckoutKey, actionId: CheckoutGitAsyncActionId): string {
|
|
return `${key}::${actionId}`;
|
|
}
|
|
|
|
interface CheckoutGitActionsStoreState {
|
|
statusByCheckout: Record<CheckoutKey, StatusMap>;
|
|
|
|
getStatus: (params: {
|
|
serverId: string;
|
|
cwd: string;
|
|
actionId: CheckoutGitAsyncActionId;
|
|
}) => CheckoutGitActionStatus;
|
|
|
|
commit: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
pull: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
push: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
pullAndPush: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
refresh: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
createPr: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
mergePr: (params: {
|
|
serverId: string;
|
|
cwd: string;
|
|
method: CheckoutPrMergeMethod;
|
|
}) => Promise<void>;
|
|
enablePrAutoMerge: (params: {
|
|
serverId: string;
|
|
cwd: string;
|
|
method: CheckoutPrMergeMethod;
|
|
}) => Promise<void>;
|
|
disablePrAutoMerge: (params: { serverId: string; cwd: string }) => Promise<void>;
|
|
mergeBranch: (params: { serverId: string; cwd: string; baseRef: string }) => Promise<void>;
|
|
mergeFromBase: (params: { serverId: string; cwd: string; baseRef: string }) => Promise<void>;
|
|
}
|
|
|
|
async function runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId,
|
|
run,
|
|
}: {
|
|
serverId: string;
|
|
cwd: string;
|
|
actionId: CheckoutGitAsyncActionId;
|
|
run: () => Promise<void>;
|
|
}): Promise<void> {
|
|
const key = checkoutKey(serverId, cwd);
|
|
const inflightId = inFlightKey(key, actionId);
|
|
|
|
const existing = inFlight.get(inflightId);
|
|
if (existing) {
|
|
await existing;
|
|
return;
|
|
}
|
|
|
|
const prevTimer = successTimers.get(inflightId);
|
|
if (prevTimer) {
|
|
clearTimeout(prevTimer);
|
|
successTimers.delete(inflightId);
|
|
}
|
|
|
|
setStatus(key, actionId, "pending");
|
|
|
|
const promise = (async () => {
|
|
try {
|
|
await run();
|
|
await invalidateCheckoutGitQueries(serverId, cwd);
|
|
setStatus(key, actionId, "success");
|
|
const timer = setTimeout(() => {
|
|
setStatus(key, actionId, "idle");
|
|
successTimers.delete(inflightId);
|
|
}, SUCCESS_DISPLAY_MS);
|
|
successTimers.set(inflightId, timer);
|
|
} catch (error) {
|
|
setStatus(key, actionId, "idle");
|
|
throw error;
|
|
} finally {
|
|
inFlight.delete(inflightId);
|
|
}
|
|
})();
|
|
|
|
inFlight.set(inflightId, promise);
|
|
await promise;
|
|
}
|
|
|
|
export const useCheckoutGitActionsStore = create<CheckoutGitActionsStoreState>()((set, get) => ({
|
|
statusByCheckout: {},
|
|
|
|
getStatus: ({ serverId, cwd, actionId }) => {
|
|
const key = checkoutKey(serverId, cwd);
|
|
return get().statusByCheckout[key]?.[actionId] ?? "idle";
|
|
},
|
|
|
|
commit: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "commit",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutCommit(cwd, { addAll: true });
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
pull: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "pull",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutPull(cwd);
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
push: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "push",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutPush(cwd);
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
refresh: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "refresh",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutRefresh(cwd);
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
pullAndPush: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "pull-and-push",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const pullPayload = await client.checkoutPull(cwd);
|
|
if (pullPayload.error) {
|
|
throw new Error(pullPayload.error.message);
|
|
}
|
|
const pushPayload = await client.checkoutPush(cwd);
|
|
if (pushPayload.error) {
|
|
throw new Error(pushPayload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
createPr: async ({ serverId, cwd }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "create-pr",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutPrCreate(cwd, {});
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
mergePr: async ({ serverId, cwd, method }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: `merge-pr-${method}`,
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutPrMerge(cwd, { method });
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
enablePrAutoMerge: async ({ serverId, cwd, method }) => {
|
|
const rpc = resolveAutoMergeActionsRpc(serverId);
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: `enable-pr-auto-merge-${method}`,
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
// COMPAT(githubAutoMergeRpc): added in v0.1.106, remove after 2026-12-28 once
|
|
// all supported clients use checkout.forge.set_auto_merge.*.
|
|
const payload =
|
|
rpc === "forge"
|
|
? await client.checkoutForgeSetAutoMerge(cwd, { enabled: true, method })
|
|
: await client.checkoutGithubSetAutoMerge(cwd, { enabled: true, method });
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
disablePrAutoMerge: async ({ serverId, cwd }) => {
|
|
const rpc = resolveAutoMergeActionsRpc(serverId);
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "disable-pr-auto-merge",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
// COMPAT(githubAutoMergeRpc): added in v0.1.106, remove after 2026-12-28 once
|
|
// all supported clients use checkout.forge.set_auto_merge.*.
|
|
const payload =
|
|
rpc === "forge"
|
|
? await client.checkoutForgeSetAutoMerge(cwd, { enabled: false })
|
|
: await client.checkoutGithubSetAutoMerge(cwd, { enabled: false });
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
mergeBranch: async ({ serverId, cwd, baseRef }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "merge-branch",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutMerge(cwd, {
|
|
baseRef,
|
|
strategy: "merge",
|
|
requireCleanTarget: true,
|
|
});
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
|
|
mergeFromBase: async ({ serverId, cwd, baseRef }) => {
|
|
await runCheckoutAction({
|
|
serverId,
|
|
cwd,
|
|
actionId: "merge-from-base",
|
|
run: async () => {
|
|
const client = resolveClient(serverId);
|
|
const payload = await client.checkoutMergeFromBase(cwd, {
|
|
baseRef,
|
|
requireCleanTarget: true,
|
|
});
|
|
if (payload.error) {
|
|
throw new Error(payload.error.message);
|
|
}
|
|
},
|
|
});
|
|
},
|
|
}));
|
|
|
|
export function __resetCheckoutGitActionsStoreForTests() {
|
|
for (const timer of successTimers.values()) {
|
|
clearTimeout(timer);
|
|
}
|
|
successTimers.clear();
|
|
inFlight.clear();
|
|
useCheckoutGitActionsStore.setState({ statusByCheckout: {} });
|
|
}
|