@xopcai/xopc 0.0.284 → 0.0.286

package/dist/browser-ext/dist/sidepanel.js

@@ -1,4 +1,4 @@
-import { w as t, M as MAX_BROWSER_CONTEXTS_PER_TURN, b as browserPageContextsInputSchema, k as gatewayFetch, o as openDatabase, R as RealtimeClient, a as activeTabId, g as currentTabDescriptor, T as TAB_BINDING_PREFIX, l as getAccessProfile, t as runWithTabSiteAccess, P as PENDING_CONTEXT_KEY, j as extensionLocale, e as captureTabWithPermission, p as pairGateway, v as setAutoConnectEnabled, r as readPendingBrowserPairing, n as readProfile, h as discoverLocalGateway, u as saveExtensionLocalePreference, s as revokeAndForgetProfile, c as cancelPendingBrowserPairing, m as loadExtensionLocalePreference } from './assets/auth-DB30ywek.js';
+import { w as t, M as MAX_BROWSER_CONTEXTS_PER_TURN, b as browserPageContextsInputSchema, k as gatewayFetch, o as openDatabase, R as RealtimeClient, a as activeTabId, g as currentTabDescriptor, T as TAB_BINDING_PREFIX, l as getAccessProfile, t as runWithTabSiteAccess, P as PENDING_CONTEXT_KEY, j as extensionLocale, e as captureTabWithPermission, p as pairGateway, v as setAutoConnectEnabled, r as readPendingBrowserPairing, n as readProfile, h as discoverLocalGateway, u as saveExtensionLocalePreference, s as revokeAndForgetProfile, c as cancelPendingBrowserPairing, m as loadExtensionLocalePreference } from './assets/auth-BXCWrPlg.js';
 
 true              &&(function polyfill() {
   const relList = document.createElement("link").relList;
@@ -17976,8 +17976,8 @@ function findCommand(value, cursor) {
   const match = /(?:^|\s)\/([\w.-]*)$/.exec(value.slice(0, cursor));
   return match ? { start: cursor - match[1].length - 1, end: cursor, query: match[1] } : void 0;
 }
-async function loadComposerCommands(sessionKey) {
-  const params = new URLSearchParams(sessionKey ? { sessionKey } : {});
+async function loadComposerCommands(conversationId) {
+  const params = new URLSearchParams(conversationId ? { conversationId } : {});
   const responses = await Promise.all([
     gatewayFetch("/api/commands"),
     gatewayFetch(`/api/chat/skills?${params}`)
@@ -18030,30 +18030,30 @@ function transactionResult(database, mode, createRequest) {
     transaction.onabort = () => reject(transaction.error ?? new Error(t("errorOutboxAborted")));
   });
 }
-async function readBrowserOutbox(sessionKey) {
+async function readBrowserOutbox(conversationId) {
   const database = await openDatabase();
   try {
     return await transactionResult(
       database,
       "readonly",
-      (store) => store.get(sessionKey)
+      (store) => store.get(conversationId)
     );
   } finally {
     database.close();
   }
 }
-async function writeBrowserOutbox(sessionKey, value) {
+async function writeBrowserOutbox(conversationId, value) {
   const database = await openDatabase();
   try {
-    await transactionResult(database, "readwrite", (store) => store.put(value, sessionKey));
+    await transactionResult(database, "readwrite", (store) => store.put(value, conversationId));
   } finally {
     database.close();
   }
 }
-async function deleteBrowserOutbox(sessionKey) {
+async function deleteBrowserOutbox(conversationId) {
   const database = await openDatabase();
   try {
-    await transactionResult(database, "readwrite", (store) => store.delete(sessionKey));
+    await transactionResult(database, "readwrite", (store) => store.delete(conversationId));
   } finally {
     database.close();
   }
@@ -18142,11 +18142,11 @@ function mapMessage(value, index) {
     } : {}
   };
 }
-function mapClarification(value, sessionKey) {
+function mapClarification(value, conversationId) {
   if (!value || typeof value !== "object") return void 0;
   const envelope = value;
   const row = envelope.clarification && typeof envelope.clarification === "object" ? envelope.clarification : envelope;
-  if (row.status !== "open" || row.sessionKey !== sessionKey || typeof row.id !== "string" || typeof row.question !== "string") return void 0;
+  if (row.status !== "open" || row.conversationId !== conversationId || typeof row.id !== "string" || typeof row.question !== "string") return void 0;
   const choices = Array.isArray(row.choices) ? row.choices.filter((choice) => typeof choice === "string" && Boolean(choice.trim())) : void 0;
   return {
     id: row.id,
@@ -18258,8 +18258,8 @@ class BrowserChatClient {
         if (!(cause instanceof GatewayRequestError) || cause.status !== 404) throw cause;
         await chrome.storage.session.remove([ACTIVE_CHAT_KEY, ...tabKey ? [tabKey] : []]);
         this.update({
-          sessionKey: void 0,
-          sessionId: void 0,
+          conversationId: void 0,
+          transcriptId: void 0,
           messages: [],
           sessionLoading: false,
           modelConfig: void 0,
@@ -18307,10 +18307,10 @@ class BrowserChatClient {
     if (this.turnClaim && this.snapshot.pendingDelivery) void this.recoverOutbox();
   }
   async bindSessionEndpoint() {
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     const endpointId = this.turnClaim?.endpointId;
-    if (!sessionKey || !endpointId) return;
-    const desired = `${sessionKey}
+    if (!conversationId || !endpointId) return;
+    const desired = `${conversationId}
 ${endpointId}`;
     if (this.endpointBinding === desired) return;
     if (this.endpointBindingTask) {
@@ -18318,14 +18318,14 @@ ${endpointId}`;
       if (this.endpointBinding === desired) return;
     }
     const task = json(await gatewayFetch(
-      `/api/endpoint-tools/bindings/${encodeURIComponent(sessionKey)}`,
+      `/api/endpoint-tools/bindings/${encodeURIComponent(conversationId)}`,
       {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ endpointId })
       }
     )).then(() => {
-      if (this.snapshot.sessionKey === sessionKey && this.turnClaim?.endpointId === endpointId) {
+      if (this.snapshot.conversationId === conversationId && this.turnClaim?.endpointId === endpointId) {
         this.endpointBinding = desired;
       }
     });
@@ -18347,7 +18347,7 @@ ${endpointId}`;
       if (typeof row.key !== "string") return [];
       return [{
         key: row.key,
-        ...typeof row.sessionId === "string" ? { sessionId: row.sessionId } : {},
+        ...typeof row.transcriptId === "string" ? { transcriptId: row.transcriptId } : {},
         title: [row.name, row.title, row.displayName].find((item) => typeof item === "string" && item.trim()) || t("newChat"),
         updatedAt: typeof row.updatedAt === "string" ? row.updatedAt : ""
       }];
@@ -18363,12 +18363,12 @@ ${endpointId}`;
     await this.loadSessions();
     await this.openSession(response.session.key);
   }
-  async openSession(sessionKey) {
+  async openSession(conversationId) {
     if (this.runTopic) this.realtime?.unsubscribe(this.runTopic);
     this.runTopic = void 0;
     this.update({
-      sessionKey,
-      sessionId: this.snapshot.sessions.find((candidate) => candidate.key === sessionKey)?.sessionId,
+      conversationId,
+      transcriptId: this.snapshot.sessions.find((candidate) => candidate.key === conversationId)?.transcriptId,
       messages: [],
       streamingText: "",
       runId: void 0,
@@ -18382,10 +18382,10 @@ ${endpointId}`;
       modelConfig: void 0,
       error: void 0
     });
-    await chrome.storage.session.set({ [ACTIVE_CHAT_KEY]: sessionKey });
+    await chrome.storage.session.set({ [ACTIVE_CHAT_KEY]: conversationId });
     const tabId = await activeTabId();
     if (tabId !== void 0) {
-      await chrome.storage.session.set({ [`${TAB_SESSION_PREFIX}${tabId}`]: sessionKey });
+      await chrome.storage.session.set({ [`${TAB_SESSION_PREFIX}${tabId}`]: conversationId });
     }
     try {
       await Promise.all([
@@ -18394,30 +18394,30 @@ ${endpointId}`;
         this.reloadClarification(),
         this.reloadTabBinding()
       ]);
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      if (this.snapshot.conversationId !== conversationId) return;
       await this.bindSessionEndpoint();
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      if (this.snapshot.conversationId !== conversationId) return;
       const run = await json(await gatewayFetch(
-        `/api/sessions/${encodeURIComponent(sessionKey)}/run`
+        `/api/sessions/${encodeURIComponent(conversationId)}/run`
       ));
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      if (this.snapshot.conversationId !== conversationId) return;
       if (run.payload?.active && run.payload.runId) await this.followRun(run.payload.runId);
       await this.reloadBrowserApproval();
-      if (this.snapshot.sessionKey !== sessionKey) return;
-      this.update({ pendingDelivery: Boolean(await readBrowserOutbox(sessionKey)) });
+      if (this.snapshot.conversationId !== conversationId) return;
+      this.update({ pendingDelivery: Boolean(await readBrowserOutbox(conversationId)) });
       if (this.snapshot.endpointReady) await this.recoverOutbox();
     } catch (cause) {
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      if (this.snapshot.conversationId !== conversationId) return;
       throw cause;
     } finally {
-      if (this.snapshot.sessionKey === sessionKey) {
-        await chrome.storage.session.set({ [ACTIVE_CHAT_KEY]: sessionKey });
+      if (this.snapshot.conversationId === conversationId) {
+        await chrome.storage.session.set({ [ACTIVE_CHAT_KEY]: conversationId });
         this.update({ sessionLoading: false });
       }
     }
   }
-  get currentSessionKey() {
-    return this.snapshot.sessionKey;
+  get currentConversationId() {
+    return this.snapshot.conversationId;
   }
   async send(content, browserContexts = [], attachments = []) {
     if (this.sendingInput) throw new Error(t("errorWaitQueuedMessage"));
@@ -18431,20 +18431,20 @@ ${endpointId}`;
   async sendInput(content, browserContexts = [], attachments = []) {
     const text = content.trim();
     if (!text && attachments.length === 0) return "sent";
-    if (!this.snapshot.sessionKey) throw new Error(t("errorOpenChatBeforeSending"));
+    if (!this.snapshot.conversationId) throw new Error(t("errorOpenChatBeforeSending"));
     if (this.snapshot.submitting || this.snapshot.pendingDelivery || this.recoveringOutbox) {
       throw new Error(t("errorWaitQueuedMessage"));
     }
     if (!this.turnClaim) throw new Error(t("errorEndpointNotReady"));
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     await this.bindSessionEndpoint();
-    if (this.snapshot.sessionKey !== sessionKey) throw new Error(t("errorChatChanged"));
+    if (this.snapshot.conversationId !== conversationId) throw new Error(t("errorChatChanged"));
     const clientMessageId = crypto.randomUUID();
     const request = {
       content: text,
       clientMessageId,
       delivery: "next",
-      expectedSessionId: this.snapshot.sessionId,
+      expectedTranscriptId: this.snapshot.transcriptId,
       ...this.snapshot.modelConfig?.fixedModel ? { configVersion: this.snapshot.modelConfig.configVersion } : {},
       origin: { type: "endpoint", endpointId: this.turnClaim.endpointId, token: this.turnClaim.token },
       ...browserContexts.length ? { browserContexts } : {},
@@ -18455,7 +18455,7 @@ ${endpointId}`;
     let deliveryAccepted = false;
     this.update({ submitting: true, pendingDelivery: false });
     try {
-      await writeBrowserOutbox(sessionKey, request);
+      await writeBrowserOutbox(conversationId, request);
       outboxStored = true;
       this.update({
         messages: this.snapshot.runId ? this.snapshot.messages : [...this.snapshot.messages, {
@@ -18475,24 +18475,24 @@ ${endpointId}`;
         error: void 0
       });
       const response = await json(
-        await gatewayFetch(`/api/sessions/${encodeURIComponent(sessionKey)}/inputs`, {
+        await gatewayFetch(`/api/sessions/${encodeURIComponent(conversationId)}/inputs`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(request)
         })
       );
       deliveryAccepted = true;
-      await deleteBrowserOutbox(sessionKey);
+      await deleteBrowserOutbox(conversationId);
       outboxStored = false;
-      if (this.snapshot.sessionKey !== sessionKey) return "sent";
-      const runId = response.payload.state.inputs?.find((input) => input.clientMessageId === clientMessageId)?.runId ?? response.payload.state.activeRunId ?? await this.waitForRun(sessionKey, clientMessageId);
-      if (this.snapshot.sessionKey !== sessionKey) return "sent";
+      if (this.snapshot.conversationId !== conversationId) return "sent";
+      const runId = response.payload.state.inputs?.find((input) => input.clientMessageId === clientMessageId)?.runId ?? response.payload.state.activeRunId ?? await this.waitForRun(conversationId, clientMessageId);
+      if (this.snapshot.conversationId !== conversationId) return "sent";
       if (runId) await this.followRun(runId);
       else await this.reloadMessages();
       return "sent";
     } catch (cause) {
       if (deliveryAccepted) {
-        if (this.snapshot.sessionKey === sessionKey) {
+        if (this.snapshot.conversationId === conversationId) {
           this.update({
             pendingDelivery: false,
             error: t("errorSentStatusUnknown")
@@ -18501,23 +18501,23 @@ ${endpointId}`;
         return "sent";
       }
       if (outboxStored && isRetryableDeliveryError(cause)) {
-        if (this.snapshot.sessionKey === sessionKey) {
+        if (this.snapshot.conversationId === conversationId) {
           this.update({ pendingDelivery: true, error: void 0 });
         }
         return "queued";
       }
-      if (outboxStored) await deleteBrowserOutbox(sessionKey);
-      if (this.snapshot.sessionKey === sessionKey) this.update({ messages: previousMessages });
+      if (outboxStored) await deleteBrowserOutbox(conversationId);
+      if (this.snapshot.conversationId === conversationId) this.update({ messages: previousMessages });
       throw cause;
     } finally {
-      if (this.snapshot.sessionKey === sessionKey) this.update({ submitting: false });
+      if (this.snapshot.conversationId === conversationId) this.update({ submitting: false });
     }
   }
   async recoverOutbox() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey || !this.turnClaim || this.recoveringOutbox) return;
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId || !this.turnClaim || this.recoveringOutbox) return;
     if (Date.now() - this.lastOutboxRecoveryAt < 3e3) return;
-    const pending = await readBrowserOutbox(sessionKey);
+    const pending = await readBrowserOutbox(conversationId);
     if (!pending?.clientMessageId || typeof pending.content !== "string") return;
     this.recoveringOutbox = true;
     this.lastOutboxRecoveryAt = Date.now();
@@ -18528,21 +18528,21 @@ ${endpointId}`;
         ...pending,
         origin: { type: "endpoint", endpointId: this.turnClaim.endpointId, token: this.turnClaim.token }
       };
-      const response = await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(sessionKey)}/inputs`, {
+      const response = await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(conversationId)}/inputs`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify(request)
       }));
       deliveryAccepted = true;
-      await deleteBrowserOutbox(sessionKey);
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      await deleteBrowserOutbox(conversationId);
+      if (this.snapshot.conversationId !== conversationId) return;
       this.update({ pendingDelivery: false, error: void 0 });
-      const runId = response.payload.state.inputs?.find((input) => input.clientMessageId === request.clientMessageId)?.runId ?? response.payload.state.activeRunId ?? await this.waitForRun(sessionKey, request.clientMessageId);
-      if (this.snapshot.sessionKey !== sessionKey) return;
+      const runId = response.payload.state.inputs?.find((input) => input.clientMessageId === request.clientMessageId)?.runId ?? response.payload.state.activeRunId ?? await this.waitForRun(conversationId, request.clientMessageId);
+      if (this.snapshot.conversationId !== conversationId) return;
       if (runId) await this.followRun(runId);
       else await this.reloadMessages();
     } catch (cause) {
-      if (this.snapshot.sessionKey === sessionKey) {
+      if (this.snapshot.conversationId === conversationId) {
         if (deliveryAccepted) {
           this.update({
             pendingDelivery: false,
@@ -18551,7 +18551,7 @@ ${endpointId}`;
         } else if (isRetryableDeliveryError(cause)) {
           this.update({ pendingDelivery: true, error: void 0 });
         } else {
-          await deleteBrowserOutbox(sessionKey);
+          await deleteBrowserOutbox(conversationId);
           this.update({
             pendingDelivery: false,
             messages: this.snapshot.messages.filter((message) => message.id !== pending.clientMessageId),
@@ -18565,16 +18565,16 @@ ${endpointId}`;
   }
   async refreshInputs() {
     const requestId = ++this.inputsRequest;
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
     const result = await json(
-      await gatewayFetch(`/api/sessions/${encodeURIComponent(sessionKey)}/input-state`)
+      await gatewayFetch(`/api/sessions/${encodeURIComponent(conversationId)}/input-state`)
     );
-    if (this.snapshot.sessionKey !== sessionKey || requestId !== this.inputsRequest) return;
+    if (this.snapshot.conversationId !== conversationId || requestId !== this.inputsRequest) return;
     this.update({ queuedInputs: (result.payload.inputs ?? []).filter((input) => input.status === "queued") });
     if (result.payload.activeRunId !== this.snapshot.runId) {
       await this.reloadMessages();
-      if (this.snapshot.sessionKey !== sessionKey || requestId !== this.inputsRequest) return;
+      if (this.snapshot.conversationId !== conversationId || requestId !== this.inputsRequest) return;
       if (result.payload.activeRunId) await this.followRun(result.payload.activeRunId);
       else {
         if (this.runTopic) this.realtime?.unsubscribe(this.runTopic);
@@ -18584,7 +18584,7 @@ ${endpointId}`;
     }
   }
   async editInput(id, version, content) {
-    const key = this.snapshot.sessionKey;
+    const key = this.snapshot.conversationId;
     if (!key) return;
     try {
       await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(key)}/inputs/${encodeURIComponent(id)}`, {
@@ -18593,17 +18593,17 @@ ${endpointId}`;
         body: JSON.stringify({ version, content })
       }));
     } finally {
-      if (this.snapshot.sessionKey === key) await this.refreshInputs();
+      if (this.snapshot.conversationId === key) await this.refreshInputs();
     }
   }
   async cancelInput(id, version) {
-    const key = this.snapshot.sessionKey;
+    const key = this.snapshot.conversationId;
     if (!key) return;
     try {
       await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(key)}/inputs/${encodeURIComponent(id)}?version=${version}`, { method: "DELETE" }));
-      if (this.snapshot.sessionKey === key) await this.reloadMessages();
+      if (this.snapshot.conversationId === key) await this.reloadMessages();
     } finally {
-      if (this.snapshot.sessionKey === key) await this.refreshInputs();
+      if (this.snapshot.conversationId === key) await this.refreshInputs();
     }
   }
   async abort() {
@@ -18623,9 +18623,9 @@ ${endpointId}`;
     }
   }
   async updateModel(model) {
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     const current = this.snapshot.modelConfig;
-    if (!sessionKey || !current) return;
+    if (!conversationId || !current) return;
     const selected = this.snapshot.models.find((candidate) => candidate.id === model);
     const thinkingLevel = selected?.thinking?.options?.includes(current.thinkingLevel) ? current.thinkingLevel : selected?.thinking?.default;
     await this.patchModelConfig({ model, thinkingLevel });
@@ -18650,11 +18650,11 @@ ${endpointId}`;
     await this.reloadClarification();
   }
   async bindActiveTab(mode) {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey || !this.turnClaim) throw new Error(t("errorOpenChatForEndpoint"));
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId || !this.turnClaim) throw new Error(t("errorOpenChatForEndpoint"));
     const descriptor = await currentTabDescriptor();
     const result = await json(await gatewayFetch(
-      `/api/browser/tab-bindings/${encodeURIComponent(sessionKey)}`,
+      `/api/browser/tab-bindings/${encodeURIComponent(conversationId)}`,
       {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
@@ -18666,7 +18666,7 @@ ${endpointId}`;
         })
       }
     ));
-    if (this.snapshot.sessionKey !== sessionKey) return;
+    if (this.snapshot.conversationId !== conversationId) return;
     if (this.snapshot.tabBinding) {
       await chrome.storage.session.remove(`${TAB_BINDING_PREFIX}${this.snapshot.tabBinding.id}`);
     }
@@ -18674,11 +18674,11 @@ ${endpointId}`;
     this.update({ tabBinding: result.payload });
   }
   async unbindActiveTab() {
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     const binding = this.snapshot.tabBinding;
-    if (!sessionKey) return;
-    await json(await gatewayFetch(`/api/browser/tab-bindings/${encodeURIComponent(sessionKey)}`, { method: "DELETE" }));
-    if (this.snapshot.sessionKey !== sessionKey) return;
+    if (!conversationId) return;
+    await json(await gatewayFetch(`/api/browser/tab-bindings/${encodeURIComponent(conversationId)}`, { method: "DELETE" }));
+    if (this.snapshot.conversationId !== conversationId) return;
     if (binding) await chrome.storage.session.remove(`${TAB_BINDING_PREFIX}${binding.id}`);
     this.update({ tabBinding: void 0 });
   }
@@ -18692,11 +18692,11 @@ ${endpointId}`;
     }));
     await this.reloadBrowserApproval();
   }
-  async waitForRun(sessionKey, clientMessageId) {
+  async waitForRun(conversationId, clientMessageId) {
     for (let attempt = 0; attempt < 20; attempt += 1) {
       await new Promise((resolve) => setTimeout(resolve, 100));
       const state = await json(
-        await gatewayFetch(`/api/sessions/${encodeURIComponent(sessionKey)}/input-state`)
+        await gatewayFetch(`/api/sessions/${encodeURIComponent(conversationId)}/input-state`)
       );
       const runId = state.payload.inputs?.find((input) => input.clientMessageId === clientMessageId)?.runId ?? state.payload.activeRunId;
       if (runId) return runId;
@@ -18707,11 +18707,11 @@ ${endpointId}`;
   async followRun(runId) {
     const topic = `run:${runId}`;
     if (this.runTopic === topic) return;
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     if (this.runTopic) this.realtime?.unsubscribe(this.runTopic);
     this.runTopic = topic;
     const stored = await chrome.storage.session.get(`${CURSOR_PREFIX}${runId}`);
-    if (this.snapshot.sessionKey !== sessionKey || this.runTopic !== topic) return;
+    if (this.snapshot.conversationId !== conversationId || this.runTopic !== topic) return;
     const cursor = typeof stored[`${CURSOR_PREFIX}${runId}`] === "number" ? stored[`${CURSOR_PREFIX}${runId}`] : void 0;
     this.update({ runId, streamingText: "" });
     this.realtime?.subscribe(topic, cursor);
@@ -18719,9 +18719,9 @@ ${endpointId}`;
   async onRealtimeEvent(topic, seq, event, data) {
     if (topic === "gateway") {
       if (event === "clarification.updated") {
-        const sessionKey = this.snapshot.sessionKey;
-        if (sessionKey && data && typeof data === "object" && data.sessionKey === sessionKey) {
-          this.update({ clarification: mapClarification(data, sessionKey) });
+        const conversationId = this.snapshot.conversationId;
+        if (conversationId && data && typeof data === "object" && data.conversationId === conversationId) {
+          this.update({ clarification: mapClarification(data, conversationId) });
         }
       }
       if (event === "browser.approval.required") await this.reloadBrowserApproval();
@@ -18752,16 +18752,16 @@ ${endpointId}`;
     }
   }
   async reloadMessages() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
-    const result = await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(sessionKey)}/messages?limit=200`));
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
+    const result = await json(await gatewayFetch(`/api/sessions/${encodeURIComponent(conversationId)}/messages?limit=200`));
     const messages = (result.payload.messages ?? []).flatMap((value, index) => {
       const message = mapMessage(value, index);
       return message ? [message] : [];
     });
-    if (this.snapshot.sessionKey !== sessionKey) return;
-    const session = this.snapshot.sessions.find((candidate) => candidate.key === sessionKey);
-    this.update({ messages, sessionId: session?.sessionId });
+    if (this.snapshot.conversationId !== conversationId) return;
+    const session = this.snapshot.sessions.find((candidate) => candidate.key === conversationId);
+    this.update({ messages, transcriptId: session?.transcriptId });
   }
   async loadModels() {
     const result = await json(await gatewayFetch("/api/models"));
@@ -18785,16 +18785,16 @@ ${endpointId}`;
     this.update({ models });
   }
   async reloadModelConfig() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
     const result = await json(await gatewayFetch(
-      `/api/sessions/${encodeURIComponent(sessionKey)}/agent-config`
+      `/api/sessions/${encodeURIComponent(conversationId)}/agent-config`
     ));
     const config = result.payload;
     if (!config || typeof config.model !== "string" || typeof config.thinkingLevel !== "string") {
       throw new Error(t("errorInvalidModelConfig"));
     }
-    if (this.snapshot.sessionKey !== sessionKey) return;
+    if (this.snapshot.conversationId !== conversationId) return;
     this.update({ modelConfig: {
       model: config.model,
       thinkingLevel: config.thinkingLevel,
@@ -18803,11 +18803,11 @@ ${endpointId}`;
     } });
   }
   async patchModelConfig(patch) {
-    const sessionKey = this.snapshot.sessionKey;
+    const conversationId = this.snapshot.conversationId;
     const current = this.snapshot.modelConfig;
-    if (!sessionKey || !current) return;
+    if (!conversationId || !current) return;
     const result = await json(await gatewayFetch(
-      `/api/sessions/${encodeURIComponent(sessionKey)}/agent-config`,
+      `/api/sessions/${encodeURIComponent(conversationId)}/agent-config`,
       {
         method: "PATCH",
         headers: { "Content-Type": "application/json" },
@@ -18818,7 +18818,7 @@ ${endpointId}`;
     if (!config || typeof config.model !== "string" || typeof config.thinkingLevel !== "string") {
       throw new Error(t("errorInvalidModelConfig"));
     }
-    if (this.snapshot.sessionKey !== sessionKey) return;
+    if (this.snapshot.conversationId !== conversationId) return;
     this.update({ modelConfig: {
       model: config.model,
       thinkingLevel: config.thinkingLevel,
@@ -18827,49 +18827,49 @@ ${endpointId}`;
     } });
   }
   async reloadClarification() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
     const result = await json(await gatewayFetch(
-      `/api/sessions/${encodeURIComponent(sessionKey)}/clarification`
+      `/api/sessions/${encodeURIComponent(conversationId)}/clarification`
     ));
-    if (this.snapshot.sessionKey === sessionKey) {
-      this.update({ clarification: mapClarification(result.payload, sessionKey) });
+    if (this.snapshot.conversationId === conversationId) {
+      this.update({ clarification: mapClarification(result.payload, conversationId) });
     }
   }
   async reloadTabBinding() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
-    const response = await gatewayFetch(`/api/browser/tab-bindings/${encodeURIComponent(sessionKey)}`);
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
+    const response = await gatewayFetch(`/api/browser/tab-bindings/${encodeURIComponent(conversationId)}`);
     if (response.status === 404) {
-      if (this.snapshot.sessionKey === sessionKey) this.update({ tabBinding: void 0 });
+      if (this.snapshot.conversationId === conversationId) this.update({ tabBinding: void 0 });
       return;
     }
     const result = await json(response);
-    if (this.snapshot.sessionKey !== sessionKey) return;
+    if (this.snapshot.conversationId !== conversationId) return;
     await chrome.storage.session.set({ [`${TAB_BINDING_PREFIX}${result.payload.id}`]: result.payload });
     this.update({ tabBinding: result.payload });
   }
   async reloadBrowserApproval() {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey || !this.snapshot.tabBinding) {
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId || !this.snapshot.tabBinding) {
       this.update({ browserApproval: void 0 });
       return;
     }
     const result = await json(await gatewayFetch(
-      `/api/browser/approvals?sessionKey=${encodeURIComponent(sessionKey)}`
+      `/api/browser/approvals?conversationId=${encodeURIComponent(conversationId)}`
     ));
-    if (this.snapshot.sessionKey === sessionKey) {
+    if (this.snapshot.conversationId === conversationId) {
       this.update({ browserApproval: result.approvals.find((approval) => approval.status === "pending") });
     }
   }
   async reconcileAbortedRun(runId) {
-    const sessionKey = this.snapshot.sessionKey;
-    if (!sessionKey) return;
+    const conversationId = this.snapshot.conversationId;
+    if (!conversationId) return;
     for (let attempt = 0; attempt < 10; attempt += 1) {
       await new Promise((resolve) => setTimeout(resolve, 200));
-      if (this.snapshot.sessionKey !== sessionKey || this.snapshot.runId !== runId) return;
+      if (this.snapshot.conversationId !== conversationId || this.snapshot.runId !== runId) return;
       const run = await json(await gatewayFetch(
-        `/api/sessions/${encodeURIComponent(sessionKey)}/run`
+        `/api/sessions/${encodeURIComponent(conversationId)}/run`
       ));
       if (!run.payload?.active || run.payload.runId !== runId) {
         if (this.runTopic) this.realtime?.unsubscribe(this.runTopic);
@@ -18878,7 +18878,7 @@ ${endpointId}`;
         try {
           await this.reloadMessages();
         } finally {
-          if (this.snapshot.sessionKey === sessionKey) {
+          if (this.snapshot.conversationId === conversationId) {
             this.update({ runId: void 0, streamingText: "", stopping: false });
           }
         }
@@ -27663,8 +27663,8 @@ function formatFileSize(size) {
 function ChatPanel({ gatewayId }) {
   const client = reactExports.useMemo(() => new BrowserChatClient(), []);
   const [snapshot, setSnapshot] = reactExports.useState(EMPTY);
-  const keyForSession = (sessionKey) => JSON.stringify([gatewayId, sessionKey ?? "new"]);
-  const draftKey = keyForSession(snapshot.sessionKey);
+  const keyForSession = (conversationId) => JSON.stringify([gatewayId, conversationId ?? "new"]);
+  const draftKey = keyForSession(snapshot.conversationId);
   const { store: drafts, draft: composerDraft, ready: draftReady, update: updateDraft } = useComposerDrafts(draftKey, (cause) => setError(String(cause)));
   const draft = composerDraft.text;
   const attachments = composerDraft.attachments;
@@ -27736,7 +27736,7 @@ function ChatPanel({ gatewayId }) {
       const stored = await chrome.storage.session.get(PENDING_CONTEXT_KEY);
       const pending = stored[PENDING_CONTEXT_KEY];
       if (!pending || !active) return;
-      const key = keyForSession(client.currentSessionKey);
+      const key = keyForSession(client.currentConversationId);
       await drafts.load(key);
       if (!active) return;
       drafts.update(key, (current) => ({ ...current, pages: appendPageContext(current.pages, pending) }));
@@ -27796,7 +27796,7 @@ function ChatPanel({ gatewayId }) {
     setAtBottom(true);
     const frame = requestAnimationFrame(() => scrollToBottom());
     return () => cancelAnimationFrame(frame);
-  }, [scrollToBottom, snapshot.sessionKey]);
+  }, [scrollToBottom, snapshot.conversationId]);
   reactExports.useEffect(() => {
     const target = textarea.current;
     if (!target) return;
@@ -27830,7 +27830,7 @@ function ChatPanel({ gatewayId }) {
     setCommandsOpen(false);
     setPreview(void 0);
     setError("");
-    if (!snapshot.sessionKey) return;
+    if (!snapshot.conversationId) return;
     let active = true;
     const refresh = () => {
       if (active) void client.refreshInputs().catch((cause) => {
@@ -27843,12 +27843,12 @@ function ChatPanel({ gatewayId }) {
       active = false;
       clearInterval(timer);
     };
-  }, [client, snapshot.sessionKey]);
+  }, [client, snapshot.conversationId]);
   reactExports.useEffect(() => {
     if (!commandsOpen) return;
     let active = true;
     setCommandsLoading(true);
-    void loadComposerCommands(snapshot.sessionKey).then((items) => {
+    void loadComposerCommands(snapshot.conversationId).then((items) => {
       if (active) setCommands(items);
     }).catch((cause) => {
       if (active) {
@@ -27861,7 +27861,7 @@ function ChatPanel({ gatewayId }) {
     return () => {
       active = false;
     };
-  }, [commandsOpen, snapshot.sessionKey]);
+  }, [commandsOpen, snapshot.conversationId]);
   function chooseCommand(item) {
     if (!commandRange || item.disabled) return;
     const text = `${draft.slice(0, commandRange.start)}${item.wire}${draft.slice(commandRange.end)}`;
@@ -27889,9 +27889,9 @@ function ChatPanel({ gatewayId }) {
     setAtBottom(true);
     let targetKey = draftKey;
     try {
-      if (!snapshot.sessionKey) {
+      if (!snapshot.conversationId) {
         await client.createSession();
-        targetKey = keyForSession(client.currentSessionKey);
+        targetKey = keyForSession(client.currentConversationId);
         drafts.update(targetKey, () => payload);
         drafts.update(draftKey, () => EMPTY_DRAFT);
       }
@@ -28093,7 +28093,7 @@ function ChatPanel({ gatewayId }) {
       setClarificationSubmitting(false);
     }
   }
-  const activeSession = snapshot.sessions.find((session) => session.key === snapshot.sessionKey);
+  const activeSession = snapshot.sessions.find((session) => session.key === snapshot.conversationId);
   const connectionText = snapshot.endpointReady ? t("ready") : snapshot.connection === "connected" ? t("wakingUp") : snapshot.connection === "connecting" || snapshot.connection === "reconnecting" ? t("connecting") : t("offline");
   const connectionProblem = !snapshot.endpointReady && (snapshot.connection === "error" || snapshot.connection === "disconnected");
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("section", { className: "chat", children: [
@@ -28121,7 +28121,7 @@ function ChatPanel({ gatewayId }) {
         /* @__PURE__ */ jsxRuntimeExports.jsx("input", { value: search, onChange: (event) => void runSearch(event.target.value), placeholder: t("searchChats"), autoFocus: true })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "session-list", children: [
-        snapshot.sessions.map((session) => /* @__PURE__ */ jsxRuntimeExports.jsxs("button", { disabled: sending || snapshot.submitting || snapshot.sessionLoading, className: session.key === snapshot.sessionKey ? "active" : "", onClick: () => {
+        snapshot.sessions.map((session) => /* @__PURE__ */ jsxRuntimeExports.jsxs("button", { disabled: sending || snapshot.submitting || snapshot.sessionLoading, className: session.key === snapshot.conversationId ? "active" : "", onClick: () => {
           setMenuOpen(false);
           void runControlAction(() => client.openSession(session.key));
         }, children: [
@@ -28129,7 +28129,7 @@ function ChatPanel({ gatewayId }) {
             /* @__PURE__ */ jsxRuntimeExports.jsx("span", { children: session.title }),
             /* @__PURE__ */ jsxRuntimeExports.jsx("small", { children: formatSessionDate(session.updatedAt) })
           ] }),
-          session.key === snapshot.sessionKey ? /* @__PURE__ */ jsxRuntimeExports.jsx(CheckIcon, {}) : null
+          session.key === snapshot.conversationId ? /* @__PURE__ */ jsxRuntimeExports.jsx(CheckIcon, {}) : null
         ] }, session.key)),
         !snapshot.sessions.length ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "session-list-empty", children: t("noChatsFound") }) : null
       ] })
@@ -28281,7 +28281,7 @@ function ChatPanel({ gatewayId }) {
             ] })
           ] }) : null,
           processing ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "composer-notice", role: "status", children: t("processingAttachments") }) : null,
-          snapshot.queuedInputs?.map((input) => /* @__PURE__ */ jsxRuntimeExports.jsx(QueuedInput, { input, onSave: (content, version) => client.editInput(input.id, version, content), onCancel: () => client.cancelInput(input.id, input.version) }, `${snapshot.sessionKey}:${input.id}`)),
+          snapshot.queuedInputs?.map((input) => /* @__PURE__ */ jsxRuntimeExports.jsx(QueuedInput, { input, onSave: (content, version) => client.editInput(input.id, version, content), onCancel: () => client.cancelInput(input.id, input.version) }, `${snapshot.conversationId}:${input.id}`)),
           snapshot.pendingDelivery ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "composer-notice", role: "status", children: t("queuedMessageNotice") }) : null,
           error || !connectionProblem && snapshot.error ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "composer-error", role: "alert", children: [
             /* @__PURE__ */ jsxRuntimeExports.jsx(AlertIcon, {}),
@@ -28566,10 +28566,10 @@ ${pageContext.context.selection ?? pageContext.context.text ?? ""}` }), children
             ] }),
             /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "composer-toolbar-end", children: [
               /* @__PURE__ */ jsxRuntimeExports.jsx(ModelControls, { models: snapshot.models, config: snapshot.modelConfig, disabled: sending || processing || voiceBusy || snapshot.submitting || snapshot.sessionLoading || Boolean(snapshot.runId), onModel: (model) => updateModelConfig(async () => {
-                if (!client.currentSessionKey) {
+                if (!client.currentConversationId) {
                   const payload = drafts.get(draftKey);
                   await client.createSession();
-                  drafts.update(keyForSession(client.currentSessionKey), () => payload);
+                  drafts.update(keyForSession(client.currentConversationId), () => payload);
                   drafts.update(draftKey, () => EMPTY_DRAFT);
                 }
                 await client.updateModel(model);