dsh-git-push 2.9.9 → 2.10.1
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.
- package/README.md +22 -15
- package/lib/app/command-registry.js +1 -0
- package/lib/app/handlers/repos.js +18 -2
- package/lib/app/tool-call.js +6 -2
- package/lib/ast/brace.js +15 -0
- package/lib/ast/size.js +68 -1
- package/lib/audit/collector.js +13 -4
- package/lib/audit/ignore-blind.js +5 -4
- package/lib/audit/orchestrate.js +2 -1
- package/lib/audit-rules/audit-rules-frontend.yml +4 -4
- package/lib/checks/button-bind.js +61 -13
- package/lib/checks/dispatch.js +1 -1
- package/lib/checks/private.js +2 -1
- package/lib/checks/structural.js +10 -3
- package/lib/client-parts/{10-account.js → account.js} +1 -1
- package/lib/client-parts/{41-actions.js → actions.js} +3 -2
- package/lib/client-parts/{99-apply.js → apply.js} +2 -1
- package/lib/client-parts/{21-audit.js → audit.js} +5 -5
- package/lib/client-parts/{11-browser.js → browser.js} +15 -4
- package/lib/client-parts/{01-const.js → const.js} +11 -5
- package/lib/client-parts/{40-controller.js → controller.js} +4 -4
- package/lib/client-parts/{03-icons.js → icons.js} +1 -1
- package/lib/client-parts/{00-loader.js → loader.js} +1 -0
- package/lib/client-parts/{23-npm.js → npm.js} +3 -2
- package/lib/client-parts/{30-page.js → page.js} +1 -1
- package/lib/client-parts/{20-repo.js → repo.js} +2 -2
- package/lib/client-parts/{22-settings.js → settings.js} +1 -1
- package/lib/client-parts/{02-utils.js → utils.js} +1 -1
- package/lib/client.js +51 -30
- package/lib/context/index.js +2 -1
- package/lib/core/atomic-json.js +1 -1
- package/lib/exempt/index.js +7 -2
- package/lib/git/index-format.js +182 -0
- package/lib/git/index.js +1 -0
- package/lib/git/repo-index.js +41 -30
- package/lib/git/scan-runner.js +1 -1
- package/lib/npm/publish.js +14 -12
- package/lib/self/index.js +1 -1
- package/package.json +1 -1
- package/scripts/build-client.mjs +19 -14
- package/scripts/picker-repro.mjs +115 -0
- package/skills/dsh-repo-index.md +1 -1
- package/skills/guide/guide-audit.md +77 -3
- package/skills/guide/guide-cli-scripts.md +1 -1
- package/skills/guide/guide-clone-repos.md +2 -2
- package/skills/guide/guide-inject-ui.md +2 -2
- package/skills/workflow/README.md +1 -1
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* dsh-repo-index 的 JSONL 存储格式(读写 + 旧 JSON 兼容)。
|
|
3
|
+
*
|
|
4
|
+
* 为什么改 JSONL(原为单份 pretty-print JSON 对象):
|
|
5
|
+
* ① **流式读写**:JSONL 每行一个独立对象,写入可以按条目逐行生成、读取可以逐行解析,
|
|
6
|
+
* 不必把整份文档拼成一个结构再 parse/stringify——索引随仓库数增长时这一点更重要;
|
|
7
|
+
* ② **损坏容错**:单份 JSON 只要有一处截断就整份不可用(parse 直接抛),
|
|
8
|
+
* 而 JSONL 可以跳过坏行、保留其余条目,索引不会因为一次半截写而全废;
|
|
9
|
+
* ③ **可增量**:单仓远端状态更新只需重写它自己那一行,语义上不再绑定「整份文档」。
|
|
10
|
+
*
|
|
11
|
+
* 文件形态(每行一个 JSON 对象,UTF-8,LF 结尾):
|
|
12
|
+
* {"_t":"meta","name":…,"description":…,"version":…,"generatedAt":…,"owner":…,"note":…}
|
|
13
|
+
* {"_t":"repo","name":…,"path":…,"repoUrl":…,"visibility":…,…} ← 每个仓库一行
|
|
14
|
+
* {"_t":"localOnly","path":"…"} ← 顶层无远端的目录
|
|
15
|
+
* {"_t":"recovery","text":"多行恢复说明"} ← 收尾(文本整体占一行)
|
|
16
|
+
*
|
|
17
|
+
* 兼容策略:
|
|
18
|
+
* - 读:优先 `dsh-repo-index.jsonl`;不存在则回退旧 `dsh-repo-index.json`(整份 JSON);
|
|
19
|
+
* 两种都能解析成同一个内存对象,调用方无感;
|
|
20
|
+
* - 写:一律写 `.jsonl`;首次写入时把旧的 `.json` 移入同级 `.trash/`(保留可恢复,
|
|
21
|
+
* 避免两份同源索引并存造成漂移)。
|
|
22
|
+
*
|
|
23
|
+
* 不变量:解析结果的对象形状与旧格式**完全一致**(name/description/version/generatedAt/
|
|
24
|
+
* owner/note/repos/localOnly/recovery),保证前端与其它读取方零改动。
|
|
25
|
+
*/
|
|
26
|
+
import { existsSync, readFileSync, mkdirSync, renameSync, readdirSync } from 'node:fs';
|
|
27
|
+
import { join, dirname } from 'node:path';
|
|
28
|
+
|
|
29
|
+
import { writeTextAtomic } from '../core/atomic-json.js';
|
|
30
|
+
|
|
31
|
+
/** 新格式文件名(JSONL)。 */
|
|
32
|
+
export const INDEX_FILE = 'dsh-repo-index.jsonl';
|
|
33
|
+
/** 旧格式文件名(整份 JSON,仅读与迁移用)。 */
|
|
34
|
+
export const LEGACY_INDEX_FILE = 'dsh-repo-index.json';
|
|
35
|
+
|
|
36
|
+
/** 把索引对象序列化成 JSONL 文本(meta → repos → localOnly → recovery)。 */
|
|
37
|
+
export function serializeIndex(index) {
|
|
38
|
+
const o = index && typeof index === 'object' ? index : {};
|
|
39
|
+
const lines = [];
|
|
40
|
+
const meta = {
|
|
41
|
+
_t: 'meta',
|
|
42
|
+
name: o.name || '',
|
|
43
|
+
description: o.description || '',
|
|
44
|
+
version: o.version || '',
|
|
45
|
+
generatedAt: o.generatedAt || '',
|
|
46
|
+
owner: o.owner || '',
|
|
47
|
+
note: o.note || '',
|
|
48
|
+
};
|
|
49
|
+
lines.push(JSON.stringify(meta));
|
|
50
|
+
for (const r of Array.isArray(o.repos) ? o.repos : []) {
|
|
51
|
+
if (!r || typeof r !== 'object') continue;
|
|
52
|
+
lines.push(JSON.stringify({ _t: 'repo', ...r }));
|
|
53
|
+
}
|
|
54
|
+
for (const p of Array.isArray(o.localOnly) ? o.localOnly : []) {
|
|
55
|
+
lines.push(JSON.stringify({ _t: 'localOnly', path: String(p || '') }));
|
|
56
|
+
}
|
|
57
|
+
// recovery 是给人看的多行命令说明:整体作为一个字段,换行由 JSON 转义承载,仍只占一行
|
|
58
|
+
if (o.recovery !== undefined && o.recovery !== null && o.recovery !== '') {
|
|
59
|
+
lines.push(JSON.stringify({ _t: 'recovery', text: String(o.recovery) }));
|
|
60
|
+
}
|
|
61
|
+
return lines.join('\n') + '\n';
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** JSONL 文本 → 索引对象;坏行跳过并计数(不因单行损坏丢弃整份)。 */
|
|
65
|
+
export function parseIndex(text) {
|
|
66
|
+
const s = String(text || '');
|
|
67
|
+
const trimmed = s.trim();
|
|
68
|
+
if (!trimmed) return null;
|
|
69
|
+
// 旧格式(整份 JSON):以 { 或 [ 开头且能整体 parse —— 其中的行不是独立对象
|
|
70
|
+
if (trimmed.startsWith('{') || trimmed.startsWith('[')) {
|
|
71
|
+
try {
|
|
72
|
+
const whole = JSON.parse(trimmed);
|
|
73
|
+
// 带 _t 的顶层对象不是旧格式(极少见),继续走 JSONL 分支
|
|
74
|
+
if (!(whole && typeof whole === 'object' && whole._t)) {
|
|
75
|
+
return Array.isArray(whole) ? { repos: whole } : whole;
|
|
76
|
+
}
|
|
77
|
+
} catch { /* 不是整份 JSON → 按 JSONL 解析 */ }
|
|
78
|
+
}
|
|
79
|
+
const out = { name: '', description: '', version: '', generatedAt: '', owner: '', note: '', repos: [], localOnly: [], recovery: '' };
|
|
80
|
+
let skipped = 0;
|
|
81
|
+
for (const raw of s.split('\n')) {
|
|
82
|
+
const line = raw.trim();
|
|
83
|
+
if (!line) continue;
|
|
84
|
+
let obj;
|
|
85
|
+
try { obj = JSON.parse(line); } catch { skipped += 1; continue; }
|
|
86
|
+
if (!obj || typeof obj !== 'object') { skipped += 1; continue; }
|
|
87
|
+
const t = obj._t;
|
|
88
|
+
if (t === 'meta') {
|
|
89
|
+
out.name = obj.name || out.name;
|
|
90
|
+
out.description = obj.description || out.description;
|
|
91
|
+
out.version = obj.version || out.version;
|
|
92
|
+
out.generatedAt = obj.generatedAt || out.generatedAt;
|
|
93
|
+
out.owner = obj.owner || out.owner;
|
|
94
|
+
out.note = obj.note || out.note;
|
|
95
|
+
} else if (t === 'repo') {
|
|
96
|
+
const { _t, ...rest } = obj;
|
|
97
|
+
out.repos.push(rest);
|
|
98
|
+
} else if (t === 'localOnly') {
|
|
99
|
+
if (obj.path) out.localOnly.push(String(obj.path));
|
|
100
|
+
} else if (t === 'recovery') {
|
|
101
|
+
out.recovery = String(obj.text || '');
|
|
102
|
+
} else {
|
|
103
|
+
skipped += 1;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
if (skipped) out._skippedLines = skipped;
|
|
107
|
+
return out;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* 读索引文件(JSONL 优先,旧 JSON 回退)。
|
|
112
|
+
* @returns {{index: object|null, path: string, format: 'jsonl'|'json'|'none'}}
|
|
113
|
+
*/
|
|
114
|
+
export function readIndexFile(dir) {
|
|
115
|
+
const jsonlPath = join(dir, INDEX_FILE);
|
|
116
|
+
if (existsSync(jsonlPath)) {
|
|
117
|
+
try { return { index: parseIndex(readFileSync(jsonlPath, 'utf8')), path: jsonlPath, format: 'jsonl' }; } catch { /* 落到旧格式 */ }
|
|
118
|
+
}
|
|
119
|
+
const legacyPath = join(dir, LEGACY_INDEX_FILE);
|
|
120
|
+
if (existsSync(legacyPath)) {
|
|
121
|
+
try { return { index: parseIndex(readFileSync(legacyPath, 'utf8')), path: legacyPath, format: 'json' }; } catch { /* 无可用索引 */ }
|
|
122
|
+
}
|
|
123
|
+
return { index: null, path: '', format: 'none' };
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* 写入索引(一律 JSONL)。
|
|
128
|
+
*
|
|
129
|
+
* 旧 `.json` 的处理:首次成功写入 `.jsonl` 后,把旧文件移入同级 `.trash/<时间戳>-<名>`
|
|
130
|
+
* (可恢复),避免「两份同源索引并存」——两者不一致时无法判断哪份是真源。
|
|
131
|
+
* @returns {{ok:boolean, path:string, migratedFrom?:string}}
|
|
132
|
+
*/
|
|
133
|
+
export function writeIndexFile(dir, index) {
|
|
134
|
+
const target = join(dir, INDEX_FILE);
|
|
135
|
+
const wr = writeTextAtomic(target, serializeIndex(index));
|
|
136
|
+
if (!wr.ok) return { ok: false, path: target };
|
|
137
|
+
const legacyPath = join(dir, LEGACY_INDEX_FILE);
|
|
138
|
+
let migratedFrom = '';
|
|
139
|
+
if (existsSync(legacyPath)) {
|
|
140
|
+
try {
|
|
141
|
+
const trashDir = join(dir, '.trash');
|
|
142
|
+
mkdirSync(trashDir, { recursive: true });
|
|
143
|
+
const stamp = new Date().toISOString().replace(/[:.]/g, '-');
|
|
144
|
+
let dest = join(trashDir, `${stamp}-${LEGACY_INDEX_FILE}`);
|
|
145
|
+
if (existsSync(dest)) dest = join(trashDir, `${stamp}-${process.pid}-${LEGACY_INDEX_FILE}`);
|
|
146
|
+
renameSync(legacyPath, dest);
|
|
147
|
+
migratedFrom = dest;
|
|
148
|
+
} catch { /* 移不动就留着(不影响 JSONL 读取优先级) */ }
|
|
149
|
+
}
|
|
150
|
+
return { ok: true, path: target, ...(migratedFrom ? { migratedFrom } : {}) };
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/** 目录里是否存在任一格式的索引文件。 */
|
|
154
|
+
export function indexFileExists(dir) {
|
|
155
|
+
return existsSync(join(dir, INDEX_FILE)) || existsSync(join(dir, LEGACY_INDEX_FILE));
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/** 找目录下的索引文件路径(JSONL 优先);都没有返回 null。 */
|
|
159
|
+
export function findIndexPath(dir) {
|
|
160
|
+
const jsonlPath = join(dir, INDEX_FILE);
|
|
161
|
+
if (existsSync(jsonlPath)) return jsonlPath;
|
|
162
|
+
const legacyPath = join(dir, LEGACY_INDEX_FILE);
|
|
163
|
+
if (existsSync(legacyPath)) return legacyPath;
|
|
164
|
+
return null;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
/** 兼容旧调用:整份 JSON 文本(部分调用方只做正则扫描,JSONL 每行也是合法 JSON 片段)。 */
|
|
168
|
+
export function indexAsJsonText(index) {
|
|
169
|
+
return serializeIndex(index);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
/** 列出目录里残留的索引文件(自检用:正常只有一个)。 */
|
|
173
|
+
export function listIndexFiles(dir) {
|
|
174
|
+
try {
|
|
175
|
+
return readdirSync(dir).filter((f) => f === INDEX_FILE || f === LEGACY_INDEX_FILE);
|
|
176
|
+
} catch { return []; }
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
/** 索引文件所在目录(便于测试与调试定位)。 */
|
|
180
|
+
export function indexDirOf(filePath) {
|
|
181
|
+
return dirname(String(filePath || ''));
|
|
182
|
+
}
|
package/lib/git/index.js
CHANGED
|
@@ -38,4 +38,5 @@ export { listCloudRepos } from './cloud.js';
|
|
|
38
38
|
export { checkGithubAccount, formatGithubAccountBlock, fetchApiQuota } from './account.js';
|
|
39
39
|
export { writeAccountStatusFromResult, accountStatusFile, readAccountStatus, refreshAccountStatus, buildAccountStatus, updateAccountStatusQuota } from './account-status.js';
|
|
40
40
|
export { locateRepoIndex, readRepoIndexMap, indexEntryForRepo, buildRepoIndex, maintainRepoIndex, updateRepoIndex, mergeCloudReposIntoIndex, updateRepoRemoteStateInIndex } from './repo-index.js';
|
|
41
|
+
export { INDEX_FILE, LEGACY_INDEX_FILE, serializeIndex, parseIndex, readIndexFile, writeIndexFile, indexFileExists, findIndexPath, listIndexFiles } from './index-format.js';
|
|
41
42
|
export { scanRunner, runScan, waitScanDelta, readScanLive, resetScanLive, scanLiveFile, stopScanWatch } from './scan-runner.js';
|
package/lib/git/repo-index.js
CHANGED
|
@@ -16,15 +16,17 @@
|
|
|
16
16
|
* 自持、不入 git;与 dsh-repo-index skill 权威位置一致)。失败全部静默降级,
|
|
17
17
|
* 不阻塞扫描/推送。
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
19
|
+
import { existsSync } from 'node:fs';
|
|
20
20
|
import { readFile, readdir, stat, access } from 'node:fs/promises';
|
|
21
21
|
import { join, basename, dirname } from 'node:path';
|
|
22
22
|
|
|
23
23
|
import { scanRepos, parseGithubOwnerRepo, githubFetch } from './index.js';
|
|
24
24
|
import { credentialsDir } from './credentials.js';
|
|
25
|
-
import { writeTextAtomic
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
import { writeTextAtomic } from './atomic-json.js';
|
|
26
|
+
import {
|
|
27
|
+
INDEX_FILE, serializeIndex, parseIndex,
|
|
28
|
+
readIndexFile, writeIndexFile, findIndexPath,
|
|
29
|
+
} from './index-format.js';
|
|
28
30
|
const VIS_CHECK_TIMEOUT_MS = 10_000; // GitHub 可见性查询超时
|
|
29
31
|
const AUTO_GEN_NOTE = 'auto-generated by dsh-git-push: DO NOT EDIT MANUALLY'; // 索引文件防手工编辑标记
|
|
30
32
|
|
|
@@ -36,8 +38,8 @@ const AUTO_GEN_NOTE = 'auto-generated by dsh-git-push: DO NOT EDIT MANUALLY'; //
|
|
|
36
38
|
* 凭据/索引收敛插件自持;workspaceRoot 保留作兼容入参,不再参与路径解析)。
|
|
37
39
|
*/
|
|
38
40
|
export function locateRepoIndex(workspaceRoot) {
|
|
39
|
-
|
|
40
|
-
return
|
|
41
|
+
// JSONL 优先,旧 .json 回退(迁移期两种都在时以 .jsonl 为准;写侧会把旧文件移入 .trash)
|
|
42
|
+
return findIndexPath(credentialsDir({ workspaceRoot: workspaceRoot || '' }));
|
|
41
43
|
}
|
|
42
44
|
|
|
43
45
|
/** 读索引:{ name → {owner, repo, repoUrl, visibility} };无索引/损坏 → null。 */
|
|
@@ -45,7 +47,7 @@ export function readRepoIndexMap(workspaceRoot) {
|
|
|
45
47
|
const p = locateRepoIndex(workspaceRoot);
|
|
46
48
|
if (!p) return null;
|
|
47
49
|
try {
|
|
48
|
-
const parsed =
|
|
50
|
+
const parsed = readIndexFile(dirname(p)).index;
|
|
49
51
|
const map = {};
|
|
50
52
|
for (const r of Array.isArray(parsed.repos) ? parsed.repos : []) {
|
|
51
53
|
if (!r || !r.name) continue;
|
|
@@ -256,7 +258,8 @@ export async function buildRepoIndex({ workspaceRoot, depth = 20, extraRepos = [
|
|
|
256
258
|
'# 3) 恢复后按插件安装三要素装回主环境(测试实例先行 + 接管式重启)',
|
|
257
259
|
].join('\n'),
|
|
258
260
|
};
|
|
259
|
-
|
|
261
|
+
// 输出 JSONL(每仓一行):流式可读、单行损坏不废整份
|
|
262
|
+
return serializeIndex(index);
|
|
260
263
|
}
|
|
261
264
|
|
|
262
265
|
/**
|
|
@@ -268,20 +271,25 @@ export function syncRepoIndex({ content, workspaceRoot = '', owner = 'EIGHTfs',
|
|
|
268
271
|
// 不变量「索引只存本地仓库」:写入前**剔除云端-only 残留条目**(cloudOnly=true 或
|
|
269
272
|
// path 为空的旧数据)——此前 merge 曾把本地无副本的云仓库登记进索引,这些条目既违反新语义,
|
|
270
273
|
// 又让前端列表出现空 path 行(React 同 key 警告)。写侧统一过滤,读到的旧索引入口即自愈。
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
274
|
+
// 调用方可能传 JSONL(buildRepoIndex 的输出),也可能传旧整份 JSON(历史调用方未全部收敛)
|
|
275
|
+
const parsed = parseIndex(content);
|
|
276
|
+
if (!parsed || !Array.isArray(parsed.repos)) {
|
|
277
|
+
// 无法解析 = 调用方传了非索引文本:原样落盘(保持旧行为,不静默丢内容)
|
|
278
|
+
const wr = writeTextAtomic(target, content);
|
|
279
|
+
return wr.ok ? { ok: true, written: [target] } : { ok: false, written: [] };
|
|
280
|
+
}
|
|
281
|
+
// 不变量「索引只存本地仓库」:写入前剔除云端-only 残留(cloudOnly=true 或 path 为空),
|
|
282
|
+
// 这些条目既违反语义,又让前端列表出现空 path 行(React 同 key 警告)。
|
|
283
|
+
parsed.repos = parsed.repos.filter((r) => r && !r.cloudOnly && String(r.path || '').trim());
|
|
284
|
+
// 显式 syncTarget 时按该路径写;否则统一走 writeIndexFile(写 .jsonl + 迁移旧 .json)
|
|
285
|
+
if (syncTarget) {
|
|
286
|
+
const wr = writeTextAtomic(syncTarget, serializeIndex(parsed));
|
|
287
|
+
return wr.ok ? { ok: true, written: [syncTarget] } : { ok: false, written: [] };
|
|
288
|
+
}
|
|
289
|
+
const wr = writeIndexFile(dirname(target), parsed);
|
|
290
|
+
return wr.ok
|
|
291
|
+
? { ok: true, written: [wr.path], ...(wr.migratedFrom ? { legacyMoved: wr.migratedFrom } : {}) }
|
|
292
|
+
: { ok: false, written: [] };
|
|
285
293
|
}
|
|
286
294
|
|
|
287
295
|
/**
|
|
@@ -299,7 +307,7 @@ export function syncRepoIndex({ content, workspaceRoot = '', owner = 'EIGHTfs',
|
|
|
299
307
|
*/
|
|
300
308
|
function mergeFreshIntoExisting(existing, freshContent) {
|
|
301
309
|
let fresh = null;
|
|
302
|
-
try { fresh =
|
|
310
|
+
try { fresh = parseIndex(freshContent); } catch { fresh = null; }
|
|
303
311
|
if (!fresh || !Array.isArray(fresh.repos)) {
|
|
304
312
|
// 新结果不可用(损坏/空)→ 保留现有索引原样
|
|
305
313
|
return { index: existing || { name: 'dsh-repo-index', version: 1, generatedAt: new Date().toISOString(), repos: [], localOnly: [] }, updated: 0 };
|
|
@@ -374,8 +382,11 @@ export async function updateRepoIndex({ workspaceRoot = '', token = '', owner =
|
|
|
374
382
|
// rebuild(默认):全量重建 → 与现有索引合并(不全量覆盖)
|
|
375
383
|
const target = syncTarget || locateRepoIndex(workspaceRoot) || join(credentialsDir({ workspaceRoot: workspaceRoot || '' }), INDEX_FILE);
|
|
376
384
|
let existing = null;
|
|
377
|
-
try {
|
|
378
|
-
|
|
385
|
+
try {
|
|
386
|
+
if (existsSync(target)) existing = readIndexFile(dirname(target)).index;
|
|
387
|
+
} catch { existing = null; }
|
|
388
|
+
// parseManualVisibility 入参是「索引文本」:统一用 JSONL 序列化(每行仍是合法 JSON 片段)
|
|
389
|
+
const manualVisibility = parseManualVisibility(existing ? serializeIndex(existing) : '');
|
|
379
390
|
// offline=true(账号卡片「扫描」)时纯离线重建——owner 过滤来自本地 remote
|
|
380
391
|
// 解析(不联网),可见性回退既有标注,不给 buildRepoIndex 传 token 即不触发可见性网络。
|
|
381
392
|
const fresh = await buildRepoIndex({
|
|
@@ -383,7 +394,7 @@ export async function updateRepoIndex({ workspaceRoot = '', token = '', owner =
|
|
|
383
394
|
token: offline ? '' : token, manualVisibility, owner, offline, maxRepos,
|
|
384
395
|
});
|
|
385
396
|
const { index, updated } = mergeFreshIntoExisting(existing, fresh);
|
|
386
|
-
const sync = syncRepoIndex({ content:
|
|
397
|
+
const sync = syncRepoIndex({ content: serializeIndex(index), workspaceRoot, owner, syncTarget });
|
|
387
398
|
return { ok: sync.ok, target: sync.written[0] || '', indexUpdated: sync.ok === true, updated };
|
|
388
399
|
} catch (e) {
|
|
389
400
|
return { ok: false, error: String(e?.message || e) };
|
|
@@ -418,7 +429,7 @@ export function mergeCloudReposIntoIndex({ workspaceRoot = '', owner = 'EIGHTfs'
|
|
|
418
429
|
const target = syncTarget || locateRepoIndex(workspaceRoot) || join(credentialsDir({ workspaceRoot: workspaceRoot || '' }), INDEX_FILE);
|
|
419
430
|
let existing = null;
|
|
420
431
|
try {
|
|
421
|
-
if (existsSync(target)) existing =
|
|
432
|
+
if (existsSync(target)) existing = readIndexFile(dirname(target)).index;
|
|
422
433
|
} catch { existing = null; }
|
|
423
434
|
// 保底结构:老索引/坏 JSON → 空容器,合并后写回
|
|
424
435
|
const index = existing && typeof existing === 'object' && Array.isArray(existing.repos) ? existing : {
|
|
@@ -461,7 +472,7 @@ export function mergeCloudReposIntoIndex({ workspaceRoot = '', owner = 'EIGHTfs'
|
|
|
461
472
|
index.repos = [...byName.values()].sort((a, b) => String(a.name).localeCompare(String(b.name)));
|
|
462
473
|
index.generatedAt = new Date().toISOString();
|
|
463
474
|
index.owner = owner;
|
|
464
|
-
const written = syncRepoIndex({ content:
|
|
475
|
+
const written = syncRepoIndex({ content: serializeIndex(index), workspaceRoot, owner, syncTarget });
|
|
465
476
|
return { ok: true, updated, ...written };
|
|
466
477
|
} catch (e) {
|
|
467
478
|
return { ok: false, error: String(e?.message || e) };
|
|
@@ -488,7 +499,7 @@ export function updateRepoRemoteStateInIndex({ workspaceRoot = '', repoName = ''
|
|
|
488
499
|
const target = syncTarget || locateRepoIndex(workspaceRoot) || join(credentialsDir({ workspaceRoot: workspaceRoot || '' }), INDEX_FILE);
|
|
489
500
|
let index = null;
|
|
490
501
|
try {
|
|
491
|
-
if (existsSync(target)) index =
|
|
502
|
+
if (existsSync(target)) index = readIndexFile(dirname(target)).index;
|
|
492
503
|
} catch { index = null; }
|
|
493
504
|
if (!index || !Array.isArray(index.repos) || !repoName) return { ok: false, error: '索引缺失/仓库名缺失' };
|
|
494
505
|
const hit = index.repos.find((r) => r.name === repoName);
|
|
@@ -504,7 +515,7 @@ export function updateRepoRemoteStateInIndex({ workspaceRoot = '', repoName = ''
|
|
|
504
515
|
if (visibility) hit.visibility = visibility;
|
|
505
516
|
hit.remoteStateAt = new Date().toISOString();
|
|
506
517
|
index.generatedAt = new Date().toISOString();
|
|
507
|
-
const written = syncRepoIndex({ content:
|
|
518
|
+
const written = syncRepoIndex({ content: serializeIndex(index), workspaceRoot, owner: index.owner || 'EIGHTfs', syncTarget });
|
|
508
519
|
return { ok: true, ...written };
|
|
509
520
|
} catch (e) {
|
|
510
521
|
return { ok: false, error: String(e?.message || e) };
|
package/lib/git/scan-runner.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* 三要素:
|
|
8
8
|
* 1) spawn 独立进程跑 scripts/scan-repos.mjs(系统级后台,不卡宿主/主进程);
|
|
9
9
|
* 2) 进程每扫到一个 author(owner) 一致的仓库 → 增量写 scan-live.json
|
|
10
|
-
* (version 递增 + found 追加),并同步把该仓库并入 dsh-repo-index.
|
|
10
|
+
* (version 递增 + found 追加),并同步把该仓库并入 dsh-repo-index.jsonl;
|
|
11
11
|
* 3) 宿主用 fs.watchFile 监听 scan-live.json 变化,变化即唤醒 waiters——
|
|
12
12
|
* 前端「等待新版本」请求挂起,直到 version > 已见数或扫描结束才返回新增
|
|
13
13
|
* (非轮询:有新数据才返回,前端只追加变化部分,不全量重读)。
|
package/lib/npm/publish.js
CHANGED
|
@@ -117,6 +117,8 @@ function appendPublishLog(line, { workspaceRoot = '' } = {}) {
|
|
|
117
117
|
export async function publishPackage({
|
|
118
118
|
dir = '', registry = DEFAULT_REGISTRY, workspaceRoot = '',
|
|
119
119
|
dryRun = true, tag = 'latest', otp = '', confirm = false, timeoutMs = PUBLISH_TIMEOUT_MS,
|
|
120
|
+
// 可选:发布成功后等待 registry 可见。默认 false —— 上传成功即为成功(可见延迟是已知现象)
|
|
121
|
+
waitVisible = false,
|
|
120
122
|
} = {}) {
|
|
121
123
|
const info = readPackageInfo(dir);
|
|
122
124
|
if (!info.ok) return { ok: false, error: info.error };
|
|
@@ -156,19 +158,19 @@ export async function publishPackage({
|
|
|
156
158
|
// 否则会去发布宿主 cwd 下的包(或不存在的包)—— 这是发包类操作里最危险的一种错。
|
|
157
159
|
const r = runNpm(args, { timeoutMs, env: { NO_UPDATE_NOTIFIER: '1' }, cwd: info.dir });
|
|
158
160
|
appendPublishLog(`publish END dryRun=${dryRun} ok=${r.ok} code=${r.code} err=${String(r.error || '').slice(0, 200)}`, { workspaceRoot });
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
+
// 成功判定 = npm publish 上传成功(返回码 0),不看 registry 是否已可见——
|
|
162
|
+
// 发布后 registry 可见常有几分钟延迟(已知现象,不是失败)。
|
|
163
|
+
// 轮询只作**附加信息**:若提前可见就记 visible=true,让调用方知道「已可安装」。
|
|
164
|
+
let visible = false;
|
|
161
165
|
let polled = 0;
|
|
162
|
-
|
|
163
|
-
if (r.ok && !dryRun) {
|
|
166
|
+
if (r.ok && !dryRun && waitVisible) {
|
|
164
167
|
for (let i = 0; i < PUBLISH_POLL_MAX; i += 1) {
|
|
165
168
|
await sleep(PUBLISH_POLL_INTERVAL_MS);
|
|
166
169
|
polled += 1;
|
|
167
170
|
const now = await fetchPublishedVersions({ name: info.name, registry: reg, timeoutMs: NPM_TIMEOUT_MS });
|
|
168
|
-
if (now.ok && now.versions.includes(info.version)) {
|
|
171
|
+
if (now.ok && now.versions.includes(info.version)) { visible = true; break; }
|
|
169
172
|
}
|
|
170
|
-
|
|
171
|
-
appendPublishLog(`publish POLL verified=${verified} polled=${polled} timeout=${pollTimeout}`, { workspaceRoot });
|
|
173
|
+
appendPublishLog(`publish POLL visible=${visible} polled=${polled}`, { workspaceRoot });
|
|
172
174
|
}
|
|
173
175
|
return {
|
|
174
176
|
ok: !!r.ok,
|
|
@@ -180,12 +182,12 @@ export async function publishPackage({
|
|
|
180
182
|
packList: pack.files,
|
|
181
183
|
packSize: pack.size,
|
|
182
184
|
tarball: pack.filename,
|
|
183
|
-
published: !dryRun && !!r.ok,
|
|
184
|
-
//
|
|
185
|
-
|
|
185
|
+
published: !dryRun && !!r.ok, // 成功判定:npm 上传成功即为成功(不要求 registry 已可见)
|
|
186
|
+
// 附加信息(不影响 published):registry 是否已能看到新版本;发布延迟(几分钟)是已知现象
|
|
187
|
+
visible,
|
|
186
188
|
polled,
|
|
187
|
-
|
|
188
|
-
|
|
189
|
+
visibleNote: visible ? 'registry 已可见'
|
|
190
|
+
: (waitVisible ? 'registry 暂未可见(发布延迟属正常,不是失败)' : '发布成功(registry 可见可能有几分钟延迟,属正常现象)'),
|
|
189
191
|
registryQuery: { ok: pub.ok, error: pub.error || '' },
|
|
190
192
|
stdout: String(r.stdout || '').slice(-4000),
|
|
191
193
|
stderr: String(r.stderr || '').slice(-4000),
|
package/lib/self/index.js
CHANGED
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
|
|
12
|
-
export const VERSION = '2.
|
|
12
|
+
export const VERSION = '2.10.1'; // 2.10.1:按插件架构修订审计规则(外部项目实测反馈,只修改判定逻辑、不以豁免代偿):①button-bind 按元素类型分流——button 要 click 类;input 接受 change/input/submit/pointerdown 等表单控件标准事件;<input type=file> 由原生 label.click() 触发、有程序化触发即视为接好;自定义分片目录(非标准 client-parts)降级 info,完整判定交产物。②函数范围识别补齐箭头函数/方法简写/asynс 体(此前只认 function 关键字 ⇒ maxFunctionLength 对纯箭头文件返回 0,导致 max-file-length 把聚合型文件误判成臃肿型且文案「最大函数 0 行(藏着超大函数)」自相矛盾);无函数时文案改为「顶层语句堆叠」。③button-bind 补进 dsh-skip-quality 的 blocked(此前该 kind 无任何标记可豁免,而规则 exemptHint 却指向它 ⇒ 提示写了不生效)。④guide-audit 增 §14 记录插件架构适配与性价比取舍。历史:2.10.0:仓库索引改 JSONL + 修 signal timed out。
|
|
13
13
|
// 实测后果:该目录有 package.json ⇒ npm 去打包整棵 DSH 树、输出 2.1MB > spawnSync 默认 maxBuffer 1MB ⇒ ENOBUFS(npm_publish 的体检与真发全部失败);
|
|
14
14
|
// 该目录没有 package.json 时报 ENOENT。现 publish 的两个调用点显式传 cwd=目标包目录,并给 runNpm 加 16MB maxBuffer。
|
|
15
15
|
// 2.8.3:文案修正——「零改动 / 无新提交」明确为**正常成功路径**(注入用法、工具描述、README、skill 同批改),并修 job 输出自相矛盾(cleanSkipCommit 路径补 committed:false,不再显示「已提交,未推送」)
|
package/package.json
CHANGED
package/scripts/build-client.mjs
CHANGED
|
@@ -32,22 +32,27 @@ export const OUT_FILE = join(ROOT, 'lib', 'client.js');
|
|
|
32
32
|
* 拼接顺序 = 依赖顺序(先定义后使用)。
|
|
33
33
|
* 函数声明会提升、但 `const`/`let` 不会——顺序错会在**运行时**才炸(静态查不出),
|
|
34
34
|
* 所以这里与 client.js 的分节标记 `[N]` 一一对应,改分片必须同步改本表。
|
|
35
|
+
*
|
|
36
|
+
* 命名约定:分片文件名**不带数字序号**(顺序只由本表这一处权威声明)。
|
|
37
|
+
* 序号前缀看似方便,实则会漂移——重排/插片时新旧序号并存,扫目录看到的顺序
|
|
38
|
+
* 与真实拼接顺序不一致,比没有序号更坏。顺序信息集中在 PART_ORDER +
|
|
39
|
+
* 每个分片头注释的「第 N/14 片」锚点,改序只改这两处。
|
|
35
40
|
*/
|
|
36
41
|
export const PART_ORDER = [
|
|
37
|
-
'
|
|
38
|
-
'
|
|
39
|
-
'
|
|
40
|
-
'
|
|
41
|
-
'
|
|
42
|
-
'
|
|
43
|
-
'
|
|
44
|
-
'
|
|
45
|
-
'
|
|
46
|
-
'
|
|
47
|
-
'
|
|
48
|
-
'
|
|
49
|
-
'
|
|
50
|
-
'
|
|
42
|
+
'loader.js', // [1] loader + factory 头 + require + NS(必须首片)
|
|
43
|
+
'const.js', // [2] 常量区(BUSY/维度表/超时/样式串)
|
|
44
|
+
'utils.js', // [3] 工具区(ensureCss/getJson/postJson/tokenConfigured/localGet…)
|
|
45
|
+
'icons.js', // [4] 图标区
|
|
46
|
+
'account.js', // [5] 账号信息 Tab
|
|
47
|
+
'browser.js', // [6] 目录选择器
|
|
48
|
+
'repo.js', // [7] 仓库管理卡
|
|
49
|
+
'npm.js', // [7续] NPM 面板(账号卡 + 装包表单 + npm 凭据字段)
|
|
50
|
+
'audit.js', // [8] 审计 Tab
|
|
51
|
+
'settings.js', // [9] 设置 Tab
|
|
52
|
+
'page.js', // [10] 页面装配(GitPushPage)
|
|
53
|
+
'controller.js', // [11] Controller:状态机 + 数据加载
|
|
54
|
+
'actions.js', // [11续] Controller:动作注入
|
|
55
|
+
'apply.js', // [12] 收尾:注册 settings.section + factory 返回(必须末片)
|
|
51
56
|
];
|
|
52
57
|
|
|
53
58
|
/** 读出全部分片内容(缺片直接报错,避免拼出半份产物当成功)。 */
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
// dsh-skip-quality: 本文件只生成**静态自检页**(用真实 CSS 拼一个最小复现,供人目测布局),
|
|
2
|
+
// 其中的按钮是布局样本、不承担交互,未绑事件属预期(规则判定无误,属「判对但不需要」)。
|
|
3
|
+
/**
|
|
4
|
+
* 目录选择器布局自检页生成器(无依赖、离线)。
|
|
5
|
+
*
|
|
6
|
+
* 为什么需要:选择器弹窗的「条目多时被压扁」是**纯布局缺陷**——CSS 文本看着没问题
|
|
7
|
+
* (`max-height` + `overflow-y:auto` 都在),只有真实渲染才暴露。实测 73 条目录在
|
|
8
|
+
* 1080px 视口下,行高从应有的 27px 被压到 10px、容器根本不滚动,而任何
|
|
9
|
+
* 「断言 CSS 里有某条声明」的单元测试都会通过。
|
|
10
|
+
*
|
|
11
|
+
* 本脚本用**真实 CSS**(直接从 lib/client-parts/const.js 抽取 .dshgp_* 规则)拼一个
|
|
12
|
+
* 最小复现页:只有 mask/dialog/path/up/list/foot 六层与 N 个目录行。
|
|
13
|
+
* 在浏览器里打开即可目测;配合一段测量脚本可拿到行高/可滚动性等硬指标。
|
|
14
|
+
*
|
|
15
|
+
* 用法:
|
|
16
|
+
* node scripts/picker-repro.mjs # 生成 /tmp/dshgp-picker-repro.html(默认 73 条)
|
|
17
|
+
* node scripts/picker-repro.mjs --count 300 # 指定条目数
|
|
18
|
+
* node scripts/picker-repro.mjs --out <路径>
|
|
19
|
+
* node scripts/picker-repro.mjs --serve # 生成后用本机 http 起服务并打印地址
|
|
20
|
+
*
|
|
21
|
+
* 判读标准(在浏览器控制台跑 MEASURE_SNIPPET):
|
|
22
|
+
* rowHeight 应 ≈ 26-28px(12px 字 + 上下 5px padding + 行高)
|
|
23
|
+
* listScrollable true(条目超容器时必须能滚,而不是压扁)
|
|
24
|
+
* footerInViewport true(「选择当前目录」必须留在视口内)
|
|
25
|
+
*/
|
|
26
|
+
import { readFileSync, writeFileSync } from 'node:fs';
|
|
27
|
+
import { join, dirname } from 'node:path';
|
|
28
|
+
import { fileURLToPath } from 'node:url';
|
|
29
|
+
import { createServer } from 'node:http';
|
|
30
|
+
|
|
31
|
+
const ROOT = join(dirname(fileURLToPath(import.meta.url)), '..');
|
|
32
|
+
const CONST_FILE = join(ROOT, 'lib', 'client-parts', 'const.js');
|
|
33
|
+
const DEFAULT_OUT = '/tmp/dshgp-picker-repro.html';
|
|
34
|
+
const DEFAULT_COUNT = 73;
|
|
35
|
+
|
|
36
|
+
/** 从 const.js 抽取全部 .dshgp_* 规则原文(保证自检页与真实样式同源)。 */
|
|
37
|
+
export function extractCss(src = readFileSync(CONST_FILE, 'utf8')) {
|
|
38
|
+
return [...src.matchAll(/'\.(dshgp_[a-z0-9_]+)\{([^}]*)\}'/g)]
|
|
39
|
+
.map((m) => `.${m[1]}{${m[2]}}`)
|
|
40
|
+
.join('\n');
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/** 生成复现页 HTML。 */
|
|
44
|
+
export function buildReproHtml({ count = DEFAULT_COUNT, css = extractCss() } = {}) {
|
|
45
|
+
const rows = Array.from({ length: count }, (_, i) => {
|
|
46
|
+
const name = `项目目录-${String(i + 1).padStart(2, '0')}-很长的中文目录名用于测试挤压`;
|
|
47
|
+
return `<div class="dshgp_browsedir" data-path="/x/${name}">📁 ${name}</div>`;
|
|
48
|
+
}).join('');
|
|
49
|
+
// 暗色变量只是为了目测接近真实主题,不参与布局判定
|
|
50
|
+
const vars = ':root{--dsw-alias-border-l4:#444;--dsw-alias-border-l2:#333;'
|
|
51
|
+
+ '--dsw-alias-bg-layer-3:#1b1b2a;--dsw-alias-bg-layer-2:#222;--dsw-alias-bg-base:#111;'
|
|
52
|
+
+ '--dsw-alias-label-primary:#eee;--dsw-alias-label-secondary:#aaa;'
|
|
53
|
+
+ '--dsw-alias-label-tertiary:#888;--dsw-alias-brand-primary:#7c5cff}';
|
|
54
|
+
return '<!doctype html><meta charset="utf-8"><title>picker repro</title>'
|
|
55
|
+
+ `<style>${vars}${css}</style>`
|
|
56
|
+
+ '<body style="margin:0;height:100vh;background:#0d0d14">'
|
|
57
|
+
+ '<div class="dshgp_browsemask"><div class="dshgp_browsedialog">'
|
|
58
|
+
+ '<div class="dshgp_browsehead"><span class="dshgp_browsetitle">选择目录</span>'
|
|
59
|
+
+ '<button type="button" class="dshgp_browseclose">✕</button></div>'
|
|
60
|
+
+ '<div class="dshgp_browsepath">/volume1/VirtualDSM/DeepSeekHarness/工作区</div>'
|
|
61
|
+
+ '<div class="dshgp_browseup">⬆ 上级目录</div>'
|
|
62
|
+
+ `<div class="dshgp_browselist" id="list">${rows}</div>`
|
|
63
|
+
+ '<div class="dshgp_browsefoot"><button type="button" class="dshgp_keybtn">选择当前目录</button></div>'
|
|
64
|
+
+ '</div></div></body>';
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/** 浏览器控制台测量脚本(返回硬指标 JSON)。 */
|
|
68
|
+
export const MEASURE_SNIPPET = `(() => {
|
|
69
|
+
const list = document.getElementById('list');
|
|
70
|
+
const rows = [...list.children];
|
|
71
|
+
const lb = list.getBoundingClientRect();
|
|
72
|
+
const f = rows[0].getBoundingClientRect();
|
|
73
|
+
const foot = document.querySelector('.dshgp_browsefoot').getBoundingClientRect();
|
|
74
|
+
return {
|
|
75
|
+
rows: rows.length,
|
|
76
|
+
rowHeight: Math.round(f.height * 10) / 10,
|
|
77
|
+
rowFlexShrink: getComputedStyle(rows[0]).flexShrink,
|
|
78
|
+
listClientH: list.clientHeight,
|
|
79
|
+
listScrollH: list.scrollHeight,
|
|
80
|
+
listScrollable: list.scrollHeight > list.clientHeight,
|
|
81
|
+
visibleRows: Math.round(lb.height / f.height),
|
|
82
|
+
footerInViewport: foot.bottom <= innerHeight,
|
|
83
|
+
};
|
|
84
|
+
})()`;
|
|
85
|
+
|
|
86
|
+
function argOf(name, def) {
|
|
87
|
+
const i = process.argv.indexOf(name);
|
|
88
|
+
return i >= 0 && process.argv[i + 1] ? process.argv[i + 1] : def;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
function main() {
|
|
92
|
+
const count = Number(argOf('--count', String(DEFAULT_COUNT))) || DEFAULT_COUNT;
|
|
93
|
+
const out = argOf('--out', DEFAULT_OUT);
|
|
94
|
+
const html = buildReproHtml({ count });
|
|
95
|
+
writeFileSync(out, html, 'utf8');
|
|
96
|
+
console.log(`✅ 已生成复现页:${out}(${count} 条目录,${html.length} 字节)`);
|
|
97
|
+
console.log('');
|
|
98
|
+
console.log('浏览器打开后,控制台粘贴以下脚本取硬指标:');
|
|
99
|
+
console.log(MEASURE_SNIPPET);
|
|
100
|
+
console.log('');
|
|
101
|
+
console.log('判读:rowHeight≈26-28px · listScrollable=true · footerInViewport=true');
|
|
102
|
+
if (!process.argv.includes('--serve')) return 0;
|
|
103
|
+
const port = Number(argOf('--port', '31399'));
|
|
104
|
+
const server = createServer((req, res) => {
|
|
105
|
+
res.writeHead(200, { 'content-type': 'text/html; charset=utf-8' });
|
|
106
|
+
res.end(html);
|
|
107
|
+
});
|
|
108
|
+
server.listen(port, '127.0.0.1', () => console.log(`\n服务已启动:http://127.0.0.1:${port}/(Ctrl+C 结束)`));
|
|
109
|
+
return null; // 挂起,等待手动结束
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) {
|
|
113
|
+
const code = main();
|
|
114
|
+
if (code !== null) process.exitCode = code;
|
|
115
|
+
}
|
package/skills/dsh-repo-index.md
CHANGED
|
@@ -12,7 +12,7 @@ generatedBy: deepseek-official/deepseek-v4-flash · EIGHTfs 2026-10-02
|
|
|
12
12
|
|
|
13
13
|
## 一、权威文件
|
|
14
14
|
|
|
15
|
-
插件配置目录下的 `git-push/dsh-repo-index.
|
|
15
|
+
插件配置目录下的 `git-push/dsh-repo-index.jsonl`(JSONL,每行一个仓库;解析顺序:`DSH_HOME/git-push/` → `~/.dsh/git-push/`)
|
|
16
16
|
|
|
17
17
|
| 事实 | 说明 |
|
|
18
18
|
|------|------|
|