mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 03:33:25 +00:00
fix(setup): preserve cleanup ownership and resource reports (#6920)
* fix(setup): report host-owned cleanup resources alongside the primary's
SetupHost.close documents that it reports the resources a setup host still
owns, but its contract returned only a string. runSetup therefore built the
ProviderCleanupError from the primary failure's cleanupResources alone, so a
resource the host failed to release reached the projection only inside a
free-text reason while the error asks the caller to review the reported local
resources.
Return a SetupCloseReport instead. closeSetupResources absorbs the structured
resources of any cause that reports them, through
ArtifactReaderFailure.cleanupObservation, and leaves opaque failures
message-only so no resource name is invented. runSetup then unions the host's
resources with the primary's before building the typed cleanup error.
Two boundary tests read the close result directly: the skill-cleanup case now
asserts the retained backup path in the report reason rather than in a bare
string, and the shared ownership helper takes an opaque close result because it
only ever awaits undefined from either host it is given.
Validation: RED then green in src/application/Setup.recovery.test.ts, where
the new case previously received only the primary resource; 116 tests across
the seven Setup and cleanup-ownership suites pass; tsc --noEmit over the
changed set, its setup callers, and both boundary tests exits 0; oxlint
reports 0 errors; oxfmt --check is clean; verify:module-boundaries passes.
The two failures in src/setupEnvironment.test.ts reproduce identically on
pristine bded9c628 with this change stashed.
* fix(setup): preserve cleanup ownership through host reports
* fix(setup): bind finalization reports to cleanup owners
* fix(setup): retain live resources in returned cleanup views
* fix(setup): preserve completed cleanup and exact installer resources
* fix(setup): retain delegated cleanup across authority changes
* fix(setup): compose callback and source cleanup authorities
* fix(setup): retain producer cleanup failure reasons
* fix(cli): render structured setup cleanup resources
* fix(setup): separate failure evidence from cleanup ownership
* fix(setup): normalize close failures and unify lease binding
* fix(setup): preserve direct lease resource attribution
---------
Co-authored-by: gensokyo-dev <342580529+gensokyo-dev@users.noreply.github.com>
This commit is contained in:
1 parent
bdf15b9bd5
commit
98ec00f406
23 files changed
+1543
-188
No files matched your search
@@ -4,7 +4,6 @@ import { describe, expect, it } from "vitest";
|
||||
|
||||
import {
|
||||
installMacHopper,
|
||||
installMacHopperBundle,
|
||||
type MacHopperBundleVerification,
|
||||
type MacHopperBundleInstallResult,
|
||||
type MacHopperInstallHost,
|
||||
@@ -233,3 +232,32 @@ it("reports an unresolved destination probe without claiming an existing install
|
||||
expect(host.installs).toBe(0);
|
||||
expect(host.unmounts).toBe(0);
|
||||
});
|
||||
|
||||
it("retains the exact DMG temporary root with its retry capability", async () => {
|
||||
const host = new FakeMacHopperHost();
|
||||
const retained: {
|
||||
close: () => Promise<void>;
|
||||
resources: readonly string[];
|
||||
}[] = [];
|
||||
let allowCleanup = false;
|
||||
const result = await installMacHopper(
|
||||
{},
|
||||
{
|
||||
...host,
|
||||
cleanup: async () => {
|
||||
if (!allowCleanup) throw new Error("DMG root busy");
|
||||
},
|
||||
retainCleanup: (close, resources) => {
|
||||
retained.push({ close, resources });
|
||||
},
|
||||
},
|
||||
);
|
||||
expect(result).toMatchObject({
|
||||
status: "installed",
|
||||
cleanupFailure: expect.stringContaining("DMG root busy"),
|
||||
});
|
||||
expect(retained).toHaveLength(1);
|
||||
expect(retained[0]?.resources).toEqual(["/tmp/rea-hopper-test"]);
|
||||
allowCleanup = true;
|
||||
await expect(retained[0]!.close()).resolves.toBeUndefined();
|
||||
});
|
||||
Reference in new issue
Block a user