@ai-matrx/content-ir-react 0.14.0 → 0.15.1

package/dist/react.cjs

@@ -54,6 +54,16 @@ var import_react2 = require("react");
 var import_react = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 var DirectiveHostContext = (0, import_react.createContext)(null);
+var DirectiveScopeContext = (0, import_react.createContext)({});
+function DirectiveScopeProvider({
+  conversationId,
+  children
+}) {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(DirectiveScopeContext.Provider, { value: { conversationId: conversationId ?? null }, children });
+}
+function useDirectiveScope() {
+  return (0, import_react.useContext)(DirectiveScopeContext);
+}
 var EMPTY_HOST = {};
 function useDirectiveHost() {
   return (0, import_react.useContext)(DirectiveHostContext) ?? EMPTY_HOST;
@@ -248,6 +258,10 @@ var MaximizeIcon = (p) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Svg, { .
   /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("line", { x1: "3", x2: "10", y1: "21", y2: "14" })
 ] });
 var LoaderIcon = (p) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Svg, { ...p, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("path", { d: "M21 12a9 9 0 1 1-6.219-8.56" }) });
+var RotateCcwIcon = (p) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Svg, { ...p, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("path", { d: "M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8" }),
+  /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("path", { d: "M3 3v5h5" })
+] });
 var CheckCircleIcon = (p) => /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Svg, { ...p, children: [
   /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("circle", { cx: "12", cy: "12", r: "10" }),
   /* @__PURE__ */ (0, import_jsx_runtime3.jsx)("path", { d: "m9 12 2 2 4-4" })
@@ -283,6 +297,8 @@ function ApplyDirectiveButton({
   onApplied
 }) {
   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 [state, setState] = (0, import_react4.useState)(
@@ -291,17 +307,19 @@ function ApplyDirectiveButton({
   const [elapsed, setElapsed] = (0, import_react4.useState)(0);
   const startedAt = (0, import_react4.useRef)(null);
   const nounText = (0, import_content_ir.nounLabel)(directive.noun, host.nouns);
-  const shellKey = readsLedger ? JSON.stringify([directive.slug, items]) : "";
+  const shellKey = readsLedger ? JSON.stringify([directive.slug, items, conversationId ?? null]) : "";
   const read = host.applyState;
   const report = host.reportError;
   (0, import_react4.useEffect)(() => {
     if (!shellKey || !read) return;
-    const [slug, shellItems] = JSON.parse(shellKey);
+    const [slug, shellItems, inConversation] = JSON.parse(shellKey);
+    const shell = { __kind: slug, items: shellItems };
+    if (inConversation) shell.conversationId = inConversation;
     let live = true;
     let polls = 0;
     let timer = null;
     const ask = () => {
-      read({ __kind: slug, items: shellItems }).then((answer) => {
+      read(shell).then((answer) => {
         if (!live) return;
         if (answer.state === "applied") {
           setState(
@@ -347,8 +365,9 @@ function ApplyDirectiveButton({
   if (!directive.parsed.executes) return null;
   const confirm = host.confirm;
   if (!confirm) return null;
-  async function handleApply() {
+  async function handleApply(again = false) {
     if (!confirm) return;
+    const before = state;
     if (host.ask) {
       setState({ status: "asking" });
       let ok = false;
@@ -356,7 +375,8 @@ function ApplyDirectiveButton({
         ok = await host.ask({
           directive,
           items,
-          nounLabel: nounText
+          nounLabel: nounText,
+          ...again ? { again: true } : {}
         });
       } catch (error) {
         setState({
@@ -366,14 +386,17 @@ function ApplyDirectiveButton({
         return;
       }
       if (!ok) {
-        setState({ status: "idle" });
+        setState(again ? before : { status: "idle" });
         return;
       }
     }
     setElapsed(0);
     setState({ status: "applying" });
     try {
-      const result = await confirm({ __kind: directive.slug, items });
+      const shell = { __kind: directive.slug, items };
+      if (conversationId) shell.conversationId = conversationId;
+      if (again) shell.force = true;
+      const result = await confirm(shell);
       setState({
         status: "applied",
         applied: result.applied,
@@ -397,20 +420,35 @@ function ApplyDirectiveButton({
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "span",
       {
-        className: `inline-flex min-w-0 flex-wrap items-center gap-1 text-xs ${bad ? "text-destructive" : "text-primary"}`,
+        className: `flex min-w-0 flex-wrap items-center gap-x-2 gap-y-0.5 text-xs ${bad ? "text-destructive" : "text-primary"}`,
         "data-apply-state": "applied",
         children: [
-          bad ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(AlertIcon, { className: "h-3.5 w-3.5 shrink-0" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CheckCircleIcon, { className: "h-3.5 w-3.5 shrink-0" }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { children: [
-            state.message ?? `Applied ${state.applied}`,
-            bad && !state.message ? ` \xB7 ${state.failed} failed` : ""
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { className: "inline-flex min-w-0 items-start gap-1", children: [
+            bad ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(AlertIcon, { className: "mt-px h-3.5 w-3.5 shrink-0" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CheckCircleIcon, { className: "mt-px h-3.5 w-3.5 shrink-0" }),
+            /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("span", { className: "min-w-0", children: [
+              state.message ?? `Applied ${state.applied}`,
+              bad && !state.message ? ` \xB7 ${state.failed} failed` : ""
+            ] })
           ] }),
           records.map((record) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { className: "inline-flex min-w-0 items-center", children: host.renderRecord?.({
             ...record,
             fallback: recordFallbackName(label2, record.id),
             context: "applied",
             trashed
-          }) }, `${record.noun}:${record.id}`))
+          }) }, `${record.noun}:${record.id}`)),
+          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
+            "button",
+            {
+              type: "button",
+              onClick: () => void handleApply(!bad),
+              className: "inline-flex items-center gap-1 rounded px-1 py-0.5 text-muted-foreground hover:bg-accent hover:text-accent-foreground",
+              "data-apply-action": bad ? "retry" : "run-again",
+              children: [
+                /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(RotateCcwIcon, { className: "h-3 w-3" }),
+                bad ? "Retry" : "Run again"
+              ]
+            }
+          )
         ]
       }
     );
@@ -684,7 +722,11 @@ function isWholeJson(content) {
     return false;
   }
 }
-function DirectiveRender({ content, className, streaming }) {
+function DirectiveRender({ conversationId, ...props }) {
+  if (conversationId === void 0) return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DirectiveRenderInner, { ...props });
+  return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DirectiveScopeProvider, { conversationId, children: /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(DirectiveRenderInner, { ...props }) });
+}
+function DirectiveRenderInner({ content, className, streaming }) {
   const host = useDirectiveHost();
   const directive = (0, import_content_ir6.tryDecodeDirectiveContent)(content, (message) => {
     const line = `[kind-directives] ${message}`;