dsh-plugin-subscription-oauth 0.8.15 → 0.8.17

package/lib/auth/provider-controller.js

@@ -300,20 +300,26 @@ export class ProviderController {
         // every startup would be noise.
         if (!await this.options.store.hasAny())
             return this.status();
-        // Discovery resolves tokens to read the model list, but a resolve must never
-        // open the browser: a transient network failure, or a token the endpoint refuses
-        // while still being within its stored expiry, is not a signal to start a login.
-        // Only an explicit user action (the connect button) opens the consent page.
+        // Discovery reads the live catalog on startup so the picker shows what the account
+        // actually serves without a manual refresh. A resolve must never open the browser:
+        // a refresh failure is recorded as the route's last error, never as a login prompt.
         const discovered = [];
         for (const account of Object.keys(await this.options.store.list())) {
+            // An unexpired token is used as-is; a lapsed one is refreshed in memory so the
+            // catalog still loads on startup. The refreshed token is not written back to the
+            // store here — a durable renewal still happens on the next real request.
             let session = await this.options.store.get(account);
             if (session === undefined)
                 continue;
-            // A token that is still within its stored expiry is used as-is; a lapsed one
-            // is a silent skip (the route works, the catalog is just not refreshed).
             if (session.expiresAt <= Date.now()) {
-                this.options.onWarn?.(`${spec.id} model discovery for ${account} skipped: token expired`);
-                continue;
+                try {
+                    const refreshed = await this.options.tokens.resolve(account, true);
+                    session = { ...session, accessToken: refreshed.accessToken, expiresAt: refreshed.expiresAt };
+                }
+                catch {
+                    this.options.onWarn?.(`${spec.id} model discovery for ${account} skipped: token refresh failed`);
+                    continue;
+                }
             }
             const ids = await spec.discover(session.accessToken);
             if (ids !== undefined) {

package/lib/client/FastModeButton.d.ts

@@ -30,14 +30,15 @@ export interface FastModeButtonInjected {
     /**
      * The session's model directory, when the host exposes one.
      *
-     * Written when the button switches between a model and its fast variant. Absent on a
-     * host without it, in which case the button renders nothing.
+     * Written when the button switches the model's `fast` rung. Absent on a host without
+     * it, in which case the button renders nothing.
      */
     modelDirectory?: {
-        /** Select one model; resolves when the picker has accepted it. */
+        /** Select one model and its reasoning rung; resolves when the picker accepted it. */
         select?: (selection: {
             provider: string;
             model: string;
+            reasoningEffort?: string;
         }) => Promise<unknown>;
     } | undefined;
 }

package/lib/client/FastModeButton.js

@@ -57,16 +57,16 @@ export function FastModeButton({ call, isOwnProvider, modelDirectory, useProject
     }, [provider, model, isOwnProvider, call]);
     // A switch that landed clears the reason, so the marker follows the truth on screen.
     useEffect(() => { setFailure(undefined); }, [model]);
-    if (pair === undefined || provider === undefined || modelDirectory?.select === undefined)
-        return null;
-    const active = pair.wireId === model;
-    const target = active ? pair.baseId : pair.wireId;
-    // Active without a base to return to would be a control that cannot switch anything off.
-    if (target === undefined || target === model)
+    if (pair === undefined || provider === undefined || model === undefined || modelDirectory?.select === undefined)
         return null;
+    // Fast mode is the row's `fast` reasoning rung, so the model id never changes and the
+    // picker always shows the row the user can switch back to.
+    const active = (selection?.next ?? selection?.lastUsed)?.reasoningEffort === 'fast';
+    // The row the rung belongs to: what the picker selected, or the pair's own base.
+    const target = model;
     const base = active
         ? 'Fast mode is on; press to go back to the standard model'
-        : 'Fast mode: switch to the fast variant of this model';
+        : 'Fast mode: switch to this model’s fast variant';
     const title = failure === undefined
         ? base
         : `${base}\nThe switch was refused — ${`${failure.code ?? ''} ${failure.message}`.trim()}`;
@@ -74,7 +74,10 @@ export function FastModeButton({ call, isOwnProvider, modelDirectory, useProject
                     event.stopPropagation();
                     setPending(true);
                     setFailure(undefined);
-                    void Promise.resolve(modelDirectory.select?.({ provider, model: target }))
+                    // Turning it off drops the rung, which the host then reads as the model's own
+                    // default. The model id is never swapped, so this cannot strand the selection.
+                    const next = active ? { provider, model: target } : { provider, model: target, reasoningEffort: 'fast' };
+                    void Promise.resolve(modelDirectory.select?.(next))
                         .then((result) => {
                         // The directory reports its own outcome: a refused selection carries why.
                         const outcome = result;

package/lib/client.js

@@ -2815,11 +2815,10 @@ function FastModeButton({ call, isOwnProvider, modelDirectory, useProjection })
 	(0, react.useEffect)(() => {
 		setFailure(void 0);
 	}, [model]);
-	if (pair === void 0 || provider === void 0 || modelDirectory?.select === void 0) return null;
-	const active = pair.wireId === model;
-	const target = active ? pair.baseId : pair.wireId;
-	if (target === void 0 || target === model) return null;
-	const base = active ? "Fast mode is on; press to go back to the standard model" : "Fast mode: switch to the fast variant of this model";
+	if (pair === void 0 || provider === void 0 || model === void 0 || modelDirectory?.select === void 0) return null;
+	const active = (selection?.next ?? selection?.lastUsed)?.reasoningEffort === "fast";
+	const target = model;
+	const base = active ? "Fast mode is on; press to go back to the standard model" : "Fast mode: switch to this model’s fast variant";
 	const title = failure === void 0 ? base : `${base}\nThe switch was refused — ${`${failure.code ?? ""} ${failure.message}`.trim()}`;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("style", { children: fastModeCss }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 		type: "button",
@@ -2835,10 +2834,15 @@ function FastModeButton({ call, isOwnProvider, modelDirectory, useProjection })
 			event.stopPropagation();
 			setPending(true);
 			setFailure(void 0);
-			Promise.resolve(modelDirectory.select?.({
+			const next = active ? {
 				provider,
 				model: target
-			})).then((result) => {
+			} : {
+				provider,
+				model: target,
+				reasoningEffort: "fast"
+			};
+			Promise.resolve(modelDirectory.select?.(next)).then((result) => {
 				const outcome = result;
 				if (outcome?.ok !== false) return;
 				const code = outcome.error?.code;