* feat(checkout): merge PR action with real-GitHub e2e test Adds a `checkoutPrMerge` server RPC backed by `gh pr merge` (squash, merge, or rebase) and surfaces three new actions in the git-actions menu — "Squash and merge", "Create a merge commit", "Rebase and merge" — with squash taking the primary slot when a PR is open and mergeable. Also renames the existing local merge action to "Merge locally" to disambiguate it from the new GitHub-side merge. Adds an end-to-end test that creates a real temporary GitHub repo, opens a PR via the daemon, polls until mergeable, calls `checkoutPrMerge`, and verifies the merge landed on `main` — no mocks. The test pre-flights the `delete_repo` scope so it skips cleanly on tokens that can't tear down, and fails loud if cleanup ever errors so we don't leak repos. PR status gains an optional `mergeable` field (`MERGEABLE | CONFLICTING | UNKNOWN`) populated from `gh pr view --json mergeable`. The schema is backward compatible — old payloads without the field still parse and default to `UNKNOWN` via `z.catch`. * Update PR status snapshot expectations * refactor: collect git/checkout/PR feature into packages/app/src/git/ Move 21 git/checkout/PR files out of components/, hooks/, stores/, screens/, utils/ flat-peer slop into a single packages/app/src/git/ module with shrunk filenames (git-diff-pane.tsx -> diff-pane.tsx, use-git-actions.ts -> use-actions.ts, etc). Dedupe: drop the duplicate useGitActionHandlers from diff-pane.tsx — the shared useGitActions hook is the single source. Drop the buildGitActionsForPane wrapper. Collapse the merge-PR triple fan-out (mergePrSquash/Merge/RebaseStatus) into one record keyed by CheckoutPrMergeMethod. Streamline server-side single-use helpers (dispatchStash/PullRequestMessage adapters, GitHubPullRequestMergeError wrapper, legacy worktree test helpers). Schema-additive only: messages.ts exports CheckoutPrMergeMethod and PullRequestMergeable types; daemon-client.ts uses the typed alias. Backward-compatible. Net delta: 43 files, +219/-1212. * fix(app): use GitHub icon for all merge-PR menu actions * test: namespace temp GitHub repos under `paseotmp-` and centralize naming Old prefixes (`paseo-checkout-ship-`, `paseo-e2e-`, `paseo-checkout-pr-merge-`) collided with the `paseo-*` namespace of real repos, making bulk cleanup unsafe. Switch every test that creates real GitHub repos to a single unmistakable `paseotmp-` prefix, owned by one shared helper per test boundary so no caller can name a repo outside the namespace. - New `packages/server/src/server/test-utils/temp-github-repo.ts` exports `TEMP_GITHUB_REPO_PREFIX` + `createTempGithubRepoName(category)`; both server e2e tests (checkout-ship, checkout-pr-merge) consume it. - `packages/app/e2e/helpers/github-fixtures.ts` locks the prefix internally and now requires callers to pass a `category` instead of an arbitrary `prefix`. Updated pr-pane and composer-attachments specs accordingly.
70 lines
2.1 KiB
TypeScript
70 lines
2.1 KiB
TypeScript
import type { CheckoutStatusPayload } from "@/git/use-status-query";
|
|
import {
|
|
parseHostWorkspaceOpenIntentFromPathname,
|
|
parseHostAgentRouteFromPathname,
|
|
parseHostWorkspaceRouteFromPathname,
|
|
} from "@/utils/host-routes";
|
|
|
|
export function parseAgentKey(
|
|
key: string | null | undefined,
|
|
): { serverId: string; agentId: string } | null {
|
|
if (!key) {
|
|
return null;
|
|
}
|
|
const sep = key.lastIndexOf(":");
|
|
if (sep <= 0 || sep >= key.length - 1) {
|
|
return null;
|
|
}
|
|
const serverId = key.slice(0, sep).trim();
|
|
const agentId = key.slice(sep + 1).trim();
|
|
if (!serverId || !agentId) {
|
|
return null;
|
|
}
|
|
return { serverId, agentId };
|
|
}
|
|
|
|
export function resolveSelectedAgentForNewAgent(input: {
|
|
pathname: string;
|
|
selectedAgentId?: string;
|
|
}): { serverId: string; agentId: string } | null {
|
|
const workspaceRoute = parseHostWorkspaceRouteFromPathname(input.pathname);
|
|
const openIntent = parseHostWorkspaceOpenIntentFromPathname(input.pathname);
|
|
if (workspaceRoute && openIntent?.kind === "agent") {
|
|
const agentId = openIntent.agentId.trim();
|
|
if (agentId) {
|
|
return { serverId: workspaceRoute.serverId, agentId };
|
|
}
|
|
}
|
|
return parseHostAgentRouteFromPathname(input.pathname) ?? parseAgentKey(input.selectedAgentId);
|
|
}
|
|
|
|
function inferMainRepoRootFromPaseoWorktreePath(cwd: string): string | null {
|
|
const normalizedPath = cwd.replace(/\\/g, "/");
|
|
const marker = "/.paseo/worktrees";
|
|
const markerIndex = normalizedPath.indexOf(marker);
|
|
if (markerIndex <= 0) {
|
|
return null;
|
|
}
|
|
const markerEnd = markerIndex + marker.length;
|
|
const nextChar = normalizedPath[markerEnd];
|
|
if (nextChar && nextChar !== "/") {
|
|
return null;
|
|
}
|
|
const inferred = cwd.slice(0, markerIndex).replace(/[\\/]+$/, "");
|
|
return inferred.trim() ? inferred : null;
|
|
}
|
|
|
|
export function resolveNewAgentWorkingDir(
|
|
cwd: string,
|
|
checkout: CheckoutStatusPayload | null,
|
|
): string {
|
|
const explicitMainRepoRoot = checkout?.isPaseoOwnedWorktree
|
|
? checkout.mainRepoRoot?.trim() || null
|
|
: null;
|
|
if (explicitMainRepoRoot) {
|
|
return explicitMainRepoRoot;
|
|
}
|
|
|
|
return inferMainRepoRootFromPaseoWorktreePath(cwd) ?? cwd;
|
|
}
|