@opengeni/react 4.3.3-canary.39786771332001 → 4.5.0

package/src/app/components/capabilities/session-machine-card.tsx

@@ -29,6 +29,7 @@ import { LogoTile } from "../../../ui/logo-tile";
 import { Notice } from "../../../ui/notice";
 import { RowButton } from "../../../ui/page-actions";
 import { useAppContext } from "../../app-context";
+import { useClientConfigFlags } from "../../../hooks/use-client-config-flags";
 import { userErrorText } from "../../../ui/api-error";
 import { isMachineComputeSelectable } from "../../lib/machine-selectability";
 import { useDesktopThisComputer } from "../desktop/this-computer";
@@ -45,6 +46,11 @@ const WATCH_POLL_MS = 3_000;
 const CHROME_POLL_MS = 5_000;
 /** Stop checking for the extension after this long without a link. */
 const CHROME_POLL_LIMIT_MS = 10 * 60_000;
+/**
+ * After a computer comes online, keep checking quietly for a short while: its
+ * Chrome profile usually links up a few seconds after the machine does.
+ */
+const CHROME_REFRESH_POLL_LIMIT_MS = 60_000;
 
 export { machineUseMessage } from "../../lib/move-chat-to-machine";
 
@@ -237,7 +243,9 @@ export function SessionMachineCapabilityCard({
     null;
   const chrome = useAttachedChrome(
     workspaceId,
-    fleet.canRead ? (chromeMachine?.enrollmentId ?? null) : null,
+    fleet.canRead && chromeMachine?.enrollmentId
+      ? { enrollmentId: chromeMachine.enrollmentId }
+      : null,
   );
   const fresh = justConnected
     ? (machines.find((machine) => machine.sandboxId === justConnected) ?? null)
@@ -478,11 +486,13 @@ export function SessionMachineCapabilityCard({
  * An earlier Connected Machine card whose request the agent made again further
  * down. The newer card is the live one, so this stays a single quiet line.
  */
-export function RepeatedMachineRequestNote() {
+export function RepeatedMachineRequestNote({ chrome = false }: { chrome?: boolean }) {
   return (
     <p className="flex items-center gap-2 text-xs text-fg-muted">
       <LaptopIcon aria-hidden className="size-3.5 shrink-0" />
-      The agent asked to use a machine. It asked again below.
+      {chrome
+        ? "The agent asked to connect Chrome. It asked again below."
+        : "The agent asked to use a machine. It asked again below."}
     </p>
   );
 }
@@ -562,32 +572,55 @@ function MachineRow({
   );
 }
 
-type ChromeState = {
+export type ChromeState = {
   connected: { name: string } | null;
+  /** A read completed, so a null `connected` means Chrome is not linked yet. */
+  checked: boolean;
   /** Start checking for the extension (after the person opens the store). */
   watch: () => void;
+  /** Checking for the extension after the person opened the store. */
+  watching: boolean;
 };
 
+/** Which Chrome to look for: one on an exact machine, or any the person connected. */
+export type AttachedChromeScope = { enrollmentId: string } | "any" | null;
+
 /**
- * Whether the Opengeni Browser extension linked a Chrome profile on this exact
- * machine. Reads once; polls only after the person opens the store, stops once
- * linked, after a bounded time, or when the inventory is not available to them.
+ * Whether the Opengeni Browser extension linked a Chrome profile the agent can
+ * use (the same check browser_open applies) on this exact machine, or, with
+ * "any", on any machine. Reads once, and again whenever `refreshKey` changes
+ * (for example when a computer comes online); polls only after the person opens
+ * the store, stops once linked, after a bounded time, or when the inventory is
+ * not available to them.
  */
-function useAttachedChrome(workspaceId: string, enrollmentId: string | null): ChromeState {
+export function useAttachedChrome(
+  workspaceId: string,
+  scope: AttachedChromeScope,
+  refreshKey: string | null = null,
+): ChromeState {
   const { client } = useAppContext();
   // Poll on its own timer; a new client identity on re-render must not refetch.
   const clientRef = useRef(client);
   clientRef.current = client;
   const [connected, setConnected] = useState<{ name: string } | null>(null);
+  const [checked, setChecked] = useState(false);
   const [watchSince, setWatchSince] = useState<number | null>(null);
+  const [refreshSince, setRefreshSince] = useState<number | null>(null);
+  const [expired, setExpired] = useState(false);
   const [denied, setDenied] = useState(false);
   const linked = connected !== null;
+  const enrollmentId = scope === null ? null : scope === "any" ? "*" : scope.enrollmentId;
 
   useEffect(() => {
     setConnected(null);
+    setChecked(false);
     setDenied(false);
   }, [enrollmentId]);
 
+  useEffect(() => {
+    setRefreshSince(refreshKey === null ? null : Date.now());
+  }, [refreshKey]);
+
   useEffect(() => {
     if (!enrollmentId || denied) return;
     let cancelled = false;
@@ -596,9 +629,13 @@ function useAttachedChrome(workspaceId: string, enrollmentId: string | null): Ch
         const result = await clientRef.current.listAttachedBrowsers(workspaceId);
         if (cancelled) return;
         const device = result.devices.find(
-          (candidate) => candidate.state === "connected" && candidate.enrollmentId === enrollmentId,
+          (candidate) =>
+            candidate.state === "connected" &&
+            candidate.capabilities.debuggerAttachment &&
+            (enrollmentId === "*" || candidate.enrollmentId === enrollmentId),
         );
         setConnected(device ? { name: device.profileLabel ?? device.browserName } : null);
+        setChecked(true);
       } catch (failure) {
         // Without inventory access the step still offers the install link.
         if (
@@ -612,10 +649,17 @@ function useAttachedChrome(workspaceId: string, enrollmentId: string | null): Ch
       }
     };
     void read();
-    if (linked || watchSince === null) return () => void (cancelled = true);
+    if (linked || (watchSince === null && refreshSince === null)) {
+      return () => void (cancelled = true);
+    }
     const timer = window.setInterval(() => {
-      if (Date.now() - watchSince > CHROME_POLL_LIMIT_MS) {
+      const now = Date.now();
+      const watching = watchSince !== null && now - watchSince <= CHROME_POLL_LIMIT_MS;
+      const refreshing =
+        refreshSince !== null && now - refreshSince <= CHROME_REFRESH_POLL_LIMIT_MS;
+      if (!watching && !refreshing) {
         window.clearInterval(timer);
+        if (watchSince !== null) setExpired(true);
         return;
       }
       if (document.visibilityState !== "hidden") void read();
@@ -624,10 +668,18 @@ function useAttachedChrome(workspaceId: string, enrollmentId: string | null): Ch
       cancelled = true;
       window.clearInterval(timer);
     };
-  }, [denied, enrollmentId, linked, watchSince, workspaceId]);
+  }, [denied, enrollmentId, linked, refreshSince, watchSince, workspaceId]);
 
-  const watch = useCallback(() => setWatchSince(Date.now()), []);
-  return { connected, watch };
+  const watch = useCallback(() => {
+    setExpired(false);
+    setWatchSince(Date.now());
+  }, []);
+  return {
+    connected,
+    checked,
+    watch,
+    watching: watchSince !== null && !linked && !expired && !denied,
+  };
 }
 
 /** How long to keep checking for the new consent, or a granted Mac permission. */
@@ -878,6 +930,12 @@ function ScreenControlStep({
 }
 
 function ChromeStep({ chrome, machineName }: { chrome: ChromeState; machineName: string }) {
+  const { client } = useAppContext();
+  // The deployment's own extension when it ships one, else Opengeni Browser.
+  const extension = useClientConfigFlags(client).browserExtension ?? {
+    name: "Opengeni Browser",
+    installUrl: OPENGENI_BROWSER_EXTENSION_URL,
+  };
   return (
     <div data-slot="chrome-extension">
       <RowList label="Chrome" flush>
@@ -887,7 +945,7 @@ function ChromeStep({ chrome, machineName }: { chrome: ChromeState; machineName:
           description={
             chrome.connected
               ? `${chrome.connected.name} on ${machineName}`
-              : `Add Opengeni Browser on ${machineName}`
+              : `Add ${extension.name} on ${machineName}`
           }
           control={
             chrome.connected ? (
@@ -898,7 +956,7 @@ function ChromeStep({ chrome, machineName }: { chrome: ChromeState; machineName:
             ) : (
               <Button asChild size="sm" variant="outline" className="rounded-[10px]">
                 <a
-                  href={OPENGENI_BROWSER_EXTENSION_URL}
+                  href={extension.installUrl}
                   target="_blank"
                   rel="noreferrer"
                   onClick={chrome.watch}