hap-cli 0.8.24__tar.gz → 0.8.25__tar.gz

{hap_cli-0.8.24 → hap_cli-0.8.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.8.24
+Version: 0.8.25
 Summary: CLI harness for Mingdao HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -273,7 +273,7 @@ discover every subcommand.
 | `chat messages` | 1-on-1 / group / inbox messages |
 | `chat files` | Files shared in a chat |
 | `chat send-to-one` | Send a message, optionally with files (`--file`), to one or more users (1-on-1) |
-| `chat send-to-group` | Send a plain-text message to a group chat |
+| `chat send-to-group` | Send a message, optionally with files, to a group chat |
 | `chat card-detail` | Resolve embedded card references |
 
 ### group — chat group lifecycle
@@ -326,7 +326,7 @@ discover every subcommand.
 |---|---|
 | `config show` | Display the current configuration summary |
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
-| `config language [LANG]` | Switch UI language (`en` / `zh-Hans` / `zh-Hant` / `ja`) |
+| `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |

{hap_cli-0.8.24/hap_cli → hap_cli-0.8.25}/README.md

@@ -244,7 +244,7 @@ discover every subcommand.
 | `chat messages` | 1-on-1 / group / inbox messages |
 | `chat files` | Files shared in a chat |
 | `chat send-to-one` | Send a message, optionally with files (`--file`), to one or more users (1-on-1) |
-| `chat send-to-group` | Send a plain-text message to a group chat |
+| `chat send-to-group` | Send a message, optionally with files, to a group chat |
 | `chat card-detail` | Resolve embedded card references |
 
 ### group — chat group lifecycle
@@ -297,7 +297,7 @@ discover every subcommand.
 |---|---|
 | `config show` | Display the current configuration summary |
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
-| `config language [LANG]` | Switch UI language (`en` / `zh-Hans` / `zh-Hant` / `ja`) |
+| `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |

{hap_cli-0.8.24 → hap_cli-0.8.25/hap_cli}/README.md

@@ -244,7 +244,7 @@ discover every subcommand.
 | `chat messages` | 1-on-1 / group / inbox messages |
 | `chat files` | Files shared in a chat |
 | `chat send-to-one` | Send a message, optionally with files (`--file`), to one or more users (1-on-1) |
-| `chat send-to-group` | Send a plain-text message to a group chat |
+| `chat send-to-group` | Send a message, optionally with files, to a group chat |
 | `chat card-detail` | Resolve embedded card references |
 
 ### group — chat group lifecycle
@@ -297,7 +297,7 @@ discover every subcommand.
 |---|---|
 | `config show` | Display the current configuration summary |
 | `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` completion |
-| `config language [LANG]` | Switch UI language (`en` / `zh-Hans` / `zh-Hant` / `ja`) |
+| `config language [LANG]` | Switch UI language (`en` / `zh-Hans`, or `auto` to follow the account language) |
 | `config update [auto\|notify\|off]` | Self-upgrade mode; `notify` only reports, `off` never checks |
 | `config log on / off / status` | Toggle and inspect API logging |
 | `config log level LEVEL` | `DEBUG / INFO / WARNING / ERROR / CRITICAL` |

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/README_CN.md

@@ -227,6 +227,7 @@ hap --json worksheet record list WORKSHEET_ID
 | `chat messages` | 单聊 / 群聊 / 收件箱（系统、应用、工作流等） |
 | `chat files` | 聊天中分享的文件 |
 | `chat send-to-one` | 向一个或多个用户发消息（单聊），可带附件 `--file`（文件作为聊天附件送达，不是链接） |
+| `chat send-to-group` | 向群聊发消息，可带附件 `--file`，支持 `--at` / `--at-all` 提醒 |
 | `chat group-info` | 群组信息 |
 | `chat card-detail` | 解析消息中嵌入的卡片引用 |
 
@@ -271,7 +272,7 @@ hap --json worksheet record list WORKSHEET_ID
 |---|---|
 | `config show` | 显示 CLI 配置摘要 |
 | `config completion [bash\|zsh\|fish] [--install]` | 启用 `<Tab>` 补全 |
-| `config language [LANG]` | 切换显示语言（`en` / `zh-Hans` / `zh-Hant` / `ja`） |
+| `config language [LANG]` | 切换显示语言（`en` / `zh-Hans`；`auto` 跟随登录账号的语言） |
 | `config update [auto\|notify\|off]` | 自动升级开关；`notify` 只提示不安装，`off` 不检查 |
 | `config log on / off / status` | 日志开关与状态 |
 | `config log level LEVEL` | 设置日志级别（`DEBUG/INFO/WARNING/ERROR/CRITICAL`） |

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/__init__.py

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

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/commands/chat_cmd.py

@@ -320,7 +320,13 @@ def chat_send_to_one(ctx, to, message, files, dry_run):
 
 @chat.command("send-to-group")
 @click.option("--group-id", "-g", required=True, help="Target group ID")
-@click.option("--message", "-m", required=True, help="Message content")
+@click.option("--message", "-m", default="", help="Message text")
+@click.option(
+    "--file", "-f", "files", multiple=True,
+    help="Attach a file: a local path or an http(s) address. Repeat for "
+         "several. The file arrives as an attachment members can open at "
+         "any time, not as a link that stops working.",
+)
 @click.option(
     "--at", "at_account_ids", multiple=True,
     help="Account ID to @-mention (can repeat). Sends a separate "
@@ -331,19 +337,61 @@ def chat_send_to_one(ctx, to, message, files, dry_run):
     "--at-all", is_flag=True, default=False,
     help="@-mention everyone in the group.",
 )
+@click.option(
+    "--dry-run", is_flag=True, default=False,
+    help="Show what would be sent, without uploading or sending anything.",
+)
 @pass_context
-def chat_send_to_group(ctx, group_id, message, at_account_ids, at_all):
-    """Send a plain-text message to a group chat."""
+def chat_send_to_group(ctx, group_id, message, files, at_account_ids, at_all, dry_run):
+    """Send a message, optionally with files, to a group chat.
+
+    \b
+      hap chat send-to-group -g <groupId> -m "spec attached" -f ./spec.pdf
+
+    Text and each file arrive as separate messages, in that order. An
+    @-mention applies to the text line, so it needs --message.
+    """
+    if not message and not files:
+        ctx.handle_error(click.UsageError(
+            "Provide --message, --file, or both."
+        ))
+        return
+    sources = upload_mod.source_descriptors(list(files))
+    at_ids = list(at_account_ids) if at_account_ids else None
+    if dry_run:
+        ctx.output(
+            {"group_id": group_id, "message": message, "files": list(files),
+             "at": at_ids or [], "at_all": at_all, "sent": False},
+            lambda d: click.echo(
+                "Dry run — nothing sent."
+                + f"\n  Group:   {group_id}"
+                + (f"\n  Message: {message}" if message else "")
+                + "".join(f"\n  File:    {f}" for f in files)
+                + (f"\n  @:       {', '.join(at_ids)}" if at_ids else "")
+                + ("\n  @:       everyone" if at_all else "")
+            ),
+        )
+        return
     try:
         session = ctx.get_session()
-        data = chat_mod.send_group_message(
-            session,
-            group_id,
-            message,
-            at_account_ids=list(at_account_ids) if at_account_ids else None,
-            at_all=at_all,
+        if not sources:
+            data = chat_mod.send_group_message(
+                session, group_id, message,
+                at_account_ids=at_ids, at_all=at_all,
+            )
+            ctx.output(data, lambda d: click.echo("Message sent."))
+            return
+        descriptors = chat_mod.upload_chat_files(session, sources)
+        acks = chat_mod.send_group_files(
+            session, group_id, descriptors, message,
+            at_account_ids=at_ids, at_all=at_all,
+        )
+        ctx.output(
+            {"sent": len(acks), "files": len(descriptors), "acks": acks},
+            lambda d: click.echo(
+                f"Sent {len(descriptors)} file(s) to the group."
+            ),
         )
-        ctx.output(data, lambda d: click.echo("Message sent."))
     except Exception as e:
         ctx.handle_error(e)
 

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/commands/config_cmd.py

@@ -2,12 +2,14 @@
 
 from __future__ import annotations
 
+import logging
 import os
 import re
 import time
 from pathlib import Path
 
 import click
+from typing import Optional
 
 from hap_cli.context import pass_context
 from hap_cli.core.logger import (
@@ -20,6 +22,8 @@ from hap_cli.core.logger import (
 )
 from hap_cli.i18n import t
 
+logger = logging.getLogger("hap_cli.config")
+
 
 # ── Shell completion helpers (moved from hap_cli.hap_cli) ────────────────
 
@@ -252,46 +256,119 @@ def config_update(ctx, mode):
 # ── `hap config language` ─────────────────────────────────────────────────
 
 
+# Languages a user can pin here. The catalog and the resolution logic
+# (HAP_LANG, config.json, login auto-detect) still understand every code in
+# ``i18n.LANG_OPTIONS`` — zh-Hant / ja keep working and keep falling back
+# to English where untranslated — they are only hidden from this picker.
+_SELECTABLE_LANGS = ("en", "zh-Hans")
+# Picker entry 0 / argument value "auto": drop the manual pin and follow
+# the language of the HAP account (re-read now, and again at every login).
+_AUTO = "auto"
+
+
+def _detect_account_language(ctx) -> Optional[str]:
+    """Read the HAP account language of the active profile, or ``None``.
+
+    Uses the same lookup as ``hap auth whoami`` (``Global/GetGlobalMeta`` →
+    ``Account.lang``). Any failure — not logged in, expired token, network —
+    yields ``None`` so the caller can still switch to auto mode and let the
+    next login fill the language in.
+    """
+    from hap_cli.core import auth as auth_mod
+    from hap_cli.core.session import (
+        _normalize_login_url, load_profile, resolve_profile_name,
+    )
+    from hap_cli.i18n import lang_from_hap_account
+
+    try:
+        session = ctx.get_session(require_auth=False)
+        if not session.auth_token:
+            return None
+        prof = load_profile(resolve_profile_name(ctx.profile))
+        login_url = _normalize_login_url(
+            prof.get("login_url") or prof.get("server_url", "")
+        ) or "https://www.mingdao.com"
+        info = auth_mod.get_user_info(login_url, session.auth_token)
+        return lang_from_hap_account(str(info.get("lang") or ""))
+    except Exception as exc:  # noqa: BLE001 — auto mode must not fail on lookup
+        logger.warning("Could not read the account language: %s", exc)
+        return None
+
+
 @config.command("language")
 @click.argument(
     "lang",
     required=False,
-    type=click.Choice(["en", "zh-Hans", "zh-Hant", "ja"]),
+    type=click.Choice([_AUTO, *_SELECTABLE_LANGS]),
 )
 @pass_context
 def config_language(ctx, lang):
     """Switch the CLI display language.
 
-    Without an argument, shows an interactive picker. Pass one of
-    ``en`` / ``zh-Hans`` / ``zh-Hant`` / ``ja`` to set non-interactively.
+    Without an argument, shows an interactive picker. Pass ``en`` or
+    ``zh-Hans`` to pin a language, or ``auto`` (``0`` in the picker) to
+    follow the language of the HAP account you log in with.
 
-    The chosen language is saved as a manual preference and pinned —
-    subsequent ``hap auth login`` calls won't overwrite it from the
-    user's HAP account language.
+    A pinned language is saved as a manual preference — subsequent
+    ``hap auth login`` calls won't overwrite it. ``auto`` removes the pin
+    and re-reads the language from your current account right away.
     """
     from hap_cli.core.session import load_config, save_config
-    from hap_cli.i18n import LANG_LABELS, LANG_OPTIONS, reset_language_cache
+    from hap_cli.i18n import DEFAULT_LANGUAGE, LANG_LABELS, reset_language_cache
 
     if lang is None:
         cfg = load_config() or {}
-        current = cfg.get("language") or "en"
-        click.echo("Choose a language / 选择语言 / 選擇語言 / 言語を選択:")
-        for i, code in enumerate(LANG_OPTIONS, start=1):
-            mark = " (current)" if code == current else ""
+        current = cfg.get("language") or DEFAULT_LANGUAGE
+        is_auto = cfg.get("language_source") != "manual"
+        click.echo("Choose a language / 选择语言:")
+        mark = " (current)" if is_auto else ""
+        click.echo(f"  0. Auto — follow your HAP account language  [auto]{mark}")
+        for i, code in enumerate(_SELECTABLE_LANGS, start=1):
+            mark = " (current)" if (not is_auto and code == current) else ""
             click.echo(f"  {i}. {LANG_LABELS[code]}  [{code}]{mark}")
+        if is_auto or current not in _SELECTABLE_LANGS:
+            default_index = 0
+        else:
+            default_index = _SELECTABLE_LANGS.index(current) + 1
         choice = click.prompt(
-            "Enter 1-4",
-            type=click.IntRange(1, len(LANG_OPTIONS)),
-            default=LANG_OPTIONS.index(current) + 1,
+            f"Enter 0-{len(_SELECTABLE_LANGS)}",
+            type=click.IntRange(0, len(_SELECTABLE_LANGS)),
+            default=default_index,
         )
-        lang = LANG_OPTIONS[choice - 1]
+        lang = _AUTO if choice == 0 else _SELECTABLE_LANGS[choice - 1]
+
+    if lang == _AUTO:
+        detected = _detect_account_language(ctx)
+        save_config({
+            "language": detected or DEFAULT_LANGUAGE,
+            "language_source": "auto",
+        })
+        reset_language_cache()
+        if ctx.json_mode:
+            from hap_cli.utils.formatting import output_json
+            output_json({
+                "status": "ok", "mode": "auto",
+                "language": detected or DEFAULT_LANGUAGE,
+                "detected": bool(detected),
+            })
+        elif detected:
+            click.echo(
+                "Language set to: Auto — following your HAP account language "
+                f"({LANG_LABELS[detected]} [{detected}])"
+            )
+        else:
+            click.echo(
+                "Language set to: Auto — it will follow your HAP account "
+                "language after the next login."
+            )
+        return
 
     save_config({"language": lang, "language_source": "manual"})
     reset_language_cache()
     label = LANG_LABELS[lang]
     if ctx.json_mode:
         from hap_cli.utils.formatting import output_json
-        output_json({"status": "ok", "language": lang, "label": label})
+        output_json({"status": "ok", "mode": "manual", "language": lang, "label": label})
     else:
         click.echo(f"Language set to: {label} [{lang}]")
 

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/commands/instance_cmd.py

@@ -182,11 +182,17 @@ def instance_submit(ctx, instance_id, work_id, opinion):
 
 @instance.command("revoke")
 @click.argument("instance_id")
-@click.option("--work-id", "-w", default="", help="Work item ID")
+@click.option("--work-id", "-w", default="",
+              help="Work item ID of the initiating step. Looked up from the "
+                   "flow automatically when omitted.")
 @click.option("--opinion", "-o", default="", help="Revocation reason")
 @pass_context
 def instance_revoke(ctx, instance_id, work_id, opinion):
-    """Revoke/withdraw a submitted instance."""
+    """Revoke/withdraw a submitted instance.
+
+    Only the initiator can withdraw a flow, and only while it is still
+    running.
+    """
     try:
         session = ctx.get_session()
         data = inst_mod.revoke(session, instance_id, work_id, opinion)
@@ -240,13 +246,18 @@ def instance_retry(ctx, instance_id):
 
 @instance.command("restart")
 @click.argument("instance_id")
-@click.option("--work-id", "-w", default="", help="Work item ID")
+@click.option("--work-id", "-w", default="",
+              help="Work item ID of the pending initiating step created by "
+                   "the revoke. Looked up from the flow automatically when "
+                   "omitted.")
 @pass_context
 def instance_restart(ctx, instance_id, work_id):
     """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.
+    start it again. It requires the approval flow to allow re-initiating
+    after a revoke; the initiator then gets a new fill task to submit. It
+    does not apply to flows that already finished.
     """
     try:
         session = ctx.get_session()

{hap_cli-0.8.24 → hap_cli-0.8.25}/hap_cli/core/chat.py

@@ -438,6 +438,79 @@ def send_group_message(
     return ack_data
 
 
+def send_group_files(
+    session: Session,
+    group_id: str,
+    descriptors: list[dict[str, Any]],
+    message: str = "",
+    at_account_ids: Optional[list[str]] = None,
+    at_all: bool = False,
+) -> list[Any]:
+    """Send already-uploaded files (and an optional line of text) to a group.
+
+    Group file messages ride the same socket.io event as group text —
+    ``'send group message'`` (``src/pages/chat/utils/socket.js``
+    ``Message.send`` GROUP branch) — with the same per-message shape the
+    1-on-1 path uses (SendToolbar ``FileUploaded`` → ``onSendFileMsg({file,
+    type}, msg)`` → ``ChatPanelSession.sendMessage``), the only difference
+    being ``togroup`` instead of ``touser`` (ChatPanelSession/index.js:355).
+    Order mirrors the chat panel: the typed text first, then one message
+    per file, all over one connection.
+
+    An @-mention (``at_account_ids`` / ``at_all``) only makes sense on the
+    text line, so the ``'group shake'`` follow-up carries the text
+    message's ack id and is skipped when there is no text — same
+    best-effort contract as :func:`send_group_message`.
+
+    Returns the acks in send order (unwrapped from the ``(err, data)``
+    tuple python-socketio surfaces). Emitting is strict — a failure to
+    deliver raises rather than reporting a phantom success.
+    """
+    import uuid
+
+    if not group_id:
+        raise ValueError("group_id is required")
+    if not descriptors and not message:
+        raise ValueError("nothing to send: provide files, a message, or both")
+
+    emits: list[tuple[str, dict[str, Any]]] = []
+    if message:
+        emits.append(("send group message", {
+            "type": MSGTYPE_TEXT,
+            "msg": message,
+            "togroup": group_id,
+            "waitingid": str(uuid.uuid4()),
+        }))
+    for descriptor in descriptors:
+        msg_type, file_obj = _chat_file_message(descriptor)
+        emits.append(("send group message", {
+            "type": msg_type,
+            "msg": _chat_file_label(msg_type, file_obj["name"]),
+            "file": file_obj,
+            "togroup": group_id,
+            "waitingid": str(uuid.uuid4()),
+        }))
+    raw_acks = _socket_emit_batch(session, emits, strict=True)
+    acks = [
+        ack[1] if isinstance(ack, tuple) and len(ack) >= 2 else ack
+        for ack in raw_acks
+    ]
+
+    to_user: Any = None
+    if at_all:
+        to_user = "all"
+    elif at_account_ids:
+        to_user = list(at_account_ids)
+    if to_user and message:
+        text_ack = acks[0]
+        message_id = text_ack.get("id") if isinstance(text_ack, dict) else None
+        shake_payload: dict[str, Any] = {"gid": group_id, "toUser": to_user}
+        if message_id:
+            shake_payload["messageId"] = message_id
+        _socket_emit(session, "group shake", shake_payload, strict=False)
+    return acks
+
+
 def get_group_info(
     session: Session,
     group_id: str,