dsh-agent-skills 0.1.3 → 0.1.5

package/README.md

@@ -25,7 +25,7 @@
 
 通过 [DSH 插件市场](https://github.com/dsh-market/dsh-market) 安装，或打开 DSH 的「设置 → 插件市场」，搜索 **Agent Skills**，点击安装。市场会优先使用 npm 包，安装速度快，也不需要在本机重新构建。
 
-安装后继续完成下面的「开启接管 DSH 技能」步骤，再重启 DSH Web。
+安装后继续完成下面的「开启接管 DSH 技能」步骤，页面会直接提供重启按钮。
 
 ### 方式二：从 npm 安装
 
@@ -47,10 +47,12 @@ dsh plugin --profile web add github:minivv/dsh-agent-skills
 
 1. 打开 DSH 的「设置 → Agent Skills」。
 2. 点击 **开启接管 DSH 技能**。
-3. 看到“已开启”提示后重启 DSH Web。
+3. 点击页面出现的 **重启 DSH**，等待服务恢复并自动刷新页面。
 
 开启后，页面会在 `standard` 与 `code` preset 中用 `dsh-agent-skills/preset` 替换原来的 `skill-filesystem` provider，让目录和技能开关真正控制 Agent 可见的技能。它不会创建第二个 `agentSkills` host 服务；卸载脚本会恢复官方 provider。
 
+需要恢复 DSH 原来的技能来源时，点击 **取消接管**，再点击 **重启 DSH**。页面刷新后，`standard` 与 `code` preset 会重新使用官方 `@deepseek-ai/dsh-skill-filesystem` provider。
+
 如果页面无法定位 DSH 安装位置，可以使用备用命令：
 
 ```bash
@@ -58,7 +60,7 @@ DSH_INSTALL_ROOT="$(npm root -g)/@deepseek-ai/dsh" \
   node ~/.dsh/profiles/web/node_modules/dsh-agent-skills/scripts/install-preset.mjs
 ```
 
-执行后重启 DSH Web。DSH 升级可能覆盖内置 preset；如果页面重新显示“开启接管 DSH 技能”，点击一次即可恢复。
+执行后重启 DSH Web。DSH 升级可能覆盖内置 preset；如果页面重新显示“开启接管 DSH 技能”，点击一次并按页面提示重启即可恢复。
 
 ## 使用
 
@@ -97,7 +99,9 @@ description: Explain when this skill should be used.
 
 ## 卸载
 
-先恢复 DSH 官方的 `skill-filesystem` provider，再卸载 npm 包：
+推荐先在「设置 → Agent Skills」点击 **取消接管** 和 **重启 DSH**，再从插件市场卸载。
+
+如果设置页无法打开，也可以用命令恢复 DSH 官方的 `skill-filesystem` provider，再卸载 npm 包：
 
 ```bash
 DSH_INSTALL_ROOT="$(npm root -g)/@deepseek-ai/dsh" \

package/lib/client.js

@@ -40,10 +40,16 @@ var zh = {
   takeoverDescription: "\u5F00\u542F\u540E\uFF0C\u8FD9\u91CC\u7684\u76EE\u5F55\u548C\u6280\u80FD\u5F00\u5173\u4F1A\u771F\u6B63\u63A7\u5236 Agent \u53EF\u89C1\u7684\u6280\u80FD\u3002",
   takeoverEnabledTitle: "\u5DF2\u63A5\u7BA1 DSH \u6280\u80FD",
   takeoverEnabledDescription: "\u76EE\u5F55\u548C\u6280\u80FD\u5F00\u5173\u5DF2\u63A5\u5165 standard \u4E0E code \u9884\u8BBE\u3002",
-  takeoverRestartDescription: "\u5DF2\u5F00\u542F\uFF0C\u8BF7\u91CD\u542F DSH \u540E\u751F\u6548\u3002",
+  takeoverRestartDescription: "\u63A5\u7BA1\u5DF2\u5F00\u542F\uFF0C\u91CD\u542F DSH \u540E\u751F\u6548\u3002",
+  takeoverDisableRestartDescription: "\u63A5\u7BA1\u5DF2\u53D6\u6D88\uFF0C\u91CD\u542F DSH \u540E\u6062\u590D\u5B98\u65B9\u6280\u80FD\u6765\u6E90\u3002",
   takeoverPartialDescription: "\u5DF2\u63A5\u5165 {configured}/{total} \u4E2A\u9884\u8BBE\uFF0C\u70B9\u51FB\u7EE7\u7EED\u5B8C\u6210\u3002",
   takeoverUnavailableDescription: "\u672A\u627E\u5230 DSH \u5B89\u88C5\u4F4D\u7F6E\uFF0C\u8BF7\u786E\u8BA4\u5F53\u524D\u9875\u9762\u7531 DSH \u542F\u52A8\u540E\u91CD\u8BD5\u3002",
   takeoverAction: "\u5F00\u542F\u63A5\u7BA1 DSH \u6280\u80FD",
+  takeoverDisableAction: "\u53D6\u6D88\u63A5\u7BA1",
+  restartDsh: "\u91CD\u542F DSH",
+  restartingDsh: "\u6B63\u5728\u91CD\u542F\u2026",
+  restartFailed: "\u91CD\u542F\u5931\u8D25\uFF1A{message}",
+  restartTimeout: "\u7B49\u5F85 DSH \u91CD\u542F\u8D85\u65F6\uFF0C\u8BF7\u67E5\u770B\u7EC8\u7AEF\u6216\u4E34\u65F6\u76EE\u5F55\u4E2D\u7684\u91CD\u542F\u65E5\u5FD7\u3002",
   searchPlaceholder: "\u641C\u7D22\u6280\u80FD\u540D\u79F0\u6216\u63CF\u8FF0\u2026",
   sources: "\u6765\u6E90",
   validCount: "\u4E2A\u6709\u6548",
@@ -90,10 +96,16 @@ var en = {
   takeoverDescription: "Connect these source and skill switches to the skills visible to the Agent.",
   takeoverEnabledTitle: "DSH skills are managed here",
   takeoverEnabledDescription: "Source and skill switches are connected to the standard and code presets.",
-  takeoverRestartDescription: "Enabled. Restart DSH to apply the change.",
+  takeoverRestartDescription: "Takeover is enabled. Restart DSH to apply it.",
+  takeoverDisableRestartDescription: "Takeover is cancelled. Restart DSH to restore the official skill source.",
   takeoverPartialDescription: "Connected to {configured}/{total} presets. Continue to finish setup.",
   takeoverUnavailableDescription: "DSH could not be located. Open this page from DSH and try again.",
   takeoverAction: "Enable DSH skill takeover",
+  takeoverDisableAction: "Cancel takeover",
+  restartDsh: "Restart DSH",
+  restartingDsh: "Restarting\u2026",
+  restartFailed: "Restart failed: {message}",
+  restartTimeout: "DSH did not restart in time. Check the terminal or the restart logs in the temporary directory.",
   searchPlaceholder: "Search skills by name or description\u2026",
   sources: "Sources",
   validCount: "valid",
@@ -137,6 +149,26 @@ var en = {
 var import_react = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 var clamp = (value, max) => value.length <= max ? value : value.slice(0, max - 1) + "\u2026";
+var TAKEOVER_RESTART_KEY = "dsh-agent-skills:takeover-restart";
+function readPendingRestart() {
+  try {
+    const raw = window.sessionStorage.getItem(TAKEOVER_RESTART_KEY);
+    if (raw === null) return void 0;
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.boot === "string" && typeof parsed.baselineEnabled === "boolean") {
+      return { boot: parsed.boot, baselineEnabled: parsed.baselineEnabled };
+    }
+  } catch {
+  }
+  return void 0;
+}
+function writePendingRestart(pending) {
+  try {
+    if (pending === void 0) window.sessionStorage.removeItem(TAKEOVER_RESTART_KEY);
+    else window.sessionStorage.setItem(TAKEOVER_RESTART_KEY, JSON.stringify(pending));
+  } catch {
+  }
+}
 function Switch({ checked, disabled, onChange, label }) {
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { className: "as-switch", title: label, "aria-label": label, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)("input", { type: "checkbox", checked, disabled, onChange: (event) => onChange(event.target.checked) }),
@@ -204,6 +236,7 @@ function AgentSkillsSection({ api, t }) {
   const [view, setView] = (0, import_react.useState)(void 0);
   const [takeover, setTakeover] = (0, import_react.useState)(void 0);
   const [takeoverRestartRequired, setTakeoverRestartRequired] = (0, import_react.useState)(false);
+  const [restarting, setRestarting] = (0, import_react.useState)(false);
   const [busy, setBusy] = (0, import_react.useState)(true);
   const [error51, setError] = (0, import_react.useState)("");
   const [query, setQuery] = (0, import_react.useState)("");
@@ -246,6 +279,10 @@ function AgentSkillsSection({ api, t }) {
     const result2 = await refresh();
     if (result2.ok) {
       setTakeover(result2.value);
+      const pending = readPendingRestart();
+      const stillPending = result2.value.boot !== void 0 && pending?.boot === result2.value.boot && result2.value.enabled !== pending.baselineEnabled;
+      setTakeoverRestartRequired(stillPending);
+      if (pending !== void 0 && !stillPending) writePendingRestart(void 0);
     } else {
       setError(t("errorLoad", { message: result2.error.message }));
     }
@@ -275,21 +312,81 @@ function AgentSkillsSection({ api, t }) {
       setSaving(false);
     }
   }, [t, updatePendingCount]);
-  const enableTakeover = (0, import_react.useCallback)(async () => {
+  const changeTakeover = (0, import_react.useCallback)(async (enabled) => {
     setSaving(true);
     setError("");
     try {
-      const result2 = await api.enableTakeover();
+      const result2 = enabled ? await api.enableTakeover() : await api.disableTakeover();
       if (result2.ok) {
+        const pending = readPendingRestart();
+        const baselineEnabled2 = result2.value.boot !== void 0 && pending?.boot === result2.value.boot ? pending.baselineEnabled : takeover?.enabled ?? !enabled;
+        const restartRequired = result2.value.enabled !== baselineEnabled2;
         setTakeover(result2.value);
-        setTakeoverRestartRequired(result2.value.enabled);
+        setTakeoverRestartRequired(restartRequired);
+        writePendingRestart(restartRequired && result2.value.boot !== void 0 ? { boot: result2.value.boot, baselineEnabled: baselineEnabled2 } : void 0);
       } else {
         setError(t("errorSave", { message: result2.error.message }));
       }
     } finally {
       setSaving(false);
     }
-  }, [api, t]);
+  }, [api, t, takeover?.enabled]);
+  const restartDsh = (0, import_react.useCallback)(async () => {
+    if (restarting) return;
+    const previousBoot = takeover?.boot;
+    setRestarting(true);
+    setError("");
+    const deadline = Date.now() + 6e4;
+    let sawOffline = false;
+    const retry = () => {
+      if (Date.now() > deadline) {
+        setRestarting(false);
+        setError(t("restartTimeout"));
+        return;
+      }
+      window.setTimeout(() => void poll(), 700);
+    };
+    const poll = async () => {
+      try {
+        const response = await fetch(`${window.location.origin}/?dsh-agent-skills-restart=${Date.now()}`, {
+          cache: "no-store"
+        });
+        if (!response.ok) throw new Error(`HTTP ${response.status}`);
+      } catch {
+        sawOffline = true;
+        retry();
+        return;
+      }
+      if (previousBoot !== void 0) {
+        try {
+          const status = await api.takeoverStatus();
+          if (status.ok && status.value.boot !== void 0 && status.value.boot !== previousBoot) {
+            window.location.reload();
+            return;
+          }
+        } catch {
+          sawOffline = true;
+          retry();
+          return;
+        }
+      }
+      if (sawOffline) {
+        window.location.reload();
+        return;
+      }
+      retry();
+    };
+    try {
+      const result2 = await api.restartDsh();
+      if (!result2.ok) {
+        setRestarting(false);
+        setError(t("restartFailed", { message: result2.error.message }));
+        return;
+      }
+    } catch {
+    }
+    retry();
+  }, [api, restarting, t, takeover?.boot]);
   const toggleDirExpanded = (path) => {
     setDirExpanded((prev) => {
       const next = new Set(prev);
@@ -338,9 +435,34 @@ function AgentSkillsSection({ api, t }) {
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "as-takeover-icon", "aria-hidden": "true", children: takeover.enabled ? "\u2713" : "\u2192" }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "as-takeover-copy", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("strong", { children: takeover.enabled ? t("takeoverEnabledTitle") : t("takeoverTitle") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: takeoverRestartRequired ? t("takeoverRestartDescription") : takeover.enabled ? t("takeoverEnabledDescription") : takeover.available && takeover.configured > 0 ? t("takeoverPartialDescription", { configured: takeover.configured, total: takeover.total }) : takeover.available ? t("takeoverDescription") : t("takeoverUnavailableDescription") })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: takeoverRestartRequired ? takeover.enabled ? t("takeoverRestartDescription") : t("takeoverDisableRestartDescription") : takeover.enabled ? t("takeoverEnabledDescription") : takeover.available && takeover.configured > 0 ? t("takeoverPartialDescription", { configured: takeover.configured, total: takeover.total }) : takeover.available ? t("takeoverDescription") : t("takeoverUnavailableDescription") })
       ] }),
-      !takeover.enabled && takeover.available && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("button", { type: "button", className: "as-btn as-btn-primary as-takeover-action", disabled: saving, onClick: () => void enableTakeover(), children: t("takeoverAction") })
+      takeover.available && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "as-takeover-actions", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          "button",
+          {
+            type: "button",
+            className: takeover.enabled || takeoverRestartRequired ? "as-btn as-takeover-action" : "as-btn as-btn-primary as-takeover-action",
+            disabled: saving || restarting,
+            onClick: () => void changeTakeover(!takeover.enabled),
+            children: takeover.enabled ? t("takeoverDisableAction") : t("takeoverAction")
+          }
+        ),
+        takeoverRestartRequired && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+          "button",
+          {
+            type: "button",
+            className: "as-btn as-btn-primary as-takeover-action",
+            disabled: saving || restarting,
+            onClick: () => void restartDsh(),
+            children: [
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { "aria-hidden": "true", children: "\u21BB" }),
+              " ",
+              restarting ? t("restartingDsh") : t("restartDsh")
+            ]
+          }
+        )
+      ] })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       "input",
@@ -533,7 +655,8 @@ var CSS = `
 .as-takeover-copy { display: flex; flex: 1; min-width: 0; flex-direction: column; gap: 2px; }
 .as-takeover-copy strong { font-size: 13px; font-weight: 600; line-height: 1.35; text-wrap: balance; }
 .as-takeover-copy span { font-size: 12px; line-height: 1.45; color: var(--as-muted); text-wrap: pretty; }
-.as-takeover-action { min-height: 40px; flex: none; transition-property: transform, background-color; transition-duration: 120ms; }
+.as-takeover-actions { display: flex; align-items: center; gap: 7px; flex: none; }
+.as-takeover-action { min-height: 32px; flex: none; transition-property: transform, background-color; transition-duration: 120ms; }
 .as-takeover-action:active:not(:disabled) { transform: scale(0.96); }
 
 .as-sources-row { display: flex; align-items: baseline; gap: 10px; }
@@ -582,10 +705,10 @@ var CSS = `
 .as-skills-header { display: flex; align-items: baseline; gap: 7px; font-size: 13px; font-weight: 550; margin: 4px 0 0; text-wrap: balance; }
 .as-skills-header-title { color: var(--as-text); }
 .as-skills-header-stats { font-size: 11px; font-weight: 450; color: var(--as-muted-2); font-variant-numeric: tabular-nums; }
-.as-refresh-card { display: flex; align-items: center; gap: 9px; min-height: 48px; padding: 4px 5px 4px 11px; border: 1px solid rgba(210, 153, 34, 0.28); border-radius: var(--as-radius); background: var(--as-warning-soft); box-sizing: border-box; }
-.as-refresh-icon { flex: none; color: var(--as-warning); font-size: 17px; line-height: 1; }
-.as-refresh-message { flex: 1; min-width: 0; color: var(--as-text); font-size: 12px; line-height: 1.45; font-variant-numeric: tabular-nums; text-wrap: pretty; }
-.as-refresh-action { min-height: 40px; flex: none; border-color: rgba(210, 153, 34, 0.42); background: rgba(210, 153, 34, 0.08); transition-property: transform, background-color; transition-duration: 120ms; }
+.as-refresh-card { display: flex; align-items: center; gap: 8px; min-height: 36px; padding: 3px 4px 3px 9px; border: 1px solid rgba(210, 153, 34, 0.28); border-radius: var(--as-radius); background: var(--as-warning-soft); box-sizing: border-box; }
+.as-refresh-icon { flex: none; color: var(--as-warning); font-size: 15px; line-height: 1; }
+.as-refresh-message { flex: 1; min-width: 0; color: var(--as-text); font-size: 12px; line-height: 1.3; font-variant-numeric: tabular-nums; }
+.as-refresh-action { min-height: 28px; padding-block: 3px; flex: none; border-color: rgba(210, 153, 34, 0.42); background: rgba(210, 153, 34, 0.08); transition-property: transform, background-color; transition-duration: 120ms; }
 .as-refresh-action:hover { background: rgba(210, 153, 34, 0.14); }
 .as-refresh-action:active { transform: scale(0.96); }
 .as-skill-grid { display: flex; flex-direction: column; gap: 8px; }
@@ -638,14 +761,12 @@ var CSS = `
     flex: 1;
   }
   .as-takeover { align-items: flex-start; flex-wrap: wrap; }
-  .as-takeover-action { width: 100%; }
+  .as-takeover-actions { width: 100%; justify-content: flex-end; flex-wrap: wrap; }
   .as-actions-row { flex-wrap: wrap; }
   .as-dir-row { align-items: flex-start; flex-wrap: wrap; }
   .as-dir-path { flex: 1; min-width: 120px; }
   .as-skill-row { align-items: flex-start; flex-wrap: wrap; }
-  .as-refresh-card { flex-wrap: wrap; padding: 8px 9px; }
-  .as-refresh-message { min-width: calc(100% - 34px); }
-  .as-refresh-action { width: 100%; }
+  .as-refresh-card { padding: 3px 4px 3px 8px; }
 }
 `;
 var installed;
@@ -15242,7 +15363,12 @@ var presetTakeoverStatusSchema = external_exports.object({
   /** Number of preset files that already contain the managed row. */
   configured: external_exports.number().int().min(0),
   /** Number of supported preset files found in this DSH installation. */
-  total: external_exports.number().int().min(0)
+  total: external_exports.number().int().min(0),
+  /** Identifies the running DSH process; changes after a successful restart. */
+  boot: external_exports.string().optional()
+});
+var restartResultSchema = external_exports.object({
+  scheduled: external_exports.literal(true)
 });
 var toggleSkillInputSchema = external_exports.object({
   name: external_exports.string(),
@@ -15298,6 +15424,24 @@ var TYPERT_REMOTE = {
       parameters: [],
       result: result("PresetTakeoverStatus", presetTakeoverStatusSchema)
     },
+    {
+      id: `${PKG}#agentSkills/disableTakeover`,
+      service: "agentSkills",
+      namespace: "agentSkills",
+      method: "disableTakeover",
+      invocation: direct,
+      parameters: [],
+      result: result("PresetTakeoverStatus", presetTakeoverStatusSchema)
+    },
+    {
+      id: `${PKG}#agentSkills/restartDsh`,
+      service: "agentSkills",
+      namespace: "agentSkills",
+      method: "restartDsh",
+      invocation: direct,
+      parameters: [],
+      result: result("RestartResult", restartResultSchema)
+    },
     {
       id: `${PKG}#agentSkills/toggleSkill`,
       service: "agentSkills",