@internetarchive/ia-book-actions 1.4.4-alpha11 → 1.4.4-alpha13

package/package.json

@@ -7,7 +7,7 @@
   },
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
-  "version": "1.4.4-alpha11",
+  "version": "1.4.4-alpha13",
   "main": "index.js",
   "module": "index.js",
   "publishConfig": {

package/src/assets/data/info.js

@@ -4,9 +4,14 @@ export const infoIcon = html`<svg
   height="20"
   width="20"
   viewBox="0 0 100 100"
-  xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd"><path d="m0 0h100v100h-100z" fill="#fff"/>
-    <path d="m49.8315487 0h.1702245c6.7356878 0 13.1853038 1.31117332 19.3488483 3.93351997 6.1635444 2.62234664 11.4854233 6.15778963 15.9656369 10.60632903 4.4802135 4.4485394 8.0478347 9.7522946 10.7028636 15.9112655 2.655029 6.1589709 3.980878 12.6038012 3.9789971 19.3344909.0567419 6.6716279-1.1702933 13.0585776-3.6811042 19.1608491-2.510811 6.1022715-6.106803 11.5206067-10.7879759 16.2550055-9.7027949 9.7522946-21.4884754 14.6851412-35.3570414 14.79854h-.1702244c-6.7333236 0-13.1829397-1.3111733-19.3488483-3.93352-6.1659087-2.6223466-11.4877876-6.1577896-15.9656369-10.606329s-8.04547055-9.7522946-10.7028637-15.9112655c-2.65739314-6.1589709-3.9844243-12.6038012-3.98254337-19.3344909-.05674149-6.6716279 1.17029325-13.0585776 3.68110421-19.1608491 2.51081095-6.1022715 6.10680292-11.5206067 10.78797586-16.2550055 9.7027949-9.75229456 21.4884754-14.68514123 35.3570414-14.79854zm12.6566146 26.4757998c1.6745578-1.6828001 2.5118367-3.6747334 2.5118367-5.9757998 0-2.4126333-.8095238-4.4324583-2.4285714-6.059475s-3.6289796-2.440525-6.0297959-2.440525c-2.4008164 0-4.4107483.8135083-6.029796 2.440525-1.6745578 1.6270167-2.5118367 3.6468417-2.5118367 6.059475 0 2.1871753.8372789 4.1791086 2.5118367 5.9757998 1.6745579 1.6828001 3.6844898 2.5242002 6.029796 2.5242002 2.3453061 0 4.3274829-.8414001 5.9465306-2.5242002zm-12.1370589 52.7776981-1.2815282-.9486968c0-.4588935.398855-1.8938272 1.196565-4.3048011l12.7338588-39-23.0745876 3.6164609.2548896 3.873251c0-.1141289.4554971-.1997256 1.3664914-.2567901.9109942 0 1.623741.1723823 2.1382404.5171468.5121392.2306356.7965299.6039323.8531721 1.1198902 0 .8607225-.6549247 3.2134431-1.9647739 7.0581619l-8.1175252 24.1061729c-1.0242785 3.2716963-1.5080967 5.5388203-1.4514546 6.8013717.0566421 1.6643804.8826732 2.9839963 2.4780932 3.9588477 1.2532071.803658 2.8769482 1.205487 4.8712231 1.205487h.5982825c1.7653464-.0570645 3.8445846-.3875629 6.2377146-.9914952 2.3931299-.6039323 4.3590839-1.3933242 5.8978617-2.3681756 1.3098493-.803658 2.3919499-1.5359853 3.2463021-2.1969821.8543521-.6609968 1.3959925-1.1341564 1.6249211-1.4194788l.3433929-.3459533-2.8214861-3.3596708-2.9914125 2.0650205c-.79771.4588935-1.5104568.7454047-2.1382404.8595337z" fill="#000" fill-rule="nonzero"/>
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <g fill="none" fill-rule="evenodd">
+    <path d="m0 0h100v100h-100z" fill="#fff" />
+    <path
+      d="m49.8315487 0h.1702245c6.7356878 0 13.1853038 1.31117332 19.3488483 3.93351997 6.1635444 2.62234664 11.4854233 6.15778963 15.9656369 10.60632903 4.4802135 4.4485394 8.0478347 9.7522946 10.7028636 15.9112655 2.655029 6.1589709 3.980878 12.6038012 3.9789971 19.3344909.0567419 6.6716279-1.1702933 13.0585776-3.6811042 19.1608491-2.510811 6.1022715-6.106803 11.5206067-10.7879759 16.2550055-9.7027949 9.7522946-21.4884754 14.6851412-35.3570414 14.79854h-.1702244c-6.7333236 0-13.1829397-1.3111733-19.3488483-3.93352-6.1659087-2.6223466-11.4877876-6.1577896-15.9656369-10.606329s-8.04547055-9.7522946-10.7028637-15.9112655c-2.65739314-6.1589709-3.9844243-12.6038012-3.98254337-19.3344909-.05674149-6.6716279 1.17029325-13.0585776 3.68110421-19.1608491 2.51081095-6.1022715 6.10680292-11.5206067 10.78797586-16.2550055 9.7027949-9.75229456 21.4884754-14.68514123 35.3570414-14.79854zm12.6566146 26.4757998c1.6745578-1.6828001 2.5118367-3.6747334 2.5118367-5.9757998 0-2.4126333-.8095238-4.4324583-2.4285714-6.059475s-3.6289796-2.440525-6.0297959-2.440525c-2.4008164 0-4.4107483.8135083-6.029796 2.440525-1.6745578 1.6270167-2.5118367 3.6468417-2.5118367 6.059475 0 2.1871753.8372789 4.1791086 2.5118367 5.9757998 1.6745579 1.6828001 3.6844898 2.5242002 6.029796 2.5242002 2.3453061 0 4.3274829-.8414001 5.9465306-2.5242002zm-12.1370589 52.7776981-1.2815282-.9486968c0-.4588935.398855-1.8938272 1.196565-4.3048011l12.7338588-39-23.0745876 3.6164609.2548896 3.873251c0-.1141289.4554971-.1997256 1.3664914-.2567901.9109942 0 1.623741.1723823 2.1382404.5171468.5121392.2306356.7965299.6039323.8531721 1.1198902 0 .8607225-.6549247 3.2134431-1.9647739 7.0581619l-8.1175252 24.1061729c-1.0242785 3.2716963-1.5080967 5.5388203-1.4514546 6.8013717.0566421 1.6643804.8826732 2.9839963 2.4780932 3.9588477 1.2532071.803658 2.8769482 1.205487 4.8712231 1.205487h.5982825c1.7653464-.0570645 3.8445846-.3875629 6.2377146-.9914952 2.3931299-.6039323 4.3590839-1.3933242 5.8978617-2.3681756 1.3098493-.803658 2.3919499-1.5359853 3.2463021-2.1969821.8543521-.6609968 1.3959925-1.1341564 1.6249211-1.4194788l.3433929-.3459533-2.8214861-3.3596708-2.9914125 2.0650205c-.79771.4588935-1.5104568.7454047-2.1382404.8595337z"
+      fill="#000"
+      fill-rule="nonzero"
+    />
   </g>
-</svg>
-`;
+</svg> `;

package/src/core/services/actions-handler/actions-handler-service.js

@@ -95,5 +95,22 @@ export default async function ActionsHandlerService(options) {
     window?.Sentry?.captureException(
       `${sentryLogs.actionsHandlerService} - Error: ${error}`
     );
+
+    /**
+     * Report it, don't just swallow it. A rejected fetch (offline, dropped
+     * connection) or a non-JSON body (a 405 returning HTML, which QA has
+     * been seeing) lands here, and calling neither `success` nor `error`
+     * leaves every caller waiting on a callback that never comes.
+     *
+     * For renew_loan that's not merely a missing modal: IABookActions
+     * clears its loanRenewInProgress guard from these callbacks, so a
+     * silent failure latched it on for good and every later renewal
+     * attempt became a no-op. Backgrounding a tab on a flaky mobile
+     * connection is exactly when this fires.
+     */
+    log(`[IABookActions] ✗ ${option.action} threw`, error);
+    option?.error({
+      error: `Could not reach the lending service. Please check your connection and try again. (${error})`,
+    });
   }
 }

package/src/core/services/actions-handler/actions-handler.js

@@ -6,7 +6,11 @@ import log from '../log.js';
 
 import ActionsHandlerService from './actions-handler-service.js';
 import LoanAnanlytics from '../loan-analytics.js';
-import { analyticsCategories, analyticsActions, analyticsLabels } from '../../config/analytics-event-and-category.js';
+import {
+  analyticsCategories,
+  analyticsActions,
+  analyticsLabels,
+} from '../../config/analytics-event-and-category.js';
 import * as Cookies from '../doc-cookies.js';
 
 /**
@@ -172,32 +176,53 @@ export default class ActionsHandler extends LitElement {
       action,
       identifier: this.identifier,
       success: async data => {
-        log('RENEW_LOAN --- ', data, this.identifier);
-        const activeLoan = data.loan ? data.loan : undefined;
-        const isRenewal = activeLoan.renewal;
-
-        if (activeLoan && isRenewal) {
-          // Await — loanAutoRenewed listeners read this same cache key
-          // immediately; dispatching before the write lands was a race.
-          await this.setBrowseTimeSession();
-
-          // Only record the renew analytics event once the renewal has
-          // actually succeeded — not merely attempted.
-          await this.loanAnanlytics?.storeLoanStatsCount(
-            this.identifier,
-            'autorenew'
-          );
-          const analyticsLabel =
-            renewType === 'auto'
-              ? analyticsLabels.browseAutoRenew
-              : analyticsLabels.browseManualRenew;
-          this.loanAnanlytics?.sendEvent(
-            analyticsCategories.browse,
-            analyticsActions.browseRenew,
-            analyticsLabel,
-            this.identifier
-          );
-        } else {
+        // Anything thrown in here is an unhandled rejection that dispatches
+        // NOTHING — and IABookActions only clears loanRenewInProgress when
+        // one of these two events arrives, so a throw here latches it on
+        // permanently (dead countdown, loan stuck "active"). Always exit
+        // through exactly one of the two dispatches below.
+        try {
+          log('RENEW_LOAN --- ', data, this.identifier);
+          const activeLoan = data.loan ? data.loan : undefined;
+          // Optional chaining: `data.loan` is genuinely absent on some
+          // failures, and reading `.renewal` off undefined threw here.
+          const isRenewal = activeLoan?.renewal;
+
+          if (activeLoan && isRenewal) {
+            // Await — loanAutoRenewed listeners read this same cache key
+            // immediately; dispatching before the write lands was a race.
+            await this.setBrowseTimeSession();
+
+            // Only record the renew analytics event once the renewal has
+            // actually succeeded — not merely attempted.
+            await this.loanAnanlytics?.storeLoanStatsCount(
+              this.identifier,
+              'autorenew'
+            );
+            const analyticsLabel =
+              renewType === 'auto'
+                ? analyticsLabels.browseAutoRenew
+                : analyticsLabels.browseManualRenew;
+            this.loanAnanlytics?.sendEvent(
+              analyticsCategories.browse,
+              analyticsActions.browseRenew,
+              analyticsLabel,
+              this.identifier
+            );
+
+            // Dispatch the success outcome ONLY for a confirmed renewal.
+            // This used to fire on the failure path too, so a
+            // `{loan: {renewal: false}}` response reported an error AND a
+            // success: the error modal went up while handleLoanAutoRenewed
+            // simultaneously put a fresh countdown back on the bar.
+            this.dispatchEvent(
+              new CustomEvent('loanAutoRenewed', {
+                detail: { action, data: { ...data, loan: activeLoan } },
+              })
+            );
+            return;
+          }
+
           log('RENEW_LOAN ERROR --- ', {
             action,
             isRenewal,
@@ -213,14 +238,17 @@ export default class ActionsHandler extends LitElement {
             error: true,
             message: 'Loan renewal failed: no loan active.',
           });
+        } catch (error) {
+          log('RENEW_LOAN THREW --- ', error);
+          window?.Sentry?.captureException(
+            `${sentryLogs.bookRenewFailed} - Exception: ${error}`
+          );
+          this.dispatchActionError(action, {
+            data,
+            error: true,
+            message: `Loan renewal failed: ${error}`,
+          });
         }
-
-        // dispatch outcome of loan renewal
-        this.dispatchEvent(
-          new CustomEvent('loanAutoRenewed', {
-            detail: { action, data: { ...data, loan: activeLoan } },
-          })
-        );
       },
       error: data => {
         this.dispatchActionError(action, data);
@@ -372,6 +400,12 @@ export default class ActionsHandler extends LitElement {
         new Date().getTime() + this.loanTotalTime * 1000
       );
 
+      log('[ActionsHandler] setBrowseTimeSession: resetting loanTime', {
+        identifier: this.identifier,
+        expireDate,
+        loanTotalTime: this.loanTotalTime,
+      });
+
       // set a value
       await this.localCache.set({
         key: `${this.identifier}-loanTime`,
@@ -381,12 +415,20 @@ export default class ActionsHandler extends LitElement {
 
       // delete pageChangedTime when book is auto renew at nth minute
       await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+
+      log('[ActionsHandler] setBrowseTimeSession: loanTime reset complete', {
+        identifier: this.identifier,
+      });
     } catch (error) {
-      log(error);
+      log('[ActionsHandler] setBrowseTimeSession failed', error);
     }
   }
 
   deleteLoanCookies() {
+    log('[ActionsHandler] deleteLoanCookies: expiring loan cookies', {
+      identifier: this.identifier,
+    });
+
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
 
@@ -414,7 +456,8 @@ export default class ActionsHandler extends LitElement {
    * @returns {void}
    */
   setStickyAdminAccess(value) {
-    const domain = window.location.hostname === 'localhost' ? 'localhost' : '.archive.org';
+    const domain =
+      window.location.hostname === 'localhost' ? 'localhost' : '.archive.org';
     const expires = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000); // 30 days from now
     Cookies.setItem('sticky-admin-access', value, expires, '/', domain);
   }

package/src/core/services/loan-analytics.js

@@ -159,17 +159,6 @@ export default class LoanAnanlytics {
    * @memberof LoanAnanlytics
    */
   sendEvent(eventCategory, eventAction, label, extraParams) {
-    log(
-      'eventCategory:-',
-      eventCategory,
-      '||\teventAction:-',
-      eventAction,
-      '||\tlabel:-',
-      label,
-      '||\textraParams:-',
-      extraParams,
-    );
-
     window?.archive_analytics?.send_event_no_sampling(
       eventCategory,
       eventAction,

package/src/core/services/loan-renew-helper.js

@@ -26,7 +26,7 @@ export class LoanRenewHelper {
     };
   }
 
-  async handleLoanRenew() {
+  handleLoanRenew() {
     try {
       if (this.hasPageChanged) {
         return this.pageChanged(); // user clicked on page
@@ -99,7 +99,7 @@ export class LoanRenewHelper {
     } else if (pageChangedTime >= pageChangeTimeFrame) {
       this.result = {
         texts: '',
-        renewNow: true,  // viewed in last time frame
+        renewNow: true, // viewed in last time frame
         renewType: 'auto',
       };
     }

package/src/core/services/loan-token-poller.js

@@ -2,6 +2,7 @@
 import ActionsHandlerService from './actions-handler/actions-handler-service.js';
 import LoanAnanlytics from './loan-analytics.js';
 import { sentryLogs } from '../config/sentry-events.js';
+import log from './log.js';
 
 /**
  * This class is used to create loan token for borrowed books
@@ -27,8 +28,16 @@ export class LoanTokenPoller {
      * the loan is genuinely valid. Retry a few times with backoff instead
      * of giving up on the first attempt.
      */
-    this.maxInitialTokenRetries = 3;
-    this.initialTokenRetryDelay = 1000; // ms, multiplied by attempt number
+    this.maxTokenRetries = 3;
+    this.tokenRetryDelay = 1000; // ms, multiplied by attempt number
+
+    /**
+     * Handle for a pending retry, so teardown can cancel it. It's a bare
+     * setTimeout rather than an IALendingIntervals entry, so without this
+     * a retry scheduled just before the loan is returned would still fire
+     * its create_token afterwards.
+     */
+    this.retryTimeout = undefined;
 
     /**
      * loan analytics instance
@@ -41,6 +50,8 @@ export class LoanTokenPoller {
 
   disconnectedCallback() {
     window?.IALendingIntervals?.clearTokenPoller();
+    clearTimeout(this.retryTimeout);
+    this.retryTimeout = undefined;
   }
 
   async bookAccessed() {
@@ -77,11 +88,21 @@ export class LoanTokenPoller {
    */
   async handleLoanTokenPoller(isInitial = false, retryCount = 0) {
     const action = 'create_token';
+    log('[LoanTokenPoller] create_token requested', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+    });
     ActionsHandlerService({
       identifier: this.identifier,
       action,
       error: data => this.handleTokenError(data, isInitial, retryCount),
       success: () => {
+        log('[LoanTokenPoller] create_token succeeded', {
+          identifier: this.identifier,
+          isInitial,
+          retryCount,
+        });
         if (isInitial) this.successCallback();
       },
     });
@@ -104,19 +125,46 @@ export class LoanTokenPoller {
       typeof data?.error === 'string' &&
       /do not currently have this book borrowed/i.test(data.error);
 
-    if (
-      isInitial &&
-      isStaleLoanReadError &&
-      retryCount < this.maxInitialTokenRetries
-    ) {
-      const delay = this.initialTokenRetryDelay * (retryCount + 1);
-      setTimeout(() => {
-        this.handleLoanTokenPoller(true, retryCount + 1);
+    log('[LoanTokenPoller] create_token failed', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+      isStaleLoanReadError,
+      error: data?.error,
+    });
+
+    // The renewal write can be mid-propagation for an interval refresh too,
+    // not just the initial call — a routine tick landing moments after a
+    // renewal hits the same race. Retry both; isInitial only decides how a
+    // final failure is reported, not whether it's worth retrying.
+    if (isStaleLoanReadError && retryCount < this.maxTokenRetries) {
+      const delay = this.tokenRetryDelay * (retryCount + 1);
+      log(
+        '[LoanTokenPoller] retrying create_token after stale-loan-read error',
+        {
+          identifier: this.identifier,
+          nextRetryCount: retryCount + 1,
+          delay,
+        }
+      );
+      clearTimeout(this.retryTimeout);
+      this.retryTimeout = setTimeout(() => {
+        this.retryTimeout = undefined;
+        this.handleLoanTokenPoller(isInitial, retryCount + 1);
       }, delay);
       return;
     }
 
-    this.errorCallback({ detail: { action, data } });
+    log('[LoanTokenPoller] giving up on create_token, reporting error', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+    });
+
+    // isInitial rides along so the consumer can distinguish "the book won't
+    // open at all" from "a mid-read refresh blipped" — see
+    // IABookActions.handleLendingActionError.
+    this.errorCallback({ detail: { action, data, isInitial } });
 
     // send error to Sentry
     window?.Sentry?.captureMessage(

package/src/ia-book-actions.js

@@ -61,7 +61,6 @@ export default class IABookActions extends LitElement {
       modal: { Object },
       tokenDelay: { type: Number },
       timerExecutionSeconds: { type: Number },
-      userActionGracePeriod: { type: Number },
       localCache: { type: Object },
       loanRenewTimeConfig: { type: Object },
       loanRenewResult: { type: Object },
@@ -84,14 +83,6 @@ export default class IABookActions extends LitElement {
     this.tokenDelay = 120; // in seconds
     this.timerExecutionSeconds = 30;
 
-    /**
-     * How long (ms) after bindLoanRenewEvents() runs to ignore
-     * BookReader:userAction events — BookReader fires that event on its
-     * own init-time jump to the last-read page, not just on genuine
-     * interaction. @see bindLoanRenewEvents
-     */
-    this.userActionGracePeriod = 2000;
-
     // private props
     this.postInitComplete = false;
     this.primaryActions = [];
@@ -241,17 +232,58 @@ export default class IABookActions extends LitElement {
   }
   /** End SharedObserver resize handler */
 
+  /**
+   * Recompute the action bar (title, buttons, colors, borrowType) from the
+   * current lendingStatus.
+   *
+   * @returns {boolean} false when there are no actions to apply, in which
+   *   case callers should bail out rather than continue with stale state.
+   */
+  applyLendingActions() {
+    this.lendingOptions = new GetLendingActions(
+      this.userid,
+      this.identifier,
+      this.lendingStatus,
+      this.bwbPurchaseUrl
+    );
+    const actions = this.lendingOptions.getCurrentLendingActions();
+
+    if (!actions) return false;
+
+    this.primaryTitle = actions.primaryTitle;
+    this.primaryActions = actions.primaryActions?.filter(action => {
+      return action != null;
+    });
+    this.primaryColor = actions.primaryColor;
+    this.secondaryActions = actions.secondaryActions?.filter(action => {
+      return action != null;
+    });
+
+    this.borrowType = actions.borrowType ? actions.borrowType : null;
+
+    return true;
+  }
+
   async setupLendingToolbarActions() {
     const hasExpired =
       'browsingExpired' in this.lendingStatus &&
       this.lendingStatus?.browsingExpired;
     if (hasExpired) {
-      // Intentionally do NOT recompute primaryActions/primaryColor/borrowType
-      // here — per the ticket, auto-return must not visibly change anything.
-      // The action bar stays exactly as it looked while reading; only a
-      // successful silent renewal or the "unavailable" error modal are
-      // allowed to change what's shown next.
-      log('[IABookActions] browsing expired — leaving action bar untouched');
+      // Per the ticket, auto-return must not visibly change anything — the
+      // action bar stays exactly as it looked while reading. But that only
+      // applies when there IS a rendered bar to preserve. On a fresh page
+      // load of an already-expired loan nothing has been computed yet, so
+      // skipping this would leave the patron staring at a blank bar with no
+      // way to re-borrow. In that case compute the normal (Borrow) actions
+      // before short-circuiting the rest of the lifecycle below.
+      if (this.primaryActions?.length) {
+        log('[IABookActions] browsing expired — leaving action bar untouched');
+      } else {
+        log(
+          '[IABookActions] browsing expired on first render — populating action bar'
+        );
+        this.applyLendingActions();
+      }
 
       if (!this.tokenPoller) {
         this.sentryCaptureMsg(sentryLogs.bookWasExpired);
@@ -271,26 +303,7 @@ export default class IABookActions extends LitElement {
       return;
     }
 
-    this.lendingOptions = new GetLendingActions(
-      this.userid,
-      this.identifier,
-      this.lendingStatus,
-      this.bwbPurchaseUrl
-    );
-    const actions = this.lendingOptions.getCurrentLendingActions();
-
-    if (!actions) return;
-
-    this.primaryTitle = actions.primaryTitle;
-    this.primaryActions = actions.primaryActions?.filter(action => {
-      return action != null;
-    });
-    this.primaryColor = actions.primaryColor;
-    this.secondaryActions = actions.secondaryActions?.filter(action => {
-      return action != null;
-    });
-
-    this.borrowType = actions.borrowType ? actions.borrowType : null;
+    if (!this.applyLendingActions()) return;
 
     // Don't (re)start the countdown while a renewal is in flight — the
     // optimistic browsingExpired flip in autoRenewExpiredLoan() (which
@@ -336,6 +349,32 @@ export default class IABookActions extends LitElement {
     this.requestUpdate();
   }
 
+  /**
+   * Is this `BookReader:userAction` BookReader's own init-time jump to the
+   * patron's last-read page, rather than something the patron just did?
+   *
+   * BookReader.updateFirstIndex() fires `userAction` unconditionally, and
+   * init() reaches it via updateFromParams() — so a plain page refresh
+   * looks identical to a page turn. Auto-renewing off that would silently
+   * re-borrow a lapsed book with no patron input at all.
+   *
+   * BookReader.trigger() passes the BookReader instance as
+   * `event.detail.props`, and init() holds `init.initComplete === false`
+   * for exactly the span that contains that init-time jump, setting it to
+   * true immediately before firing PostInit. So the flag is an exact,
+   * timing-independent marker of "this came from init".
+   *
+   * Only an explicit `false` suppresses the event: a BookReader too old to
+   * expose the flag, or a synthetic event with no detail, must still be
+   * treated as a genuine interaction.
+   *
+   * @param {Event} event - the BookReader:userAction event
+   * @returns {boolean}
+   */
+  isBookReaderInitAction(event) {
+    return event?.detail?.props?.init?.initComplete === false;
+  }
+
   /**
    * Bind 1 hour loan auto renew event,
    * There are two events we want to use,
@@ -343,15 +382,13 @@ export default class IABookActions extends LitElement {
    * 2. IABookActions:loanRenew - dispatched from timer-countdown component
    */
   bindLoanRenewEvents() {
-    this.userActionReadyAt = Date.now() + this.userActionGracePeriod;
-
     /**
      * dispatched this event from bookreader page changed
      */
-    window.addEventListener('BookReader:userAction', () => {
-      if (Date.now() < this.userActionReadyAt) {
+    window.addEventListener('BookReader:userAction', event => {
+      if (this.isBookReaderInitAction(event)) {
         log(
-          '[IABookActions] BookReader:userAction ignored — within startup grace period'
+          '[IABookActions] BookReader:userAction ignored — fired by BookReader init'
         );
         return;
       }
@@ -392,7 +429,10 @@ export default class IABookActions extends LitElement {
         return;
       }
 
-      log('[IABookActions] visibilitychange: tab foregrounded', this.borrowType);
+      log(
+        '[IABookActions] visibilitychange: tab foregrounded',
+        this.borrowType
+      );
 
       try {
         // Loan already expired while tab was hidden — try to silently renew
@@ -414,9 +454,16 @@ export default class IABookActions extends LitElement {
           if (secondsLeft >= this.timerExecutionSeconds) {
             this.loanStatusCheckInterval(Number(secondsLeft));
           } else {
-            // Loan expired while user was away — try to silently renew
+            // Loan expired while user was away — try to silently renew.
+            // Only stop the stale intervals here; this used to call
+            // disconnectedCallback(), which was harmless back when the
+            // following modal navigated away, but the reading session now
+            // continues. Tearing down would drop the resize observer for
+            // good (it's only re-added on firstUpdated / sharedObserver
+            // change), leaving the bar unable to respond to viewport
+            // changes, and would report a bogus disconnect to Sentry.
+            window?.IALendingIntervals?.clearAll();
             this.autoRenewExpiredLoan();
-            this.disconnectedCallback();
           }
         }
       } catch (error) {
@@ -465,7 +512,18 @@ export default class IABookActions extends LitElement {
    * On error: handleLendingActionError() shows showLoanUnavailableModal().
    */
   autoRenewExpiredLoan() {
-    if (this.loanRenewInProgress) return;
+    if (this.loanRenewInProgress) {
+      log(
+        '[IABookActions] autoRenewExpiredLoan: skipped, renewal already in progress',
+        {
+          identifier: this.identifier,
+        }
+      );
+      return;
+    }
+    log('[IABookActions] autoRenewExpiredLoan: starting silent renewal', {
+      identifier: this.identifier,
+    });
     this.loanRenewInProgress = true;
     this.recoveringFromLoanExpiry = true;
 
@@ -561,7 +619,8 @@ export default class IABookActions extends LitElement {
         >
           Okay
         </button>
-      </div> `;
+      </div>
+    `;
 
     this.modal.setAttribute('aria-live', 'assertive');
     await this.modal?.showModal({ config, customModalContent });
@@ -578,7 +637,10 @@ export default class IABookActions extends LitElement {
    * Execute when loan is expired
    */
   async browseHasExpired() {
-    log('[IABookActions] browseHasExpired');
+    log('[IABookActions] browseHasExpired', {
+      identifier: this.identifier,
+      loanRenewInProgress: this.loanRenewInProgress,
+    });
     window?.IALendingIntervals?.clearAll();
 
     const currStatus = {
@@ -591,6 +653,12 @@ export default class IABookActions extends LitElement {
     // remove respected key:value for loan-renew
     await this.localCache.delete(`${this.identifier}-loanTime`);
     await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+    log(
+      '[IABookActions] browseHasExpired: cleared loanTime/pageChangedTime cache',
+      {
+        identifier: this.identifier,
+      }
+    );
 
     // show message after browsed book is expired.
     this.loanRenewResult.renewNow = false;
@@ -598,6 +666,10 @@ export default class IABookActions extends LitElement {
       'This book has been returned due to inactivity.';
 
     this.modal?.closeModal();
+    // We just closed whatever was on screen, including the warning modal —
+    // release the re-entrancy guard so a later pre-expiry window can show
+    // it again. Otherwise it stays latched for the life of the component.
+    this.warningModalOpen = false;
 
     this.sentryCaptureMsg(sentryLogs.browseHasExpired);
   }
@@ -712,10 +784,34 @@ export default class IABookActions extends LitElement {
    */
   async handleLoanAutoRenewed({ detail }) {
     const activeLoan = detail?.data?.loan;
-    const errorMessage = `Whoops, seems we hit a hiccup with renewing this book. Please refresh & retry. --- (Debug: ${detail?.data?.error})`;
-    if (!activeLoan) {
+
+    /**
+     * Defensive: ActionsHandler only dispatches this event for a CONFIRMED
+     * renewal, but treat anything else as a failure rather than a success.
+     *
+     * A `renewal: false` loan reaching the success path below is actively
+     * harmful: setBrowseTimeSession() never ran, so the loanTime read comes
+     * back undefined, and the NaN fallback then invents a full fresh hour —
+     * putting a brand-new countdown on screen alongside the "someone else
+     * has now borrowed it" modal.
+     *
+     * Clearing loanRenewInProgress here matters just as much. Leaving it set
+     * latches the component: autoLoanRenewChecker() and
+     * autoRenewExpiredLoan() both no-op on it, and neither the countdown nor
+     * the token poller will restart — the loan sits "active" forever with a
+     * dead timer.
+     */
+    if (!activeLoan?.renewal) {
+      this.loanRenewInProgress = false;
       this.recoveringFromLoanExpiry = false;
-      this.showErrorModal(errorMessage, 'handleLoanAutoRenewed');
+      this.warningModalOpen = false;
+
+      // dispatchActionError() has already reported this and shown the
+      // relevant modal; don't stack a second one on top.
+      log('[IABookActions] handleLoanAutoRenewed: not a confirmed renewal', {
+        identifier: this.identifier,
+        activeLoan,
+      });
       return;
     }
 
@@ -817,9 +913,8 @@ export default class IABookActions extends LitElement {
     }
 
     log('[IABookActions] timer', {
-      secondsLeft,
-      loanRenewAtLast: this.loanRenewTimeConfig.loanRenewAtLast,
-      pageChangedInLast: this.loanRenewTimeConfig.pageChangedInLast,
+      whatShouldLeft: resyncd.whatShouldLeft,
+      whatIsleft: secondsLeft,
     });
 
     /**
@@ -907,7 +1002,10 @@ export default class IABookActions extends LitElement {
     // show warning modal with remaining time to auto returned it.
     // once the patron has dismissed it, don't re-show it on every subsequent
     // tick — only an actual renewal (see handleLoanAutoRenewed) re-arms it.
-    if (this.loanRenewResult.renewNow === false && !this.warningModalDismissed) {
+    if (
+      this.loanRenewResult.renewNow === false &&
+      !this.warningModalDismissed
+    ) {
       /**
        * so compensate for the 50 second buffer to handle above race conditions
        * let's reduce 1 min from warning texts and early return the book when 1 min left.
@@ -977,6 +1075,16 @@ export default class IABookActions extends LitElement {
 
     const action = event?.detail?.action;
     const errorMsg = event?.detail?.data?.error;
+    const isInitial = event?.detail?.isInitial === true;
+
+    log('[IABookActions] handleLendingActionError', {
+      identifier: this.identifier,
+      action,
+      errorMsg,
+      isInitial,
+      loanRenewInProgress: this.loanRenewInProgress,
+      recoveringFromLoanExpiry: this.recoveringFromLoanExpiry,
+    });
 
     if (action === 'create_token') {
       // A create_token hiccup only affects BookReader's page-image access
@@ -985,21 +1093,38 @@ export default class IABookActions extends LitElement {
       // token poller so it can be retried.
       window?.IALendingIntervals?.clearTokenPoller();
 
-      // The loan itself is fine — just this token refresh failed — but
-      // the action bar must reflect that it isn't safely browsable right
-      // now rather than silently doing nothing.
+      /**
+       * Only the INITIAL token matters to the patron: without it BookReader
+       * can't be initialized at all, so the book genuinely won't open and
+       * they need to know. A routine interval refresh failing is a
+       * different thing — the patron is already reading, the pages they
+       * have are still served, and LoanTokenPoller will try again on the
+       * next tick. Interrupting a mid-read session with a blocking modal
+       * over a transient blip (the recurring 405s QA is seeing, say) is
+       * worse than the blip. This is why the original code suppressed
+       * create_token errors outright; keep that for the interval case.
+       */
+      if (!isInitial) {
+        log(
+          '[IABookActions] create_token failed on interval refresh — staying silent, poller will retry'
+        );
+        return;
+      }
+
+      // The loan itself is fine — just the token failed — but the action
+      // bar must reflect that the book isn't openable right now rather
+      // than silently doing nothing.
       this.lendingStatus = {
         ...this.lendingStatus,
         user_has_browsed: false,
         available_to_browse: true,
       };
 
-      // By the time this handler runs, LoanTokenPoller has already
-      // exhausted its retries for the transient datanode-propagation
-      // race (or the error wasn't that in the first place) — this is a
-      // genuine failure, so let the patron know instead of doing this
-      // silently. showErrorModal has dedicated create_token messaging
-      // (refresh button + support email).
+      // LoanTokenPoller has already exhausted its retries for the
+      // transient datanode-propagation race by the time we get here (or
+      // the error was never that), so this is a genuine failure.
+      // showErrorModal has dedicated create_token messaging (refresh
+      // button + support email).
       if (errorMsg) this.showErrorModal(errorMsg, action);
     } else if (action === 'renew_loan') {
       window?.IALendingIntervals?.clearAll();
@@ -1035,9 +1160,15 @@ export default class IABookActions extends LitElement {
       // update action bar state if book is not available to browse or borrow.
       if (errorMsg.match(/not available to borrow/gm)) {
         if (action === 'browse_book') {
-          this.lendingStatus = { ...this.lendingStatus, available_to_browse: false };
+          this.lendingStatus = {
+            ...this.lendingStatus,
+            available_to_browse: false,
+          };
         } else if (action === 'borrow_book') {
-          this.lendingStatus = { ...this.lendingStatus, available_to_borrow: false };
+          this.lendingStatus = {
+            ...this.lendingStatus,
+            available_to_borrow: false,
+          };
         }
       }
     }

package/test/core/services/loan-token-poller.test.js

@@ -1,4 +1,4 @@
-import { expect } from '@open-wc/testing';
+import { expect, aTimeout } from '@open-wc/testing';
 import Sinon from 'sinon';
 
 import { LoanTokenPoller } from '../../../src/core/services/loan-token-poller.js';
@@ -89,7 +89,7 @@ describe('handleTokenError retry (WEBDEV-8322 follow-up)', () => {
 
       expect(errorCallbackSpy.called).to.be.false;
 
-      clock.tick(tokenPoller.initialTokenRetryDelay);
+      clock.tick(tokenPoller.tokenRetryDelay);
 
       expect(handleLoanTokenPollerSpy.calledWith(true, 1)).to.be.true;
     } finally {
@@ -104,19 +104,35 @@ describe('handleTokenError retry (WEBDEV-8322 follow-up)', () => {
     tokenPoller.handleTokenError(
       staleLoanReadError,
       true,
-      tokenPoller.maxInitialTokenRetries
+      tokenPoller.maxTokenRetries
     );
 
     expect(errorCallbackSpy.calledOnce).to.be.true;
   });
 
-  it('does not retry a routine (non-initial) poll on the same error', () => {
+  it('retries a routine (non-initial) poll on the same error too', () => {
+    // A routine tick landing moments after a renewal hits the very same
+    // write-propagation race as the initial call, so it's equally worth
+    // retrying. isInitial only decides how a FINAL failure is reported.
     const tokenPoller = makeTokenPoller();
+    const handleLoanTokenPollerSpy = Sinon.spy(
+      tokenPoller,
+      'handleLoanTokenPoller'
+    );
     const errorCallbackSpy = Sinon.spy(tokenPoller, 'errorCallback');
+    const clock = Sinon.useFakeTimers();
 
-    tokenPoller.handleTokenError(staleLoanReadError, false, 0);
+    try {
+      tokenPoller.handleTokenError(staleLoanReadError, false, 0);
 
-    expect(errorCallbackSpy.calledOnce).to.be.true;
+      expect(errorCallbackSpy.called).to.be.false;
+
+      clock.tick(tokenPoller.tokenRetryDelay);
+
+      expect(handleLoanTokenPollerSpy.calledWith(false, 1)).to.be.true;
+    } finally {
+      clock.restore();
+    }
   });
 
   it('does not retry a genuinely different error, even on the initial call', () => {
@@ -132,3 +148,53 @@ describe('handleTokenError retry (WEBDEV-8322 follow-up)', () => {
     expect(errorCallbackSpy.calledOnce).to.be.true;
   });
 });
+
+describe('LoanTokenPoller - WEBDEV-8322 review fixes', () => {
+  it('retries a stale-loan-read error on interval refreshes too, not just the initial call', async () => {
+    const poller = new LoanTokenPoller('foo', 'browsed', () => {}, () => {}, 120);
+    poller.disconnectedCallback(); // stop the real poller started in the ctor
+
+    const retrySpy = Sinon.stub(poller, 'handleLoanTokenPoller');
+    poller.tokenRetryDelay = 1;
+
+    poller.handleTokenError(
+      { error: 'you do not currently have this book borrowed' },
+      false, // interval refresh
+      0
+    );
+    await aTimeout(30);
+
+    expect(retrySpy.calledOnce).to.be.true;
+    expect(retrySpy.firstCall.args).to.deep.equal([false, 1]);
+    poller.disconnectedCallback();
+  });
+
+  it('passes isInitial through to the error callback', () => {
+    const errorCallback = Sinon.spy();
+    const poller = new LoanTokenPoller('foo', 'browsed', () => {}, errorCallback, 120);
+    poller.disconnectedCallback();
+
+    poller.handleTokenError({ error: 'something else went wrong' }, true, 0);
+
+    expect(errorCallback.calledOnce).to.be.true;
+    expect(errorCallback.firstCall.args[0].detail.isInitial).to.be.true;
+  });
+
+  it('cancels a pending retry on teardown', async () => {
+    const poller = new LoanTokenPoller('foo', 'browsed', () => {}, () => {}, 120);
+    const retrySpy = Sinon.stub(poller, 'handleLoanTokenPoller');
+    poller.tokenRetryDelay = 20;
+
+    poller.handleTokenError(
+      { error: 'you do not currently have this book borrowed' },
+      true,
+      0
+    );
+    expect(poller.retryTimeout).to.not.be.undefined;
+
+    poller.disconnectedCallback();
+    await aTimeout(60);
+
+    expect(retrySpy.called).to.be.false;
+  });
+});

package/test/ia-book-actions.test.js

@@ -89,8 +89,6 @@ describe('<ia-book-actions>', () => {
         identifier: 'foobar',
       })
     );
-    // Not testing the BookReader-init grace period here — bypass it.
-    el.userActionReadyAt = 0;
 
     const spy = Sinon.spy(el, 'autoLoanRenewChecker');
     el.lendingStatus = { ...el.lendingStatus, browsingExpired: false };
@@ -113,8 +111,6 @@ describe('<ia-book-actions>', () => {
         lendingStatus: { user_has_browsed: true, browsingExpired: true },
       })
     );
-    // Not testing the BookReader-init grace period here — bypass it.
-    el.userActionReadyAt = 0;
 
     const spy = Sinon.spy(el, 'autoRenewExpiredLoan');
     el.borrowType = 'browsed';
@@ -126,14 +122,17 @@ describe('<ia-book-actions>', () => {
     expect(spy.calledOnce).to.be.true;
   });
 
-  it('ignores BookReader:userAction fired within the startup grace period (WEBDEV-8322 follow-up)', async () => {
-    // Regression: BookReader.jumpToIndex() fires its own 'userAction'
-    // event any time it runs — including BookReader's own init-time jump
-    // to the reader's last-read page (updateFromParams(), called from
+  it('ignores BookReader:userAction fired by BookReader init (WEBDEV-8322 follow-up)', async () => {
+    // Regression: BookReader.updateFirstIndex() fires 'userAction'
+    // unconditionally — including on BookReader's own init-time jump to
+    // the reader's last-read page (updateFromParams(), called from
     // init()), which has nothing to do with the patron doing anything.
-    // Without this grace period, a plain page refresh on an already-
-    // expired loan would silently auto-renew before the patron did
-    // anything at all.
+    // Auto-renewing off that would silently re-borrow a lapsed book on a
+    // plain page refresh, before the patron did anything at all.
+    //
+    // BookReader.trigger() passes the BookReader instance as
+    // detail.props, and init() holds init.initComplete === false for
+    // exactly the span containing that jump.
     const el = await fixture(
       container({
         userid: '@user1',
@@ -146,13 +145,60 @@ describe('<ia-book-actions>', () => {
 
     const spy = Sinon.spy(el, 'autoRenewExpiredLoan');
 
-    // Fired immediately after bindLoanRenewEvents() ran (in firstUpdated())
-    // — well within the default grace period.
-    window.dispatchEvent(new Event('BookReader:userAction'));
+    window.dispatchEvent(
+      new CustomEvent('BookReader:userAction', {
+        detail: { props: { init: { initComplete: false } } },
+      })
+    );
     await el.updateComplete;
 
     expect(spy.called).to.be.false;
   });
+
+  it('honours BookReader:userAction once BookReader init has completed', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'foobar',
+        lendingStatus: { user_has_browsed: true, browsingExpired: true },
+      })
+    );
+    el.borrowType = 'browsed';
+    await el.updateComplete;
+
+    const spy = Sinon.spy(el, 'autoRenewExpiredLoan');
+
+    window.dispatchEvent(
+      new CustomEvent('BookReader:userAction', {
+        detail: { props: { init: { initComplete: true } } },
+      })
+    );
+    await el.updateComplete;
+
+    expect(spy.calledOnce).to.be.true;
+  });
+
+  it('treats a userAction with no BookReader detail as a genuine interaction', async () => {
+    // A BookReader too old to expose init.initComplete, or any synthetic
+    // dispatch, must not be silently swallowed — only an explicit false
+    // suppresses the event.
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'foobar',
+        lendingStatus: { user_has_browsed: true, browsingExpired: true },
+      })
+    );
+    el.borrowType = 'browsed';
+    await el.updateComplete;
+
+    const spy = Sinon.spy(el, 'autoRenewExpiredLoan');
+
+    window.dispatchEvent(new Event('BookReader:userAction'));
+    await el.updateComplete;
+
+    expect(spy.calledOnce).to.be.true;
+  });
 });
 
 describe('Primary Actions data', () => {
@@ -741,7 +787,7 @@ describe('autoRenewExpiredLoan', () => {
     );
     collapsibleActionGroupEl.dispatchEvent(
       new CustomEvent('loanAutoRenewed', {
-        detail: { data: { loan: { identifier: 'foobar' } } },
+        detail: { data: { loan: { identifier: 'foobar', renewal: true } } },
       })
     );
 
@@ -792,7 +838,7 @@ describe('autoRenewExpiredLoan', () => {
     );
     collapsibleActionGroupEl.dispatchEvent(
       new CustomEvent('loanAutoRenewed', {
-        detail: { data: { loan: { identifier: 'foobar' } } },
+        detail: { data: { loan: { identifier: 'foobar', renewal: true } } },
       })
     );
 
@@ -848,7 +894,7 @@ describe('autoRenewExpiredLoan', () => {
     );
     collapsibleActionGroupEl.dispatchEvent(
       new CustomEvent('loanAutoRenewed', {
-        detail: { data: { loan: { identifier: 'foobar' } } },
+        detail: { data: { loan: { identifier: 'foobar', renewal: true } } },
       })
     );
 
@@ -884,7 +930,7 @@ describe('autoRenewExpiredLoan', () => {
     );
     collapsibleActionGroupEl.dispatchEvent(
       new CustomEvent('loanAutoRenewed', {
-        detail: { data: { loan: { identifier: 'foobar' } } },
+        detail: { data: { loan: { identifier: 'foobar', renewal: true } } },
       })
     );
 
@@ -944,8 +990,6 @@ describe('BookReader:userAction race regression (WEBDEV-8322)', () => {
     );
     await el.updateComplete;
     expect(el.borrowType).to.equal('browsed');
-    // Not testing the BookReader-init grace period here — bypass it.
-    el.userActionReadyAt = 0;
 
     el.lendingStatus = { ...baseStatus, browsingExpired: true };
     await el.updateComplete;
@@ -987,8 +1031,6 @@ describe('BookReader:userAction race regression (WEBDEV-8322)', () => {
     );
     await el.updateComplete;
     expect(el.borrowType).to.equal('browsed');
-    // Not testing the BookReader-init grace period here — bypass it.
-    el.userActionReadyAt = 0;
 
     el.loanRenewInProgress = true;
 
@@ -1062,9 +1104,11 @@ describe('handleLendingActionError - create_token failures must not stop the cou
   it('shows the error modal for a create_token failure that reaches here (retries already exhausted)', async () => {
     // By the time handleLendingActionError runs for a create_token
     // failure, LoanTokenPoller has already retried and given up (see
-    // loan-token-poller.js's handleTokenError) — this is a genuine
-    // failure, so the patron must be told instead of it happening
-    // silently.
+    // loan-token-poller.js's handleTokenError). For the INITIAL token
+    // that's terminal — BookReader can't be initialized and the book
+    // won't open — so the patron must be told rather than left staring
+    // at nothing. (An interval refresh failing is handled separately and
+    // stays silent; see the WEBDEV-8322 review fixes below.)
     const el = await fixture(
       container({
         userid: '@user1',
@@ -1084,6 +1128,7 @@ describe('handleLendingActionError - create_token failures must not stop the cou
     el.handleLendingActionError({
       detail: {
         action: 'create_token',
+        isInitial: true,
         data: { error: errorMsg },
       },
     });
@@ -1316,3 +1361,183 @@ describe('Shared Resize Observer', () => {
     expect(component.sharedObserver).to.not.be.undefined;
   });
 });
+
+describe('WEBDEV-8322 review fixes', () => {
+  it('populates the action bar on a fresh load of an already-expired loan', async () => {
+    // Regression: the hasExpired early-return was hoisted above the
+    // GetLendingActions computation so auto-return wouldn't visibly change
+    // the bar. That's right for the transition, but this method also runs
+    // on the FIRST lendingStatus update, where there is no bar to preserve
+    // — leaving the patron a blank bar and no way to re-borrow.
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'fresh-expired',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          available_to_borrow: true,
+          user_has_browsed: true,
+          browsingExpired: true,
+          secondsLeftOnLoan: 0,
+        },
+      })
+    );
+    await el.updateComplete;
+
+    expect(el.primaryActions.length).to.be.greaterThan(0);
+    expect(el.primaryActions.map(a => a.id)).to.include('browseBook');
+  });
+
+  it('still leaves a rendered action bar untouched when the loan auto-returns', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'auto-returned',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          available_to_borrow: true,
+          user_has_browsed: true,
+          browsingExpired: false,
+          secondsLeftOnLoan: 300,
+        },
+      })
+    );
+    await el.updateComplete;
+    expect(el.primaryActions[0].text).to.equal('Return now');
+
+    el.lendingStatus = { ...el.lendingStatus, browsingExpired: true };
+    await el.updateComplete;
+
+    // Auto-return must not visibly change the bar (the ticket's core ask).
+    expect(el.primaryActions[0].text).to.equal('Return now');
+  });
+
+  it('does not treat a `renewal: false` response as a successful renewal', async () => {
+    // Regression: handleLoanAutoRenewed saw a truthy `loan` and took the
+    // success path. setBrowseTimeSession() never ran, so the loanTime read
+    // was undefined -> NaN -> the fallback invented a full fresh hour,
+    // putting a new countdown on screen next to the failure modal.
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'not-renewed',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          user_has_browsed: true,
+          browsingExpired: true,
+          secondsLeftOnLoan: 0,
+        },
+      })
+    );
+    await el.updateComplete;
+    el.loanRenewResult = { texts: '', renewNow: true, renewType: 'auto' };
+    el.loanRenewInProgress = true;
+    await el.updateComplete;
+
+    await el.handleLoanAutoRenewed({
+      detail: {
+        action: 'renew_loan',
+        data: { success: true, loan: { renewal: false } },
+      },
+    });
+    await el.updateComplete;
+
+    expect(el.lendingStatus.secondsLeftOnLoan).to.not.equal(
+      el.loanRenewTimeConfig.loanTotalTime
+    );
+    expect(el.loanRenewInProgress).to.be.false;
+  });
+
+  it('clears loanRenewInProgress when the renewal response carries no loan', async () => {
+    // Regression: the !activeLoan branch cleared recoveringFromLoanExpiry
+    // but left loanRenewInProgress set, latching the component — every
+    // later renewal attempt no-ops and neither the countdown nor the token
+    // poller ever restarts.
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'no-loan',
+        lendingStatus: { user_has_browsed: true, browsingExpired: true },
+      })
+    );
+    await el.updateComplete;
+
+    el.autoRenewExpiredLoan();
+    expect(el.loanRenewInProgress).to.be.true;
+
+    await el.handleLoanAutoRenewed({
+      detail: { action: 'renew_loan', data: { success: true } },
+    });
+
+    expect(el.loanRenewInProgress).to.be.false;
+    expect(el.recoveringFromLoanExpiry).to.be.false;
+
+    // and the component is usable again, not latched
+    el.autoRenewExpiredLoan();
+    expect(el.loanRenewInProgress).to.be.true;
+  });
+
+  it('stays silent when an interval create_token refresh fails', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'token-blip',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          user_has_browsed: true,
+          browsingExpired: false,
+          secondsLeftOnLoan: 300,
+        },
+      })
+    );
+    await el.updateComplete;
+    const spy = Sinon.spy(el, 'showErrorModal');
+
+    el.handleLendingActionError({
+      detail: {
+        action: 'create_token',
+        isInitial: false,
+        data: { error: 'loan token not found. please try again later.' },
+      },
+    });
+    await el.updateComplete;
+
+    expect(spy.called).to.be.false;
+    // the patron is still reading — don't knock them out of the loan
+    expect(el.lendingStatus.user_has_browsed).to.be.true;
+  });
+
+  it('surfaces a failed initial create_token, which blocks opening the book', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        identifier: 'token-initial',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          user_has_browsed: true,
+          browsingExpired: false,
+          secondsLeftOnLoan: 300,
+        },
+      })
+    );
+    await el.updateComplete;
+    const spy = Sinon.spy(el, 'showErrorModal');
+
+    el.handleLendingActionError({
+      detail: {
+        action: 'create_token',
+        isInitial: true,
+        data: { error: 'loan token not found. please try again later.' },
+      },
+    });
+    await el.updateComplete;
+
+    expect(spy.calledOnce).to.be.true;
+    expect(el.lendingStatus.user_has_browsed).to.be.false;
+  });
+});