nmail-cli 0.1.0__tar.gz → 0.4.1__tar.gz

{nmail_cli-0.1.0 → nmail_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: nmail-cli
-Version: 0.1.0
+Version: 0.4.1
 Summary: Nmail 对外 API 命令行客户端——为 agent/skill 设计（JSON envelope + exit code 契约 + 两阶段确认）
 Author: Nmail
 License: MIT

nmail_cli-0.4.1/nmail_cli/__init__.py

@@ -0,0 +1,3 @@
+"""nmail-cli：Nmail 对外 API 命令行客户端（AGENT_SKILL_PLAN P2，REDESIGN_PLAN §19）。"""
+
+__version__ = "0.4.1"  # 与 app 同一条版本线：勿手改，python3 scripts/sync_version.py 统一维护

{nmail_cli-0.1.0 → nmail_cli-0.4.1}/nmail_cli/cli.py

@@ -501,6 +501,13 @@ def cmd_drafts_send(args) -> int:
     return EXIT_OK
 
 
+def cmd_drafts_delete(args) -> int:
+    """删除草稿（服务端仅放行 editing/discarded；在途审批草稿先 discard）。"""
+    client = _client(args)
+    _emit(client.request("DELETE", f"/api/ext/v1/drafts/{args.draft_id}"))
+    return EXIT_OK
+
+
 # ── 其他 ────────────────────────────────────────────────────
 
 def cmd_contacts_search(args) -> int:
@@ -518,6 +525,15 @@ def cmd_folders_list(args) -> int:
     return EXIT_OK
 
 
+def cmd_folders_sync(args) -> int:
+    """按需同步指定文件夹（wait 模式：完成才返回，之后该文件夹立即可读）。"""
+    client = _client(args)
+    _stderr(f"同步文件夹 {args.folder}（account {args.account_id}）…")
+    _emit(client.request("POST", "/api/ext/v1/folders/sync", params={
+        "account_id": args.account_id, "name": args.folder, "wait": "true"}))
+    return EXIT_OK
+
+
 def _agent_collect(out: dict) -> dict:
     """非流式 agent 响应 → 紧凑 envelope：回答 + 待审批 + 暂停态（供 SKILL.md 决策）。"""
     events = out.get("events") or []
@@ -572,6 +588,12 @@ def cmd_digest(args) -> int:
 
 def cmd_watch(args) -> int:
     client = _client(args)
+    if args.timeout is not None and args.timeout <= 0:
+        raise CliError("--timeout 必须为正数（秒）", code="bad_request",
+                       exit_code=EXIT_BAD_PARAMS)
+    if args.max_emails is not None and args.max_emails <= 0:
+        raise CliError("--max-emails 必须为正整数", code="bad_request",
+                       exit_code=EXIT_BAD_PARAMS)
     params: dict = {"limit": 200}
     if args.account_id is not None:
         params["account_id"] = args.account_id
@@ -580,13 +602,27 @@ def cmd_watch(args) -> int:
         params["since_id"] = latest["latest_id"]  # 基线：不回放历史
     else:
         params["since_id"] = args.since_id
-    _stderr(f"watching（base={params['since_id']}，Ctrl-C 停止）…")
+    stop_hint = "Ctrl-C 停止" if args.timeout is None and args.max_emails is None else "到条件自动停止"
+    _stderr(f"watching（base={params['since_id']}，{stop_hint}）…")
+    deadline = (time.monotonic() + args.timeout) if args.timeout is not None else None
+    received = 0
     while True:
         body = client.request("GET", "/api/ext/v1/emails/recent", params=params)
         for item in body["items"]:
             _emit(item)
+            received += 1
         params["since_id"] = body["latest_id"]
-        time.sleep(args.interval)
+        if args.max_emails is not None and received >= args.max_emails:
+            _stderr(f"已收到 {received} 封（--max-emails={args.max_emails}），停止监听")
+            return EXIT_OK
+        if deadline is not None:
+            remaining = deadline - time.monotonic()
+            if remaining <= 0:
+                _stderr(f"--timeout={args.timeout}s 到，停止监听")
+                return EXIT_OK
+            time.sleep(min(args.interval, remaining))
+        else:
+            time.sleep(args.interval)
 
 
 # ── 参数表 ──────────────────────────────────────────────────
@@ -713,6 +749,10 @@ def build_parser() -> argparse.ArgumentParser:
                       help="第二阶段：用户明确许可后才传（不得同轮自确认）")
     _add_auth_base(send)
     send.set_defaults(func=cmd_drafts_send)
+    ddel = drafts_sub.add_parser("delete", help="删除草稿（仅新建/已丢弃状态；在途审批草稿先 discard）")
+    ddel.add_argument("draft_id", type=int)
+    _add_auth_base(ddel)
+    ddel.set_defaults(func=cmd_drafts_delete)
 
     contacts = sub.add_parser("contacts", help="通讯录")
     contacts_sub = contacts.add_subparsers(dest="contacts_command", required=True)
@@ -732,6 +772,11 @@ def build_parser() -> argparse.ArgumentParser:
     fl.add_argument("--account-id", type=int, required=True, help="账号 id（+me 查看）")
     _add_auth_base(fl)
     fl.set_defaults(func=cmd_folders_list)
+    fs = folders_sub.add_parser("sync", help="按需同步指定文件夹（归档/移动后兜底；完成才返回）")
+    fs.add_argument("--account-id", type=int, required=True, help="账号 id（+me 查看）")
+    fs.add_argument("--folder", required=True, help="文件夹名（folders list 里查）")
+    _add_auth_base(fs)
+    fs.set_defaults(func=cmd_folders_sync)
 
     agent_ = sub.add_parser("agent", help="内置总管家（scope=agent；AI 需已在 Nmail 配置）")
     agent_sub = agent_.add_subparsers(dest="agent_command", required=True)
@@ -756,11 +801,15 @@ def build_parser() -> argparse.ArgumentParser:
     _add_auth_base(res)
     res.set_defaults(func=cmd_agent_resume)
 
-    wat = sub.add_parser("watch", help="新邮件流（NDJSON 每行一封，Ctrl-C 停止）")
+    wat = sub.add_parser("watch", help="新邮件流（NDJSON 每行一封；agent 调用建议带 --timeout）")
     wat.add_argument("--since-id", type=int, default=None,
                      help="起始游标（默认当前最新，不回放历史）")
     wat.add_argument("--account-id", type=int)
     wat.add_argument("--interval", type=float, default=10.0, help="轮询秒数（默认 10）")
+    wat.add_argument("--timeout", type=float, default=None,
+                     help="最长监听秒数，到点自动退出（缺省一直监听直到 Ctrl-C）")
+    wat.add_argument("--max-emails", type=int, default=None,
+                     help="收到 N 封后自动退出（缺省不限）")
     _add_auth_base(wat)
     wat.set_defaults(func=cmd_watch)
 

{nmail_cli-0.1.0 → nmail_cli-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nmail-cli"
-version = "0.1.0"
+version = "0.4.1"  # 与 app 同一条版本线：勿手改，python3 scripts/sync_version.py 统一维护
 description = "Nmail 对外 API 命令行客户端——为 agent/skill 设计（JSON envelope + exit code 契约 + 两阶段确认）"
 readme = "README.md"
 requires-python = ">=3.11"

{nmail_cli-0.1.0 → nmail_cli-0.4.1}/tests/test_cli.py

@@ -239,6 +239,61 @@ def test_folders_list(capsys):
     assert envelope["ok"] is True and "folders" in envelope["data"]
 
 
+def test_drafts_delete(capsys):
+    "v0.4.1：drafts delete 删新建草稿；AI 待审（pending_review）草稿业务拒绝。"
+    client.post("/api/extkeys/enabled", json={"enabled": True})
+    save_config("http://127.0.0.1:8720", _make_key(["read", "write"]))
+    aid = _seed_account()
+
+    # 新建 → 删除 → 再读 exit 6（资源不存在）
+    assert main(["drafts", "create", "--account-id", str(aid), "--to", "a@b.com",
+                 "--subject", "待删草稿", "--body", "x"]) == EXIT_OK
+    draft = _out_lines(capsys)[0]["data"]
+    assert main(["drafts", "delete", str(draft["id"])]) == EXIT_OK
+    assert main(["drafts", "send", str(draft["id"])]) == EXIT_PERMANENT
+
+    # 在途审批草稿不开放删除 → exit 2 业务拒绝（防 agent 误清审批队列）
+    conn = database.get_conn()
+    cur = conn.execute(
+        "INSERT INTO user_drafts (account_id, mode, status, to_addrs, subject, body_html)"
+        " VALUES (?, 'ai', 'pending_review', 'x@y.com', '审批中', '<p>z</p>')", (aid,))
+    conn.commit()
+    assert main(["drafts", "delete", str(int(cur.lastrowid))]) == EXIT_BAD_PARAMS
+    conn.execute("DELETE FROM user_drafts WHERE id = ?", (int(cur.lastrowid),))
+    conn.commit()
+
+
+def test_folders_sync_wait模式(capsys):
+    "v0.4.1：folders sync 带 wait=true 同步执行；无 IMAP 凭据的种子账号按业务失败透传。"
+    client.post("/api/extkeys/enabled", json={"enabled": True})
+    save_config("http://127.0.0.1:8720", _make_key(["write"]))
+    aid = _seed_account()
+    _seed_folder(aid)
+    assert main(["folders", "sync", "--account-id", str(aid), "--folder", "INBOX"]) == EXIT_OK
+    envelope = _out_lines(capsys)[0]
+    # HTTP 成功（CLI envelope ok），data 里是同步结果；种子账号缺凭据 → ok=false 如实透出
+    assert envelope["ok"] is True and envelope["data"]["ok"] is False
+    assert "started" not in envelope["data"]  # wait 模式：不是后台线程的 {started} 响应
+
+
+def test_watch_max_emails自动退出(capsys, monkeypatch):
+    "v0.4.1：--max-emails 收满自动退出（agent 调用防挂起），不再必须 Ctrl-C。"
+    client.post("/api/extkeys/enabled", json={"enabled": True})
+    save_config("http://127.0.0.1:8720", _make_key(["read"]))
+    aid = _seed_account()
+    _seed_email(aid, 1, "历史邮件")
+
+    # 首轮轮询为空，sleep 时注入一封新邮件 → 下轮输出 1 封即达 --max-emails 退出。
+    # 注：cli.time 是全局 time 模块（anyio/限流器也在用 monotonic），不要 mock 它。
+    def _seed_and_return(*_a):
+        _seed_email(aid, 2, "新邮件")
+    monkeypatch.setattr(cli.time, "sleep", _seed_and_return)
+    assert main(["watch", "--account-id", str(aid), "--interval", "0",
+                 "--max-emails", "1"]) == EXIT_OK
+    lines = _out_lines(capsys)
+    assert len(lines) == 1 and lines[0]["data"]["subject"] == "新邮件"
+
+
 def test_agent_ask_未配置AI(capsys):
     "B3：AI 未配置时 agent ask 返回明确错误（exit 2，agent 据此告知用户）。"
     client.post("/api/extkeys/enabled", json={"enabled": True})

nmail_cli-0.1.0/nmail_cli/__init__.py

@@ -1,3 +0,0 @@
-"""nmail-cli：Nmail 对外 API 命令行客户端（AGENT_SKILL_PLAN P2，REDESIGN_PLAN §19）。"""
-
-__version__ = "0.1.0"