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

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

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

@@ -103,7 +103,7 @@ Agent／脚本使用 `netizen update --json`：stdout 只输出最终 JSON，进
 ### 3. 在飞书开始第一次对话
 
 1. 打开机器人单聊；如需在群里使用，先将机器人加入目标群。
-2. 发送 `/settings`，创建或登记一个项目并启用。项目登记一个默认工作目录。
+2. 发送 `/projects`，创建或登记一个项目并启用。项目登记一个默认工作目录。
 3. 发送 `/new`，在卡片中选择项目。模型配置可选择“继承 Codex”；过程卡默认开启，可按需关闭。
 4. 直接发送任务，例如：**“梳理这个项目的结构，并生成一份入门说明。”**
 5. 收到回复后继续交流；如果出现“本轮文件”，点击“发送”取回需要的文件。
@@ -130,7 +130,7 @@ Git 项目可在 `/new` 中加载 worktree 选项，选择已有受管 worktree
 
 | 想做什么 | 入口 |
 | --- | --- |
-| 创建或登记项目工作目录 | `/settings` |
+| 创建或登记项目工作目录 | `/projects` |
 | 新建会话，选择项目及受管 worktree | `/new` |
 | 查看、保存或删除当前聊天的会话默认配置 | `/defaults` |
 | 查看并切换已有会话 | `/sessions` |

{netizen_cli-0.14.1 → netizen_cli-0.14.3}/netizen_cli/__init__.py

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

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

@@ -2616,13 +2616,6 @@ function renderWorkspacePolicy(input, editor, { project, loading = false, schedu
   input("worktree").required = workspace.mode === "existing";
   input("workspace-ref").value = workspace.ref || "";
   for (const field of ["workspace", "worktree", "workspace-ref"]) input(field).disabled = loading;
-  input("workspace-refs").replaceChildren();
-  for (const branch of options?.branches || []) {
-    const option = document.createElement("option");
-    option.value = branch.ref;
-    option.textContent = branch.name;
-    input("workspace-refs").append(option);
-  }
   const notes = [];
   if (loading) notes.push("正在读取 worktree 选项…");
   if (editor.workspaceError) notes.push(workspaceErrorMessage(editor.workspaceError));
@@ -3392,6 +3385,8 @@ function renderScheduleTarget() {
   scheduleInput("chat-target").hidden = binding;
   if (binding) { scheduleInput("chat").required = false; chatTarget("schedule").close(); }
   scheduleInput("session-settings").hidden = binding;
+  scheduleInput("auto-archive-field").hidden = binding;
+  scheduleInput("auto-archive").disabled = binding;
   renderScheduleWorkspace();
   const target = editor.targetSession;
   const selected = editor.plan?.target_binding_id || target?.bindingId || "";
@@ -3445,6 +3440,7 @@ function scheduleEditorValues() {
     .filter((input) => input.checked).map((input) => input.value);
   return { name: scheduleInput("name").value, instructions: scheduleInput("instructions").value,
     enabled: scheduleInput("enabled").checked, targetKind: scheduleTargetKind(),
+    autoArchive: binding ? null : scheduleInput("auto-archive").checked,
     binding: binding ? scheduleInput("binding").value : "",
     project: binding ? "" : scheduleInput("project").value,
     chat: binding ? "" : scheduleInput("chat").value, rule,
@@ -3458,7 +3454,7 @@ function scheduleEditorHasChanges() {
 }
 
 function captureScheduleDraft() {
-  const fields = ["name", "instructions", "enabled", "kind", "timezone", "time", "at", "offset", "end-at", "end-offset", "every"];
+  const fields = ["name", "instructions", "enabled", "auto-archive", "kind", "timezone", "time", "at", "offset", "end-at", "end-offset", "every"];
   return {
     discardBase: structuredClone(scheduleEditor.discardBase), dirty: scheduleEditorHasChanges(),
     fields: fields.map((id) => ({ id, value: scheduleInput(id).value, checked: scheduleInput(id).checked })),
@@ -3733,8 +3729,8 @@ function renderScheduleWorkspace() {
 }
 
 function updateScheduleSaveAvailability() {
-  scheduleInput("save").disabled = !schedulePrepared || !scheduleEditor?.action
-    || (!schedulePrepared.hasFuture && !scheduleEditor.plan) || !scheduleWorkspaceCanSave();
+  scheduleInput("save").disabled = scheduleInput("fields").disabled || !scheduleEditor?.action
+    || !scheduleWorkspaceCanSave();
 }
 
 async function changeScheduleProject() {
@@ -3852,9 +3848,9 @@ function readScheduleRule() {
 function invalidateSchedulePreview() {
   schedulePrepared = null;
   schedulePreviewSerial += 1;
-  scheduleInput("save").disabled = true;
+  updateScheduleSaveAvailability();
   scheduleInput("preview-times").replaceChildren();
-  scheduleInput("preview-message").textContent = "保存前请预览触发时间。";
+  scheduleInput("preview-message").textContent = "可预览触发时间，也可直接保存。";
   scheduleInput("preview-message").classList.toggle("error", false);
   for (const node of document.querySelectorAll("[data-schedule-rule]")) {
     node.hidden = !node.dataset.scheduleRule.split(" ").includes(scheduleInput("kind").value);
@@ -3879,9 +3875,12 @@ function renderSchedulePreview(selector, preview) {
 
 async function previewSchedule() {
   if (scheduleInput("fields").disabled || !scheduleEditor) return;
+  return prepareSchedule();
+}
+
+async function prepareSchedule() {
   const serial = ++schedulePreviewSerial;
   schedulePrepared = null;
-  scheduleInput("save").disabled = true;
   if (!validateScheduleFields()) return;
   scheduleInput("preview-message").textContent = "正在计算触发时间…";
   scheduleInput("preview-message").classList.toggle("error", false);
@@ -3918,6 +3917,7 @@ async function previewSchedule() {
       ? `预计触发时间 · ${data.schedule.timezone}`
       : scheduleEditor?.plan ? "没有后续触发时间。仍可保存计划修改；已认领的执行可以继续。" : "没有后续触发时间，请调整规则。";
     updateScheduleSaveAvailability();
+    return schedulePrepared;
   } catch (error) {
     if (serial !== schedulePreviewSerial) return;
     if (["ambiguous_local_time", "ambiguous_end_time"].includes(error.code) && Array.isArray(error.choices)) {
@@ -3963,6 +3963,7 @@ function openScheduleEditor(plan = null, source = {}) {
   chatTarget("schedule", changeScheduleChat).set({ chatId: plan?.chat_id, chat: plan?.chat });
   scheduleInput("instructions").value = plan?.instructions || "";
   scheduleInput("enabled").checked = plan?.enabled ?? true;
+  scheduleInput("auto-archive").checked = plan?.auto_archive ?? false;
   scheduleInput("timezone").value = rule.timezone;
   scheduleInput("kind").value = rule.kind;
   scheduleInput("time").value = ["daily", "weekly"].includes(rule.kind) ? rule.at : "09:00";
@@ -4001,33 +4002,45 @@ async function editSchedule(plan) {
 
 async function saveSchedule(event) {
   event.preventDefault();
-  if (scheduleInput("fields").disabled || !scheduleEditor?.action || !schedulePrepared
-      || schedulePrepared.fingerprint !== scheduleRuleFingerprint()) return;
+  if (scheduleInput("fields").disabled || !scheduleEditor?.action) return;
   if (!validateScheduleFields({ saving: true })) return;
   const editor = scheduleEditor;
-  const prepared = schedulePrepared;
-  if (scheduleTargetKind() !== "binding") {
-    let validationError = null;
-    scheduleInput("fields").disabled = true;
-    scheduleInput("close").disabled = true;
-    try { await chatTarget("schedule").validate(); }
-    catch (error) {
-      invalidateSchedulePreview();
-      validationError = error;
-    } finally {
-      scheduleInput("fields").disabled = false;
-      scheduleInput("close").disabled = false;
+  let prepared = schedulePrepared;
+  let validationError = null;
+  scheduleInput("fields").disabled = true;
+  scheduleInput("close").disabled = true;
+  updateScheduleSaveAvailability();
+  try {
+    // Resolve local times and validate the current draft without requiring a
+    // separate preview click. The same read preserves DST and interval anchors.
+    if (!prepared || prepared.fingerprint !== scheduleRuleFingerprint()) prepared = await prepareSchedule();
+    if (!prepared) {
+      if (scheduleInput("form-error").hidden) showScheduleFormError("配置已更新，请检查后重新保存。");
+      return;
     }
-    if (scheduleEditor !== editor) return;
-    if (validationError) { showScheduleRequestError(validationError); return; }
+    if (!prepared.hasFuture && !editor.plan) {
+      showScheduleFormError("没有后续触发时间，请调整规则后保存。");
+      return;
+    }
+    if (scheduleTargetKind() !== "binding") await chatTarget("schedule").validate();
+  } catch (error) {
+    invalidateSchedulePreview();
+    validationError = error;
+  } finally {
+    scheduleInput("fields").disabled = false;
+    scheduleInput("close").disabled = false;
+    updateScheduleSaveAvailability();
+    if (scheduleFieldErrors.size) focusScheduleError();
   }
+  if (scheduleEditor !== editor) return;
+  if (validationError) { showScheduleRequestError(validationError); return; }
   // A late options response may replace defaults and invalidate the preview
   // while group validation is in flight. Never submit that stale confirmation.
   if (schedulePrepared !== prepared || prepared.fingerprint !== scheduleRuleFingerprint()) {
     invalidateSchedulePreview();
-    scheduleInput("preview-message").textContent = "配置已更新，请重新预览后保存。";
+    scheduleInput("preview-message").textContent = "配置已更新，请检查后重新保存。";
     scheduleInput("preview-message").classList.toggle("error", true);
-    showScheduleFormError("配置已更新，请重新预览后保存。");
+    showScheduleFormError("配置已更新，请检查后重新保存。");
     return;
   }
   if (!scheduleWorkspaceCanSave()) {
@@ -4051,6 +4064,7 @@ async function saveSchedule(event) {
   } else {
     definition.project = scheduleInput("project").value.trim();
     definition.chat_id = scheduleInput("chat").value.trim();
+    definition.auto_archive = scheduleInput("auto-archive").checked;
     if (scheduleWorkspaceChanged()) {
       definition.workspace = structuredClone(editor.workspace);
       if (editor.workspaceOptions?.projectAlias === definition.project) {
@@ -4324,6 +4338,9 @@ async function showSchedule(planId, returnFocus = document.activeElement) {
       : scheduleSessionSummary(data.plan.session_settings || defaultScheduleSessionSettings());
     scheduleInput("detail-settings").textContent += ` · ${data.plan.target_kind === "binding"
       ? scheduleInheritedWorkspace(data.plan) : workspacePolicySummary(data.plan.workspace, { scheduled: true })}`;
+    if (data.plan.target_kind !== "binding") {
+      scheduleInput("detail-settings").textContent += ` · 成功后自动归档：${data.plan.auto_archive ? "开启" : "关闭"}`;
+    }
     scheduleInput("detail-rule").textContent = scheduleRuleLabel(data.plan.schedule);
     renderSchedulePreview("#schedule-detail-preview", data.preview);
     scheduleInput("detail-note").textContent = "";

{netizen_cli-0.14.1 → netizen_cli-0.14.3}/netizen_cli/admin/static/index.html

@@ -94,8 +94,8 @@
           <div class="workspace-fields">
             <label>Project<select id="worktree-project" required><option value="">选择 Project</option></select></label>
             <label>检出方式<select id="worktree-mode"><option value="detached">Detached（不绑定命名分支）</option><option value="existing">检出已有本地分支</option><option value="new">创建并检出新分支</option></select></label>
-            <label id="worktree-ref-label">起点提交 / 分支<input id="worktree-ref" list="worktree-refs" placeholder="HEAD"><datalist id="worktree-refs"></datalist></label>
-            <label id="worktree-existing-label" hidden>本地分支<select id="worktree-existing"></select></label>
+            <label id="worktree-ref-label">起点提交 / 分支<input id="worktree-ref" maxlength="256" placeholder="HEAD、分支、标签或提交"></label>
+            <label id="worktree-existing-label" hidden>本地分支<input id="worktree-existing" maxlength="256" placeholder="填写本地分支名"></label>
             <label id="worktree-new-label" hidden>新分支名称<input id="worktree-new-branch" maxlength="1024"></label>
           </div>
           <p id="worktree-create-note" class="hint">只检出已提交内容，不复制未提交、未跟踪或忽略文件，不执行环境初始化。不创建会话。</p>
@@ -291,7 +291,7 @@
               <label>Project<select id="defaults-project" required><option value="">选择 Project</option></select></label>
               <label>worktree 使用方式<select id="defaults-workspace"><option value="project">项目目录（不使用 worktree）</option><option value="existing">使用已有 worktree</option><option value="new">每个新会话新建 worktree</option></select></label>
               <label id="defaults-worktree-field" hidden>受管 worktree<select id="defaults-worktree"></select></label>
-              <label id="defaults-workspace-ref-field" hidden>起点提交 / 分支<input id="defaults-workspace-ref" list="defaults-workspace-refs" maxlength="256" placeholder="留空使用创建时 Project 的 HEAD"><datalist id="defaults-workspace-refs"></datalist></label>
+              <label id="defaults-workspace-ref-field" hidden>起点提交 / 分支<input id="defaults-workspace-ref" maxlength="256" placeholder="留空使用创建时 Project 的 HEAD"></label>
             </div>
             <p id="defaults-workspace-help" class="defaults-field-help" role="status"></p>
             <div class="schedule-form-grid">
@@ -417,7 +417,7 @@
                 <div id="schedule-workspace-fields" class="schedule-section-fields">
                   <label>worktree 使用方式<select id="schedule-workspace"><option value="project">项目目录（不使用 worktree）</option><option value="existing">使用已有 worktree</option><option value="new">每次执行新建 worktree</option></select></label>
                   <label id="schedule-worktree-field" hidden>受管 worktree<select id="schedule-worktree"></select></label>
-                  <label id="schedule-workspace-ref-field" hidden>起点提交 / 分支<input id="schedule-workspace-ref" list="schedule-workspace-refs" maxlength="256" placeholder="留空使用执行时 Project 的 HEAD"><datalist id="schedule-workspace-refs"></datalist></label>
+                  <label id="schedule-workspace-ref-field" hidden>起点提交 / 分支<input id="schedule-workspace-ref" maxlength="256" placeholder="留空使用执行时 Project 的 HEAD"></label>
                   <p id="schedule-workspace-help" class="schedule-field-help" role="status"></p>
                 </div>
                 <div id="schedule-chat-target" class="chat-target">
@@ -461,11 +461,15 @@
                 </fieldset>
                 <div class="schedule-preview-panel">
                   <button id="schedule-preview" type="button">预览触发时间</button>
-                  <p id="schedule-preview-message" role="status" aria-live="polite">保存前请预览触发时间。</p>
+                  <p id="schedule-preview-message" role="status" aria-live="polite">可预览触发时间，也可直接保存。</p>
                   <ol id="schedule-preview-times"></ol>
                 </div>
               </div>
             </section>
+            <section id="schedule-auto-archive-field" class="schedule-editor-section">
+              <label class="schedule-checkbox"><input id="schedule-auto-archive" type="checkbox" aria-describedby="schedule-auto-archive-help">成功后自动归档</label>
+              <p id="schedule-auto-archive-help" class="schedule-field-help">首轮正常结束且结果送达后归档，恢复使用 /sessions archived。</p>
+            </section>
             <details id="schedule-session-settings" class="schedule-editor-section schedule-session-settings" open>
               <summary>会话配置<span id="schedule-session-summary">继承 Codex · 当前消息</span></summary>
               <div class="schedule-section-fields">

{netizen_cli-0.14.1 → netizen_cli-0.14.3}/netizen_cli/admin/static/worktrees.js

@@ -6,10 +6,10 @@ window.NetizenWorktrees = (() => {
   const node = (name) => document.querySelector(`#worktree-${name}`);
   let dependencies;
   let settings = null;
-  let branches = null;
+  let creationOptions = null;
   let pending = false;
   let serial = 0;
-  let branchSerial = 0;
+  let creationSerial = 0;
   let editor = null;
   let cursor = null;
   let nextCursor = null;
@@ -59,7 +59,7 @@ window.NetizenWorktrees = (() => {
     node("new-branch").required = mode === "new";
     node("existing").required = mode === "existing";
     node("create-submit").disabled = disabled || editor?.kind !== "create" || editor.loading || editor.checking
-      || editor.uncertain || !branches?.actions?.create || (mode === "existing" && !node("existing").value);
+      || editor.uncertain || !creationOptions?.actions?.create || (mode === "existing" && !node("existing").value.trim());
     node("create-submit").textContent = pending && editor?.kind === "create" ? "正在创建…" : "创建 worktree";
     node("new").disabled = disabled;
     node("configure").disabled = disabled;
@@ -73,8 +73,8 @@ window.NetizenWorktrees = (() => {
     if (!saved && !confirmed && dirty() && !window.confirm("有未保存的修改，确定放弃吗？")) return false;
     const current = editor;
     editor = null;
-    branchSerial += 1;
-    branches = null;
+    creationSerial += 1;
+    creationOptions = null;
     settings = null;
     window.NetizenSelect?.close();
     node(current.kind).hidden = true;
@@ -89,14 +89,14 @@ window.NetizenWorktrees = (() => {
     const current = { kind, returnFocus, loading: true, checking: false, uncertain: false, checkAvailable: false, base: null };
     editor = current;
     settings = null;
-    branches = null;
+    creationOptions = null;
     if (kind === "settings") {
       node("root").value = ""; node("fetch").checked = false;
       node("effective-root").textContent = "";
     } else {
       node("project").replaceChildren(); option(node("project"), "", "选择 Project"); node("project").value = "";
       node("mode").value = "detached"; node("ref").value = ""; node("new-branch").value = "";
-      node("existing").replaceChildren(); node("existing").value = ""; node("refs").replaceChildren();
+      node("existing").value = "";
       node("create-note").textContent = ""; node("create-config").textContent = "";
     }
     current.base = values(kind);
@@ -149,32 +149,25 @@ window.NetizenWorktrees = (() => {
     return dependencies.api(path, { method: "POST", headers: { "Content-Type": "application/json" },
       body: JSON.stringify(dependencies.actionPayload(envelope, extra)) });
   }
-  async function loadBranches() {
+  async function loadCreationOptions() {
     const current = editor;
     if (current?.kind !== "create" || current.loading || pending || expired()) return;
-    const request = ++branchSerial;
+    const request = ++creationSerial;
     const project = node("project").value;
-    branches = null;
-    node("existing").replaceChildren(); node("existing").value = "";
-    node("refs").replaceChildren();
+    creationOptions = null;
+    node("existing").value = "";
     controls();
     if (!project || expired()) return;
     try {
-      const result = await dependencies.api(`/api/v1/worktrees/branches?${new URLSearchParams({ project })}`);
-      if (expired() || editor !== current || request !== branchSerial || node("project").value !== project) return;
-      branches = result;
-      option(node("existing"), "", "选择未被占用的本地分支");
-      for (const branch of result.items) {
-        option(node("refs"), branch.ref, branch.name);
-        if (!branch.remote) option(node("existing"), branch.name,
-          `${branch.name}${branch.occupiedPaths?.length ? "（已被其他 checkout 占用）" : ""}`, Boolean(branch.occupiedPaths?.length));
-      }
+      const result = await dependencies.api(`/api/v1/worktrees/create-options?${new URLSearchParams({ project })}`);
+      if (expired() || editor !== current || request !== creationSerial || node("project").value !== project) return;
+      creationOptions = result;
       node("create-note").textContent = result.isGit === false ? "该 Project 不是 Git 仓库，不能创建 worktree。"
         : "默认从此 Project 当前 HEAD 检出；不复制未提交、未跟踪或忽略文件，不执行环境初始化。不创建会话。";
     } catch (error) {
-      if (editor === current && request === branchSerial && !expired()) node("create-note").textContent = error.message;
+      if (editor === current && request === creationSerial && !expired()) node("create-note").textContent = error.message;
     } finally {
-      if (request === branchSerial) controls();
+      if (request === creationSerial) controls();
     }
   }
   function renderRows(items) {
@@ -273,11 +266,11 @@ window.NetizenWorktrees = (() => {
     event.preventDefault();
     const current = editor;
     if (expired() || pending || current?.kind !== "create" || current.loading || current.checking
-        || current.uncertain || !branches?.actions?.create) return;
+        || current.uncertain || !creationOptions?.actions?.create) return;
     const mode = node("mode").value;
-    const branch = mode === "existing" ? node("existing").value : mode === "new" ? node("new-branch").value.trim() : null;
+    const branch = mode === "existing" ? node("existing").value.trim() : mode === "new" ? node("new-branch").value.trim() : null;
     const ref = mode === "existing" ? `refs/heads/${branch}` : node("ref").value.trim() || "HEAD";
-    const grant = branches.actions.create; branches.actions.create = null;
+    const grant = creationOptions.actions.create; creationOptions.actions.create = null;
     pending = true; controls(); editorMessage("正在创建 worktree…");
     let result;
     try {
@@ -339,7 +332,7 @@ window.NetizenWorktrees = (() => {
     dependencies = values;
     node("new").addEventListener("click", (event) => openEditor("create", event.currentTarget));
     node("configure").addEventListener("click", (event) => openEditor("settings", event.currentTarget));
-    node("project").addEventListener("change", loadBranches);
+    node("project").addEventListener("change", loadCreationOptions);
     for (const name of ["mode", "root", "fetch", "ref", "existing", "new-branch"]) {
       node(name).addEventListener(name === "mode" ? "change" : "input", controls);
     }
@@ -361,5 +354,5 @@ window.NetizenWorktrees = (() => {
     controls();
   }
   return { init, load, dirty, busy: () => pending, discard,
-    expire() { serial += 1; branchSerial += 1; controls(); } };
+    expire() { serial += 1; creationSerial += 1; controls(); } };
 })();

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

@@ -609,8 +609,8 @@ class AdminWebApplication:
             return await self._projects(context)
         if route == ("GET", "/api/v1/worktrees"):
             return await self._worktrees(context)
-        if route == ("GET", "/api/v1/worktrees/branches"):
-            return await self._worktree_branches(context)
+        if route == ("GET", "/api/v1/worktrees/create-options"):
+            return await self._worktree_creation_options(context)
         if route == ("GET", "/api/v1/worktrees/settings"):
             return self._worktree_settings(context)
         if route == ("GET", "/api/v1/progress-card/settings"):
@@ -986,7 +986,7 @@ class AdminWebApplication:
         )
         definition = payload.get("definition", {})
         if not isinstance(definition, dict) or set(definition) - {
-            "name", "instructions", "project", "expected_project_revision", "chat_id", "schedule", "enabled", "session_settings", "workspace", "target_kind", "target_binding_id",
+            "name", "instructions", "project", "expected_project_revision", "chat_id", "schedule", "enabled", "session_settings", "workspace", "target_kind", "target_binding_id", "auto_archive",
         }:
             raise AdminWebError(400, "invalid_input", "定时任务定义字段无效。")
         request: dict[str, object] = {
@@ -1054,14 +1054,14 @@ class AdminWebApplication:
         )}} for item in result["items"]]
         return _json_response(200, {**result, "items": items, "requestId": context.request.request_id})
 
-    async def _worktree_branches(self, context: _RequestContext) -> Response:
+    async def _worktree_creation_options(self, context: _RequestContext) -> Response:
         _require_query_keys(context.query, {"project"})
         alias = _optional_text_query(context.query, "project", maximum=64)
         if not alias:
             raise AdminWebError(400, "invalid_input", "请选择 Project。")
-        result = await self._worktree_service().branches(project_alias=alias)
+        result = await self._worktree_service().creation_options(project_alias=alias)
         actions = {}
-        if result.get("isGit", True):
+        if result["isGit"]:
             actions["create"] = self._grant(
                 context, "worktrees.create", AdminActionTarget("project", alias),
                 _empty_preconditions(project_revision=ExpectedValue.expect(result["projectRevision"])),

{netizen_cli-0.14.1 → netizen_cli-0.14.3}/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 = 19
+SCHEMA_VERSION = 20
 
 # 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.v19 import validate
+    from .migrations.v20 import validate
     validate(connection)
 
 
@@ -563,23 +563,29 @@ class BindingStore:
     A file-backed Store owns a WAL writer plus one query-only Admin reader.
     ``:memory:`` is the explicit compatibility/test mode: Admin reads run on
     the same connection under the writer lock, never against a second empty
-    in-memory database.
+    in-memory database. Service startup uses ``create=False`` so validation and
+    opening share the requirement for an existing, nonempty database.
     """
 
     def __init__(
         self,
         path: str | Path = ":memory:",
         *,
+        create: bool = True,
         id_factory: Callable[[], str] | None = None,
         wall_clock: Callable[[], float] = time.time,
     ) -> None:
         self._path = path
         self._path_string = str(path)
         self._is_memory = self._path_string == ":memory:"
-        if not self._is_memory and Path(path).exists():
+        if not create or (not self._is_memory and Path(path).exists()):
             # Reject unsupported data before a writer can recover/checkpoint a
             # previous process's WAL, even while closing after an open failure.
-            validate_channel_database(path, allow_empty=True)
+            validate_channel_database(path, allow_empty=create)
+        self._connection_target = (
+            self._path_string if create else Path(path).resolve().as_uri() + "?mode=rw"
+        )
+        self._connection_uri = not create
         self._id_factory = id_factory or (lambda: str(uuid.uuid4()))
         self._wall_clock = wall_clock
         self._lock = threading.RLock()
@@ -593,11 +599,12 @@ class BindingStore:
             max_workers=1,
             thread_name_prefix="netizen-binding-query",
         )
-        if not self._is_memory:
+        if create and not self._is_memory:
             db_path = Path(path)
             db_path.parent.mkdir(mode=0o700, parents=True, exist_ok=True)
         self._connection = sqlite3.connect(
-            self._path_string,
+            self._connection_target,
+            uri=self._connection_uri,
             isolation_level=None,
             check_same_thread=False,
         )
@@ -606,7 +613,7 @@ class BindingStore:
         self.defaults = DefaultsStore(self)
         self.worktrees = WorktreeStore(self)
         try:
-            self._initialize()
+            self._initialize(create=create)
             if not self._is_memory:
                 self._query_connection = self._query_executor.submit(
                     self._open_query_connection
@@ -618,14 +625,14 @@ class BindingStore:
         if not self._is_memory:
             os.chmod(Path(path), 0o600)
 
-    def _initialize(self) -> None:
+    def _initialize(self, *, create: bool) -> None:
         with self._lock:
             tables = {
                 row["name"] for row in self._connection.execute(
                     "SELECT name FROM sqlite_master WHERE type = 'table'"
                 )
             }
-            if tables:
+            if tables or not create:
                 if "schema_version" not in tables:
                     raise RuntimeError("Channel database is missing its schema version; existing data was not changed")
                 _require_current_schema(self._connection)
@@ -862,7 +869,8 @@ class BindingStore:
 
     def _open_query_connection(self) -> sqlite3.Connection:
         connection = sqlite3.connect(
-            self._path_string,
+            self._connection_target,
+            uri=self._connection_uri,
             isolation_level=None,
             check_same_thread=False,
         )

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

@@ -79,7 +79,6 @@ from .callbacks import (
     _turn_reference,
 )
 from .reply import reply_card
-from .model_info import with_model_details
 from .session_ids import session_identity_lines
 
 
@@ -139,7 +138,7 @@ def settings_card(
     notice: str | None = None,
     notice_is_error: bool = False,
 ) -> OutboundCard:
-    builder = _builder("Netizen 设置", _settings_section_label(section))
+    builder = _builder("Netizen 项目管理", _settings_section_label(section))
     builder.raw(_settings_navigation(scope=scope, active=section))
     builder.markdown(
         "当前聊天的参与者均可管理项目；修改会影响使用这个机器人的其他聊天。"
@@ -180,7 +179,7 @@ def _render_projects_settings(
 
     builder.raw(
         _repeatable_callback_button(
-            label="刷新当前配置",
+            label="刷新项目列表",
             value=_envelope(
                 scope,
                 CardControlName.REFRESH_SETTINGS,
@@ -546,11 +545,6 @@ def _new_workspace_elements(options: Mapping[str, Any]) -> list[dict[str, Any]]:
             f"已有 worktree · {branch} · {item['cwd']}",
             _workspace_reference(options, "id:" + item["id"]),
         ))
-    refs = [("当前 HEAD", "HEAD")]
-    for branch in options.get("branches", ()):
-        occupied = " · 已占用，仅可作起点" if branch.get("occupiedPaths") else ""
-        remote = "远端 · " if branch.get("remote") else "本地 · "
-        refs.append((remote + branch["name"] + occupied, branch["ref"]))
     return [
         _form_label("worktree（切换项目后请重新加载选项）"),
         _static_select(
@@ -565,11 +559,9 @@ def _new_workspace_elements(options: Mapping[str, Any]) -> list[dict[str, Any]]:
                      ("创建并检出新分支", "new")),
             initial_option="detached",
         ),
-        _form_label("起点 revision；检出已有分支时请选择对应的本地分支"),
-        _static_select(
-            name="new_worktree_ref", placeholder="选择起点/已有分支",
-            options=tuple(refs), initial_option="HEAD",
-        ),
+        _form_label("起点 revision；检出已有分支时填写本地分支名"),
+        {"tag": "input", "name": "new_worktree_ref", "max_length": 256,
+         "placeholder": _plain_text("HEAD、分支、标签或提交"), "default_value": "HEAD"},
         {"tag": "input", "name": "new_worktree_branch", "max_length": 255,
          "label": _plain_text("新分支名（仅创建新分支时填写）"),
          "placeholder": _plain_text("例如：feature/my-task")},
@@ -1023,7 +1015,7 @@ def new_binding_card(
     )
     if not projects:
         builder.markdown(
-            "还没有已启用的项目。请先发送 `/settings` 创建、登记或启用项目，"
+            "还没有已启用的项目。请先发送 `/projects` 创建、登记或启用项目，"
             "再发送 `/new`。发送 `/help` 查看快速开始。"
         )
     else:
@@ -1056,7 +1048,7 @@ def new_binding_card(
                 settings_draft=settings_draft,
             )
         )
-    return OutboundCard(card=with_model_details(builder.to_dict(), catalog if projects else None))
+    return OutboundCard(card=builder.to_dict())
 
 
 def config_card(
@@ -1116,7 +1108,7 @@ def config_card(
             catalog=catalog,
         )
     )
-    return OutboundCard(card=with_model_details(builder.to_dict(), catalog))
+    return OutboundCard(card=builder.to_dict())
 
 
 def rename_binding_card(
@@ -2393,7 +2385,8 @@ def _decode_new_workspace(
     if match is None:
         raise CardActionError("worktree 选择无效，请重新加载 worktree 选项。")
     mode = _required_string(payload["new_worktree_mode"], "new_worktree_mode")
-    ref = _bounded_string(payload["new_worktree_ref"], "new_worktree_ref", max_chars=1000)
+    ref_value = payload["new_worktree_ref"]
+    ref = _bounded_string(ref_value, "new_worktree_ref", max_chars=256).strip() if ref_value != "" else ""
     branch_value = payload.get("new_worktree_branch")
     branch = (
         _bounded_string(branch_value, "new_worktree_branch", max_chars=255).strip()
@@ -2412,10 +2405,11 @@ def _decode_new_workspace(
     if mode == "new" and not branch:
         raise CardActionError("创建新分支时请填写新分支名。")
     if mode == "existing":
-        if not ref.startswith("refs/heads/") or not ref.removeprefix("refs/heads/"):
-            raise CardActionError("检出已有分支时，请选择未被占用的本地分支。")
         branch = ref.removeprefix("refs/heads/")
-    return None, {"mode": mode, "ref": ref, "branch": branch if mode != "detached" else None}
+        if not branch or branch == "HEAD" or branch.startswith("refs/"):
+            raise CardActionError("检出已有分支时，请填写本地分支名。")
+        ref = "refs/heads/" + branch
+    return None, {"mode": mode, "ref": ref or "HEAD", "branch": branch if mode != "detached" else None}
 
 
 def _decode_config_form(

{netizen_cli-0.14.1 → netizen_cli-0.14.3}/netizen_cli/cards/defaults.py

@@ -139,10 +139,10 @@ def defaults_card(
         project_options.append({"text": _plain_text(f"{selected_project} · 不可用（保留原配置）"), "value": selected_value})
         builder.raw(_notice(f"Project「{selected_project}」已停用或不可用；请选择可用项目后保存，或删除本聊天的默认配置。", error=True))
     if not enabled_projects:
-        builder.raw(_notice("没有可用 Project，请先通过 /settings 登记或启用项目。"))
+        builder.raw(_notice("没有可用 Project，请先通过 /projects 登记或启用项目。"))
     if not project_options:
         # Feishu cannot render an empty static select. There is no saved exact
-        # record to delete in this branch; opening again after /settings gives
+        # record to delete in this branch; opening again after /projects gives
         # the ordinary single form without inventing a default Project.
         return OutboundCard(card=builder.to_dict())