@michengai/dsh-skills-manager 0.1.15 → 0.1.17

package/README.md

@@ -124,7 +124,9 @@ Escape closes only the frontmost upload or confirmation dialog and leaves Settin
 
 - Enable, disable, and delete accept only one ordinary skill-name path segment.
 - Replacements copy to a temporary sibling path first and keep the original until that succeeds.
-- Write endpoints require JSON and the DSH client request marker, so cross-site browser requests cannot trigger local file operations.
+- All endpoints, including GET `/state`, accept only loopback `Host` values (`localhost`, `127.0.0.1`, `[::1]`).
+- Write endpoints also require JSON and the DSH client request marker, so cross-site browser requests cannot trigger local file operations.
+- Import accepts the local path the user selected. The HTTP API trusts loopback callers only; do not expose the host web server beyond this machine.
 
 ## Secondary development
 

package/README.zh-CN.md

@@ -124,7 +124,9 @@ dsh --profile web --dump-config
 
 - 启用、停用和删除只接受单个普通技能名称，目录穿越名称会被拒绝。
 - 覆盖前先复制到同目录临时路径；复制成功前不会改动现有技能。
-- 写入接口要求 JSON 与 DSH 客户端请求标记，跨站浏览器请求不能触发本地文件操作。
+- 全部接口（含 GET `/state`）只接受 loopback `Host`（`localhost`、`127.0.0.1`、`[::1]`）。
+- 写入接口还要求 JSON 与 DSH 客户端请求标记，跨站浏览器请求不能触发本地文件操作。
+- 导入接受用户选定的本机路径。HTTP 接口只信任 loopback 来源，不要把宿主 webServer 暴露到非本机地址。
 
 ## 二次开发
 

package/lib/client.js

@@ -55,6 +55,8 @@ window.__ModuleLoader__.load({
         "result.done": "上传完成：{names}",
         "result.skipped": "未导入：同名插件已跳过：{names}",
         "result.none": "未导入任何插件。",
+        "result.warnings": "警告：{warnings}",
+        "warning.backupUncleaned": "旧版本备份未清理: {path}（{error}）",
         "upload.title": "上传插件",
         "upload.close": "关闭上传弹窗",
         "upload.drop.title": "拖放 SKILL.md 文件到这里",
@@ -83,7 +85,9 @@ window.__ModuleLoader__.load({
         "error.import.invalidName": "无法生成合法 kebab-case 名称（原始名: {name}）",
         "error.import.duplicateName": "批量来源中存在多个同名插件: {name}",
         "error.import.failed": "导入失败",
+        "error.import.rollbackFailed": "覆盖导入回滚失败，备份保留在: {path}（{error}）",
         "error.proto.forbidden": "禁止的修改请求（缺少客户端标记）",
+        "error.proto.forbiddenHost": "禁止的请求来源（非法 Host）",
         "error.proto.contentType": "请求体必须是 application/json",
         "error.proto.method": "不支持的请求方法",
         "error.proto.unknownAction": "未知操作",
@@ -138,6 +142,8 @@ window.__ModuleLoader__.load({
         "result.done": "Upload complete: {names}",
         "result.skipped": "Not imported: same-name plugins were skipped: {names}",
         "result.none": "Nothing was imported.",
+        "result.warnings": "Warning: {warnings}",
+        "warning.backupUncleaned": "Old version backup was not cleaned up: {path} ({error})",
         "upload.title": "Upload plugin",
         "upload.close": "Close upload dialog",
         "upload.drop.title": "Drop SKILL.md file here",
@@ -166,7 +172,9 @@ window.__ModuleLoader__.load({
         "error.import.invalidName": "Cannot generate a valid kebab-case name (original name: {name})",
         "error.import.duplicateName": "Batch source contains multiple plugins with the same name: {name}",
         "error.import.failed": "Import failed",
+        "error.import.rollbackFailed": "Overwrite import rollback failed; backups kept at: {path} ({error})",
         "error.proto.forbidden": "Forbidden mutation request (missing client marker)",
+        "error.proto.forbiddenHost": "Forbidden request origin (invalid host)",
         "error.proto.contentType": "Content type must be application/json",
         "error.proto.method": "Method not allowed",
         "error.proto.unknownAction": "Unknown action",
@@ -457,6 +465,13 @@ window.__ModuleLoader__.load({
         var failedItems = importResult.failed || (importResult.error && importResult.error.failed) || [];
         var skippedNames = (importResult.skipped || []).map(function (item) { return item.name; });
         var failedText = failedItems.map(function (item) { return translateError(t, item); }).join(errorSeparator);
+        var warningItems = [];
+        (importResult.imported || []).forEach(function (item) {
+          if (item.warnings && item.warnings.length) {
+            for (var i = 0; i < item.warnings.length; i++) warningItems.push(item.warnings[i]);
+          }
+        });
+        var warningText = warningItems.map(function (item) { return translateError(t, item); }).join(errorSeparator);
         var resultText;
         if (isImportError) {
           // 顶层聚合错误优先展示已翻译的失败明细；无明细时由 translateError 兜底（含 Error 对象）。
@@ -470,6 +485,7 @@ window.__ModuleLoader__.load({
         } else {
           resultText = t("result.none");
         }
+        if (warningText) resultText = resultText + errorSeparator + t("result.warnings", { warnings: warningText });
         nodes.push(h("div", { key: "import-result", className: isImportError || failedItems.length ? "dssm-error" : "dssm-note", role: "status" }, resultText));
       }
       if (uploadOpen) {

package/lib/core.js

@@ -116,7 +116,9 @@ function stripBom(text) {
   return text.charCodeAt(0) === 0xfeff ? text.slice(1) : text;
 }
 
-/** 解析 SKILL.md 的 frontmatter。返回 { fields, map, body }，map 保留键序。 */
+/** 解析 SKILL.md 的 frontmatter。返回 { fields, map, body }，map 保留键序。
+ *  只识别顶层 key: value；缩进嵌套字段（如 metadata.source）不进入 map。
+ *  写入走 updateInvocationPolicy 的文本级替换，因此嵌套块会被原样保留。 */
 export function parseSkillDoc(text) {
   const src = stripBom(String(text));
   const lines = src.split(/\r?\n/);
@@ -180,7 +182,8 @@ export function unquote(v) {
   return s;
 }
 
-/** 仅更新调用策略行，避免重写并破坏其他 YAML frontmatter。 */
+/** 仅更新调用策略行，避免重写并破坏其他 YAML frontmatter。
+ *  启用时删除这两行以恢复缺省可调用，不还原这两行的原始文本或行内注释。 */
 function updateInvocationPolicy(text, enabled) {
   const source = String(text);
   const newline = source.includes("\r\n") ? "\r\n" : "\n";
@@ -423,14 +426,16 @@ async function replaceWithCopy(source, dest, isDir, existing = []) {
       try {
         await fs.rename(item.backup, item.path);
       } catch (rollbackError) {
-        rollbackFailures.push(`${item.backup}（${String(rollbackError && rollbackError.message ? rollbackError.message : rollbackError)}）`);
+        rollbackFailures.push(item.backup);
       }
     }
     if (rollbackFailures.length) {
-      const restoreError = new Error(`${String(error && error.message ? error.message : error)}；覆盖导入回滚失败，备份保留在: ${rollbackFailures.join("、")}`);
-      if (error && error.code) restoreError.code = error.code;
-      if (error && error.params) restoreError.params = error.params;
-      throw restoreError;
+      const causeText = String(error && error.message ? error.message : error);
+      throw codedError(
+        `${causeText}；覆盖导入回滚失败，备份保留在: ${rollbackFailures.join("、")}`,
+        "error.import.rollbackFailed",
+        { path: rollbackFailures.join("; "), error: causeText },
+      );
     }
     throw error;
   }
@@ -439,7 +444,11 @@ async function replaceWithCopy(source, dest, isDir, existing = []) {
     try {
       await fs.rm(item.backup, { recursive: true, force: true });
     } catch (error) {
-      warnings.push(`旧版本备份未清理: ${item.backup}（${String(error && error.message ? error.message : error)}）`);
+      warnings.push({
+        code: "warning.backupUncleaned",
+        params: { path: item.backup, error: String(error && error.message ? error.message : error) },
+        error: `旧版本备份未清理: ${item.backup}（${String(error && error.message ? error.message : error)}）`,
+      });
     }
   }
   return warnings;

package/lib/index.js

@@ -1,6 +1,7 @@
 // dsh-skills-manager host half：设置面板的 HTTP 后端（webServer prefix 路由）
 // - 零第三方 import（仅 node: 内置 + 本地 core.js）
 // - 路由：/api/dsh-skills-manager/state | enable | disable | delete | import
+// - 全部接口先校验 loopback Host；写接口再校验请求标记与 JSON
 // - $DSH_HOME\skills 可上传、删除、启停；$DSH_AGENTS_HOME\skills 仅允许查看
 
 import { appendFile, rename, rm, stat } from "node:fs/promises";
@@ -72,10 +73,17 @@ function readBody(req, limit = 1 << 20) {
   });
 }
 
-/** 自定义请求头使跨站 fetch 必须预检；本地接口不提供 CORS 响应。 */
-function validateMutationRequest(req) {
+/** 只允许 loopback Host，避免 DNS rebinding 读取 /state 或改写本地技能。 */
+function validateLoopbackHost(req) {
   const host = String(req.headers.host || "").toLowerCase();
-  if (!/^(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/.test(host)) return { statusCode: 403, code: "error.proto.forbidden", error: "forbidden host" };
+  if (!/^(localhost|127\.0\.0\.1|\[::1\])(:\d+)?$/.test(host)) return { statusCode: 403, code: "error.proto.forbiddenHost", error: "forbidden host" };
+  return null;
+}
+
+/** 写接口额外要求自定义头与 JSON；自定义头迫使跨站 fetch 预检，且本接口不回 CORS。 */
+function validateMutationRequest(req) {
+  const hostError = validateLoopbackHost(req);
+  if (hostError) return hostError;
   if (req.headers[CLIENT_MARKER_HEADER] !== "1") return { statusCode: 403, code: "error.proto.forbidden", error: "forbidden mutation request" };
   const contentType = String(req.headers["content-type"] || "").split(";", 1)[0].trim().toLowerCase();
   if (contentType !== "application/json") return { statusCode: 415, code: "error.proto.contentType", error: "content-type must be application/json" };
@@ -174,6 +182,11 @@ function apply(ctx) {
       const u = new URL(req.url, "http://localhost");
       const path = u.pathname.replace(/\/+$/, "");
       try {
+        const hostError = validateLoopbackHost(req);
+        if (hostError) {
+          json(res, hostError.statusCode, { ok: false, code: hostError.code, error: hostError.error });
+          return;
+        }
         if (req.method === "GET" && path === "/api/dsh-skills-manager/state") {
           return run(res, state);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@michengai/dsh-skills-manager",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "NPM-installable DSH Web plugin for managing local skills and viewing shared Agent skills safely.",
   "license": "Apache-2.0",
   "repository": {