@kevlns/xlmerge 1.2.1-beta.1 → 1.2.1-beta.3

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 CHANGED
@@ -70,9 +70,12 @@ decisions.json 格式(Cell 用 manifest 中的稳定逻辑 ID,如 `row:base:
70
70
  ## 开发与测试
71
71
 
72
72
  ```bash
73
- # 单元测试(63 个,覆盖引擎与解析器全流程)
73
+ # 单元测试(72 个,覆盖引擎与解析器全流程)
74
74
  python -m unittest discover -s python/tests -v
75
75
 
76
+ # 校验 v-cli.plugin.json 与 CLI 解析器未漂移(命令/选项/副作用覆盖)
77
+ npm run check:manifest
78
+
76
79
  # 端到端(构造真实冲突仓库 -> detect -> launch -> API 决策 -> 写回提交)
77
80
  python e2e_test.py bin/xlmerge.js node
78
81
 
@@ -85,11 +88,12 @@ npm pack
85
88
  ```
86
89
  bin/xlmerge.js # Node 启动垫片:探测 Python、按需建 venv、透传参数
87
90
  skill/SKILL.md # Agent Skill 文档
91
+ v-cli.plugin.json # Agent 插件清单(命令/选项/副作用),与 CLI 解析器做漂移校验
88
92
  python/
89
93
  ├── xlsx_merge_engine/ # 三方结构化差异引擎(可独立 CLI 调试)
90
94
  │ └── xlsx_git_merge_bridge.py
91
95
  ├── xlsx_resolver/ # 冲突解析器(detect/prepare/launch/apply + bottle UI)
92
- └── tests/ # 引擎与解析器测试
96
+ └── tests/ # 引擎与解析器测试(不随 npm 包发布)
93
97
  ```
94
98
 
95
99
  > 注:为兼容嵌入式 Python 发行版(`._pth` 忽略 `PYTHONPATH`),模块内使用包内自举的 `sys.path` 注入而非纯包导入;这是有意为之。
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kevlns/xlmerge",
3
- "version": "1.2.1-beta.1",
3
+ "version": "1.2.1-beta.3",
4
4
  "description": "Visual resolver for unresolved Git merge conflicts in .xlsx/.xlsm workbooks: three-way sheet/row/cell diff, local UI, write-back and commit.",
5
5
  "bin": {
6
6
  "xlmerge": "bin/xlmerge.js"
@@ -9,11 +9,16 @@
9
9
  "bin/",
10
10
  "skill/",
11
11
  "python/xlsx_merge_engine/",
12
- "python/xlsx_resolver/"
12
+ "python/xlsx_resolver/",
13
+ "v-cli.plugin.json"
13
14
  ],
15
+ "vCli": {
16
+ "manifest": "v-cli.plugin.json"
17
+ },
14
18
  "scripts": {
15
19
  "test": "node bin/xlmerge.js --selfcheck",
16
- "test:python": "python -m unittest discover -s python/tests -v"
20
+ "test:python": "python -m unittest discover -s python/tests -v",
21
+ "check:manifest": "python -m unittest discover -s python/tests -p test_v_cli_plugin_manifest.py -v"
17
22
  },
18
23
  "repository": {
19
24
  "type": "git",