dsh-himarket 0.1.1

package/lib/index.js

@@ -0,0 +1,268 @@
+/**
+ * dsh-himarket 宿主端：HiMarket 桥接的编排器。
+ *
+ * 职责：
+ *  - 注册 settings 命名空间持久化凭证；
+ *  - 注册环回 HTTP 路由 /himarket/* 供设置页卡片调用（state/save-config/sync/install-skill）；
+ *  - 注册对话式工具 himarket_sync / himarket_install_skill；
+ *  - 用 McpManager 把已订阅 MCP 映射为官方 dsh-mcp-client 动态 fiber；
+ *  - 用 installSkill 把 Skill ZIP 落盘到 ~/.dsh/skills/。
+ *
+ * 归属：host 平面、不发布服务（只消费 webServer/tools/settings），行 loose、无 isolate realm。
+ *
+ * @module dsh-himarket
+ */
+import { HimarketClient } from './himarket-client.js';
+import { McpManager } from './mcp.js';
+import { attachSettings } from './settings.js';
+import { installSkill, defaultSkillRoot } from './skill.js';
+import { registerHimarketTools } from './tools.js';
+export const name = 'himarket';
+export function apply(ctx, config) {
+    const baseUrl = ctx.baseUrl ?? 'file:///';
+    const fallback = {
+        baseUrl: '',
+        username: '',
+        password: '',
+        token: '',
+        skillInstallDir: config.skillInstallDir ?? '',
+    };
+    const settings = attachSettings(ctx, fallback, baseUrl);
+    let client;
+    let mcpManager;
+    let subscribedMcps = [];
+    let publishedSkills = [];
+    let installedSkills = new Set();
+    let lastError = '';
+    const skillRoot = () => {
+        const dir = settings.current().skillInstallDir;
+        return dir.trim() === '' ? defaultSkillRoot() : dir;
+    };
+    function buildClient() {
+        const s = settings.current();
+        if (s.baseUrl.trim() === '' || s.username.trim() === '' || s.password.trim() === '') {
+            return undefined;
+        }
+        return new HimarketClient({ baseUrl: s.baseUrl, username: s.username, password: s.password, token: s.token });
+    }
+    async function ensureReady() {
+        const s = settings.current();
+        if (s.baseUrl.trim() === '')
+            throw new Error('还没配置 HiMarket 地址，请先在设置里填「HiMarket 地址」');
+        if (s.username.trim() === '' || s.password.trim() === '') {
+            throw new Error('还没配置 HiMarket 账号，请先在设置里填「用户名」和「密码」');
+        }
+        if (client === undefined)
+            client = buildClient();
+        if (mcpManager === undefined)
+            mcpManager = new McpManager(ctx, baseUrl);
+        if (!client.hasToken) {
+            const token = await client.login();
+            await settings.save({ token });
+        }
+        return client;
+    }
+    async function sync() {
+        try {
+            const c = await ensureReady();
+            const { mcpServers, authHeaders } = await c.listSubscribedMcps();
+            const skills = await c.listPublishedSkills();
+            subscribedMcps = mcpServers;
+            publishedSkills = skills;
+            const report = await (mcpManager ?? new McpManager(ctx, baseUrl)).reconcile(mcpServers, authHeaders);
+            installedSkills = await refreshInstalledSkills();
+            lastError = '';
+            const parts = [];
+            parts.push(`已同步：${mcpServers.length} 个已订阅 MCP，${skills.length} 个可安装技能。`);
+            if (report.added.length > 0)
+                parts.push(`新接入 MCP 工具：${report.added.join('、')}`);
+            if (report.removed.length > 0)
+                parts.push(`已移除 MCP：${report.removed.join('、')}`);
+            if (report.errors.length > 0)
+                parts.push(`有 ${report.errors.length} 个 MCP 连接失败：${report.errors.join('；')}`);
+            return parts.join('\n');
+        }
+        catch (error) {
+            lastError = error instanceof Error ? error.message : String(error);
+            return `同步失败：${lastError}`;
+        }
+    }
+    async function installByNameOrId(nameOrId) {
+        try {
+            const c = await ensureReady();
+            const target = publishedSkills.find((s) => s.productId === nameOrId || s.name === nameOrId);
+            if (target === undefined) {
+                throw new Error(`找不到技能「${nameOrId}」，请先同步（或核对技能名/ID）`);
+            }
+            const result = await installSkill(c, target.productId, skillRoot());
+            installedSkills.add(result.name);
+            return result.note;
+        }
+        catch (error) {
+            lastError = error instanceof Error ? error.message : String(error);
+            return `安装失败：${lastError}`;
+        }
+    }
+    async function refreshInstalledSkills() {
+        const root = skillRoot();
+        const names = new Set();
+        try {
+            const { readdir } = await import('node:fs/promises');
+            const entries = await readdir(root, { withFileTypes: true }).catch(() => []);
+            for (const e of entries) {
+                if (e.isDirectory() && !e.name.startsWith('.'))
+                    names.add(e.name);
+            }
+        }
+        catch { }
+        return names;
+    }
+    async function snapshot() {
+        const s = settings.current();
+        return {
+            configured: s.baseUrl.trim() !== '' && s.username.trim() !== '' && s.password.trim() !== '',
+            loggedIn: (client?.hasToken ?? false) || s.token !== '',
+            baseUrl: s.baseUrl,
+            username: s.username,
+            mcpServers: subscribedMcps,
+            activeMcpNames: mcpManager?.activeServerNames() ?? [],
+            publishedSkills,
+            installedSkills: [...installedSkills],
+            lastError,
+        };
+    }
+    // 启动时：若已有凭证，异步尝试恢复（不阻塞启动）。
+    const boot = settings.current();
+    if (boot.baseUrl.trim() !== '' && boot.username.trim() !== '' && boot.password.trim() !== '') {
+        void (async () => {
+            try {
+                client = buildClient();
+                mcpManager = new McpManager(ctx, baseUrl);
+                const { mcpServers, authHeaders } = await client.listSubscribedMcps();
+                subscribedMcps = mcpServers;
+                publishedSkills = await client.listPublishedSkills();
+                await mcpManager.reconcile(mcpServers, authHeaders);
+                installedSkills = await refreshInstalledSkills();
+                ctx.logger.info('[dsh-himarket] 启动恢复完成：%d 个 MCP、%d 个技能', mcpServers.length, publishedSkills.length);
+            }
+            catch (error) {
+                ctx.logger.warn('[dsh-himarket] 启动恢复失败（将静默降级）：%s', error instanceof Error ? error.message : String(error));
+                lastError = error instanceof Error ? error.message : String(error);
+            }
+        })();
+    }
+    void registerHimarketTools(ctx, baseUrl, {
+        sync,
+        installSkill: installByNameOrId,
+    });
+    ctx.inject(['webServer'], (scope) => {
+        const webServer = scope.get('webServer');
+        if (webServer === undefined) {
+            ctx.logger.warn('[dsh-himarket] webServer 服务不可用，设置页卡片路由未注册');
+            return;
+        }
+        const isLoopback = (addr) => addr === '127.0.0.1' || addr === '::1' || addr === '::ffff:127.0.0.1';
+        const sendJson = (res, status, body) => {
+            const json = JSON.stringify(body);
+            res.writeHead(status, {
+                'content-type': 'application/json; charset=utf-8',
+                'cache-control': 'no-cache',
+            });
+            res.end(json);
+        };
+        const sendError = (res, status, message) => {
+            sendJson(res, status, { ok: false, error: message });
+        };
+        return webServer.register({
+            kind: 'prefix',
+            path: '/himarket',
+            handler: async (req, res) => {
+                if (!isLoopback(req.socket?.remoteAddress ?? '')) {
+                    sendError(res, 403, '仅允许本机访问');
+                    return;
+                }
+                const url = new URL(req.url ?? '/', 'http://x');
+                const pathname = url.pathname;
+                const method = req.method ?? 'GET';
+                const readBody = async () => {
+                    let raw = '';
+                    for await (const chunk of req)
+                        raw += chunk;
+                    if (raw.trim() === '')
+                        return {};
+                    try {
+                        return JSON.parse(raw);
+                    }
+                    catch {
+                        throw new Error('请求体不是合法 JSON');
+                    }
+                };
+                try {
+                    if (method === 'GET' && pathname === '/himarket/state') {
+                        sendJson(res, 200, { ok: true, ...(await snapshot()) });
+                        return;
+                    }
+                    if (method === 'POST' && pathname === '/himarket/save-config') {
+                        const body = await readBody();
+                        const patch = {};
+                        if (typeof body.baseUrl === 'string')
+                            patch.baseUrl = body.baseUrl;
+                        if (typeof body.username === 'string')
+                            patch.username = body.username;
+                        if (typeof body.password === 'string')
+                            patch.password = body.password;
+                        if (typeof body.skillInstallDir === 'string')
+                            patch.skillInstallDir = body.skillInstallDir;
+                        // 地址被清空时，一并清空 token（避免残留旧凭证）。
+                        if (patch.baseUrl !== undefined && patch.baseUrl.trim() === '') {
+                            patch.token = '';
+                        }
+                        await settings.save(patch);
+                        // 凭证变化：丢弃旧 client（含旧 token）；若地址被清空，同时卸载 MCP fiber 并清空内存缓存。
+                        client = undefined;
+                        if (patch.baseUrl !== undefined && patch.baseUrl.trim() === '') {
+                            mcpManager?.dispose();
+                            mcpManager = undefined;
+                            subscribedMcps = [];
+                            publishedSkills = [];
+                            installedSkills = new Set();
+                            lastError = '';
+                        }
+                        sendJson(res, 200, { ok: true, configured: true });
+                        return;
+                    }
+                    if (method === 'POST' && pathname === '/himarket/sync') {
+                        const summary = await sync();
+                        sendJson(res, 200, { ok: true, summary });
+                        return;
+                    }
+                    if (method === 'POST' && pathname === '/himarket/install-skill') {
+                        const body = await readBody();
+                        const nameOrId = typeof body.nameOrId === 'string' ? body.nameOrId : '';
+                        if (nameOrId === '') {
+                            sendError(res, 400, '缺少 nameOrId');
+                            return;
+                        }
+                        const summary = await installByNameOrId(nameOrId);
+                        sendJson(res, 200, { ok: true, summary });
+                        return;
+                    }
+                    sendError(res, 404, '未知的 /himarket 端点');
+                }
+                catch (error) {
+                    sendError(res, 500, error instanceof Error ? error.message : String(error));
+                }
+            },
+        });
+    });
+    ctx.effect(() => {
+        return () => {
+            mcpManager?.dispose();
+            mcpManager = undefined;
+            client = undefined;
+        };
+    }, 'himarket.dispose');
+}
+export { defaultSkillRoot } from './skill.js';
+export { sanitizeServerName } from './mcp.js';
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

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

package/lib/mcp.d.ts

@@ -0,0 +1,39 @@
+/**
+ * MCP 接入：把「已订阅 MCP 清单」映射为一组 @deepseek-ai/dsh-mcp-client 动态 fiber。
+ *
+ * 复用官方 mcp-client（不重造客户端）：经 ctx.plugin(plugin, config) 动态实例化，
+ * 每次 sync 做「期望清单 vs 现存 fiber」的 diff——新增/变更 dispose 旧 fiber 再建，
+ * 移除则 dispose。mcp-client 的 inject 是 ['tools']，工具注册到 host tools 全局层，
+ * 对所有会话可见（与 dsh-matrix 注册工具同一机制）。
+ *
+ * 官方包在运行时经 createRequire(ctx.baseUrl) 解析（web profile 的 @deepseek-ai 是空目录）。
+ *
+ * @module dsh-himarket/mcp
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { SubscribedMcp } from './himarket-client.js';
+/** 清洗 HiMarket 的 name 为合法 serverName（去非法字符，压缩下划线）。 */
+export declare function sanitizeServerName(raw: string): string;
+/**
+ * 订阅态 → 动态 mcp-client fiber 集合管理器。惰性加载官方 mcp-client，
+ * 只在第一次 reconcile 时 import，避免启动期拖慢。
+ */
+export declare class McpManager {
+    private readonly ctx;
+    private readonly baseUrl;
+    private readonly handles;
+    private mcpApply;
+    constructor(ctx: Context, baseUrl: string);
+    /** 当前已连接的 serverName 列表。 */
+    activeServerNames(): string[];
+    /** 与期望清单做 diff，重建 fiber 集合；返回 { added, removed, errors }。 */
+    reconcile(desired: SubscribedMcp[], authHeaders: Record<string, string>): Promise<{
+        added: string[];
+        removed: string[];
+        errors: string[];
+    }>;
+    /** 卸载全部 fiber（插件销毁时）。 */
+    dispose(): void;
+    /** 惰性加载官方 mcp-client 并缓存 apply。 */
+    private ensureLoaded;
+}

package/lib/mcp.js

@@ -0,0 +1,125 @@
+/**
+ * MCP 接入：把「已订阅 MCP 清单」映射为一组 @deepseek-ai/dsh-mcp-client 动态 fiber。
+ *
+ * 复用官方 mcp-client（不重造客户端）：经 ctx.plugin(plugin, config) 动态实例化，
+ * 每次 sync 做「期望清单 vs 现存 fiber」的 diff——新增/变更 dispose 旧 fiber 再建，
+ * 移除则 dispose。mcp-client 的 inject 是 ['tools']，工具注册到 host tools 全局层，
+ * 对所有会话可见（与 dsh-matrix 注册工具同一机制）。
+ *
+ * 官方包在运行时经 createRequire(ctx.baseUrl) 解析（web profile 的 @deepseek-ai 是空目录）。
+ *
+ * @module dsh-himarket/mcp
+ */
+import { importOfficial } from './resolver.js';
+/** 清洗 HiMarket 的 name 为合法 serverName（去非法字符，压缩下划线）。 */
+export function sanitizeServerName(raw) {
+    const cleaned = raw
+        .trim()
+        .replace(/[^A-Za-z0-9_-]/gu, '_')
+        .replace(/^_+|_+$/gu, '');
+    if (cleaned === '')
+        return 'mcp';
+    return cleaned.slice(0, 32);
+}
+/** 组装 mcp-client 的 config（streamable-http）。 */
+function buildMcpConfig(mcp, authHeaders) {
+    const transport = mcp.transportType === 'stdio' ? 'stdio' : 'streamable-http';
+    if (transport === 'stdio') {
+        throw new Error(`暂不支持 stdio 型 MCP（${mcp.name}）`);
+    }
+    return {
+        transport: 'streamable-http',
+        serverName: sanitizeServerName(mcp.name),
+        url: mcp.url,
+        headers: { ...authHeaders },
+        failOnStartupError: false,
+    };
+}
+/**
+ * 订阅态 → 动态 mcp-client fiber 集合管理器。惰性加载官方 mcp-client，
+ * 只在第一次 reconcile 时 import，避免启动期拖慢。
+ */
+export class McpManager {
+    ctx;
+    baseUrl;
+    handles = new Map();
+    mcpApply;
+    constructor(ctx, baseUrl) {
+        this.ctx = ctx;
+        this.baseUrl = baseUrl;
+    }
+    /** 当前已连接的 serverName 列表。 */
+    activeServerNames() {
+        return [...this.handles.keys()];
+    }
+    /** 与期望清单做 diff，重建 fiber 集合；返回 { added, removed, errors }。 */
+    async reconcile(desired, authHeaders) {
+        const apply = await this.ensureLoaded();
+        const next = new Map();
+        const errors = [];
+        for (const mcp of desired) {
+            const serverName = sanitizeServerName(mcp.name);
+            if (!next.has(serverName))
+                next.set(serverName, mcp);
+        }
+        const added = [];
+        const removed = [];
+        for (const [serverName, handle] of [...this.handles]) {
+            if (!next.has(serverName)) {
+                try {
+                    handle.fiber.dispose();
+                }
+                catch { }
+                this.handles.delete(serverName);
+                removed.push(serverName);
+            }
+        }
+        for (const [serverName, mcp] of next) {
+            const existing = this.handles.get(serverName);
+            const existingKey = existing?.key;
+            const newKey = JSON.stringify([mcp.url, mcp.transportType, authHeaders]);
+            if (existingKey === newKey)
+                continue;
+            if (existing !== undefined) {
+                try {
+                    existing.fiber.dispose();
+                }
+                catch { }
+                this.handles.delete(serverName);
+            }
+            try {
+                const config = buildMcpConfig(mcp, authHeaders);
+                const fiber = this.ctx.plugin({ inject: ['tools'], apply }, config);
+                this.handles.set(serverName, { serverName, key: newKey, fiber: { dispose: () => fiber.dispose() } });
+                added.push(serverName);
+            }
+            catch (error) {
+                errors.push(`${serverName}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        return { added, removed, errors };
+    }
+    /** 卸载全部 fiber（插件销毁时）。 */
+    dispose() {
+        for (const handle of this.handles.values()) {
+            try {
+                handle.fiber.dispose();
+            }
+            catch { }
+        }
+        this.handles.clear();
+    }
+    /** 惰性加载官方 mcp-client 并缓存 apply。 */
+    async ensureLoaded() {
+        if (this.mcpApply !== undefined)
+            return this.mcpApply;
+        const mod = await importOfficial('@deepseek-ai/dsh-mcp-client', this.baseUrl);
+        const apply = mod.apply;
+        if (typeof apply !== 'function') {
+            throw new Error('官方 mcp-client 未导出 apply');
+        }
+        this.mcpApply = apply;
+        return apply;
+    }
+}
+//# sourceMappingURL=mcp.js.map

package/lib/mcp.js.map

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

package/lib/resolver.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Official @deepseek-ai/* package resolver.
+ *
+ * The web profile's node_modules/@deepseek-ai is an empty directory: official
+ * packages actually live in the global dsh install, and Node's CJS resolution
+ * walks parent directories, so createRequire(ctx.baseUrl) resolves them from
+ * the profile directory.
+ *
+ * This bridge package carries only light deps; official packages (mcp-client /
+ * settings / tools / schemastery) are ALWAYS resolved at runtime through this
+ * module, never statically imported (a static import would resolve against this
+ * package's own node_modules and fail under the profile).
+ *
+ * @module dsh-himarket/resolver
+ */
+/** Resolve an official package entry from the profile directory (file:// URL). */
+export declare function resolveOfficial(specifier: string, baseUrl: string): string;
+/** Dynamically import an official package (ESM or CJS). */
+export declare function importOfficial(specifier: string, baseUrl: string): Promise<Record<string, unknown>>;
+/** Synchronously require an official CJS package (e.g. schemastery). */
+export declare function requireOfficial(specifier: string, baseUrl: string): unknown;

package/lib/resolver.js

@@ -0,0 +1,33 @@
+/**
+ * Official @deepseek-ai/* package resolver.
+ *
+ * The web profile's node_modules/@deepseek-ai is an empty directory: official
+ * packages actually live in the global dsh install, and Node's CJS resolution
+ * walks parent directories, so createRequire(ctx.baseUrl) resolves them from
+ * the profile directory.
+ *
+ * This bridge package carries only light deps; official packages (mcp-client /
+ * settings / tools / schemastery) are ALWAYS resolved at runtime through this
+ * module, never statically imported (a static import would resolve against this
+ * package's own node_modules and fail under the profile).
+ *
+ * @module dsh-himarket/resolver
+ */
+import { createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
+/** Resolve an official package entry from the profile directory (file:// URL). */
+export function resolveOfficial(specifier, baseUrl) {
+    const req = createRequire(baseUrl);
+    const resolved = req.resolve(specifier);
+    return pathToFileURL(resolved).href;
+}
+/** Dynamically import an official package (ESM or CJS). */
+export async function importOfficial(specifier, baseUrl) {
+    return (await import(resolveOfficial(specifier, baseUrl)));
+}
+/** Synchronously require an official CJS package (e.g. schemastery). */
+export function requireOfficial(specifier, baseUrl) {
+    const req = createRequire(baseUrl);
+    return req(specifier);
+}
+//# sourceMappingURL=resolver.js.map

package/lib/resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../src/resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,kFAAkF;AAClF,MAAM,UAAU,eAAe,CAAC,SAAiB,EAAE,OAAe;IAChE,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IACvC,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAA;AACrC,CAAC;AAED,2DAA2D;AAC3D,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,SAAiB,EAAE,OAAe;IACrE,OAAO,CAAC,MAAM,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAA4B,CAAA;AACvF,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,eAAe,CAAC,SAAiB,EAAE,OAAe;IAChE,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,CAAA;IAClC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAA;AACvB,CAAC"}

package/lib/settings.d.ts

@@ -0,0 +1,38 @@
+/**
+ * HiMarket bridge config & credential persistence, mounted on the DSH settings
+ * service (settings.yaml, hot-reloaded). The bridge publishes no service; it
+ * only consumes settings, and credentials are a runtime choice that users change
+ * after deployment — so they ride the same namespace mechanism as the Web Models
+ * page and survive restart.
+ *
+ * The schemastery schema is loaded SYNCHRONOUSLY via requireOfficial (CJS),
+ * because settings.register() needs the schema object at attach time. This keeps
+ * the bridge free of any static @deepseek-ai/* import (see resolver.ts).
+ *
+ * @module dsh-himarket/settings
+ */
+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). */
+    baseUrl: string;
+    /** Developer account username. */
+    username: string;
+    /** Developer account password (plaintext, local settings.yaml only). */
+    password: string;
+    /** Cached JWT; re-login happens on 401. */
+    token: string;
+    /** Skill install root; empty falls back to ~/.dsh/skills. */
+    skillInstallDir: string;
+}
+/** Settings namespace name. */
+export declare const NAMESPACE = "himarket";
+/**
+ * Register the settings namespace and return a read/write handle; falls back to
+ * read-only row config when the settings service is unavailable.
+ */
+export declare function attachSettings(ctx: Context, fallback: HimarketSettings, baseUrl: string): {
+    current(): HimarketSettings;
+    save(patch: Partial<HimarketSettings>): Promise<void>;
+    onChange(cb: () => void): () => void;
+};

package/lib/settings.js

@@ -0,0 +1,57 @@
+/**
+ * HiMarket bridge config & credential persistence, mounted on the DSH settings
+ * service (settings.yaml, hot-reloaded). The bridge publishes no service; it
+ * only consumes settings, and credentials are a runtime choice that users change
+ * after deployment — so they ride the same namespace mechanism as the Web Models
+ * page and survive restart.
+ *
+ * The schemastery schema is loaded SYNCHRONOUSLY via requireOfficial (CJS),
+ * because settings.register() needs the schema object at attach time. This keeps
+ * the bridge free of any static @deepseek-ai/* import (see resolver.ts).
+ *
+ * @module dsh-himarket/settings
+ */
+import { requireOfficial } from './resolver.js';
+/** Settings namespace name. */
+export const NAMESPACE = 'himarket';
+/**
+ * Register the settings namespace and return a read/write handle; falls back to
+ * read-only row config when the settings service is unavailable.
+ */
+export function attachSettings(ctx, fallback, baseUrl) {
+    let resolved = () => fallback;
+    let save = async () => { };
+    let onChange = () => () => { };
+    // settings 服务是异步 init 的，apply 时可能尚未就绪；用 ctx.inject 等它就绪。
+    ctx.inject(['settings'], (scope) => {
+        const settings = scope.get('settings');
+        if (settings === undefined) {
+            ctx.logger.warn('[dsh-himarket] settings service unavailable, using cordis.patch.yml row config');
+            return;
+        }
+        try {
+            const Schema = requireOfficial('@deepseek-ai/schemastery', baseUrl);
+            const schema = Schema.object({
+                baseUrl: Schema.string().default(''),
+                username: Schema.string().default(''),
+                password: Schema.string().default(''),
+                token: Schema.string().default(''),
+                skillInstallDir: Schema.string().default(''),
+            });
+            const scopeHandle = settings.register(NAMESPACE, schema, { base: fallback });
+            resolved = () => scopeHandle.get();
+            save = async (patch) => {
+                await scopeHandle.update(patch);
+            };
+            onChange = (cb) => scopeHandle.watch(() => { cb(); });
+        }
+        catch (error) {
+            ctx.logger.warn('[dsh-himarket] settings registration failed, falling back to row config: %s', messageOf(error));
+        }
+    });
+    return { current: () => resolved(), save, onChange };
+}
+function messageOf(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+//# sourceMappingURL=settings.js.map

package/lib/settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAgB/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,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,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AACtD,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

@@ -0,0 +1,24 @@
+/**
+ * Skill 安装：下载 HiMarket 的 Skill ZIP → 解压 → 定位 SKILL.md → 落盘到
+ * ~/.dsh/skills/<name>/。技能由 @deepseek-ai/dsh-skill-filesystem 扫描发现，
+ * 写入即生效（该插件有 watcher + fs 工具同步失效），无需重启。
+ *
+ * 解压用系统 bsdtar（Windows/macOS 自带，Linux 也默认有 tar），避免引入原生
+ * 依赖；先落临时目录，校验通过后再搬到目标目录，失败不污染已装内容。
+ *
+ * @module dsh-himarket/skill
+ */
+import type { HimarketClient } from './himarket-client.js';
+/** 默认安装根：~/.dsh/skills（DSH_HOME 优先）。 */
+export declare function defaultSkillRoot(): string;
+export interface SkillInstallResult {
+    ok: boolean;
+    name: string;
+    dir: string;
+    note: string;
+}
+/**
+ * 安装一个 Skill（按 productId 下载 ZIP → 定位 SKILL.md → 落盘）。
+ * 已装同名 skill 会被覆盖（幂等重装）；失败时保留旧版。
+ */
+export declare function installSkill(client: HimarketClient, productId: string, installRoot: string): Promise<SkillInstallResult>;