* fix(git): reconcile pull requests after branch changes Treat persisted change-request metadata as a branch-bound hint and prefer current tracking configuration when it identifies the checked-out branch. * fix(git): preserve enterprise fork identity Use branch-bound metadata to supplement the owner when explicit tracking points at the same head on a self-hosted remote. * fix(git): honor local branch upstreams Treat Git remote dot with a merge ref as explicit current tracking so stale PR metadata cannot override a local upstream. * fix(git): own change request branch bindings Centralize persisted hint validation and rebinding so renames preserve change request identity while switches invalidate it, including normalized legacy Enterprise owners. * fix(git): preserve PR identity through workspace renames Resolve the backing worktree root during rename without adding a Git call, and retain fork owner identity from explicit same-name tracking configuration. * fix(git): trust current enterprise fork identity Explicit tracking now derives repository identity from the current remote path, so stale checkout metadata cannot override a repointed fork. * fix(git): recognize enterprise repository aliases GitHub repository identity is case-insensitive. Normalize equality checks so differently cased aliases cannot turn base tracking into a fork lookup. * fix(git): reject ownerless legacy fork matches Owner-qualified legacy hints only belong to their historical owner-prefixed branch names. A later ownerless branch reusing the same head must resolve from current Git state instead. * fix(git): keep fork feature lookups local A feature branch may track the upstream base branch for ancestry even when origin is a fork. Only treat that cross-repository base ref as PR identity when the local branch name identifies the tracked head.
297 lines
9.4 KiB
TypeScript
297 lines
9.4 KiB
TypeScript
import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
|
|
import { isAbsolute, join, resolve } from "path";
|
|
import { z } from "zod";
|
|
|
|
const ChangeRequestLookupTargetSchema = z.object({
|
|
headRef: z.string().min(1),
|
|
headRepositoryOwner: z.string().min(1).optional(),
|
|
changeRequestNumber: z.number().int().positive().optional(),
|
|
localBranchName: z.string().min(1).optional(),
|
|
});
|
|
|
|
const PaseoWorktreeMetadataV1Schema = z.object({
|
|
version: z.literal(1),
|
|
baseRefName: z.string().min(1),
|
|
changeRequestLookupTarget: ChangeRequestLookupTargetSchema.optional(),
|
|
});
|
|
|
|
const PaseoWorktreeMetadataV2Schema = z.object({
|
|
version: z.literal(2),
|
|
baseRefName: z.string().min(1),
|
|
changeRequestLookupTarget: ChangeRequestLookupTargetSchema.optional(),
|
|
firstAgentBranchAutoName: z
|
|
.discriminatedUnion("status", [
|
|
z.object({
|
|
status: z.literal("pending"),
|
|
placeholderBranchName: z.string().min(1),
|
|
}),
|
|
z.object({
|
|
status: z.literal("attempted"),
|
|
placeholderBranchName: z.string().min(1),
|
|
attemptedAt: z.string().min(1),
|
|
}),
|
|
])
|
|
.optional(),
|
|
runtime: z
|
|
.object({
|
|
worktreePort: z.number().int().positive(),
|
|
})
|
|
.optional(),
|
|
});
|
|
|
|
const PaseoWorktreeMetadataSchema = z.union([
|
|
PaseoWorktreeMetadataV1Schema,
|
|
PaseoWorktreeMetadataV2Schema,
|
|
]);
|
|
|
|
export type PaseoWorktreeMetadata = z.infer<typeof PaseoWorktreeMetadataSchema>;
|
|
export type PaseoWorktreeChangeRequestHint = z.infer<typeof ChangeRequestLookupTargetSchema>;
|
|
|
|
export function createPaseoWorktreeChangeRequestHint(
|
|
input: PaseoWorktreeChangeRequestHint,
|
|
): PaseoWorktreeChangeRequestHint {
|
|
return ChangeRequestLookupTargetSchema.parse(input);
|
|
}
|
|
|
|
export function getPaseoWorktreeChangeRequestHintForBranch(
|
|
metadata: PaseoWorktreeMetadata | null,
|
|
currentBranch: string,
|
|
): PaseoWorktreeChangeRequestHint | null {
|
|
const target = metadata?.changeRequestLookupTarget;
|
|
if (!target) {
|
|
return null;
|
|
}
|
|
if (target.localBranchName) {
|
|
return target.localBranchName === currentBranch ? target : null;
|
|
}
|
|
|
|
// COMPAT(change-request-local-branch): metadata before v0.2.5 omitted the
|
|
// local binding; remove after 2027-07-31.
|
|
const canonicalBranches = new Set<string>();
|
|
if (target.headRepositoryOwner) {
|
|
canonicalBranches.add(`${target.headRepositoryOwner}/${target.headRef}`);
|
|
const normalizedOwner = normalizeLegacyGitHubOwnerForBranch(target.headRepositoryOwner);
|
|
if (normalizedOwner) {
|
|
canonicalBranches.add(`${normalizedOwner}/${target.headRef}`);
|
|
}
|
|
} else {
|
|
canonicalBranches.add(target.headRef);
|
|
}
|
|
return canonicalBranches.has(currentBranch) ? target : null;
|
|
}
|
|
|
|
function normalizeLegacyGitHubOwnerForBranch(owner: string): string | null {
|
|
const normalized = owner.trim().toLowerCase();
|
|
return /^[a-z0-9-]+$/.test(normalized) ? normalized : null;
|
|
}
|
|
|
|
export function rebindPaseoWorktreeChangeRequestHint(
|
|
worktreeRoot: string,
|
|
previousBranch: string,
|
|
currentBranch: string,
|
|
): boolean {
|
|
const metadata = readPaseoWorktreeMetadata(worktreeRoot);
|
|
const target = getPaseoWorktreeChangeRequestHintForBranch(metadata, previousBranch);
|
|
if (!metadata || !target) {
|
|
return false;
|
|
}
|
|
|
|
writePaseoWorktreeMetadataFile(worktreeRoot, {
|
|
...metadata,
|
|
changeRequestLookupTarget: {
|
|
...target,
|
|
localBranchName: currentBranch,
|
|
},
|
|
});
|
|
return true;
|
|
}
|
|
|
|
function getGitDirForWorktreeRoot(worktreeRoot: string): string {
|
|
const gitPath = join(worktreeRoot, ".git");
|
|
if (!existsSync(gitPath)) {
|
|
throw new Error(`Not a git repository: ${worktreeRoot}`);
|
|
}
|
|
|
|
// In a worktree checkout, `.git` is a file containing `gitdir: <path>`.
|
|
// In a normal checkout, `.git` is a directory.
|
|
try {
|
|
const gitFileContent = readFileSync(gitPath, "utf8");
|
|
const match = gitFileContent.match(/gitdir:\s*(.+)/);
|
|
if (match?.[1]) {
|
|
const raw = match[1].trim();
|
|
return isAbsolute(raw) ? raw : resolve(worktreeRoot, raw);
|
|
}
|
|
} catch {
|
|
// If `.git` is a directory, readFileSync will throw; fall through.
|
|
}
|
|
|
|
return gitPath;
|
|
}
|
|
|
|
export function getPaseoWorktreeMetadataPath(worktreeRoot: string): string {
|
|
const gitDir = getGitDirForWorktreeRoot(worktreeRoot);
|
|
return join(gitDir, "paseo", "worktree.json");
|
|
}
|
|
|
|
export function normalizeBaseRefName(input: string): string {
|
|
const trimmed = input.trim();
|
|
if (!trimmed) {
|
|
throw new Error("Base branch is required");
|
|
}
|
|
if (trimmed.startsWith("origin/")) {
|
|
return trimmed.slice("origin/".length);
|
|
}
|
|
return trimmed;
|
|
}
|
|
|
|
export function writePaseoWorktreeMetadata(
|
|
worktreeRoot: string,
|
|
options: {
|
|
baseRefName: string;
|
|
changeRequestLookupTarget?: PaseoWorktreeChangeRequestHint;
|
|
},
|
|
): void {
|
|
const baseRefName = normalizeBaseRefName(options.baseRefName);
|
|
if (baseRefName === "HEAD") {
|
|
throw new Error("Base branch cannot be HEAD");
|
|
}
|
|
if (baseRefName.includes("..") || baseRefName.includes("@{")) {
|
|
throw new Error(`Invalid base branch: ${baseRefName}`);
|
|
}
|
|
if (!/^[0-9A-Za-z._/-]+$/.test(baseRefName)) {
|
|
throw new Error(`Invalid base branch: ${baseRefName}`);
|
|
}
|
|
|
|
const metadata: PaseoWorktreeMetadata = {
|
|
version: 1,
|
|
baseRefName,
|
|
...(options.changeRequestLookupTarget
|
|
? { changeRequestLookupTarget: options.changeRequestLookupTarget }
|
|
: {}),
|
|
};
|
|
writePaseoWorktreeMetadataFile(worktreeRoot, metadata);
|
|
}
|
|
|
|
export function writePaseoWorktreeRuntimeMetadata(
|
|
worktreeRoot: string,
|
|
options: { worktreePort: number },
|
|
): void {
|
|
if (!Number.isInteger(options.worktreePort) || options.worktreePort <= 0) {
|
|
throw new Error(`Invalid worktree runtime port: ${options.worktreePort}`);
|
|
}
|
|
|
|
const current = readPaseoWorktreeMetadata(worktreeRoot);
|
|
if (!current) {
|
|
throw new Error("Cannot persist worktree runtime metadata: missing base metadata");
|
|
}
|
|
|
|
const next: PaseoWorktreeMetadata = {
|
|
version: 2,
|
|
baseRefName: current.baseRefName,
|
|
...(current.changeRequestLookupTarget
|
|
? { changeRequestLookupTarget: current.changeRequestLookupTarget }
|
|
: {}),
|
|
...(current.version === 2 && current.firstAgentBranchAutoName
|
|
? { firstAgentBranchAutoName: current.firstAgentBranchAutoName }
|
|
: {}),
|
|
runtime: {
|
|
worktreePort: options.worktreePort,
|
|
},
|
|
};
|
|
writePaseoWorktreeMetadataFile(worktreeRoot, next);
|
|
}
|
|
|
|
export function writePaseoWorktreeFirstAgentBranchAutoNameMetadata(
|
|
worktreeRoot: string,
|
|
options: { placeholderBranchName: string },
|
|
): void {
|
|
const placeholderBranchName = options.placeholderBranchName.trim();
|
|
if (!placeholderBranchName) {
|
|
throw new Error("Placeholder branch name is required");
|
|
}
|
|
|
|
const current = readPaseoWorktreeMetadata(worktreeRoot);
|
|
if (!current) {
|
|
throw new Error("Cannot persist first-agent branch auto-name metadata: missing base metadata");
|
|
}
|
|
|
|
writePaseoWorktreeMetadataFile(worktreeRoot, {
|
|
version: 2,
|
|
baseRefName: current.baseRefName,
|
|
...(current.changeRequestLookupTarget
|
|
? { changeRequestLookupTarget: current.changeRequestLookupTarget }
|
|
: {}),
|
|
firstAgentBranchAutoName: {
|
|
status: "pending",
|
|
placeholderBranchName,
|
|
},
|
|
...(current.version === 2 && current.runtime ? { runtime: current.runtime } : {}),
|
|
});
|
|
}
|
|
|
|
export function markPaseoWorktreeFirstAgentBranchAutoNameAttempted(
|
|
worktreeRoot: string,
|
|
options: { attemptedAt?: string } = {},
|
|
): PaseoWorktreeMetadata | null {
|
|
const current = readPaseoWorktreeMetadata(worktreeRoot);
|
|
if (!current || current.version !== 2 || current.firstAgentBranchAutoName?.status !== "pending") {
|
|
return current;
|
|
}
|
|
|
|
const next: PaseoWorktreeMetadata = {
|
|
version: 2,
|
|
baseRefName: current.baseRefName,
|
|
...(current.changeRequestLookupTarget
|
|
? { changeRequestLookupTarget: current.changeRequestLookupTarget }
|
|
: {}),
|
|
firstAgentBranchAutoName: {
|
|
status: "attempted",
|
|
placeholderBranchName: current.firstAgentBranchAutoName.placeholderBranchName,
|
|
attemptedAt: options.attemptedAt ?? new Date().toISOString(),
|
|
},
|
|
...(current.runtime ? { runtime: current.runtime } : {}),
|
|
};
|
|
writePaseoWorktreeMetadataFile(worktreeRoot, next);
|
|
return next;
|
|
}
|
|
|
|
export function readPaseoWorktreeMetadata(worktreeRoot: string): PaseoWorktreeMetadata | null {
|
|
const metadataPath = getPaseoWorktreeMetadataPath(worktreeRoot);
|
|
if (!existsSync(metadataPath)) {
|
|
return null;
|
|
}
|
|
const parsed = JSON.parse(readFileSync(metadataPath, "utf8"));
|
|
return PaseoWorktreeMetadataSchema.parse(parsed);
|
|
}
|
|
|
|
export function requirePaseoWorktreeBaseRefName(worktreeRoot: string): string {
|
|
const metadataPath = getPaseoWorktreeMetadataPath(worktreeRoot);
|
|
const metadata = readPaseoWorktreeMetadata(worktreeRoot);
|
|
if (!metadata) {
|
|
throw new Error(`Missing Paseo worktree base metadata: ${metadataPath}`);
|
|
}
|
|
return metadata.baseRefName;
|
|
}
|
|
|
|
export function readPaseoWorktreeRuntimePort(worktreeRoot: string): number | null {
|
|
const metadata = readPaseoWorktreeMetadata(worktreeRoot);
|
|
if (!metadata) {
|
|
return null;
|
|
}
|
|
if (metadata.version === 2 && metadata.runtime?.worktreePort) {
|
|
return metadata.runtime.worktreePort;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function writePaseoWorktreeMetadataFile(
|
|
worktreeRoot: string,
|
|
metadata: PaseoWorktreeMetadata,
|
|
): void {
|
|
const metadataPath = getPaseoWorktreeMetadataPath(worktreeRoot);
|
|
mkdirSync(join(getGitDirForWorktreeRoot(worktreeRoot), "paseo"), { recursive: true });
|
|
const tempPath = `${metadataPath}.${process.pid}.${Date.now()}.tmp`;
|
|
writeFileSync(tempPath, `${JSON.stringify(metadata, null, 2)}\n`, "utf8");
|
|
renameSync(tempPath, metadataPath);
|
|
}
|