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

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

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

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

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/admin/static/admin.css

@@ -200,11 +200,32 @@ button:disabled { cursor: default; opacity: .48; }
 .service-restart p { line-height: 1.6; }
 #updates a { color: var(--blue); }
 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; }
-.login-card label { display: grid; gap: 7px; }
-.login-card input { margin-bottom: 14px; }
-.login-card button { width: 100%; border: 0; border-radius: 8px; padding: 10px; background: var(--blue); color: white; }
+.login-body { min-height: 100vh; min-height: 100svh; display: grid; place-items: center; padding: clamp(12px, 3vw, 24px); }
+.login-card { width: min(420px, 100%); min-width: 0; margin: 0; padding: clamp(20px, 5vw, 28px); border: 1px solid var(--line); border-radius: 14px; background: var(--paper); box-shadow: 0 8px 28px rgb(23 39 68 / 6%); font-size: 14px; line-height: 1.6; }
+.login-heading h1 { font-size: 28px; line-height: 1.2; }
+.login-heading p { margin: 8px 0 0; color: var(--muted); font-size: 13px; }
+.login-instance { margin: 20px 0; padding: 10px 12px; border-radius: 8px; background: var(--wash); }
+.login-instance > span { color: var(--muted); font-size: 12px; }
+.login-instance .instance-root { margin: 3px 0 0; line-height: 1.5; }
+.login-card .login-button { display: inline-flex; align-items: center; justify-content: center; gap: 8px; min-height: 44px; border: 1px solid var(--line); border-radius: 8px; padding: 10px 14px; background: var(--paper); color: var(--ink); font-size: 14px; line-height: 22px; font-weight: 500; text-align: center; text-decoration: none; }
+.login-card .login-primary { width: 100%; border-color: var(--blue); background: var(--blue); color: white; }
+.login-card .login-cancel { border-color: transparent; background: transparent; color: var(--muted); }
+.login-card .login-secondary:hover:not(:disabled), .login-card .login-cancel:hover:not(:disabled) { background: var(--wash); }
+.login-card .login-button:focus-visible { outline: 3px solid #8cb4ff; outline-offset: 2px; }
+.login-scan { margin-top: 20px; }
+.login-scan:has(.login-qr[hidden]) { display: none; }
+.login-divider { display: flex; align-items: center; gap: 12px; margin: 0; color: var(--muted); font-size: 12px; }
+.login-divider::before, .login-divider::after { content: ""; flex: 1; border-top: 1px solid var(--line); }
+.login-qr { display: block; width: min(208px, 100%); height: auto; margin: 12px auto 0; }
+.login-user-code { display: flex; align-items: center; justify-content: center; flex-wrap: wrap; gap: 8px; margin: 12px 0 0; color: var(--muted); font-size: 12px; }
+#login-code { min-width: 0; border-radius: 6px; padding: 4px 8px; background: var(--wash); color: var(--ink); font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 16px; letter-spacing: .04em; overflow-wrap: anywhere; }
+.login-deadline { margin: 6px 0 0; color: var(--muted); font-size: 12px; text-align: center; }
+.login-deadline:empty { display: none; }
+.login-card .status { margin: 16px 0 0; font-size: 13px; text-align: center; overflow-wrap: anywhere; }
+.login-actions { display: flex; justify-content: center; flex-wrap: wrap; gap: 8px; margin-top: 16px; }
+.login-actions:not(:has(> :not([hidden]))) { display: none; }
+#login-retry { margin-top: 16px; }
+.login-safety { margin: 20px 0 0; border-top: 1px solid var(--line); padding-top: 14px; color: var(--muted); font-size: 12px; }
 @media (max-width: 650px) {
   .topbar { padding: 12px 18px; }
   .tabs { overflow-x: auto; padding: 10px 14px; }
@@ -428,13 +449,9 @@ body.schedule-detail-open { overflow: hidden; }
 .identity-panel { max-width: 480px; border: 1px solid var(--line); border-radius: 14px; margin-bottom: 24px; padding: 20px; color: var(--ink); }
 .identity-panel h3 { margin: 0; }
 .identity-panel > p { margin: 20px 0; }
-.identity-panel-actions, .login-actions { display: flex; justify-content: flex-end; flex-wrap: wrap; gap: 10px; }
+.identity-panel-actions { display: flex; justify-content: flex-end; flex-wrap: wrap; gap: 10px; }
 #admin-selector { min-height: 48px; margin: 18px 0; }
 #admin-user-selection { margin-top: 20px; }
-.login-qr { display: block; width: min(240px, 100%); height: auto; margin: 18px auto; }
-.login-link { display: inline-block; margin-bottom: 14px; }
-.login-actions { justify-content: flex-start; margin: 18px 0; }
-#login-code { overflow-wrap: anywhere; }
 @media (max-width: 600px) {
   .topbar { align-items: flex-start; gap: 12px; flex-wrap: wrap; }
   .topbar-brand { flex-basis: 100%; }

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/admin/static/admin.js

@@ -2565,12 +2565,13 @@ function renderDefaultSettings() {
   const model = renderSessionSettingsFields(defaultsInput, settings, editor.models, editor.contextAvailable);
   defaultsInput("context-field").hidden = editor.kind === "chat"
     && chatTarget("defaults").kind() === "p2p" && settings.message_context_mode === "current-only";
+  renderDefaultWorkspace();
   const notes = [editor.loading ? "正在读取配置…" : "", editor.sourceNote, editor.error, editor.catalogError];
   if (turn && !model) notes.push("已保存的模型当前不可用，选择保持不变；可显式选择其他模型。");
   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;
+  defaultsInput("save").disabled = defaultsBusy || editor.loading || !editor.action || !defaultWorkspaceAvailable();
   defaultsInput("save").textContent = defaultsBusy ? "保存中…" : "保存";
   defaultsInput("editor").setAttribute("aria-busy", String(defaultsBusy || editor.loading));
 }
@@ -2595,6 +2596,77 @@ function renderDefaultProject(project) {
   ])], project);
 }
 
+function defaultWorkspaceAvailable() {
+  const editor = defaultsEditor;
+  if (!editor || editor.workspace.mode === "project") return true;
+  const options = editor.workspaceOptions;
+  if (!options?.isGit || options.projectAlias !== defaultsInput("project").value) return false;
+  return editor.workspace.mode === "new"
+    || options.items.some((item) => item.id === editor.workspace.worktree_id);
+}
+
+function renderDefaultWorkspace() {
+  const editor = defaultsEditor;
+  const workspace = editor.workspace;
+  const options = editor.workspaceOptions;
+  const available = options?.isGit && options.projectAlias === defaultsInput("project").value;
+  defaultsInput("workspace").value = workspace.mode;
+  for (const option of defaultsInput("workspace").querySelectorAll("option")) {
+    option.disabled = option.value !== "project" && (!available || option.value === "existing" && !options.items.length);
+  }
+  defaultsInput("worktree-field").hidden = workspace.mode !== "existing";
+  defaultsInput("workspace-ref-field").hidden = workspace.mode !== "new";
+  scheduleSelectOptions(defaultsInput("worktree"), [["", "选择受管 Worktree"],
+    ...(available ? options.items : []).map((item) => [item.id, `${item.cwd} · ${item.branch || "detached"} · ${item.id}`])],
+  workspace.worktree_id || "");
+  defaultsInput("worktree").required = workspace.mode === "existing";
+  defaultsInput("workspace-ref").value = workspace.ref || "";
+  defaultsInput("workspace-refs").replaceChildren();
+  for (const branch of options?.branches || []) {
+    const option = document.createElement("option");
+    option.value = branch.ref;
+    option.textContent = branch.name;
+    defaultsInput("workspace-refs").append(option);
+  }
+  const notes = [];
+  if (editor.workspaceError) notes.push(editor.workspaceError);
+  else if (options?.isGit === false) notes.push("该 Project 不是 Git 仓库，只支持项目目录。");
+  else if (!defaultsInput("project").value) notes.push("先选择 Project，再选择工作区策略。");
+  if (workspace.mode === "existing") {
+    notes.push("新会话共享所选 Worktree 的文件和分支；删除或失效后保留此配置，自动创建会话时明确报错。");
+    if (!editor.loading && !defaultWorkspaceAvailable()) notes.push("所选 Worktree 当前不可用，请重新选择；不会切回项目目录。");
+  } else if (workspace.mode === "new") {
+    notes.push("每次自动创建新会话时创建一次 detached Worktree；后续消息复用。留空使用创建时 Project 的 HEAD，保存配置不创建目录。");
+    if (!editor.loading && !available) notes.push("当前无法使用新建 Worktree 策略，请检查 Project。");
+  } else notes.push("新会话使用 Project 的项目目录。");
+  defaultsInput("workspace-help").textContent = notes.join(" ");
+  defaultsInput("workspace-help").classList.toggle("error", !editor.loading && !defaultWorkspaceAvailable());
+}
+
+async function changeDefaultProject() {
+  const editor = defaultsEditor;
+  if (!editor || defaultsBusy) return;
+  editor.workspace = { mode: "project" };
+  editor.workspaceOptions = null;
+  editor.workspaceError = "";
+  await loadDefaultOptions();
+}
+
+function changeDefaultWorkspace(field) {
+  const editor = defaultsEditor;
+  if (!editor || editor.loading || defaultsBusy) return;
+  if (field === "workspace") {
+    const mode = defaultsInput("workspace").value;
+    editor.workspace = mode === "existing" ? { mode, worktree_id: "" } : { mode };
+  } else if (field === "worktree") {
+    editor.workspace = { mode: "existing", worktree_id: defaultsInput(field).value };
+  } else {
+    const ref = defaultsInput(field).value.trim();
+    editor.workspace = { mode: "new", ...(ref ? { ref } : {}) };
+  }
+  renderDefaultSettings();
+}
+
 async function loadDefaultOptions(resolveChat = false) {
   const editor = defaultsEditor;
   if (!editor) return;
@@ -2603,6 +2675,8 @@ async function loadDefaultOptions(resolveChat = false) {
   const chatId = editor.kind === "chat" ? defaultsInput("chat").value.trim() : "";
   editor.loading = true;
   editor.error = "";
+  editor.workspaceOptions = null;
+  editor.workspaceError = "";
   renderDefaultSettings();
   try {
     let view = null;
@@ -2614,10 +2688,12 @@ async function loadDefaultOptions(resolveChat = false) {
       const effective = view.exact || view.effective;
       if (effective) {
         editor.settings = structuredClone(effective.session_settings);
+        editor.workspace = structuredClone(effective.workspace);
         renderDefaultProject(effective.project);
         editor.touched = true;
       } else {
         editor.settings = defaultScheduleSessionSettings();
+        editor.workspace = { mode: "project" };
         renderDefaultProject("");
         editor.touched = false;
       }
@@ -2627,10 +2703,14 @@ async function loadDefaultOptions(resolveChat = false) {
     }
     const query = new URLSearchParams({ mode: "options" });
     if (chatId) query.set("chat_id", chatId);
+    const project = defaultsInput("project").value;
+    if (project) query.set("project", project);
     const data = await api(`/api/v1/defaults?${query}`);
     if (defaultsEditor !== editor || serial !== editor.serial) return;
     editor.models = data.models;
     editor.contextAvailable = data.context_mode_available;
+    editor.workspaceOptions = data.workspace_options || null;
+    editor.workspaceError = data.workspace_options_error || "";
     if (editor.kind === "chat") chatTarget("defaults").resolveKind(editor.contextAvailable);
     editor.catalogError = typeof data.model_catalog_error === "string"
       ? data.model_catalog_error : data.model_catalog_error?.message || "";
@@ -2657,6 +2737,7 @@ function openDefaultEditor(kind, record = null) {
     returnFocus: document.activeElement,
     settings: structuredClone(record?.session_settings || defaultScheduleSessionSettings()),
     models: [], serial: 0, loading: true, touched: false, contextAvailable: null,
+    workspace: structuredClone(record ? record.workspace : { mode: "project" }), workspaceOptions: null, workspaceError: "",
     sourceNote: record ? "修改已保存的配置，只影响之后创建的会话。" : "保存后，在没有当前会话的位置收到消息时生效。",
     error: "", catalogError: "", lockedTarget: Boolean(record) };
   defaultsInput("editor").hidden = false;
@@ -2701,7 +2782,7 @@ function defaultEditorValues() {
   if (!editor) return null;
   return { kind: editor.kind, project: defaultsInput("project").value,
     target: defaultsInput(editor.kind === "chat" ? "chat" : "keyword").value,
-    settings: sessionSettingsFingerprint(editor.settings) };
+    settings: sessionSettingsFingerprint(editor.settings), workspace: structuredClone(editor.workspace) };
 }
 
 function defaultEditorHasChanges() {
@@ -2752,7 +2833,7 @@ async function defaultMutation(mode, action, extra = {}) {
 async function saveDefault(event) {
   event.preventDefault();
   const editor = defaultsEditor;
-  if (!editor || editor.loading || !editor.action || defaultsBusy) return;
+  if (!editor || editor.loading || !editor.action || defaultsBusy || !defaultWorkspaceAvailable()) return;
   if (editor.kind === "chat") {
     editor.loading = true;
     renderDefaultSettings();
@@ -2765,7 +2846,10 @@ async function saveDefault(event) {
     if (defaultsEditor !== editor) return;
   }
   const definition = { kind: editor.kind, project: defaultsInput("project").value,
-    session_settings: structuredClone(editor.settings) };
+    session_settings: structuredClone(editor.settings), workspace: structuredClone(editor.workspace) };
+  if (editor.workspaceOptions?.projectAlias === definition.project) {
+    definition.expected_project_revision = editor.workspaceOptions.projectRevision;
+  }
   if (editor.kind === "chat") definition.chat_id = defaultsInput("chat").value.trim();
   else definition.keyword = defaultsInput("keyword").value.trim();
   const action = editor.action;
@@ -2828,7 +2912,7 @@ function defaultChatCell(row, rule) {
   row.append(td);
 }
 
-function defaultSettingsCell(row, settings) {
+function defaultSettingsCell(row, settings, workspace) {
   const td = document.createElement("td");
   const model = settings.turn_settings;
   const title = document.createElement("div");
@@ -2836,7 +2920,11 @@ function defaultSettingsCell(row, settings) {
   const detail = document.createElement("div");
   detail.className = "default-settings-detail";
   detail.textContent = scheduleSessionSummary(settings).split(" · ").slice(1).join(" · ");
-  td.append(title, detail);
+  const location = document.createElement("div");
+  location.className = "default-settings-detail";
+  location.textContent = workspace.mode === "existing" ? `指定 Worktree：${workspace.worktree_id}`
+    : workspace.mode === "new" ? `每个新会话创建 Worktree · ${workspace.ref || "创建时 Project HEAD"}` : "项目目录";
+  td.append(title, detail, location);
   row.append(td);
 }
 
@@ -2863,7 +2951,7 @@ async function loadDefaults(offset = defaultsOffset, returnFocus = null) {
         cell(row, rule.keyword);
       } else defaultChatCell(row, rule);
       cell(row, rule.project);
-      defaultSettingsCell(row, rule.session_settings);
+      defaultSettingsCell(row, rule.session_settings, rule.workspace);
       const actions = document.createElement("td");
       const buttons = document.createElement("div");
       buttons.className = "actions";
@@ -4418,6 +4506,11 @@ defaultsInput("drawer").addEventListener("cancel", (event) => {
 });
 defaultsInput("editor").addEventListener("submit", saveDefault);
 defaultsInput("chat").addEventListener("change", () => changeDefaultChat());
+defaultsInput("project").addEventListener("change", changeDefaultProject);
+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"]) {
   defaultsInput(field).addEventListener("change", () => changeDefaultSettings(field));
 }

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/admin/static/index.html

@@ -271,6 +271,12 @@
             <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 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>
+            <div class="schedule-form-grid">
               <label>模型<select id="defaults-model"><option value="">继承 Codex</option></select></label>
               <label>推理强度<select id="defaults-effort" disabled></select></label>
               <label>速度<select id="defaults-tier" disabled></select></label>

netizen_cli-0.13.2/netizen_cli/admin/static/login.html

@@ -0,0 +1,41 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Netizen Admin 登录</title>
+  <link rel="stylesheet" href="/static/admin.css">
+  <script src="/static/login.js" defer></script>
+</head>
+<body class="login-body">
+  <main class="login-card">
+    <header class="login-heading">
+      <h1>Netizen Admin</h1>
+      <p>使用已获授权的飞书管理员账号登录</p>
+    </header>
+    <div class="login-instance">
+      <span>当前实例</span>
+      <p class="instance-root">__NETIZEN_INSTANCE_ROOT__</p>
+    </div>
+    <input id="login-nonce" type="hidden" value="__NETIZEN_LOGIN_NONCE__">
+    <input id="login-next" type="hidden" value="__NETIZEN_LOGIN_NEXT__">
+    <div id="login-authorization" hidden>
+      <a id="login-link" class="login-button login-primary" target="_blank" rel="noopener noreferrer">打开飞书授权页<span aria-hidden="true">↗</span></a>
+      <div class="login-scan">
+        <p class="login-divider">或使用飞书扫码</p>
+        <img id="login-qr" class="login-qr" alt="使用飞书扫描二维码完成本次登录" hidden>
+      </div>
+      <p class="login-user-code"><span>核对用户码</span><strong id="login-code"></strong></p>
+      <p id="login-deadline" class="login-deadline"></p>
+    </div>
+    <p id="login-status" class="status" role="status" aria-live="polite">正在检查登录状态…</p>
+    <div class="login-actions">
+      <button id="login-start" class="login-button login-primary" disabled>使用飞书登录</button>
+      <button id="login-check" class="login-button login-secondary" hidden>检查登录结果</button>
+      <button id="login-cancel" class="login-button login-cancel" hidden>取消登录</button>
+    </div>
+    <a id="login-retry" class="login-button login-primary" href="/login" hidden>重新开始登录</a>
+    <p class="login-safety">只确认你为上述实例主动发起的登录，不要替他人确认登录请求。</p>
+  </main>
+</body>
+</html>

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/admin/web.py

@@ -764,7 +764,7 @@ class AdminWebApplication:
         allowed = {
             "list": {"mode", "kind", "offset", "limit"},
             "view": {"mode", "chat_id"},
-            "options": {"mode", "chat_id"},
+            "options": {"mode", "chat_id", "project", "expected_project_revision"},
         }
         if mode not in allowed:
             raise AdminWebError(400, "invalid_query", "默认配置查询类型无效。")
@@ -773,9 +773,9 @@ class AdminWebApplication:
         for key in allowed[mode] - {"mode"}:
             value = _optional_text_query(context.query, key)
             if value is not None:
-                if key in {"offset", "limit"}:
+                if key in {"offset", "limit", "expected_project_revision"}:
                     if not value.isascii() or not value.isdigit():
-                        raise AdminWebError(400, "invalid_query", "分页参数无效。")
+                        raise AdminWebError(400, "invalid_query", "分页或 Project 版本参数无效。")
                     request[key] = int(value)
                 else:
                     request[key] = value
@@ -817,7 +817,7 @@ class AdminWebApplication:
         grant = self._redeem_parsed(context, payload, "defaults.save", target, expected_resource=target.resource)
         definition = payload.get("definition")
         if not isinstance(definition, dict) or set(definition) - {
-            "kind", "chat_id", "keyword", "project", "session_settings",
+            "kind", "chat_id", "keyword", "project", "expected_project_revision", "workspace", "session_settings",
         }:
             raise AdminWebError(400, "invalid_input", "默认配置字段无效。")
         request: dict[str, object] = {**definition, "mode": "save", "expected_revision": None}

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/bindings.py

@@ -39,7 +39,7 @@ from .worktrees.models import WorktreeRecord
 from .worktrees.store import WorktreeStore, create_schema as create_worktree_schema
 
 
-SCHEMA_VERSION = 15
+SCHEMA_VERSION = 16
 
 # Includes the running query and all submitted queries waiting for the reader.
 _ADMIN_QUERY_CAPACITY = 32
@@ -466,7 +466,7 @@ def _require_current_schema(connection: sqlite3.Connection) -> None:
     _require_project_metadata_schema(connection)
     require_schema(connection)
     require_defaults_schema(connection)
-    from .migrations.v15 import validate
+    from .migrations.v16 import validate
     validate(connection)
 
 

{netizen_cli-0.13.1 → netizen_cli-0.13.2}/netizen_cli/cards/controls.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import json
 import re
-from collections.abc import Callable, Mapping
+from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass
 from datetime import datetime
 from typing import Any
@@ -350,7 +350,7 @@ def _new_binding_form(
         ),
         None,
     )
-    elements = [_new_form_section("项目", [
+    elements = [_form_section("项目", [
         _static_select(
             name="new_project",
             placeholder="选择项目",
@@ -393,31 +393,15 @@ def _new_binding_form(
             model_value_encoder=_new_model_reference,
             inherit_initial_when_unset=False,
         )
-    _restore_new_settings_draft(model_fields, settings_draft)
-    model_elements = [model_fields[1]]
-    if len(model_fields) > 2:
-        model_elements.append(_new_form_columns(
-            (1, model_fields[2:4]), (1, model_fields[4:6]),
-        ))
-    elements.append(_new_form_section("模型配置", model_elements))
-    if allow_context_mode:
-        context = _context_mode_form_elements(prefix="new", initial_mode=message_context_mode)
-        context[-1] = _form_hint(
-            "机器人始终只响应 @。选择“自动带上”会把两次 @ 之间未 @ 机器人的群聊消息交给 Codex。"
-        )
-        _restore_new_settings_draft(context, settings_draft)
-        elements.append(_new_form_section("消息上下文", context))
-    feedback = _task_feedback_form_elements(prefix="new", initial=task_feedback)
-    _restore_new_settings_draft(feedback, settings_draft)
-    feedback_hints = (
-        "执行时闪烁；关闭仍保留状态表情。部分移动端会显示为消息。",
-        "展示执行状态与清单，结束后自动折叠。",
-        "完成或失败时 @ 发起人；主动停止、定时自动首轮不提醒。",
+    context = (
+        _context_mode_form_elements(prefix="new", initial_mode=message_context_mode)
+        if allow_context_mode else []
     )
-    elements.append(_new_form_section("任务反馈", [
-        _new_form_columns((3, [label, _form_hint(hint)]), (1, [select]))
-        for label, select, hint in zip(feedback[::3], feedback[1::3], feedback_hints, strict=True)
-    ]))
+    feedback = _task_feedback_form_elements(prefix="new", initial=task_feedback)
+    _restore_settings_draft([*model_fields, *context, *feedback], settings_draft)
+    elements.extend(_session_settings_sections(
+        model_fields=model_fields, context_fields=context, feedback_fields=feedback,
+    ))
     if allow_workspace_selection:
         workspace_elements = [
             _form_hint("使用上方选择的项目加载目录选项；不会创建会话。切换项目后请重新加载。"),
@@ -434,7 +418,7 @@ def _new_binding_form(
             ))
         if workspace_options is not None and workspace_options.get("isGit") is True:
             workspace_elements.extend(_new_workspace_elements(workspace_options))
-        elements.append(_new_form_section("工作区", workspace_elements))
+        elements.append(_form_section("工作区", workspace_elements))
     elements.append(
         _form_submit_button(name="new_binding_submit_v6", label="新建会话")
     )
@@ -446,7 +430,7 @@ def _new_binding_form(
     }
 
 
-def _restore_new_settings_draft(
+def _restore_settings_draft(
     elements: list[dict[str, Any]], draft: Mapping[str, str] | None,
 ) -> None:
     """Retain this form submission only; never silently replace an unavailable choice."""
@@ -461,8 +445,8 @@ def _restore_new_settings_draft(
         element["initial_option"] = value
 
 
-def _new_form_columns(*columns: tuple[int, list[dict[str, Any]]]) -> dict[str, Any]:
-    """Arrange existing /new controls without changing their submitted values."""
+def _form_columns(*columns: tuple[int, list[dict[str, Any]]]) -> dict[str, Any]:
+    """Arrange existing controls without changing their submitted values."""
     rendered = []
     for weight, elements in columns:
         styled = []
@@ -482,8 +466,41 @@ def _new_form_columns(*columns: tuple[int, list[dict[str, Any]]]) -> dict[str, A
     }
 
 
-def _new_form_section(title: str, elements: list[dict[str, Any]]) -> dict[str, Any]:
-    return _new_form_columns((1, [{"tag": "markdown", "content": f"**{title}**"}, *elements]))
+def _form_section(title: str, elements: list[dict[str, Any]]) -> dict[str, Any]:
+    return _form_columns((1, [{"tag": "markdown", "content": f"**{title}**"}, *elements]))
+
+
+def _session_settings_sections(
+    *,
+    model_fields: list[dict[str, Any]],
+    context_fields: list[dict[str, Any]],
+    feedback_fields: list[dict[str, Any]],
+    model_notices: Sequence[dict[str, Any]] = (),
+) -> list[dict[str, Any]]:
+    """Share presentation while each caller owns field values and validation."""
+    model_elements = [*model_notices, model_fields[1]]
+    if len(model_fields) > 2:
+        model_elements.append(_form_columns(
+            (1, model_fields[2:4]), (1, model_fields[4:6]),
+        ))
+    sections = [_form_section("模型配置", model_elements)]
+    if context_fields:
+        sections.append(_form_section("消息上下文", [
+            *context_fields[:-1],
+            _form_hint("机器人始终只响应 @。选择“自动带上”会把两次 @ 之间未 @ 机器人的群聊消息交给 Codex。"),
+        ]))
+    feedback_hints = (
+        "执行时闪烁；关闭仍保留状态表情。部分移动端会显示为消息。",
+        "展示执行状态与清单，结束后自动折叠。",
+        "完成或失败时 @ 发起人；主动停止、定时自动首轮不提醒。",
+    )
+    sections.append(_form_section("任务反馈", [
+        _form_columns((3, [label, _form_hint(hint)]), (1, [select]))
+        for label, select, hint in zip(
+            feedback_fields[::3], feedback_fields[1::3], feedback_hints, strict=True,
+        )
+    ]))
+    return sections
 
 
 def _workspace_reference(options: Mapping[str, Any], choice: str) -> str:
@@ -567,38 +584,31 @@ def _binding_config_form(
             model_id=model_id,
         )
 
-    elements: list[dict[str, Any]] = []
     if catalog is None:
-        elements.extend(
-            [
-                _form_label("Model"),
-                _static_select(
-                    name="config_model",
-                    placeholder="选择 Model 来源",
-                    options=(("继承 Codex", model_reference(None)),),
-                    initial_option=model_reference(None),
-                ),
-            ]
-        )
+        model_fields = [
+            _form_label("Model"),
+            _static_select(
+                name="config_model",
+                placeholder="选择 Model 来源",
+                options=(("继承 Codex", model_reference(None)),),
+                initial_option=model_reference(None),
+            ),
+        ]
     else:
-        elements.extend(
-            _model_settings_form_elements(
-                prefix="config",
-                catalog=catalog,
-                turn_settings=turn_settings,
-                model_value_encoder=model_reference,
-                inherit_initial_when_unset=True,
-            )
-        )
-    if allow_context_mode:
-        elements.extend(
-            _context_mode_form_elements(
-                prefix="config",
-                initial_mode=message_context_mode,
-            )
+        model_fields = _model_settings_form_elements(
+            prefix="config",
+            catalog=catalog,
+            turn_settings=turn_settings,
+            model_value_encoder=model_reference,
+            inherit_initial_when_unset=True,
         )
-    elements.extend(
-        _task_feedback_form_elements(prefix="config", initial=task_feedback)
+    elements = _session_settings_sections(
+        model_fields=model_fields,
+        context_fields=(
+            _context_mode_form_elements(prefix="config", initial_mode=message_context_mode)
+            if allow_context_mode else []
+        ),
+        feedback_fields=_task_feedback_form_elements(prefix="config", initial=task_feedback),
     )
     elements.append(
         _form_submit_button(
@@ -609,6 +619,7 @@ def _binding_config_form(
     return {
         "tag": "form",
         "name": "binding_config_v6",
+        "vertical_spacing": "12px",
         "elements": elements,
     }
 
@@ -778,6 +789,8 @@ def session_settings_form_elements(
     catalog: ModelCatalog | None,
     catalog_error: str | None = None,
     allow_context_mode: bool,
+    grouped: bool = False,
+    settings_draft: Mapping[str, str] | None = None,
 ) -> list[dict[str, Any]]:
     """Use ordinary controls while preserving unavailable explicit intent."""
     usable_catalog = catalog
@@ -787,34 +800,43 @@ def session_settings_form_elements(
         except ValueError:
             usable_catalog = None
             catalog_error = "已有 Model / Effort / Speed 暂不可用，当前选择完整保留。"
-    elements: list[dict[str, Any]] = []
+    model_notices: list[dict[str, Any]] = []
     if usable_catalog is not None:
-        elements.extend(_model_settings_form_elements(
+        model_fields = _model_settings_form_elements(
             prefix=prefix, catalog=usable_catalog, turn_settings=settings.turn_settings,
             model_value_encoder=_new_model_reference, inherit_initial_when_unset=True,
-        ))
+        )
     else:
-        elements.append(_notice(catalog_error or "模型目录暂不可用；可以保留原配置或明确选择继承 Codex。"))
+        model_notices.append(_notice(catalog_error or "模型目录暂不可用；可以保留原配置或明确选择继承 Codex。"))
         options = [("继承 Codex", _new_model_reference(None))]
         turn = settings.turn_settings
         if turn is not None:
             options.append(("保留已有显式配置", _new_model_reference(turn.model_id)))
-        elements.extend([
+        model_fields = [
             _form_label("Model"),
             _static_select(name=f"{prefix}_model", placeholder="选择 Model 来源", options=tuple(options),
                 initial_option=_new_model_reference(turn.model_id if turn else None)),
-        ])
+        ]
         if turn is not None:
             for field, label, value in (("effort", "Effort", turn.effort_id), ("speed", "Speed", turn.service_tier_id)):
-                elements.extend([
+                model_fields.extend([
                     _form_label(label),
                     _static_select(name=f"{prefix}_{field}", placeholder=label,
                         options=((value, value),), initial_option=value),
                 ])
-    if allow_context_mode:
-        elements.extend(_context_mode_form_elements(prefix=prefix, initial_mode=settings.message_context_mode))
-    elements.extend(_task_feedback_form_elements(prefix=prefix, initial=settings.task_feedback))
-    return elements
+    context = (
+        _context_mode_form_elements(prefix=prefix, initial_mode=settings.message_context_mode)
+        if allow_context_mode else []
+    )
+    feedback = _task_feedback_form_elements(prefix=prefix, initial=settings.task_feedback)
+    fields = [*model_fields, *context, *feedback]
+    _restore_settings_draft(fields, settings_draft)
+    if grouped:
+        return _session_settings_sections(
+            model_fields=model_fields, context_fields=context, feedback_fields=feedback,
+            model_notices=model_notices,
+        )
+    return [*model_notices, *fields]
 
 
 def session_settings_summary(settings: SessionSettings, *, allow_context_mode: bool = True) -> str: