dsh-rewind-plugin 0.13.0-alpha.2 → 0.14.0-beta.1

package/lib/client.js

@@ -78,6 +78,32 @@ function isPreviewCommand(command) {
 function isCandidateCommand(command) {
   return (command.args ?? "").includes("__candidates");
 }
+function coalesceCuts(spans) {
+  if (spans.length < 2) return spans;
+  const sorted = [...spans].sort((left, right) => left.start - right.start || left.end - right.end);
+  const merged = [];
+  for (const span of sorted) {
+    const last = merged[merged.length - 1];
+    if (last !== void 0 && span.start <= last.end) {
+      if (span.end > last.end) last.end = span.end;
+      continue;
+    }
+    merged.push({ start: span.start, end: span.end });
+  }
+  return merged;
+}
+function cutsContain(cuts, seq) {
+  let low = 0;
+  let high = cuts.length - 1;
+  while (low <= high) {
+    const middle = low + high >> 1;
+    const cut = cuts[middle];
+    if (seq < cut.start) high = middle - 1;
+    else if (seq > cut.end) low = middle + 1;
+    else return true;
+  }
+  return false;
+}
 function hiddenSeqsOf(snap) {
   const hidden = /* @__PURE__ */ new Set();
   const spans = [];
@@ -99,13 +125,11 @@ function hiddenSeqsOf(snap) {
       spans.push({ start: target, end: marker });
     }
   }
+  const cuts = coalesceCuts(spans);
   for (const key of snap.order) {
     const node = snap.nodes.get(key);
     if (node === void 0) continue;
-    const anchor = node.anchorSeq;
-    if (spans.some((span) => anchor >= span.start && anchor <= span.end)) {
-      hidden.add(anchor);
-    }
+    if (cutsContain(cuts, node.anchorSeq)) hidden.add(node.anchorSeq);
   }
   return hidden;
 }
@@ -373,25 +397,10 @@ var STYLE = `
   pointer-events: none;
 }
 
-/* ---- Snapshot-cleanup configuration form (mirrors the harness plugin form) ---- */
-/* The Plugins page draws the bundle's title, icon, crumb, and description; this
-   is the form body only. Every value mirrors ui-settings-plugins'
-   PluginConfigForm.module.css / fields.module.css /
-   SubagentModelSelectionFields.module.css: those components are package-internal
-   (the package ships lib/** only) and cannot be imported across packages, so the
-   numbers are copied rather than the components. */
-.dsh-rewind-cleanup-form {
-  display: flex;
-  flex-direction: column;
-}
-.dsh-rewind-cleanup-readonly,
-.dsh-rewind-cleanup-unavailable {
-  margin: 0 0 12px;
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
-}
-/* Auto-cleanup permission block: the label + Switch row, then the hint. */
+/* ---- Snapshot-cleanup configuration form ---- */
+/* The Plugins page draws the bundle's title, icon, crumb, description, and the
+   shared settings form frame (labels, save, read-only and failure lines); this
+   styles only the one control the card owns: the auto-cleanup toggle row. */
 .dsh-rewind-cleanup-permission {
   display: grid;
   gap: 6px;
@@ -410,127 +419,12 @@ var STYLE = `
   flex: 1;
   min-width: 0;
 }
-.dsh-rewind-cleanup-field {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  padding: 12px 0;
-}
-.dsh-rewind-cleanup-field + .dsh-rewind-cleanup-field {
-  border-top: 0.5px solid var(--dsw-alias-border-l2);
-}
-.dsh-rewind-cleanup-head {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-.dsh-rewind-cleanup-label-group {
-  display: flex;
-  align-items: center;
-  gap: 4px;
-  flex: 1;
-  min-width: 0;
-}
-.dsh-rewind-cleanup-label {
-  flex: 1;
-  min-width: 0;
-  font-size: 13px;
-  font-weight: 500;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
-}
-.dsh-rewind-cleanup-label-group > .dsh-rewind-cleanup-label {
-  flex: 0 1 auto;
-}
-.dsh-rewind-cleanup-badges {
-  display: inline-flex;
-  align-items: center;
-  gap: 8px;
-}
-.dsh-rewind-cleanup-reset {
-  border: none;
-  background: none;
-  padding: 0;
-  font: inherit;
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-secondary);
-  cursor: pointer;
-}
-.dsh-rewind-cleanup-reset:hover:not(:disabled) {
-  color: var(--dsw-alias-label-primary);
-}
-.dsh-rewind-cleanup-reset:disabled {
-  cursor: default;
-}
 .dsh-rewind-cleanup-hint {
   margin: 0;
   font-size: 12px;
   line-height: 1.5;
   color: var(--dsw-alias-label-tertiary);
 }
-.dsh-rewind-cleanup-error {
-  margin: 0;
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-state-error-primary);
-}
-.dsh-rewind-cleanup-input {
-  height: 34px;
-  padding: 0 12px;
-  border: 0.5px solid var(--dsw-alias-border-l4);
-  border-radius: 8px;
-  background: var(--dsw-alias-bg-layer-3);
-  font: inherit;
-  font-size: 13px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
-}
-.dsh-rewind-cleanup-input:focus-visible {
-  outline: none;
-  border-color: var(--dsw-alias-brand-primary);
-}
-.dsh-rewind-cleanup-input:disabled {
-  color: var(--dsw-alias-label-tertiary);
-  cursor: default;
-}
-.dsh-rewind-cleanup-input[aria-invalid='true'] {
-  border-color: var(--dsw-alias-state-error-primary);
-}
-.dsh-rewind-cleanup-footer {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding-top: 16px;
-}
-.dsh-rewind-cleanup-failed {
-  flex: 1;
-  min-width: 0;
-  margin: 0;
-  font-size: 12px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-error);
-}
-.dsh-rewind-cleanup-save {
-  appearance: none;
-  border: 1px solid transparent;
-  border-radius: 8px;
-  padding: 5px 14px;
-  font: inherit;
-  font-size: 13px;
-  line-height: 1.5;
-  cursor: pointer;
-  background: var(--dsw-alias-label-primary);
-  color: var(--dsw-alias-bg-layer-3);
-}
-.dsh-rewind-cleanup-save:disabled {
-  opacity: 0.4;
-  cursor: default;
-}
-.dsh-rewind-cleanup-save:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary);
-  outline-offset: 1px;
-}
 `;
 
 // src/client/popover.ts
@@ -1047,6 +941,14 @@ function showHint(text) {
 var COMPOSER_EDITABLE_SELECTOR = "[data-composer-input]";
 var USER_SEAT_SELECTOR = '[data-chat-flow-kind="user"][data-chat-anchor-key], [data-chat-flow-kind="steering"][data-chat-anchor-key]';
 var CHAT_SEAT_SELECTOR = "[data-chat-anchor-key]";
+var GROUP_SHELL_SELECTOR = '[data-chat-anchor-key^="group:"]';
+function resolveSeatAnchorSeq(element, chat) {
+  if (chat === void 0) return void 0;
+  const flowKey = element.dataset.chatAnchorKey;
+  const nodeKey = element.dataset.chatNodeKey;
+  const node = (flowKey !== void 0 ? chat.nodes.get(flowKey) : void 0) ?? (nodeKey !== void 0 ? chat.nodes.get(nodeKey) : void 0);
+  return node?.anchorSeq;
+}
 var PENDING_SEAT_SELECTOR = "[data-pending-steering]";
 function actionsContainerOf(row) {
   const buttons = Array.from(row?.querySelectorAll("button") ?? []);
@@ -1055,6 +957,38 @@ function actionsContainerOf(row) {
   if (structural instanceof HTMLElement && structural.querySelector("button") !== null) return structural;
   return void 0;
 }
+function hideWithdrawnSeats(chat, seats, hiddenSeqs, hidden) {
+  if (chat === void 0) return;
+  const shells = /* @__PURE__ */ new Map();
+  for (const seat of seats) {
+    if (seat.matches(GROUP_SHELL_SELECTOR)) continue;
+    const anchor = resolveSeatAnchorSeq(seat, chat);
+    const withdrawn = anchor !== void 0 && hiddenSeqs.has(anchor);
+    if (withdrawn) {
+      seat.style.display = "none";
+      seat.dataset.dshRewindHidden = "true";
+      hidden.add(seat);
+    } else if (hidden.has(seat)) {
+      seat.style.display = "";
+      delete seat.dataset.dshRewindHidden;
+      hidden.delete(seat);
+    }
+    const shell = seat.parentElement?.closest(GROUP_SHELL_SELECTOR);
+    if (shell === null || shell === void 0) continue;
+    shells.set(shell, (shells.get(shell) ?? true) && withdrawn);
+  }
+  for (const [shell, allWithdrawn] of shells) {
+    if (allWithdrawn) {
+      shell.style.display = "none";
+      shell.dataset.dshRewindHidden = "true";
+      hidden.add(shell);
+    } else if (hidden.has(shell)) {
+      shell.style.display = "";
+      delete shell.dataset.dshRewindHidden;
+      hidden.delete(shell);
+    }
+  }
+}
 function collectTargets(chat, hiddenSeqs) {
   const rows = /* @__PURE__ */ new Map();
   for (const element of document.querySelectorAll(USER_SEAT_SELECTOR)) {
@@ -1145,19 +1079,12 @@ function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchC
       const snapshot = session.getSnapshot();
       const chat = chatOf(session);
       const hiddenSeqs = chat === void 0 ? /* @__PURE__ */ new Set() : hiddenSeqsOf(chat);
-      for (const seat of chat === void 0 ? [] : document.querySelectorAll(CHAT_SEAT_SELECTOR)) {
-        const key = seat.dataset.chatAnchorKey;
-        const anchor = key !== void 0 ? chat?.nodes.get(key)?.anchorSeq : void 0;
-        if (anchor !== void 0 && hiddenSeqs.has(anchor)) {
-          seat.style.display = "none";
-          seat.dataset.dshRewindHidden = "true";
-          hidden.current.add(seat);
-        } else if (hidden.current.has(seat)) {
-          seat.style.display = "";
-          delete seat.dataset.dshRewindHidden;
-          hidden.current.delete(seat);
-        }
-      }
+      hideWithdrawnSeats(
+        chat,
+        chat === void 0 ? [] : document.querySelectorAll(CHAT_SEAT_SELECTOR),
+        hiddenSeqs,
+        hidden.current
+      );
       const durable = collectDurableTargets(snapshot, chat, hiddenSeqs);
       const next = [...durable, ...collectPendingTargets(snapshot, steeringItemsOf(inboxOf(session)?.["next-step"]))];
       setTargets((current) => sameTargets(current, next) ? current : next);
@@ -1306,9 +1233,9 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.13.0-alpha.2" : "dev";
+var PLUGIN_VERSION = true ? "0.14.0-beta.1" : "dev";
 var PLUGIN_PACKAGE = "dsh-rewind-plugin";
-var BUILD_HASH = true ? "d7022b63" : "dev";
+var BUILD_HASH = true ? "190a881a" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1391,201 +1318,100 @@ var en = {
 };
 
 // src/client/settings-card.tsx
-var import_react2 = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
 var import_jsx_runtime2 = require("react/jsx-runtime");
-var CLEANUP_SETTINGS_NAMESPACE = "dsh-rewind-snapshot-cleanup";
+var CLEANUP_ENTRY_ID = "dsh-rewind-plugin";
 var DEFAULT_MAX_AGE_DAYS = 30;
-function parseMaxAge(text) {
-  const trimmed = text.trim();
-  if (trimmed === "") return { kind: "clear" };
-  if (!/^\d+$/.test(trimmed)) return void 0;
-  const days = Number(trimmed);
-  return Number.isSafeInteger(days) && days > 0 ? { kind: "set", value: days } : void 0;
-}
-function formatMaxAge(value) {
-  return typeof value === "number" ? String(value) : "";
-}
-function formatEnabled(value) {
-  return String(value === true);
-}
-function parseEnabled(text) {
-  return { kind: "set", value: text === "true" };
-}
-function formatOf(field, value) {
-  return field === "enabled" ? formatEnabled(value) : formatMaxAge(value);
-}
-function parseOf(field, text) {
-  return field === "enabled" ? parseEnabled(text) : parseMaxAge(text);
-}
-function textOf2(field, staged, reads) {
-  const edit = staged.get(field);
-  return edit !== void 0 ? edit.text : formatOf(field, reads.value);
-}
-function overriddenOf(field, staged, reads) {
-  const edit = staged.get(field);
-  if (edit === void 0) return reads.stored;
-  if (edit.clear) return false;
-  return parseOf(field, edit.text)?.kind === "set";
-}
-function invalidOf(field, staged) {
-  const edit = staged.get(field);
-  if (edit === void 0 || edit.clear) return false;
-  return parseOf(field, edit.text) === void 0;
-}
-function planOf(staged, reads) {
-  const plan = [];
-  for (const [field, edit] of staged) {
-    const read = reads(field);
-    if (edit.clear) {
-      if (read.stored) plan.push({ field, kind: "clear" });
-      continue;
-    }
-    if (edit.text === formatOf(field, read.value)) continue;
-    const write = parseOf(field, edit.text);
-    if (write === void 0) plan.push({ field, kind: "invalid" });
-    else if (write.kind === "clear") {
-      if (read.stored) plan.push({ field, kind: "clear" });
-    } else {
-      plan.push({ field, kind: "set", value: write.value });
-    }
-  }
-  return plan;
-}
-function shellOf(plan, flags) {
+function autoCleanupEnabledField() {
   return {
-    dirty: plan.length > 0,
-    invalid: plan.some((entry) => entry.kind === "invalid"),
-    saving: flags.saving,
-    failed: flags.failed
+    field: "autoCleanupEnabled",
+    format: (value) => String(value === true),
+    parse: (text) => ({ kind: "set", value: text === "true" })
   };
 }
-function SettingsCleanupCard({ view, api, t }) {
-  const [staged, setStaged] = (0, import_react2.useState)(() => /* @__PURE__ */ new Map());
-  const [saving, setSaving] = (0, import_react2.useState)(false);
-  const [failed, setFailed] = (0, import_react2.useState)(false);
-  const [, setRevision] = (0, import_react2.useState)(0);
-  (0, import_react2.useEffect)(() => api.subscribe(() => {
-    setRevision((revision) => revision + 1);
-  }), [api]);
-  if (view === "summary") return null;
-  const readField = (field) => ({
-    value: api.read(field),
-    stored: api.stored(field)
-  });
-  const stage = (field, edit) => {
-    setStaged((current) => {
-      const next = new Map(current);
-      next.set(field, edit);
-      return next;
-    });
-    setFailed(false);
+function formLabels(t) {
+  return {
+    unavailable: t("cleanup.unavailable"),
+    readOnly: t("cleanup.readonly"),
+    saveFailed: t("cleanup.saveFailed"),
+    save: t("cleanup.save"),
+    saving: t("cleanup.saving")
   };
-  const plan = planOf(staged, readField);
-  const shell = shellOf(plan, { saving, failed });
-  const writable = api.writable();
-  const disabled = !writable || saving;
-  const blocked = !shell.dirty || shell.invalid || shell.saving;
-  const save = async () => {
-    const writes = plan.map((entry) => async () => {
-      if (entry.kind === "clear") return api.unset(entry.field);
-      if (entry.kind === "set") return api.set(entry.field, entry.value);
-      return false;
-    });
-    if (plan.length === 0 || saving || plan.some((entry) => entry.kind === "invalid")) return;
-    setSaving(true);
-    setFailed(false);
-    let landed = true;
-    for (const write of writes) landed = await write() && landed;
-    if (landed) setStaged(/* @__PURE__ */ new Map());
-    setSaving(false);
-    setFailed(!landed);
+}
+function cleanupForm(scope) {
+  const form = new import_dsh_client_ui_primitives.SettingsFormModel(scope, [
+    autoCleanupEnabledField(),
+    (0, import_dsh_client_ui_primitives.settingsNumberField)("autoCleanupMaxAgeDays")
+  ]);
+  return {
+    form,
+    store: form.bind(() => ({
+      ...form.shell(),
+      enabled: form.field("autoCleanupEnabled"),
+      maxAgeDays: form.field("autoCleanupMaxAgeDays")
+    }))
   };
-  const enabledReads = readField("enabled");
-  const enabledText = textOf2("enabled", staged, enabledReads);
-  const enabled = enabledText === "true";
-  const maxAgeReads = readField("maxAgeDays");
-  const maxAgeText = textOf2("maxAgeDays", staged, maxAgeReads);
-  const maxAgeInvalid = invalidOf("maxAgeDays", staged);
-  if (!api.available()) {
-    return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-unavailable", role: "status", children: t("cleanup.unavailable") });
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-form", children: [
-    !writable ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-readonly", role: "status", children: t("cleanup.readonly") }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-permission", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-toggle-row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-toggle-label", children: t("cleanup.auto") }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          import_dsh_client_ui_primitives.Switch,
+}
+function SettingsCleanupCard(props) {
+  const { t, useCleanupCard } = props;
+  const state = useCleanupCard((snapshot) => snapshot);
+  if (props.view === "summary") return null;
+  const disabled = !state.writable || state.saving;
+  const enabled = state.enabled.text === "true";
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+    import_dsh_client_ui_primitives.SettingsForm,
+    {
+      labels: formLabels(t),
+      state,
+      onSave: props.save,
+      onDiscard: props.discard,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-permission", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-toggle-row", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-toggle-label", children: t("cleanup.auto") }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+              import_dsh_client_ui_primitives.Switch,
+              {
+                checked: enabled,
+                label: t("cleanup.auto"),
+                disabled,
+                onChange: (next) => {
+                  props.edit("autoCleanupEnabled", String(next));
+                }
+              }
+            )
+          ] }),
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-hint", children: t(enabled ? "cleanup.auto.on" : "cleanup.auto.off") })
+        ] }),
+        enabled ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+          import_dsh_client_ui_primitives.SettingsValueField,
           {
-            checked: enabled,
-            label: t("cleanup.auto"),
+            id: "dsh-rewind-cleanup-maxage",
+            label: t("cleanup.maxAge"),
+            hint: t("cleanup.maxAge.hint"),
+            overriddenLabel: t("cleanup.overridden"),
+            resetLabel: t("cleanup.reset"),
+            invalidLabel: t("cleanup.invalid"),
+            placeholder: String(DEFAULT_MAX_AGE_DAYS),
+            numeric: true,
             disabled,
-            onChange: (next) => {
-              stage("enabled", { text: formatEnabled(next), clear: false });
-            }
-          }
-        )
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-hint", children: t(enabled ? "cleanup.auto.on" : "cleanup.auto.off") })
-    ] }),
-    enabled ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-field", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-head", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "dsh-rewind-cleanup-label-group", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("label", { className: "dsh-rewind-cleanup-label", htmlFor: "dsh-rewind-cleanup-maxage", children: t("cleanup.maxAge") }) }),
-        overriddenOf("maxAgeDays", staged, maxAgeReads) ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { className: "dsh-rewind-cleanup-badges", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives.Tag, { tone: "neutral", children: t("cleanup.overridden") }),
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-            "button",
-            {
-              type: "button",
-              className: "dsh-rewind-cleanup-reset",
-              disabled,
-              onClick: () => {
-                stage("maxAgeDays", { text: formatMaxAge(api.base("maxAgeDays")), clear: true });
-              },
-              children: t("cleanup.reset")
+            ...state.maxAgeDays,
+            onEdit: (text) => {
+              props.edit("autoCleanupMaxAgeDays", text);
+            },
+            onReset: () => {
+              props.resetField("autoCleanupMaxAgeDays");
             }
-          )
-        ] }) : null
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-        "input",
-        {
-          id: "dsh-rewind-cleanup-maxage",
-          className: "dsh-rewind-cleanup-input",
-          type: "text",
-          inputMode: "numeric",
-          ...maxAgeInvalid ? { "aria-invalid": true } : {},
-          "aria-describedby": "dsh-rewind-cleanup-maxage-message",
-          value: maxAgeText,
-          placeholder: String(DEFAULT_MAX_AGE_DAYS),
-          disabled,
-          onChange: (event) => {
-            stage("maxAgeDays", { text: event.target.value, clear: false });
           }
-        }
-      ),
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-        "p",
-        {
-          id: "dsh-rewind-cleanup-maxage-message",
-          className: maxAgeInvalid ? "dsh-rewind-cleanup-error" : "dsh-rewind-cleanup-hint",
-          children: maxAgeInvalid ? t("cleanup.invalid") : t("cleanup.maxAge.hint")
-        }
-      )
-    ] }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-footer", children: [
-      shell.failed ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-failed", role: "status", children: t("cleanup.saveFailed") }) : null,
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("button", { type: "button", className: "dsh-rewind-cleanup-save", disabled: blocked, onClick: () => {
-        void save();
-      }, children: shell.saving ? t("cleanup.saving") : t("cleanup.save") })
-    ] })
-  ] });
+        ) : null
+      ]
+    }
+  );
 }
 
 // src/client/index.ts
 var name = "dsh-rewind";
-var inject = ["slots", "sessions", "locale", "commandUi"];
+var inject = ["slots", "sessions", "locale", "commandUi", "configForms"];
 var NS2 = "rewind";
 var HEADER_ACTIONS_SLOT = "conversation.session.header.actions";
 var COMPOSER_EDITABLE_SELECTOR2 = "[data-composer-input]";
@@ -1652,58 +1478,25 @@ function apply(ctx) {
       },
       createRewindBridge({ sessionOf, chatOf, isMainViewSession, watchChat, setComposerText, t, subscribeLocale })
     ));
-    const clientCtx = ctx;
-    clientCtx.inject(["settingsScope"], (scoped) => {
-      try {
-        const scope = scoped.settingsScope.bind({ namespace: CLEANUP_SETTINGS_NAMESPACE });
-        const userLayer = () => {
-          const user = scope.getSnapshot().user;
-          return typeof user === "object" && user !== null ? user : void 0;
-        };
-        const cardApi = {
-          // The official shell reads `status === 'ready'`; a loading namespace
-          // is not available, so the form offers no fields yet.
-          available: () => scope.getSnapshot().status === "ready",
-          writable: () => {
-            return scope.getSnapshot().writable === true;
-          },
-          read: (field) => scope.getSnapshot().value?.[field],
-          base: (field) => scope.getSnapshot().base?.[field],
-          stored: (field) => {
-            const user = userLayer();
-            return user !== void 0 && Object.hasOwn(user, field);
-          },
-          // The Host decides whether a write landed: report the read-back the
-          // official `CardForm.store` performs.
-          set: async (field, value) => {
-            await scope.set(field, value);
-            return userLayer()?.[field] === value;
-          },
-          unset: async (field) => {
-            await scope.unset(field);
-            const user = userLayer();
-            return user === void 0 || !Object.hasOwn(user, field);
-          },
-          subscribe: (cb) => scope.subscribe(cb)
-        };
-        scoped.slots.inject("plugins.bundle.config", () => scoped.slots.register(
-          {
-            name: "plugins.bundle.config",
-            // Keyed by the bundle's package name: the page renders this form on
-            // the bundle's own page, between its description and its rows.
-            key: PLUGIN_PACKAGE,
-            // Match the official cards / dsh-market: locale + inject provide
-            // the card its props through the slot renderer (the page feeds it
-            // the `view` it asks for plus the bound api).
-            locale: NS2,
-            inject: () => ({ t, api: cardApi })
-          },
-          SettingsCleanupCard
-        ));
-      } catch (error) {
-        rewindLog.error("settings", "settings card register failed", error);
-      }
-    });
+    try {
+      const { store, form } = cleanupForm(
+        ctx.configForms.get(CLEANUP_ENTRY_ID)
+      );
+      ctx.effect(() => () => {
+        form.dispose();
+      }, "dsh-rewind cleanup form");
+      yield slots.inject("plugins.bundle.config", () => slots.register(
+        {
+          name: "plugins.bundle.config",
+          key: PLUGIN_PACKAGE,
+          locale: NS2,
+          inject: () => ({ hooks: { cleanupCard: store }, ...form.actions() })
+        },
+        SettingsCleanupCard
+      ));
+    } catch (error) {
+      rewindLog.error("settings", "settings card register failed", error);
+    }
     const commandUi = ctx.get("commandUi");
     const hasCandidates = (sessionId) => {
       const face = sessionId === void 0 ? void 0 : sessionOf(sessionId);