Skip to content

YC (S26) | Open Computer History | Continuously record your company computer work, map your workflows, help you find work worth automating, and power your agents' context

Unify one-click meeting joins across macOS, Windows and Linux (#7646)

Louis Beaumont759bff51cec6
diff --git a/apps/screenpipe-app-tauri/app/notification-panel/page.test.tsx b/apps/screenpipe-app-tauri/app/notification-panel/page.test.tsx
index 57365ad99..bbc49e6d7 100644
--- a/apps/screenpipe-app-tauri/app/notification-panel/page.test.tsx
+++ b/apps/screenpipe-app-tauri/app/notification-panel/page.test.tsx
@@ -15,6 +15,8 @@ const bridge = vi.hoisted(() => ({
receive: (_event: { payload: string }) => {},
copy: vi.fn().mockResolvedValue(undefined),
hide: vi.fn().mockResolvedValue(undefined),
+ show: vi.fn().mockResolvedValue(undefined),
+ execute: vi.fn().mockResolvedValue(undefined),
}));
vi.mock("@tauri-apps/api/event", () => ({
listen: vi.fn((_name, callback) => {
@@ -27,6 +29,7 @@ vi.mock("@/lib/utils/tauri", () => ({
commands: {
copyTextToClipboard: bridge.copy,
hideNotificationPanel: bridge.hide,
+ showNotificationPanel: bridge.show,
},
}));
vi.mock("posthog-js", () => ({ default: { capture: vi.fn() } }));
@@ -42,7 +45,7 @@ vi.mock("@/components/markdown", () => ({
screenpipeViewerPathFromHref: vi.fn(),
}));
vi.mock("@/lib/notifications/actions", () => ({
- executeNotificationAction: vi.fn(),
+ executeNotificationAction: bridge.execute,
}));
const payload = {
@@ -148,3 +151,31 @@ describe("compact notification panel", () => {
expect(bridge.hide).toHaveBeenCalledTimes(1);
});
});
+
+
+describe("meeting join notification delivery", () => {
+ const meeting = {
+ ...payload, type: "meeting", title: "meeting starting in 1 min",
+ actions: [
+ { type: "meeting_join", id: "join", label: "join and take notes", url: "https://meet.google.com/example", primary: true },
+ { type: "api", id: "hd", label: "+ HD", url: "/capture/hd/start", method: "POST", body: { boundTo: "prewarm_pending" } },
+ ],
+ };
+ it("renders the split card and dispatches join + HD from the incoming notification", async () => {
+ render(<NotificationPanelPage />);
+ await deliver(meeting);
+ fireEvent.click(screen.getByRole("button", { name: "Join and take notes with HD screen recording" }));
+ await waitFor(() => expect(bridge.hide).toHaveBeenCalledTimes(1));
+ expect(bridge.execute).toHaveBeenCalledWith(expect.objectContaining({ type: "meeting_join", url: meeting.actions[0].url, screen_detail: { boundTo: "prewarm_pending" } }), expect.anything());
+ expect(screen.queryByRole("button", { name: "Notification options" })).toBeNull();
+ });
+ it("shows capture failure only after closing the join card", async () => {
+ bridge.execute.mockImplementationOnce(async (_action, context) => context.onScreenDetailError());
+ render(<NotificationPanelPage />);
+ await deliver(meeting);
+ fireEvent.click(screen.getByRole("button", { name: "Join and take notes with HD screen recording" }));
+ await waitFor(() => expect(bridge.show).toHaveBeenCalledTimes(1));
+ expect(JSON.parse(bridge.show.mock.calls[0][0])).toMatchObject({ type: "warning", title: "Screen detail could not start" });
+ expect(bridge.hide.mock.invocationCallOrder[0]).toBeLessThan(bridge.show.mock.invocationCallOrder[0]);
+ });
+});
diff --git a/apps/screenpipe-app-tauri/app/notification-panel/page.tsx b/apps/screenpipe-app-tauri/app/notification-panel/page.tsx
index cd1791fa2..d3330a850 100644
--- a/apps/screenpipe-app-tauri/app/notification-panel/page.tsx
+++ b/apps/screenpipe-app-tauri/app/notification-panel/page.tsx
@@ -37,6 +37,8 @@ import { qualifiedValue } from "@/lib/analytics/qualified-value";
import { NotificationActionButton } from "@/components/notification-action-button";
import { isNotificationFeedbackEligible } from "@/lib/ai-feedback";
import { NotificationFeedback } from "@/components/notification-feedback";
+import { MeetingJoinNotification } from "@/components/meeting-join-notification";
+import { showNotificationPanel } from "@/lib/hooks/use-notification-panel";
import { useGT } from "gt-react";
@@ -174,12 +176,22 @@ export default function NotificationPanelPage() {
}
return;
}
+ let screenDetailFailed = false;
await executeNotificationAction(actionObj, {
+ onScreenDetailError: () => { screenDetailFailed = true; },
pipeName: payload?.pipe_name,
sourceId: payload?.id,
sourceUrl: payload?.source_url,
});
await hide("action");
+ if (screenDetailFailed) {
+ await showNotificationPanel({
+ id: "meeting-screen-detail-failed", type: "warning",
+ title: ui("Screen detail could not start"),
+ body: ui("You can still join your meeting normally."),
+ actions: [], autoDismissMs: 12000,
+ });
+ }
return;
}
@@ -272,6 +284,7 @@ export default function NotificationPanelPage() {
payload?.pipe_name,
payload?.source_url,
hide,
+ ui,
],
);
@@ -437,6 +450,13 @@ export default function NotificationPanelPage() {
return null;
}
+ if (payload.actions.some((action) => action.type === "meeting_join" && action.url)) {
+ return <MeetingJoinNotification key={payload.id} {...payload}
+ onAction={handleAction} onDismiss={() => void hide("explicit")}
+ onMouseEnter={() => { hoveredRef.current = true; }}
+ onMouseLeave={() => { hoveredRef.current = false; }} />;
+ }
+
const visibleActions = payload.actions.filter(
(action) => (action.type || action.action) !== "dismiss",
);
diff --git a/apps/screenpipe-app-tauri/components/meeting-join-notification.test.tsx b/apps/screenpipe-app-tauri/components/meeting-join-notification.test.tsx
new file mode 100644
index 000000000..d43ac5434
--- /dev/null
+++ b/apps/screenpipe-app-tauri/components/meeting-join-notification.test.tsx
@@ -0,0 +1,52 @@
+// screenpipe — AI that knows everything you've seen, said, or heard
+// https://screenpipe.com
+
+import { act, fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { MeetingJoinNotification } from "./meeting-join-notification";
+import { meetingJoinChoices, meetingProvider } from "@/lib/notifications/meeting-join";
+import type { NotificationAction } from "@/lib/notifications/actions";
+
+const actions: NotificationAction[] = [
+ { id: "join", type: "meeting_join", label: "join and take notes", url: "https://meet.google.com/example", deeplinkUrl: "screenpipe://meeting/42", primary: true },
+ { id: "hd", type: "api", url: "/capture/hd/start", method: "POST", body: { boundTo: "prewarm_pending" }, label: "+ HD" },
+];
+const props = { title: "meeting starting in 1 min", body: "Weekly team sync", actions, onDismiss: vi.fn() };
+
+describe("shared desktop join card", () => {
+ it("joins normally in one click without starting HD", async () => {
+ const onAction = vi.fn().mockResolvedValue(undefined);
+ render(<MeetingJoinNotification {...props} onAction={onAction} />);
+ await act(async () => fireEvent.click(screen.getByRole("button", { name: "join and take notes" })));
+ expect(onAction).toHaveBeenCalledWith(actions[0]);
+ expect(screen.queryByRole("checkbox")).toBeNull();
+ });
+ it("joins and records HD in one click, preserving the meeting and note URLs", async () => {
+ const onAction = vi.fn().mockResolvedValue(undefined);
+ render(<MeetingJoinNotification {...props} onAction={onAction} />);
+ await act(async () => fireEvent.click(screen.getByRole("button", { name: "Join and take notes with HD screen recording" })));
+ expect(onAction).toHaveBeenCalledWith({ ...actions[0], id: "hd", screen_detail: actions[1].body });
+ });
+ it("prevents a second join while the first request is pending", async () => {
+ let finish!: () => void;
+ const onAction = vi.fn(() => new Promise<void>((resolve) => { finish = resolve; }));
+ render(<MeetingJoinNotification {...props} onAction={onAction} />);
+ fireEvent.click(screen.getByRole("button", { name: "Join and take notes with HD screen recording" }));
+ fireEvent.click(screen.getByRole("button", { name: "join and take notes" }));
+ expect(onAction).toHaveBeenCalledTimes(1);
+ await act(async () => finish());
+ });
+ it("only offers HD when the notification includes an eligible capture action", () => {
+ render(<MeetingJoinNotification {...props} actions={[actions[0]]} onAction={vi.fn()} />);
+ expect(screen.queryByText("join + HD")).toBeNull();
+ expect(meetingJoinChoices([actions[0], { ...actions[1], url: "/unrelated" }])?.hd).toBeNull();
+ });
+ it.each([
+ ["https://meet.google.com/example", "googleMeet"], ["https://us02web.zoom.us/j/1", "zoom"],
+ ["https://teams.microsoft.com/l/meetup-join/1", "teams"], ["https://example.webex.com/meet/test", "webex"],
+ ["https://zoom.us.evil.example/", null], ["https://evil.example/?next=https://meet.google.com", null],
+ ["not-a-url", null],
+ ])("matches provider only from the destination hostname: %s", (url, expected) => {
+ expect(meetingProvider(url)).toBe(expected);
+ });
+});
diff --git a/apps/screenpipe-app-tauri/components/meeting-join-notification.tsx b/apps/screenpipe-app-tauri/components/meeting-join-notification.tsx
new file mode 100644
index 000000000..8b358dd2d
--- /dev/null
+++ b/apps/screenpipe-app-tauri/components/meeting-join-notification.tsx
@@ -0,0 +1,77 @@
+// screenpipe — AI that knows everything you've seen, said, or heard
+// https://screenpipe.com
+
+"use client";
+
+import { useRef, useState } from "react";
+import { Video, X } from "lucide-react";
+import { useGT } from "gt-react";
+import type { NotificationAction } from "@/lib/notifications/actions";
+import { meetingJoinChoices, meetingProvider } from "@/lib/notifications/meeting-join";
+
+interface Props {
+ title: string;
+ body: string;
+ actions: NotificationAction[];
+ onAction: (action: NotificationAction) => Promise<void>;
+ onDismiss: () => void;
+ onMouseEnter?: () => void;
+ onMouseLeave?: () => void;
+}
+
+/** Shared Windows/Linux join card; mirrors the native macOS split control. */
+export function MeetingJoinNotification(props: Props) {
+ const ui = useGT();
+ const busy = useRef(false);
+ const [pending, setPending] = useState(false);
+ const choices = meetingJoinChoices(props.actions);
+ if (!choices) return null;
+ const provider = meetingProvider(choices.join.url!);
+ const join = async (action: NotificationAction) => {
+ if (busy.current) return;
+ busy.current = true;
+ setPending(true);
+ try { await props.onAction(action); }
+ finally { busy.current = false; setPending(false); }
+ };
+ const buttonStyle = {
+ height: 36, padding: "0 12px", border: 0, background: "transparent",
+ color: "#000", font: "inherit", fontSize: 13, fontWeight: 500,
+ cursor: pending ? "wait" : "pointer", display: "flex", alignItems: "center", gap: 7,
+ whiteSpace: "nowrap" as const,
+ };
+ return (
+ <section aria-label={ui("Meeting starting")} aria-busy={pending}
+ onMouseEnter={props.onMouseEnter} onMouseLeave={props.onMouseLeave}
+ style={{ boxSizing: "border-box", width: "100%", height: "100%", minHeight: 124,
+ background: "#000", color: "#f2f2f2", border: "1px solid #6b6b6b", borderRadius: 8,
+ padding: 14, display: "flex", flexDirection: "column", gap: 8,
+ fontFamily: '"IBM Plex Mono", monospace' }}>
+ <style>{`.meeting-join-controls button:focus-visible { outline: 2px solid #4285f4; outline-offset: -3px; border-radius: 5px; }`}</style>
+ <div style={{ display: "flex", alignItems: "flex-start", gap: 10, minWidth: 0 }}>
+ <Video size={20} fill="currentColor" aria-hidden="true" style={{ color: "#bfbfbf", marginTop: 3, flexShrink: 0 }} />
+ <div style={{ flex: 1, minWidth: 0 }}>
+ <div style={{ fontSize: 14, fontWeight: 600, lineHeight: "18px", overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{props.title}</div>
+ <div style={{ color: "#999", fontSize: 12, lineHeight: "14px", marginTop: 4,
+ display: "-webkit-box", WebkitLineClamp: 2, WebkitBoxOrient: "vertical", overflow: "hidden" }}>{props.body}</div>
+ </div>
+ <button type="button" aria-label={ui("Dismiss notification")} onClick={props.onDismiss}
+ style={{ background: "transparent", border: 0, color: "#999", padding: 4, cursor: "pointer" }}><X size={16} /></button>
+ </div>
+ <div className="meeting-join-controls" style={{ alignSelf: "flex-end", marginTop: "auto", display: "flex", alignItems: "center", borderRadius: 6, background: "#ebebeb", maxWidth: "100%" }}>
+ <button type="button" disabled={pending} onClick={() => void join(choices.join)} style={buttonStyle}>
+ {provider ? <img src={`/images/meeting-providers/${provider}.png`} width={18} height={18} alt="" /> : <Video size={18} fill="currentColor" aria-hidden="true" />}
+ {choices.join.label || ui("join and take notes")}
+ </button>
+ {choices.hd && <>
+ <span aria-hidden="true" style={{ width: 1, height: 20, flexShrink: 0, background: "#00000026" }} />
+ <button type="button" disabled={pending} onClick={() => void join(choices.hd!)} style={buttonStyle}
+ aria-label={ui("Join and take notes with HD screen recording")}
+ title={ui("Join and take notes with HD screen recording: more frequent screenshots for smoother replay. Uses more storage.")}>
+ {ui("join + HD")}
+ </button>
+ </>}
+ </div>
+ </section>
+ );
+}
diff --git a/apps/screenpipe-app-tauri/lib/notifications/actions.ts b/apps/screenpipe-app-tauri/lib/notifications/actions.ts
index 7c05ad21f..508dc7e66 100644
--- a/apps/screenpipe-app-tauri/lib/notifications/actions.ts
+++ b/apps/screenpipe-app-tauri/lib/notifications/actions.ts
@@ -56,6 +56,7 @@ export interface NotificationAction {
deeplinkUrl?: string;
method?: string;
body?: Record<string, unknown>;
+ screen_detail?: Record<string, unknown>;
toast?: string;
open_in_chat?: boolean;
}
@@ -223,6 +224,7 @@ export interface ExecuteActionContext {
sourceId?: string;
/** Fallback target for a "source" action that omits its own url. */
sourceUrl?: string;
+ onScreenDetailError?: () => void;
}
/**
@@ -358,6 +360,34 @@ export async function executeNotificationAction(
break;
}
case "meeting_join": {
+ if (action.screen_detail) {
+ const controller = new AbortController();
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ try {
+ await Promise.race([
+ localFetch("/capture/hd/start", {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify(action.screen_detail),
+ signal: controller.signal,
+ redirect: "error",
+ }).then((response) => {
+ if (!response.ok) throw new Error(`HTTP ${response.status}`);
+ }),
+ new Promise<never>((_, reject) => {
+ timer = setTimeout(() => {
+ controller.abort();
+ reject(new Error("HD recording timed out"));
+ }, 3000);
+ }),
+ ]);
+ } catch (error) {
+ console.warn("meeting join HD recording failed", error);
+ ctx.onScreenDetailError?.();
+ } finally {
+ clearTimeout(timer);
+ }
+ }
if (action.url) {
const { open } = await import("@tauri-apps/plugin-shell");
await open(action.url);
diff --git a/apps/screenpipe-app-tauri/lib/notifications/meeting-join-execution.test.ts b/apps/screenpipe-app-tauri/lib/notifications/meeting-join-execution.test.ts
new file mode 100644
index 000000000..c64d33e49
--- /dev/null
+++ b/apps/screenpipe-app-tauri/lib/notifications/meeting-join-execution.test.ts
@@ -0,0 +1,52 @@
+// screenpipe — AI that knows everything you've seen, said, or heard
+// https://screenpipe.com
+
+import { afterEach, describe, expect, it, vi } from "vitest";
+const mocks = vi.hoisted(() => ({ fetch: vi.fn(), open: vi.fn().mockResolvedValue(undefined) }));
+vi.mock("@/lib/api", () => ({ localFetch: mocks.fetch, isLocalApiUrl: () => true }));
+vi.mock("@tauri-apps/plugin-shell", () => ({ open: mocks.open }));
+import { executeNotificationAction } from "./actions";
+
+const action = { type: "meeting_join" as const, url: "https://meet.google.com/example", screen_detail: { boundTo: "prewarm_pending" } };
+afterEach(() => { vi.clearAllMocks(); vi.useRealTimers(); });
+describe("cross-platform combined join", () => {
+ it("starts authenticated local capture before opening the call", async () => {
+ mocks.fetch.mockResolvedValue({ ok: true });
+ await executeNotificationAction(action);
+ expect(mocks.fetch).toHaveBeenCalledWith("/capture/hd/start", expect.objectContaining({ method: "POST", body: JSON.stringify(action.screen_detail), redirect: "error" }));
+ expect(mocks.open).toHaveBeenCalledWith(action.url);
+ expect(mocks.fetch.mock.invocationCallOrder[0]).toBeLessThan(mocks.open.mock.invocationCallOrder[0]);
+ });
+ it.each([503, 302])("still joins and reports failed capture for HTTP %s", async (status) => {
+ mocks.fetch.mockResolvedValue({ ok: false, status });
+ const onScreenDetailError = vi.fn();
+ await executeNotificationAction(action, { onScreenDetailError });
+ expect(mocks.open).toHaveBeenCalledWith(action.url);
+ expect(onScreenDetailError).toHaveBeenCalledTimes(1);
+ });
+ it("still joins when the capture service is unreachable", async () => {
+ mocks.fetch.mockRejectedValue(new Error("offline"));
+ const onScreenDetailError = vi.fn();
+ await executeNotificationAction(action, { onScreenDetailError });
+ expect(mocks.open).toHaveBeenCalledWith(action.url);
+ expect(onScreenDetailError).toHaveBeenCalledTimes(1);
+ });
+ it("bounds a stalled capture request to three seconds", async () => {
+ vi.useFakeTimers();
+ mocks.fetch.mockImplementation(() => new Promise(() => {}));
+ const onScreenDetailError = vi.fn();
+ const result = executeNotificationAction(action, { onScreenDetailError });
+ await vi.advanceTimersByTimeAsync(2999);
+ expect(mocks.open).not.toHaveBeenCalled();
+ await vi.advanceTimersByTimeAsync(1);
+ await result;
+ expect(mocks.open).toHaveBeenCalledWith(action.url);
+ expect(mocks.fetch.mock.calls[0][1].signal.aborted).toBe(true);
+ expect(onScreenDetailError).toHaveBeenCalledTimes(1);
+ });
+ it("normal joining does not request capture", async () => {
+ await executeNotificationAction({ type: "meeting_join", url: action.url });
+ expect(mocks.fetch).not.toHaveBeenCalled();
+ expect(mocks.open).toHaveBeenCalledWith(action.url);
+ });
+});
diff --git a/apps/screenpipe-app-tauri/lib/notifications/meeting-join.ts b/apps/screenpipe-app-tauri/lib/notifications/meeting-join.ts
new file mode 100644
index 000000000..2290154e0
--- /dev/null
+++ b/apps/screenpipe-app-tauri/lib/notifications/meeting-join.ts
@@ -0,0 +1,30 @@
+// screenpipe — AI that knows everything you've seen, said, or heard
+// https://screenpipe.com
+
+import type { NotificationAction } from "./actions";
+
+export function meetingProvider(url: string): string | null {
+ try {
+ const destination = new URL(url);
+ if (!["https:", "http:", "zoommtg:", "zoomus:", "msteams:"].includes(destination.protocol)) return null;
+ const host = destination.hostname.toLowerCase().replace(/^\.+|\.+$/g, "");
+ const matches = (domain: string) => host === domain || host.endsWith(`.${domain}`);
+ if (host === "meet.google.com") return "googleMeet";
+ if (["zoom.us", "zoom.com", "zoomgov.com"].some(matches)) return "zoom";
+ if (["teams.microsoft.com", "teams.live.com", "teams.cloud.microsoft"].includes(host)) return "teams";
+ if (matches("webex.com")) return "webex";
+ } catch { /* Unknown destinations retain a generic video icon. */ }
+ return null;
+}
+
+export function meetingJoinChoices(actions: NotificationAction[]) {
+ const join = actions.find((action) => action.type === "meeting_join" && action.url);
+ if (!join) return null;
+ const capture = actions.find((action) => action.type === "api" &&
+ action.url === "/capture/hd/start" && action.method === "POST" &&
+ action.body && typeof action.body === "object" && !Array.isArray(action.body));
+ return {
+ join,
+ hd: capture ? { ...join, id: capture.id || "join-hd", screen_detail: capture.body } : null,
+ };
+}
diff --git a/apps/screenpipe-app-tauri/public/images/meeting-providers/googleMeet.png b/apps/screenpipe-app-tauri/public/images/meeting-providers/googleMeet.png
new file mode 100644
index 000000000..bc706e940
Binary files /dev/null and b/apps/screenpipe-app-tauri/public/images/meeting-providers/googleMeet.png differ
diff --git a/apps/screenpipe-app-tauri/public/images/meeting-providers/teams.png b/apps/screenpipe-app-tauri/public/images/meeting-providers/teams.png
new file mode 100644
index 000000000..b0ab97dc3
Binary files /dev/null and b/apps/screenpipe-app-tauri/public/images/meeting-providers/teams.png differ
diff --git a/apps/screenpipe-app-tauri/public/images/meeting-providers/webex.png b/apps/screenpipe-app-tauri/public/images/meeting-providers/webex.png
new file mode 100644
index 000000000..11c27d215
Binary files /dev/null and b/apps/screenpipe-app-tauri/public/images/meeting-providers/webex.png differ
diff --git a/apps/screenpipe-app-tauri/public/images/meeting-providers/zoom.png b/apps/screenpipe-app-tauri/public/images/meeting-providers/zoom.png
new file mode 100644
index 000000000..102f9c3db
Binary files /dev/null and b/apps/screenpipe-app-tauri/public/images/meeting-providers/zoom.png differ
diff --git a/apps/screenpipe-app-tauri/src-tauri/src/commands.rs b/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
index 7d297481a..3a03203ec 100644
--- a/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
+++ b/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
@@ -4058,6 +4058,41 @@ pub(crate) fn notification_belongs_to_overlay(notification_type: Option<&str>) -
matches!(notification_type, Some("meeting"))
}
+/// Join cards share a compact landscape surface on every platform.
+fn notification_is_meeting_join(payload: &str) -> bool {
+ serde_json::from_str::<serde_json::Value>(payload)
+ .ok()
+ .and_then(|value| value.get("actions").and_then(|v| v.as_array()).cloned())
+ .is_some_and(|actions| {
+ actions.iter().any(|action| {
+ action.get("type").and_then(|v| v.as_str()) == Some("meeting_join")
+ && action
+ .get("url")
+ .and_then(|v| v.as_str())
+ .is_some_and(|url| !url.is_empty())
+ })
+ })
+}
+
+#[cfg(test)]
+mod meeting_join_notification_tests {
+ use super::notification_is_meeting_join;
+
+ #[test]
+ fn meeting_join_uses_typed_action_instead_of_localized_copy() {
+ assert!(notification_is_meeting_join(
+ r#"{"actions":[{"type":"meeting_join","label":"Rejoindre","url":"https://meet.google.com/example"}]}"#
+ ));
+ assert!(!notification_is_meeting_join(
+ r#"{"actions":[{"type":"api","label":"join and take notes"}]}"#
+ ));
+ assert!(!notification_is_meeting_join("invalid"));
+ assert!(!notification_is_meeting_join(
+ r#"{"actions":[{"type":"meeting_join","url":""}]}"#
+ ));
+ }
+}
+
/// What actually happened to an alert we tried to surface.
///
/// `show_notification_panel` returned `Ok(())` whether it drew the panel or
@@ -4159,10 +4194,14 @@ pub(crate) async fn deliver_notification_panel(
// The pill speaks up for its own alerts wherever it is native. Windows has
// no native standalone panel, so only the overlay branch applies and
// anything the pill refuses falls through to the webview panel below.
+ let meeting_join = notification_is_meeting_join(&payload);
#[cfg(target_os = "windows")]
{
native_actions::install_shortcut_action_callback(&app_handle);
- if notification_belongs_to_overlay(notification_type.as_deref())
+ // Use the shared web card for joins; the Win32 pill only supports a
+ // compact row and cannot render the provider/split-control layout.
+ if !meeting_join
+ && notification_belongs_to_overlay(notification_type.as_deref())
&& native_shortcut_reminder::show_notification(&payload)
{
info!("meeting notification rendered from the shortcut overlay");
@@ -4189,7 +4228,7 @@ pub(crate) async fn deliver_notification_panel(
return Ok(NotificationDelivery::ShownOnOverlay);
}
- if native_notification::is_available() {
+ if !meeting_join && native_notification::is_available() {
info!("Using native SwiftUI notification panel");
if native_notification::show(&payload) {
// Emit event so the main window can save notification history + PostHog analytics
@@ -4201,8 +4240,11 @@ pub(crate) async fn deliver_notification_panel(
}
}
- let window_width = 340.0;
- let window_height = 380.0;
+ let (window_width, window_height) = if meeting_join {
+ (460.0, 124.0)
+ } else {
+ (340.0, 380.0)
+ };
// Position at top-right of the screen where the cursor is
let (x, y) = {
@@ -4255,6 +4297,9 @@ pub(crate) async fn deliver_notification_panel(
// If window exists, reposition to current screen and show
if let Some(window) = app_handle.get_webview_window(label) {
info!("notification-panel window exists, repositioning and showing");
+ window
+ .set_size(tauri::LogicalSize::new(window_width, window_height))
+ .map_err(|e| e.to_string())?;
let _ = window.set_position(tauri::Position::Logical(tauri::LogicalPosition::new(x, y)));
let _ = app_handle.emit_to(label, "notification-panel-update", &payload);
diff --git a/apps/screenpipe-app-tauri/src-tauri/src/commands/native_actions.rs b/apps/screenpipe-app-tauri/src-tauri/src/commands/native_actions.rs
index f9694a84f..4b1c14912 100644
--- a/apps/screenpipe-app-tauri/src-tauri/src/commands/native_actions.rs
+++ b/apps/screenpipe-app-tauri/src-tauri/src/commands/native_actions.rs
@@ -657,6 +657,28 @@ fn native_notif_action_callback_inner(json_ptr: *const std::os::raw::c_char) {
dispatch_notification_action(json);
}
+/// The optional join setting uses the same authenticated local endpoint as
+/// the HD action. Bound the wait so recording trouble cannot strand joining.
+fn start_meeting_join_screen_detail(
+ api: &crate::recording::LocalApiContext,
+ body: &serde_json::Value,
+) -> Result<(), String> {
+ let client = reqwest::blocking::Client::builder()
+ .timeout(std::time::Duration::from_secs(3))
+ .redirect(reqwest::redirect::Policy::none())
+ .build()
+ .map_err(|e| e.to_string())?;
+ let response = api
+ .apply_auth_blocking(client.post(api.url("/capture/hd/start")).json(body))
+ .send()
+ .map_err(|e| e.to_string())?;
+ if response.status().is_success() {
+ Ok(())
+ } else {
+ Err(format!("HTTP {}", response.status()))
+ }
+}
+
/// Run one notification action. Shared by the standalone notification panel and
/// by notifications the shortcut overlay renders itself, so a meeting alert
/// behaves identically whichever surface showed it.
@@ -899,9 +921,18 @@ pub(crate) fn dispatch_notification_action(json: String) {
return;
};
+ let screen_detail = parsed
+ .as_ref()
+ .and_then(|v| v.get("screen_detail"))
+ .filter(|v| v.is_object())
+ .cloned();
let app_clone = app.clone();
std::thread::spawn(move || {
use tauri_plugin_opener::OpenerExt;
+ let capture_error = screen_detail.and_then(|body| {
+ let api = crate::recording::local_api_context_from_app(&app_clone);
+ start_meeting_join_screen_detail(&api, &body).err()
+ });
if let Err(e) = app_clone.opener().open_url(&meeting_url, None::<&str>) {
error!(
"failed to open meeting url '{}' from notification: {}",
@@ -909,6 +940,20 @@ pub(crate) fn dispatch_notification_action(json: String) {
);
}
+ if let Some(error) = capture_error {
+ warn!("meeting join screen detail failed: {}", error);
+ let _ = app_clone.run_on_main_thread(|| {
+ native_notification::show(&serde_json::json!({
+ "id": "meeting-screen-detail-failed",
+ "type": "warning",
+ "title": crate::localization::ui_text("Screen detail could not start"),
+ "body": crate::localization::ui_text("You can still join your meeting normally."),
+ "actions": [],
+ "autoDismissMs": 12000,
+ }).to_string());
+ });
+ }
+
let Some(deeplink_url) = deeplink_url else {
return;
};
@@ -1591,10 +1636,71 @@ mod tests {
artifact_request_from_notification_url, chat_prefill_payload_from_action,
native_overlay_meeting_note_id, notification_copy_value, notification_deeplink_target,
notification_source_url, parse_meeting_deeplink, parse_overlay_anchor,
- resolve_timeline_event_target, viewer_path_from_notification_url, SHORTCUT_OVERLAY_ANCHORS,
+ resolve_timeline_event_target, start_meeting_join_screen_detail,
+ viewer_path_from_notification_url, SHORTCUT_OVERLAY_ANCHORS,
};
use serde_json::json;
+ #[test]
+ fn meeting_join_screen_detail_posts_authenticated_scope_and_reports_failures() {
+ use std::io::{Read, Write};
+ use std::net::TcpListener;
+ for (status, succeeds) in [
+ ("200 OK", true),
+ ("503 Service Unavailable", false),
+ ("302 Found", false),
+ ] {
+ let listener = TcpListener::bind("127.0.0.1:0").unwrap();
+ let port = listener.local_addr().unwrap().port();
+ let server = std::thread::spawn(move || {
+ let (mut stream, _) = listener.accept().unwrap();
+ stream
+ .set_read_timeout(Some(std::time::Duration::from_secs(5)))
+ .unwrap();
+ let mut request = Vec::new();
+ let mut buffer = [0; 1024];
+ loop {
+ let count = stream.read(&mut buffer).unwrap();
+ assert!(count > 0);
+ request.extend_from_slice(&buffer[..count]);
+ if let Some(header_end) = request.windows(4).position(|w| w == b"\r\n\r\n") {
+ let headers =
+ String::from_utf8_lossy(&request[..header_end]).to_lowercase();
+ let length: usize = headers
+ .lines()
+ .find_map(|line| line.strip_prefix("content-length: "))
+ .unwrap()
+ .parse()
+ .unwrap();
+ if request.len() >= header_end + 4 + length {
+ assert!(headers.starts_with("post /capture/hd/start http/1.1"));
+ assert!(headers.contains("authorization: bearer test-key"));
+ let body: serde_json::Value =
+ serde_json::from_slice(&request[header_end + 4..]).unwrap();
+ assert_eq!(body, json!({"boundTo": "prewarm_pending"}));
+ break;
+ }
+ }
+ }
+ write!(
+ stream,
+ "HTTP/1.1 {status}\r\nContent-Length: 2\r\nConnection: close\r\n\r\n{{}}"
+ )
+ .unwrap();
+ });
+ let api = crate::recording::LocalApiContext {
+ api_key: Some("test-key".into()),
+ port,
+ };
+ assert_eq!(
+ start_meeting_join_screen_detail(&api, &json!({"boundTo": "prewarm_pending"}))
+ .is_ok(),
+ succeeds
+ );
+ server.join().unwrap();
+ }
+ }
+
#[test]
fn viewer_path_parses_view_deeplinks() {
assert_eq!(
diff --git a/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder.swift b/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder.swift
index 5214bc4aa..d1a6073aa 100644
--- a/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder.swift
+++ b/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder.swift
@@ -161,6 +161,44 @@ final class OverlayMetrics: ObservableObject {
@Published var hoveredControl: String? = nil
}
+/// Identify the service from the join destination, never from translated copy.
+enum MeetingJoinProvider: String, CaseIterable {
+ case googleMeet, zoom, teams, webex, other
+
+ static func from(url: String) -> MeetingJoinProvider {
+ guard let destination = URL(string: url),
+ let scheme = destination.scheme?.lowercased(),
+ ["https", "http", "zoommtg", "zoomus", "msteams"].contains(scheme),
+ let rawHost = destination.host else { return .other }
+ let host = rawHost.lowercased().trimmingCharacters(in: CharacterSet(charactersIn: "."))
+ func matches(_ domain: String) -> Bool {
+ host == domain || host.hasSuffix("." + domain)
+ }
+ if host == "meet.google.com" { return .googleMeet }
+ if matches("zoom.us") || matches("zoom.com") || matches("zoomgov.com") { return .zoom }
+ if ["teams.microsoft.com", "teams.live.com", "teams.cloud.microsoft"].contains(host) { return .teams }
+ if matches("webex.com") { return .webex }
+ return .other
+ }
+
+ var image: NSImage? { Self.images[self] }
+
+ // Embedded 48px PNGs keep the static Swift library independent of resource
+ // paths and network access. Source and license: docs/meeting-provider-icons.md.
+ private static let images: [MeetingJoinProvider: NSImage] = {
+ let encoded: [MeetingJoinProvider: String] = [
+ .googleMeet: "iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAMKADAAQAAAABAAAAMAAAAAD4/042AAAFRklEQVRoBe1ZXWgcVRQ+92dmZ7O7cTfZpFETk4p5CoJgFPTFVRD786CYlgaLRaIPxYBUtAq+KOKDYB/yYEBain1QgqYBg9WKio+CxiBUbKGhplVry5q22SSb7M/MvZ47m51stjubyWbd7MMemOzM3HvP/b5vzjl37gSgYQ0FGgo0FNhOBchmJp/tecGIDn3/QfCJ64+Y6c2MdO9LsUlIkJTKCyJLTmlPmT+49769xTOB2VjMCGTSo+FH54a0gUsAGTV1FY0BWFlYAVPu509aX3n1zL10lAj+Blse1XU2tGIKoFkAiUdVDf1xH/hNiwyjX88ENpRRKW+Dp2QoJQTIqqIucmbZ1z04h+fIKPsElPL/KuURfNoGvyHfIkQVXJLS4B/4+Jkw97O3KKd90qTvTA1+NqW8uxLIgV8aNShbBV8BmCoNeejTgXslg5PUx2KUUbAsu4Q860ogr3w9gO8f2xcDBsdR+V6RxhjTsGQJuSOvzW0xsQY+Hzb5rrX7xQSwU61/bGAIwU8CJb0ik0uQHAop8mjWhZCM9WDCLo36MWz+94TNIyj65VKI3V/v9sUTgbcJgzexmUqsfG7mEJCxtuBNEhkxCCpvmXYmFZcCaZcHARiGuPK4uXS/b7njWB0kISF0Pb4Y+ITqZJ80cUI1aRlzCLz88ORLd2bnXzRxNXEbQogOkTuufHvEPHxKACnm5zqNhU+fExlCMUdwlFEKE6cCLiSaxNE/e7tlB71PZgtDxtX1WhU6H3mw/TzXwTKzpesY+mA+DTIpuPpq7PAYrpvuXku0yEkIiQA9plgXCqSuGYL/7kYEXr/YQ6/JAO1u8+7beQJMmIIKBkxkSkyfu8Usjjm1UkHwACxpYBhFnimRtlgnr3bAu390QtKi4Dc2jLN1XhwC6+7W4AJDCpKCwvuznfARElBPgpPNgVcwt4UApxKup3V4Y6YbzsxFQMdrO7QKY8ujiDUnQJmAc4kAHLm4E35dDIKB8b8VqxmBoI1SsG/imKwzO+GfNCbFFsErlzUjAEsAJ1IdC+9d7vIvY7L6MGyqYTUjsAv2W5cWElZKLKg1oRrYbR8VlcRKZo9juY+0N4eid4UloQQX2OqQqBkBRRrfIkkgHCStna3ANV4VEjUlYJNA4f0BA9q6oqAb+pZJ1JxAjoQEzdCg7Z4o+EP+LZHYFgJ5ErhJgda7WyDYEqyYhEMA3xIJmvpT/gCtopVn2RdKKeDrDMNJzRfZEYZwexhXY7Ueb86cMrqQXFwBkpISvy65uSA0LYlxpb1/fNegNJsc8m79C++TzHwIAXLcEBbeds6boyHgnJqL80mCVYphwjtt5U4cAn/H4z7gOoEyb6PC5CTY9dueFqrvJWpXsxlDPDZ4F1yqrDa1BJjW5LsmLJlkPla0jSw92RoKFUD4OMuZ3S6xk/oWWMFRzneujRBN47e4gL0iI36kOn6u28DWCGzQsVbNKA376eDEjBTpp2XGGicakiija90RWBWKTD/35Vy0efl5MMUxzAl79S4Q0aFUrwRsrGf3nE1PHTh9VFryFcyRNMGyi2VLHc6es64J5BX/ZXDiQ8z9QRDiL6wE6rPymXzbGgGC+7v6sJJ1avrAxBckRR8Tpvm4TLSO5KE6ZRRH3ST4JWk7jTB8SxVkBjGUJPHzofFZbFOHYw4BDmLSslLDRGvqAeH28V8HwjguRyoWq/vA7FdsU5i4zznhoPNw4mSz6tsx/Hsf7vJek8K6317ji4SQpgaBzmlo6fsc/y+ke3DvsYuNgtwSWXl8+uDpcY+jGt0aCjQUaChQBwr8Bxc8+b54UAZXAAAAAElFTkSuQmCC",
+ .zoom: "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",
+ .teams: "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",
+ .webex: "iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAMKADAAQAAAABAAAAMAAAAAD4/042AAAFGUlEQVRoBe2YW6hVVRSGd1eyi0SpPaihQUTQhSi1C5G9JEZWdKEH6QJlvpSFD92sKCoqyqBDDxVBJUQPvUiUGFYPmnRDM6Qo0aKEivKWGpZp9X37zHUaLuZea52zzouwB/x7jjnmGP8Ye8615px7dzp96c9Afwb6M3AwzcA0ih0AX4LdYB/YAlaCRWAiqJNJOOhrzFawH8glp9zmGHWZCuNy8G8N/mL8WTAGlEXbYqBPHY+5zDkqMhuWXaAuaRxfi/+4kF1dW/Sp0815eeAYkTqHqL9BXbLc+FfEnZiyrhkhh7mtYURyGFGfgVxxTW3LiD8EPNCC5w9izwS1MgGP+eB+MBeMBUeCN0DTgnN+txF/BPi6BY8vuBxTwDxQrCzqoFxD404QC/iV/kxwOFgN4thw9N+IPQ7c2ILDfAuBT8UGsBNcC7pyNp97Qa6o37FPBhf2GM/F5GwmdzV/asGzjVgn4pbEYc3ngc5byZBLrO15nZAfQC+fOruxruTTLTjM4UT4KG1PPEtpu4dJVQHf6IS8CaLfO/QXgO9K9ugT9Vn4OWPRton+neDdkj36RN1NRbFw7X6Rzp7UiY5Rdytz+R8OfiZ0d1FOB00Op1e73v+vpDGnJZtc7lgxb07fkfxfSL7W3mgGz8DvuhRk4pNBlFfo5BJGm7PlY/Ry8rWNImfdRGxOAa/Tyr3xUD42JGNV4xdYnxyW0P5Ych4o9XPd4zHOACvS4GupLRo5y7ZirGg/SMq01HZrX0wnzlROfwIfv+xucBbIyTqMudhoexSf8eAXUDyCqENyEtrPIMYUurlPBU5CYfPeNbQtFcZc6/OpPDPYZD/jO5Lj0PZRirw3yzBodLXdOCKHM30RcAeKt4Ob6Xc8B6JzTvdQU9yHe8n5DORio+1PfI4CR/ciSXYPrEvBTeAC4OofC94Gkc/au9+q7uUxyN2mSnxBXeaYIKdfXEWSxk6gdYfyvTHv3cB3JPI5Ga5IVz7mMw7m9DuSb1XzXgOe+6oI0phnQ66GaPtUX5dGWT3YVH7OrhwdHFzVwKfJCsxqwHNAzVcREL9dTt+DzzE1xDMb8OzEx2e8l5jDXLkaou3KSDCWzt4GQUM3wBgc9DENeaaHmLJ6PYZYaE73dtDdUIpHyFk5YEnKrKl/aw+75nOAM7fGTo1cVjE+t2KsGHI73lV0inYhSu7bRtt+fMrXiCL+QxQn5HEQY3L62iKo1E6g3+RJuKsU1+1O5vMfkEsYbY9lgj189DkXXJL0GJPTjSnLIxhyvtFmjRPLgUXfXSQ653R/5DhTUV6io+9DwL1Zn1xstL2ITxQ5fZSjT05fGYPK+rwGBJIuBcVdxgOnOAg/QVeWgFzyaDPGWMVdySt6HO+lzzegl3jEbwe9gqPdQ8tncVPwd3mngCuCLcaUdWMXgPcb+vviVl1nGO50ngPlRMPpLyLea8Xmljy5nMXPW6h7i/9des/IETSxfU+sj8Q9LThyeazJ2hrJU3jlSJrabiDei9iWljwx35NwNRaP840gEgxHX0+sq3B7C46Yz1rqrjG4HCj+bGvzKPlyerCtALGY4erWYC0jkquJanIy5or6PGUcR/styPnU2cztRbOVzCG6ycEUi/GqMD5k9eRcB6JPnb4Df7fjUZFTYFkO6pJ6OLkN534yanOsyYouw28qGHWZAeMA+AJ4qOwDW8Eq8CCYBOrEO5dXDm+U24CHnz9F5XSfnw760p+B/gz0Z+AgmYH/APin+6zmnH9lAAAAAElFTkSuQmCC",
+ ]
+ return encoded.compactMapValues { value in
+ guard let data = Data(base64Encoded: value) else { return nil }
+ return NSImage(data: data)
+ }
+ }()
+}
+
/// One clickable button on a notification shown from the pill.
struct OverlayNotificationAction: Identifiable, Equatable {
/// Opaque payload handed back to Rust verbatim so the pill reuses the same
@@ -169,6 +207,8 @@ struct OverlayNotificationAction: Identifiable, Equatable {
let label: String
let primary: Bool
let payload: String
+ let meetingProvider: MeetingJoinProvider?
+ let screenDetailBody: String?
}
/// A notification rendered as an extension of the pill rather than as a
@@ -179,6 +219,53 @@ struct OverlayNotification: Equatable {
let body: String
let actions: [OverlayNotificationAction]
let autoDismissMs: Int?
+ let isMeetingJoin: Bool
+
+ func size(scale: CGFloat) -> NSSize {
+ NSSize(
+ width: (isMeetingJoin ? 460 : kBaseNotificationW) * scale,
+ height: (isMeetingJoin ? 124 : kBaseNotificationH) * scale
+ )
+ }
+
+ var screenDetailAction: OverlayNotificationAction? {
+ actions.first { $0.screenDetailBody != nil }
+ }
+
+ /// Both visible meeting buttons join in one click. The screen-detail variant
+ /// replaces the standalone capture action while preserving its eligibility.
+ var displayActions: [OverlayNotificationAction] {
+ guard isMeetingJoin, let detailAction = screenDetailAction,
+ let join = actions.first(where: { $0.meetingProvider != nil })
+ else { return actions }
+ let combined = joining(join, captureScreenDetail: true)
+ return actions.map { action in
+ guard action.id == detailAction.id else { return action }
+ return OverlayNotificationAction(
+ id: action.id, label: uiText("join + HD"), primary: false,
+ payload: combined.payload, meetingProvider: combined.meetingProvider,
+ screenDetailBody: nil
+ )
+ }
+ }
+
+ /// Compose capture and joining into one dispatch, with capture starting first.
+ func joining(_ action: OverlayNotificationAction, captureScreenDetail: Bool) -> OverlayNotificationAction {
+ guard captureScreenDetail, action.meetingProvider != nil,
+ let body = screenDetailAction?.screenDetailBody,
+ let bodyData = body.data(using: .utf8),
+ let detail = try? JSONSerialization.jsonObject(with: bodyData),
+ let data = action.payload.data(using: .utf8),
+ var payload = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any]
+ else { return action }
+ payload["screen_detail"] = detail
+ guard let updated = try? JSONSerialization.data(withJSONObject: payload),
+ let json = String(data: updated, encoding: .utf8) else { return action }
+ return OverlayNotificationAction(
+ id: action.id, label: action.label, primary: action.primary,
+ payload: json, meetingProvider: action.meetingProvider, screenDetailBody: nil
+ )
+ }
static func parse(_ json: String) -> OverlayNotification? {
guard let data = json.data(using: .utf8),
@@ -196,11 +283,25 @@ struct OverlayNotification: Equatable {
guard let payloadData = try? JSONSerialization.data(withJSONObject: action),
let payload = String(data: payloadData, encoding: .utf8)
else { return nil }
+ let screenDetailBody: String?
+ if action["type"] as? String == "api",
+ action["url"] as? String == "/capture/hd/start",
+ action["method"] as? String == "POST",
+ let body = action["body"] as? [String: Any],
+ let encoded = try? JSONSerialization.data(withJSONObject: body) {
+ screenDetailBody = String(data: encoded, encoding: .utf8)
+ } else {
+ screenDetailBody = nil
+ }
return OverlayNotificationAction(
id: actionId,
label: label,
primary: (action["primary"] as? Bool) ?? false,
- payload: payload
+ payload: payload,
+ meetingProvider: action["type"] as? String == "meeting_join"
+ ? MeetingJoinProvider.from(url: action["url"] as? String ?? "")
+ : nil,
+ screenDetailBody: screenDetailBody
)
}
@@ -217,7 +318,8 @@ struct OverlayNotification: Equatable {
title: title,
body: (root["body"] as? String) ?? "",
actions: actions,
- autoDismissMs: autoDismiss
+ autoDismissMs: autoDismiss,
+ isMeetingJoin: rawActions.contains { $0["type"] as? String == "meeting_join" }
)
}
}
@@ -1578,10 +1680,115 @@ private struct OverlayNotificationView: View {
/// Ordered so the primary action lands closest to the right edge, where the
/// pointer already is after reading the title.
private var orderedActions: [OverlayNotificationAction] {
- notification.actions.sorted { !$0.primary && $1.primary }
+ notification.displayActions.sorted { !$0.primary && $1.primary }
}
var body: some View {
+ Group {
+ if notification.isMeetingJoin {
+ meetingJoinContent
+ } else {
+ compactContent
+ }
+ }
+ .frame(width: notification.size(scale: scale).width, height: notification.size(scale: scale).height)
+ .background(Color.black)
+ .clipShape(RoundedRectangle(cornerRadius: s(8)))
+ .overlay(RoundedRectangle(cornerRadius: s(8)).stroke(Color.white.opacity(0.42), lineWidth: 1))
+ }
+
+ private var meetingJoinContent: some View {
+ VStack(alignment: .leading, spacing: s(8)) {
+ HStack(alignment: .top, spacing: s(10)) {
+ Image(systemName: "video.fill")
+ .font(.system(size: 16 * scale, weight: .medium))
+ .foregroundColor(.white.opacity(0.75))
+ .frame(height: s(24))
+ VStack(alignment: .leading, spacing: s(4)) {
+ Text(notification.title)
+ .font(Brand.swiftUIMonoFont(size: 14 * scale, weight: .semibold))
+ .foregroundColor(.white.opacity(0.95))
+ .lineLimit(1)
+ if !notification.body.isEmpty {
+ Text(notification.body)
+ .font(Brand.swiftUIMonoFont(size: 12 * scale))
+ .foregroundColor(.white.opacity(0.60))
+ .lineLimit(2)
+ .fixedSize(horizontal: false, vertical: true)
+ }
+ }
+ .frame(maxWidth: .infinity, alignment: .leading)
+ dismissButton
+ }
+ HStack(spacing: s(8)) {
+ Spacer(minLength: 0)
+ meetingJoinActions
+ }
+ }
+ .padding(s(14))
+ }
+
+ /// Two immediate actions share one light surface. HD remains one click,
+ /// and its label explicitly includes joining rather than a recording toggle.
+ @ViewBuilder
+ private var meetingJoinActions: some View {
+ if let join = notification.actions.first(where: { $0.meetingProvider != nil }),
+ let detailID = notification.screenDetailAction?.id,
+ let detail = notification.displayActions.first(where: { $0.id == detailID }) {
+ ForEach(orderedActions.filter { $0.id != join.id && $0.id != detailID }) { action in
+ Button(action.label) { onAction(action) }
+ .buttonStyle(.plain)
+ .foregroundColor(.white.opacity(0.88))
+ }
+ HStack(spacing: 0) {
+ Button(action: { onAction(join) }) {
+ HStack(spacing: s(7)) {
+ if let provider = join.meetingProvider {
+ if let image = provider.image {
+ Image(nsImage: image)
+ .resizable()
+ .interpolation(.high)
+ .scaledToFit()
+ .frame(width: s(18), height: s(18))
+ .accessibilityHidden(true)
+ } else {
+ Image(systemName: "video.fill")
+ .font(.system(size: 16 * scale))
+ .frame(width: s(18), height: s(18))
+ .accessibilityHidden(true)
+ }
+ }
+ Text(join.label)
+ }
+ .padding(.horizontal, s(12))
+ .frame(height: s(36))
+ .contentShape(Rectangle())
+ }
+ Rectangle()
+ .fill(Color.black.opacity(0.15))
+ .frame(width: 1, height: s(20))
+ .accessibilityHidden(true)
+ Button(action: { onAction(detail) }) {
+ Text(detail.label)
+ .padding(.horizontal, s(12))
+ .frame(height: s(36))
+ .contentShape(Rectangle())
+ }
+ .help(uiText("Join and take notes with HD screen recording: more frequent screenshots for smoother replay. Uses more storage."))
+ .accessibilityLabel(uiText("Join and take notes with HD screen recording"))
+ }
+ .font(Brand.swiftUIMonoFont(size: 13 * scale, weight: .medium))
+ .foregroundColor(.black)
+ .buttonStyle(.plain)
+ .background(Color.white.opacity(0.92))
+ .clipShape(RoundedRectangle(cornerRadius: s(6)))
+ .fixedSize()
+ } else {
+ actionButtons
+ }
+ }
+
+ private var compactContent: some View {
HStack(spacing: s(8)) {
Image(systemName: "video.fill")
.font(.system(size: 10 * scale, weight: .medium))
@@ -1601,44 +1808,66 @@ private struct OverlayNotificationView: View {
}
.frame(maxWidth: .infinity, alignment: .leading)
- ForEach(orderedActions) { action in
- Button(action: { onAction(action) }) {
+ actionButtons
+ dismissButton
+ }
+ .padding(.horizontal, s(10))
+ }
+
+ private var actionButtons: some View {
+ ForEach(orderedActions) { action in
+ Button(action: { onAction(action) }) {
+ HStack(spacing: s(7)) {
+ if let provider = action.meetingProvider {
+ if let image = provider.image {
+ Image(nsImage: image)
+ .resizable()
+ .interpolation(.high)
+ .scaledToFit()
+ .frame(width: s(18), height: s(18))
+ .background(action.primary ? Color.clear : Color.white)
+ .clipShape(RoundedRectangle(cornerRadius: s(3)))
+ .accessibilityHidden(true)
+ } else {
+ Image(systemName: "video.fill")
+ .font(.system(size: 16 * scale))
+ .frame(width: s(18), height: s(18))
+ .accessibilityHidden(true)
+ }
+ }
Text(action.label)
- .font(Brand.swiftUIMonoFont(size: 9 * scale, weight: .medium))
- .foregroundColor(action.primary ? .black : .white.opacity(0.88))
+ .font(Brand.swiftUIMonoFont(size: (notification.isMeetingJoin ? 12 : 9) * scale, weight: .medium))
.lineLimit(1)
- .padding(.horizontal, s(8))
- .frame(height: s(22))
- .background(
- action.primary
- ? Color.white.opacity(0.92)
- : Color.white.opacity(0.10)
- )
- .clipShape(RoundedRectangle(cornerRadius: s(6)))
- .contentShape(RoundedRectangle(cornerRadius: s(6)))
}
- .buttonStyle(.plain)
- .fixedSize()
- }
-
- Button(action: onDismiss) {
- Image(systemName: "xmark")
- .font(.system(size: 8 * scale, weight: .semibold))
- .foregroundColor(.white.opacity(0.55))
- .frame(width: s(14), height: s(22))
- .contentShape(Rectangle())
+ .foregroundColor(action.primary ? .black : .white.opacity(0.88))
+ .padding(.horizontal, s(notification.isMeetingJoin ? 10 : 8))
+ .frame(height: s(notification.isMeetingJoin ? 34 : 22))
+ .background(
+ action.primary
+ ? Color.white.opacity(0.92)
+ : Color.white.opacity(0.10)
+ )
+ .clipShape(RoundedRectangle(cornerRadius: s(6)))
+ .contentShape(RoundedRectangle(cornerRadius: s(6)))
}
.buttonStyle(.plain)
- .accessibilityLabel(uiText("dismiss notification"))
+ .help(notification.isMeetingJoin && action.id == notification.screenDetailAction?.id
+ ? uiText("Join and take notes with more frequent screen capture for smoother replay. Uses more storage.")
+ : action.label)
+ .fixedSize()
}
- .padding(.horizontal, s(10))
- .frame(
- width: kBaseNotificationW * scale,
- height: kBaseNotificationH * scale
- )
- .background(Color.black)
- .clipShape(RoundedRectangle(cornerRadius: s(8)))
- .overlay(RoundedRectangle(cornerRadius: s(8)).stroke(Color.white.opacity(0.42), lineWidth: 1))
+ }
+
+ private var dismissButton: some View {
+ Button(action: onDismiss) {
+ Image(systemName: "xmark")
+ .font(.system(size: (notification.isMeetingJoin ? 11 : 8) * scale, weight: .semibold))
+ .foregroundColor(.white.opacity(0.55))
+ .frame(width: s(notification.isMeetingJoin ? 24 : 14), height: s(notification.isMeetingJoin ? 24 : 22))
+ .contentShape(Rectangle())
+ }
+ .buttonStyle(.plain)
+ .accessibilityLabel(uiText("dismiss notification"))
}
}
@@ -3211,8 +3440,10 @@ class ShortcutReminderController: NSObject, NSWindowDelegate {
private func ensureNotificationPanel() {
guard notificationPanel == nil else { return }
- let w = kBaseNotificationW * gOverlayScale
- let h = kBaseNotificationH * gOverlayScale
+ guard let notification = activeNotification else { return }
+ let size = notification.size(scale: gOverlayScale)
+ let w = size.width
+ let h = size.height
let toast = NSPanel(
contentRect: NSRect(x: 0, y: 0, width: Int(w), height: Int(h)),
styleMask: [.nonactivatingPanel, .borderless],
@@ -3245,6 +3476,8 @@ class ShortcutReminderController: NSObject, NSWindowDelegate {
private func updateNotificationContent() {
guard let contentView = notificationPanel?.contentView,
let notification = activeNotification else { return }
+ // The same panel is reused for compact alerts and larger join cards.
+ notificationPanel?.setContentSize(notification.size(scale: gOverlayScale))
let view = OverlayNotificationView(
notification: notification,
scale: gOverlayScale,
diff --git a/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder_tests.swift b/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder_tests.swift
index 09540d4ea..8e8c23ef0 100644
--- a/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder_tests.swift
+++ b/apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder_tests.swift
@@ -547,6 +547,96 @@ private func testLocalizedDisclosure() {
expect(brand?.1 == "localized right-click", "right-click hint was not translated")
}
+/// Layout follows the typed action, including localized labels. It must not
+/// enlarge unrelated notifications or change the payload sent back to Rust.
+private func testMeetingJoinNotification() {
+ let json = """
+ {"id":"calendar","title":"localized title","body":"Weekly sync","autoDismissMs":30000,"actions":[{"id":"join","label":"Rejoindre et prendre des notes","type":"meeting_join","url":"https://meet.google.com/example","primary":true},{"id":"hd","label":"+ HD","type":"api"}]}
+ """
+ guard let meeting = OverlayNotification.parse(json) else {
+ expect(false, "valid join notification was rejected")
+ return
+ }
+ expect(meeting.isMeetingJoin, "localized join action needs the larger card")
+ expect(meeting.autoDismissMs == 30000, "join timeout must be preserved")
+ let action = try! JSONSerialization.jsonObject(with: Data(meeting.actions[0].payload.utf8)) as! [String: Any]
+ expect(action["type"] as? String == "meeting_join", "join action type changed")
+ expect(action["url"] as? String == "https://meet.google.com/example", "join URL changed")
+ let ordinary = OverlayNotification.parse(json.replacingOccurrences(of: "meeting_join", with: "deeplink"))!
+ expect(!ordinary.isMeetingJoin, "non-join alert must remain compact")
+ for scale: CGFloat in [1, 1.5, 2] {
+ let size = meeting.size(scale: scale)
+ expect(size.width > ordinary.size(scale: scale).width, "join card needs more text width")
+ expect(size.height >= 3 * ordinary.size(scale: scale).height, "join card needs room for separate actions")
+ let y = overlayAttachmentY(pill: NSRect(x: 500, y: 1030, width: 22, height: 16), height: size.height, gap: 4, stacked: 150, disclosureDown: true, visible: visible, edgeInset: 4)
+ expect(y >= visible.minY && y + size.height <= visible.maxY, "join card must stay on screen at scale \(scale)")
+ }
+}
+
+private func testMeetingProviderIcons() {
+ let cases: [(String, MeetingJoinProvider)] = [
+ ("https://meet.google.com/abc-defg-hij", .googleMeet),
+ ("https://MEET.GOOGLE.COM./abc-defg-hij", .googleMeet),
+ ("https://us02web.zoom.us/j/123", .zoom),
+ ("zoommtg://zoom.us/join?confno=123", .zoom),
+ ("https://company.zoom.com/j/123", .zoom),
+ ("https://agency.zoomgov.com/j/123", .zoom),
+ ("https://teams.microsoft.com/l/meetup-join/example", .teams),
+ ("https://teams.live.com/meet/123", .teams),
+ ("https://teams.cloud.microsoft/meet/123", .teams),
+ ("https://company.webex.com/meet/example", .webex),
+ ("https://unknown.example/meet", .other),
+ ("https://zoom.us.example.org/j/123", .other),
+ ("https://notzoom.us/j/123", .other),
+ ("https://[email protected]/j/123", .other),
+ ("https://evil.example/?url=https://meet.google.com/abc", .other),
+ ("file://meet.google.com/abc", .other),
+ ("not a URL", .other),
+ ("", .other),
+ ]
+ for (url, provider) in cases {
+ expect(MeetingJoinProvider.from(url: url) == provider, "wrong provider for \(url)")
+ }
+ for provider in MeetingJoinProvider.allCases where provider != .other {
+ expect(provider.image?.isValid == true, "missing embedded icon for \(provider)")
+ }
+ let json = """
+ {"id":"icon","title":"test","actions":[{"label":"Rejoindre","type":"meeting_join","url":"https://meet.google.com/abc"},{"label":"+ HD","type":"api","url":"/capture/hd/start"}]}
+ """
+ let parsed = OverlayNotification.parse(json)!
+ expect(parsed.actions[0].meetingProvider == .googleMeet, "join action needs the provider icon")
+ expect(parsed.actions[1].meetingProvider == nil, "HD action must not get a meeting icon")
+}
+
+private func testJoinScreenDetailChoice() {
+ let json = """
+ {"id":"choice","title":"meeting starting","actions":[{"id":"join-meeting","label":"join and take notes","type":"meeting_join","url":"https://meet.google.com/example","primary":true},{"id":"record-hd","action":"record-hd","label":"+ HD","type":"api","url":"/capture/hd/start","method":"POST","body":{"boundTo":"prewarm_pending"}}]}
+ """
+ let notification = OverlayNotification.parse(json)!
+ let join = notification.actions[0]
+ let displayed = notification.displayActions
+ expect(displayed.count == 2, "meeting must expose two one-click join choices")
+ expect(displayed[0] == join, "ordinary Join must remain unchanged")
+ expect(displayed[1].label == "join + HD", "capture choice must explicitly say it joins")
+ expect(displayed[1].meetingProvider == .googleMeet, "both join choices must show the service icon")
+ let detailPayload = try! JSONSerialization.jsonObject(with: Data(displayed[1].payload.utf8)) as! [String: Any]
+ expect(detailPayload["type"] as? String == "meeting_join", "screen-detail button must join directly")
+ expect((detailPayload["screen_detail"] as? [String: Any])?["boundTo"] as? String == "prewarm_pending", "screen-detail button must include capture in its single dispatch")
+ expect(notification.screenDetailAction != nil, "HD eligibility must expose the option")
+ expect(notification.joining(join, captureScreenDetail: false) == join, "ordinary Join must not enable screen detail")
+ let combined = notification.joining(join, captureScreenDetail: true)
+ let payload = try! JSONSerialization.jsonObject(with: Data(combined.payload.utf8)) as! [String: Any]
+ expect(payload["type"] as? String == "meeting_join", "selected option must still join")
+ expect(payload["url"] as? String == "https://meet.google.com/example", "combined Join lost the call URL")
+ expect((payload["screen_detail"] as? [String: Any])?["boundTo"] as? String == "prewarm_pending", "combined Join lost capture scope")
+ expect(combined.meetingProvider == .googleMeet, "combined Join lost its icon")
+ let withoutHD = OverlayNotification.parse(json.replacingOccurrences(of: "/capture/hd/start", with: "/unrelated"))!
+ expect(withoutHD.screenDetailAction == nil, "unrelated API action must not become a capture setting")
+ expect(withoutHD.displayActions == withoutHD.actions, "ineligible notifications must keep their actions")
+ expect(withoutHD.joining(withoutHD.actions[0], captureScreenDetail: true) == withoutHD.actions[0], "capture cannot be added without the offered HD action")
+ expect(notification.joining(notification.actions[1], captureScreenDetail: true) == notification.actions[1], "non-join actions must stay unchanged")
+}
+
@main
struct ShortcutReminderTests {
static func main() {
@@ -566,6 +656,9 @@ struct ShortcutReminderTests {
testTieBreaksToCurrent()
testAttachmentStacking()
testAttachmentStaysOnScreen()
+ testJoinScreenDetailChoice()
+ testMeetingProviderIcons()
+ testMeetingJoinNotification()
testWireContract()
testShortcutGlyphs()
testLocalizedDisclosure()
diff --git a/docs/meeting-provider-icons.md b/docs/meeting-provider-icons.md
new file mode 100644
index 000000000..5615c4d30
--- /dev/null
+++ b/docs/meeting-provider-icons.md
@@ -0,0 +1,21 @@
+# Meeting provider icons
+
+<!-- doc-covers: none -->
+
+The native shortcut notification embeds 48 px PNGs in `MeetingJoinProvider` in
+`apps/screenpipe-app-tauri/src-tauri/swift/shortcut_reminder.swift`. They display
+at 18 points, use the actual join URL to select a service, and require no runtime
+network request or installed meeting app. Unknown services use an SF Symbols
+video icon. The original action label and destination remain unchanged. The shared Windows/Linux card uses the same PNGs from `apps/screenpipe-app-tauri/public/images/meeting-providers/`, with the same hostname matching and generic video fallback.
+
+Sources:
+
+- Google Meet: existing `apps/screenpipe-app-tauri/public/images/google-meet.png`.
+- Zoom: [SVG Logos zoom-icon.svg](https://github.com/gilbarbara/logos/blob/4a5b550414be64d5c007574cd395d910d50e8950/logos/zoom-icon.svg).
+- Microsoft Teams: [SVG Logos microsoft-teams.svg](https://github.com/gilbarbara/logos/blob/4a5b550414be64d5c007574cd395d910d50e8950/logos/microsoft-teams.svg).
+- Webex: [Simple Icons webex.svg](https://github.com/simple-icons/simple-icons/blob/4d29a35c954699b389a834aacc97dd6e7e74143c/icons/webex.svg).
+
+SVG Logos and Simple Icons distribute these assets under CC0-1.0. Product names
+and logos remain trademarks of their respective owners. SVGs were rasterized
+with AppKit, preserving aspect ratio in a transparent 48 x 48 canvas, then
+encoded as base64 PNGs. Google Meet was resized from the existing PNG the same way.
diff --git a/docs/pr-assets/larger-join-meeting/after.png b/docs/pr-assets/larger-join-meeting/after.png
new file mode 100644
index 000000000..2ccd59971
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/after.png differ
diff --git a/docs/pr-assets/larger-join-meeting/before.png b/docs/pr-assets/larger-join-meeting/before.png
new file mode 100644
index 000000000..f20411790
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/before.png differ
diff --git a/docs/pr-assets/larger-join-meeting/other.png b/docs/pr-assets/larger-join-meeting/other.png
new file mode 100644
index 000000000..87655ce9a
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/other.png differ
diff --git a/docs/pr-assets/larger-join-meeting/teams.png b/docs/pr-assets/larger-join-meeting/teams.png
new file mode 100644
index 000000000..b7126b4a7
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/teams.png differ
diff --git a/docs/pr-assets/larger-join-meeting/web-after.png b/docs/pr-assets/larger-join-meeting/web-after.png
new file mode 100644
index 000000000..66644d31d
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/web-after.png differ
diff --git a/docs/pr-assets/larger-join-meeting/web-before.png b/docs/pr-assets/larger-join-meeting/web-before.png
new file mode 100644
index 000000000..f29c1cb80
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/web-before.png differ
diff --git a/docs/pr-assets/larger-join-meeting/webex.png b/docs/pr-assets/larger-join-meeting/webex.png
new file mode 100644
index 000000000..ac1a4839e
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/webex.png differ
diff --git a/docs/pr-assets/larger-join-meeting/zoom.png b/docs/pr-assets/larger-join-meeting/zoom.png
new file mode 100644
index 000000000..10c752fd5
Binary files /dev/null and b/docs/pr-assets/larger-join-meeting/zoom.png differ