fix: address Codex review on PR #2569

This commit is contained in:
netcatty-bot committed 2026-07-28 09:50:44 +00:00
1 parent 44b87a815b
commit 16eae0d4e1
2 files changed
+67 -13

No files matched your search

@@ -2881,3 +2881,49 @@ test("panel completed sticks while directory walk is still in flight (issue #256
assert.equal(row?.status, "completed");
assert.equal(store.getSnapshot().activeCount, 0);
});
test("stale terminal panel snapshot cannot overwrite newer soft-control epoch", async (t) => {
const {
registerTransferWalk,
unregisterTransferWalk,
resetTransferWalkRegistryForTests,
} = await import("./sftp/transferWalkRegistry");
const { resetTransferControlEpochsForTests } = await import("./sftp/transferControlEpoch");
resetTransferWalkRegistryForTests();
resetTransferControlEpochsForTests();
registerTransferWalk("dir-live");
t.after(() => {
unregisterTransferWalk("dir-live");
resetTransferWalkRegistryForTests();
resetTransferControlEpochsForTests();
});
const store = createSftpTransferCenterStore();
store.publishOwner("panel-a", [{
...makeTask("dir-live", "transferring"),
fileName: "folder",
isDirectory: true,
progressMode: "files",
totalBytes: 10,
transferredBytes: 4,
lifecycleEpoch: 2,
}]);
// Delayed panel completion from before soft pause/resume must not win.
store.publishOwner("panel-a", [{
...makeTask("dir-live", "completed"),
fileName: "folder",
isDirectory: true,
progressMode: "files",
totalBytes: 10,
transferredBytes: 4,
endTime: Date.now(),
speed: 0,
lifecycleEpoch: 1,
}]);
const row = store.getSnapshot().tasks.find((task) => task.id === "dir-live");
assert.equal(row?.status, "transferring");
assert.equal(row?.lifecycleEpoch, 2);
assert.equal(store.getSnapshot().activeCount, 1);
});
+21 -13
View File
@@ -1135,14 +1135,15 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
);
// Runtime writer is authority for live walks: panel cannot roll lifecycle
// back past the process-global control epoch (soft pause/resume).
// Terminal panel statuses must stick: processTransfer paints completed
// via setTransfers before runWalk unregisters, and a default control
// epoch (0) is always > panel undefined (-1). Rejecting completed here
// left directory rows at 100% forever as "transferring" (#2568).
// Narrow #2568 exception: processTransfer paints completed via setTransfers
// before runWalk unregisters, and a default control epoch (0) is always >
// panel undefined (-1). Only skip the epoch guard for that unstamped
// default-epoch terminal race — older terminal snapshots after soft
// pause/resume must still lose to the runtime-owned newer epoch.
const runtimeOwned = isTransferWalkInFlight(task.id)
|| (task.parentTaskId ? isTransferWalkInFlight(task.parentTaskId) : false)
|| isTransferOrRootPauseLatched(task.parentTaskId ?? task.id, task.id);
if (runtimeOwned && !TERMINAL_OWNER_STATUSES.has(replacement.status)) {
if (runtimeOwned) {
const storeEpoch = Number.isFinite(task.lifecycleEpoch)
? (task.lifecycleEpoch as number)
: getTransferControlEpoch(task.parentTaskId ?? task.id);
@@ -1150,14 +1151,21 @@ export function createSftpTransferCenterStore(persistence?: StorePersistence): S
? (replacement.lifecycleEpoch as number)
: -1;
if (storeEpoch > panelEpoch) {
merged = {
...merged,
status: task.status,
lifecycleEpoch: task.lifecycleEpoch ?? merged.lifecycleEpoch,
speed: (task.status === "paused" || task.status === "pausing") ? 0 : merged.speed,
transferredBytes: Math.max(task.transferredBytes ?? 0, merged.transferredBytes ?? 0),
checkpointBytes: Math.max(task.checkpointBytes ?? 0, merged.checkpointBytes ?? 0),
};
const isDefaultEpochTerminalRace =
TERMINAL_OWNER_STATUSES.has(replacement.status)
&& !Number.isFinite(task.lifecycleEpoch)
&& !Number.isFinite(replacement.lifecycleEpoch)
&& storeEpoch === 0;
if (!isDefaultEpochTerminalRace) {
merged = {
...merged,
status: task.status,
lifecycleEpoch: task.lifecycleEpoch ?? merged.lifecycleEpoch,
speed: (task.status === "paused" || task.status === "pausing") ? 0 : merged.speed,
transferredBytes: Math.max(task.transferredBytes ?? 0, merged.transferredBytes ?? 0),
checkpointBytes: Math.max(task.checkpointBytes ?? 0, merged.checkpointBytes ?? 0),
};
}
}
}
if (areTransferTasksEquivalent(task, merged)) return [task];