@homeflare/alchemy 0.8.0 → 0.10.1

package/src/openbao/fake-families.ts

@@ -13,9 +13,9 @@ import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as FetchHttpClient from 'effect/unstable/http/FetchHttpClient';
 import { BaoAuthRole, BaoAuthRoleProvider } from './auth-role.ts';
-import type { Seen } from './fake-bao.ts';
+import type { Reply, Seen } from './fake-bao.ts';
 import { type Estate, fakeEstate } from './fake-engines-roles.ts';
-import { type FakeStack, type StackBody, withFakeStack } from './fake-stack.ts';
+import { type FakeStack, type StackBody, fakeStack, withFakeStack } from './fake-stack.ts';
 import { BaoJwtAuthConfig, BaoJwtAuthConfigProvider } from './jwt-config.ts';
 import { BaoJwtRole, BaoJwtRoleProvider } from './jwt-role.ts';
 import { BaoKubernetesRole, BaoKubernetesRoleProvider } from './kubernetes-role.ts';
@@ -38,12 +38,18 @@ export const familyProviders = Layer.mergeAll(
   FetchHttpClient.layer,
 );
 
-/** One stack over a fresh estate: every family's provider, and every call the fake saw. */
+/**
+ * One stack over a fresh estate: every family's provider, and every call the fake saw — plus
+ * `owner`, a SECOND stack over the same fake with its own state: another owner of the same names.
+ */
 export const withEstate = (
-  body: (stack: FakeStack, estate: Estate, seen: Seen[]) => Promise<void>,
+  body: (stack: FakeStack, estate: Estate, seen: Seen[], owner: FakeStack) => Promise<void>,
+  answer: (estate: Estate) => (seen: Seen) => Reply = (estate) => estate,
 ): Promise<void> => {
   const estate = fakeEstate();
-  return withFakeStack(familyProviders, estate, (stack, bao) => body(stack, estate, bao.seen));
+  return withFakeStack(familyProviders, answer(estate), (stack, bao) =>
+    body(stack, estate, bao.seen, fakeStack(familyProviders, { BAO_ADDR: bao.address }, 'Owner')),
+  );
 };
 
 /** The row for one family, by name. */

package/src/openbao/fake-mounts.ts

@@ -0,0 +1,74 @@
+/**
+ * A fake mount table for fake-bao — `sys/mounts` (secrets engines) or `sys/auth` (auth methods):
+ * enable, tune, read, the listing a 400 is settled against (mount-wire.ts), and `sys/remount`.
+ * Split out of mount-move.test.ts so the engine-level ownership tests drive Bao.Mount and
+ * Bao.AuthMethod through the same table.
+ *
+ * ⛔ TEST-ONLY — see fake-bao.ts. No provider imports this file.
+ */
+import type { Reply, Seen } from './fake-bao.ts';
+
+type Entry = { type: string; description: string; config: Record<string, unknown> };
+
+/** A fresh mount's lease TTLs: 0, "use the system default", as the server reports them. */
+const zero = () => ({ default_lease_ttl: 0, max_lease_ttl: 0 });
+
+/** The table keyed `<path>/` as the server keys it; `initial` maps a bare path to its type. */
+export const liveTable = (prefix: string, initial: Record<string, string>) => {
+  const entries = new Map<string, Entry>(
+    Object.entries(initial).map(([path, type]) => [
+      `${path}/`,
+      { config: zero(), description: '', type },
+    ]),
+  );
+  const types = () => new Map([...entries].map(([path, entry]) => [path, entry.type]));
+  const answer = (seen: Seen): Reply => {
+    const path = seen.path.replace(/^\/v1\//, '');
+    if (path === 'sys/remount' && seen.method === 'POST') {
+      const { from, to } = JSON.parse(seen.body) as { from: string; to: string };
+      const key = `${from.replace(/^auth\//, '')}/`;
+      const entry = entries.get(key);
+      if (entry === undefined) return { json: { errors: ['no matching mount'] }, status: 400 };
+      entries.delete(key);
+      entries.set(`${to.replace(/^auth\//, '')}/`, entry);
+      return { json: { data: { migration_id: 'm-1' } }, status: 200 };
+    }
+    if (path.startsWith('sys/remount/status/')) {
+      return { json: { data: { migration_info: { status: 'success' } } }, status: 200 };
+    }
+    if (path === prefix) return { json: { data: Object.fromEntries(types()) }, status: 200 };
+    const tune = path.endsWith('/tune');
+    const key = `${path.slice(prefix.length + 1).replace(/\/tune$/, '')}/`;
+    if (seen.method === 'POST') {
+      const body = JSON.parse(seen.body || '{}') as Record<string, unknown>;
+      const entry = entries.get(key) ?? {
+        config: zero(),
+        description: '',
+        type: 'enabled-by-test',
+      };
+      if (!tune && typeof body['type'] === 'string') entry.type = body['type'];
+      if (tune) {
+        const { description, ...config } = body;
+        if (typeof description === 'string') entry.description = description;
+        entry.config = { ...entry.config, ...config };
+      }
+      entries.set(key, entry);
+      return { status: 204 };
+    }
+    if (seen.method === 'DELETE') {
+      entries.delete(key);
+      return { status: 204 };
+    }
+    const entry = entries.get(key);
+    return entry === undefined
+      ? { json: { errors: [`No secret engine mount at ${key}`] }, status: 400 }
+      : { json: { data: entry }, status: 200 };
+  };
+  return {
+    answer,
+    /** The live table as `<path>/` → type, the shape the move tests compare. */
+    get table() {
+      return types();
+    },
+  };
+};

package/src/openbao/fake-stack.ts

@@ -16,6 +16,8 @@
  *   in the shell running the tests is never read. No provider imports this file.
  */
 import * as Alchemy from 'alchemy';
+import { AdoptPolicy } from 'alchemy/AdoptPolicy';
+import { provideFreshArtifactStore } from 'alchemy/Artifacts';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import type { BaoEnvironment } from './bao-address.ts';
@@ -28,9 +30,12 @@ export type Planned = Readonly<Record<string, string>>;
 /** A stack body: resource declarations, as an `alchemy.run.ts` would write them. */
 export type StackBody = Effect.Effect<unknown, unknown, unknown>;
 
+/** What the CLI would set for one deploy: `adopt` is `--adopt` (the AdoptPolicy service). */
+export type DeployOptions = { readonly adopt?: boolean };
+
 export interface FakeStack {
   /** Plan, then apply, `body`. Resolves to the plan; rejects with the apply's failure. */
-  readonly deploy: (body: StackBody) => Promise<Planned>;
+  readonly deploy: (body: StackBody, options?: DeployOptions) => Promise<Planned>;
 }
 
 type Node = { readonly action: string };
@@ -72,22 +77,30 @@ export const fakeStack = <ROut, E, RIn>(
   ) => Effect.Effect<PlanView, unknown, never>;
   const apply = Alchemy.apply as unknown as (planned: PlanView) => Effect.Effect<unknown, unknown>;
 
-  const deploy = (body: StackBody) =>
+  /**
+   * ★ ONE ARTIFACT STORE ACROSS PLAN AND APPLY, as Deploy.ts's evalStack provides — the channel a
+   *   diff uses to tell reconcile it resumes an interrupted create (ownership/resume.ts).
+   * ★ `--adopt` reaches registration, plan and apply alike, as the Alchemist session provides it.
+   */
+  const deploy = (body: StackBody, options: DeployOptions = {}) =>
     Effect.gen(function* () {
       const compiled = yield* stack(name, { providers, state }, body);
       return yield* Effect.gen(function* () {
         const planned = yield* plan(compiled);
         yield* apply(planned);
         return actionsOf(planned);
-      }).pipe(Effect.provide(Layer.succeedContext(compiled.services)));
+      }).pipe(provideFreshArtifactStore, Effect.provide(Layer.succeedContext(compiled.services)));
     }).pipe(
+      options.adopt === undefined ? (e) => e : Effect.provideService(AdoptPolicy, options.adopt),
       Effect.provideService(Alchemy.Stage, 'test'),
       Effect.provideService(BaoEnv, env),
       Effect.provide(state),
       Effect.scoped,
     );
 
-  return { deploy: (body) => Effect.runPromise(deploy(body) as Effect.Effect<Planned>) };
+  return {
+    deploy: (body, options) => Effect.runPromise(deploy(body, options) as Effect.Effect<Planned>),
+  };
 };
 
 /**

package/src/openbao/jwt-config.ts

@@ -21,6 +21,8 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { claimFor } from '../ownership/adopt.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import {
   type BaoJwtAuthConfigAttributes,
   type BaoJwtAuthConfigProps,
@@ -33,7 +35,7 @@ import {
 } from './jwt-config-form.ts';
 import { declaredOr } from './rename.ts';
 import { type Identity, guardRename, judgeRename } from './rename-identity.ts';
-import { type RoleSpec, planRole, readRoleAt, reconcileRole } from './role-reconcile.ts';
+import { type RoleSpec, planRole, readOwnedRole, reconcileRole } from './role-reconcile.ts';
 
 export type { BaoJwtAuthConfigAttributes, BaoJwtAuthConfigProps } from './jwt-config-form.ts';
 
@@ -78,14 +80,15 @@ export const BaoJwtAuthConfigProvider = () =>
       BaoJwtAuthConfig.Provider.of({
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          const found = yield* readRoleAt(jwtConfigSpec(olds));
-          return found?.attributes;
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          return yield* readOwnedRole({ fqn, instanceId, output }, jwtConfigSpec(olds));
         }),
 
         diff: Effect.fn(function* ({ news, olds, output }) {
           // ⛔ The mount first, before isResolved; onto a mount with a config fails the plan.
           const move = yield* judgeRename(IDENTITY, olds, news, output);
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
           if (output === undefined) return undefined;
           if (move !== undefined) return { action: 'replace' } as const;
           if (!isResolved(news)) return undefined;
@@ -93,14 +96,14 @@ export const BaoJwtAuthConfigProvider = () =>
         }),
 
         /** ⛔ Refuses, before writing, a live config that carries an OIDC client (wouldErase). */
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           // ⛔ An `update` across a move the diff could not see — refused before any write.
           yield* guardRename(IDENTITY, news, output);
-          return yield* reconcileRole(jwtConfigSpec(news));
+          return yield* reconcileRole(jwtConfigSpec(news), claimFor({ fqn, instanceId, output }));
         }),
 
         /** ⚠️ Writes nothing — there is no delete endpoint (header). */
         delete: () => Effect.void,
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );

package/src/openbao/jwt-role.ts

@@ -23,6 +23,8 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { claimFor } from '../ownership/adopt.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import { baoDelete } from './bao-http.ts';
 import {
   type BaoJwtRoleAttributes,
@@ -34,7 +36,7 @@ import {
   writeBody,
 } from './jwt-role-form.ts';
 import { foldName, guardRename, judgeRename, roleIdentity } from './rename-identity.ts';
-import { type RoleSpec, planRole, readRoleAt, reconcileRole } from './role-reconcile.ts';
+import { type RoleSpec, planRole, readOwnedRole, reconcileRole } from './role-reconcile.ts';
 
 export type {
   BaoJwtCallbackMode,
@@ -87,25 +89,26 @@ export const BaoJwtRoleProvider = () =>
          */
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          const found = yield* readRoleAt(jwtRoleSpec(olds));
-          return found?.attributes;
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          return yield* readOwnedRole({ fqn, instanceId, output }, jwtRoleSpec(olds));
         }),
 
         /** ⛔ IT COMPARES THE LIVE ROLE, NOT THE STORED DIGEST — a hand-widened audience is drift. */
         diff: Effect.fn(function* ({ news, olds, output }) {
           // ⛔ The identity first, before isResolved; onto a role that exists fails the plan.
           const move = yield* judgeRename(IDENTITY, olds, news, output);
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
           if (output === undefined) return undefined;
           if (move !== undefined) return { action: 'replace' } as const;
           if (!isResolved(news)) return undefined;
           return { action: yield* planRole(jwtRoleSpec(news)) } as const;
         }),
 
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           // ⛔ An `update` across a move the diff could not see — refused before any write.
           yield* guardRename(IDENTITY, news, output);
-          return yield* reconcileRole(jwtRoleSpec(news));
+          return yield* reconcileRole(jwtRoleSpec(news), claimFor({ fqn, instanceId, output }));
         }),
 
         /** Idempotent as Alchemy requires — a missing role deletes as success. */
@@ -114,5 +117,5 @@ export const BaoJwtRoleProvider = () =>
           return undefined;
         }),
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );

package/src/openbao/kubernetes-role.ts

@@ -17,6 +17,8 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { claimFor } from '../ownership/adopt.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import { baoDelete } from './bao-http.ts';
 import {
   type BaoKubernetesRoleAttributes,
@@ -28,7 +30,7 @@ import {
   writeBody,
 } from './kubernetes-role-form.ts';
 import { foldName, guardRename, judgeRename, roleIdentity } from './rename-identity.ts';
-import { type RoleSpec, planRole, readRoleAt, reconcileRole } from './role-reconcile.ts';
+import { type RoleSpec, planRole, readOwnedRole, reconcileRole } from './role-reconcile.ts';
 
 export type {
   BaoKubernetesAliasSource,
@@ -75,25 +77,29 @@ export const BaoKubernetesRoleProvider = () =>
         /** ⛔ The mount's role listing is not a list of things this owns. */
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          const found = yield* readRoleAt(kubernetesRoleSpec(olds));
-          return found?.attributes;
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          return yield* readOwnedRole({ fqn, instanceId, output }, kubernetesRoleSpec(olds));
         }),
 
         /** ⛔ IT COMPARES THE LIVE ROLE, NOT THE STORED DIGEST. */
         diff: Effect.fn(function* ({ news, olds, output }) {
           // ⛔ The identity first, before isResolved; onto a role that exists fails the plan.
           const move = yield* judgeRename(IDENTITY, olds, news, output);
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
           if (output === undefined) return undefined;
           if (move !== undefined) return { action: 'replace' } as const;
           if (!isResolved(news)) return undefined;
           return { action: yield* planRole(kubernetesRoleSpec(news)) } as const;
         }),
 
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           // ⛔ An `update` across a move the diff could not see — refused before any write.
           yield* guardRename(IDENTITY, news, output);
-          return yield* reconcileRole(kubernetesRoleSpec(news));
+          return yield* reconcileRole(
+            kubernetesRoleSpec(news),
+            claimFor({ fqn, instanceId, output }),
+          );
         }),
 
         /** Idempotent as Alchemy requires — a missing role deletes as success. */
@@ -102,5 +108,5 @@ export const BaoKubernetesRoleProvider = () =>
           return undefined;
         }),
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );

package/src/openbao/mfa-enforcement.ts

@@ -31,6 +31,9 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { type Claim, claimFor } from '../ownership/adopt.ts';
+import { ownedRead } from '../ownership/probe.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import type { BaoError } from './bao-status.ts';
 import {
   type BaoMfaLoginEnforcementAttributes,
@@ -96,14 +99,21 @@ export const planEnforcement = (
     return live !== undefined && matches(live, props, resolved) ? 'noop' : 'update';
   });
 
-/** Write when live differs, then prove it by reading back. */
+/**
+ * Write when live differs, then prove it by reading back.
+ * ⛔ `claim` (the provider passes it): a create never takes over an enforcement it finds by name.
+ */
 export const reconcileEnforcement = (
   props: BaoMfaLoginEnforcementProps,
+  claim?: Claim,
 ): Effect.Effect<BaoMfaLoginEnforcementAttributes, BaoError, Env> =>
   Effect.gen(function* () {
     const { bad, resolved } = yield* resolveTargets(props);
     if (bad.length > 0) return yield* refuse(props.name, bad.join('; '));
     const live = yield* readLive(props.name);
+    if (live !== undefined && claim !== undefined) {
+      yield* claim(`Bao.MfaLoginEnforcement ${props.name}`);
+    }
     if (live === undefined || !matches(live, props, resolved)) {
       yield* writeEnforcement(props.name, writeBody(canonicalFromProps(props, resolved)));
     }
@@ -124,24 +134,28 @@ export const BaoMfaLoginEnforcementProvider = () =>
         /** ⛔ The namespace's enforcement listing is not a list of things this owns. */
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          return yield* readLive(olds.name);
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          const found = yield* readLive(olds.name);
+          const ours = Effect.map(planEnforcement(olds), (plan) => plan === 'noop');
+          return yield* ownedRead({ fqn, instanceId, output }, found, ours);
         }),
 
         /** ⛔ IT COMPARES THE LIVE ENFORCEMENT — a target removed by hand is drift, not a noop. */
         diff: Effect.fn(function* ({ news, olds, output }) {
           // ⛔ The name first, before isResolved; onto an enforcement that exists fails the plan.
           const move = yield* judgeRename(IDENTITY, olds, news, output);
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
           if (output === undefined) return undefined;
           if (move !== undefined) return { action: 'replace' } as const;
           if (!isResolved(news)) return undefined;
           return { action: yield* planEnforcement(news) } as const;
         }),
 
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           // ⛔ An `update` across a rename the diff could not see — refused before any write.
           yield* guardRename(IDENTITY, news, output);
-          return yield* reconcileEnforcement(news);
+          return yield* reconcileEnforcement(news, claimFor({ fqn, instanceId, output }));
         }),
 
         /** ⛔ REFUSED — read the header: in 2.6.2 the delete does not survive a restart. */
@@ -154,5 +168,5 @@ export const BaoMfaLoginEnforcementProvider = () =>
           );
         }),
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );

package/src/openbao/mfa-totp.ts

@@ -20,6 +20,9 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { type Claim, claimFor } from '../ownership/adopt.ts';
+import { ownedRead } from '../ownership/probe.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import type { BaoError } from './bao-status.ts';
 import {
   type BaoMfaTotpMethodAttributes,
@@ -70,14 +73,19 @@ export const planTotp = (
     return live !== undefined && matches(live, props) ? 'noop' : 'update';
   });
 
-/** Upsert by name when live differs, then prove it by reading back. */
+/**
+ * Upsert by name when live differs, then prove it by reading back.
+ * ⛔ `claim` (the provider passes it): a create never takes over a method it finds by that name.
+ */
 export const reconcileTotp = (
   props: BaoMfaTotpMethodProps,
+  claim?: Claim,
 ): Effect.Effect<BaoMfaTotpMethodAttributes, BaoError, HttpClient.HttpClient> =>
   Effect.gen(function* () {
     const bad = problems(props);
     if (bad.length > 0) return yield* refuse(props.name, bad.join('; '));
     const live = yield* readTotp(props);
+    if (live !== undefined && claim !== undefined) yield* claim(`Bao.MfaTotpMethod ${props.name}`);
     if (live === undefined || !matches(live, props)) yield* writeTotp(writeBody(props));
     const after = yield* readTotp(props);
     if (after === undefined)
@@ -94,8 +102,13 @@ export const BaoMfaTotpMethodProvider = () =>
         /** ⛔ The namespace's method listing is not a list of things this owns. */
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          return yield* readTotp(olds);
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          const found = yield* readTotp(olds);
+          const ours = Effect.sync(
+            () => found !== undefined && problems(olds).length === 0 && matches(found, olds),
+          );
+          return yield* ownedRead({ fqn, instanceId, output }, found, ours);
         }),
 
         /**
@@ -110,15 +123,17 @@ export const BaoMfaTotpMethodProvider = () =>
             const rename = renameProblem(output.name, name);
             if (rename !== undefined) return yield* refuse(name, rename);
           }
-          if (output === undefined || !isResolved(news)) return undefined;
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
+          if (output === undefined) return undefined;
+          if (!isResolved(news)) return undefined;
           return { action: yield* planTotp(news) } as const;
         }),
 
         /** ⛔ A rename the diff could not see (the name was an Output), refused before any write. */
-        reconcile: Effect.fn(function* ({ news, output }) {
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
           const rename = output === undefined ? undefined : renameProblem(output.name, news.name);
           if (rename !== undefined) return yield* refuse(news.name, rename);
-          return yield* reconcileTotp(news);
+          return yield* reconcileTotp(news, claimFor({ fqn, instanceId, output }));
         }),
 
         /** ⛔ Read the header first. Idempotent: an unknown id deletes as success. */
@@ -127,5 +142,5 @@ export const BaoMfaTotpMethodProvider = () =>
           return undefined;
         }),
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );

package/src/openbao/mount-move.test.ts

@@ -5,7 +5,8 @@
 import assert from 'node:assert/strict';
 import { describe, it } from 'node:test';
 import { reconcileAuthMethod } from './auth-method-reconcile.ts';
-import { type Reply, type Seen, run, withFake } from './fake-bao.ts';
+import { type Seen, run, withFake } from './fake-bao.ts';
+import { liveTable } from './fake-mounts.ts';
 import { planMove } from './mount-move.ts';
 import { reconcileMount } from './mount-reconcile.ts';
 
@@ -32,40 +33,6 @@ describe('planMove', () => {
   });
 });
 
-/** A fake with a live table under `prefix` (`sys/mounts` or `sys/auth`) that sys/remount edits. */
-const liveTable = (prefix: string, initial: Record<string, string>) => {
-  const table = new Map(Object.entries(initial).map(([path, type]) => [`${path}/`, type]));
-  const entry = (type: string) => ({ config: { default_lease_ttl: 0, max_lease_ttl: 0 }, type });
-  const answer = (seen: Seen): Reply => {
-    const path = seen.path.replace(/^\/v1\//, '');
-    if (path === 'sys/remount' && seen.method === 'POST') {
-      const { from, to } = JSON.parse(seen.body) as { from: string; to: string };
-      const key = `${from.replace(/^auth\//, '')}/`;
-      const type = table.get(key);
-      if (type === undefined) return { json: { errors: ['no matching mount'] }, status: 400 };
-      table.delete(key);
-      table.set(`${to.replace(/^auth\//, '')}/`, type);
-      return { json: { data: { migration_id: 'm-1' } }, status: 200 };
-    }
-    if (path.startsWith('sys/remount/status/')) {
-      return { json: { data: { migration_info: { status: 'success' } } }, status: 200 };
-    }
-    if (path === prefix) {
-      return { json: { data: Object.fromEntries(table) }, status: 200 };
-    }
-    const mount = path.slice(prefix.length + 1).replace(/\/tune$/, '');
-    if (seen.method === 'POST') {
-      if (!path.endsWith('/tune')) table.set(`${mount}/`, 'enabled-by-test');
-      return { status: 204 };
-    }
-    const type = table.get(`${mount}/`);
-    return type === undefined
-      ? { json: { errors: [`No secret engine mount at ${mount}/`] }, status: 400 }
-      : { json: { data: entry(type) }, status: 200 };
-  };
-  return { answer, table };
-};
-
 const posts = (seen: Seen[]) =>
   seen.filter((each) => each.method === 'POST').map((each) => each.path);
 

package/src/openbao/mount-reconcile.ts

@@ -4,6 +4,7 @@
  */
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import type { Claim } from '../ownership/adopt.ts';
 import type { BaoError } from './bao-status.ts';
 import {
   type BaoMountAttributes,
@@ -37,22 +38,31 @@ const moveTarget = (props: BaoMountProps): MoveTarget => ({
 /**
  * Converge one mount. `stated` is the path in Alchemy's state (undefined on a first reconcile).
  * Dies on a refusal; fails with OpenBao's own error on a refused call.
+ * ⛔ `claim` (mount.ts always passes it) refuses, before any write, a first reconcile that would take
+ *   over a live mount: the one at the path, or the `remountFrom` source it would move
+ *   (ownership/adopt.ts).
  */
 export const reconcileMount = (
   news: BaoMountProps,
   stated: string | undefined,
   options?: RemountOptions,
+  claim?: Claim,
 ): Effect.Effect<BaoMountAttributes, BaoError | RemountError, HttpClient.HttpClient> =>
   Effect.gen(function* () {
     const move = planMove('Bao.Mount', stated, news.path, news.remountFrom);
     if (move.kind === 'refuse') return yield* Effect.die(new Error(move.message));
+    const first = stated === undefined ? claim : undefined;
+    if (first !== undefined && move.kind === 'move') {
+      const source = yield* readMount({ ...news, path: move.from });
+      if (source !== undefined) yield* first(`Bao.Mount ${move.from} (the remountFrom source)`);
+    }
     if (move.kind === 'move') yield* performMove(moveTarget(news), move.from, options);
 
     let live = yield* readMount(news);
     if (live === undefined) {
       yield* enableMount(news);
       if (wantsTune(news)) yield* tuneMount(news);
-    } else if (!matches(live, news)) {
+    } else {
       if (live.type !== news.type) {
         return yield* Effect.die(
           new Error(
@@ -61,7 +71,8 @@ export const reconcileMount = (
           ),
         );
       }
-      yield* tuneMount(news);
+      if (first !== undefined) yield* first(`Bao.Mount ${mountPath(news.path)}`);
+      if (!matches(live, news)) yield* tuneMount(news);
     }
     live = yield* readMount(news);
     if (live === undefined) {

package/src/openbao/mount.ts

@@ -22,6 +22,9 @@ import { isResolved } from 'alchemy/Diff';
 import * as Provider from 'alchemy/Provider';
 import * as Effect from 'effect/Effect';
 import type * as HttpClient from 'effect/unstable/http/HttpClient';
+import { claimFor } from '../ownership/adopt.ts';
+import { ownedRead } from '../ownership/probe.ts';
+import { provingResumes } from '../ownership/resume.ts';
 import { type BaoMountAttributes, type BaoMountProps, matches } from './mount-form.ts';
 import { planMove } from './mount-move.ts';
 import { readMount, reconcileMount } from './mount-reconcile.ts';
@@ -55,12 +58,17 @@ export const BaoMountProvider = () =>
          */
         list: () => Effect.succeed([]),
 
-        read: Effect.fn(function* ({ olds }) {
-          return yield* readMount(olds);
+        /** ⛔ Stateless: `Unowned` unless our own interrupted create made it (ownership/probe.ts). */
+        read: Effect.fn(function* ({ fqn, instanceId, olds, output }) {
+          const found = yield* readMount(olds);
+          const ours = Effect.sync(() => found !== undefined && matches(found, olds));
+          return yield* ownedRead({ fqn, instanceId, output }, found, ours);
         }),
 
         diff: Effect.fn(function* ({ news, output }) {
-          if (output === undefined || !isResolved(news)) return undefined;
+          // ★ No attributes: an unfinished generation, proven ours or not by provingResumes.
+          if (output === undefined) return undefined;
+          if (!isResolved(news)) return undefined;
           /**
            * ⛔ A CHANGED PATH IS DECIDED HERE, BEFORE ANY READ OF THE NEW PATH — reading it would
            *   find nothing and plan `update`, which is how an empty mount used to get enabled.
@@ -98,8 +106,9 @@ export const BaoMountProvider = () =>
          *   method and path — the job the per-command exit-code checks used to do by hand.
          *   The body, and the move, live in mount-reconcile.ts.
          */
-        reconcile: Effect.fn(function* ({ news, output }) {
-          return yield* reconcileMount(news, output?.path);
+        reconcile: Effect.fn(function* ({ fqn, instanceId, news, output }) {
+          const claim = claimFor({ fqn, instanceId, output });
+          return yield* reconcileMount(news, output?.path, undefined, claim);
         }),
 
         /**
@@ -111,5 +120,5 @@ export const BaoMountProvider = () =>
           return undefined;
         }),
       }),
-    ),
+    ).pipe(Effect.map(provingResumes)),
   );