netizen-cli 0.12.2__tar.gz → 0.13.1__tar.gz

{netizen_cli-0.12.2/netizen_cli.egg-info → netizen_cli-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.12.2
+Version: 0.13.1
 Summary: Use native Codex threads through a Feishu Channel.
 Requires-Python: <3.15,>=3.11
 Requires-Dist: h11==0.16.0

{netizen_cli-0.12.2 → netizen_cli-0.13.1}/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.2 → netizen_cli-0.13.1}/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.2 → netizen_cli-0.13.1}/netizen_cli/__init__.py

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

{netizen_cli-0.12.2 → netizen_cli-0.13.1}/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.2 → netizen_cli-0.13.1}/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; }
@@ -213,7 +220,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, body.session-settings-drawer-open { overflow: hidden; }
+body.schedule-drawer-open, body.defaults-drawer-open, body.session-settings-drawer-open, body.workspace-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; }
@@ -322,6 +329,19 @@ body.schedule-detail-open { overflow: hidden; }
 .drawer-footer { display: flex; justify-content: flex-end; gap: 10px; padding: 16px 24px; border-top: 1px solid var(--line); }
 .drawer-form .drawer-cancel { color: var(--ink); background: white; border: 1px solid var(--line); }
 .drawer-form input { margin: 0; }
+.workspace-form[hidden], .workspace-form [hidden] { display: none; }
+.workspace-fields { display: grid; gap: 18px; }
+.workspace-fields .hint { margin: -10px 0 0; }
+.workspace-field-label { margin: 0 0 8px; color: var(--muted); font-size: 13px; }
+.workspace-modes { display: flex; flex-wrap: wrap; gap: 4px; padding: 4px; border-radius: 9px; background: var(--wash); }
+.workspace-form .workspace-modes button { flex: 1; background: transparent; color: var(--muted); }
+.workspace-form .workspace-modes button[aria-pressed="true"] { background: var(--paper); color: var(--blue); box-shadow: 0 1px 4px rgb(23 39 68 / 12%); font-weight: 600; }
+.workspace-form .workspace-modes button:focus-visible { outline: 3px solid #8cb4ff; outline-offset: 2px; }
+.workspace-form .drawer-body > .hint { margin-top: 12px; }
+.workspace-form .status { margin-top: 24px; white-space: pre-line; overflow-wrap: anywhere; }
+.workspace-form .cascade-choice input { width: 16px; height: 16px; margin: 0; flex: 0 0 auto; }
+.workspace-form .target-summary, #worktree-effective-root { overflow-wrap: anywhere; }
+#projects .section-head, #worktrees .section-head { flex-wrap: wrap; }
 #defaults [hidden], #defaults-editor[hidden], #defaults-editor [hidden] { display: none; }
 .defaults-help, .defaults-order-help, .defaults-field-help { color: var(--muted); font-size: 13px; line-height: 1.6; }
 .defaults-help { margin: 12px 0 24px; }
@@ -375,15 +395,36 @@ body.schedule-detail-open { overflow: hidden; }
 .person-avatar[hidden], .person-placeholder[hidden] { display: none; }
 .auth-expired { display: flex; align-items: center; justify-content: center; gap: 18px; padding: 18px; background: #fff2df; color: #7b4400; }
 .auth-expired[hidden], .person[hidden], .identity-panel[hidden], .identity-panel [hidden], .login-card [hidden] { display: none; }
-.system-tabs { width: fit-content; margin: 22px 0; }
+.system-tabs { overflow-x: auto; }
+.system-tabs .session-tab { flex: 0 0 auto; min-height: 44px; }
+.system-tab-panel { padding-top: 20px; }
+.tab-unsaved { display: inline-block; margin-left: 6px; padding: 2px 6px; border-radius: 4px; background: #fff3d6; color: #875800; font-size: 12px; font-weight: 400; }
+.tab-unsaved[hidden] { display: none; }
 .admin-users { padding: 0; margin: 0; list-style: none; }
 .admin-users > li { display: flex; justify-content: space-between; align-items: center; gap: 16px; border-top: 1px solid var(--line); padding: 16px 0; }
-.session-access { margin-top: 32px; padding-top: 18px; border-top: 1px solid var(--line); }
-.session-access-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); gap: 24px; }
-.session-access-grid h4 { margin: 0 0 8px; }
-.session-access-grid p { min-height: 48px; color: var(--muted); line-height: 1.6; }
-.session-access-grid textarea { width: 100%; resize: vertical; font-family: monospace; }
-.session-access-grid [hidden] { display: none; }
+.session-access-form { border: 0; padding: 0; }
+#session-access-fields { min-width: 0; margin: 0; border: 0; padding: 0; }
+.session-access-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)); align-items: start; gap: 16px; }
+.session-access-rule { min-width: 0; border: 1px solid var(--line); border-radius: 10px; padding: 20px; }
+.session-access-rule h4 { margin: 0; font-size: 16px; }
+.session-access-description { margin: 6px 0 20px; color: var(--muted); font-size: 13px; line-height: 1.6; }
+.session-access-targets { display: grid; gap: 16px; margin-top: 16px; }
+.session-access-rule-note { margin: 16px 0 0; color: var(--muted); font-size: 12px; line-height: 1.6; }
+.session-access-rule textarea { width: 100%; resize: vertical; font-family: ui-monospace, SFMono-Regular, Menlo, monospace; line-height: 1.6; }
+.session-access-rule .chat-picker-popup { width: 100%; max-width: 100%; }
+.session-access-rule [hidden] { display: none; }
+.session-access-help { margin-top: 16px; padding: 14px 16px; border-radius: 8px; background: var(--wash); color: var(--muted); font-size: 13px; line-height: 1.6; }
+.session-access-help h4 { margin: 0 0 6px; color: var(--ink); font-size: inherit; font-weight: 600; }
+.session-access-help p { margin: 4px 0 0; }
+.session-access-footer { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: 16px; margin-top: 20px; padding-top: 16px; border-top: 1px solid var(--line); }
+.session-access-footer .defaults-field-help { flex: 1 1 240px; margin: 0; }
+.session-access-footer .actions { flex: 0 0 auto; gap: 8px; margin-left: auto; }
+.session-access-footer button { min-width: 96px; min-height: 40px; border: 1px solid var(--blue); padding: 9px 14px; font-size: var(--control-font-size); line-height: var(--control-line-height); font-weight: 500; }
+.session-access-footer .refresh { border-color: var(--line); background: var(--paper); color: var(--ink); }
+@media (max-width: 650px) {
+  .session-access-rule { padding: 16px; }
+  .session-access-footer button { min-height: 44px; }
+}
 .identity-panel { max-width: 480px; border: 1px solid var(--line); border-radius: 14px; margin-bottom: 24px; padding: 20px; color: var(--ink); }
 .identity-panel h3 { margin: 0; }
 .identity-panel > p { margin: 20px 0; }