@marcelo-ochoa/server-qnap 1.0.1 → 1.0.2

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.2] - 2026-02-10
+
+### Added
+- **Enhanced qnap-report Tool**: Completely rewritten in native TypeScript for better performance and reliability.
+  - Replaced Python-based report collector with native Node.js implementation.
+  - Returns structured **JSON format** instead of plain text, perfect for AI parsing.
+  - Added detailed **Disk Health** (model, serial, capacity, temperature, health status).
+  - Added granular **Resource Usage** (CPU load, memory breakdown, uptime, system temperature).
+  - Added comprehensive **Storage Info** (volume labels, total/used/free space, usage percentages).
+
 ## [1.0.1] - 2026-02-09
 
 ### Changed

package/Demos.md

@@ -146,6 +146,49 @@ Using this sample settings.json file at ~/.gemini/ directory:
 - qnap-report
 - analyze backup files in several subdirectories of `/backup/stacks` on the QNAP NAS. For each subdirectory compare the two most recent backups (daily or weekly, identified by filenames like `alldb_backup-2.sql.gz` for weekly and `alldb_backup-09.sql.gz` for daily). The comparison should be based on file size, considering backups with similar sizes as correct. Generate a report indicating the status (OK or Error) for each directory based on this comparison.
 
+### qnap-report JSON Output Example
+
+The `qnap-report` tool now returns a structured JSON object, making it easy for AI models to analyze the system state.
+
+```json
+{
+  "timestamp": "2026-02-10T15:29:38.124Z",
+  "host": "http://10.1.1.241:8080",
+  "diskHealth": [
+    {
+      "alias": "3.5\" SATA HDD 1",
+      "model": "WD20EFRX-68EUZN0",
+      "serial": "WD-WCC4M1RXUCRS",
+      "capacity": "1.82 TB",
+      "health": "OK",
+      "temperature": "39°C"
+    },
+    ...
+  ],
+  "resourceUsage": {
+    "cpuUsage": "21.5 %",
+    "memory": {
+      "totalMB": 1000,
+      "freeMB": 529,
+      "usedMB": 471,
+      "usedPercent": "47.1%"
+    },
+    "uptime": "29 days, 0 hours, 27 minutes",
+    "systemTemperature": "39°C"
+  },
+  "storageInfo": [
+    {
+      "name": "Backup",
+      "totalGB": "1218.42",
+      "usedGB": "1029.01",
+      "freeGB": "189.42",
+      "usedPercent": "84.5%"
+    },
+    ...
+  ]
+}
+```
+
 ## Using Antigravity Code Editor
 
 Put this in `~/.gemini/antigravity/mcp_config.json`

package/LICENSE

@@ -0,0 +1,216 @@
+The MCP project is undergoing a licensing transition from the MIT License to the Apache License, Version 2.0 ("Apache-2.0"). All new code and specification contributions to the project are licensed under Apache-2.0. Documentation contributions (excluding specifications) are licensed under CC-BY-4.0.
+
+Contributions for which relicensing consent has been obtained are licensed under Apache-2.0. Contributions made by authors who originally licensed their work under the MIT License and who have not yet granted explicit permission to relicense remain licensed under the MIT License.
+
+No rights beyond those granted by the applicable original license are conveyed for such contributions.
+
+---
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to the Licensor for inclusion in the Work by the copyright
+      owner or by an individual or Legal Entity authorized to submit on behalf
+      of the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+---
+
+MIT License
+
+Copyright (c) 2024-2025 Model Context Protocol a Series of LF Projects, LLC.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+Creative Commons Attribution 4.0 International (CC-BY-4.0)
+
+Documentation in this project (excluding specifications) is licensed under
+CC-BY-4.0. See https://creativecommons.org/licenses/by/4.0/legalcode for
+the full license text.

package/README.md

@@ -8,7 +8,7 @@ An MCP server implementation for QNAP NAS devices, providing tools to monitor sy
   - `host`: The QNAP NAS URL (e.g., `http://10.1.1.241:8080`).
   - `username`: Your admin username.
   - `password`: Your admin password.
-- `qnap-report`: Generate a system report including CPU, memory, disks, and volume status.
+- `qnap-report`: Generate a system report in **JSON format** including CPU, memory, disks, and volume status. Perfect for AI analysis and automated monitoring.
 - `qnap-dir`: List the contents of a directory.
   - `path`: The path to list (e.g., `/Public`).
 - `qnap-file-info`: Get detailed information about a specific file.
@@ -82,8 +82,8 @@ docker run -i --rm -e QNAP_USER=admin -e QNAP_PASSWORD=password mochoa/mcp-qnap
 
 ## Change Log
 
-See [Change Log](CHANGELOG.md) for the history of changes.
+See [Change Log](https://github.com/marcelo-ochoa/servers/blob/main/src/qnap/CHANGELOG.md) for the history of changes.
 
-## License
+## 📜 License
 
-MIT
+This project is licensed under the Apache License, Version 2.0 for new contributions, with existing code under MIT - see the [LICENSE](https://github.com/marcelo-ochoa/servers/blob/main/src/qnap/LICENSE) file for details.

package/dist/server.js

@@ -19,7 +19,7 @@ export class QnapServer {
     constructor() {
         this.server = new Server({
             name: "qnap-mcp-server",
-            version: "1.0.1",
+            version: "1.0.2",
         }, {
             capabilities: {
                 tools: {},

package/dist/tools/report.js

@@ -1,38 +1,159 @@
 import { getNasHost, getNasSid, fetchWithTimeout } from "./connect.js";
+/**
+ * Parses disk health information from QNAP XML response.
+ */
+function parseDiskHealth(xml) {
+    const disks = [];
+    // Extract individual disk entries
+    const entryRegex = /<entry>(.*?)<\/entry>/gs;
+    let match;
+    while ((match = entryRegex.exec(xml)) !== null) {
+        const entry = match[1];
+        const alias = entry.match(/<Disk_Alias><!\[CDATA\[(.*?)\]\]><\/Disk_Alias>/)?.[1] || "";
+        const health = entry.match(/<Health><!\[CDATA\[(.*?)\]\]><\/Health>/)?.[1] || "";
+        const capacity = entry.match(/<Capacity><!\[CDATA\[(.*?)\]\]><\/Capacity>/)?.[1] || "";
+        const tempC = entry.match(/<oC><!\[CDATA\[(.*?)\]\]><\/oC>/)?.[1] || "";
+        const model = entry.match(/<Model><!\[CDATA\[(.*?)\]\]><\/Model>/)?.[1] || "";
+        const serial = entry.match(/<Serial><!\[CDATA\[(.*?)\]\]><\/Serial>/)?.[1] || "";
+        if (alias) {
+            disks.push({
+                alias,
+                model,
+                serial,
+                capacity,
+                health,
+                temperature: tempC ? `${tempC}°C` : ""
+            });
+        }
+    }
+    return disks;
+}
+/**
+ * Parses resource usage information from QNAP XML response.
+ */
+function parseResourceUsage(xml) {
+    const cpuUsage = xml.match(/<cpu_usage><!\[CDATA\[(.*?)\]\]><\/cpu_usage>/)?.[1]?.trim() || "";
+    const memTotalStr = xml.match(/<total_memory><!\[CDATA\[(.*?)\]\]><\/total_memory>/)?.[1];
+    const memFreeStr = xml.match(/<free_memory><!\[CDATA\[(.*?)\]\]><\/free_memory>/)?.[1];
+    let memory = null;
+    if (memTotalStr && memFreeStr) {
+        const total = parseFloat(memTotalStr);
+        const free = parseFloat(memFreeStr);
+        const used = total - free;
+        const usedPct = total > 0 ? (used / total) * 100 : 0;
+        memory = {
+            totalMB: total,
+            freeMB: free,
+            usedMB: used,
+            usedPercent: usedPct.toFixed(1) + "%"
+        };
+    }
+    const day = xml.match(/<uptime_day><!\[CDATA\[(.*?)\]\]><\/uptime_day>/)?.[1];
+    const hour = xml.match(/<uptime_hour><!\[CDATA\[(.*?)\]\]><\/uptime_hour>/)?.[1];
+    const min = xml.match(/<uptime_min><!\[CDATA\[(.*?)\]\]><\/uptime_min>/)?.[1];
+    let uptime = "";
+    if (day !== undefined && hour !== undefined && min !== undefined) {
+        uptime = `${day} days, ${hour} hours, ${min} minutes`;
+    }
+    const sysTemp = xml.match(/<sys_tempc>([^<]+)<\/sys_tempc>/)?.[1];
+    return {
+        cpuUsage,
+        memory,
+        uptime,
+        systemTemperature: sysTemp ? `${sysTemp}°C` : ""
+    };
+}
+/**
+ * Parses storage/volume information from QNAP XML response.
+ */
+function parseStorageInfo(xml) {
+    const volumes = [];
+    // Create mapping of volumeValue to volumeLabel
+    const volLabels = {};
+    const volRegex = /<volume>(.*?)<\/volume>/gs;
+    let volMatch;
+    while ((volMatch = volRegex.exec(xml)) !== null) {
+        const vol = volMatch[1];
+        const val = vol.match(/<volumeValue><!\[CDATA\[(.*?)\]\]><\/volumeValue>/)?.[1];
+        const label = vol.match(/<volumeLabel><!\[CDATA\[(.*?)\]\]><\/volumeLabel>/)?.[1];
+        if (val && label) {
+            volLabels[val] = label;
+        }
+    }
+    // Parse volume usage
+    const useRegex = /<volumeUse>(.*?)<\/volumeUse>/gs;
+    let useMatch;
+    while ((useMatch = useRegex.exec(xml)) !== null) {
+        const volUse = useMatch[1];
+        const val = volUse.match(/<volumeValue><!\[CDATA\[(.*?)\]\]><\/volumeValue>/)?.[1];
+        const totalStr = volUse.match(/<total_size><!\[CDATA\[(.*?)\]\]><\/total_size>/)?.[1];
+        const freeStr = volUse.match(/<free_size><!\[CDATA\[(.*?)\]\]><\/free_size>/)?.[1];
+        if (val) {
+            const name = volLabels[val] || `Volume ${val}`;
+            let usage = { name };
+            if (totalStr && freeStr) {
+                try {
+                    const total = parseFloat(totalStr);
+                    const free = parseFloat(freeStr);
+                    const used = total - free;
+                    const usedPct = total > 0 ? (used / total) * 100 : 0;
+                    usage = {
+                        ...usage,
+                        totalGB: (total / (1024 ** 3)).toFixed(2),
+                        usedGB: (used / (1024 ** 3)).toFixed(2),
+                        freeGB: (free / (1024 ** 3)).toFixed(2),
+                        usedPercent: usedPct.toFixed(1) + "%"
+                    };
+                }
+                catch {
+                    usage = { ...usage, totalBytes: totalStr, freeBytes: freeStr };
+                }
+            }
+            volumes.push(usage);
+        }
+    }
+    return volumes;
+}
+/**
+ * Handle qnap-report tool call.
+ */
 export async function reportHandler(request) {
-    const nas_host = getNasHost();
-    const nas_sid = getNasSid();
-    if (!nas_host || !nas_sid) {
+    const host = getNasHost();
+    const sid = getNasSid();
+    if (!host || !sid) {
         return {
-            content: [{ type: "text", text: "Not connected to QNAP NAS. Use qnap-connect first." }],
+            content: [{ type: "text", text: JSON.stringify({ error: "Not connected to QNAP NAS. Use qnap-connect first." }) }],
             isError: true
         };
     }
     try {
-        // Fetch system info to get model details
-        const dc = Date.now();
-        const url = `${nas_host}/cgi-bin/sys/sysRequest.cgi?subfunc=sys_info&sid=${nas_sid}&_dc=${dc}`;
-        const response = await fetchWithTimeout(url);
-        const text = await response.text();
-        const modelMatch = text.match(/<displayModelName><!\[CDATA\[([^\]]*)\]\]><\/displayModelName>/);
-        const modelName = modelMatch ? modelMatch[1] : "Unknown QNAP Model";
-        // Extract IP from host
-        const hostUrl = new URL(nas_host);
-        const report = [
-            `### QNAP Connection Report`,
-            `- **Model Name**: ${modelName}`,
-            `- **IP Address**: ${hostUrl.hostname}`,
-            `- **Connected User**: ${process.env.QNAP_USER || "admin"}`,
-            `- **Access URL**: ${nas_host}`
-        ].join('\n');
+        const results = {
+            timestamp: new Date().toISOString(),
+            host: host
+        };
+        // 1. Disk Health
+        const diskUrl = `${host}/cgi-bin/disk/qsmart.cgi?func=all_hd_data&sid=${sid}`;
+        const diskResp = await fetchWithTimeout(diskUrl);
+        const diskXml = await diskResp.text();
+        results.diskHealth = parseDiskHealth(diskXml);
+        // 2. Resource Usage
+        const resUrl = `${host}/cgi-bin/management/manaRequest.cgi?subfunc=sysinfo&hd=no&multicpu=1&sid=${sid}`;
+        const resResp = await fetchWithTimeout(resUrl);
+        const resXml = await resResp.text();
+        results.resourceUsage = parseResourceUsage(resXml);
+        // 3. Storage Info
+        const storageUrl = `${host}/cgi-bin/management/chartReq.cgi?chart_func=disk_usage&disk_select=all&include=all&sid=${sid}`;
+        const storageResp = await fetchWithTimeout(storageUrl);
+        const storageXml = await storageResp.text();
+        results.storageInfo = parseStorageInfo(storageXml);
         return {
-            content: [{ type: "text", text: report }],
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
             isError: false,
         };
     }
     catch (error) {
         return {
-            content: [{ type: "text", text: `Error generating report: ${error.message}` }],
+            content: [{ type: "text", text: JSON.stringify({ error: `Error generating report: ${error.message}` }) }],
             isError: true
         };
     }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@marcelo-ochoa/server-qnap",
     "mcpName": "io.github.marcelo-ochoa/qnap",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "An MCP server for QNAP NAS API.",
     "type": "module",
     "bin": {

package/server.json

@@ -7,12 +7,12 @@
         "source": "github",
         "subfolder": "src/qnap"
     },
-    "version": "1.0.1",
+    "version": "1.0.2",
     "packages": [
         {
             "registryType": "npm",
             "identifier": "@marcelo-ochoa/server-qnap",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "transport": {
                 "type": "stdio"
             }

package/server.ts

@@ -27,7 +27,7 @@ export class QnapServer {
         this.server = new Server(
             {
                 name: "qnap-mcp-server",
-                version: "1.0.1",
+                version: "1.0.2",
             },
             {
                 capabilities: {

package/tools/report.ts

@@ -1,45 +1,181 @@
 import { CallToolRequest } from "@modelcontextprotocol/sdk/types.js";
 import { getNasHost, getNasSid, fetchWithTimeout } from "./connect.js";
 
+/**
+ * Parses disk health information from QNAP XML response.
+ */
+function parseDiskHealth(xml: string): any[] {
+    const disks: any[] = [];
+    // Extract individual disk entries
+    const entryRegex = /<entry>(.*?)<\/entry>/gs;
+    let match;
+
+    while ((match = entryRegex.exec(xml)) !== null) {
+        const entry = match[1];
+
+        const alias = entry.match(/<Disk_Alias><!\[CDATA\[(.*?)\]\]><\/Disk_Alias>/)?.[1] || "";
+        const health = entry.match(/<Health><!\[CDATA\[(.*?)\]\]><\/Health>/)?.[1] || "";
+        const capacity = entry.match(/<Capacity><!\[CDATA\[(.*?)\]\]><\/Capacity>/)?.[1] || "";
+        const tempC = entry.match(/<oC><!\[CDATA\[(.*?)\]\]><\/oC>/)?.[1] || "";
+        const model = entry.match(/<Model><!\[CDATA\[(.*?)\]\]><\/Model>/)?.[1] || "";
+        const serial = entry.match(/<Serial><!\[CDATA\[(.*?)\]\]><\/Serial>/)?.[1] || "";
+
+        if (alias) {
+            disks.push({
+                alias,
+                model,
+                serial,
+                capacity,
+                health,
+                temperature: tempC ? `${tempC}°C` : ""
+            });
+        }
+    }
+    return disks;
+}
+
+/**
+ * Parses resource usage information from QNAP XML response.
+ */
+function parseResourceUsage(xml: string): any {
+    const cpuUsage = xml.match(/<cpu_usage><!\[CDATA\[(.*?)\]\]><\/cpu_usage>/)?.[1]?.trim() || "";
+    const memTotalStr = xml.match(/<total_memory><!\[CDATA\[(.*?)\]\]><\/total_memory>/)?.[1];
+    const memFreeStr = xml.match(/<free_memory><!\[CDATA\[(.*?)\]\]><\/free_memory>/)?.[1];
+
+    let memory: any = null;
+    if (memTotalStr && memFreeStr) {
+        const total = parseFloat(memTotalStr);
+        const free = parseFloat(memFreeStr);
+        const used = total - free;
+        const usedPct = total > 0 ? (used / total) * 100 : 0;
+        memory = {
+            totalMB: total,
+            freeMB: free,
+            usedMB: used,
+            usedPercent: usedPct.toFixed(1) + "%"
+        };
+    }
+
+    const day = xml.match(/<uptime_day><!\[CDATA\[(.*?)\]\]><\/uptime_day>/)?.[1];
+    const hour = xml.match(/<uptime_hour><!\[CDATA\[(.*?)\]\]><\/uptime_hour>/)?.[1];
+    const min = xml.match(/<uptime_min><!\[CDATA\[(.*?)\]\]><\/uptime_min>/)?.[1];
+
+    let uptime = "";
+    if (day !== undefined && hour !== undefined && min !== undefined) {
+        uptime = `${day} days, ${hour} hours, ${min} minutes`;
+    }
+
+    const sysTemp = xml.match(/<sys_tempc>([^<]+)<\/sys_tempc>/)?.[1];
+
+    return {
+        cpuUsage,
+        memory,
+        uptime,
+        systemTemperature: sysTemp ? `${sysTemp}°C` : ""
+    };
+}
+
+/**
+ * Parses storage/volume information from QNAP XML response.
+ */
+function parseStorageInfo(xml: string): any[] {
+    const volumes: any[] = [];
+
+    // Create mapping of volumeValue to volumeLabel
+    const volLabels: Record<string, string> = {};
+    const volRegex = /<volume>(.*?)<\/volume>/gs;
+    let volMatch;
+    while ((volMatch = volRegex.exec(xml)) !== null) {
+        const vol = volMatch[1];
+        const val = vol.match(/<volumeValue><!\[CDATA\[(.*?)\]\]><\/volumeValue>/)?.[1];
+        const label = vol.match(/<volumeLabel><!\[CDATA\[(.*?)\]\]><\/volumeLabel>/)?.[1];
+        if (val && label) {
+            volLabels[val] = label;
+        }
+    }
+
+    // Parse volume usage
+    const useRegex = /<volumeUse>(.*?)<\/volumeUse>/gs;
+    let useMatch;
+    while ((useMatch = useRegex.exec(xml)) !== null) {
+        const volUse = useMatch[1];
+        const val = volUse.match(/<volumeValue><!\[CDATA\[(.*?)\]\]><\/volumeValue>/)?.[1];
+        const totalStr = volUse.match(/<total_size><!\[CDATA\[(.*?)\]\]><\/total_size>/)?.[1];
+        const freeStr = volUse.match(/<free_size><!\[CDATA\[(.*?)\]\]><\/free_size>/)?.[1];
+
+        if (val) {
+            const name = volLabels[val] || `Volume ${val}`;
+            let usage: any = { name };
+
+            if (totalStr && freeStr) {
+                try {
+                    const total = parseFloat(totalStr);
+                    const free = parseFloat(freeStr);
+                    const used = total - free;
+                    const usedPct = total > 0 ? (used / total) * 100 : 0;
+
+                    usage = {
+                        ...usage,
+                        totalGB: (total / (1024 ** 3)).toFixed(2),
+                        usedGB: (used / (1024 ** 3)).toFixed(2),
+                        freeGB: (free / (1024 ** 3)).toFixed(2),
+                        usedPercent: usedPct.toFixed(1) + "%"
+                    };
+                } catch {
+                    usage = { ...usage, totalBytes: totalStr, freeBytes: freeStr };
+                }
+            }
+            volumes.push(usage);
+        }
+    }
+    return volumes;
+}
+
+/**
+ * Handle qnap-report tool call.
+ */
 export async function reportHandler(request: CallToolRequest) {
-    const nas_host = getNasHost();
-    const nas_sid = getNasSid();
+    const host = getNasHost();
+    const sid = getNasSid();
 
-    if (!nas_host || !nas_sid) {
+    if (!host || !sid) {
         return {
-            content: [{ type: "text", text: "Not connected to QNAP NAS. Use qnap-connect first." }],
+            content: [{ type: "text", text: JSON.stringify({ error: "Not connected to QNAP NAS. Use qnap-connect first." }) }],
             isError: true
         };
     }
 
     try {
-        // Fetch system info to get model details
-        const dc = Date.now();
-        const url = `${nas_host}/cgi-bin/sys/sysRequest.cgi?subfunc=sys_info&sid=${nas_sid}&_dc=${dc}`;
-        const response = await fetchWithTimeout(url);
-        const text = await response.text();
-
-        const modelMatch = text.match(/<displayModelName><!\[CDATA\[([^\]]*)\]\]><\/displayModelName>/);
-        const modelName = modelMatch ? modelMatch[1] : "Unknown QNAP Model";
-
-        // Extract IP from host
-        const hostUrl = new URL(nas_host);
-
-        const report = [
-            `### QNAP Connection Report`,
-            `- **Model Name**: ${modelName}`,
-            `- **IP Address**: ${hostUrl.hostname}`,
-            `- **Connected User**: ${process.env.QNAP_USER || "admin"}`,
-            `- **Access URL**: ${nas_host}`
-        ].join('\n');
+        const results: any = {
+            timestamp: new Date().toISOString(),
+            host: host
+        };
+
+        // 1. Disk Health
+        const diskUrl = `${host}/cgi-bin/disk/qsmart.cgi?func=all_hd_data&sid=${sid}`;
+        const diskResp = await fetchWithTimeout(diskUrl);
+        const diskXml = await diskResp.text();
+        results.diskHealth = parseDiskHealth(diskXml);
+
+        // 2. Resource Usage
+        const resUrl = `${host}/cgi-bin/management/manaRequest.cgi?subfunc=sysinfo&hd=no&multicpu=1&sid=${sid}`;
+        const resResp = await fetchWithTimeout(resUrl);
+        const resXml = await resResp.text();
+        results.resourceUsage = parseResourceUsage(resXml);
+
+        // 3. Storage Info
+        const storageUrl = `${host}/cgi-bin/management/chartReq.cgi?chart_func=disk_usage&disk_select=all&include=all&sid=${sid}`;
+        const storageResp = await fetchWithTimeout(storageUrl);
+        const storageXml = await storageResp.text();
+        results.storageInfo = parseStorageInfo(storageXml);
 
         return {
-            content: [{ type: "text", text: report }],
+            content: [{ type: "text", text: JSON.stringify(results, null, 2) }],
             isError: false,
         };
     } catch (error: any) {
         return {
-            content: [{ type: "text", text: `Error generating report: ${error.message}` }],
+            content: [{ type: "text", text: JSON.stringify({ error: `Error generating report: ${error.message}` }) }],
             isError: true
         };
     }