ht32-code-mcp 0.3.0__tar.gz → 0.3.2__tar.gz

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ht32-code-mcp
-Version: 0.3.0
+Version: 0.3.2
 Summary: HT32 Code MCP Server - 为 AI Agent 提供 HT32 函数库/例程/模板检索与工程导出
 License-Expression: MIT
 Keywords: firmware,holtek,ht32,mcp,mcu

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ht32-code-mcp"
-version = "0.3.0"
+version = "0.3.2"
 description = "HT32 Code MCP Server - 为 AI Agent 提供 HT32 函数库/例程/模板检索与工程导出"
 requires-python = ">=3.11"
 license = "MIT"

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/src/ht32_code_mcp/materializer.py

@@ -20,6 +20,7 @@ import os
 import re
 import shutil
 import tempfile
+import threading
 import time
 import zipfile
 from pathlib import Path
@@ -381,6 +382,10 @@ class Materializer:
         self.raw = self.root / "raw"
         self.recipes = load_recipes(recipes_dir)
         self.recipes["__dir__"] = recipes_dir  # resolve() 需要定位 adapter
+        # 单次调用的中间状态必须放 thread-local：物化器是进程级单例，
+        # 并发导出（MCP 工具在线程池里执行）会互相覆盖 _stage / _project_rel，
+        # 导致 "…is not in the subpath of…" 之类的相对路径串台错误。
+        self._local = threading.local()
 
     def resolve(self, *, config_id: str = "", chip: str = "", device: str = "",
                 board: str = "", variant: str = "", clock_profile: str = "",
@@ -434,7 +439,7 @@ class Materializer:
             target.parent.mkdir(parents=True, exist_ok=True)
             shutil.copyfile(p, target)
             manifest_files.append(dict(
-                path=(dst.relative_to(self._stage) / rel).as_posix(), bytes=p.stat().st_size,
+                path=(dst.relative_to(self._local.stage) / rel).as_posix(), bytes=p.stat().st_size,
                 sha256=sha256_file(p), classification="official",
                 origin=f"{pkg_name}/{src.relative_to(self.raw / pkg_name).as_posix()}/{rel}"))
 
@@ -456,7 +461,7 @@ class Materializer:
         # staging：与目标同文件系统的临时目录（保证原子重命名）
         out.parent.mkdir(parents=True, exist_ok=True)
         stage = Path(tempfile.mkdtemp(prefix=f".ht32-stage-{stem}-", dir=str(out.parent)))
-        self._stage = stage
+        self._local.stage = stage
         manifest_files: list[dict] = []
         deviations: list[dict] = []
         try:
@@ -497,7 +502,7 @@ class Materializer:
                     shutil.rmtree(stage, ignore_errors=True)
                 except BaseException:  # noqa: BLE001 - best-effort cleanup
                     pass
-        return MaterialResult(out_dir=out, project_file=self._project_rel,
+        return MaterialResult(out_dir=out, project_file=self._local.project_rel,
                               files=len(manifest_files), bytes=total_bytes,
                               sha256=tree_hash, manifest_dir="manifest",
                               warnings=r.warnings, deviations=deviations)
@@ -509,7 +514,7 @@ class Materializer:
         cfg = r.config
         origin = cfg["origin"]
         pkg = self.raw / origin["package"]
-        self._stage = stage
+        self._local.stage = stage
 
         # 1) library：完整官方树（complete-official-tree）
         lib_src = pkg / ("libraries" if kernel == "m4" else "library")
@@ -618,9 +623,9 @@ class Materializer:
         proj_dir = stage / "project" / "MDK_ARMv5"
         proj_dir.mkdir(parents=True, exist_ok=True)
         uvprojx = self._materialize_uvprojx(r, proj_dir, stem, kernel, board_dir, deviations)
-        self._project_rel = uvprojx.relative_to(stage).as_posix()
+        self._local.project_rel = uvprojx.relative_to(stage).as_posix()
         uv_data = uvprojx.read_bytes()
-        manifest_files.append(dict(path=self._project_rel, bytes=len(uv_data),
+        manifest_files.append(dict(path=self._local.project_rel, bytes=len(uv_data),
                                    sha256=sha256_bytes(uv_data),
                                    classification="materialized-project",
                                    origin=f"{origin['package']}/{origin['project']}"))
@@ -714,18 +719,24 @@ class Materializer:
             text = text.replace("<umfTarg>0</umfTarg>", "<umfTarg>1</umfTarg>", 1)
             edits.append("umfTarg 0->1 (Use Memory Layout from Target Dialog)")
         # FlashDriverDll：-FL 与裁决容量一致（官方逐 IC 值优先；仅裁决覆盖时改写）
+        # 注意 UL2CM3 参数是**按算法块分块**的：
+        #   UL2CM3(... -FF0HT32F -FS00 -FL<主 Flash 容量> -FF1HT32F_OPT -FS11FF00000 -FL<OPT 区长度>)
+        # 裁决容量只属于 block 0（主 Flash）；block 1 是 Option Bytes 区（另一基址/另一长度），
+        # 改写它会把 OPT 区长度错写成主 Flash 大小。故 count=1 只改首个 -FL。
         if origin["kind"] == "official-per-ic-project":
             m = re.search(r"(<FlashDriverDll>)(.*?)(</FlashDriverDll>)", text, re.S)
             if m and "-FL" in m.group(2):
                 fdd = m.group(2)
                 fl = re.search(r"-FL([0-9A-Fa-f]+)", fdd)
                 if fl and int(fl.group(1), 16) != flash_size:
-                    new_fdd, n = re.subn(r"-FL[0-9A-Fa-f]+", f"-FL{flash_size:X}", fdd)
+                    new_fdd, n = re.subn(r"-FL[0-9A-Fa-f]+", f"-FL{flash_size:X}", fdd,
+                                         count=1)
                     if n != 1:
-                        raise ContractError(RECIPE_MISMATCH, f"{what}: FlashDriverDll -FL 命中异常")
+                        raise ContractError(RECIPE_MISMATCH,
+                                            f"{what}: FlashDriverDll -FL 命中异常")
                     text = text[:m.start()] + m.group(1) + new_fdd + m.group(3) + text[m.end():]
                     edits.append(f"FlashDriverDll -FL{fl.group(1)} -> -FL{flash_size:X} "
-                                 f"(LIBCFG adjudication)")
+                                 f"(LIBCFG adjudication, main alg block only)")
         # d) dfp-derived：Define/RegisterFile/SFDFile 的器件宏替换
         if origin["kind"] == "dfp-derived":
             base_dev = orig_device
@@ -825,7 +836,7 @@ class Materializer:
         (mdir / "validation.json").write_text(json.dumps({
             "layers": validation,
             "gate_rule": "gui/hardware 未验证项以 not-tested 明示，不得宣称已验证",
-            "compile_command": f'UV4 -b "{self._project_rel}" -j0 -o build.log',
+            "compile_command": f'UV4 -b "{self._local.project_rel}" -j0 -o build.log',
         }, ensure_ascii=False, indent=1), encoding="utf-8")
 
     def _readme(self, r: Resolved, stem: str) -> str:
@@ -841,14 +852,16 @@ class Materializer:
             "",
             "## 前置条件",
             "",
-            f"- Keil MDK-ARM 5.x（AC5；本地以 ARMCC V5.06 update 4/7 实测）",
+            f"- Keil MDK-ARM 5.x，编译器 **AC5（armcc）**（本地以 ARMCC V5.06 update 4/7 实测）"
+            f"——**本工程暂不支持 AC6（armclang）**，请在 Options for Target → Target 保持"
+            f"编译器版本为 AC5；切到 AC6 可能在编译/链接阶段报错",
             f"- {r.recipe['pack']['device_macro_note']}（manifest 锁定 "
             f"`{r.recipe['pack']['id']}`）",
             "",
             "## 打开与编译",
             "",
-            f"- 打开 `{self._project_rel}`（Target：`{stem}`）",
-            f"- 命令行基线编译：`UV4 -b \"{self._project_rel}\" -j0 -o build.log`",
+            f"- 打开 `{self._local.project_rel}`（Target：`{stem}`）",
+            f"- 命令行基线编译：`UV4 -b \"{self._local.project_rel}\" -j0 -o build.log`",
         ]
         if r.series == "ht32f5":
             lines.append("- 调试：工程自带受控 `.uvoptx`（CMSIS-DAP + Reset and Run 配置；"

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/src/ht32_code_mcp/server.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import os
 import sys
+import time
 from importlib.metadata import PackageNotFoundError, version as pkg_version
 from pathlib import Path
 from typing import Literal
@@ -43,6 +44,11 @@ BUNDLE_BASE_URL = os.environ.get("BUNDLE_BASE_URL", "").strip()
 BUNDLE_TTL = _env_int("BUNDLE_TTL_SECONDS", DEFAULT_BUNDLE_TTL)
 CLOUD_BUNDLE = bool(BUNDLE_DIR and BUNDLE_BASE_URL)
 
+
+def _fmt_time(ts: float) -> str:
+    """epoch 秒 → 本地时间字符串（用于云端 zip 下载的有效期提示）。"""
+    return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(ts))
+
 # 反馈与用量日志：FEEDBACK_ROOT（宿主机挂载的可写卷，与 wiki 同一套约定）
 # 下按服务名分子目录，本服务写 <FEEDBACK_ROOT>/code/。
 # 为空则整体关闭——本地开发默认不落盘。注意：日志含 query 原文，勿提交进仓库。

ht32_code_mcp-0.3.2/tests/test_export_cloud_mode.py

@@ -0,0 +1,47 @@
+"""回归测试：线上实测暴露的两个导出缺陷。
+
+1) 云端 zip 模式下响应格式化用了未定义的 `_fmt_time` → 线上 `export_project_bundle`
+   100% 失败（本地模式与直接调 `exporter.export_zip` 都覆盖不到这行）。
+2) 物化器的单次调用状态（`_stage` / `_project_rel`）曾挂在进程级单例实例上，
+   并发导出互相覆盖 → "…is not in the subpath of…" 串台错误。
+"""
+from __future__ import annotations
+
+import concurrent.futures
+
+from ht32_code_mcp import server as srv
+
+CFG_F52352 = "ht32f52352.ht32f52352-sk.ac5.hsi-safe.retarget"
+CFG_F50241 = "ht32f50241.ht32f50241-sk.ac5.hsi-safe.retarget"
+CFG_L52241 = "ht32l52241.ht32l52241-sk.ac5.hsi-safe.retarget"
+
+
+def test_cloud_zip_response_formats_expiry(tmp_path, monkeypatch):
+    """云端模式必须能给出下载 URL 与有效期（不得因未定义的 helper 直接抛 NameError）。"""
+    monkeypatch.setattr(srv, "CLOUD_BUNDLE", True)
+    monkeypatch.setattr(srv, "BUNDLE_DIR", str(tmp_path / "bundles"))
+    monkeypatch.setattr(srv, "BUNDLE_BASE_URL", "http://example.test/ht32-bundles")
+    text = srv.export_project_bundle(config_id=CFG_F52352, project_name="CloudMode")
+    assert "导出失败" not in text, text
+    assert "下载 URL" in text and "http://example.test/ht32-bundles/" in text
+    assert "有效期" in text
+    assert list(tmp_path.joinpath("bundles").glob("*.zip")), "未生成 zip 产物"
+
+
+def test_concurrent_exports_do_not_cross_talk(tmp_path):
+    """并发导出必须各自落到自己的目录（不得因共享实例状态串台）。"""
+    jobs = [(CFG_F50241, "ConcA"), (CFG_L52241, "ConcB")]
+
+    def run(item):
+        idx, (cid, name) = item
+        return srv.export_project_bundle(
+            config_id=cid, project_name=name, out_dir=str(tmp_path / f"out{idx}"))
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=2) as pool:
+        texts = list(pool.map(run, enumerate(jobs)))
+
+    for text, (_, name) in zip(texts, jobs):
+        assert "导出失败" not in text, text
+    for idx, (_, name) in enumerate(jobs):
+        proj = tmp_path / f"out{idx}" / "project" / "MDK_ARMv5" / f"{name}.uvprojx"
+        assert proj.is_file(), f"并发导出产物缺失：{proj}"

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/tests/test_tools.py

@@ -275,7 +275,10 @@ def _bundle_checks_v2(out_dir: Path, device: str, config_id: str = ""):
     # 模板自用文件不进用户工程；README 属于用户工程
     assert not (out_dir / "devices.json").exists()
     assert not (out_dir / "TEMPLATE.md").exists()
-    assert (out_dir / "README.md").read_text(encoding="utf-8").startswith(f"# {device}")
+    readme = (out_dir / "README.md").read_text(encoding="utf-8")
+    assert readme.startswith(f"# {device}")
+    # 工具链声明必须随产物交付（仅 AC5；AC6 暂不支持）
+    assert "AC5" in readme and "不支持 AC6" in readme, "导出 README 未声明仅支持 AC5"
     # 完整官方库（自包含） + 文件清单逐条登记
     files = json.loads((mdir / "files.json").read_text(encoding="utf-8"))
     registered = {f["path"] for f in files["files"]}

{ht32_code_mcp-0.3.0 → ht32_code_mcp-0.3.2}/uv.lock

@@ -440,7 +440,7 @@ wheels = [
 
 [[package]]
 name = "ht32-code-mcp"
-version = "0.3.0"
+version = "0.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "fastmcp" },