@kevlns/xlmerge 2.0.4 → 2.0.5
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/AGENTS.md +25 -171
- package/LICENSE +21 -21
- package/README.md +111 -111
- package/bin/xlmerge.js +152 -152
- package/package.json +3 -2
- package/python/xlsx_merge_engine/__init__.py +2 -2
- package/python/xlsx_merge_engine/xlsx_git_merge_bridge.py +1614 -1614
- package/python/xlsx_resolver/__init__.py +2 -2
- package/python/xlsx_resolver/__main__.py +4 -4
- package/python/xlsx_resolver/formula_values.py +677 -660
- package/python/xlsx_resolver/merge_ui.html +1635 -1634
- package/python/xlsx_resolver/recalculate_workbook.ps1 +140 -141
- package/python/xlsx_resolver/xlsx_conflict.py +2381 -2317
- package/skills/xlmerge/SKILL.md +8 -0
- package/skills/xlmerge/references/project.md +171 -0
- package/v-cli.plugin.json +305 -299
package/v-cli.plugin.json
CHANGED
|
@@ -1,299 +1,305 @@
|
|
|
1
|
-
{
|
|
2
|
-
"schemaVersion": 1,
|
|
3
|
-
"package": "@kevlns/xlmerge",
|
|
4
|
-
"command": "xlmerge",
|
|
5
|
-
"bin": "xlmerge",
|
|
6
|
-
"description": "在浏览器中审阅 Git 冲突工作簿的三方差异,校验后写回并提交合并结果。",
|
|
7
|
-
"platforms": [
|
|
8
|
-
"darwin",
|
|
9
|
-
"linux",
|
|
10
|
-
"win32"
|
|
11
|
-
],
|
|
12
|
-
"runtime": {
|
|
13
|
-
"node": ">=16",
|
|
14
|
-
"python": ">=3.9",
|
|
15
|
-
"pythonDependencies": [
|
|
16
|
-
"openpyxl==3.1.5",
|
|
17
|
-
"bottle==0.13.4"
|
|
18
|
-
]
|
|
19
|
-
},
|
|
20
|
-
"environment": [
|
|
21
|
-
{
|
|
22
|
-
"name": "XLMERGE_PYTHON",
|
|
23
|
-
"description": "Python 解释器路径,优先于自动查找。"
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
"name": "XLMERGE_VENV",
|
|
27
|
-
"description": "按需创建的用户虚拟环境目录,默认 ~/.xlmerge/venv。"
|
|
28
|
-
},
|
|
29
|
-
{
|
|
30
|
-
"name": "XLMERGE_EXCEL_TIMEOUT_SECONDS",
|
|
31
|
-
"description": "Excel 隔离重算单个工作簿的硬超时,默认 120 秒。"
|
|
32
|
-
}
|
|
33
|
-
],
|
|
34
|
-
"agent": {
|
|
35
|
-
"whenToUse": "When a user asks to resolve Git merge conflicts in .xlsx/.xlsm planning or configuration tables (策划表/配置表冲突): run detect first; when reviewCount > 0 run launch and give the returned url to the user. Configured auto-theirs filters may resolve and commit matched generated workbooks without opening the UI. Do not inspect workbook cells or summarize diffs yourself; the resolver owns diff, choices, write-back and commit.",
|
|
36
|
-
"globalOptions": [
|
|
37
|
-
{
|
|
38
|
-
"flags": "--repo <path>",
|
|
39
|
-
"description": "Git 仓库目录,默认当前目录并向上查找仓库根。"
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
"flags": "--runtime-dir <dir>",
|
|
43
|
-
"description": "Git 三方工作簿与清单的暂存目录,默认系统临时目录,供 prepare、resolve、launch 使用。"
|
|
44
|
-
}
|
|
45
|
-
],
|
|
46
|
-
"commands": [
|
|
47
|
-
{
|
|
48
|
-
"path": [
|
|
49
|
-
"detect"
|
|
50
|
-
],
|
|
51
|
-
"usage": "xlmerge --repo <repo> detect",
|
|
52
|
-
"description": "列出仓库中未解决的 .xlsx/.xlsm 冲突。",
|
|
53
|
-
"arguments": [],
|
|
54
|
-
"options": [],
|
|
55
|
-
"output": {
|
|
56
|
-
"format": "json",
|
|
57
|
-
"description": "返回 ok、repo、count、reviewCount、autoTheirs 和 conflicts(path、stages)。"
|
|
58
|
-
},
|
|
59
|
-
"exitCodes": {
|
|
60
|
-
"0": "成功。",
|
|
61
|
-
"1": "执行失败,例如目标不是 Git 仓库。",
|
|
62
|
-
"2": "用法错误。"
|
|
63
|
-
},
|
|
64
|
-
"safety": [
|
|
65
|
-
"read-only",
|
|
66
|
-
"no-worktree-modification"
|
|
67
|
-
]
|
|
68
|
-
},
|
|
69
|
-
{
|
|
70
|
-
"path": [
|
|
71
|
-
"filter",
|
|
72
|
-
"add"
|
|
73
|
-
],
|
|
74
|
-
"usage": "xlmerge --repo <repo> filter add <path>",
|
|
75
|
-
"description": "添加不区分大小写的工作簿路径后缀过滤项;匹配文件逐字节采用 Git stage 3。",
|
|
76
|
-
"arguments": [
|
|
77
|
-
{
|
|
78
|
-
"name": "path",
|
|
79
|
-
"required": true,
|
|
80
|
-
"description": "需采用 Git stage 3 的 .xlsx/.xlsm 相对路径后缀。"
|
|
81
|
-
}
|
|
82
|
-
],
|
|
83
|
-
"options": [],
|
|
84
|
-
"output": {
|
|
85
|
-
"format": "json",
|
|
86
|
-
"description": "返回 ok、repo、config、filter、added 和完整 filters,写入 <repo>/.xlmerge.json。"
|
|
87
|
-
},
|
|
88
|
-
"exitCodes": {
|
|
89
|
-
"0": "成功,包含过滤项已存在的情况。",
|
|
90
|
-
"1": "仓库、过滤路径或 .xlmerge.json 无效。",
|
|
91
|
-
"2": "用法错误。"
|
|
92
|
-
},
|
|
93
|
-
"safety": [
|
|
94
|
-
"writes-worktree",
|
|
95
|
-
"no-commit"
|
|
96
|
-
]
|
|
97
|
-
},
|
|
98
|
-
{
|
|
99
|
-
"path": [
|
|
100
|
-
"prepare"
|
|
101
|
-
],
|
|
102
|
-
"usage": "xlmerge --repo <repo> prepare [--path <file>]",
|
|
103
|
-
"description": "生成按工作表组织的清单;命中整表过滤的文件跳过单元格分析。",
|
|
104
|
-
"arguments": [],
|
|
105
|
-
"options": [
|
|
106
|
-
{
|
|
107
|
-
"flags": "--path <file>",
|
|
108
|
-
"description": "仅准备指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
109
|
-
}
|
|
110
|
-
],
|
|
111
|
-
"output": {
|
|
112
|
-
"format": "json",
|
|
113
|
-
"description": "返回 ok 和清单 JSON 的绝对路径 manifest。"
|
|
114
|
-
},
|
|
115
|
-
"exitCodes": {
|
|
116
|
-
"0": "成功。",
|
|
117
|
-
"1": "无冲突、仓库无效或 Git 执行失败。",
|
|
118
|
-
"2": "用法错误。"
|
|
119
|
-
},
|
|
120
|
-
"safety": [
|
|
121
|
-
"writes-runtime-dir",
|
|
122
|
-
"no-worktree-modification",
|
|
123
|
-
"no-commit"
|
|
124
|
-
]
|
|
125
|
-
},
|
|
126
|
-
{
|
|
127
|
-
"path": [
|
|
128
|
-
"resolve"
|
|
129
|
-
],
|
|
130
|
-
"usage": "xlmerge --repo <repo> resolve [--path <file>] [--no-browser]",
|
|
131
|
-
"description": "准备冲突并以前台阻塞模式启动本地审阅界面。",
|
|
132
|
-
"arguments": [],
|
|
133
|
-
"options": [
|
|
134
|
-
{
|
|
135
|
-
"flags": "--path <file>",
|
|
136
|
-
"description": "仅处理指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
137
|
-
},
|
|
138
|
-
{
|
|
139
|
-
"flags": "--no-browser",
|
|
140
|
-
"description": "只输出地址,不打开浏览器。"
|
|
141
|
-
}
|
|
142
|
-
],
|
|
143
|
-
"output": {
|
|
144
|
-
"format": "stdout",
|
|
145
|
-
"description": "审阅模式输出 MERGE_SERVER_URL=http://127.0.0.1:<port>;全量命中过滤时直接写回 stage 3 并提交,返回 JSON。"
|
|
146
|
-
},
|
|
147
|
-
"exitCodes": {
|
|
148
|
-
"0": "已应用解决结果:自动完成或通过界面写回,随后关闭服务。",
|
|
149
|
-
"1": "准备失败,或应用解决结果前服务已停止。",
|
|
150
|
-
"2": "用法错误。"
|
|
151
|
-
},
|
|
152
|
-
"safety": [
|
|
153
|
-
"blocking",
|
|
154
|
-
"binds-loopback",
|
|
155
|
-
"opens-browser-by-default",
|
|
156
|
-
"no-push",
|
|
157
|
-
"writes-runtime-dir",
|
|
158
|
-
"writes-worktree",
|
|
159
|
-
"commits-by-default",
|
|
160
|
-
"writes-worktree-via-ui",
|
|
161
|
-
"commits-by-default-via-ui"
|
|
162
|
-
]
|
|
163
|
-
},
|
|
164
|
-
{
|
|
165
|
-
"path": [
|
|
166
|
-
"launch"
|
|
167
|
-
],
|
|
168
|
-
"usage": "xlmerge --repo <repo> launch [--path <file>] [--no-browser]",
|
|
169
|
-
"description": "准备冲突,在后台启动审阅界面并返回地址。",
|
|
170
|
-
"arguments": [],
|
|
171
|
-
"options": [
|
|
172
|
-
{
|
|
173
|
-
"flags": "--path <file>",
|
|
174
|
-
"description": "仅处理指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
175
|
-
},
|
|
176
|
-
{
|
|
177
|
-
"flags": "--no-browser",
|
|
178
|
-
"description": "启动服务但不打开浏览器。"
|
|
179
|
-
}
|
|
180
|
-
],
|
|
181
|
-
"output": {
|
|
182
|
-
"format": "json",
|
|
183
|
-
"description": "审阅模式返回 ok、pid、url、manifest 和日志路径;全量过滤时 url 为 null,autoResolved 和 steps 记录写回与提交。"
|
|
184
|
-
},
|
|
185
|
-
"exitCodes": {
|
|
186
|
-
"0": "成功。",
|
|
187
|
-
"1": "准备失败,或服务未在 15 秒内报告地址。",
|
|
188
|
-
"2": "用法错误。"
|
|
189
|
-
},
|
|
190
|
-
"safety": [
|
|
191
|
-
"starts-background-server",
|
|
192
|
-
"binds-loopback",
|
|
193
|
-
"opens-browser-by-default",
|
|
194
|
-
"no-push",
|
|
195
|
-
"writes-runtime-dir",
|
|
196
|
-
"writes-worktree",
|
|
197
|
-
"commits-by-default",
|
|
198
|
-
"writes-worktree-via-ui",
|
|
199
|
-
"commits-by-default-via-ui"
|
|
200
|
-
]
|
|
201
|
-
},
|
|
202
|
-
{
|
|
203
|
-
"path": [
|
|
204
|
-
"apply"
|
|
205
|
-
],
|
|
206
|
-
"usage": "xlmerge --repo <repo> apply --manifest <manifest.json> --decisions <decisions.json> [--no-commit] [--push] [--message <text>]",
|
|
207
|
-
"description": "按决策 JSON 写回,不启动界面。",
|
|
208
|
-
"arguments": [],
|
|
209
|
-
"options": [
|
|
210
|
-
{
|
|
211
|
-
"flags": "--manifest <file>",
|
|
212
|
-
"description": "prepare 生成的清单 JSON,必填。"
|
|
213
|
-
},
|
|
214
|
-
{
|
|
215
|
-
"flags": "--decisions <file>",
|
|
216
|
-
"description": "按逻辑 ID 指定文件、工作表、单元格、行列、重命名和宏选择的决策 JSON,必填。"
|
|
217
|
-
},
|
|
218
|
-
{
|
|
219
|
-
"flags": "--no-commit",
|
|
220
|
-
"description": "写回后不执行 git add/commit。"
|
|
221
|
-
},
|
|
222
|
-
{
|
|
223
|
-
"flags": "--push",
|
|
224
|
-
"description": "提交后推送,默认关闭。"
|
|
225
|
-
},
|
|
226
|
-
{
|
|
227
|
-
"flags": "--message <text>",
|
|
228
|
-
"description": "指定提交说明。"
|
|
229
|
-
}
|
|
230
|
-
],
|
|
231
|
-
"output": {
|
|
232
|
-
"format": "json",
|
|
233
|
-
"description": "返回 success 与写回文件、提交摘要。"
|
|
234
|
-
},
|
|
235
|
-
"exitCodes": {
|
|
236
|
-
"0": "成功,包含指定 --no-commit 的情况。",
|
|
237
|
-
"1": "决策无效、不完整或 Git/系统操作失败。",
|
|
238
|
-
"2": "用法错误。"
|
|
239
|
-
},
|
|
240
|
-
"safety": [
|
|
241
|
-
"writes-worktree",
|
|
242
|
-
"commits-by-default",
|
|
243
|
-
"pushes-only-with-flag"
|
|
244
|
-
]
|
|
245
|
-
},
|
|
246
|
-
{
|
|
247
|
-
"path": [
|
|
248
|
-
"status"
|
|
249
|
-
],
|
|
250
|
-
"usage": "xlmerge status --manifest <file>",
|
|
251
|
-
"description": "查询原审阅服务。",
|
|
252
|
-
"arguments": [],
|
|
253
|
-
"options": [
|
|
254
|
-
{
|
|
255
|
-
"flags": "--manifest <file>",
|
|
256
|
-
"description": "原审阅清单路径,必须与 session.json 身份一致。"
|
|
257
|
-
}
|
|
258
|
-
],
|
|
259
|
-
"output": {
|
|
260
|
-
"format": "json",
|
|
261
|
-
"description": "返回审阅身份、状态、完成回执及 stopConfirmed;unknown 不代表已停止。"
|
|
262
|
-
},
|
|
263
|
-
"exitCodes": {
|
|
264
|
-
"0": "查询或停止请求完成。",
|
|
265
|
-
"1": "身份、连接或状态不可确认。"
|
|
266
|
-
},
|
|
267
|
-
"safety": [
|
|
268
|
-
"read-only"
|
|
269
|
-
]
|
|
270
|
-
},
|
|
271
|
-
{
|
|
272
|
-
"path": [
|
|
273
|
-
"cancel"
|
|
274
|
-
],
|
|
275
|
-
"usage": "xlmerge cancel --manifest <file>",
|
|
276
|
-
"description": "请求停止原审阅服务并等待回执。",
|
|
277
|
-
"arguments": [],
|
|
278
|
-
"options": [
|
|
279
|
-
{
|
|
280
|
-
"flags": "--manifest <file>",
|
|
281
|
-
"description": "原审阅清单路径,必须与 session.json 身份一致。"
|
|
282
|
-
}
|
|
283
|
-
],
|
|
284
|
-
"output": {
|
|
285
|
-
"format": "json",
|
|
286
|
-
"description": "返回审阅身份、状态、完成回执及 stopConfirmed;unknown 不代表已停止。"
|
|
287
|
-
},
|
|
288
|
-
"exitCodes": {
|
|
289
|
-
"0": "查询或停止请求完成。",
|
|
290
|
-
"1": "身份、连接或状态不可确认。"
|
|
291
|
-
},
|
|
292
|
-
"safety": [
|
|
293
|
-
"binds-loopback",
|
|
294
|
-
"no-commit"
|
|
295
|
-
]
|
|
296
|
-
}
|
|
297
|
-
]
|
|
298
|
-
}
|
|
299
|
-
|
|
1
|
+
{
|
|
2
|
+
"schemaVersion": 1,
|
|
3
|
+
"package": "@kevlns/xlmerge",
|
|
4
|
+
"command": "xlmerge",
|
|
5
|
+
"bin": "xlmerge",
|
|
6
|
+
"description": "在浏览器中审阅 Git 冲突工作簿的三方差异,校验后写回并提交合并结果。",
|
|
7
|
+
"platforms": [
|
|
8
|
+
"darwin",
|
|
9
|
+
"linux",
|
|
10
|
+
"win32"
|
|
11
|
+
],
|
|
12
|
+
"runtime": {
|
|
13
|
+
"node": ">=16",
|
|
14
|
+
"python": ">=3.9",
|
|
15
|
+
"pythonDependencies": [
|
|
16
|
+
"openpyxl==3.1.5",
|
|
17
|
+
"bottle==0.13.4"
|
|
18
|
+
]
|
|
19
|
+
},
|
|
20
|
+
"environment": [
|
|
21
|
+
{
|
|
22
|
+
"name": "XLMERGE_PYTHON",
|
|
23
|
+
"description": "Python 解释器路径,优先于自动查找。"
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"name": "XLMERGE_VENV",
|
|
27
|
+
"description": "按需创建的用户虚拟环境目录,默认 ~/.xlmerge/venv。"
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"name": "XLMERGE_EXCEL_TIMEOUT_SECONDS",
|
|
31
|
+
"description": "Excel 隔离重算单个工作簿的硬超时,默认 120 秒。"
|
|
32
|
+
}
|
|
33
|
+
],
|
|
34
|
+
"agent": {
|
|
35
|
+
"whenToUse": "When a user asks to resolve Git merge conflicts in .xlsx/.xlsm planning or configuration tables (策划表/配置表冲突): run detect first; when reviewCount > 0 run launch and give the returned url to the user. Configured auto-theirs filters may resolve and commit matched generated workbooks without opening the UI. Do not inspect workbook cells or summarize diffs yourself; the resolver owns diff, choices, write-back and commit.",
|
|
36
|
+
"globalOptions": [
|
|
37
|
+
{
|
|
38
|
+
"flags": "--repo <path>",
|
|
39
|
+
"description": "Git 仓库目录,默认当前目录并向上查找仓库根。"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"flags": "--runtime-dir <dir>",
|
|
43
|
+
"description": "Git 三方工作簿与清单的暂存目录,默认系统临时目录,供 prepare、resolve、launch 使用。"
|
|
44
|
+
}
|
|
45
|
+
],
|
|
46
|
+
"commands": [
|
|
47
|
+
{
|
|
48
|
+
"path": [
|
|
49
|
+
"detect"
|
|
50
|
+
],
|
|
51
|
+
"usage": "xlmerge --repo <repo> detect",
|
|
52
|
+
"description": "列出仓库中未解决的 .xlsx/.xlsm 冲突。",
|
|
53
|
+
"arguments": [],
|
|
54
|
+
"options": [],
|
|
55
|
+
"output": {
|
|
56
|
+
"format": "json",
|
|
57
|
+
"description": "返回 ok、repo、count、reviewCount、autoTheirs 和 conflicts(path、stages)。"
|
|
58
|
+
},
|
|
59
|
+
"exitCodes": {
|
|
60
|
+
"0": "成功。",
|
|
61
|
+
"1": "执行失败,例如目标不是 Git 仓库。",
|
|
62
|
+
"2": "用法错误。"
|
|
63
|
+
},
|
|
64
|
+
"safety": [
|
|
65
|
+
"read-only",
|
|
66
|
+
"no-worktree-modification"
|
|
67
|
+
]
|
|
68
|
+
},
|
|
69
|
+
{
|
|
70
|
+
"path": [
|
|
71
|
+
"filter",
|
|
72
|
+
"add"
|
|
73
|
+
],
|
|
74
|
+
"usage": "xlmerge --repo <repo> filter add <path>",
|
|
75
|
+
"description": "添加不区分大小写的工作簿路径后缀过滤项;匹配文件逐字节采用 Git stage 3。",
|
|
76
|
+
"arguments": [
|
|
77
|
+
{
|
|
78
|
+
"name": "path",
|
|
79
|
+
"required": true,
|
|
80
|
+
"description": "需采用 Git stage 3 的 .xlsx/.xlsm 相对路径后缀。"
|
|
81
|
+
}
|
|
82
|
+
],
|
|
83
|
+
"options": [],
|
|
84
|
+
"output": {
|
|
85
|
+
"format": "json",
|
|
86
|
+
"description": "返回 ok、repo、config、filter、added 和完整 filters,写入 <repo>/.xlmerge.json。"
|
|
87
|
+
},
|
|
88
|
+
"exitCodes": {
|
|
89
|
+
"0": "成功,包含过滤项已存在的情况。",
|
|
90
|
+
"1": "仓库、过滤路径或 .xlmerge.json 无效。",
|
|
91
|
+
"2": "用法错误。"
|
|
92
|
+
},
|
|
93
|
+
"safety": [
|
|
94
|
+
"writes-worktree",
|
|
95
|
+
"no-commit"
|
|
96
|
+
]
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
"path": [
|
|
100
|
+
"prepare"
|
|
101
|
+
],
|
|
102
|
+
"usage": "xlmerge --repo <repo> prepare [--path <file>]",
|
|
103
|
+
"description": "生成按工作表组织的清单;命中整表过滤的文件跳过单元格分析。",
|
|
104
|
+
"arguments": [],
|
|
105
|
+
"options": [
|
|
106
|
+
{
|
|
107
|
+
"flags": "--path <file>",
|
|
108
|
+
"description": "仅准备指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
109
|
+
}
|
|
110
|
+
],
|
|
111
|
+
"output": {
|
|
112
|
+
"format": "json",
|
|
113
|
+
"description": "返回 ok 和清单 JSON 的绝对路径 manifest。"
|
|
114
|
+
},
|
|
115
|
+
"exitCodes": {
|
|
116
|
+
"0": "成功。",
|
|
117
|
+
"1": "无冲突、仓库无效或 Git 执行失败。",
|
|
118
|
+
"2": "用法错误。"
|
|
119
|
+
},
|
|
120
|
+
"safety": [
|
|
121
|
+
"writes-runtime-dir",
|
|
122
|
+
"no-worktree-modification",
|
|
123
|
+
"no-commit"
|
|
124
|
+
]
|
|
125
|
+
},
|
|
126
|
+
{
|
|
127
|
+
"path": [
|
|
128
|
+
"resolve"
|
|
129
|
+
],
|
|
130
|
+
"usage": "xlmerge --repo <repo> resolve [--path <file>] [--no-browser]",
|
|
131
|
+
"description": "准备冲突并以前台阻塞模式启动本地审阅界面。",
|
|
132
|
+
"arguments": [],
|
|
133
|
+
"options": [
|
|
134
|
+
{
|
|
135
|
+
"flags": "--path <file>",
|
|
136
|
+
"description": "仅处理指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
137
|
+
},
|
|
138
|
+
{
|
|
139
|
+
"flags": "--no-browser",
|
|
140
|
+
"description": "只输出地址,不打开浏览器。"
|
|
141
|
+
}
|
|
142
|
+
],
|
|
143
|
+
"output": {
|
|
144
|
+
"format": "stdout",
|
|
145
|
+
"description": "审阅模式输出 MERGE_SERVER_URL=http://127.0.0.1:<port>;全量命中过滤时直接写回 stage 3 并提交,返回 JSON。"
|
|
146
|
+
},
|
|
147
|
+
"exitCodes": {
|
|
148
|
+
"0": "已应用解决结果:自动完成或通过界面写回,随后关闭服务。",
|
|
149
|
+
"1": "准备失败,或应用解决结果前服务已停止。",
|
|
150
|
+
"2": "用法错误。"
|
|
151
|
+
},
|
|
152
|
+
"safety": [
|
|
153
|
+
"blocking",
|
|
154
|
+
"binds-loopback",
|
|
155
|
+
"opens-browser-by-default",
|
|
156
|
+
"no-push",
|
|
157
|
+
"writes-runtime-dir",
|
|
158
|
+
"writes-worktree",
|
|
159
|
+
"commits-by-default",
|
|
160
|
+
"writes-worktree-via-ui",
|
|
161
|
+
"commits-by-default-via-ui"
|
|
162
|
+
]
|
|
163
|
+
},
|
|
164
|
+
{
|
|
165
|
+
"path": [
|
|
166
|
+
"launch"
|
|
167
|
+
],
|
|
168
|
+
"usage": "xlmerge --repo <repo> launch [--path <file>] [--no-browser]",
|
|
169
|
+
"description": "准备冲突,在后台启动审阅界面并返回地址。",
|
|
170
|
+
"arguments": [],
|
|
171
|
+
"options": [
|
|
172
|
+
{
|
|
173
|
+
"flags": "--path <file>",
|
|
174
|
+
"description": "仅处理指定仓库相对路径的 .xlsx/.xlsm 文件。"
|
|
175
|
+
},
|
|
176
|
+
{
|
|
177
|
+
"flags": "--no-browser",
|
|
178
|
+
"description": "启动服务但不打开浏览器。"
|
|
179
|
+
}
|
|
180
|
+
],
|
|
181
|
+
"output": {
|
|
182
|
+
"format": "json",
|
|
183
|
+
"description": "审阅模式返回 ok、pid、url、manifest 和日志路径;全量过滤时 url 为 null,autoResolved 和 steps 记录写回与提交。"
|
|
184
|
+
},
|
|
185
|
+
"exitCodes": {
|
|
186
|
+
"0": "成功。",
|
|
187
|
+
"1": "准备失败,或服务未在 15 秒内报告地址。",
|
|
188
|
+
"2": "用法错误。"
|
|
189
|
+
},
|
|
190
|
+
"safety": [
|
|
191
|
+
"starts-background-server",
|
|
192
|
+
"binds-loopback",
|
|
193
|
+
"opens-browser-by-default",
|
|
194
|
+
"no-push",
|
|
195
|
+
"writes-runtime-dir",
|
|
196
|
+
"writes-worktree",
|
|
197
|
+
"commits-by-default",
|
|
198
|
+
"writes-worktree-via-ui",
|
|
199
|
+
"commits-by-default-via-ui"
|
|
200
|
+
]
|
|
201
|
+
},
|
|
202
|
+
{
|
|
203
|
+
"path": [
|
|
204
|
+
"apply"
|
|
205
|
+
],
|
|
206
|
+
"usage": "xlmerge --repo <repo> apply --manifest <manifest.json> --decisions <decisions.json> [--no-commit] [--push] [--message <text>]",
|
|
207
|
+
"description": "按决策 JSON 写回,不启动界面。",
|
|
208
|
+
"arguments": [],
|
|
209
|
+
"options": [
|
|
210
|
+
{
|
|
211
|
+
"flags": "--manifest <file>",
|
|
212
|
+
"description": "prepare 生成的清单 JSON,必填。"
|
|
213
|
+
},
|
|
214
|
+
{
|
|
215
|
+
"flags": "--decisions <file>",
|
|
216
|
+
"description": "按逻辑 ID 指定文件、工作表、单元格、行列、重命名和宏选择的决策 JSON,必填。"
|
|
217
|
+
},
|
|
218
|
+
{
|
|
219
|
+
"flags": "--no-commit",
|
|
220
|
+
"description": "写回后不执行 git add/commit。"
|
|
221
|
+
},
|
|
222
|
+
{
|
|
223
|
+
"flags": "--push",
|
|
224
|
+
"description": "提交后推送,默认关闭。"
|
|
225
|
+
},
|
|
226
|
+
{
|
|
227
|
+
"flags": "--message <text>",
|
|
228
|
+
"description": "指定提交说明。"
|
|
229
|
+
}
|
|
230
|
+
],
|
|
231
|
+
"output": {
|
|
232
|
+
"format": "json",
|
|
233
|
+
"description": "返回 success 与写回文件、提交摘要。"
|
|
234
|
+
},
|
|
235
|
+
"exitCodes": {
|
|
236
|
+
"0": "成功,包含指定 --no-commit 的情况。",
|
|
237
|
+
"1": "决策无效、不完整或 Git/系统操作失败。",
|
|
238
|
+
"2": "用法错误。"
|
|
239
|
+
},
|
|
240
|
+
"safety": [
|
|
241
|
+
"writes-worktree",
|
|
242
|
+
"commits-by-default",
|
|
243
|
+
"pushes-only-with-flag"
|
|
244
|
+
]
|
|
245
|
+
},
|
|
246
|
+
{
|
|
247
|
+
"path": [
|
|
248
|
+
"status"
|
|
249
|
+
],
|
|
250
|
+
"usage": "xlmerge status --manifest <file>",
|
|
251
|
+
"description": "查询原审阅服务。",
|
|
252
|
+
"arguments": [],
|
|
253
|
+
"options": [
|
|
254
|
+
{
|
|
255
|
+
"flags": "--manifest <file>",
|
|
256
|
+
"description": "原审阅清单路径,必须与 session.json 身份一致。"
|
|
257
|
+
}
|
|
258
|
+
],
|
|
259
|
+
"output": {
|
|
260
|
+
"format": "json",
|
|
261
|
+
"description": "返回审阅身份、状态、完成回执及 stopConfirmed;unknown 不代表已停止。"
|
|
262
|
+
},
|
|
263
|
+
"exitCodes": {
|
|
264
|
+
"0": "查询或停止请求完成。",
|
|
265
|
+
"1": "身份、连接或状态不可确认。"
|
|
266
|
+
},
|
|
267
|
+
"safety": [
|
|
268
|
+
"read-only"
|
|
269
|
+
]
|
|
270
|
+
},
|
|
271
|
+
{
|
|
272
|
+
"path": [
|
|
273
|
+
"cancel"
|
|
274
|
+
],
|
|
275
|
+
"usage": "xlmerge cancel --manifest <file>",
|
|
276
|
+
"description": "请求停止原审阅服务并等待回执。",
|
|
277
|
+
"arguments": [],
|
|
278
|
+
"options": [
|
|
279
|
+
{
|
|
280
|
+
"flags": "--manifest <file>",
|
|
281
|
+
"description": "原审阅清单路径,必须与 session.json 身份一致。"
|
|
282
|
+
}
|
|
283
|
+
],
|
|
284
|
+
"output": {
|
|
285
|
+
"format": "json",
|
|
286
|
+
"description": "返回审阅身份、状态、完成回执及 stopConfirmed;unknown 不代表已停止。"
|
|
287
|
+
},
|
|
288
|
+
"exitCodes": {
|
|
289
|
+
"0": "查询或停止请求完成。",
|
|
290
|
+
"1": "身份、连接或状态不可确认。"
|
|
291
|
+
},
|
|
292
|
+
"safety": [
|
|
293
|
+
"binds-loopback",
|
|
294
|
+
"no-commit"
|
|
295
|
+
]
|
|
296
|
+
}
|
|
297
|
+
]
|
|
298
|
+
},
|
|
299
|
+
"skills": [
|
|
300
|
+
{
|
|
301
|
+
"id": "xlmerge",
|
|
302
|
+
"path": "skills/xlmerge/SKILL.md"
|
|
303
|
+
}
|
|
304
|
+
]
|
|
305
|
+
}
|