dsh-git-push 2.20.19 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (239) hide show
  1. package/README.md +76 -47
  2. package/cli-tool.mjs +2 -4
  3. package/cli.mjs +11 -4
  4. package/lib/app/apply.js +15 -13
  5. package/lib/app/command-registry.js +26 -19
  6. package/lib/app/handlers/http-constants.js +8 -0
  7. package/lib/app/handlers/meta.js +2 -2
  8. package/lib/app/handlers/preprocess.js +104 -0
  9. package/lib/app/handlers/repo-actions.js +2 -3
  10. package/lib/app/handlers/repos.js +137 -10
  11. package/lib/app/handlers/settings.js +34 -15
  12. package/lib/app/http-handlers.js +13 -42
  13. package/lib/app/index.js +3 -2
  14. package/lib/app/inject-text.js +6 -21
  15. package/lib/app/preprocess-client.js +136 -0
  16. package/lib/app/repo-ownership.js +1 -1
  17. package/lib/app/schema.js +20 -10
  18. package/lib/app/settings-bridge.js +60 -8
  19. package/lib/app/severity.js +14 -0
  20. package/lib/app/slash-commands.js +5 -164
  21. package/lib/app/tool-call.js +96 -163
  22. package/lib/cli/commands-preprocess.mjs +74 -0
  23. package/lib/cli/commands-tool.mjs +3 -2
  24. package/lib/cli/commands-vcs.mjs +39 -5
  25. package/lib/cli/shared.mjs +36 -10
  26. package/lib/client/index.js +11 -16
  27. package/lib/client-parts/git/account.js +21 -12
  28. package/lib/client-parts/git/actions.js +23 -77
  29. package/lib/client-parts/git/apply.js +8 -2
  30. package/lib/client-parts/git/browser.js +1 -1
  31. package/lib/client-parts/git/const.js +33 -1
  32. package/lib/client-parts/git/controller.js +175 -176
  33. package/lib/client-parts/git/icons.js +1 -1
  34. package/lib/client-parts/git/loader.js +1 -1
  35. package/lib/client-parts/git/npm.js +56 -37
  36. package/lib/client-parts/git/page.js +53 -1
  37. package/lib/client-parts/git/repo.js +8 -1
  38. package/lib/client-parts/git/settings.js +13 -1
  39. package/lib/client-parts/git/state.js +237 -0
  40. package/lib/client-parts/git/utils.js +1 -1
  41. package/lib/client.js +631 -312
  42. package/lib/commit-push/pre-commit-engine.js +629 -30
  43. package/lib/commit-push.js +127 -67
  44. package/lib/context/index.js +7 -5
  45. package/lib/core/config.js +1 -27
  46. package/lib/core/exec.js +2 -11
  47. package/lib/{exempt/index.js → git/exempt-markers.js} +8 -1
  48. package/lib/git/identity-rewrite.js +1 -1
  49. package/lib/git/ignore.js +1 -1
  50. package/lib/git/index.js +1 -1
  51. package/lib/git/push.js +2 -17
  52. package/lib/git/repo-index.js +8 -3
  53. package/lib/git/repos.js +2 -2
  54. package/lib/git/sensitive.js +1 -1
  55. package/lib/npm/install.js +1 -1
  56. package/lib/npm/publish.js +20 -5
  57. package/lib/npm/registry.js +2 -2
  58. package/lib/plugin/auto-push.js +5 -8
  59. package/lib/preprocess/providers.js +195 -0
  60. package/lib/self/index.js +1 -1
  61. package/lib/skip-dirs.js +14 -55
  62. package/package.json +31 -42
  63. package/skills/dev/dsh-git-push.md +9 -9
  64. package/skills/guide/guide-commit-push.md +11 -13
  65. package/skills/workflow/README.md +0 -1
  66. package/skills/workflow/task-completion-report.md +2 -2
  67. package/.auditignore +0 -30
  68. package/.gitignore +0 -43
  69. package/cli-audit.mjs +0 -141
  70. package/lib/BUGFIX-NOTES-2026-09-14.md +0 -278
  71. package/lib/app/audit-api.js +0 -173
  72. package/lib/app/handlers/audit.js +0 -150
  73. package/lib/app/host-doc-checks.js +0 -25
  74. package/lib/app/schema-audit.js +0 -42
  75. package/lib/app/scope-check.js +0 -69
  76. package/lib/ast/brace.js +0 -120
  77. package/lib/ast/callgraph.js +0 -135
  78. package/lib/ast/code-lines.js +0 -175
  79. package/lib/ast/consts.js +0 -12
  80. package/lib/ast/control-flow.js +0 -470
  81. package/lib/ast/credential.js +0 -315
  82. package/lib/ast/dataflow.js +0 -391
  83. package/lib/ast/dup-code.js +0 -165
  84. package/lib/ast/fs-hotspots.js +0 -154
  85. package/lib/ast/index.js +0 -38
  86. package/lib/ast/io-risk-const.js +0 -95
  87. package/lib/ast/io-risk-fn.js +0 -208
  88. package/lib/ast/io-risk-loop.js +0 -308
  89. package/lib/ast/io-risk.js +0 -314
  90. package/lib/ast/lang.js +0 -156
  91. package/lib/ast/line-count.js +0 -52
  92. package/lib/ast/magic-number.js +0 -272
  93. package/lib/ast/naming.js +0 -292
  94. package/lib/ast/perf.js +0 -488
  95. package/lib/ast/scope-collisions.js +0 -228
  96. package/lib/ast/scope.js +0 -241
  97. package/lib/ast/shell.js +0 -131
  98. package/lib/ast/size.js +0 -448
  99. package/lib/ast/symbol-index.js +0 -399
  100. package/lib/ast/tokenizer.js +0 -421
  101. package/lib/ast/treesitter.js +0 -413
  102. package/lib/audit/analysis-coverage.js +0 -98
  103. package/lib/audit/audit-file.js +0 -205
  104. package/lib/audit/auditignore-rules.js +0 -148
  105. package/lib/audit/checks.js +0 -17
  106. package/lib/audit/client-entry.js +0 -93
  107. package/lib/audit/collector.js +0 -610
  108. package/lib/audit/ext-runner.js +0 -80
  109. package/lib/audit/file-context.js +0 -391
  110. package/lib/audit/finding.js +0 -101
  111. package/lib/audit/gitignore-match.js +0 -113
  112. package/lib/audit/glob.js +0 -63
  113. package/lib/audit/history-report.js +0 -100
  114. package/lib/audit/history.js +0 -126
  115. package/lib/audit/ignore-blind.js +0 -102
  116. package/lib/audit/index.js +0 -33
  117. package/lib/audit/orchestrate.js +0 -672
  118. package/lib/audit/public.js +0 -24
  119. package/lib/audit/repo-level.js +0 -30
  120. package/lib/audit/report-yaml.js +0 -90
  121. package/lib/audit/scope-policy.js +0 -110
  122. package/lib/audit/slot.js +0 -66
  123. package/lib/audit-rules/audit-rules-comment.yml +0 -199
  124. package/lib/audit-rules/audit-rules-cpp.yml +0 -114
  125. package/lib/audit-rules/audit-rules-csharp.yml +0 -82
  126. package/lib/audit-rules/audit-rules-docs.yml +0 -32
  127. package/lib/audit-rules/audit-rules-dsh.yml +0 -177
  128. package/lib/audit-rules/audit-rules-filehealth.yml +0 -42
  129. package/lib/audit-rules/audit-rules-folder.yml +0 -99
  130. package/lib/audit-rules/audit-rules-frontend.yml +0 -335
  131. package/lib/audit-rules/audit-rules-go.yml +0 -103
  132. package/lib/audit-rules/audit-rules-i18n.yml +0 -45
  133. package/lib/audit-rules/audit-rules-java.yml +0 -105
  134. package/lib/audit-rules/audit-rules-nodejs.yml +0 -662
  135. package/lib/audit-rules/audit-rules-npm.yml +0 -187
  136. package/lib/audit-rules/audit-rules-paths.yml +0 -98
  137. package/lib/audit-rules/audit-rules-performance.yml +0 -245
  138. package/lib/audit-rules/audit-rules-php.yml +0 -101
  139. package/lib/audit-rules/audit-rules-private.yml +0 -24
  140. package/lib/audit-rules/audit-rules-python.yml +0 -106
  141. package/lib/audit-rules/audit-rules-robustness.yml +0 -31
  142. package/lib/audit-rules/audit-rules-rust.yml +0 -109
  143. package/lib/audit-rules/audit-rules-structure.yml +0 -158
  144. package/lib/audit-rules/audit-rules-swift.yml +0 -99
  145. package/lib/audit-rules/audit-rules-template.yml +0 -108
  146. package/lib/audit-ui-sdk/contract.js +0 -117
  147. package/lib/audit-ui-sdk/index.js +0 -17
  148. package/lib/checks/button-bind.js +0 -347
  149. package/lib/checks/common.js +0 -170
  150. package/lib/checks/credential-file.js +0 -43
  151. package/lib/checks/dataflow.js +0 -40
  152. package/lib/checks/dispatch.js +0 -117
  153. package/lib/checks/dup-code.js +0 -69
  154. package/lib/checks/dup-const.js +0 -232
  155. package/lib/checks/file-health.js +0 -150
  156. package/lib/checks/filter.js +0 -137
  157. package/lib/checks/folder.js +0 -173
  158. package/lib/checks/fs-scanner.js +0 -57
  159. package/lib/checks/hardcoded-path.js +0 -98
  160. package/lib/checks/index.js +0 -49
  161. package/lib/checks/io.js +0 -66
  162. package/lib/checks/magic-number.js +0 -42
  163. package/lib/checks/npm-json.js +0 -273
  164. package/lib/checks/private.js +0 -64
  165. package/lib/checks/regex.js +0 -298
  166. package/lib/checks/scope-collision.js +0 -68
  167. package/lib/checks/semantic.js +0 -134
  168. package/lib/checks/structural.js +0 -281
  169. package/lib/cli/commands-audit.mjs +0 -142
  170. package/lib/cli/commands-doc.mjs +0 -127
  171. package/lib/client-parts/audit/audit.js +0 -301
  172. package/lib/exempt/tool.js +0 -198
  173. package/lib/git/module-splitter.js +0 -47
  174. package/lib/link-check/index.js +0 -187
  175. package/lib/lint-adapter/detect.js +0 -161
  176. package/lib/lint-adapter/index.js +0 -50
  177. package/lib/lint-adapter/runner.js +0 -133
  178. package/lib/preprocess/audit.js +0 -98
  179. package/lib/preprocess/index.js +0 -78
  180. package/lib/rule/compilers/credential.js +0 -62
  181. package/lib/rule/compilers/dataflow.js +0 -38
  182. package/lib/rule/compilers/file-health.js +0 -75
  183. package/lib/rule/compilers/frontend.js +0 -86
  184. package/lib/rule/compilers/func.js +0 -35
  185. package/lib/rule/compilers/helpers.js +0 -71
  186. package/lib/rule/compilers/index.js +0 -29
  187. package/lib/rule/compilers/link-semantic.js +0 -45
  188. package/lib/rule/compilers/list-kinds.js +0 -12
  189. package/lib/rule/compilers/numeric-kinds.js +0 -73
  190. package/lib/rule/compilers/regex.js +0 -78
  191. package/lib/rule/compilers/structure.js +0 -107
  192. package/lib/rule/compilers.js +0 -17
  193. package/lib/rule/homoglyph.js +0 -45
  194. package/lib/rule/loader.js +0 -274
  195. package/lib/rule/registry.js +0 -122
  196. package/lib/rule/scope.js +0 -67
  197. package/lib/score/docs-score.js +0 -166
  198. package/lib/score/index.js +0 -234
  199. package/lib/user-requirements.json +0 -15
  200. package/scripts/__pycache__/module-splitter.cpython-38.pyc +0 -0
  201. package/scripts/audit-ext/_example-readme-present.mjs +0 -34
  202. package/scripts/audit-ext/dsh-inject-declarations.mjs +0 -209
  203. package/scripts/audit-ext/variable-min-length.mjs +0 -102
  204. package/scripts/audit-gate.mjs +0 -235
  205. package/scripts/audit-runner.mjs +0 -35
  206. package/scripts/audit-runtime-check.mjs +0 -129
  207. package/scripts/browser-page-probe.mjs +0 -271
  208. package/scripts/build-client.mjs +0 -131
  209. package/scripts/bump-version.mjs +0 -178
  210. package/scripts/check-js-scope.mjs +0 -87
  211. package/scripts/check.mjs +0 -203
  212. package/scripts/clean-date-comments.py +0 -102
  213. package/scripts/cpu-sample.mjs +0 -188
  214. package/scripts/doc-drift.mjs +0 -200
  215. package/scripts/doc-func.mjs +0 -212
  216. package/scripts/doc-tree.mjs +0 -458
  217. package/scripts/doc-version.mjs +0 -149
  218. package/scripts/hot-path-probe-cjs.cjs +0 -71
  219. package/scripts/hot-path-probe-fs-shim.mjs +0 -28
  220. package/scripts/hot-path-probe-fsp-shim.mjs +0 -31
  221. package/scripts/hot-path-probe.mjs +0 -153
  222. package/scripts/local-registry.mjs +0 -37
  223. package/scripts/module-splitter.py +0 -800
  224. package/scripts/picker-repro.mjs +0 -115
  225. package/scripts/platform-scan.mjs +0 -168
  226. package/scripts/probe-recheck.mjs +0 -47
  227. package/scripts/rename-locator.mjs +0 -97
  228. package/scripts/rule-switch.mjs +0 -97
  229. package/scripts/rules-solo-audit.mjs +0 -173
  230. package/scripts/scan-file-io.mjs +0 -717
  231. package/scripts/scan-fs-hotspots.mjs +0 -107
  232. package/scripts/scan-version.mjs +0 -125
  233. package/scripts/symbol-index.mjs +0 -85
  234. package/scripts/verify-prestep.mjs +0 -100
  235. package/scripts/version-source.mjs +0 -173
  236. package/skills/dev/audit-rule-authoring.md +0 -58
  237. package/skills/guide/guide-audit.md +0 -270
  238. /package/lib/{audit → app}/ownership.js +0 -0
  239. /package/lib/{audit-defaults.js → git/defaults.js} +0 -0
package/lib/app/schema.js CHANGED
@@ -9,8 +9,6 @@
9
9
 
10
10
  import { createRequire } from 'node:module';
11
11
 
12
- // 审计侧设置键单独成文件(文件隔离阶段;展开合并后仍是同一个 Config 对象)
13
- import { auditConfigShape } from './schema-audit.js';
14
12
  // 引擎默认超时取单一来源(与运行期兜底共用),避免 schema 默认值漂移
15
13
  import { PRE_COMMIT_TIMEOUT_MS_DEFAULT } from './constants.js';
16
14
 
@@ -87,18 +85,30 @@ export const Config = Schema.object({
87
85
  workspaceRoot: Schema.string().default('').description('扫描根目录(空=DSH workspaceRoot)'),
88
86
  extraRepos: Schema.array(Schema.string()).default([]).description('额外仓库路径(数组)'),
89
87
  extraReposFile: Schema.string().default('').description('额外仓库清单文件(每行一个绝对路径,# 注释;运行时实时读取)'),
90
- // —— 审计侧设置键(集中在 lib/app/schema-audit.js,此处展开合并)——
91
- ...auditConfigShape(Schema),
92
88
  maxCloneFileMB: Schema.number().default(10).description('clone 单文件体积上限(MB),0=不限'),
93
89
  cloneConcurrency: Schema.number().default(6).description('clone 并发下载数'),
94
- // —— 提交前预处理引擎(可替换审计引擎,解耦方案 §2.1)——
95
- // 三项刻意都是「空 = 内置」而不是「空 = 关闭」:门禁不能因为漏配字段就悄悄不审计。
96
- // 注意本项是**高级文件配置**,不进 UI 设置项;解析顺序见 pre-commit-engine.js 的 resolvePreCommitConfig。
90
+ // —— 提交前预处理(可替换的预处理实现,解耦方案 §2.1)——
91
+ // 这里**只剩「跑不跑 + 用哪个引擎」**:预处理开不开是宿主自己的门禁策略,
92
+ // 而「怎么审」(扫描范围 / 权重 / 规则槽位 / 文件上限)属于预处理实现自己的配置,
93
+ // 不在本插件配置里(拆包后审计配置住在 audit-sluice 自己的 config.json)。
94
+ // 三项 command/args/timeoutMs 刻意都是「空 = 内置」而不是「空 = 关闭」:
95
+ // 门禁不能因为漏配字段就悄悄不跑。enable 才决定跑不跑。
96
+ // 解析顺序见 pre-commit-engine.js 的 resolvePreCommitConfig / resolvePreCommitEnabled。
97
97
  preCommit: Schema.object({
98
- command: Schema.string().default('').description('审计引擎命令(空=内置 node;走 PATH 自探测,找不到会显式报错而不是静默降级)'),
99
- args: Schema.array(Schema.string()).default([]).description('引擎参数(空=内置 scripts/audit-gate.mjs);相对路径按插件根解析'),
98
+ enabled: Schema.boolean().default(false).description('提交前预处理(默认关):开启后提交前调用预处理实现做门禁;关闭时提交照常,不做任何静态检查'),
99
+ // ── 有序阶段链(新):数组顺序 = 执行顺序 ──
100
+ // 空数组 = 不启用阶段链 ⇒ 走下面的旧单命令字段(行为与升级前逐字段一致)。
101
+ // 每阶段:provider = provider 注册表里的 id;onFail 留空 ⇒ 用 provider 自己声明的
102
+ // defaultOnFail ⇒ 再缺省 'block'(宿主不按 provider 名字猜语义)。
103
+ stages: Schema.array(Schema.object({
104
+ provider: Schema.string().default('').description('provider id(providers.js 注册表里的 id,如 audit)'),
105
+ onFail: Schema.string().default('').description("该阶段失败怎么办:block(中断并拒绝提交)| warn(记警告继续)| skip(静默跳过);空=用 provider 声明的 defaultOnFail,再缺省 block"),
106
+ timeoutMs: Schema.number().default(0).description('该阶段超时毫秒(0=用 provider/全局默认)'),
107
+ })).default([]).description('有序阶段链:按数组顺序执行;空=用单命令模式(command/args)'),
108
+ command: Schema.string().default('').description('预处理引擎命令(单命令模式;空=内置 node;走 PATH 自探测,找不到会显式报错而不是静默降级)'),
109
+ args: Schema.array(Schema.string()).default([]).description('引擎参数(空=预处理实现 CLI);相对路径按插件根解析'),
100
110
  timeoutMs: Schema.number().default(PRE_COMMIT_TIMEOUT_MS_DEFAULT).description('引擎超时毫秒(超时按执行失败处理,fail-closed)'),
101
- }).description('提交前预处理引擎(空=内置;换引擎只改这里)'),
111
+ }).description('提交前预处理(开/关 + 阶段链或单命令;空 engine = 内置预处理实现)'),
102
112
  pushMethod: Schema.string().default('ssh').description('推送通道:ssh(默认,推本地 HEAD、远端 sha 与本地一致)| api(Git Data API 重建提交)| auto(有私钥走 ssh,否则 api)'),
103
113
  // 推送门禁(类似会话指挥家写操作拦截)——开启后 AI 推送必须带 pushConfirmed:true
104
114
  // (已显式放行 pushConfirmed:true),否则 git_commit_push 拦截推送步骤(commit 可做,push 被挡)。
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * 设置读写桥 · settings-bridge
3
3
  *
4
- * 背景(大坑,见 lib/BUGFIX-NOTES-2026-09-14.md「Bug 3」):
4
+ * 背景(历史大坑:无 Origin 的桌面端请求曾被 403 挡住,表现为「页面能开、保存永不生效」):
5
5
  * DSH web GUI 的 settings 持久化由 client 侧 `ctx.remote.$host.isLoopback` 决定(ui-settings
6
6
  * src/client/index.ts:58):经反代地址访问时 isLoopback=false → persistence='memory' →
7
7
  * 前端 scope.set 只改页面内存、不发 wire、不写盘、重启全丢;且公共 settings.yaml 存在
@@ -36,18 +36,47 @@ import { readJson, writeJsonAtomic, updateJsonAtomic } from '../git/atomic-json.
36
36
  */
37
37
  // 设置键映射表(模块级常量:与每次调用无关,放外面避免重复构造,也让 applySettingsToCfg 更短)
38
38
  // 语义:类型收窄 / 枚举白名单 / 数字钳制,与 SETTINGS_SCHEMA 声明同步。
39
- const BOOL_KEYS = ['injectSystemPrompt', 'auditEnabled', 'injectRequirements', 'pushGate', 'autoPushEnabled'];
40
- const ENUM_KEYS = { auditScanScope: ['diff', 'full'], pushMethod: ['ssh', 'api', 'auto'], autoPushScope: ['session', 'all'] };
41
- const STR_KEYS = ['weightOverrides', 'autoPushTriggerText', 'autoPushMessage', 'npmRegistry'];
39
+ // 边界:本表只收**本插件自己的设置键**。「怎么审」(扫描范围/权重/规则包/文件上限)
40
+ // 归预处理实现自己的配置,不在这里;宿主只保留「提交前预处理开不开」
41
+ // (preCommit.enabled,见下方 applyPreCommitBlock)。
42
+ const BOOL_KEYS = ['injectSystemPrompt', 'pushGate', 'autoPushEnabled'];
43
+ const ENUM_KEYS = { pushMethod: ['ssh', 'api', 'auto'], autoPushScope: ['session', 'all'] };
44
+ const STR_KEYS = ['autoPushTriggerText', 'autoPushMessage', 'npmRegistry'];
42
45
  const STR_TRIM_KEYS = ['githubToken', 'sshPub', 'npmToken'];
43
- const ARR_KEYS = ['auditRuleOrder', 'auditDisabledSlots'];
44
- const NUM_KEYS = ['maxScanFiles'];
45
46
  // 数值钳制:min/max 边界,floor 先取整(clone 并发数不高于 16)
46
47
  const CLAMP_KEYS = {
47
48
  maxCloneFileMB: { min: 0 },
48
49
  cloneConcurrency: { min: 1, max: 16, floor: true },
49
50
  };
50
51
 
52
+ /**
53
+ * 嵌套块 `preCommit` 的键级合并(只认已知子键 + 类型守卫)。
54
+ *
55
+ * 为什么单独处理:`preCommit` 是嵌套对象,若走「整键覆盖」的通用路径,
56
+ * 前端只改 `enabled` 这一项时会把同块的 `command` / `args` / `timeoutMs` 一起抹掉
57
+ * (用户手配的引擎位置凭空消失,而且看不出是被谁清的)。
58
+ *
59
+ * 两个入口都给同一件事赋值,来源不同不能互相覆盖:
60
+ * · `patch.preCommitEnabled` —— settings-set 单键写入(前端开关,扁平键名)
61
+ * · `patch.preCommit` —— 启动时把整份 config.json 合并进 cfg(嵌套原样)
62
+ * 单键写入优先:它是用户刚做的动作,文件里的旧嵌套值是更早的状态。
63
+ */
64
+ function applyPreCommitBlock(cfg, patch) {
65
+ const flatEnabled = typeof patch.preCommitEnabled === 'boolean' ? patch.preCommitEnabled : null;
66
+ const block = (patch.preCommit && typeof patch.preCommit === 'object') ? patch.preCommit : null;
67
+ const blockEnabled = typeof block?.enabled === 'boolean' ? block.enabled : null;
68
+ const enabled = flatEnabled ?? blockEnabled;
69
+ const cur = (cfg.preCommit && typeof cfg.preCommit === 'object') ? cfg.preCommit : {};
70
+ const next = { ...cur };
71
+ if (enabled !== null) next.enabled = enabled;
72
+ if (typeof block?.command === 'string') next.command = block.command;
73
+ if (Array.isArray(block?.args)) next.args = block.args.map((rawArg) => String(rawArg));
74
+ if (typeof block?.timeoutMs === 'number' && Number.isFinite(block.timeoutMs)) next.timeoutMs = block.timeoutMs;
75
+ if (enabled === null && blockEnabled === null && typeof block?.command !== 'string'
76
+ && !Array.isArray(block?.args) && typeof block?.timeoutMs !== 'number') return;
77
+ cfg.preCommit = next;
78
+ }
79
+
51
80
  /**
52
81
  * 按类型把 patch 里的键写进 cfg(布尔 / 枚举 / 字符串 / 去空白字符串 / 数组 / 有限数字)。
53
82
  *
@@ -61,8 +90,6 @@ function applyTypedKeys(cfg, patch) {
61
90
  }
62
91
  for (const k of STR_KEYS) if (typeof patch[k] === 'string') cfg[k] = patch[k];
63
92
  for (const k of STR_TRIM_KEYS) if (typeof patch[k] === 'string' && patch[k].trim()) cfg[k] = patch[k].trim();
64
- for (const k of ARR_KEYS) if (Array.isArray(patch[k])) cfg[k] = patch[k];
65
- for (const k of NUM_KEYS) if (typeof patch[k] === 'number' && Number.isFinite(patch[k])) cfg[k] = patch[k];
66
93
  }
67
94
 
68
95
  /** 数值键钳制:非有限数字跳过;floor 先取整,再按 min/max 收敛。 */
@@ -81,6 +108,7 @@ export function applySettingsToCfg(cfg, patch) {
81
108
  if (!cfg || !patch || typeof patch !== 'object') return out;
82
109
  applyTypedKeys(cfg, patch);
83
110
  applyClampedNumbers(cfg, patch);
111
+ applyPreCommitBlock(cfg, patch);
84
112
  if (typeof patch.injectSystemPrompt === 'boolean') out.changedSystemPrompt = patch.injectSystemPrompt;
85
113
  return out;
86
114
  }
@@ -215,4 +243,28 @@ export async function writeSettingsKey(key, jsonValue, env = {}) {
215
243
  } catch (e) {
216
244
  return { ok: false, code: 'WRITE_FAIL', error: `配置写入失败: ${e?.message || e}` };
217
245
  }
246
+ }
247
+
248
+ /**
249
+ * 写「提交前预处理」总开关(`preCommit.enabled`,嵌套块里的**单个子键**)。
250
+ *
251
+ * 为什么不复用 writeSettingsKey:那条是「整键覆盖」,key 写 `preCommit` 会把同块的
252
+ * command / args / timeoutMs 一起换掉——用户手配的引擎位置会凭空消失且无提示。
253
+ * 这里做键级合并(atomic 读改写,不引入第二条写路径)。
254
+ * @param {boolean} enabled
255
+ * @param {{workspaceRoot?:string}} [env]
256
+ * @returns {{ok:boolean, code?:string, error?:string}}
257
+ */
258
+ export async function writePreCommitEnabled(enabled, env = {}) {
259
+ if (typeof enabled !== 'boolean') return { ok: false, code: 'BAD_VALUE', error: 'preCommit.enabled 只接受布尔值' };
260
+ try {
261
+ const file = settingsFilePath(env);
262
+ const updated = updateJsonAtomic(file, (cur) => {
263
+ const block = (cur && typeof cur.preCommit === 'object' && cur.preCommit !== null) ? cur.preCommit : {};
264
+ return { ...cur, preCommit: { ...block, enabled } };
265
+ });
266
+ return updated.ok ? { ok: true, file: updated.file } : { ok: false, code: 'WRITE_FAIL', error: `配置写入失败: ${updated.error || '未知'}` };
267
+ } catch (e) {
268
+ return { ok: false, code: 'WRITE_FAIL', error: `配置写入失败: ${e?.message || e}` };
269
+ }
218
270
  }
@@ -0,0 +1,14 @@
1
+ /**
2
+ * 「拦截级」严重度判定(宿主侧同步快照)
3
+ *
4
+ * 语义与审计包 `lib/engine/finding.js` 的 `isBlockerFinding` 相同:`blocker` 与 `error` 都算拦截级。
5
+ * 为什么宿主还留一份:调用点是**同步**的(HTTP handler 内即时过滤 findings),
6
+ * 而审计包只能异步加载。**不是又一处双份真相,是带对拍门禁的快照**——
7
+ * test/app/test-audit-severity-parity.mjs 会比对两边结果,分叉即红。
8
+ * @param {object} finding
9
+ * @returns {boolean}
10
+ */
11
+ export function isBlockerSeverity(finding) {
12
+ const severity = finding?.severity;
13
+ return severity === 'blocker' || severity === 'error';
14
+ }
@@ -2,7 +2,8 @@
2
2
  * 插件入口层 · 用户输入框斜杠命令
3
3
  *
4
4
  * 官方通道:ctx.inject(['commands']) → commands.register({ name, description, input, handler })。
5
- * 人在输入框打 /git-audit 等命令,直接跑代码、不进模型。
5
+ * 人在输入框打 /git-scan 等命令,直接跑代码、不进模型。
6
+ * 注:审计类斜杠命令(/git-audit、/git-io-scan、/link-check)已随审计能力迁出宿主。
6
7
  *
7
8
  * ── 只注册「只读」命令 ──
8
9
  * 这里挂的每条命令都零副作用:不写文件、不改远端、不发提交。写类操作
@@ -21,6 +22,9 @@ import { callTool } from './tool-call.js';
21
22
 
22
23
  /* ───────────────────────── 通用工具 ───────────────────────── */
23
24
 
25
+ /** 路径不存在时的统一前缀(多个斜杠命令共用)。 */
26
+ const ERR_PATH_NOT_FOUND = '路径不存在: ';
27
+
24
28
  /** 会话工作区路径。空 = 指挥家「未分类」(header.cwd 缺失)。 */
25
29
  export function sessionCwdOf(invocation) {
26
30
  const cwd = invocation?.agent?.session?.header?.cwd;
@@ -34,7 +38,6 @@ export function sessionCwdOf(invocation) {
34
38
  */
35
39
  /** git 仓库向上探测的最大深度(超过即放弃,防深目录逐级 existsSync 拖慢)。 */
36
40
  const GIT_ROOT_MAX_DEPTH = 20;
37
- const BLOCKERS_LIST_MAX = 20; // /git-audit 拦截文件列表上限
38
41
  const PREVIEW_LIST_MAX = 15; // /git-clone-preview 预览列表条数上限(防刷屏)
39
42
  const LIST_PRINT_MAX = 20; // 通用列表打印上限(拦截文件/坏链接等,防刷屏)
40
43
 
@@ -94,78 +97,6 @@ function rejectRepo(usage, example, detail) {
94
97
  return { kind: 'error', text: `${detail}\n${usage}${example ? '\n' + example : ''}` };
95
98
  }
96
99
 
97
- /* ───────────────────────── /git-audit ───────────────────────── */
98
-
99
- const AUDIT_USAGE = '用法: /git-audit [路径] [--full] [--force]';
100
- const AUDIT_EXAMPLE = '示例: /git-audit /path/to/repo --full;/git-audit /path/to/dir --force(非 git 目录强制全量扫描)';
101
- /** 路径不存在错误前缀(4 个命令共用,统一文案防漂移)。 */
102
- const ERR_PATH_NOT_FOUND = '路径不存在: ';
103
-
104
- /** 兼容旧名(外部/测试可能仍在用)。 */
105
- export function parseGitAuditInput(raw = '') {
106
- const parsed = parseCommandInput(raw, ['--full', '--force'], AUDIT_USAGE);
107
- if (parsed.error) return { path: '', scope: 'diff', error: parsed.error };
108
- return { path: parsed.path, scope: parsed.opts.full ? 'full' : 'diff', force: parsed.opts.force === true };
109
- }
110
-
111
- /** 兼容旧名。 */
112
- export function resolveAuditRepo(rawPath, opts) {
113
- return resolveTargetPath(rawPath, opts);
114
- }
115
-
116
- /**
117
- * 把 code_audit 结果收成输入框可显示的短文本(含 blocker 文件列表)。
118
- * @param {object} r callTool('code_audit') 返回值
119
- */
120
- export function formatGitAuditCommandText(r = {}) {
121
- if (!r || r.ok === false) return r?.error || '审计失败';
122
- // 修(回归):code_audit 1.11.5 后返回改版(无 block/findings——默认精简)——
123
- // 旧实现依赖 r.block/r.findings → lines 空 → 输出「审计完成(无摘要)」。改用新返回
124
- // summary(计数)+ quality(评分)+ blocked(拦截列表,含 2.0.4 includeFindings 前的结构)。
125
- const lines = [];
126
- const s = r.summary || {};
127
- const quality = r.quality || {};
128
- lines.push(`审计 ${r.repo || ''}(${r.scope === 'full' ? '全量' : '变动'})`);
129
- lines.push(`评分 ${quality.score ?? '?'}/${quality.level ?? '?'} · ${s.blocker ?? 0} 拦截 / ${s.warning ?? 0} 警告 / ${s.notice ?? 0} 提示`);
130
- const blockers = Array.isArray(r.blocked) ? r.blocked : [];
131
- if (blockers.length) {
132
- lines.push(`拦截 ${blockers.length} 个:`);
133
- for (const b of blockers.slice(0, BLOCKERS_LIST_MAX)) {
134
- const loc = b.line ? `${b.file}:${b.line}` : String(b.file || '');
135
- lines.push(` ${loc}(${b.rule || ''})`);
136
- }
137
- if (blockers.length > BLOCKERS_LIST_MAX) lines.push(` …另有 ${blockers.length - BLOCKERS_LIST_MAX} 条`);
138
- }
139
- return lines.join('\n') || '审计完成';
140
- }
141
-
142
- /** /git-audit handler 主体(可单测,不依赖 cordis)。 */
143
- export async function runGitAuditCommand({ rawInput = '', invocation = null, env = {}, cfg = {}, log = null } = {}) {
144
- const parsed = parseGitAuditInput(rawInput);
145
- if (parsed.error) return { kind: 'error', text: parsed.error };
146
- const sessionCwd = sessionCwdOf(invocation);
147
- if (!parsed.path && !sessionCwd) {
148
- return { kind: 'error', text: `当前会话未绑定工作区(未分类)。请指定 git 仓库路径。\n${AUDIT_USAGE}\n${AUDIT_EXAMPLE}` };
149
- }
150
- if (parsed.path && !isAbsolute(parsed.path) && !sessionCwd) {
151
- return { kind: 'error', text: `相对路径需要会话工作区。请给绝对路径。\n${AUDIT_USAGE}\n${AUDIT_EXAMPLE}` };
152
- }
153
- const target = resolveTargetPath(parsed.path, { sessionCwd });
154
- if (!target || !existsSync(target)) return { kind: 'error', text: `${ERR_PATH_NOT_FOUND}${target || '(空)'}` };
155
- let repo = findGitRoot(target);
156
- if (!repo) {
157
- // 非 git 目录默认拒绝(全量扫非仓库目录可能打爆进程);--force 显式放行——
158
- // code_audit 工具对非 git 目录自动走 auditFull(scope 强制 full,不依赖 git 元数据)
159
- if (!parsed.force) {
160
- return rejectRepo(AUDIT_USAGE, AUDIT_EXAMPLE, `不是 git 仓库: ${target}。拒绝全量扫非仓库目录(会把进程打爆);加 --force 强制扫描。`);
161
- }
162
- repo = target;
163
- }
164
- const r = await callTool('code_audit', { repo, scope: parsed.scope }, env, cfg, log);
165
- if (!r || r.ok === false) return { kind: 'error', text: r?.error || '审计失败' };
166
- return { kind: 'success', text: formatGitAuditCommandText(r) };
167
- }
168
-
169
100
  /* ───────────────────────── /git-scan ───────────────────────── */
170
101
 
171
102
  const SCAN_USAGE = '用法: /git-scan [路径]';
@@ -207,93 +138,6 @@ export async function runGitScanCommand({ rawInput = '', invocation = null, env
207
138
  return { kind: 'success', text: formatGitScanCommandText(r) };
208
139
  }
209
140
 
210
- /* ───────────────────────── /git-io-scan ───────────────────────── */
211
-
212
- const IOSCAN_USAGE = '用法: /git-io-scan [路径] [--write]';
213
- const IOSCAN_EXAMPLE = '示例: /git-io-scan --write';
214
-
215
- /**
216
- * 把 I/O 扫描结果收成输入框可显示的短文本。
217
- * 数据形态:{ total, sync, byRisk:{high,medium,low,safe}, files:[{file,count}], items:[...] }
218
- */
219
- export function formatIoScanCommandText(r = {}) {
220
- if (!r || r.ok === false) return r?.error || 'I/O 扫描失败';
221
- const total = Number(r.total) || 0;
222
- if (!total) return `扫描根: ${r.root || '(会话工作区)'}\n未发现文件 I/O 调用。`;
223
- const b = r.byRisk || {};
224
- const lines = [
225
- `扫描根: ${r.root || '(会话工作区)'}`,
226
- `文件 I/O 调用 ${total} 处(同步 ${r.sync || 0} / 异步 ${total - (r.sync || 0)})`,
227
- '',
228
- '风险分布:',
229
- ` 🔴 高 ${b.high || 0} 🟠 中 ${b.medium || 0} 🟡 低 ${b.low || 0} 🟢 安全 ${b.safe || 0}`,
230
- ];
231
- const items = Array.isArray(r.items) ? r.items : [];
232
- const top = items.filter((hit) => hit.risk === 'high').slice(0, 10);
233
- if (top.length) {
234
- lines.push('', '高风险(改造优先级):');
235
- for (const hit of top) {
236
- const ctxs = [];
237
- if (hit.inAsync) ctxs.push('异步路径');
238
- if (hit.inLoop) ctxs.push('循环内');
239
- if (hit.inRequest) ctxs.push('请求路径');
240
- lines.push(` ${hit.file}:${hit.line} ${hit.call || hit.op || ''} ${ctxs.join('+') || '—'}`);
241
- }
242
- const highTotal = b.high || 0;
243
- if (highTotal > top.length) lines.push(` …另有 ${highTotal - top.length} 处高危`);
244
- }
245
- return lines.join('\n');
246
- }
247
-
248
- /**
249
- * /git-io-scan handler:扫描脚本里读写文件的调用与路径。
250
- * 复用 scripts/scan-file-io.mjs(AST 四级分级,与审计 io-risk 同标准),
251
- * 不另写一套扫描逻辑。
252
- */
253
- export async function runGitIoScanCommand({ rawInput = '', invocation = null, env = {}, cfg = {}, log = null } = {}) {
254
- const parsed = parseCommandInput(rawInput, ['--write'], IOSCAN_USAGE);
255
- if (parsed.error) return { kind: 'error', text: parsed.error };
256
- const sessionCwd = sessionCwdOf(invocation);
257
- const target = resolveTargetPath(parsed.path, { sessionCwd });
258
- if (parsed.path && !target) {
259
- return { kind: 'error', text: `相对路径需要会话工作区。请给绝对路径。\n${IOSCAN_USAGE}` };
260
- }
261
- if (target && !existsSync(target)) return { kind: 'error', text: `${ERR_PATH_NOT_FOUND}${target}` };
262
- const r = await callTool('io_scan', { repo: target || sessionCwd, writeOnly: parsed.opts.write === true }, env, cfg, log);
263
- if (!r || r.ok === false) return { kind: 'error', text: r?.error || 'I/O 扫描失败' };
264
- return { kind: 'success', text: formatIoScanCommandText(r) };
265
- }
266
-
267
- /* ───────────────────────── /link-check ───────────────────────── */
268
-
269
- const LINK_USAGE = '用法: /link-check [文件或目录]';
270
- const LINK_EXAMPLE = '示例: /link-check README.md';
271
-
272
- /** 把链接检查结果收成短文本。 */
273
- export function formatLinkCheckCommandText(r = {}) {
274
- if (!r || r.ok === false) return r?.error || '链接检查失败';
275
- const findings = Array.isArray(r.findings) ? r.findings : [];
276
- if (!findings.length) return `共检查链接 ${r.count || 0} 个,全部有效。`;
277
- const bad = findings.filter((f) => f && f.ok === false);
278
- const lines = [`共检查 ${r.count || findings.length} 个链接,其中 ${bad.length} 个无效:`, ''];
279
- for (const f of bad.slice(0, LIST_PRINT_MAX)) {
280
- lines.push(` ✗ ${f.url || f.link || '(空)'}${f.error ? ` — ${f.error}` : ''}`);
281
- }
282
- if (bad.length > LIST_PRINT_MAX) lines.push(` …另有 ${bad.length - LIST_PRINT_MAX} 个`);
283
- return lines.join('\n');
284
- }
285
-
286
- export async function runLinkCheckCommand({ rawInput = '', invocation = null, env = {}, cfg = {}, log = null } = {}) {
287
- const parsed = parseCommandInput(rawInput, [], LINK_USAGE);
288
- if (parsed.error) return { kind: 'error', text: parsed.error };
289
- const sessionCwd = sessionCwdOf(invocation);
290
- const target = resolveTargetPath(parsed.path, { sessionCwd }) || env.workspaceRoot || '';
291
- if (target && !existsSync(target)) return { kind: 'error', text: `${ERR_PATH_NOT_FOUND}${target}` };
292
- const r = await callTool('link_check', { path: target }, env, cfg, log);
293
- if (!r || r.ok === false) return { kind: 'error', text: r?.error || '链接检查失败' };
294
- return { kind: 'success', text: formatLinkCheckCommandText(r) };
295
- }
296
-
297
141
  /* ───────────────────────── /git-account ───────────────────────── */
298
142
 
299
143
  const ACCOUNT_USAGE = '用法: /git-account';
@@ -356,10 +200,7 @@ export async function runGitClonePreviewCommand({ rawInput = '', env = {}, cfg =
356
200
  * keep: 便于测试断言注册集合,避免漏挂/多挂。
357
201
  */
358
202
  export const SLASH_COMMANDS = [
359
- { name: 'git-audit', description: '审计当前会话工作区(未分类须写路径;--full 全量)', input: { hint: '[路径] [--full]' }, run: runGitAuditCommand },
360
203
  { name: 'git-scan', description: '列出各仓库分支/未提交/未推送(只读)', input: { hint: '[路径]' }, run: runGitScanCommand },
361
- { name: 'git-io-scan', description: '扫描脚本里读写文件的调用与路径,标四级风险(只读)', input: { hint: '[路径] [--write]' }, run: runGitIoScanCommand },
362
- { name: 'link-check', description: '检查文档内链接有效性(只读)', input: { hint: '[文件或目录]' }, run: runLinkCheckCommand },
363
204
  { name: 'git-account', description: '校验 GitHub 账号与凭据(只读)', input: { hint: '' }, run: runGitAccountCommand },
364
205
  { name: 'git-clone-preview', description: '预览 clone 将下载/跳过哪些文件,不落盘(只读)', input: { hint: '<owner/repo> [--branch 名]' }, run: runGitClonePreviewCommand },
365
206
  ];