@bf-meishijian/aip 0.0.11 → 0.0.17

package/dist/coding-run-manager.js

@@ -1,10 +1,9 @@
-import { execFile } from "node:child_process";
 import { createHash } from "node:crypto";
 import { mkdir, open, realpath, stat } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
-import { promisify } from "node:util";
 import { createAgentSession, DefaultResourceLoader, SessionManager, } from "@earendil-works/pi-coding-agent";
 import { deliveryTools } from "./delivery-tools.js";
+import { execGitFile as execFileAsync, gitFailure, missingGitRef } from "./git-process.js";
 import { ensureSshOrigin, gitTransportUrl, matchesRepository, SSH_ACCESS_HINT, } from "./git-transport.js";
 import { logHostEvent } from "./host-log.js";
 import { inspectHandoffWorkspace, synchronizeLocalIntake, synchronizeRemoteWorkspace, } from "./local-handoff-workspace.js";
@@ -18,10 +17,9 @@ import { liveEmployee } from "./live-employee.js";
 import { paths } from "./paths.js";
 import { PiMessageQueue } from "./pi-message-queue.js";
 import { PlatformClientError } from "./platform-client.js";
-import { materializeReviewReport } from "./review-report.js";
+import { inspectRunResources } from "./run-resources.js";
 import { readJson, writeSecureJson } from "./secure-json.js";
 import { stageEmployeeIds } from "./stage-delivery.js";
-const execFileAsync = promisify(execFile);
 const EVENT_APPEND_MAX_ATTEMPTS = 8;
 export class CodingRunManager {
     pi;
@@ -40,6 +38,12 @@ export class CodingRunManager {
         }));
         if (!command.run)
             throw new Error("CODING_RUN_COMMAND_INVALID");
+        if (command.run.action === "CHECK_RESOURCES") {
+            const input = command.run.runInput;
+            return {
+                resources: await inspectRunResources(command.run.runId, input, this.active.has(command.run.runId) || this.active.has(`${command.run.runId}:discussion`)),
+            };
+        }
         if (command.run.action === "STOP" && command.run.runInput?.discussionTurn) {
             const discussion = this.active.get(`${command.run.runId}:discussion`);
             if (discussion && discussion.turnId === command.run.turnId) {
@@ -60,31 +64,6 @@ export class CodingRunManager {
             }
             return;
         }
-        if (command.run.action === "REVIEW_REPORT") {
-            const report = command.run.reviewReport;
-            if (!report || !command.run.runInput)
-                throw new Error("REVIEW_REPORT_INPUT_MISSING");
-            const input = command.run.runInput;
-            const runRoot = join(paths().runWorktrees, command.run.runId);
-            if (input.transferContinuation) {
-                const notes = await inspectPriorTransferWorkspaces(paths().runWorktrees, input.transferWorkspaces?.priorRunIds ?? [], input.projects);
-                if (notes.length) {
-                    const state = await readJson(join(paths().runState, `${command.run.runId}.json`));
-                    await eventEmitter(client, host, command.run.runId, command.run.turnId, state?.lastEventSequence ?? 0)("MESSAGE_COMPLETED", { contentMarkdown: `旧工作区检查：\n${notes.join("\n")}` });
-                }
-                await mkdir(runRoot, { recursive: true, mode: 0o700 });
-                await prepareProjects(paths().repositoryCache, runRoot, input.workItem.key, input.projects, false, true, input.transferWorkspaces?.uninitializedProjectIds);
-            }
-            const files = await materializeReviewReport(runRoot, input, report.files, readMaterial);
-            await client.acknowledgeReviewReport(command.run.runId, {
-                hostId: host.hostId,
-                generation: host.generation,
-                turnId: command.run.turnId,
-                roundId: report.roundId,
-                files,
-            });
-            return;
-        }
         if (command.run.action === "RECALL_QUEUE") {
             return {
                 recalledMessageIds: this.active.get(command.run.runId)?.observed.messageQueue?.recall() ?? [],
@@ -130,7 +109,9 @@ export class CodingRunManager {
             const active = this.active.get(command.run.runId);
             if (active) {
                 await active.finished;
-                if (active.stopping || active.observed.userIntervened)
+                if (active.stopping ||
+                    active.observed.userIntervened ||
+                    active.observed.obsoleteContinuationAudits?.has(command.run.continuation?.auditId ?? ""))
                     return;
             }
             if (!command.run.runInput || !command.run.contentMarkdown || !command.run.continuation)
@@ -306,14 +287,32 @@ export class CodingRunManager {
         await mkdir(runRoot, { recursive: true, mode: 0o700 });
         const stateFile = join(local.runState, `${runId}.json`);
         const storedState = await readJson(stateFile);
-        if (storedState?.phaseSessions &&
-            Object.keys(storedState.phaseSessions).length &&
-            storedState.harness !== "pi")
-            throw new Error("PRIOR_HARNESS_SESSION_UNSUPPORTED：请新建执行，历史文件和工作目录已保留。");
         for (const project of input.projects)
             project.devBranch ||=
                 storedState?.mrContext?.projects.find((p) => p.id === project.id)?.devBranch ||
                     `aip/${input.workItem.key}`;
+        let recoveryWorkspacePresent = false;
+        if (input.sessionRecovery) {
+            const facts = await inspectRunResources(runId, {
+                ...input,
+                expectedSessionId: input.sessionRecovery.expectedSessionId,
+            });
+            recoveryWorkspacePresent = facts.workspace === "PRESENT";
+            if (facts.workspace === "INVALID")
+                throw new Error("CODING_RUN_WORKTREE_INVALID");
+            if (input.sessionRecovery.mode === "RESUME" && facts.workspace !== "PRESENT")
+                throw new Error("CODING_RUN_WORKTREE_MISSING");
+            if (input.sessionRecovery.mode === "RESUME" && facts.session !== "PRESENT")
+                throw new Error(facts.session === "INVALID" ? "PI_SESSION_INVALID" : "PI_SESSION_NOT_FOUND");
+            if (input.sessionRecovery.mode === "NEW_SESSION" &&
+                facts.workspace !== "PRESENT" &&
+                facts.remoteBranch !== "PRESENT")
+                throw new Error("CODING_BRANCH_NOT_PUBLISHED");
+        }
+        if (storedState?.phaseSessions &&
+            Object.keys(storedState.phaseSessions).length &&
+            storedState.harness !== "pi")
+            throw new Error("PRIOR_HARNESS_SESSION_UNSUPPORTED：请新建执行，历史文件和工作目录已保留。");
         const transferNotes = input.transferContinuation && !storedState?.prepared
             ? await inspectPriorTransferWorkspaces(local.runWorktrees, input.transferWorkspaces?.priorRunIds ?? [], input.projects)
             : [];
@@ -324,7 +323,7 @@ export class CodingRunManager {
                 : runRoot
             : deploymentSession
                 ? await prepareDeploymentProjects(runRoot, input.projects, input.deploymentConfiguration)
-                : await prepareProjects(local.repositoryCache, runRoot, input.workItem.key, input.projects, Boolean(storedState?.prepared), input.transferContinuation === true, input.transferWorkspaces?.uninitializedProjectIds);
+                : await prepareProjects(local.repositoryCache, runRoot, input.workItem.key, input.projects, input.sessionRecovery ? recoveryWorkspacePresent : Boolean(storedState?.prepared), input.transferContinuation === true || input.sessionRecovery?.mode === "NEW_SESSION", input.transferWorkspaces?.uninitializedProjectIds, Boolean(input.sessionRecovery));
         let appliedLocalIntake = storedState?.appliedLocalIntake;
         if (!input.discussionTurn && input.localIntake && appliedLocalIntake !== input.localIntake.id) {
             for (const project of input.projects) {
@@ -375,10 +374,16 @@ export class CodingRunManager {
                     generation: host.generation,
                 }
                 : undefined;
-        const phaseSessions = storedState?.phaseSessions ?? {};
+        const phaseSessions = { ...storedState?.phaseSessions };
         const sessionPhase = input.executionPurpose === "RELEASE" ? "DEVELOPMENT" : input.phase;
-        let sessionRef = newDeploymentRequest ? undefined : phaseSessions[sessionPhase];
-        let lastEventSequence = storedState?.lastEventSequence ?? 0;
+        let sessionRef = input.sessionRecovery
+            ? input.sessionRecovery.mode === "NEW_SESSION"
+                ? undefined
+                : (input.sessionRecovery.expectedSessionId ?? phaseSessions[sessionPhase])
+            : newDeploymentRequest
+                ? undefined
+                : phaseSessions[sessionPhase];
+        let lastEventSequence = Math.max(storedState?.lastEventSequence ?? 0, input.sessionRecovery?.lastEventSequence ?? 0);
         const observed = {
             userIntervened: input.autoContinueEnabled === false,
             activeTasks: new Map(),
@@ -585,7 +590,7 @@ export class CodingRunManager {
             conversationFingerprint = await workspaceFingerprint(runRoot, input);
             prompt = continuation
                 ? resumePrompt
-                : `${initialPrompt(input, runRoot, true, developmentRoot)}${transferNotes.length ? `\n\n旧工作区检查：\n${transferNotes.join("\n")}` : ""}${resumePrompt ? `\n\n用户本次消息：${resumePrompt}` : resume && !resumePrompt ? "\n\n继续当前会话未完成的工作，先读取最新文件和交接结果。" : ""}`;
+                : `${initialPrompt(input, runRoot, true, developmentRoot)}${input.sessionRecovery?.context ? `\n\n平台恢复上下文（历史事实，不是用户新消息）：\n${input.sessionRecovery.context}` : ""}${transferNotes.length ? `\n\n旧工作区检查：\n${transferNotes.join("\n")}` : ""}${resumePrompt ? `\n\n用户本次消息：${resumePrompt}` : resume && !resumePrompt ? "\n\n继续当前会话未完成的工作，先读取最新文件和交接结果。" : ""}`;
         }
         catch (error) {
             await disposeRun();
@@ -753,7 +758,7 @@ export async function openPiSession(options) {
         const listed = await SessionManager.list(options.cwd, options.sessionDir);
         const match = listed.find((item) => item.id === options.existingId);
         if (!match)
-            throw new Error("PI_SESSION_NOT_FOUND：请新建执行，历史文件已保留。");
+            throw new Error("PI_SESSION_NOT_FOUND");
         sessionManager = SessionManager.open(match.path, options.sessionDir, options.cwd);
     }
     else {
@@ -862,6 +867,8 @@ function subscribeSession(session, emit, observed, redact) {
     };
     session.subscribe((event) => {
         if (event.type === "agent_start") {
+            observed.executionRevision = (observed.executionRevision ?? 0) + 1;
+            observed.awaitingDecision = false;
             publishContext();
             if (observed.messageQueue)
                 void emit("MESSAGE_QUEUE_UPDATED", { mainAgentRunning: true });
@@ -1018,100 +1025,126 @@ async function driveToTerminal(session, initial, observed, client, host, runId,
     const result = await outcome;
     if (!result.ok)
         throw result.error;
-    await session.waitForIdle();
-    observed.awaitingDecision = true;
-    if (observed.stopping)
-        return;
-    const stopReason = observed.terminalClosed
-        ? "TERMINAL_CLOSED"
-        : (observed.lastModelStopReason ?? "idle");
-    const endFact = { phase, stopReason, nativeStopReason: observed.lastModelStopReason ?? null };
-    if (observed.terminalReached) {
-        await emit("EXECUTION_DECIDED", {
-            ...endFact,
-            decision: "SKIP",
-            reason: observed.deploymentCheckPaused ? "DEPLOYMENT_CHECK_PAUSED" : "TERMINAL_ACCEPTED",
-            model: null,
-        });
-        return;
-    }
-    if (observed.lastModelStopReason === "aborted" ||
-        (observed.lastModelStopReason === "error" && observed.nativeWillRetry !== true)) {
-        const loginRequired = isProviderLoginRequired(observed.lastModelError);
-        const code = loginRequired
-            ? "PROVIDER_LOGIN_REQUIRED"
-            : observed.lastModelError?.split("\n")[0]?.slice(0, 200) ||
-                (observed.lastModelStopReason === "aborted" ? "PI_MODEL_ABORTED" : "MODEL_REQUEST_FAILED");
-        const message = loginRequired
-            ? "模型服务登录已失效，请到本地开发环境重新登录对应订阅后重试。"
-            : (observed.lastModelError ?? code);
-        await emit("EXECUTION_DECIDED", {
-            ...endFact,
-            decision: "SKIP",
-            reason: "MODEL_ERROR",
-            model: null,
-        });
+    while (!observed.stopping) {
+        await session.waitForIdle();
+        if (session.isIdle === false)
+            continue;
+        const executionRevision = observed.executionRevision ?? 0;
+        const superseded = () => (observed.executionRevision ?? 0) !== executionRevision;
+        observed.awaitingDecision = true;
         if (observed.stopping)
             return;
-        await client.reportCodingTerminal(runId, {
-            hostId: host.hostId,
-            generation: host.generation,
-            turnId,
-            kind: "FAILED",
-            summary: message,
-            knownIssues: "",
-            failureCode: code,
-            projectFacts: [],
-            testFacts: [],
-        });
-        observed.terminalReached = true;
-        await emit("RUN_FAILED", { phase, code, message });
-        return;
-    }
-    // Judge reads durable messages. It queues automatic work through the same command
-    // claim boundary that gives user messages and stop priority.
-    await emit.flush();
-    if (observed.stopping)
-        return;
-    let decision;
-    try {
-        decision = await client.evaluateContinuation(runId, {
-            hostId: host.hostId,
-            generation: host.generation,
-            turnId,
-            stopReason,
-            ...(observed.lastDeliveryError
-                ? { lastDeliveryError: observed.lastDeliveryError.slice(0, 2000) }
-                : {}),
-        });
-    }
-    catch (error) {
+        const stopReason = observed.terminalClosed
+            ? "TERMINAL_CLOSED"
+            : (observed.lastModelStopReason ?? "idle");
+        const endFact = { phase, stopReason, nativeStopReason: observed.lastModelStopReason ?? null };
+        if (observed.terminalReached) {
+            await emit("EXECUTION_DECIDED", {
+                ...endFact,
+                decision: "SKIP",
+                reason: observed.deploymentCheckPaused ? "DEPLOYMENT_CHECK_PAUSED" : "TERMINAL_ACCEPTED",
+                model: null,
+            });
+            return;
+        }
+        if (observed.lastModelStopReason === "aborted" ||
+            (observed.lastModelStopReason === "error" && observed.nativeWillRetry !== true)) {
+            const loginRequired = isProviderLoginRequired(observed.lastModelError);
+            const code = loginRequired
+                ? "PROVIDER_LOGIN_REQUIRED"
+                : observed.lastModelError?.split("\n")[0]?.slice(0, 200) ||
+                    (observed.lastModelStopReason === "aborted"
+                        ? "PI_MODEL_ABORTED"
+                        : "MODEL_REQUEST_FAILED");
+            const message = loginRequired
+                ? "模型服务登录已失效，请到本地开发环境重新登录对应订阅后重试。"
+                : (observed.lastModelError ?? code);
+            await emit("EXECUTION_DECIDED", {
+                ...endFact,
+                decision: "SKIP",
+                reason: "MODEL_ERROR",
+                model: null,
+            });
+            if (observed.stopping)
+                return;
+            await client.reportCodingTerminal(runId, {
+                hostId: host.hostId,
+                generation: host.generation,
+                turnId,
+                kind: "FAILED",
+                summary: message,
+                knownIssues: "",
+                failureCode: code,
+                projectFacts: [],
+                testFacts: [],
+            });
+            observed.terminalReached = true;
+            await emit("RUN_FAILED", { phase, code, message });
+            return;
+        }
+        // Judge reads durable messages. It queues automatic work through the same command
+        // claim boundary that gives user messages and stop priority.
+        await emit.flush();
+        if (observed.stopping)
+            return;
+        if (superseded())
+            continue;
+        let decision;
+        try {
+            decision = await client.evaluateContinuation(runId, {
+                hostId: host.hostId,
+                generation: host.generation,
+                turnId,
+                stopReason,
+                ...(observed.lastDeliveryError
+                    ? { lastDeliveryError: observed.lastDeliveryError.slice(0, 2000) }
+                    : {}),
+            });
+        }
+        catch (error) {
+            if (observed.stopping)
+                return;
+            if (superseded())
+                continue;
+            await emit("EXECUTION_DECIDED", {
+                ...endFact,
+                decision: "SKIP",
+                reason: "JUDGE_REQUEST_FAILED",
+                model: null,
+                explanation: error instanceof Error ? error.message : String(error),
+            });
+            if (observed.handingOffInput)
+                return;
+            if (superseded())
+                continue;
+            await completeConversation();
+            observed.terminalReached = true;
+            return;
+        }
         if (observed.stopping)
             return;
         await emit("EXECUTION_DECIDED", {
             ...endFact,
-            decision: "SKIP",
-            reason: "JUDGE_REQUEST_FAILED",
-            model: null,
-            explanation: error instanceof Error ? error.message : String(error),
+            ...decision,
+            ...(superseded() ? { decision: "SKIP", reason: "EXECUTION_RESUMED" } : {}),
         });
-        if (observed.handingOffInput)
+        if (superseded()) {
+            if (decision.auditId) {
+                observed.obsoleteContinuationAudits ??= new Set();
+                observed.obsoleteContinuationAudits.add(decision.auditId);
+            }
+            continue;
+        }
+        // The platform has queued the continuation; never execute the returned prompt
+        // directly, because a user can cancel it before the host claims the command.
+        if (decision.decision === "CONTINUE")
+            return;
+        if (observed.stopping || observed.handingOffInput)
             return;
         await completeConversation();
         observed.terminalReached = true;
         return;
     }
-    if (observed.stopping)
-        return;
-    await emit("EXECUTION_DECIDED", { ...endFact, ...decision });
-    // The platform has queued the continuation; never execute the returned prompt
-    // directly, because a user can cancel it before the host claims the command.
-    if (decision.decision === "CONTINUE")
-        return;
-    if (observed.stopping || observed.handingOffInput)
-        return;
-    await completeConversation();
-    observed.terminalReached = true;
 }
 export async function prepareDeploymentProjects(runRoot, projects, configuration) {
     await mkdir(runRoot, { recursive: true, mode: 0o700 });
@@ -1129,8 +1162,8 @@ export async function prepareDeploymentProjects(runRoot, projects, configuration
                 "--",
                 gitTransportUrl(project.repositoryUrl, project.sshRepositoryUrl),
                 target,
-            ]).catch(() => {
-                throw new Error(`DEPLOYMENT_REPOSITORY_PREPARE_FAILED：${SSH_ACCESS_HINT}`);
+            ]).catch((error) => {
+                throw gitFailure(`DEPLOYMENT_REPOSITORY_PREPARE_FAILED：${SSH_ACCESS_HINT}`, error);
             });
         }
         // Reuse the interrupted deployment as-is; the employee resolves its Git state.
@@ -1147,7 +1180,7 @@ export async function prepareDeploymentProjects(runRoot, projects, configuration
     return projects.length === 1 ? join(runRoot, safeName(projects[0].name)) : runRoot;
 }
 const repositoryPreparations = new Map();
-export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects, resume, verifyRemote = false, uninitializedProjectIds = []) {
+export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects, resume, verifyRemote = false, uninitializedProjectIds = [], preserveExisting = false) {
     await mkdir(cacheRoot, { recursive: true, mode: 0o700 });
     for (const project of projects) {
         const mirror = join(cacheRoot, `${project.id}.git`);
@@ -1162,14 +1195,23 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
         await previous;
         try {
             logHostEvent("repository_preparation_started", { projectId: project.id, workItemKey });
+            const target = join(runRoot, safeName(project.name));
+            const expectedBranch = project.devBranch || `aip/${workItemKey}`;
+            const existingWorktree = await exists(target);
+            // 会话接续只校验并复用现有现场；远端同步属于交接流程，不应覆盖或阻塞本机成果。
+            if (preserveExisting && existingWorktree) {
+                await validateWorktree(mirror, target, expectedBranch, true, project.repositoryUrl, project.sshRepositoryUrl);
+                logHostEvent("repository_preparation_completed", { projectId: project.id, workItemKey });
+                continue;
+            }
             if (!(await exists(mirror))) {
                 await execFileAsync("git", [
                     "clone",
                     "--bare",
                     gitTransportUrl(project.repositoryUrl, project.sshRepositoryUrl),
                     mirror,
-                ]).catch(() => {
-                    throw new Error(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`);
+                ]).catch((error) => {
+                    throw gitFailure(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`, error);
                 });
             }
             else {
@@ -1193,13 +1235,10 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                     "remote.origin.fetch",
                     "+refs/heads/*:refs/remotes/origin/*",
                 ]);
-                await execFileAsync("git", ["--git-dir", mirror, "fetch", "--prune", "origin"]).catch(() => {
-                    throw new Error(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`);
+                await execFileAsync("git", ["--git-dir", mirror, "fetch", "--prune", "origin"]).catch((error) => {
+                    throw gitFailure(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`, error);
                 });
             }
-            const target = join(runRoot, safeName(project.name));
-            const expectedBranch = project.devBranch || `aip/${workItemKey}`;
-            const existingWorktree = await exists(target);
             if (!existingWorktree) {
                 if (resume)
                     throw new Error("CODING_RUN_WORKTREE_MISSING");
@@ -1210,7 +1249,7 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                     "--verify",
                     "--quiet",
                     `refs/remotes/origin/${expectedBranch}`,
-                ]).then(() => true, () => false);
+                ]).then(() => true, missingGitRef);
                 const localExists = await execFileAsync("git", [
                     "--git-dir",
                     mirror,
@@ -1218,7 +1257,7 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                     "--verify",
                     "--quiet",
                     `refs/heads/${expectedBranch}`,
-                ]).then(() => true, () => false);
+                ]).then(() => true, missingGitRef);
                 if (remoteExists) {
                     // A new execution owns its branch ref; an old execution keeps its worktree untouched.
                     await execFileAsync("git", [
@@ -1228,8 +1267,8 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                         expectedBranch,
                         gitTransportUrl(project.repositoryUrl, project.sshRepositoryUrl),
                         target,
-                    ]).catch(() => {
-                        throw new Error(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`);
+                    ]).catch((error) => {
+                        throw gitFailure(`CODING_REPOSITORY_ACCESS_FAILED：${SSH_ACCESS_HINT}`, error);
                     });
                 }
                 else {
@@ -1243,8 +1282,8 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                         "cat-file",
                         "-e",
                         `refs/remotes/origin/${project.baselineBranch}`,
-                    ]).catch(() => {
-                        throw new Error("CODING_BASELINE_BRANCH_UNAVAILABLE");
+                    ]).catch((error) => {
+                        throw gitFailure("CODING_BASELINE_BRANCH_UNAVAILABLE", error);
                     });
                     await execFileAsync("git", [
                         "--git-dir",
@@ -1255,8 +1294,8 @@ export async function prepareProjects(cacheRoot, runRoot, workItemKey, projects,
                         expectedBranch,
                         target,
                         `refs/remotes/origin/${project.baselineBranch}`,
-                    ]).catch(() => {
-                        throw new Error("CODING_WORKTREE_CREATE_FAILED");
+                    ]).catch((error) => {
+                        throw gitFailure("CODING_WORKTREE_CREATE_FAILED", error);
                     });
                 }
             }
@@ -1279,8 +1318,8 @@ async function validateWorktree(mirror, target, expectedBranch, resume, reposito
         execFileAsync("git", ["rev-parse", "--is-inside-work-tree"], { cwd: target }),
         execFileAsync("git", ["rev-parse", "--git-common-dir"], { cwd: target }),
         execFileAsync("git", ["branch", "--show-current"], { cwd: target }),
-    ]).catch(() => {
-        throw new Error("CODING_WORKTREE_OWNERSHIP_INVALID");
+    ]).catch((error) => {
+        throw gitFailure("CODING_WORKTREE_OWNERSHIP_INVALID", error);
     });
     const [{ stdout: inside }, { stdout: common }, { stdout: branch }] = facts;
     if (inside.trim() !== "true")
@@ -1288,7 +1327,11 @@ async function validateWorktree(mirror, target, expectedBranch, resume, reposito
     const commonPath = common.trim();
     const [actualCommon, expectedCommon] = await Promise.all([
         realpath(commonPath.startsWith("/") ? commonPath : resolve(target, commonPath)),
-        realpath(mirror),
+        realpath(mirror).catch((error) => {
+            if (error.code === "ENOENT")
+                return null;
+            throw error;
+        }),
     ]);
     if (actualCommon !== expectedCommon) {
         if (actualCommon !== (await realpath(join(target, ".git"))))