botschat 0.1.15 → 0.1.16

package/packages/web/src/foreground.ts

@@ -1,18 +1,43 @@
 /**
- * Foreground/background detection — notifies the ConnectionDO via WebSocket
- * so it knows whether to send push notifications.
+ * Foreground/background detection & channel-level focus tracking.
+ *
+ * Notifies the ConnectionDO via WebSocket so it knows whether to send push
+ * notifications and which session the user is currently viewing.
  */
 
 import { Capacitor } from "@capacitor/core";
 import type { BotsChatWSClient } from "./ws";
 import { dlog } from "./debug-log";
 
-export function setupForegroundDetection(
+export interface ForegroundOptions {
+  wsClient: BotsChatWSClient;
+  getActiveSessionKey: () => string | null;
+  onResume?: () => void;
+}
+
+export interface ForegroundHandle {
+  cleanup: () => void;
+  /** Re-send the current foreground/background state. Call after WS auth succeeds. */
+  resend: () => void;
+}
+
+/**
+ * Send a focus.update message when the user switches channels/sessions
+ * while already in the foreground.
+ */
+export function sendFocusUpdate(
   wsClient: BotsChatWSClient,
-  onResume?: () => void,
-): () => void {
+  sessionKey: string | null,
+): void {
+  wsClient.send({ type: "focus.update", sessionKey });
+  dlog.info("Foreground", `Focus updated: ${sessionKey ?? "(none)"}`);
+}
+
+export function setupForegroundDetection(opts: ForegroundOptions): ForegroundHandle {
+  const { wsClient, getActiveSessionKey, onResume } = opts;
+
   const notifyForeground = () => {
-    wsClient.send({ type: "foreground.enter" });
+    wsClient.send({ type: "foreground.enter", sessionKey: getActiveSessionKey() });
     onResume?.();
     dlog.info("Foreground", "Entered foreground");
   };
@@ -24,19 +49,23 @@ export function setupForegroundDetection(
 
   if (Capacitor.isNativePlatform()) {
     let cleanup: (() => void) | null = null;
+    let nativeIsActive = true;
 
     import("@capacitor/app").then(({ App }) => {
       const handle = App.addListener("appStateChange", ({ isActive }) => {
+        nativeIsActive = isActive;
         if (isActive) notifyForeground();
         else notifyBackground();
       });
       cleanup = () => handle.then((h) => h.remove());
     });
 
-    // Report initial foreground state once WS is connected
     notifyForeground();
 
-    return () => cleanup?.();
+    return {
+      cleanup: () => cleanup?.(),
+      resend: () => { if (nativeIsActive) notifyForeground(); else notifyBackground(); },
+    };
   }
 
   // Web: Use Page Visibility API
@@ -49,7 +78,8 @@ export function setupForegroundDetection(
 
   if (!document.hidden) notifyForeground();
 
-  return () => {
-    document.removeEventListener("visibilitychange", handleVisibilityChange);
+  return {
+    cleanup: () => document.removeEventListener("visibilitychange", handleVisibilityChange),
+    resend: () => { if (!document.hidden) notifyForeground(); else notifyBackground(); },
   };
 }

package/packages/web/src/store.ts

@@ -15,6 +15,10 @@ export type ChatMessage = {
   /** Tracks which action blocks have been resolved, keyed by prompt hash */
   resolvedActions?: Record<string, { value: string; label: string }>;
   isEncryptedLocked?: boolean;
+  /** Whether the message text was E2E encrypted (bitmask from API: bit0=text, bit1=media) */
+  encrypted?: boolean | number;
+  /** Whether the media binary was E2E encrypted (derived from sender + encrypted flag) */
+  mediaEncrypted?: boolean;
 };
 
 export type ActiveView = "messages" | "automations";

package/packages/web/dist/assets/index-CbCpFrA9.js

@@ -1,2 +0,0 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/web-DIeOUVhn.js","assets/index-CvbTpaza.js","assets/index-cm_3YFsA.css"])))=>i.map(i=>d[i]);
-import{r as o,f as t}from"./index-CvbTpaza.js";const n=o("SocialLogin",{web:()=>t(()=>import("./web-DIeOUVhn.js"),__vite__mapDeps([0,1,2])).then(e=>new e.SocialLoginWeb)});export{n as SocialLogin};

package/packages/web/dist/assets/index-Ct0m11C8.js

@@ -1,2 +0,0 @@
-const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["assets/web-Dft_LGIH.js","assets/index-CvbTpaza.js","assets/index-cm_3YFsA.css"])))=>i.map(i=>d[i]);
-import{r as p,f as r}from"./index-CvbTpaza.js";const o=p("App",{web:()=>r(()=>import("./web-Dft_LGIH.js"),__vite__mapDeps([0,1,2])).then(e=>new e.AppWeb)});export{o as App};

package/packages/web/dist/assets/index-GwprVhDP.js

@@ -1 +0,0 @@
-import{r as i}from"./index-CvbTpaza.js";const t=i("PushNotifications",{});export{t as PushNotifications};