@agent-native/core 0.114.10 → 0.114.11

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

@@ -86,6 +86,7 @@ import {
   type RecorderStopResult,
 } from "./lib/recorder";
 import { REWIND_AGENT_PROMPT } from "./lib/rewind-agent-prompt";
+import { getRewindStatusPresentation } from "./lib/rewind-status";
 import {
   loadBool,
   loadString,
@@ -893,6 +894,7 @@ export function App() {
   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);
@@ -946,26 +948,54 @@ 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 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 = () => {
-      invoke<ScreenMemoryStatus>("screen_memory_status")
-        .then((status) => {
-          if (!cancelled) setHomeScreenMemoryStatus(status);
-        })
-        .catch(() => {});
+      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]);
+  }, [
+    featureConfig?.screenMemory?.enabled,
+    popoverVisible,
+    refreshHomeScreenMemoryStatus,
+  ]);
   const recordShortcutHandlerRef = useRef<() => void>(() => {});
   // Mirrors `bubbleActive` (assigned below once it is computed) so device
   // probes can synchronously tell whether the camera bubble owns the grant.
@@ -3154,8 +3184,11 @@ export function App() {
           },
         },
       });
-      const status = await invoke<ScreenMemoryStatus>("screen_memory_status");
-      setHomeScreenMemoryStatus(status);
+      // 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:",
@@ -3633,34 +3666,13 @@ export function App() {
         <section className="rewind-home-card" aria-label="Rewind status">
           <div className="rewind-home-status">
             <span
-              className={`rewind-home-dot ${
-                featureConfig?.screenMemory?.enabled === true &&
-                featureConfig.screenMemory.paused !== true &&
-                homeScreenMemoryStatus?.state === "recording"
-                  ? "is-live"
-                  : ""
-              }`}
+              className={`rewind-home-dot ${homeRewindPresentation.isLive ? "is-live" : ""}`}
             />
             <div>
-              <strong>
-                {featureConfig?.screenMemory?.enabled !== true
-                  ? "Rewind is off"
-                  : featureConfig.screenMemory.paused === true
-                    ? "Rewind is paused"
-                    : homeScreenMemoryStatus?.exclusionActive
-                      ? "Rewind is protecting a private moment"
-                      : "Rewind is remembering"}
-              </strong>
-              {featureConfig?.screenMemory?.enabled !== true ||
-              featureConfig.screenMemory.paused ||
-              homeScreenMemoryStatus?.exclusionActive ? (
-                <p>
-                  {featureConfig?.screenMemory?.enabled !== true
-                    ? "Private memory for moments you may need later."
-                    : featureConfig.screenMemory.paused
-                      ? "Existing local memory is still available."
-                      : "An excluded app is being skipped."}
-                </p>
+              <strong>{homeRewindPresentation.title}</strong>
+              {!homeRewindPresentation.isLive ||
+              homeRewindPresentation.hasError ? (
+                <p>{homeRewindPresentation.detail}</p>
               ) : null}
             </div>
             <div className="rewind-home-controls">
@@ -4941,6 +4953,7 @@ function Setup({
   );
   const [screenMemoryStatus, setScreenMemoryStatus] =
     useState<ScreenMemoryStatus | null>(null);
+  const screenMemoryStatusRefreshVersionRef = useRef(0);
   const [screenMemoryMessage, setScreenMemoryMessage] = useState<{
     kind: "ok" | "error";
     text: string;
@@ -4976,7 +4989,11 @@ function Setup({
     (sum, segment) => sum + segment.bytes,
     0,
   );
-  const screenMemoryRecording = screenMemoryStatus?.state === "recording";
+  const rewindStatusPresentation = getRewindStatusPresentation({
+    status: screenMemoryStatus,
+    config: screenMemory,
+    clipRecordingActive: recordingActive,
+  });
   const captureControlsLocked = recordingActive;
 
   useEffect(() => {
@@ -5172,11 +5189,16 @@ function Setup({
     }
   }
 
-  function refreshScreenMemoryStatus() {
+  const refreshScreenMemoryStatus = useCallback(() => {
+    const version = ++screenMemoryStatusRefreshVersionRef.current;
     invoke<ScreenMemoryStatus>("screen_memory_status")
-      .then(setScreenMemoryStatus)
+      .then((status) => {
+        if (version === screenMemoryStatusRefreshVersionRef.current) {
+          setScreenMemoryStatus(status);
+        }
+      })
       .catch(() => {});
-  }
+  }, []);
 
   function refreshRewindEgressLog() {
     invoke<RewindEgressEvent[]>("rewind_list_evidence_egress", { limit: 20 })
@@ -5257,6 +5279,7 @@ function Setup({
       const status = await invoke<ScreenMemoryStatus>(
         "screen_memory_delete_all",
       );
+      screenMemoryStatusRefreshVersionRef.current += 1;
       setScreenMemoryStatus(status);
       setScreenMemoryMessage({ kind: "ok", text: "Rewind cleared." });
     } catch (err) {
@@ -5424,13 +5447,10 @@ function Setup({
   useEffect(() => {
     let cancelled = false;
     const refresh = () => {
-      invoke<ScreenMemoryStatus>("screen_memory_status")
-        .then((status) => {
-          if (!cancelled) setScreenMemoryStatus(status);
-        })
-        .catch(() => {});
+      if (!cancelled) refreshScreenMemoryStatus();
     };
     refresh();
+    const timer = window.setInterval(refresh, 5_000);
     const unlistens: Array<() => void> = [];
     const track = (p: Promise<() => void>) => {
       p.then((u) => {
@@ -5448,6 +5468,8 @@ function Setup({
     track(listen("clips:screen-memory-changed", refresh));
     return () => {
       cancelled = true;
+      screenMemoryStatusRefreshVersionRef.current += 1;
+      window.clearInterval(timer);
       unlistens.forEach((u) => {
         try {
           u();
@@ -5456,7 +5478,7 @@ function Setup({
         }
       });
     };
-  }, []);
+  }, [refreshScreenMemoryStatus]);
 
   // Load model status on mount and keep it current via events.
   useEffect(() => {
@@ -6044,17 +6066,16 @@ function Setup({
             </div>
             <div className="rewind-settings-status">
               <span
-                className={`rewind-home-dot ${screenMemoryRecording ? "is-live" : ""}`}
+                className={`rewind-home-dot ${rewindStatusPresentation.isLive ? "is-live" : ""}`}
               />
-              <span>
-                {screenMemoryStatus?.exclusionActive
-                  ? screenMemoryStatus.coverage
-                  : screenMemoryRecording
+              <span className="rewind-settings-status-copy">
+                <strong>{rewindStatusPresentation.title}</strong>
+                <span>
+                  {rewindStatusPresentation.kind === "recording" &&
+                  !rewindStatusPresentation.hasError
                     ? `${screenMemorySegments.length} retained segment${screenMemorySegments.length === 1 ? "" : "s"} · ${formatStorageBytes(screenMemoryTotalBytes)}`
-                    : screenMemory.paused
-                      ? "Paused. Existing memory remains available."
-                      : screenMemoryStatus?.lastError ||
-                        "Waiting for screen-recording permission."}
+                    : rewindStatusPresentation.detail}
+                </span>
               </span>
             </div>
             <div className="setup-section-heading">Privacy</div>
@@ -6550,17 +6571,11 @@ function Setup({
       <div className="setup-section rewind-settings-entry">
         <div className="rewind-settings-entry-main">
           <span
-            className={`rewind-home-dot ${screenMemoryRecording ? "is-live" : ""}`}
+            className={`rewind-home-dot ${rewindStatusPresentation.isLive ? "is-live" : ""}`}
           />
           <div>
             <strong>Rewind</strong>
-            <p className="setup-hint">
-              {!screenMemory.enabled
-                ? "Off"
-                : screenMemory.paused
-                  ? "Paused · existing local memory is still available"
-                  : "Remembering locally"}
-            </p>
+            <p className="setup-hint">{rewindStatusPresentation.title}</p>
           </div>
         </div>
         <button type="button" className="secondary" onClick={onOpenRewind}>
@@ -6738,21 +6753,16 @@ function Setup({
               bundle ID cannot be detected.
             </p>
             <div className="whisper-status">
-              {screenMemoryRecording ? (
+              {rewindStatusPresentation.isLive ? (
                 <IconCircleCheck size={13} className="whisper-status-icon" />
               ) : (
                 <IconAlertTriangle size={13} className="whisper-status-icon" />
               )}
               <span>
-                {screenMemoryStatus?.exclusionActive
-                  ? screenMemoryStatus.coverage
-                  : screenMemoryRecording
-                    ? `Rewind is retaining local coverage: ${screenMemorySegments.length} segment${screenMemorySegments.length === 1 ? "" : "s"}, ${formatStorageBytes(screenMemoryTotalBytes)}.`
-                    : screenMemory.paused
-                      ? "Capture paused. Existing local coverage remains available."
-                      : screenMemoryStatus?.lastError
-                        ? screenMemoryStatus.lastError
-                        : "Capture status is waiting for screen-recording permission."}
+                {rewindStatusPresentation.kind === "recording" &&
+                !rewindStatusPresentation.hasError
+                  ? `Rewind is retaining local coverage: ${screenMemorySegments.length} segment${screenMemorySegments.length === 1 ? "" : "s"}, ${formatStorageBytes(screenMemoryTotalBytes)}.`
+                  : rewindStatusPresentation.detail}
               </span>
             </div>
             {screenMemorySegments[0] ? (

package/corpus/templates/clips/desktop/src/lib/rewind-status.ts

@@ -0,0 +1,103 @@
+import type { ScreenMemoryConfig, ScreenMemoryStatus } from "../shared/config";
+
+export type RewindPresentationKind =
+  | "off"
+  | "paused"
+  | "recording"
+  | "excluded"
+  | "idle"
+  | "error"
+  | "unavailable";
+
+export interface RewindStatusPresentation {
+  kind: RewindPresentationKind;
+  title: string;
+  detail: string;
+  isLive: boolean;
+  hasError: boolean;
+}
+
+export function getRewindStatusPresentation({
+  status,
+  config,
+  clipRecordingActive = false,
+}: {
+  status: ScreenMemoryStatus | null;
+  config: ScreenMemoryConfig;
+  clipRecordingActive?: boolean;
+}): RewindStatusPresentation {
+  const runtimeConfig = status?.config ?? config;
+
+  if (!runtimeConfig.enabled || status?.state === "disabled") {
+    return {
+      kind: "off",
+      title: "Rewind is off",
+      detail: "Private memory for moments you may need later.",
+      isLive: false,
+      hasError: false,
+    };
+  }
+
+  if (runtimeConfig.paused || status?.state === "paused") {
+    return {
+      kind: "paused",
+      title: "Rewind is paused",
+      detail: "Existing local memory is still available.",
+      isLive: false,
+      hasError: false,
+    };
+  }
+
+  if (status?.exclusionActive) {
+    return {
+      kind: "excluded",
+      title: "Rewind is protecting a private moment",
+      detail: status.coverage || "An excluded app is being skipped.",
+      isLive: false,
+      hasError: false,
+    };
+  }
+
+  if (status?.available === false) {
+    return {
+      kind: "unavailable",
+      title: "Rewind is unavailable",
+      detail: "Rewind capture is not available on this device.",
+      isLive: false,
+      hasError: false,
+    };
+  }
+
+  if (status?.state === "recording") {
+    return {
+      kind: "recording",
+      title: "Rewind is remembering",
+      detail:
+        status.lastError ||
+        status.coverage ||
+        "Rewind is retaining local coverage.",
+      isLive: true,
+      hasError: Boolean(status.lastError),
+    };
+  }
+
+  if (status?.lastError) {
+    return {
+      kind: "error",
+      title: "Rewind needs attention",
+      detail: status.lastError,
+      isLive: false,
+      hasError: true,
+    };
+  }
+
+  return {
+    kind: "idle",
+    title: "Rewind is enabled but not currently capturing",
+    detail: clipRecordingActive
+      ? "Rewind will resume when this Clip ends."
+      : "No new local coverage is being retained right now.",
+    isLive: false,
+    hasError: false,
+  };
+}

package/corpus/templates/clips/desktop/src/styles.css

@@ -1707,6 +1707,16 @@ body[data-clips-route="recording-pill"] #root {
   margin: -4px 0 0;
 }
 
+.rewind-settings-status-copy {
+  display: grid;
+  gap: 1px;
+}
+
+.rewind-settings-status-copy strong {
+  color: var(--fg);
+  font-weight: 600;
+}
+
 .rewind-agent-row {
   border-bottom: none;
 }

package/dist/collab/awareness.d.ts

@@ -62,11 +62,11 @@ export declare const postAwareness: import("h3").EventHandlerWithFetch<import("h
     error: string;
     states?: undefined;
 } | {
+    error?: undefined;
     states: {
         clientId: number;
         state: string;
     }[];
-    error?: undefined;
 }>>;
 /**
  * GET /_agent-native/collab/:docId/users
@@ -77,10 +77,10 @@ export declare const getActiveUsers: import("h3").EventHandlerWithFetch<import("
     error: string;
     users?: undefined;
 } | {
+    error?: undefined;
     users: {
         clientId: number;
         lastSeen: number;
     }[];
-    error?: undefined;
 }>>;
 //# sourceMappingURL=awareness.d.ts.map

package/dist/collab/awareness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"awareness.d.ts","sourceRoot":"","sources":["../../src/collab/awareness.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgB3C,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAOD,eAAO,MAAM,sBAAsB,EAAG,kBAA2B,CAAC;AAElE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,kBAAkB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,gFAAgF;IAChF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,wBAAgB,mBAAmB,IAAI,YAAY,CAElD;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,cAAc,GAAG,SAAS,GAChC,IAAI,CAON;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,KAAK,CAAC,EAAE,cAAc,GACrB,IAAI,CAgBN;AAoBD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,GAAE,MAAmB,GAC7B,IAAI,CAON;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE1E;AAiBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAO1E;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAOnE;AAkCD;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa;;;;;kBAwDa,MAAM;eAAS,MAAM;;;GAoB1D,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,cAAc;;;;;kBAYM,MAAM;kBAAY,MAAM;;;GAMvD,CAAC"}
+{"version":3,"file":"awareness.d.ts","sourceRoot":"","sources":["../../src/collab/awareness.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAgB3C,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAOD,eAAO,MAAM,sBAAsB,EAAG,kBAA2B,CAAC;AAElE,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,kBAAkB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,gFAAgF;IAChF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAOD,wBAAgB,mBAAmB,IAAI,YAAY,CAElD;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,cAAc,GAAG,SAAS,GAChC,IAAI,CAON;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,KAAK,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,EAClD,KAAK,CAAC,EAAE,cAAc,GACrB,IAAI,CAgBN;AAoBD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,SAAS,GAAE,MAAmB,GAC7B,IAAI,CAON;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAE1E;AAiBD,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAO1E;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,IAAI,CAOnE;AAkCD;;;;;;;GAOG;AACH,eAAO,MAAM,aAAa;;;;;;kBAwDa,MAAM;eAAS,MAAM;;GAoB1D,CAAC;AAEH;;;;GAIG;AACH,eAAO,MAAM,cAAc;;;;;;kBAYM,MAAM;kBAAY,MAAM;;GAMvD,CAAC"}

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/extensions/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/extensions/actions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AA+DhE,wBAAgB,4BAA4B,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CA0kC1E"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../src/extensions/actions.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAkEhE,wBAAgB,4BAA4B,IAAI,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAgyC1E"}

package/dist/extensions/actions.js

@@ -1,6 +1,8 @@
+import { randomUUID } from "node:crypto";
 import { ACTION_CHAT_UI_INLINE_EXTENSION_RENDERER } from "../action-ui.js";
 import { AgentActionStopError } from "../action.js";
 import { writeAppState } from "../application-state/script-helpers.js";
+import { getDbExec, isPostgres } from "../db/client.js";
 import { readResource } from "../resources/script-helpers.js";
 import { getRequestOrgId, getRequestRunContext, getRequestUserEmail, } from "../server/request-context.js";
 import { resolveAccess } from "../sharing/access.js";
@@ -9,7 +11,7 @@ import { ExtensionContentEditError } from "./content-patch.js";
 import { getLocalExtension, isLocalExtensionRow, listLocalExtensions, } from "./local.js";
 import { extensionPath } from "./path.js";
 import { addExtensionSlotTarget, installExtensionSlot, uninstallExtensionSlot, listExtensionsForSlot, listSlotsForExtension, } from "./slots/store.js";
-import { createExtension, deleteExtension, findRecentDuplicateExtension, getHiddenExtensionIdsForCurrentUser, getExtension, getExtensionHistoryVersion, globalHideExtension, globalUnhideExtension, hideExtension, listExtensionHistory, listExtensions, restoreExtensionHistoryVersion, unhideExtension, updateExtension, updateExtensionContent, } from "./store.js";
+import { createExtension, deleteExtension, ensureExtensionsTables, findRecentDuplicateExtension, getHiddenExtensionIdsForCurrentUser, getExtension, getExtensionHistoryVersion, globalHideExtension, globalUnhideExtension, hideExtension, listExtensionHistory, listExtensions, notifyExtensionChangeForResource, restoreExtensionHistoryVersion, unhideExtension, updateExtension, updateExtensionContent, } from "./store.js";
 // A 200k extension body containing JSON-sensitive HTML/JS characters (quotes,
 // backslashes, and newlines) expands to about 400k characters when pretty-JSON
 // serialized by the agent loop. A history detail can carry the current and
@@ -689,6 +691,196 @@ export function createExtensionActionEntries() {
                 };
             },
         },
+        "extension-data-set": {
+            tool: {
+                description: "Write a value to an extension's extensionData store (the tool_data table) from the agent side. Use this when the agent needs to update or seed data that an extension reads via extensionData.get() at render time. Requires editor access to the extension.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        extensionId: {
+                            type: "string",
+                            description: "Extension id whose data store to write to.",
+                        },
+                        collection: {
+                            type: "string",
+                            description: "Collection name within the extension's data store.",
+                        },
+                        itemId: {
+                            type: "string",
+                            description: "Item id within the collection. Upserts if it already exists.",
+                        },
+                        data: {
+                            description: "The data value to store. Objects are JSON-serialized automatically.",
+                        },
+                        scope: {
+                            type: "string",
+                            enum: ["user", "org"],
+                            description: "Storage scope. 'user' (default) is private to the current user; 'org' is shared across the organization.",
+                        },
+                    },
+                    required: ["extensionId", "collection", "itemId", "data"],
+                },
+            },
+            run: async (args) => {
+                const extensionId = String(args?.extensionId ?? "").trim();
+                const collection = String(args?.collection ?? "").trim();
+                const itemId = String(args?.itemId ?? "").trim();
+                if (!extensionId || !collection || !itemId)
+                    return "Error: extensionId, collection, and itemId are required.";
+                if (args?.data === undefined)
+                    return "Error: data is required.";
+                await ensureExtensionsTables();
+                const access = await resolveAccess("extension", extensionId);
+                if (!access || access.role === "viewer")
+                    return `Error: editor access required for extension ${extensionId}.`;
+                const userEmail = getRequestUserEmail()?.toLowerCase() ?? "";
+                const scope = args?.scope === "org" ? "org" : "user";
+                const orgId = getRequestOrgId();
+                if (scope === "org" && !orgId)
+                    return "Error: org context required for scope=org.";
+                const data = typeof args.data === "string" ? args.data : JSON.stringify(args.data);
+                const MAX_BYTES = 1024 * 1024;
+                if (Buffer.byteLength(data, "utf8") > MAX_BYTES)
+                    return `Error: data exceeds ${MAX_BYTES} byte limit. Store large payloads in file storage instead.`;
+                const now = new Date().toISOString();
+                const scopeKey = scope === "org" ? `org:${orgId}` : userEmail;
+                const client = getDbExec();
+                const pg = isPostgres();
+                const conflictClause = pg
+                    ? `ON CONFLICT (tool_id, collection, scope_key, item_id)
+             DO UPDATE SET data = EXCLUDED.data, updated_at = EXCLUDED.updated_at`
+                    : `ON CONFLICT (tool_id, collection, scope_key, item_id)
+             DO UPDATE SET data = excluded.data, updated_at = excluded.updated_at`;
+                await client.execute({
+                    sql: `UPDATE tools SET updated_at = ? WHERE id = ?`,
+                    args: [now, extensionId],
+                });
+                await client.execute({
+                    sql: `INSERT INTO tool_data (id, tool_id, collection, item_id, data, owner_email, scope, org_id, scope_key, created_at, updated_at)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+           ${conflictClause}`,
+                    args: [
+                        randomUUID(),
+                        extensionId,
+                        collection,
+                        itemId,
+                        data,
+                        userEmail,
+                        scope,
+                        scope === "org" ? orgId : null,
+                        scopeKey,
+                        now,
+                        now,
+                    ],
+                });
+                await notifyExtensionChangeForResource(extensionId);
+                return {
+                    ok: true,
+                    id: itemId,
+                    extensionId,
+                    collection,
+                    scope,
+                    updatedAt: now,
+                };
+            },
+        },
+        "extension-data-get": {
+            tool: {
+                description: "Read items from an extension's extensionData store (the tool_data table) from the agent side. Use this to inspect what data an extension currently has stored, or to verify a write succeeded. Requires viewer access to the extension.",
+                parameters: {
+                    type: "object",
+                    properties: {
+                        extensionId: {
+                            type: "string",
+                            description: "Extension id whose data store to read from.",
+                        },
+                        collection: {
+                            type: "string",
+                            description: "Collection name within the extension's data store.",
+                        },
+                        itemId: {
+                            type: "string",
+                            description: "Optional specific item id. If omitted, lists all items in the collection.",
+                        },
+                        scope: {
+                            type: "string",
+                            enum: ["user", "org", "all"],
+                            description: "Storage scope to read. 'user' (default) reads the current user's items; 'org' reads organization-shared items; 'all' reads both.",
+                        },
+                        limit: {
+                            type: "number",
+                            description: "Maximum items to return when listing (default 100, max 1000).",
+                        },
+                    },
+                    required: ["extensionId", "collection"],
+                },
+            },
+            run: async (args) => {
+                const extensionId = String(args?.extensionId ?? "").trim();
+                const collection = String(args?.collection ?? "").trim();
+                if (!extensionId || !collection)
+                    return "Error: extensionId and collection are required.";
+                await ensureExtensionsTables();
+                const access = await resolveAccess("extension", extensionId);
+                if (!access)
+                    return `Error: no access to extension ${extensionId}.`;
+                const userEmail = getRequestUserEmail()?.toLowerCase() ?? "";
+                const scope = args?.scope ?? "user";
+                const orgId = getRequestOrgId();
+                if ((scope === "org" || scope === "all") && !orgId)
+                    return "Error: org context required for scope=org or scope=all.";
+                const itemId = args?.itemId ? String(args.itemId).trim() : null;
+                const limit = Math.min(Math.max(1, Number(args?.limit) || 100), 1000);
+                const client = getDbExec();
+                if (itemId) {
+                    const scopeClause = scope === "org"
+                        ? `AND scope = 'org' AND org_id = ?`
+                        : scope === "all"
+                            ? `AND ((scope = 'user' AND lower(owner_email) = ?) OR (scope = 'org' AND org_id = ?))`
+                            : `AND scope = 'user' AND lower(owner_email) = ?`;
+                    const scopeArgs = scope === "org"
+                        ? [orgId ?? ""]
+                        : scope === "all"
+                            ? [userEmail, orgId ?? ""]
+                            : [userEmail];
+                    const result = await client.execute({
+                        sql: `SELECT COALESCE(item_id, id) AS id, data, scope, owner_email, updated_at
+              FROM tool_data
+              WHERE tool_id = ? AND collection = ? AND COALESCE(item_id, id) = ? ${scopeClause}`,
+                        args: [extensionId, collection, itemId, ...scopeArgs],
+                    });
+                    const row = result.rows?.[0];
+                    if (!row)
+                        return { found: false, extensionId, collection, itemId };
+                    return { found: true, ...row };
+                }
+                const scopeClause = scope === "org"
+                    ? `AND scope = 'org' AND org_id = ?`
+                    : scope === "all"
+                        ? `AND ((scope = 'user' AND lower(owner_email) = ?) OR (scope = 'org' AND org_id = ?))`
+                        : `AND scope = 'user' AND lower(owner_email) = ?`;
+                const scopeArgs = scope === "org"
+                    ? [orgId ?? ""]
+                    : scope === "all"
+                        ? [userEmail, orgId ?? ""]
+                        : [userEmail];
+                const result = await client.execute({
+                    sql: `SELECT COALESCE(item_id, id) AS id, data, scope, owner_email, updated_at
+            FROM tool_data
+            WHERE tool_id = ? AND collection = ? ${scopeClause}
+            ORDER BY updated_at DESC
+            LIMIT ?`,
+                    args: [extensionId, collection, ...scopeArgs, limit],
+                });
+                return {
+                    extensionId,
+                    collection,
+                    scope,
+                    count: result.rows?.length ?? 0,
+                    items: result.rows ?? [],
+                };
+            },
+        },
         "delete-extension": {
             tool: {
                 description: "Permanently delete an extension everywhere it is shared. Requires owner/admin access. If the user only wants a shared extension removed from their own sidebar/list, use hide-extension instead.",