hap-cli 0.8.14__tar.gz → 0.8.16__tar.gz

{hap_cli-0.8.14 → hap_cli-0.8.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.14
+Version: 0.8.16
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for Mingdao HAP (hap-cli)."""
 
-__version__ = "0.8.14"
+__version__ = "0.8.16"

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/commands/instance_cmd.py

@@ -243,7 +243,11 @@ def instance_retry(ctx, instance_id):
 @click.option("--work-id", "-w", default="", help="Work item ID")
 @pass_context
 def instance_restart(ctx, instance_id, work_id):
-    """Re-initiate a completed/rejected instance."""
+    """Re-initiate a flow the initiator has revoked.
+
+    Use this after the initiator revoked (withdrew) a still-running flow to
+    start it again. It does not apply to flows that already finished.
+    """
     try:
         session = ctx.get_session()
         data = inst_mod.restart_instance(session, instance_id, work_id)
@@ -354,15 +358,24 @@ def instance_batch(ctx, action, type_, process_id, select, instances_json,
 
 
 def _batch_lifecycle_options(fn):
-    """Shared options for end-batch / retry-batch — both take
-    ``RequestStartProcess`` shape (see instanceVersion.js:144)."""
+    """Shared options for end-batch / retry-batch.
+
+    The primary path takes one or more INSTANCE_IDS (the ids shown in the flow
+    history list) as positional arguments — these become ``sources`` and are
+    the only thing the server needs. The ``--app-id`` + ``--all`` + filter
+    options drive the alternative "select all in a worksheet view" mode.
+    """
     decorators = [
-        click.argument("app_id"),
-        click.option("--trigger-id", default="", help="Trigger/button ID"),
-        click.option("--view-id", default="", help="Source view ID"),
-        click.option("--source", "-s", multiple=True, help="Explicit row ID to act on (repeat)"),
-        click.option("--all", "is_all", is_flag=True, default=False, help="Select all matching rows"),
-        click.option("--keywords", default="", help="Search keyword over rows"),
+        click.argument("instance_ids", nargs=-1),
+        click.option("--source", "-s", multiple=True,
+                     help="Instance ID to act on (repeat; merged with positional IDs)"),
+        click.option("--app-id", "app_id", default="",
+                     help="Worksheet ID — only needed with --all to select every matching row"),
+        click.option("--all", "is_all", is_flag=True, default=False,
+                     help="Select all matching rows (requires --app-id)"),
+        click.option("--view-id", default="", help="Source view ID (for --all)"),
+        click.option("--trigger-id", default="", help="Trigger/button ID (for --all)"),
+        click.option("--keywords", default="", help="Search keyword over rows (for --all)"),
         click.option("--filter-controls", default="", help="JSON array of filter conditions"),
         click.option("--fast-filters", default="", help="JSON array of fast filters"),
         click.option("--nav-group-filters", default="", help="JSON array of nav-group filters"),
@@ -376,12 +389,21 @@ def _batch_lifecycle_options(fn):
 
 
 def _resolve_batch_lifecycle_kwargs(
-    source, is_all, keywords,
+    instance_ids, source, app_id, is_all, keywords,
     filter_controls, fast_filters, nav_group_filters, filters_group,
     data_log, push_unique_id,
 ):
+    sources = list(instance_ids) + list(source)
+    if not sources and not is_all:
+        raise click.UsageError(
+            "Provide at least one INSTANCE_ID (or --source), "
+            "or use --all with --app-id to select a whole view."
+        )
+    if is_all and not app_id:
+        raise click.UsageError("--all requires --app-id (the worksheet ID).")
     return {
-        "sources": list(source) if source else None,
+        "app_id": app_id,
+        "sources": sources or None,
         "is_all": is_all,
         "key_words": keywords,
         "filter_controls": _json.loads(filter_controls) if filter_controls else None,
@@ -398,21 +420,27 @@ def _resolve_batch_lifecycle_kwargs(
 @click.option("--yes", "-y", is_flag=True, help="Skip confirmation")
 @pass_context
 def instance_end_batch(
-    ctx, app_id, trigger_id, view_id, source, is_all, keywords,
+    ctx, instance_ids, source, app_id, is_all, view_id, trigger_id, keywords,
     filter_controls, fast_filters, nav_group_filters, filters_group,
     data_log, push_unique_id, yes,
 ):
-    """Terminate instances in bulk (``v1/instance/endInstanceList``)."""
+    """Terminate one or more running flows in bulk.
+
+    Pass the instance IDs from the flow history list as arguments:
+
+        hap approval end-batch <INSTANCE_ID> [<INSTANCE_ID> ...]
+    """
     try:
+        kwargs = _resolve_batch_lifecycle_kwargs(
+            instance_ids, source, app_id, is_all, keywords,
+            filter_controls, fast_filters, nav_group_filters, filters_group,
+            data_log, push_unique_id,
+        )
         if not yes:
             click.confirm("Terminate the matching instances?", abort=True)
         session = ctx.get_session()
-        kwargs = _resolve_batch_lifecycle_kwargs(
-            source, is_all, keywords, filter_controls, fast_filters,
-            nav_group_filters, filters_group, data_log, push_unique_id,
-        )
         data = inst_mod.end_instance_batch(
-            session, app_id, trigger_id=trigger_id, view_id=view_id, **kwargs,
+            session, view_id=view_id, trigger_id=trigger_id, **kwargs,
         )
         ctx.output(data, lambda d: click.echo(f"Batch terminate dispatched: {d}"))
     except Exception as e:
@@ -423,19 +451,25 @@ def instance_end_batch(
 @_batch_lifecycle_options
 @pass_context
 def instance_retry_batch(
-    ctx, app_id, trigger_id, view_id, source, is_all, keywords,
+    ctx, instance_ids, source, app_id, is_all, view_id, trigger_id, keywords,
     filter_controls, fast_filters, nav_group_filters, filters_group,
     data_log, push_unique_id,
 ):
-    """Retry failed instances in bulk (``v1/instance/resetInstanceList``)."""
+    """Retry one or more failed flows in bulk.
+
+    Pass the instance IDs from the flow history list as arguments:
+
+        hap approval retry-batch <INSTANCE_ID> [<INSTANCE_ID> ...]
+    """
     try:
-        session = ctx.get_session()
         kwargs = _resolve_batch_lifecycle_kwargs(
-            source, is_all, keywords, filter_controls, fast_filters,
-            nav_group_filters, filters_group, data_log, push_unique_id,
+            instance_ids, source, app_id, is_all, keywords,
+            filter_controls, fast_filters, nav_group_filters, filters_group,
+            data_log, push_unique_id,
         )
+        session = ctx.get_session()
         data = inst_mod.reset_instance_batch(
-            session, app_id, trigger_id=trigger_id, view_id=view_id, **kwargs,
+            session, view_id=view_id, trigger_id=trigger_id, **kwargs,
         )
         ctx.output(data, lambda d: click.echo(f"Batch retry dispatched: {d}"))
     except Exception as e:

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/commands/node_cmd.py

@@ -313,13 +313,21 @@ def node_test_code(ctx, process_id, node_id, code, input_json):
 @click.argument("process_id")
 @click.argument("node_id")
 @click.option("--url", "-u", required=True, help="Target URL")
-@click.option("--method", "-m", default="POST", help="HTTP method")
+@click.option("--method", "-m", default="POST",
+              help="HTTP method: GET, POST, PUT, DELETE, HEAD, or PATCH.")
 @click.option("--body", "-b", default="", help="Request body (JSON string)")
 @click.option("--headers", "-H", default="", help="Headers JSON: [{name,value}]")
-@click.option("--content-type", default="application/json", help="Content-Type")
+@click.option("--content-type", default="json",
+              help="Body format: json, text, form-data, "
+                   "x-www-form-urlencoded, or file.")
 @pass_context
 def node_test_webhook(ctx, process_id, node_id, url, method, body, headers, content_type):
-    """Test a WebHook node."""
+    """Run the "Test API" action of a Send Custom Request node.
+
+    Issues the request the node is configured to make and prints the
+    response. Works for any outbound API call the node performs, not just
+    webhook callbacks.
+    """
     try:
         session = ctx.get_session()
         headers_list = json.loads(headers) if headers else None

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/commands/role_cmd.py

@@ -69,7 +69,8 @@ def role_create(ctx, app_id, name, desc, permission):
                    "views are fetched and the full permission structure is "
                    "filled in (unspecified fields/views default to allowed).")
 @click.option("--page-permissions", "page_perms_json", default="",
-              help="Page permission JSON: list of {pageId, enable}.")
+              help="Page permission JSON: list of {id, enable}, where 'id' is "
+                   "the custom-page id ('pageId' is also accepted).")
 @click.option("--hide-app-for-members", is_flag=True, default=False,
               help="Hide the app from members of this role.")
 @pass_context

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/commands/worksheet_cmd.py

@@ -189,12 +189,23 @@ def worksheet_create(ctx, app_id, name, org_id, section_id, icon, icon_color,
 @click.option("--app-id", "-a", default="", help="Application ID")
 @org_id_option()
 @click.option("--copy-rows", is_flag=True, default=False, help="Copy rows as well")
+@click.option("--section-id", default="",
+              help="Sidebar group the copy lands in. Auto-resolved from the "
+                   "source worksheet's group when omitted (requires --app-id).")
 @pass_context
-def worksheet_copy(ctx, worksheet_id, name, app_id, org_id, copy_rows):
-    """Copy a worksheet."""
+def worksheet_copy(ctx, worksheet_id, name, app_id, org_id, copy_rows, section_id):
+    """Copy a worksheet into the same sidebar group as the original.
+
+    Pass --app-id so the target group can be resolved, or set --section-id
+    to place the copy in a specific group.
+    """
     try:
         session = ctx.get_session()
-        data = ws_mod.copy_worksheet(session, worksheet_id, name, app_id, require_api_project_id(session, org_id), copy_rows)
+        data = ws_mod.copy_worksheet(
+            session, worksheet_id, name, app_id,
+            require_api_project_id(session, org_id), copy_rows,
+            section_id=section_id,
+        )
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/core/flow_node.py

@@ -455,6 +455,66 @@ def test_code(
     return session.workflow_call("flowNode/codeTest", data)
 
 
+# flowNode/webHookTestRequest wants integer enums, not strings. Source of
+# truth: pd-openweb src/pages/workflow/WorkflowSettings/enum.js (METHODS_TYPE)
+# and src/pages/workflow/WorkflowSettings/Detail/WebHook/index.jsx
+# (contentTypes + the raw JSON/Text sub-dropdown). Sending "POST" /
+# "application/json" verbatim makes the server answer 400.
+_WEBHOOK_METHODS = {
+    "GET": 1,
+    "POST": 2,
+    "PUT": 3,
+    "DELETE": 14,
+    "HEAD": 5,
+    "PATCH": 6,
+}
+
+_WEBHOOK_CONTENT_TYPES = {
+    "x-www-form-urlencoded": 1,
+    "urlencoded": 1,
+    "json": 2,
+    "application/json": 2,
+    "text": 3,
+    "form-data": 4,
+    "file": 5,
+}
+
+
+def _encode_webhook_method(method: Any) -> int:
+    """Map a friendly HTTP method name to its webHookTestRequest enum int.
+
+    Accepts an int (passed through) or a case-insensitive method name.
+    """
+    if isinstance(method, int):
+        return method
+    key = str(method).strip()
+    if key.isdigit():
+        return int(key)
+    code = _WEBHOOK_METHODS.get(key.upper())
+    if code is None:
+        raise ValueError(
+            f"Unknown HTTP method {method!r}; expected one of "
+            f"{', '.join(_WEBHOOK_METHODS)}."
+        )
+    return code
+
+
+def _encode_webhook_content_type(content_type: Any) -> int:
+    """Map a friendly body format name to its webHookTestRequest enum int."""
+    if isinstance(content_type, int):
+        return content_type
+    key = str(content_type).strip()
+    if key.isdigit():
+        return int(key)
+    code = _WEBHOOK_CONTENT_TYPES.get(key.lower())
+    if code is None:
+        raise ValueError(
+            f"Unknown content type {content_type!r}; expected one of "
+            "json, text, form-data, x-www-form-urlencoded, file."
+        )
+    return code
+
+
 def test_webhook(
     session: Session,
     process_id: str,
@@ -463,22 +523,28 @@ def test_webhook(
     method: str = "POST",
     headers: Optional[list] = None,
     body: str = "",
-    content_type: str = "application/json",
+    content_type: str = "json",
     params: Optional[list] = None,
     auth_id: str = "",
     settings: Optional[dict] = None,
 ) -> dict[str, Any]:
-    """Test a WebHook request.
+    """Send the HTTP request configured on a "Send Custom Request" node.
+
+    This drives the node's "Test API" action (flowNode/webHookTestRequest):
+    it issues the configured outbound request and returns the response —
+    it works for any API call the node makes, not just webhook callbacks.
 
     Args:
         session: Active session
         process_id: Process ID
-        node_id: WebHook node ID
+        node_id: Send-Custom-Request node ID
         url: Target URL
-        method: HTTP method
+        method: HTTP method name (GET/POST/PUT/DELETE/HEAD/PATCH) or its
+            enum int. Mapped to the integer the endpoint requires.
         headers: Request headers [{name, value}]
         body: Request body (JSON string)
-        content_type: Content-Type header
+        content_type: Body format — json, text, form-data,
+            x-www-form-urlencoded, or file — or its enum int.
         params: URL parameters [{name, value}]
         auth_id: Authentication config ID
         settings: Additional settings
@@ -490,8 +556,8 @@ def test_webhook(
         "processId": process_id,
         "nodeId": node_id,
         "url": url,
-        "method": method,
-        "contentType": content_type,
+        "method": _encode_webhook_method(method),
+        "contentType": _encode_webhook_content_type(content_type),
     }
     if headers:
         data["headers"] = headers

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/core/instance.py

@@ -628,7 +628,12 @@ def restart_instance(
     instance_id: str,
     work_id: str = "",
 ) -> dict[str, Any]:
-    """Re-initiate a rejected/completed instance.
+    """Re-initiate an instance that the initiator has revoked.
+
+    This is the "撤回后重新发起" action (instance/restart, paired with
+    instance/revoke; operation types 13/19 in ExecDialog/StepItem). It applies
+    to an instance the initiator previously revoked while it was still running
+    — NOT to an already-completed or rejected instance.
 
     Args:
         session: Active session
@@ -647,13 +652,22 @@ def restart_instance(
 # ── Batch lifecycle ─────────────────────────────────────────────────────
 #
 # ``endInstanceList`` and ``resetInstanceList`` take a ``RequestStartProcess``
-# payload that describes a selection over a worksheet view (same shape used
-# by worksheet trigger batch ops). Callers either enumerate explicit
-# ``sources`` row ids OR flip ``is_all`` on and describe the filter.
+# payload (instanceVersion.js:144). There are two ways to select the target
+# instances:
+#   1. Explicit ``sources`` = a list of instance ids (the ids returned by the
+#      flow-history list). This is the only shape the frontend ever sends —
+#      HistoryHeader.jsx:95/112 calls ``{sources: [id, ...]}`` with nothing
+#      else. ``appId`` is NOT required and must NOT be injected, otherwise the
+#      server 500s when it is given a value that is not a real worksheet id.
+#   2. ``is_all`` selection over a worksheet view — then ``appId`` (the
+#      worksheet id, named ``appId`` in the schema) plus the filter fields are
+#      required.
+# Therefore ``appId`` and ``isAll`` are only added to the body when they carry
+# meaning; an empty ``appId`` or ``isAll=False`` must not leak into the payload.
 
 
 def _build_request_start_process(
-    app_id: str,
+    app_id: str = "",
     trigger_id: str = "",
     view_id: str = "",
     sources: Optional[list] = None,
@@ -666,11 +680,16 @@ def _build_request_start_process(
     data_log: str = "",
     push_unique_id: str = "",
 ) -> dict[str, Any]:
-    """Assemble a ``RequestStartProcess`` body per instanceVersion.js:144."""
-    data: dict[str, Any] = {
-        "appId": app_id,
-        "isAll": is_all,
-    }
+    """Assemble a ``RequestStartProcess`` body per instanceVersion.js:144.
+
+    ``appId`` is only emitted when non-empty and ``isAll`` only when ``True``;
+    the explicit-``sources`` path (the common case) sends just ``sources``.
+    """
+    data: dict[str, Any] = {}
+    if app_id:
+        data["appId"] = app_id
+    if is_all:
+        data["isAll"] = is_all
     if trigger_id:
         data["triggerId"] = trigger_id
     if view_id:
@@ -696,7 +715,7 @@ def _build_request_start_process(
 
 def end_instance_batch(
     session: Session,
-    app_id: str,
+    app_id: str = "",
     *,
     trigger_id: str = "",
     view_id: str = "",
@@ -712,9 +731,11 @@ def end_instance_batch(
 ) -> dict[str, Any]:
     """Terminate instances in bulk (``v1/instance/endInstanceList``).
 
-    Either pass ``sources`` (explicit row ids) or flip ``is_all=True`` and
-    describe the selection filter via ``filter_controls`` / ``fast_filters``
-    / ``filters_group`` / etc.
+    Either pass ``sources`` (explicit instance ids from the flow-history list)
+    or flip ``is_all=True`` with ``app_id`` (the worksheet id) and describe the
+    selection filter via ``filter_controls`` / ``fast_filters`` /
+    ``filters_group`` / etc. In the common ``sources`` path ``app_id`` is left
+    empty and is not sent.
     """
     data = _build_request_start_process(
         app_id, trigger_id=trigger_id, view_id=view_id,
@@ -728,7 +749,7 @@ def end_instance_batch(
 
 def reset_instance_batch(
     session: Session,
-    app_id: str,
+    app_id: str = "",
     *,
     trigger_id: str = "",
     view_id: str = "",

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/core/role_perm_builder.py

@@ -142,6 +142,27 @@ def complete_worksheet_permission(
     }
 
 
+def _normalize_page_permissions(
+    page_permissions: Optional[list[dict[str, Any]]],
+) -> list[dict[str, Any]]:
+    """Normalize each custom-page permission to the V3 ``{id, enable}`` shape.
+
+    The V3 ``/v3/app/roles`` schema requires ``id`` (the custom-page id) for
+    each entry. ``pageId`` is accepted as a friendly alias and rewritten to
+    ``id`` so both spellings work.
+    """
+    normalized: list[dict[str, Any]] = []
+    for pp in page_permissions or []:
+        if not isinstance(pp, dict):
+            normalized.append(pp)
+            continue
+        entry = dict(pp)
+        if "id" not in entry and "pageId" in entry:
+            entry["id"] = entry.pop("pageId")
+        normalized.append(entry)
+    return normalized
+
+
 def create_role_fine_grained(
     session: Any,
     app_id: str,
@@ -168,7 +189,7 @@ def create_role_fine_grained(
         "permissionScope": 0,
         "hideAppForMembers": hide_app_for_members,
         "worksheetPermissions": complete_ws_perms,
-        "pagePermissions": page_permissions or [],
+        "pagePermissions": _normalize_page_permissions(page_permissions),
     }
     return session.v3_call(
         "POST", "/v3/app/roles", app_id=app_id, body=body,

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/core/worksheet.py

@@ -351,13 +351,34 @@ def copy_worksheet(
     app_id: str = "",
     project_id: str = "",
     copy_rows: bool = False,
+    section_id: str = "",
 ) -> dict[str, Any]:
-    """Copy a worksheet."""
-    data: dict[str, Any] = {"worksheetId": worksheet_id, "name": name}
+    """Copy a worksheet.
+
+    CopyWorksheet needs ``appSectionId`` — the sidebar group the new
+    worksheet should land in. Without it the server answers "服务异常"
+    (evidence: pd-openweb src/pages/worksheet/redux/actions/sheetList.js
+    copySheet + WorkSheetLeft/MoreOperation.jsx, both of which always send
+    ``appSectionId``). When ``section_id`` is omitted but ``app_id`` is
+    given, resolve it from the source worksheet's own section so the copy
+    lands beside the original.
+    """
+    data: dict[str, Any] = {
+        "worksheetId": worksheet_id,
+        "name": name,
+        "relationControlIds": [],
+    }
     if app_id:
         data["appId"] = app_id
     if project_id:
         data["projectId"] = project_id
+    if not section_id and app_id:
+        from hap_cli.core import app as _app
+        section_id, _ = _app.find_worksheet_section(
+            session, app_id, worksheet_id,
+        )
+    if section_id:
+        data["appSectionId"] = section_id
     data["isCopyRows"] = copy_rows
     return session.api_call("Worksheet", "CopyWorksheet", data)
 

{hap_cli-0.8.14 → hap_cli-0.8.16}/hap_cli/locale/messages.json

@@ -1156,10 +1156,10 @@
       "en": "0=end, 1=active"
     },
     "approval end-batch": {
-      "en": "Terminate instances in bulk (``v1/instance/endInstanceList``)."
+      "en": "Terminate one or more running flows in bulk.\n\nPass the instance IDs from the flow history list as arguments:\n\n    hap approval end-batch <INSTANCE_ID> [<INSTANCE_ID> ...]"
     },
     "approval end-batch --all": {
-      "en": "Select all matching rows"
+      "en": "Select all matching rows (requires --app-id)"
     },
     "approval end-batch --data-log": {
       "en": "Extended trigger context blob"
@@ -1174,7 +1174,7 @@
       "en": "JSON array of custom-page filter groups"
     },
     "approval end-batch --keywords": {
-      "en": "Search keyword over rows"
+      "en": "Search keyword over rows (for --all)"
     },
     "approval end-batch --nav-group-filters": {
       "en": "JSON array of nav-group filters"
@@ -1183,13 +1183,13 @@
       "en": "Client-side push dedup id"
     },
     "approval end-batch --source": {
-      "en": "Explicit row ID to act on (repeat)"
+      "en": "Instance ID to act on (repeat; merged with positional IDs)"
     },
     "approval end-batch --trigger-id": {
-      "en": "Trigger/button ID"
+      "en": "Trigger/button ID (for --all)"
     },
     "approval end-batch --view-id": {
-      "en": "Source view ID"
+      "en": "Source view ID (for --all)"
     },
     "approval forward": {
       "en": "Forward a task to another user."
@@ -1276,7 +1276,7 @@
       "en": "Work item ID"
     },
     "approval restart": {
-      "en": "Re-initiate a completed/rejected instance."
+      "en": "Re-initiate a flow the initiator has revoked.\n\nUse this after the initiator revoked (withdrew) a still-running flow to start it again. It does not apply to flows that already finished."
     },
     "approval restart --work-id": {
       "en": "Work item ID"
@@ -1285,10 +1285,10 @@
       "en": "Retry a failed instance."
     },
     "approval retry-batch": {
-      "en": "Retry failed instances in bulk (``v1/instance/resetInstanceList``)."
+      "en": "Retry one or more failed flows in bulk.\n\nPass the instance IDs from the flow history list as arguments:\n\n    hap approval retry-batch <INSTANCE_ID> [<INSTANCE_ID> ...]"
     },
     "approval retry-batch --all": {
-      "en": "Select all matching rows"
+      "en": "Select all matching rows (requires --app-id)"
     },
     "approval retry-batch --data-log": {
       "en": "Extended trigger context blob"
@@ -1303,7 +1303,7 @@
       "en": "JSON array of custom-page filter groups"
     },
     "approval retry-batch --keywords": {
-      "en": "Search keyword over rows"
+      "en": "Search keyword over rows (for --all)"
     },
     "approval retry-batch --nav-group-filters": {
       "en": "JSON array of nav-group filters"
@@ -1312,13 +1312,13 @@
       "en": "Client-side push dedup id"
     },
     "approval retry-batch --source": {
-      "en": "Explicit row ID to act on (repeat)"
+      "en": "Instance ID to act on (repeat; merged with positional IDs)"
     },
     "approval retry-batch --trigger-id": {
-      "en": "Trigger/button ID"
+      "en": "Trigger/button ID (for --all)"
     },
     "approval retry-batch --view-id": {
-      "en": "Source view ID"
+      "en": "Source view ID (for --all)"
     },
     "approval revoke": {
       "en": "Revoke/withdraw a submitted instance."
@@ -2599,19 +2599,19 @@
       "en": "Input data JSON: [{name,value,type}]"
     },
     "workflow node test-webhook": {
-      "en": "Test a WebHook node."
+      "en": "Run the \"Test API\" action of a Send Custom Request node."
     },
     "workflow node test-webhook --body": {
       "en": "Request body (JSON string)"
     },
     "workflow node test-webhook --content-type": {
-      "en": "Content-Type"
+      "en": "Body format: json, text, form-data, x-www-form-urlencoded, or file."
     },
     "workflow node test-webhook --headers": {
       "en": "Headers JSON: [{name,value}]"
     },
     "workflow node test-webhook --method": {
-      "en": "HTTP method"
+      "en": "HTTP method: GET, POST, PUT, DELETE, HEAD, or PATCH."
     },
     "workflow node test-webhook --url": {
       "en": "Target URL"
@@ -2713,7 +2713,7 @@
       "en": "Worksheet operations."
     },
     "worksheet copy": {
-      "en": "Copy a worksheet."
+      "en": "Copy a worksheet into the same sidebar group as the original."
     },
     "worksheet copy --app-id": {
       "en": "Application ID"
@@ -2724,6 +2724,9 @@
     "worksheet copy --org-id": {
       "en": "Organization ID"
     },
+    "worksheet copy --section-id": {
+      "en": "Sidebar group the copy lands in. Auto-resolved from the source worksheet's group when omitted (requires --app-id)."
+    },
     "worksheet create": {
       "en": "Create a worksheet with the full v3 field-type set including Attachment."
     },
@@ -3257,6 +3260,12 @@
     },
     "worksheet view sort": {
       "en": "Reorder worksheet views. Pass view IDs in desired order."
+    },
+    "approval end-batch --app-id": {
+      "en": "Worksheet ID — only needed with --all to select every matching row"
+    },
+    "approval retry-batch --app-id": {
+      "en": "Worksheet ID — only needed with --all to select every matching row"
     }
   }
 }