@tanskong/office-assistant 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanskong/office-assistant",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Office Assistant - AI-powered Office automation via MCP protocol with license protection",
   "main": "bin/office-assistant.js",
   "bin": {

package/requirements.txt

@@ -1,3 +1,4 @@
-fastmcp>=2.3.3
-pywin32>=310
-Pillow>=10.0.0
+fastmcp>=2.3.3
+pywin32>=310
+Pillow>=10.0.0
+psutil>=5.9.0

package/src/officer.py

@@ -147,10 +147,35 @@ class TheOfficer:
                 self.__dict__[app_name_attr] = app
                 return app
             else:
+                # 策略1：优先尝试 GetActiveObject
                 try:
                     app = win32com.client.GetActiveObject(app_full_name)
-                except pywintypes.com_error:
-                    app = win32com.client.Dispatch(app_full_name)
+                    # 验证可用性
+                    _ = app.Visible
+                    self.__dict__[app_name_attr] = app
+                    return app
+                except (pywintypes.com_error, Exception):
+                    pass
+                
+                # 策略2：通过进程列表查找当前用户的实例（需要 psutil）
+                try:
+                    import psutil
+                    current_user = psutil.Process().username()
+                    for proc in psutil.process_iter(['pid', 'name', 'username']):
+                        if proc.info['name'].lower() == app_name.lower() + '.exe' and proc.info['username'] == current_user:
+                            pid = proc.info['pid']
+                            # 使用动态分派绑定到指定进程
+                            import win32com.client.dynamic
+                            moniker = f"!{pid}"
+                            app = win32com.client.dynamic.Dispatch(moniker)
+                            _ = app.Visible
+                            self.__dict__[app_name_attr] = app
+                            return app
+                except Exception:
+                    pass
+                
+                # 策略3：兜底，创建新实例
+                app = win32com.client.Dispatch(app_full_name)
                 self.__dict__[app_name_attr] = app
                 return app
         except Exception as e:

package/src/server.py

@@ -194,10 +194,15 @@ def run_python(code: str, app_name: str = "Excel") -> dict:
 # ========== System Tools ==========
 
 @mcp.tool()
-def screenshot(save_name: str = None) -> str:
+def screenshot(save_name: str = None) -> dict:
     """Capture a screenshot and save to the export folder."""
-    path = Officer.ScreenShot(save_name)
-    return path
+    try:
+        path = Officer.ScreenShot(save_name)
+        return {"success": True, "path": path}
+    except ImportError as e:
+        return {"success": False, "error": "缺少 Pillow 模块，请运行: pip install Pillow", "detail": str(e)}
+    except Exception as e:
+        return {"success": False, "error": str(e)}
 
 
 @mcp.tool()