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

feat(FN-4623): complete Step 3 — add backend-aware path resolution

Browse Source 
Fusion-Task-Id: FN-4623
Fusion-Task-Lineage: 58122853-cab7-4102-9649-4ceda4c5959e
This commit is contained in:
Fusion (runfusion.ai)
2026-05-15 19:19:40 -07:00
committed by gsxdsm
parent c98a4e2f82
commit 0f372f67c3
4 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@ import { exec } from "node:child_process";
import { promisify } from "node:util";
import type { RunMutationContext, Settings, Task, TaskStore } from "@fusion/core";
import { generateWorktreeName, slugify } from "./worktree-names.js";
import { resolveTaskWorktreePath } from "./worktree-paths.js";
import { resolveTaskWorktreePathForBackend } from "./worktree-paths.js";
import { hydrateWorktreeDb } from "./worktree-db-hydrate.js";
import { formatError } from "./logger.js";
import { isBranchConflictError } from "./branch-conflicts.js";
@@ -110,7 +110,7 @@ export async function acquireTaskWorktree(opts: AcquireTaskWorktreeOptions): Pro
: naming === "task-title"
? slugify(task.title || task.description.slice(0, 60))
: generateWorktreeName(rootDir, settings);
worktreePath = resolveTaskWorktreePath(rootDir, settings, worktreeName);
worktreePath = await resolveTaskWorktreePathForBackend(rootDir, worktreeName, settings, backend, branchName);
}
let isResume = Boolean(task.worktree && existsSync(worktreePath));
@@ -118,7 +118,8 @@ export async function acquireTaskWorktree(opts: AcquireTaskWorktreeOptions): Pro
logger?.log(`${task.id}: assigned worktree is not usable; creating a fresh worktree instead: ${worktreePath}`);
await store.logEntry(task.id, "Assigned worktree is not a registered, usable git worktree; creating a fresh worktree instead", worktreePath, runContext);
await store.updateTask(task.id, { worktree: null, branch: null });
worktreePath = resolveTaskWorktreePath(rootDir, settings, generateWorktreeName(rootDir, settings));
const fallbackName = generateWorktreeName(rootDir, settings);
worktreePath = await resolveTaskWorktreePathForBackend(rootDir, fallbackName, settings, backend, branchName);
isResume = false;
}