@tanskong/office-assistant 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -0,0 +1,26 @@
+# 版本历史
+
+## 1.0.8 - 2026-05-31
+
+### 修复
+- 修复 Word 自动化完全失效问题（app.Selection null 检查）
+- 修复 PowerPoint 无幻灯片时崩溃问题（doc.Slides.Count 检查）
+- 修复 save_file 遍历逻辑错误，添加 app_name 参数支持指定保存目标
+- 修复中文路径不兼容问题，使用 win32api.GetShortPathName 转换
+- 为 run_python 添加 finally 保护，确保 stdout 正确恢复
+- 修复未知扩展名默认用 Excel 打开的问题
+- 为 screenshot_element 添加返回值校验
+- 为全局初始化添加异常捕获
+- 为所有 UIA 工具添加模块可用性检查
+
+### 优化
+- 精简 UIA 工具，删除不适合日常办公的工具：
+  - screenshot_element
+  - find_ui_element
+  - get_ui_tree
+  - click_ui_element
+- 保留核心 UIA 工具：
+  - screenshot（截图）
+  - get_window_list（窗口列表）
+  - activate_window（激活窗口）
+- 更新 README，反映最新功能状态

package/README.md

@@ -7,8 +7,9 @@
 - **RunPython 主力工具**：自由执行 Python 代码控制 Office 应用程序
 - **智能工作区**：桌面文件夹安全处理文件
 - **全 Office 套件支持**：Excel、Word、PowerPoint、Outlook、Visio、WPS 等
-- **UI 自动化引擎**：基于 Windows UI Automation 框架的精准截图与控件操作
+- **UI 自动化引擎**：基于 Windows UI Automation 框架的精准截图与窗口管理
 - **许可证保护**：机器绑定的许可证激活机制
+- **中文路径支持**：完美解决中文文件路径问题
 
 ## 安装
 
@@ -48,18 +49,14 @@ npx @tanskong/office-assistant
 | `available_apps` | 列出已安装的 Office 应用程序 |
 | `launch_app` | 启动 Office 应用程序 |
 | `quit_app` | 退出 Office 应用程序 |
-| `open_file` | 打开 Office 文件 |
-| `save_file` | 保存当前文档 |
+| `open_file` | 打开 Office 文件（支持中文路径） |
+| `save_file` | 保存当前文档（可指定应用） |
 
 ### UIA 自动化工具
 
 | 工具 | 说明 |
 |------|------|
 | `screenshot` | 精准截图（全屏/活动窗口/指定窗口） |
-| `screenshot_element` | 截取指定 UI 元素的截图 |
-| `find_ui_element` | 查找 UI 元素并返回属性信息 |
-| `get_ui_tree` | 获取窗口的 UI 树结构 |
-| `click_ui_element` | 点击指定 UI 元素 |
 | `get_window_list` | 列出所有顶层窗口 |
 | `activate_window` | 激活指定窗口 |
 
@@ -81,9 +78,6 @@ screenshot('active')
 
 # 截取指定窗口
 screenshot('Excel')
-
-# 截取 UI 元素
-screenshot_element('Calculate', 'Button', 'Calculator')
 ```
 
 ## 许可证

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanskong/office-assistant",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "Office Assistant - AI-powered Office automation via MCP protocol with license protection",
   "main": "bin/office-assistant.js",
   "bin": {
@@ -39,6 +39,7 @@
     "bin/",
     "src/",
     "README.md",
+    "CHANGELOG.md",
     "requirements.txt"
   ],
   "repository": {

package/src/officer.py

@@ -29,7 +29,7 @@ class TheOfficer:
 
         # 使用用户目录，避免硬编码 D 盘
         self._default_folder = os.path.join(os.path.expanduser("~"), "OfficeMCP_Data")
-        self.Version = "1.0.5"
+        self.Version = "1.0.8"
         self.ComObjects = {}
         self._printable = False
         self.Data = OfficerData()
@@ -229,30 +229,38 @@ class TheOfficer:
         return "Demo succeeded"
 
     def DemonstrateExcel(self) -> bool:
-        excel = self.Excel
-        if excel is None:
+        try:
+            excel = self.Application("Excel", asNewInstance=True)
+            if excel is None:
+                return False
+            book = excel.Workbooks.Add()
+            sheet = excel.ActiveSheet
+            excel.Visible = True
+            sheet.Cells(1, 1).Value = "Hello, World From Office Assistant!"
+            sheet.Cells(1, 1).Font.Size = 20
+            sheet.Cells(1, 1).Font.Bold = True
+            sheet.Cells(2, 1).Value = "This is a demonstration of the Office Assistant server."
+            sheet.Cells(3, 1).Value = "You can use run_python tool to control all Microsoft Office Applications."
+            return True
+        except Exception as e:
+            print(f"DemonstrateExcel error: {e}")
             return False
-        book = excel.Workbooks.Add()
-        sheet = excel.ActiveSheet
-        excel.Visible = True
-        sheet.Cells(1, 1).Value = "Hello, World From Office Assistant!"
-        sheet.Cells(1, 1).Font.Size = 20
-        sheet.Cells(1, 1).Font.Bold = True
-        sheet.Cells(2, 1).Value = "This is a demonstration of the Office Assistant server."
-        sheet.Cells(3, 1).Value = "You can use run_python tool to control all Microsoft Office Applications."
-        return True
 
     def DemonstratePowerPoint(self) -> bool:
-        ppt = self.Application("PowerPoint")
-        if ppt is None:
+        try:
+            ppt = self.Application("PowerPoint", asNewInstance=True)
+            if ppt is None:
+                return False
+            ppt.Visible = True
+            presentation = ppt.Presentations.Add()
+            slide = presentation.Slides.Add(1, 12)
+            shape = slide.Shapes.AddTextbox(1, 100, 20, 800, 100)
+            shape.TextFrame.TextRange.Text = "Hello, World From Office Assistant!"
+            shape.TextFrame.TextRange.Font.Bold = True
+            return True
+        except Exception as e:
+            print(f"DemonstratePowerPoint error: {e}")
             return False
-        ppt.Visible = True
-        presentation = ppt.Presentations.Add()
-        slide = presentation.Slides.Add(1, 12)
-        shape = slide.Shapes.AddTextbox(1, 100, 20, 800, 100)
-        shape.TextFrame.TextRange.Text = "Hello, World From Office Assistant!"
-        shape.TextFrame.TextRange.Font.Bold = True
-        return True
 
     def FilePath(self, file_name: str = None, subfolder: str = None) -> str:
         # 优先使用智能办公区路径

package/src/server.py

@@ -13,12 +13,19 @@ import sys
 import os
 from io import StringIO
 
-from license_manager import verify_license
-verify_license()
-
-from fastmcp import FastMCP
-from officer import TheOfficer
-from utils import get_workspace, get_data_dir, get_export_dir, get_download_dir
+try:
+    from license_manager import verify_license
+    verify_license()
+except Exception as e:
+    print(f"[WARNING] License verification failed: {e}")
+
+try:
+    from fastmcp import FastMCP
+    from officer import TheOfficer
+    from utils import get_workspace, get_data_dir, get_export_dir, get_download_dir
+except Exception as e:
+    print(f"[ERROR] Failed to import dependencies: {e}")
+    sys.exit(1)
 
 mcp = FastMCP("Office Assistant")
 Officer = TheOfficer()
@@ -52,9 +59,15 @@ def _build_globals(app, doc, app_name):
     if app_name.lower() in ['excel', 'ket']:
         base['sheet'] = doc.ActiveSheet if doc else None
     elif app_name.lower() in ['word', 'kwps']:
-        base['selection'] = app.Selection
+        base['selection'] = app.Selection if app else None
     elif app_name.lower() in ['powerpoint', 'kwpp']:
-        base['slide'] = doc.Slides(doc.Slides.Count) if doc else None
+        base['slide'] = None
+        if doc and hasattr(doc, 'Slides'):
+            try:
+                if doc.Slides.Count > 0:
+                    base['slide'] = doc.Slides(doc.Slides.Count)
+            except Exception:
+                pass
     return base
 
 
@@ -67,21 +80,29 @@ def available_apps() -> list:
 
 
 @mcp.tool()
-def launch_app(app_name: str = "Excel", visible: bool = True) -> bool:
+def launch_app(app_name: str = "Excel", visible: bool = True) -> dict:
     """Launch a Microsoft Office application."""
     try:
         app = Officer.Application(app_name)
-        app.Visible = visible
-        return True
+        if app is None:
+            return {"success": False, "error": f"Failed to start {app_name}"}
+        try:
+            app.Visible = visible
+        except Exception:
+            pass
+        return {"success": True, "app": app_name, "name": app.Name}
     except Exception as e:
-        print(f"Launch failed: {e}")
-        return False
+        return {"success": False, "error": str(e)}
 
 
 @mcp.tool()
-def quit_app(app_name: str = "Excel", force: bool = False) -> bool:
+def quit_app(app_name: str = "Excel", force: bool = False) -> dict:
     """Quit a Microsoft Office application."""
-    return Officer.Quit(app_name, force)
+    try:
+        result = Officer.Quit(app_name, force)
+        return {"success": result}
+    except Exception as e:
+        return {"success": False, "error": str(e)}
 
 
 # ========== File Operation Tools ==========
@@ -92,54 +113,71 @@ def open_file(file_path: str) -> dict:
     Open an Office file.
 
     Supported formats:
-    - Excel: .xlsx, .xls, .csv
-    - Word: .docx, .doc
-    - PowerPoint: .pptx, .ppt
+      - Excel: .xlsx, .xls, .csv
+      - Word: .docx, .doc
+      - PowerPoint: .pptx, .ppt
 
     Tip: Place files in "Desktop/智能办公区/数据" for safe processing.
-    Note: For Chinese file paths, use run_python tool instead.
     """
     import os
     
     # 处理中文路径编码
-    # 方法1: 使用绝对路径
+    # 方法1：使用绝对路径
     file_path = os.path.abspath(file_path)
     
-    # 方法2: 确保路径存在
+    # 方法2：确保路径存在
     if not os.path.exists(file_path):
         return {"success": False, "error": f"File not found: {file_path}"}
     
     ext = file_path.split('.')[-1].lower()
-    app_name = APP_MAP.get(ext, 'Excel')
+    if ext not in APP_MAP:
+        return {"success": False, "error": f"Unsupported file format: .{ext}"}
+    
+    app_name = APP_MAP.get(ext)
     app = Officer.Application(app_name)
     
     if app is None:
         return {"success": False, "error": f"Failed to start {app_name}"}
 
     try:
+        # 使用win32api.GetShortPathName解决中文路径问题
+        try:
+            import win32api
+            short_path = win32api.GetShortPathName(file_path)
+            open_path = short_path
+        except Exception:
+            open_path = file_path
+        
         if app_name == 'Excel':
-            # 使用 Unicode 字符串传递路径
-            doc = app.Workbooks.Open(file_path)
+            doc = app.Workbooks.Open(open_path)
         elif app_name == 'Word':
-            doc = app.Documents.Open(file_path)
+            doc = app.Documents.Open(open_path)
         elif app_name == 'PowerPoint':
-            doc = app.Presentations.Open(file_path)
+            doc = app.Presentations.Open(open_path)
 
         app.Visible = True
         return {"success": True, "app": app_name, "file": file_path}
     except Exception as e:
-        return {"success": False, "error": str(e), "note": "For Chinese paths, use run_python tool"}
+        return {"success": False, "error": str(e)}
 
 
 @mcp.tool()
-def save_file(file_path: str = None) -> dict:
-    """Save the current active document."""
-    for app_name in ['Excel', 'Word', 'PowerPoint']:
+def save_file(file_path: str = None, app_name: str = None) -> dict:
+    """Save the current active document.
+    
+    Args:
+        file_path: Optional file path to save as
+        app_name: Optional specific app to save (Excel, Word, PowerPoint)
+    """
+    apps_to_check = [app_name] if app_name else ['Excel', 'Word', 'PowerPoint']
+    for app_name_check in apps_to_check:
         try:
-            app = Officer.Application(app_name)
-            if app_name == 'Excel':
+            app = Officer.Application(app_name_check)
+            if app is None:
+                continue
+            if app_name_check == 'Excel':
                 doc = app.ActiveWorkbook
-            elif app_name == 'Word':
+            elif app_name_check == 'Word':
                 doc = app.ActiveDocument
             else:
                 doc = app.ActivePresentation
@@ -150,7 +188,7 @@ def save_file(file_path: str = None) -> dict:
                 else:
                     doc.Save()
                 return {"success": True, "file": doc.FullName}
-        except:
+        except Exception:
             continue
     return {"success": False, "error": "No active document found"}
 
@@ -163,12 +201,12 @@ def run_python(code: str, app_name: str = "Excel") -> dict:
     Execute Python code to control Office applications (PRIMARY TOOL).
 
     Available global variables:
-    - app: The Office application object
-    - doc: The current active document
-    - sheet: Active worksheet (Excel)
-    - selection: Current selection (Word)
-    - slide: Active slide (PowerPoint)
-    - Officer: TheOfficer instance for accessing other apps
+      - app: The Office application object
+      - doc: The current active document
+      - sheet: Active worksheet (Excel)
+      - selection: Current selection (Word)
+      - slide: Active slide (PowerPoint)
+      - Officer: TheOfficer instance for accessing other apps
 
     Excel example:
         sheet.Cells(1, 1).Value = "Hello"
@@ -192,11 +230,11 @@ def run_python(code: str, app_name: str = "Excel") -> dict:
     try:
         exec(code, globals_dict)
         output = buffer.getvalue()
-        sys.stdout = old_stdout
         return {"success": True, "output": output or "(无输出)"}
     except Exception as e:
-        sys.stdout = old_stdout
         return {"success": False, "error": str(e)}
+    finally:
+        sys.stdout = old_stdout
 
 
 # ========== UIA Tools ==========
@@ -222,102 +260,13 @@ def screenshot(target: str = None, save_name: str = None) -> dict:
         return {"success": False, "error": str(e)}
 
 
-@mcp.tool()
-def screenshot_element(element_name: str, control_type: str = None,
-                       parent_name: str = None, save_name: str = None) -> dict:
-    """
-    Capture screenshot of a specific UI element.
-
-    Args:
-        element_name: Name of the UI element
-        control_type: Control type, e.g., 'Button', 'Edit', 'Document'
-        parent_name: Parent window name to limit search scope
-        save_name: Filename to save
-
-    Examples:
-        screenshot_element('Calculate', 'Button', 'Calculator')
-        screenshot_element('Sheet1', 'TabItem', 'Excel')
-    """
-    try:
-        path = Officer.UIA.screenshot_element(element_name, control_type, parent_name, save_name)
-        return {"success": True, "path": path}
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
-@mcp.tool()
-def find_ui_element(name: str, control_type: str = None,
-                    parent_name: str = None) -> dict:
-    """
-    Find a UI element and return its properties.
-
-    Args:
-        name: Element name
-        control_type: Control type filter
-        parent_name: Parent window name
-
-    Returns:
-        Element properties including name, type, rect, automation_id
-    """
-    try:
-        element = Officer.UIA.find_element(name, control_type, parent_name)
-        if element is None:
-            return {"success": False, "error": f"Element not found: {name}"}
-        return {
-            "success": True,
-            "name": element.Name,
-            "type": element.ControlTypeName,
-            "automation_id": element.AutomationId,
-            "class_name": element.ClassName,
-            "rect": element.BoundingRectangle,
-            "enabled": element.IsEnabled,
-            "visible": not element.IsOffscreen
-        }
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
-@mcp.tool()
-def get_ui_tree(window_name: str = None, max_depth: int = 3) -> dict:
-    """
-    Get the UI automation tree of a window.
-
-    Args:
-        window_name: Window name, None for active window
-        max_depth: Maximum traversal depth
-
-    Returns:
-        Hierarchical tree structure of UI elements
-    """
-    try:
-        tree = Officer.UIA.get_element_tree(window_name, max_depth)
-        return {"success": True, "tree": tree}
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
-@mcp.tool()
-def click_ui_element(name: str, control_type: str = None,
-                     parent_name: str = None) -> dict:
-    """
-    Click a UI element.
-
-    Args:
-        name: Element name
-        control_type: Control type
-        parent_name: Parent window name
-    """
-    try:
-        result = Officer.UIA.click_element(name, control_type, parent_name)
-        return {"success": result}
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
 @mcp.tool()
 def get_window_list() -> dict:
     """List all top-level windows."""
     try:
+        if not hasattr(Officer, 'UIA') or not Officer.UIA.available:
+            return {"success": False, "error": "UIA automation module not available"}
+        
         windows = Officer.UIA.get_window_list()
         return {"success": True, "windows": windows}
     except Exception as e:
@@ -328,6 +277,9 @@ def get_window_list() -> dict:
 def activate_window(window_name: str) -> dict:
     """Activate a window by name."""
     try:
+        if not hasattr(Officer, 'UIA') or not Officer.UIA.available:
+            return {"success": False, "error": "UIA automation module not available"}
+        
         result = Officer.UIA.activate_window(window_name)
         return {"success": result}
     except Exception as e:
@@ -337,9 +289,16 @@ def activate_window(window_name: str) -> dict:
 # ========== System Tools ==========
 
 @mcp.tool()
-def download(url: str, save_name: str = None) -> str:
+def download(url: str, save_name: str = None) -> dict:
     """Download a file from URL to the download folder."""
-    return Officer.DownloadURL(url, save_name)
+    try:
+        result = Officer.DownloadURL(url, save_name)
+        if result:
+            return {"success": True, "file_path": result}
+        else:
+            return {"success": False, "error": "Download failed or returned empty path"}
+    except Exception as e:
+        return {"success": False, "error": str(e)}
 
 
 @mcp.tool()