dsh-rewind-plugin 0.12.2 → 0.13.0-alpha.2

package/lib/client.js

@@ -292,6 +292,14 @@ var STYLE = `
 .dsh-rewind-popover-option:hover {
   background: var(--dsw-alias-interactive-bg-hover);
 }
+/* Arrow navigation moves real focus, so the focused row carries the pointer's
+   fill and the browser ring is suppressed: in dark mode the UA two-tone ring
+   draws its dark half against the filled row and reads as a residue edge (the
+   harness Menu suppresses it the same way). */
+.dsh-rewind-popover-option:focus-visible:not(:disabled) {
+  background: var(--dsw-alias-interactive-bg-hover);
+  outline: none;
+}
 .dsh-rewind-popover-option:disabled {
   opacity: 0.5;
   cursor: default;
@@ -365,95 +373,43 @@ var STYLE = `
   pointer-events: none;
 }
 
-/* ---- Snapshot-cleanup settings card (mirrors the harness PluginCard look) ---- */
-/* Standardized on the 0.1.2 harness card look (border-radius 16px + 0.5px
-   border-l4, 0.5px internal separators). */
-.dsh-rewind-cleanup-card {
-  list-style: none;
-  border: 0.5px solid var(--dsw-alias-border-l4);
-  border-radius: 16px;
-  background: var(--dsw-alias-bg-layer-3);
-  transition: border-color .16s, background .16s;
-}
-.dsh-rewind-cleanup-card:hover {
-  border-color: var(--dsw-alias-label-dimmed);
-}
-.dsh-rewind-cleanup-card-open {
-  background: var(--dsw-alias-bg-layer-2);
-  border-color: var(--dsw-alias-label-dimmed);
-}
-.dsh-rewind-cleanup-header {
-  width: 100%;
-  appearance: none;
-  border: 0;
-  background: none;
-  font: inherit;
-  color: inherit;
-  text-align: left;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  padding: 14px 16px;
-  border-radius: 12px;
-}
-.dsh-rewind-cleanup-header:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary);
-  outline-offset: -2px;
-}
-.dsh-rewind-cleanup-head-text {
-  flex: 1;
-  min-width: 0;
+/* ---- 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;
-  gap: 4px;
-}
-.dsh-rewind-cleanup-name {
-  font-size: 15px;
-  font-weight: 600;
-  line-height: 1.4;
-  color: var(--dsw-alias-label-primary);
-}
-.dsh-rewind-cleanup-desc {
-  font-size: 13px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-tertiary);
-}
-.dsh-rewind-cleanup-chevron {
-  flex: none;
-  color: var(--dsw-alias-label-tertiary);
-  transition: transform .16s;
 }
-.dsh-rewind-cleanup-chevron-open {
-  transform: rotate(180deg);
-}
-.dsh-rewind-cleanup-pending {
-  flex: none;
-  border-radius: 999px;
-  padding: 1px 8px;
-  font-size: 11px;
-  line-height: 17px;
-  font-weight: 500;
-  white-space: nowrap;
-  background: var(--dsw-alias-bg-module-platform);
-  color: var(--dsw-alias-label-secondary);
-}
-.dsh-rewind-cleanup-body {
-  border-top: 0.5px solid var(--dsw-alias-border-l2);
-  margin: 0 16px;
-  padding: 0 0 8px;
-}
-.dsh-rewind-cleanup-readonly {
-  margin: 12px 0 0;
+.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. */
 .dsh-rewind-cleanup-permission {
   display: grid;
   gap: 6px;
   padding: 12px 0;
 }
+.dsh-rewind-cleanup-toggle-row {
+  display: flex;
+  align-items: flex-start;
+  justify-content: space-between;
+  gap: 16px;
+  font-size: 13px;
+  line-height: 1.5;
+  color: var(--dsw-alias-label-primary);
+}
+.dsh-rewind-cleanup-toggle-label {
+  flex: 1;
+  min-width: 0;
+}
 .dsh-rewind-cleanup-field {
   display: flex;
   flex-direction: column;
@@ -463,17 +419,18 @@ var STYLE = `
 .dsh-rewind-cleanup-field + .dsh-rewind-cleanup-field {
   border-top: 0.5px solid var(--dsw-alias-border-l2);
 }
-/* Auto-cleanup (permission) block and the max-age field are consecutive control
- * sections of the open card \u2014 give them the same 0.5px divider the harness gives
- * every pair of config fields (fields.module.css field + field). */
-.dsh-rewind-cleanup-permission + .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;
@@ -482,6 +439,30 @@ var STYLE = `
   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;
@@ -492,65 +473,9 @@ var STYLE = `
   margin: 0;
   font-size: 12px;
   line-height: 1.5;
-  color: var(--dsw-alias-label-error);
-}
-/* Switch row: label left, role=switch button right, hint below (Subagent module).
- * The track mirrors the harness ui-primitives Switch (0.1.3-alpha.2 line): the
- * on/off appearance keys off aria-checked rather than a parallel class, so the
- * visual state cannot disagree with the state assistive technology reads, and
- * corner-shape: round opts the capsule track out of the global superellipse
- * (which would square the capsule ends off against the round thumb inside). */
-.dsh-rewind-cleanup-toggle-row {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 16px;
-  font-size: 13px;
-  line-height: 1.5;
-  color: var(--dsw-alias-label-primary);
-}
-.dsh-rewind-cleanup-toggle-label {
-  flex: 1;
-  min-width: 0;
-}
-.dsh-rewind-cleanup-switch {
-  box-sizing: border-box;
-  position: relative;
-  flex: 0 0 auto;
-  width: 36px;
-  height: 20px;
-  padding: 2px;
-  border: 0;
-  border-radius: 10px;
-  corner-shape: round;
-  background: var(--dsw-alias-border-l3);
-  cursor: pointer;
-}
-.dsh-rewind-cleanup-switch[aria-checked='true'] {
-  background: var(--dsw-alias-brand-primary);
-}
-.dsh-rewind-cleanup-switch:disabled {
-  cursor: default;
-  opacity: 0.5;
-}
-.dsh-rewind-cleanup-switch:focus-visible {
-  outline: 2px solid var(--dsw-alias-brand-primary);
-  outline-offset: 2px;
-}
-.dsh-rewind-cleanup-thumb {
-  display: block;
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-  corner-shape: round;
-  background: var(--dsw-alias-label-primary-foreground);
-  transition: transform 120ms ease;
-}
-.dsh-rewind-cleanup-switch[aria-checked='true'] .dsh-rewind-cleanup-thumb {
-  transform: translateX(16px);
+  color: var(--dsw-alias-state-error-primary);
 }
 .dsh-rewind-cleanup-input {
-  box-sizing: border-box;
   height: 34px;
   padding: 0 12px;
   border: 0.5px solid var(--dsw-alias-border-l4);
@@ -569,16 +494,14 @@ var STYLE = `
   color: var(--dsw-alias-label-tertiary);
   cursor: default;
 }
-.dsh-rewind-cleanup-input-invalid {
-  border-color: var(--dsw-alias-label-error);
+.dsh-rewind-cleanup-input[aria-invalid='true'] {
+  border-color: var(--dsw-alias-state-error-primary);
 }
 .dsh-rewind-cleanup-footer {
   display: flex;
   align-items: center;
-  justify-content: flex-end;
   gap: 8px;
-  padding: 12px 0 4px;
-  border-top: 0.5px solid var(--dsw-alias-border-l2);
+  padding-top: 16px;
 }
 .dsh-rewind-cleanup-failed {
   flex: 1;
@@ -588,7 +511,6 @@ var STYLE = `
   line-height: 1.5;
   color: var(--dsw-alias-label-error);
 }
-.dsh-rewind-cleanup-discard,
 .dsh-rewind-cleanup-save {
   appearance: none;
   border: 1px solid transparent;
@@ -598,26 +520,13 @@ var STYLE = `
   font-size: 13px;
   line-height: 1.5;
   cursor: pointer;
-}
-.dsh-rewind-cleanup-discard {
-  border-color: var(--dsw-alias-border-l2);
-  background: none;
-  color: var(--dsw-alias-label-secondary);
-}
-.dsh-rewind-cleanup-discard:hover:not(:disabled) {
-  color: var(--dsw-alias-label-primary);
-  border-color: var(--dsw-alias-label-dimmed);
-}
-.dsh-rewind-cleanup-save {
   background: var(--dsw-alias-label-primary);
   color: var(--dsw-alias-bg-layer-3);
 }
-.dsh-rewind-cleanup-discard:disabled,
 .dsh-rewind-cleanup-save:disabled {
   opacity: 0.4;
   cursor: default;
 }
-.dsh-rewind-cleanup-discard:focus-visible,
 .dsh-rewind-cleanup-save:focus-visible {
   outline: 2px solid var(--dsw-alias-brand-primary);
   outline-offset: 1px;
@@ -984,6 +893,23 @@ var import_react = require("react");
 var import_react_dom = require("react-dom");
 
 // src/client/pending.ts
+var QUEUE_PREVIEW_CHARS = 200;
+function textOf(content) {
+  if (!content.every((block) => block.type === "text")) return null;
+  return content.map((block) => block.text ?? "").join("");
+}
+function previewOf(content) {
+  const flat = content.filter((block) => block.type !== "image" && block.type !== "file").map((block) => block.type === "text" ? block.text ?? "" : `[${block.type}]`).join(" ").replace(/\s+/g, " ").trim();
+  const chars = Array.from(flat);
+  return chars.length > QUEUE_PREVIEW_CHARS ? `${chars.slice(0, QUEUE_PREVIEW_CHARS).join("")}\u2026` : flat;
+}
+function steeringItemsOf(nextStep) {
+  return (nextStep ?? []).filter((item) => item.source?.kind === "user").map((item) => ({
+    id: item.id,
+    text: textOf(item.content),
+    preview: previewOf(item.content)
+  }));
+}
 function matchPendingRows(rows, steering) {
   const matched = [];
   for (let i = 0; i < rows.length; i++) {
@@ -1045,7 +971,7 @@ function userNodeOf(chat, key) {
   if (node === void 0 || node.kind !== "user" && node.kind !== "steering") return void 0;
   return node.data;
 }
-async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf, watchChat, setComposerText) {
+async function runRewindAndFill(session, seq, mode, isMainViewSession, chatOf, watchChat, setComposerText) {
   const known = knownCommandSeqs(session, chatOf, (node) => isExecutedRewindCommand(node, seq));
   let result;
   try {
@@ -1077,7 +1003,7 @@ async function runRewindAndFill(session, seq, mode, currentSessionId, chatOf, wa
     showHint(outcome.text ?? "rewind failed");
     return;
   }
-  if (currentSessionId() !== session.sessionId) {
+  if (!isMainViewSession(session.sessionId)) {
     return;
   }
   let text;
@@ -1155,19 +1081,21 @@ function collectDurableTargets(snapshot, chat, hiddenSeqs) {
   if (chat === void 0 || isRewindInertSession(snapshot)) return [];
   return collectTargets(chat, hiddenSeqs);
 }
+function inboxOf(session) {
+  return session.projections.faceOf("inbox").getSnapshot();
+}
 function bubbleTextOf(row) {
   const clone = row.cloneNode(true);
   clone.lastElementChild?.remove();
   return clone.textContent ?? "";
 }
-function collectPendingTargets(snapshot) {
+function collectPendingTargets(snapshot, steering) {
   if (snapshot.subagent !== null) return [];
-  const steering = snapshot.queue.filter((item) => item.placement === "steering");
   if (steering.length === 0) return [];
   const rows = Array.from(document.querySelectorAll(PENDING_SEAT_SELECTOR));
   const matched = matchPendingRows(
     rows.map((row) => ({ text: bubbleTextOf(row) })),
-    steering.map((item) => ({ id: item.id, text: item.text }))
+    steering
   );
   const targets = [];
   for (let i = 0; i < matched.length; i++) {
@@ -1197,7 +1125,7 @@ function sameTargets(left, right) {
     return other.kind === "pending" && target.itemId === other.itemId;
   });
 }
-function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, watchChat, t, subscribeLocale, setComposerText }) {
+function RewindPortals({ sessionId, sessionOf, chatOf, isMainViewSession, watchChat, t, subscribeLocale, setComposerText }) {
   const [targets, setTargets] = (0, import_react.useState)([]);
   const hidden = (0, import_react.useRef)(/* @__PURE__ */ new WeakSet());
   const [, forceRender] = (0, import_react.useReducer)((count) => count + 1, 0);
@@ -1231,7 +1159,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, watchCh
         }
       }
       const durable = collectDurableTargets(snapshot, chat, hiddenSeqs);
-      const next = [...durable, ...collectPendingTargets(snapshot)];
+      const next = [...durable, ...collectPendingTargets(snapshot, steeringItemsOf(inboxOf(session)?.["next-step"]))];
       setTargets((current) => sameTargets(current, next) ? current : next);
     };
     const queueRefresh = () => {
@@ -1271,7 +1199,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, watchCh
         sessionOf,
         chatOf,
         watchChat,
-        currentSessionId,
+        isMainViewSession,
         setComposerText,
         t
       },
@@ -1281,7 +1209,7 @@ function RewindPortals({ sessionId, sessionOf, chatOf, currentSessionId, watchCh
     target.key
   ));
 }
-function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, currentSessionId, setComposerText, t }) {
+function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, isMainViewSession, setComposerText, t }) {
   const onClick = (event) => {
     event.stopPropagation();
     const session = sessionOf(sessionId);
@@ -1301,7 +1229,7 @@ function RewindButton({ target, sessionId, sessionOf, chatOf, watchChat, current
       anchor: event.currentTarget,
       t,
       onRewind: (mode) => {
-        void runRewindAndFill(session, node.seq, mode, currentSessionId, chatOf, watchChat, setComposerText);
+        void runRewindAndFill(session, node.seq, mode, isMainViewSession, chatOf, watchChat, setComposerText);
       }
     });
   };
@@ -1323,8 +1251,7 @@ function composerText() {
   return surface.textContent ?? "";
 }
 async function retractPending(session, itemId, text, setComposerText) {
-  const queue = session.getSnapshot().queue;
-  const steering = queue.filter((item) => item.placement === "steering");
+  const steering = steeringItemsOf(inboxOf(session)?.["next-step"]);
   let removedTarget = false;
   for (const id of retractSpan(steering, itemId)) {
     let accepted = false;
@@ -1379,8 +1306,9 @@ function createRewindBridge(deps) {
 }
 
 // src/client/build-info.ts
-var PLUGIN_VERSION = true ? "0.12.2" : "dev";
-var BUILD_HASH = true ? "c9f4bb5f" : "dev";
+var PLUGIN_VERSION = true ? "0.13.0-alpha.2" : "dev";
+var PLUGIN_PACKAGE = "dsh-rewind-plugin";
+var BUILD_HASH = true ? "d7022b63" : "dev";
 
 // src/client/locales.ts
 var zh = {
@@ -1408,23 +1336,19 @@ var zh = {
   "popover.impact.delete": "\u5220\u9664 {path}",
   "popover.confirm": "\u786E\u8BA4\u56DE\u9000",
   "popover.back": "\u8FD4\u56DE",
-  "cleanup.title": "\u5FEB\u7167\u6E05\u7406",
-  "cleanup.desc": "dsh-rewind \xB7 \u7BA1\u7406\u4F1A\u8BDD\u5FEB\u7167\u5907\u4EFD\u7684\u81EA\u52A8\u6E05\u7406\u7B56\u7565",
-  "cleanup.expand": "\u5C55\u5F00",
-  "cleanup.collapse": "\u6536\u8D77",
-  "cleanup.unsaved": "\u672A\u4FDD\u5B58\u4FEE\u6539",
   "cleanup.auto": "\u81EA\u52A8\u6E05\u7406",
   "cleanup.auto.on": "\u5F00\u542F\u540E\u6309\u4E0D\u6D3B\u8DC3\u5929\u6570\u81EA\u52A8\u6E05\u7406\u8FC7\u671F\u4F1A\u8BDD\u5FEB\u7167",
   "cleanup.auto.off": "\u5173\u95ED\u540E\u4FDD\u7559\u5168\u90E8\u5FEB\u7167\uFF0C\u4E0D\u81EA\u52A8\u6E05\u7406",
   "cleanup.maxAge": "\u4E0D\u6D3B\u8DC3\u65F6\u95F4\uFF08\u5929\uFF09",
   "cleanup.maxAge.hint": "\u8D85\u8FC7\u8BE5\u5929\u6570\u672A\u6D3B\u52A8\u7684\u4F1A\u8BDD\u5FEB\u7167\u4F1A\u88AB\u6E05\u7406",
-  "cleanup.invalid": "\u4EC5\u63A5\u53D7\u6B63\u6574\u6570",
-  "cleanup.discard": "\u653E\u5F03\u4FEE\u6539",
+  "cleanup.invalid": "\u8BF7\u586B\u6B63\u6574\u6570\uFF1B\u7559\u7A7A\u8868\u793A\u4F7F\u7528\u9ED8\u8BA4\u503C",
+  "cleanup.overridden": "\u5DF2\u8986\u76D6",
+  "cleanup.reset": "\u6062\u590D\u9ED8\u8BA4",
   "cleanup.save": "\u4FDD\u5B58",
   "cleanup.saving": "\u4FDD\u5B58\u4E2D\u2026",
-  "cleanup.saved": "\u5DF2\u4FDD\u5B58\u5E76\u751F\u6548",
-  "cleanup.saveFailed": "\u4FDD\u5B58\u5931\u8D25\uFF1A{message}",
-  "cleanup.readonly": "\u8BBE\u7F6E\u6E90\u53EA\u8BFB"
+  "cleanup.saveFailed": "\u672C\u90E8\u7F72\u6CA1\u6709\u63A5\u53D7\u8FD9\u4E9B\u503C\uFF0C\u5DF2\u4FDD\u7559\u4F9B\u4F60\u4FEE\u6539",
+  "cleanup.readonly": "\u672C\u90E8\u7F72\u7684\u8BBE\u7F6E\u4E3A\u53EA\u8BFB",
+  "cleanup.unavailable": "\u8BE5\u63D2\u4EF6\u5F53\u524D\u672A\u52A0\u8F7D\uFF0C\u6682\u65F6\u65E0\u6CD5\u914D\u7F6E"
 };
 var en = {
   "button.aria": "Rewind to this message",
@@ -1451,185 +1375,211 @@ var en = {
   "popover.impact.delete": "Delete {path}",
   "popover.confirm": "Confirm rewind",
   "popover.back": "Back",
-  "cleanup.title": "Snapshot cleanup",
-  "cleanup.desc": "dsh-rewind \xB7 Manage the auto-cleanup policy of session snapshot backups",
-  "cleanup.expand": "Expand",
-  "cleanup.collapse": "Collapse",
-  "cleanup.unsaved": "Unsaved changes",
   "cleanup.auto": "Auto cleanup",
   "cleanup.auto.on": "When enabled, session snapshots idle past the cutoff are cleaned automatically",
   "cleanup.auto.off": "When disabled, all snapshot backups are kept; nothing is cleaned automatically.",
   "cleanup.maxAge": "Idle time (days)",
   "cleanup.maxAge.hint": "Snapshot backups of sessions idle longer than this many days are cleaned",
-  "cleanup.invalid": "A positive integer only",
-  "cleanup.discard": "Discard changes",
+  "cleanup.invalid": "Enter a positive integer, or leave blank to use the default",
+  "cleanup.overridden": "Overridden",
+  "cleanup.reset": "Reset to default",
   "cleanup.save": "Save",
   "cleanup.saving": "Saving\u2026",
-  "cleanup.saved": "Saved and applied",
-  "cleanup.saveFailed": "Save failed: {message}",
-  "cleanup.readonly": "Read-only settings source"
+  "cleanup.saveFailed": "The deployment did not accept these values; they were left for you to correct",
+  "cleanup.readonly": "This deployment stores settings read-only",
+  "cleanup.unavailable": "This plugin is not loaded, so it cannot be configured right now"
 };
 
 // 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 DEFAULT_MAX_AGE_DAYS = 30;
-function draftFrom(policy) {
-  return { enabled: policy?.enabled ?? false, maxAgeDays: String(policy?.maxAgeDays ?? "") };
-}
-function maxAgeOf(text) {
+function parseMaxAge(text) {
   const trimmed = text.trim();
-  if (!/^\d+$/.test(trimmed)) return null;
+  if (trimmed === "") return { kind: "clear" };
+  if (!/^\d+$/.test(trimmed)) return void 0;
   const days = Number(trimmed);
-  return Number.isSafeInteger(days) && days > 0 ? days : null;
-}
-function configOf(draft) {
-  const days = maxAgeOf(draft.maxAgeDays);
-  if (days === null) return null;
-  return { enabled: draft.enabled, maxAgeDays: days };
-}
-function dirtyOf(base, draft) {
-  return base.enabled !== draft.enabled || base.maxAgeDays !== draft.maxAgeDays;
-}
-function SettingsCleanupCard({ api, t }) {
-  const [open, setOpen] = (0, import_react2.useState)(false);
-  const [baseline, setBaseline] = (0, import_react2.useState)(() => draftFrom(api.read()));
-  const [draft, setDraft] = (0, import_react2.useState)(() => draftFrom(api.read()));
-  const [busy, setBusy] = (0, import_react2.useState)(false);
-  const [error, setError] = (0, import_react2.useState)(null);
-  const writable = api.writable();
+  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) {
+  return {
+    dirty: plan.length > 0,
+    invalid: plan.some((entry) => entry.kind === "invalid"),
+    saving: flags.saving,
+    failed: flags.failed
+  };
+}
+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(() => {
-    const next = draftFrom(api.read());
-    setBaseline((base) => {
-      setDraft((cur) => dirtyOf(base, cur) ? cur : next);
+    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;
     });
-  }), [api]);
-  const dirty = dirtyOf(baseline, draft);
-  const days = maxAgeOf(draft.maxAgeDays);
-  const invalid = days === null;
-  const disabled = busy || !writable;
-  const edit = (patch) => {
-    setDraft((cur) => ({ ...cur, ...patch }));
-    setError(null);
+    setFailed(false);
   };
+  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 () => {
-    if (busy || !writable || !dirty) return;
-    const next = configOf(draft);
-    if (next === null) {
-      setError(t("cleanup.invalid"));
-      return;
-    }
-    setBusy(true);
-    setError(null);
-    try {
-      await api.save(next);
-      setBaseline(draft);
-      setError(null);
-    } catch (e) {
-      setError(t("cleanup.saveFailed", { message: e instanceof Error ? e.message : String(e) }));
-    } finally {
-      setBusy(false);
-    }
-  };
-  const discard = () => {
-    if (busy) return;
-    setDraft(baseline);
-    setError(null);
+    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);
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("li", { className: `dsh-rewind-cleanup-card${open ? " dsh-rewind-cleanup-card-open" : ""}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
-      "button",
-      {
-        type: "button",
-        className: "dsh-rewind-cleanup-header",
-        "aria-expanded": open,
-        "aria-label": `${t(open ? "cleanup.collapse" : "cleanup.expand")}: ${t("cleanup.title")}`,
-        onClick: () => setOpen(!open),
-        children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { className: "dsh-rewind-cleanup-head-text", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-name", children: t("cleanup.title") }),
-            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-desc", children: t("cleanup.desc") })
-          ] }),
-          dirty ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-pending", children: t("cleanup.unsaved") }) : null,
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-            "svg",
-            {
-              className: `dsh-rewind-cleanup-chevron${open ? " dsh-rewind-cleanup-chevron-open" : ""}`,
-              width: "14",
-              height: "14",
-              viewBox: "0 0 16 16",
-              "aria-hidden": "true",
-              children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("path", { d: "M4 6l4 4 4-4", fill: "none", stroke: "currentColor", strokeWidth: "1.5", strokeLinecap: "round", strokeLinejoin: "round" })
+  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,
+          {
+            checked: enabled,
+            label: t("cleanup.auto"),
+            disabled,
+            onChange: (next) => {
+              stage("enabled", { text: formatEnabled(next), clear: false });
             }
-          )
-        ]
-      }
-    ),
-    open ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-body", 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", id: "dsh-rewind-cleanup-enabled-label", children: t("cleanup.auto") }),
+          }
+        )
+      ] }),
+      /* @__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",
-              role: "switch",
-              className: "dsh-rewind-cleanup-switch",
-              "aria-checked": draft.enabled,
-              "aria-labelledby": "dsh-rewind-cleanup-enabled-label",
+              className: "dsh-rewind-cleanup-reset",
               disabled,
-              onClick: () => edit({ enabled: !draft.enabled }),
-              children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dsh-rewind-cleanup-thumb" })
+              onClick: () => {
+                stage("maxAgeDays", { text: formatMaxAge(api.base("maxAgeDays")), clear: true });
+              },
+              children: t("cleanup.reset")
             }
           )
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-hint", children: t(draft.enabled ? "cleanup.auto.on" : "cleanup.auto.off") })
+        ] }) : null
       ] }),
-      draft.enabled ? /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-field", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "dsh-rewind-cleanup-head", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("label", { className: "dsh-rewind-cleanup-label", htmlFor: "dsh-rewind-cleanup-maxage", children: t("cleanup.maxAge") }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          "input",
-          {
-            className: `dsh-rewind-cleanup-input${invalid ? " dsh-rewind-cleanup-input-invalid" : ""}`,
-            type: "text",
-            inputMode: "numeric",
-            id: "dsh-rewind-cleanup-maxage",
-            value: draft.maxAgeDays,
-            disabled,
-            "aria-invalid": invalid || void 0,
-            placeholder: String(DEFAULT_MAX_AGE_DAYS),
-            onChange: (e) => edit({ maxAgeDays: e.target.value })
+      /* @__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", { className: invalid ? "dsh-rewind-cleanup-error" : "dsh-rewind-cleanup-hint", children: invalid ? t("cleanup.invalid") : t("cleanup.maxAge.hint") })
-      ] }) : null,
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dsh-rewind-cleanup-footer", children: [
-        error ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dsh-rewind-cleanup-failed", role: "status", children: error }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          "button",
-          {
-            type: "button",
-            className: "dsh-rewind-cleanup-discard",
-            disabled: !dirty || busy || !writable,
-            onClick: discard,
-            children: t("cleanup.discard")
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          "button",
-          {
-            type: "button",
-            className: "dsh-rewind-cleanup-save",
-            disabled: !dirty || busy || !writable || invalid,
-            onClick: save,
-            children: busy ? t("cleanup.saving") : t("cleanup.save")
-          }
-        )
-      ] })
-    ] }) : null
+        }
+      ),
+      /* @__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") })
+    ] })
   ] });
 }
 
@@ -1645,11 +1595,11 @@ function apply(ctx) {
     yield ctx.locale.register(NS2, { zh, en });
     const t = ctx.locale.bind(NS2);
     const style = document.createElement("style");
-    style.dataset.plugin = "dsh-rewind";
+    style.dataset.plugin = PLUGIN_PACKAGE;
     style.textContent = STYLE;
     document.head.appendChild(style);
     const sessionOf = (sessionId) => ctx.sessions.binding(sessionId)?.session;
-    const currentSessionId = () => ctx.sessions.list.getSnapshot().current;
+    const isMainViewSession = (sessionId) => (ctx.sessions.list.getSnapshot().byId[sessionId]?.retainedBy.mainView ?? 0) > 0;
     const subscribeLocale = (cb) => ctx.locale.subscribe(cb);
     const uiConversation = () => ctx.get("uiConversation");
     const CHAT_VIEW = "chat";
@@ -1700,33 +1650,51 @@ function apply(ctx) {
         id: "dsh-rewind-portals",
         order: 1e3
       },
-      createRewindBridge({ sessionOf, chatOf, currentSessionId, watchChat, setComposerText, t, subscribeLocale })
+      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 = {
-          read: () => {
-            const value = scope.getSnapshot().value;
-            return value === void 0 ? void 0 : { enabled: value.enabled, maxAgeDays: value.maxAgeDays };
-          },
+          // 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;
           },
-          save: async (next) => {
-            await scope.set("enabled", next.enabled);
-            await scope.set("maxAgeDays", next.maxAgeDays);
+          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("settings.plugin.item", () => scoped.slots.register(
+        scoped.slots.inject("plugins.bundle.config", () => scoped.slots.register(
           {
-            name: "settings.plugin.item",
-            key: CLEANUP_SETTINGS_NAMESPACE,
+            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 keyed card owns
-            // its internals, but the page feeds it locale + the bound api).
+            // 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 })
           },
@@ -1789,7 +1757,7 @@ function apply(ctx) {
             anchor: composerAnchor(),
             t,
             onRewind: (mode) => {
-              void runRewindAndFill(face, candidate.seq, mode, currentSessionId, chatOf, watchChat, setComposerText);
+              void runRewindAndFill(face, candidate.seq, mode, isMainViewSession, chatOf, watchChat, setComposerText);
             }
           });
         }
@@ -1800,6 +1768,7 @@ function apply(ctx) {
     }
     const composerSurface2 = () => document.querySelector(COMPOSER_EDITABLE_SELECTOR2);
     yield () => {
+      closePopover();
       style.remove();
     };
   }, "dsh-rewind client lifecycle");