fix(server): self-heal execution workspaces whose recorded branch no longer exists (#10578)
## Thinking Path > - Paperclip is the open source app people use to manage AI agents for work > - Each agent task gets an execution workspace (a git worktree) with a recorded branch name; workspace validation compares that record to the worktree before every run > - Agents sometimes rename their task branch (for example to a `feat/*` PR branch), so the recorded branch never existed or was deleted > - Validation then fails every run with "expected branch does not exist" — a deterministic `workspace_validation_failed` loop with no self-heal path > - A recorded branch with no resolvable commit has nothing to lose, so adopting a clean, registered checked-out branch is trivially forward-only > - This pull request routes that exact case through the existing audited forward-reconciliation path, in both the runtime and the manual board reconcile endpoint > - The benefit is that these stranded workspaces heal themselves while dirty worktrees, detached HEADs, unregistered paths, and ambiguous git states all stay fail-closed ## Linked Issues or Issue Description No public GitHub issue exists; the underlying bug is described here per `bug_report.yml`. Related PR: #10574 self-heals the sibling provisioning failure loop uncovered by the same incident diagnosis. **What happened?** An execution workspace whose recorded branch was renamed away failed every subsequent run with `workspace_validation_failed` ("expected branch does not exist"). The safe-repair matrix refused the case, so the task stayed blocked until a human intervened. **Expected behavior** When the recorded branch is confirmed absent and the worktree is clean and registered with its checked-out branch matching HEAD, Paperclip adopts the checked-out branch through the audited forward-reconciliation path and the next run proceeds. **Steps to reproduce** In an isolated workspace, rename the task branch (`git branch -m <recorded> feat/something`) or delete the recorded branch, leave the worktree clean, then start a new run on the task. Validation fails on every retry. **Paperclip version or commit** master as of the branch point of this PR. **Deployment mode** Local trusted deployment with git-worktree isolated workspaces. ## What Changed - `ensureGitWorktreeBranchCoherent` (workspace runtime): a missing recorded branch with a clean worktree, an existing checked-out branch, and a registered branch matching HEAD now goes through audited forward reconciliation instead of failing closed. Gated behind `enableWorkspaceBranchReconcileForward`. - `reconcileExecutionWorkspaceBranch` mode `forward` (service): accepts the same case so the board reconcile endpoint can repair it manually. - The service inspection now classifies each branch ref as `resolved` / `missing` / `error` (`git rev-parse --verify --quiet`, distinguishing an absent ref from git failing to inspect the repo). Adoption requires a confirmed-missing recorded ref **and** a resolved target ref, so a git error can never bypass ancestry validation and a nonexistent branch name is never persisted. - Removed the test that asserted this case fails closed; it is superseded by tests that assert the new behavior. - New tests: successful adoption, dirty-worktree refusal, refusal when the checked-out branch ref does not resolve either, and disabled-flag behavior. ## Verification - `server`: `npx vitest run src/__tests__/execution-workspaces-service.test.ts -t "reconcil"` — 11 passed. - `server`: `npx vitest run src/__tests__/workspace-runtime.test.ts -t "adopt"` — 7 passed. - `npx tsc --noEmit` in `server/` is clean. - Manually validated the underlying repair on a live stranded workspace before automating it: creating the recorded branch at the clean HEAD ended the validation-failure loop without touching the agent's PR branch. ## Risks - The change relaxes a fail-closed gate, so the main risk is over-adoption. Mitigations: the exception requires flag-on, clean worktree, registered worktree path, registered branch matching HEAD, a confirmed-missing (not merely unreadable) recorded ref, and a resolvable target ref; everything else still fails closed. Every adoption goes through the audited reconcile path with an issue comment trail. - No migrations, no API surface changes (the reconcile route returns the same hand-picked fields). ## Model Used Claude Fable 5 (Anthropic, model ID `claude-fable-5`), extended thinking, agentic tool use (Claude Code harness). ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with `Fixes: #` / `Closes #` / `Refs #` OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip` URLs) - [x] My branch name describes the change (e.g. `docs/...`, `fix/...`) and contains no internal Paperclip ticket id or instance-derived details - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [ ] All Paperclip CI gates are green - [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Dotta
GitHub
parent
79eff0aea1
commit
32c1a8576c
|
|
@ -631,6 +631,228 @@ describeEmbeddedPostgres("executionWorkspaceService.getCloseReadiness", () => {
|
|||
});
|
||||
}, 20_000);
|
||||
|
||||
it("reconciles forward when the recorded branch has no resolvable commit and the worktree is clean", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
tempDirs.add(repoRoot);
|
||||
const worktreePath = path.join(path.dirname(repoRoot), `paperclip-missing-recorded-${randomUUID()}`);
|
||||
tempDirs.add(worktreePath);
|
||||
|
||||
await runGit(repoRoot, ["worktree", "add", "-b", "feature/current", worktreePath, "HEAD"]);
|
||||
await fs.writeFile(path.join(worktreePath, "feature.txt"), "current branch\n", "utf8");
|
||||
await runGit(worktreePath, ["add", "feature.txt"]);
|
||||
await runGit(worktreePath, ["commit", "-m", "Current branch work"]);
|
||||
|
||||
const companyId = randomUUID();
|
||||
const projectId = randomUUID();
|
||||
const issueId = randomUUID();
|
||||
const executionWorkspaceId = randomUUID();
|
||||
|
||||
await db.insert(companies).values({
|
||||
id: companyId,
|
||||
name: "Paperclip",
|
||||
issuePrefix: "PAP",
|
||||
requireBoardApprovalForNewAgents: false,
|
||||
});
|
||||
await db.insert(projects).values({
|
||||
id: projectId,
|
||||
companyId,
|
||||
name: "Missing recorded branch",
|
||||
status: "in_progress",
|
||||
});
|
||||
await db.insert(issues).values({
|
||||
id: issueId,
|
||||
companyId,
|
||||
projectId,
|
||||
title: "Source task",
|
||||
identifier: "PAP-124",
|
||||
status: "blocked",
|
||||
priority: "medium",
|
||||
});
|
||||
await db.insert(executionWorkspaces).values({
|
||||
id: executionWorkspaceId,
|
||||
companyId,
|
||||
projectId,
|
||||
sourceIssueId: issueId,
|
||||
mode: "isolated_workspace",
|
||||
strategyType: "git_worktree",
|
||||
name: "feature/never-created",
|
||||
status: "idle",
|
||||
providerType: "git_worktree",
|
||||
cwd: worktreePath,
|
||||
providerRef: worktreePath,
|
||||
branchName: "feature/never-created",
|
||||
baseRef: "main",
|
||||
});
|
||||
|
||||
const result = await svc.reconcileExecutionWorkspaceBranch(executionWorkspaceId, {
|
||||
mode: "forward",
|
||||
reason: null,
|
||||
actor: {
|
||||
actorType: "user",
|
||||
actorId: "local-board",
|
||||
agentId: null,
|
||||
runId: null,
|
||||
},
|
||||
});
|
||||
|
||||
expect(result.workspace.branchName).toBe("feature/current");
|
||||
expect(result.workspace.name).toBe("feature/current");
|
||||
expect(result.inspection).toMatchObject({
|
||||
fromBranch: "feature/never-created",
|
||||
toBranch: "feature/current",
|
||||
fromSha: null,
|
||||
ancestryVerdict: "unknown",
|
||||
cleanliness: "clean",
|
||||
});
|
||||
|
||||
const [comment] = await db
|
||||
.select()
|
||||
.from(issueComments)
|
||||
.where(eq(issueComments.issueId, issueId));
|
||||
expect(comment?.body).toContain("Execution workspace branch reconciled.");
|
||||
expect(comment?.body).toContain("- From branch: `feature/never-created`");
|
||||
expect(comment?.body).toContain("- To branch: `feature/current`");
|
||||
}, 20_000);
|
||||
|
||||
it("keeps forward reconciliation fail-closed when the recorded branch is missing but the worktree is dirty", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
tempDirs.add(repoRoot);
|
||||
const worktreePath = path.join(path.dirname(repoRoot), `paperclip-missing-recorded-dirty-${randomUUID()}`);
|
||||
tempDirs.add(worktreePath);
|
||||
|
||||
await runGit(repoRoot, ["worktree", "add", "-b", "feature/current", worktreePath, "HEAD"]);
|
||||
await fs.writeFile(path.join(worktreePath, "uncommitted.txt"), "dirty work\n", "utf8");
|
||||
|
||||
const companyId = randomUUID();
|
||||
const projectId = randomUUID();
|
||||
const issueId = randomUUID();
|
||||
const executionWorkspaceId = randomUUID();
|
||||
|
||||
await db.insert(companies).values({
|
||||
id: companyId,
|
||||
name: "Paperclip",
|
||||
issuePrefix: "PAP",
|
||||
requireBoardApprovalForNewAgents: false,
|
||||
});
|
||||
await db.insert(projects).values({
|
||||
id: projectId,
|
||||
companyId,
|
||||
name: "Missing recorded branch dirty",
|
||||
status: "in_progress",
|
||||
});
|
||||
await db.insert(issues).values({
|
||||
id: issueId,
|
||||
companyId,
|
||||
projectId,
|
||||
title: "Source task",
|
||||
identifier: "PAP-125",
|
||||
status: "blocked",
|
||||
priority: "medium",
|
||||
});
|
||||
await db.insert(executionWorkspaces).values({
|
||||
id: executionWorkspaceId,
|
||||
companyId,
|
||||
projectId,
|
||||
sourceIssueId: issueId,
|
||||
mode: "isolated_workspace",
|
||||
strategyType: "git_worktree",
|
||||
name: "feature/never-created",
|
||||
status: "idle",
|
||||
providerType: "git_worktree",
|
||||
cwd: worktreePath,
|
||||
providerRef: worktreePath,
|
||||
branchName: "feature/never-created",
|
||||
baseRef: "main",
|
||||
});
|
||||
|
||||
await expect(svc.reconcileExecutionWorkspaceBranch(executionWorkspaceId, {
|
||||
mode: "forward",
|
||||
reason: null,
|
||||
actor: {
|
||||
actorType: "user",
|
||||
actorId: "local-board",
|
||||
agentId: null,
|
||||
runId: null,
|
||||
},
|
||||
})).rejects.toMatchObject({
|
||||
status: 422,
|
||||
message: expect.stringContaining("requires the recorded branch to be an ancestor"),
|
||||
});
|
||||
}, 20_000);
|
||||
|
||||
it("keeps forward reconciliation fail-closed when the checked-out branch ref does not resolve either", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
tempDirs.add(repoRoot);
|
||||
const worktreePath = path.join(path.dirname(repoRoot), `paperclip-missing-both-refs-${randomUUID()}`);
|
||||
tempDirs.add(worktreePath);
|
||||
|
||||
// An empty tree keeps the worktree clean even after its branch ref is
|
||||
// deleted, so this exercises the adoption gate rather than cleanliness.
|
||||
const emptyTreeSha = (await readGit(repoRoot, ["hash-object", "-t", "tree", "/dev/null"]))!;
|
||||
const emptyCommitSha = (await readGit(repoRoot, ["commit-tree", emptyTreeSha, "-m", "empty base"]))!;
|
||||
await runGit(repoRoot, ["branch", "empty-base", emptyCommitSha]);
|
||||
await runGit(repoRoot, ["worktree", "add", "-b", "feature/current", worktreePath, "empty-base"]);
|
||||
// Deleting the local ref while it is checked out leaves symbolic-ref still
|
||||
// reporting the branch name even though nothing resolves to a commit.
|
||||
await runGit(repoRoot, ["update-ref", "-d", "refs/heads/feature/current"]);
|
||||
|
||||
const companyId = randomUUID();
|
||||
const projectId = randomUUID();
|
||||
const issueId = randomUUID();
|
||||
const executionWorkspaceId = randomUUID();
|
||||
|
||||
await db.insert(companies).values({
|
||||
id: companyId,
|
||||
name: "Paperclip",
|
||||
issuePrefix: "PAP",
|
||||
requireBoardApprovalForNewAgents: false,
|
||||
});
|
||||
await db.insert(projects).values({
|
||||
id: projectId,
|
||||
companyId,
|
||||
name: "Missing both branch refs",
|
||||
status: "in_progress",
|
||||
});
|
||||
await db.insert(issues).values({
|
||||
id: issueId,
|
||||
companyId,
|
||||
projectId,
|
||||
title: "Source task",
|
||||
identifier: "PAP-126",
|
||||
status: "blocked",
|
||||
priority: "medium",
|
||||
});
|
||||
await db.insert(executionWorkspaces).values({
|
||||
id: executionWorkspaceId,
|
||||
companyId,
|
||||
projectId,
|
||||
sourceIssueId: issueId,
|
||||
mode: "isolated_workspace",
|
||||
strategyType: "git_worktree",
|
||||
name: "feature/never-created",
|
||||
status: "idle",
|
||||
providerType: "git_worktree",
|
||||
cwd: worktreePath,
|
||||
providerRef: worktreePath,
|
||||
branchName: "feature/never-created",
|
||||
baseRef: "main",
|
||||
});
|
||||
|
||||
await expect(svc.reconcileExecutionWorkspaceBranch(executionWorkspaceId, {
|
||||
mode: "forward",
|
||||
reason: null,
|
||||
actor: {
|
||||
actorType: "user",
|
||||
actorId: "local-board",
|
||||
agentId: null,
|
||||
runId: null,
|
||||
},
|
||||
})).rejects.toMatchObject({
|
||||
status: 422,
|
||||
message: expect.stringContaining("requires the recorded branch to be an ancestor"),
|
||||
});
|
||||
}, 20_000);
|
||||
|
||||
it("quarantine_restore rescues dirty live-branch work, resolves recovery, and returns the source issue to todo", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
tempDirs.add(repoRoot);
|
||||
|
|
@ -2042,81 +2264,6 @@ describeEmbeddedPostgres("executionWorkspaceService.getCloseReadiness", () => {
|
|||
expect(comments).toHaveLength(0);
|
||||
}, 20_000);
|
||||
|
||||
it("rejects forward branch reconciliation when branch ancestry is unknown", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
tempDirs.add(repoRoot);
|
||||
const worktreePath = path.join(path.dirname(repoRoot), `paperclip-unknown-${randomUUID()}`);
|
||||
tempDirs.add(worktreePath);
|
||||
|
||||
await runGit(repoRoot, ["branch", "feature/current"]);
|
||||
await runGit(repoRoot, ["worktree", "add", worktreePath, "feature/current"]);
|
||||
|
||||
const companyId = randomUUID();
|
||||
const projectId = randomUUID();
|
||||
const issueId = randomUUID();
|
||||
const executionWorkspaceId = randomUUID();
|
||||
|
||||
await db.insert(companies).values({
|
||||
id: companyId,
|
||||
name: "Paperclip",
|
||||
issuePrefix: "PAP",
|
||||
requireBoardApprovalForNewAgents: false,
|
||||
});
|
||||
await db.insert(projects).values({
|
||||
id: projectId,
|
||||
companyId,
|
||||
name: "Branch reconcile",
|
||||
status: "in_progress",
|
||||
});
|
||||
await db.insert(issues).values({
|
||||
id: issueId,
|
||||
companyId,
|
||||
projectId,
|
||||
title: "Source task",
|
||||
status: "blocked",
|
||||
priority: "medium",
|
||||
});
|
||||
await db.insert(executionWorkspaces).values({
|
||||
id: executionWorkspaceId,
|
||||
companyId,
|
||||
projectId,
|
||||
sourceIssueId: issueId,
|
||||
mode: "isolated_workspace",
|
||||
strategyType: "git_worktree",
|
||||
name: "Unknown workspace",
|
||||
status: "idle",
|
||||
providerType: "git_worktree",
|
||||
cwd: worktreePath,
|
||||
providerRef: worktreePath,
|
||||
branchName: "feature/missing-recorded",
|
||||
baseRef: "main",
|
||||
});
|
||||
|
||||
await expect(svc.reconcileExecutionWorkspaceBranch(executionWorkspaceId, {
|
||||
mode: "forward",
|
||||
reason: null,
|
||||
actor: {
|
||||
actorType: "user",
|
||||
actorId: "local-board",
|
||||
agentId: null,
|
||||
runId: null,
|
||||
},
|
||||
})).rejects.toMatchObject({
|
||||
status: 422,
|
||||
details: {
|
||||
inspection: expect.objectContaining({
|
||||
ancestryVerdict: "unknown",
|
||||
fromBranch: "feature/missing-recorded",
|
||||
toBranch: "feature/current",
|
||||
fromSha: null,
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
const comments = await db.select().from(issueComments).where(eq(issueComments.issueId, issueId));
|
||||
expect(comments).toHaveLength(0);
|
||||
}, 20_000);
|
||||
|
||||
it("returns a bounded company-scoped workspace overview with service and linked issue summaries", async () => {
|
||||
const companyId = randomUUID();
|
||||
const otherCompanyId = randomUUID();
|
||||
|
|
|
|||
|
|
@ -2690,7 +2690,7 @@ describe("realizeExecutionWorkspace", () => {
|
|||
});
|
||||
}, 15_000);
|
||||
|
||||
it("classifies persisted git worktree branch incoherence as unknown when the recorded branch was deleted", async () => {
|
||||
it("routes a deleted recorded branch with a clean worktree to forward adoption when reconcile-forward is enabled", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
const expectedBranch = "PAP-458-deleted-recorded-branch";
|
||||
const actualBranch = "PAP-458-actual-work";
|
||||
|
|
@ -2740,6 +2740,8 @@ describe("realizeExecutionWorkspace", () => {
|
|||
error = err;
|
||||
}
|
||||
|
||||
// Without a database the adoption cannot be audited, so it still fails closed —
|
||||
// but through the forward-adoption path rather than "expected branch does not exist".
|
||||
expect(error).toMatchObject({
|
||||
code: "workspace_validation_failed",
|
||||
resultJson: {
|
||||
|
|
@ -2759,6 +2761,76 @@ describe("realizeExecutionWorkspace", () => {
|
|||
ancestryVerdict: "unknown",
|
||||
plainLanguageReason: expect.stringContaining("missing a resolvable HEAD commit"),
|
||||
}),
|
||||
safeRepair: expect.objectContaining({
|
||||
attempted: false,
|
||||
succeeded: false,
|
||||
reason: "forward reconciliation adoption requires database access to audit after workspace realization",
|
||||
}),
|
||||
}),
|
||||
},
|
||||
});
|
||||
}, 15_000);
|
||||
|
||||
it("keeps a deleted recorded branch fail-closed when reconcile-forward is disabled", async () => {
|
||||
const repoRoot = await createTempRepo();
|
||||
const expectedBranch = "PAP-458-deleted-recorded-branch-flag-off";
|
||||
const actualBranch = "PAP-458-actual-work-flag-off";
|
||||
const worktreePath = path.join(repoRoot, ".paperclip", "worktrees", expectedBranch);
|
||||
|
||||
await fs.mkdir(path.dirname(worktreePath), { recursive: true });
|
||||
await runGit(repoRoot, ["branch", expectedBranch]);
|
||||
await runGit(repoRoot, ["worktree", "add", "-b", actualBranch, worktreePath, "HEAD"]);
|
||||
await runGit(repoRoot, ["branch", "-D", expectedBranch]);
|
||||
|
||||
let error: unknown = null;
|
||||
try {
|
||||
await ensurePersistedExecutionWorkspaceAvailable({
|
||||
base: {
|
||||
baseCwd: repoRoot,
|
||||
source: "project_primary",
|
||||
projectId: "project-1",
|
||||
workspaceId: "workspace-1",
|
||||
repoUrl: null,
|
||||
repoRef: "HEAD",
|
||||
},
|
||||
workspace: {
|
||||
id: "execution-workspace-deleted-branch-flag-off",
|
||||
mode: "isolated_workspace",
|
||||
strategyType: "git_worktree",
|
||||
cwd: worktreePath,
|
||||
providerRef: worktreePath,
|
||||
projectId: "project-1",
|
||||
projectWorkspaceId: "workspace-1",
|
||||
repoUrl: null,
|
||||
baseRef: "HEAD",
|
||||
branchName: expectedBranch,
|
||||
},
|
||||
issue: {
|
||||
id: "issue-deleted-branch-flag-off",
|
||||
identifier: "PAP-458",
|
||||
title: "Classify deleted branch ancestry",
|
||||
},
|
||||
agent: {
|
||||
id: "agent-1",
|
||||
name: "Codex Coder",
|
||||
companyId: "company-1",
|
||||
},
|
||||
enableWorkspaceBranchReconcileForward: false,
|
||||
});
|
||||
} catch (err) {
|
||||
error = err;
|
||||
}
|
||||
|
||||
expect(error).toMatchObject({
|
||||
code: "workspace_validation_failed",
|
||||
resultJson: {
|
||||
workspaceValidation: expect.objectContaining({
|
||||
cleanliness: "clean",
|
||||
provenance: expect.objectContaining({
|
||||
expectedBranchExists: false,
|
||||
actualBranchExists: true,
|
||||
ancestryVerdict: "unknown",
|
||||
}),
|
||||
safeRepair: expect.objectContaining({
|
||||
eligible: false,
|
||||
attempted: false,
|
||||
|
|
|
|||
|
|
@ -56,6 +56,8 @@ export type ExecutionWorkspaceBranchReconcileActor = {
|
|||
runId: string | null;
|
||||
};
|
||||
|
||||
export type ExecutionWorkspaceBranchRefResolution = "resolved" | "missing" | "error";
|
||||
|
||||
export type ExecutionWorkspaceBranchReconcileInspection = {
|
||||
fingerprint: string;
|
||||
worktreePath: string;
|
||||
|
|
@ -64,6 +66,8 @@ export type ExecutionWorkspaceBranchReconcileInspection = {
|
|||
toBranch: string;
|
||||
fromSha: string | null;
|
||||
toSha: string | null;
|
||||
fromBranchRefStatus: ExecutionWorkspaceBranchRefResolution;
|
||||
toBranchRefStatus: ExecutionWorkspaceBranchRefResolution;
|
||||
ancestryVerdict: GitWorktreeBranchAncestryVerdict;
|
||||
cleanliness: "clean" | "dirty" | "unknown";
|
||||
statusEntryCount: number | null;
|
||||
|
|
@ -224,6 +228,24 @@ function fingerprintWorkspaceBranchIncoherence(input: {
|
|||
return `workspace_incoherence:v1:sha256:${digest}`;
|
||||
}
|
||||
|
||||
async function resolveLocalBranchCommit(
|
||||
repoRoot: string,
|
||||
branch: string,
|
||||
): Promise<{ status: ExecutionWorkspaceBranchRefResolution; sha: string | null }> {
|
||||
try {
|
||||
// --quiet makes an absent ref exit 1 with empty output instead of exiting
|
||||
// 128 with a fatal message, so a missing branch stays distinguishable from
|
||||
// git failing to inspect the repository at all.
|
||||
const sha = await readGitStdout(["rev-parse", "--verify", "--quiet", `refs/heads/${branch}^{commit}`], repoRoot);
|
||||
return sha ? { status: "resolved", sha } : { status: "missing", sha: null };
|
||||
} catch (error) {
|
||||
const code = typeof error === "object" && error && "code" in error
|
||||
? (error as { code?: unknown }).code
|
||||
: null;
|
||||
return { status: code === 1 ? "missing" : "error", sha: null };
|
||||
}
|
||||
}
|
||||
|
||||
async function getGitWorktreeBranchAncestryVerdict(input: {
|
||||
repoRoot: string;
|
||||
expectedHeadSha: string | null;
|
||||
|
|
@ -296,8 +318,9 @@ async function inspectExecutionWorkspaceBranchForReconcile(
|
|||
const cleanliness: ExecutionWorkspaceBranchReconcileInspection["cleanliness"] =
|
||||
status === null ? "unknown" : status.trim().length > 0 ? "dirty" : "clean";
|
||||
|
||||
const fromSha = await readGitStdout(["rev-parse", "--verify", `refs/heads/${fromBranch}^{commit}`], repoRoot)
|
||||
.catch(() => null);
|
||||
const fromRef = await resolveLocalBranchCommit(repoRoot, fromBranch);
|
||||
const toRef = await resolveLocalBranchCommit(repoRoot, toBranch);
|
||||
const fromSha = fromRef.sha;
|
||||
const toSha = await readGitStdout(["rev-parse", "HEAD"], worktreePath).catch(() => null);
|
||||
const ancestryVerdict = await getGitWorktreeBranchAncestryVerdict({
|
||||
repoRoot,
|
||||
|
|
@ -322,6 +345,8 @@ async function inspectExecutionWorkspaceBranchForReconcile(
|
|||
toBranch,
|
||||
fromSha,
|
||||
toSha,
|
||||
fromBranchRefStatus: fromRef.status,
|
||||
toBranchRefStatus: toRef.status,
|
||||
ancestryVerdict,
|
||||
cleanliness,
|
||||
statusEntryCount: statusLines?.length ?? null,
|
||||
|
|
@ -1627,7 +1652,18 @@ export function executionWorkspaceService(db: Db) {
|
|||
}
|
||||
|
||||
const inspection = await inspectExecutionWorkspaceBranchForReconcile(existing);
|
||||
if (input.mode === "forward" && inspection.ancestryVerdict !== "ancestor") {
|
||||
// A recorded branch whose ref is confirmed absent (not merely unreadable)
|
||||
// has nothing to lose, so adopting the clean checked-out branch is
|
||||
// trivially forward-only — provided the adopted branch's own local ref
|
||||
// resolves, so a nonexistent branch name is never persisted.
|
||||
const recordedBranchAdoptable =
|
||||
inspection.fromBranchRefStatus === "missing" &&
|
||||
inspection.toBranchRefStatus === "resolved";
|
||||
if (
|
||||
input.mode === "forward" &&
|
||||
inspection.ancestryVerdict !== "ancestor" &&
|
||||
!(recordedBranchAdoptable && inspection.cleanliness === "clean")
|
||||
) {
|
||||
throw unprocessable(
|
||||
"Forward branch reconciliation requires the recorded branch to be an ancestor of the checked-out branch",
|
||||
{ inspection },
|
||||
|
|
|
|||
|
|
@ -1758,14 +1758,24 @@ export async function ensureGitWorktreeBranchCoherent(input: {
|
|||
};
|
||||
}
|
||||
|
||||
// A recorded branch that no longer exists anywhere has no commits to lose, so
|
||||
// adopting the clean checked-out branch is trivially forward-only. This is the
|
||||
// steady state left behind when an agent renames its task branch (e.g. to a
|
||||
// feat/* PR branch) and the recorded branch was never created or was deleted.
|
||||
const recordedBranchMissingButAdoptable =
|
||||
!evidence.provenance.expectedBranchExists &&
|
||||
evidence.provenance.actualBranchExists === true &&
|
||||
evidence.provenance.registeredBranchMatchesHead;
|
||||
if (
|
||||
input.enableWorkspaceBranchReconcileForward === true &&
|
||||
evidence.provenance.ancestryVerdict === "ancestor" &&
|
||||
!evidence.provenance.sameHead &&
|
||||
evidence.cleanliness === "clean" &&
|
||||
currentBranch
|
||||
currentBranch &&
|
||||
((evidence.provenance.ancestryVerdict === "ancestor" && !evidence.provenance.sameHead) ||
|
||||
recordedBranchMissingButAdoptable)
|
||||
) {
|
||||
const reason = "Automatic forward reconciliation: recorded branch is an ancestor of the checked-out branch.";
|
||||
const reason = evidence.provenance.expectedBranchExists
|
||||
? "Automatic forward reconciliation: recorded branch is an ancestor of the checked-out branch."
|
||||
: "Automatic forward reconciliation: the recorded branch no longer exists, so Paperclip adopted the clean checked-out branch.";
|
||||
if (input.executionWorkspaceId && input.persistForwardReconcile !== false) {
|
||||
if (!input.db) {
|
||||
evidence.safeRepair.reason = "forward reconciliation requires database access to update the execution workspace record";
|
||||
|
|
|
|||
Loading…
Reference in New Issue