netizen-cli 0.10.1__tar.gz → 0.11.0__tar.gz

{netizen_cli-0.10.1/netizen_cli.egg-info → netizen_cli-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.10.1
+Version: 0.11.0
 Summary: Use native Codex threads through a Feishu Channel.
 Requires-Python: <3.15,>=3.11
 Requires-Dist: h11==0.16.0
@@ -10,7 +10,7 @@ Requires-Dist: markdown-it-py==4.0.0
 Requires-Dist: mdformat==1.0.0
 Requires-Dist: mdformat-gfm==1.0.0
 Requires-Dist: mcp==2.2.0
-Requires-Dist: openai-codex==0.156.1
+Requires-Dist: openai-codex==0.161.0
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: qrcode==8.2

{netizen_cli-0.10.1 → netizen_cli-0.11.0}/README.md

@@ -41,6 +41,9 @@
   [群聊上下文](skills/netizen-user-guide/references/user-guide.md#发送消息引用与图片)。
 - **取回本轮文件。** 完成后从回复卡片中按需发送有原生执行记录的文件；发送的是点击时
   的当前内容，详见[文件说明](skills/netizen-user-guide/references/user-guide.md#查看和发送本轮文件)。
+- **保留上下文，另开一条讨论。** 用
+  [持久分支](skills/netizen-user-guide/references/user-guide.md#fork-持久分支)在当前聊天或其他群
+  创建普通话题，之后独立继续。
 - **展开临时讨论，推进持续目标。** 用
   [Side](skills/netizen-user-guide/references/user-guide.md#side-临时话题)另开临时话题，或用
   [Goal](skills/netizen-user-guide/references/user-guide.md#goal)让 Codex 围绕目标持续推进。
@@ -122,8 +125,10 @@ setup 准备配置、飞书授权和实例数据并注册服务，不默认启
 | 新建会话，选择项目 | `/new` |
 | 查看、保存或删除当前聊天的会话默认配置 | `/defaults` |
 | 查看并切换已有会话 | `/sessions` |
+| 从当前空闲会话另建持久分支话题 | `/fork` |
 | 调整模型、思考强度和过程卡 | `/config`，当前会话空闲时使用 |
 | 查看当前任务和上下文用量 | `/status` |
+| 查看共享 Codex 账号额度和重置时间 | `/usage` |
 | 中断当前任务 | `/stop`；不保证前台工具进程退出，见[停止说明](skills/netizen-user-guide/references/user-guide.md#stop) |
 | 查找当前机器人的管理入口 | `/admin`；返回实际管理 URL 和实例根目录，不返回登录凭据 |
 | 管理定时任务 | `/cron`，也可以直接用自然语言描述计划 |
@@ -175,7 +180,7 @@ Side 会在同一聊天中新建话题，可继续多轮讨论。它与原会话
   飞书 1.0 卡片明确不支持。
   输出文件按本轮原生记录发现，不扫描工作区补齐，也不自动上传。
 - **Codex 能力有宿主差异。** 飞书复用原生会话和工具，但并非每个 App/CLI 控件都可用；
-  新会话采用 `auto_review`，不能完整继承 App 的 Ask/Custom。
+  全新会话采用 `auto_review`，持久分支沿用原生继承权限；不提供 App 的 Ask/Custom 选择器。
   [完整差异与当前限制](skills/netizen-user-guide/references/user-guide.md#与-codex-appcli-的差异)
 
 <a id="用户指南-skill"></a>

{netizen_cli-0.10.1 → netizen_cli-0.11.0}/netizen_cli/__init__.py

@@ -1,3 +1,3 @@
 """Netizen: a thin Feishu Channel for native Codex Threads."""
 
-__version__ = "0.10.1"
+__version__ = "0.11.0"

netizen_cli-0.11.0/netizen_cli/account_rate_limits.py

@@ -0,0 +1,340 @@
+"""One read-only, removable bridge for native account quota snapshots."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import re
+from dataclasses import dataclass
+from decimal import Decimal, InvalidOperation, ROUND_HALF_UP
+from typing import Any, Protocol
+
+from openai_codex import AsyncCodex
+from pydantic import ValidationError, field_validator
+
+from .sdk_gap_adapter import (
+    SdkFacadeMigrationRequired,
+    SdkGapCapabilityUnavailable,
+    _generated_type,
+    _initialized_client,
+    _require_model_fields,
+)
+
+
+_CAPABILITY = "account-rate-limits"
+_READ_METHOD = "account/rateLimits/read"
+_READ_TIMEOUT_SECONDS = 10.0
+_MAX_BUCKETS = 64
+_MAX_LABEL_LENGTH = 256
+
+
+class AccountRateLimitsUnavailable(RuntimeError):
+    """The response cannot supply a trustworthy quota projection."""
+
+
+@dataclass(frozen=True, slots=True)
+class AccountRateLimitWindow:
+    used_percent: int
+    window_duration_mins: int | None
+    resets_at: int | None
+
+
+@dataclass(frozen=True, slots=True)
+class AccountCredits:
+    has_credits: bool
+    unlimited: bool
+    balance: int | None
+
+
+@dataclass(frozen=True, slots=True)
+class AccountMonthlyCreditLimit:
+    limit: int
+    used: int
+    remaining_percent: int
+    resets_at: int
+
+
+@dataclass(frozen=True, slots=True)
+class AccountRateLimitBucket:
+    limit_id: str | None
+    limit_name: str | None
+    primary: AccountRateLimitWindow | None
+    secondary: AccountRateLimitWindow | None
+    credits: AccountCredits | None = None
+    monthly_limit: AccountMonthlyCreditLimit | None = None
+
+
+@dataclass(frozen=True, slots=True)
+class AccountRateLimitsSnapshot:
+    buckets: tuple[AccountRateLimitBucket, ...]
+
+
+class AccountRateLimits(Protocol):
+    async def read(self) -> AccountRateLimitsSnapshot: ...
+
+
+def facade_migration_requirements() -> tuple[str, ...]:
+    """Require review when a candidate public account-quota facade appears."""
+
+    candidates = (
+        "rate_limits",
+        "rate_limits_read",
+        "account_rate_limits",
+        "account_rate_limits_read",
+        "get_account_rate_limits",
+        "read_account_rate_limits",
+    )
+    names = tuple(
+        f"AsyncCodex.{name}" for name in candidates if hasattr(AsyncCodex, name)
+    )
+    return (
+        (f"migration-required:{_CAPABILITY}:{','.join(names)}",) if names else ()
+    )
+
+
+class AppServerAccountRateLimits:
+    """Read once through the same initialized SDK-owned client.
+
+    Timeout/cancellation stops waiting, not the SDK's underlying sync request.
+    This bridge never retries, resets quota, consumes notifications, or closes
+    the shared client. Late results remain owned by the SDK transport.
+    """
+
+    __slots__ = ("_client", "_params_model", "_response_model", "_bucket_model")
+
+    def __init__(self, codex: AsyncCodex) -> None:
+        if requirements := facade_migration_requirements():
+            raise SdkFacadeMigrationRequired("; ".join(requirements))
+        self._client = _initialized_client(codex, capability=_CAPABILITY)
+        self._params_model = _model(
+            "GetAccountRateLimitsParams",
+            {
+                "exclude_reset_credit_details": "excludeResetCreditDetails",
+                "supports_luna_reserve": "supportsLunaReserve",
+            },
+        )
+        self._response_model = _model(
+            "GetAccountRateLimitsResponse",
+            {
+                "account_id": "accountId",
+                "ordinary_usage_allowed": "ordinaryUsageAllowed",
+                "rate_limit_reset_credits": "rateLimitResetCredits",
+                "rate_limit_upsell": "rateLimitUpsell",
+                "rate_limits": "rateLimits",
+                "rate_limits_by_limit_id": "rateLimitsByLimitId",
+            },
+        )
+        self._bucket_model = _model(
+            "RateLimitSnapshot",
+            {
+                "credits": "credits",
+                "individual_limit": "individualLimit",
+                "limit_id": "limitId",
+                "limit_name": "limitName",
+                "normal_model_slug": "normalModelSlug",
+                "plan_type": "planType",
+                "primary": "primary",
+                "rate_limit_reached_type": "rateLimitReachedType",
+                "secondary": "secondary",
+                "spend_control_reached": "spendControlReached",
+            },
+        )
+        _model(
+            "RateLimitWindow",
+            {
+                "resets_at": "resetsAt",
+                "used_percent": "usedPercent",
+                "window_duration_mins": "windowDurationMins",
+            },
+        )
+        _model(
+            "CreditsSnapshot",
+            {
+                "balance": "balance",
+                "has_credits": "hasCredits",
+                "unlimited": "unlimited",
+            },
+        )
+        _model(
+            "SpendControlLimitSnapshot",
+            {
+                "limit": "limit",
+                "used": "used",
+                "remaining_percent": "remainingPercent",
+                "resets_at": "resetsAt",
+            },
+        )
+        self._response_model = _strict_response_model(
+            self._response_model, self._bucket_model
+        )
+
+    async def read(self) -> AccountRateLimitsSnapshot:
+        params = self._params_model(
+            excludeResetCreditDetails=True, supportsLunaReserve=False
+        )
+        try:
+            async with asyncio.timeout(_READ_TIMEOUT_SECONDS):
+                response = await self._client.request(
+                    _READ_METHOD,
+                    params.model_dump(by_alias=True),
+                    response_model=self._response_model,
+                )
+        except ValidationError as error:
+            raise AccountRateLimitsUnavailable("Codex 额度响应格式无效。") from error
+        if not isinstance(response, self._response_model):
+            raise AccountRateLimitsUnavailable("Codex 额度响应类型无效。")
+        multiple = response.rate_limits_by_limit_id
+        if multiple is None:
+            buckets = (self._project_bucket(response.rate_limits),)
+        else:
+            if not isinstance(multiple, dict) or not 0 < len(multiple) <= _MAX_BUCKETS:
+                raise AccountRateLimitsUnavailable("Codex 额度分组为空或超出读取范围。")
+            projected = []
+            for key, raw in multiple.items():
+                limit_id = _label(key, required=True)
+                if not isinstance(raw, dict):
+                    raise AccountRateLimitsUnavailable("Codex 额度分组格式无效。")
+                try:
+                    # JSON strict validation preserves valid string enums while
+                    # rejecting coercion of window strings/bools into numbers.
+                    bucket = self._bucket_model.model_validate_json(
+                        json.dumps(raw, allow_nan=False), strict=True
+                    )
+                except (ValidationError, TypeError, ValueError) as error:
+                    raise AccountRateLimitsUnavailable(
+                        "Codex 额度分组格式无效。"
+                    ) from error
+                projected.append(self._project_bucket(bucket, limit_id=limit_id))
+            buckets = tuple(projected)
+        if not any(
+            bucket.primary is not None or bucket.secondary is not None
+            or bucket.credits is not None or bucket.monthly_limit is not None
+            for bucket in buckets
+        ):
+            raise AccountRateLimitsUnavailable("Codex 尚未提供可用的额度数据。")
+        return AccountRateLimitsSnapshot(buckets)
+
+    def _project_bucket(
+        self, bucket: Any, *, limit_id: str | None = None
+    ) -> AccountRateLimitBucket:
+        if not isinstance(bucket, self._bucket_model):
+            raise AccountRateLimitsUnavailable("Codex 额度分组格式无效。")
+        supplied_id = _label(bucket.limit_id)
+        if limit_id is not None and supplied_id is not None and limit_id != supplied_id:
+            raise AccountRateLimitsUnavailable("Codex 额度分组标识不一致。")
+        return AccountRateLimitBucket(
+            limit_id=limit_id if limit_id is not None else supplied_id,
+            limit_name=_label(bucket.limit_name),
+            primary=_window(bucket.primary),
+            secondary=_window(bucket.secondary),
+            credits=_credits(bucket.credits),
+            monthly_limit=_monthly_limit(bucket.individual_limit),
+        )
+
+
+def _model(name: str, aliases: dict[str, str]) -> type[Any]:
+    model = _generated_type(name, capability=_CAPABILITY)
+    _require_model_fields(model, capability=_CAPABILITY, aliases=aliases)
+    if not callable(getattr(model, "model_validate_json", None)):
+        raise SdkGapCapabilityUnavailable(f"{_CAPABILITY} model validation changed")
+    return model
+
+
+def _strict_response_model(
+    response_model: type[Any], bucket_model: type[Any]
+) -> type[Any]:
+    # Inherit every field from the installed SDK. Its request decoder calls
+    # model_validate on the raw response, so validate legacy windows before
+    # Pydantic can coerce false, "0", or 0.0 into a known zero percent.
+    class StrictAccountRateLimitsResponse(response_model):
+        @field_validator("rate_limits", mode="before")
+        @classmethod
+        def _strict_legacy_bucket(cls, value: Any) -> Any:
+            if not isinstance(value, dict):
+                raise ValueError("expected a quota bucket object")
+            try:
+                return bucket_model.model_validate_json(
+                    json.dumps(value, allow_nan=False), strict=True
+                )
+            except TypeError as error:
+                raise ValueError("invalid quota bucket object") from error
+
+    return StrictAccountRateLimitsResponse
+
+
+def _label(value: Any, *, required: bool = False) -> str | None:
+    if value is None and not required:
+        return None
+    if (
+        not isinstance(value, str)
+        or not value
+        or value.strip() != value
+        or len(value) > _MAX_LABEL_LENGTH
+        or any(ord(char) < 32 or ord(char) == 127 for char in value)
+    ):
+        raise AccountRateLimitsUnavailable("Codex 额度分组名称或标识无效。")
+    return value
+
+
+def _window(value: Any) -> AccountRateLimitWindow | None:
+    if value is None:
+        return None
+    used = _nonnegative_int(value.used_percent)
+    duration = (
+        None if value.window_duration_mins is None
+        else _nonnegative_int(value.window_duration_mins)
+    )
+    resets = None if value.resets_at is None else _nonnegative_int(value.resets_at)
+    if duration == 0:
+        raise AccountRateLimitsUnavailable("Codex 额度窗口时长无效。")
+    # Native i32 percentages can exceed 100; do not invent a capped usage value.
+    return AccountRateLimitWindow(used, duration, resets)
+
+
+def _credits(value: Any) -> AccountCredits | None:
+    if value is None or not (value.unlimited or value.has_credits):
+        return None
+    # The native display treats a hidden or invalid balance as Available; it
+    # never exposes the raw string or infers requests from credit balances.
+    balance = _credit_amount(value.balance, positive=True)
+    return AccountCredits(value.has_credits, value.unlimited, balance)
+
+
+def _monthly_limit(value: Any) -> AccountMonthlyCreditLimit | None:
+    if value is None:
+        return None
+    limit, used = _credit_amount(value.limit), _credit_amount(value.used)
+    if limit is None or used is None:
+        return None
+    # Native remainingPercent can fall outside the display range; clamp only
+    # while rendering, independently of the reported used/limit amounts.
+    remaining = value.remaining_percent
+    if isinstance(remaining, bool) or not isinstance(remaining, int):
+        raise AccountRateLimitsUnavailable("Codex 月度额度数值无效。")
+    return AccountMonthlyCreditLimit(
+        limit, used, remaining, _nonnegative_int(value.resets_at)
+    )
+
+
+def _credit_amount(value: str | None, *, positive: bool = False) -> int | None:
+    if value is None:
+        return None
+    raw = value.strip()
+    if re.fullmatch(r"[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?", raw) is None:
+        return None
+    try:
+        amount = Decimal(raw)
+    except InvalidOperation:
+        return None
+    if (
+        not amount.is_finite() or amount < 0 or (positive and amount == 0)
+        or amount > 2**63 - 1
+    ):
+        return None
+    return int(amount.to_integral_value(rounding=ROUND_HALF_UP))
+
+
+def _nonnegative_int(value: Any) -> int:
+    if isinstance(value, bool) or not isinstance(value, int) or value < 0:
+        raise AccountRateLimitsUnavailable("Codex 额度窗口数值无效。")
+    return value

{netizen_cli-0.10.1 → netizen_cli-0.11.0}/netizen_cli/admin/presentation.py

@@ -6,10 +6,9 @@ from dataclasses import asdict, is_dataclass
 from datetime import datetime
 from enum import Enum
 from typing import Any
-from urllib.parse import urlencode
 from zoneinfo import ZoneInfo
 
-from ..bindings import BindingTurnSettings
+from ..feishu_links import chat_open_url, topic_open_url as _topic_open_url
 from ..runtime.contracts import (
     ReleaseDisposition,
     StopDisposition,
@@ -18,23 +17,10 @@ from ..management import BindingStatusProjection, ChatLabel
 
 
 def _chat_open_url(chat: ChatLabel) -> str:
-    if chat.chat_mode == "p2p" and chat.p2p_target_open_id is not None:
-        query = urlencode({"openId": chat.p2p_target_open_id})
-    else:
-        query = urlencode({"openChatId": chat.chat_id})
-    return f"https://applink.feishu.cn/client/chat/open?{query}"
-
-
-def _topic_open_url(chat_id: str, topic_id: str) -> str:
-    # Match the official Lark CLI's desktop/mobile ID spellings and root position.
-    query = urlencode({
-        "open_chat_id": chat_id,
-        "open_thread_id": topic_id,
-        "openchatid": chat_id,
-        "openthreadid": topic_id,
-        "thread_position": -1,
-    })
-    return f"https://applink.feishu.cn/client/thread/open?{query}"
+    return chat_open_url(
+        chat.chat_id,
+        p2p_target_open_id=(chat.p2p_target_open_id if chat.chat_mode == "p2p" else None),
+    )
 
 
 def _schedule_plan_json(plan: dict[str, Any], chat: ChatLabel) -> dict[str, Any]:
@@ -76,16 +62,6 @@ def _jsonable(value: object) -> object:
     raise TypeError(f"unsupported JSON projection: {type(value).__name__}")
 
 
-def _settings_json(settings: BindingTurnSettings | None) -> dict[str, str] | None:
-    if settings is None:
-        return None
-    return {
-        "modelId": settings.model_id,
-        "effortId": settings.effort_id,
-        "serviceTierId": settings.service_tier_id,
-    }
-
-
 def _runtime_binding_json(status: BindingStatusProjection) -> dict[str, object]:
     snapshot = status.snapshot
     turn = snapshot.turn
@@ -217,7 +193,4 @@ def _binding_result(request_id: str, binding: Any) -> dict[str, object]:
         "scopeKey": binding.scope_key,
         "current": binding.active,
         "nativeThreadId": binding.native_thread_id,
-        "settingsRevision": binding.settings_revision,
-        "messageContextMode": binding.message_context_mode.value,
-        "contextRevision": binding.context_revision,
     }

{netizen_cli-0.10.1 → netizen_cli-0.11.0}/netizen_cli/admin/static/admin.css

@@ -37,6 +37,16 @@ input, select, textarea { min-width: 0; border: 1px solid #bac3d0; border-radius
 .card-form input { width: 100%; margin: 5px 0 12px; }
 .card-form button, .filter-bar > button[type="submit"], .action { border: 0; border-radius: 7px; padding: 8px 11px; background: var(--blue); color: white; }
 .filter-bar { display: grid; grid-template-columns: repeat(auto-fit, minmax(145px, 1fr)); align-items: end; gap: 10px; margin: 20px 0; }
+.filter-bar > input[type="hidden"] { display: none; }
+.chat-target, .schedule-binding-target { grid-column: 1 / -1; min-width: 0; }
+.chat-target > label:first-child { max-width: 240px; margin-bottom: 12px; }
+.card-form .chat-manual-toggle { display: flex; align-items: center; gap: 7px; margin: 10px 0; }
+.card-form .chat-manual-toggle input { width: auto; margin: 0; }
+.chat-target [hidden], .schedule-binding-target[hidden], .selection-notice[hidden] { display: none; }
+.target-summary { white-space: pre-line; overflow-wrap: anywhere; padding: 12px; border: 1px solid var(--line); border-radius: 8px; background: var(--wash); }
+.selection-notice { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin: 14px 0; padding: 12px; border: 1px solid #bbcff5; border-radius: 8px; background: var(--blue-soft); }
+.selection-notice p { margin: 0; font-size: 13px; }
+.selection-notice button { flex-shrink: 0; }
 .multi-filter { position: relative; min-width: 0; margin: 0; padding: 0; border: 0; }
 .multi-filter legend { margin-bottom: 5px; padding: 0; color: var(--muted); font-size: 13px; }
 .multi-filter-trigger { display: flex; align-items: center; justify-content: space-between; gap: 8px; width: 100%; min-height: 36px; border: 1px solid #bac3d0; border-radius: 7px; padding: 8px 10px; background: white; color: var(--ink); text-align: left; }
@@ -129,14 +139,10 @@ button:disabled { cursor: default; opacity: .48; }
 .update-operation { padding: 16px; margin: 20px 0; border-radius: 9px; background: var(--wash); }
 .update-operation p { margin: 8px 0 0; line-height: 1.6; }
 .update-warning { color: var(--muted); font-size: 13px; line-height: 1.6; }
-.update-actions { gap: 10px; }
-.update-actions .action { padding: 8px 13px; font-size: inherit; }
 .update-help { margin-top: 16px; font-size: 13px; }
 .service-restart { margin-top: 28px; padding-top: 20px; border-top: 1px solid var(--line); }
 .service-restart p { line-height: 1.6; }
 #updates a { color: var(--blue); }
-.update-notes { margin-top: 28px; padding-top: 20px; border-top: 1px solid var(--line); }
-#update-notes { white-space: pre-wrap; overflow-wrap: anywhere; line-height: 1.6; }
 button:focus-visible, input:focus-visible, select:focus-visible { outline: 3px solid #8cb4ff; outline-offset: 2px; }
 .login-body { min-height: 100vh; display: grid; place-items: center; padding: 20px; }
 .login-card { width: min(420px, 100%); background: white; border: 1px solid var(--line); border-radius: 14px; padding: 28px; }
@@ -158,7 +164,7 @@ button:focus-visible, input:focus-visible, select:focus-visible { outline: 3px s
   .time-range-fields { grid-template-columns: 1fr; }
 }
 .schedule-help { margin-top: 18px; color: var(--muted); }
-body.schedule-drawer-open, body.defaults-drawer-open { overflow: hidden; }
+body.schedule-drawer-open, body.defaults-drawer-open, body.session-settings-drawer-open { overflow: hidden; }
 .editor-drawer { position: fixed; inset: 0 0 0 auto; margin: 0; padding: 0; width: min(720px, 100vw); max-width: 100vw; height: 100dvh; max-height: 100dvh; border: 0; color: var(--ink); background: var(--paper); box-shadow: -12px 0 40px rgb(23 39 68 / 16%); }
 .editor-drawer::backdrop { background: rgb(16 33 63 / 35%); }
 #schedule-editor { height: 100%; display: flex; flex-direction: column; border: 0; border-radius: 0; padding: 0; margin: 0; }
@@ -236,6 +242,12 @@ body.schedule-drawer-open, body.defaults-drawer-open { overflow: hidden; }
 .defaults-feedback label { display: flex; align-items: center; gap: 7px; }
 .drawer-form .defaults-feedback input { width: 16px; height: 16px; margin: 0; accent-color: var(--blue); }
 #defaults-note.error { color: var(--danger); }
+#session-settings-editor[hidden], #session-settings-editor [hidden] { display: none; }
+#session-settings-fields { border: 0; padding: 0; margin: 0; min-width: 0; }
+#session-settings-fields:disabled { opacity: .6; }
+.session-settings-help { color: var(--muted); font-size: 13px; line-height: 1.6; }
+#session-settings-note { margin-top: 24px; }
+#session-settings-note.error { color: var(--danger); }
 #defaults table { table-layout: fixed; }
 #defaults th:first-child { width: 25%; }
 #defaults th:nth-child(2) { width: 16%; }