@michengai/dsh-archive-manager 1.3.0 → 1.3.1

package/lib/index.js

@@ -1,4 +1,4 @@
-import { getEntryLocation, getOnlineUpdate, getSidebarFavoriteStar, setEntryLocation, setOnlineUpdate, setSidebarFavoriteStar } from "./plugin-settings.js";
+import { getEntryLocation, getOnlineUpdate, getSidebarFavoriteStarMode, setEntryLocation, setOnlineUpdate, setSidebarFavoriteStarMode } from "./plugin-settings.js";
 import { isTrustedUpdateRequest, rawService, registerPluginUpdater, releaseUpdateRoute } from "./plugin-updater.js";
 import { apply as installHost, inject as hostInject } from "./host-install.js";
 import { authorizeExplorerPath } from "./explorer-path-policy.js";
@@ -85,8 +85,8 @@ function registerSettingsRoutes(ctx, hostUpdateDisabled) {
     path: SIDEBAR_FAVORITE_STAR_ENDPOINT,
     handler: async (request, response) => {
       if (request.method === "GET" || request.method === "HEAD") {
-        const enabled = await getSidebarFavoriteStar();
-        sendJson(response, 200, { ok: true, enabled });
+        const mode = await getSidebarFavoriteStarMode();
+        sendJson(response, 200, { ok: true, mode, enabled: mode !== "none" });
         return;
       }
       if (request.method === "POST") {
@@ -95,12 +95,25 @@ function registerSettingsRoutes(ctx, hostUpdateDisabled) {
           return;
         }
         const body = await readJsonBody(request);
-        if (!body || typeof body.enabled !== "boolean") {
-          sendJson(response, 400, { ok: false, error: "enabled \u5FC5\u987B\u662F\u5E03\u5C14\u503C" });
+        if (!body) {
+          sendJson(response, 400, { ok: false, error: "\u8BF7\u6C42\u4F53\u4E0D\u80FD\u4E3A\u7A7A" });
           return;
         }
-        const enabled = await setSidebarFavoriteStar(body.enabled);
-        sendJson(response, 200, { ok: true, enabled });
+        let targetMode;
+        if (typeof body.mode === "string") {
+          if (body.mode !== "all" && body.mode !== "favorites" && body.mode !== "none") {
+            sendJson(response, 400, { ok: false, error: "mode \u5FC5\u987B\u662F all\u3001favorites \u6216 none" });
+            return;
+          }
+          targetMode = body.mode;
+        } else if (typeof body.enabled === "boolean") {
+          targetMode = body.enabled ? "all" : "none";
+        } else {
+          sendJson(response, 400, { ok: false, error: "\u7F3A\u5C11\u5408\u6CD5\u7684 mode \u6216 enabled \u53C2\u6570" });
+          return;
+        }
+        const mode = await setSidebarFavoriteStarMode(targetMode);
+        sendJson(response, 200, { ok: true, mode, enabled: mode !== "none" });
         return;
       }
       response.writeHead(405, { allow: "GET, HEAD, POST" });

package/lib/plugin-settings.js

@@ -3,6 +3,11 @@ import { existsSync, mkdirSync } from "node:fs";
 import { readFile, rename, unlink, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+function normalizeFavoriteStarMode(value) {
+  if (value === "all" || value === "favorites" || value === "none") return value;
+  if (value === false) return "none";
+  return "all";
+}
 function resolveDshHome() {
   const custom = process.env.DSH_HOME;
   if (typeof custom === "string" && custom.trim() !== "") {
@@ -62,7 +67,7 @@ async function readSettings() {
     entryLocation: "settings",
     sidebarEntry: false,
     onlineUpdate: true,
-    sidebarFavoriteStar: true
+    sidebarFavoriteStar: "all"
   };
   if (!existsSync(path)) {
     return defaultSettings;
@@ -86,7 +91,7 @@ async function readSettings() {
       entryLocation,
       sidebarEntry: entryLocation !== "settings",
       onlineUpdate: typeof item.onlineUpdate === "boolean" ? item.onlineUpdate : true,
-      sidebarFavoriteStar: typeof item.sidebarFavoriteStar === "boolean" ? item.sidebarFavoriteStar : true
+      sidebarFavoriteStar: normalizeFavoriteStarMode(item.sidebarFavoriteStar)
     };
   } catch {
     return defaultSettings;
@@ -99,7 +104,7 @@ async function writeSettings(next) {
     entryLocation: location,
     sidebarEntry: location !== "settings",
     onlineUpdate: next.onlineUpdate !== false,
-    sidebarFavoriteStar: next.sidebarFavoriteStar !== false
+    sidebarFavoriteStar: normalizeFavoriteStarMode(next.sidebarFavoriteStar)
   };
   const serialized = `${JSON.stringify(normalized, null, 2)}
 `;
@@ -153,31 +158,49 @@ async function setOnlineUpdate(enabled) {
     return enabled;
   });
 }
-async function getSidebarFavoriteStar() {
+async function getSidebarFavoriteStarMode() {
   const current = await readSettings();
-  return current.sidebarFavoriteStar !== false;
+  return normalizeFavoriteStarMode(current.sidebarFavoriteStar);
 }
-async function setSidebarFavoriteStar(enabled) {
-  if (typeof enabled !== "boolean") {
-    throw new TypeError("sidebarFavoriteStar must be a boolean");
+async function setSidebarFavoriteStarMode(mode) {
+  if (mode !== "all" && mode !== "favorites" && mode !== "none") {
+    throw new TypeError("sidebarFavoriteStar mode must be 'all', 'favorites', or 'none'");
   }
   return enqueueWrite(async () => {
     const current = await readSettings();
-    current.sidebarFavoriteStar = enabled;
+    current.sidebarFavoriteStar = mode;
     await writeSettings(current);
-    return enabled;
+    return mode;
   });
 }
+async function getSidebarFavoriteStar() {
+  const mode = await getSidebarFavoriteStarMode();
+  return mode !== "none";
+}
+async function setSidebarFavoriteStar(value) {
+  if (typeof value !== "boolean" && value !== "all" && value !== "favorites" && value !== "none") {
+    throw new TypeError("sidebarFavoriteStar must be 'all', 'favorites', 'none', or a boolean");
+  }
+  if (typeof value === "boolean") {
+    const mode = value ? "all" : "none";
+    await setSidebarFavoriteStarMode(mode);
+    return value;
+  }
+  return setSidebarFavoriteStarMode(value);
+}
 export {
   getEntryLocation,
   getOnlineUpdate,
   getSidebarEntry,
   getSidebarFavoriteStar,
+  getSidebarFavoriteStarMode,
   managerSettingsPath,
+  normalizeFavoriteStarMode,
   readSettings,
   setEntryLocation,
   setOnlineUpdate,
   setSidebarEntry,
   setSidebarFavoriteStar,
+  setSidebarFavoriteStarMode,
   writeSettings
 };

package/lib/sidebar-entry.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { IconArchiveOutlineMedium, SegmentedControl, Switch as PrimitiveSwitch } from "@deepseek-ai/dsh-client-ui-primitives";
+import { IconArchiveOutlineMedium, SegmentedControl } from "@deepseek-ai/dsh-client-ui-primitives";
 const h = React.createElement;
 const BUNDLE_KEY = "@michengai/dsh-archive-manager";
 const SIDEBAR_PANEL_ID = "archived-sessions";
@@ -37,15 +37,14 @@ function ArchiveBundleConfigCard(props) {
     enabled = false,
     onToggle,
     disabled,
-    onlineUpdateEnabled = true,
-    onToggleOnlineUpdate,
-    onlineUpdateDisabled,
-    onlineUpdateLocked = false,
     sidebarFavoriteStarEnabled = true,
     onToggleSidebarFavoriteStar,
-    sidebarFavoriteStarDisabled
+    sidebarFavoriteStarDisabled,
+    sidebarFavoriteStarMode: propStarMode,
+    onSidebarFavoriteStarModeChange
   } = props;
   const effectiveLocation = propLocation ?? (enabled ? "both" : "settings");
+  const effectiveStarMode = propStarMode ?? (sidebarFavoriteStarEnabled === false ? "none" : "all");
   const handleLocationChange = (next) => {
     if (next === "both" || next === "sidebar" || next === "settings") {
       if (typeof onLocationChange === "function") {
@@ -55,6 +54,15 @@ function ArchiveBundleConfigCard(props) {
       }
     }
   };
+  const handleStarModeChange = (next) => {
+    if (next === "all" || next === "favorites" || next === "none") {
+      if (typeof onSidebarFavoriteStarModeChange === "function") {
+        onSidebarFavoriteStarModeChange(next);
+      } else if (typeof onToggleSidebarFavoriteStar === "function") {
+        onToggleSidebarFavoriteStar(next !== "none");
+      }
+    }
+  };
   const rows = [
     h(
       "div",
@@ -80,7 +88,7 @@ function ArchiveBundleConfigCard(props) {
       })
     )
   ];
-  if (typeof onToggleSidebarFavoriteStar === "function") {
+  if (typeof onSidebarFavoriteStarModeChange === "function" || typeof onToggleSidebarFavoriteStar === "function") {
     rows.push(
       h(
         "div",
@@ -91,11 +99,17 @@ function ArchiveBundleConfigCard(props) {
           h("span", { className: "dsham_bundle_title" }, t("sidebar.favoriteStar.title")),
           h("span", { className: "dsham_bundle_desc" }, t("sidebar.favoriteStar.desc"))
         ),
-        h(PrimitiveSwitch, {
-          checked: sidebarFavoriteStarEnabled,
-          onChange: onToggleSidebarFavoriteStar,
-          label: t("sidebar.favoriteStar.toggle"),
-          disabled: sidebarFavoriteStarDisabled
+        h(SegmentedControl, {
+          id: "dsham-bundle-favorite-star-mode",
+          value: effectiveStarMode,
+          onChange: handleStarModeChange,
+          label: t("sidebar.favoriteStar.title"),
+          disabled: sidebarFavoriteStarDisabled ?? disabled,
+          options: [
+            { value: "all", label: t("sidebar.favoriteStar.all") },
+            { value: "favorites", label: t("sidebar.favoriteStar.favorites") },
+            { value: "none", label: t("sidebar.favoriteStar.none") }
+          ]
         })
       )
     );
@@ -104,7 +118,12 @@ function ArchiveBundleConfigCard(props) {
 }
 function ArchiveBundleConfigCardWrapper(props) {
   const [location, setLocation] = React.useState(props.getLocation);
-  const [sidebarFavoriteStarEnabled, setSidebarFavoriteStarEnabled] = React.useState(props.getSidebarFavoriteStarEnabled ? props.getSidebarFavoriteStarEnabled : () => true);
+  const resolveInitialStarMode = () => {
+    if (props.getSidebarFavoriteStarMode) return props.getSidebarFavoriteStarMode();
+    if (props.getSidebarFavoriteStarEnabled) return props.getSidebarFavoriteStarEnabled() ? "all" : "none";
+    return "all";
+  };
+  const [sidebarFavoriteStarMode, setSidebarFavoriteStarMode] = React.useState(resolveInitialStarMode);
   const [saveError, setSaveError] = React.useState(null);
   const [savingLocation, setSavingLocation] = React.useState(false);
   const [savingFavoriteStar, setSavingFavoriteStar] = React.useState(false);
@@ -112,8 +131,10 @@ function ArchiveBundleConfigCardWrapper(props) {
     const syncState = () => {
       setLocation(props.getLocation());
       setSaveError(null);
-      if (props.getSidebarFavoriteStarEnabled) {
-        setSidebarFavoriteStarEnabled(props.getSidebarFavoriteStarEnabled());
+      if (props.getSidebarFavoriteStarMode) {
+        setSidebarFavoriteStarMode(props.getSidebarFavoriteStarMode());
+      } else if (props.getSidebarFavoriteStarEnabled) {
+        setSidebarFavoriteStarMode(props.getSidebarFavoriteStarEnabled() ? "all" : "none");
       }
     };
     syncState();
@@ -131,13 +152,12 @@ function ArchiveBundleConfigCardWrapper(props) {
       setSavingLocation(false);
     });
   };
-  const onToggleSidebarFavoriteStar = props.setSidebarFavoriteStar ? (next) => {
+  const onSidebarFavoriteStarModeChange = props.setSidebarFavoriteStarMode || props.setSidebarFavoriteStar ? (next) => {
     setSavingFavoriteStar(true);
-    setSidebarFavoriteStarEnabled(next);
-    props.setSidebarFavoriteStar(next).catch(() => {
-      if (props.getSidebarFavoriteStarEnabled) {
-        setSidebarFavoriteStarEnabled(props.getSidebarFavoriteStarEnabled());
-      }
+    setSidebarFavoriteStarMode(next);
+    const savePromise = props.setSidebarFavoriteStarMode ? props.setSidebarFavoriteStarMode(next) : props.setSidebarFavoriteStar(next !== "none");
+    savePromise.catch(() => {
+      setSidebarFavoriteStarMode(resolveInitialStarMode());
     }).finally(() => {
       setSavingFavoriteStar(false);
     });
@@ -148,9 +168,11 @@ function ArchiveBundleConfigCardWrapper(props) {
     errorMessage: saveError,
     disabled: savingLocation,
     onLocationChange,
-    sidebarFavoriteStarEnabled,
+    sidebarFavoriteStarMode,
+    sidebarFavoriteStarEnabled: sidebarFavoriteStarMode !== "none",
     sidebarFavoriteStarDisabled: savingFavoriteStar,
-    onToggleSidebarFavoriteStar
+    onSidebarFavoriteStarModeChange,
+    onToggleSidebarFavoriteStar: onSidebarFavoriteStarModeChange ? (enabled) => onSidebarFavoriteStarModeChange(enabled ? "all" : "none") : void 0
   });
 }
 function setupSidebarEntry(ctx, options) {
@@ -163,11 +185,10 @@ function setupSidebarEntry(ctx, options) {
       isEnabled: () => false,
       isSupported: () => false,
       setEnabled: async () => false,
-      isOnlineUpdateEnabled: () => true,
-      isOnlineUpdateLocked: () => false,
-      setOnlineUpdate: async () => false,
       isSidebarFavoriteStarEnabled: () => true,
       setSidebarFavoriteStar: async () => false,
+      getSidebarFavoriteStarMode: () => "all",
+      setSidebarFavoriteStarMode: async () => "all",
       destroy: () => {
       }
     };
@@ -294,30 +315,22 @@ function setupSidebarEntry(ctx, options) {
     await setLocation(next ? "both" : "settings");
     return isSidebarEnabled();
   };
-  let onlineUpdateEnabled = true;
-  let onlineUpdateLocked = false;
-  const setOnlineUpdate = async (next) => {
-    if (destroyed || onlineUpdateLocked) return onlineUpdateEnabled;
-    onlineUpdateEnabled = next;
+  let sidebarFavoriteStarMode = "all";
+  let favoriteStarEpoch = 0;
+  const setSidebarFavoriteStarMode = async (next) => {
+    if (destroyed) return sidebarFavoriteStarMode;
+    const currentEpoch = ++favoriteStarEpoch;
+    const previous = sidebarFavoriteStarMode;
+    sidebarFavoriteStarMode = next;
     notify();
-    if (typeof options.onOnlineUpdateChange === "function") {
+    if (typeof options.onSidebarFavoriteStarModeChange === "function") {
       try {
-        options.onOnlineUpdateChange(next);
+        options.onSidebarFavoriteStarModeChange(next);
       } catch {
       }
-    }
-    return next;
-  };
-  let sidebarFavoriteStarEnabled = true;
-  let favoriteStarEpoch = 0;
-  const setSidebarFavoriteStar = async (next) => {
-    if (destroyed) return sidebarFavoriteStarEnabled;
-    const currentEpoch = ++favoriteStarEpoch;
-    sidebarFavoriteStarEnabled = next;
-    notify();
-    if (typeof options.onSidebarFavoriteStarChange === "function") {
+    } else if (typeof options.onSidebarFavoriteStarChange === "function") {
       try {
-        options.onSidebarFavoriteStarChange(next);
+        options.onSidebarFavoriteStarChange(next !== "none");
       } catch {
       }
     }
@@ -325,16 +338,21 @@ function setupSidebarEntry(ctx, options) {
       await callApi("/sidebar-favorite-star", {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ enabled: next })
+        body: JSON.stringify({ mode: next, enabled: next !== "none" })
       });
       return next;
     } catch (err) {
       if (currentEpoch === favoriteStarEpoch) {
-        sidebarFavoriteStarEnabled = !next;
+        sidebarFavoriteStarMode = previous;
         notify();
-        if (typeof options.onSidebarFavoriteStarChange === "function") {
+        if (typeof options.onSidebarFavoriteStarModeChange === "function") {
+          try {
+            options.onSidebarFavoriteStarModeChange(previous);
+          } catch {
+          }
+        } else if (typeof options.onSidebarFavoriteStarChange === "function") {
           try {
-            options.onSidebarFavoriteStarChange(!next);
+            options.onSidebarFavoriteStarChange(previous !== "none");
           } catch {
           }
         }
@@ -342,6 +360,10 @@ function setupSidebarEntry(ctx, options) {
       throw err;
     }
   };
+  const setSidebarFavoriteStar = async (next) => {
+    const res = await setSidebarFavoriteStarMode(next ? "all" : "none");
+    return res !== "none";
+  };
   const loadEpoch = epoch;
   callApi("/sidebar-entry").then((res) => {
     if (!destroyed && epoch === loadEpoch && res) {
@@ -363,12 +385,21 @@ function setupSidebarEntry(ctx, options) {
   });
   const loadFavoriteStarEpoch = favoriteStarEpoch;
   callApi("/sidebar-favorite-star").then((res) => {
-    if (!destroyed && favoriteStarEpoch === loadFavoriteStarEpoch && res && typeof res.enabled === "boolean") {
-      sidebarFavoriteStarEnabled = res.enabled;
+    if (!destroyed && favoriteStarEpoch === loadFavoriteStarEpoch && res) {
+      if (res.mode === "all" || res.mode === "favorites" || res.mode === "none") {
+        sidebarFavoriteStarMode = res.mode;
+      } else if (typeof res.enabled === "boolean") {
+        sidebarFavoriteStarMode = res.enabled ? "all" : "none";
+      }
       notify();
-      if (typeof options.onSidebarFavoriteStarChange === "function") {
+      if (typeof options.onSidebarFavoriteStarModeChange === "function") {
+        try {
+          options.onSidebarFavoriteStarModeChange(sidebarFavoriteStarMode);
+        } catch {
+        }
+      } else if (typeof options.onSidebarFavoriteStarChange === "function") {
         try {
-          options.onSidebarFavoriteStarChange(sidebarFavoriteStarEnabled);
+          options.onSidebarFavoriteStarChange(sidebarFavoriteStarMode !== "none");
         } catch {
         }
       }
@@ -413,11 +444,10 @@ function setupSidebarEntry(ctx, options) {
         setLocation,
         getEnabled: () => isSidebarEnabled(),
         setSidebar: setEnabled,
-        getOnlineUpdateEnabled: () => onlineUpdateEnabled,
-        setOnlineUpdate,
-        getOnlineUpdateLocked: () => onlineUpdateLocked,
-        getSidebarFavoriteStarEnabled: () => sidebarFavoriteStarEnabled,
+        getSidebarFavoriteStarEnabled: () => sidebarFavoriteStarMode !== "none",
         setSidebarFavoriteStar,
+        getSidebarFavoriteStarMode: () => sidebarFavoriteStarMode,
+        setSidebarFavoriteStarMode,
         subscribe: (fn) => {
           listeners.add(fn);
           return () => {
@@ -434,11 +464,10 @@ function setupSidebarEntry(ctx, options) {
     isEnabled: () => isSidebarEnabled(),
     isSupported: () => sidebarSupported,
     setEnabled,
-    isOnlineUpdateEnabled: () => onlineUpdateEnabled,
-    isOnlineUpdateLocked: () => onlineUpdateLocked,
-    setOnlineUpdate,
-    isSidebarFavoriteStarEnabled: () => sidebarFavoriteStarEnabled,
+    isSidebarFavoriteStarEnabled: () => sidebarFavoriteStarMode !== "none",
     setSidebarFavoriteStar,
+    getSidebarFavoriteStarMode: () => sidebarFavoriteStarMode,
+    setSidebarFavoriteStarMode,
     destroy: () => {
       if (destroyed) return;
       destroyed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-archive-manager",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "归档、恢复、收藏和永久删除会话，并诊断损坏的会话日志。 · Archive, restore, favorite, and permanently delete sessions, and diagnose damaged session logs.",
   "type": "module",
   "packageManager": "pnpm@11.22.0",