From 398e24e402cd7ae86aa49cfc0d5abd63990442f9 Mon Sep 17 00:00:00 2001 From: Gene Kogan <1335251+genekogan@users.noreply.github.com> Date: Mon, 16 Nov 2026 04:23:28 -0500 Subject: [PATCH 1/2] fix(take): a take's lazy baseline holds the take before's final state, not its body, so dropped takes are collected (#2585) Co-Authored-By: Claude Opus 5.5 --- mars/viewer/engine/take/recorder.ts | 4 +- packages/engine-mars/src/take-retain.test.ts | 41 ++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 packages/engine-mars/src/take-retain.test.ts diff --git a/mars/viewer/engine/take/recorder.ts b/mars/viewer/engine/take/recorder.ts index 66eceb56f..20b1088ca 100644 --- a/mars/viewer/engine/take/recorder.ts +++ b/mars/viewer/engine/take/recorder.ts @@ -439,7 +439,9 @@ export class TakeRecorder implements RuntimeObserver { if (table && table !== COPIES.get(world)?.table) TEXT.delete(table); return id; }); - return { take: take as Take, finalStateHash: () => body.finalStateHash as string }; + // #2585: the next take's baseline is this hash itself (it caches), holding only this take's final state: a function + // that read `body` would hold this take's body, and through its own lazy baseline every take before it, a chain + return { take: take as Take, finalStateHash }; } } diff --git a/packages/engine-mars/src/take-retain.test.ts b/packages/engine-mars/src/take-retain.test.ts new file mode 100644 index 000000000..b4b8c6d6e --- /dev/null +++ b/packages/engine-mars/src/take-retain.test.ts @@ -0,0 +1,41 @@ +// #2585: a take the engine no longer keeps is collected. Since #2422 each take's baseline hash is read lazily from the take +// before it; that function must hold only the earlier take's final state, never its body, or every take ever cut stays +// reachable from the current recorder (a chain), and a watched world's heap grows until the watchdog restarts it. +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { setFlagsFromString } from 'node:v8'; +import { runInNewContext } from 'node:vm'; +import { marsFactory, GREEN_FIELD_WORLD, type MarsEngine } from './engine.ts'; +import type { Take } from '../../../mars/viewer/engine/take/types.ts'; + +setFlagsFromString('--expose-gc'); +const gc = runInNewContext('gc') as () => void; +const factory = await marsFactory({ ...GREEN_FIELD_WORLD, heldActivitiesV1: true, soulsRepairV1: true }); + +/** Three bodies walk for 40 takes (the engine keeps 12); `watched` reads each new take's id, as a watched world's hub does. + * Returns how many of the first 20 takes' final states are still reachable. */ +async function stillHeld(watched: boolean) { + const e = factory.create(factory.genesis('take-retain-2585')) as MarsEngine; + for (const [id, label] of [['a', 'Ada'], ['b', 'Bo'], ['c', 'Cy']]) e.spawnHuman({ id, label, soul: `s_${id}` }); + const walk = (id: string, to: [number, number]) => assert.equal(e.perform({ actor: id, label: 'walk', steps: [{ verb: 'walk_to', params: { to } }] } as never).ok, true); + walk('a', [8, 2]); walk('b', [-7, 3]); walk('c', [3, -8]); + const refs = new Map>(); + for (let i = 0; i < 800; i++) { + e.step(); + for (const c of e.takeChunks(-1)) { + const t = c.take as Take; + if (refs.has(t.startTick)) continue; + refs.set(t.startTick, new WeakRef(t.finalState as object)); + if (watched) void t.id; + } + } + assert.ok(refs.size >= 39, `takes cut: ${refs.size}`); + await new Promise((r) => setImmediate(r)); + gc(); + return [...refs].sort((x, y) => x[0] - y[0]).slice(0, 20).filter(([, r]) => r.deref() !== undefined).map(([t]) => t); +} + +test('#2585: a take the engine has dropped is collected, watched or not', async () => { + assert.deepEqual(await stillHeld(true), [], 'watched: early takes still reachable'); + assert.deepEqual(await stillHeld(false), [], 'unwatched: early takes still reachable'); +}); From 3a00bd890fcb395209ce295f1accc7d0e0e3c3e0 Mon Sep 17 00:00:00 2001 From: Gene Kogan <1335251+genekogan@users.noreply.github.com> Date: Mon, 16 Nov 2026 04:25:40 -0500 Subject: [PATCH 2/2] changes: 2585 fragment Co-Authored-By: Claude Opus 5.5 --- changes/2585-take-baseline-chain.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/2585-take-baseline-chain.md diff --git a/changes/2585-take-baseline-chain.md b/changes/2585-take-baseline-chain.md new file mode 100644 index 000000000..9f4d3ef3d --- /dev/null +++ b/changes/2585-take-baseline-chain.md @@ -0,0 +1,4 @@ +--- +type: fix +--- +A watched world no longer keeps every recording it has ever made, so its memory stays level under many viewers instead of growing until it restarts.