netizen-cli 0.12.1__tar.gz → 0.13.0__tar.gz

{netizen_cli-0.12.1/netizen_cli.egg-info → netizen_cli-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.12.1
+Version: 0.13.0
 Summary: Use native Codex threads through a Feishu Channel.
 Requires-Python: <3.15,>=3.11
 Requires-Dist: h11==0.16.0
@@ -11,7 +11,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.162.1
+Requires-Dist: openai-codex==0.163.0
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: qrcode==8.2

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/README.md

@@ -103,7 +103,7 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 ### 3. 在飞书开始第一次对话
 
 1. 打开机器人单聊；如需在群里使用，先将机器人加入目标群。
-2. 发送 `/settings`，创建或登记一个项目并启用。项目就是 Codex 实际工作的目录。
+2. 发送 `/settings`，创建或登记一个项目并启用。项目登记一个默认工作目录。
 3. 发送 `/new`，在卡片中选择项目。模型配置可选择“继承 Codex”；过程卡默认开启，可按需关闭。
 4. 直接发送任务，例如：**“梳理这个项目的结构，并生成一份入门说明。”**
 5. 收到回复后继续交流；如果出现“本轮文件”，点击“发送”取回需要的文件。
@@ -116,6 +116,11 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 群聊和群话题中的每条请求都需要重新 **@机器人**，包括命令。`/new` 只通过卡片创建会话，
 不接受参数。普通任务执行中发来的新消息用于调整当前任务，不会排队成下一个任务。
 
+Git 项目可在 `/new` 中加载项目目录选项，选择已有受管 worktree 或新建 worktree；默认
+仍使用项目目录。新建只检出提交内容，不复制本地改动或执行环境初始化。
+配置、状态查询与删除在 [Admin Worktrees](skills/netizen-user-guide/references/admin.md#worktree-配置与管理)
+中完成；不同会话可以共享同一工作区。`/fork` 不提供新建或选择 worktree 的入口。
+
 安装遇到问题可从[部署文档](docs/deployment.md)继续；已能对话时，常见疑问见
 [使用 FAQ](skills/netizen-user-guide/references/faq.md#常见问题)。
 
@@ -126,7 +131,7 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 | 想做什么 | 入口 |
 | --- | --- |
 | 创建或登记项目工作目录 | `/settings` |
-| 新建会话，选择项目 | `/new` |
+| 新建会话，选择项目及受管 worktree | `/new` |
 | 查看、保存或删除当前聊天的会话默认配置 | `/defaults` |
 | 查看并切换已有会话 | `/sessions` |
 | 从当前空闲会话另建持久分支话题 | `/fork` |
@@ -149,7 +154,7 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 /side 这个方案还有哪些边界情况需要考虑？
 ```
 
-Side 会在同一聊天中新建话题，可继续多轮讨论。它与原会话共享项目目录，空闲两小时或
+Side 会在同一聊天中新建话题，可继续多轮讨论。它与原会话共享实际工作目录，空闲两小时或
 服务重启后过期；`/side close` 主动结束话题会话。Side 中不支持 Goal。
 
 **每天回顾项目进展。** 在已经选择项目的普通会话中发送：

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/config.example.yaml

@@ -9,9 +9,16 @@ instance:
 # User and chat availability are configured in the Feishu app console. Netizen
 # does not maintain a second allowlist.
 projects:
-  # All native Codex Threads under this alias share the exact same cwd.
+  # Default cwd. /new can explicitly select a managed Worktree of this Project.
   test: /home/your-user/projects/test
 
+# Instance-owned Git worktrees; Admin can change these settings for future creates.
+# Omitted root uses <instance-root>/worktrees; existing checkouts are not moved.
+# No Codex App global configuration or private managed index is modified.
+worktrees:
+  # root: /home/your-user/.netizen/worktrees
+  fetchBeforeCreate: false
+
 channel:
   securityMode: audit
 

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/netizen_cli/__init__.py

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

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/netizen_cli/admin/port_config.py

@@ -6,6 +6,7 @@ import contextlib
 import os
 import stat
 import tempfile
+import threading
 from dataclasses import dataclass, field
 from pathlib import Path
 
@@ -45,6 +46,27 @@ class ConfigFileSnapshot:
             )
 
 
+class ConfigFileEditor:
+    """Serialize instance-owned section edits against one exact file snapshot.
+
+    Settings services share this object so their successful writes do not make
+    each other stale. External edits still conflict with the complete snapshot;
+    they are never silently merged or made effective in the running service.
+    """
+
+    def __init__(self, snapshot: ConfigFileSnapshot) -> None:
+        self._snapshot = snapshot
+        self._lock = threading.RLock()
+
+    def update_section(self, name: str, value: object) -> None:
+        with self._lock:
+            loaded = yaml.safe_load(self._snapshot.content)
+            if not isinstance(loaded, dict):
+                raise AdminPortConfigurationError("configuration root must be a mapping")
+            loaded[name] = value
+            self._snapshot = write_configuration(self._snapshot, loaded)
+
+
 def _identity(metadata: os.stat_result) -> tuple[int, ...]:
     return (
         metadata.st_dev, metadata.st_ino, metadata.st_mode, metadata.st_size,

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/netizen_cli/admin/queries.py

@@ -12,7 +12,7 @@ from datetime import UTC, datetime
 from .errors import AdminWebError
 from ..bindings import BindingCursor, SideTopicCursor
 from ..domain import ScopeKind
-from ..management import SessionInventoryState, SessionUpdatedCursor
+from ..management import SessionInventoryState, SessionNativeCursor
 
 
 _MAX_TEXT_BYTES = 4_096
@@ -113,22 +113,34 @@ def _text_set_query(
 def _created_range_query(
     values: Mapping[str, list[str]],
 ) -> tuple[str | None, str | None]:
-    created_from = _optional_created_time_query(values, "createdFrom")
-    created_before = _optional_created_time_query(values, "createdBefore")
+    return _time_range_query(values, "created", "创建")
+
+
+def _updated_range_query(
+    values: Mapping[str, list[str]],
+) -> tuple[str | None, str | None]:
+    return _time_range_query(values, "updated", "更新")
+
+
+def _time_range_query(
+    values: Mapping[str, list[str]], prefix: str, label: str,
+) -> tuple[str | None, str | None]:
+    lower = _optional_time_query(values, f"{prefix}From")
+    upper = _optional_time_query(values, f"{prefix}Before")
     if (
-        created_from is not None
-        and created_before is not None
-        and created_from >= created_before
+        lower is not None
+        and upper is not None
+        and lower >= upper
     ):
         raise AdminWebError(
             400,
             "invalid_time_range",
-            "创建时间的开始时间必须早于结束时间。",
+            f"{label}时间的开始时间必须早于结束时间。",
         )
-    return created_from, created_before
+    return lower, upper
 
 
-def _optional_created_time_query(
+def _optional_time_query(
     values: Mapping[str, list[str]],
     name: str,
 ) -> str | None:
@@ -190,27 +202,17 @@ def _current_query(values: Mapping[str, list[str]]) -> bool | None:
     return raw[0] == "true" if len(raw) == 1 else None
 
 
-def _session_inventory_states(
+def _session_inventory_state(
     values: Mapping[str, list[str]],
-) -> tuple[SessionInventoryState, ...] | None:
-    raw = _text_set_query(values, "inventoryState")
-    if raw is None:
-        return (
-            SessionInventoryState.ACTIVE,
-            SessionInventoryState.LAZY,
-            SessionInventoryState.UNKNOWN,
-        )
-    if raw == ("all",):
-        return None
-    try:
-        states = tuple(SessionInventoryState(value) for value in raw)
-    except ValueError:
+) -> SessionInventoryState:
+    raw = _optional_one(values, "inventoryState") or "active"
+    if raw not in {"active", "archived", "lazy"}:
         raise AdminWebError(
             400,
             "invalid_inventory_state",
             "会话状态无效。",
-        ) from None
-    return None if set(states) == set(SessionInventoryState) else states
+        )
+    return SessionInventoryState(raw)
 
 
 def _id_query(values: Mapping[str, list[str]], name: str) -> tuple[str, ...]:
@@ -308,13 +310,14 @@ def _decode_binding_cursor(
 
 
 def _encode_session_cursor(
-    cursor: BindingCursor | SessionUpdatedCursor | None,
+    cursor: BindingCursor | SessionNativeCursor | None,
     fingerprint: str,
 ) -> str | None:
-    if not isinstance(cursor, SessionUpdatedCursor):
+    if not isinstance(cursor, SessionNativeCursor):
         return _encode_binding_cursor(cursor, fingerprint)
+    marker = "start" if cursor.cursor is None else "next"
     return _encode_cursor(
-        "session-updated", (str(cursor.updated_at) if cursor.updated_at is not None else "unknown", cursor.binding_id), fingerprint,
+        "session-native", (marker, cursor.cursor if cursor.cursor is not None else "start", str(cursor.offset)), fingerprint,
     )
 
 
@@ -322,19 +325,21 @@ def _decode_session_cursor(
     encoded: str | None,
     fingerprint: str,
     *,
-    sort_by: str,
-) -> BindingCursor | SessionUpdatedCursor | None:
-    if sort_by == "created_at":
+    inventory_state: SessionInventoryState,
+) -> BindingCursor | SessionNativeCursor | None:
+    if inventory_state is SessionInventoryState.LAZY:
         return _decode_binding_cursor(encoded, fingerprint)
-    values = _decode_cursor(encoded, kind="session-updated", length=2, fingerprint=fingerprint)
+    values = _decode_cursor(encoded, kind="session-native", length=3, fingerprint=fingerprint)
     if values is None:
         return None
-    raw_time, binding_id = values
-    if raw_time == "unknown":
-        return SessionUpdatedCursor(None, binding_id)
-    if not re.fullmatch(r"0|[1-9][0-9]{0,15}", raw_time):
+    marker, raw_cursor, raw_offset = values
+    if (
+        marker not in {"start", "next"}
+        or marker == "start" and raw_cursor != "start"
+        or re.fullmatch(r"0|[1-9][0-9]?", raw_offset) is None
+    ):
         raise AdminWebError(400, "invalid_cursor", "分页游标无效。")
-    return SessionUpdatedCursor(int(raw_time), binding_id)
+    return SessionNativeCursor(None if marker == "start" else raw_cursor, int(raw_offset))
 
 
 def _encode_side_cursor(

{netizen_cli-0.12.1 → netizen_cli-0.13.0}/netizen_cli/admin/static/admin.css

@@ -101,7 +101,8 @@ input, select, textarea { min-width: 0; border: 1px solid #bac3d0; border-radius
 .time-range-calendar-icon { position: relative; width: 15px; height: 14px; flex: 0 0 auto; border: 1.5px solid currentColor; border-radius: 3px; color: var(--muted); }
 .time-range-calendar-icon::before { content: ""; position: absolute; left: -1.5px; right: -1.5px; top: 3px; border-top: 1.5px solid currentColor; }
 .time-range-calendar-icon::after { content: ""; position: absolute; width: 2px; height: 2px; left: 3px; top: 7px; border-radius: 50%; background: currentColor; box-shadow: 4px 0 currentColor, 8px 0 currentColor; }
-.time-range-summary { min-width: 0; flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.time-range-summary { min-width: 0; flex: 1; white-space: pre-line; overflow-wrap: anywhere; }
+.time-range-dates { color: var(--muted); font-size: 11px; }
 .time-range-chevron { flex: 0 0 auto; color: var(--muted); font-size: 16px; line-height: 1; }
 .time-range-quick-clear { position: absolute; z-index: 1; top: 50%; right: 30px; width: 24px; height: 24px; transform: translateY(-50%); border: 0; border-radius: 50%; padding: 0; background: transparent; color: var(--muted); font-size: 18px; line-height: 22px; }
 .time-range-quick-clear:hover { background: #edf1f6; color: var(--ink); }
@@ -160,6 +161,12 @@ tr:last-child td { border-bottom: 0; }
 .badge.on { background: #e5f6ed; color: #136c3c; }
 .badge.warn { background: #fff2df; color: #925400; }
 .actions { display: flex; flex-wrap: wrap; gap: 5px; }
+.cascade-choice, .card-form label.cascade-choice { display: flex; align-items: center; gap: 6px; font-size: 12px; }
+.cascade-choice input, .card-form .cascade-choice input { width: auto; margin: 0; }
+#worktrees-body td { white-space: pre-line; overflow-wrap: anywhere; }
+#worktrees-body td:last-child { min-width: 170px; }
+#worktrees-body .action { margin-top: 8px; }
+#worktree-result { white-space: pre-line; }
 .project-delete-result { margin: 16px 0; padding: 14px 16px; border: 1px solid var(--line); border-radius: 9px; background: var(--wash); font-size: 13px; line-height: 1.6; }
 .project-delete-result.error { border-color: #e3b8b4; color: var(--danger); }
 .project-delete-result p { margin: 0; white-space: pre-line; }