mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-17 04:50:52 +00:00
* fix(terminal): soft-hide the tab that just left when hibernate keep is full Evict the oldest soft-hidden session to a full snapshot, and keep the session the user just left on hideRuntimeOnly. Disconnected sessions, alternate screen, and inline images keep their existing branches. Wake replay order is unchanged. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(terminal): full-hibernate when keep-count eviction is refused A soft-hidden session with inline images consumes the eviction request and stays mounted. Soft-hiding the tab that just left anyway let that protected session pin the oldest slot, so every later tab was retained too. Walk oldest-first, keep the leaving tab soft-hidden only after one victim actually leaves the set, and full-hibernate it when none can. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(terminal): retain a leaving tab only after eviction hibernates Waking a soft-hidden victim clears its marker before fullHibernateRuntime finishes. Treating that as success soft-hid the tab that just left even when drain, snapshot, or alternate-screen failure restored the victim. Await hibernate completion outside the pure keep-count helper, and put a failed victim back in the soft-hidden set so it stays a candidate. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix(terminal): reserve hibernate slots outside domain policy Keep the keep-count decision pure. The application walk reserves the leaving tab before awaiting a victim, rechecks that slot before soft-hide, and does not restore a victim that became visible or had hibernate turned off while the upgrade was in flight. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
115 lines
5.4 KiB
TypeScript
115 lines
5.4 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import test from "node:test";
|
|
|
|
import { terminalHiddenRendererStore } from "./terminalHiddenRendererStore.ts";
|
|
|
|
test("terminalHiddenRendererStore evicts oldest soft-hidden session", () => {
|
|
terminalHiddenRendererStore.clearSoftHidden("a");
|
|
terminalHiddenRendererStore.clearSoftHidden("b");
|
|
terminalHiddenRendererStore.markSoftHidden("a");
|
|
terminalHiddenRendererStore.markSoftHidden("b");
|
|
assert.equal(terminalHiddenRendererStore.pickEvictionCandidate(2), "a");
|
|
assert.deepEqual(terminalHiddenRendererStore.listSoftHiddenOldestFirst(), ["a", "b"]);
|
|
terminalHiddenRendererStore.clearSoftHidden("a");
|
|
terminalHiddenRendererStore.clearSoftHidden("b");
|
|
});
|
|
|
|
test("evictSoftHidden reports refusal and drops an unconsumed request", async () => {
|
|
const sessions = ["images", "plain", "other"];
|
|
for (const sessionId of sessions) terminalHiddenRendererStore.clearSoftHidden(sessionId);
|
|
terminalHiddenRendererStore.markSoftHidden("images");
|
|
terminalHiddenRendererStore.markSoftHidden("plain");
|
|
|
|
const unsubscribe = terminalHiddenRendererStore.subscribe(() => {
|
|
if (terminalHiddenRendererStore.consumeEvictionRequest("images")) return;
|
|
if (terminalHiddenRendererStore.consumeEvictionRequest("plain")) {
|
|
terminalHiddenRendererStore.clearSoftHidden("plain");
|
|
terminalHiddenRendererStore.settleEviction("plain", true);
|
|
}
|
|
});
|
|
|
|
try {
|
|
assert.equal(await terminalHiddenRendererStore.evictSoftHidden("images"), false);
|
|
assert.equal(terminalHiddenRendererStore.isSoftHidden("images"), true);
|
|
assert.equal(await terminalHiddenRendererStore.evictSoftHidden("plain"), true);
|
|
assert.equal(terminalHiddenRendererStore.isSoftHidden("plain"), false);
|
|
} finally {
|
|
unsubscribe();
|
|
for (const sessionId of sessions) terminalHiddenRendererStore.clearSoftHidden(sessionId);
|
|
}
|
|
|
|
terminalHiddenRendererStore.markSoftHidden("images");
|
|
assert.equal(await terminalHiddenRendererStore.evictSoftHidden("images"), false);
|
|
const delivered: string[] = [];
|
|
const later = terminalHiddenRendererStore.subscribe(() => {
|
|
if (terminalHiddenRendererStore.consumeEvictionRequest("images")) delivered.push("images");
|
|
});
|
|
try {
|
|
terminalHiddenRendererStore.markSoftHidden("other");
|
|
assert.deepEqual(delivered, []);
|
|
assert.equal(terminalHiddenRendererStore.isSoftHidden("images"), true);
|
|
} finally {
|
|
later();
|
|
for (const sessionId of sessions) terminalHiddenRendererStore.clearSoftHidden(sessionId);
|
|
}
|
|
});
|
|
|
|
test("a reserved leaving slot counts toward occupancy until it is released", () => {
|
|
const sessions = ["a", "b", "c", "d"];
|
|
for (const sessionId of sessions) terminalHiddenRendererStore.clearSoftHidden(sessionId);
|
|
terminalHiddenRendererStore.markSoftHidden("a");
|
|
terminalHiddenRendererStore.markSoftHidden("b");
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 2);
|
|
|
|
const alreadyHidden = terminalHiddenRendererStore.reserveLeavingSlot("a");
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 2);
|
|
terminalHiddenRendererStore.releaseLeavingSlot("a", alreadyHidden);
|
|
|
|
const tokenC = terminalHiddenRendererStore.reserveLeavingSlot("c");
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 3);
|
|
assert.equal(terminalHiddenRendererStore.leavingSlotStillFits("c", 2), false);
|
|
|
|
terminalHiddenRendererStore.clearSoftHidden("a");
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 2);
|
|
assert.equal(terminalHiddenRendererStore.leavingSlotStillFits("c", 2), true);
|
|
|
|
const tokenD = terminalHiddenRendererStore.reserveLeavingSlot("d");
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 3);
|
|
assert.equal(terminalHiddenRendererStore.leavingSlotStillFits("c", 2), false);
|
|
assert.equal(terminalHiddenRendererStore.leavingSlotStillFits("d", 2), false);
|
|
terminalHiddenRendererStore.releaseLeavingSlot("c", tokenD);
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 3);
|
|
terminalHiddenRendererStore.releaseLeavingSlot("c", tokenC);
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 2);
|
|
terminalHiddenRendererStore.releaseLeavingSlot("d", tokenD);
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 1);
|
|
|
|
for (const sessionId of sessions) terminalHiddenRendererStore.clearSoftHidden(sessionId);
|
|
assert.equal(terminalHiddenRendererStore.getSoftHiddenOccupancy(), 0);
|
|
});
|
|
|
|
test("evictSoftHidden waits for hibernate after the marker is cleared", async () => {
|
|
terminalHiddenRendererStore.clearSoftHidden("victim");
|
|
terminalHiddenRendererStore.markSoftHidden("victim");
|
|
let markerClearedBeforeSettle = false;
|
|
const unsubscribe = terminalHiddenRendererStore.subscribe(() => {
|
|
if (!terminalHiddenRendererStore.consumeEvictionRequest("victim")) return;
|
|
terminalHiddenRendererStore.clearSoftHidden("victim");
|
|
markerClearedBeforeSettle = !terminalHiddenRendererStore.isSoftHidden("victim");
|
|
queueMicrotask(() => {
|
|
terminalHiddenRendererStore.markSoftHidden("victim");
|
|
terminalHiddenRendererStore.settleEviction("victim", false);
|
|
});
|
|
});
|
|
|
|
try {
|
|
const completed = await terminalHiddenRendererStore.evictSoftHidden("victim");
|
|
assert.equal(markerClearedBeforeSettle, true);
|
|
assert.equal(completed, false);
|
|
assert.equal(terminalHiddenRendererStore.isSoftHidden("victim"), true);
|
|
} finally {
|
|
unsubscribe();
|
|
terminalHiddenRendererStore.clearSoftHidden("victim");
|
|
}
|
|
});
|