netizen-cli 0.13.3__tar.gz → 0.14.0__tar.gz

{netizen_cli-0.13.3/netizen_cli.egg-info → netizen_cli-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.13.3
+Version: 0.14.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.13.3 → netizen_cli-0.14.0}/README.md

@@ -116,10 +116,10 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 群聊和群话题中的每条请求都需要重新 **@机器人**，包括命令。`/new` 只通过卡片创建会话，
 不接受参数。普通任务执行中发来的新消息用于调整当前任务，不会排队成下一个任务。
 
-Git 项目可在 `/new` 中加载项目目录选项，选择已有受管 worktree 或新建 worktree；默认
+Git 项目可在 `/new` 中加载 worktree 选项，选择已有受管 worktree 或新建 worktree；默认
 仍使用项目目录。新建只检出提交内容，不复制本地改动或执行环境初始化。
-配置、状态查询与删除在 [Admin Worktrees](skills/netizen-user-guide/references/admin.md#worktree-配置与管理)
-中完成；不同会话可以共享同一工作区。`/fork` 不提供新建或选择 worktree 的入口。
+配置、状态查询与删除在 [Admin worktree](skills/netizen-user-guide/references/admin.md#worktree-配置与管理)
+中完成；不同会话可以共享同一 worktree。`/fork` 不提供新建或选择 worktree 的入口。
 
 安装遇到问题可从[部署文档](docs/deployment.md)继续；已能对话时，常见疑问见
 [使用 FAQ](skills/netizen-user-guide/references/faq.md#常见问题)。

{netizen_cli-0.13.3 → netizen_cli-0.14.0}/netizen_cli/__init__.py

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

{netizen_cli-0.13.3 → netizen_cli-0.14.0}/netizen_cli/admin/presentation.py

@@ -23,6 +23,17 @@ def _chat_open_url(chat: ChatLabel) -> str:
     )
 
 
+def _chat_label_json(chat: ChatLabel) -> dict[str, object]:
+    return {
+        "chatId": chat.chat_id,
+        "chatLabel": chat.display_name,
+        "chatLabelResolved": chat.resolved,
+        "chatMode": chat.chat_mode,
+        "chatType": chat.chat_type,
+        "chatOpenUrl": _chat_open_url(chat),
+    }
+
+
 def _schedule_plan_json(plan: dict[str, Any], chat: ChatLabel) -> dict[str, Any]:
     rule = plan.get("schedule")
     local_at = None

{netizen_cli-0.13.3 → netizen_cli-0.14.0}/netizen_cli/admin/static/admin.css

@@ -380,6 +380,11 @@ body.schedule-detail-open { overflow: hidden; }
 .defaults-feedback { display: flex; flex-wrap: wrap; gap: 18px; }
 .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); }
+.progress-settings { margin-top: 18px; padding: 16px; border: 1px solid var(--line); border-radius: 8px; }
+.progress-settings > .defaults-feedback { margin-top: 16px; }
+.progress-settings > .schedule-form-grid { margin-top: 10px; }
+.progress-settings > .session-settings-help { margin-bottom: 0; }
+.progress-settings-error { color: var(--danger); font-size: 13px; line-height: 1.6; }
 #defaults-note.error { color: var(--danger); }
 #defaults-workspace-help.error, #schedule-editor #schedule-workspace-help.error { color: var(--danger); }
 #session-settings-editor[hidden], #session-settings-editor [hidden] { display: none; }

{netizen_cli-0.13.3 → netizen_cli-0.14.0}/netizen_cli/admin/static/admin.js

@@ -55,6 +55,7 @@ async function api(path, options = {}) {
 function expireAdminSession() {
   if (state.authExpired) return;
   state.authExpired = true;
+  invalidateSessionListRequest();
   stopUpdatePolling();
   window.NetizenSelect?.close();
   // Release these modal drawers so the page's login link remains reachable.
@@ -609,7 +610,7 @@ function confirmProjectDelete(preview) {
     + "\n定时计划将被删除；后续会话清理失败也不会恢复计划。"
     + "\n\n原生会话、派生子会话、Codex App/CLI 历史和本地会话登记将永久删除，无法恢复。"
     + "\n全部会话删除确认成功后，才会删除 Project 登记；部分失败时会保留 Project 和剩余会话。"
-    + `\n关联受管 Worktrees：${preview.worktreeCount || 0}，${preview.deleteWorktrees ? "同时安全删除；失败项保留，不强制丢弃成果" : "保留目录，可在 Worktrees 页面处理；不会自动关联到同名新 Project"}。`
+    + `\n关联受管 worktree：${preview.worktreeCount || 0}，${preview.deleteWorktrees ? "同时安全删除；失败项保留，不强制丢弃成果" : "保留目录，可在 worktree 页面处理；不会自动关联到同名新 Project"}。`
     + (preview.deleteWorktrees && preview.worktrees?.length ? `\n将删除的 checkout 根目录：\n${preview.worktrees.map((item) => `${item.id} · ${item.root}`).join("\n")}` : "")
     + `\n\n磁盘代码目录保留：${preview.project.cwd}`,
   );
@@ -665,10 +666,10 @@ async function deleteProject(project, deleteWorktrees = false) {
     if (result.remainingScheduledRunCount) {
       details.push(`仍有 ${result.remainingScheduledRunCount} 条定时执行的交接或清理未确认。`);
     }
-    if (result.deletedWorktreeCount) message += `\n已删除 ${result.deletedWorktreeCount} 个受管 Worktree。`;
+    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 页面处理。`;
+      if (result.deleteWorktrees) details.push(`仍有 ${result.remainingWorktreeCount} 个受管 worktree 未安全删除，请在 worktree 页面检查。`);
+      else message += `\n已按选择保留 ${result.remainingWorktreeCount} 个受管 worktree，可在 worktree 页面处理。`;
     }
     return result;
   } catch (error) {
@@ -727,7 +728,7 @@ async function loadProjects(cursor = undefined) {
       cascadeLabel.className = "cascade-choice";
       const cascade = document.createElement("input");
       cascade.type = "checkbox";
-      cascadeLabel.append(cascade, document.createTextNode("同时删除关联受管 Worktrees"));
+      cascadeLabel.append(cascade, document.createTextNode("同时删除关联受管 worktree"));
       actions.append(cascadeLabel);
       actions.append(actionButton(
         "删除 Project 及关联 Sessions", () => deleteProject(project, cascade.checked), true,
@@ -1824,24 +1825,33 @@ function locationFallback(session) {
 
 function sessionLocationCell(row, session, { showIdentity = true } = {}) {
   const td = document.createElement("td");
+  td.className = "session-location";
   const link = document.createElement("a");
   link.className = "chat-link";
-  link.href = session.topicOpenUrl || session.chatOpenUrl;
   link.target = "_blank";
   link.rel = "noopener noreferrer";
-  link.textContent = session.chatLabelResolved
-    ? session.chatLabel
-    : showIdentity ? locationFallback(session) : `${chatModeLabel(session.chatMode, session.scopeKind)}（名称暂不可用）`;
-  link.title = session.topicOpenUrl
-    ? "打开飞书话题"
-    : "打开飞书会话";
   const mode = document.createElement("div");
   mode.className = "meta-line";
   mode.append(badge(chatModeLabel(session.chatMode, session.scopeKind)));
   td.append(link, mode);
+  updateSessionLocationCell(td, session, { showIdentity });
   row.append(td);
 }
 
+function updateSessionLocationCell(td, session, { showIdentity = true, loading = false } = {}) {
+  const link = td.querySelector(".chat-link");
+  link.href = session.topicOpenUrl || session.chatOpenUrl;
+  link.textContent = session.chatLabelResolved
+    ? session.chatLabel
+    : loading ? `${chatModeLabel(session.chatMode, session.scopeKind)}（名称加载中）`
+      : showIdentity ? locationFallback(session) : `${chatModeLabel(session.chatMode, session.scopeKind)}（名称暂不可用）`;
+  link.title = session.topicOpenUrl
+    ? "打开飞书话题"
+    : "打开飞书会话";
+  td.querySelector(".badge").textContent = chatModeLabel(session.chatMode, session.scopeKind);
+  td.setAttribute("aria-busy", String(loading));
+}
+
 function sessionIdentityCell(row, session) {
   const td = document.createElement("td");
   const title = document.createElement("strong");
@@ -2039,12 +2049,58 @@ function resetSessionFilters(kind = "session") {
   return refresh("sessions", page);
 }
 
+let pendingSessionChatLabels = null;
+
 function invalidateSessionListRequest() {
   state.sessionListRequest = (state.sessionListRequest || 0) + 1;
+  // A failed replacement read can leave these same rows on screen. Their old
+  // enrichment must stop showing a loading placeholder when it is invalidated.
+  pendingSessionChatLabels?.();
+  pendingSessionChatLabels = null;
+}
+
+async function loadSessionChatLabels(kind, data, page, request) {
+  const name = kind === "side" ? "sides" : "sessions";
+  const isCurrent = () => !state.authExpired && request === state.sessionListRequest
+    && state.tab === "sessions" && state.sessionTab === (kind === "side" ? "temporary" : "ordinary")
+    && state[name] === data && state[`${kind}Page`] === page;
+  if (!isCurrent()) return;
+  const body = document.querySelector(`#${name}-body`);
+  const targets = data.items.flatMap((item, index) => item.chatLabelResolved || !item.chatId
+    ? [] : [{ item, cell: body.children[index].querySelector(".session-location") }]);
+  if (!targets.length) return;
+  const showIdentity = kind !== "side";
+  const finish = () => {
+    for (const { item, cell } of targets) updateSessionLocationCell(cell, item, { showIdentity });
+  };
+  pendingSessionChatLabels = finish;
+  for (const { item, cell } of targets) updateSessionLocationCell(cell, item, { showIdentity, loading: true });
+  try {
+    const query = new URLSearchParams({ chatIds: [...new Set(targets.map(({ item }) => item.chatId))].join(",") });
+    const labels = await api(`/api/v1/chat-labels?${query}`);
+    if (!isCurrent()) return;
+    const byChat = new Map(labels.items.map((label) => [label.chatId, label]));
+    for (const { item } of targets) {
+      const label = byChat.get(item.chatId);
+      if (!label) continue;
+      // Enrichment changes display facts only; retain exact identities, topic
+      // links, runtime and action grants from the successful list response.
+      for (const field of ["chatLabel", "chatLabelResolved", "chatMode", "chatType", "chatOpenUrl"]) {
+        if (Object.hasOwn(label, field)) item[field] = label[field];
+      }
+    }
+  } catch {
+    // Name failures are local to the location cells. Authentication expiry is
+    // already handled by api(), and list status/freshness stay unchanged.
+  } finally {
+    if (isCurrent()) finish();
+    if (pendingSessionChatLabels === finish) pendingSessionChatLabels = null;
+  }
 }
 
 async function loadSessionPage(kind, page, render) {
-  const request = state.sessionListRequest = (state.sessionListRequest || 0) + 1;
+  invalidateSessionListRequest();
+  const request = state.sessionListRequest;
   const isCurrent = () => request === state.sessionListRequest;
   const name = kind === "side" ? "sides" : "sessions";
   setStatus("正在读取服务端事实…");
@@ -2075,6 +2131,7 @@ async function loadSessionPage(kind, page, render) {
     }
     syncPageUrl();
     setStatus("已更新。");
+    void loadSessionChatLabels(kind, data, state[`${kind}Page`], request);
     return true;
   } catch (error) {
     if (isCurrent()) setStatus(error.message + (state[name] ? " 当前仍显示上次成功读取的结果。" : ""), true);
@@ -2278,7 +2335,8 @@ function renderSessionSettingsEditor() {
   }
   sessionSettingsInput("note").textContent = notes.filter(Boolean).join(" ");
   sessionSettingsInput("note").classList.toggle("error", Boolean(editor.error));
-  sessionSettingsInput("save").disabled = editor.loading || editor.saving || !editor.action;
+  sessionSettingsInput("save").disabled = editor.loading || editor.saving || !editor.action
+    || Boolean(progressCardSettingsError(editor.settings));
   sessionSettingsInput("save").textContent = editor.saving ? "保存中…" : "保存";
   sessionSettingsInput("cancel").disabled = editor.saving;
   sessionSettingsInput("close").disabled = editor.saving;
@@ -2366,7 +2424,7 @@ function changeSessionSettings(field) {
 async function saveSessionSettings(event) {
   event.preventDefault();
   const editor = sessionSettingsEditor;
-  if (!editor || editor.loading || editor.saving || !editor.action) return;
+  if (!editor || editor.loading || editor.saving || !editor.action || progressCardSettingsError(editor.settings)) return;
   const action = editor.action;
   editor.action = null;
   editor.session.actions.configure = null;
@@ -2533,9 +2591,9 @@ function workspacePolicyAvailable(workspace, options, project) {
 
 function workspacePolicySummary(workspace, { scheduled = false } = {}) {
   if (!workspace) return "沿用原会话的实际工作目录";
-  if (workspace.mode === "existing") return `指定 Worktree：${workspace.worktree_id}`;
-  if (workspace.mode === "new") return `${scheduled ? "每次执行" : "每个新会话"}创建 Worktree · ${workspace.ref || "创建时 Project HEAD"}`;
-  return "项目目录";
+  if (workspace.mode === "existing") return `使用已有 worktree：${workspace.worktree_id}`;
+  if (workspace.mode === "new") return `${scheduled ? "每次执行" : "每个新会话"}新建 worktree · ${workspace.ref || "创建时 Project HEAD"}`;
+  return "项目目录（不使用 worktree）";
 }
 
 function renderWorkspacePolicy(input, editor, { project, loading = false, scheduled = false } = {}) {
@@ -2549,8 +2607,8 @@ function renderWorkspacePolicy(input, editor, { project, loading = false, schedu
   }
   input("worktree-field").hidden = workspace.mode !== "existing";
   input("workspace-ref-field").hidden = workspace.mode !== "new";
-  scheduleSelectOptions(input("worktree"), [["", "选择受管 Worktree"],
-    ...items.map((item) => [item.id, `${item.cwd} · ${item.branch || "detached"} · ${item.id}`])],
+  scheduleSelectOptions(input("worktree"), [["", "选择受管 worktree"],
+    ...items.map((item) => [item.id, `已有 worktree · ${item.branch || "detached"} · ${item.cwd}`])],
   workspace.worktree_id || "");
   input("worktree").required = workspace.mode === "existing";
   input("workspace-ref").value = workspace.ref || "";
@@ -2563,21 +2621,21 @@ function renderWorkspacePolicy(input, editor, { project, loading = false, schedu
     input("workspace-refs").append(option);
   }
   const notes = [];
-  if (loading) notes.push("正在读取工作区选项…");
+  if (loading) notes.push("正在读取 worktree 选项…");
   if (editor.workspaceError) notes.push(workspaceErrorMessage(editor.workspaceError));
   else if (options?.isGit === false) notes.push("该 Project 不是 Git 仓库，只支持项目目录。");
-  else if (!project) notes.push("先选择 Project，再选择工作区策略。");
+  else if (!project) notes.push("先选择 Project，再选择 worktree 使用方式。");
   if (workspace.mode === "existing") {
-    notes.push(scheduled ? "各次执行共享所选 Worktree 的文件和分支；资源不可用时保留计划并跳过执行。"
-      : "新会话共享所选 Worktree 的文件和分支；删除或失效后保留此配置，自动创建会话时明确报错。");
+    notes.push(scheduled ? "各次执行共享所选 worktree 的文件和分支；资源不可用时保留计划并跳过执行。"
+      : "新会话共享所选 worktree 的文件和分支；删除或失效后保留此配置，自动创建会话时明确报错。");
     if (!loading && !workspacePolicyAvailable(workspace, options, project)) {
-      notes.push("所选 Worktree 当前不可用，请重新选择；不会切回项目目录。");
+      notes.push("所选 worktree 当前不可用，请重新选择；不会切回项目目录。");
     }
   } else if (workspace.mode === "new") {
     notes.push(scheduled
-      ? "每次执行创建一份 detached Worktree；该次会话的后续消息复用。留空使用执行时 Project 的 HEAD，预览和保存不创建目录。"
-      : "每次自动创建新会话时创建一次 detached Worktree；后续消息复用。留空使用创建时 Project 的 HEAD，保存配置不创建目录。");
-    if (!loading && !available) notes.push("当前无法使用新建 Worktree 策略，请检查 Project。");
+      ? "每次执行新建 detached worktree；该次会话的后续消息复用。留空使用执行时 Project 的 HEAD，预览和保存不创建目录。"
+      : "每个自动创建的新会话新建 detached worktree；后续消息复用。留空使用创建时 Project 的 HEAD，保存配置不创建目录。");
+    if (!loading && !available) notes.push("当前无法使用新建 worktree 方式，请检查 Project。");
   } else notes.push(scheduled ? "每次执行创建的会话使用 Project 的项目目录。" : "新会话使用 Project 的项目目录。");
   input("workspace-help").textContent = notes.join(" ");
   input("workspace-help").classList.toggle("error", !loading && !workspacePolicyAvailable(workspace, options, project));
@@ -2646,7 +2704,8 @@ function renderDefaultSettings() {
   if (editor.contextAvailable === false) notes.push("单聊不支持补齐未读上下文，请使用当前消息。");
   defaultsInput("note").textContent = notes.filter(Boolean).join(" ");
   defaultsInput("note").classList.toggle("error", Boolean(editor.error));
-  defaultsInput("save").disabled = defaultsBusy || editor.loading || !editor.action || !defaultWorkspaceAvailable();
+  defaultsInput("save").disabled = defaultsBusy || editor.loading || !editor.action || !defaultWorkspaceAvailable()
+    || Boolean(progressCardSettingsError(editor.settings));
   defaultsInput("save").textContent = defaultsBusy ? "保存中…" : "保存";
   defaultsInput("editor").setAttribute("aria-busy", String(defaultsBusy || editor.loading));
 }
@@ -2864,7 +2923,8 @@ async function defaultMutation(mode, action, extra = {}) {
 async function saveDefault(event) {
   event.preventDefault();
   const editor = defaultsEditor;
-  if (!editor || editor.loading || !editor.action || defaultsBusy || !defaultWorkspaceAvailable()) return;
+  if (!editor || editor.loading || !editor.action || defaultsBusy || !defaultWorkspaceAvailable()
+      || progressCardSettingsError(editor.settings)) return;
   if (editor.kind === "chat") {
     editor.loading = true;
     renderDefaultSettings();
@@ -3027,7 +3087,8 @@ function sessionSettingsFingerprint(settings) {
   const turn = settings.turn_settings;
   return JSON.stringify([turn ? [turn.model_id, turn.effort_id, turn.service_tier_id] : null,
     settings.message_context_mode, settings.reaction_pulse_enabled,
-    settings.progress_card_enabled, settings.completion_mention_enabled]);
+    settings.progress_card_enabled, settings.completion_mention_enabled,
+    progressCardFields.map((field) => progressCardSettings(settings)[field.replaceAll("-", "_")])]);
 }
 
 function confirmDiscardChanges(changed) {
@@ -3093,10 +3154,10 @@ function scheduleRunStatus(status) {
     not_started: "尚未执行", expired: "已过期，未执行", missed: "已错过",
     skipped_busy: "上次仍在执行，本次跳过", blocked_unknown: "上次结果待确认，本次跳过",
     project_disabled: "Project 已停用，本次未执行", project_unavailable: "Project 不可用，本次未执行",
-    workspace_unavailable: "工作区不可用，本次未执行",
-    workspace_creation_failed: "工作区创建失败，本次未执行",
-    workspace_creation_unknown: "工作区创建结果待确认，本次未执行",
-    workspace_handoff_failed: "工作区已保留，会话交接失败",
+    workspace_unavailable: "worktree 不可用，本次未执行",
+    workspace_creation_failed: "worktree 创建失败，本次未执行",
+    workspace_creation_unknown: "worktree 创建结果待确认，本次未执行",
+    workspace_handoff_failed: "worktree 已保留，会话交接失败",
     released: "调度已收尾", recovery_no_start: "服务恢复，本次未启动",
     publishing_unknown: "话题投递待确认", deleted: "执行会话已删除",
     initial_start_rejected: "启动被拒绝", publishing_failed: "话题发布失败",
@@ -3113,7 +3174,7 @@ function scheduleTriggerSource(source) {
 
 function scheduleWorktreeReceipt(run, { details = true } = {}) {
   if (!run?.worktree_id) return "";
-  const labels = [`Worktree：${run.worktree_id}`];
+  const labels = [`worktree：${run.worktree_id}`];
   const receipt = run.worktree;
   if (details && receipt) {
     if (receipt.cwd) labels.push(`工作目录：${receipt.cwd}`);
@@ -3139,7 +3200,7 @@ function scheduleBlockedLabel(plan) {
     project_unavailable: "Project 不可用", target_inactive: "原会话已切走或归档，自动暂停",
     target_missing: "原会话不可用", target_mismatch: "原会话位置不匹配" }[plan.blocked_reason] || "";
   const workspace = workspaceErrorMessage(plan.workspace_error)
-    || ([plan.blocked_reason, plan.suspended_reason].includes("workspace_unavailable") ? "工作区不可用" : "");
+    || ([plan.blocked_reason, plan.suspended_reason].includes("workspace_unavailable") ? "worktree 不可用" : "");
   return [primary, workspace].filter(Boolean).join(" · ");
 }
 
@@ -3153,7 +3214,7 @@ function scheduleInheritedWorkspace(plan) {
   const labels = [workspace.working_cwd
     ? `${workspace.native_cwd_unresolved ? "已登记" : "已选"}工作目录：${workspace.working_cwd}`
     : "工作目录尚未登记"];
-  if (workspace.worktree_id) labels.push(`Worktree：${workspace.worktree_id}`);
+  if (workspace.worktree_id) labels.push(`worktree：${workspace.worktree_id}`);
   labels.push(workspace.native_cwd_unresolved
     ? "实际目录由原会话确定，本次未查询原生目录。" : "执行时沿用原会话的工作目录。");
   return labels.join(" · ");
@@ -3273,8 +3334,8 @@ function validateScheduleFields({ saving = false } = {}) {
     setScheduleFieldError("weekdays", "请至少选择一天。");
   }
   if (saving && !scheduleWorkspaceCanSave()) {
-    setScheduleFieldError("workspace", scheduleEditor.workspaceLoading ? "工作区选项仍在读取，请稍后保存。"
-      : workspaceErrorMessage(scheduleEditor.workspaceError) || "请选择可用的工作区策略。");
+    setScheduleFieldError("workspace", scheduleEditor.workspaceLoading ? "worktree 选项仍在读取，请稍后保存。"
+      : workspaceErrorMessage(scheduleEditor.workspaceError) || "请选择可用的 worktree 使用方式。");
   }
   if (scheduleFieldErrors.size) {
     if (scheduleEditor?.action) showScheduleFormError("请检查标红的表单项。");
@@ -3489,7 +3550,54 @@ function resetScheduleEndOffset() {
 
 function defaultScheduleSessionSettings() {
   return { turn_settings: null, reaction_pulse_enabled: false, progress_card_enabled: true, completion_mention_enabled: true,
-    message_context_mode: "current-only" };
+    message_context_mode: "current-only", progress_card_settings: {
+      show_commentary: true, show_operations: true, show_plan: true,
+      commentary_limit: 4, operation_limit: 8, commentary_max_chars: 160, operation_max_chars: 120,
+      organization: "content",
+    } };
+}
+
+const progressCardFields = ["show-commentary", "show-operations", "show-plan", "commentary-limit",
+  "operation-limit", "commentary-max-chars", "operation-max-chars", "organization"];
+
+function progressCardSettings(settings) {
+  return settings.progress_card_settings || defaultScheduleSessionSettings().progress_card_settings;
+}
+
+function progressCardSettingsError(settings) {
+  const progress = progressCardSettings(settings);
+  for (const [key, label, maximum] of [
+    ["commentary_limit", "进展条数", 8], ["operation_limit", "操作条数", 16],
+    ["commentary_max_chars", "进展摘要长度", 320], ["operation_max_chars", "操作摘要长度", 240],
+  ]) {
+    if (!Number.isInteger(progress[key]) || progress[key] < 1 || progress[key] > maximum) {
+      return `${label}必须是 1 到 ${maximum} 之间的整数。`;
+    }
+  }
+  return "";
+}
+
+function renderProgressCardSettings(input, settings) {
+  const container = input("progress-settings");
+  if (!container) return;
+  const progress = progressCardSettings(settings);
+  container.hidden = !settings.progress_card_enabled;
+  for (const node of container.querySelectorAll("input, select")) {
+    const field = node.id.split("-progress-").at(-1);
+    const key = field.replaceAll("-", "_");
+    if (field.startsWith("show-")) node.checked = progress[key];
+    else node.value = progress[key];
+    node.disabled = !settings.progress_card_enabled
+      || (field.startsWith("commentary-") && !progress.show_commentary)
+      || (field.startsWith("operation-") && !progress.show_operations);
+  }
+  for (const [kind, shown] of [["commentary", progress.show_commentary], ["operation", progress.show_operations]]) {
+    input(`progress-${kind}-capacity`).hidden = !shown;
+  }
+  const error = progressCardSettingsError(settings);
+  const note = input("progress-error");
+  note.textContent = error;
+  note.hidden = !error;
 }
 
 function scheduleSessionSummary(settings) {
@@ -3535,6 +3643,7 @@ function renderSessionSettingsFields(input, settings, models, contextAvailable)
   input("reactions").checked = settings.reaction_pulse_enabled;
   input("progress").checked = settings.progress_card_enabled;
   input("completion-mention").checked = settings.completion_mention_enabled;
+  renderProgressCardSettings(input, settings);
   return model;
 }
 
@@ -3552,6 +3661,13 @@ function changeSessionSettingsField(input, settings, models, field, baseTurn = n
   else if (field === "reactions") settings.reaction_pulse_enabled = input("reactions").checked;
   else if (field === "progress") settings.progress_card_enabled = input("progress").checked;
   else if (field === "completion-mention") settings.completion_mention_enabled = input("completion-mention").checked;
+  else if (field.startsWith("progress-") && progressCardFields.includes(field.slice(9))) {
+    const key = field.slice(9).replaceAll("-", "_");
+    const node = input(field);
+    const value = key.startsWith("show_") ? node.checked
+      : key === "organization" || node.value === "" ? node.value : Number(node.value);
+    settings.progress_card_settings = { ...progressCardSettings(settings), [key]: value };
+  }
 }
 
 function renderScheduleSessionSettings() {
@@ -4652,7 +4768,8 @@ sessionSettingsInput("drawer").addEventListener("cancel", (event) => {
   closeSessionSettingsEditor();
 });
 sessionSettingsInput("editor").addEventListener("submit", saveSessionSettings);
-for (const field of ["model", "effort", "tier", "context", "reactions", "progress", "completion-mention"]) {
+for (const field of ["model", "effort", "tier", "context", "reactions", "progress", "completion-mention",
+  ...progressCardFields.map((name) => `progress-${name}`)]) {
   sessionSettingsInput(field).addEventListener("change", () => changeSessionSettings(field));
 }
 defaultsInput("new").addEventListener("click", () => openDefaultEditor(defaultsTab));
@@ -4679,7 +4796,8 @@ for (const field of ["workspace", "worktree"]) {
   defaultsInput(field).addEventListener("change", () => changeDefaultWorkspace(field));
 }
 defaultsInput("workspace-ref").addEventListener("input", () => changeDefaultWorkspace("workspace-ref"));
-for (const field of ["model", "effort", "tier", "context", "reactions", "progress", "completion-mention"]) {
+for (const field of ["model", "effort", "tier", "context", "reactions", "progress", "completion-mention",
+  ...progressCardFields.map((name) => `progress-${name}`)]) {
   defaultsInput(field).addEventListener("change", () => changeDefaultSettings(field));
 }
 for (const [name, delta] of [["previous", -50], ["next", 50]]) {

{netizen_cli-0.13.3 → netizen_cli-0.14.0}/netizen_cli/admin/static/index.html

@@ -25,7 +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="worktrees" href="/worktrees">worktree</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>
@@ -79,16 +79,16 @@
     </dialog>
 
     <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><div class="actions"><button id="worktree-new" class="action">新建 Worktree</button><button id="worktree-configure" class="refresh">创建配置</button><button class="refresh" data-refresh="worktrees">刷新</button></div></div>
-      <p class="hint">仅管理本实例创建的工作区。多个会话可共享文件和分支；列表按需查询，不扫描未提交内容，也不能证明没有外部客户端使用。</p>
+      <div class="section-head"><div><p class="eyebrow">managed worktree</p><h2 id="worktrees-heading">worktree</h2></div><div class="actions"><button id="worktree-new" class="action">新建 worktree</button><button id="worktree-configure" class="refresh">创建配置</button><button class="refresh" data-refresh="worktrees">刷新</button></div></div>
+      <p class="hint">仅管理本实例创建的 worktree。多个会话可共享文件和分支；列表按需查询，不扫描未提交内容，也不能证明没有外部客户端使用。</p>
       <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>
+      <nav class="pagination" aria-label="worktree 分页"><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>
 
     <dialog id="worktree-create-drawer" class="editor-drawer" aria-labelledby="worktree-create-title">
       <form id="worktree-create" class="card-form drawer-form workspace-form" hidden>
-        <div class="drawer-head"><div><p class="eyebrow">WORKTREE</p><h3 id="worktree-create-title">新建 Worktree</h3></div><button id="worktree-create-close" class="drawer-close" type="button" aria-label="关闭新建 Worktree 表单">×</button></div>
+        <div class="drawer-head"><div><p class="eyebrow">worktree</p><h3 id="worktree-create-title">新建 worktree</h3></div><button id="worktree-create-close" class="drawer-close" type="button" aria-label="关闭新建 worktree 表单">×</button></div>
         <div class="drawer-body">
           <div class="workspace-fields">
             <label>Project<select id="worktree-project" required><option value="">选择 Project</option></select></label>
@@ -100,19 +100,19 @@
           <p id="worktree-create-note" class="hint">只检出已提交内容，不复制未提交、未跟踪或忽略文件，不执行环境初始化。不创建会话。</p>
           <h4>当前创建配置</h4>
           <p id="worktree-create-config" class="target-summary hint"></p>
-          <p class="hint">使用本实例已保存的配置；可在 Worktrees 页的“创建配置”中修改。</p>
+          <p class="hint">使用本实例已保存的配置；可在 worktree 页的“创建配置”中修改。</p>
           <p id="worktree-create-status" class="status" role="status" aria-live="polite"></p>
           <button id="worktree-create-check" class="drawer-cancel" type="button" hidden>刷新列表核对</button>
         </div>
-        <div class="drawer-footer"><button id="worktree-create-cancel" class="drawer-cancel" type="button">取消</button><button id="worktree-create-submit" type="submit" disabled>创建 Worktree</button></div>
+        <div class="drawer-footer"><button id="worktree-create-cancel" class="drawer-cancel" type="button">取消</button><button id="worktree-create-submit" type="submit" disabled>创建 worktree</button></div>
       </form>
     </dialog>
 
     <dialog id="worktree-settings-drawer" class="editor-drawer" aria-labelledby="worktree-settings-title">
       <form id="worktree-settings" class="card-form drawer-form workspace-form" hidden>
-        <div class="drawer-head"><div><p class="eyebrow">WORKTREE SETTINGS</p><h3 id="worktree-settings-title">Worktree 创建配置</h3></div><button id="worktree-settings-close" class="drawer-close" type="button" aria-label="关闭 Worktree 创建配置">×</button></div>
+        <div class="drawer-head"><div><p class="eyebrow">worktree settings</p><h3 id="worktree-settings-title">worktree 创建配置</h3></div><button id="worktree-settings-close" class="drawer-close" type="button" aria-label="关闭 worktree 创建配置">×</button></div>
         <div class="drawer-body">
-          <p class="hint">用于本实例后续创建，包括 Admin、飞书和 Agent 入口。已有工作区仍按原路径管理；不修改 Codex App 配置。</p>
+          <p class="hint">用于本实例后续创建，包括 Admin、飞书和 Agent 入口。已有 worktree 仍按原路径管理；不修改 Codex App 配置。</p>
           <div class="workspace-fields">
             <label>新建根目录（留空使用实例默认目录）<input id="worktree-root" maxlength="4096" aria-describedby="worktree-effective-root"></label>
             <p id="worktree-effective-root" class="hint"></p>
@@ -221,6 +221,22 @@
               <label><input id="session-settings-progress" type="checkbox">进度卡片</label>
               <label><input id="session-settings-completion-mention" type="checkbox">结束时 @ 提醒</label>
             </div>
+            <div id="session-settings-progress-settings" class="progress-settings" hidden>
+              <label>过程卡组织方式<select id="session-settings-progress-organization"><option value="content">按内容</option><option value="time">按时间</option></select></label>
+              <p class="session-settings-help">按时间交错显示进展与操作，任务清单固定在底部。执行状态和异常提示始终保留。</p>
+              <div class="defaults-feedback"><label><input id="session-settings-progress-show-commentary" type="checkbox">最近进展</label></div>
+              <div id="session-settings-progress-commentary-capacity" class="schedule-form-grid">
+                <label>进展条数（1–8）<input id="session-settings-progress-commentary-limit" type="number" min="1" max="8" step="1" required></label>
+                <label>进展摘要长度（1–320 字符）<input id="session-settings-progress-commentary-max-chars" type="number" min="1" max="320" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="session-settings-progress-show-operations" type="checkbox">最近操作</label></div>
+              <div id="session-settings-progress-operation-capacity" class="schedule-form-grid">
+                <label>操作条数（1–16）<input id="session-settings-progress-operation-limit" type="number" min="1" max="16" step="1" required></label>
+                <label>操作摘要长度（1–240 字符）<input id="session-settings-progress-operation-max-chars" type="number" min="1" max="240" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="session-settings-progress-show-plan" type="checkbox">任务清单</label></div>
+            </div>
+            <p id="session-settings-progress-error" class="progress-settings-error" role="status" hidden></p>
           </fieldset>
           <p id="session-settings-note" class="session-settings-help" role="status" aria-live="polite"></p>
         </div>
@@ -271,8 +287,8 @@
             <h4>会话配置</h4>
             <div class="schedule-form-grid">
               <label>Project<select id="defaults-project" required><option value="">选择 Project</option></select></label>
-              <label>工作区策略<select id="defaults-workspace"><option value="project">项目目录</option><option value="existing">指定已有 Worktree</option><option value="new">每个新会话创建 Worktree</option></select></label>
-              <label id="defaults-worktree-field" hidden>受管 Worktree<select id="defaults-worktree"></select></label>
+              <label>worktree 使用方式<select id="defaults-workspace"><option value="project">项目目录（不使用 worktree）</option><option value="existing">使用已有 worktree</option><option value="new">每个新会话新建 worktree</option></select></label>
+              <label id="defaults-worktree-field" hidden>受管 worktree<select id="defaults-worktree"></select></label>
               <label id="defaults-workspace-ref-field" hidden>起点提交 / 分支<input id="defaults-workspace-ref" list="defaults-workspace-refs" maxlength="256" placeholder="留空使用创建时 Project 的 HEAD"><datalist id="defaults-workspace-refs"></datalist></label>
             </div>
             <p id="defaults-workspace-help" class="defaults-field-help" role="status"></p>
@@ -288,6 +304,22 @@
               <label><input id="defaults-progress" type="checkbox">进度卡片</label>
               <label><input id="defaults-completion-mention" type="checkbox">结束时 @ 提醒</label>
             </div>
+            <div id="defaults-progress-settings" class="progress-settings" hidden>
+              <label>过程卡组织方式<select id="defaults-progress-organization"><option value="content">按内容</option><option value="time">按时间</option></select></label>
+              <p class="session-settings-help">按时间交错显示进展与操作，任务清单固定在底部。执行状态和异常提示始终保留。</p>
+              <div class="defaults-feedback"><label><input id="defaults-progress-show-commentary" type="checkbox">最近进展</label></div>
+              <div id="defaults-progress-commentary-capacity" class="schedule-form-grid">
+                <label>进展条数（1–8）<input id="defaults-progress-commentary-limit" type="number" min="1" max="8" step="1" required></label>
+                <label>进展摘要长度（1–320 字符）<input id="defaults-progress-commentary-max-chars" type="number" min="1" max="320" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="defaults-progress-show-operations" type="checkbox">最近操作</label></div>
+              <div id="defaults-progress-operation-capacity" class="schedule-form-grid">
+                <label>操作条数（1–16）<input id="defaults-progress-operation-limit" type="number" min="1" max="16" step="1" required></label>
+                <label>操作摘要长度（1–240 字符）<input id="defaults-progress-operation-max-chars" type="number" min="1" max="240" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="defaults-progress-show-plan" type="checkbox">任务清单</label></div>
+            </div>
+            <p id="defaults-progress-error" class="progress-settings-error" role="status" hidden></p>
           </fieldset>
           <p id="defaults-note" class="defaults-field-help" role="status"></p>
         </div>
@@ -380,8 +412,8 @@
                 </div>
                 <label id="schedule-project-field">Project<select id="schedule-project" required><option value="">选择 Project</option></select></label>
                 <div id="schedule-workspace-fields" class="schedule-section-fields">
-                  <label>工作区策略<select id="schedule-workspace"><option value="project">项目目录</option><option value="existing">指定已有 Worktree</option><option value="new">每次执行创建 Worktree</option></select></label>
-                  <label id="schedule-worktree-field" hidden>受管 Worktree<select id="schedule-worktree"></select></label>
+                  <label>worktree 使用方式<select id="schedule-workspace"><option value="project">项目目录（不使用 worktree）</option><option value="existing">使用已有 worktree</option><option value="new">每次执行新建 worktree</option></select></label>
+                  <label id="schedule-worktree-field" hidden>受管 worktree<select id="schedule-worktree"></select></label>
                   <label id="schedule-workspace-ref-field" hidden>起点提交 / 分支<input id="schedule-workspace-ref" list="schedule-workspace-refs" maxlength="256" placeholder="留空使用执行时 Project 的 HEAD"><datalist id="schedule-workspace-refs"></datalist></label>
                   <p id="schedule-workspace-help" class="schedule-field-help" role="status"></p>
                 </div>