mixdog 0.9.62 → 0.9.64

package/scripts/parent-abort-link-test.mjs

@@ -1,90 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import {
-  getSessionRuntime,
-  linkParentSignalToSession,
-  markSessionCancelled,
-  markSessionError,
-} from '../src/runtime/agent/orchestrator/session/manager.mjs';
-import {
-  _clearSessionRuntime,
-  _sweepTerminalSessionRuntimes,
-} from '../src/runtime/agent/orchestrator/session/manager/runtime-liveness.mjs';
-
-test('markSessionError drops parent AbortSignal listener but keeps runtime entry', () => {
-  const sessionId = `parent-abort-error-${Date.now()}`;
-  const parent = new AbortController();
-  linkParentSignalToSession(sessionId, parent.signal);
-  const runtime = getSessionRuntime(sessionId);
-  assert.ok(runtime?.parentAbortLink?.signal === parent.signal);
-  assert.equal(typeof runtime.parentAbortLink.listener, 'function');
-
-  markSessionError(sessionId, 'boom');
-
-  assert.equal(getSessionRuntime(sessionId)?.parentAbortLink, null);
-  assert.equal(getSessionRuntime(sessionId)?.stage, 'error');
-  let childAborted = false;
-  runtime.controller.signal.addEventListener('abort', () => { childAborted = true; }, { once: true });
-  parent.abort();
-  assert.equal(childAborted, false);
-});
-
-test('an already/early-aborted parent signal is retained and re-cascades onto a swapped controller', () => {
-  const sessionId = `parent-abort-early-${Date.now()}`;
-  const parent = new AbortController();
-  parent.abort(new Error('canceled before dispatch'));
-  linkParentSignalToSession(sessionId, parent.signal);
-  const runtime = getSessionRuntime(sessionId);
-  // The controller present at link time was aborted up front...
-  assert.equal(runtime.controller.signal.aborted, true);
-  // ...and the parent signal is RETAINED (listener null: nothing left to fire)
-  // so askSession's fresh-controller swap can detect + re-cascade the early abort.
-  assert.ok(runtime.parentAbortLink?.signal === parent.signal);
-  assert.equal(runtime.parentAbortLink.listener, null);
-  // Simulate askSession swapping in a fresh (non-aborted) controller, then
-  // re-linking the retained parent signal: the early abort must re-cascade so
-  // provider computation actually aborts instead of running detached.
-  const linked = runtime.parentAbortLink.signal;
-  runtime.controller = null;
-  linkParentSignalToSession(sessionId, linked);
-  assert.equal(runtime.controller.signal.aborted, true,
-    'early parent abort re-cascaded onto the freshly swapped controller');
-});
-
-test('markSessionCancelled drops parent AbortSignal listener but keeps runtime entry', () => {
-  const sessionId = `parent-abort-cancel-${Date.now()}`;
-  const parent = new AbortController();
-  linkParentSignalToSession(sessionId, parent.signal);
-  const runtime = getSessionRuntime(sessionId);
-  assert.ok(runtime?.parentAbortLink);
-
-  markSessionCancelled(sessionId);
-
-  assert.equal(getSessionRuntime(sessionId)?.parentAbortLink, null);
-  assert.equal(getSessionRuntime(sessionId)?.stage, 'done');
-  let childAborted = false;
-  runtime.controller.signal.addEventListener('abort', () => { childAborted = true; }, { once: true });
-  parent.abort();
-  assert.equal(childAborted, false);
-});
-
-test('terminal runtime sweep drains the full backlog but preserves in-flight controllers', () => {
-  const prefix = `terminal-retention-${Date.now()}`;
-  const terminalIds = Array.from({ length: 40 }, (_, i) => `${prefix}-${i}`);
-  for (const id of terminalIds) {
-    linkParentSignalToSession(id, new AbortController().signal);
-    markSessionError(id, 'finished');
-    getSessionRuntime(id).controller = null;
-  }
-  const activeId = `${prefix}-active`;
-  linkParentSignalToSession(activeId, new AbortController().signal);
-  markSessionError(activeId, 'provider still unwinding');
-
-  const cleaned = _sweepTerminalSessionRuntimes();
-
-  assert.ok(cleaned >= terminalIds.length, 'one pass drains every settled terminal entry');
-  for (const id of terminalIds) assert.equal(getSessionRuntime(id), null);
-  assert.ok(getSessionRuntime(activeId)?.controller, 'active in-flight controller is retained');
-  _clearSessionRuntime(activeId);
-});
-

package/scripts/patch-binary-cache-test.mjs

@@ -1,181 +0,0 @@
-import assert from 'node:assert/strict';
-import { createHash } from 'node:crypto';
-import {
-  mkdirSync, mkdtempSync, rmSync, writeFileSync,
-} from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import test from 'node:test';
-import {
-  ensurePatchBinary,
-  findCachedPatchBinary,
-} from '../src/runtime/agent/orchestrator/tools/patch-binary-fetcher.mjs';
-import {
-  ensureNativePatchBinaryAvailable,
-  nativePatchBinPath,
-} from '../src/runtime/agent/orchestrator/tools/patch/native-server.mjs';
-
-const pkey = `${process.platform === 'win32' ? 'win32' : process.platform}-${process.arch}`;
-const suffix = process.platform === 'win32' ? '.exe' : '';
-
-function sha256(body) {
-  return createHash('sha256').update(body).digest('hex');
-}
-
-function makeManifest(version, body, url = `https://github.com/tribgames/mixdog/releases/download/patch-v${version}/mixdog-patch-${pkey}${suffix}`) {
-  return {
-    version,
-    assets: { [pkey]: { url, sha256: sha256(body) } },
-  };
-}
-
-function fixture(t) {
-  const dataDir = mkdtempSync(join(tmpdir(), 'mixdog-patch-cache-'));
-  const binDir = join(dataDir, 'patch-bin');
-  mkdirSync(binDir, { recursive: true });
-  t.after(() => rmSync(dataDir, { recursive: true, force: true }));
-  return {
-    dataDir,
-    binDir,
-    bin(version) {
-      return join(binDir, `mixdog-patch-${version}${suffix}`);
-    },
-    localBin: join(dataDir, 'local-build', `mixdog-patch${suffix}`),
-  };
-}
-
-function nativeOptions(f, bundledManifest, download) {
-  return {
-    dataDir: f.dataDir,
-    defaultBin: f.localBin,
-    fetcherOptions: { bundledManifest, download },
-  };
-}
-
-test('stale cached manifest and binary cannot bypass native resolution', async (t) => {
-  const f = fixture(t);
-  const oldBody = Buffer.from('old binary');
-  const bundledBody = Buffer.from('bundled binary');
-  const bundledManifest = makeManifest('2.0.0', bundledBody);
-  writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(makeManifest('1.0.0', oldBody)));
-  writeFileSync(f.bin('1.0.0'), oldBody);
-  const options = nativeOptions(f, bundledManifest, async (_url, destination) => {
-    writeFileSync(destination, bundledBody);
-  });
-
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), null);
-  assert.equal(nativePatchBinPath(options), f.localBin);
-  assert.equal(await ensureNativePatchBinaryAvailable(options), f.bin('2.0.0'));
-});
-
-test('wrong-hash binary cannot bypass native resolution', async (t) => {
-  const f = fixture(t);
-  const expectedBody = Buffer.from('expected binary');
-  const manifest = makeManifest('2.0.0', expectedBody);
-  writeFileSync(f.bin('2.0.0'), 'wrong binary');
-  const options = nativeOptions(f, manifest, async (_url, destination) => {
-    writeFileSync(destination, expectedBody);
-  });
-
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest: manifest }), null);
-  assert.equal(nativePatchBinPath(options), f.localBin);
-  assert.equal(await ensureNativePatchBinaryAvailable(options), f.bin('2.0.0'));
-});
-
-test('exact bundled filename with the correct hash is selected', (t) => {
-  const f = fixture(t);
-  const body = Buffer.from('correct binary');
-  const manifest = makeManifest('2.0.0', body);
-  writeFileSync(f.bin('2.0.0'), body);
-
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest: manifest }), f.bin('2.0.0'));
-});
-
-test('upgrade downloads the bundled version through the network-free seam', async (t) => {
-  const f = fixture(t);
-  const oldBody = Buffer.from('old binary');
-  const newBody = Buffer.from('new binary');
-  const oldManifest = makeManifest('1.0.0', oldBody);
-  const bundledManifest = makeManifest('2.0.0', newBody);
-  writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(oldManifest));
-  writeFileSync(f.bin('1.0.0'), oldBody);
-  let downloads = 0;
-
-  const selected = await ensurePatchBinary(f.dataDir, {
-    bundledManifest,
-    download: async (url, destination) => {
-      downloads += 1;
-      assert.equal(url, bundledManifest.assets[pkey].url);
-      writeFileSync(destination, newBody);
-    },
-  });
-
-  assert.equal(downloads, 1);
-  assert.equal(selected, f.bin('2.0.0'));
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), selected);
-});
-
-test('only a trusted, strictly newer valid cached manifest may advance policy', (t) => {
-  const f = fixture(t);
-  const bundledBody = Buffer.from('bundled binary');
-  const newerBody = Buffer.from('newer binary');
-  const bundledManifest = makeManifest('2.0.0', bundledBody);
-  const newerManifest = makeManifest('2.1.0', newerBody);
-  writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(newerManifest));
-  writeFileSync(f.bin('2.1.0'), newerBody);
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), f.bin('2.1.0'));
-
-  newerManifest.assets[pkey].url = 'https://example.com/untrusted';
-  writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(newerManifest));
-  writeFileSync(f.bin('2.0.0'), bundledBody);
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), f.bin('2.0.0'));
-});
-
-test('equal-version cached manifest cannot replace bundled policy', (t) => {
-  const f = fixture(t);
-  const bundledBody = Buffer.from('bundled binary');
-  const bundledManifest = makeManifest('2.0.0', bundledBody);
-  const equalManifest = makeManifest('2.0.0', Buffer.from('different binary'));
-  writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(equalManifest));
-  writeFileSync(f.bin('2.0.0'), bundledBody);
-
-  assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), f.bin('2.0.0'));
-});
-
-for (const [label, badUrl] of [
-  ['wrong release tag', `https://github.com/tribgames/mixdog/releases/download/patch-v9.9.9/mixdog-patch-${pkey}${suffix}`],
-  ['wrong platform filename', `https://github.com/tribgames/mixdog/releases/download/patch-v2.1.0/mixdog-patch-wrong-platform${suffix}`],
-]) {
-  test(`newer cached manifest with ${label} cannot replace bundled policy`, (t) => {
-    const f = fixture(t);
-    const bundledBody = Buffer.from('bundled binary');
-    const newerBody = Buffer.from('newer binary');
-    const bundledManifest = makeManifest('2.0.0', bundledBody);
-    const newerManifest = makeManifest('2.1.0', newerBody, badUrl);
-    writeFileSync(join(f.binDir, 'manifest.json'), JSON.stringify(newerManifest));
-    writeFileSync(f.bin('2.0.0'), bundledBody);
-    writeFileSync(f.bin('2.1.0'), newerBody);
-
-    assert.equal(findCachedPatchBinary(f.dataDir, { bundledManifest }), f.bin('2.0.0'));
-  });
-}
-
-test('explicit native override and local cargo path retain precedence', (t) => {
-  const f = fixture(t);
-  const body = Buffer.from('cached binary');
-  const bundledManifest = makeManifest('2.0.0', body);
-  writeFileSync(f.bin('2.0.0'), body);
-  mkdirSync(join(f.dataDir, 'local-build'), { recursive: true });
-  writeFileSync(f.localBin, 'local binary');
-  const options = nativeOptions(f, bundledManifest);
-
-  assert.equal(nativePatchBinPath(options), f.localBin);
-  const previous = process.env.MIXDOG_PATCH_NATIVE_BIN;
-  process.env.MIXDOG_PATCH_NATIVE_BIN = join(f.dataDir, 'explicit-binary');
-  try {
-    assert.equal(nativePatchBinPath(options), process.env.MIXDOG_PATCH_NATIVE_BIN);
-  } finally {
-    if (previous === undefined) delete process.env.MIXDOG_PATCH_NATIVE_BIN;
-    else process.env.MIXDOG_PATCH_NATIVE_BIN = previous;
-  }
-});

package/scripts/path-suffix-test.mjs

@@ -1,57 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { findBySuffixStrip } from '../src/runtime/agent/orchestrator/tools/builtin/path-diagnostics.mjs';
-
-function makeRepo() {
-    const root = mkdtempSync(join(tmpdir(), 'mixdog-suffix-test-'));
-    mkdirSync(join(root, 'src', 'tui'), { recursive: true });
-    writeFileSync(join(root, 'src', 'tui', 'input-editing.mjs'), '// real file\n');
-    mkdirSync(join(root, 'vendor', 'ink', 'build'), { recursive: true });
-    writeFileSync(join(root, 'vendor', 'ink', 'build', 'index.js'), '// vendored\n');
-    return root;
-}
-
-test('resolves a hallucinated absolute prefix to the real repo-relative file', () => {
-    const root = makeRepo();
-    try {
-        const hallucinated = '/Users/danma/Local/Project/ink/src/tui/input-editing.mjs';
-        const hit = findBySuffixStrip(root, hallucinated);
-        assert.equal(hit, 'src/tui/input-editing.mjs');
-    } finally {
-        rmSync(root, { recursive: true, force: true });
-    }
-});
-
-test('resolves a hallucinated prefix onto a vendor/ path (no skip-dir filtering)', () => {
-    const root = makeRepo();
-    try {
-        const hallucinated = '/Users/danma/Local/Project/vendor/ink/build/index.js';
-        const hit = findBySuffixStrip(root, hallucinated);
-        assert.equal(hit, 'vendor/ink/build/index.js');
-    } finally {
-        rmSync(root, { recursive: true, force: true });
-    }
-});
-
-test('returns null when no tail length matches a real file', () => {
-    const root = makeRepo();
-    try {
-        const hit = findBySuffixStrip(root, '/Users/danma/Local/Project/does/not/exist.mjs');
-        assert.equal(hit, null);
-    } finally {
-        rmSync(root, { recursive: true, force: true });
-    }
-});
-
-test('a bare basename (1 segment) is never matched', () => {
-    const root = makeRepo();
-    try {
-        const hit = findBySuffixStrip(root, 'input-editing.mjs');
-        assert.equal(hit, null);
-    } finally {
-        rmSync(root, { recursive: true, force: true });
-    }
-});

package/scripts/pending-completion-drop-test.mjs

@@ -1,239 +0,0 @@
-// Deferred agent/tool *completion* notifications must:
-//   - SURVIVE a LIVE drain (they are the intended model-visible payload, e.g.
-//     the idle-resume kick delivering an async task body this process), and
-//   - be DROPPED on a RESUME drain (only the persisted copy remains after a
-//     restart, where replaying it would inject the body out-of-order).
-// Genuine user/steering messages survive with order preserved in both paths.
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, rmSync, readFileSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-// Redirect the pending-message spool to a throwaway dir before import so the
-// real ~/.mixdog/data spool is never touched.
-const dataDir = mkdtempSync(join(tmpdir(), 'mixpend-'));
-process.env.MIXDOG_DATA_DIR = dataDir;
-
-const {
-  enqueuePendingMessage,
-  drainPendingMessages,
-  hydratePendingMessages,
-  acknowledgePendingMessages,
-  recordPendingMessageDelivery,
-  finalizePendingMessageDelivery,
-  releasePendingMessages,
-  COMPLETION_NOTIFICATION_KIND,
-  markCompletionEntry,
-  _dropPendingMessageState,
-} = await import('../src/runtime/agent/orchestrator/session/manager/pending-messages.mjs');
-const texts = (entries) => entries.map((m) => (typeof m === 'string' ? m : m.text));
-
-test('live drain delivers the completion notification and keeps user order', () => {
-  const sid = 'sess_live_1';
-  enqueuePendingMessage(sid, 'user first');
-  enqueuePendingMessage(sid, markCompletionEntry('Async agent task xyz finished.\n\nResult:\n> done'));
-  enqueuePendingMessage(sid, 'user second');
-
-  // In-memory queue is populated (live, same process) → completion survives.
-  const delivered = drainPendingMessages(sid);
-  const drained = texts(delivered);
-  assert.ok(drained.includes('user first') && drained.includes('user second'), 'user messages kept');
-  assert.ok(drained.some((t) => /finished/.test(t)), 'live completion delivered, not dropped');
-  assert.ok(drained.indexOf('user first') < drained.indexOf('user second'), 'user order preserved');
-  acknowledgePendingMessages(sid, delivered);
-});
-
-test('live drain preserves interleaved [user, completion, user] order', () => {
-  // Buffered-persist copies of the live sends carry the same user texts but the
-  // completion is filtered out of the persisted path. The in-memory queue is
-  // authoritative, so the completion must stay BETWEEN the users and never be
-  // flattened to the tail as [user, user, completion].
-  const sid = 'sess_live_order';
-  enqueuePendingMessage(sid, 'user first');
-  enqueuePendingMessage(sid, markCompletionEntry('Async agent task zzz finished.\n\nResult:\n> done'));
-  enqueuePendingMessage(sid, 'user second');
-
-  const delivered = drainPendingMessages(sid);
-  const drained = texts(delivered);
-  const first = drained.indexOf('user first');
-  const second = drained.indexOf('user second');
-  const completion = drained.findIndex((t) => /finished/.test(t));
-  assert.ok(completion !== -1, 'completion present in live drain');
-  assert.ok(first < completion && completion < second, 'completion stays between the two users');
-  acknowledgePendingMessages(sid, delivered);
-});
-
-test('live drain asynchronously removes already-flushed persisted copies', async () => {
-  const sid = 'sess_live_flushed';
-  enqueuePendingMessage(sid, 'already flushed');
-  await new Promise((r) => setImmediate(r));
-  await new Promise((r) => setTimeout(r, 30));
-
-  const delivered = drainPendingMessages(sid);
-  assert.deepEqual(texts(delivered), ['already flushed']);
-  acknowledgePendingMessages(sid, delivered);
-  await new Promise((r) => setTimeout(r, 30));
-  const store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  assert.equal(store.sessions[sid], undefined, 'delivered live copy removed without a sync drain');
-});
-
-test('resume drain drops the completion notification, keeps user messages in order', async () => {
-  const sid = 'sess_resume_1';
-  enqueuePendingMessage(sid, 'user first');
-  enqueuePendingMessage(sid, markCompletionEntry('Async agent task xyz finished.\n\nResult:\n> done'));
-  enqueuePendingMessage(sid, 'user second');
-
-  // Flush the buffered persist to disk, then drop the in-memory queue → mimic a
-  // restart where only the persisted copy survives (the resume path).
-  await new Promise((r) => setImmediate(r));
-  await new Promise((r) => setTimeout(r, 30));
-  const store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  const persistedQueue = store.sessions[sid] || [];
-  const marked = persistedQueue.filter((e) => e && typeof e === 'object' && e.notificationKind === COMPLETION_NOTIFICATION_KIND);
-  assert.equal(marked.length, 1, 'completion notification persisted as a marked object');
-  _dropPendingMessageState(sid, { clearPersisted: false });
-
-  await hydratePendingMessages(sid);
-  const delivered = drainPendingMessages(sid);
-  const drained = texts(delivered);
-  assert.deepEqual(drained, ['user first', 'user second'], 'completion dropped on resume; user order kept');
-  assert.ok(!drained.some((t) => /finished/.test(t)), 'no completion prose replayed on resume');
-  acknowledgePendingMessages(sid, delivered);
-
-  // A second drain yields nothing — the completion was discarded, not deferred.
-  assert.deepEqual(drainPendingMessages(sid), []);
-});
-
-test('hydrate crash before publish leaves durable entries for replay', async () => {
-  const sid = 'sess_hydrate_crash';
-  enqueuePendingMessage(sid, 'survives crash window');
-  await new Promise((r) => setImmediate(r));
-  await new Promise((r) => setTimeout(r, 30));
-  await hydratePendingMessages(sid, { beforePublish: () => { throw new Error('simulated crash'); } });
-  const store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  assert.equal(store.sessions[sid].length, 1, 'hydrate never deletes before memory publish');
-  await hydratePendingMessages(sid);
-  const delivered = drainPendingMessages(sid);
-  assert.deepEqual(texts(delivered), ['survives crash window']);
-  acknowledgePendingMessages(sid, delivered);
-});
-
-test('ids preserve identical foreign messages and dedupe only replay copies', async () => {
-  const sid = 'sess_identical_ids';
-  enqueuePendingMessage(sid, 'identical');
-  enqueuePendingMessage(sid, 'identical');
-  await new Promise((r) => setImmediate(r));
-  await new Promise((r) => setTimeout(r, 30));
-  await hydratePendingMessages(sid);
-  const delivered = drainPendingMessages(sid);
-  assert.equal(delivered.length, 2, 'same text with distinct ids is delivered twice');
-  assert.notEqual(delivered[0].id, delivered[1].id);
-  acknowledgePendingMessages(sid, [delivered[0]]);
-  releasePendingMessages(sid, [delivered[1]]);
-  await new Promise((r) => setTimeout(r, 30));
-  const store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  assert.deepEqual(store.sessions[sid].map((entry) => entry.id), [delivered[1].id], 'ack removes only the matching id');
-});
-
-test('post-completion hydration sweep picks up a late foreign spool entry', async () => {
-  const sid = 'sess_late_foreign';
-  await hydratePendingMessages(sid);
-  const spool = join(dataDir, 'session-pending-messages.json');
-  const store = JSON.parse(readFileSync(spool, 'utf8'));
-  store.sessions[sid] = [{ id: 'foreign_late_id', message: 'late foreign message', enqueuedAt: Date.now() }];
-  store.sessionTouchedAt[sid] = Date.now();
-  writeFileSync(spool, JSON.stringify(store));
-
-  assert.equal(await hydratePendingMessages(sid), 1);
-  const delivered = drainPendingMessages(sid);
-  assert.deepEqual(texts(delivered), ['late foreign message']);
-  acknowledgePendingMessages(sid, delivered);
-});
-
-test('enqueue replaces caller ids and delivery tracking stays session-scoped', () => {
-  const firstSid = 'sess_untrusted_id_a';
-  const secondSid = 'sess_untrusted_id_b';
-  enqueuePendingMessage(firstSid, { id: 'caller_id', content: 'first', text: 'first' });
-  enqueuePendingMessage(secondSid, { id: 'caller_id', content: 'second', text: 'second' });
-  const first = drainPendingMessages(firstSid);
-  const second = drainPendingMessages(secondSid);
-  assert.notEqual(first[0].id, 'caller_id');
-  assert.notEqual(second[0].id, 'caller_id');
-  assert.notEqual(first[0].id, second[0].id);
-  releasePendingMessages(firstSid, first);
-  releasePendingMessages(secondSid, second);
-});
-
-test('over-512 unconfirmed ledger IDs are retained and suppress restart replay', async () => {
-  const sid = 'sess_delivered_ledger';
-  const session = { id: sid, deliveredPendingMessageIds: [] };
-  const entries = Array.from({ length: 600 }, (_, i) => ({
-    id: `delivered_${i}`,
-    content: `message ${i}`,
-    text: `message ${i}`,
-    enqueuedAt: i + 1,
-  }));
-  recordPendingMessageDelivery(session, entries);
-  assert.equal(session.deliveredPendingMessageIds.length, 600, 'unconfirmed ids are never evicted');
-
-  const { saveSession, setLiveSession, loadSession } = await import('../src/runtime/agent/orchestrator/session/store.mjs');
-  saveSession({ ...session, owner: 'user', createdAt: Date.now(), updatedAt: Date.now(), messages: [] });
-  setLiveSession(null);
-  const spool = join(dataDir, 'session-pending-messages.json');
-  const store = JSON.parse(readFileSync(spool, 'utf8'));
-  store.sessions[sid] = [{ id: 'delivered_0', message: 'old surviving spool entry', enqueuedAt: Date.now() }];
-  store.sessionTouchedAt[sid] = Date.now();
-  writeFileSync(spool, JSON.stringify(store));
-  assert.equal(await hydratePendingMessages(sid), 0);
-  assert.deepEqual(drainPendingMessages(sid), []);
-  setLiveSession(null);
-  assert.equal(
-    loadSession(sid).deliveredPendingMessageIds.includes('delivered_0'),
-    false,
-    'restart cleanup prunes its now-confirmed id from the durable ledger',
-  );
-  assert.equal(loadSession(sid).deliveredPendingMessageIds.length, 0, 'spool-absent ledger ids are stale too');
-});
-
-test('hydration prunes a ledger id whose spool entry was already deleted', async () => {
-  const sid = 'sess_orphaned_ledger_id';
-  const { saveSession, setLiveSession, loadSession } = await import('../src/runtime/agent/orchestrator/session/store.mjs');
-  saveSession({
-    id: sid,
-    owner: 'user',
-    createdAt: Date.now(),
-    updatedAt: Date.now(),
-    messages: [],
-    deliveredPendingMessageIds: ['cleanup_committed_before_crash'],
-  });
-  setLiveSession(null);
-  assert.equal(await hydratePendingMessages(sid), 0);
-  setLiveSession(null);
-  assert.deepEqual(loadSession(sid).deliveredPendingMessageIds, []);
-});
-
-test('spool cleanup waits for durable ledger save', async () => {
-  const sid = 'sess_durable_before_ack';
-  enqueuePendingMessage(sid, 'ordered cleanup');
-  await new Promise((r) => setImmediate(r));
-  await new Promise((r) => setTimeout(r, 30));
-  const delivered = drainPendingMessages(sid);
-  const session = { id: sid, deliveredPendingMessageIds: [] };
-  recordPendingMessageDelivery(session, delivered);
-  let releaseSave;
-  const durableSave = new Promise((resolve) => { releaseSave = resolve; });
-  const completing = finalizePendingMessageDelivery(session, delivered, durableSave);
-  await new Promise((r) => setImmediate(r));
-  let store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  assert.equal(store.sessions[sid].length, 1, 'spool remains until ledger save is durable');
-  releaseSave();
-  await completing;
-  store = JSON.parse(readFileSync(join(dataDir, 'session-pending-messages.json'), 'utf8'));
-  assert.equal(store.sessions[sid], undefined);
-  assert.deepEqual(session.deliveredPendingMessageIds, []);
-});
-
-test.after(() => {
-  try { rmSync(dataDir, { recursive: true, force: true }); } catch { /* ignore */ }
-});

package/scripts/pending-messages-lock-nonblocking-test.mjs

@@ -1,62 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, rmSync, writeFileSync, unlinkSync, readFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-const dataDir = mkdtempSync(join(tmpdir(), 'mixpend-lock-'));
-process.env.MIXDOG_DATA_DIR = dataDir;
-
-const {
-  hydratePendingMessages,
-  drainPendingMessages,
-  acknowledgePendingMessages,
-} = await import('../src/runtime/agent/orchestrator/session/manager/pending-messages.mjs');
-
-test('held pending spool lock does not block the completion-loop drain', async () => {
-  const sid = 'sess_lock_held';
-  const spool = join(dataDir, 'session-pending-messages.json');
-  const lock = `${spool}.lock`;
-  // Let the module's one-shot orphan sweep complete before reproducing the
-  // runtime completion scenario; the debugger lock is acquired mid-session.
-  await new Promise((resolve) => setImmediate(resolve));
-  writeFileSync(spool, JSON.stringify({
-    version: 1,
-    updatedAt: Date.now(),
-    sessions: { [sid]: ['persisted steering'] },
-    sessionTouchedAt: { [sid]: Date.now() },
-  }));
-  // A live-pid foreign token is deliberately not stale-reclaimable.
-  writeFileSync(lock, `${process.pid} ${Date.now()} debugger-held-lock\n`);
-
-  const started = Date.now();
-  let loopTickAt = 0;
-  const loopTick = new Promise((resolve) => {
-    setTimeout(() => {
-      loopTickAt = Date.now();
-      resolve();
-    }, 25);
-  });
-  const hydration = hydratePendingMessages(sid);
-
-  // The terminal path is synchronous but now memory-only.
-  assert.deepEqual(drainPendingMessages(sid), []);
-  await loopTick;
-  assert.ok(loopTickAt - started < 250, `event loop stalled ${loopTickAt - started}ms`);
-
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  unlinkSync(lock);
-  await hydration;
-  const delivered = drainPendingMessages(sid);
-  assert.deepEqual(delivered.map((entry) => entry.text), ['persisted steering']);
-  const stored = JSON.parse(readFileSync(spool, 'utf8'));
-  assert.equal(stored.sessions[sid].length, 1, 'hydrate is read-only until delivery ack');
-  acknowledgePendingMessages(sid, delivered);
-  await new Promise((resolve) => setTimeout(resolve, 30));
-  const acknowledged = JSON.parse(readFileSync(spool, 'utf8'));
-  assert.equal(acknowledged.sessions[sid], undefined);
-});
-
-test.after(() => {
-  try { rmSync(dataDir, { recursive: true, force: true }); } catch {}
-});