@bananapus/nana-sdk-core 6.2.0 → 6.3.0

package/dist/cjs/review/react/useReviewedRun.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.REVIEWED_RUN_BUSY_LINE = exports.REVIEWED_RUN_SCOPE_LINE = void 0;
 exports.useReviewedRun = useReviewedRun;
 const lineError_js_1 = require("../lineError.js");
+const locks_js_1 = require("../locks.js");
 const receipt_js_1 = require("../receipt.js");
 const index_js_1 = require("../index.js");
 const react_1 = require("react");
 const heldView_js_1 = require("./heldView.js");
+const ownership_js_1 = require("./ownership.js");
 const IDLE = {
     cancelled: false,
     stopped: false,
@@ -31,6 +33,28 @@ const sent = ({ chainId, to, data, value, gas }) => [
     value ?? 0n,
     gas ?? null,
 ];
+/** This form's earlier write of the same calls succeeded: the run closes on it, sending nothing. */
+/**
+ * The holds `action`'s steps are held in, each with its step: a resumed
+ * sequence's sending step; a Safe app's batch as its one MultiSend
+ * proposal, its last step; or each call. The one home for that mapping.
+ */
+function heldSteps(account, safe, action, saved) {
+    if (saved?.sending)
+        return [
+            { call: saved.calls[saved.sending.step], step: saved.sending.step },
+        ];
+    const total = saved?.calls.length ?? action.calls.length;
+    return !saved && action.batch && safe && action.calls.length > 1
+        ? [{ call: (0, index_js_1.safeBatchCall)(account, action.calls), step: total - 1 }]
+        : action.calls.map((call, step) => ({ call, step }));
+}
+class OwnSucceeded extends Error {
+    constructor(found) {
+        super("succeeded");
+        this.found = found;
+    }
+}
 exports.REVIEWED_RUN_SCOPE_LINE = "This action has more than one step and no scope to resume it by. Nothing was sent.";
 exports.REVIEWED_RUN_BUSY_LINE = "This action is still running. Wait for it to finish, then try again.";
 /**
@@ -46,16 +70,29 @@ function useReviewedRun(deps) {
         if (cancelling)
             void (0, receipt_js_1.tell)(cancelling.told);
     }, [cancelling]);
-    /** The last shown success's acknowledgement: the next run waits for it. */
+    /** Every shown success's acknowledgement: the next run waits for all. */
     const acknowledged = (0, react_1.useRef)(Promise.resolve());
     // A success is acknowledged only once its done rendered: a reset after
-    // that hides nothing, and one before it leaves the success warning.
+    // that hides nothing, and one before it leaves the success warning. A
+    // later one never drops an earlier one still running from the wait.
     (0, react_1.useEffect)(() => {
         if (state.acknowledge)
-            acknowledged.current = state.acknowledge();
+            acknowledged.current = Promise.all([
+                acknowledged.current,
+                state.acknowledge(),
+            ]).then(() => undefined);
     }, [state.acknowledge]);
     /** The hold followed after a run, and its chain's client: its view is `held`. */
-    const [watched, setWatched] = (0, react_1.useState)(null);
+    const [watched, setWatchedState] = (0, react_1.useState)(null);
+    /**
+     * `watched` as last set, for a handler that resets and runs from one
+     * render's handle (a "Try again"): never that render's stale copy.
+     */
+    const watchedNow = (0, react_1.useRef)(null);
+    const setWatched = (next) => {
+        watchedNow.current = next;
+        setWatchedState(next);
+    };
     /** The latest run: an earlier one's late answers change nothing. */
     const latest = (0, react_1.useRef)(0);
     /** The sent step whose hold the latest run's `ended()` awaits. */
@@ -76,6 +113,101 @@ function useReviewedRun(deps) {
      * hold keeps the sent step.
      */
     const leave = (0, react_1.useRef)(() => { });
+    /** Every reservation this runner's runs followed: its own, whatever its calls now. */
+    const mine = (0, react_1.useRef)(new Set());
+    /**
+     * The reservations `calls`' holds hold now (a held write, or a success
+     * nothing showed), each with its hold.
+     */
+    const holdsOf = (account, calls) => calls.flatMap((call) => {
+        if (!deps || !account)
+            return [];
+        try {
+            // A hold's key is its call's, whatever the Safe mode.
+            const handle = (0, index_js_1.openStepHold)(deps.hold, account, false, call);
+            const held = handle.peek();
+            const reservation = held.status !== "clear"
+                ? held.reservation
+                : handle.unacknowledgedSuccess()?.reservation;
+            return reservation ? [{ handle, reservation }] : [];
+        }
+        catch {
+            return [];
+        }
+    });
+    /**
+     * The reservations this form's last run left unshown, or the last step
+     * `dismiss` closed while it was followed (`run`, whose later showing the
+     * user closed, never counts as seen), and the account that sent them.
+     * Their success, whoever acknowledged it, closes a later run under the
+     * same hold (its intent's, though the calls were refreshed) from the same
+     * account. Still pending, the hold refuses that run, which follows it again.
+     * One entry per account and reservation: keeping or showing one never
+     * touches another's.
+     */
+    const own = (0, react_1.useRef)(new Map());
+    /**
+     * Every change to a form's write, under the account that sent it, goes
+     * through {@link mergeOwn}: forward only. A showing (`shown`) changes
+     * the reservation's entry whichever account it is under.
+     */
+    const changeOwn = (account, reservations, change) => {
+        for (const reservation of reservations) {
+            if (!reservation)
+                continue;
+            const keys = [...own.current]
+                .filter(([, entry]) => change.kind === "shown" && entry.reservation === reservation)
+                .map(([key]) => key);
+            const mine = `${account.toLowerCase()}:${reservation}`;
+            for (const key of keys.length ? keys : [mine]) {
+                const entry = own.current.get(key);
+                own.current.set(key, (0, ownership_js_1.mergeOwn)(entry, entry?.account ?? account, reservation, change));
+            }
+        }
+    };
+    const ownSuccess = (action) => {
+        if (!deps?.account ||
+            (action.account &&
+                action.account.toLowerCase() !== deps.account.toLowerCase()))
+            return undefined;
+        const kept = [...own.current.values()]
+            .filter((entry) => entry.state === "owned" &&
+            entry.account.toLowerCase() === deps.account.toLowerCase())
+            .map((entry) => entry.reservation);
+        if (!kept.length)
+            return undefined;
+        // Only the action's last step's hold, as `follow` maps it: a success
+        // of an earlier step never completes the action. Its Safe mode may not
+        // be known yet; a reservation is only ever in its own mode's hold.
+        const account = deps.account;
+        const lasts = [false, true].map((safe) => {
+            const steps = heldSteps(account, safe, action);
+            return steps[steps.length - 1];
+        });
+        for (const { call, step } of lasts) {
+            try {
+                // A reservation is read only through its own hold: another hold
+                // (another intent, or another exact call) never answers for it.
+                const handle = (0, index_js_1.openStepHold)(deps.hold, deps.account, false, call);
+                for (const reservation of kept) {
+                    const settled = handle.settlementOf(reservation);
+                    if (settled?.result === "success")
+                        return {
+                            settled: settled,
+                            handle,
+                            account,
+                            call: call,
+                            step,
+                            reservation,
+                        };
+                }
+            }
+            catch {
+                /* A call the hold can't open holds nothing of this form's. */
+            }
+        }
+        return undefined;
+    };
     const replaced = () => {
         latest.current += 1;
         life.current.abort();
@@ -94,9 +226,12 @@ function useReviewedRun(deps) {
         };
     }, []);
     /** How a followed step ended, as the run that followed it shows it. */
-    const showSettled = (run, step, total, settled, receipt, acknowledge) => {
+    const showSettled = (run, step, total, settled, receipt, acknowledge, account, reservation) => {
         if (latest.current !== run)
             return;
+        // Shown: its own entry is released, unless `dismiss` closed it while
+        // this run followed it (its showing the user closed never counts).
+        changeOwn(account, [reservation], { kind: "shown", run });
         const finished = step === total - 1;
         setState((now) => settled.result !== "success"
             ? {
@@ -202,9 +337,24 @@ function useReviewedRun(deps) {
             const waiting = awaiting.current;
             if (open.current && !waiting)
                 return false;
+            /**
+             * The followed last step this closes, under the account that sent it,
+             * and the run that followed it: a retry of it never sends it again.
+             */
+            const last = waiting
+                ? waiting.last && { ...waiting.owner, run: waiting.run }
+                : watched?.step === watched?.total - 1 && watched;
+            const closing = () => {
+                if (last)
+                    changeOwn(last.account, [last.reservation], {
+                        kind: "dismiss",
+                        run: last.run,
+                    });
+            };
             if (waiting?.last) {
                 awaiting.current = null;
                 waiting.end();
+                closing();
                 return true;
             }
             detach(waiting
@@ -213,9 +363,13 @@ function useReviewedRun(deps) {
                     handle: watched.handle,
                     client: watched.client,
                     call: watched.call,
+                    account: watched.account,
                     reservation: watched.reservation,
                 });
+            // Closing the view keeps what this form sent: a reset forgets no
+            // entry, so a later dismiss of the idle view never forgets one.
             reset();
+            closing();
             return true;
         },
         preload,
@@ -235,6 +389,102 @@ function useReviewedRun(deps) {
             setWatched(null);
         },
         run: async ({ onCancelled, onStopped, ...action }) => {
+            /**
+             * The account this run sends from, read once: every continuation of
+             * it uses this one, whatever account the app's deps hold by then.
+             */
+            const runAccount = deps?.account;
+            /**
+             * The wallet's Safe mode, only while it still speaks for the run's
+             * account: another account's mode never names this run's holds.
+             */
+            const runSafe = () => deps && deps.account?.toLowerCase() === runAccount?.toLowerCase()
+                ? deps.adapter.isSafe()
+                : undefined;
+            /** This form's unshown write of these calls succeeded: the form closes on it. */
+            const close = async (found) => {
+                const { settled, handle } = found;
+                // Every exit holds the run open, and this form's ownership stays
+                // until its success is shown and acknowledged: until then a dismiss
+                // is refused and a later run closes on the same success again.
+                open.current += 1;
+                try {
+                    // Completed as its run would have, under this run's locks: told to
+                    // onConfirmed once (unless another completion did), and done only
+                    // once delivered.
+                    let failure;
+                    const told = await load(deps.engine)
+                        .then((engine) => engine.completeReviewedStep({
+                        step: found.step,
+                        held: { call: found.call, reservation: found.reservation },
+                    }, {
+                        account: found.account,
+                        scope: action.scope,
+                        onConfirmed: action.onConfirmed,
+                        locks: action.locks,
+                        attemptScoped: action.attemptScoped,
+                    }, deps, null, alive, false))
+                        .catch((error) => {
+                        failure = error;
+                        return null;
+                    });
+                    if (!told || told.undelivered) {
+                        failure ??= new locks_js_1.LockLostError(action.locks?.[0]?.name ?? "site");
+                        const error = (0, index_js_1.errorLine)(failure);
+                        update({ ...IDLE, error, failure });
+                        return { status: "failed", error, failure };
+                    }
+                    const step = action.calls.length - 1;
+                    update({
+                        ...IDLE,
+                        // Shown now: acknowledged once rendered, so it blocks no new send.
+                        // Rendered: the form's own is released, and a later run waits
+                        // for this acknowledgement before it sends.
+                        acknowledge: async () => {
+                            if (alive.aborted)
+                                return;
+                            changeOwn(found.account, [found.reservation], {
+                                kind: "shown",
+                            });
+                            await handle.acknowledge(settled).catch(() => undefined);
+                        },
+                        phase: "done",
+                        step,
+                        total: action.calls.length,
+                        hash: settled.hash,
+                        settled: { step, finished: true },
+                    });
+                    return {
+                        status: "done",
+                        hashes: told.hashes,
+                        receipts: [],
+                        ...(told.signatures ? { signatures: told.signatures } : {}),
+                    };
+                }
+                finally {
+                    open.current -= 1;
+                }
+            };
+            // This form's own write is still followed: a retry of it is refused
+            // with the hold's line, and the run following it goes on.
+            const now = watchedNow.current;
+            // Identity, never bytes: the followed reservation is one of these
+            // calls' holds'. A scoped sequence's journal answers for its own.
+            const followed = now?.reservation &&
+                runAccount &&
+                (action.scope === undefined || action.calls.length === 1)
+                ? now
+                : null;
+            const ownState = followed?.handle.peek();
+            if (followed &&
+                ownState?.status !== "clear" &&
+                ownState?.reservation === followed.reservation &&
+                holdsOf(runAccount, action.calls).some(({ reservation }) => reservation === followed.reservation)) {
+                const failure = new index_js_1.WriteHeldError(ownState);
+                const error = (0, index_js_1.errorLine)(failure);
+                setState((now) => ({ ...now, error, failure }));
+                return { status: "failed", error, failure };
+            }
             replaced();
             const id = latest.current;
             const { signal: alive } = life.current;
@@ -248,6 +498,21 @@ function useReviewedRun(deps) {
                     setState((now) => ({ ...now, ...next }));
             };
             setState({ ...IDLE, phase: "review", total: action.calls.length });
+            const succeeded = ownSuccess(action);
+            if (succeeded) {
+                setWatched(null);
+                // close holds the run open itself, from here until it ends.
+                open.current -= 1;
+                return close(succeeded);
+            }
+            /**
+             * Reservations the action's holds had before this run: another run's
+             * (another form's, sharing a hold). This run never follows one.
+             */
+            const holds = () => holdsOf(runAccount, runAccount && action.batch && action.calls.length > 1
+                ? [...action.calls, (0, index_js_1.safeBatchCall)(runAccount, action.calls)]
+                : action.calls);
+            const before = new Set(holds().map(({ reservation }) => reservation));
             let loaded;
             /** A step of the action was sent before this run, or by it: never a cancel. */
             let sentAny = false;
@@ -276,9 +541,11 @@ function useReviewedRun(deps) {
                 let completed = Promise.resolve(null);
                 let shown = false;
                 const action$ = {
-                    account: deps.account,
+                    account: runAccount,
                     scope: action.scope,
                     onConfirmed: action.onConfirmed,
+                    locks: action.locks,
+                    attemptScoped: action.attemptScoped,
                 };
                 const finish = (seen, receipt = null) => {
                     if (shown || alive.aborted)
@@ -292,11 +559,30 @@ function useReviewedRun(deps) {
                             return null;
                         }));
                     void completed.then((ended) => {
+                        // Its notice undelivered: the form's own, whichever run shows
+                        // now (a retry that replaced this one included), so a later
+                        // run closes on it, telling it then.
+                        if (ended?.undelivered && target.step === total - 1)
+                            changeOwn(action$.account, [target.held?.reservation], {
+                                kind: "keep",
+                            });
                         if (shown || alive.aborted)
                             return;
-                        // Nothing advanced (its receipt unread, or its hold not settled
-                        // for this send yet): it is tried again.
-                        if (unread || (!ended && seen)) {
+                        // Nothing advanced (its receipt unread, its hold not settled
+                        // for this send yet, or its onConfirmed not delivered): it is
+                        // tried again, still followed and acknowledged by nothing.
+                        // ponytail: retried at the receipt's pace while mounted.
+                        if (unread || (!ended && seen) || ended?.undelivered) {
+                            if (ended?.undelivered) {
+                                completed = Promise.resolve(null);
+                                // While the site's work under its locks runs, its notice may
+                                // wait for it (kept for a lock this run lost, or another
+                                // completion's claim queued behind one it holds): the wait
+                                // ends now, retryable, and is never what holds that work up.
+                                // Once that work ended, nothing of the caller's is in its way.
+                                if (action.locks?.some(locks_js_1.lockWorkRunning))
+                                    end?.("queued");
+                            }
                             if (mounted.current)
                                 setTimeout(() => finish(seen, receipt), index_js_1.RECEIPT_RETRY_MS);
                             return;
@@ -306,8 +592,8 @@ function useReviewedRun(deps) {
                         shown = true;
                         // Shown with the receipt completion checked, a failure's too.
                         showSettled(id, target.step, total, ended.settled, ended.receipt, ended.settled.result === "success" && target.step === total - 1
-                            ? acknowledging((0, index_js_1.openStepHold)(deps.hold, deps.account, false, target.held.call), ended.settled)
-                            : null);
+                            ? acknowledging((0, index_js_1.openStepHold)(deps.hold, action$.account, false, target.held.call), ended.settled)
+                            : null, action$.account, target.held?.reservation);
                         setWatched(null);
                         end?.(ended);
                     });
@@ -319,9 +605,10 @@ function useReviewedRun(deps) {
              * found one, or null when the wallet could not say (its Safe mode unknown).
              */
             const follow = async (finish, released) => {
-                if (latest.current !== id || !deps?.account)
+                if (latest.current !== id || !deps || !runAccount)
                     return false;
-                const { account, adapter, hold, storage } = deps;
+                const { adapter, hold, storage } = deps;
+                const account = runAccount;
                 // Its Safe mode is read only once the wallet says it is known.
                 try {
                     await (0, index_js_1.walletReady)(adapter);
@@ -332,36 +619,48 @@ function useReviewedRun(deps) {
                 try {
                     if (latest.current !== id)
                         return false;
-                    const safe = adapter.isSafe();
+                    const safe = runSafe();
+                    if (safe === undefined)
+                        return null;
                     const saved = !action.scope
                         ? null
                         : (0, index_js_1.findReviewedSequence)(action.scope, account, { storage });
                     const total = saved?.calls.length ?? action.calls.length;
-                    // A Safe app's batch is held as its one MultiSend proposal, its last step.
-                    const steps = saved?.sending
-                        ? [
-                            {
-                                call: saved.calls[saved.sending.step],
-                                step: saved.sending.step,
-                            },
-                        ]
-                        : !saved && action.batch && safe && action.calls.length > 1
-                            ? [
-                                {
-                                    call: (0, index_js_1.safeBatchCall)(account, action.calls),
-                                    step: total - 1,
-                                },
-                            ]
-                            : action.calls.map((call, step) => ({ call, step }));
-                    // A held step, or the last step's success nothing showed.
+                    const steps = heldSteps(account, safe, action, saved);
+                    // A held step, or the last step's success nothing showed, of this
+                    // run (or of the saved sequence it resumes), never another run's.
                     const found = steps
                         .map(({ call, step }) => ({
                         call,
                         step,
                         handle: (0, index_js_1.openStepHold)(hold, account, safe, call),
                     }))
-                        .find(({ handle, step }) => handle.peek().status !== "clear" ||
-                        (step === total - 1 && handle.unacknowledgedSuccess()));
+                        .find(({ handle, step, call }) => {
+                        const held = handle.peek();
+                        const success = step === total - 1 ? handle.unacknowledgedSuccess() : undefined;
+                        if (held.status === "clear" && !success)
+                            return false;
+                        const reservation = held.status !== "clear"
+                            ? held.reservation
+                            : success?.reservation;
+                        // A write held before this run, under an intent other forms
+                        // share, is followed only when this runner followed it before,
+                        // or it is this exact call (or this saved sequence's): another
+                        // form's write is never adopted.
+                        if (!reservation ||
+                            !before.has(reservation) ||
+                            mine.current.has(reservation) ||
+                            reservation === saved?.sending?.reservation ||
+                            !call.intent)
+                            return true;
+                        if (held.status === "clear")
+                            return false;
+                        const record = (0, index_js_1.listReviewedWrites)({ chainId: call.chainId, account }, { storage }).find(({ record }) => record.id === reservation)?.record;
+                        return (!!record &&
+                            record.call.to.toLowerCase() === call.to.toLowerCase() &&
+                            record.call.data.toLowerCase() === call.data.toLowerCase() &&
+                            record.call.value === String(call.value ?? 0n));
+                    });
                     // Its settlement completes it as a send's would: a proposal too.
                     const reservation = found?.handle.peek().reservation ??
                         found?.handle.unacknowledgedSuccess()?.reservation;
@@ -370,6 +669,7 @@ function useReviewedRun(deps) {
                             handle: found.handle,
                             client: deps.clientFor(found.call.chainId),
                             run: id,
+                            account,
                             call: found.call,
                             reservation,
                             step: found.step,
@@ -383,6 +683,8 @@ function useReviewedRun(deps) {
                         }
                         : null);
                     // Only its hold is followed now: the confirm can close.
+                    if (reservation)
+                        mine.current.add(reservation);
                     if (found)
                         update({ following: true });
                     return !!found;
@@ -394,13 +696,17 @@ function useReviewedRun(deps) {
             };
             const heldStep = (target) => {
                 const call = target.held?.call ?? action.calls[target.step];
-                if (!deps?.account || !call)
+                if (!deps || !runAccount || !call)
                     return null;
                 try {
+                    const safe = runSafe();
+                    if (safe === undefined)
+                        return null;
                     return {
-                        handle: (0, index_js_1.openStepHold)(deps.hold, deps.account, deps.adapter.isSafe(), call),
+                        handle: (0, index_js_1.openStepHold)(deps.hold, runAccount, safe, call),
                         client: deps.clientFor(call.chainId),
                         call,
+                        account: runAccount,
                         reservation: target.held?.reservation,
                     };
                 }
@@ -409,10 +715,10 @@ function useReviewedRun(deps) {
                 }
             };
             try {
-                if (!deps?.account)
+                if (!deps || !runAccount)
                     throw new lineError_js_1.ReviewLineError("Connect a wallet first.");
                 if (action.account &&
-                    action.account.toLowerCase() !== deps.account.toLowerCase())
+                    action.account.toLowerCase() !== runAccount.toLowerCase())
                     throw new lineError_js_1.ReviewLineError(index_js_1.REVIEWED_ACCOUNT_CHANGED_LINE);
                 if (action.calls.length > 1 && action.scope === undefined)
                     throw new lineError_js_1.ReviewLineError(exports.REVIEWED_RUN_SCOPE_LINE);
@@ -433,7 +739,14 @@ function useReviewedRun(deps) {
                 const { resumeReviewed, sendReviewed } = loaded;
                 // A success already shown is acknowledged before this run checks it.
                 await acknowledged.current;
-                const { account, guard } = deps;
+                const settledOwn = () => {
+                    const settled = ownSuccess(action);
+                    if (settled)
+                        throw new OwnSucceeded(settled);
+                };
+                settledOwn();
+                const { guard } = deps;
+                const account = runAccount;
                 const tracked = {
                     ...deps,
                     onProgress: (progress) => {
@@ -490,9 +803,20 @@ function useReviewedRun(deps) {
                         (0, receipt_js_1.tell)(action.follow?.onConfirming, step);
                     },
                 };
+                const assertWriteState = () => {
+                    settledOwn();
+                    action.assertWriteState?.();
+                };
+                const gated = {
+                    ...action,
+                    guard,
+                    follow: inPlace,
+                    onSubmitted,
+                    assertWriteState,
+                };
                 const result = saved
-                    ? await resumeReviewed(saved, { ...action, guard, follow: inPlace, onSubmitted }, tracked)
-                    : await sendReviewed({ ...action, account, guard, follow: inPlace, onSubmitted }, tracked);
+                    ? await resumeReviewed(saved, gated, tracked)
+                    : await sendReviewed({ ...gated, account }, tracked);
                 // A wallet that reviews on its own page reports no progress: the
                 // result is the run's last word.
                 const calls = saved?.calls ?? action.calls;
@@ -517,6 +841,8 @@ function useReviewedRun(deps) {
                 return result;
             }
             catch (error) {
+                if (error instanceof OwnSucceeded)
+                    return close(error.found);
                 if (error instanceof index_js_1.ReviewedReceiptUnverifiedError) {
                     // Still confirming: followed until its hold settles it.
                     update({
@@ -545,7 +871,12 @@ function useReviewedRun(deps) {
                         leave.current = abandon;
                         cancelled?.addEventListener("abort", abandon, { once: true });
                         awaiting.current = {
+                            run: id,
                             last: error.step === action.calls.length - 1,
+                            owner: {
+                                account: runAccount,
+                                reservation: error.held?.reservation,
+                            },
                             detached: heldStep(error),
                             end: abandon,
                         };
@@ -553,7 +884,6 @@ function useReviewedRun(deps) {
                     const finish = completing(error, action.calls.length, end);
                     // Followed for a later settlement; one already there is read once it attaches.
                     void follow(finish, () => end(null)).then(() => finish());
-                    const before = error.held?.hashes ?? [];
                     return {
                         status: "receipt",
                         step: error.step,
@@ -564,6 +894,11 @@ function useReviewedRun(deps) {
                         ended: () => outcome.then(async (ran) => {
                             if (!ran)
                                 return null;
+                            if (ran === "queued") {
+                                const failure = new locks_js_1.ConfirmationQueuedError(error.step);
+                                const line = (0, index_js_1.errorLine)(failure);
+                                return { status: "failed", error: line, failure };
+                            }
                             const { settled, receipt } = ran;
                             if (settled.result !== "success") {
                                 const line = (0, index_js_1.settledLine)(settled);
@@ -573,7 +908,8 @@ function useReviewedRun(deps) {
                                     failure: new lineError_js_1.ReviewLineError(line),
                                 };
                             }
-                            const signatures = error.held?.signatures;
+                            // The run's own, as its hold saved them with the step.
+                            const { signatures } = ran;
                             if (error.step < action.calls.length - 1) {
                                 const started = await runLatest.current({
                                     ...action,
@@ -591,7 +927,7 @@ function useReviewedRun(deps) {
                             }
                             return {
                                 status: "done",
-                                hashes: [...before, settled.hash],
+                                hashes: ran.hashes,
                                 receipts: receipt ? [receipt] : [],
                                 ...(signatures ? { signatures } : {}),
                             };
@@ -600,9 +936,9 @@ function useReviewedRun(deps) {
                 }
                 // A resume can complete a step the wallet sent before the reload.
                 try {
-                    const after = action.scope === undefined || !deps?.account
+                    const after = action.scope === undefined || !runAccount
                         ? null
-                        : (0, index_js_1.findReviewedSequence)(action.scope, deps.account, {
+                        : (0, index_js_1.findReviewedSequence)(action.scope, runAccount, {
                             storage: deps.storage,
                         });
                     if (after?.completed.length &&
@@ -614,6 +950,19 @@ function useReviewedRun(deps) {
                 catch {
                     /* An unreadable sequence adds nothing to what this run saw. */
                 }
+                // Refused by a write already held (another form's, sharing the
+                // hold): this run follows it only as its own exact call.
+                const refused = error instanceof index_js_1.WriteHeldError
+                    ? error.state.reservation
+                    : error instanceof index_js_1.WriteHoldUnacknowledgedSuccessError
+                        ? error.success.reservation
+                        : undefined;
+                if (refused)
+                    before.add(refused);
+                // ponytail: one call only; a sequence's journal keeps its steps.
+                const left = holds().filter(({ reservation }) => !before.has(reservation));
+                if (action.calls.length === 1 && left.length && runAccount)
+                    changeOwn(runAccount, left.map(({ reservation }) => reservation), { kind: "keep" });
                 const cancelled = error instanceof index_js_1.TransactionReviewCancelledError ||
                     (0, index_js_1.isDefiniteWalletRejection)(error);
                 const line = cancelled ? null : (0, index_js_1.errorLine)(error);