feat(secrets-mcp): Web 条目编辑 API 与 Notes 列表展示优化（0.3.6）

- secrets-core: EntryWriteRow；按 id 更新/删除（含并发冲突与唯一键）
- Web: PATCH/DELETE /api/entries/{id}；列表编辑/删除与错误映射
- entries 模板：Notes 限高滚动；空 Notes 不显示占位框
- 版本 0.3.5 → 0.3.6，同步 Cargo.lock

Made-with: Cursor

crates/secrets-mcp/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "secrets-mcp"
-version = "0.3.5"
+version = "0.3.6"
 edition.workspace = true
 
 [[bin]]

crates/secrets-mcp/src/web.rs

@@ -8,9 +8,10 @@ use axum::{
     extract::{ConnectInfo, Path, Query, State},
     http::{HeaderMap, StatusCode, header},
     response::{Html, IntoResponse, Redirect, Response},
-    routing::{get, post},
+    routing::{get, patch, post},
 };
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 use tower_sessions::Session;
 use uuid::Uuid;
 
@@ -19,7 +20,9 @@ use secrets_core::crypto::hex;
 use secrets_core::service::{
     api_key::{ensure_api_key, regenerate_api_key},
     audit_log::list_for_user,
+    delete::delete_by_id,
     search::{SearchParams, count_entries, list_entries},
+    update::{UpdateEntryFieldsByIdParams, update_fields_by_id},
     user::{
         OAuthProfile, bind_oauth_account, find_or_create_user, get_user_by_id,
         unbind_oauth_account, update_user_key_setup,
@@ -95,6 +98,7 @@ struct EntriesPageTemplate {
 
 /// Non-sensitive fields only (no `secrets` / ciphertext).
 struct EntryListItemView {
+    id: String,
     folder: String,
     entry_type: String,
     name: String,
@@ -199,6 +203,10 @@ pub fn web_router() -> Router<AppState> {
         .route("/api/key-setup", post(api_key_setup))
         .route("/api/apikey", get(api_apikey_get))
         .route("/api/apikey/regenerate", post(api_apikey_regenerate))
+        .route(
+            "/api/entries/{id}",
+            patch(api_entry_patch).delete(api_entry_delete),
+        )
 }
 
 fn text_asset_response(content: &'static str, content_type: &'static str) -> Response {
@@ -573,6 +581,7 @@ async fn entries_page(
     let entries = rows
         .into_iter()
         .map(|e| EntryListItemView {
+            id: e.id.to_string(),
             folder: e.folder,
             entry_type: e.entry_type,
             name: e.name,
@@ -872,6 +881,122 @@ async fn api_apikey_regenerate(
     Ok(Json(ApiKeyResponse { api_key }))
 }
 
+// ── Entry management (Web UI, non-sensitive fields only) ───────────────────────
+
+#[derive(Deserialize)]
+struct EntryPatchBody {
+    folder: String,
+    #[serde(rename = "type")]
+    entry_type: String,
+    name: String,
+    notes: String,
+    tags: Vec<String>,
+    metadata: serde_json::Value,
+}
+
+type EntryApiError = (StatusCode, Json<serde_json::Value>);
+
+fn map_entry_mutation_err(e: anyhow::Error) -> EntryApiError {
+    let msg = e.to_string();
+    if msg.contains("Entry not found") {
+        return (
+            StatusCode::NOT_FOUND,
+            Json(json!({ "error": "条目不存在或无权访问" })),
+        );
+    }
+    if msg.contains("already exists") {
+        return (
+            StatusCode::CONFLICT,
+            Json(json!({ "error": "该账号下已存在相同 folder + name 的条目" })),
+        );
+    }
+    if msg.contains("Concurrent modification") {
+        return (
+            StatusCode::CONFLICT,
+            Json(json!({ "error": "条目已被修改，请刷新后重试" })),
+        );
+    }
+    if msg.contains("must be at most") {
+        return (StatusCode::BAD_REQUEST, Json(json!({ "error": msg })));
+    }
+    tracing::error!(error = %e, "entry mutation failed");
+    (
+        StatusCode::INTERNAL_SERVER_ERROR,
+        Json(json!({ "error": "操作失败，请稍后重试" })),
+    )
+}
+
+async fn api_entry_patch(
+    State(state): State<AppState>,
+    session: Session,
+    Path(entry_id): Path<Uuid>,
+    Json(body): Json<EntryPatchBody>,
+) -> Result<Json<serde_json::Value>, EntryApiError> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or((StatusCode::UNAUTHORIZED, Json(json!({ "error": "未登录" }))))?;
+
+    let folder = body.folder.trim();
+    let entry_type = body.entry_type.trim();
+    let name = body.name.trim();
+    let notes = body.notes.trim();
+
+    if name.is_empty() {
+        return Err((
+            StatusCode::BAD_REQUEST,
+            Json(json!({ "error": "name 不能为空" })),
+        ));
+    }
+
+    let tags: Vec<String> = body
+        .tags
+        .into_iter()
+        .map(|t| t.trim().to_string())
+        .filter(|t| !t.is_empty())
+        .collect();
+
+    if !body.metadata.is_object() {
+        return Err((
+            StatusCode::BAD_REQUEST,
+            Json(json!({ "error": "metadata 必须是 JSON 对象" })),
+        ));
+    }
+
+    update_fields_by_id(
+        &state.pool,
+        entry_id,
+        user_id,
+        UpdateEntryFieldsByIdParams {
+            folder,
+            entry_type,
+            name,
+            notes,
+            tags: &tags,
+            metadata: &body.metadata,
+        },
+    )
+    .await
+    .map_err(map_entry_mutation_err)?;
+
+    Ok(Json(json!({ "ok": true })))
+}
+
+async fn api_entry_delete(
+    State(state): State<AppState>,
+    session: Session,
+    Path(entry_id): Path<Uuid>,
+) -> Result<Json<serde_json::Value>, EntryApiError> {
+    let user_id = current_user_id(&session)
+        .await
+        .ok_or((StatusCode::UNAUTHORIZED, Json(json!({ "error": "未登录" }))))?;
+
+    delete_by_id(&state.pool, entry_id, user_id)
+        .await
+        .map_err(map_entry_mutation_err)?;
+
+    Ok(Json(json!({ "ok": true })))
+}
+
 // ── OAuth / Well-known ────────────────────────────────────────────────────────
 
 /// RFC 9728 — OAuth 2.0 Protected Resource Metadata.

crates/secrets-mcp/templates/entries.html

@@ -82,11 +82,58 @@
         .cell-notes, .cell-meta {
             max-width: 280px; word-break: break-word;
         }
+        .notes-scroll {
+            max-height: 160px;
+            overflow: auto;
+            white-space: pre-wrap;
+            word-break: break-word;
+            padding: 8px;
+            background: var(--bg);
+            border: 1px solid var(--border);
+            border-radius: 8px;
+            font-size: 12px;
+        }
         .detail {
             background: var(--bg); border: 1px solid var(--border); border-radius: 8px;
             padding: 10px; white-space: pre-wrap; word-break: break-word; font-size: 12px;
             max-width: 320px; max-height: 160px; overflow: auto;
         }
+        .col-actions { white-space: nowrap; }
+        .row-actions { display: flex; flex-wrap: wrap; gap: 6px; }
+        .btn-row {
+            padding: 4px 10px; border-radius: 6px; font-size: 12px; cursor: pointer;
+            border: 1px solid var(--border); background: var(--surface2); color: var(--text-muted);
+            font-family: inherit;
+        }
+        .btn-row:hover { color: var(--text); border-color: var(--text-muted); }
+        .btn-row.danger:hover { border-color: #f85149; color: #f85149; }
+        .modal-overlay {
+            position: fixed; inset: 0; background: rgba(1, 4, 9, 0.65); z-index: 200;
+            display: flex; align-items: center; justify-content: center; padding: 16px;
+        }
+        .modal-overlay[hidden] { display: none !important; }
+        .modal {
+            background: var(--surface); border: 1px solid var(--border); border-radius: 12px;
+            padding: 22px; width: 100%; max-width: 520px; max-height: 90vh; overflow: auto;
+            box-shadow: 0 16px 48px rgba(0,0,0,0.45);
+        }
+        .modal-title { font-size: 16px; font-weight: 600; margin-bottom: 14px; }
+        .modal-field { margin-bottom: 12px; }
+        .modal-field label { display: block; font-size: 12px; color: var(--text-muted); margin-bottom: 5px; }
+        .modal-field input, .modal-field textarea {
+            width: 100%; background: var(--bg); border: 1px solid var(--border); border-radius: 6px;
+            color: var(--text); padding: 8px 10px; font-size: 13px; font-family: 'JetBrains Mono', monospace;
+            outline: none;
+        }
+        .modal-field textarea { min-height: 72px; resize: vertical; }
+        .modal-field textarea.metadata-edit { min-height: 140px; }
+        .modal-error { color: #f85149; font-size: 12px; margin-bottom: 10px; display: none; }
+        .modal-error.visible { display: block; }
+        .modal-footer { display: flex; flex-wrap: wrap; gap: 8px; justify-content: flex-end; margin-top: 16px; }
+        .btn-modal { padding: 8px 16px; border-radius: 6px; font-size: 13px; cursor: pointer; font-family: inherit; border: 1px solid var(--border); background: transparent; color: var(--text); }
+        .btn-modal.primary { background: var(--accent); color: #0d1117; border-color: transparent; font-weight: 600; }
+        .btn-modal.primary:hover { background: var(--accent-hover); }
+        .btn-modal.danger { border-color: #f85149; color: #f85149; }
         @media (max-width: 900px) {
             .layout { flex-direction: column; }
             .sidebar {
@@ -113,7 +160,9 @@
             td.col-notes::before { content: "Notes"; }
             td.col-tags::before { content: "Tags"; }
             td.col-meta::before { content: "Metadata"; }
+            td.col-actions::before { content: "操作"; }
             .detail { max-width: none; }
+            .notes-scroll { max-width: none; }
         }
     </style>
 </head>
@@ -171,18 +220,25 @@
                     <th>Notes</th>
                     <th>Tags</th>
                     <th>Metadata</th>
+                    <th>操作</th>
                 </tr>
             </thead>
             <tbody>
                 {% for entry in entries %}
-                <tr>
+                <tr data-entry-id="{{ entry.id }}">
                     <td class="col-updated mono"><time class="entry-local-time" datetime="{{ entry.updated_at_iso }}">{{ entry.updated_at_iso }}</time></td>
-                    <td class="col-folder mono">{{ entry.folder }}</td>
-                    <td class="col-type mono">{{ entry.entry_type }}</td>
-                    <td class="col-name mono">{{ entry.name }}</td>
-                    <td class="col-notes cell-notes">{{ entry.notes }}</td>
-                    <td class="col-tags mono">{{ entry.tags }}</td>
-                    <td class="col-meta cell-meta"><pre class="detail">{{ entry.metadata }}</pre></td>
+                    <td class="col-folder mono cell-folder">{{ entry.folder }}</td>
+                    <td class="col-type mono cell-type">{{ entry.entry_type }}</td>
+                    <td class="col-name mono cell-name">{{ entry.name }}</td>
+                    <td class="col-notes cell-notes">{% if !entry.notes.is_empty() %}<div class="notes-scroll cell-notes-val">{{ entry.notes }}</div>{% endif %}</td>
+                    <td class="col-tags mono cell-tags-val">{{ entry.tags }}</td>
+                    <td class="col-meta cell-meta"><pre class="detail cell-meta-val">{{ entry.metadata }}</pre></td>
+                    <td class="col-actions">
+                        <div class="row-actions">
+                            <button type="button" class="btn-row btn-edit">编辑</button>
+                            <button type="button" class="btn-row danger btn-del">删除</button>
+                        </div>
+                    </td>
                 </tr>
                 {% endfor %}
             </tbody>
@@ -193,6 +249,23 @@
 </main>
 </div>
 </div>
+
+<div id="edit-overlay" class="modal-overlay" hidden>
+    <div class="modal" role="dialog" aria-modal="true" aria-labelledby="edit-title">
+        <div class="modal-title" id="edit-title">编辑条目</div>
+        <div id="edit-error" class="modal-error"></div>
+        <div class="modal-field"><label for="edit-folder">Folder</label><input id="edit-folder" type="text" autocomplete="off"></div>
+        <div class="modal-field"><label for="edit-type">Type</label><input id="edit-type" type="text" autocomplete="off"></div>
+        <div class="modal-field"><label for="edit-name">Name</label><input id="edit-name" type="text" autocomplete="off"></div>
+        <div class="modal-field"><label for="edit-notes">Notes</label><textarea id="edit-notes"></textarea></div>
+        <div class="modal-field"><label for="edit-tags">Tags（逗号分隔）</label><input id="edit-tags" type="text" autocomplete="off"></div>
+        <div class="modal-field"><label for="edit-metadata">Metadata（JSON 对象）</label><textarea id="edit-metadata" class="metadata-edit"></textarea></div>
+        <div class="modal-footer">
+            <button type="button" class="btn-modal" id="edit-cancel">取消</button>
+            <button type="button" class="btn-modal primary" id="edit-save">保存</button>
+        </div>
+    </div>
+</div>
 <script>
 (function () {
   document.querySelectorAll('time.entry-local-time[datetime]').forEach(function (el) {
@@ -203,6 +276,109 @@
       el.title = raw + ' (UTC)';
     }
   });
+
+  var editOverlay = document.getElementById('edit-overlay');
+  var editError = document.getElementById('edit-error');
+  var editFolder = document.getElementById('edit-folder');
+  var editType = document.getElementById('edit-type');
+  var editName = document.getElementById('edit-name');
+  var editNotes = document.getElementById('edit-notes');
+  var editTags = document.getElementById('edit-tags');
+  var editMetadata = document.getElementById('edit-metadata');
+  var currentEntryId = null;
+
+  function showEditErr(msg) {
+    editError.textContent = msg || '';
+    editError.classList.toggle('visible', !!msg);
+  }
+
+  function openEdit(tr) {
+    var id = tr.getAttribute('data-entry-id');
+    if (!id) return;
+    currentEntryId = id;
+    showEditErr('');
+    editFolder.value = tr.querySelector('.cell-folder') ? tr.querySelector('.cell-folder').textContent.trim() : '';
+    editType.value = tr.querySelector('.cell-type') ? tr.querySelector('.cell-type').textContent.trim() : '';
+    editName.value = tr.querySelector('.cell-name') ? tr.querySelector('.cell-name').textContent.trim() : '';
+    editNotes.value = tr.querySelector('.cell-notes-val') ? tr.querySelector('.cell-notes-val').textContent : '';
+    var tagsText = tr.querySelector('.cell-tags-val') ? tr.querySelector('.cell-tags-val').textContent.trim() : '';
+    editTags.value = tagsText;
+    var metaPre = tr.querySelector('.cell-meta-val');
+    editMetadata.value = metaPre ? metaPre.textContent : '{}';
+    editOverlay.hidden = false;
+  }
+
+  function closeEdit() {
+    editOverlay.hidden = true;
+    currentEntryId = null;
+    showEditErr('');
+  }
+
+  document.getElementById('edit-cancel').addEventListener('click', closeEdit);
+  editOverlay.addEventListener('click', function (e) {
+    if (e.target === editOverlay) closeEdit();
+  });
+
+  document.getElementById('edit-save').addEventListener('click', function () {
+    if (!currentEntryId) return;
+    var meta;
+    try {
+      meta = JSON.parse(editMetadata.value);
+    } catch (err) {
+      showEditErr('Metadata 不是合法 JSON');
+      return;
+    }
+    if (meta === null || typeof meta !== 'object' || Array.isArray(meta)) {
+      showEditErr('Metadata 必须是 JSON 对象');
+      return;
+    }
+    var tags = editTags.value.split(',').map(function (s) { return s.trim(); }).filter(Boolean);
+    var body = {
+      folder: editFolder.value,
+      type: editType.value,
+      name: editName.value.trim(),
+      notes: editNotes.value,
+      tags: tags,
+      metadata: meta
+    };
+    showEditErr('');
+    fetch('/api/entries/' + encodeURIComponent(currentEntryId), {
+      method: 'PATCH',
+      headers: { 'Content-Type': 'application/json' },
+      credentials: 'same-origin',
+      body: JSON.stringify(body)
+    }).then(function (r) {
+      return r.json().then(function (data) {
+        if (!r.ok) throw new Error(data.error || ('HTTP ' + r.status));
+        return data;
+      });
+    }).then(function () {
+      closeEdit();
+      window.location.reload();
+    }).catch(function (e) {
+      showEditErr(e.message || String(e));
+    });
+  });
+
+  document.querySelectorAll('tr[data-entry-id]').forEach(function (tr) {
+    tr.querySelector('.btn-edit').addEventListener('click', function () { openEdit(tr); });
+    tr.querySelector('.btn-del').addEventListener('click', function () {
+      var id = tr.getAttribute('data-entry-id');
+      var nameEl = tr.querySelector('.cell-name');
+      var name = nameEl ? nameEl.textContent.trim() : '';
+      if (!id) return;
+      if (!confirm('确定删除条目「' + name + '」？关联的密文字段将一并删除。')) return;
+      fetch('/api/entries/' + encodeURIComponent(id), { method: 'DELETE', credentials: 'same-origin' })
+        .then(function (r) {
+          return r.json().then(function (data) {
+            if (!r.ok) throw new Error(data.error || ('HTTP ' + r.status));
+            return data;
+          });
+        })
+        .then(function () { window.location.reload(); })
+        .catch(function (e) { alert(e.message || String(e)); });
+    });
+  });
 })();
 </script>
 </body>