hap-cli 0.6.0__tar.gz → 0.6.5__tar.gz

{hap_cli-0.6.0 → hap_cli-0.6.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.6.0
+Version: 0.6.5
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -53,16 +53,19 @@ hap auth login nocoly     # Nocoly
 hap auth login https://hap.example.com   # Self-hosted
 ```
 
-Opens your browser to the MingDAO login page. After login, the token is saved automatically, your organizations are fetched immediately, and the first org is stored as the current org.
+Opens your browser to the MingDAO login page. After login, your organizations are fetched immediately, and the first org is stored as the current org.
 
-**Option B: Manual token**
+**Option B: Manual token (headless / scripted)**
 
 ```bash
-hap auth set \
-  --server https://your-mingdao-server.com \
-  --token YOUR_MD_PSS_ID_TOKEN
+hap auth login https://your-mingdao-server.com --token YOUR_PERSONAL_ACCESS_TOKEN
 ```
 
+If the browser flow is running but the callback never reaches the CLI (e.g. remote
+server, restrictive firewall), interrupt the command (the usual shell interrupt
+shortcut for your terminal) to fall back to an interactive paste prompt for the
+token shown on the success page.
+
 **Other auth commands**
 
 ```bash
@@ -105,11 +108,9 @@ hap --json worksheet record list WORKSHEET_ID
 
 | Command | Description |
 |---|---|
-| `auth login` | Login via browser |
+| `auth login` | Login via browser (use `--token` for scripted login) |
 | `auth logout` | Clear saved auth token |
-| `auth set` | Set server address and auth token |
-| `auth show` | Show current configuration |
-| `auth whoami` | Show current logged-in user info |
+| `auth whoami` | Show current logged-in user and current organization |
 | `auth list-my-orgs` | List all organizations for current user |
 | `auth switch-org` | Switch saved current organization |
 
@@ -308,7 +309,7 @@ hap --json worksheet record list WORKSHEET_ID
 
 | Command | Description |
 |---|---|
-| `contact search` | Search contacts and departments |
+| `contact search` | Search contacts by keyword within an organization |
 | `contact resolve` | Resolve accountId by name/email/phone |
 | `contact friends` | List contacts in address book |
 | `contact friend-requests` | List pending friend requests |
@@ -333,17 +334,20 @@ hap --json worksheet record list WORKSHEET_ID
 | Command | Description |
 |---|---|
 | `post list` | List feed posts |
-| `post get` | Get post details |
+| `post search` | Search posts by keyword and date range |
+| `post get` | Show a post with its comment thread |
 | `post create` | Create a new post |
-| `post update` | Update a post |
+| `post update` | Edit a post's content |
 | `post delete` | Delete a post |
-| `post search` | Search posts by keyword and date range |
-| `post pinned` | List pinned posts |
-| `post top` | Pin or unpin a post |
-| `post like` | Like or unlike a post |
-| `post favorite` | Favorite or unfavorite a post |
-| `post comments` | List comments on a post |
 | `post comment` | Add a comment to a post |
+| `post comments` | List all comments on a post |
+| `post comment-delete` | Delete a comment |
+| `post like` | Like a post (`--remove` to unlike) |
+| `post likes` | List users who liked a post |
+| `post favorite` | Favorite a post (`--remove` to unfavorite) |
+| `post pin` | Pin a post (`--hours` for duration) |
+| `post unpin` | Unpin a post |
+| `post pinned` | List pinned posts |
 
 ### calendar — Calendar Management
 
@@ -363,25 +367,11 @@ hap --json worksheet record list WORKSHEET_ID
 | Command | Description |
 |---|---|
 | `chat list` | List recent chat sessions |
-| `chat history` | Get 1-on-1 or group chat history |
+| `chat files` | List files shared in a 1-on-1 or group chat |
+| `chat messages` | Fetch 1-on-1, group, or inbox (system / app / workflow / ...) messages |
 | `chat send` | Send a message to one or more users |
-| `chat send-file` | Send a file to a chat (supports both 1-on-1 and group) |
-| `chat send-card` | Send a card to a chat (supports both 1-on-1 and group) |
+| `chat group-info` | Get information about a chat group |
 | `chat card-detail` | Resolve card references embedded in chat messages |
-| `chat start` | Start a 1-on-1 chat with another user |
-
-#### chat group — Group Management
-
-| Command | Description |
-|---|---|
-| `chat group list` | List groups |
-| `chat group info` | Get group information |
-| `chat group create` | Create a group chat (supports keyword member resolution, at least 2 members) |
-| `chat group update` | Update group name and/or announcement |
-| `chat group delete` | Disband a group |
-| `chat group members` | List group members |
-| `chat group remove-member` | Remove member from a group |
-| `chat group files` | List files in a group |
 
 ## Workflow Management
 
@@ -462,7 +452,8 @@ hap> quit
 ## API Authentication
 
 The CLI uses MingDAO's `md_pss_id` session token. Use `hap auth login` for
-browser-based login, or `hap auth set --token TOKEN` to set the token manually.
+browser-based login, or `hap auth login --token TOKEN` to supply a token
+non-interactively (e.g. on a headless server).
 
 Commands that expose `--org-id` will use the saved current org when you omit the option.
 
@@ -506,9 +497,6 @@ hap app role add-member APP_ID ROLE_ID -u USER_ID
 # Manage option sets
 hap app optionset list APP_ID
 
-# Manage chat groups
-hap chat group list
-
 # Terminate a stuck instance
 hap approval terminate INSTANCE_ID --yes
 

{hap_cli-0.6.0 → hap_cli-0.6.5}/hap_cli/README.md

@@ -24,16 +24,19 @@ hap auth login nocoly     # Nocoly
 hap auth login https://hap.example.com   # Self-hosted
 ```
 
-Opens your browser to the MingDAO login page. After login, the token is saved automatically, your organizations are fetched immediately, and the first org is stored as the current org.
+Opens your browser to the MingDAO login page. After login, your organizations are fetched immediately, and the first org is stored as the current org.
 
-**Option B: Manual token**
+**Option B: Manual token (headless / scripted)**
 
 ```bash
-hap auth set \
-  --server https://your-mingdao-server.com \
-  --token YOUR_MD_PSS_ID_TOKEN
+hap auth login https://your-mingdao-server.com --token YOUR_PERSONAL_ACCESS_TOKEN
 ```
 
+If the browser flow is running but the callback never reaches the CLI (e.g. remote
+server, restrictive firewall), interrupt the command (the usual shell interrupt
+shortcut for your terminal) to fall back to an interactive paste prompt for the
+token shown on the success page.
+
 **Other auth commands**
 
 ```bash
@@ -76,11 +79,9 @@ hap --json worksheet record list WORKSHEET_ID
 
 | Command | Description |
 |---|---|
-| `auth login` | Login via browser |
+| `auth login` | Login via browser (use `--token` for scripted login) |
 | `auth logout` | Clear saved auth token |
-| `auth set` | Set server address and auth token |
-| `auth show` | Show current configuration |
-| `auth whoami` | Show current logged-in user info |
+| `auth whoami` | Show current logged-in user and current organization |
 | `auth list-my-orgs` | List all organizations for current user |
 | `auth switch-org` | Switch saved current organization |
 
@@ -279,7 +280,7 @@ hap --json worksheet record list WORKSHEET_ID
 
 | Command | Description |
 |---|---|
-| `contact search` | Search contacts and departments |
+| `contact search` | Search contacts by keyword within an organization |
 | `contact resolve` | Resolve accountId by name/email/phone |
 | `contact friends` | List contacts in address book |
 | `contact friend-requests` | List pending friend requests |
@@ -304,17 +305,20 @@ hap --json worksheet record list WORKSHEET_ID
 | Command | Description |
 |---|---|
 | `post list` | List feed posts |
-| `post get` | Get post details |
+| `post search` | Search posts by keyword and date range |
+| `post get` | Show a post with its comment thread |
 | `post create` | Create a new post |
-| `post update` | Update a post |
+| `post update` | Edit a post's content |
 | `post delete` | Delete a post |
-| `post search` | Search posts by keyword and date range |
-| `post pinned` | List pinned posts |
-| `post top` | Pin or unpin a post |
-| `post like` | Like or unlike a post |
-| `post favorite` | Favorite or unfavorite a post |
-| `post comments` | List comments on a post |
 | `post comment` | Add a comment to a post |
+| `post comments` | List all comments on a post |
+| `post comment-delete` | Delete a comment |
+| `post like` | Like a post (`--remove` to unlike) |
+| `post likes` | List users who liked a post |
+| `post favorite` | Favorite a post (`--remove` to unfavorite) |
+| `post pin` | Pin a post (`--hours` for duration) |
+| `post unpin` | Unpin a post |
+| `post pinned` | List pinned posts |
 
 ### calendar — Calendar Management
 
@@ -334,25 +338,11 @@ hap --json worksheet record list WORKSHEET_ID
 | Command | Description |
 |---|---|
 | `chat list` | List recent chat sessions |
-| `chat history` | Get 1-on-1 or group chat history |
+| `chat files` | List files shared in a 1-on-1 or group chat |
+| `chat messages` | Fetch 1-on-1, group, or inbox (system / app / workflow / ...) messages |
 | `chat send` | Send a message to one or more users |
-| `chat send-file` | Send a file to a chat (supports both 1-on-1 and group) |
-| `chat send-card` | Send a card to a chat (supports both 1-on-1 and group) |
+| `chat group-info` | Get information about a chat group |
 | `chat card-detail` | Resolve card references embedded in chat messages |
-| `chat start` | Start a 1-on-1 chat with another user |
-
-#### chat group — Group Management
-
-| Command | Description |
-|---|---|
-| `chat group list` | List groups |
-| `chat group info` | Get group information |
-| `chat group create` | Create a group chat (supports keyword member resolution, at least 2 members) |
-| `chat group update` | Update group name and/or announcement |
-| `chat group delete` | Disband a group |
-| `chat group members` | List group members |
-| `chat group remove-member` | Remove member from a group |
-| `chat group files` | List files in a group |
 
 ## Workflow Management
 
@@ -433,7 +423,8 @@ hap> quit
 ## API Authentication
 
 The CLI uses MingDAO's `md_pss_id` session token. Use `hap auth login` for
-browser-based login, or `hap auth set --token TOKEN` to set the token manually.
+browser-based login, or `hap auth login --token TOKEN` to supply a token
+non-interactively (e.g. on a headless server).
 
 Commands that expose `--org-id` will use the saved current org when you omit the option.
 
@@ -477,9 +468,6 @@ hap app role add-member APP_ID ROLE_ID -u USER_ID
 # Manage option sets
 hap app optionset list APP_ID
 
-# Manage chat groups
-hap chat group list
-
 # Terminate a stuck instance
 hap approval terminate INSTANCE_ID --yes
 

{hap_cli-0.6.0 → hap_cli-0.6.5}/hap_cli/README_CN.md

@@ -26,17 +26,16 @@ hap auth login nocoly     # nocoly
 hap auth login https://hap.example.com   # 私有部署
 ```
 
-执行后会自动打开浏览器，在明道云页面完成登录后，token 会自动保存到本地配置，并立即拉取你所属的组织列表，将第一个组织保存为当前组织。
+执行后会自动打开浏览器，在明道云页面完成登录后，token 会自动保存，并立即拉取你所属的组织列表，将第一个组织保存为当前组织。
 
-**方式二：手动配置 Token**
+**方式二：手动粘贴 Token（无浏览器 / 脚本化场景）**
 
 ```bash
-hap auth set \
-  --server https://你的明道云服务器地址 \
-  --token 你的_MD_PSS_ID_令牌
+hap auth login https://你的明道云服务器地址 --token 你的个人访问令牌
 ```
 
-> `md_pss_id` 令牌可从浏览器登录明道云后的 Cookie 中获取。
+如果浏览器登录已完成但回调没能送回 CLI（比如远程服务器、防火墙拦截），
+在等待界面使用终端的中断快捷键打断当前命令，CLI 会自动切换到交互式粘贴模式，把登录成功页上的 token 贴回命令行即可。
 
 > 所有带 `--org-id` 的命令，在未显式传参时都会默认使用当前保存的组织。
 
@@ -87,11 +86,9 @@ hap --json worksheet record list 工作表ID
 
 | 命令 | 说明 |
 |---|---|
-| `auth login` | 通过浏览器登录 |
+| `auth login` | 通过浏览器登录（加 `--token` 可非交互式登录） |
 | `auth logout` | 清除已保存的认证令牌 |
-| `auth set` | 设置服务器地址和认证令牌 |
-| `auth show` | 显示当前配置 |
-| `auth whoami` | 显示当前登录用户信息 |
+| `auth whoami` | 显示当前登录用户及当前组织 |
 | `auth list-my-orgs` | 列出当前用户所属的所有组织 |
 | `auth switch-org` | 切换已保存的当前组织 |
 
@@ -290,7 +287,7 @@ hap --json worksheet record list 工作表ID
 
 | 命令 | 说明 |
 |---|---|
-| `contact search` | 搜索联系人和部门 |
+| `contact search` | 在组织内按关键词搜索联系人 |
 | `contact resolve` | 根据姓名/邮箱/手机号解析 accountId |
 | `contact friends` | 列出通讯录中的联系人 |
 | `contact friend-requests` | 列出待处理的好友请求 |
@@ -315,17 +312,20 @@ hap --json worksheet record list 工作表ID
 | 命令 | 说明 |
 |---|---|
 | `post list` | 列出动态帖子 |
-| `post get` | 获取帖子详情 |
+| `post search` | 按关键词和日期范围搜索帖子 |
+| `post get` | 查看帖子详情（含评论） |
 | `post create` | 创建新帖子 |
-| `post update` | 更新帖子 |
+| `post update` | 编辑帖子内容 |
 | `post delete` | 删除帖子 |
-| `post search` | 按关键词和日期范围搜索帖子 |
-| `post pinned` | 列出置顶帖子 |
-| `post top` | 置顶或取消置顶帖子 |
-| `post like` | 点赞或取消点赞帖子 |
-| `post favorite` | 收藏或取消收藏帖子 |
-| `post comments` | 列出帖子的评论 |
 | `post comment` | 为帖子添加评论 |
+| `post comments` | 列出帖子的所有评论 |
+| `post comment-delete` | 删除一条评论 |
+| `post like` | 点赞帖子（`--remove` 取消） |
+| `post likes` | 列出点赞该帖子的用户 |
+| `post favorite` | 收藏帖子（`--remove` 取消） |
+| `post pin` | 置顶帖子（`--hours` 指定时长） |
+| `post unpin` | 取消置顶 |
+| `post pinned` | 列出置顶帖子 |
 
 ### calendar — 日程管理
 
@@ -345,25 +345,11 @@ hap --json worksheet record list 工作表ID
 | 命令 | 说明 |
 |---|---|
 | `chat list` | 列出最近的聊天会话 |
-| `chat history` | 获取单聊或群聊的聊天记录 |
+| `chat files` | 列出单聊或群聊中分享的文件 |
+| `chat messages` | 获取单聊、群聊或收件箱（系统/应用/工作流等）消息 |
 | `chat send` | 向一个或多个用户发送消息 |
-| `chat send-file` | 向聊天发送文件（支持单聊和群聊） |
-| `chat send-card` | 向聊天发送卡片（支持单聊和群聊） |
+| `chat group-info` | 获取群组信息 |
 | `chat card-detail` | 解析聊天消息中嵌入的卡片引用 |
-| `chat start` | 发起与另一用户的单聊 |
-
-#### chat group — 群组管理
-
-| 命令 | 说明 |
-|---|---|
-| `chat group list` | 列出群组 |
-| `chat group info` | 获取群组信息 |
-| `chat group create` | 创建群聊（支持关键词解析成员，至少两个成员） |
-| `chat group update` | 更新群组名称和/或公告 |
-| `chat group delete` | 解散群组 |
-| `chat group members` | 列出群组成员 |
-| `chat group remove-member` | 从群组移除成员 |
-| `chat group files` | 列出群组中的文件 |
 
 ## 工作流管理
 
@@ -874,12 +860,3 @@ hap approval approve 实例ID --opinion "费用合理，同意报销"
 # 查看执行结果
 hap --json approval history-detail 实例ID
 ```
-
-## 认证说明
-
-本工具使用明道云的 `md_pss_id` 会话令牌进行认证。获取方式：
-
-1. 在浏览器中登录明道云
-2. 打开开发者工具 (F12)
-3. 在 Application > Cookies 中找到 `md_pss_id`
-4. 复制其值作为 `--token` 参数

{hap_cli-0.6.0 → hap_cli-0.6.5}/hap_cli/__init__.py

@@ -1,3 +1,3 @@
 """CLI harness for MingDAO HAP (hap-cli)."""
 
-__version__ = "0.6.0"
+__version__ = "0.6.5"

{hap_cli-0.6.0 → hap_cli-0.6.5}/hap_cli/commands/auth_cmd.py

@@ -1,5 +1,7 @@
 """CLI commands for authentication and session management."""
 
+import sys
+
 import click
 
 from hap_cli.context import pass_context
@@ -20,96 +22,87 @@ def auth():
     pass
 
 
-@auth.command("set")
-@click.option("--server", "-s", required=True, help="MingDAO server URL")
-@click.option("--token", "-t", required=True, help="Authentication token (md_pss_id)")
-@pass_context
-def auth_set(ctx, server, token):
-    """Set server URL and authentication token."""
-    session = Session(server_url=server, auth_token=token)
-    session.save()
-    ctx.output(
-        {"status": "ok", "server": server},
-        lambda d: click.echo(f"Auth config saved. Server: {server}"),
-    )
+def _print_browser_hint(ctx, server, timeout):
+    api_host, webui = auth_mod.resolve_server(server)
+    port = auth_mod.get_available_port()
+    auth_url = auth_mod.build_auth_url(webui, port)
+    if not ctx.json_mode:
+        click.echo("Opening browser for login...")
+        click.echo(f"  Server: {webui}")
+        click.echo("  If browser doesn't open, visit:")
+        click.echo(f"  {auth_url}")
+        click.echo(f"  Waiting for login (timeout: {timeout}s)...")
+        click.echo("  If the callback doesn't come back, interrupt to paste the token manually.")
 
 
-@auth.command("show")
-@pass_context
-def auth_show(ctx):
-    """Show current configuration."""
+def _paste_flow(ctx, server):
+    if not sys.stdin.isatty():
+        raise SessionError("No TTY available; use --token instead")
+    _api_host, webui = auth_mod.resolve_server(server)
+    if not ctx.json_mode:
+        click.echo(f"Log in at {webui} on a device with a browser,")
+        click.echo("then copy the md_pss_id token and paste it below.")
+    token = click.prompt("Paste token").strip()
+    return auth_mod.verify_token(server, token)
+
+
+def _save_and_report(ctx, token, webui, user_info):
     session = ctx.get_session()
+    session.server_url = webui
+    session.auth_token = token
+    session.default_app_id = ""
+    session.default_project_id = ""
+    orgs = auth_mod.list_my_orgs(session)
+    current_org = orgs[0] if orgs else {}
+    if current_org.get("projectId"):
+        session.default_project_id = current_org["projectId"]
+    session.save()
+
     data = {
-        "server_url": session.server_url,
-        "auth_token": session.auth_token[:8] + "..." if session.auth_token else "",
-        "configured": session.is_configured(),
-        "current_org_id": session.default_project_id,
+        "status": "ok",
+        "server_url": webui,
+        "user": user_info,
+        "current_org": current_org,
     }
     ctx.output(
         data,
-        lambda d: output_kv(d, labels={
-            "server_url": "Server URL",
-            "auth_token": "Auth Token",
-            "configured": "Configured",
-            "current_org_id": "Current Org ID",
-        }),
+        lambda d: click.echo(
+            f"Logged in as: {user_info.get('name', '')} "
+            f"({user_info.get('email', '')})\n"
+            f"Server: {webui}\n"
+            f"Current org: {current_org.get('projectId', '')} "
+            f"{current_org.get('companyName', '')}".rstrip()
+        ),
     )
 
 
 @auth.command("login")
 @click.argument("server", default="mingdao")
 @click.option("--timeout", "-t", default=300, help="Login timeout in seconds")
+@click.option("--token", "token_opt", default=None, help="Non-interactive: use this token")
 @pass_context
-def auth_login(ctx, server, timeout):
+def auth_login(ctx, server, timeout, token_opt):
     """Login via browser. Opens HAP login page and captures token.
 
     SERVER can be 'mingdao', 'nocoly', or a self-hosted URL.
     Default is 'mingdao'.
+
+    If the browser flow can't complete (no GUI, callback never fires),
+    interrupt the command to fall back to pasting the token manually.
+    Use --token to supply a token non-interactively for scripts.
     """
     try:
-        api_host, webui = auth_mod.resolve_server(server)
-        port = auth_mod.get_available_port()
-        auth_url = auth_mod.build_auth_url(webui, port)
-
-        if not ctx.json_mode:
-            click.echo(f"Opening browser for login...")
-            click.echo(f"  Server: {webui}")
-            click.echo(f"  If browser doesn't open, visit:")
-            click.echo(f"  {auth_url}")
-            click.echo(f"  Waiting for login (timeout: {timeout}s)...")
-
-        token, api_host, user_info = auth_mod.login(server, timeout=timeout)
-
-        # Save to config
-        session = ctx.get_session()
-        session.server_url = api_host
-        session.auth_token = token
-        session.default_app_id = ""
-        session.default_project_id = ""
-        orgs = auth_mod.list_my_orgs(session)
-        current_org = orgs[0] if orgs else {}
-        if current_org.get("projectId"):
-            session.default_project_id = current_org["projectId"]
-        session.save()
-
-        data = {
-            "status": "ok",
-            "server_url": api_host,
-            "user": user_info,
-            "current_org": current_org,
-        }
-        ctx.output(
-            data,
-            lambda d: click.echo(
-                f"Logged in as: {user_info.get('name', '')} "
-                f"({user_info.get('email', '')})\n"
-                f"Server: {api_host}\n"
-                f"Current org: {current_org.get('projectId', '')} "
-                f"{current_org.get('companyName', '')}".rstrip()
-            ),
-        )
-    except TimeoutError:
-        ctx.handle_error(SessionError("Login timed out. Please try again."))
+        if token_opt:
+            token, webui, user_info = auth_mod.verify_token(server, token_opt)
+        else:
+            try:
+                _print_browser_hint(ctx, server, timeout)
+                token, webui, user_info = auth_mod.login(server, timeout=timeout)
+            except (TimeoutError, KeyboardInterrupt):
+                if not ctx.json_mode:
+                    click.echo("\nSwitching to manual paste mode...")
+                token, webui, user_info = _paste_flow(ctx, server)
+        _save_and_report(ctx, token, webui, user_info)
     except ImportError as e:
         ctx.handle_error(SessionError(str(e)))
     except Exception as e:
@@ -176,20 +169,40 @@ def auth_switch_org(ctx, org_id):
 @auth.command("whoami")
 @pass_context
 def auth_whoami(ctx):
-    """Show current logged-in user info."""
+    """Show current logged-in user info and current organization."""
     try:
         session = ctx.get_session()
         if not session.is_configured():
             raise SessionError("Not logged in. Run 'auth login' first.")
 
         user_info = auth_mod.get_user_info(session.server_url, session.auth_token)
+
+        current_org = {}
+        current_org_id = session.default_project_id
+        if current_org_id:
+            try:
+                for org in auth_mod.list_my_orgs(session):
+                    if org.get("projectId") == current_org_id:
+                        current_org = org
+                        break
+            except Exception:
+                # Fetching orgs is best-effort; whoami should still work
+                current_org = {"projectId": current_org_id}
+
+        data = {
+            **user_info,
+            "current_org_id": current_org.get("projectId", ""),
+            "current_org_name": current_org.get("companyName", ""),
+        }
         ctx.output(
-            user_info,
+            data,
             lambda d: output_kv(d, labels={
                 "id": "Account ID",
                 "name": "Name",
                 "email": "Email",
                 "lang": "Language",
+                "current_org_id": "Current Org ID",
+                "current_org_name": "Current Org",
             }),
         )
     except Exception as e: