dsh-plugin-pscad-expert-vyma 1.0.11 → 1.0.12

package/README.md

@@ -1,6 +1,6 @@
 # pscad-dsh-plugin — PSCAD 自动化建模与仿真控制专家插件
 
-> **版本**：1.0.11 ｜ **注册名**：`pscad-automation-expert`
+> **版本**：1.0.12 ｜ **注册名**：`pscad-automation-expert`
 > **来源**：PSCAD 知识资产固化项目（四阶段：技能文档 → 模板索引 → 工具库 → 插件打包）
 > 所有知识、工具、模板均来自真实仿真验证（L13~L19 认证轮 + R4 科研轮），**无伪造数据**。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-pscad-expert-vyma",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "PSCAD 自动化建模与仿真控制专家插件（DSH Agent 工具库 + 基准模板 + 领域知识）",
   "type": "module",
   "main": "index.js",

package/plugin.yaml

@@ -3,7 +3,7 @@
 # 由知识资产固化项目自动生成（2026-08-25）· 部署至 Git 仓库
 # ============================================================
 name: pscad-automation-expert
-version: 1.0.11
+version: 1.0.12
 description: PSCAD 自动化建模与仿真控制专家插件
 
 # ---- 系统提示词（加载到 Agent 上下文最前置位置）----

package/tools/main.py

@@ -522,6 +522,57 @@ def _gen_name(comp_type: str) -> str:
 # ---------------------------------------------------------------------------
 # 工具集 1：连接与工程加载（懒加载 mhi）
 # ---------------------------------------------------------------------------
+def _persist_case(prj: Any, project_name: str, folder: str) -> Optional[str]:
+    """尽力把会话内新建工程落盘，返回实际 .pscx 路径；找不到返回 None。
+
+    mhi-pscad 2.9.7 的 create_case(project_name, folder=...) 与 save() 都可能
+    不按 folder 写 .pscx（工程仅在 PSCAD 会话内存）。依次尝试：
+    ① save/save_as/save_case 变体；② prj 路径属性；③ 候选目录全盘搜同名文件。
+    """
+    expected = os.path.join(folder, project_name + '.pscx')
+    try:
+        # ① 常见保存 API
+        for meth, args in (('save', ()), ('save_as', (expected,)),
+                           ('save_case', (expected,))):
+            try:
+                fn = getattr(prj, meth)
+                fn(*args)
+            except Exception:
+                continue
+            if os.path.isfile(expected):
+                return expected
+        # ② prj 自带路径属性
+        for attr in ('path', 'filename', 'file_name', 'case_path',
+                     'project_path'):
+            try:
+                p = getattr(prj, attr)
+                if callable(p):
+                    p = p()
+                if isinstance(p, str) and p.lower().endswith('.pscx') \
+                        and os.path.isfile(p):
+                    return p
+            except Exception:
+                continue
+        # ③ 候选目录搜最近生成的同名文件
+        import glob as _glob
+        bases = [folder, os.getcwd(), os.path.expanduser('~/Documents'),
+                 os.path.expanduser('~/PSCAD')]
+        best = None
+        for base in bases:
+            try:
+                hits = _glob.glob(os.path.join(base, '**',
+                                               project_name + '.pscx'),
+                                  recursive=True)
+            except Exception:
+                hits = []
+            for h in hits:
+                if best is None or os.path.getmtime(h) > os.path.getmtime(best):
+                    best = h
+        return best
+    except Exception:
+        return None
+
+
 def connect_and_load_project(project_name: str,
                              folder: Optional[str] = None,
                              create_if_missing: bool = False,
@@ -558,6 +609,7 @@ def connect_and_load_project(project_name: str,
 
         folder = folder or (DEFAULT_FOLDER or os.getcwd())
         _prj_folder = folder
+        pscx_path: Optional[str] = None  # 实际落盘的 .pscx 路径（探测后回报）
 
         prj = None
         try:
@@ -571,19 +623,23 @@ def connect_and_load_project(project_name: str,
                 try:
                     _pscad.load(pscx.replace('\\', '/'))
                     prj = _pscad.project(project_name)
+                    pscx_path = pscx
                 except Exception as exc:
                     return _err('加载 %s 失败: %s' % (pscx, exc))
 
         if prj is None and create_if_missing:
             try:
-                _pscad.create_case(project_name, folder=folder)
-                prj = _pscad.project(project_name)
-                # mhi 2.9.7 的 create_case 可能只在 PSCAD 会话内存建工程、不落盘
-                # （与 2.2.1 语义差异）；显式 save() 保证 folder 下生成 .pscx
+                # 目录不存在可能导致 create_case 静默不落盘：先确保目标目录存在
                 try:
-                    prj.save()
+                    os.makedirs(folder, exist_ok=True)
                 except Exception:
                     pass
+                _pscad.create_case(project_name, folder=folder)
+                prj = _pscad.project(project_name)
+                pscx_path = _persist_case(prj, project_name, folder)
+                if pscx_path:
+                    folder = os.path.dirname(pscx_path)  # 会话状态跟随真实落盘目录
+                    _prj_folder = folder
             except Exception as exc:
                 return _err('create_case 失败: %s' % exc)
 
@@ -599,7 +655,13 @@ def connect_and_load_project(project_name: str,
         except Exception as exc:
             _main = None
             return _err('打开 Main 画布失败: %s' % exc)
-        return _ok({'project': project_name, 'canvas': 'Main'})
+        result = {'project': project_name, 'canvas': 'Main',
+                  'pscx_path': pscx_path}
+        if create_if_missing and not pscx_path:
+            result['warning'] = ('create_case 未能在磁盘找到 .pscx（mhi 2.9.7 可能仅'
+                                 '内存建工程）：工程仅存在于当前 PSCAD 会话，退出即丢；'
+                                 '建议改用已有模板 .pscx 加载，或提供可写目录。')
+        return _ok(result)
     except Exception as exc:
         return _err(exc)