@ai-matrx/content-ir-react 0.17.1 → 0.18.1

package/dist/react.cjs

@@ -329,19 +329,52 @@ function classIcon(directiveClass, noun) {
 
 // directives/ApplyDirectiveButton.tsx
 var import_jsx_runtime4 = require("react/jsx-runtime");
+var applyOutcomes = /* @__PURE__ */ new WeakMap();
+var EMPTY_AUTHORITY = {};
+var outcomeListeners = /* @__PURE__ */ new Set();
+function outcomesOf(host) {
+  let held = applyOutcomes.get(host);
+  if (!held) {
+    held = /* @__PURE__ */ new Map();
+    applyOutcomes.set(host, held);
+  }
+  return held;
+}
+function publishOutcome(host, identity, outcome) {
+  outcomesOf(host).set(identity, outcome);
+  for (const listener of outcomeListeners) listener();
+}
+function subscribeOutcomes(listener) {
+  outcomeListeners.add(listener);
+  return () => {
+    outcomeListeners.delete(listener);
+  };
+}
+function useApplyOutcome(host, identity) {
+  return (0, import_react4.useSyncExternalStore)(
+    subscribeOutcomes,
+    () => applyOutcomes.get(host)?.get(identity) ?? null,
+    () => null
+  );
+}
 var FINISH_POLL_MS = 2e3;
 var FINISH_POLLS_MAX = 30;
+function readsApplyLedger(host, directive) {
+  return !!host.applyState && !!host.confirm && directive.parsed.executes && directive.items.length > 0;
+}
 function ApplyDirectiveButton({
   directive,
   label = "Apply",
   itemCount,
-  onApplied
+  onApplied,
+  onPhase,
+  nothingToChange = false
 }) {
   const host = useDirectiveHost();
   const scope = useDirectiveScope();
   const conversationId = scope.conversationId || void 0;
   const items = directive.items;
-  const readsLedger = !!host.applyState && !!host.confirm && directive.parsed.executes && items.length > 0;
+  const readsLedger = readsApplyLedger(host, directive);
   const initial = readsLedger ? { status: "checking" } : { status: "idle" };
   const [state, setState] = (0, import_react4.useState)(initial);
   const [elapsed, setElapsed] = (0, import_react4.useState)(0);
@@ -355,6 +388,8 @@ function ApplyDirectiveButton({
     setAskingAgain(false);
     setElapsed(0);
   }
+  const shared = useApplyOutcome(host.confirm ?? EMPTY_AUTHORITY, identity);
+  const view = state.status === "asking" || !shared ? state : shared;
   const currentIdentity = (0, import_react4.useRef)(identity);
   (0, import_react4.useEffect)(() => {
     currentIdentity.current = identity;
@@ -382,7 +417,8 @@ function ApplyDirectiveButton({
               failed: 0,
               message: answer.message?.trim() ? answer.message.trim() : null,
               records: answer.records ?? [],
-              copies: Math.max(1, answer.copies ?? 1)
+              copies: Math.max(1, answer.copies ?? 1),
+              before: answer.before ?? null
             } : prev
           );
         } else if (answer.state === "in_flight" && polls < FINISH_POLLS_MAX) {
@@ -407,24 +443,34 @@ function ApplyDirectiveButton({
       if (timer) clearTimeout(timer);
     };
   }, [shellKey, read, report]);
+  const appliedClean = view.status === "applied" && view.failed === 0 ? view : null;
+  const appliedBefore = appliedClean ? appliedClean.before : null;
+  const phaseKey = view.status === "checking" || view.status === "finishing" ? "pending" : appliedClean ? `applied:${JSON.stringify(appliedBefore)}` : "open";
+  (0, import_react4.useEffect)(() => {
+    if (!onPhase) return;
+    if (phaseKey === "pending") onPhase({ phase: "pending" });
+    else if (phaseKey === "open") onPhase({ phase: "open" });
+    else onPhase({ phase: "applied", before: appliedBefore });
+  }, [phaseKey, onPhase, appliedBefore]);
+  const applyingSince = view.status === "applying" ? view.startedAt : null;
   (0, import_react4.useEffect)(() => {
-    if (state.status !== "applying") return;
-    startedAt.current = Date.now();
+    if (applyingSince === null) return;
+    startedAt.current = applyingSince;
     const id = setInterval(
       () => setElapsed(Math.round((Date.now() - (startedAt.current ?? 0)) / 1e3)),
       1e3
     );
     return () => clearInterval(id);
-  }, [state.status]);
+  }, [applyingSince]);
   if (!directive.parsed.executes) return null;
   const confirm = host.confirm;
   if (!confirm) return null;
   async function handleApply(again = false) {
     if (!confirm) return;
-    const before = state;
+    const prior = view;
     const askedFor = identity;
     const stillHere = () => currentIdentity.current === askedFor;
-    const priorCopies = state.status === "applied" ? state.copies : 0;
+    const priorCopies = view.status === "applied" ? view.copies : 0;
     if (host.ask) {
       if (again) setAskingAgain(true);
       else setState({ status: "asking" });
@@ -448,41 +494,43 @@ function ApplyDirectiveButton({
       if (!stillHere()) return;
       setAskingAgain(false);
       if (!ok) {
-        setState(again ? before : { status: "idle" });
+        setState(again ? prior : { status: "idle" });
         return;
       }
     }
     setElapsed(0);
-    setState({ status: "applying" });
+    setState((prev) => prev.status === "asking" ? { status: "idle" } : prev);
+    publishOutcome(confirm, askedFor, { status: "applying", startedAt: Date.now() });
     try {
       const shell = { __kind: directive.slug, items };
       if (conversationId) shell.conversationId = conversationId;
       if (again) shell.force = true;
       const result = await confirm(shell);
-      if (!stillHere()) return;
-      setState({
+      publishOutcome(confirm, askedFor, {
         status: "applied",
         applied: result.applied,
         failed: result.failed,
         message: result.message?.trim() ? result.message.trim() : null,
         records: result.records ?? [],
         // "Run again" made one more; a first apply (or a replay of one) is one.
-        copies: again ? Math.max(1, priorCopies) + 1 : Math.max(1, priorCopies)
+        copies: again ? Math.max(1, priorCopies) + 1 : Math.max(1, priorCopies),
+        // "Run again" wrote the same values over themselves; what the FIRST
+        // apply replaced is still the change this block made.
+        before: again && prior.status === "applied" && prior.before ? prior.before : result.before ?? null
       });
-      onApplied?.();
+      if (stillHere()) onApplied?.();
     } catch (error) {
-      if (!stillHere()) return;
-      setState({
+      publishOutcome(confirm, askedFor, {
         status: "error",
         message: error instanceof Error && error.message ? error.message : "That couldn't be applied just now. Please try again."
       });
     }
   }
-  if (state.status === "applied") {
-    const bad = state.failed > 0;
+  if (view.status === "applied") {
+    const bad = view.failed > 0;
     const trashed = directive.directiveClass === "delete";
     const label2 = nounText;
-    const records = host.renderRecord ? state.records : [];
+    const records = host.renderRecord ? view.records : [];
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "span",
       {
@@ -496,26 +544,26 @@ function ApplyDirectiveButton({
               {
                 words: failureWords(
                   {
-                    raw: state.message ?? `${state.failed} failed`,
+                    raw: view.message ?? `${view.failed} failed`,
                     directiveClass: directive.directiveClass,
                     noun: directive.noun,
                     nounLabel: nounText,
-                    failed: state.failed,
-                    total: state.applied + state.failed
+                    failed: view.failed,
+                    total: view.applied + view.failed
                   },
                   host.explainFailure
                 ),
-                raw: state.message
+                raw: view.message
               }
-            ) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "min-w-0", children: state.message ?? `Applied ${state.applied}` })
+            ) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "min-w-0", children: view.message ?? `Applied ${view.applied}` })
           ] }),
-          state.copies > 1 ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+          view.copies > 1 ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
             "span",
             {
               className: "shrink-0 text-muted-foreground",
-              "data-apply-copies": state.copies,
+              "data-apply-copies": view.copies,
               title: records.length > 0 ? directive.directiveClass === "create" ? "Links to the latest copy." : "Links to the latest run." : void 0,
-              children: directive.directiveClass === "create" ? `${state.copies} copies` : `Ran ${state.copies} times`
+              children: directive.directiveClass === "create" ? `${view.copies} copies` : `Ran ${view.copies} times`
             }
           ) : null,
           records.map((record) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "inline-flex min-w-0 items-center", children: host.renderRecord?.({
@@ -542,7 +590,7 @@ function ApplyDirectiveButton({
       }
     );
   }
-  if (state.status === "checking") {
+  if (view.status === "checking") {
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
       "span",
       {
@@ -554,7 +602,7 @@ function ApplyDirectiveButton({
       }
     );
   }
-  if (state.status === "finishing") {
+  if (view.status === "finishing") {
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "span",
       {
@@ -569,22 +617,25 @@ function ApplyDirectiveButton({
     );
   }
   const destructive = directive.directiveClass === "delete";
+  const muted = nothingToChange && view.status === "idle";
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { className: "inline-flex items-center gap-2", children: [
+    muted ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "text-xs text-muted-foreground", "data-apply-nothing": "", children: "Nothing to change" }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "button",
       {
         type: "button",
         onClick: () => void handleApply(),
-        disabled: state.status === "applying" || state.status === "asking" || items.length === 0,
-        "data-apply-tone": destructive ? "destructive" : "default",
-        className: `inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs font-medium disabled:opacity-50 ${destructive ? "border-destructive/50 bg-background text-destructive hover:bg-destructive/10" : "border-border bg-background hover:bg-accent"}`,
+        disabled: view.status === "applying" || view.status === "asking" || items.length === 0,
+        "data-apply-tone": muted ? "muted" : destructive ? "destructive" : "default",
+        title: muted ? "It sets no fields, so applying it changes nothing." : void 0,
+        className: `inline-flex items-center gap-1 rounded-md border px-2 py-1 text-xs font-medium disabled:opacity-50 ${muted ? "border-border/60 bg-background text-muted-foreground hover:bg-accent" : destructive ? "border-destructive/50 bg-background text-destructive hover:bg-destructive/10" : "border-border bg-background hover:bg-accent"}`,
         children: [
-          state.status === "applying" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(LoaderIcon, { className: "h-3.5 w-3.5 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(PlayIcon, { className: "h-3.5 w-3.5" }),
-          state.status === "applying" ? `Applying${itemCount ? ` ${itemCount} ${itemCount === 1 ? "item" : "items"}` : ""}\u2026${elapsed ? ` ${elapsed}s` : ""}` : label
+          view.status === "applying" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(LoaderIcon, { className: "h-3.5 w-3.5 animate-spin" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(PlayIcon, { className: "h-3.5 w-3.5" }),
+          view.status === "applying" ? `Applying${itemCount ? ` ${itemCount} ${itemCount === 1 ? "item" : "items"}` : ""}\u2026${elapsed ? ` ${elapsed}s` : ""}` : label
         ]
       }
     ),
-    state.status === "error" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
+    view.status === "error" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "span",
       {
         className: "inline-flex max-w-sm items-start gap-1 text-xs text-destructive",
@@ -596,14 +647,14 @@ function ApplyDirectiveButton({
             {
               words: failureWords(
                 {
-                  raw: state.message,
+                  raw: view.message,
                   directiveClass: directive.directiveClass,
                   noun: directive.noun,
                   nounLabel: nounText
                 },
                 host.explainFailure
               ),
-              raw: state.message
+              raw: view.message
             }
           )
         ]
@@ -765,12 +816,13 @@ function ItemRow({
   directive,
   item,
   index,
-  total
+  total,
+  phase
 }) {
   const host = useDirectiveHost();
   const recordId = TARGETING_CLASSES.has(directive.directiveClass) ? itemRecordId(item) : null;
   if (recordId) {
-    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(TargetRow, { directive, item, recordId });
+    return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(TargetRow, { directive, item, recordId, index, phase });
   }
   const titleColumn = (0, import_content_ir5.nounTitleColumn)(directive.noun, host.nouns);
   const title = (0, import_content_ir5.itemTitle)(item, titleColumn, index, total);
@@ -857,16 +909,20 @@ function DirectiveChangeList({
 function TargetRow({
   directive,
   item,
-  recordId
+  recordId,
+  index,
+  phase
 }) {
   const host = useDirectiveHost();
   const fallback = recordFallbackName((0, import_content_ir5.nounLabel)(directive.noun, host.nouns), recordId);
   const isUpdate = directive.directiveClass === "update";
-  const current = useRecordValues(
-    isUpdate ? host.readRecord : void 0,
-    isUpdate ? { noun: directive.noun, id: recordId } : null
+  const readsLive = isUpdate && phase.phase === "open";
+  const live = useRecordValues(
+    readsLive ? host.readRecord : void 0,
+    readsLive ? { noun: directive.noun, id: recordId } : null
   );
-  const changes = isUpdate ? itemChanges(item, current.values, { titleColumn: (0, import_content_ir5.nounTitleColumn)(directive.noun, host.nouns) }) : [];
+  const compareTo = phase.phase === "applied" ? phase.before?.[index] ?? null : readsLive ? live.values : null;
+  const changes = isUpdate ? itemChanges(item, compareTo, { titleColumn: (0, import_content_ir5.nounTitleColumn)(directive.noun, host.nouns) }) : [];
   const name = host.renderRecord ? host.renderRecord({ noun: directive.noun, id: recordId, fallback, context: "row" }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("span", { className: "truncate font-medium text-foreground", children: fallback });
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "py-1 text-xs", "data-directive-target": recordId, children: [
     /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "flex min-w-0 items-center gap-2", children: [
@@ -883,6 +939,10 @@ function SideEffectDirectiveCard({ directive }) {
   const total = items.length;
   const display = (0, import_content_ir5.directiveDisplay)(directive.directiveClass, directive.noun, host.nouns);
   const Icon = classIcon(directive.directiveClass, directive.noun);
+  const [phase, setPhase] = (0, import_react6.useState)(
+    () => readsApplyLedger(host, directive) ? { phase: "pending" } : { phase: "open" }
+  );
+  const nothingToChange = directive.directiveClass === "update" && total > 0 && items.every((item) => itemChanges(item).length === 0);
   const shown = expanded ? items : items.slice(0, ROWS_BEFORE_FOLD);
   const hidden = total - shown.length;
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "my-3 rounded-md border border-border bg-card px-2.5 py-1.5", "data-directive": directive.slug, children: [
@@ -897,13 +957,21 @@ function SideEffectDirectiveCard({ directive }) {
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)("div", { className: "ml-auto flex items-center gap-1", children: [
         host.renderCopy?.({ label: display.title, value: directive.shell, size: "icon" }),
-        /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ApplyDirectiveButton, { directive, itemCount: total })
+        /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
+          ApplyDirectiveButton,
+          {
+            directive,
+            itemCount: total,
+            onPhase: setPhase,
+            nothingToChange
+          }
+        )
       ] })
     ] }),
     total === 0 ? (
       // Stated, never silent: an empty batch is a real (and suspicious) state.
       /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { className: "mt-1 text-xs text-muted-foreground", children: "No items \u2014 nothing would be written." })
-    ) : /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: "mt-0.5 divide-y divide-border/60", children: shown.map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ItemRow, { directive, item, index: i, total }, i)) }),
+    ) : /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("div", { className: "mt-0.5 divide-y divide-border/60", children: shown.map((item, i) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(ItemRow, { directive, item, index: i, total, phase }, i)) }),
     hidden > 0 || expanded ? /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
       "button",
       {