@bodhiapp/bodhi-js-ext 0.0.41 → 0.0.43

package/dist/bodhi-ext.esm.js

@@ -1,6 +1,6 @@
-import { DirectClientBase as V, createStoragePrefixWithNamespace as X, STORAGE_PREFIXES as N, generateCodeVerifier as w, generateCodeChallenge as z, buildAuthorizeUrl as v, BASE_OAUTH_SCOPE as L, buildErrorUrl as b, AccessRequestBuilder as P, unwrapResponse as k, buildReviewUrl as O, createOperationError as d, throwAccessRequestDenialError as M, PENDING_EXTENSION_READY as f, Logger as x, NOOP_STATE_CALLBACK as Q, createExtensionStateNotInitialized as G, BACKEND_SERVER_NOT_REACHABLE as K, createExtensionStateNotFound as F, BodhiError as T, INITIAL_AUTH_STATE as H, BodhiApiError as W, Chat as J, Models as Y, Embeddings as j, Mcps as Z, isAuthError as ee, BaseFacadeClient as te, refreshAccessToken as re } from "@bodhiapp/bodhi-js-core";
+import { DirectClientBase as z, createStoragePrefixWithNamespace as X, STORAGE_PREFIXES as N, generateCodeVerifier as w, generateCodeChallenge as V, buildAuthorizeUrl as v, BASE_OAUTH_SCOPE as L, buildErrorUrl as b, AccessRequestBuilder as P, unwrapResponse as k, buildReviewUrl as O, createOperationError as d, throwAccessRequestDenialError as M, PENDING_EXTENSION_READY as f, Logger as x, NOOP_STATE_CALLBACK as Q, createExtensionStateNotInitialized as G, BACKEND_SERVER_NOT_REACHABLE as K, createExtensionStateNotFound as F, BodhiError as T, INITIAL_AUTH_STATE as H, BodhiApiError as W, Chat as J, Models as Y, Embeddings as j, Mcps as Z, isAuthError as ee, BaseFacadeClient as te, refreshAccessToken as re } from "@bodhiapp/bodhi-js-core";
 import { InMemoryStorage as Ae } from "@bodhiapp/bodhi-js-core";
-import { isExtError as y, isApiSuccessResponse as se, MESSAGE_TYPES as _, EXT_ACTIONS as oe, BODHI_STREAM_PORT as ie, isStreamChunk as ne, isStreamApiError as ae, isStreamError as ce, BODHI_STREAM_TEXT_PORT as he } from "@bodhiapp/bodhi-browser-types";
+import { isExtError as y, isApiSuccessResponse as se, MESSAGE_TYPES as _, EXT_ACTIONS as ie, BODHI_STREAM_PORT as oe, isStreamChunk as ne, isStreamApiError as ae, isStreamError as he, BODHI_STREAM_TEXT_PORT as ce } from "@bodhiapp/bodhi-browser-types";
 const a = {
   EXT2EXT_CLIENT_REQUEST: "EXT2EXT_CLIENT_REQUEST",
   EXT2EXT_CLIENT_RESPONSE: "EXT2EXT_CLIENT_RESPONSE",
@@ -42,12 +42,12 @@ class _e {
     await chrome.storage.session.remove(e);
   }
 }
-class me extends V {
+class me extends z {
   constructor(e, t) {
     const r = X(
       e.basePath,
       N.EXT_DIRECT
-    ), i = {
+    ), o = {
       authClientId: e.authClientId,
       authServerUrl: e.authServerUrl,
       storagePrefix: r,
@@ -57,47 +57,47 @@ class me extends V {
       storage: e.storage ?? new _e(),
       initialTokens: e.initialTokens
     };
-    super(i, t);
+    super(o, t);
   }
   // ============================================================================
   // Authentication (chrome.identity OAuth)
   // ============================================================================
   async login(e) {
     const t = await this.getAuthState();
-    if (t.status === "authenticated")
+    if (t.status === "authenticated" && !e?.reauthorize)
       return t;
-    const r = e?.userRole ?? "scope_user_user", i = this._getRedirectUri();
+    const r = e?.userRole ?? "scope_user_user", o = this._getRedirectUri();
     e?.onProgress?.("requesting");
-    const s = w(), o = await z(s), n = w();
+    const s = w(), i = await V(s), n = w();
     await this._storageSet({
       [this.storageKeys.CODE_VERIFIER]: s,
       [this.storageKeys.STATE]: n
     });
-    const h = v(this.authEndpoints, {
+    const c = v(this.authEndpoints, {
       clientId: this.authClientId,
-      redirectUri: i,
+      redirectUri: o,
       scope: L,
       state: n,
-      codeChallenge: o
-    }), c = b(i), E = new P(this.authClientId).requestedRole(r);
+      codeChallenge: i
+    }), h = b(o), E = new P(this.authClientId).requestedRole(r);
     e?.requested && E.requested(e.requested);
-    const l = await this.requestAccess(E.build()), { review_url: u } = k(l), g = O(u, h, c);
+    const l = await this.requestAccess(E.build()), { review_url: u } = k(l), g = O(u, c, h);
     e?.onProgress?.("reviewing");
     const S = await this.launchReview(g);
     return e?.onProgress?.("authenticating"), this.completeOAuthRedirect(S);
   }
   launchReview(e) {
     return new Promise((t, r) => {
-      chrome.identity.launchWebAuthFlow({ url: e, interactive: !0 }, (i) => {
+      chrome.identity.launchWebAuthFlow({ url: e, interactive: !0 }, (o) => {
         if (chrome.runtime.lastError) {
           r(chrome.runtime.lastError);
           return;
         }
-        if (!i) {
+        if (!o) {
           r(d("oauth_error", "No redirect URL received"));
           return;
         }
-        t(i);
+        t(o);
       });
     });
   }
@@ -105,12 +105,12 @@ class me extends V {
     const t = new URL(e), r = t.searchParams.get("error");
     if (r)
       throw await this._storageRemove([this.storageKeys.CODE_VERIFIER, this.storageKeys.STATE]), t.searchParams.get("error_source") === "bodhi" && M(r === "access_denied" ? "denied" : r), d("oauth_error", t.searchParams.get("error_description") ?? r);
-    const i = t.searchParams.get("code"), s = t.searchParams.get("state"), o = await this._storageGet(this.storageKeys.STATE);
-    if (!s || s !== o)
+    const o = t.searchParams.get("code"), s = t.searchParams.get("state"), i = await this._storageGet(this.storageKeys.STATE);
+    if (!s || s !== i)
       throw await this._storageRemove([this.storageKeys.CODE_VERIFIER, this.storageKeys.STATE]), d("oauth_error", "State mismatch");
-    if (!i)
+    if (!o)
       throw await this._storageRemove([this.storageKeys.CODE_VERIFIER, this.storageKeys.STATE]), d("oauth_error", "No authorization code");
-    await this.exchangeCodeForTokens(i);
+    await this.exchangeCodeForTokens(o);
     const n = await this.getAuthState();
     if (n.status !== "authenticated")
       throw await this._storageRemove([this.storageKeys.CODE_VERIFIER, this.storageKeys.STATE]), d("oauth_error", "Login failed");
@@ -195,8 +195,8 @@ class pe {
   async init(e = {}) {
     if (!e.testConnection && !e.selectedConnection) {
       this.logger.info("No testConnection or selectedConnection, returning not-initialized state");
-      const i = G();
-      return this.setState(i), i;
+      const o = G();
+      return this.setState(o), o;
     }
     if (this.extensionId && !e.testConnection)
       return this.logger.debug("Already initialized with extensionId, skipping discovery"), this.state;
@@ -211,20 +211,20 @@ class pe {
           ), this.extensionId = r;
         else {
           this.logger.info("Discovering bodhi-browser extension...");
-          const o = {
+          const i = {
             attempts: this.config.initParams?.extension?.attempts,
             attemptWaitMs: this.config.initParams?.extension?.attemptWaitMs,
             attemptTimeout: this.config.initParams?.extension?.attemptTimeout
           }, n = await this.sendExtMessageWithTimeout(
             m.DISCOVER_EXTENSION,
-            o,
+            i,
             t
           );
           this.extensionId = n.extensionId, this.logger.info("Extension discovered:", this.extensionId);
         }
         this.setupBroadcastListener();
       }
-      const i = {
+      const o = {
         type: "extension",
         extension: "ready",
         extensionId: this.extensionId,
@@ -234,12 +234,12 @@ class pe {
       if (e.testConnection)
         try {
           s = await this.getServerState(), this.logger.info("Server connectivity tested, state:", s.status);
-        } catch (o) {
-          this.logger.error("Failed to get server state:", o), s = K;
+        } catch (i) {
+          this.logger.error("Failed to get server state:", i), s = K;
         }
-      return this.setState({ ...i, server: s }), this.state;
-    } catch (i) {
-      this.logger.error("Failed to initialize extension:", i), this.extensionId = null;
+      return this.setState({ ...o, server: s }), this.state;
+    } catch (o) {
+      this.logger.error("Failed to initialize extension:", o), this.extensionId = null;
       const s = F();
       return this.setState(s), this.state;
     }
@@ -248,10 +248,10 @@ class pe {
    * Helper method to send ext message with timeout support
    */
   async sendExtMessageWithTimeout(e, t, r = 1e4) {
-    const i = new Promise(
-      (s, o) => setTimeout(() => o(new Error("Timeout")), r)
+    const o = new Promise(
+      (s, i) => setTimeout(() => i(new Error("Timeout")), r)
     );
-    return Promise.race([this.sendExtRequest(e, t), i]);
+    return Promise.race([this.sendExtRequest(e, t), o]);
   }
   /**
    * Send an EXT2EXT_CLIENT_REQUEST message and await EXT2EXT_CLIENT_RESPONSE
@@ -259,7 +259,7 @@ class pe {
    */
   async sendExtRequest(e, t) {
     try {
-      const r = this.generateRequestId(), i = await chrome.runtime.sendMessage({
+      const r = this.generateRequestId(), o = await chrome.runtime.sendMessage({
         type: a.EXT2EXT_CLIENT_REQUEST,
         requestId: r,
         request: {
@@ -267,17 +267,17 @@ class pe {
           params: t
         }
       });
-      if (!i)
+      if (!o)
         throw d("extension_error", "No response from background script");
-      if (i.type !== a.EXT2EXT_CLIENT_RESPONSE)
+      if (o.type !== a.EXT2EXT_CLIENT_RESPONSE)
         throw d(
           "extension_error",
           "Invalid response type from background script"
         );
-      const s = i.response;
+      const s = o.response;
       if (y(s)) {
-        const o = s.error.type || "extension_error";
-        throw d(o, s.error.message);
+        const i = s.error.type || "extension_error";
+        throw d(i, s.error.message);
       }
       return s;
     } catch (r) {
@@ -291,16 +291,16 @@ class pe {
    * Send an API_REQUEST message and await API_RESPONSE (internal)
    * Returns ext2ext-specific ExtClientApiResponseMessage
    */
-  async sendRawApiMessage(e, t, r, i, s) {
-    const o = this.generateRequestId();
+  async sendRawApiMessage(e, t, r, o, s) {
+    const i = this.generateRequestId();
     return await chrome.runtime.sendMessage({
       type: a.EXT2EXT_CLIENT_API_REQUEST,
-      requestId: o,
+      requestId: i,
       request: {
         method: e,
         endpoint: t,
         body: r,
-        headers: i,
+        headers: o,
         authenticated: s
       }
     });
@@ -309,11 +309,11 @@ class pe {
    * Send an API message and return ApiResponse
    * @throws BodhiError on operational errors (network, timeout, extension-level)
    */
-  async sendApiRequest(e, t, r, i, s) {
+  async sendApiRequest(e, t, r, o, s) {
     try {
-      const o = new Promise(
-        (h, c) => setTimeout(
-          () => c(
+      const i = new Promise(
+        (c, h) => setTimeout(
+          () => h(
             new Error(
               `[bodhi-js-sdk/ext] network timeout: api request not completed within configured/default timeout of ${this.apiTimeoutMs}ms`
             )
@@ -321,18 +321,18 @@ class pe {
           this.apiTimeoutMs
         )
       ), n = await Promise.race([
-        this.sendRawApiMessage(e, t, r, i, s),
-        o
+        this.sendRawApiMessage(e, t, r, o, s),
+        i
       ]);
       if (ge(n)) {
-        const h = n.error.type || "extension_error";
-        throw new T(h, n.error.message);
+        const c = n.error.type || "extension_error";
+        throw new T(c, n.error.message);
       }
       return n.response;
-    } catch (o) {
-      if (o instanceof T)
-        throw o;
-      const n = o instanceof Error ? o.message : String(o);
+    } catch (i) {
+      if (i instanceof T)
+        throw i;
+      const n = i instanceof Error ? i.message : String(i);
       throw new T("network_error", n);
     }
   }
@@ -344,29 +344,29 @@ class pe {
    */
   async login(e) {
     return new Promise((t, r) => {
-      const i = async (s) => {
+      const o = async (s) => {
         if (s && typeof s == "object" && "type" in s && s.type === "EXT2EXT_CLIENT_BROADCAST" && "event" in s && s.event === "authStateChanged") {
-          chrome.runtime.onMessage.removeListener(i);
+          chrome.runtime.onMessage.removeListener(o);
           try {
-            const o = await this.getAuthState();
-            if (ee(o)) {
+            const i = await this.getAuthState();
+            if (ee(i)) {
               r(
-                d("auth_error", `Login failed: ${o.error?.message}`)
+                d("auth_error", `Login failed: ${i.error?.message}`)
               );
               return;
             }
-            if (o.status !== "authenticated") {
+            if (i.status !== "authenticated") {
               r(d("auth_error", "Login failed: User is not logged in"));
               return;
             }
-            this.setAuthState(o), t(o);
-          } catch (o) {
-            r(o);
+            this.setAuthState(i), t(i);
+          } catch (i) {
+            r(i);
           }
         }
       };
-      chrome.runtime.onMessage.addListener(i), this.sendExtRequest(m.LOGIN, e).catch((s) => {
-        chrome.runtime.onMessage.removeListener(i), r(s);
+      chrome.runtime.onMessage.addListener(o), this.sendExtRequest(m.LOGIN, e).catch((s) => {
+        chrome.runtime.onMessage.removeListener(o), r(s);
       });
     });
   }
@@ -413,11 +413,11 @@ class pe {
     try {
       e = await this.sendApiRequest("GET", "/bodhi/v1/info");
     } catch (s) {
-      const o = s instanceof Error ? s.message : "Connection failed", n = s instanceof T ? s.code : "extension_error";
+      const i = s instanceof Error ? s.message : "Connection failed", n = s instanceof T ? s.code : "extension_error";
       return {
         status: "not-reachable",
         version: null,
-        error: { message: o, type: n }
+        error: { message: i, type: n }
       };
     }
     if (e.status >= 400)
@@ -426,30 +426,30 @@ class pe {
         version: null,
         error: { message: "API error from server", type: "extension_error" }
       };
-    const t = e.body, r = t.version || "unknown", i = { deployment: t.deployment ?? null, client_id: t.client_id ?? null };
+    const t = e.body, r = t.version || "unknown", o = { deployment: t.deployment ?? null, client_id: t.client_id ?? null };
     switch (t.status) {
       case "ready":
-        return { status: "ready", version: r, error: null, ...i };
+        return { status: "ready", version: r, error: null, ...o };
       case "setup":
         return {
           status: "setup",
           version: r,
           error: t.error ? { message: t.error.message, type: t.error.type } : { message: "Setup required", type: "extension_error" },
-          ...i
+          ...o
         };
       case "resource_admin":
         return {
           status: "resource_admin",
           version: r,
           error: t.error ? { message: t.error.message, type: t.error.type } : { message: "Resource admin required", type: "extension_error" },
-          ...i
+          ...o
         };
       case "error":
         return {
           status: "error",
           version: r,
           error: t.error ? { message: t.error.message, type: t.error.type } : { message: "Server error", type: "extension_error" },
-          ...i
+          ...o
         };
       default:
         return {
@@ -465,24 +465,24 @@ class pe {
   /**
    * Generic streaming method
    */
-  async *stream(e, t, r, i, s = !0) {
-    const o = this.generateRequestId();
+  async *stream(e, t, r, o, s = !0) {
+    const i = this.generateRequestId();
     this.logger.debug("Starting stream", {
       method: e,
       endpoint: t,
-      requestId: o
+      requestId: i
     });
-    const n = chrome.runtime.connect({ name: U }), c = new ReadableStream({
+    const n = chrome.runtime.connect({ name: U }), h = new ReadableStream({
       start: (E) => {
         n.onMessage.addListener((l) => {
-          if (l.requestId === o)
+          if (l.requestId === i)
             switch (l.type) {
               case a.EXT2EXT_CLIENT_STREAM_DONE:
-                this.logger.debug("Stream complete", { requestId: o }), E.close(), n.disconnect();
+                this.logger.debug("Stream complete", { requestId: i }), E.close(), n.disconnect();
                 break;
               case a.EXT2EXT_CLIENT_STREAM_ERROR:
                 this.logger.error("Stream error", {
-                  requestId: o,
+                  requestId: i,
                   error: JSON.stringify(l.error)
                 }), E.error(
                   new T(
@@ -494,7 +494,7 @@ class pe {
               case a.EXT2EXT_CLIENT_STREAM_API_ERROR: {
                 const u = l;
                 this.logger.error("Stream API error", {
-                  requestId: o,
+                  requestId: i,
                   error: u.response.body?.error
                 }), E.error(
                   new W(
@@ -512,21 +512,21 @@ class pe {
               }
             }
         }), n.onDisconnect.addListener(() => {
-          this.logger.debug("Port disconnected", { requestId: o });
+          this.logger.debug("Port disconnected", { requestId: i });
           try {
             E.error(new T("connection_closed", "Connection closed unexpectedly"));
           } catch {
           }
         }), n.postMessage({
           type: a.EXT2EXT_CLIENT_STREAM_REQUEST,
-          requestId: o,
-          request: { method: e, endpoint: t, body: r, headers: i, authenticated: s }
+          requestId: i,
+          request: { method: e, endpoint: t, body: r, headers: o, authenticated: s }
         });
       }
     }).getReader();
     try {
       for (; ; ) {
-        const { done: E, value: l } = await c.read();
+        const { done: E, value: l } = await h.read();
         if (E) {
           this.logger.debug("Stream iteration complete");
           break;
@@ -534,24 +534,24 @@ class pe {
         yield l;
       }
     } finally {
-      c.releaseLock();
+      h.releaseLock();
     }
   }
   /**
    * Raw text streaming method - no SSE/JSON parsing
    * Returns status, headers, and async generator of raw text chunks
    */
-  async streamText(e, t, r, i, s = !0) {
-    const o = this.generateRequestId();
-    return new Promise((n, h) => {
-      let c, E = !1;
+  async streamText(e, t, r, o, s = !0) {
+    const i = this.generateRequestId();
+    return new Promise((n, c) => {
+      let h, E = !1;
       const l = new ReadableStream({
         start: (g) => {
-          c = g;
+          h = g;
         }
       }), u = chrome.runtime.connect({ name: D });
       u.onMessage.addListener((g) => {
-        if (g.requestId === o)
+        if (g.requestId === i)
           switch (g.type) {
             case a.EXT2EXT_CLIENT_STREAM_TEXT_START: {
               E = !0;
@@ -575,31 +575,31 @@ class pe {
               break;
             }
             case a.EXT2EXT_CLIENT_STREAM_TEXT_CHUNK:
-              c.enqueue(g.chunk);
+              h.enqueue(g.chunk);
               break;
             case a.EXT2EXT_CLIENT_STREAM_TEXT_DONE:
-              c.close(), u.disconnect();
+              h.close(), u.disconnect();
               break;
             case a.EXT2EXT_CLIENT_STREAM_TEXT_ERROR: {
               const S = d("extension_error", g.error.message);
-              E ? c.error(S) : h(S), u.disconnect();
+              E ? h.error(S) : c(S), u.disconnect();
               break;
             }
           }
       }), u.onDisconnect.addListener(() => {
         if (!E)
-          h(d("extension_error", "Connection closed unexpectedly"));
+          c(d("extension_error", "Connection closed unexpectedly"));
         else
           try {
-            c.error(
+            h.error(
               d("extension_error", "Connection closed unexpectedly")
             );
           } catch {
           }
       }), u.postMessage({
         type: a.EXT2EXT_CLIENT_STREAM_TEXT_REQUEST,
-        requestId: o,
-        request: { method: e, endpoint: t, body: r, headers: i, authenticated: s }
+        requestId: i,
+        request: { method: e, endpoint: t, body: r, headers: o, authenticated: s }
       });
     });
   }
@@ -649,14 +649,14 @@ class pe {
 }
 class ye extends te {
   constructor(e, t, r) {
-    const i = t || {}, s = {
-      basePath: i.basePath || "/",
-      authServerUrl: i.authServerUrl || "https://id.getbodhi.app/realms/bodhi",
-      logLevel: i.logLevel || "warn",
-      apiTimeoutMs: i.apiTimeoutMs,
-      storage: i.storage,
-      initialTokens: i.initialTokens,
-      initParams: i.initParams
+    const o = t || {}, s = {
+      basePath: o.basePath || "/",
+      authServerUrl: o.authServerUrl || "https://id.getbodhi.app/realms/bodhi",
+      logLevel: o.logLevel || "warn",
+      apiTimeoutMs: o.apiTimeoutMs,
+      storage: o.storage,
+      initialTokens: o.initialTokens,
+      initParams: o.initParams
     };
     super(e, s, r);
   }
@@ -697,7 +697,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
   // Constructor
   // ============================================================================
   constructor(e, t) {
-    this.isAuthenticating = !1, this.state = "setup", this.listenersInitialized = !1, this.refreshPromise = null, this.activeStreamPorts = /* @__PURE__ */ new Map(), this.authClientId = e, this.authServerUrl = t?.authServerUrl || "https://id.getbodhi.app/realms/bodhi", this.extensionId = t?.extensionId, this.logger = new x("BodhiExtClient", t?.logLevel || "warn"), this.attempts = t?.attempts ?? ue, this.attemptWaitMs = t?.attemptWaitMs ?? de, this.attemptTimeout = t?.attemptTimeout ?? le, this.authEndpoints = {
+    this.isAuthenticating = !1, this.isReauthorizing = !1, this.state = "setup", this.listenersInitialized = !1, this.refreshPromise = null, this.activeStreamPorts = /* @__PURE__ */ new Map(), this.authClientId = e, this.authServerUrl = t?.authServerUrl || "https://id.getbodhi.app/realms/bodhi", this.extensionId = t?.extensionId, this.logger = new x("BodhiExtClient", t?.logLevel || "warn"), this.attempts = t?.attempts ?? ue, this.attemptWaitMs = t?.attemptWaitMs ?? de, this.attemptTimeout = t?.attemptTimeout ?? le, this.authEndpoints = {
       authorize: `${this.authServerUrl}/protocol/openid-connect/auth`,
       token: `${this.authServerUrl}/protocol/openid-connect/token`,
       userinfo: `${this.authServerUrl}/protocol/openid-connect/userinfo`,
@@ -718,8 +718,8 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
     return crypto.getRandomValues(e), p.base64UrlEncode(e.buffer);
   }
   static async generateCodeChallenge(e) {
-    const r = new TextEncoder().encode(e), i = await crypto.subtle.digest("SHA-256", r);
-    return p.base64UrlEncode(i);
+    const r = new TextEncoder().encode(e), o = await crypto.subtle.digest("SHA-256", r);
+    return p.base64UrlEncode(o);
   }
   // ============================================================================
   // State Management
@@ -748,7 +748,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
     return this.logger.debug(
       `[Ext2Ext/Discovery] Pinging extension: ${e} with timeout ${this.attemptTimeout}ms`
     ), new Promise((t, r) => {
-      const i = setTimeout(() => {
+      const o = setTimeout(() => {
         this.logger.debug(`[Ext2Ext/Discovery] Timeout waiting for extension ${e}`), r(new Error("Timeout"));
       }, this.attemptTimeout);
       try {
@@ -759,23 +759,23 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
             action: "get_extension_id"
           }
         };
-        this.logger.debug(`[Ext2Ext/Discovery] Sending message to ${e}:`, s), chrome.runtime.sendMessage(e, s, (o) => {
-          if (clearTimeout(i), chrome.runtime.lastError) {
+        this.logger.debug(`[Ext2Ext/Discovery] Sending message to ${e}:`, s), chrome.runtime.sendMessage(e, s, (i) => {
+          if (clearTimeout(o), chrome.runtime.lastError) {
             this.logger.error(
               `[Ext2Ext/Discovery] Error from extension ${e}:`,
               chrome.runtime.lastError.message
             ), r(new Error(chrome.runtime.lastError.message));
             return;
           }
-          this.logger.debug(`[Ext2Ext/Discovery] Response from ${e}:`, o);
-          const n = o;
+          this.logger.debug(`[Ext2Ext/Discovery] Response from ${e}:`, i);
+          const n = i;
           n && n.type === _.EXT_RESPONSE ? (this.logger.debug(`[Ext2Ext/Discovery] ✓ Extension ${e} responded`), t(!0)) : (this.logger.error(
             `[Ext2Ext/Discovery] Invalid response from ${e}:`,
-            o
+            i
           ), r(new Error("Invalid response")));
         });
       } catch (s) {
-        this.logger.error(`[Ext2Ext/Discovery] Exception pinging ${e}:`, s), clearTimeout(i), r(s);
+        this.logger.error(`[Ext2Ext/Discovery] Exception pinging ${e}:`, s), clearTimeout(o), r(s);
       }
     });
   }
@@ -790,36 +790,36 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @param params Resolved discovery params
    */
   async discoverBodhiExtension(e) {
-    const { attempts: t, attemptWaitMs: r, attemptTimeout: i } = e;
+    const { attempts: t, attemptWaitMs: r, attemptTimeout: o } = e;
     this.logger.info(
-      `[Ext2Ext/Discovery] Starting discovery: ${t} attempts per ID, ${i}ms timeout, ${r}ms between attempts`
+      `[Ext2Ext/Discovery] Starting discovery: ${t} attempts per ID, ${o}ms timeout, ${r}ms between attempts`
     );
     const s = this.getExtensionIdsForEnvironment();
     this.logger.debug(
       `[Ext2Ext/Discovery] Will try ${s.length} extension(s):`,
       s
     );
-    for (const h of s) {
-      for (let c = 1; c <= t; c++) {
+    for (const c of s) {
+      for (let h = 1; h <= t; h++) {
         this.logger.debug(
-          `[Ext2Ext/Discovery] Trying ${h} - attempt ${c}/${t}`
+          `[Ext2Ext/Discovery] Trying ${c} - attempt ${h}/${t}`
         );
         try {
-          return await this.pingExtension(h), this.logger.info(`[Ext2Ext/Discovery] ✓ Found: ${h} on attempt ${c}`), {
+          return await this.pingExtension(c), this.logger.info(`[Ext2Ext/Discovery] ✓ Found: ${c} on attempt ${h}`), {
             success: !0,
-            extensionId: h
+            extensionId: c
           };
         } catch (E) {
           this.logger.debug(
-            `[Ext2Ext/Discovery] Attempt ${c} failed for ${h}: ${E instanceof Error ? E.message : "Unknown error"}`
-          ), c < t && await this.sleep(r);
+            `[Ext2Ext/Discovery] Attempt ${h} failed for ${c}: ${E instanceof Error ? E.message : "Unknown error"}`
+          ), h < t && await this.sleep(r);
         }
       }
       this.logger.warn(
-        `[Ext2Ext/Discovery] ✗ Not found: ${h} after ${t} attempts`
+        `[Ext2Ext/Discovery] ✗ Not found: ${c} after ${t} attempts`
       );
     }
-    const o = s.join(", "), n = `Extension not found. Tried ${s.length} IDs with ${t} attempts each: ${o}`;
+    const i = s.join(", "), n = `Extension not found. Tried ${s.length} IDs with ${t} attempts each: ${i}`;
     return this.logger.error(`[Ext2Ext/Discovery] ${n}`), {
       success: !1,
       error: n
@@ -853,8 +853,8 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
         type: "NOT_INITIALIZED"
       }
     }), !0) : (this.logger.debug(`[BodhiExtClient] Processing message.type=${e.type}`), (async () => {
-      const i = await this.handleAction(e);
-      r(i);
+      const o = await this.handleAction(e);
+      r(o);
     })(), !0)), this.registerStreamPortListener(
       U,
       a.EXT2EXT_CLIENT_STREAM_REQUEST,
@@ -937,7 +937,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
           Authorization: `Bearer ${s}`
         }, this.logger.debug("[BodhiExtClient] Injected auth token for authenticated request");
       }
-      const i = await this.sendApiRequest(
+      const o = await this.sendApiRequest(
         e.request.method,
         e.request.endpoint,
         e.request.body,
@@ -946,7 +946,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
       return {
         type: a.EXT2EXT_CLIENT_API_RESPONSE,
         requestId: t,
-        response: i
+        response: o
       };
     } catch (r) {
       return this.logger.error("[BodhiExtClient] API request failed:", r), {
@@ -966,17 +966,17 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @returns Action response message (success or error)
    */
   async handleExtClientRequest(e) {
-    const { requestId: t, request: r } = e, { action: i, params: s } = r;
-    this.logger.debug(`[BodhiExtClient] Handling action: ${i}`);
+    const { requestId: t, request: r } = e, { action: o, params: s } = r;
+    this.logger.debug(`[BodhiExtClient] Handling action: ${o}`);
     try {
-      let o = {};
-      switch (i) {
+      let i = {};
+      switch (o) {
         case m.DISCOVER_EXTENSION: {
           const n = s;
           await this.init(n), this.logger.info("[BodhiExtClient] Discovery successful:", {
             extensionId: this.extensionId,
             environment: I
-          }), o = {
+          }), i = {
             extensionId: this.extensionId,
             environment: I
           };
@@ -984,11 +984,11 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
         }
         case m.SET_EXTENSION_ID: {
           const { extensionId: n } = s;
-          this.extensionId = n, this.state = "ready", this.logger.info("[BodhiExtClient] Extension ID set:", { extensionId: n }), o = { success: !0 };
+          this.extensionId = n, this.state = "ready", this.logger.info("[BodhiExtClient] Extension ID set:", { extensionId: n }), i = { success: !0 };
           break;
         }
         case m.GET_EXTENSION_ID: {
-          const n = await this.sendExtRequestRaw(oe.GET_EXTENSION_ID, s);
+          const n = await this.sendExtRequestRaw(ie.GET_EXTENSION_ID, s);
           return y(n.response) ? {
             type: a.EXT2EXT_CLIENT_RESPONSE,
             requestId: t,
@@ -1013,29 +1013,29 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
           await this.logout(), this.broadcastAuthStateChange();
           break;
         case m.GET_AUTH_STATE:
-          o = { authState: await this.getAuthState() };
+          i = { authState: await this.getAuthState() };
           break;
         default:
           return {
             type: a.EXT2EXT_CLIENT_RESPONSE,
             requestId: t,
             response: {
-              error: { message: `Unknown action: ${i}`, type: "UNKNOWN_ACTION" }
+              error: { message: `Unknown action: ${o}`, type: "UNKNOWN_ACTION" }
             }
           };
       }
       return {
         type: a.EXT2EXT_CLIENT_RESPONSE,
         requestId: t,
-        response: o
+        response: i
       };
-    } catch (o) {
-      return this.logger.error("[BodhiExtClient] Unexpected error:", o), {
+    } catch (i) {
+      return this.logger.error("[BodhiExtClient] Unexpected error:", i), {
         type: a.EXT2EXT_CLIENT_RESPONSE,
         requestId: t,
         response: {
           error: {
-            message: o instanceof Error ? o.message : `Unexpected error: ${JSON.stringify(o)}`
+            message: i instanceof Error ? i.message : `Unexpected error: ${JSON.stringify(i)}`
           }
         }
       };
@@ -1072,25 +1072,25 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @throws Error if login fails
    */
   async login(e) {
-    if (!(this.isAuthenticating || (await this.getAuthState()).status === "authenticated")) {
-      this.isAuthenticating = !0;
+    if (!(this.isAuthenticating || (await this.getAuthState()).status === "authenticated" && !e?.reauthorize)) {
+      this.isAuthenticating = !0, this.isReauthorizing = e?.reauthorize ?? !1;
       try {
         if (!this.extensionId)
           throw new Error("Extension not discovered. Please detect Bodhi extension before login.");
-        const r = e?.userRole ?? "scope_user_user", i = chrome.identity.getRedirectURL("callback"), s = p.generateCodeVerifier(), o = await p.generateCodeChallenge(s), n = p.generateCodeVerifier();
+        const r = e?.userRole ?? "scope_user_user", o = chrome.identity.getRedirectURL("callback"), s = p.generateCodeVerifier(), i = await p.generateCodeChallenge(s), n = p.generateCodeVerifier();
         await chrome.storage.session.set({ codeVerifier: s, state: n, authInProgress: !0 });
-        const h = v(this.authEndpoints, {
+        const c = v(this.authEndpoints, {
           clientId: this.authClientId,
-          redirectUri: i,
+          redirectUri: o,
           scope: L,
           state: n,
-          codeChallenge: o
-        }), c = b(i), E = new P(this.authClientId).requestedRole(r);
+          codeChallenge: i
+        }), h = b(o), E = new P(this.authClientId).requestedRole(r);
         e?.requested && E.requested(e.requested);
-        const l = await this.requestAccess(E.build()), { review_url: u } = k(l), g = O(u, h, c), S = await this.launchReview(g);
+        const l = await this.requestAccess(E.build()), { review_url: u } = k(l), g = O(u, c, h), S = await this.launchReview(g);
         await this.completeOAuthRedirect(S);
       } finally {
-        this.isAuthenticating = !1;
+        this.isAuthenticating = !1, this.isReauthorizing = !1;
       }
     }
   }
@@ -1099,9 +1099,9 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @param code Authorization code from OAuth callback
    */
   async exchangeCodeForTokens(e) {
-    if ((await this.getAuthState()).status === "authenticated")
+    if ((await this.getAuthState()).status === "authenticated" && !this.isReauthorizing)
       return;
-    const { codeVerifier: r } = await chrome.storage.session.get("codeVerifier"), i = chrome.identity.getRedirectURL("callback"), s = await fetch(this.authEndpoints.token, {
+    const { codeVerifier: r } = await chrome.storage.session.get("codeVerifier"), o = chrome.identity.getRedirectURL("callback"), s = await fetch(this.authEndpoints.token, {
       method: "POST",
       headers: {
         "Content-Type": "application/x-www-form-urlencoded"
@@ -1109,7 +1109,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
       body: new URLSearchParams({
         grant_type: "authorization_code",
         code: e,
-        redirect_uri: i,
+        redirect_uri: o,
         client_id: this.authClientId,
         code_verifier: r
       })
@@ -1118,12 +1118,12 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
       const n = await s.text();
       throw new Error(`Token exchange failed: ${s.status} ${n}`);
     }
-    const o = await s.json();
+    const i = await s.json();
     await this.storeTokens({
-      accessToken: o.access_token,
-      refreshToken: o.refresh_token,
-      idToken: o.id_token,
-      expiresIn: o.expires_in
+      accessToken: i.access_token,
+      refreshToken: i.refresh_token,
+      idToken: i.id_token,
+      expiresIn: i.expires_in
     });
   }
   /**
@@ -1208,16 +1208,16 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
   }
   launchReview(e) {
     return new Promise((t, r) => {
-      chrome.identity.launchWebAuthFlow({ url: e, interactive: !0 }, async (i) => {
+      chrome.identity.launchWebAuthFlow({ url: e, interactive: !0 }, async (o) => {
         if (await chrome.storage.session.set({ authInProgress: !1 }), chrome.runtime.lastError) {
           await chrome.storage.session.remove(["codeVerifier", "state"]), r(chrome.runtime.lastError);
           return;
         }
-        if (!i) {
+        if (!o) {
           await chrome.storage.session.remove(["codeVerifier", "state"]), r(d("oauth_error", "No redirect URL received"));
           return;
         }
-        t(i);
+        t(o);
       });
     });
   }
@@ -1225,12 +1225,12 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
     const t = new URL(e), r = t.searchParams.get("error");
     if (r)
       throw await chrome.storage.session.remove(["codeVerifier", "state"]), t.searchParams.get("error_source") === "bodhi" && M(r === "access_denied" ? "denied" : r), d("oauth_error", t.searchParams.get("error_description") ?? r);
-    const i = t.searchParams.get("code"), s = t.searchParams.get("state"), { state: o } = await chrome.storage.session.get("state");
-    if (!s || s !== o)
+    const o = t.searchParams.get("code"), s = t.searchParams.get("state"), { state: i } = await chrome.storage.session.get("state");
+    if (!s || s !== i)
       throw await chrome.storage.session.remove(["codeVerifier", "state"]), d("oauth_error", "State mismatch");
-    if (!i)
+    if (!o)
       throw await chrome.storage.session.remove(["codeVerifier", "state"]), d("oauth_error", "No authorization code");
-    if (await this.exchangeCodeForTokens(i), await chrome.storage.session.remove(["codeVerifier", "state"]), (await this.getAuthState()).status !== "authenticated")
+    if (await this.exchangeCodeForTokens(o), await chrome.storage.session.remove(["codeVerifier", "state"]), (await this.getAuthState()).status !== "authenticated")
       throw d("oauth_error", "Login failed");
   }
   // Ext2Ext Communication (Private Methods)
@@ -1257,7 +1257,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @param headers Optional headers
    * @returns API response from LLM server via bodhi-browser-ext
    */
-  async sendApiRequest(e, t, r, i) {
+  async sendApiRequest(e, t, r, o) {
     if (!this.extensionId)
       throw new T(
         "not_initialized",
@@ -1267,24 +1267,24 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
       `[BodhiExtClient] Sending API_REQUEST: method=${e}, endpoint=${t}`,
       r ? { body: r } : ""
     );
-    const s = crypto.randomUUID(), o = {
+    const s = crypto.randomUUID(), i = {
       type: _.API_REQUEST,
       requestId: s,
       request: {
         method: e,
         endpoint: t,
         body: r,
-        headers: i
+        headers: o
       }
     };
-    return this.logger.debug(`[BodhiExtClient] Request ID: ${s}, Extension: ${this.extensionId}`), new Promise((n, h) => {
+    return this.logger.debug(`[BodhiExtClient] Request ID: ${s}, Extension: ${this.extensionId}`), new Promise((n, c) => {
       try {
-        chrome.runtime.sendMessage(this.extensionId, o, (c) => {
+        chrome.runtime.sendMessage(this.extensionId, i, (h) => {
           if (chrome.runtime.lastError) {
             this.logger.error(
               `[BodhiExtClient] Chrome runtime error for request ${s}:`,
               chrome.runtime.lastError
-            ), h(
+            ), c(
               new T(
                 "extension_error",
                 chrome.runtime.lastError.message ?? "Chrome runtime error"
@@ -1292,19 +1292,19 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
             );
             return;
           }
-          if (this.logger.debug(`[BodhiExtClient] Response for request ${s}:`, c), !c) {
-            this.logger.error(`[BodhiExtClient] No response received for request ${s}`), h(new T("extension_error", "No response from extension"));
+          if (this.logger.debug(`[BodhiExtClient] Response for request ${s}:`, h), !h) {
+            this.logger.error(`[BodhiExtClient] No response received for request ${s}`), c(new T("extension_error", "No response from extension"));
             return;
           }
-          c.type === _.API_RESPONSE && c.requestId === s ? "error" in c ? (this.logger.error(`[BodhiExtClient] API error for ${s}:`, c.error), h(
-            new T(c.error.type || "extension_error", c.error.message)
-          )) : (this.logger.debug(`[BodhiExtClient] ✓ Valid API_RESPONSE for ${s}`), n(c.response)) : (this.logger.error(
+          h.type === _.API_RESPONSE && h.requestId === s ? "error" in h ? (this.logger.error(`[BodhiExtClient] API error for ${s}:`, h.error), c(
+            new T(h.error.type || "extension_error", h.error.message)
+          )) : (this.logger.debug(`[BodhiExtClient] ✓ Valid API_RESPONSE for ${s}`), n(h.response)) : (this.logger.error(
             `[BodhiExtClient] Invalid response format for ${s}:`,
-            c
-          ), h(new T("extension_error", "Invalid response format")));
+            h
+          ), c(new T("extension_error", "Invalid response format")));
         });
-      } catch (c) {
-        this.logger.error(`[BodhiExtClient] Exception sending message for ${s}:`, c), h(c);
+      } catch (h) {
+        this.logger.error(`[BodhiExtClient] Exception sending message for ${s}:`, h), c(h);
       }
     });
   }
@@ -1324,7 +1324,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
       `[BodhiExtClient] Sending EXT_REQUEST (raw): action=${e}`,
       t ? { params: t } : ""
     );
-    const r = crypto.randomUUID(), i = {
+    const r = crypto.randomUUID(), o = {
       type: _.EXT_REQUEST,
       requestId: r,
       request: {
@@ -1332,27 +1332,27 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
         params: t
       }
     };
-    return this.logger.debug(`[BodhiExtClient] Request ID: ${r}, Extension: ${this.extensionId}`), new Promise((s, o) => {
+    return this.logger.debug(`[BodhiExtClient] Request ID: ${r}, Extension: ${this.extensionId}`), new Promise((s, i) => {
       try {
-        chrome.runtime.sendMessage(this.extensionId, i, (n) => {
+        chrome.runtime.sendMessage(this.extensionId, o, (n) => {
           if (chrome.runtime.lastError) {
             this.logger.error(
               `[BodhiExtClient] Chrome runtime error for request ${r}:`,
               chrome.runtime.lastError
-            ), o(new Error(chrome.runtime.lastError.message));
+            ), i(new Error(chrome.runtime.lastError.message));
             return;
           }
           if (this.logger.debug(`[BodhiExtClient] Response for request ${r}:`, n), !n) {
-            this.logger.error(`[BodhiExtClient] No response received for request ${r}`), o(new Error("No response from extension"));
+            this.logger.error(`[BodhiExtClient] No response received for request ${r}`), i(new Error("No response from extension"));
             return;
           }
           n.type === _.EXT_RESPONSE && n.requestId === r ? (this.logger.debug(`[BodhiExtClient] ✓ Valid EXT_RESPONSE for ${r}`), s(n)) : (this.logger.error(
             `[BodhiExtClient] Invalid response format for ${r}:`,
             n
-          ), o(new T("extension_error", "Invalid response format")));
+          ), i(new T("extension_error", "Invalid response format")));
         });
       } catch (n) {
-        this.logger.error(`[BodhiExtClient] Exception sending message for ${r}:`, n), o(n);
+        this.logger.error(`[BodhiExtClient] Exception sending message for ${r}:`, n), i(n);
       }
     });
   }
@@ -1360,18 +1360,18 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * Register a chrome.runtime.onConnect listener for a streaming port.
    * Validates port name and message type, then delegates to handler.
    */
-  registerStreamPortListener(e, t, r, i) {
+  registerStreamPortListener(e, t, r, o) {
     chrome.runtime.onConnect.addListener((s) => {
-      s.name === e && (this.logger.info(`[BodhiExtClient] Port connected: ${e}`), s.onMessage.addListener(async (o) => {
-        if (o.type !== t) {
-          this.logger.warn(`[BodhiExtClient] Unknown message type on ${e}:`, o.type), s.postMessage({
+      s.name === e && (this.logger.info(`[BodhiExtClient] Port connected: ${e}`), s.onMessage.addListener(async (i) => {
+        if (i.type !== t) {
+          this.logger.warn(`[BodhiExtClient] Unknown message type on ${e}:`, i.type), s.postMessage({
             type: r,
-            requestId: o.requestId,
+            requestId: i.requestId,
             error: { message: "Unknown message type", type: "extension_error" }
           });
           return;
         }
-        await i(s, o);
+        await o(s, i);
       }), s.onDisconnect.addListener(() => {
         this.logger.info(`[BodhiExtClient] Port disconnected: ${e}`);
       }));
@@ -1385,48 +1385,48 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * @param onBodhiMessage Called for each message from bodhi-browser-ext.
    *   Returns true if the stream is complete (triggers cleanup).
    */
-  async handleGenericStreamRelay(e, t, r, i, s, o, n) {
+  async handleGenericStreamRelay(e, t, r, o, s, i, n) {
     if (this.logger.debug("[BodhiExtClient] Processing stream relay:", {
       requestId: t,
       method: r.method,
       endpoint: r.endpoint,
-      bodhiPortName: i
+      bodhiPortName: o
     }), !this.extensionId) {
       e.postMessage({
-        type: o,
+        type: i,
         requestId: t,
         error: { message: "Client not initialized (no extensionId)", type: "extension_error" }
       });
       return;
     }
     try {
-      let h = { ...r.headers };
+      let c = { ...r.headers };
       if (r.authenticated !== !1) {
         const u = await this._getAccessTokenRaw();
         if (!u) {
           e.postMessage({
-            type: o,
+            type: i,
             requestId: t,
             error: { message: "Not authenticated. Please log in first.", type: "extension_error" }
           });
           return;
         }
-        h = { ...h, Authorization: `Bearer ${u}` }, this.logger.debug("[BodhiExtClient] Injected auth token for stream relay");
+        c = { ...c, Authorization: `Bearer ${u}` }, this.logger.debug("[BodhiExtClient] Injected auth token for stream relay");
       }
-      const c = chrome.runtime.connect(this.extensionId, { name: i });
-      this.activeStreamPorts.set(t, c);
+      const h = chrome.runtime.connect(this.extensionId, { name: o });
+      this.activeStreamPorts.set(t, h);
       const E = setTimeout(() => {
         this.activeStreamPorts.has(t) && (this.logger.error(`[BodhiExtClient] Stream timeout for ${t}`), e.postMessage({
-          type: o,
+          type: i,
           requestId: t,
           error: { message: "Stream request timed out", type: "timeout_error" }
         }), this.cleanupStreamPort(t));
       }, p.STREAM_TIMEOUT);
-      c.onMessage.addListener((u) => {
+      h.onMessage.addListener((u) => {
         n(u, e, t) && (clearTimeout(E), this.cleanupStreamPort(t));
-      }), c.onDisconnect.addListener(() => {
+      }), h.onDisconnect.addListener(() => {
         clearTimeout(E), this.activeStreamPorts.has(t) && (this.logger.error(`[BodhiExtClient] Bodhi port disconnected for ${t}`), e.postMessage({
-          type: o,
+          type: i,
           requestId: t,
           error: {
             message: "Connection to Bodhi extension closed unexpectedly",
@@ -1441,17 +1441,17 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
           method: r.method,
           endpoint: r.endpoint,
           body: r.body,
-          headers: h
+          headers: c
         }
       };
-      this.logger.debug("[BodhiExtClient] Sending stream request to bodhi port:", l), c.postMessage(l);
-    } catch (h) {
-      const c = h;
-      this.logger.error("[BodhiExtClient] Stream relay error:", JSON.stringify(c.message)), e.postMessage({
-        type: o,
+      this.logger.debug("[BodhiExtClient] Sending stream request to bodhi port:", l), h.postMessage(l);
+    } catch (c) {
+      const h = c;
+      this.logger.error("[BodhiExtClient] Stream relay error:", JSON.stringify(h.message)), e.postMessage({
+        type: i,
         requestId: t,
         error: {
-          message: `uncaught error: ${JSON.stringify({ error: c, message: c.message })}`,
+          message: `uncaught error: ${JSON.stringify({ error: h, message: h.message })}`,
           type: "extension_error"
         }
       });
@@ -1474,43 +1474,43 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * Handle SSE-parsed streaming request — translates STREAM_* messages to EXT2EXT_CLIENT_STREAM_*
    */
   async handleStreamRequest(e, t) {
-    const { requestId: r, request: i } = t;
+    const { requestId: r, request: o } = t;
     await this.handleGenericStreamRelay(
       e,
       r,
-      i,
-      ie,
+      o,
+      oe,
       _.STREAM_REQUEST,
       a.EXT2EXT_CLIENT_STREAM_ERROR,
-      (s, o, n) => {
+      (s, i, n) => {
         if (ne(s)) {
-          const h = s.response, c = h.body;
-          return h.status >= 400 ? (o.postMessage({
+          const c = s.response, h = c.body;
+          return c.status >= 400 ? (i.postMessage({
             type: a.EXT2EXT_CLIENT_STREAM_API_ERROR,
             requestId: n,
-            response: h
-          }), !1) : c?.done ? (o.postMessage({
+            response: c
+          }), !1) : h?.done ? (i.postMessage({
             type: a.EXT2EXT_CLIENT_STREAM_DONE,
             requestId: n
-          }), this.logger.info(`[BodhiExtClient] Stream complete for ${n}`), !0) : (o.postMessage({
+          }), this.logger.info(`[BodhiExtClient] Stream complete for ${n}`), !0) : (i.postMessage({
             type: a.EXT2EXT_CLIENT_STREAM_CHUNK,
             requestId: n,
-            response: h
+            response: c
           }), !1);
         } else {
           if (ae(s))
             return this.logger.error(
               `[BodhiExtClient] Stream API error for ${n}: ${s.response.status}`
-            ), o.postMessage({
+            ), i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_API_ERROR,
               requestId: n,
               response: s.response
             }), !1;
-          if (ce(s))
+          if (he(s))
             return this.logger.error(
               `[BodhiExtClient] Stream error for ${n}:`,
               s.error.message
-            ), o.postMessage({
+            ), i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_ERROR,
               requestId: n,
               error: {
@@ -1527,31 +1527,31 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
    * Handle raw text streaming request — translates STREAM_TEXT_* messages to EXT2EXT_CLIENT_STREAM_TEXT_*
    */
   async handleStreamTextRequest(e, t) {
-    const { requestId: r, request: i } = t;
+    const { requestId: r, request: o } = t;
     await this.handleGenericStreamRelay(
       e,
       r,
-      i,
-      he,
+      o,
+      ce,
       _.STREAM_TEXT_REQUEST,
       a.EXT2EXT_CLIENT_STREAM_TEXT_ERROR,
-      (s, o, n) => {
+      (s, i, n) => {
         switch (s.type) {
           case _.STREAM_TEXT_START:
-            return o.postMessage({
+            return i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_TEXT_START,
               requestId: n,
               status: s.status,
               headers: s.headers
             }), !1;
           case _.STREAM_TEXT_CHUNK:
-            return o.postMessage({
+            return i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_TEXT_CHUNK,
               requestId: n,
               chunk: s.chunk
             }), !1;
           case _.STREAM_TEXT_DONE:
-            return this.logger.info(`[BodhiExtClient] Stream text complete for ${n}`), o.postMessage({
+            return this.logger.info(`[BodhiExtClient] Stream text complete for ${n}`), i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_TEXT_DONE,
               requestId: n
             }), !0;
@@ -1559,7 +1559,7 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
             return this.logger.error(
               `[BodhiExtClient] Stream text error for ${n}:`,
               s.error.message
-            ), o.postMessage({
+            ), i.postMessage({
               type: a.EXT2EXT_CLIENT_STREAM_TEXT_ERROR,
               requestId: n,
               error: s.error
@@ -1654,10 +1654,10 @@ const Se = ["ggedphdcbekjlomjaidbajglgihbeaon"], Re = ["bjdjhiombmfbcoeojijpfckl
     ]);
   }
   parseJwt(e) {
-    const r = e.split(".")[1].replace(/-/g, "+").replace(/_/g, "/"), i = decodeURIComponent(
+    const r = e.split(".")[1].replace(/-/g, "+").replace(/_/g, "/"), o = decodeURIComponent(
       atob(r).split("").map((s) => "%" + ("00" + s.charCodeAt(0).toString(16)).slice(-2)).join("")
     );
-    return JSON.parse(i);
+    return JSON.parse(o);
   }
   createErrorClientNotInitialized(e) {
     return `Client not initialized. Extension discovery not triggered nor extensionId set, cannot handle request: ${JSON.stringify(e)}`;