hap-cli 0.6.7__tar.gz → 0.6.8__tar.gz

{hap_cli-0.6.7/hap_cli.egg-info → hap_cli-0.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hap-cli
-Version: 0.6.7
+Version: 0.6.8
 Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
 Author: hap-cli
 License: Apache-2.0
@@ -15,14 +15,13 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click>=8.0
 Requires-Dist: requests>=2.28
-Provides-Extra: crypto
-Requires-Dist: pycryptodome>=3.15; extra == "crypto"
+Requires-Dist: pycryptodome>=3.15
+Requires-Dist: python-socketio[client]>=5.10
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: license
-Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -374,6 +373,20 @@ hap --json worksheet record list WORKSHEET_ID
 | `chat group-info` | Get information about a chat group |
 | `chat card-detail` | Resolve card references embedded in chat messages |
 
+### config — Harness Settings
+
+| Command | Description |
+|---|---|
+| `config show` | Show current harness configuration |
+| `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` shell completion (old `hap completion` kept as hidden alias) |
+| `config log on` | Enable API request/response logging |
+| `config log off` | Disable logging |
+| `config log level <LEVEL>` | Set log level (default `WARNING`; choices: `DEBUG/INFO/WARNING/ERROR/CRITICAL`) |
+| `config log status` | Show current logging on/off, level, and file path |
+| `config log view [--lines N] [--no-follow]` | Follow the log file `tail -f` style |
+
+Logs are written to `~/.hap-cli/hap-cli.log` (rotated at 10 MB × 3). When enabled, every HAP API call is logged at `INFO` with URL, request body, response body, and a redacted `Authorization` header (first 16 characters only). Sensitive keys like `password` in request bodies are masked automatically. Set `HAP_LOG_LEVEL=DEBUG` to temporarily override the stored level without editing config.
+
 ## Workflow Management
 
 ```bash
@@ -458,12 +471,6 @@ non-interactively (e.g. on a headless server).
 
 Commands that expose `--org-id` will use the saved current org when you omit the option.
 
-For private deployments with encrypted API responses, install crypto support:
-
-```bash
-pip install hap-cli[crypto]
-```
-
 ## More Examples
 
 ```bash

hap_cli-0.6.7/PKG-INFO → hap_cli-0.6.8/hap_cli/README.md

@@ -1,32 +1,3 @@
-Metadata-Version: 2.4
-Name: hap-cli
-Version: 0.6.7
-Summary: CLI harness for MingDAO HAP - Enterprise no-code platform
-Author: hap-cli
-License: Apache-2.0
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-Requires-Dist: click>=8.0
-Requires-Dist: requests>=2.28
-Provides-Extra: crypto
-Requires-Dist: pycryptodome>=3.15; extra == "crypto"
-Dynamic: author
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: license
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 # hap-cli
 
 CLI harness for **MingDAO HAP** (明道云) - an enterprise no-code platform (hap).
@@ -374,6 +345,20 @@ hap --json worksheet record list WORKSHEET_ID
 | `chat group-info` | Get information about a chat group |
 | `chat card-detail` | Resolve card references embedded in chat messages |
 
+### config — Harness Settings
+
+| Command | Description |
+|---|---|
+| `config show` | Show current harness configuration |
+| `config completion [bash\|zsh\|fish] [--install]` | Enable `<Tab>` shell completion (old `hap completion` kept as hidden alias) |
+| `config log on` | Enable API request/response logging |
+| `config log off` | Disable logging |
+| `config log level <LEVEL>` | Set log level (default `WARNING`; choices: `DEBUG/INFO/WARNING/ERROR/CRITICAL`) |
+| `config log status` | Show current logging on/off, level, and file path |
+| `config log view [--lines N] [--no-follow]` | Follow the log file `tail -f` style |
+
+Logs are written to `~/.hap-cli/hap-cli.log` (rotated at 10 MB × 3). When enabled, every HAP API call is logged at `INFO` with URL, request body, response body, and a redacted `Authorization` header (first 16 characters only). Sensitive keys like `password` in request bodies are masked automatically. Set `HAP_LOG_LEVEL=DEBUG` to temporarily override the stored level without editing config.
+
 ## Workflow Management
 
 ```bash
@@ -458,12 +443,6 @@ non-interactively (e.g. on a headless server).
 
 Commands that expose `--org-id` will use the saved current org when you omit the option.
 
-For private deployments with encrypted API responses, install crypto support:
-
-```bash
-pip install hap-cli[crypto]
-```
-
 ## More Examples
 
 ```bash

{hap_cli-0.6.7 → hap_cli-0.6.8}/hap_cli/README_CN.md

@@ -352,6 +352,20 @@ hap --json worksheet record list 工作表ID
 | `chat group-info` | 获取群组信息 |
 | `chat card-detail` | 解析聊天消息中嵌入的卡片引用 |
 
+### config — 本地 CLI 配置
+
+| 命令 | 说明 |
+|---|---|
+| `config show` | 显示当前 CLI 配置摘要 |
+| `config completion [bash\|zsh\|fish] [--install]` | 启用 `<Tab>` 命令补全（原 `hap completion`，保留隐藏别名） |
+| `config log on` | 打开 API 请求/响应日志记录 |
+| `config log off` | 关闭日志记录 |
+| `config log level <LEVEL>` | 设置日志级别（默认 `WARNING`） |
+| `config log status` | 查看当前日志开关、级别及文件路径 |
+| `config log view [--lines N] [--no-follow]` | 以 `tail -f` 模式跟踪日志文件 |
+
+日志默认写入 `~/.hap-cli/hap-cli.log`，自动按 10MB × 3 份滚动。开启后每次 API 调用以 `INFO` 级别记录 URL、请求体、响应体及脱敏后的 `Authorization`（仅保留前 16 字符）。请求体中的 `password` 等敏感字段会被自动打码。临时调试可设 `HAP_LOG_LEVEL=DEBUG` 覆盖本地配置。
+
 ## 工作流管理
 
 ### 创建与编辑流程

{hap_cli-0.6.7 → hap_cli-0.6.8}/hap_cli/commands/app_cmd.py

@@ -6,14 +6,25 @@ from hap_cli.context import pass_context
 from hap_cli.core import app as app_mod
 from hap_cli.utils.formatting import output_json, output_table, output_kv
 from hap_cli.utils.options import org_id_option, require_api_project_id
+from hap_cli.i18n import t
 
 
-@click.group()
+@click.group(help=t('Application management.'))
 def app():
-    """Application management."""
     pass
 
 
+def _print_apps_with_default(rows, default_app_id, columns, headers):
+    marked = []
+    for row in rows:
+        row = dict(row)
+        row["_mark"] = "*" if default_app_id and row.get("appId") == default_app_id else ""
+        marked.append(row)
+    output_table(marked, ["_mark", *columns], [" ", *headers])
+    if default_app_id and any(r.get("appId") == default_app_id for r in rows):
+        click.echo(t("* = current default app (set via 'hap app select')."))
+
+
 @app.command("list")
 @org_id_option()
 @pass_context
@@ -24,8 +35,9 @@ def app_list(ctx, org_id):
         apps = app_mod.get_all_home_apps(session, require_api_project_id(session, org_id))
         ctx.output(
             apps,
-            lambda d: output_table(
+            lambda d: _print_apps_with_default(
                 d,
+                session.default_app_id,
                 ["appId", "name", "orgName"],
                 ["App ID", "Name", "Org Name"],
             ),
@@ -44,8 +56,9 @@ def app_list_managed(ctx, org_id):
         apps = app_mod.get_managed_apps(session, require_api_project_id(session, org_id))
         ctx.output(
             apps,
-            lambda d: output_table(
+            lambda d: _print_apps_with_default(
                 d,
+                session.default_app_id,
                 ["appId", "name", "worksheetCount"],
                 ["App ID", "Name", "Worksheets"],
             ),
@@ -93,6 +106,39 @@ def app_worksheets(ctx, app_id):
         ctx.handle_error(e)
 
 
+@app.command("select")
+@click.argument("app_id")
+@pass_context
+def app_select(ctx, app_id):
+    """Set the default application used when --app-id is omitted."""
+    try:
+        session = ctx.get_session()
+        session.default_app_id = app_id
+        session.save()
+        ctx.output(
+            {"status": "ok", "default_app_id": app_id},
+            lambda d: click.echo(t("Default app set to: {app_id}").format(app_id=app_id)),
+        )
+    except Exception as e:
+        ctx.handle_error(e)
+
+
+@app.command("unselect")
+@pass_context
+def app_unselect(ctx):
+    """Clear the saved default application."""
+    try:
+        session = ctx.get_session()
+        session.default_app_id = ""
+        session.save()
+        ctx.output(
+            {"status": "ok", "default_app_id": ""},
+            lambda d: click.echo(t("Default app cleared.")),
+        )
+    except Exception as e:
+        ctx.handle_error(e)
+
+
 # ── App Lifecycle ────────────────────────────────────────────────────────
 
 
@@ -360,4 +406,4 @@ def app_logs(ctx, app_id, org_id, page_size, page):
         )
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
-        ctx.handle_error(e)
+        ctx.handle_error(e)

{hap_cli-0.6.7 → hap_cli-0.6.8}/hap_cli/commands/auth_cmd.py

@@ -7,7 +7,9 @@ import click
 from hap_cli.context import pass_context
 from hap_cli.core.session import Session, SessionError
 from hap_cli.core import auth as auth_mod
+from hap_cli.core import global_meta as gm
 from hap_cli.utils.formatting import output_json, output_kv
+from hap_cli.i18n import t
 
 
 SERVER_HELP = (
@@ -16,9 +18,8 @@ SERVER_HELP = (
 )
 
 
-@click.group()
+@click.group(help=t('Manage authentication and session identity.'))
 def auth():
-    """Manage authentication and session identity."""
     pass
 
 
@@ -46,16 +47,44 @@ def _paste_flow(ctx, server):
     return auth_mod.verify_token(server, token)
 
 
-def _save_and_report(ctx, token, webui, user_info):
+def _auto_set_language_from_account(user_info: dict) -> None:
+    """Persist a CLI language picked from the user's HAP account.
+
+    No-op when the user has already pinned a language via
+    ``hap config language`` (``language_source == "manual"``).
+    """
+    from hap_cli.core.session import load_config, save_config
+    from hap_cli.i18n import lang_from_hap_account, reset_language_cache
+
+    cfg = load_config() or {}
+    if cfg.get("language_source") == "manual":
+        return
+    lang = lang_from_hap_account(str(user_info.get("lang") or ""))
+    save_config({"language": lang, "language_source": "auto"})
+    reset_language_cache()
+
+
+def _save_and_report(ctx, token, webui, user_info, meta):
     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)
+    session.default_project_name = ""
+    # Harvest routing table + org list from the meta we already fetched
+    # during login. No extra round-trip. The meta is fetched from the
+    # *exact* login host (see _main_api_base_for_url), so meihua
+    # sessions get meihua-specific URLs (api2.mingdao.com etc.) without
+    # a synthesised override.
+    session.service_endpoints = gm.extract_service_endpoints(meta)
+    # Auto-detect UI language from the user's HAP account preference,
+    # but only if the user has not pinned a language manually.
+    _auto_set_language_from_account(user_info)
+    orgs = gm.extract_orgs(meta)
     current_org = orgs[0] if orgs else {}
     if current_org.get("projectId"):
         session.default_project_id = current_org["projectId"]
+        session.default_project_name = str(current_org.get("companyName") or "")
     session.save()
 
     data = {
@@ -90,19 +119,51 @@ def auth_login(ctx, server, timeout, token_opt):
     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.
+
+    Shared-credential shortcut: production (``mingdao`` /
+    ``https://www.mingdao.com``) and pre-release
+    (``https://meihua.mingdao.com``) share user accounts and data —
+    only the API routing differs. When you are already logged into one
+    and run ``hap auth login`` for the other, the existing token is
+    reused and the browser is not opened. If no session exists yet,
+    falls back to the regular browser flow.
     """
     try:
+        # Shared-credential warm switch: skip the browser when an
+        # existing session on a sibling host can be reused.
+        if not token_opt and auth_mod.can_warm_switch_to(server):
+            target_host = auth_mod._resolve_target_host(server)
+            if not ctx.json_mode:
+                click.echo(f"Switching to {target_host} using existing credentials...")
+            token, webui, user_info, meta, reused = (
+                auth_mod.shortcut_switch_shared_credential(server)
+            )
+            _save_and_report(ctx, token, webui, user_info, meta)
+            if not ctx.json_mode and reused:
+                click.echo("(reused existing token — no browser opened)")
+            return
+
+        # Cold pre-release: no existing session, but target is meihua.
+        # The shortcut handles browser-to-prod-then-swap so users still
+        # land on meihua at the end.
+        if not token_opt and auth_mod.is_prerelease_login(server):
+            token, webui, user_info, meta, reused = (
+                auth_mod.shortcut_switch_shared_credential(server)
+            )
+            _save_and_report(ctx, token, webui, user_info, meta)
+            return
+
         if token_opt:
-            token, webui, user_info = auth_mod.verify_token(server, token_opt)
+            token, webui, user_info, meta = 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)
+                token, webui, user_info, meta = 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)
+                token, webui, user_info, meta = _paste_flow(ctx, server)
+        _save_and_report(ctx, token, webui, user_info, meta)
     except ImportError as e:
         ctx.handle_error(SessionError(str(e)))
     except Exception as e:
@@ -118,6 +179,8 @@ def auth_logout(ctx):
     session.auth_token = ""
     session.default_app_id = ""
     session.default_project_id = ""
+    session.default_project_name = ""
+    session.service_endpoints = {}
     session.save()
     ctx.output(
         {"status": "ok", "server_url": old_server},
@@ -177,22 +240,24 @@ def auth_whoami(ctx):
 
         user_info = auth_mod.get_user_info(session.server_url, session.auth_token)
 
-        current_org = {}
+        # Prefer the org name cached at login/switch-org time so whoami
+        # runs without an extra network round-trip. Fall back to the
+        # projects list if the cache is empty (older configs).
         current_org_id = session.default_project_id
-        if current_org_id:
+        current_org_name = session.default_project_name
+        if current_org_id and not current_org_name:
             try:
                 for org in auth_mod.list_my_orgs(session):
                     if org.get("projectId") == current_org_id:
-                        current_org = org
+                        current_org_name = str(org.get("companyName") or "")
                         break
             except Exception:
-                # Fetching orgs is best-effort; whoami should still work
-                current_org = {"projectId": current_org_id}
+                pass
 
         data = {
             **user_info,
-            "current_org_id": current_org.get("projectId", ""),
-            "current_org_name": current_org.get("companyName", ""),
+            "current_org_id": current_org_id,
+            "current_org_name": current_org_name,
         }
         ctx.output(
             data,

{hap_cli-0.6.7 → hap_cli-0.6.8}/hap_cli/commands/calendar_cmd.py

@@ -7,15 +7,15 @@ import click
 from hap_cli.context import pass_context
 from hap_cli.core import auth as auth_mod
 from hap_cli.core import calendar_mod as cal_mod
+from hap_cli.i18n import t
 
 
 FREQUENCY_CHOICES = ("none", "day", "week", "month", "year")
 REMIND_TYPE_CHOICES = ("none", "minute", "hour", "day")
 
 
-@click.group()
+@click.group(help=t('Calendar and schedule management.'))
 def calendar():
-    """Calendar and schedule management."""
     pass
 
 
@@ -543,4 +543,4 @@ def calendar_categories(ctx):
         summary = _simplify_categories_result(raw)
         ctx.output(summary, _render_categories)
     except Exception as e:
-        ctx.handle_error(e)
+        ctx.handle_error(e)

{hap_cli-0.6.7 → hap_cli-0.6.8}/hap_cli/commands/chat_cmd.py

@@ -8,6 +8,7 @@ from hap_cli.context import pass_context
 from hap_cli.core import chat as chat_mod
 from hap_cli.core import group as group_mod
 from hap_cli.utils.formatting import output_json, output_kv, output_table
+from hap_cli.i18n import t
 
 
 CHAT_SESSION_TYPE_LABELS = {
@@ -35,9 +36,9 @@ def _chat_message_preview(session_item):
         message = ""
 
     prefixes = []
-    count = session_item.get("count")
-    if isinstance(count, int) and count > 0:
-        prefixes.append(f"[{count}条未读]")
+    unread = session_item.get("unread")
+    if isinstance(unread, int) and unread > 0:
+        prefixes.append(f"[{unread}条未读]")
 
     if session_item.get("type") == 2:
         sender_name = ((session_item.get("from") or {}).get("name") or "").strip()
@@ -72,9 +73,8 @@ def _output_chat_list_table(rows):
     )
 
 
-@click.group()
+@click.group(help=t('Chat and messaging management.'))
 def chat():
-    """Chat and messaging management."""
     pass
 
 
@@ -174,7 +174,6 @@ def chat_files(ctx, with_user, group_id, page_size, page, keywords, file_type, s
     "--inbox-type", "inbox_type", default=None,
     help="Raw inbox type code (overrides --category for advanced filters)",
 )
-@click.option("--unread", is_flag=True, help="Only unread messages (inbox mode)")
 @click.option("--page", "-p", default=1, help="Page number")
 @click.option("--num", "-n", default=20, help="Messages per page")
 @click.option(
@@ -187,6 +186,14 @@ def chat_files(ctx, with_user, group_id, page_size, page, keywords, file_type, s
     type=click.Choice(["", "up", "down"]),
     help="'up' loads older messages, 'down' loads newer; empty = default",
 )
+@click.option(
+    "--mark-read", "mark_read", is_flag=True, default=False,
+    help="After fetching, clear the unread badge for this chat. "
+         "Opens a brief socket.io session to emit the same event the "
+         "web UI uses when the panel is opened. For --inbox-type "
+         "(raw code) this only works when the code maps back to a "
+         "known category.",
+)
 @pass_context
 def chat_messages(
     ctx,
@@ -194,12 +201,12 @@ def chat_messages(
     group_id,
     category,
     inbox_type,
-    unread,
     page,
     num,
     sincetime,
     keyword,
     direction,
+    mark_read,
 ):
     """Fetch chat message history.
 
@@ -227,6 +234,7 @@ def chat_messages(
                 sincetime=sincetime,
                 keyword=keyword,
                 direction=direction,
+                mark_read=mark_read,
             )
         elif group_id:
             data = chat_mod.get_group_messages(
@@ -237,6 +245,7 @@ def chat_messages(
                 sincetime=sincetime,
                 keyword=keyword,
                 direction=direction,
+                mark_read=mark_read,
             )
         else:
             type_code = inbox_type or chat_mod.INBOX_CATEGORY_TYPES[category]
@@ -245,9 +254,10 @@ def chat_messages(
                 type_=type_code,
                 page_index=page,
                 page_size=num,
-                load_type=1 if unread else 2,
                 category=category,
             )
+            if mark_read and category:
+                chat_mod.mark_inbox_read(session, category)
         ctx.output(data, lambda d: output_json(d))
     except Exception as e:
         ctx.handle_error(e)
@@ -309,4 +319,3 @@ def chat_card_detail(ctx, task, post, calendar, kcfile, worksheet, worksheetrow)
     except Exception as e:
         ctx.handle_error(e)
 
-