dsh-himarket 0.1.1 → 0.1.4

package/lib/client.js

@@ -65,7 +65,21 @@ var zh = {
   installed: "\u5DF2\u88C5",
   empty: "\u6682\u65E0\u6570\u636E\uFF0C\u8BF7\u5148\u300C\u540C\u6B65\u300D\u6216\u68C0\u67E5\u8D26\u53F7\u662F\u5426\u5DF2\u8BA2\u9605/\u4E0A\u67B6\u3002",
   error: "\u51FA\u9519\u4E86",
-  ok: "\u5B8C\u6210"
+  ok: "\u5B8C\u6210",
+  publishTitle: "\u2463 \u53D1\u5E03\u6211\u7684\u5C97\u4F4D\u5230\u5E02\u573A",
+  publishHint: "\u628A\u672C\u673A\u5DF2\u8FED\u4EE3\u4F18\u5316\u7684\u6570\u5B57\u5458\u5DE5\u5C97\u4F4D\uFF08preset \u4EBA\u8BBE + \u5C97\u4F4D\u6280\u80FD\uFF09\u6253\u5305\u4E0A\u67B6\uFF0C\u4F9B\u540C\u4E8B\u540C\u6B65\u5B89\u88C5\u3002\u53D1\u5E03\u8D70\u5305\u88C5\u5C42\uFF08\u4F01\u4E1A\u7EDF\u4E00\u901A\u9053\uFF0C\u81EA\u52A8\u767B\u8BB0\u5F52\u5C5E/\u6765\u6E90\uFF09\uFF0C\u8BF7\u5148\u586B\u597D\u4E0A\u65B9\u5305\u88C5\u5C42\u5730\u5740\u3002",
+  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",
+  sourceOfficial: "\u4F01\u4E1A\u53D1\u5E03",
+  sourceCommunity: "\u5458\u5DE5\u5171\u5EFA",
+  filterAll: "\u5168\u90E8",
+  filterOfficial: "\u4F01\u4E1A\u53D1\u5E03",
+  filterCommunity: "\u5458\u5DE5\u5171\u5EFA",
+  overrideTag: "\u5458\u5DE5\u6539\u8FDB\u7248",
+  overrideOf: "\u8986\u76D6",
+  overriddenHint: "\u6709\u5458\u5DE5\u6539\u8FDB\u7248\uFF08\u5B98\u65B9\u9ED8\u8BA4\uFF0C\u53EF\u9009\u7528\u6539\u8FDB\u7248\uFF09"
 };
 var en = {
   tab: "HiMarket",
@@ -85,7 +99,21 @@ var en = {
   installed: "Installed",
   empty: "Nothing yet. Sync first, or check subscriptions/published items.",
   error: "Error",
-  ok: "Done"
+  ok: "Done",
+  publishTitle: "4. Publish My Job to Market",
+  publishHint: "Package your locally iterated digital-employee job (preset persona + job skill) and publish it for colleagues to install. Publishing goes through the gateway (enterprise channel, records ownership/source automatically). Fill in the gateway URL above first.",
+  publish: "Publish",
+  publishing: "Publishing",
+  gatewayLabel: "Gateway URL",
+  gatewayPlaceholder: "e.g. http://ai-job.ict.cmcc; publishing and source tags go through it",
+  sourceOfficial: "Official",
+  sourceCommunity: "Community",
+  filterAll: "All",
+  filterOfficial: "Official",
+  filterCommunity: "Community",
+  overrideTag: "Community Fork",
+  overrideOf: "of",
+  overriddenHint: "has community forks (official default; fork optional)"
 };
 var CSS = [
   ".hm_section{width:100%;max-width:760px;display:flex;flex-direction:column;gap:14px;color:var(--dsw-alias-label-primary)}",
@@ -105,7 +133,14 @@ var CSS = [
   ".hm_name{font-size:13px;font-weight:600;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}",
   ".hm_desc{font-size:12px;color:var(--dsw-alias-label-tertiary);margin:0}",
   ".hm_tag{border:1px solid var(--dsw-alias-border-l2);color:var(--dsw-alias-label-tertiary);border-radius:999px;padding:1px 8px;font-size:11px;line-height:16px;flex:none}",
-  ".hm_tag[data-ok=true]{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary)}"
+  ".hm_tag[data-ok=true]{border-color:var(--dsw-alias-state-success-primary);color:var(--dsw-alias-state-success-primary)}",
+  ".hm_tag[data-source=official]{border-color:var(--dsw-alias-state-business-primary);color:var(--dsw-alias-state-business-primary)}",
+  ".hm_tag[data-source=community]{border-color:var(--dsw-alias-border-l2);color:var(--dsw-alias-label-secondary)}",
+  ".hm_btn[data-active=true]{background:var(--dsw-alias-state-business-primary);border-color:var(--dsw-alias-state-business-primary);color:#fff}",
+  ".hm_overrides{margin-top:4px;padding:6px 8px;background:var(--dsw-alias-bg-layer-2);border-radius:8px;display:grid;gap:6px}",
+  ".hm_overrides .hm_desc{margin:0 0 2px 0}",
+  ".hm_overrides .hm_list{gap:4px}",
+  ".hm_overrides .hm_item{padding:6px 8px}"
 ].join("\n");
 function injectCss() {
   const tagId = "dsh-himarket/client.css";
@@ -131,11 +166,14 @@ function HimarketTab(props) {
   const [baseUrl, setBaseUrl] = import_react.default.useState("");
   const [username, setUsername] = import_react.default.useState("");
   const [password, setPassword] = import_react.default.useState("");
+  const [gatewayUrl, setGatewayUrl] = import_react.default.useState("");
+  const [sourceFilter, setSourceFilter] = import_react.default.useState("ALL");
   const refresh = import_react.default.useCallback(function() {
     call("/himarket/state").then(function(data2) {
       setState({ status: "ready", data: data2 });
       if (data2 && data2.baseUrl) setBaseUrl(data2.baseUrl);
       if (data2 && data2.username) setUsername(data2.username);
+      if (data2 && data2.gatewayUrl) setGatewayUrl(data2.gatewayUrl);
     }, function(err) {
       setState({ status: "error", error: err.message });
     });
@@ -145,7 +183,8 @@ function HimarketTab(props) {
   }, [refresh]);
   function saveConfig() {
     setBusy(true);
-    call("/himarket/save-config", { baseUrl, username, password }).then(
+    var patch = { baseUrl, username, password, gatewayUrl };
+    call("/himarket/save-config", patch).then(
       function() {
         setMessage(t("saved"));
         setBusy(false);
@@ -180,6 +219,18 @@ function HimarketTab(props) {
       setBusy(false);
     });
   }
+  function publishMyJob(job) {
+    setBusy(true);
+    setMessage(t("publishing") + "\uFF1A" + job);
+    call("/himarket/publish-job", { job }).then(function(data2) {
+      setMessage(data2.summary || t("ok"));
+      setBusy(false);
+      refresh();
+    }, function(err) {
+      setMessage(t("error") + "\uFF1A" + err.message);
+      setBusy(false);
+    });
+  }
   const data = state.status === "ready" ? state.data : null;
   const mcpServers = data && data.mcpServers || [];
   const activeNames = data && data.activeMcpNames || [];
@@ -189,6 +240,55 @@ function HimarketTab(props) {
     const name = skill && skill.name;
     return installedSkills.indexOf(name) >= 0;
   }
+  function sourceTag(item) {
+    if (!item) return null;
+    const src = item.source;
+    if (src === "OFFICIAL") {
+      return el(
+        "span",
+        { className: "hm_tag", "data-source": "official", title: item.overriddenBy && item.overriddenBy.length > 0 ? t("overriddenHint") : void 0 },
+        t("sourceOfficial")
+      );
+    }
+    if (src === "COMMUNITY") {
+      const txt = item.overrides ? t("overrideTag") + "\xB7" + t("overrideOf") + " " + item.overrides : t("sourceCommunity");
+      return el("span", { className: "hm_tag", "data-source": "community" }, txt);
+    }
+    return null;
+  }
+  function overrideBlock(item) {
+    if (!item || !item.overriddenBy || item.overriddenBy.length === 0) return null;
+    const hint = item.source === "OFFICIAL" ? t("overriddenHint") : t("overrideTag") + "\uFF1A" + item.overriddenBy.length;
+    return el(
+      "div",
+      { className: "hm_overrides" },
+      el("p", { className: "hm_desc" }, hint),
+      el(
+        "ul",
+        { className: "hm_list" },
+        item.overriddenBy.map(function(o) {
+          const done = installedSkills.indexOf(o.name) >= 0;
+          return el(
+            "li",
+            { className: "hm_item", key: o.productId || o.name },
+            el(
+              "div",
+              { className: "hm_itemTop" },
+              el("span", { className: "hm_name" }, o.name + "\uFF08" + o.publisher + "\uFF09"),
+              el("span", { className: "hm_tag", "data-source": "community" }, t("overrideTag")),
+              el(
+                "button",
+                { className: "hm_btn", type: "button", disabled: busy || done, onClick: function() {
+                  installSkill(o.productId);
+                } },
+                done ? t("installed") : t("install")
+              )
+            )
+          );
+        })
+      )
+    );
+  }
   return el(
     "div",
     { className: "hm_section" },
@@ -213,6 +313,12 @@ function HimarketTab(props) {
       el("label", null, t("passwordLabel")),
       el("input", { className: "hm_input", type: "password", placeholder: t("passwordPlaceholder"), value: password, onChange: (e) => setPassword(e.target.value) })
     ),
+    el(
+      "div",
+      { className: "hm_field" },
+      el("label", null, t("gatewayLabel")),
+      el("input", { className: "hm_input", type: "text", placeholder: t("gatewayPlaceholder"), value: gatewayUrl, onChange: (e) => setGatewayUrl(e.target.value) })
+    ),
     el(
       "div",
       { className: "hm_row" },
@@ -225,6 +331,7 @@ function HimarketTab(props) {
       "ul",
       { className: "hm_list" },
       mcpServers.map((mm) => {
+        if (sourceFilter !== "ALL" && (mm.source || "COMMUNITY") !== sourceFilter) return null;
         const active = activeNames.indexOf(mm.name) >= 0;
         return el(
           "li",
@@ -233,6 +340,7 @@ function HimarketTab(props) {
             "div",
             { className: "hm_itemTop" },
             el("span", { className: "hm_name" }, mm.name),
+            sourceTag(mm),
             el("span", { className: "hm_tag", "data-ok": active ? "true" : void 0 }, active ? "\u5DF2\u63A5\u5165" : "\u672A\u8FDE\u63A5")
           ),
           mm.description ? el("p", { className: "hm_desc" }, mm.description) : null
@@ -240,10 +348,18 @@ function HimarketTab(props) {
       })
     ),
     el("h3", null, t("skillTitle")),
+    el(
+      "div",
+      { className: "hm_row" },
+      el("button", { className: "hm_btn", type: "button", "data-active": sourceFilter === "ALL" ? "true" : void 0, onClick: () => setSourceFilter("ALL") }, t("filterAll")),
+      el("button", { className: "hm_btn", type: "button", "data-active": sourceFilter === "OFFICIAL" ? "true" : void 0, onClick: () => setSourceFilter("OFFICIAL") }, t("filterOfficial")),
+      el("button", { className: "hm_btn", type: "button", "data-active": sourceFilter === "COMMUNITY" ? "true" : void 0, onClick: () => setSourceFilter("COMMUNITY") }, t("filterCommunity"))
+    ),
     publishedSkills.length === 0 ? el("p", { className: "hm_message" }, t("empty")) : el(
       "ul",
       { className: "hm_list" },
       publishedSkills.map((sk) => {
+        if (sourceFilter !== "ALL" && (sk.source || "COMMUNITY") !== sourceFilter) return null;
         const done = isInstalled(sk);
         return el(
           "li",
@@ -252,12 +368,23 @@ function HimarketTab(props) {
             "div",
             { className: "hm_itemTop" },
             el("span", { className: "hm_name" }, sk.name),
+            sourceTag(sk),
             el("button", { className: "hm_btn", type: "button", disabled: busy || done, onClick: () => installSkill(sk.productId) }, done ? t("installed") : t("install"))
           ),
-          sk.description ? el("p", { className: "hm_desc" }, sk.description) : null
+          sk.description ? el("p", { className: "hm_desc" }, sk.description) : null,
+          overrideBlock(sk)
         );
       })
     ),
+    el("h3", null, t("publishTitle")),
+    el("p", { className: "hm_message" }, t("publishHint")),
+    el(
+      "div",
+      { className: "hm_row" },
+      ["pm", "dev", "qa", "leader", "newbie", "secretary", "general"].map(function(j) {
+        return el("button", { className: "hm_btn", type: "button", disabled: busy, key: j, onClick: () => publishMyJob(j) }, t("publish") + "\uFF1A" + j);
+      })
+    ),
     state.status === "error" ? el("p", { className: "hm_message", "data-error": "true" }, t("error") + "\uFF1A" + state.error) : null
   );
 }

package/lib/himarket-client.d.ts

@@ -17,6 +17,16 @@ export interface SubscribedMcp {
     url: string;
     transportType: string;
     description: string;
+    /** 来源标签（由包装层网关注入）：OFFICIAL=企业发布，COMMUNITY=员工共建。 */
+    source?: 'OFFICIAL' | 'COMMUNITY';
+    /** 覆盖的官方产品名（社区覆盖版指向它）；空=独立产品。 */
+    overrides?: string;
+    /** 覆盖本产品的社区版列表（官方产品才有）。 */
+    overriddenBy?: Array<{
+        productId: string;
+        name: string;
+        publisher: string;
+    }>;
 }
 /** 单个已发布 Skill（market-skills 条目）。 */
 export interface PublishedSkill {
@@ -24,6 +34,16 @@ export interface PublishedSkill {
     name: string;
     description: string;
     skillTags: string[];
+    /** 来源标签（由包装层网关注入）：OFFICIAL=企业发布，COMMUNITY=员工共建。 */
+    source?: 'OFFICIAL' | 'COMMUNITY';
+    /** 覆盖的官方产品名（社区覆盖版指向它）；空=独立产品。 */
+    overrides?: string;
+    /** 覆盖本产品的社区版列表（官方产品才有）。 */
+    overriddenBy?: Array<{
+        productId: string;
+        name: string;
+        publisher: string;
+    }>;
 }
 export declare class HimarketError extends Error {
 }
@@ -35,17 +55,30 @@ export declare class HimarketClient {
     private readonly baseUrl;
     private readonly username;
     private readonly password;
+    /** 管理员账号（/admins/login 用，默认 admin）；与开发者账号区分。 */
+    private readonly adminUsername;
+    private readonly adminPassword;
+    /** 开发者 token（/developers/login），sync/install 用。 */
     private token;
+    /** 管理员 token（/admins/login），publish 用。 */
+    private adminToken;
     private fetchFn;
     constructor(opts: {
         baseUrl: string;
         username: string;
         password: string;
+        adminUsername?: string;
+        adminPassword?: string;
         token?: string;
+        adminToken?: string;
         fetchFn?: typeof fetch;
     });
     get hasToken(): boolean;
     get currentToken(): string;
+    /** 是否已缓存管理员 token（发布前判断）。 */
+    adminTokenMissing(): boolean;
+    /** 返回缓存的管理员 token（供发布后回写 settings）。 */
+    cachedAdminToken(): string;
     /** 登录并缓存 token；返回 access_token。 */
     login(): Promise<string>;
     /** 拉取已订阅（且已批准）的 MCP 列表 + 认证头。 */
@@ -57,6 +90,27 @@ export declare class HimarketClient {
     listPublishedSkills(): Promise<PublishedSkill[]>;
     /** 下载 Skill ZIP，返回字节。 */
     downloadSkill(productId: string): Promise<Uint8Array>;
+    /** 管理员登录并缓存 token；返回 access_token。publish 系列走管理员端点。 */
+    loginAdmin(): Promise<string>;
+    /**
+     * 发布一个岗位包 / 技能包 ZIP 到 HiMarket（管理员端点）：
+     *   确保分类存在 → 建/复用产品 → 上传 zip → 发布最新 draft 版本 online → 发布到门户。
+     * 契约与 dsh-job-market/scripts/publish-job.mjs 一致（已实测跑通）。
+     *
+     * @param name 产品名（岗位 id，如 pm/dev；HiMarket 产品名唯一）
+     * @param zipBuffer 打包好的 zip 字节
+     * @param opts.portalId 发布到的门户 ID（可选，缺省跳过门户发布）
+     * @param opts.categoryName 分类名，默认「数字员工岗位」
+     */
+    publishSkillPackage(name: string, zipBuffer: Uint8Array, opts?: {
+        portalId?: string;
+        categoryName?: string;
+    }): Promise<{
+        productId: string;
+        version: string;
+    }>;
+    /** 管理员端点通用请求：带 401 自动重登一次；解析 {code,data} 包装。 */
+    private adminRequest;
     /** 通用请求：带 401 自动重登一次；解析 {code,data} 包装。 */
     private request;
 }

package/lib/himarket-client.js

@@ -29,13 +29,22 @@ export class HimarketClient {
     baseUrl;
     username;
     password;
+    /** 管理员账号（/admins/login 用，默认 admin）；与开发者账号区分。 */
+    adminUsername;
+    adminPassword;
+    /** 开发者 token（/developers/login），sync/install 用。 */
     token;
+    /** 管理员 token（/admins/login），publish 用。 */
+    adminToken;
     fetchFn;
     constructor(opts) {
         this.baseUrl = normalizeBaseUrl(opts.baseUrl);
         this.username = opts.username;
         this.password = opts.password;
+        this.adminUsername = opts.adminUsername ?? 'admin';
+        this.adminPassword = opts.adminPassword ?? '';
         this.token = opts.token ?? '';
+        this.adminToken = opts.adminToken ?? '';
         this.fetchFn = opts.fetchFn ?? globalThis.fetch;
     }
     get hasToken() {
@@ -44,6 +53,14 @@ export class HimarketClient {
     get currentToken() {
         return this.token;
     }
+    /** 是否已缓存管理员 token（发布前判断）。 */
+    adminTokenMissing() {
+        return this.adminToken === '';
+    }
+    /** 返回缓存的管理员 token（供发布后回写 settings）。 */
+    cachedAdminToken() {
+        return this.adminToken;
+    }
     /** 登录并缓存 token；返回 access_token。 */
     async login() {
         const wrapped = await this.request('/developers/login', {
@@ -97,6 +114,159 @@ export class HimarketClient {
             throw new HimarketError('下载到的技能包为空');
         return buf;
     }
+    /** 管理员登录并缓存 token；返回 access_token。publish 系列走管理员端点。 */
+    async loginAdmin() {
+        const wrapped = await this.request('/admins/login', {
+            method: 'POST',
+            body: JSON.stringify({ username: this.adminUsername, password: this.adminPassword }),
+            auth: false,
+        });
+        const token = wrapped.access_token;
+        if (token === undefined || token === '') {
+            throw new HimarketError('管理员登录成功但未返回 access_token');
+        }
+        this.adminToken = token;
+        return token;
+    }
+    /**
+     * 发布一个岗位包 / 技能包 ZIP 到 HiMarket（管理员端点）：
+     *   确保分类存在 → 建/复用产品 → 上传 zip → 发布最新 draft 版本 online → 发布到门户。
+     * 契约与 dsh-job-market/scripts/publish-job.mjs 一致（已实测跑通）。
+     *
+     * @param name 产品名（岗位 id，如 pm/dev；HiMarket 产品名唯一）
+     * @param zipBuffer 打包好的 zip 字节
+     * @param opts.portalId 发布到的门户 ID（可选，缺省跳过门户发布）
+     * @param opts.categoryName 分类名，默认「数字员工岗位」
+     */
+    async publishSkillPackage(name, zipBuffer, opts = {}) {
+        if (this.adminToken === '')
+            await this.loginAdmin();
+        // 1. 确保分类存在（幂等）
+        const catName = opts.categoryName ?? '数字员工岗位';
+        const cats = await this.adminRequest('/product-categories?size=100');
+        const catList = cats.content ?? [];
+        let catId = catList.find((c) => c.name === catName)?.categoryId ?? '';
+        if (catId === '') {
+            const created = await this.adminRequest('/product-categories', {
+                method: 'POST',
+                body: JSON.stringify({ name: catName, description: '可安装的数字员工岗位包：含岗位 preset 与岗位专项技能' }),
+            });
+            catId = created.categoryId ?? '';
+            if (catId === '')
+                throw new HimarketError('创建分类失败');
+        }
+        // 2. 建/复用产品（按 name 幂等）
+        const prods = await this.adminRequest(`/products?type=AGENT_SKILL&size=200`);
+        const prodList = prods.content ?? [];
+        let productId = prodList.find((p) => p.name === name)?.productId ?? '';
+        if (productId === '') {
+            const created = await this.adminRequest('/products', {
+                method: 'POST',
+                body: JSON.stringify({
+                    name,
+                    description: `[岗位包] ${name} 数字员工岗位`,
+                    type: 'AGENT_SKILL',
+                    document: `# ${name} 数字员工岗位包`,
+                    autoApprove: true,
+                    categories: [catId],
+                }),
+            });
+            productId = created.productId ?? '';
+            if (productId === '')
+                throw new HimarketError('创建产品失败');
+        }
+        // 3. 上传 zip（multipart/form-data: file=@zip）
+        // 文件名带时间戳：HiMarket 服务端对「同产品 + 同文件名」的上传可能判重跳过
+        // （不生成新 draft → 内容不更新）。加时间戳保证每次都是新文件名，强制服务端建新版本。
+        const uploadBody = new FormData();
+        const stamp = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 14);
+        uploadBody.append('file', new Blob([zipBuffer], { type: 'application/zip' }), `${name}-${stamp}.zip`);
+        const uploadUrl = `${this.baseUrl}${API_PREFIX}/skills/${encodeURIComponent(productId)}/package`;
+        const uploadRes = await this.fetchFn(uploadUrl, {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${this.adminToken}` },
+            body: uploadBody,
+        });
+        if (!uploadRes.ok) {
+            const body = await uploadRes.text().catch(() => '');
+            throw new HimarketError(`上传技能包失败（HTTP ${uploadRes.status}）${body.slice(0, 200)}`);
+        }
+        const uploadJson = (await uploadRes.json().catch(() => ({ code: 'PARSE_ERROR' })));
+        if (uploadJson.code !== undefined && uploadJson.code !== 'SUCCESS') {
+            throw new HimarketError(uploadJson.message ?? '上传技能包失败');
+        }
+        // 4. 发布最新 draft 版本为 online（force）
+        // 服务端契约（SkillServiceImpl）：uploadPackage 只把 zip 覆盖进 Nacos skill draft，
+        // **不会**自动在 Product 版本列表建记录。要生成可发布的版本，必须显式
+        // POST /{productId}/draft（body { baseVersion, version }）创建版本记录，
+        // 再 PATCH 该 version 为 online。漏掉 createDraft 会导致：上传内容已更新但版本列表
+        // 无新 draft → 旧版本仍被下载（本 bug 曾致 secretary 更新不生效）。
+        const versions = await this.adminRequest(`/skills/${encodeURIComponent(productId)}/versions`);
+        const vlist = Array.isArray(versions) ? versions : versions;
+        const sorted = [...vlist].sort((a, b) => String(b.version).localeCompare(String(a.version)));
+        const latestOnline = [...sorted].reverse().find((v) => v.status === 'online');
+        const draft = [...sorted].reverse().find((v) => v.status === 'draft');
+        let ver = draft?.version !== undefined ? String(draft.version) : undefined;
+        if (ver === undefined) {
+            // 没有 draft 版本记录 → 显式创建一个（baseVersion=当前最高 online；version=next 递增）。
+            const baseVersion = latestOnline?.version !== undefined ? String(latestOnline.version) : undefined;
+            const nextVersion = bumpVersion(baseVersion);
+            this.adminRequest(`/skills/${encodeURIComponent(productId)}/draft`, {
+                method: 'POST',
+                body: JSON.stringify({
+                    ...(baseVersion !== undefined ? { baseVersion } : {}),
+                    version: nextVersion,
+                }),
+            });
+            ver = nextVersion;
+        }
+        const pubResp = await this.adminRequest(`/skills/${encodeURIComponent(productId)}/versions/${encodeURIComponent(ver)}`, {
+            method: 'PATCH',
+            body: JSON.stringify({ status: 'online', force: true, updateLatestLabel: true }),
+        });
+        if (pubResp.code !== undefined && pubResp.code !== 'SUCCESS') {
+            throw new HimarketError(`发布版本失败：${pubResp.message ?? ver}`);
+        }
+        // 5. 发布到门户（可选）
+        if (opts.portalId !== undefined && opts.portalId.trim() !== '') {
+            await this.adminRequest(`/products/${encodeURIComponent(productId)}/publications`, {
+                method: 'POST',
+                body: JSON.stringify({ portalId: opts.portalId }),
+            }).catch((e) => {
+                // 门户发布失败不阻断主流程（warn 级）。
+                throw new HimarketError(`已发布版本，但发布到门户失败：${e instanceof Error ? e.message : String(e)}`);
+            });
+        }
+        return { productId, version: ver };
+    }
+    /** 管理员端点通用请求：带 401 自动重登一次；解析 {code,data} 包装。 */
+    async adminRequest(path, opts = {}) {
+        const doFetch = async () => {
+            const res = await this.fetchFn(this.baseUrl + API_PREFIX + path, {
+                method: opts.method ?? 'GET',
+                headers: {
+                    'Content-Type': 'application/json',
+                    ...(this.adminToken !== '' ? { Authorization: `Bearer ${this.adminToken}` } : {}),
+                },
+                ...(opts.body !== undefined ? { body: opts.body } : {}),
+            });
+            return res;
+        };
+        let res = await doFetch();
+        if (res.status === 401) {
+            await this.loginAdmin();
+            res = await doFetch();
+        }
+        if (!res.ok) {
+            const body = await res.text().catch(() => '');
+            throw new HimarketError(`HiMarket 管理端请求失败（HTTP ${res.status}）${body.slice(0, 200)}`);
+        }
+        const wrapped = (await res.json().catch(() => ({ code: 'PARSE_ERROR' })));
+        if (wrapped.code !== undefined && wrapped.code !== 'SUCCESS') {
+            throw new HimarketError(wrapped.message ?? `HiMarket 返回错误码 ${wrapped.code}`);
+        }
+        return (wrapped.data ?? wrapped);
+    }
     /** 通用请求：带 401 自动重登一次；解析 {code,data} 包装。 */
     async request(path, opts) {
         const doFetch = async () => {
@@ -126,4 +296,14 @@ export class HimarketClient {
         return (wrapped.data ?? wrapped);
     }
 }
+/** semver 递增：0.0.1 → 0.0.2；无 base 时返回 0.0.1。 */
+function bumpVersion(base) {
+    if (base === undefined || base.trim() === '')
+        return '0.0.1';
+    const parts = base.trim().split('.').map((p) => parseInt(p, 10) || 0);
+    while (parts.length < 3)
+        parts.push(0);
+    const patch = (parts[2] ?? 0) + 1;
+    return `${parts[0] ?? 0}.${parts[1] ?? 0}.${patch}`;
+}
 //# sourceMappingURL=himarket-client.js.map

package/lib/himarket-client.js.map

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