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

fix(FN-756): correct task card change counts

Browse Source
This commit is contained in:
gsxdsm
2026-04-03 07:29:42 -07:00
parent d8f57e0d31
commit 651ec03698
2 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
packages/dashboard/src/__tests__/routes-session-files.test.ts
View File

@@ -131,15 +131,18 @@ describe("GET /api/tasks/:id/session-files", () => {
vi.restoreAllMocks();
});
it("uses baseCommitSha with double-dot syntax when available", async () => {
it("uses merge-base against the task base branch and includes working-tree changes", async () => {
const store = new MockStore();
store.addTask(createTask({ id: "FN-675-base", baseCommitSha: "abc123" }));
mockExecSync.mockImplementation((command) => {
if (String(command) === "git merge-base --is-ancestor abc123 HEAD") {
return "" as any;
if (String(command) === "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main") {
return "mergebase123\n" as any;
}
if (String(command) === "git diff --name-only abc123..HEAD") {
return "src/a.ts\nsrc/b.ts\n" as any;
if (String(command) === "git diff --name-only mergebase123..HEAD") {
return "src/a.ts\n" as any;
}
if (String(command) === "git diff --name-only") {
return "src/b.ts\n" as any;
}
throw new Error(`Unexpected command: ${String(command)}`);
});
@@ -150,30 +153,34 @@ describe("GET /api/tasks/:id/session-files", () => {
expect(response.body).toEqual(["src/a.ts", "src/b.ts"]);
expect(mockExecSync).toHaveBeenNthCalledWith(
1,
"git merge-base --is-ancestor abc123 HEAD",
"git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
2,
"git diff --name-only abc123..HEAD",
"git diff --name-only mergebase123..HEAD",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
3,
"git diff --name-only",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).not.toHaveBeenCalledWith(expect.stringContaining("...HEAD"), expect.anything());
});
it("ignores stale baseCommitSha values that are not ancestors of HEAD", async () => {
it("ignores stale baseCommitSha values and uses current branch merge-base", async () => {
const store = new MockStore();
store.addTask(createTask({ id: "FN-675-stale-base", baseCommitSha: "stale123" }));
mockExecSync.mockImplementation((command) => {
if (String(command) === "git merge-base --is-ancestor stale123 HEAD") {
throw new Error("not ancestor");
}
if (String(command) === "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main") {
return "mergebase123\n" as any;
}
if (String(command) === "git diff --name-only mergebase123..HEAD") {
return "packages/engine/src/executor.ts\n" as any;
}
if (String(command) === "git diff --name-only") {
return "" as any;
}
throw new Error(`Unexpected command: ${String(command)}`);
});
@@ -183,19 +190,19 @@ describe("GET /api/tasks/:id/session-files", () => {
expect(response.body).toEqual(["packages/engine/src/executor.ts"]);
expect(mockExecSync).toHaveBeenNthCalledWith(
1,
"git merge-base --is-ancestor stale123 HEAD",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
2,
"git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
3,
2,
"git diff --name-only mergebase123..HEAD",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
3,
"git diff --name-only",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
});
it("computes fallback base ref with merge-base and returns matching file list", async () => {
@@ -208,6 +215,9 @@ describe("GET /api/tasks/:id/session-files", () => {
if (String(command) === "git diff --name-only mergebase123..HEAD") {
return "packages/dashboard/src/routes.ts\npackages/dashboard/app/components/TaskCard.tsx\n" as any;
}
if (String(command) === "git diff --name-only") {
return "" as any;
}
throw new Error(`Unexpected command: ${String(command)}`);
});
@@ -228,6 +238,11 @@ describe("GET /api/tasks/:id/session-files", () => {
"git diff --name-only mergebase123..HEAD",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
expect(mockExecSync).toHaveBeenNthCalledWith(
3,
"git diff --name-only",
expect.objectContaining({ cwd: "/tmp/fn-675" }),
);
});
it("falls back to HEAD~1 when merge-base fails", async () => {
@@ -243,6 +258,9 @@ describe("GET /api/tasks/:id/session-files", () => {
if (String(command) === "git diff --name-only parent123..HEAD") {
return "src/only.ts\n" as any;
}
if (String(command) === "git diff --name-only") {
return "" as any;
}
throw new Error(`Unexpected command: ${String(command)}`);
});
@@ -267,12 +285,15 @@ describe("GET /api/tasks/:id/session-files", () => {
const store = new MockStore();
store.addTask(createTask({ id: "FN-675-cache", baseCommitSha: "cachebase" }));
mockExecSync.mockImplementation((command) => {
if (String(command) === "git merge-base --is-ancestor cachebase HEAD") {
return "" as any;
if (String(command) === "git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main") {
return "mergebase123\n" as any;
}
if (String(command) === "git diff --name-only cachebase..HEAD") {
if (String(command) === "git diff --name-only mergebase123..HEAD") {
return "cached/file.ts\n" as any;
}
if (String(command) === "git diff --name-only") {
return "" as any;
}
throw new Error(`Unexpected command: ${String(command)}`);
});
const handler = await getSessionFilesHandler(store);
@@ -282,12 +303,12 @@ describe("GET /api/tasks/:id/session-files", () => {
expect(first.body).toEqual(["cached/file.ts"]);
expect(second.body).toEqual(["cached/file.ts"]);
expect(mockExecSync).toHaveBeenCalledTimes(2);
expect(mockExecSync).toHaveBeenCalledTimes(3);
vi.advanceTimersByTime(10001);
const third = await requestSessionFilesWithHandler(handler, "FN-675-cache");
expect(third.body).toEqual(["cached/file.ts"]);
expect(mockExecSync).toHaveBeenCalledTimes(4);
expect(mockExecSync).toHaveBeenCalledTimes(6);
});
});

53
packages/dashboard/src/routes.ts
View File

@@ -1925,49 +1925,52 @@ export function createApiRoutes(store: TaskStore, options?: ServerOptions): Rout
let files: string[] = [];
try {
let baseRef = task.baseCommitSha;
const fileSet = new Set<string>();
const baseBranch = task.baseBranch ?? "main";
let baseRef: string | undefined;
if (baseRef) {
try {
nodeChildProcess.execSync(`git merge-base --is-ancestor ${baseRef} HEAD`, {
try {
baseRef = nodeChildProcess.execSync(
`git merge-base HEAD origin/${baseBranch} 2>/dev/null || git merge-base HEAD ${baseBranch}`,
{
cwd: task.worktree,
stdio: "pipe",
encoding: "utf-8",
timeout: 5000,
});
} catch {
baseRef = undefined;
}
}
if (!baseRef) {
},
).trim();
} catch {
try {
baseRef = nodeChildProcess.execSync("git merge-base HEAD origin/main 2>/dev/null || git merge-base HEAD main", {
baseRef = nodeChildProcess.execSync("git rev-parse HEAD~1", {
cwd: task.worktree,
encoding: "utf-8",
timeout: 5000,
}).trim();
} catch {
try {
baseRef = nodeChildProcess.execSync("git rev-parse HEAD~1", {
cwd: task.worktree,
encoding: "utf-8",
timeout: 5000,
}).trim();
} catch {
baseRef = undefined;
}
baseRef = undefined;
}
}
if (baseRef) {
const output = nodeChildProcess.execSync(`git diff --name-only ${baseRef}..HEAD`, {
const committedOutput = nodeChildProcess.execSync(`git diff --name-only ${baseRef}..HEAD`, {
cwd: task.worktree,
encoding: "utf-8",
timeout: 5000,
}).trim();
files = output ? output.split("\n").filter(Boolean) : [];
for (const file of committedOutput.split("\n").filter(Boolean)) {
fileSet.add(file);
}
}
const workingTreeOutput = nodeChildProcess.execSync("git diff --name-only", {
cwd: task.worktree,
encoding: "utf-8",
timeout: 5000,
}).trim();
for (const file of workingTreeOutput.split("\n").filter(Boolean)) {
fileSet.add(file);
}
files = Array.from(fileSet);
} catch {
files = [];
}