@nklisch/pi-enhanced 0.1.10 → 0.2.0

package/node_modules/@nklisch/pi-plugins/dist/application/plugin-lifecycle-service.js

@@ -1,100 +1,34 @@
 import { z } from "zod";
 import { LifecycleOperationSchema, LifecycleOriginSchema, LifecycleRetainedDataSchema, LifecycleRejectionCodeSchema, } from "./plugin-lifecycle-contract.js";
-import { ActivationObservationSchema, LifecycleReloadResultSchema, } from "./ports/lifecycle-reload.js";
-import { createActiveProjectionExpectation, createPluginRuntimeProjection, verifyProjectionExpectation, } from "./ports/runtime-projection.js";
-import { createLifecycleTransitionRecord, } from "./ports/lifecycle-transition-store.js";
-import { authorizeAutomaticUpdateCandidate, createAutomaticUpdateAuthorizationEvidence } from "./automatic-update-authorization.js";
-import { resolveEffectiveUpdatePolicy } from "./update-policy-resolution.js";
-import { prepareEnableCandidate, prepareInactiveProjection, preparePluginCandidate, } from "./plugin-candidate-preparation.js";
-import { CandidateContentCleanupError, isCandidateContentCleanupError, } from "./ports/candidate-content-lease.js";
+import { runScopedMutation } from "./state-transaction.js";
+import { prepareEnableCandidate, prepareInactiveProjection, preparePluginCandidate } from "./plugin-candidate-preparation.js";
+import { CandidateContentCleanupError, isCandidateContentCleanupError } from "./ports/candidate-content-lease.js";
 import { deriveLifecycleTargetDigest } from "./native-lifecycle-target.js";
 import { PluginConfigurationReadResultSchema } from "./ports/plugin-configuration-store.js";
 import { verifyPluginConfigurationDocument } from "../domain/configured-values.js";
-import { parseStateMutation, } from "./state-contract.js";
-import { createInstalledRevisionRecord, InstalledPluginRecordSchema, } from "../domain/state/installed-state.js";
-import { createInstalledUserStateDocument, } from "../domain/state/installed-state.js";
+import { parseStateMutation } from "./state-contract.js";
+import { createInstalledRevisionRecord, InstalledPluginRecordSchema, createInstalledUserStateDocument, } from "../domain/state/installed-state.js";
 import { createProjectLocalStateDocument } from "../domain/state/project-state.js";
-import { ScopeContextSchema, createScopeContext, toScopeReference, } from "../domain/state/scope.js";
+import { ScopeContextSchema, createScopeContext, toScopeReference } from "../domain/state/scope.js";
 import { PluginKeySchema } from "../domain/identity.js";
-import { deriveMarketplaceSourceIdentity, derivePluginSourceIdentity, MarketplaceUpdateRecordSchema } from "../domain/update-policy.js";
-import { createTrustCandidate } from "../domain/trust-policy.js";
-import { createLifecycleTransitionReconciler } from "./lifecycle-transition-reconciler.js";
-import { CommittedMutationCleanupError } from "./generation-mutation-coordinator.js";
-class GuardMismatch extends Error {
-    generation;
-    constructor(generation) {
-        super("lifecycle target changed while a prepared transition was waiting");
-        this.name = "GuardMismatch";
-        this.generation = generation;
-    }
-}
-class PromotionFailure extends Error {
-    constructor() {
-        super("content promotion did not return the requested immutable revision");
-        this.name = "PromotionFailure";
-    }
-}
-class ConfigurationGuardMismatch extends Error {
-    constructor() {
-        super("prepared configuration authority changed");
-        this.name = "ConfigurationGuardMismatch";
-    }
-}
-class ConfigurationGuardUnavailable extends Error {
-    constructor() {
-        super("prepared configuration authority is unavailable");
-        this.name = "ConfigurationGuardUnavailable";
-    }
-}
-function sameJson(left, right) {
-    return JSON.stringify(left) === JSON.stringify(right);
-}
-function asScopeContext(input, sha256) {
-    return createScopeContext(ScopeContextSchema.parse(input), sha256);
-}
+import { GenerationSchema } from "../domain/state/config-state.js";
+import { ContentDigestSchema } from "../domain/content-manifest.js";
+function sameJson(left, right) { return JSON.stringify(left) === JSON.stringify(right); }
+function asScopeContext(input, sha256) { return createScopeContext(ScopeContextSchema.parse(input), sha256); }
 function targetRecord(snapshot, plugin) {
-    return "installed" in snapshot
-        ? snapshot.installed.plugins.find((record) => record.plugin === plugin)
-        : snapshot.project.plugins.find((record) => record.plugin === plugin);
-}
-function withoutPending(record) {
-    const { pendingTransition: _pendingTransition, ...value } = record;
-    return InstalledPluginRecordSchema.parse(value);
-}
-function withPending(record, reference, _sha256) {
-    return InstalledPluginRecordSchema.parse({ ...withoutPending(record), pendingTransition: reference });
-}
-function scopeRecords(snapshot) {
-    return "installed" in snapshot ? snapshot.installed.plugins : snapshot.project.plugins;
+    return "installed" in snapshot ? snapshot.installed.plugins.find((record) => record.plugin === plugin) : snapshot.project.plugins.find((record) => record.plugin === plugin);
 }
+function records(snapshot) { return "installed" in snapshot ? snapshot.installed.plugins : snapshot.project.plugins; }
 function replaceTarget(snapshot, plugin, replacement, sha256) {
-    const records = scopeRecords(snapshot).filter((record) => record.plugin !== plugin);
+    const next = records(snapshot).filter((record) => record.plugin !== plugin);
     if (replacement !== null)
-        records.push(replacement);
+        next.push(replacement);
     if ("installed" in snapshot) {
-        const installed = createInstalledUserStateDocument({
-            ...snapshot.installed,
-            generation: snapshot.generation,
-            plugins: records,
-        }, sha256);
-        return parseStateMutation({
-            scope: snapshot.scope,
-            expectedGeneration: snapshot.generation,
-            replace: { installed },
-        }, sha256);
+        const installed = createInstalledUserStateDocument({ ...snapshot.installed, generation: snapshot.generation, plugins: next }, sha256);
+        return parseStateMutation({ scope: snapshot.scope, expectedGeneration: snapshot.generation, replace: { installed } }, sha256);
     }
-    // Lifecycle owns only the target plugin. Rebuilding through the current
-    // constructor preserves declaration, policy, scheduler, and registration evidence.
-    const project = createProjectLocalStateDocument({
-        ...snapshot.project,
-        generation: snapshot.generation,
-        plugins: records,
-    }, snapshot.scope, sha256);
-    return parseStateMutation({
-        scope: snapshot.scope,
-        expectedGeneration: snapshot.generation,
-        replace: { project },
-    }, sha256);
+    const project = createProjectLocalStateDocument({ ...snapshot.project, generation: snapshot.generation, plugins: next }, snapshot.scope, sha256);
+    return parseStateMutation({ scope: snapshot.scope, expectedGeneration: snapshot.generation, replace: { project } }, sha256);
 }
 function mapPreparationCode(code) {
     switch (code) {
@@ -108,23 +42,15 @@ function mapPreparationCode(code) {
         default: return "MALFORMED";
     }
 }
-function safeFailure(error) {
-    if (error instanceof DOMException && error.name === "AbortError")
-        return { kind: "adapter-error", code: "ABORTED" };
-    if (error !== null && typeof error === "object" && "name" in error && error.name === "AbortError") {
-        return { kind: "adapter-error", code: "ABORTED" };
-    }
-    return { kind: "adapter-error", code: "ADAPTER_FAILED" };
-}
-function cleanupSignal() {
-    return new AbortController().signal;
-}
+function operationOrigin(request) { return LifecycleOriginSchema.parse(request.origin ?? "manual"); }
+function retainedData(request) { return LifecycleRetainedDataSchema.parse(request.retainedData ?? "keep"); }
+function current(operation, snapshot) { return { kind: "current", operation, snapshot }; }
+function rejected(operation, code) { return { kind: "rejected", operation, code: LifecycleRejectionCodeSchema.parse(code) }; }
+function cleanupSignal() { return new AbortController().signal; }
 async function discardCandidate(dependencies, candidate) {
     if (candidate?.allocation === undefined)
         return;
-    const recovery = Object.freeze({
-        retry: () => dependencies.content.discardStaging(candidate.allocation, cleanupSignal()),
-    });
+    const recovery = Object.freeze({ retry: () => dependencies.content.discardStaging(candidate.allocation, cleanupSignal()) });
     try {
         await recovery.retry();
     }
@@ -132,241 +58,100 @@ async function discardCandidate(dependencies, candidate) {
         throw new CandidateContentCleanupError(recovery, { cause: error });
     }
 }
-async function preparePreviousExpectation(dependencies, scope, plugin, previous, signal) {
-    if (previous === undefined || previous.activation === "disabled") {
-        return prepareInactiveProjection(dependencies, { scope, plugin }, signal);
+async function exactConfigurationState(dependencies, prepared, expected) {
+    if (expected === undefined)
+        return "current";
+    if (prepared === undefined || prepared.revision.configurationRef === undefined)
+        return "stale";
+    try {
+        const result = PluginConfigurationReadResultSchema.parse(await dependencies.configurations.read(prepared.revision.configurationRef, cleanupSignal()));
+        if (result.kind === "missing")
+            return "stale";
+        const document = verifyPluginConfigurationDocument(result.document, prepared.normalized.configuration, dependencies.sha256);
+        return document.configurationRef === prepared.revision.configurationRef && document.plugin === prepared.plugin && sameJson(document.scope, toScopeReference(prepared.scope)) && document.revision === expected ? "current" : "stale";
     }
-    const selected = previous.revisions.find((revision) => revision.revision === previous.selectedRevision);
-    if (selected === undefined)
-        throw new Error("installed state selected revision is missing");
-    const loaded = await dependencies.installed.load({ scope, revision: selected }, signal);
-    if (loaded.binding !== selected.revision || loaded.plugin.identity.key !== plugin)
-        throw new Error("installed loader returned a different selected revision");
-    const reconstructed = createInstalledRevisionRecord({
-        plugin: loaded.plugin,
-        compatibility: loaded.compatibility,
-        content: loaded.content,
-        revision: selected.revision,
-        contentRef: selected.contentRef,
-        dataRef: selected.dataRef,
-        ...(selected.configurationRef === undefined ? {} : { configurationRef: selected.configurationRef }),
-        ...(selected.evidence.source.marketplaceSourceIdentity === undefined ? {} : { marketplaceSourceIdentity: selected.evidence.source.marketplaceSourceIdentity }),
-        ...(selected.evidence.source.pluginSourceIdentity === undefined ? {} : { pluginSourceIdentity: selected.evidence.source.pluginSourceIdentity }),
-        ...(selected.evidence.source.declaredVersion === undefined ? {} : { declaredVersion: selected.evidence.source.declaredVersion }),
-        scope: toScopeReference(scope),
-    }, dependencies.sha256);
-    if (!sameJson(reconstructed, selected))
-        throw new Error("installed loader evidence does not match selected state");
-    const projection = createActiveProjectionExpectation(createPluginRuntimeProjection({
-        scope: toScopeReference(scope),
-        plugin: loaded.plugin,
-        compatibility: loaded.compatibility,
-        revision: selected,
-        sha256: dependencies.sha256,
-    }), dependencies.sha256);
-    const prepared = await dependencies.projections.prepare(projection, signal);
-    const verified = verifyProjectionExpectation(prepared, dependencies.sha256);
-    if (!sameJson(verified, projection))
-        throw new Error("previous projection adapter returned different evidence");
-    return verified;
-}
-function observationMatches(observation, expectation, plugin) {
-    if (expectation.kind === "inactive") {
-        return observation.kind === "inactive" &&
-            sameJson(observation.scope, expectation.scope) &&
-            observation.plugin === plugin &&
-            observation.projectionDigest === expectation.digest;
+    catch {
+        return "unavailable";
     }
-    return observation.kind === "active" &&
-        sameJson(observation.scope, expectation.projection.scope) &&
-        observation.plugin === plugin &&
-        observation.revision === expectation.projection.revision &&
-        observation.projectionDigest === expectation.projection.digest;
 }
-async function reloadAndObserve(dependencies, scope, plugin, transition, expectation, signal) {
+function appendPrevious(candidate, previous, operation) {
+    if (operation !== "update" || previous === undefined)
+        return candidate;
+    const previousRevision = previous.selectedRevision === candidate.selectedRevision
+        ? previous.previousRevision
+        : previous.selectedRevision;
+    return InstalledPluginRecordSchema.parse({
+        ...candidate,
+        ...(previousRevision === undefined ? {} : { previousRevision }),
+    });
+}
+function sourceEvidenceMatches(candidate, expected) {
+    const actual = candidate.evidence.source;
+    const wanted = expected.evidence.source;
+    if (actual.kind !== wanted.kind || actual.sourceHash !== wanted.sourceHash)
+        return false;
+    if ("revision" in actual && "revision" in wanted && actual.revision !== wanted.revision)
+        return false;
+    if ("marketplaceRevision" in actual && "marketplaceRevision" in wanted && actual.marketplaceRevision !== wanted.marketplaceRevision)
+        return false;
+    if (actual.kind === "npm" && wanted.kind === "npm" && actual.sourceRevision !== wanted.sourceRevision)
+        return false;
+    return true;
+}
+async function activate(dependencies, operation, scope, snapshot, plugin, signal) {
     try {
-        const reloadResult = LifecycleReloadResultSchema.parse(await dependencies.reload.reload({ scope: toScopeReference(scope), transition }, signal));
-        if (reloadResult.kind === "failed") {
-            // Missing reload authority (no reload-capable pi context) is reported
-            // distinctly from a genuine reload failure: updates settle staged
-            // instead of rolling back when activation simply cannot be driven here.
-            if (reloadResult.code === "PI_RELOAD_CONTEXT_UNAVAILABLE") {
-                return { ok: false, failure: { kind: "activation-unavailable", code: "PI_RELOAD_CONTEXT_UNAVAILABLE" } };
+        const result = await dependencies.reload.reload({ scope: toScopeReference(scope) }, signal);
+        if (result.kind === "accepted") {
+            const degraded = result.report?.kind === "degraded"
+                ? result.report.degraded.find((entry) => entry.plugin === plugin && (entry.scope === undefined || sameJson(entry.scope, toScopeReference(scope))))
+                : undefined;
+            if (degraded !== undefined) {
+                return {
+                    kind: "degraded",
+                    operation,
+                    snapshot,
+                    failure: { plugin, code: degraded.code, explanation: degraded.explanation },
+                    ...(degraded.runningRevision === undefined ? {} : { runningRevision: ContentDigestSchema.parse(degraded.runningRevision) }),
+                };
             }
-            return { ok: false, failure: { kind: "reload-rejected", code: "RELOAD_REJECTED" } };
+            return { kind: "applied", operation, snapshot, activation: "applied" };
         }
-        const observation = ActivationObservationSchema.parse(await dependencies.reload.observe({ scope: toScopeReference(scope), plugin }, signal));
-        if (!observationMatches(observation, expectation, plugin)) {
-            return { ok: false, failure: { kind: "observation-mismatch", code: "OBSERVATION_MISMATCH" } };
-        }
-        return { ok: true, observation };
-    }
-    catch (error) {
-        return { ok: false, failure: safeFailure(error) };
+        if (result.code === "PI_RELOAD_CONTEXT_UNAVAILABLE")
+            return { kind: "live-next-start", operation, snapshot, note: "no-reload-context" };
+        return { kind: "live-next-start", operation, snapshot, note: "reload-failed" };
     }
-}
-function candidateForOperation(operation, previous, prepared, _sha256) {
-    if (operation === "disable" || operation === "uninstall") {
-        return InstalledPluginRecordSchema.parse({ ...withoutPending(previous), activation: "disabled" });
+    catch {
+        return { kind: "live-next-start", operation, snapshot, note: "reload-failed" };
     }
-    if (prepared === undefined)
-        throw new Error("activation candidate is missing");
-    return prepared.record;
-}
-function operationOrigin(request) {
-    return LifecycleOriginSchema.parse(request.origin ?? "manual");
-}
-function retainedData(request) {
-    return LifecycleRetainedDataSchema.parse("retainedData" in request ? request.retainedData ?? "keep" : "keep");
-}
-function noOp(operation, snapshot) {
-    return { kind: "unchanged", operation, snapshot };
-}
-function rejected(operation, code) {
-    return { kind: "rejected", operation, code: LifecycleRejectionCodeSchema.parse(code) };
 }
-function recovery(operation, transition, committed) {
-    return committed === undefined
-        ? { kind: "recovery-required", operation, transition }
-        : { kind: "recovery-required", operation, transition, committed };
+function mapMutation(operation, result, signal) {
+    if (result.kind === "committed")
+        return { kind: "committed", snapshot: result.snapshot };
+    if (result.kind === "stale")
+        return { kind: "stale", operation, expected: GenerationSchema.parse(result.expected), ...(result.actual === undefined ? {} : { actual: GenerationSchema.parse(result.actual) }) };
+    if (result.kind === "retryable")
+        return rejected(operation, result.code);
+    if (result.kind === "reject")
+        return result.value;
+    if (result.kind === "no-op")
+        return result.value;
+    if (signal.aborted)
+        return rejected(operation, "ABORTED");
+    return rejected(operation, "MALFORMED");
 }
 function createPluginLifecycleImplementation(dependencies) {
     if (dependencies === null || typeof dependencies !== "object")
         throw new TypeError("lifecycle service dependencies are required");
     const preparation = dependencies;
-    const reconciler = createLifecycleTransitionReconciler({
-        state: dependencies.state,
-        mutations: dependencies.mutations,
-        reload: dependencies.reload,
-        transitions: dependencies.transitions,
-        sha256: dependencies.sha256,
-    });
     async function load(scope, signal) {
         const result = await dependencies.state.read(scope, signal);
         return result.ok ? result.snapshot : undefined;
     }
-    async function releaseStagedOwnership(scope, reference) {
-        if (dependencies.transitions.releaseOwnership === undefined)
-            return;
-        // The stage commit is already durable; this handoff write must complete
-        // even when the caller aborts, exactly like ledger settlement. Failure
-        // only degrades to the pre-existing fence: the row stays owned by this
-        // process and recovery adopts it after this process exits.
-        try {
-            await dependencies.transitions.releaseOwnership({ scope: toScopeReference(scope), reference }, cleanupSignal());
-        }
-        catch { /* next start still recovers through owner death */ }
-    }
-    async function trustFor(scope, requestRecords, signal) {
-        if (requestRecords !== undefined)
-            return requestRecords;
-        const snapshot = await load({ kind: "user" }, signal);
-        return snapshot !== undefined && "trust" in snapshot ? snapshot.trust.records : [];
-    }
-    async function exactConfigurationState(prepared, expectedRevision) {
-        if (expectedRevision === undefined)
-            return "current";
-        const ref = prepared?.revision.configurationRef;
-        if (ref === undefined || prepared === undefined)
-            return "stale";
-        try {
-            const result = PluginConfigurationReadResultSchema.parse(await dependencies.configurations.read(ref, new AbortController().signal));
-            if (result.kind === "missing")
-                return "stale";
-            const document = verifyPluginConfigurationDocument(result.document, prepared.normalized.configuration, dependencies.sha256);
-            return document.configurationRef === ref && document.plugin === prepared.plugin &&
-                sameJson(document.scope, toScopeReference(prepared.scope)) && document.revision === expectedRevision
-                ? "current"
-                : "stale";
-        }
-        catch {
-            return "unavailable";
-        }
-    }
-    async function runFirstCommit(operation, scope, plugin, before, previous, candidate, prepared, reference, expectedConfigurationRevision, signal) {
-        let expected = before.generation;
-        for (let attempt = 0; attempt < 2; attempt += 1) {
-            try {
-                const result = await dependencies.mutations.runPreparedMutation({ scope, plugins: [plugin], expectedGeneration: expected }, async (context) => {
-                    await context.assertOwned();
-                    const current = targetRecord(context.snapshot, plugin);
-                    if (!sameJson(current, previous))
-                        throw new GuardMismatch(context.snapshot.generation);
-                    const configurationState = await exactConfigurationState(prepared, expectedConfigurationRevision);
-                    if (configurationState === "stale")
-                        throw new ConfigurationGuardMismatch();
-                    if (configurationState === "unavailable")
-                        throw new ConfigurationGuardUnavailable();
-                    let promotion;
-                    if (prepared?.promotion !== undefined) {
-                        try {
-                            promotion = await dependencies.content.promote(prepared.promotion, signal);
-                        }
-                        catch {
-                            throw new PromotionFailure();
-                        }
-                        if (!sameJson(promotion.identity, prepared.promotion.identity) || !sameJson(promotion.manifest, prepared.promotion.manifest)) {
-                            throw new PromotionFailure();
-                        }
-                    }
-                    return {
-                        mutation: replaceTarget(context.snapshot, plugin, withPending(candidate, reference, dependencies.sha256), dependencies.sha256),
-                        value: promotion,
-                    };
-                }, signal);
-                if (result.kind === "committed")
-                    return { kind: "committed", snapshot: result.snapshot };
-                if (result.kind === "stale-generation") {
-                    if (attempt === 1)
-                        return { kind: "stale", expected: result.expected, actual: result.actual };
-                    const fresh = await load(scope, signal);
-                    if (fresh === undefined)
-                        return { kind: "recovery" };
-                    if (targetRecord(fresh, plugin) !== undefined && !sameJson(targetRecord(fresh, plugin), previous)) {
-                        return { kind: "stale", expected: expected, actual: fresh.generation };
-                    }
-                    if (targetRecord(fresh, plugin) === undefined && previous !== undefined) {
-                        return { kind: "stale", expected: expected, actual: fresh.generation };
-                    }
-                    expected = fresh.generation;
-                    continue;
-                }
-                if (result.kind === "commit-failed")
-                    return { kind: "rejected", code: "MALFORMED" };
-                // A concurrent unrelated writer can advance the scope between the
-                // store commit and the coordinator's verification read. Resolve that
-                // ambiguous outcome from current authority only when our exact
-                // pending candidate and transition reference are durably present.
-                const fresh = await load(scope, signal);
-                const freshTarget = fresh === undefined ? undefined : targetRecord(fresh, plugin);
-                const expectedTarget = withPending(candidate, reference, dependencies.sha256);
-                if (fresh !== undefined && sameJson(freshTarget, expectedTarget)) {
-                    return { kind: "committed", snapshot: fresh };
-                }
-                return result.actual === undefined
-                    ? { kind: "recovery" }
-                    : { kind: "recovery", committed: result.actual };
-            }
-            catch (error) {
-                // The coordinator preserves durable commit evidence when only scope
-                // lease cleanup fails. Replaying would be unsafe; continue the
-                // transition from the exact committed snapshot instead.
-                if (error instanceof CommittedMutationCleanupError)
-                    return { kind: "committed", snapshot: error.committed.snapshot };
-                if (signal.aborted)
-                    return { kind: "rejected", code: "ABORTED" };
-                if (error instanceof GuardMismatch)
-                    return { kind: "stale", expected, actual: error.generation };
-                if (error instanceof ConfigurationGuardMismatch)
-                    return { kind: "rejected", code: "CONFIGURATION_STALE" };
-                if (error instanceof ConfigurationGuardUnavailable)
-                    return { kind: "rejected", code: "MALFORMED" };
-                if (error instanceof PromotionFailure)
-                    return { kind: "rejected", code: "PROMOTION_FAILED" };
-                return { kind: "recovery" };
-            }
-        }
-        return { kind: "stale", expected, actual: expected };
+    async function trustFor(request, signal) {
+        if (request.trustRecords !== undefined)
+            return request.trustRecords;
+        const result = await dependencies.state.read({ kind: "user" }, signal);
+        return result.ok && "trust" in result.snapshot ? result.snapshot.trust.records : [];
     }
     async function execute(operation, request, signal) {
         LifecycleOperationSchema.parse(operation);
@@ -374,124 +159,34 @@ function createPluginLifecycleImplementation(dependencies) {
             return rejected(operation, "ABORTED");
         const scope = asScopeContext(request.scope, dependencies.sha256);
         const plugin = PluginKeySchema.parse(request.plugin);
-        const origin = operationOrigin(request);
-        let initial;
-        try {
-            initial = await load(scope, signal);
-        }
-        catch {
-            return rejected(operation, signal.aborted ? "ABORTED" : "MALFORMED");
-        }
+        const initial = await load(scope, signal).catch(() => undefined);
         if (initial === undefined)
             return rejected(operation, "MALFORMED");
         const previous = targetRecord(initial, plugin);
-        if (previous?.pendingTransition !== undefined)
-            return rejected(operation, "PENDING_TRANSITION");
         const expectedTarget = "expectedTarget" in request ? request.expectedTarget : undefined;
-        if (expectedTarget !== undefined) {
-            if (expectedTarget.plugin !== plugin || previous === undefined || previous.pendingTransition !== undefined ||
-                previous.selectedRevision !== expectedTarget.selectedRevision || previous.activation !== expectedTarget.activation ||
-                deriveLifecycleTargetDigest(toScopeReference(scope), previous, dependencies.sha256) !== expectedTarget.targetDigest) {
-                return { kind: "stale", operation, expected: expectedTarget.generation, actual: initial.generation };
-            }
-        }
-        if (operation === "enable" && (previous === undefined || previous.activation === "enabled")) {
-            return previous === undefined ? rejected(operation, "NOT_INSTALLED") : noOp(operation, initial);
-        }
-        if (operation === "disable" && (previous === undefined || previous.activation === "disabled")) {
-            return previous === undefined ? rejected(operation, "NOT_INSTALLED") : noOp(operation, initial);
+        if (expectedTarget !== undefined && (previous === undefined || expectedTarget.plugin !== plugin || expectedTarget.selectedRevision !== previous.selectedRevision || expectedTarget.activation !== previous.activation || deriveLifecycleTargetDigest(toScopeReference(scope), previous, dependencies.sha256) !== expectedTarget.targetDigest)) {
+            return { kind: "stale", operation, expected: expectedTarget.generation, actual: initial.generation };
         }
+        if (operation === "install" && previous !== undefined)
+            return rejected(operation, "ALREADY_INSTALLED");
         if (operation === "update" && previous === undefined)
             return rejected(operation, "NOT_INSTALLED");
+        if (operation === "enable" && previous === undefined)
+            return rejected(operation, "NOT_INSTALLED");
+        if (operation === "disable" && previous === undefined)
+            return rejected(operation, "NOT_INSTALLED");
         if (operation === "uninstall" && previous === undefined)
-            return noOp(operation, initial);
-        const trustRecords = operation === "install" || operation === "update" || operation === "enable"
-            ? ("trustRecords" in request && request.trustRecords !== undefined
-                ? request.trustRecords
-                : "trust" in initial
-                    ? initial.trust.records
-                    : await trustFor(scope, undefined, signal))
-            : [];
-        let automaticAuthorization;
-        if (operation === "update" && origin === "automatic-update") {
-            const automaticRequest = request;
-            if (automaticRequest.expectedRevision === undefined)
-                return rejected(operation, "INVALID_REQUEST");
-            const policyRecord = "config" in initial
-                ? initial.config.records.find((record) => record.marketplace === automaticRequest.entry.identity.value.marketplaceName)
-                : initial.project.marketplaceUpdates.find((record) => record.marketplace === automaticRequest.entry.identity.value.marketplaceName);
-            if (policyRecord === undefined)
-                return rejected(operation, "UNTRUSTED");
-            const selected = previous?.revisions.find((revision) => revision.revision === previous.selectedRevision);
-            if (selected === undefined)
-                return rejected(operation, "MALFORMED");
-            try {
-                const loadedPrevious = await dependencies.installed.load({ scope, revision: selected }, signal);
-                const previousCandidate = createTrustCandidate({
-                    scope: toScopeReference(scope),
-                    marketplaceSource: loadedPrevious.marketplaceSource,
-                    plugin: loadedPrevious.plugin,
-                    compatibility: loadedPrevious.compatibility,
-                    content: loadedPrevious.content,
-                    materializationBinding: loadedPrevious.binding,
-                }, dependencies.sha256);
-                let globalPolicy;
-                let scopedPolicy;
-                if ("config" in initial) {
-                    globalPolicy = initial.config.global.application;
-                    scopedPolicy = initial.config.scope.application;
-                }
-                else {
-                    const userPolicy = await dependencies.state.read({ kind: "user" }, signal);
-                    if (!userPolicy.ok || !("config" in userPolicy.snapshot))
-                        return rejected(operation, "UNTRUSTED");
-                    globalPolicy = userPolicy.snapshot.config.global.application;
-                    scopedPolicy = initial.project.scope.application;
-                }
-                const effectivePolicy = resolveEffectiveUpdatePolicy({
-                    plugin,
-                    record: MarketplaceUpdateRecordSchema.parse(policyRecord),
-                    global: globalPolicy,
-                    ...(scopedPolicy === undefined ? {} : { scope: scopedPolicy }),
-                    marketplaceSourceIdentity: selected.evidence.source.marketplaceSourceIdentity ?? "legacy-unavailable",
-                    registeredMarketplaceSourceIdentity: deriveMarketplaceSourceIdentity(policyRecord.source, dependencies.sha256),
-                    pluginSourceIdentity: selected.evidence.source.pluginSourceIdentity ?? "legacy-unavailable",
-                });
-                const authority = await authorizeAutomaticUpdateCandidate({
-                    scope,
-                    previous: loadedPrevious,
-                    previousRecord: selected,
-                    candidate: previousCandidate,
-                    candidateMarketplaceSourceIdentity: deriveMarketplaceSourceIdentity(automaticRequest.marketplaceSource.declared, dependencies.sha256),
-                    candidatePluginSourceIdentity: derivePluginSourceIdentity(automaticRequest.entry.source.value, dependencies.sha256),
-                    expectedRevision: automaticRequest.expectedRevision,
-                    policyRecord: MarketplaceUpdateRecordSchema.parse(policyRecord),
-                    effectivePolicy,
-                    trustRecords,
-                    ...(scope.kind === "project" && "project" in initial ? { projectDeclarationDigest: initial.project.declarationDigest } : {}),
-                }, { projectTrust: dependencies.projectTrust, sha256: dependencies.sha256 }, signal);
-                if (authority.kind === "denied")
-                    return rejected(operation, authority.code === "STATE_STALE" ? "MALFORMED" : authority.code === "PROJECT_UNTRUSTED" ? "UNTRUSTED" : "UNTRUSTED");
-                automaticAuthorization = createAutomaticUpdateAuthorizationEvidence({
-                    kind: "automatic-authorization",
-                    scope: toScopeReference(scope),
-                    plugin,
-                    expectedRevision: automaticRequest.expectedRevision,
-                    marketplaceSourceIdentity: deriveMarketplaceSourceIdentity(automaticRequest.marketplaceSource.declared, dependencies.sha256),
-                    pluginSourceIdentity: derivePluginSourceIdentity(automaticRequest.entry.source.value, dependencies.sha256),
-                });
-            }
-            catch (error) {
-                if (signal.aborted)
-                    return rejected(operation, "ABORTED");
-                return rejected(operation, "UNTRUSTED");
-            }
-        }
+            return current(operation, initial);
+        if (operation === "enable" && previous?.activation === "enabled")
+            return current(operation, initial);
+        if (operation === "disable" && previous?.activation === "disabled")
+            return current(operation, initial);
         let prepared;
-        let candidateExpectation;
         try {
             if (operation === "install" || operation === "update") {
                 const installRequest = request;
+                const preparedInstallRequest = request;
+                const trustRecords = await trustFor(installRequest, signal);
                 const candidateRequest = {
                     operation,
                     scope,
@@ -501,15 +196,9 @@ function createPluginLifecycleImplementation(dependencies) {
                     trustRecords,
                     configurationPathContext: installRequest.configurationPathContext,
                     ...(previous === undefined ? {} : { existing: previous }),
-                    ...(automaticAuthorization === undefined ? {} : { automaticAuthorization }),
                     ...(installRequest.expectedRevision === undefined ? {} : { expectedRevision: installRequest.expectedRevision }),
-                    ...("candidateLease" in installRequest ? {
-                        candidateLease: installRequest.candidateLease,
-                        expectedBinding: installRequest.expectedBinding,
-                        ...(installRequest.expectedConfigurationRevision === undefined
-                            ? {}
-                            : { expectedConfigurationRevision: installRequest.expectedConfigurationRevision }),
-                    } : {}),
+                    ...(installRequest.automaticAuthorization === undefined ? {} : { automaticAuthorization: installRequest.automaticAuthorization }),
+                    ...("candidateLease" in request ? { candidateLease: preparedInstallRequest.candidateLease, expectedBinding: preparedInstallRequest.expectedBinding, ...(preparedInstallRequest.expectedConfigurationRevision === undefined ? {} : { expectedConfigurationRevision: preparedInstallRequest.expectedConfigurationRevision }) } : {}),
                 };
                 const result = await preparePluginCandidate(preparation, candidateRequest, signal);
                 if (result.kind === "rejected")
@@ -517,41 +206,21 @@ function createPluginLifecycleImplementation(dependencies) {
                 prepared = result.candidate;
                 if (prepared.plugin !== plugin) {
                     await discardCandidate(dependencies, prepared);
+                    prepared = undefined;
                     return rejected(operation, "MALFORMED");
                 }
-                if (operation === "install" && previous !== undefined) {
-                    if (previous.selectedRevision === prepared.record.selectedRevision && previous.activation === "enabled") {
-                        await discardCandidate(dependencies, prepared);
-                        return noOp(operation, initial);
-                    }
-                    await discardCandidate(dependencies, prepared);
-                    return rejected(operation, "ALREADY_INSTALLED");
-                }
                 if (operation === "update" && previous !== undefined && previous.selectedRevision === prepared.record.selectedRevision && previous.activation === "enabled") {
                     await discardCandidate(dependencies, prepared);
-                    return noOp(operation, initial);
+                    prepared = undefined;
+                    return current(operation, initial);
                 }
-                candidateExpectation = prepared.projection;
             }
             else if (operation === "enable") {
-                if (previous === undefined)
-                    return rejected(operation, "NOT_INSTALLED");
                 const enableRequest = request;
-                const result = await prepareEnableCandidate(preparation, {
-                    operation: "enable",
-                    scope,
-                    installed: previous,
-                    trustRecords,
-                    configurationPathContext: enableRequest.configurationPathContext,
-                    ...(enableRequest.expectedConfigurationRevision === undefined ? {} : { expectedConfigurationRevision: enableRequest.expectedConfigurationRevision }),
-                }, signal);
+                const result = await prepareEnableCandidate(preparation, { operation: "enable", scope, installed: previous, trustRecords: await trustFor(enableRequest, signal), configurationPathContext: enableRequest.configurationPathContext, ...(enableRequest.expectedConfigurationRevision === undefined ? {} : { expectedConfigurationRevision: enableRequest.expectedConfigurationRevision }) }, signal);
                 if (result.kind === "rejected")
                     return rejected(operation, mapPreparationCode(result.code));
                 prepared = result.candidate;
-                candidateExpectation = prepared.projection;
-            }
-            else {
-                candidateExpectation = await prepareInactiveProjection(dependencies, { scope, plugin }, signal);
             }
         }
         catch (error) {
@@ -560,139 +229,186 @@ function createPluginLifecycleImplementation(dependencies) {
                 throw error;
             return rejected(operation, signal.aborted ? "ABORTED" : "PROJECTION_FAILED");
         }
-        const previousExpectation = await preparePreviousExpectation(dependencies, scope, plugin, previous, signal).catch(() => undefined);
-        if (previousExpectation === undefined) {
-            await discardCandidate(dependencies, prepared);
-            return rejected(operation, "MALFORMED");
+        const expectedConfigurationRevision = "expectedConfigurationRevision" in request ? request.expectedConfigurationRevision : undefined;
+        const candidate = operation === "uninstall"
+            ? InstalledPluginRecordSchema.parse({ ...previous, activation: "disabled" })
+            : operation === "disable"
+                ? InstalledPluginRecordSchema.parse({ ...previous, activation: "disabled" })
+                : appendPrevious(prepared?.record ?? previous, previous, operation);
+        if (operation === "uninstall" && retainedData(request) === "delete-confirmed" && dependencies.pendingDeletes !== undefined && previous !== undefined) {
+            const selected = previous.revisions.find((revision) => revision.revision === previous.selectedRevision);
+            if (selected === undefined)
+                return rejected(operation, "MALFORMED");
+            try {
+                await dependencies.pendingDeletes.create({ scope: toScopeReference(scope), plugin, dataRef: selected.dataRef, requestedAt: Date.now() });
+            }
+            catch {
+                return rejected(operation, "MALFORMED");
+            }
         }
-        let operationId;
         try {
-            operationId = await dependencies.operationIds.create(signal);
-            z.string().uuid().parse(operationId);
-        }
-        catch {
+            if (prepared?.promotion !== undefined) {
+                const promotion = await dependencies.content.promote(prepared.promotion, signal);
+                if (!sameJson(promotion.identity, prepared.promotion.identity) || !sameJson(promotion.manifest, prepared.promotion.manifest)) {
+                    await discardCandidate(dependencies, prepared);
+                    prepared = undefined;
+                    return rejected(operation, "PROMOTION_FAILED");
+                }
+            }
+            const mutation = runScopedMutation(dependencies.state, scope, (snapshot) => {
+                const latest = targetRecord(snapshot, plugin);
+                if (!sameJson(latest, previous))
+                    return { kind: "reject", value: { kind: "stale", operation, expected: initial.generation, actual: snapshot.generation } };
+                const replacement = operation === "uninstall" ? null : candidate;
+                return { kind: "commit", mutation: replaceTarget(snapshot, plugin, replacement, dependencies.sha256), value: undefined, recheckAuthority: async () => {
+                        const configurationState = await exactConfigurationState(dependencies, prepared, expectedConfigurationRevision);
+                        if (configurationState === "stale")
+                            throw new Error("CONFIGURATION_STALE");
+                        if (configurationState === "unavailable")
+                            throw new Error("CONFIGURATION_UNAVAILABLE");
+                    } };
+            }, signal);
+            const committed = await mutation;
+            const mapped = mapMutation(operation, committed, signal);
+            if (!("kind" in mapped) || mapped.kind !== "committed") {
+                await discardCandidate(dependencies, prepared);
+                return mapped;
+            }
             await discardCandidate(dependencies, prepared);
-            return rejected(operation, signal.aborted ? "ABORTED" : "MALFORMED");
+            if (operation === "update" && request.activation === "deferred")
+                return { kind: "live-next-start", operation, snapshot: mapped.snapshot, note: "no-reload-context" };
+            if (operation === "uninstall" && retainedData(request) === "delete-confirmed" && dependencies.pendingDeletes !== undefined && dependencies.dataRemoval !== undefined && previous !== undefined) {
+                const selected = previous.revisions.find((revision) => revision.revision === previous.selectedRevision);
+                if (selected !== undefined) {
+                    const marker = { scope: toScopeReference(scope), plugin, dataRef: selected.dataRef, requestedAt: Date.now() };
+                    try {
+                        await dependencies.dataRemoval.remove({ ...marker, confirmation: "delete-confirmed", capability: {} }, signal);
+                        await dependencies.pendingDeletes.remove(marker);
+                    }
+                    catch { /* convergence retries the durable marker */ }
+                }
+            }
+            return activate(dependencies, operation, scope, mapped.snapshot, plugin, signal);
         }
-        const reference = (await import("./plugin-lifecycle-contract.js")).deriveLifecyclePendingTransitionRef({
-            operationId,
-            scope: toScopeReference(scope),
-            plugin,
-            startingGeneration: initial.generation,
-        }, dependencies.sha256);
-        const candidateSource = previous ?? prepared?.record;
-        if (candidateSource === undefined) {
-            await discardCandidate(dependencies, prepared);
+        catch (error) {
+            await discardCandidate(dependencies, prepared).catch(() => undefined);
+            if (signal.aborted)
+                return rejected(operation, "ABORTED");
+            if (error instanceof Error && error.message === "CONFIGURATION_STALE")
+                return rejected(operation, "CONFIGURATION_STALE");
+            if (error instanceof Error && error.message === "CONFIGURATION_UNAVAILABLE")
+                return rejected(operation, "UNCONFIGURED");
+            if (error instanceof Error && error.message.includes("promotion"))
+                return rejected(operation, "PROMOTION_FAILED");
             return rejected(operation, "MALFORMED");
         }
-        const candidate = candidateForOperation(operation, candidateSource, prepared, dependencies.sha256);
-        const finalRecord = operation === "uninstall" ? null : candidate;
-        const transition = createLifecycleTransitionRecord({
-            operationId,
-            operation,
-            origin,
-            scope: toScopeReference(scope),
-            plugin,
-            startingGeneration: initial.generation,
-            previous: previous === undefined ? null : withoutPending(previous),
-            candidate: withoutPending(candidate),
-            final: finalRecord === null ? null : withoutPending(finalRecord),
-            previousProjection: previousExpectation,
-            candidateProjection: candidateExpectation,
-            retainedData: operation === "uninstall" ? retainedData(request) : "keep",
-            reference,
-            sha256: dependencies.sha256,
-        });
+    }
+    async function repair(request, signal) {
+        const operation = "repair";
+        if (signal.aborted)
+            return rejected(operation, "ABORTED");
+        const scope = asScopeContext(request.scope, dependencies.sha256);
+        const plugin = PluginKeySchema.parse(request.plugin);
+        const initial = await load(scope, signal).catch(() => undefined);
+        if (initial === undefined)
+            return rejected(operation, "MALFORMED");
+        const installed = targetRecord(initial, plugin);
+        const selected = installed?.revisions.find((revision) => revision.revision === installed.selectedRevision);
+        if (installed === undefined)
+            return rejected(operation, "NOT_INSTALLED");
+        if (selected === undefined)
+            return rejected(operation, "MALFORMED");
+        let prepared;
         try {
-            const stored = await dependencies.transitions.prepare(transition, signal);
-            if (stored === "already-present") {
-                await discardCandidate(dependencies, prepared);
-                return rejected(operation, "PENDING_TRANSITION");
+            const preparedResult = await preparePluginCandidate(preparation, {
+                operation: "update",
+                scope,
+                entry: request.entry,
+                marketplaceSource: request.marketplaceSource,
+                sourceContext: request.sourceContext,
+                trustRecords: await trustFor(request, signal),
+                configurationPathContext: request.configurationPathContext,
+                existing: installed,
+                expectedRevision: selected.revision,
+                ...(request.expectedConfigurationRevision === undefined ? {} : { expectedConfigurationRevision: request.expectedConfigurationRevision }),
+            }, signal);
+            if (preparedResult.kind === "rejected")
+                return rejected(operation, mapPreparationCode(preparedResult.code));
+            prepared = preparedResult.candidate;
+            if (prepared.plugin !== plugin || prepared.revision.revision !== selected.revision || !sourceEvidenceMatches(prepared.revision, selected)) {
+                await discardCandidate(dependencies, prepared).catch(() => undefined);
+                prepared = undefined;
+                return rejected(operation, "AVAILABLE_REVISION_CHANGED");
+            }
+            if (prepared.promotion !== undefined) {
+                const promotion = await dependencies.content.promote(prepared.promotion, signal);
+                if (!sameJson(promotion.identity, prepared.promotion.identity) || !sameJson(promotion.manifest, prepared.promotion.manifest)) {
+                    await discardCandidate(dependencies, prepared).catch(() => undefined);
+                    prepared = undefined;
+                    return rejected(operation, "PROMOTION_FAILED");
+                }
             }
-        }
-        catch {
             await discardCandidate(dependencies, prepared);
-            return rejected(operation, signal.aborted ? "ABORTED" : "MALFORMED");
-        }
-        const expectedConfigurationRevision = "expectedConfigurationRevision" in request
-            ? request.expectedConfigurationRevision
-            : undefined;
-        const first = await runFirstCommit(operation, scope, plugin, initial, previous, candidate, prepared, reference, expectedConfigurationRevision, signal);
-        await discardCandidate(dependencies, prepared);
-        if (first.kind === "stale")
-            return { kind: "stale", operation, expected: first.expected, actual: first.actual };
-        if (first.kind === "rejected")
-            return rejected(operation, first.code);
-        if (first.kind === "recovery")
-            return recovery(operation, reference, first.committed);
-        const committed = first.snapshot;
-        if (operation === "update" && request.activation === "deferred") {
-            // Staged update: the candidate is committed and the durable transition
-            // stays pending on purpose. The next start/reload activates the new
-            // revision and settles the journal through the normal recovery path —
-            // in ANY session, so journal ownership must not stay bound to this
-            // process's lifetime.
-            await releaseStagedOwnership(scope, reference);
-            return { kind: "staged", operation, transition: reference, snapshot: committed };
+            prepared = undefined;
+            const latest = await load(scope, signal);
+            const latestRecord = latest === undefined ? undefined : targetRecord(latest, plugin);
+            if (latest === undefined || latestRecord === undefined || latestRecord.selectedRevision !== selected.revision) {
+                return { kind: "stale", operation, expected: initial.generation, ...(latest === undefined ? {} : { actual: latest.generation }) };
+            }
+            // Repair never commits when the authority pointer already names the
+            // repaired revision. The promotion above is idempotent and is the only
+            // persistent change in the common missing-files case.
+            return activate(dependencies, operation, scope, latest, plugin, signal);
         }
-        const beforeReloadConfiguration = await exactConfigurationState(prepared, expectedConfigurationRevision);
-        let activation;
-        if (beforeReloadConfiguration === "stale") {
-            activation = { ok: false, failure: { kind: "observation-mismatch", code: "OBSERVATION_MISMATCH" } };
+        catch (error) {
+            await discardCandidate(dependencies, prepared).catch(() => undefined);
+            if (signal.aborted)
+                return rejected(operation, "ABORTED");
+            if (error instanceof Error && error.message === "AVAILABLE_REVISION_CHANGED")
+                return rejected(operation, "AVAILABLE_REVISION_CHANGED");
+            if (error instanceof Error && error.message.includes("promotion"))
+                return rejected(operation, "PROMOTION_FAILED");
+            return rejected(operation, "MALFORMED");
         }
-        else if (beforeReloadConfiguration === "unavailable") {
-            activation = { ok: false, failure: { kind: "adapter-error", code: "ADAPTER_FAILED" } };
+    }
+    async function rollback(request, signal) {
+        const operation = "rollback";
+        if (signal.aborted)
+            return rejected(operation, "ABORTED");
+        const scope = asScopeContext(request.scope, dependencies.sha256);
+        const plugin = PluginKeySchema.parse(request.plugin);
+        const initial = await load(scope, signal).catch(() => undefined);
+        if (initial === undefined)
+            return rejected(operation, "MALFORMED");
+        const previous = targetRecord(initial, plugin);
+        const expectedTarget = request.expectedTarget;
+        if (expectedTarget !== undefined && (previous === undefined || expectedTarget.plugin !== plugin || expectedTarget.selectedRevision !== previous.selectedRevision || expectedTarget.activation !== previous.activation || deriveLifecycleTargetDigest(toScopeReference(scope), previous, dependencies.sha256) !== expectedTarget.targetDigest)) {
+            return { kind: "stale", operation, expected: expectedTarget.generation, actual: initial.generation };
         }
-        else {
-            activation = await reloadAndObserve(dependencies, scope, plugin, reference, candidateExpectation, signal);
-            if (activation.ok) {
-                const observedConfiguration = await exactConfigurationState(prepared, expectedConfigurationRevision);
-                if (observedConfiguration !== "current") {
-                    activation = observedConfiguration === "stale"
-                        ? { ok: false, failure: { kind: "observation-mismatch", code: "OBSERVATION_MISMATCH" } }
-                        : { ok: false, failure: { kind: "adapter-error", code: "ADAPTER_FAILED" } };
-                }
+        if (previous === undefined)
+            return rejected(operation, "NOT_INSTALLED");
+        if (previous.previousRevision === undefined || !previous.revisions.some((revision) => revision.revision === previous.previousRevision))
+            return rejected(operation, "MALFORMED");
+        const mutation = await runScopedMutation(dependencies.state, scope, (snapshot) => {
+            const latest = targetRecord(snapshot, plugin);
+            if (latest === undefined || !sameJson(latest, previous)) {
+                return { kind: "reject", value: { kind: "stale", operation, expected: initial.generation, actual: snapshot.generation } };
             }
-        }
-        if (operation === "update" && !activation.ok && activation.failure.kind === "activation-unavailable") {
-            // No reload-capable context (for example an RPC caller): settle the
-            // committed update as staged rather than rolling it back. Genuine
-            // activation failures keep the rollback path. Like the deferred stage
-            // above, the next start of any session finishes it.
-            await releaseStagedOwnership(scope, reference);
-            return { kind: "staged", operation, transition: reference, snapshot: committed };
-        }
-        const reconciled = await reconciler.completeCommittedTransition({
-            operation,
-            scope,
-            plugin,
-            previous,
-            candidate,
-            final: finalRecord,
-            reference,
-            committed,
-            previousProjection: previousExpectation,
-            candidateProjection: candidateExpectation,
-            activation,
+            const fallback = latest.previousRevision;
+            if (fallback === undefined || !latest.revisions.some((revision) => revision.revision === fallback)) {
+                return { kind: "reject", value: rejected(operation, "MALFORMED") };
+            }
+            const replacement = InstalledPluginRecordSchema.parse({
+                ...latest,
+                selectedRevision: fallback,
+                previousRevision: latest.selectedRevision,
+            });
+            return { kind: "commit", mutation: replaceTarget(snapshot, plugin, replacement, dependencies.sha256), value: undefined };
         }, signal);
-        if (reconciled.kind === "recovery-required")
-            return recovery(operation, reference, reconciled.committed);
-        if (reconciled.kind === "rolled-back") {
-            return {
-                kind: "rolled-back",
-                operation,
-                failure: reconciled.failure,
-                snapshot: reconciled.snapshot,
-                observation: reconciled.observation,
-            };
-        }
-        return {
-            kind: "changed",
-            operation,
-            snapshot: reconciled.snapshot,
-            observation: reconciled.observation,
-            ...(operation === "uninstall" ? { cleanup: { kind: "deferred", retainedData: retainedData(request), transition: reference } } : {}),
-        };
+        const mapped = mapMutation(operation, mutation, signal);
+        if (!("kind" in mapped) || mapped.kind !== "committed")
+            return mapped;
+        return activate(dependencies, operation, scope, mapped.snapshot, plugin, signal);
     }
     const application = Object.freeze({
         install: (request, signal) => execute("install", request, signal),
@@ -700,6 +416,8 @@ function createPluginLifecycleImplementation(dependencies) {
         disable: (request, signal) => execute("disable", request, signal),
         update: (request, signal) => execute("update", request, signal),
         uninstall: (request, signal) => execute("uninstall", request, signal),
+        repair,
+        rollback,
     });
     async function executePrepared(operation, request, signal) {
         const preparedRequest = {
@@ -720,7 +438,6 @@ function createPluginLifecycleImplementation(dependencies) {
             return await execute(operation, preparedRequest, signal);
         }
         finally {
-            // No-op after transfer; mandatory cleanup when lifecycle returned before claim.
             await request.lease.release();
         }
     }
@@ -730,14 +447,7 @@ function createPluginLifecycleImplementation(dependencies) {
     });
     return Object.freeze({ application, prepared, preparedInstall: prepared });
 }
-export function createPluginLifecycleComposition(dependencies) {
-    return createPluginLifecycleImplementation(dependencies);
-}
-/** Source-compatible public lifecycle factory. */
-export function createPluginLifecycleService(dependencies) {
-    return createPluginLifecycleImplementation(dependencies).application;
-}
-export const PluginLifecycleResultSchema = z.object({
-    kind: z.enum(["changed", "unchanged", "rejected", "stale", "rolled-back", "recovery-required", "staged"]),
-}).passthrough().readonly();
+export function createPluginLifecycleComposition(dependencies) { return createPluginLifecycleImplementation(dependencies); }
+export function createPluginLifecycleService(dependencies) { return createPluginLifecycleImplementation(dependencies).application; }
+export const PluginLifecycleResultSchema = z.object({ kind: z.enum(["applied", "live-next-start", "degraded", "current", "rejected", "stale"]) }).passthrough().readonly();
 //# sourceMappingURL=plugin-lifecycle-service.js.map