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

{netizen_cli-0.12.2/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.2
+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

{netizen_cli-0.12.2 → 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.2 → 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.2 → 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.2"
+__version__ = "0.13.0"

{netizen_cli-0.12.2 → 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.2 → 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; }

{netizen_cli-0.12.2 → netizen_cli-0.13.0}/netizen_cli/admin/static/admin.js

@@ -62,6 +62,7 @@ function expireAdminSession() {
   if (notice) notice.hidden = false;
   window.NetizenIdentity?.expire();
   window.NetizenSessionAccess?.expire();
+  window.NetizenWorktrees?.expire();
   setStatus("登录已过期，请重新登录。", true);
 }
 
@@ -444,11 +445,13 @@ function confirmProjectDelete(preview) {
     + "\n定时计划将被删除；后续会话清理失败也不会恢复计划。"
     + "\n\n原生会话、派生子会话、Codex App/CLI 历史和本地会话登记将永久删除，无法恢复。"
     + "\n全部会话删除确认成功后，才会删除 Project 登记；部分失败时会保留 Project 和剩余会话。"
+    + `\n关联受管 Worktrees：${preview.worktreeCount || 0}，${preview.deleteWorktrees ? "同时安全删除；失败项保留，不强制丢弃成果" : "保留目录，可在 Worktrees 页面处理；不会自动关联到同名新 Project"}。`
+    + (preview.deleteWorktrees && preview.worktrees?.length ? `\n将删除的 checkout 根目录：\n${preview.worktrees.map((item) => `${item.id} · ${item.root}`).join("\n")}` : "")
     + `\n\n磁盘代码目录保留：${preview.project.cwd}`,
   );
 }
 
-async function deleteProject(project) {
+async function deleteProject(project, deleteWorktrees = false) {
   const envelope = project.actions.previewDelete;
   if (!envelope || pendingProjectDeletes.has(project.alias)) return;
   pendingProjectDeletes.add(project.alias);
@@ -467,7 +470,7 @@ async function deleteProject(project) {
     const preview = await api("/api/v1/projects/delete-preview", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(actionPayload(envelope)),
+      body: JSON.stringify(actionPayload(envelope, deleteWorktrees ? { deleteWorktrees: true } : {})),
     });
     if (!confirmProjectDelete(preview)) {
       message = `已取消删除 Project「${project.alias}」，未提交删除。`;
@@ -498,6 +501,11 @@ async function deleteProject(project) {
     if (result.remainingScheduledRunCount) {
       details.push(`仍有 ${result.remainingScheduledRunCount} 条定时执行的交接或清理未确认。`);
     }
+    if (result.deletedWorktreeCount) message += `\n已删除 ${result.deletedWorktreeCount} 个受管 Worktree。`;
+    if (result.remainingWorktreeCount) {
+      if (result.deleteWorktrees) details.push(`仍有 ${result.remainingWorktreeCount} 个受管 Worktree 未安全删除，请在 Worktrees 页面检查。`);
+      else message += `\n已按选择保留 ${result.remainingWorktreeCount} 个受管 Worktree，可在 Worktrees 页面处理。`;
+    }
     return result;
   } catch (error) {
     isError = true;
@@ -551,8 +559,14 @@ async function loadProjects(cursor = undefined) {
       ));
     }
     if (project.actions.previewDelete) {
+      const cascadeLabel = document.createElement("label");
+      cascadeLabel.className = "cascade-choice";
+      const cascade = document.createElement("input");
+      cascade.type = "checkbox";
+      cascadeLabel.append(cascade, document.createTextNode("同时删除关联受管 Worktrees"));
+      actions.append(cascadeLabel);
       actions.append(actionButton(
-        "删除 Project 及关联 Sessions", () => deleteProject(project), true,
+        "删除 Project 及关联 Sessions", () => deleteProject(project, cascade.checked), true,
       ));
     }
     if (project.deleting || pendingProjectDeletes.has(project.alias)) {
@@ -1022,6 +1036,10 @@ function formQuery(form, defaultPageSize = "25", refreshRelativeTime = true) {
   for (const [key, value] of new FormData(form)) {
     if (String(value)) query.append(key, String(value));
   }
+  for (const root of form.querySelectorAll("[data-time-range]")) {
+    const kind = timeRangeControllers.get(root)?.presetKind();
+    if (kind) query.set(`${root.dataset.timeRangeField || "created"}Range`, kind);
+  }
   for (const root of form.querySelectorAll("[data-session-multi], [data-side-multi]")) {
     const name = root.dataset.sessionMulti || root.dataset.sideMulti;
     const filters = root.dataset.sideMulti ? sideMultiFilters : sessionMultiFilters;
@@ -1034,7 +1052,7 @@ function formQuery(form, defaultPageSize = "25", refreshRelativeTime = true) {
     const identity = new URLSearchParams(state.sessionPage?.query || "").get("identity");
     if (identity) query.set("identity", identity);
     if (query.get("inventoryState") === "lazy") {
-      for (const key of ["createdFrom", "createdBefore", "updatedFrom", "updatedBefore"]) query.delete(key);
+      for (const key of ["createdFrom", "createdBefore", "createdRange", "updatedFrom", "updatedBefore", "updatedRange"]) query.delete(key);
     } else if (!query.has("updatedFrom") && !query.has("updatedBefore")) {
       query.set("updatedRange", "all"); // URL intent only; never sent to the API.
     }
@@ -1082,10 +1100,6 @@ function formatLocalMinute(value) {
   return localMinuteValue(value).replace("T", " ");
 }
 
-function compactLocalMinute(value) {
-  return `${twoDigits(value.getMonth() + 1)}-${twoDigits(value.getDate())} ${twoDigits(value.getHours())}:${twoDigits(value.getMinutes())}`;
-}
-
 function utcOffsetLabel(value) {
   const total = -value.getTimezoneOffset();
   const sign = total >= 0 ? "+" : "-";
@@ -1182,6 +1196,24 @@ function allTimeRange() {
   };
 }
 
+function timeRangeSummary(from, before, kind = "custom", now = new Date()) {
+  if (!from && !before) return "全部时间";
+  const rolling = kind.startsWith("last-");
+  const start = new Date(from);
+  // Show the last included minute, including a partially included rolling minute.
+  const end = before ? new Date(new Date(before).getTime() - 1) : now;
+  const startLabel = Number.isNaN(start.getTime()) ? from || "不限起点" : formatLocalMinute(start);
+  const endLabel = !before && !rolling ? "不限终点"
+    : Number.isNaN(end.getTime()) ? before : formatLocalMinute(end);
+  const label = timeRangePresetLabels[kind];
+  const name = label && kind !== "all" ? `${label}${!before && rolling ? "（至今）" : ""}` : "";
+  const dates = [from ? start : null, before || rolling ? end : null]
+    .filter((value) => value && !Number.isNaN(value.getTime()));
+  const offsets = [...new Set(dates.map(utcOffsetLabel))].join(" → ");
+  const heading = [name, offsets].filter(Boolean).join(" · ");
+  return `${heading ? `${heading}\n` : ""}${startLabel} ~ ${endLabel}`;
+}
+
 function presetTimeRange(kind, now = new Date(), openEnded = false) {
   if (kind === "all") return allTimeRange();
   let from;
@@ -1210,18 +1242,16 @@ function presetTimeRange(kind, now = new Date(), openEnded = false) {
     before = new Date(now.getTime());
     from = new Date(now.getTime() - durationDays * 24 * 60 * 60 * 1000);
   }
-  const label = timeRangePresetLabels[kind];
   const rolling = kind.startsWith("last-");
-  const summary = rolling && !openEnded
-    ? `${label} · 至 ${compactLocalMinute(before)} · ${utcOffsetLabel(before)}`
-    : `${label} · ${utcOffsetLabel(from)}`;
+  const fromUtc = canonicalUtc(from);
+  const beforeUtc = openEnded && rolling ? "" : canonicalUtc(before);
   return {
     kind,
-    from: canonicalUtc(from),
-    before: openEnded && rolling ? "" : canonicalUtc(before),
+    from: fromUtc,
+    before: beforeUtc,
     startValue: localMinuteValue(from),
-    endValue: localMinuteValue(new Date(before.getTime() - 60 * 1000)),
-    summary,
+    endValue: localMinuteValue(new Date(before.getTime() - 1)),
+    summary: timeRangeSummary(fromUtc, beforeUtc, kind, now),
   };
 }
 
@@ -1252,7 +1282,7 @@ function customTimeRange(startValue, endValue) {
       before: canonicalUtc(before),
       startValue,
       endValue,
-      summary: `${formatLocalMinute(parsedStart.date)} — ${formatLocalMinute(parsedEnd.date)} · ${utcOffsetLabel(parsedStart.date)}`,
+      summary: timeRangeSummary(canonicalUtc(parsedStart.date), canonicalUtc(before)),
     },
     error: "",
     invalid: null,
@@ -1318,7 +1348,19 @@ function initializeTimeRangeFilter(root) {
   function renderApplied() {
     fromNode.value = applied.from;
     beforeNode.value = applied.before;
-    summary.textContent = applied.summary;
+    applied.summary = timeRangeSummary(applied.from, applied.before, applied.kind);
+    const [heading, bounds] = applied.summary.split("\n");
+    if (bounds) {
+      const name = document.createElement("span");
+      name.textContent = `${heading}\n`;
+      const dates = document.createElement("span");
+      dates.className = "time-range-dates";
+      dates.textContent = bounds;
+      summary.replaceChildren(name, dates);
+    } else summary.textContent = applied.summary;
+    const dates = [applied.from, applied.before || new Date()].filter(Boolean)
+      .map((value) => new Date(value)).filter((value) => !Number.isNaN(value.getTime()));
+    trigger.title = `${applied.summary}\n${zoneDescription(dates)}`;
     trigger.classList.toggle("has-value", applied.kind !== "all");
     trigger.setAttribute("aria-label", `${label}：${applied.summary}`);
     quickClear.hidden = applied.kind === "all";
@@ -1405,7 +1447,7 @@ function initializeTimeRangeFilter(root) {
   }
 
   function prepareQuery() {
-    if (applied.kind === "all" || applied.kind === "custom") return;
+    if (applied.kind === "all" || applied.kind === "custom" || applied.restored) return;
     applied = preset(applied.kind);
     renderApplied();
   }
@@ -1430,15 +1472,17 @@ function initializeTimeRangeFilter(root) {
   const controller = {
     cancel: cancelDraft,
     prepareQuery,
-    setBounds(from, before) {
+    refreshSummary: renderApplied,
+    presetKind() { return applied.kind !== "all" && applied.kind !== "custom" ? applied.kind : null; },
+    setBounds(from, before, kind = "custom") {
       if (!from && !before) { this.reset("all"); return; }
       const startDate = new Date(from);
       const beforeDate = new Date(before);
-      const endDate = new Date(beforeDate.getTime() - 60000);
-      applied = { kind: "custom", from, before,
+      const endDate = new Date(beforeDate.getTime() - 1);
+      // URL bounds stay absolute; the preset name is presentation metadata only.
+      applied = { kind: Object.hasOwn(timeRangePresetLabels, kind) && kind !== "all" ? kind : "custom", from, before, restored: true,
         startValue: Number.isNaN(startDate.getTime()) ? "" : localMinuteValue(startDate),
-        endValue: Number.isNaN(endDate.getTime()) ? "" : localMinuteValue(endDate),
-        summary: `${Number.isNaN(startDate.getTime()) ? from || "不限起点" : formatLocalMinute(startDate)} — ${Number.isNaN(endDate.getTime()) ? before || "不限终点" : formatLocalMinute(endDate)}` };
+        endValue: Number.isNaN(endDate.getTime()) ? "" : localMinuteValue(endDate) };
       draft = { ...applied };
       closePopover({ restoreFocus: false });
       renderApplied();
@@ -1836,7 +1880,7 @@ async function loadSessionPage(kind, page, render) {
     const candidate = { ...page, query: query.toString(), previousCursors: [...page.previousCursors] };
     await loadSessionProjectOptions(kind === "side" ? sideMultiFilters : sessionMultiFilters, isCurrent);
     if (!isCurrent()) return false;
-    query.delete("updatedRange");
+    for (const field of ["created", "updated"]) query.delete(`${field}Range`);
     if (page.cursor) query.set("cursor", page.cursor);
     const data = await api(`/api/v1/${kind === "side" ? "side-topics" : "sessions"}?${query}`);
     if (!isCurrent()) return false;
@@ -1849,6 +1893,9 @@ async function loadSessionPage(kind, page, render) {
     renderSessionPagination(kind);
     renderSessionSort(kind);
     renderSessionFreshness();
+    for (const root of document.querySelector(`#${kind}-filter`).querySelectorAll("[data-time-range]")) {
+      timeRangeControllers.get(root)?.refreshSummary();
+    }
     syncPageUrl();
     setStatus("已更新。");
     return true;
@@ -2694,20 +2741,22 @@ function confirmDiscardChanges(changed) {
 
 function hasUnsavedEditors() {
   return sessionSettingsHasChanges() || defaultEditorHasChanges() || scheduleEditorHasChanges()
-    || Boolean(pendingScheduleDraft?.dirty) || Boolean(window.NetizenSessionAccess?.dirty());
+    || Boolean(pendingScheduleDraft?.dirty) || Boolean(window.NetizenSessionAccess?.dirty())
+    || Boolean(window.NetizenWorktrees?.dirty());
 }
 
 // Navigation asks once before closing any editor. Busy submissions retain the
 // existing fail-closed boundary; this helper never cancels or repeats a POST.
 function confirmDiscardEditors() {
   if (sessionSettingsEditor?.saving || defaultsBusy || (scheduleEditor && scheduleInput("fields").disabled)
-      || window.NetizenSessionAccess?.busy()) return false;
+      || window.NetizenSessionAccess?.busy() || window.NetizenWorktrees?.busy()) return false;
   if (!confirmDiscardChanges(hasUnsavedEditors())) return false;
   closeSessionSettingsEditor({ confirmed: true });
   closeDefaultEditor({ confirmed: true });
   if (scheduleEditor) closeScheduleEditor({ confirmed: true });
   cancelScheduleSelection({ confirmed: true });
   window.NetizenSessionAccess?.discard();
+  window.NetizenWorktrees?.discard();
   return true;
 }
 
@@ -3801,11 +3850,11 @@ async function moveScheduleRunsPage(direction) {
 
 // Only durable query intent belongs in URLs. Grants, editor drafts and live
 // keyset cursors stay in this document and are never restored as server facts.
-const adminPagePaths = { projects: "/projects", schedules: "/schedules", defaults: "/defaults",
+const adminPagePaths = { projects: "/projects", worktrees: "/worktrees", schedules: "/schedules", defaults: "/defaults",
   updates: "/maintenance", system: "/system" };
 const sessionUrlKeys = ["project", "scopeKind", "inventoryState", "current", "chatId", "topicId", "identity",
-  "createdFrom", "createdBefore", "updatedFrom", "updatedBefore", "updatedRange", "pageSize", "sortBy", "sortDirection"];
-const sideUrlKeys = ["project", "state", "chatId", "createdFrom", "createdBefore", "pageSize", "sortBy", "sortDirection"];
+  "createdFrom", "createdBefore", "createdRange", "updatedFrom", "updatedBefore", "updatedRange", "pageSize", "sortBy", "sortDirection"];
+const sideUrlKeys = ["project", "state", "chatId", "createdFrom", "createdBefore", "createdRange", "pageSize", "sortBy", "sortDirection"];
 let navigationReady = false;
 let navigationIndex = 0;
 let navigationHref = "";
@@ -3826,13 +3875,20 @@ function pageQuery(tab, sessionTab, raw = "") {
       if (!["active", "archived", "lazy"].includes(query.get(field))) query.set(field, "active");
       else query.set(field, query.get(field));
       if (query.get(field) === "lazy") {
-        for (const key of ["createdFrom", "createdBefore", "updatedFrom", "updatedBefore", "updatedRange"]) query.delete(key);
+        for (const key of ["createdFrom", "createdBefore", "createdRange", "updatedFrom", "updatedBefore", "updatedRange"]) query.delete(key);
         query.set("sortBy", "createdAt");
       } else if (!query.has("updatedFrom") && !query.has("updatedBefore") && query.get("updatedRange") !== "all") {
         const range = presetTimeRange("last-3-months", new Date(), true);
         query.set("updatedFrom", range.from);
+        query.set("updatedRange", range.kind);
       }
-      if (query.has("updatedFrom") || query.has("updatedBefore")) query.delete("updatedRange");
+    }
+    for (const field of ["created", "updated"]) {
+      const kind = query.get(`${field}Range`);
+      const hasBounds = query.has(`${field}From`) || query.has(`${field}Before`);
+      const valid = Object.hasOwn(timeRangePresetLabels, kind) && (kind === "all" ? !hasBounds : hasBounds);
+      if (valid) query.set(`${field}Range`, kind);
+      else query.delete(`${field}Range`);
     }
     if (!query.has("pageSize")) query.set("pageSize", "20");
     if (!query.has("sortBy")) query.set("sortBy", "updatedAt");
@@ -3915,7 +3971,7 @@ function restorePageFilters(route) {
     document.querySelector(`#${kind}-page-size`).value = query.get("pageSize");
     for (const root of document.querySelector(`#${kind}-filter`).querySelectorAll("[data-time-range]")) {
       const field = root.dataset.timeRangeField || "created";
-      timeRangeControllers.get(root).setBounds(query.get(`${field}From`) || "", query.get(`${field}Before`) || "");
+      timeRangeControllers.get(root).setBounds(query.get(`${field}From`) || "", query.get(`${field}Before`) || "", query.get(`${field}Range`) || "custom");
     }
     if (kind === "session") {
       document.querySelector("#session-inventory-state").value = query.get("inventoryState");
@@ -3993,6 +4049,7 @@ async function refresh(tab, cursor = undefined) {
   setStatus("正在读取服务端事实…");
   try {
     if (tab === "projects" && await loadProjects(cursor) === false) return false;
+    if (tab === "worktrees" && await window.NetizenWorktrees.load() === false) return false;
     if (tab === "updates") await loadUpdates();
     if (tab === "schedules" && await loadSchedules(cursor) === false) return false;
     if (tab === "defaults") await loadDefaults();
@@ -4126,6 +4183,7 @@ document.querySelector("#side-page-size").addEventListener("change", () => {
 });
 document.querySelector("#projects-previous").addEventListener("click", () => moveListPage("projects", "previous"));
 document.querySelector("#projects-next").addEventListener("click", () => moveListPage("projects", "next"));
+window.NetizenWorktrees?.init({ api, actionPayload, setStatus, queryProjectOptions, isExpired: () => state.authExpired });
 document.querySelector("#sessions-previous").addEventListener("click", () => moveSessionPage("previous"));
 document.querySelector("#sessions-next").addEventListener("click", () => moveSessionPage("next"));
 document.querySelector("#sides-previous").addEventListener("click", () => moveSidePage("previous"));

{netizen_cli-0.12.2 → netizen_cli-0.13.0}/netizen_cli/admin/static/index.html

@@ -9,6 +9,7 @@
   <script src="/static/chat-picker.js" defer></script>
   <script src="/static/identity.js" defer></script>
   <script src="/static/session-access.js" defer></script>
+  <script src="/static/worktrees.js" defer></script>
   <script src="/static/admin.js" defer></script>
 </head>
 <body>
@@ -24,6 +25,7 @@
 
   <nav class="tabs" aria-label="管理模块">
     <a class="tab active" data-tab="projects" href="/projects" aria-current="page">Projects</a>
+    <a class="tab" data-tab="worktrees" href="/worktrees">Worktrees</a>
     <a class="tab" data-tab="sessions" href="/sessions/ordinary">Sessions</a>
     <a class="tab" data-tab="schedules" href="/schedules">定时任务</a>
     <a class="tab" data-tab="defaults" href="/defaults">默认会话配置</a>
@@ -67,6 +69,34 @@
       </nav>
     </section>
 
+    <section id="worktrees" class="panel" aria-labelledby="worktrees-heading" hidden>
+      <div class="section-head"><div><p class="eyebrow">MANAGED CHECKOUTS</p><h2 id="worktrees-heading">Worktrees</h2></div><button class="refresh" data-refresh="worktrees">刷新</button></div>
+      <p class="hint">仅管理本实例创建的工作区。多个会话可共享文件和分支；列表按需查询，不扫描未提交内容，也不能证明没有外部客户端使用。</p>
+      <div class="forms-grid">
+        <form id="worktree-settings" class="card-form">
+          <h3>配置</h3>
+          <label>新建根目录（留空使用实例默认目录）<input id="worktree-root" maxlength="4096"></label>
+          <p id="worktree-effective-root" class="hint"></p>
+          <label class="cascade-choice"><input id="worktree-fetch" type="checkbox">创建前 fetch；失败则终止创建</label>
+          <p class="hint">只影响之后创建的位置，已有工作区仍按原路径管理；不修改 Codex App 配置。</p>
+          <button id="worktree-settings-save" type="submit" disabled>保存配置</button>
+        </form>
+        <form id="worktree-create" class="card-form">
+          <h3>新建 Worktree</h3>
+          <label>Project<select id="worktree-project" required><option value="">选择 Project</option></select></label>
+          <label>检出方式<select id="worktree-mode"><option value="detached">Detached（不绑定命名分支）</option><option value="existing">检出已有本地分支</option><option value="new">创建并检出新分支</option></select></label>
+          <label id="worktree-ref-label">起点提交 / 分支<input id="worktree-ref" list="worktree-refs" placeholder="HEAD"><datalist id="worktree-refs"></datalist></label>
+          <label id="worktree-existing-label" hidden>本地分支<select id="worktree-existing"></select></label>
+          <label id="worktree-new-label" hidden>新分支名称<input id="worktree-new-branch" maxlength="1024"></label>
+          <p id="worktree-create-note" class="hint">只检出已提交内容，不复制未提交、未跟踪或忽略文件，不执行环境初始化。不创建会话。</p>
+          <button id="worktree-create-submit" type="submit" disabled>创建 Worktree</button>
+        </form>
+      </div>
+      <p id="worktree-result" class="status" role="status" aria-live="polite"></p>
+      <div class="table-wrap"><table><thead><tr><th>Project / 标识</th><th>工作目录</th><th>当前状态</th><th>分支 / HEAD</th><th>关联会话</th><th>操作</th></tr></thead><tbody id="worktrees-body"></tbody></table></div>
+      <nav class="pagination" aria-label="Worktrees 分页"><button id="worktrees-previous" class="next" disabled>上一页</button><span id="worktrees-page" aria-live="polite">第 1 页</span><button id="worktrees-next" class="next" disabled>下一页</button></nav>
+    </section>
+
     <section id="sessions" class="panel" aria-labelledby="sessions-heading" hidden>
       <div class="section-head">
         <div><p class="eyebrow">CONVERSATIONS</p><h2 id="sessions-heading">Sessions</h2></div>