@agent-native/core 0.149.6 → 0.151.0

package/corpus/README.md

@@ -31,4 +31,4 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- template files: 8044
+- template files: 8070

package/corpus/templates/analytics/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/analytics/app/hooks/use-navigation-state.ts

@@ -1,4 +1,5 @@
 import { useAgentRouteState } from "@agent-native/core/client/navigation";
+import { useLocation } from "react-router";
 
 import { rememberLastOpened } from "@/lib/last-opened";
 import { TAB_ID } from "@/lib/tab-id";
@@ -19,8 +20,11 @@ interface NavigationState {
 }
 
 const SESSION_FILTER_KEYS = ["range", "app", "q"] as const;
+const DASHBOARD_PATH_RE = /^\/(?:adhoc|dashboards)\/([^/]+)\/?$/;
 
 export function useNavigationState() {
+  const location = useLocation();
+
   useAgentRouteState<NavigationState>({
     browserTabId: TAB_ID,
     getNavigationState: ({ pathname, searchParams }) => {
@@ -107,54 +111,88 @@ export function useNavigationState() {
 
       return state;
     },
-    getCommandPath: (cmd) => {
-      if (cmd.view === "adhoc" && cmd.dashboardId)
-        return `/dashboards/${cmd.dashboardId}`;
-      if (cmd.view === "analyses" && cmd.analysisId)
-        return `/analyses/${cmd.analysisId}`;
-      if (cmd.view === "analyses") return "/dashboards";
-      if (cmd.view === "extensions" && cmd.extensionId)
-        return `/extensions/${cmd.extensionId}`;
-      if (cmd.view === "extensions") return "/settings/extensions";
-      if (cmd.view === "sessions" && cmd.recordingId)
-        return `/sessions/${encodeURIComponent(cmd.recordingId)}`;
-      if (cmd.view === "sessions") return "/sessions";
-      if (
-        cmd.view === "agents" &&
-        (cmd.agentsView === "database" ||
-          cmd.agentsView === "dashboards" ||
-          cmd.agentsView === "flags")
-      ) {
-        const params = new URLSearchParams({ view: cmd.agentsView });
-        if (cmd.agentsView === "database" && cmd.dbAdminConnectionId) {
-          params.set("db", cmd.dbAdminConnectionId);
-        }
-        return `/agents?${params.toString()}`;
-      }
-      if (cmd.view === "agents") return "/agents";
-      if (cmd.view === "monitoring") {
-        const params = new URLSearchParams();
-        if (cmd.monitoringView === "errors") {
-          params.set("view", "errors");
-          if (cmd.errorIssueId) params.set("issue", cmd.errorIssueId);
-        } else if (cmd.statusPageId) {
-          params.set("statuspage", cmd.statusPageId);
-        } else if (cmd.monitorId) {
-          params.set("monitor", cmd.monitorId);
-        }
-        const qs = params.toString();
-        return qs ? `/monitoring?${qs}` : "/monitoring";
-      }
-      if (cmd.view === "data-sources") return "/data-sources";
-      if (cmd.view === "data-dictionary") return "/data-dictionary";
-      if (cmd.view === "ask") return "/ask";
-      if (cmd.view === "settings") return "/settings";
-      if (cmd.view === "overview" || cmd.view === "home") return "/ask";
-      return "/";
-    },
+    getCommandPath: (cmd) =>
+      preserveActiveDashboardTab(
+        commandPathForNavigation(cmd),
+        location.pathname,
+        location.search,
+      ),
   });
 }
 
+function commandPathForNavigation(cmd: NavigationState): string {
+  if (cmd.view === "adhoc" && cmd.dashboardId)
+    return `/dashboards/${cmd.dashboardId}`;
+  if (cmd.view === "analyses" && cmd.analysisId)
+    return `/analyses/${cmd.analysisId}`;
+  if (cmd.view === "analyses") return "/dashboards";
+  if (cmd.view === "extensions" && cmd.extensionId)
+    return `/extensions/${cmd.extensionId}`;
+  if (cmd.view === "extensions") return "/settings/extensions";
+  if (cmd.view === "sessions" && cmd.recordingId)
+    return `/sessions/${encodeURIComponent(cmd.recordingId)}`;
+  if (cmd.view === "sessions") return "/sessions";
+  if (
+    cmd.view === "agents" &&
+    (cmd.agentsView === "database" ||
+      cmd.agentsView === "dashboards" ||
+      cmd.agentsView === "flags")
+  ) {
+    const params = new URLSearchParams({ view: cmd.agentsView });
+    if (cmd.agentsView === "database" && cmd.dbAdminConnectionId) {
+      params.set("db", cmd.dbAdminConnectionId);
+    }
+    return `/agents?${params.toString()}`;
+  }
+  if (cmd.view === "agents") return "/agents";
+  if (cmd.view === "monitoring") {
+    const params = new URLSearchParams();
+    if (cmd.monitoringView === "errors") {
+      params.set("view", "errors");
+      if (cmd.errorIssueId) params.set("issue", cmd.errorIssueId);
+    } else if (cmd.statusPageId) {
+      params.set("statuspage", cmd.statusPageId);
+    } else if (cmd.monitorId) {
+      params.set("monitor", cmd.monitorId);
+    }
+    const qs = params.toString();
+    return qs ? `/monitoring?${qs}` : "/monitoring";
+  }
+  if (cmd.view === "data-sources") return "/data-sources";
+  if (cmd.view === "data-dictionary") return "/data-dictionary";
+  if (cmd.view === "ask") return "/ask";
+  if (cmd.view === "settings") return "/settings";
+  if (cmd.view === "overview" || cmd.view === "home") return "/ask";
+  return "/";
+}
+
+export function preserveActiveDashboardTab(
+  targetPath: string,
+  currentPathname: string,
+  currentSearch: string,
+): string {
+  const targetUrl = new URL(targetPath, "https://analytics.local");
+  if (targetUrl.search || targetUrl.hash) return targetPath;
+
+  const targetDashboardId = dashboardIdFromPath(targetUrl.pathname);
+  const currentDashboardId = dashboardIdFromPath(currentPathname);
+  if (!targetDashboardId || targetDashboardId !== currentDashboardId) {
+    return targetPath;
+  }
+
+  const activeTab = new URLSearchParams(currentSearch).get("tab");
+  if (!activeTab) return targetPath;
+
+  // Agent navigation identifies the dashboard, but the active tab is UI state
+  // held in the URL and is not part of the navigate action payload.
+  targetUrl.searchParams.set("tab", activeTab);
+  return `${targetUrl.pathname}${targetUrl.search}${targetUrl.hash}`;
+}
+
+function dashboardIdFromPath(pathname: string): string | undefined {
+  return pathname.match(DASHBOARD_PATH_RE)?.[1];
+}
+
 function sessionFilters(
   searchParams?: URLSearchParams | Record<string, string>,
 ): Record<string, string> | undefined {

package/corpus/templates/analytics/changelog/2026-08-11-analytics-dashboards-keep-the-selected-tab-when-reopened.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-11
+---
+
+Analytics dashboards keep the selected tab when reopened

package/corpus/templates/assets/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/brain/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/calendar/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/chat/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/clips/.agents/skills/delegate-to-agent/SKILL.md

@@ -49,6 +49,34 @@ sendToAgentChat({
 });
 ```
 
+### Keep user text separate from injected context
+
+Treat the visible `message` as the user's request or the shortest clear
+description of an app-initiated operation. Put context the user did not type —
+IDs, URLs, filenames, current selection or screen state, serialized records,
+upload instructions, and bounded source excerpts — in the `context` field.
+`context` is model input carried through the agent turn; it is stripped from
+the rendered user message, so do not concatenate it into `message` with labels,
+blank-line sections, or `<context>` tags yourself.
+
+Use the related surface for each kind of supporting input:
+
+| Surface | Use for |
+| --- | --- |
+| `message` | User-authored intent or a concise app action description |
+| `context` | Derived metadata and bounded text needed to carry out that intent |
+| `setAgentChatContextItem` | Context staged for a later user-submitted prompt; keep it keyed so updates replace stale context |
+| `images`, `referenceImagePaths`, attachments | Binary or visual inputs; describe only the handling instructions in `context` |
+
+If an app builds a prompt from a form, selection, upload, or editor state, keep
+the visible message short and pass the assembled details as `context`. Preserve
+the user's actual freeform text in `message` when it is the request; do not
+restate it as metadata in `context` unless the agent needs a structured copy.
+
+This boundary applies to auto-submitted turns and prefills. A hidden context
+field is not a license to send unbounded records or secrets: cap excerpts,
+prefer stable IDs and URLs, and use an action or resource lookup for full data.
+
 **From the UI, in the background:**
 
 ```ts

package/corpus/templates/clips/changelog/2026-08-11-clips-recovers-from-transient-updates-and-avoids-macos-priva.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-08-11
+---
+
+Clips recovers from transient updates and avoids macOS privacy crashes during restart.

package/corpus/templates/clips/desktop/src/app.tsx

@@ -2,8 +2,6 @@ import {
   IconAlertTriangle,
   IconArrowLeft,
   IconCalendarEvent,
-  IconChevronDown,
-  IconChevronRight,
   IconCircleCheck,
   IconCopy,
   IconDownload,
@@ -973,10 +971,6 @@ export function App() {
   const [rewindSettingsReturnView, setRewindSettingsReturnView] = useState<
     "recorder" | "settings"
   >("recorder");
-  const [homeScreenMemoryStatus, setHomeScreenMemoryStatus] =
-    useState<ScreenMemoryStatus | null>(null);
-  const [homeScreenMemoryBusy, setHomeScreenMemoryBusy] = useState(false);
-  const homeScreenMemoryRefreshVersionRef = useRef(0);
   const [rewindAgentPromptCopied, setRewindAgentPromptCopied] = useState(false);
   const [agentHandoff, setAgentHandoff] =
     useState<RewindAgentHandoffRequest | null>(null);
@@ -1002,7 +996,6 @@ export function App() {
   const [readinessOpen, setReadinessOpen] = useState<boolean>(
     () => !loadBool(READINESS_REVIEWED_KEY, false),
   );
-  const [rewindHomeOpen, setRewindHomeOpen] = useState(false);
   const [recorder, setRecorder] = useState<RecorderHandle | null>(null);
   const recordingStartAbortRef = useRef<AbortController | null>(null);
   const [recError, setRecError] = useState<string | null>(null);
@@ -1036,57 +1029,6 @@ export function App() {
   const isRecording = recorder !== null;
   // Whether the popover window is shown; driven by the visibility effect below.
   const [popoverVisible, setPopoverVisible] = useState(false);
-  const homeRewindPresentation = getRewindStatusPresentation({
-    status: homeScreenMemoryStatus,
-    config: featureConfig?.screenMemory ?? DEFAULT_SCREEN_MEMORY_CONFIG,
-    clipRecordingActive: isRecording || recordingFlowActive,
-  });
-  const homeRewindOn =
-    featureConfig?.screenMemory?.enabled === true &&
-    featureConfig.screenMemory.paused !== true;
-  const refreshHomeScreenMemoryStatus = useCallback(() => {
-    const version = ++homeScreenMemoryRefreshVersionRef.current;
-    invoke<ScreenMemoryStatus>("screen_memory_status")
-      .then((status) => {
-        if (version === homeScreenMemoryRefreshVersionRef.current) {
-          setHomeScreenMemoryStatus(status);
-        }
-      })
-      .catch(() => {});
-  }, []);
-  useEffect(() => {
-    if (featureConfig?.screenMemory?.enabled !== true) {
-      homeScreenMemoryRefreshVersionRef.current += 1;
-      setHomeScreenMemoryStatus(null);
-      return;
-    }
-    let cancelled = false;
-    const refresh = () => {
-      if (!cancelled) refreshHomeScreenMemoryStatus();
-    };
-    refresh();
-    const timer = window.setInterval(refresh, popoverVisible ? 5_000 : 30_000);
-    let unlisten: (() => void) | undefined;
-    listen("clips:screen-memory-changed", refresh)
-      .then((stopListening) => {
-        if (cancelled) {
-          stopListening();
-          return;
-        }
-        unlisten = stopListening;
-      })
-      .catch(() => {});
-    return () => {
-      cancelled = true;
-      homeScreenMemoryRefreshVersionRef.current += 1;
-      window.clearInterval(timer);
-      unlisten?.();
-    };
-  }, [
-    featureConfig?.screenMemory?.enabled,
-    popoverVisible,
-    refreshHomeScreenMemoryStatus,
-  ]);
   const recordShortcutHandlerRef = useRef<() => void>(() => {});
   const handleStartRecordingRef = useRef<
     (options?: {
@@ -3576,47 +3518,6 @@ export function App() {
   const showCameraRow = mode !== "screen"; // screen-only has no camera
   const showSourceRow = mode !== "camera"; // camera-only has no screen source
 
-  async function setHomeRewindRemembering(remembering: boolean) {
-    if (homeScreenMemoryBusy) return;
-    if (remembering && featureConfig?.screenMemory?.enabled !== true) {
-      setRewindSettingsReturnView("recorder");
-      setPromptRewindEnable(true);
-      setPopoverView("rewind-settings");
-      return;
-    }
-    setHomeScreenMemoryBusy(true);
-    try {
-      const current = await invoke<FeatureConfig>("get_feature_config");
-      await invoke("set_feature_config", {
-        config: {
-          ...current,
-          screenMemory: {
-            ...DEFAULT_SCREEN_MEMORY_CONFIG,
-            ...current.screenMemory,
-            // Once Rewind has been set up, the everyday Home switch is a
-            // pause/resume control. Full disable and capture permissions live
-            // in Rewind Settings, so an accidental Home click never tears
-            // down the configured memory system or asks for consent again.
-            enabled: true,
-            paused: !remembering,
-          },
-        },
-      });
-      // The native producer can take a moment to finish pausing. Do not keep
-      // the Home switch locked while that status request waits; the existing
-      // change event and bounded poll will reconcile it, and this best-effort
-      // refresh can do the same without blocking the next resume action.
-      refreshHomeScreenMemoryStatus();
-    } catch (err) {
-      console.error(
-        "[clips-tray] update Rewind remembering state failed:",
-        err,
-      );
-    } finally {
-      setHomeScreenMemoryBusy(false);
-    }
-  }
-
   const pendingUploadBanner = recordingStopFinalizing ? (
     <FinalizingUploadBanner />
   ) : pendingUploads.length > 0 ? (
@@ -3831,6 +3732,9 @@ export function App() {
             setServerUrl(url.replace(/\/+$/, ""));
             setPopoverView("recorder");
           }}
+          rewindAgentPromptCopied={rewindAgentPromptCopied}
+          onCopyRewindAgentPrompt={copyRewindAgentPrompt}
+          onOpenRewindDocs={openRewindDocs}
           onOpenRewind={() => setPopoverView("rewind-settings")}
           onOpenMemory={() => setPopoverView("memory")}
           onCancel={() => {
@@ -3877,6 +3781,9 @@ export function App() {
             setServerUrl(url.replace(/\/+$/, ""));
             setPopoverView("recorder");
           }}
+          rewindAgentPromptCopied={rewindAgentPromptCopied}
+          onCopyRewindAgentPrompt={copyRewindAgentPrompt}
+          onOpenRewindDocs={openRewindDocs}
           onOpenRewind={() => {
             setPromptRewindEnable(false);
             setRewindSettingsReturnView("settings");
@@ -4093,83 +4000,6 @@ export function App() {
             onOpenChange={updateReadinessOpen}
             onOpenPermission={openPrivacySettings}
           />
-
-          <section className="rewind-home-card" aria-label="Rewind">
-            <button
-              type="button"
-              className="rewind-home-summary"
-              aria-expanded={rewindHomeOpen}
-              onClick={() => setRewindHomeOpen((open) => !open)}
-            >
-              <span className="rewind-home-title">Rewind</span>
-              <span className="rewind-home-state">
-                {homeRewindOn ? "On" : "Off"}
-                {rewindHomeOpen ? (
-                  <IconChevronDown size={11} stroke={2} />
-                ) : (
-                  <IconChevronRight size={11} stroke={2} />
-                )}
-              </span>
-            </button>
-            {rewindHomeOpen ? (
-              <div className="rewind-home-details">
-                <p>{homeRewindPresentation.detail}</p>
-                <div className="rewind-home-detail-actions">
-                  <button
-                    type="button"
-                    className="rewind-docs-link"
-                    onClick={openRewindDocs}
-                  >
-                    Learn about Rewind
-                    <IconExternalLink size={13} stroke={1.9} />
-                  </button>
-                  <div className="rewind-home-controls">
-                    <Tooltip>
-                      <TooltipTrigger asChild>
-                        <button
-                          type="button"
-                          className="rewind-agent-prompt-copy"
-                          onClick={() => void copyRewindAgentPrompt()}
-                          aria-label={
-                            rewindAgentPromptCopied
-                              ? "Setup prompt copied — paste it into your agent once"
-                              : "Copy setup prompt for your agent"
-                          }
-                        >
-                          {rewindAgentPromptCopied ? (
-                            <IconCircleCheck size={15} stroke={2} />
-                          ) : (
-                            <IconCopy size={15} stroke={1.9} />
-                          )}
-                        </button>
-                      </TooltipTrigger>
-                      <TooltipContent>
-                        {rewindAgentPromptCopied
-                          ? "Setup prompt copied"
-                          : "Copy setup prompt for your agent"}
-                      </TooltipContent>
-                    </Tooltip>
-                    <Switch
-                      on={homeRewindOn}
-                      disabled={
-                        homeScreenMemoryBusy ||
-                        isRecording ||
-                        recordingFlowActive
-                      }
-                      onChange={(remembering) =>
-                        void setHomeRewindRemembering(remembering)
-                      }
-                      label={
-                        featureConfig?.screenMemory?.enabled === true
-                          ? "Remember with Rewind"
-                          : "Set up Rewind"
-                      }
-                    />
-                  </div>
-                </div>
-              </div>
-            ) : null}
-          </section>
         </div>
 
         {!isRecording ? (
@@ -5445,6 +5275,9 @@ function Setup({
   onVoiceProviderChange,
   onVoiceInstructionsChange,
   onConnect,
+  rewindAgentPromptCopied,
+  onCopyRewindAgentPrompt,
+  onOpenRewindDocs,
   onOpenRewind,
   onOpenMemory,
   onCancel,
@@ -5472,6 +5305,9 @@ function Setup({
   onVoiceProviderChange: (value: VoiceProvider) => void;
   onVoiceInstructionsChange: (value: string) => void;
   onConnect: (url: string) => void;
+  rewindAgentPromptCopied: boolean;
+  onCopyRewindAgentPrompt: () => void;
+  onOpenRewindDocs: () => void;
   onOpenRewind?: () => void;
   onOpenMemory?: () => void;
   onCancel?: () => void;
@@ -6669,6 +6505,26 @@ function Setup({
                   Rewind's reusable instructions and repairs the local
                   connection, so later you can simply say “Look at Rewind.”
                 </p>
+                <div className="setup-button-row">
+                  <button
+                    type="button"
+                    className="secondary"
+                    onClick={onCopyRewindAgentPrompt}
+                  >
+                    <IconCopy size={14} stroke={1.9} />
+                    {rewindAgentPromptCopied
+                      ? "Setup prompt copied"
+                      : "Copy setup prompt"}
+                  </button>
+                  <button
+                    type="button"
+                    className="secondary"
+                    onClick={onOpenRewindDocs}
+                  >
+                    <IconExternalLink size={14} stroke={1.9} />
+                    Learn about Rewind
+                  </button>
+                </div>
               </div>
             </div>
             <details className="setup-advanced rewind-agent-repair">