root/fusion
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(review): address PR #1713 review feedback

Browse Source 
Wrap the fatal-path acquisition observability writes (logEntry + audit.git)
in safeObserve so a store/audit throw can't replace the original
acquisition error, keeping WorkspaceRepoAcquireBusyError instanceof checks
reliable upstream.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
gsxdsm
2026-06-22 02:54:23 -07:00
parent 9f0492e69f
commit 3fd7d12439
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/engine/src/worktree-acquisition.ts
View File

@@ -856,11 +856,18 @@ export async function acquireWorkspaceRepoWorktree(
if (!(err instanceof WorkspaceRepoAcquireBusyError)) {
const message = err instanceof Error ? err.message : String(err);
logger?.error?.(`${task.id}: workspace sub-repo acquisition failed for ${repoRelPath}: ${message}`);
await store.logEntry(task.id, `Workspace sub-repo acquisition failed for ${repoRelPath}: ${message}`, undefined, runContext);
await audit?.git({
type: "worktree:workspace-repo-acquire-failed",
target: repoAbsPath,
metadata: { repoRelPath, taskId: task.id, error: message },
// FNXC:Workspace 2026-06-22-09:30: the fatal-path observability writes must use safeObserve
// for the same reason as the non-fatal catches — an unsuppressed throw from logEntry/audit
// would replace `err` as the propagated rejection, so a store/audit hiccup could surface a
// non-WorkspaceRepoAcquireBusyError to callers whose `instanceof` type checks then misfire.
// The original acquisition `err` (line below) is the contract; observability is best-effort.
await safeObserve(async () => {
await store.logEntry(task.id, `Workspace sub-repo acquisition failed for ${repoRelPath}: ${message}`, undefined, runContext);
await audit?.git({
type: "worktree:workspace-repo-acquire-failed",
target: repoAbsPath,
metadata: { repoRelPath, taskId: task.id, error: message },
});
});
}
throw err;