netizen-cli 0.10.0__tar.gz → 0.10.2__tar.gz

{netizen_cli-0.10.0/netizen_cli.egg-info → netizen_cli-0.10.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netizen-cli
-Version: 0.10.0
+Version: 0.10.2
 Summary: Use native Codex threads through a Feishu Channel.
 Requires-Python: <3.15,>=3.11
 Requires-Dist: h11==0.16.0
@@ -10,7 +10,7 @@ Requires-Dist: markdown-it-py==4.0.0
 Requires-Dist: mdformat==1.0.0
 Requires-Dist: mdformat-gfm==1.0.0
 Requires-Dist: mcp==2.2.0
-Requires-Dist: openai-codex==0.156.1
+Requires-Dist: openai-codex==0.159.2
 Requires-Dist: pydantic==2.13.4
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: qrcode==8.2

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/README.md

@@ -69,8 +69,8 @@ Linux 注销后常驻需要 linger；macOS 服务随桌面登录启动、注销
 
 ### 2. 安装 CLI 并创建实例
 
-此分支改为普通 Python CLI，尚未发布到 PyPI；以下为新版使用方式，不表示旧 Release
-已具备这些命令。开发安装见[贡献指南](docs/CONTRIBUTING.md)。发行后在选定环境安装：
+在选定 Python 环境从 PyPI 安装 `netizen-cli`。源码开发安装见
+[贡献指南](docs/CONTRIBUTING.md)。
 
 ```sh
 python -m pip install netizen-cli
@@ -91,8 +91,7 @@ setup 准备配置、飞书授权和实例数据并注册服务，不默认启
 
 日常维护用 `netizen update` 更新当前环境并恢复原来运行的实例；它不接受 --root。
 `netizen remove --root ...` 默认保留数据，--purge 才清理精确范围，-y 只省略确认。
-完整流程、失败边界、跨环境切换和卸载见 [CLI 安装与维护](docs/cli.md)。旧安装手工转换，
-不提供自动旧布局迁移，不要直接对现有旧实例执行新版清理命令。
+完整流程、失败边界、跨环境切换和卸载见 [CLI 安装与维护](docs/cli.md)。
 
 ### 3. 在飞书开始第一次对话
 

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/__init__.py

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

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/port_config.py

@@ -1,4 +1,4 @@
-"""Narrow atomic port writes for explicit installation and first startup."""
+"""Atomic persistence of the Admin port allocated during first startup."""
 
 from __future__ import annotations
 
@@ -56,7 +56,7 @@ def persist_admin_port(snapshot: ConfigFileSnapshot, port: int) -> None:
     """Preserve all YAML values and refuse a detected concurrent human edit.
 
     The caller retains its listening socket and instance lifetime lock. This
-    deliberately does not acquire the installer lock (the installer may still
+    deliberately does not acquire the CLI maintenance lock (the CLI may still
     be waiting for this startup). Only the previously absent port is added.
     """
 
@@ -75,23 +75,6 @@ def persist_admin_port(snapshot: ConfigFileSnapshot, port: int) -> None:
     _write_configuration(snapshot, loaded)
 
 
-def set_admin_port(path: Path, port: int) -> None:
-    """Apply an explicit installer choice, even if Admin is currently disabled."""
-
-    _validate_port(port)
-    snapshot = ConfigFileSnapshot.read(path)
-    loaded = yaml.safe_load(snapshot.content)
-    if not isinstance(loaded, dict):
-        raise AdminPortConfigurationError("configuration root must be a mapping")
-    values = loaded.setdefault("adminWeb", {})
-    if not isinstance(values, dict):
-        raise AdminPortConfigurationError("adminWeb must be a mapping")
-    values = dict(values)
-    loaded["adminWeb"] = values
-    values["port"] = port
-    _write_configuration(snapshot, loaded)
-
-
 def _validate_port(port: int) -> None:
     if isinstance(port, bool) or not isinstance(port, int) or not 1 <= port <= 65535:
         raise AdminPortConfigurationError("Admin port must be from 1 to 65535")

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/presentation.py

@@ -9,7 +9,6 @@ from typing import Any
 from urllib.parse import urlencode
 from zoneinfo import ZoneInfo
 
-from ..bindings import BindingTurnSettings
 from ..runtime.contracts import (
     ReleaseDisposition,
     StopDisposition,
@@ -17,40 +16,6 @@ from ..runtime.contracts import (
 from ..management import BindingStatusProjection, ChatLabel
 
 
-def _release_check_message(code: str | None) -> str | None:
-    if code is None:
-        return None
-    return {
-        "release_rate_limited": "GitHub 更新查询已触发限流，请稍后重试。",
-        "release_access_denied": (
-            "更新查询被拒绝（HTTP 403）。请检查服务所在机器的网络访问策略或代理配置；"
-            "若持续出现，请联系维护者。"
-        ),
-        "release_not_found": (
-            "未找到可访问的官方发布版本（HTTP 404）。请稍后重试；"
-            "若持续出现，请联系维护者检查仓库与 Release 状态。"
-        ),
-        "release_service_unavailable": (
-            "更新服务暂时异常（HTTP 5xx）。请稍后重新检查。"
-        ),
-        "release_http_error": (
-            "更新查询收到异常 HTTP 响应。请稍后重试；"
-            "若持续出现，请联系维护者检查更新接口或网络代理。"
-        ),
-        "release_check_timeout": (
-            "查询 GitHub 更新服务超时。请稍后重试；"
-            "若持续出现，请检查服务所在机器的网络或代理配置。"
-        ),
-        "release_network_error": (
-            "访问 GitHub 更新服务时发生网络错误。请检查服务所在机器的网络、代理和 HTTPS 证书配置后再试。"
-        ),
-        "release_invalid_response": (
-            "官方更新信息格式异常，或发布资产不完整、未通过校验。"
-            "请稍后重试；若持续出现，请联系维护者检查 Release。"
-        ),
-    }.get(code, "检查更新失败，原因暂未识别。请稍后重试；若持续出现，请联系维护者。")
-
-
 def _chat_open_url(chat: ChatLabel) -> str:
     if chat.chat_mode == "p2p" and chat.p2p_target_open_id is not None:
         query = urlencode({"openId": chat.p2p_target_open_id})
@@ -110,16 +75,6 @@ def _jsonable(value: object) -> object:
     raise TypeError(f"unsupported JSON projection: {type(value).__name__}")
 
 
-def _settings_json(settings: BindingTurnSettings | None) -> dict[str, str] | None:
-    if settings is None:
-        return None
-    return {
-        "modelId": settings.model_id,
-        "effortId": settings.effort_id,
-        "serviceTierId": settings.service_tier_id,
-    }
-
-
 def _runtime_binding_json(status: BindingStatusProjection) -> dict[str, object]:
     snapshot = status.snapshot
     turn = snapshot.turn
@@ -251,7 +206,4 @@ def _binding_result(request_id: str, binding: Any) -> dict[str, object]:
         "scopeKey": binding.scope_key,
         "current": binding.active,
         "nativeThreadId": binding.native_thread_id,
-        "settingsRevision": binding.settings_revision,
-        "messageContextMode": binding.message_context_mode.value,
-        "contextRevision": binding.context_revision,
     }

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/static/admin.css

@@ -129,14 +129,10 @@ button:disabled { cursor: default; opacity: .48; }
 .update-operation { padding: 16px; margin: 20px 0; border-radius: 9px; background: var(--wash); }
 .update-operation p { margin: 8px 0 0; line-height: 1.6; }
 .update-warning { color: var(--muted); font-size: 13px; line-height: 1.6; }
-.update-actions { gap: 10px; }
-.update-actions .action { padding: 8px 13px; font-size: inherit; }
 .update-help { margin-top: 16px; font-size: 13px; }
 .service-restart { margin-top: 28px; padding-top: 20px; border-top: 1px solid var(--line); }
 .service-restart p { line-height: 1.6; }
 #updates a { color: var(--blue); }
-.update-notes { margin-top: 28px; padding-top: 20px; border-top: 1px solid var(--line); }
-#update-notes { white-space: pre-wrap; overflow-wrap: anywhere; line-height: 1.6; }
 button:focus-visible, input:focus-visible, select:focus-visible { outline: 3px solid #8cb4ff; outline-offset: 2px; }
 .login-body { min-height: 100vh; display: grid; place-items: center; padding: 20px; }
 .login-card { width: min(420px, 100%); background: white; border: 1px solid var(--line); border-radius: 14px; padding: 28px; }
@@ -158,7 +154,7 @@ button:focus-visible, input:focus-visible, select:focus-visible { outline: 3px s
   .time-range-fields { grid-template-columns: 1fr; }
 }
 .schedule-help { margin-top: 18px; color: var(--muted); }
-body.schedule-drawer-open, body.defaults-drawer-open { overflow: hidden; }
+body.schedule-drawer-open, body.defaults-drawer-open, body.session-settings-drawer-open { overflow: hidden; }
 .editor-drawer { position: fixed; inset: 0 0 0 auto; margin: 0; padding: 0; width: min(720px, 100vw); max-width: 100vw; height: 100dvh; max-height: 100dvh; border: 0; color: var(--ink); background: var(--paper); box-shadow: -12px 0 40px rgb(23 39 68 / 16%); }
 .editor-drawer::backdrop { background: rgb(16 33 63 / 35%); }
 #schedule-editor { height: 100%; display: flex; flex-direction: column; border: 0; border-radius: 0; padding: 0; margin: 0; }
@@ -236,6 +232,12 @@ body.schedule-drawer-open, body.defaults-drawer-open { overflow: hidden; }
 .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); }
 #defaults-note.error { color: var(--danger); }
+#session-settings-editor[hidden], #session-settings-editor [hidden] { display: none; }
+#session-settings-fields { border: 0; padding: 0; margin: 0; min-width: 0; }
+#session-settings-fields:disabled { opacity: .6; }
+.session-settings-help { color: var(--muted); font-size: 13px; line-height: 1.6; }
+#session-settings-note { margin-top: 24px; }
+#session-settings-note.error { color: var(--danger); }
 #defaults table { table-layout: fixed; }
 #defaults th:first-child { width: 25%; }
 #defaults th:nth-child(2) { width: 16%; }

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/static/admin.js

@@ -112,8 +112,8 @@ function renderUpdates() {
   document.querySelector("#update-source").textContent = {
     python: "Python 环境安装",
   }[data.current.source] || "安装来源未知";
-  document.querySelector("#update-message").textContent = data.checkingError
-    || data.message || "程序更新请在对应 Python 环境运行 netizen update。";
+  document.querySelector("#update-message").textContent = data.message
+    || "程序更新请在对应 Python 环境运行 netizen update。";
   const operation = data.operation;
   const restarting = updateExpectedTarget != null || operation?.kind === "restart";
   const operationName = restarting ? "重启" : "升级";
@@ -1371,9 +1371,10 @@ async function loadSessions(cursor = state.sessionPage.cursor) {
     updateRuntimeCell(runtime, session.runtime);
     row.append(runtime);
     cell(row, session.projectAlias);
-    const settings = session.turnSettings;
-    const model = settings ? `${settings.modelId} / ${settings.effortId} / ${settings.serviceTierId}` : "继承 Codex";
-    cell(row, `${session.messageContextMode} · ${model}`);
+    const settings = session.sessionSettings;
+    const turnSettings = settings.turn_settings;
+    const model = turnSettings ? `${turnSettings.model_id} / ${turnSettings.effort_id} / ${turnSettings.service_tier_id}` : "继承 Codex";
+    cell(row, `${settings.message_context_mode} · ${model}`);
     cell(row, sessionUpdatedAtLabel(session));
     const actions = actionsCell(row);
     wireSessionActions(actions, session);
@@ -1399,18 +1400,10 @@ function wireSessionActions(actions, session) {
     });
   }));
   if (a.activate) actions.append(actionButton("设为当前", () => mutate("/api/v1/sessions/activate", a.activate)));
-  if (a.configure) actions.append(actionButton("配置", async () => {
-    const clear = window.confirm("确定使用默认配置？取消后可输入精确 Model / Effort / Speed ID。");
-    let turnSettings = null;
-    if (!clear) {
-      const modelId = window.prompt("Model ID", session.turnSettings?.modelId || "");
-      const effortId = window.prompt("Effort ID", session.turnSettings?.effortId || "");
-      const serviceTierId = window.prompt("Speed / Service Tier ID", session.turnSettings?.serviceTierId || "");
-      if (!modelId || !effortId || !serviceTierId) return;
-      turnSettings = { modelId, effortId, serviceTierId };
-    }
-    await mutate("/api/v1/sessions/configure", a.configure, { turnSettings });
-  }));
+  if (a.configure) {
+    const button = actionButton("配置", () => openSessionSettingsEditor(session, button));
+    actions.append(button);
+  }
   if (a.rename) actions.append(actionButton("重命名", async () => {
     const name = window.prompt("新的原生会话名称");
     if (name) await mutate("/api/v1/sessions/rename", a.rename, { name });
@@ -1492,6 +1485,137 @@ function rowByIdentity(selector, key, value) {
   return null;
 }
 
+let sessionSettingsEditor = null;
+const sessionSettingsInput = (name) => document.querySelector(`#session-settings-${name}`);
+
+function renderSessionSettingsEditor() {
+  const editor = sessionSettingsEditor;
+  if (!editor) return;
+  renderSessionSettingsFields(sessionSettingsInput, editor.settings, editor.models, editor.contextAvailable);
+  sessionSettingsInput("fields").disabled = editor.loading || editor.saving;
+  sessionSettingsInput("context-field").hidden = editor.privateChat;
+  sessionSettingsInput("context").disabled = editor.privateChat;
+  sessionSettingsInput("context-note").hidden = editor.privateChat;
+  sessionSettingsInput("context-note").textContent = editor.contextAvailable
+    ? "补齐未读上下文会在下次 @ 时带入同一位置未 @ 机器人的成员消息。关闭后，请到飞书 /config 重新开启。"
+    : "开启补齐未读上下文，请到飞书 /config 设置。";
+  const notes = [editor.loading ? "正在读取模型目录…" : "", editor.catalogError, editor.error];
+  if (editor.settings.turn_settings && !editor.models.some((model) => model.id === editor.settings.turn_settings.model_id)) {
+    notes.push("已保存的模型当前不可用，原选择保持不变；可调整其他配置，或显式选择继承 Codex。");
+  }
+  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").textContent = editor.saving ? "保存中…" : "保存";
+  sessionSettingsInput("cancel").disabled = editor.saving;
+  sessionSettingsInput("close").disabled = editor.saving;
+  sessionSettingsInput("editor").setAttribute("aria-busy", String(editor.loading || editor.saving));
+}
+
+async function loadSessionSettingsOptions() {
+  const editor = sessionSettingsEditor;
+  if (!editor) return;
+  const serial = ++editor.optionsSerial;
+  editor.loading = true;
+  renderSessionSettingsEditor();
+  try {
+    const data = await api("/api/v1/sessions/options");
+    if (sessionSettingsEditor !== editor || serial !== editor.optionsSerial) return;
+    editor.models = data.models;
+    editor.catalogError = data.model_catalog_error || "";
+  } catch (error) {
+    if (sessionSettingsEditor !== editor || serial !== editor.optionsSerial) return;
+    editor.models = [];
+    editor.catalogError = `${error.message} 模型目录暂未读取，原选择保持不变。`;
+  } finally {
+    if (sessionSettingsEditor === editor && serial === editor.optionsSerial) {
+      editor.loading = false;
+      renderSessionSettingsEditor();
+    }
+  }
+}
+
+function openSessionSettingsEditor(session, returnFocus) {
+  if (sessionSettingsEditor?.saving || !session.actions.configure) return;
+  const base = structuredClone(session.sessionSettings);
+  const privateChat = session.scopeKind === "direct" || session.chatMode === "p2p";
+  sessionSettingsEditor = { session, returnFocus, settings: structuredClone(base), base,
+    action: session.actions.configure, models: [], catalogError: "", error: "",
+    privateChat, contextAvailable: !privateChat && base.message_context_mode === "catch-up",
+    loading: true, saving: false, optionsSerial: 0 };
+  sessionSettingsInput("editor").hidden = false;
+  sessionSettingsInput("identity").textContent = `${session.nativeTitle || "未命名 Session"} · ${session.shortId} · ${session.projectAlias}`;
+  renderSessionSettingsEditor();
+  if (!sessionSettingsInput("drawer").open) sessionSettingsInput("drawer").showModal();
+  document.body.classList.toggle("session-settings-drawer-open", true);
+  sessionSettingsInput("close").focus();
+  const editor = sessionSettingsEditor;
+  loadSessionSettingsOptions().then(() => {
+    if (sessionSettingsEditor === editor && document.activeElement === sessionSettingsInput("close")) {
+      sessionSettingsInput("model").focus();
+    }
+  });
+}
+
+function closeSessionSettingsEditor() {
+  const editor = sessionSettingsEditor;
+  if (!editor || editor.saving) return;
+  sessionSettingsEditor = null;
+  sessionSettingsInput("editor").hidden = true;
+  sessionSettingsInput("drawer").close();
+  document.body.classList.toggle("session-settings-drawer-open", false);
+  const returnFocus = editor.returnFocus?.disabled
+    ? document.querySelector("#sessions [data-refresh]") : editor.returnFocus;
+  returnFocus?.focus();
+}
+
+function changeSessionSettings(field) {
+  const editor = sessionSettingsEditor;
+  if (!editor || editor.loading || editor.saving) return;
+  if (field === "context" && (editor.privateChat
+    || (sessionSettingsInput("context").value === "catch-up" && !editor.contextAvailable))) {
+    renderSessionSettingsEditor();
+    return;
+  }
+  changeSessionSettingsField(sessionSettingsInput, editor.settings, editor.models, field, editor.base.turn_settings);
+  renderSessionSettingsEditor();
+}
+
+async function saveSessionSettings(event) {
+  event.preventDefault();
+  const editor = sessionSettingsEditor;
+  if (!editor || editor.loading || editor.saving || !editor.action) return;
+  const action = editor.action;
+  editor.action = null;
+  editor.session.actions.configure = null;
+  if (editor.returnFocus) editor.returnFocus.disabled = true;
+  editor.saving = true;
+  renderSessionSettingsEditor();
+  setStatus("正在保存会话配置…");
+  let result;
+  try {
+    result = await api("/api/v1/sessions/configure", { method: "POST", headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(actionPayload(action, { sessionSettings: structuredClone(editor.settings) })) });
+  } catch (error) {
+    editor.error = `${error.message} 请关闭表单，刷新 Sessions 后重新打开配置。`;
+    setStatus(editor.error, true);
+    editor.saving = false;
+    renderSessionSettingsEditor();
+    return;
+  }
+  editor.saving = false;
+  closeSessionSettingsEditor();
+  if (await refresh("sessions")) {
+    setStatus(result?.message || "会话配置已保存。");
+    if (!sessionSettingsEditor && state.tab === "sessions") {
+      const row = rowByIdentity("#sessions-body", "bindingId", editor.session.bindingId);
+      Array.from(row?.querySelectorAll("button") || []).find((button) => button.textContent === "配置")?.focus();
+    }
+  } else {
+    setStatus("会话配置已保存，但 Sessions 列表刷新失败，请手动刷新。", true);
+  }
+}
+
 let defaultsEditor = null;
 let defaultsProjects = [];
 let defaultsOffset = 0;
@@ -1533,20 +1657,7 @@ function renderDefaultSettings() {
   if (!editor) return;
   const settings = editor.settings;
   const turn = settings.turn_settings;
-  const model = editor.models.find((item) => item.id === turn?.model_id);
-  scheduleSelectOptions(defaultsInput("model"), [["", "继承 Codex"],
-    ...editor.models.map((item) => [item.id, item.display_name])], turn?.model_id);
-  scheduleSelectOptions(defaultsInput("effort"), (model?.efforts || []).map((item) => [item.id, item.id]), turn?.effort_id);
-  scheduleSelectOptions(defaultsInput("tier"), (model?.service_tiers || []).map((item) => [item.id, item.name || item.id]), turn?.service_tier_id);
-  defaultsInput("effort").disabled = !model;
-  defaultsInput("tier").disabled = !model;
-  defaultsInput("context").value = settings.message_context_mode;
-  for (const option of defaultsInput("context").querySelectorAll("option")) {
-    option.disabled = option.value === "catch-up" && editor.contextAvailable === false;
-  }
-  defaultsInput("reactions").checked = settings.reaction_pulse_enabled;
-  defaultsInput("progress").checked = settings.progress_card_enabled;
-  defaultsInput("completion-mention").checked = settings.completion_mention_enabled;
+  const model = renderSessionSettingsFields(defaultsInput, settings, editor.models, editor.contextAvailable);
   const notes = [editor.loading ? "正在读取配置…" : "", editor.sourceNote, editor.error, editor.catalogError];
   if (turn && !model) notes.push("已保存的模型当前不可用，选择保持不变；可显式选择其他模型。");
   if (editor.contextAvailable === false) notes.push("单聊不支持补齐未读上下文，请使用当前消息。");
@@ -1659,18 +1770,7 @@ function changeDefaultSettings(field) {
   const editor = defaultsEditor;
   if (!editor) return;
   editor.touched = true;
-  const settings = editor.settings;
-  if (field === "model") {
-    const selected = editor.models.find((item) => item.id === defaultsInput("model").value);
-    if (!defaultsInput("model").value) settings.turn_settings = null;
-    else if (selected) settings.turn_settings = { model_id: selected.id,
-      effort_id: selected.default_effort_id, service_tier_id: selected.default_service_tier_id };
-  } else if (field === "effort" && settings.turn_settings) settings.turn_settings.effort_id = defaultsInput("effort").value;
-  else if (field === "tier" && settings.turn_settings) settings.turn_settings.service_tier_id = defaultsInput("tier").value;
-  else if (field === "context") settings.message_context_mode = defaultsInput("context").value;
-  else if (field === "reactions") settings.reaction_pulse_enabled = defaultsInput("reactions").checked;
-  else if (field === "progress") settings.progress_card_enabled = defaultsInput("progress").checked;
-  else if (field === "completion-mention") settings.completion_mention_enabled = defaultsInput("completion-mention").checked;
+  changeSessionSettingsField(defaultsInput, editor.settings, editor.models, field);
   renderDefaultSettings();
 }
 
@@ -2038,25 +2138,47 @@ function scheduleSelectOptions(node, choices, selected) {
   node.value = selected || "";
 }
 
+function renderSessionSettingsFields(input, settings, models, contextAvailable) {
+  const turn = settings.turn_settings;
+  const model = models.find((item) => item.id === turn?.model_id);
+  scheduleSelectOptions(input("model"), [["", "继承 Codex"],
+    ...models.map((item) => [item.id, item.display_name])], turn?.model_id);
+  scheduleSelectOptions(input("effort"), (model?.efforts || []).map((item) => [item.id, item.id]), turn?.effort_id);
+  scheduleSelectOptions(input("tier"), (model?.service_tiers || []).map((item) => [item.id, item.name || item.id]), turn?.service_tier_id);
+  input("effort").disabled = !model;
+  input("tier").disabled = !model;
+  input("context").value = settings.message_context_mode;
+  for (const option of input("context").querySelectorAll("option")) {
+    option.disabled = option.value === "catch-up" && contextAvailable === false;
+  }
+  input("reactions").checked = settings.reaction_pulse_enabled;
+  input("progress").checked = settings.progress_card_enabled;
+  input("completion-mention").checked = settings.completion_mention_enabled;
+  return model;
+}
+
+function changeSessionSettingsField(input, settings, models, field, baseTurn = null) {
+  if (field === "model") {
+    const id = input("model").value;
+    const selected = models.find((item) => item.id === id);
+    if (!id) settings.turn_settings = null;
+    else if (selected) settings.turn_settings = { model_id: selected.id,
+      effort_id: selected.default_effort_id, service_tier_id: selected.default_service_tier_id };
+    else if (id === baseTurn?.model_id) settings.turn_settings = structuredClone(baseTurn);
+  } else if (field === "effort" && settings.turn_settings) settings.turn_settings.effort_id = input("effort").value;
+  else if (field === "tier" && settings.turn_settings) settings.turn_settings.service_tier_id = input("tier").value;
+  else if (field === "context") settings.message_context_mode = input("context").value;
+  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;
+}
+
 function renderScheduleSessionSettings() {
   const editor = scheduleEditor;
   if (!editor) return;
   const settings = editor.sessionDraft;
   const current = settings.turn_settings;
-  const model = editor.models.find((item) => item.id === current?.model_id);
-  scheduleSelectOptions(scheduleInput("model"), [["", "继承 Codex"],
-    ...editor.models.map((item) => [item.id, item.display_name])], current?.model_id);
-  scheduleSelectOptions(scheduleInput("effort"), (model?.efforts || []).map((item) => [item.id, item.id]), current?.effort_id);
-  scheduleSelectOptions(scheduleInput("tier"), (model?.service_tiers || []).map((item) => [item.id, item.name || item.id]), current?.service_tier_id);
-  scheduleInput("effort").disabled = !model;
-  scheduleInput("tier").disabled = !model;
-  scheduleInput("context").value = settings.message_context_mode;
-  for (const option of scheduleInput("context").querySelectorAll("option")) {
-    option.disabled = option.value === "catch-up" && editor.contextAvailable === false;
-  }
-  scheduleInput("reactions").checked = settings.reaction_pulse_enabled;
-  scheduleInput("progress").checked = settings.progress_card_enabled;
-  scheduleInput("completion-mention").checked = settings.completion_mention_enabled;
+  const model = renderSessionSettingsFields(scheduleInput, settings, editor.models, editor.contextAvailable);
   scheduleInput("session-summary").textContent = scheduleSessionSummary(settings);
   const notes = [];
   if (editor.catalogMessage) notes.push(editor.catalogMessage);
@@ -2106,23 +2228,8 @@ async function loadScheduleSessionOptions() {
 function changeScheduleSessionSettings(field) {
   const editor = scheduleEditor;
   if (!editor) return;
-  const settings = editor.sessionDraft;
   editor.settingsTouched = true;
-  if (field === "model") {
-    const id = scheduleInput("model").value;
-    const selected = editor.models.find((item) => item.id === id);
-    if (!id) settings.turn_settings = null;
-    else if (selected) settings.turn_settings = { model_id: selected.id,
-      effort_id: selected.default_effort_id, service_tier_id: selected.default_service_tier_id };
-    else if (id === editor.sessionBase.turn_settings?.model_id) settings.turn_settings = structuredClone(editor.sessionBase.turn_settings);
-  } else if (field === "effort" && settings.turn_settings) {
-    settings.turn_settings.effort_id = scheduleInput("effort").value;
-  } else if (field === "tier" && settings.turn_settings) {
-    settings.turn_settings.service_tier_id = scheduleInput("tier").value;
-  } else if (field === "context") settings.message_context_mode = scheduleInput("context").value;
-  else if (field === "reactions") settings.reaction_pulse_enabled = scheduleInput("reactions").checked;
-  else if (field === "progress") settings.progress_card_enabled = scheduleInput("progress").checked;
-  else if (field === "completion-mention") settings.completion_mention_enabled = scheduleInput("completion-mention").checked;
+  changeSessionSettingsField(scheduleInput, editor.sessionDraft, editor.models, field, editor.sessionBase.turn_settings);
   invalidateSchedulePreview();
   renderScheduleSessionSettings();
 }
@@ -2743,6 +2850,16 @@ document.querySelector("#projects-next").addEventListener("click", () => refresh
 document.querySelector("#sessions-previous").addEventListener("click", () => moveSessionPage("previous"));
 document.querySelector("#sessions-next").addEventListener("click", () => moveSessionPage("next"));
 document.querySelector("#sides-next").addEventListener("click", () => refresh("side-topics", state.sideCursor));
+sessionSettingsInput("cancel").addEventListener("click", closeSessionSettingsEditor);
+sessionSettingsInput("close").addEventListener("click", closeSessionSettingsEditor);
+sessionSettingsInput("drawer").addEventListener("cancel", (event) => {
+  event.preventDefault();
+  closeSessionSettingsEditor();
+});
+sessionSettingsInput("editor").addEventListener("submit", saveSessionSettings);
+for (const field of ["model", "effort", "tier", "context", "reactions", "progress", "completion-mention"]) {
+  sessionSettingsInput(field).addEventListener("change", () => changeSessionSettings(field));
+}
 defaultsInput("new").addEventListener("click", () => openDefaultEditor(defaultsTab));
 for (const kind of ["chat", "group_name"]) {
   defaultsInput(`tab-${kind}`).addEventListener("click", () => selectDefaultTab(kind));

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/static/index.html

@@ -88,6 +88,34 @@
       </nav>
     </section>
 
+    <dialog id="session-settings-drawer" class="editor-drawer" aria-labelledby="session-settings-title" aria-describedby="session-settings-identity">
+      <form id="session-settings-editor" class="card-form drawer-form" hidden>
+        <div class="drawer-head"><div><p class="eyebrow">SESSION SETTINGS</p><h3 id="session-settings-title">配置 Session</h3></div><button id="session-settings-close" class="drawer-close" type="button" aria-label="关闭会话配置表单">×</button></div>
+        <div class="drawer-body">
+          <p id="session-settings-identity" class="meta-line"></p>
+          <p class="session-settings-help">只影响之后由 Netizen 启动的任务。选择继承 Codex 时，沿用 Codex 的原生配置。</p>
+          <fieldset id="session-settings-fields">
+            <h4>模型配置</h4>
+            <div class="schedule-form-grid">
+              <label>模型<select id="session-settings-model"><option value="">继承 Codex</option></select></label>
+              <label>推理强度<select id="session-settings-effort" disabled></select></label>
+              <label>速度<select id="session-settings-tier" disabled></select></label>
+              <label id="session-settings-context-field">消息上下文<select id="session-settings-context" aria-describedby="session-settings-context-note"><option value="current-only">当前消息</option><option value="catch-up">补齐未读上下文</option></select></label>
+            </div>
+            <p id="session-settings-context-note" class="session-settings-help"></p>
+            <h4>任务反馈</h4>
+            <div class="defaults-feedback">
+              <label><input id="session-settings-reactions" type="checkbox">表情反馈</label>
+              <label><input id="session-settings-progress" type="checkbox">进度卡片</label>
+              <label><input id="session-settings-completion-mention" type="checkbox">结束时 @ 提醒</label>
+            </div>
+          </fieldset>
+          <p id="session-settings-note" class="session-settings-help" role="status" aria-live="polite"></p>
+        </div>
+        <div class="drawer-footer"><button id="session-settings-cancel" class="drawer-cancel" type="button">取消</button><button id="session-settings-save" type="submit">保存</button></div>
+      </form>
+    </dialog>
+
     <section id="side-topics" class="panel" aria-labelledby="sides-heading" hidden>
       <div class="section-head">
         <div><p class="eyebrow">EPHEMERAL THREADS</p><h2 id="sides-heading">Side Topics</h2></div>

{netizen_cli-0.10.0 → netizen_cli-0.10.2}/netizen_cli/admin/transport.py

@@ -112,7 +112,6 @@ class _ClientDisconnected(Exception):
 class _Connection:
     writer: asyncio.StreamWriter
     accepted_at: float
-    task: asyncio.Task[None] | None = None
     handler_task: asyncio.Task[Response] | None = None
 
 
@@ -350,7 +349,6 @@ class AdminHttpTransport:
         task = self._owned_loop().create_task(
             self._serve_connection(connection, reader)
         )
-        connection.task = task
         self._track_task(task, self._connection_tasks)
 
     async def _serve_connection(
@@ -365,17 +363,15 @@ class AdminHttpTransport:
             h11.SERVER,
             max_incomplete_event_size=MAX_HEADER_SECTION_BYTES,
         )
-        pending = b""
         first_request = True
 
         try:
             while not self._closing:
                 request_id = secrets.token_hex(16)
                 try:
-                    request, pending = await self._read_request(
+                    request = await self._read_request(
                         reader=reader,
                         parser=parser,
-                        pending=pending,
                         first_request=first_request,
                         accepted_at=connection.accepted_at,
                         peer=peer,
@@ -486,7 +482,6 @@ class AdminHttpTransport:
                     parser.start_next_cycle()
                 except h11.LocalProtocolError:
                     return
-                pending = b""
         except asyncio.CancelledError:
             handler = connection.handler_task
             if handler is not None and not handler.done():
@@ -505,19 +500,17 @@ class AdminHttpTransport:
         *,
         reader: asyncio.StreamReader,
         parser: h11.Connection,
-        pending: bytes,
         first_request: bool,
         accepted_at: float,
         peer: Address,
         sockname: Address,
         request_id: str,
-    ) -> tuple[Request, bytes]:
+    ) -> Request:
         loop = self._owned_loop()
+        pending = b""
 
         if first_request:
             header_deadline = accepted_at + HEADER_TIMEOUT_SECONDS
-        elif pending:
-            header_deadline = loop.time() + HEADER_TIMEOUT_SECONDS
         else:
             try:
                 first_byte = await asyncio.wait_for(
@@ -578,7 +571,7 @@ class AdminHttpTransport:
             # entered are pipelining, including a same-write second request.
             raise _RequestRejected(400, "pipelined_request")
 
-        request = Request(
+        return Request(
             method=event.method,
             target=event.target,
             http_version=event.http_version,
@@ -588,7 +581,6 @@ class AdminHttpTransport:
             sockname=sockname,
             request_id=request_id,
         )
-        return request, b""
 
     async def _read_header_section(
         self,