mirror of
https://github.com/morluto/rea.git
synced 2026-11-15 11:13:21 +00:00
* refactor: prune internal seams and preserve configuration ownership * fix(setup): keep YAML aliases and inherited registration settings on refresh - Reuse an unchanged YAML collection only while every alias in it still resolves after the edit; otherwise rebuild it so the alias becomes its value. A sibling anchor replaced or moved in the same refresh no longer leaves an unresolved alias in Hermes or Goose output. - Keep a connection selector whose existing value already chooses stdio (for example an inherited Hermes transport: stdio) instead of superseding it; remote selectors are still replaced. Explicit stdio selectors are therefore no longer rewritten (Kimi expectation updated). - When the whole Hermes registration is inherited through a merge, override it with that merge and write only the changed fields. * fix(setup): edit registration fields whose YAML key is an alias A key written as an alias to a string scalar (for example *field with field: &field env) was treated as a source-only key, so any change to its value was refused in Hermes and Goose. Resolve such keys to their string, keep the aliased spelling while its anchor survives the edit, and write the plain key when the same edit rebuilds the anchor. * test(process): bound cleanup-boundary waits and always release gates Both cancellation tests awaited a bare started promise and released their gates only on success, so a missed boundary waited for the outer deadline and could leave cleanup parked. Use awaitAcknowledgement and release and join the cleanup in finally. * fix(setup): repair only aliases an edit leaves unresolved Replace the pre-edit alias survival guess, which expanded aliases to sibling anchors that survive unchanged, with an exact repair: record what each alias in the replaced value resolves to, write the edit, then replace only aliases left without a preceding anchor by that value. - Keep an aliased key's source position, so its anchor stays ahead of later aliases. - Treat an aliased key as its string only when no other key in the map resolves to the same string; an ambiguous one stays guarded. - Override an inherited Hermes registration only when the requested entry keeps every inherited field, so an explicit replacement can drop remote selectors. * fix(setup): repair aliases whose binding an edit changes, keeping comments An alias whose own anchor was removed could resolve to an earlier anchor with the same name and silently change value. Record the node each alias resolved to and repair any alias that no longer resolves to that node. Carry the alias's comments and spacing onto the repaired value. * test(setup): split the Hermes anchor and merge refresh cases * fix(setup): refuse removing an overridden key its merge would restore The merge-retention check skipped keys the mapping also overrides, so dropping such a key (for example a remote url during an explicit stdio replacement) let the retained merge restore it. Check removal before skipping overridden keys, so the edit is refused with the existing message instead of producing a registration that cannot be applied.
108 lines
3.4 KiB
TypeScript
108 lines
3.4 KiB
TypeScript
import { expect, it } from "vitest";
|
|
import {
|
|
VerifierArtifactCleanupFailure,
|
|
withVerifierArtifactScope,
|
|
} from "../../../scripts/lib/verifier-artifact-scope.mjs";
|
|
import type { ArtifactResourceScope } from "../../../src/artifacts/ArtifactResourceScope.js";
|
|
import { awaitAcknowledgement } from "../../fixtures/lifecycleAcknowledgement.js";
|
|
|
|
it("retains the exact scope for retry and preserves the operation failure", async () => {
|
|
const primary = new Error("analysis failed");
|
|
const cleanup = new Error("worker close failed");
|
|
let attempts = 0;
|
|
let scope: ArtifactResourceScope | undefined;
|
|
let failure: unknown;
|
|
try {
|
|
await withVerifierArtifactScope(async (owner) => {
|
|
scope = owner;
|
|
owner.addCloseHook(async () => {
|
|
if (++attempts === 1) throw cleanup;
|
|
});
|
|
throw primary;
|
|
});
|
|
} catch (cause) {
|
|
failure = cause;
|
|
}
|
|
expect(failure).toBeInstanceOf(VerifierArtifactCleanupFailure);
|
|
const aggregate = failure as VerifierArtifactCleanupFailure;
|
|
expect(aggregate.errors).toEqual([primary, cleanup]);
|
|
expect(aggregate.cause).toBe(primary);
|
|
expect(aggregate.cleanupOwner).toBe(scope);
|
|
await aggregate.cleanupOwner.close();
|
|
expect(attempts).toBe(2);
|
|
});
|
|
|
|
it("retains cleanup authority when the operation succeeds", async () => {
|
|
let attempts = 0;
|
|
let failure: unknown;
|
|
try {
|
|
await withVerifierArtifactScope(async (scope) => {
|
|
scope.addCloseHook(async () => {
|
|
if (++attempts === 1) throw new Error("close failed");
|
|
});
|
|
return "result";
|
|
});
|
|
} catch (cause) {
|
|
failure = cause;
|
|
}
|
|
expect(failure).toBeInstanceOf(VerifierArtifactCleanupFailure);
|
|
const aggregate = failure as VerifierArtifactCleanupFailure;
|
|
expect(aggregate.errors).toHaveLength(1);
|
|
await aggregate.cleanupOwner.close();
|
|
expect(attempts).toBe(2);
|
|
});
|
|
|
|
it("finishes every close hook when cancellation arrives during final cleanup", async () => {
|
|
const controller = new AbortController();
|
|
const cleanup = new Error("first close failed");
|
|
let release: (() => void) | undefined;
|
|
let entered: (() => void) | undefined;
|
|
const started = new Promise<void>((resolve) => {
|
|
entered = resolve;
|
|
});
|
|
const gate = new Promise<void>((resolve) => {
|
|
release = resolve;
|
|
});
|
|
const calls: string[] = [];
|
|
let attempts = 0;
|
|
const operation = withVerifierArtifactScope(async (scope) => {
|
|
scope.addCloseHook(async () => {
|
|
calls.push("first");
|
|
if (++attempts === 1) {
|
|
entered?.();
|
|
await gate;
|
|
if (controller.signal.aborted) throw cleanup;
|
|
}
|
|
});
|
|
scope.addCloseHook(async () => {
|
|
calls.push("second");
|
|
});
|
|
return "finished";
|
|
});
|
|
try {
|
|
await awaitAcknowledgement(
|
|
started,
|
|
operation,
|
|
"verifier artifact close hook",
|
|
);
|
|
controller.abort();
|
|
} finally {
|
|
// Release and join the parked cleanup even when the boundary is missed.
|
|
release?.();
|
|
await operation.catch(() => undefined);
|
|
}
|
|
let failure: unknown;
|
|
try {
|
|
await operation;
|
|
} catch (cause) {
|
|
failure = cause;
|
|
}
|
|
expect(controller.signal.aborted).toBe(true);
|
|
expect(failure).toBeInstanceOf(VerifierArtifactCleanupFailure);
|
|
expect(calls).toEqual(["first", "second"]);
|
|
const aggregate = failure as VerifierArtifactCleanupFailure;
|
|
expect(aggregate.errors).toEqual([cleanup]);
|
|
await aggregate.cleanupOwner.close();
|
|
expect(calls).toEqual(["first", "second", "first", "second"]);
|
|
});
|