vmware-storage 2.5.0__tar.gz → 2.6.0__tar.gz

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/.claude-plugin/plugin.json

@@ -2,7 +2,7 @@
   "$schema": "https://anthropic.com/claude-code/plugin.schema.json",
   "name": "vmware-storage",
   "displayName": "VMware Storage",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "VMware vSphere storage with 16 MCP tools: datastores, iSCSI, vSAN, FC multipath.",
   "author": {
     "name": "Wei Zhou",

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/.mcp.json

@@ -5,7 +5,7 @@
       "command": "uvx",
       "args": [
         "--from",
-        "vmware-storage==2.5.0",
+        "vmware-storage==2.6.0",
         "vmware-storage-mcp"
       ]
     }

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: vmware-storage
-Version: 2.5.0
+Version: 2.6.0
 Summary: VMware vSphere storage management: datastores, iSCSI, vSAN. Domain-focused MCP skill.
 Project-URL: Homepage, https://github.com/vmware-skills/VMware-Storage
 Project-URL: Repository, https://github.com/vmware-skills/VMware-Storage
 Project-URL: Issues, https://github.com/vmware-skills/VMware-Storage/issues
 Project-URL: Changelog, https://github.com/vmware-skills/VMware-Storage/blob/main/RELEASE_NOTES.md
-Author-email: Wei Zhou <wei-wz.zhou@broadcom.com>
+Author-email: Wei Zhou <zhouwei008@gmail.com>
 License-Expression: MIT
 License-File: LICENSE
 Requires-Python: >=3.10
@@ -24,7 +24,7 @@ Description-Content-Type: text/markdown
 
 For a read-only check of this skill with your model and agent host, use the shared [model-fit self-test](https://github.com/vmware-skills/marketplace/blob/main/MODEL_FIT_SELF_TEST.md) in the marketplace root.
 
-> **Author**: Wei Zhou, VMware by Broadcom — wei-wz.zhou@broadcom.com
+> **Author**: Wei Zhou, VMware by Broadcom — zhouwei008@gmail.com
 > This is a community-driven project by a VMware engineer, not an official VMware product.
 > For official VMware developer tools see [developer.broadcom.com](https://developer.broadcom.com).
 
@@ -137,6 +137,13 @@ The `add-target` command automatically rescans storage. Use `--dry-run` to previ
 
 ### Find Deployable Images Across Datastores
 
+For scripts, add `--json` to `datastore list`, `datastore browse`, or
+`datastore scan-images`. Successful output is the complete result envelope,
+including `items`, counts, truncation and any cache note. Without the flag,
+list keeps its table and browse/scan-images keep their legacy JSON arrays.
+Other read commands already output JSON by default. Failures still exit nonzero
+with the existing CLI error message.
+
 1. List all datastores: `vmware-storage datastore list`
 2. Scan for images: `vmware-storage datastore scan-images datastore01`
 3. Browse with a pattern: `vmware-storage datastore browse datastore01 --pattern "*.iso"`

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/README-CN.md

@@ -3,7 +3,7 @@
 
 要用自己的模型和 Agent 平台进行只读自测，请看 marketplace 根目录的[共享模型适配自测任务](https://github.com/vmware-skills/marketplace/blob/main/MODEL_FIT_SELF_TEST.md)。
 
-> **作者**: Wei Zhou, VMware by Broadcom — wei-wz.zhou@broadcom.com
+> **作者**: Wei Zhou, VMware by Broadcom — zhouwei008@gmail.com
 > 本项目由 VMware 工程师维护的社区项目，非 VMware 官方产品。
 > VMware 官方开发者工具请访问 [developer.broadcom.com](https://developer.broadcom.com)。
 
@@ -152,6 +152,10 @@ targets:
 
 ### 查找可部署镜像
 
+脚本可为 `datastore list`、`datastore browse`、`datastore scan-images` 添加 `--json`。
+成功时输出完整结果封装，保留 `items`、数量、截断状态及缓存提示。省略该选项时，list 仍为表格，
+browse/scan-images 仍为原有 JSON 数组。其他只读命令已默认输出 JSON；失败仍以非零退出码和现有 CLI 错误消息报告。
+
 1. 列出所有数据存储：`vmware-storage datastore list`
 2. 扫描镜像：`vmware-storage datastore scan-images datastore01`
 3. 按模式浏览：`vmware-storage datastore browse datastore01 --pattern "*.iso"`

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/README.md

@@ -3,7 +3,7 @@
 
 For a read-only check of this skill with your model and agent host, use the shared [model-fit self-test](https://github.com/vmware-skills/marketplace/blob/main/MODEL_FIT_SELF_TEST.md) in the marketplace root.
 
-> **Author**: Wei Zhou, VMware by Broadcom — wei-wz.zhou@broadcom.com
+> **Author**: Wei Zhou, VMware by Broadcom — zhouwei008@gmail.com
 > This is a community-driven project by a VMware engineer, not an official VMware product.
 > For official VMware developer tools see [developer.broadcom.com](https://developer.broadcom.com).
 
@@ -116,6 +116,13 @@ The `add-target` command automatically rescans storage. Use `--dry-run` to previ
 
 ### Find Deployable Images Across Datastores
 
+For scripts, add `--json` to `datastore list`, `datastore browse`, or
+`datastore scan-images`. Successful output is the complete result envelope,
+including `items`, counts, truncation and any cache note. Without the flag,
+list keeps its table and browse/scan-images keep their legacy JSON arrays.
+Other read commands already output JSON by default. Failures still exit nonzero
+with the existing CLI error message.
+
 1. List all datastores: `vmware-storage datastore list`
 2. Scan for images: `vmware-storage datastore scan-images datastore01`
 3. Browse with a pattern: `vmware-storage datastore browse datastore01 --pattern "*.iso"`

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/RELEASE_NOTES.md

@@ -1,3 +1,12 @@
+## v2.6.0 — complete datastore CLI JSON envelopes (2026-11-08)
+
+* Update public author/project contact metadata to `zhouwei008@gmail.com`.
+
+### datastore CLI JSON envelopes
+- Add `--json` to datastore list/browse/scan-images to preserve the complete
+  result envelope, including unknown totals, truncation and cache notes.
+- Preserve the existing default table/JSON-array formats and error behavior.
+
 ## v2.5.0 — per-VM datastore usage and clearer storage refusals (2026-11-01)
 
 * New read-only `get_datastore_vm_usage(datastore_name, top_n=10)` reports per-VM committed, uncommitted and unshared space on one datastore, plus attributed/unattributed used space and VMs whose usage could not be measured. It uses one PropertyCollector pass, sorts largest committed usage first, and does not turn unknown into zero. The MCP surface now has 16 tools. Verified against a lab vCenter before this release branch.
@@ -1388,7 +1397,7 @@ This release tracks vmware-pilot v1.5.17 (new `investigate_alert` template + `re
 - **[READ]/[WRITE] tool prefixes**: All MCP tool descriptions now start with [READ] or [WRITE] to clearly indicate operation type
 - **Read/write split counts**: SKILL.md MCP Tools section header shows exact read vs write tool counts
 - **Negative routing**: Description frontmatter includes "Do NOT use when..." clause to prevent misrouting
-- **Broadcom author attestation**: README.md, README-CN.md, and pyproject.toml include VMware by Broadcom author identity (wei-wz.zhou@broadcom.com) to resolve Snyk E005 brand warnings
+- **Broadcom author attestation**: README.md, README-CN.md, and pyproject.toml include VMware by Broadcom author identity (zhouwei008@gmail.com) to resolve Snyk E005 brand warnings
 
 ### Storage-specific
 

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/SECURITY.md

@@ -4,13 +4,13 @@
 
 This is a community-maintained open-source project and is **not affiliated with, endorsed by, or sponsored by VMware, Inc. or Broadcom Inc.** "VMware" and "vSphere" are trademarks of Broadcom Inc.
 
-**Author**: Wei Zhou, VMware by Broadcom — wei-wz.zhou@broadcom.com
+**Author**: Wei Zhou, VMware by Broadcom — zhouwei008@gmail.com
 
 ## Reporting Vulnerabilities
 
 If you discover a security vulnerability, please report it privately:
 
-- **Email**: wei-wz.zhou@broadcom.com
+- **Email**: zhouwei008@gmail.com
 - **GitHub**: Open a [private security advisory](https://github.com/vmware-skills/VMware-Storage/security/advisories/new)
 
 Do **not** open a public GitHub issue for security vulnerabilities.

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/openclaw.plugin.json

@@ -11,7 +11,7 @@
       "command": "uvx",
       "args": [
         "--from",
-        "vmware-storage==2.5.0",
+        "vmware-storage==2.6.0",
         "vmware-storage-mcp"
       ]
     }

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zw008/vmware-storage",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "VMware vSphere storage with 16 MCP tools: datastores, iSCSI, vSAN, FC multipath.",
   "private": true,
   "license": "MIT",

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "vmware-storage"
-version = "2.5.0"
+version = "2.6.0"
 description = "VMware vSphere storage management: datastores, iSCSI, vSAN. Domain-focused MCP skill."
 readme = "README.md"
 license = "MIT"
 requires-python = ">=3.10"
-authors = [{ name = "Wei Zhou", email = "wei-wz.zhou@broadcom.com" }]
+authors = [{ name = "Wei Zhou", email = "zhouwei008@gmail.com" }]
 dependencies = [
     "pyvmomi>=8.0.3.0,<10.0",
     "pyaml>=24.0,<27.0",

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/server.json

@@ -7,12 +7,12 @@
     "url": "https://github.com/vmware-skills/VMware-Storage",
     "source": "github"
   },
-  "version": "2.5.0",
+  "version": "2.6.0",
   "packages": [
     {
       "registryType": "pypi",
       "identifier": "vmware-storage",
-      "version": "2.5.0",
+      "version": "2.6.0",
       "runtimeHint": "uvx",
       "packageArguments": [
         {

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/skills/vmware-storage/SKILL.md

@@ -42,7 +42,7 @@ VMware vSphere storage management — 16 MCP tools for datastores, iSCSI, vSAN,
 ## Quick Install
 
 ```bash
-uv tool install vmware-storage==2.5.0
+uv tool install vmware-storage==2.6.0
 vmware-storage init      # guided setup: writes config + .env (chmod 600, password grep-safe), then verifies
 vmware-storage doctor
 ```
@@ -274,7 +274,7 @@ Corporate TLS proxies inject certificates that uv's bundled CA store doesn't tru
 ## Setup
 
 ```bash
-uv tool install vmware-storage==2.5.0
+uv tool install vmware-storage==2.6.0
 mkdir -p ~/.vmware-storage
 cp config.example.yaml ~/.vmware-storage/config.yaml
 # Edit config.yaml with your vCenter/ESXi targets

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/skills/vmware-storage/references/cli-reference.md

@@ -276,3 +276,16 @@ Privileges are checked on the root folder: `not_granted_at_root` may still be gr
 |----------|-------------|
 | `VMWARE_STORAGE_CONFIG` | Override config file path (used by MCP server) |
 | `VMWARE_<TARGET>_PASSWORD` | Password for a target (e.g., `VMWARE_MY_VCENTER_PASSWORD`) |
+
+### Datastore JSON envelopes
+
+Add `--json` to `datastore list`, `datastore browse`, or `datastore scan-images`
+for the full successful result envelope, matching the MCP operation's result:
+`items`, `returned`, `limit`, `total`, `truncated`, `hint`, and any extra evidence
+such as `cache_note`. Unknown/null values remain unknown, not zero or complete.
+A successful image scan can carry a local-cache failure note; do not discard it.
+
+Without this option list prints its table and browse/scan-images retain their
+legacy JSON arrays. Other read commands already emit JSON by default. This flag
+does not alter reads, local-cache writes, Policy or auditing. Errors retain the
+existing text message and nonzero exit code; scripts must check the exit status.

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/skills/vmware-storage/references/setup-guide.md

@@ -13,19 +13,19 @@ Complete setup and security guide for `vmware-storage`.
 ### Via uv (recommended)
 
 ```bash
-uv tool install vmware-storage==2.5.0
+uv tool install vmware-storage==2.6.0
 ```
 
 ### Via pip
 
 ```bash
-pip install vmware-storage==2.5.0
+pip install vmware-storage==2.6.0
 ```
 
 ### From source
 
 ```bash
-git clone --branch v2.5.0 https://github.com/vmware-skills/VMware-Storage.git
+git clone --branch v2.6.0 https://github.com/vmware-skills/VMware-Storage.git
 cd VMware-Storage
 pip install -e .
 ```

vmware_storage-2.6.0/tests/eval/regression/test_datastore_cli_json.py

@@ -0,0 +1,62 @@
+"""Successful JSON output must preserve coverage and local-cache evidence."""
+from __future__ import annotations
+
+import json
+from types import SimpleNamespace
+
+import pytest
+from typer.testing import CliRunner
+
+from vmware_storage import cli
+from vmware_storage.ops import datastore_browser, inventory
+
+
+@pytest.fixture
+def connection(monkeypatch):
+    si = object()
+    monkeypatch.setattr(cli, "_get_connection", lambda *a: si)
+    monkeypatch.setattr(cli, "load_config", lambda *a: object())
+    monkeypatch.setattr(cli, "ConnectionManager", lambda *a: SimpleNamespace(
+        resolve_target_name=lambda target: "lab", connect=lambda target: si))
+    return si
+
+
+def _envelope(items):
+    return {"items": items, "returned": len(items), "limit": 2,
+            "total": None, "truncated": True, "hint": "incomplete evidence"}
+
+
+@pytest.mark.parametrize("command,owner,operation", [
+    (["list"], inventory, "list_datastores"),
+    (["browse", "ds"], datastore_browser, "browse_datastore"),
+    (["scan-images", "ds"], datastore_browser, "scan_images"),
+])
+@pytest.mark.parametrize("items", [[], [{"name": "[SSD] 数据", "usage_pct": None}]])
+def test_json_preserves_envelope_even_when_empty_or_unknown(
+    monkeypatch, connection, command, owner, operation, items,
+):
+    envelope = _envelope(items)
+    envelope["cache_note"] = "Scan succeeded but the local cache was not updated"
+    calls = []
+
+    def read(si, *a, **kw):
+        assert si is connection
+        calls.append(kw)
+        return envelope
+
+    monkeypatch.setattr(owner, operation, read)
+    out = CliRunner().invoke(cli.app, ["datastore", *command, "--json"])
+    assert out.exit_code == 0, out.output
+    assert json.loads(out.stdout) == envelope
+    assert len(calls) == 1
+
+
+@pytest.mark.parametrize("command,operation", [
+    (["browse", "ds"], "browse_datastore"), (["scan-images", "ds"], "scan_images"),
+])
+def test_legacy_json_arrays_are_unchanged_without_flag(monkeypatch, connection, command, operation):
+    items = [{"name": "image.iso"}]
+    monkeypatch.setattr(datastore_browser, operation, lambda *a, **kw: _envelope(items))
+    out = CliRunner().invoke(cli.app, ["datastore", *command])
+    assert out.exit_code == 0, out.output
+    assert json.loads(out.stdout) == items

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 5
 requires-python = ">=3.10"
 resolution-markers = [
     "python_full_version >= '3.14' and sys_platform == 'win32'",
@@ -341,7 +341,7 @@ name = "exceptiongroup"
 version = "1.3.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+    { name = "typing-extensions" },
 ]
 sdist = { url = "https://files.pythonhosted.org/packages/50/79/66800aadf48771f6b62f7eb014e352e5d06856655206165d775e675a02c9/exceptiongroup-1.3.1.tar.gz", hash = "sha256:8b412432c6055b0b7d14c310000ae93352ed6754f70fa8f7c34141f91c4e3219", size = 30371, upload-time = "2025-11-21T23:01:54.787Z" }
 wheels = [
@@ -1176,7 +1176,7 @@ wheels = [
 
 [[package]]
 name = "vmware-storage"
-version = "2.5.0"
+version = "2.6.0"
 source = { editable = "." }
 dependencies = [
     { name = "mcp", extra = ["cli"] },

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/vmware_storage/__init__.py

@@ -1,3 +1,3 @@
 """VMware Storage — vSphere datastore, iSCSI, and vSAN management."""
 
-__version__ = "2.5.0"
+__version__ = "2.6.0"

{vmware_storage-2.5.0 → vmware_storage-2.6.0}/vmware_storage/cli.py

@@ -208,6 +208,7 @@ def _usage_cell(usage_pct: float | None) -> Text:
 @handle_cli_errors
 @audited("list_all_datastores")
 def ds_list(
+    as_json: bool = typer.Option(False, "--json", help="Return the complete result envelope"),
     target: str | None = typer.Option(None, help="Target name"),
     config: str | None = typer.Option(None, "--config", help="Config file path"),
 ) -> None:
@@ -215,8 +216,11 @@ def ds_list(
     from vmware_storage.ops.inventory import list_datastores
 
     si = _get_connection(target, config)
-    result = list_datastores(si, include_vm_count=True)["items"]
+    result = list_datastores(si, include_vm_count=True)
     _audit.log_query(target=target or "default", resource="datastores", query_type="list")
+    if as_json:
+        _print_json(result)
+        return
     table = Table(title="Datastores")
     table.add_column("Name", style="bold")
     table.add_column("Type")
@@ -224,7 +228,7 @@ def ds_list(
     table.add_column("Free GB", justify="right")
     table.add_column("Usage %", justify="right")
     table.add_column("VMs", justify="right")
-    for ds in result:
+    for ds in result["items"]:
         table.add_row(
             # Text(), not str: a datastore may legally be called "[SSD] prod",
             # and vCenter's name is data, not markup we wrote.
@@ -245,6 +249,7 @@ def ds_browse(
     ds_name: str = typer.Argument(help="Datastore name"),
     path: str = typer.Option("", help="Subdirectory path"),
     pattern: str = typer.Option("*", help="Glob pattern"),
+    as_json: bool = typer.Option(False, "--json", help="Return the complete result envelope"),
     target: str | None = typer.Option(None, help="Target name"),
     config: str | None = typer.Option(None, "--config", help="Config file path"),
 ) -> None:
@@ -252,9 +257,9 @@ def ds_browse(
     from vmware_storage.ops.datastore_browser import browse_datastore
 
     si = _get_connection(target, config)
-    result = browse_datastore(si, ds_name, path=path, pattern=pattern)["items"]
+    result = browse_datastore(si, ds_name, path=path, pattern=pattern)
     _audit.log_query(target=target or "default", resource=ds_name, query_type="browse")
-    _print_json(result)
+    _print_json(result if as_json else result["items"])
 
 
 @ds_app.command("scan-images")
@@ -262,6 +267,7 @@ def ds_browse(
 @audited("scan_datastore_images")
 def ds_scan_images(
     ds_name: str = typer.Argument(help="Datastore name"),
+    as_json: bool = typer.Option(False, "--json", help="Return the complete result envelope"),
     target: str | None = typer.Option(None, help="Target name"),
     config: str | None = typer.Option(None, "--config", help="Config file path"),
 ) -> None:
@@ -271,9 +277,9 @@ def ds_scan_images(
     conn_mgr = ConnectionManager(load_config(Path(config) if config else None))
     name = conn_mgr.resolve_target_name(target)
     si = conn_mgr.connect(name)
-    result = scan_images(si, ds_name, target=name)["items"]
+    result = scan_images(si, ds_name, target=name)
     _audit.log_query(target=target or "default", resource=ds_name, query_type="scan_images")
-    _print_json(result)
+    _print_json(result if as_json else result["items"])
 
 
 # ---------------------------------------------------------------------------