hap-cli 0.9.7__tar.gz → 0.9.8__tar.gz

{hap_cli-0.9.7 → hap_cli-0.9.8}/PKG-INFO

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

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/__init__.py

@@ -3,7 +3,7 @@
 import sys as _sys
 import types as _types
 
-__version__ = "0.9.7"
+__version__ = "0.9.8"
 
 # The command tree used to live in hap_cli/hap_cli.py. A module named
 # after the package it sits in shadows that package: run python with the

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/commands/post_cmd.py

@@ -778,8 +778,8 @@ def post_create(ctx, org_id, message, post_type, files, share_group_ids,
     Files given with --file are uploaded and attached to the post.
 
     In the message, #name# files the post under the category (topic) of
-    that name, and [aid]<accountId>[/aid] mentions a person — get the id
-    with `hap contact resolve <name>`. --dry-run lists both, with the
+    that name, and user:<accountId> followed by a space mentions and
+    notifies a person — get the id with `hap contact resolve <name>`. --dry-run lists both, with the
     mentioned names, before anything is published. Details in
     `hap guide post tags`.
     """
@@ -796,7 +796,8 @@ def post_create(ctx, org_id, message, post_type, files, share_group_ids,
             ) or [f"org:{org_id or '<current>'} (everyone, default)"]
             preview = {"audience": audience,
                        "cardToGroups": list(card_group_ids),
-                       "message": message, "files": list(files),
+                       "message": post_mod.mention_syntax(message),
+                       "files": list(files),
                        "categories": post_mod.extract_topics(message),
                        "mentions": _preview_mentions(ctx, org_id, message),
                        "published": False}
@@ -915,7 +916,11 @@ def post_delete(ctx, post_id, yes):
 )
 @pass_context
 def post_comment(ctx, post_id, message, reply_id, reply_account_id, files):
-    """Add a comment to a post, optionally with files attached."""
+    """Add a comment to a post, optionally with files attached.
+
+    Mention someone with user:<accountId> followed by a space; they are
+    notified. Get the id with `hap contact resolve <name>`.
+    """
     try:
         session = ctx.get_session()
         attachments = (post_mod.upload_post_files(

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/core/post.py

@@ -262,14 +262,36 @@ def upload_post_files(
 
 
 # What the feed composer writes into a post body (MDPublic
-# src/components/MentionsInput/index.jsx). The post composer opens it
-# without a sourceType, so a person is `[aid]<accountId>[/aid]`
-# (mentionItemSyntax, :75-76) and a topic is `#name#`, half- or full-width
-# `#` (categoryLetterArr, :19; :308). The server files the post under the
-# category of that name, creating it when new, and reads it back as
-# `categories` — there is no category field on AddPost itself.
+# src/components/MentionsInput/index.jsx). A topic is `#name#`, half- or
+# full-width `#` (categoryLetterArr, :19; :308). The server files the post
+# under the category of that name, creating it when new, and reads it back
+# as `categories` — there is no category field on AddPost itself.
+#
+# A person is `user:<accountId>`: posts and post comments open the
+# composer with sourceType POST, whose mentionItemSyntax is
+# `<type>:<id>` (:75-78), and a captured AddPost / AddPostComment from the
+# web feed (2026-10-12) carries exactly `user:<id> `. The server turns that
+# into the stored `[aid]<id>[/aid]` marker *and* notifies the person.
+# Sending `[aid]…[/aid]` directly renders as a mention but notifies nobody,
+# so callers that learned the stored form are rewritten — the post editor
+# does the same when it loads a post back (EditPostDialog.jsx:94).
 _TOPIC_RE = re.compile(r"[#＃]([^#＃\n]+?)[#＃]")
-_MENTION_RE = re.compile(r"\[aid\]([^\[\]]+?)\[/aid\]")
+_MENTION_RE = re.compile(r"(?<![0-9A-Za-z_])user:([0-9A-Za-z-]+)")
+_STORED_MENTION_RE = re.compile(r"\[aid\]\s*([0-9A-Za-z-]+)\s*\[/aid\]")
+
+
+def mention_syntax(message: str) -> str:
+    """Rewrite stored-form ``[aid]<id>[/aid]`` mentions to ``user:<id>``.
+
+    A space follows each rewritten mention unless whitespace already does,
+    matching the composer, which leaves one after the picked name."""
+    text = message or ""
+
+    def _sub(m: "re.Match[str]") -> str:
+        follow = text[m.end():m.end() + 1]
+        return f"user:{m.group(1)}" + ("" if not follow or follow.isspace() else " ")
+
+    return _STORED_MENTION_RE.sub(_sub, text)
 
 
 def extract_topics(message: str) -> list[str]:
@@ -283,11 +305,11 @@ def extract_topics(message: str) -> list[str]:
 
 
 def extract_mentions(message: str) -> list[str]:
-    """Account ids written as ``[aid]<id>[/aid]`` in a post body, unique."""
+    """Account ids mentioned in a post body (``user:<id>``, or the stored
+    ``[aid]<id>[/aid]`` form), in order, unique."""
     seen: list[str] = []
-    for account_id in _MENTION_RE.findall(message or ""):
-        account_id = account_id.strip()
-        if account_id and account_id not in seen:
+    for account_id in _MENTION_RE.findall(mention_syntax(message)):
+        if account_id not in seen:
             seen.append(account_id)
     return seen
 
@@ -363,7 +385,7 @@ def add_post(
     data: dict[str, Any] = {
         "projectId": project_id,
         "postType": post_type,
-        "postMsg": message,
+        "postMsg": mention_syntax(message),
         "scope": scope,
     }
     if attachments:
@@ -384,7 +406,7 @@ def edit_post(
     doesn't have the previous text we omit it (the server accepts
     either shape, but the frontend always sends the old text).
     """
-    data: dict[str, Any] = {"postId": post_id, "postMsg": message}
+    data: dict[str, Any] = {"postId": post_id, "postMsg": mention_syntax(message)}
     if old_message:
         data["oldPostMsg"] = old_message
     return _require_post_success(
@@ -413,7 +435,7 @@ def add_comment(
     string form as on a post (MDPublic src/pages/feed/components/post/
     comment/postCommentInput.jsx:181-192; pd-openweb identical).
     """
-    data: dict[str, Any] = {"postID": post_id, "message": message}
+    data: dict[str, Any] = {"postID": post_id, "message": mention_syntax(message)}
     if reply_id:
         data["replyID"] = reply_id
     if reply_account_id:

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/guide/en/post.md

@@ -92,19 +92,20 @@ remove it too, recall that message with
 minutes of sending; a group admin can recall a member's message with no limit).
 
 ## 3. Categories and mentions in the body
-<!-- hook: #name# in the body sets the post's category; [aid]accountId[/aid] mentions a person; --dry-run previews both. -->
+<!-- hook: #name# in the body sets the post's category; user:<accountId> mentions and notifies a person; --dry-run previews both. -->
 <!-- alias: tags -->
 
 There is no category option: **the category comes from the body.** Writing
 `#name#` (for example `#今日工作#`) files the post under the category of that
 name, creating it if it is new. List existing ones with `hap post topics`.
 
-To mention someone, write `[aid]<accountId>[/aid]` where the `@name` should
-go. Get the id from the person's name first:
+To mention someone, write `user:<accountId>` followed by a space where the
+`@name` should go — the person is notified. The same works in
+`hap post comment`. Get the id from the person's name first:
 
 ```bash
 hap contact resolve 刘禹            # candidates[].id is the accountId
-hap post create -m "#今日工作# 今天和 [aid]<accountId>[/aid] 对齐了方案" --dry-run
+hap post create -m "#今日工作# 今天和 user:<accountId> 对齐了方案" --dry-run
 ```
 
 A published post's audience cannot be changed, so check with `--dry-run`

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/guide/index.json

@@ -51,8 +51,8 @@
         "zh-Hans": "发动态与发布范围"
       },
       "summary": {
-        "en": "Audience decides who can see a post, and you cannot read it back off an existing one; #name# in the body sets the category, [aid]…[/aid] mentions someone.",
-        "zh-Hans": "发布范围决定谁能看到，且无法从旧动态读出来；正文 #名称# 决定分类，[aid]…[/aid] 提及某人。"
+        "en": "Audience decides who can see a post, and you cannot read it back off an existing one; #name# in the body sets the category, user:<accountId> notifies a person.",
+        "zh-Hans": "发布范围决定谁能看到，且无法从旧动态读出来；正文 #名称# 决定分类，user:<accountId> 提及并通知某人。"
       }
     },
     {

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/guide/zh-Hans/post.md

@@ -80,17 +80,18 @@ hap post create -m "内容" --to-group 9ccde712-xxxx --card-to-group 7f694ec7-xx
 撤回那条卡片消息（自己的消息限发送后 5 分钟内，群管理员撤回他人消息不限时）。
 
 ## 3. 正文里的分类与 @提及
-<!-- hook: 正文 #名称# 定分类，[aid]id[/aid] 提及某人，--dry-run 可预览 -->
+<!-- hook: 正文 #名称# 定分类，user:id 提及并通知某人，--dry-run 可预览 -->
 <!-- alias: tags -->
 
 没有设置分类的选项：**分类由正文决定。** 正文里写 `#名称#`（例如 `#今日工作#`），
 动态就会归到同名分类下，分类不存在时会自动新建。已有分类用 `hap post topics` 查。
 
-要 @ 某人，在想出现「@姓名」的位置写 `[aid]<accountId>[/aid]`。先用姓名查出 id：
+要 @ 某人，在想出现「@姓名」的位置写 `user:<accountId>`，后面跟一个空格，对方会收到提醒。
+`hap post comment` 里写法相同。先用姓名查出 id：
 
 ```bash
 hap contact resolve 刘禹            # candidates[].id 就是 accountId
-hap post create -m "#今日工作# 今天和 [aid]<accountId>[/aid] 对齐了方案" --dry-run
+hap post create -m "#今日工作# 今天和 user:<accountId> 对齐了方案" --dry-run
 ```
 
 动态发出后范围无法再改，所以先用 `--dry-run` 检查：它会列出分类，以及每个

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/locale/messages.json

@@ -4468,8 +4468,8 @@
       "zh-Hans": "以 JSON 格式输出"
     },
     "post comment": {
-      "en": "Add a comment to a post, optionally with files attached.",
-      "zh-Hans": "为动态添加评论，可同时附带文件。"
+      "en": "Add a comment to a post, optionally with files attached.\n\nMention someone with user:<accountId> followed by a space; they are\nnotified. Get the id with `hap contact resolve <name>`.",
+      "zh-Hans": "为动态添加评论，可同时附带文件。\n\n要 @ 某人，写 user:<accountId> 并在后面跟一个空格，对方会收到提醒。用 `hap contact resolve <姓名>` 查 id。"
     },
     "post comment --file": {
       "en": "Attach a file: a local path or an http(s) address. Repeat for several. Videos, pictures and documents all work.",
@@ -4512,8 +4512,8 @@
       "zh-Hans": "以 JSON 格式输出"
     },
     "post create": {
-      "en": "Create a new post in the given organization.\n\nAudience is set with --to-group / --to-org and defaults to everyone in\n--org-id when neither is given. Who can see a post is covered in\n`hap guide post audience`; the group-chat card is `hap guide post card`.\nFiles given with --file are uploaded and attached to the post.\n\nIn the message, #name# files the post under the category (topic) of\nthat name, and [aid]<accountId>[/aid] mentions a person — get the id\nwith `hap contact resolve <name>`. --dry-run lists both, with the\nmentioned names, before anything is published. Details in\n`hap guide post tags`.",
-      "zh-Hans": "在指定组织中发布一条新动态。\n\n发布范围用 --to-group / --to-org 指定，都不给时默认发给 --org-id 组织的全体同事。谁能看到动态见 `hap guide post audience`；群聊卡片见 `hap guide post card`。用 --file 指定的文件会上传并附加到动态上。\n\n正文里写 #名称# 会把动态归到同名分类（话题）下，写 [aid]<accountId>[/aid] 会提及某人——用 `hap contact resolve <姓名>` 查 id。--dry-run 会在发布前列出这两项以及被提及人的姓名。详见 `hap guide post tags`。"
+      "en": "Create a new post in the given organization.\n\nAudience is set with --to-group / --to-org and defaults to everyone in\n--org-id when neither is given. Who can see a post is covered in\n`hap guide post audience`; the group-chat card is `hap guide post card`.\nFiles given with --file are uploaded and attached to the post.\n\nIn the message, #name# files the post under the category (topic) of\nthat name, and user:<accountId> followed by a space mentions and\nnotifies a person — get the id with `hap contact resolve <name>`. --dry-run lists both, with the\nmentioned names, before anything is published. Details in\n`hap guide post tags`.",
+      "zh-Hans": "在指定组织中发布一条新动态。\n\n发布范围用 --to-group / --to-org 指定，都不给时默认发给 --org-id 组织的全体同事。谁能看到动态见 `hap guide post audience`；群聊卡片见 `hap guide post card`。用 --file 指定的文件会上传并附加到动态上。\n\n正文里写 #名称# 会把动态归到同名分类（话题）下，写 user:<accountId> 并在后面跟一个空格会提及并提醒某人——用 `hap contact resolve <姓名>` 查 id。--dry-run 会在发布前列出这两项以及被提及人的姓名。详见 `hap guide post tags`。"
     },
     "post create --card-to-group": {
       "en": "After publishing, also send a card linking to the post into this group chat (repeatable). This is a chat message and does not change who can see the post.",

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli/tests/test_post_group_friction.py

@@ -21,9 +21,52 @@ class TestBodyMarkers:
         assert post_mod.extract_topics("plain text") == []
 
     def test_mentions(self):
-        msg = "hi [aid]a1[/aid] and [aid]b2[/aid] and [aid]a1[/aid]"
+        msg = "hi user:a1 and [aid]b2[/aid] and user:a1 "
         assert post_mod.extract_mentions(msg) == ["a1", "b2"]
 
+    def test_mention_needs_a_word_boundary(self):
+        assert post_mod.extract_mentions("superuser:x1") == []
+
+
+class TestMentionNotifies:
+    """The web feed sends ``user:<id>`` for a mention; the server turns it
+    into the stored ``[aid]`` marker and notifies the person. A raw
+    ``[aid]…[/aid]`` is stored as-is and notifies nobody."""
+
+    AID = "a62d4f33-5ea5-4b35-91b3-0e2dd395f7d1"
+
+    def test_stored_form_is_rewritten(self):
+        assert post_mod.mention_syntax(f"hi [aid]{self.AID}[/aid]你好") == \
+            f"hi user:{self.AID} 你好"
+        assert post_mod.mention_syntax(f"[aid]{self.AID}[/aid] ok") == \
+            f"user:{self.AID} ok"
+        assert post_mod.mention_syntax(f"end [aid]{self.AID}[/aid]") == \
+            f"end user:{self.AID}"
+
+    def test_user_form_left_alone(self):
+        msg = f"这是示例\nuser:{self.AID} 我at了小文"
+        assert post_mod.mention_syntax(msg) == msg
+
+    def test_add_post_sends_user_form(self):
+        session = MagicMock()
+        post_mod.add_post(session, "org1", f"[aid]{self.AID}[/aid] 你好")
+        body = session.api_call.call_args[0][2]
+        assert body["postMsg"] == f"user:{self.AID} 你好"
+
+    def test_add_comment_sends_user_form(self):
+        session = MagicMock()
+        session.api_call.return_value = {"code": 1}
+        with patch.object(post_mod, "_require_post_success", side_effect=lambda r, **k: r):
+            post_mod.add_comment(session, "p1", f"[aid]{self.AID}[/aid] 收到了吗")
+        body = session.api_call.call_args[0][2]
+        assert body["message"] == f"user:{self.AID} 收到了吗"
+
+    def test_edit_post_sends_user_form(self):
+        session = MagicMock()
+        with patch.object(post_mod, "_require_post_success", side_effect=lambda r, **k: r):
+            post_mod.edit_post(session, "p1", f"[aid]{self.AID}[/aid] x")
+        assert session.api_call.call_args[0][2]["postMsg"] == f"user:{self.AID} x"
+
     def test_resolve_accounts_sends_org_and_maps_names(self):
         session = MagicMock()
         session.api_call.return_value = {"list": [{"accountId": "a1", "fullname": "刘禹"}]}
@@ -50,7 +93,7 @@ class TestDryRunPreview:
                 patch("hap_cli.core.post.resolve_accounts",
                       return_value={"a1": "刘禹"}):
             result = CliRunner().invoke(cli, [
-                "post", "create", "-m", "[aid]a1[/aid] [aid]zz[/aid]", "--dry-run"])
+                "post", "create", "-m", "user:a1 [aid]zz[/aid]", "--dry-run"])
         assert result.exit_code == 0, result.output
         assert "Mentions: 刘禹 (a1)" in result.output
         assert "Warning" in result.output and "zz" in result.output
@@ -58,9 +101,14 @@ class TestDryRunPreview:
     def test_help_explains_category_and_mention_syntax(self):
         result = CliRunner().invoke(cli, ["post", "create", "--help"])
         text = " ".join(result.output.split())
-        assert "#name#" in text and "[aid]" in text
+        assert "#name#" in text and "user:<accountId>" in text
+        assert "[aid]" not in text
         assert "hap contact resolve" in text
 
+    def test_comment_help_explains_mentions(self):
+        result = CliRunner().invoke(cli, ["post", "comment", "--help"])
+        assert "user:<accountId>" in " ".join(result.output.split())
+
 
 class TestUploadProgress:
     def test_start_and_done_per_file(self, tmp_path):

{hap_cli-0.9.7 → hap_cli-0.9.8}/hap_cli.egg-info/PKG-INFO

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