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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.14.0
+Version: 0.14.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.14.0 → netizen_cli-0.14.1}/netizen_cli/__init__.py

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

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

@@ -429,8 +429,9 @@ body.schedule-detail-open { overflow: hidden; }
 .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-form { border: 0; padding: 0; }
-#session-access-fields { min-width: 0; margin: 0; border: 0; padding: 0; }
+.session-access-form, .global-card-form { border: 0; padding: 0; }
+.global-card-form { max-width: 800px; }
+#session-access-fields, #global-card-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; }

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

@@ -70,6 +70,7 @@ function expireAdminSession() {
   if (notice) notice.hidden = false;
   window.NetizenIdentity?.expire();
   window.NetizenSessionAccess?.expire();
+  window.NetizenProgressCard?.expire();
   window.NetizenWorktrees?.expire();
   setStatus("登录已过期，请重新登录。", true);
 }
@@ -2349,6 +2350,7 @@ async function loadSessionSettingsOptions() {
   const serial = ++editor.optionsSerial;
   editor.loading = true;
   renderSessionSettingsEditor();
+  const progressRead = editor.settings.progress_card_settings === null ? window.NetizenProgressCard.read() : null;
   try {
     const data = await api("/api/v1/sessions/options");
     if (sessionSettingsEditor !== editor || serial !== editor.optionsSerial) return;
@@ -2359,6 +2361,7 @@ async function loadSessionSettingsOptions() {
     editor.models = [];
     editor.catalogError = `${error.message} 模型目录暂未读取，原选择保持不变。`;
   } finally {
+    await progressRead;
     if (sessionSettingsEditor === editor && serial === editor.optionsSerial) {
       editor.loading = false;
       renderSessionSettingsEditor();
@@ -2768,6 +2771,7 @@ async function loadDefaultOptions(resolveChat = false) {
   editor.workspaceOptions = null;
   editor.workspaceError = "";
   renderDefaultSettings();
+  let progressRead = editor.settings.progress_card_settings === null ? window.NetizenProgressCard.read() : null;
   try {
     let view = null;
     if (resolveChat && chatId) {
@@ -2810,6 +2814,11 @@ async function loadDefaultOptions(resolveChat = false) {
     editor.error = `${error.message} 请重新打开表单后操作。`;
     if (resolveChat) editor.action = null;
   } finally {
+    if (defaultsEditor === editor && serial === editor.serial
+        && editor.settings.progress_card_settings === null && !progressRead) {
+      progressRead = window.NetizenProgressCard.read();
+    }
+    await progressRead;
     if (defaultsEditor === editor && serial === editor.serial) {
       // Initial catalog/defaults hydration is not a user edit. Later target
       // resolution must not erase the original values used for discard checks.
@@ -3088,7 +3097,8 @@ function sessionSettingsFingerprint(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,
-    progressCardFields.map((field) => progressCardSettings(settings)[field.replaceAll("-", "_")])]);
+    settings.progress_card_settings === null ? null
+      : progressCardFields.map((field) => settings.progress_card_settings[field.replaceAll("-", "_")])]);
 }
 
 function confirmDiscardChanges(changed) {
@@ -3098,6 +3108,7 @@ function confirmDiscardChanges(changed) {
 function hasUnsavedEditors() {
   return projectEditorHasChanges() || sessionSettingsHasChanges() || defaultEditorHasChanges() || scheduleEditorHasChanges()
     || Boolean(pendingScheduleDraft?.dirty) || Boolean(window.NetizenSessionAccess?.dirty())
+    || Boolean(window.NetizenProgressCard?.dirty())
     || Boolean(window.NetizenWorktrees?.dirty());
 }
 
@@ -3105,7 +3116,8 @@ function hasUnsavedEditors() {
 // existing fail-closed boundary; this helper never cancels or repeats a POST.
 function confirmDiscardEditors() {
   if (projectEditor?.saving || sessionSettingsEditor?.saving || defaultsBusy || (scheduleEditor && scheduleInput("fields").disabled)
-      || window.NetizenSessionAccess?.busy() || window.NetizenWorktrees?.busy()) return false;
+      || window.NetizenSessionAccess?.busy() || window.NetizenProgressCard?.busy()
+      || window.NetizenWorktrees?.busy()) return false;
   if (!confirmDiscardChanges(hasUnsavedEditors())) return false;
   closeProjectEditor({ confirmed: true });
   closeSessionSettingsEditor({ confirmed: true });
@@ -3113,6 +3125,7 @@ function confirmDiscardEditors() {
   if (scheduleEditor) closeScheduleEditor({ confirmed: true });
   cancelScheduleSelection({ confirmed: true });
   window.NetizenSessionAccess?.discard();
+  window.NetizenProgressCard?.discard();
   window.NetizenWorktrees?.discard();
   return true;
 }
@@ -3550,22 +3563,19 @@ 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", 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",
-    } };
+    message_context_mode: "current-only", progress_card_settings: null };
 }
 
 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;
+  return settings.progress_card_settings || window.NetizenProgressCard?.current();
 }
 
 function progressCardSettingsError(settings) {
   const progress = progressCardSettings(settings);
+  if (!progress) return "";
   for (const [key, label, maximum] of [
     ["commentary_limit", "进展条数", 8], ["operation_limit", "操作条数", 16],
     ["commentary_max_chars", "进展摘要长度", 320], ["operation_max_chars", "操作摘要长度", 240],
@@ -3582,19 +3592,21 @@ function renderProgressCardSettings(input, settings) {
   if (!container) return;
   const progress = progressCardSettings(settings);
   container.hidden = !settings.progress_card_enabled;
+  const source = input("progress-source");
+  if (source) source.hidden = settings.progress_card_settings !== null;
   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
+    if (field.startsWith("show-")) node.checked = progress?.[key] || false;
+    else node.value = progress?.[key] ?? "";
+    node.disabled = !progress || !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]]) {
+  for (const [kind, shown] of [["commentary", progress?.show_commentary], ["operation", progress?.show_operations]]) {
     input(`progress-${kind}-capacity`).hidden = !shown;
   }
-  const error = progressCardSettingsError(settings);
+  const error = progress ? progressCardSettingsError(settings) : "读取全局配置后可编辑过程卡细项。";
   const note = input("progress-error");
   note.textContent = error;
   note.hidden = !error;
@@ -3662,11 +3674,13 @@ function changeSessionSettingsField(input, settings, models, field, baseTurn = n
   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 progress = progressCardSettings(settings);
+    if (!progress) return;
     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 };
+    settings.progress_card_settings = { ...progress, [key]: value };
   }
 }
 
@@ -4604,8 +4618,9 @@ async function refresh(tab, cursor = undefined) {
     if (tab === "schedules" && await loadSchedules(cursor) === false) return false;
     if (tab === "defaults") await loadDefaults();
     if (tab === "system") {
-      const results = await Promise.all([window.NetizenIdentity.loadUsers(), window.NetizenSessionAccess?.load()]);
-      if (results[1] === false) return false;
+      const results = await Promise.all([window.NetizenIdentity.loadUsers(), window.NetizenSessionAccess?.load(),
+        window.NetizenProgressCard?.load()]);
+      if (results.includes(false)) return false;
     }
     if (state.authExpired) return false;
     if (isCurrentView()) setStatus("已更新。");
@@ -4643,7 +4658,7 @@ function selectSystemTab(name) {
   if (state.authExpired || state.systemTab === name) return;
   window.NetizenSelect?.close();
   if (state.systemTab === "admins") window.NetizenIdentity?.suspendSelector();
-  else window.NetizenSessionAccess?.closePickers();
+  else if (state.systemTab === "access") window.NetizenSessionAccess?.closePickers();
   state.systemTab = name;
   for (const button of document.querySelectorAll("[data-system-tab]")) {
     const selected = button.dataset.systemTab === name;
@@ -4710,8 +4725,10 @@ for (const tab of document.querySelectorAll("[data-system-tab]")) {
   tab.addEventListener("keydown", (event) => {
     if (!["ArrowLeft", "ArrowRight", "Home", "End"].includes(event.key)) return;
     event.preventDefault();
-    const name = event.key === "Home" ? "admins" : event.key === "End" ? "access"
-      : tab.dataset.systemTab === "admins" ? "access" : "admins";
+    const names = [...document.querySelectorAll("[data-system-tab]")].map((button) => button.dataset.systemTab);
+    const index = names.indexOf(tab.dataset.systemTab);
+    const name = event.key === "Home" ? names[0] : event.key === "End" ? names.at(-1)
+      : names[(index + (event.key === "ArrowRight" ? 1 : names.length - 1)) % names.length];
     selectSystemTab(name);
     document.querySelector(`#system-tab-${name}`).focus();
   });

{netizen_cli-0.14.0 → netizen_cli-0.14.1}/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/progress-card.js" defer></script>
   <script src="/static/worktrees.js" defer></script>
   <script src="/static/admin.js" defer></script>
 </head>
@@ -222,6 +223,7 @@
               <label><input id="session-settings-completion-mention" type="checkbox">结束时 @ 提醒</label>
             </div>
             <div id="session-settings-progress-settings" class="progress-settings" hidden>
+              <p id="session-settings-progress-source" class="session-settings-help" hidden>当前未单独配置，显示全局过程卡配置。修改细项后将保存为独立配置。</p>
               <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>
@@ -305,6 +307,7 @@
               <label><input id="defaults-completion-mention" type="checkbox">结束时 @ 提醒</label>
             </div>
             <div id="defaults-progress-settings" class="progress-settings" hidden>
+              <p id="defaults-progress-source" class="session-settings-help" hidden>当前未单独配置，显示全局过程卡配置。修改细项后将保存为独立配置。</p>
               <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>
@@ -488,6 +491,7 @@
       <div class="session-tabs system-tabs" role="tablist" aria-label="系统管理">
         <button id="system-tab-admins" class="session-tab" role="tab" data-system-tab="admins" aria-selected="true" aria-controls="system-admins" tabindex="0">管理员</button>
         <button id="system-tab-access" class="session-tab" role="tab" data-system-tab="access" aria-selected="false" aria-controls="system-access" tabindex="-1">跨会话工具权限<span id="session-access-unsaved" class="tab-unsaved" hidden>未保存</span></button>
+        <button id="system-tab-progress" class="session-tab" role="tab" data-system-tab="progress" aria-selected="false" aria-controls="system-progress" tabindex="-1">过程卡<span id="global-card-unsaved" class="tab-unsaved" hidden>未保存</span></button>
       </div>
       <div id="system-admins" class="system-tab-panel" role="tabpanel" aria-labelledby="system-tab-admins">
         <div class="section-head"><h3>管理员</h3><button id="admin-user-add" class="action" aria-expanded="false" aria-controls="admin-user-panel" disabled>添加管理员</button></div>
@@ -541,6 +545,34 @@
           </div>
         </form>
       </div>
+      <div id="system-progress" class="system-tab-panel" role="tabpanel" aria-labelledby="system-tab-progress" hidden>
+        <h3>全局过程卡配置</h3>
+        <p class="defaults-help">仅在本实例的会话未单独配置过程卡时使用，不覆盖会话及聊天默认配置中已有的过程卡设置。</p>
+        <form id="global-card-form" class="card-form global-card-form">
+          <fieldset id="global-card-fields" disabled>
+            <div id="global-card-progress-settings" class="progress-settings" hidden>
+              <label>过程卡组织方式<select id="global-card-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="global-card-progress-show-commentary" type="checkbox">最近进展</label></div>
+              <div id="global-card-progress-commentary-capacity" class="schedule-form-grid">
+                <label>进展条数（1–8）<input id="global-card-progress-commentary-limit" type="number" min="1" max="8" step="1" required></label>
+                <label>进展摘要长度（1–320 字符）<input id="global-card-progress-commentary-max-chars" type="number" min="1" max="320" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="global-card-progress-show-operations" type="checkbox">最近操作</label></div>
+              <div id="global-card-progress-operation-capacity" class="schedule-form-grid">
+                <label>操作条数（1–16）<input id="global-card-progress-operation-limit" type="number" min="1" max="16" step="1" required></label>
+                <label>操作摘要长度（1–240 字符）<input id="global-card-progress-operation-max-chars" type="number" min="1" max="240" step="1" required></label>
+              </div>
+              <div class="defaults-feedback"><label><input id="global-card-progress-show-plan" type="checkbox">任务清单</label></div>
+            </div>
+            <p id="global-card-progress-error" class="progress-settings-error" role="status" hidden></p>
+          </fieldset>
+          <div class="session-access-footer">
+            <p id="global-card-note" class="defaults-field-help" role="status"></p>
+            <div class="actions"><button id="global-card-cancel" class="refresh" type="button" disabled>放弃修改</button><button id="global-card-save" class="action" type="submit" disabled>保存配置</button></div>
+          </div>
+        </form>
+      </div>
     </section>
     <section id="updates" class="panel" aria-labelledby="updates-heading" hidden>
       <div class="section-head">

netizen_cli-0.14.1/netizen_cli/admin/static/progress-card.js

@@ -0,0 +1,118 @@
+"use strict";
+
+window.NetizenProgressCard = (() => {
+  const node = (name) => document.querySelector(`#global-card-${name}`);
+  let snapshot = null;
+  let draft = null;
+  let preview = null;
+  let loading = false;
+  let pending = false;
+  let expired = false;
+  let generation = 0;
+  let previewGeneration = 0;
+
+  const wrapper = () => ({ progress_card_enabled: true, progress_card_settings: draft });
+  const dirty = () => Boolean(snapshot) && JSON.stringify(draft) !== JSON.stringify(snapshot.settings);
+
+  function render() {
+    if (draft) renderProgressCardSettings(node, wrapper());
+    node("fields").disabled = expired || loading || pending || !snapshot?.editable;
+    node("save").disabled = expired || loading || pending || !snapshot?.actions.save || !dirty()
+      || Boolean(progressCardSettingsError(wrapper()));
+    node("cancel").disabled = expired || loading || pending || !dirty();
+    node("unsaved").hidden = !dirty();
+    node("save").textContent = pending ? "保存中…" : "保存配置";
+    node("form").setAttribute("aria-busy", String(loading || pending));
+  }
+
+  function discard() {
+    generation += 1;
+    loading = false;
+    draft = snapshot ? structuredClone(snapshot.settings) : null;
+    render();
+  }
+
+  async function read() {
+    const version = ++previewGeneration;
+    preview = null;
+    try {
+      const value = await api("/api/v1/progress-card/settings");
+      if (!expired && version === previewGeneration) preview = value.settings;
+      return value.settings;
+    } catch (error) {
+      if (!expired && version === previewGeneration) setStatus(`全局过程卡配置读取失败：${error.message}`, true);
+      return null;
+    }
+  }
+
+  async function load() {
+    if (expired || pending || !confirmDiscardChanges(dirty())) return false;
+    const version = ++generation;
+    loading = true;
+    render();
+    try {
+      const value = await api("/api/v1/progress-card/settings");
+      if (expired || version !== generation) return false;
+      snapshot = value;
+      previewGeneration += 1;
+      preview = value.settings;
+      draft = structuredClone(value.settings);
+      node("note").textContent = value.editable
+        ? "保存后，从后续任务开始使用；正在执行的卡片保持不变。" : "实例配置不可编辑。";
+      return true;
+    } catch (error) {
+      if (!expired && version === generation) {
+        if (snapshot) snapshot.actions.save = null;
+        node("note").textContent = "读取失败，请刷新后重试。";
+      }
+      throw error;
+    } finally {
+      if (version === generation) { loading = false; render(); }
+    }
+  }
+
+  async function save(event) {
+    event.preventDefault();
+    if (expired || loading || pending || !snapshot?.actions.save || !dirty()
+        || progressCardSettingsError(wrapper())) return;
+    const body = actionPayload(snapshot.actions.save, { settings: draft });
+    snapshot.actions.save = null;
+    pending = true;
+    generation += 1;
+    render();
+    try {
+      const value = await api("/api/v1/progress-card/settings", {
+        method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body),
+      });
+      if (expired) return;
+      snapshot = value;
+      previewGeneration += 1;
+      preview = value.settings;
+      draft = structuredClone(value.settings);
+      node("note").textContent = "全局过程卡配置已保存，从后续任务开始使用。";
+      setStatus("全局过程卡配置已保存。");
+    } catch (error) {
+      if (!expired) {
+        node("note").textContent = "请刷新核对当前配置后再保存；本次修改未自动重试。";
+        setStatus(error.message, true);
+      }
+    } finally {
+      pending = false;
+      render();
+    }
+  }
+
+  for (const field of node("fields").querySelectorAll("input, select")) {
+    field.addEventListener("change", () => {
+      if (expired || loading || pending || !snapshot?.editable) return;
+      const settings = wrapper();
+      changeSessionSettingsField(node, settings, [], field.id.slice("global-card-".length));
+      draft = settings.progress_card_settings;
+      render();
+    });
+  }
+  node("form").addEventListener("submit", save);
+  node("cancel").addEventListener("click", discard);
+  return { load, read, current: () => preview, dirty, discard, busy: () => pending,
+    expire() { expired = true; generation += 1; render(); } };
+})();

{netizen_cli-0.14.0 → netizen_cli-0.14.1}/netizen_cli/admin/web.py

@@ -167,6 +167,8 @@ from ..sessions.policy import (
     SessionAccessPolicy, SessionPolicyConflict, SessionPolicyError, SessionPolicyService,
 )
 from ..worktrees.errors import WorktreeError
+from ..progress_card_config import ProgressCardConfigConflict, ProgressCardConfigError
+from ..progress_card_settings import ProgressCardSettings
 
 
 logger = logging.getLogger(__name__)
@@ -255,6 +257,7 @@ class AdminActionPreconditions:
     session_policy_revision: ExpectedValue[str] = ExpectedValue.dont_check()
     cascade_delete: ExpectedValue[bool] = ExpectedValue.dont_check()
     worktree_settings_revision: ExpectedValue[str] = ExpectedValue.dont_check()
+    progress_card_settings_revision: ExpectedValue[str] = ExpectedValue.dont_check()
 
 
 @dataclass(frozen=True, slots=True)
@@ -577,6 +580,8 @@ class AdminWebApplication:
             return Response(200, ((b"Content-Type", b"text/javascript; charset=utf-8"),), self._assets["session-access.js"])
         if route == ("GET", "/static/worktrees.js"):
             return Response(200, ((b"Content-Type", b"text/javascript; charset=utf-8"),), self._assets["worktrees.js"])
+        if route == ("GET", "/static/progress-card.js"):
+            return Response(200, ((b"Content-Type", b"text/javascript; charset=utf-8"),), self._assets["progress-card.js"])
         if route == ("GET", "/api/v1/identity"):
             _require_query_keys(context.query, set())
             session = self._authenticate(context)
@@ -608,6 +613,8 @@ class AdminWebApplication:
             return await self._worktree_branches(context)
         if route == ("GET", "/api/v1/worktrees/settings"):
             return self._worktree_settings(context)
+        if route == ("GET", "/api/v1/progress-card/settings"):
+            return self._progress_card_settings(context)
         if route == ("GET", "/api/v1/chats"):
             return await self._chats(context)
         if route == ("GET", "/api/v1/chat-labels"):
@@ -656,6 +663,7 @@ class AdminWebApplication:
         mutations: dict[str, Callable[[_RequestContext], Awaitable[Response]]] = {
             "/api/v1/worktrees/create": self._worktree_create,
             "/api/v1/worktrees/settings": self._worktree_save_settings,
+            "/api/v1/progress-card/settings": self._progress_card_save_settings,
             "/api/v1/worktrees/delete-preview": self._worktree_delete_preview,
             "/api/v1/worktrees/delete": self._worktree_delete,
             "/api/v1/session-tool-access/save": self._save_session_tool_access,
@@ -1104,6 +1112,46 @@ class AdminWebApplication:
         )
         return _json_response(200, {**result, "requestId": context.request.request_id})
 
+    def _progress_card_settings(self, context: _RequestContext) -> Response:
+        _require_query_keys(context.query, set())
+        view = self._management.progress_card_settings()
+        actions = {}
+        if view["editable"]:
+            actions["save"] = self._grant(
+                context, "progress-card.settings", AdminActionTarget("progress-card-settings", "instance"),
+                _empty_preconditions(progress_card_settings_revision=ExpectedValue.expect(view["revision"])),
+            )
+        return _json_response(200, {**view, "actions": actions, "requestId": context.request.request_id})
+
+    async def _progress_card_save_settings(self, context: _RequestContext) -> Response:
+        _require_query_keys(context.query, set())
+        payload, grant = self._redeem(
+            context, "progress-card.settings", expected_resource="progress-card-settings",
+            allowed_extra={"settings"},
+        )
+        if grant.target.target_id != "instance":
+            raise StaleActionGrant()
+        try:
+            settings = ProgressCardSettings.from_dict(payload["settings"])
+        except ValueError as error:
+            raise AdminWebError(400, "invalid_progress_card_settings", str(error)) from None
+        revision = _expected_value(
+            _grant_preconditions(grant).progress_card_settings_revision, "progress card settings revision",
+        )
+
+        async def apply() -> dict[str, Any]:
+            try:
+                return await self._management.update_progress_card_settings(settings, expected_revision=revision)
+            except ProgressCardConfigConflict:
+                raise AdminWebError(409, "stale_progress_card_settings", "过程卡配置已被修改，请刷新后再保存。") from None
+            except AdminPortConfigurationError:
+                raise AdminWebError(409, "configuration_changed", "实例配置文件已变化；请重启实例加载配置后再保存。") from None
+            except (ProgressCardConfigError, OSError):
+                raise AdminWebError(503, "configuration_unavailable", "无法保存过程卡配置，当前配置未更新。") from None
+
+        await self._mutation(context, "progress-card.settings", "instance", apply())
+        return self._progress_card_settings(context)
+
     async def _worktree_delete_preview(self, context: _RequestContext) -> Response:
         _require_query_keys(context.query, set())
         payload, grant = self._redeem(
@@ -2164,7 +2212,7 @@ class AdminWebApplication:
 
         async def apply() -> None:
             try:
-                service.update(policy, expected_revision=revision)
+                await self._management.update_session_tool_access(service, policy, expected_revision=revision)
             except SessionPolicyConflict:
                 raise AdminWebError(409, "stale_session_tool_access", "权限已被修改，请刷新后再保存。") from None
             except AdminPortConfigurationError:
@@ -2713,7 +2761,7 @@ def admin_access_urls(
 def _load_assets() -> dict[str, bytes]:
     root = importlib.resources.files("netizen_cli.admin").joinpath("static")
     assets: dict[str, bytes] = {}
-    for name in ("index.html", "admin.css", "admin.js", "chat-picker.js", "chat-picker.css", "login.html", "login.js", "identity.js", "session-access.js", "worktrees.js"):
+    for name in ("index.html", "admin.css", "admin.js", "chat-picker.js", "chat-picker.css", "login.html", "login.js", "identity.js", "session-access.js", "worktrees.js", "progress-card.js"):
         assets[name] = root.joinpath(name).read_bytes()
     return assets
 
@@ -3015,6 +3063,7 @@ def _empty_preconditions(
     session_policy_revision: ExpectedValue[str] | None = None,
     cascade_delete: ExpectedValue[bool] | None = None,
     worktree_settings_revision: ExpectedValue[str] | None = None,
+    progress_card_settings_revision: ExpectedValue[str] | None = None,
 ) -> AdminActionPreconditions:
     return AdminActionPreconditions(
         active_binding_id or ExpectedValue.dont_check(),
@@ -3037,6 +3086,7 @@ def _empty_preconditions(
         session_policy_revision or ExpectedValue.dont_check(),
         cascade_delete or ExpectedValue.dont_check(),
         worktree_settings_revision or ExpectedValue.dont_check(),
+        progress_card_settings_revision or ExpectedValue.dont_check(),
     )
 
 

{netizen_cli-0.14.0 → netizen_cli-0.14.1}/netizen_cli/bindings.py

@@ -40,7 +40,7 @@ from .worktrees.models import WorktreeRecord
 from .worktrees.store import WorktreeStore, create_schema as create_worktree_schema
 
 
-SCHEMA_VERSION = 18
+SCHEMA_VERSION = 19
 
 # Includes the running query and all submitted queries waiting for the reader.
 _ADMIN_QUERY_CAPACITY = 32
@@ -467,7 +467,7 @@ def _require_current_schema(connection: sqlite3.Connection) -> None:
     _require_project_metadata_schema(connection)
     require_schema(connection)
     require_defaults_schema(connection)
-    from .migrations.v18 import validate
+    from .migrations.v19 import validate
     validate(connection)
 
 
@@ -1334,10 +1334,10 @@ class BindingStore:
                 row["task_reactions_enabled"],
                 row["progress_card_enabled"],
                 row["completion_mention_enabled"],
-                _progress_card_settings(row["progress_card_settings_json"]).to_dict(),
+                _progress_card_settings(row["progress_card_settings_json"]),
             )
             feedback_changed = current_feedback != (
-                *feedback_values[:3], task_feedback.progress_card_settings.to_dict(),
+                *feedback_values[:3], task_feedback.progress_card_settings,
             )
             if (
                 not settings_changed
@@ -3008,13 +3008,17 @@ def _feedback_values(
         int(feedback.reaction_pulse_enabled),
         int(feedback.progress_card_enabled),
         int(feedback.completion_mention_enabled),
-        json.dumps(feedback.progress_card_settings.to_dict(), separators=(",", ":")),
+        json.dumps(
+            feedback.progress_card_settings.to_dict() if feedback.progress_card_settings is not None else None,
+            separators=(",", ":"),
+        ),
     )
 
 
-def _progress_card_settings(raw: str) -> ProgressCardSettings:
+def _progress_card_settings(raw: str) -> ProgressCardSettings | None:
     try:
-        return ProgressCardSettings.from_dict(json.loads(raw))
+        value = json.loads(raw)
+        return ProgressCardSettings.from_dict(value) if value is not None else None
     except (TypeError, ValueError) as error:
         raise RuntimeError("Binding contains invalid progress card settings") from error
 

{netizen_cli-0.14.0 → netizen_cli-0.14.1}/netizen_cli/cards/controls.py

@@ -453,10 +453,9 @@ def _restore_settings_draft(
             # /new redraws start from defaults; both toggle choices must keep
             # the presentation settings already carried by this draft.
             _, settings = _decode_progress_card_reference(value, element["name"])
-            if settings is not None:
-                for option in element["options"]:
-                    enabled, _ = _decode_progress_card_reference(option["value"], element["name"])
-                    option["value"] = _progress_card_reference(enabled, settings)
+            for option in element["options"]:
+                enabled, _ = _decode_progress_card_reference(option["value"], element["name"])
+                option["value"] = _progress_card_reference(enabled, settings)
         if not any(option["value"] == value for option in element["options"]):
             label = "保留已选值（当前不可用）"
             if element["name"].endswith("_model"):
@@ -806,22 +805,28 @@ def _task_feedback_form_elements(
     ]
 
 
-def _progress_card_reference(enabled: bool, settings: ProgressCardSettings) -> str:
+def _progress_card_reference(enabled: bool, settings: ProgressCardSettings | None) -> str:
     # Ordinary Feishu forms only edit the existing toggle. Carry the Admin
     # presentation choices with both options, without a card session or new UI.
-    values = [enabled, *(getattr(settings, name) for name in _PROGRESS_CARD_FIELDS)]
+    values = (
+        [enabled, None] if settings is None else
+        [enabled, *(getattr(settings, name) for name in _PROGRESS_CARD_FIELDS)]
+    )
     return _PROGRESS_CARD_REFERENCE_PREFIX + json.dumps(values, separators=(",", ":"))
 
 
 def _decode_progress_card_reference(value: Any, field: str) -> tuple[bool, ProgressCardSettings | None]:
     value = _bounded_string(value, field, max_chars=128)
     if not value.startswith(_PROGRESS_CARD_REFERENCE_PREFIX):
-        return _decode_task_feedback_reference(value, field), None
+        return _decode_task_feedback_reference(value, field), ProgressCardSettings()
     try:
         values = json.loads(value[len(_PROGRESS_CARD_REFERENCE_PREFIX):])
-        if not isinstance(values, list) or len(values) != len(_PROGRESS_CARD_FIELDS) + 1 or type(values[0]) is not bool:
+        if not isinstance(values, list) or not values or type(values[0]) is not bool:
             raise ValueError("invalid progress card reference")
-        settings = ProgressCardSettings.from_dict(dict(zip(_PROGRESS_CARD_FIELDS, values[1:], strict=True)))
+        settings = (
+            None if values[1:] == [None] else
+            ProgressCardSettings.from_dict(dict(zip(_PROGRESS_CARD_FIELDS, values[1:], strict=True)))
+        )
     except (ValueError, TypeError) as error:
         raise CardActionError("过程卡设置无效，请重新打开配置卡片。") from error
     return values[0], settings
@@ -834,7 +839,7 @@ def _decode_task_feedback_fields(payload: Mapping[str, Any], *, prefix: str) ->
         _decode_task_feedback_reference(payload[f"{prefix}_task_reactions"], f"{prefix}_task_reactions"),
         progress_enabled,
         _decode_task_feedback_reference(payload[f"{prefix}_completion_mention"], f"{prefix}_completion_mention"),
-        settings or ProgressCardSettings(),
+        settings,
     )
 
 

{netizen_cli-0.14.0 → netizen_cli-0.14.1}/netizen_cli/channel_app.py

@@ -267,7 +267,6 @@ from .prompt_projection import (
     project_current_message,
 )
 from .projects import ProjectError, ProjectRegistry, UnknownProject
-from .progress_card_settings import ProgressCardSettings
 from .task_text import project_task_text
 from .result_images import prepare_result_images
 from .quoted_context import (
@@ -5144,7 +5143,7 @@ class ChannelApplication:
                 reaction_pulse_enabled=bool(intent.reaction_pulse_enabled),
                 progress_card_enabled=bool(intent.progress_card_enabled),
                 completion_mention_enabled=bool(intent.completion_mention_enabled),
-                progress_card_settings=intent.progress_card_settings or ProgressCardSettings(),
+                progress_card_settings=intent.progress_card_settings,
             )
             project, binding = await self._create_binding(
                 scope=intent.scope,