dsh-config-manager 0.1.39 → 0.1.41

package/lib/market/my-repo.js

@@ -24,6 +24,7 @@
  */
 import { join } from 'node:path';
 import os from 'node:os';
+import fs from 'node:fs/promises';
 import { MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO } from "./github-repos.js";
 import { GitHubApiError } from "./github-repos.js";
 import { createGitFileWriter } from "./git-file-writer.js";
@@ -40,12 +41,19 @@ import { redact } from "../security/redaction.js";
 export const USER_CONFIGS_REPO = 'dsh-configs';
 /** 用户仓库 index.json 的名称/描述（展示用） */
 export const USER_INDEX_NAME = '我的配置仓库';
-/** PR 分支固定名模式：dsh-market-sync/<itemId> */
+/** PR 分支固定名模式：dsh-market-sync/<itemId>（收录） */
 export const PR_BRANCH_PREFIX = 'dsh-market-sync';
+/** 下架 PR 分支固定名模式：dsh-market-delist/<itemId>（删除已收录条目；独立分支避免与收录分支混淆，
+ *  防止 listItems 的 pr-pending 判定把下架 PR 误判为收录待审、以及删除后重传时 PR 复用错乱） */
+export const DELIST_BRANCH_PREFIX = 'dsh-market-delist';
 /** 由 itemId 生成 PR 分支名（固定模式，同条目复用同一分支：未合并 force push 更新、已合并基于最新 main 重开） */
 export function prBranchFor(itemId) {
     return `${PR_BRANCH_PREFIX}/${itemId}`;
 }
+/** 由 itemId 生成下架 PR 分支名（删除已收录条目时用；独立于收录分支） */
+export function delistBranchFor(itemId) {
+    return `${DELIST_BRANCH_PREFIX}/${itemId}`;
+}
 /** 用户公开仓库 URL（https 形态，绝不携带凭据） */
 export function userConfigsRepoUrl(login) {
     return `https://github.com/${login}/${USER_CONFIGS_REPO}`;
@@ -105,6 +113,10 @@ function upsertIndexItem(index, item) {
         items.push(item);
     return { ...index, items };
 }
+/** 移除条目：按 id 过滤（删除条目时用）；不存在则原样返回 */
+function removeIndexItem(index, itemId) {
+    return { ...index, items: index.items.filter((it) => it.id !== itemId) };
+}
 /** manifest → 用户仓库 index 条目（不含 repo：条目即在本仓库） */
 function toUserIndexItem(m) {
     return {
@@ -142,6 +154,7 @@ function failureResult(itemId, version, err) {
         prNumber: null,
         prUrl: null,
         warnings: [],
+        listing: 'done', // 上传阶段即失败：无收录流程，listing 无意义
         error: redact(msg),
         errorCode: classifyError(err),
     };
@@ -154,6 +167,10 @@ export class MyRepoService {
     tokenProvider;
     now;
     workDirRoot;
+    /** 后台市场任务表（收录/下架；key=itemId；内存态，重启丢失 → 列表状态徽章回退 + relist/删除可重提） */
+    listingJobs = new Map();
+    /** 同一 login 的「写用户仓库」串行队列（user-<login> 工作副本共享；上传/删除并发时防踩踏） */
+    loginWriteQueues = new Map();
     constructor(options) {
         if (options.prepare === null || typeof options.prepare !== 'function') {
             throw new MyRepoError('prepare 必填');
@@ -216,6 +233,169 @@ export class MyRepoService {
         }
         return entries;
     }
+    /* ---------------- 后台收录/下架任务状态 ---------------- */
+    /**
+     * 查询收录/下架任务状态。
+     * 内存任务表命中 → 直接返回；未命中（进程重启 / 从未提交）→ 回退 GitHub 实况推导：
+     * 官方 index 含该 id → done（已收录）；存在 open 收录 PR → done（带 PR 链接）；否则 null。
+     */
+    async listingStatus(itemId) {
+        const job = this.listingJobs.get(itemId);
+        if (job !== undefined)
+            return this.toListingStatus(job);
+        // 回退实况推导（重启后任务表丢失：靠官方 index / open PR 判断是否已完成）
+        try {
+            const user = await this.rest.getUser();
+            const login = user.login;
+            const officialText = await this.rest.readFile(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, 'index.json');
+            if (officialText !== null) {
+                const op = parseMarketIndex(officialText);
+                if (op.ok && op.index !== null && op.index.items.some((it) => it.id === itemId)) {
+                    return { itemId, listing: 'done', prNumber: null, prUrl: null };
+                }
+            }
+            const openPrs = await this.rest.listOpenPullRequests(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, `${login}:${prBranchFor(itemId)}`);
+            if (openPrs.length > 0) {
+                const pr = openPrs[0];
+                return { itemId, listing: 'done', prNumber: pr.number, prUrl: pr.htmlUrl };
+            }
+            return null;
+        }
+        catch {
+            return null; // 实况推导失败不阻塞轮询：前端按 null 处理（任务已结束/重启丢失）
+        }
+    }
+    /** 重新提交收录（收录失败 / 进程重启丢失后的一键重试）：幂等 —— 已有 pending 任务直接复用，不再重复启动 */
+    async relist(itemId) {
+        const user = await this.rest.getUser(); // 401 → 上层映射「请重新登录」
+        const login = user.login;
+        const existing = this.listingJobs.get(itemId);
+        if (existing !== undefined) {
+            if (existing.status === 'pending')
+                return this.toListingStatus(existing);
+            if (existing.status === 'done')
+                return this.toListingStatus(existing);
+            // failed → 落下去重新启动
+        }
+        const { index } = await this.readUserIndex(login);
+        const item = index.items.find((it) => it.id === itemId);
+        if (item === undefined) {
+            throw new MyRepoError(`未找到条目 ${itemId}（可能已被删除），请刷新列表后重试`, 'item_not_found');
+        }
+        const repoUrl = userConfigsRepoUrl(login);
+        this.launchListing({
+            action: 'list',
+            login,
+            itemId,
+            version: item.version ?? '1.0.0',
+            repoUrl,
+        });
+        const job = this.listingJobs.get(itemId);
+        return this.toListingStatus(job);
+    }
+    /** 等待任务终态（测试辅助 / 需要同步等待的场景；超时抛 internal 错误） */
+    async waitForListing(itemId, timeoutMs = 10_000) {
+        const deadline = Date.now() + timeoutMs;
+        for (;;) {
+            const job = this.listingJobs.get(itemId);
+            if (job !== undefined && job.status !== 'pending')
+                return this.toListingStatus(job);
+            if (Date.now() >= deadline) {
+                throw new MyRepoError(`等待市场任务超时（${itemId}）`, 'internal');
+            }
+            await new Promise((resolve) => setTimeout(resolve, 25));
+        }
+    }
+    /* ---------------- 删除条目（含下架处理） ---------------- */
+    /**
+     * 删除已上传条目：
+     * ① 从用户仓库 index.json 移除条目 + 删除 items/<itemId>/ 目录（同步，秒级）
+     * ② 收录状态处理：
+     *    - 已收录进官方市场（listed）→ 后台异步提「下架 PR」（从官方 index 移除，独立 delist 分支）
+     *    - 有待审核的收录 open PR → 同步关闭该 PR
+     *    - 未收录 / 无 PR → 无额外操作
+     * 返回 DeleteResult（ok=false 时携带已脱敏 error + errorCode）。
+     */
+    async deleteItem(itemId) {
+        const user = await this.rest.getUser();
+        const login = user.login;
+        const repoUrl = userConfigsRepoUrl(login);
+        try {
+            // ① 读用户仓库 index + 定位条目
+            const { index } = await this.readUserIndex(login);
+            const item = index.items.find((it) => it.id === itemId);
+            if (item === undefined) {
+                throw new MyRepoError(`未找到要删除的条目 ${itemId}（可能已被删除），请刷新列表后重试`, 'item_not_found');
+            }
+            // ② 移除条目 + 删除 items/<itemId>/ 目录 → 写回 index.json（per-login 串行）
+            const updatedIndex = removeIndexItem(index, itemId);
+            await this.withLoginLock(login, async () => {
+                // writeFiles 只写 entries 列出的文件、不会主动删除 items/<itemId>/：先删工作副本目录，git add -A 才会捕获删除
+                const workDir = this.userWorkDir(login);
+                await fs.rm(join(workDir, 'items', itemId), { recursive: true, force: true }).catch(() => undefined);
+                await this.gitWriter.writeFiles({
+                    repoUrl: `${userConfigsRepoUrl(login)}.git`,
+                    workDir,
+                    entries: [{ path: 'index.json', content: stringifyJsonSafe(updatedIndex, { space: 2 }) }],
+                    commitMessage: `publish: remove ${itemId}`,
+                });
+            });
+            // ③ 收录状态处理
+            const officialText = await this.rest.readFile(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, 'index.json');
+            let officialListed = false;
+            if (officialText !== null) {
+                const op = parseMarketIndex(officialText);
+                if (op.ok && op.index !== null)
+                    officialListed = op.index.items.some((it) => it.id === itemId);
+            }
+            if (officialListed) {
+                // 已收录 → 后台异步提下架 PR（不阻塞删除；下架 PR 合并前官方市场条目短暂不可下载，UI 已提示）
+                this.launchListing({
+                    action: 'delist',
+                    login,
+                    itemId,
+                    version: item.version ?? '1.0.0',
+                    repoUrl,
+                });
+                return {
+                    ok: true,
+                    itemId,
+                    delisted: true,
+                    prNumber: null,
+                    prUrl: null,
+                    warnings: ['该条目已收录官方市场，已自动提交下架 PR；合并前官方市场可能仍显示该条目'],
+                };
+            }
+            // 未收录 → 关闭待审核的收录 PR（如有）
+            const openPrs = await this.rest.listOpenPullRequests(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, `${login}:${prBranchFor(itemId)}`);
+            if (openPrs.length > 0) {
+                const pr = openPrs[0];
+                await this.rest.closePullRequest(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, pr.number);
+                return {
+                    ok: true,
+                    itemId,
+                    delisted: false,
+                    prNumber: pr.number,
+                    prUrl: pr.htmlUrl,
+                    warnings: ['已关闭该条目的待审核收录 PR'],
+                };
+            }
+            return { ok: true, itemId, delisted: false, prNumber: null, prUrl: null, warnings: [] };
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            return {
+                ok: false,
+                itemId,
+                delisted: false,
+                prNumber: null,
+                prUrl: null,
+                warnings: [],
+                error: redact(msg),
+                errorCode: classifyError(err),
+            };
+        }
+    }
     /* ---------------- 上传/更新共享状态机 ---------------- */
     async runPublish(params) {
         const form = params.form;
@@ -233,11 +413,20 @@ export class MyRepoService {
             let version;
             const warnings = [];
             if (params.mode === 'update') {
-                const existing = userIndex.index.items.find((it) => it.id === baseId);
+                // 优先按显式 form.id 定位（「更新」按钮预填，避免 name→slug 猜测在中文名/改名场景失配）；
+                // 缺省回退 name slug 匹配（旧调用方向后兼容）。
+                const explicitId = typeof form.id === 'string' && form.id.trim() !== '' ? form.id.trim() : null;
+                const existing = explicitId !== null
+                    ? userIndex.index.items.find((it) => it.id === explicitId)
+                    : userIndex.index.items.find((it) => it.id === baseId);
                 if (existing !== undefined) {
                     itemId = existing.id; // id 保持不变
                     version = bumpVersion(existing.version ?? '0.0.0');
                 }
+                else if (explicitId !== null) {
+                    // 明确要求更新一个不存在的 id → 报错（避免静默新建导致用户以为更新成功）
+                    throw new MyRepoError(`未找到要更新的条目 ${explicitId}（可能已被移除），请刷新列表后重试`, 'item_not_found');
+                }
                 else {
                     itemId = uniqueItemId(baseId, ids); // 名称变化 → 作为新条目
                     version = '1.0.0';
@@ -264,26 +453,18 @@ export class MyRepoService {
             // ⑤ ensure 用户仓库 <login>/dsh-configs（复用或自动创建公开仓库）
             const repo = await this.ensureUserRepo(login);
             // ⑥ 写用户仓库：items/<id>/manifest.json + config.zip + 更新 index.json，commit + push
+            //    （同一 login 的写操作串行化：user-<login> 工作副本共享，删除/上传并发时防踩踏）
             const updatedUserIndex = upsertIndexItem(userIndex.index, toUserIndexItem(manifest));
-            await this.gitWriterManifestSync(login, repo, prepared, params.zipBytes, updatedUserIndex, itemId, version, params.mode);
-            // ⑦ ensureFork 官方仓库（复用已 fork / 新建 + 轮询就绪）
-            const fork = await this.rest.ensureFork(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO);
-            // ⑧ 官方 index：读最新 → 更新条目（带 repo 自托管引用）→ 写 fork 分支 + force push
-            const officialIndex = await this.readOfficialIndex();
-            const updatedOfficial = upsertIndexItem(officialIndex.index, toOfficialIndexItem(manifest, repoUrl));
-            const branch = prBranchFor(itemId);
-            await this.gitWriter.writeFiles({
-                repoUrl: fork.cloneUrl,
-                workDir: this.forkWorkDir(login),
-                upstreamUrl: `https://github.com/${MARKET_UPSTREAM_OWNER}/${MARKET_UPSTREAM_REPO}.git`,
-                branch,
-                baseRef: 'upstream/main',
-                force: true,
-                entries: [{ path: 'index.json', content: stringifyJsonSafe(updatedOfficial, { space: 2 }) }],
-                commitMessage: `market: ${params.mode === 'update' ? 'update' : 'add'} ${itemId} v${version}`,
+            await this.withLoginLock(login, () => this.gitWriterManifestSync(login, repo, prepared, params.zipBytes, updatedUserIndex, itemId, version, params.mode));
+            // ⑦⑧⑨ 收录流程（fork + 官方 index + PR）转入后台异步任务：上传立即返回，
+            //    避免 GitHub fork 排队时整个请求长时间挂起；结果经 listingStatus / 列表徽章查询。
+            this.launchListing({
+                action: 'list',
+                login,
+                itemId,
+                version,
+                repoUrl,
             });
-            // ⑨ PR：查 open PR（head=<login>:<branch>）复用；无则创建
-            const pr = await this.ensurePullRequest(login, branch, itemId, version);
             return {
                 ok: true,
                 itemId,
@@ -291,9 +472,10 @@ export class MyRepoService {
                 sha256: prepared.sha256,
                 sections: prepared.sections,
                 repoUrl,
-                prNumber: pr.number,
-                prUrl: pr.htmlUrl,
+                prNumber: null,
+                prUrl: null,
                 warnings: [...prepared.warnings, ...warnings],
+                listing: 'pending',
             };
         }
         catch (err) {
@@ -360,12 +542,27 @@ export class MyRepoService {
         }
         return this.rest.createPublicRepo(USER_CONFIGS_REPO, '我的配置仓库（dsh-config-manager 自动发布）');
     }
-    /** ⑨ ensure PR：open PR（head=<login>:<branch>）存在 → 复用；否则 openPullRequest(base=main) */
-    async ensurePullRequest(login, branch, itemId, version) {
+    /** ⑨ ensure PR：open PR（head=<login>:<branch>）存在 → 复用；否则 openPullRequest(base=main)。
+     *  action='delist' 时标题/正文为下架语义（分支用 delistBranchFor，head 过滤天然隔离）。 */
+    async ensurePullRequest(login, branch, itemId, version, action = 'list') {
         const head = `${login}:${branch}`;
         const open = await this.rest.listOpenPullRequests(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO, head);
         if (open.length > 0)
             return open[0];
+        if (action === 'delist') {
+            return this.rest.openPullRequest({
+                head,
+                base: 'main',
+                title: `市场下架：${itemId}`,
+                body: [
+                    `由 dsh-config-manager「删除条目」自动提交。`,
+                    '',
+                    `- 条目：${itemId}`,
+                    `- 操作：从官方市场 index.json 移除该条目（下架）`,
+                    `- 内容：原条目内容位于用户公开仓库，已随删除移除`,
+                ].join('\n'),
+            });
+        }
         return this.rest.openPullRequest({
             head,
             base: 'main',
@@ -379,11 +576,97 @@ export class MyRepoService {
             ].join('\n'),
         });
     }
+    /* ---------------- 后台市场任务（收录/下架） ---------------- */
+    /** 启动后台任务（fire-and-forget）：同 itemId 已有 pending 任务 → 不重复启动（幂等） */
+    launchListing(input) {
+        const existing = this.listingJobs.get(input.itemId);
+        if (existing !== undefined && existing.status === 'pending')
+            return;
+        const job = {
+            ...input,
+            status: 'pending',
+            prNumber: null,
+            prUrl: null,
+            error: null,
+            startedAt: Date.now(),
+            finishedAt: null,
+        };
+        this.listingJobs.set(input.itemId, job);
+        void this.finishListing(job).catch((err) => {
+            job.status = 'failed';
+            job.error = redact(err instanceof Error ? err.message : String(err));
+            job.finishedAt = Date.now();
+        });
+    }
+    /**
+     * 后台任务主体（收录/下架共用管道）：
+     * 读用户仓库条目 → ensureFork（复用/新建+轮询就绪）→ 读官方 index → 改（收录 upsert 带 repo /
+     * 下架 remove）→ 写 fork 分支（workDir 按 itemId 隔离，防并发踩踏）force push → 开/复用 PR。
+     */
+    async finishListing(job) {
+        // ⑦ fork（复用已 fork / 新建 + 轮询就绪；GitHub 侧异步复制）
+        const fork = await this.rest.ensureFork(MARKET_UPSTREAM_OWNER, MARKET_UPSTREAM_REPO);
+        // ⑧ 官方 index：读最新 → 改 → 写 fork 分支 + force push
+        const officialIndex = await this.readOfficialIndex();
+        let updatedOfficial;
+        let commitMsg;
+        if (job.action === 'delist') {
+            // 下架：从官方 index 移除（不依赖用户仓库条目仍存在——删除后条目已移除）
+            updatedOfficial = removeIndexItem(officialIndex.index, job.itemId);
+            commitMsg = `market: delist ${job.itemId}`;
+        }
+        else {
+            // 收录：从用户仓库读最新条目元数据（上传已完成，条目在用户仓库）→ upsert 带 repo 引用
+            const { index } = await this.readUserIndex(job.login);
+            const item = index.items.find((it) => it.id === job.itemId);
+            if (item === undefined) {
+                throw new MyRepoError(`条目 ${job.itemId} 已不在用户仓库（可能已删除），任务终止`, 'item_not_found');
+            }
+            updatedOfficial = upsertIndexItem(officialIndex.index, { ...item, repo: job.repoUrl });
+            commitMsg = `market: ${item.version !== undefined && item.version !== '' ? 'update' : 'add'} ${job.itemId} v${job.version}`;
+        }
+        const branch = job.action === 'delist' ? delistBranchFor(job.itemId) : prBranchFor(job.itemId);
+        await this.gitWriter.writeFiles({
+            repoUrl: fork.cloneUrl,
+            workDir: this.forkWorkDir(job.login, job.itemId),
+            upstreamUrl: `https://github.com/${MARKET_UPSTREAM_OWNER}/${MARKET_UPSTREAM_REPO}.git`,
+            branch,
+            baseRef: 'upstream/main',
+            force: true,
+            entries: [{ path: 'index.json', content: stringifyJsonSafe(updatedOfficial, { space: 2 }) }],
+            commitMessage: commitMsg,
+        });
+        // ⑨ PR：查 open PR（head=<login>:<branch>）复用；无则创建
+        const pr = await this.ensurePullRequest(job.login, branch, job.itemId, job.version, job.action);
+        job.status = 'done';
+        job.prNumber = pr.number;
+        job.prUrl = pr.htmlUrl;
+        job.finishedAt = Date.now();
+    }
+    /** job → ListingStatusResponse（错误文本 redact 兜底） */
+    toListingStatus(job) {
+        return {
+            itemId: job.itemId,
+            listing: job.status,
+            prNumber: job.prNumber,
+            prUrl: job.prUrl,
+            ...(job.status === 'failed' ? { error: redact(job.error ?? '') } : {}),
+        };
+    }
+    /** 同一 login 的「写用户仓库」串行化（user-<login> 工作副本共享；上传/删除并发防踩踏）。
+     *  前一个操作失败不阻塞队列：catch 吞掉错误只作为队列锚点，真实错误已由调用方处理。 */
+    async withLoginLock(login, fn) {
+        const prev = this.loginWriteQueues.get(login) ?? Promise.resolve();
+        const run = prev.then(fn, fn);
+        this.loginWriteQueues.set(login, run.then(() => undefined, () => undefined));
+        return run;
+    }
     userWorkDir(login) {
         return join(this.workDirRoot, `user-${login}`);
     }
-    forkWorkDir(login) {
-        return join(this.workDirRoot, `fork-${login}`);
+    /** fork 工作副本按 itemId 隔离（fork-<login>/<itemId>）：不同条目的后台收录/下架并发操作互不踩踏 */
+    forkWorkDir(login, itemId) {
+        return join(this.workDirRoot, `fork-${login}`, itemId);
     }
 }
 //# sourceMappingURL=my-repo.js.map

package/lib/market/my-repo.js.map

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

package/lib/market/prepare.js

@@ -88,7 +88,8 @@ export function prepareMarketItem(input) {
         throw new MarketPrepareError(`zip 包含禁止分区 ${bannedHit.join(', ')}（sessions=历史会话 / pluginFiles=任意文件 / self=本地环境），市场条目禁止携带`);
     }
     // 6c. 内容级秘密扫描（纵深防御，不依赖导出 containsSecrets 标记）：
-    //     JSON 分区走 scanAndRedact（字段名+值形状，空值/env 引用名豁免，低误报）；
+    //     JSON 分区走 scanAndRedact 宽松档（literalValueOnly：占位符/模板引用/代码表达式/短标识符
+    //     放行，只有值像真实字面量凭据才拦截——消除 `"token": "${ENV}"`、`Bearer <token>` 等误报）；
     //     文件类分区（skills/agentPresets/agentInstructions）走 scanText（只报告不改写）。
     const scanHits = [];
     for (const sid of sections) {
@@ -118,7 +119,7 @@ export function prepareMarketItem(input) {
             catch {
                 continue;
             }
-            const { hits } = scanAndRedact(data);
+            const { hits } = scanAndRedact(data, { literalValueOnly: true });
             if (hits.length > 0)
                 scanHits.push(`${sid}: ${hits.slice(0, 5).map((h) => h.path).join(', ')}`);
         }

package/lib/market/prepare.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/market/prepare.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/market/prepare.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAErE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAEpE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC9F,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAA;AAChD,OAAO,EACL,gBAAgB,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,oBAAoB,GAC3F,MAAM,YAAY,CAAA;AAGnB,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAA;IAClC,CAAC;CACF;AA+BD,MAAM,eAAe,GAAoB;IACvC,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;IAChC,kBAAkB,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;IACrC,cAAc,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;IACjC,QAAQ,EAAE,GAAG;CACd,CAAA;AAED,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,eAAe,CAAC,CAAA;AAEjE;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAyB;IACzD,oBAAoB;IACpB,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;IAC9B,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC/D,MAAM,IAAI,kBAAkB,CAAC,SAAS,CAAC,CAAA;IACzC,CAAC;IACD,6DAA6D;IAC7D,MAAM,OAAO,GAAG,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACnH,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAI,GAAG,KAAK,IAAI;YAAE,MAAM,IAAI,kBAAkB,CAAC,eAAe,GAAG,EAAE,CAAC,CAAA;IACtE,CAAC;IACD,6CAA6C;IAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC1F,IAAI,GAAG,CAAC,MAAM,GAAG,oBAAoB,EAAE,CAAC;QACtC,MAAM,IAAI,kBAAkB,CAAC,iBAAiB,GAAG,CAAC,MAAM,SAAS,oBAAoB,KAAK,CAAC,CAAA;IAC7F,CAAC;IACD,0CAA0C;IAC1C,IAAI,OAAO,CAAA;IACX,IAAI,CAAC;QACH,OAAO,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,kBAAkB,CAAC,sBAAsB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACxG,CAAC;IACD,+BAA+B;IAC/B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,kBAAkB,CAAC,0CAA0C,CAAC,CAAA;IAC1E,CAAC;IACD,IAAI,gBAAgB,CAAA;IACpB,IAAI,CAAC;QACH,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAA;IACxE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,kBAAkB,CAAC,8BAA8B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAChH,CAAC;IACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;QAC9C,MAAM,IAAI,kBAAkB,CAAC,6CAA6C,CAAC,CAAA;IAC7E,CAAC;IACD,8CAA8C;IAC9C,MAAM,QAAQ,GAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAA4B;SACnF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;SACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAA;IACpB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,kBAAkB,CAAC,kBAAkB,CAAC,CAAA;IAClD,CAAC;IACD,oFAAoF;IACpF,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5E,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,kBAAkB,CAC1B,cAAc,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,yDAAyD,CAC5F,CAAA;IACH,CAAC;IACD,8CAA8C;IAC9C,sEAAsE;IACtE,uEAAuE;IACvE,sEAAsE;IACtE,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAE,CAAA;YAC1C,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBACvE,IAAI,IAAY,CAAA;gBAChB,IAAI,CAAC;oBACH,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;gBACjE,CAAC;gBAAC,MAAM,CAAC;oBACP,SAAQ;gBACV,CAAC;gBACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAC3B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;oBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YACjG,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;YACxC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAAE,SAAQ;YAC9D,IAAI,IAAa,CAAA;YACjB,IAAI,CAAC;gBACH,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;YACxC,CAAC;YAAC,MAAM,CAAC;gBACP,SAAQ;YACV,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,IAAI,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAA;YAChE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACjG,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,kBAAkB,CAC1B,aAAa,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,sBAAsB,CAClE,CAAA;IACH,CAAC;IACD,8BAA8B;IAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAA;IAC7B,MAAM,QAAQ,GAAuB;QACnC,aAAa,EAAE,0BAA0B;QACzC,EAAE,EAAE,KAAK,CAAC,MAAM;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;QACvB,OAAO,EAAE,CAAC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QAC5G,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxH,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpG,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAChD,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;YAC/D,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE;YAC/E,CAAC,CAAC,EAAE,CAAC;QACP,QAAQ;QACR,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,SAAS,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;KAC3B,CAAA;IACD,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,MAAM;QACN,QAAQ;QACR,QAAQ,EAAE;YACR,4BAA4B;YAC5B,wBAAwB;SACzB;KACF,CAAA;AACH,CAAC"}

package/lib/market/types.d.ts

@@ -164,6 +164,8 @@ export interface MarketStatusResponse {
     /** 是否已添加过至少一个市场 */
     configured: boolean;
     markets: MarketSummary[];
+    /** 本次 dsh 启动后市场是否已刷新过（首次打开市场页自动更新一次的依据；进程内存，dsh 重启后重置） */
+    bootAutoRefreshed?: boolean;
 }
 /** POST /market/add | /market/remove 响应：{ ok, markets } */
 export interface MarketMutateResponse {

package/lib/security/secret-scanner.d.ts

@@ -15,6 +15,8 @@ export interface ValuePattern {
     re: RegExp;
 }
 export declare const SECRET_VALUE_PATTERNS: readonly ValuePattern[];
+/** 值是否命中强模式 secret 形状（示例/占位形态 → null；返回命中模式名；未命中返回 null） */
+export declare function matchSecretValuePattern(value: string): string | null;
 export interface SecretScannerOptions {
     /** 附加敏感字段名（任意原始形态，内部会规范化） */
     extraFieldNames?: string[];
@@ -24,6 +26,13 @@ export interface SecretScannerOptions {
     valuePatterns?: boolean;
     /** 高熵长串启发式（默认 false：误伤风险高，需显式开启） */
     highEntropy?: boolean;
+    /**
+     * 宽松档（默认 false = 保守档）。
+     * 保守档（导出/同步脱敏）：字段名敏感即命中，值形状优先、引用/env 名豁免；
+     * 宽松档（市场发布扫描）：字段名敏感**且**值像真实字面量凭据才命中——占位符 /
+     * 模板引用 / 代码表达式 / 类型词 / 短标识符放行，消除「值不是秘密」的误报。
+     */
+    literalValueOnly?: boolean;
     /** 最大递归深度（默认 64，与 JSON 深度上限一致） */
     maxDepth?: number;
 }
@@ -31,18 +40,24 @@ export interface SecretScannerOptions {
 export declare function normalizeFieldName(name: string): string;
 /** 是否为「环境变量名」形态（全大写下划线，如 DEEPSEEK_API_KEY）→ 视为引用名 */
 export declare function isEnvVarName(value: string): boolean;
+/** 是否为模板/环境变量引用形态（${VAR} / {{VAR}} / %VAR% / $VAR）→ 值是名字不是秘密。
+ *  注意：文本扫描的 `field: value` 正则用 `[^\s,;}]` 取值，`${...}` / `{{...}}` 的右花括号
+ *  会被截断，因此除完整闭合形态外，也接受「以 ${ / {{ / % 开头、内容全为变量名字符」的截断形态。 */
+export declare function isTemplateReference(value: string): boolean;
 /** 字段名是否命中敏感名单（规范化后精确 / 敏感后缀 / 敏感前缀） */
 export declare function isSensitiveFieldName(field: string, extra?: readonly string[]): boolean;
 /** 是否为引用字段（值只是名字，不剥离） */
 export declare function isReferenceField(field: string, extra?: readonly string[]): boolean;
-/** 值是否命中强模式 secret 形状（返回命中模式名；未命中返回 null） */
-export declare function matchSecretValuePattern(value: string): string | null;
 /** 递归扫描 + 剥离（纯函数，不改原数据；深度保护；返回清洗后数据与命中清单） */
 export declare function scanAndRedact(data: unknown, opts?: SecretScannerOptions): {
     sanitized: unknown;
     hits: SensitiveHit[];
 };
-/** 文本级扫描：逐行找「敏感字段名 = 值」与「值形状」命中（只报告，不修改文本） */
+/** 文本级扫描：逐行找「敏感字段名 + 疑似真实字面量凭据」与「值形状」命中（只报告，不修改文本）。
+ *  2026-08-20 优化：字段名命中不再是充分条件 —— 值必须是「非代码引用 / 非占位符 / 非类型词 /
+ *  非短标识符」的字面量，消除技能/代码文档中 `token:`/`password:` 等示例命名的误报；
+ *  2026-08-21 优化：值形状（sk-/ghp_/AKIA/JWT/PEM/Bearer）对示例/占位形态（含 your/example/
+ *  xxx/test/<...> 等占位词）放行；混合字符串需像真实凭据（含数字/符号/大小写混合）才报告。 */
 export declare function scanText(text: string, opts?: SecretScannerOptions): SensitiveHit[];
 /** 强化版 SecretScanner（对齐 core SecretScanner 契约，可注入 Exporter.scanner） */
 export declare function createSecretScanner(opts?: SecretScannerOptions): SecretScanner;