multi-claude-cli 0.12.0__tar.gz → 0.13.0__tar.gz

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-claude-cli
-Version: 0.12.0
+Version: 0.13.0
 Summary: Run several Claude Code accounts side by side: separate CLAUDE_CONFIG_DIR directories, launchers, proxies, environment variables and arguments.
 License: MIT
 Project-URL: Homepage, https://github.com/jakoes-wu/multi-claude
@@ -331,6 +331,19 @@ old    keychain  token expired  -       inherit                no      -
 - `error` comes with a reason on stderr, for example `plan lookup failed for work: timeout (via 127.0.0.1:7890, 10.01s)`. `tls_failed` usually means the Python that runs multi-claude has no root certificates (python.org installers ship an `Install Certificates.command`).
 - `list --offline` skips the lookup — no token is read, nothing is sent — and prints the table without the two columns. `list --json` carries the same data in each account's `plan` object (`refresh` tells whether a token was renewed); scripts should use it instead of parsing the table. The lookup adds about a second, at most 15; a renewal that is under way is allowed to finish first (the first Ctrl-C only prints a notice), so that the new login is not lost.
 
+#### Renewal date
+
+Anthropic's interface does not say when a subscription renews, and the date it implies is wrong for an account whose subscription was stopped and started again. Copy the date from the store's subscription page (App Store or Google Play) instead:
+
+```sh
+multi-claude set work --renews 2026-11-10   # the date the store shows
+multi-claude set work --renews off          # forget it
+```
+
+Once any account has a date, `list` adds a `RENEWS` column (also with `--offline`, since nothing is looked up): `11-10 (25d)` is 25 days away, `10-19 (3d!)` three days or less, `10-16 (today!)` today, `10-10 (6d ago)` already passed. A date in another year is written in full, `2027-01-05 (81d)`. Days are counted in your local time zone. When a date has passed — usually because the store renewed the subscription — `list` reminds you on stderr to look up the new date. Accounts without a date show `-`; without any dates the table is unchanged.
+
+`list --json` gives each account `"renews": {"date": "2026-11-10", "days_left": 25}` (`days_left` is negative once the date has passed), or `null`. The date is stored as `renews` in `config.json`; `apply -f FILE` treats it like any other account setting, so an account whose entry in FILE has no `renews` loses its date.
+
 ### Finding a session
 
 Forgot which account or which directory a session was started in? `sessions` lists the sessions of every account and every project directory, newest first; `--cmd` adds the command that resumes each one:
@@ -529,14 +542,14 @@ It never copies, exports, uploads or backs up a login. One command touches one:
 | `multi-claude restore NAME [--skip-process-check] [--dry-run]` | Undo `migrate-default`: move the account back to `~/.claude` and unregister it. The login is kept. |
 | `multi-claude export NAME FILE` | Write the account's settings, `CLAUDE.md`, agents, commands, skills, output styles and MCP servers to FILE. No logins or sessions. |
 | `multi-claude import FILE NAME [--force] [--dry-run]` | Import such a file into an existing account; conflicts are refused unless `--force` (which backs up first). |
-| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
-| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
+| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--renews` records the renewal date (see [Renewal date](#renewal-date)). `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
+| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
 | `multi-claude proxy NAME PORT\|URL\|off\|inherit` | Set an account's proxy. |
 | `multi-claude env (NAME \| --defaults) [K=V ...] [--unset K ...]` | Set or remove extra environment variables. |
 | `multi-claude args (NAME \| --defaults) -- [ARG ...]` | Replace the fixed arguments; `--` with nothing after it clears them. |
 | `multi-claude remove NAME` | Unregister an account and delete its launcher. **The directory and the login are kept.** |
 | `multi-claude apply [-f FILE]` | Converge everything to the configuration (or to `FILE`). |
-| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). |
+| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). A `RENEWS` column (and a `renews` key in `--json`) shows the renewal dates you recorded. |
 | `multi-claude usage [NAME] [--json]` | Show the last known 5-hour and 7-day usage of each account. |
 | `multi-claude usage --history [NAME] [--days N] [--by day\|model] [--json]` | Token usage per day or model, counted from the session files on this machine (default: 7 days). |
 | `multi-claude doctor [--json] [--verbose]` | Check the configuration, launchers, account directories, shared links, logins and environment. |

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/README.md

@@ -304,6 +304,19 @@ old    keychain  token expired  -       inherit                no      -
 - `error` comes with a reason on stderr, for example `plan lookup failed for work: timeout (via 127.0.0.1:7890, 10.01s)`. `tls_failed` usually means the Python that runs multi-claude has no root certificates (python.org installers ship an `Install Certificates.command`).
 - `list --offline` skips the lookup — no token is read, nothing is sent — and prints the table without the two columns. `list --json` carries the same data in each account's `plan` object (`refresh` tells whether a token was renewed); scripts should use it instead of parsing the table. The lookup adds about a second, at most 15; a renewal that is under way is allowed to finish first (the first Ctrl-C only prints a notice), so that the new login is not lost.
 
+#### Renewal date
+
+Anthropic's interface does not say when a subscription renews, and the date it implies is wrong for an account whose subscription was stopped and started again. Copy the date from the store's subscription page (App Store or Google Play) instead:
+
+```sh
+multi-claude set work --renews 2026-11-10   # the date the store shows
+multi-claude set work --renews off          # forget it
+```
+
+Once any account has a date, `list` adds a `RENEWS` column (also with `--offline`, since nothing is looked up): `11-10 (25d)` is 25 days away, `10-19 (3d!)` three days or less, `10-16 (today!)` today, `10-10 (6d ago)` already passed. A date in another year is written in full, `2027-01-05 (81d)`. Days are counted in your local time zone. When a date has passed — usually because the store renewed the subscription — `list` reminds you on stderr to look up the new date. Accounts without a date show `-`; without any dates the table is unchanged.
+
+`list --json` gives each account `"renews": {"date": "2026-11-10", "days_left": 25}` (`days_left` is negative once the date has passed), or `null`. The date is stored as `renews` in `config.json`; `apply -f FILE` treats it like any other account setting, so an account whose entry in FILE has no `renews` loses its date.
+
 ### Finding a session
 
 Forgot which account or which directory a session was started in? `sessions` lists the sessions of every account and every project directory, newest first; `--cmd` adds the command that resumes each one:
@@ -502,14 +515,14 @@ It never copies, exports, uploads or backs up a login. One command touches one:
 | `multi-claude restore NAME [--skip-process-check] [--dry-run]` | Undo `migrate-default`: move the account back to `~/.claude` and unregister it. The login is kept. |
 | `multi-claude export NAME FILE` | Write the account's settings, `CLAUDE.md`, agents, commands, skills, output styles and MCP servers to FILE. No logins or sessions. |
 | `multi-claude import FILE NAME [--force] [--dry-run]` | Import such a file into an existing account; conflicts are refused unless `--force` (which backs up first). |
-| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
-| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
+| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--renews` records the renewal date (see [Renewal date](#renewal-date)). `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
+| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
 | `multi-claude proxy NAME PORT\|URL\|off\|inherit` | Set an account's proxy. |
 | `multi-claude env (NAME \| --defaults) [K=V ...] [--unset K ...]` | Set or remove extra environment variables. |
 | `multi-claude args (NAME \| --defaults) -- [ARG ...]` | Replace the fixed arguments; `--` with nothing after it clears them. |
 | `multi-claude remove NAME` | Unregister an account and delete its launcher. **The directory and the login are kept.** |
 | `multi-claude apply [-f FILE]` | Converge everything to the configuration (or to `FILE`). |
-| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). |
+| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). A `RENEWS` column (and a `renews` key in `--json`) shows the renewal dates you recorded. |
 | `multi-claude usage [NAME] [--json]` | Show the last known 5-hour and 7-day usage of each account. |
 | `multi-claude usage --history [NAME] [--days N] [--by day\|model] [--json]` | Token usage per day or model, counted from the session files on this machine (default: 7 days). |
 | `multi-claude doctor [--json] [--verbose]` | Check the configuration, launchers, account directories, shared links, logins and environment. |

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude/__init__.py

@@ -1,3 +1,3 @@
 """multi-claude：管理多个 Claude Code 账号的配置目录、启动命令、代理与启动参数。"""
 
-__version__ = "0.12.0"
+__version__ = "0.13.0"

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude/cli.py

@@ -16,7 +16,7 @@ import stat
 import subprocess
 import sys
 import unicodedata
-from datetime import datetime, timedelta, timezone
+from datetime import date, datetime, timedelta, timezone
 from typing import List, NamedTuple, Optional, Tuple
 
 from . import (__version__, accounts, artifacts, bundle, completion, doctor, history, hook, identity, launcher, migrate,
@@ -24,7 +24,7 @@ from . import (__version__, accounts, artifacts, bundle, completion, doctor, his
 from .actions import LOG_PREFIX, error, info, warn
 from .config import (DEFAULT_SHARED_DIR, DEFAULT_SHARED_ITEMS, IDENTITY_DEFAULT, IDENTITY_DIR, Account, Config, ConfigError, RouteRule,
                      is_unshareable, load_config, normalize_proxy, parse_config, validate_env_key, validate_name,
-                     validate_route_path, validate_value, config_path)
+                     validate_renews, validate_route_path, validate_value, config_path)
 from .env import account_env
 from .fsutil import KIND_FILE, KIND_LINK, KIND_MISSING, atomic_write, entry_kind, expand, read_text
 from .lock import LockBusyError, WriteLock
@@ -46,7 +46,7 @@ COMMAND_GROUPS = [
         ("list", "show accounts, logins and usage"),
     ]),
     ("Account settings", [
-        ("set NAME", "change an account: proxy and sharing"),
+        ("set NAME", "change an account: proxy, sharing, renewal date"),
         ("proxy, env, args", "set the proxy, extra variables or fixed arguments of a launcher"),
         ("rename, remove", "rename or unregister an account"),
         ("migrate-default, restore", "turn the existing ~/.claude into an account, or back"),
@@ -74,6 +74,7 @@ _EXAMPLES = [
     ("multi-claude add work --proxy 7901", ""),
     ("multi-claude login work", ""),
     ("multi-claude route ~/work work", ""),
+    ("multi-claude set work --renews 2026-11-10", "record when the plan renews"),
     ("multi-claude add --help", "details of one command"),
 ]
 
@@ -95,12 +96,62 @@ def _help_epilog() -> str:
         for shown, text in items:
             lines.append("  {:<18}{}".format(shown, text))
         lines.append("")
-    lines.append("Examples:")
-    for command, text in _EXAMPLES:
-        lines.append("  {:<36}{}".format(command, text).rstrip())
+    lines.extend(_examples_lines(_EXAMPLES))
     return "\n".join(lines)
 
 
+def _examples_lines(examples: List[Tuple[str, str]]) -> List[str]:
+    """帮助末尾的 Examples: 段。列宽按最长的命令算：固定列宽遇到长命令时说明会紧贴在命令后面，
+    测试按“两个以上空格”切分命令与说明，贴住就切不开（方案 feature-renewal-date §5.1.4）。"""
+    width = max(len(command) for command, _text in examples) + 2
+    lines = ["Examples:"]
+    for command, text in examples:
+        lines.append("  {}{}".format(command.ljust(width), text).rstrip())
+    return lines
+
+
+# 子命令帮助末尾的示例：覆盖该命令的全部选项（公共写选项 --verbose 除外），测试逐条解析核对。
+_SET_EXAMPLES = [
+    ("multi-claude set work --proxy 7901", "set the proxy to http://127.0.0.1:7901"),
+    ("multi-claude set work --proxy off", "start claude-work without a proxy"),
+    ("multi-claude set work --shared", "link the shared items (default {})".format(DEFAULT_SHARED_DIR)),
+    ("multi-claude set work --shared ~/claude-common", "make ~/claude-common the shared directory for every account"),
+    ("multi-claude set work --no-shared", "remove the shared links of this account"),
+    ("multi-claude set work --shared-exclude skills", "do not link skills into this account"),
+    ("multi-claude set work --shared-include skills", "link skills again"),
+    ("multi-claude set work --renews 2026-11-10", "record the renewal date shown by the App Store / Google Play"),
+    ("multi-claude set work --renews off", "forget the renewal date"),
+    ("multi-claude set work --renews 2026-11-10 --dry-run", "show what would change without writing"),
+]
+
+_ADD_EXAMPLES = [
+    ("multi-claude add work", "create account work and its launcher claude-work"),
+    ("multi-claude add work --proxy 7901 --shared", "with a proxy and the shared items"),
+    ("multi-claude add work --no-shared", "keep the account without shared links"),
+    ("multi-claude add work --shared-exclude skills", "share everything except skills"),
+    ("multi-claude add work --shared-include skills", "share skills again"),
+    ("multi-claude add work --renews 2026-11-10", "also record the renewal date"),
+    ("multi-claude add work --shared --adopt", "take over shared links that already exist"),
+    ("multi-claude add work --config-from home", "copy settings.json from account home once"),
+    ("multi-claude add work --dry-run", "show what would be created"),
+]
+
+_LIST_EXAMPLES = [
+    ("multi-claude list", "accounts, plan, usage; RENEWS appears once a renewal date is set"),
+    ("multi-claude list --offline", "no token read, no network (RENEWS still shown)"),
+    ("multi-claude list --no-refresh", "never renew an expired access token"),
+    ("multi-claude list --verbose", "every field and the global settings"),
+    ("multi-claude list --json", 'for scripts; each account has "renews": {"date", "days_left"} or null'),
+    ("multi-claude list --names", "account names only"),
+]
+
+_RENEWS_LEGEND = [
+    "RENEWS: the date you recorded with `multi-claude set NAME --renews YYYY-MM-DD`;",
+    "(25d) days left, (3d!) three days or less, (today!) renews today,",
+    "(6d ago) passed: update it after the store renews.",
+]
+
+
 def build_parser() -> argparse.ArgumentParser:
     # 子命令不传 help=，argparse 就不会把它们平铺成一列；改由 epilog 按用途分组列出（方案 feature-clearer-help §5.1.1）。
     # 新增子命令时必须同时写进 COMMAND_GROUPS，测试会核对两者一致。
@@ -134,13 +185,18 @@ def build_parser() -> argparse.ArgumentParser:
                        help="do not check whether Claude Code is running (at your own risk)")
     _add_dry_run(p_mig)
 
-    p_add = sub.add_parser("add", description="add an account, adopt an existing directory, or change its options")
+    # 带 epilog 示例的子命令用 RawDescriptionHelpFormatter 保留换行；description 因此不再自动折行，须手动加 \n。
+    p_add = sub.add_parser("add", description="add an account, adopt an existing directory, or change its options",
+                           epilog="\n".join(_examples_lines(_ADD_EXAMPLES)),
+                           formatter_class=argparse.RawDescriptionHelpFormatter)
     _add_account_options(p_add, adopt=True)
     p_add.add_argument("--config-from", metavar="OTHER",
                        help="copy settings.json from account OTHER into this account once")
 
-    p_set = sub.add_parser("set", description="change an existing account: proxy and sharing "
-                                              "(use env, args, rename for the rest)")
+    p_set = sub.add_parser("set", description="change an existing account: proxy, sharing and renewal date\n"
+                                              "(use env, args, rename for the rest)",
+                           epilog="\n".join(_examples_lines(_SET_EXAMPLES)),
+                           formatter_class=argparse.RawDescriptionHelpFormatter)
     _add_account_options(p_set, adopt=False)
 
     p_proxy = sub.add_parser("proxy", description="set the proxy of an account")
@@ -169,8 +225,10 @@ def build_parser() -> argparse.ArgumentParser:
     p_apply.add_argument("-f", "--file", help="use this file as the new configuration")
     _add_write_options(p_apply)
 
-    p_list = sub.add_parser("list", description="show accounts and their status; looks up each account's plan "
-                            "and billing channel from Anthropic unless --offline is given")
+    p_list = sub.add_parser("list", description="show accounts and their status; looks up each account's plan\n"
+                            "and billing channel from Anthropic unless --offline is given",
+                            epilog="\n".join(_examples_lines(_LIST_EXAMPLES) + [""] + _RENEWS_LEGEND),
+                            formatter_class=argparse.RawDescriptionHelpFormatter)
     list_mode = p_list.add_mutually_exclusive_group()
     list_mode.add_argument("--verbose", action="store_true",
                            help="show every field, the global settings and the keychain details")
@@ -341,6 +399,9 @@ def _add_account_options(parser: argparse.ArgumentParser, adopt: bool) -> None:
                              "the link multi-claude made is removed")
     parser.add_argument("--shared-include", action="append", default=[], metavar="ITEM",
                         help="undo --shared-exclude for this item (repeatable)")
+    # 续费日由用户照着 App Store / Google Play 的订阅页手填：服务端接口给不出准确的到期日（方案 feature-renewal-date §1）。
+    parser.add_argument("--renews", metavar="DATE",
+                        help="renewal date of the subscription, YYYY-MM-DD as shown by the store; off to clear it")
     _add_write_options(parser)
 
 
@@ -606,6 +667,8 @@ def dispatch(args: argparse.Namespace) -> int:
             account.shared = True
         elif args.no_shared:
             account.shared = False
+        if args.renews is not None:
+            account.renews = None if args.renews == "off" else _checked_renews(args.renews)
         _apply_shared_exclude(new, account, args.shared_exclude, args.shared_include)
         if getattr(args, "adopt", False):
             # 接管只对开启了共享的账号有意义；关闭状态下工具本来就不管这些软链。
@@ -1178,7 +1241,7 @@ def _hint_next_step(config: Config, name: str) -> None:
 
 def _has_account_option(args: argparse.Namespace) -> bool:
     return bool(args.proxy is not None or args.shared_to is not None or args.no_shared
-                or args.shared_exclude or args.shared_include)
+                or args.shared_exclude or args.shared_include or args.renews is not None)
 
 
 def _looks_like_path(value: str) -> bool:
@@ -1328,6 +1391,13 @@ def _checked_proxy(value: str) -> str:
         raise UsageError(str(exc))
 
 
+def _checked_renews(value: str) -> str:
+    try:
+        return validate_renews(value)
+    except ValueError as exc:
+        raise UsageError(str(exc))
+
+
 def cmd_list(verbose: bool = False, as_json: bool = False, names_only: bool = False, offline: bool = False,
              refresh_tokens: bool = True) -> int:
     """列出账号。除 --names 与 --offline 外，会读各账号的访问令牌并向服务端查询套餐（方案 feature-live-plan）；
@@ -1346,9 +1416,12 @@ def cmd_list(verbose: bool = False, as_json: bool = False, names_only: bool = Fa
     plans = None if offline or not exists else plan.query_all(config, os.environ, datetime.now(timezone.utc),
                                                              allow_refresh=refresh_tokens)
     if as_json:
-        _print_json(_list_data(config, exists, plans))
+        # 只取一次今天：JSON 里的 days_left 与 stderr 的过期提示在跨午夜时也一致。
+        today = _local_today()
+        _print_json(_list_data(config, exists, plans, today))
         if exists:
             _report_plan_problems(plans)
+            _report_renewals(config, today)
             accounts.warn_launch_settings(config, None, note_invalid=True)
         return accounts.EXIT_OK
     if not exists:
@@ -1365,7 +1438,10 @@ def cmd_list(verbose: bool = False, as_json: bool = False, names_only: bool = Fa
         return accounts.EXIT_OK
     if "CLAUDE_CODE_CUSTOM_OAUTH_URL" in os.environ:
         warn("CLAUDE_CODE_CUSTOM_OAUTH_URL is set; LOGIN assumes the production service and may be wrong")
-    rows = [("NAME", "IDENTITY", "DIR", "PROXY", "SHARED", "LAUNCHER", "LOGIN") + _plan_header(plans) + ("LINK",)]
+    today = _local_today()
+    renews_shown = _has_renewals(config)
+    rows = [("NAME", "IDENTITY", "DIR", "PROXY", "SHARED", "LAUNCHER", "LOGIN") + _plan_header(plans)
+            + _renews_header(renews_shown) + ("LINK",)]
     details = []
     default_account = None
     for entry in _account_entries(config):
@@ -1373,7 +1449,9 @@ def cmd_list(verbose: bool = False, as_json: bool = False, names_only: bool = Fa
             default_account = entry["name"]
         rows.append((entry["name"], entry["identity"], "ok" if entry["dir_exists"] else "missing-dir",
                      entry["proxy"], _shared_cell(entry), entry["launcher"], entry["login"])
-                    + _plan_cells(plans, entry["name"]) + (entry["link"] or "-",))
+                    + _plan_cells(plans, entry["name"])
+                    + _renews_cells(renews_shown, config.find(entry["name"]).renews, today)
+                    + (entry["link"] or "-",))
         if verbose:
             details.append("  {}: keychain service {!r}, credentials file {}".format(
                 entry["name"], entry["keychain_service"], entry["credentials_file"]))
@@ -1385,6 +1463,7 @@ def cmd_list(verbose: bool = False, as_json: bool = False, names_only: bool = Fa
     for line in details:
         print(line)
     _report_plan_problems(plans)
+    _report_renewals(config, today)
     accounts.warn_launch_settings(config, None, note_invalid=True)
     return accounts.EXIT_OK
 
@@ -1403,6 +1482,61 @@ def _plan_cells(plans: Optional[dict], name: str) -> tuple:
     return (plan.plan_cell(plans[name]), plan.billing_cell(plans[name]))
 
 
+def _local_today() -> date:
+    """本机时区的今天；续费日按商店页面显示的日期手填，剩余天数也按本地日期算。"""
+    return datetime.now().astimezone().date()
+
+
+def _has_renewals(config: Config) -> bool:
+    """没有任何账号填过续费日时不加 RENEWS 列，表格与改动前完全相同。"""
+    return any(account.renews for account in config.accounts.values())
+
+
+def _renews_header(shown: bool) -> tuple:
+    return ("RENEWS",) if shown else ()
+
+
+def _renews_cells(shown: bool, renews: Optional[str], today: date) -> tuple:
+    return (_renews_cell(renews, today),) if shown else ()
+
+
+def _renews_days(renews: str, today: date) -> int:
+    return (datetime.strptime(renews, "%Y-%m-%d").date() - today).days
+
+
+def _renews_cell(renews: Optional[str], today: date) -> str:
+    """RENEWS 列的一格：同年只写月-日，括号里是剩余天数；3 天内加 !，已过写 ago，提醒去商店页核对后更新。"""
+    if not renews:
+        return "-"
+    day = datetime.strptime(renews, "%Y-%m-%d").date()
+    shown = day.strftime("%m-%d") if day.year == today.year else renews
+    days = (day - today).days
+    if days == 0:
+        return "{} (today!)".format(shown)
+    if days < 0:
+        return "{} ({}d ago)".format(shown, -days)
+    if days <= 3:
+        return "{} ({}d!)".format(shown, days)
+    return "{} ({}d)".format(shown, days)
+
+
+def _renews_dict(renews: Optional[str], today: date) -> Optional[dict]:
+    """--json 的 renews 键：没填为 None；days_left 可为负数（日期已过）。"""
+    if not renews:
+        return None
+    return {"date": renews, "days_left": _renews_days(renews, today)}
+
+
+def _report_renewals(config: Config, today: date) -> None:
+    """续费日已过的账号打一行到 stderr：多半是商店已自动续费、用户还没更新日期。走 stderr 不混进 --json。"""
+    passed = [name for name, account in config.accounts.items()
+              if account.renews and _renews_days(account.renews, today) < 0]
+    if passed:
+        print("{} renewal date has passed for {}: check the store's subscription page, then run "
+              "multi-claude set NAME --renews YYYY-MM-DD (or --renews off)".format(LOG_PREFIX, ", ".join(passed)),
+              file=sys.stderr)
+
+
 def _report_plan_problems(plans: Optional[dict]) -> None:
     """套餐查询与令牌刷新的失败提示，打到 stderr；不影响表格、STATUS 列与退出码。"""
     if plans is None:
@@ -1436,13 +1570,17 @@ def _print_brief_list(config: Config, plans: Optional[dict] = None) -> int:
         # 与完整输出相同：LOGIN 与由它得出的 STATUS 都按正式服务探测，这时可能不准。
         warn("CLAUDE_CODE_CUSTOM_OAUTH_URL is set; LOGIN assumes the production service and may be wrong")
     now = datetime.now(timezone.utc)
-    rows = [("NAME", "LOGIN") + _plan_header(plans) + ("PROXY", "SHARED", "5H", "7D", "LAST USED", "STATUS")]
+    today = _local_today()
+    renews_shown = _has_renewals(config)
+    rows = [("NAME", "LOGIN") + _plan_header(plans) + _renews_header(renews_shown)
+            + ("PROXY", "SHARED", "5H", "7D", "LAST USED", "STATUS")]
     has_problem = False
     for entry in _account_entries(config):
         report = usage.read_account_usage(config, config.find(entry["name"]), now)
         status = _status_cell(entry)
         has_problem = has_problem or status != "ok"
         rows.append((entry["name"], entry["login"]) + _plan_cells(plans, entry["name"])
+                    + _renews_cells(renews_shown, config.find(entry["name"]).renews, today)
                     + (entry["proxy"], _shared_cell(entry),
                        _window_cell(report.five_hour, now), _window_cell(report.seven_day, now),
                        _last_used_cell(entry["last_used"], now), status))
@@ -1451,6 +1589,7 @@ def _print_brief_list(config: Config, plans: Optional[dict] = None) -> int:
     if has_problem:
         print("run multi-claude doctor for details")
     _report_plan_problems(plans)
+    _report_renewals(config, today)
     accounts.warn_launch_settings(config, None, note_invalid=True)
     return accounts.EXIT_OK
 
@@ -1493,9 +1632,11 @@ def _shared_cell(entry: dict) -> str:
     return "yes"
 
 
-def _account_entries(config: Config, with_usage: bool = False, plans: Optional[dict] = None) -> List[dict]:
+def _account_entries(config: Config, with_usage: bool = False, plans: Optional[dict] = None,
+                     today: Optional[date] = None) -> List[dict]:
     """list 的表格与 JSON 共用的每账号数据；表格的列取自这里，保证两种输出口径一致。"""
     now = datetime.now(timezone.utc)
+    today = today or _local_today()
     entries = []
     for name, account in config.accounts.items():
         directory = accounts.account_dir(config, name)
@@ -1515,6 +1656,7 @@ def _account_entries(config: Config, with_usage: bool = False, plans: Optional[d
             "credentials_file": identity.credentials_file(directory),
             # history.jsonl 与会话文件的最大 mtime；只 stat 不读内容（方案 feature-usage-history §5.1.3）
             "last_used": _iso(history.last_used(directory)),
+            "renews": _renews_dict(account.renews, today),
         }
         if with_usage:
             entry["usage"] = usage.report_to_dict(usage.read_account_usage(config, account, now), now)
@@ -1525,7 +1667,7 @@ def _account_entries(config: Config, with_usage: bool = False, plans: Optional[d
     return entries
 
 
-def _list_data(config: Config, exists: bool, plans: Optional[dict] = None) -> dict:
+def _list_data(config: Config, exists: bool, plans: Optional[dict] = None, today: Optional[date] = None) -> dict:
     if not exists:
         return {"schema_version": 1, "configured": False, "accounts": [],
                 "routes": {"default": None, "rules": []}}
@@ -1535,7 +1677,7 @@ def _list_data(config: Config, exists: bool, plans: Optional[dict] = None) -> di
         "root": expand(config.root),
         "bin_dir": expand(config.bin_dir),
         "shared_dir": expand(config.shared_dir) if config.shared_dir else None,
-        "accounts": _account_entries(config, with_usage=True, plans=plans),
+        "accounts": _account_entries(config, with_usage=True, plans=plans, today=today),
         "routes": {"default": config.route_default,
                    "rules": [{"path": rule.path, "account": rule.account, "exists": os.path.isdir(expand(rule.path))}
                              for rule in config.route_rules]},

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude/config.py

@@ -4,6 +4,7 @@ config.json 是唯一的权威源，启动命令、共享链接都是从它推
 本模块只负责数据本身，不创建或删除任何账号文件。
 """
 
+import datetime
 import json
 import os
 import re
@@ -80,7 +81,8 @@ class Account(object):
     def __init__(self, name: str, proxy: str = PROXY_INHERIT, shared: bool = False,
                  managed_links: Optional[List[str]] = None, identity: str = IDENTITY_DIR,
                  env: Optional[Dict[str, str]] = None, args: Optional[List[str]] = None,
-                 dir: Optional[str] = None, shared_exclude: Optional[List[str]] = None) -> None:
+                 dir: Optional[str] = None, shared_exclude: Optional[List[str]] = None,
+                 renews: Optional[str] = None) -> None:
         self.name = name
         # 账号目录在根目录下的名字。缺省等于账号名；rename 只改 name、不改 dir，
         # 目录路径不变，macOS 上按路径绑定的登录就不会丢（方案 feature-rename-mcp §3）。
@@ -93,10 +95,14 @@ class Account(object):
         self.identity = identity
         self.env = dict(env or {})
         self.args = list(args or [])
+        # 订阅续费日 YYYY-MM-DD，用户照着 App Store / Google Play 订阅页手填；None 表示没填。
+        # 服务端接口给不出准确的到期日，所以只能手填（方案 feature-renewal-date §1）。
+        self.renews = renews
 
     def copy(self) -> "Account":
+        # migrate-default、restore 靠 config.copy() 复制配置，漏掉任何字段都会让这两个命令把它清掉。
         return Account(self.name, self.proxy, self.shared, list(self.managed_links), self.identity,
-                       dict(self.env), list(self.args), self.dir, list(self.shared_exclude))
+                       dict(self.env), list(self.args), self.dir, list(self.shared_exclude), self.renews)
 
     def to_dict(self) -> dict:
         data = {"identity": self.identity, "proxy": self.proxy, "shared": self.shared,
@@ -107,6 +113,9 @@ class Account(object):
         # 同理只在非空时写出，没有退出项的账号配置内容不变。
         if self.shared_exclude:
             data["shared_exclude"] = list(self.shared_exclude)
+        # 同理只在填过续费日时写出。
+        if self.renews:
+            data["renews"] = self.renews
         return data
 
 
@@ -372,7 +381,24 @@ def _parse_account(name: str, value: object, source: str) -> Account:
     exclude = value.get("shared_exclude", [])
     if not isinstance(exclude, list) or not all(_valid_item(item) for item in exclude):
         raise ConfigError("{}: 'shared_exclude' must be a list of names".format(where))
-    return Account(name, proxy, shared, links, identity, env, args, directory, _unique(exclude))
+    renews = value.get("renews")
+    if renews is not None:
+        try:
+            renews = validate_renews(renews)
+        except ValueError:
+            raise ConfigError("{}: 'renews' must be a date YYYY-MM-DD".format(where))
+    return Account(name, proxy, shared, links, identity, env, args, directory, _unique(exclude), renews)
+
+
+def validate_renews(value: object) -> str:
+    """校验续费日：整串 YYYY-MM-DD 且是真实存在的日期（拒绝 2026-02-30）。"""
+    if not isinstance(value, str) or not re.fullmatch(r"[0-9]{4}-[0-9]{2}-[0-9]{2}", value):
+        raise ValueError("renewal date must be YYYY-MM-DD, e.g. 2026-11-10")
+    try:
+        datetime.datetime.strptime(value, "%Y-%m-%d")
+    except ValueError:
+        raise ValueError("renewal date must be YYYY-MM-DD, e.g. 2026-11-10")
+    return value
 
 
 def _unique(items: List[str]) -> List[str]:

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude/refresh.py

@@ -230,13 +230,25 @@ class _Lock(object):
     """自己建的一把锁，以及用来确认“这个路径上还是我建的那个目录”的指纹。
 
     指纹是设备号、inode 和自己最后一次设置的修改时间（proper-lockfile 也靠修改时间判断锁有没有被别人动过）。
-    只比 inode 不够：别人删掉重建时文件系统可能复用同一个编号。
+    只比 inode 不够：别人删掉重建时文件系统可能复用同一个编号。修改时间也不能交给内核取：
+    ext4 上几毫秒内删掉重建的目录，inode 和内核记的修改时间多半与原来相同（实测 2000 次里 1993 次），会把别人的锁认成自己的。
+    所以建锁和保活时都用 _set_mtime_now 写入此刻的精细时间。
+    不能改成往锁目录里放标记文件：proper-lockfile 用 rmdir 清理过期锁，目录非空就删不掉，锁会一直卡住。
     """
 
     def __init__(self, path: str) -> None:
         self.path = path
+        try:
+            self._set_mtime_now()
+        except OSError:
+            # 设不了时间就用内核写的时间记指纹：锁照样能用，只是分辨不出同一时钟节拍里的删掉重建。
+            pass
         self._stamp = self._read()
 
+    def _set_mtime_now(self) -> None:
+        now_ns = time.time_ns()
+        os.utime(self.path, ns=(now_ns, now_ns))
+
     def _read(self) -> Optional[Tuple[int, int, int]]:
         try:
             status = os.lstat(self.path)
@@ -252,7 +264,8 @@ class _Lock(object):
         if not self.is_mine():
             return
         try:
-            os.utime(self.path, None)
+            # 不能用 os.utime(path, None)：那样又由内核取时间，保活一次后指纹就退回分辨不出重建的状态。
+            self._set_mtime_now()
         except OSError:
             return
         fresh = self._read()

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: multi-claude-cli
-Version: 0.12.0
+Version: 0.13.0
 Summary: Run several Claude Code accounts side by side: separate CLAUDE_CONFIG_DIR directories, launchers, proxies, environment variables and arguments.
 License: MIT
 Project-URL: Homepage, https://github.com/jakoes-wu/multi-claude
@@ -331,6 +331,19 @@ old    keychain  token expired  -       inherit                no      -
 - `error` comes with a reason on stderr, for example `plan lookup failed for work: timeout (via 127.0.0.1:7890, 10.01s)`. `tls_failed` usually means the Python that runs multi-claude has no root certificates (python.org installers ship an `Install Certificates.command`).
 - `list --offline` skips the lookup — no token is read, nothing is sent — and prints the table without the two columns. `list --json` carries the same data in each account's `plan` object (`refresh` tells whether a token was renewed); scripts should use it instead of parsing the table. The lookup adds about a second, at most 15; a renewal that is under way is allowed to finish first (the first Ctrl-C only prints a notice), so that the new login is not lost.
 
+#### Renewal date
+
+Anthropic's interface does not say when a subscription renews, and the date it implies is wrong for an account whose subscription was stopped and started again. Copy the date from the store's subscription page (App Store or Google Play) instead:
+
+```sh
+multi-claude set work --renews 2026-11-10   # the date the store shows
+multi-claude set work --renews off          # forget it
+```
+
+Once any account has a date, `list` adds a `RENEWS` column (also with `--offline`, since nothing is looked up): `11-10 (25d)` is 25 days away, `10-19 (3d!)` three days or less, `10-16 (today!)` today, `10-10 (6d ago)` already passed. A date in another year is written in full, `2027-01-05 (81d)`. Days are counted in your local time zone. When a date has passed — usually because the store renewed the subscription — `list` reminds you on stderr to look up the new date. Accounts without a date show `-`; without any dates the table is unchanged.
+
+`list --json` gives each account `"renews": {"date": "2026-11-10", "days_left": 25}` (`days_left` is negative once the date has passed), or `null`. The date is stored as `renews` in `config.json`; `apply -f FILE` treats it like any other account setting, so an account whose entry in FILE has no `renews` loses its date.
+
 ### Finding a session
 
 Forgot which account or which directory a session was started in? `sessions` lists the sessions of every account and every project directory, newest first; `--cmd` adds the command that resumes each one:
@@ -529,14 +542,14 @@ It never copies, exports, uploads or backs up a login. One command touches one:
 | `multi-claude restore NAME [--skip-process-check] [--dry-run]` | Undo `migrate-default`: move the account back to `~/.claude` and unregister it. The login is kept. |
 | `multi-claude export NAME FILE` | Write the account's settings, `CLAUDE.md`, agents, commands, skills, output styles and MCP servers to FILE. No logins or sessions. |
 | `multi-claude import FILE NAME [--force] [--dry-run]` | Import such a file into an existing account; conflicts are refused unless `--force` (which backs up first). |
-| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
-| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
+| `multi-claude add NAME [--proxy P] [--shared [DIR] \| --no-shared] [--adopt] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off] [--config-from OTHER]` | Add an account, adopt an existing directory, or change its options. `--config-from` copies `settings.json` from OTHER once. `--renews` records the renewal date (see [Renewal date](#renewal-date)). `--shared DIR` also makes DIR the shared directory for every account (default `~/.claude-shared`). `--shared-exclude` keeps one shared item out of this account; `--shared-include` undoes it. |
+| `multi-claude set NAME [--proxy P] [--shared [DIR] \| --no-shared] [--shared-exclude ITEM] [--shared-include ITEM] [--renews DATE\|off]` | Change an existing account; same options as `add` without `--adopt`. Returns 1 for an account that is not registered. |
 | `multi-claude proxy NAME PORT\|URL\|off\|inherit` | Set an account's proxy. |
 | `multi-claude env (NAME \| --defaults) [K=V ...] [--unset K ...]` | Set or remove extra environment variables. |
 | `multi-claude args (NAME \| --defaults) -- [ARG ...]` | Replace the fixed arguments; `--` with nothing after it clears them. |
 | `multi-claude remove NAME` | Unregister an account and delete its launcher. **The directory and the login are kept.** |
 | `multi-claude apply [-f FILE]` | Converge everything to the configuration (or to `FILE`). |
-| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). |
+| `multi-claude list [--verbose \| --json \| --names] [--no-refresh] [--offline]` | Show accounts, launchers, login state and the plan and billing channel looked up from Anthropic. `--json` adds usage and is meant for scripts; `--names` prints only the names; `--no-refresh` does not renew expired access tokens (never writes to a login); `--offline` skips the plan lookup (no token read, no network). A `RENEWS` column (and a `renews` key in `--json`) shows the renewal dates you recorded. |
 | `multi-claude usage [NAME] [--json]` | Show the last known 5-hour and 7-day usage of each account. |
 | `multi-claude usage --history [NAME] [--days N] [--by day\|model] [--json]` | Token usage per day or model, counted from the session files on this machine (default: 7 days). |
 | `multi-claude doctor [--json] [--verbose]` | Check the configuration, launchers, account directories, shared links, logins and environment. |

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/src/multi_claude_cli.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ tests/test_plan.py
 tests/test_platform.py
 tests/test_refresh.py
 tests/test_rename.py
+tests/test_renewal.py
 tests/test_routes.py
 tests/test_sessions.py
 tests/test_set.py

{multi_claude_cli-0.12.0 → multi_claude_cli-0.13.0}/tests/test_refresh.py

@@ -7,13 +7,16 @@
 
 import json
 import os
+import shutil
 import signal
 import stat
 import subprocess
 import sys
+import tempfile
 import threading
 import time
 import types
+import unittest
 from http.server import BaseHTTPRequestHandler
 from unittest import mock
 
@@ -482,6 +485,36 @@ class RenewTest(RefreshTestCase):
             self.assertNotIn("add-generic-password", call)
 
 
+class LockStampTest(unittest.TestCase):
+    """锁指纹里的修改时间必须是本工具写入的精细时间，不能交给内核取。
+
+    ext4 上几毫秒内删掉重建的锁目录，inode 和内核记的修改时间都与原来相同；只有自己写入的时间能分辨出来。
+    这里不依赖 inode 复用，在任何文件系统上确定性地检查“建锁和保活都写入了 time_ns 的值”。
+    """
+
+    # 低位非零：内核按时钟节拍记的时间不会恰好是这个值
+    STAMP_NS = 1_700_000_000_123_456_789
+
+    def setUp(self):
+        self.tmp = tempfile.mkdtemp(prefix="mcl-lock-")
+        self.addCleanup(shutil.rmtree, self.tmp, True)
+        self.path = os.path.join(self.tmp, refresh.LOCK_NAME)
+        os.mkdir(self.path)
+
+    def test_creating_and_touching_write_the_fine_clock(self):
+        # refresh.time 就是标准库 time：桩只包住这两次调用，不影响进程里的其它代码
+        with mock.patch.object(refresh.time, "time_ns", return_value=self.STAMP_NS):
+            lock = refresh._Lock(self.path)
+        self.assertEqual(os.lstat(self.path).st_mtime_ns, self.STAMP_NS)
+        self.assertTrue(lock.is_mine())
+
+        later = self.STAMP_NS + 5_000_000_000
+        with mock.patch.object(refresh.time, "time_ns", return_value=later):
+            lock.touch()
+        self.assertEqual(os.lstat(self.path).st_mtime_ns, later)
+        self.assertTrue(lock.is_mine())
+
+
 class KeychainWriteTest(CliTestCase):
     """macOS 分支：凭据在钥匙串里，写回走 `security -i`；用假 security，任何平台都能跑。"""
 

multi_claude_cli-0.13.0/tests/test_renewal.py

@@ -0,0 +1,245 @@
+"""方案 feature-renewal-date §8：手填续费日的写入、校验、list 显示与帮助示例。"""
+
+import argparse
+import contextlib
+import io
+import json
+import os
+import re
+import shlex
+import shutil
+import subprocess
+import sys
+import unittest
+from datetime import date, datetime, timedelta
+
+from helpers import CliTestCase, SRC
+
+sys.path.insert(0, SRC)
+
+from multi_claude import cli  # noqa: E402
+from multi_claude.config import dump_config, parse_config  # noqa: E402
+
+
+def _today():
+    return datetime.now().astimezone().date()
+
+
+class RenewsSettingTest(CliTestCase):
+    def account_data(self, name="work"):
+        return self.config_data()["accounts"][name]
+
+    def test_t1_set_records_date(self):
+        self.ok("add", "work")
+        self.ok("set", "work", "--renews", "2026-11-10")
+        self.assertEqual(self.account_data()["renews"], "2026-11-10")
+
+    def test_t2_off_removes_key(self):
+        self.ok("add", "work", "--renews", "2026-11-10")
+        self.assertEqual(self.account_data()["renews"], "2026-11-10")
+        self.ok("set", "work", "--renews", "off")
+        self.assertNotIn("renews", self.account_data())
+
+    def test_t3_bad_dates_rejected(self):
+        self.ok("add", "work", "--renews", "2026-11-10")
+        before = self.config_data()
+        for value in ("2026-02-30", "11-10", "tomorrow", "２０２６-11-10"):
+            with self.subTest(value=value):
+                result = self.run_cli("set", "work", "--renews", value)
+                self.assertEqual(result.code, 2, result)
+                self.assertIn("YYYY-MM-DD", result.err)
+                self.assertEqual(self.config_data(), before)
+
+    def test_t4_apply_file_validates(self):
+        self.ok("add", "work")
+        data = self.config_data()
+        path = os.path.join(self.tmp, "apply.json")
+        for bad in ("x", 5):
+            with self.subTest(value=bad):
+                data["accounts"]["work"]["renews"] = bad
+                self.write(path, json.dumps(data))
+                result = self.run_cli("apply", "-f", path)
+                self.assertEqual(result.code, 1, result)
+                self.assertIn("'renews'", result.err)
+        data["accounts"]["work"]["renews"] = "2026-11-10"
+        self.write(path, json.dumps(data))
+        self.ok("apply", "-f", path)
+        self.assertEqual(self.account_data()["renews"], "2026-11-10")
+
+    def test_t5_kept_by_other_changes(self):
+        self.ok("add", "work", "--renews", "2026-11-10")
+        self.ok("set", "work", "--proxy", "7901")
+        self.assertEqual(self.account_data()["renews"], "2026-11-10")
+        self.ok("rename", "work", "home")
+        self.assertEqual(self.account_data("home")["renews"], "2026-11-10")
+        # migrate-default 与 restore 都靠 config.copy() 复制配置。
+        with open(os.path.join(self.state, "config.json")) as handle:
+            config = parse_config(handle.read(), "config.json")
+        self.assertEqual(config.copy().accounts["home"].renews, "2026-11-10")
+        self.assertEqual(dump_config(config.copy()), dump_config(config))
+
+    def test_t10_dry_run_writes_nothing(self):
+        self.ok("add", "work")
+        before = self.config_data()
+        self.ok("set", "work", "--renews", "2026-11-10", "--dry-run")
+        self.assertEqual(self.config_data(), before)
+
+    def test_t13_apply_file_without_renews_clears_it(self):
+        self.ok("add", "work", "--renews", "2026-11-10")
+        data = self.config_data()
+        del data["accounts"]["work"]["renews"]
+        path = self.write(os.path.join(self.tmp, "apply.json"), json.dumps(data))
+        self.ok("apply", "-f", path)
+        self.assertNotIn("renews", self.account_data())
+
+    @unittest.skipUnless(shutil.which("bash"), "bash is not installed")
+    def test_t11_bash_completion(self):
+        script = self.write(os.path.join(self.tmp, "c.bash"), self.ok("completion", "bash").out)
+        runner = self.write(os.path.join(self.tmp, "run.bash"), (
+            'source "$1"\n'
+            'COMP_LINE="$2"; COMP_POINT=${#COMP_LINE}\n'
+            'COMP_WORDS=($COMP_LINE); COMP_CWORD=${#COMP_WORDS[@]}\n'
+            '_multi_claude\n'
+            'printf "%s\\n" "${COMPREPLY[@]}"\n'))
+        self.write(os.path.join(self.fakebin, "multi-claude"),
+                   '#!/bin/sh\nexec "{}" -m multi_claude "$@"\n'.format(sys.executable), 0o755)
+        env = self._merged({"PATH": os.pathsep.join([os.path.dirname(sys.executable), self.fakebin,
+                                                    "/usr/bin", "/bin"])})
+        proc = subprocess.run(["bash", runner, script, "multi-claude set x --ren"], env=env,
+                              stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+        self.assertEqual(proc.returncode, 0, proc.stderr)
+        self.assertIn("--renews", proc.stdout.split())
+
+
+class RenewsListTest(CliTestCase):
+    def test_t6_no_renewal_dates_no_change(self):
+        self.ok("add", "work")
+        brief = self.ok("list")
+        self.assertRegex(brief.out.splitlines()[0],
+                         r"^NAME\s+LOGIN\s+PLAN\s+BILLING\s+PROXY\s+SHARED\s+5H\s+7D\s+LAST USED\s+STATUS$")
+        self.assertNotIn("renewal date", brief.err)
+        verbose = self.ok("list", "--verbose")
+        header = [line for line in verbose.out.splitlines() if line.startswith("NAME")][0]
+        self.assertNotIn("RENEWS", header)
+        self.assertNotIn("renewal date", verbose.err)
+        as_json = self.ok("list", "--json")
+        self.assertNotIn("renewal date", as_json.err)
+        data = json.loads(as_json.out)
+        self.assertEqual([entry["renews"] for entry in data["accounts"]], [None])
+
+    def _list_with_dates(self):
+        """一个账号 +25 天、另一个 -6 天；前后两次取到的今天不同（跨午夜）就重跑一次。"""
+        for _attempt in range(2):
+            today = _today()
+            self.ok("set", "soon", "--renews", (today + timedelta(days=25)).isoformat())
+            self.ok("set", "late", "--renews", (today - timedelta(days=6)).isoformat())
+            brief = self.ok("list")
+            offline = self.ok("list", "--offline")
+            verbose = self.ok("list", "--verbose")
+            as_json = self.ok("list", "--json")
+            if _today() == today:
+                return brief, offline, verbose, as_json
+        self.fail("the date changed twice while the test was running")
+
+    def test_t7b_and_t9_columns_and_json(self):
+        self.ok("add", "soon")
+        self.ok("add", "late")
+        brief, offline, verbose, as_json = self._list_with_dates()
+        for result in (brief, offline):
+            header = result.out.splitlines()[0]
+            self.assertIn("RENEWS", header)
+            self.assertLess(header.index("RENEWS"), header.index("PROXY"))
+            self.assertRegex(result.out, r"\nsoon\s.*\(25d\)\s")
+            self.assertRegex(result.out, r"\nlate\s.*\(6d ago\)\s")
+        self.assertIn("LOGIN  RENEWS", offline.out.splitlines()[0])
+        self.assertIn("BILLING  RENEWS", brief.out.splitlines()[0])
+        verbose_header = [line for line in verbose.out.splitlines() if line.startswith("NAME")][0]
+        self.assertLess(verbose_header.index("RENEWS"), verbose_header.index("LINK"))
+        for result in (brief, offline, verbose, as_json):
+            self.assertIn("renewal date has passed for late", result.err)
+            self.assertNotIn("soon", result.err.split("renewal date has passed for")[1].splitlines()[0])
+        data = json.loads(as_json.out)
+        days = {entry["name"]: entry["renews"]["days_left"] for entry in data["accounts"]}
+        self.assertEqual(days, {"soon": 25, "late": -6})
+
+
+class RenewsCellTest(unittest.TestCase):
+    def test_t7_cells(self):
+        today = date(2026, 10, 16)
+        cases = [("2026-11-10", "11-10 (25d)"), ("2026-10-19", "10-19 (3d!)"), ("2026-10-16", "10-16 (today!)"),
+                 ("2026-10-10", "10-10 (6d ago)"), ("2027-01-05", "2027-01-05 (81d)"), (None, "-")]
+        for value, shown in cases:
+            with self.subTest(value=value):
+                self.assertEqual(cli._renews_cell(value, today), shown)
+        self.assertEqual(cli._renews_dict("2026-10-10", today), {"date": "2026-10-10", "days_left": -6})
+        self.assertIsNone(cli._renews_dict(None, today))
+
+
+class RenewsHelpTest(unittest.TestCase):
+    def help_text(self, *argv):
+        out = io.StringIO()
+        with contextlib.redirect_stdout(out), self.assertRaises(SystemExit) as raised:
+            cli.build_parser().parse_args(list(argv) + ["--help"])
+        self.assertEqual(raised.exception.code, 0)
+        return out.getvalue()
+
+    def example_commands(self, text):
+        self.assertIn("Examples:", text)
+        lines = text.split("Examples:", 1)[1].splitlines()
+        commands = []
+        for line in lines[1:]:
+            if not line.startswith("  "):
+                break
+            commands.append(re.split(r"\s{2,}", line.strip())[0])
+        return commands
+
+    def parse_example(self, command):
+        words = shlex.split(command)
+        self.assertEqual(words[0], "multi-claude")
+        if "--help" in words:
+            with contextlib.redirect_stdout(io.StringIO()), self.assertRaises(SystemExit) as raised:
+                cli.build_parser().parse_args(words[1:])
+            self.assertEqual(raised.exception.code, 0)
+            return None
+        return cli.build_parser().parse_args(words[1:])
+
+    def subparser(self, name):
+        parser = cli.build_parser()
+        for action in parser._actions:
+            if isinstance(action, argparse._SubParsersAction):
+                return action.choices[name]
+        raise AssertionError("no subparsers")
+
+    def test_t8_examples_parse_and_cover_options(self):
+        for argv in ((), ("set",), ("add",), ("list",)):
+            with self.subTest(command=argv):
+                commands = self.example_commands(self.help_text(*argv))
+                self.assertTrue(commands)
+                for command in commands:
+                    self.parse_example(command)
+                if not argv:
+                    continue
+                options = {option for action in self.subparser(argv[0])._actions
+                           for option in action.option_strings} - {"-h", "--help"}
+                if argv[0] in ("set", "add"):
+                    options.discard("--verbose")
+                used = {word for command in commands for word in shlex.split(command)}
+                self.assertEqual(sorted(options - used), [])
+
+    def test_t14_main_examples_keep_descriptions(self):
+        lines = self.help_text().split("Examples:", 1)[1].splitlines()
+        for command, text in cli._EXAMPLES:
+            if not text:
+                continue
+            with self.subTest(command=command):
+                self.assertTrue(any(command + "  " in line and line.endswith(text) for line in lines))
+
+    def test_descriptions_fit_80_columns(self):
+        for name in ("set", "add", "list"):
+            with self.subTest(command=name):
+                for line in (self.subparser(name).description or "").splitlines():
+                    self.assertLessEqual(len(line), 80)
+
+
+if __name__ == "__main__":
+    unittest.main()