npm - dsh-himarket - Versions diffs - 0.1.5 → 0.1.6 - Mend

dsh-himarket 0.1.5 → 0.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/README.md CHANGED Viewed

@@ -62,11 +62,39 @@ dsh plugin --profile web add link:E:/path/to/dsh-himarket
 | 字段 | 默认 | 说明 |
 |---|---|---|
-| `baseUrl` | 空 | HiMarket 后端地址（不含尾斜杠），如 `http://10.0.0.8:8080` |
+| `baseUrl` | `http://market.ai.ict.cmcc` | HiMarket 后端地址（不含尾斜杠）。旧环境填 `http://ai-market.ict.cmcc` |
+| `gatewayUrl` | `http://gateway.ai.ict.cmcc` | 岗位网关（包装层）地址。旧环境填 `http://ai-job.ict.cmcc` |
 | `username` | 空 | 开发者账号用户名 |
 | `password` | 空 | 开发者账号密码（明文，仅存本机 settings.yaml） |
 | `skillInstallDir` | 空 | Skill 安装根；留空回退 `~/.dsh/skills` |
+### 域名配置（新旧环境并存）
+内网原有 `*.ict.cmcc`，新部署的 K8S 环境改用 `*.ai.ict.cmcc`。**两套环境并存**，
+故域名不写死：默认指向新环境，可随时切回旧环境或指向其他环境。
+| 用途 | 旧环境 | 新环境（默认） |
+|---|---|---|
+| HiMarket 门户（`baseUrl`） | `http://ai-market.ict.cmcc` | `http://market.ai.ict.cmcc` |
+| 岗位网关（`gatewayUrl`） | `http://ai-job.ict.cmcc` | `http://gateway.ai.ict.cmcc` |
+| 数字员工花名册 | `http://ai-roster.ict.cmcc` | `http://roster.ai.ict.cmcc` |
+| 启动器配置中心 | `http://ai-conf.ict.cmcc` | `http://conf.ai.ict.cmcc` |
+覆盖优先级（低 → 高）：
+1. 内置默认（新环境 `*.ai.ict.cmcc`）
+2. 环境变量 `DSH_DEPLOY_ENV=legacy` 整体切回旧环境；或 `DSH_DOMAIN_SUFFIX=<后缀>` 只换后缀
+3. 环境变量 `DSH_HIMARKET_BASE_URL` / `DSH_HIMARKET_GATEWAY_URL` 给整条 URL
+4. `cordis.patch.yml` 行 config 的 `baseUrl` / `gatewayUrl`
+5. 设置页「HiMarket」卡片（`settings.yaml` 的 `himarket` namespace，最高）
+```bash
+# 切回旧环境（任一即可）
+export DSH_DEPLOY_ENV=legacy
+export DSH_HIMARKET_BASE_URL=http://ai-market.ict.cmcc
+# 或在设置页把「HiMarket 地址」改成 http://ai-market.ict.cmcc
+```
 ## 架构与实现要点
 - **不发布服务**：桥接只消费 `webServer`/`tools`/`settings`，放 host 平面、行 loose、无 isolate realm（与 `dsh-matrix` 同形）。

package/cordis.patch.yml CHANGED Viewed

@@ -8,3 +8,13 @@
         # 桥接包在运行时经 createRequire(ctx.baseUrl) 解析官方 @deepseek-ai/* 包，
         # 无需在此声明它们；这里只放桥接自身可调的默认值。
         skillInstallDir: ''
+        # 内网域名可切换：默认指向新 K8S 环境（*.ai.ict.cmcc），旧环境并存时可覆盖。
+        #   新环境（默认，无需写）：baseUrl: http://market.ai.ict.cmcc
+        #                            gatewayUrl: http://job.ai.ict.cmcc
+        #   旧环境：baseUrl: http://ai-market.ict.cmcc
+        #           gatewayUrl: http://ai-job.ict.cmcc
+        # ⚠️ gatewayUrl 指的是「岗位发布台」（dsh-himarket-gateway:3091），
+        #    新环境域名是 job.ai.ict.cmcc；而 gateway.ai.ict.cmcc 是 Higress 控制台，不是它。
+        # 也可整体切档：环境变量 DSH_DEPLOY_ENV=legacy（旧）/ 默认 new（新）。
+        # baseUrl: ''
+        # gatewayUrl: ''

package/lib/client.js CHANGED Viewed

@@ -43,6 +43,7 @@ module.exports = __toCommonJS(client_main_exports);
 var import_react = __toESM(require("react"), 1);
 var inject = ["slots", "locale"];
 var el = import_react.default.createElement;
+var PLUGIN_VERSION = true ? "0.1.6" : "dev";
 var NS = "settings.himarket";
 var zh = {
   tab: "HiMarket",
@@ -50,7 +51,7 @@ var zh = {
   subtitle: "\u586B\u4E00\u6B21\u5730\u5740\u548C\u8D26\u53F7\uFF0C\u70B9\u300C\u540C\u6B65\u300D\uFF0C\u5C31\u80FD\u5728\u5BF9\u8BDD\u91CC\u7528\u4E0A\u516C\u53F8\u4E0A\u67B6\u7684 MCP \u5DE5\u5177\u548C\u6280\u80FD\u3002",
   configTitle: "\u2460 \u8FDE\u63A5\u914D\u7F6E",
   baseUrlLabel: "HiMarket \u5730\u5740",
-  baseUrlPlaceholder: "\u4F8B\u5982 http://ai-market.ict.cmcc",
+  baseUrlPlaceholder: "\u4F8B\u5982 http://market.ai.ict.cmcc\uFF08\u65E7\u73AF\u5883 http://ai-market.ict.cmcc\uFF09",
   usernameLabel: "\u7528\u6237\u540D",
   usernamePlaceholder: "\u5F00\u53D1\u8005\u8D26\u53F7\u7528\u6237\u540D",
   passwordLabel: "\u5BC6\u7801",
@@ -71,7 +72,7 @@ var zh = {
   publish: "\u53D1\u5E03",
   publishing: "\u53D1\u5E03\u4E2D",
   gatewayLabel: "\u5305\u88C5\u5C42\u5730\u5740",
-  gatewayPlaceholder: "\u5982 http://ai-job.ict.cmcc\uFF0C\u53D1\u5E03\u4E0E\u6765\u6E90\u6807\u7B7E\u90FD\u8D70\u5B83",
+  gatewayPlaceholder: "\u5982 http://gateway.ai.ict.cmcc\uFF08\u65E7\u73AF\u5883 http://ai-job.ict.cmcc\uFF09\uFF0C\u53D1\u5E03\u4E0E\u6765\u6E90\u6807\u7B7E\u90FD\u8D70\u5B83",
   sourceOfficial: "\u4F01\u4E1A\u53D1\u5E03",
   sourceCommunity: "\u5458\u5DE5\u5171\u5EFA",
   filterAll: "\u5168\u90E8",
@@ -105,7 +106,7 @@ var en = {
   publish: "Publish",
   publishing: "Publishing",
   gatewayLabel: "Gateway URL",
-  gatewayPlaceholder: "e.g. http://ai-job.ict.cmcc; publishing and source tags go through it",
+  gatewayPlaceholder: "e.g. http://gateway.ai.ict.cmcc (legacy: http://ai-job.ict.cmcc); publishing and source tags go through it",
   sourceOfficial: "Official",
   sourceCommunity: "Community",
   filterAll: "All",
@@ -292,7 +293,12 @@ function HimarketTab(props) {
   return el(
     "div",
     { className: "hm_section" },
-    el("h3", null, t("title")),
+    el(
+      "div",
+      { style: { display: "flex", alignItems: "baseline", gap: "8px" } },
+      el("h3", null, t("title")),
+      el("span", { style: { fontSize: "12px", color: "var(--dsw-alias-label-tertiary)" } }, `dsh-himarket v${PLUGIN_VERSION}`)
+    ),
     el("p", { className: "hm_message" }, t("subtitle")),
     el("h3", null, t("configTitle")),
     el(
@@ -394,11 +400,11 @@ function apply(ctx) {
   }, "himarket: dictionaries");
   const t = ctx.locale.bind(NS);
   injectCss();
-  ctx.slots.inject("settings.plugins.tab", function() {
+  ctx.slots.inject("settings.section", function() {
     return ctx.slots.register({
-      name: "settings.plugins.tab",
+      name: "settings.section",
       id: "himarket",
-      order: 30,
+      order: 40,
       label: () => t("tab"),
       locale: NS,
       inject: () => ({ t })

package/lib/domain.d.ts ADDED Viewed

@@ -0,0 +1,68 @@
+/**
+ * 内网服务域名的集中配置（可切换部署环境）。
+ *
+ * 背景：公司内网原有 `*.ict.cmcc` 域名（如 ai-market.ict.cmcc），新部署的 K8S
+ * 环境改用 `*.ai.ict.cmcc`（如 market.ai.ict.cmcc）。**两套环境并存**，故这里
+ * 不写死任何一个：默认指向新环境，但允许经环境变量整体切回旧环境或指向其他环境。
+ *
+ * 两套环境的命名规律不同，因此用「环境档位」而非单纯换后缀：
+ *   新环境：`<服务>.ai.ict.cmcc`（market / job / roster / conf）
+ *   旧环境：`ai-<服务>.ict.cmcc`（ai-market / ai-job / ai-roster / ai-conf）
+ *
+ * ⚠️ 注意 `job` 与 `gateway` 的区别（两者**不是**同一服务）：
+ *   - `job`     → 岗位发布台（dsh-himarket-gateway:3091），旧环境 `ai-job.ict.cmcc`
+ *   - `gateway` → Higress 网关控制台（节点 :8001），旧环境 `ai-gateway.ict.cmcc`
+ *   本插件需要的是**岗位发布台**，故用 `job`；`gateway` 仅作注释参考。
+ *
+ * 覆盖优先级（低 → 高）：
+ *   1. 默认档位 `new`（新 K8S 环境）
+ *   2. `DSH_DEPLOY_ENV=legacy` 整体切回旧环境
+ *   3. `DSH_DOMAIN_SUFFIX` 只换后缀（用于指向其他按新规律命名的新式环境）
+ *   4. 各服务的整条 URL 环境变量（见 {@link defaultBaseUrl} / {@link defaultJobUrl}）
+ *   5. `cordis.patch.yml` 行 config
+ *   6. 设置页「HiMarket」卡片（settings.yaml 的 himarket namespace，最高）
+ *
+ * @module dsh-himarket/domain
+ */
+/** 新环境域名后缀（默认）。 */
+export declare const DEFAULT_DOMAIN_SUFFIX = "ai.ict.cmcc";
+/** 旧环境域名后缀。 */
+export declare const LEGACY_DOMAIN_SUFFIX = "ict.cmcc";
+/**
+ * 新环境各服务主机名。
+ *
+ * `job` = 岗位发布台（dsh-himarket-gateway）。
+ * 注意：新环境的 `gateway.ai.ict.cmcc` 是 Higress 控制台，**不是**岗位发布台。
+ */
+declare const NEW_HOSTS: {
+    readonly market: "market.ai.ict.cmcc";
+    readonly job: "job.ai.ict.cmcc";
+};
+/** 本插件用到的服务名。 */
+export type ServiceName = keyof typeof NEW_HOSTS;
+/**
+ * 是否使用旧环境域名档位。
+ * `DSH_DEPLOY_ENV=legacy` 即可整体切回旧环境（旧域名前缀带 `ai-`，不是简单换后缀）。
+ */
+export declare function isLegacyEnv(): boolean;
+/**
+ * 某服务的主机名（不含协议）。
+ * `DSH_DOMAIN_SUFFIX` 可只换后缀（指向其他按新规律命名的新式环境）。
+ */
+export declare function hostOf(service: ServiceName): string;
+/**
+ * 拼一个服务地址：优先整条 URL 环境变量，否则按当前环境档位拼。
+ * @param service 服务名（`market` / `job`）
+ * @param envName 整条 URL 覆盖用的环境变量名
+ */
+export declare function serviceUrl(service: ServiceName, envName: string): string;
+/** 默认 HiMarket 门户地址：新 `http://market.ai.ict.cmcc` / 旧 `http://ai-market.ict.cmcc`。 */
+export declare function defaultBaseUrl(): string;
+/**
+ * 默认岗位发布台地址：新 `http://job.ai.ict.cmcc` / 旧 `http://ai-job.ict.cmcc`。
+ *
+ * 兼容别名：`DSH_HIMARKET_GATEWAY_URL` 仍可用（历史命名），
+ * 但推荐用语义更准确的 `DSH_HIMARKET_JOB_URL`。
+ */
+export declare function defaultJobUrl(): string;
+export {};

package/lib/domain.js ADDED Viewed

@@ -0,0 +1,95 @@
+/**
+ * 内网服务域名的集中配置（可切换部署环境）。
+ *
+ * 背景：公司内网原有 `*.ict.cmcc` 域名（如 ai-market.ict.cmcc），新部署的 K8S
+ * 环境改用 `*.ai.ict.cmcc`（如 market.ai.ict.cmcc）。**两套环境并存**，故这里
+ * 不写死任何一个：默认指向新环境，但允许经环境变量整体切回旧环境或指向其他环境。
+ *
+ * 两套环境的命名规律不同，因此用「环境档位」而非单纯换后缀：
+ *   新环境：`<服务>.ai.ict.cmcc`（market / job / roster / conf）
+ *   旧环境：`ai-<服务>.ict.cmcc`（ai-market / ai-job / ai-roster / ai-conf）
+ *
+ * ⚠️ 注意 `job` 与 `gateway` 的区别（两者**不是**同一服务）：
+ *   - `job`     → 岗位发布台（dsh-himarket-gateway:3091），旧环境 `ai-job.ict.cmcc`
+ *   - `gateway` → Higress 网关控制台（节点 :8001），旧环境 `ai-gateway.ict.cmcc`
+ *   本插件需要的是**岗位发布台**，故用 `job`；`gateway` 仅作注释参考。
+ *
+ * 覆盖优先级（低 → 高）：
+ *   1. 默认档位 `new`（新 K8S 环境）
+ *   2. `DSH_DEPLOY_ENV=legacy` 整体切回旧环境
+ *   3. `DSH_DOMAIN_SUFFIX` 只换后缀（用于指向其他按新规律命名的新式环境）
+ *   4. 各服务的整条 URL 环境变量（见 {@link defaultBaseUrl} / {@link defaultJobUrl}）
+ *   5. `cordis.patch.yml` 行 config
+ *   6. 设置页「HiMarket」卡片（settings.yaml 的 himarket namespace，最高）
+ *
+ * @module dsh-himarket/domain
+ */
+/** 新环境域名后缀（默认）。 */
+export const DEFAULT_DOMAIN_SUFFIX = 'ai.ict.cmcc';
+/** 旧环境域名后缀。 */
+export const LEGACY_DOMAIN_SUFFIX = 'ict.cmcc';
+/**
+ * 新环境各服务主机名。
+ *
+ * `job` = 岗位发布台（dsh-himarket-gateway）。
+ * 注意：新环境的 `gateway.ai.ict.cmcc` 是 Higress 控制台，**不是**岗位发布台。
+ */
+const NEW_HOSTS = {
+    market: 'market.ai.ict.cmcc',
+    job: 'job.ai.ict.cmcc',
+};
+/** 旧环境各服务主机名（前缀带 `ai-`；旧环境岗位发布台是 ai-job）。 */
+const LEGACY_HOSTS = {
+    market: 'ai-market.ict.cmcc',
+    job: 'ai-job.ict.cmcc',
+};
+/** 读环境变量（空串视为未设置）。 */
+function env(name) {
+    const v = process.env[name];
+    return v !== undefined && v.trim() !== '' ? v.trim() : '';
+}
+/**
+ * 是否使用旧环境域名档位。
+ * `DSH_DEPLOY_ENV=legacy` 即可整体切回旧环境（旧域名前缀带 `ai-`，不是简单换后缀）。
+ */
+export function isLegacyEnv() {
+    return env('DSH_DEPLOY_ENV').toLowerCase() === 'legacy';
+}
+/**
+ * 某服务的主机名（不含协议）。
+ * `DSH_DOMAIN_SUFFIX` 可只换后缀（指向其他按新规律命名的新式环境）。
+ */
+export function hostOf(service) {
+    const suffix = env('DSH_DOMAIN_SUFFIX').replace(/^\.+/u, '');
+    if (suffix !== '')
+        return `${service}.${suffix}`;
+    return (isLegacyEnv() ? LEGACY_HOSTS : NEW_HOSTS)[service];
+}
+/**
+ * 拼一个服务地址：优先整条 URL 环境变量，否则按当前环境档位拼。
+ * @param service 服务名（`market` / `job`）
+ * @param envName 整条 URL 覆盖用的环境变量名
+ */
+export function serviceUrl(service, envName) {
+    const override = env(envName);
+    if (override !== '')
+        return override.replace(/\/+$/u, '');
+    return `http://${hostOf(service)}`;
+}
+/** 默认 HiMarket 门户地址：新 `http://market.ai.ict.cmcc` / 旧 `http://ai-market.ict.cmcc`。 */
+export function defaultBaseUrl() {
+    return serviceUrl('market', 'DSH_HIMARKET_BASE_URL');
+}
+/**
+ * 默认岗位发布台地址：新 `http://job.ai.ict.cmcc` / 旧 `http://ai-job.ict.cmcc`。
+ *
+ * 兼容别名：`DSH_HIMARKET_GATEWAY_URL` 仍可用（历史命名），
+ * 但推荐用语义更准确的 `DSH_HIMARKET_JOB_URL`。
+ */
+export function defaultJobUrl() {
+    const jobOverride = env('DSH_HIMARKET_JOB_URL');
+    if (jobOverride !== '')
+        return jobOverride.replace(/\/+$/u, '');
+    return serviceUrl('job', 'DSH_HIMARKET_GATEWAY_URL');
+}
+//# sourceMappingURL=domain.js.map

package/lib/domain.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"domain.js","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,mBAAmB;AACnB,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAA;AAElD,eAAe;AACf,MAAM,CAAC,MAAM,oBAAoB,GAAG,UAAU,CAAA;AAE9C;;;;;GAKG;AACH,MAAM,SAAS,GAAG;IAChB,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,iBAAiB;CACd,CAAA;AAEV,6CAA6C;AAC7C,MAAM,YAAY,GAAG;IACnB,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,iBAAiB;CACd,CAAA;AAKV,sBAAsB;AACtB,SAAS,GAAG,CAAC,IAAY;IACvB,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC3B,OAAO,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AAC3D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW;IACzB,OAAO,GAAG,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAA;AACzD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,MAAM,CAAC,OAAoB;IACzC,MAAM,MAAM,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAC5D,IAAI,MAAM,KAAK,EAAE;QAAE,OAAO,GAAG,OAAO,IAAI,MAAM,EAAE,CAAA;IAChD,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAA;AAC5D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,OAAoB,EAAE,OAAe;IAC9D,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,CAAA;IAC7B,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IACzD,OAAO,UAAU,MAAM,CAAC,OAAO,CAAC,EAAE,CAAA;AACpC,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,cAAc;IAC5B,OAAO,UAAU,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAA;AACtD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa;IAC3B,MAAM,WAAW,GAAG,GAAG,CAAC,sBAAsB,CAAC,CAAA;IAC/C,IAAI,WAAW,KAAK,EAAE;QAAE,OAAO,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;IAC/D,OAAO,UAAU,CAAC,KAAK,EAAE,0BAA0B,CAAC,CAAA;AACtD,CAAC"}

package/lib/index.d.ts CHANGED Viewed

@@ -17,6 +17,10 @@ export declare const name = "himarket";
 /** cordis.patch.yml 行 config（默认值，settings 覆盖）。 */
 export interface Config {
     skillInstallDir: string;
+    /** HiMarket 门户地址；缺省用 domain.ts 的环境档位默认值（新环境 market.ai.ict.cmcc）。 */
+    baseUrl?: string;
+    /** 岗位网关地址；缺省用 domain.ts 的环境档位默认值（新环境 gateway.ai.ict.cmcc）。 */
+    gatewayUrl?: string;
 }
 export declare function apply(ctx: Context, config: Config): void;
 export { defaultSkillRoot } from './skill.js';

package/lib/index.js CHANGED Viewed

@@ -18,11 +18,14 @@ import { attachSettings } from './settings.js';
 import { installSkill, defaultSkillRoot } from './skill.js';
 import { packageLocalJob } from './publish.js';
 import { registerHimarketTools } from './tools.js';
+import { defaultBaseUrl, defaultJobUrl } from './domain.js';
 export const name = 'himarket';
 export function apply(ctx, config) {
     const baseUrl = ctx.baseUrl ?? 'file:///';
+    // 域名默认值集中走 domain.ts（默认新 K8S 环境 *.ai.ict.cmcc，可经环境变量/行 config
+    // 切回旧环境 *.ict.cmcc）；行 config 显式给值则优先。
     const fallback = {
-        baseUrl: '',
+        baseUrl: config.baseUrl?.trim() || defaultBaseUrl(),
         username: '',
         password: '',
         token: '',
@@ -30,7 +33,7 @@ export function apply(ctx, config) {
         adminUsername: 'admin',
         adminPassword: '',
         portalId: '',
-        gatewayUrl: '',
+        gatewayUrl: config.gatewayUrl?.trim() || defaultJobUrl(),
         skillInstallDir: config.skillInstallDir ?? '',
     };
     const settings = attachSettings(ctx, fallback, baseUrl);

package/lib/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/preset.d.ts CHANGED Viewed

@@ -17,6 +17,10 @@
  *
  * @module dsh-himarket/preset
  */
+/** preset id 合法性（与 dsh-agent-presets 的 PRESET_ID 一致）。 */
+export declare const PRESET_ID: RegExp;
+/** 岗位包 marker 文件：存在即视为岗位包。 */
+export declare const PRESET_COMPOSITION = "agent.cordis.yml";
 /** 岗位 preset 落盘根（~/.dsh/.agent-presets）。 */
 export declare function defaultPresetRoot(): string;
 /** 岗位包安装结果。 */
@@ -29,7 +33,11 @@ export interface PresetInstallResult {
 /** 判断一个解压目录是否为岗位包（含 agent.cordis.yml）。 */
 export declare function isPresetPackage(unpackDir: string): Promise<boolean>;
 /**
- * 把岗位包落盘为 preset：agent.cordis.yml + preset.yml + 伴随文件 → ~/.dsh/.agent-presets/<id>/。
+ * 把岗位包落盘为 preset：agent.cordis.yml + preset.yml + 伴随文件 + skills/ → ~/.dsh/.agent-presets/<id>/。
+ *
+ * ⚠️ 本函数会 **rm -rf** 目标目录再整拷（幂等重装）。所以调用方若有「安装后要额外
+ * 写入的文件」（如岗位技能目录的重组结果），必须在**本函数之后**做，否则会被删掉。
+ *
  * @param unpackDir - 解压后的岗位包根（含 agent.cordis.yml）
  * @param id - preset id（目录名），取 SKILL.md frontmatter 的 name 或产品名
  * @param presetRoot - preset 落盘根，默认 ~/.dsh/.agent-presets

package/lib/preset.js CHANGED Viewed

@@ -23,9 +23,9 @@ import { homedir } from 'node:os';
 /** 岗位 preset 目录相对 harness home 的名字（与 dsh-agent-presets 的 USER_PRESET_DIR 一致）。 */
 const USER_PRESET_DIR = '.agent-presets';
 /** preset id 合法性（与 dsh-agent-presets 的 PRESET_ID 一致）。 */
-const PRESET_ID = /^[a-z0-9][a-z0-9-]*$/;
+export const PRESET_ID = /^[a-z0-9][a-z0-9-]*$/;
 /** 岗位包 marker 文件：存在即视为岗位包。 */
-const PRESET_COMPOSITION = 'agent.cordis.yml';
+export const PRESET_COMPOSITION = 'agent.cordis.yml';
 /** 默认 harness home（DSH_HOME 优先）。 */
 function dshHome() {
     return process.env.DSH_HOME?.trim() || join(homedir(), '.dsh');
@@ -44,7 +44,8 @@ export async function isPresetPackage(unpackDir) {
         return false;
     }
 }
-/** 排除名单：不属于 preset 组成、不该落进 preset 目录的文件。 */
+/** 排除名单：不属于 preset 组成、不该落进 preset 目录的文件。
+ *  注意：`skills/` **不**在此列 —— 分层结构下它随 preset 走（customSkillDirs 指向它）。 */
 const SKIP_PRESET_FILES = new Set(['SKILL.md', 'package.json', 'README.md']);
 /** 安全拷贝目录内容到目标（逐文件递归，忽略符号链接与 node_modules/点文件）。 */
 async function copyTreeSafe(srcDir, destDir) {
@@ -64,7 +65,11 @@ async function copyTreeSafe(srcDir, destDir) {
     }
 }
 /**
- * 把岗位包落盘为 preset：agent.cordis.yml + preset.yml + 伴随文件 → ~/.dsh/.agent-presets/<id>/。
+ * 把岗位包落盘为 preset：agent.cordis.yml + preset.yml + 伴随文件 + skills/ → ~/.dsh/.agent-presets/<id>/。
+ *
+ * ⚠️ 本函数会 **rm -rf** 目标目录再整拷（幂等重装）。所以调用方若有「安装后要额外
+ * 写入的文件」（如岗位技能目录的重组结果），必须在**本函数之后**做，否则会被删掉。
+ *
  * @param unpackDir - 解压后的岗位包根（含 agent.cordis.yml）
  * @param id - preset id（目录名），取 SKILL.md frontmatter 的 name 或产品名
  * @param presetRoot - preset 落盘根，默认 ~/.dsh/.agent-presets
@@ -76,7 +81,7 @@ export async function installPreset(unpackDir, id, presetRoot) {
     const root = presetRoot.trim() === '' ? defaultPresetRoot() : presetRoot;
     const dest = join(root, id);
     // 幂等重装：先删旧目录，再整拷 preset 组成（agent.cordis.yml + preset.yml + 伴随文件如
-    // tool-restrict.mjs），排除 SKILL.md 等 skill 侧文件（由 installSkill 落到 skills/）。
+    // tool-restrict.mjs + skills/），排除 SKILL.md 等 skill 侧文件。
     await mkdir(root, { recursive: true });
     await rm(dest, { recursive: true, force: true });
     const entries = await readdir(unpackDir, { withFileTypes: true });

package/lib/preset.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"preset.js","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AACzE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAEjC,iFAAiF;AACjF,MAAM,eAAe,GAAG,gBAAgB,CAAA;AAExC,yDAAyD;AACzD,MAAM,SAAS,GAAG,sBAAsB,CAAA;~~AAExC~~,8BAA8B;AAC9B,MAAM,kBAAkB,GAAG,kBAAkB,CAAA;~~AAE7C~~,oCAAoC;AACpC,SAAS,OAAO;IACd,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;AAChE,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,iBAAiB;IAC/B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,eAAe,CAAC,CAAA;AACzC,CAAC;AAUD,0CAA0C;AAC1C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,SAAiB;IACrD,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAA;QAC3D,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED~~,4CAA4C~~;~~AAC5C~~,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAA;AAE5E,mDAAmD;AACnD,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,OAAe;IACzD,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAQ;QACzE,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,MAAM,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;AACH,CAAC;AAED~~;;;;;GAKG~~;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,SAAiB,EACjB,EAAU,EACV,UAAkB;IAElB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;IACxE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAE3B,iEAAiE;IACjE,~~yEAAyE~~;~~IACzE~~,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IACjE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAQ;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACvC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,YAAY,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACnC,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;YACtC,MAAM,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,OAAO;QACL,EAAE,EAAE,IAAI;QACR,EAAE;QACF,GAAG,EAAE,IAAI;QACT,IAAI,EAAE,SAAS,EAAE,MAAM,IAAI,EAAE;KAC9B,CAAA;AACH,CAAC"}
1	+ {"version":3,"file":"preset.js","sourceRoot":"","sources":["../src/preset.ts"],"names":[],"mappings":"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"}

package/lib/settings.d.ts CHANGED Viewed

@@ -14,7 +14,11 @@
 import type { Context } from '@deepseek-ai/cordis';
 /** Bridge config & credential shape (resolved settings namespace value). */
 export interface HimarketSettings {
-    /** HiMarket backend base URL, e.g. http://ai-market.ict.cmcc (no trailing slash). */
+    /**
+     * HiMarket backend base URL, no trailing slash.
+     * 默认值由 domain.ts 按部署环境档位给出：新 K8S 环境 http://market.ai.ict.cmcc，
+     * 旧环境 http://ai-market.ict.cmcc（DSH_DEPLOY_ENV=legacy 或显式配置切换）。
+     */
     baseUrl: string;
     /** Developer account username. */
     username: string;

package/lib/settings.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;~~AA0B~~/C,+BAA+B;AAC/B,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAA;AAkBnC;;;GAGG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAY,EACZ,QAA0B,EAC1B,OAAe;IAMf,IAAI,QAAQ,GAA2B,GAAG,EAAE,CAAC,QAAQ,CAAA;IACrD,IAAI,IAAI,GAAwD,KAAK,IAAI,EAAE,GAAE,CAAC,CAAA;IAC9E,IAAI,QAAQ,GAAmC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAA;IAE7D,yDAAyD;IACzD,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAA6B,CAAA;QAClE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAA;YACjG,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,eAAe,CAAC,0BAA0B,EAAE,OAAO,CAAoB,CAAA;YACtF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YACF,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAmB,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC9F,QAAQ,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;YAClC,IAAI,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;gBACrB,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjC,CAAC,CAAA;YACD,QAAQ,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAClH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;QAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC/D,CAAC"}
1	+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AA8B/C,+BAA+B;AAC/B,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAA;AAkBnC;;;GAGG;AACH,MAAM,UAAU,cAAc,CAC5B,GAAY,EACZ,QAA0B,EAC1B,OAAe;IAMf,IAAI,QAAQ,GAA2B,GAAG,EAAE,CAAC,QAAQ,CAAA;IACrD,IAAI,IAAI,GAAwD,KAAK,IAAI,EAAE,GAAE,CAAC,CAAA;IAC9E,IAAI,QAAQ,GAAmC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC,CAAA;IAE7D,yDAAyD;IACzD,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAA6B,CAAA;QAClE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAA;YACjG,OAAM;QACR,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,eAAe,CAAC,0BAA0B,EAAE,OAAO,CAAoB,CAAA;YACtF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBAC3B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAClC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC;gBAC/C,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;aAC7C,CAAC,CAAA;YACF,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAmB,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;YAC9F,QAAQ,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,CAAA;YAClC,IAAI,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE;gBACrB,MAAM,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACjC,CAAC,CAAA;YACD,QAAQ,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;QACtD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6EAA6E,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;QAClH,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE;QACzB,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;QAC5B,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;KAC/B,CAAA;AACH,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAC/D,CAAC"}

package/lib/skill.d.ts CHANGED Viewed

@@ -24,7 +24,22 @@ export interface SkillInstallResult {
  * 安装一个 Skill（按 productId 下载 ZIP → 定位 SKILL.md → 落盘）。
  * 已装同名 skill 会被覆盖（幂等重装）；失败时保留旧版。
  *
- * 若 ZIP 是岗位包（含 agent.cordis.yml），额外把 preset 落盘到
- * ~/.dsh/.agent-presets/<id>/，SKILL.md 仍落 ~/.dsh/skills/<id>/。
+ * 包结构（2026-09-13 起支持分层结构，对齐 dsh 官方 cordis preset）：
+ *
+ *   A. 岗位包（含 agent.cordis.yml + skills/）
+ *      SKILL.md                 根层清单（跳过）
+ *      agent.cordis.yml         → .agent-presets/<id>/
+ *      preset.yml               → .agent-presets/<id>/
+ *      skills/<name>/SKILL.md   → .agent-presets/<id>/skills/   ← 随 preset 走（preset 层）
+ *      伴随文件（tool-restrict.mjs）→ .agent-presets/<id>/
+ *
+ *      skills/ 随 preset 走的原因：agent.cordis.yml 用 customSkillDirs 指向
+ *      preset 内的 skills/，注册进 preset 自己的层 → 岗位间隔离，且员工可在
+ *      project 层（<项目>/.dsh/skills/）同名覆盖而不被岗位更新冲掉。
+ *
+ *   B. 独立技能包（仅 SKILL.md 或 <name>/SKILL.md）
+ *      → ~/.dsh/skills/<name>/（global 层，所有岗位可见）
+ *
+ * 兼容旧岗位包（根层 SKILL.md 且无 skills/）：仍落全局 skills/，行为不变。
  */
 export declare function installSkill(client: HimarketClient, productId: string, installRoot: string, presetRoot?: string): Promise<SkillInstallResult>;

package/lib/skill.js CHANGED Viewed

@@ -14,7 +14,7 @@ import { tmpdir, homedir } from 'node:os';
 import { existsSync } from 'node:fs';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
-import { isPresetPackage, installPreset, defaultPresetRoot } from './preset.js';
+import { isPresetPackage, installPreset, defaultPresetRoot, PRESET_ID, PRESET_COMPOSITION } from './preset.js';
 const execFileAsync = promisify(execFile);
 /** skill 名称合法性（dsh-skill-filesystem 要求 kebab-case）。 */
 const SKILL_NAME_PATTERN = /^[a-z0-9][a-z0-9-]{0,63}$/u;
@@ -50,9 +50,32 @@ async function hasSkillMd(dir) {
         return false;
     }
 }
-/** 解压 ZIP 到目标目录（系统 bsdtar；多平台可用）。 */
+/**
+ * 解压 ZIP 到目标目录。
+ *
+ * ⚠️ Windows 必须用系统自带 bsdtar（C:\Windows\System32\tar.exe），不能用 PATH 上的 tar：
+ * 若用户装了 Git for Windows / MSYS，PATH 里的 GNU tar 会把 `C:\...` 当成「远程主机 C」，
+ * 报 `tar: Cannot connect to C: resolve failed`。bsdtar 原生支持 zip 与 Windows 路径。
+ */
 async function extractZip(zipPath, destDir) {
-    await execFileAsync('tar', ['-xf', zipPath, '-C', destDir], { timeout: 120000, windowsHide: true });
+    let tarBin = 'tar';
+    if (process.platform === 'win32') {
+        const winTar = join(process.env.SystemRoot || 'C:\\Windows', 'System32', 'tar.exe');
+        if (existsSync(winTar))
+            tarBin = winTar;
+    }
+    try {
+        await execFileAsync(tarBin, ['-xf', zipPath, '-C', destDir], { timeout: 120000, windowsHide: true });
+    }
+    catch (e) {
+        // GNU tar 会把 Windows 盘符当远程主机 → 明确报错，便于定位（而非抛出难懂的 tar 报错）
+        const msg = String(e?.stderr ?? e.message);
+        if (msg.includes('Cannot connect to')) {
+            throw new Error(`解压失败：PATH 上的 tar 是 GNU tar（不认 Windows 路径）。` +
+                `请确认系统自带 ${join(process.env.SystemRoot || 'C:\\Windows', 'System32', 'tar.exe')} 存在。原始错误：${msg.trim()}`);
+        }
+        throw e;
+    }
 }
 /** 防 zip-slip：确保展开后的路径仍在 root 内。 */
 function isWithin(root, target) {
@@ -85,8 +108,23 @@ async function copyTreeSafe(srcDir, destDir) {
  * 安装一个 Skill（按 productId 下载 ZIP → 定位 SKILL.md → 落盘）。
  * 已装同名 skill 会被覆盖（幂等重装）；失败时保留旧版。
  *
- * 若 ZIP 是岗位包（含 agent.cordis.yml），额外把 preset 落盘到
- * ~/.dsh/.agent-presets/<id>/，SKILL.md 仍落 ~/.dsh/skills/<id>/。
+ * 包结构（2026-09-13 起支持分层结构，对齐 dsh 官方 cordis preset）：
+ *
+ *   A. 岗位包（含 agent.cordis.yml + skills/）
+ *      SKILL.md                 根层清单（跳过）
+ *      agent.cordis.yml         → .agent-presets/<id>/
+ *      preset.yml               → .agent-presets/<id>/
+ *      skills/<name>/SKILL.md   → .agent-presets/<id>/skills/   ← 随 preset 走（preset 层）
+ *      伴随文件（tool-restrict.mjs）→ .agent-presets/<id>/
+ *
+ *      skills/ 随 preset 走的原因：agent.cordis.yml 用 customSkillDirs 指向
+ *      preset 内的 skills/，注册进 preset 自己的层 → 岗位间隔离，且员工可在
+ *      project 层（<项目>/.dsh/skills/）同名覆盖而不被岗位更新冲掉。
+ *
+ *   B. 独立技能包（仅 SKILL.md 或 <name>/SKILL.md）
+ *      → ~/.dsh/skills/<name>/（global 层，所有岗位可见）
+ *
+ * 兼容旧岗位包（根层 SKILL.md 且无 skills/）：仍落全局 skills/，行为不变。
  */
 export async function installSkill(client, productId, installRoot, presetRoot) {
     const root = installRoot.trim() === '' ? defaultSkillRoot() : installRoot;
@@ -98,14 +136,99 @@ export async function installSkill(client, productId, installRoot, presetRoot) {
         await mkdir(unpackDir, { recursive: true });
         await writeFile(zipPath, bytes);
         await extractZip(zipPath, unpackDir);
-        let skillSrc = unpackDir;
-        if (!(await hasSkillMd(unpackDir))) {
+        // 定位包根：根层有 agent.cordis.yml（岗位包）或 SKILL.md（技能包）；
+        // 否则退到第一层含 SKILL.md 的子目录（兼容打成 <name>/... 的包）。
+        let pkgRoot = unpackDir;
+        if (!existsSync(join(unpackDir, 'SKILL.md')) && !existsSync(join(unpackDir, PRESET_COMPOSITION))) {
             const subs = await readdir(unpackDir, { withFileTypes: true });
-            const found = subs.find((d) => d.isDirectory() && existsSync(join(unpackDir, d.name, 'SKILL.md')));
+            const found = subs.find((d) => d.isDirectory() && (existsSync(join(unpackDir, d.name, 'SKILL.md'))
+                || existsSync(join(unpackDir, d.name, PRESET_COMPOSITION))));
             if (found === undefined) {
-                throw new Error('技能包内未找到 SKILL.md（根或第一层子目录）');
+                throw new Error('技能包内未找到 SKILL.md 或 agent.cordis.yml（根或第一层子目录）');
+            }
+            pkgRoot = join(unpackDir, found.name);
+        }
+        const isPreset = existsSync(join(pkgRoot, PRESET_COMPOSITION));
+        const pkgSkillsDir = join(pkgRoot, 'skills');
+        const hasLayeredSkills = existsSync(pkgSkillsDir);
+        // ── 岗位包：技能随 preset 走（含安装侧重组）──
+        if (isPreset && hasLayeredSkills) {
+            // 岗位 id 取根层 SKILL.md 的 frontmatter name，退回产品名
+            let presetId = await skillNameFromFrontmatter(join(pkgRoot, 'SKILL.md'));
+            if (presetId === undefined) {
+                const raw = basename(productId).toLowerCase().replace(/[^a-z0-9-]/gu, '-').replace(/^-+|-+$/gu, '');
+                presetId = SKILL_NAME_PATTERN.test(raw) ? raw : `job-${raw}`.slice(0, 64);
             }
-            skillSrc = join(unpackDir, found.name);
+            if (!PRESET_ID.test(presetId))
+                throw new Error(`岗位 id「${presetId}」不合法`);
+            // ⚠️ 安装侧重组（Nacos 布局 → dsh 布局）
+            //
+            // Nacos 侧（上传/存储/下载）：
+            //   SKILL.md                        岗位技能入口（根层，Nacos 规范化的目标位置）
+            //   skills/<job>-references/*.md    岗位资源（按岗位命名的目录）
+            //   skills/<shared>.md              共享技能（平铺）
+            //
+            // dsh 侧（discoverRoot 要求）：
+            //   skills/<job>/SKILL.md           目录包入口（discoverRoot 只认 <dir>/SKILL.md）
+            //   skills/<job>/references/*.md    资源（resourceBase = skills/<job>/ 隔离）
+            //   skills/<shared>.md              不变
+            //
+            // 重组的必要性：
+            //   ① Nacos 会把技能入口规范化到**包根层**，目录包布局在 Nacos 侧不成立
+            //   ② dsh 的 discoverRoot 只扫 skills/ 的**直接子项**，根层 SKILL.md 扫不到
+            //   → 两边要求冲突，只能在安装时把根层 SKILL.md 搬进 skills/<job>/
+            //
+            // ⚠️ 顺序：installPreset 会 rm -rf 目标目录，所以**必须先调它**，
+            //    再做重组（否则重组结果会被删掉）。
+            const presetRootDir = presetRoot ?? defaultPresetRoot();
+            // 1. preset 组成 + 共享技能（installPreset 整拷 skills/）
+            const preset = await installPreset(pkgRoot, presetId, presetRootDir);
+            // 2. 岗位技能入口：根层 SKILL.md → skills/<job>/SKILL.md
+            const rootSkill = join(pkgRoot, 'SKILL.md');
+            if (!existsSync(rootSkill)) {
+                throw new Error('岗位包缺根层 SKILL.md（Nacos 侧技能入口）');
+            }
+            const destSkills = join(preset.dir, 'skills');
+            const jobSkillDir = join(destSkills, presetId);
+            await mkdir(jobSkillDir, { recursive: true });
+            await copyFile(rootSkill, join(jobSkillDir, 'SKILL.md'));
+            // 3. 岗位资源：skills/<job>-references/*.md → skills/<job>/references/*.md
+            let refCount = 0;
+            const refSrcDir = join(pkgSkillsDir, `${presetId}-references`);
+            if (existsSync(refSrcDir)) {
+                const refDestDir = join(jobSkillDir, 'references');
+                await mkdir(refDestDir, { recursive: true });
+                for (const f of await readdir(refSrcDir, { withFileTypes: true })) {
+                    if (!f.isFile())
+                        continue;
+                    await copyFile(join(refSrcDir, f.name), join(refDestDir, f.name));
+                    refCount++;
+                }
+            }
+            // 清掉落盘目录里按岗位命名的临时资源目录（内容已重组进 skills/<job>/references/）
+            // ⚠️ 要清的是 **落盘后** 的 skills/<job>-references/（installPreset 整拷过来的），
+            //    不是源包里的 —— 源在临时目录，会被 finally 清掉。
+            const stagedRefDir = join(destSkills, `${presetId}-references`);
+            if (existsSync(stagedRefDir)) {
+                await rm(stagedRefDir, { recursive: true, force: true });
+            }
+            return {
+                ok: true,
+                name: presetId,
+                dir: preset.dir,
+                note: `已安装岗位「${presetId}」：preset + 岗位技能（含 ${refCount} 个 references）` +
+                    ` → ${preset.dir}（技能随 preset 层，其他岗位不可见）`,
+                preset,
+            };
+        }
+        // ── 独立技能包（或旧结构岗位包）：落全局 skills/ ──
+        let skillSrc = pkgRoot;
+        if (!(await hasSkillMd(pkgRoot))) {
+            const subs = await readdir(pkgRoot, { withFileTypes: true });
+            const found = subs.find((d) => d.isDirectory() && existsSync(join(pkgRoot, d.name, 'SKILL.md')));
+            if (found === undefined)
+                throw new Error('技能包内未找到 SKILL.md（根或第一层子目录）');
+            skillSrc = join(pkgRoot, found.name);
         }
         let skillName = await skillNameFromFrontmatter(join(skillSrc, 'SKILL.md'));
         if (skillName === undefined) {
@@ -119,17 +242,17 @@ export async function installSkill(client, productId, installRoot, presetRoot) {
         await mkdir(root, { recursive: true });
         await rm(dest, { recursive: true, force: true });
         await copyTreeSafe(skillSrc, dest);
-        // 岗位包：额外落盘 preset
+        // 旧结构岗位包（根层 SKILL.md + agent.cordis.yml，无 skills/）：额外落盘 preset
         let preset;
-        if (await isPresetPackage(skillSrc)) {
-            preset = await installPreset(skillSrc, skillName, presetRoot ?? defaultPresetRoot());
+        if (isPreset) {
+            preset = await installPreset(pkgRoot, skillName, presetRoot ?? defaultPresetRoot());
         }
         return {
             ok: true,
             name: skillName,
             dir: dest,
             note: preset !== undefined
-                ? `已安装岗位「${skillName}」：技能 → ${dest}；岗位 preset → ${preset.dir}`
+                ? `已安装岗位「${skillName}」（旧结构）：技能 → ${dest}；岗位 preset → ${preset.dir}`
                 : `已安装技能「${skillName}」到 ${dest}`,
             preset,
         };

package/lib/skill.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"skill.js","sourceRoot":"","sources":["../src/skill.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC7F,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAA;AACxD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAErC,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;~~AAG/E~~,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AAEzC,uDAAuD;AACvD,MAAM,kBAAkB,GAAG,4BAA4B,CAAA;AAEvD;;;;mEAImE;AACnE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC,CAAA;AAEtH,wCAAwC;AACxC,MAAM,UAAU,gBAAgB;IAC9B,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAA;IACpE,OAAO,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;AAC7B,CAAC;AAED,iEAAiE;AACjE,KAAK,UAAU,wBAAwB,CAAC,WAAmB;IACzD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;QAChD,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAChE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACf,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,mCAAmC;AACnC,KAAK,UAAU,UAAU,CAAC,GAAW;IACnC,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,CAAA;QAC7C,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED~~,qCAAqC~~;~~AACrC~~,KAAK,UAAU,UAAU,CAAC,OAAe,EAAE,OAAe;IACxD,MAAM,~~aAAa~~,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;~~AACrG~~,CAAC;AAED,oCAAoC;AACpC,SAAS,QAAQ,CAAC,IAAY,EAAE,MAAc;IAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACvB,MAAM,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACzB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,GAAG,GAAG,CAAC,CAAA;AACzC,CAAC;AAED;;+BAE+B;AAC/B,KAAK,UAAU,YAAY,CAAC,MAAc,EAAE,OAAe;IACzD,MAAM,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IAC9D,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,SAAQ;QAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC;YAAE,SAAQ;QACtC,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,MAAM,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QAC3B,CAAC;IACH,CAAC;AACH,CAAC;AAWD~~;;;;;;GAMG~~;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAsB,EACtB,SAAiB,EACjB,WAAmB,EACnB,UAAmB;IAEnB,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,WAAW,CAAA;IACzE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;IAEnD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAA;IAChE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QACrC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3C,MAAM,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAC/B,MAAM,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;QAEpC,IAAI,~~QAAQ~~,GAAG,SAAS,CAAA;~~QACxB~~,IAAI,CAAC,CAAC,~~MAAM~~,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;~~YACnC~~,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,SAAS,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;YAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,~~CAAC~~,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAA;~~YAClG~~,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,MAAM,IAAI,KAAK,CAAC,~~4BAA4B~~,CAAC,CAAA;YAC/C,CAAC;~~YACD~~,QAAQ,GAAG,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;~~QACxC~~,CAAC;QAED,IAAI,SAAS,GAAG,MAAM,wBAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;QAC1E,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;YACnG,SAAS,GAAG,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAC9E,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,OAAO,SAAS,oBAAoB,CAAC,CAAA;QACvD,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QACtC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAChD,MAAM,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;QAElC~~,kBAAkB~~;~~QAClB~~,IAAI,MAAuC,CAAA;QAC3C,IAAI,~~MAAM,eAAe,CAAC,~~QAAQ,~~CAAC,~~EAAE,CAAC;~~YACpC~~,MAAM,GAAG,MAAM,aAAa,~~CAC1B~~,~~QAAQ~~,~~EACR~~,SAAS,~~EACT~~,UAAU,IAAI,iBAAiB,EAAE,~~CAClC~~,CAAA;~~QACH~~,CAAC;QAED,OAAO;YACL,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,SAAS;YACf,GAAG,EAAE,IAAI;YACT,IAAI,EAAE,MAAM,KAAK,SAAS;gBACxB,CAAC,CAAC,SAAS,SAAS,~~UAAU~~,IAAI,gBAAgB,MAAM,CAAC,GAAG,EAAE;~~gBAC9D~~,CAAC,CAAC,SAAS,SAAS,MAAM,IAAI,EAAE;YAClC,MAAM;SACP,CAAA;IACH,CAAC;YAAS,CAAC;QACT,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACjD,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"skill.js","sourceRoot":"","sources":["../src/skill.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "dsh-himarket",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "HiMarket bridge for DeepSeek Harness: sync subscribed MCP servers and install published Skills into DSH, with a beginner-friendly settings panel and chat tools",
   "license": "MIT",
   "type": "module",
@@ -47,6 +47,7 @@
     "@deepseek-ai/schemastery": "^3.18.2",
     "@types/node": "^24.0.0",
     "esbuild": "^0.28.2",
+    "semver": "^7.6.0",
     "typescript": "^5.9.0"
   }
 }