Release secrets-mcp 0.3.0: folder/type schema and MCP folder disambiguation

- Rename namespace/kind to folder/type on entries, audit_log, and history tables; add notes. Unique key is (user_id, folder, name). - Service layer and MCP tools support name-first lookup with optional folder when multiple entries share the same name. - secrets_delete dry_run uses the same disambiguation as real deletes. - Add scripts/migrate-v0.3.0.sql for manual DB migration. Refresh README and AGENTS.md. Made-with: Cursor
docs: 同步 CI 触发路径、覆盖式 tag/Release 说明与 RUST_LOG 示例
2026-03-26 15:12:28 +08:00 · 2026-03-22 16:15:29 +08:00 · 2026-03-22 16:11:59 +08:00
26 changed files with 1499 additions and 580 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -29,7 +29,8 @@ secrets/

 - **建议库名**：`secrets-mcp`（专用实例，与历史库名区分）。
 - **连接**：环境变量 **`SECRETS_DATABASE_URL`**（本分支无本地配置文件路径）。
- **表**：`entries`（含 `user_id`）、`secrets`、`entries_history`、`secrets_history`、`audit_log`、`users`、`oauth_accounts`，首次连接 **auto-migrate**。
+- **表**：`entries`（含 `user_id`）、`secrets`、`entries_history`、`secrets_history`、`audit_log`、`users`、`oauth_accounts`，首次连接 **auto-migrate**（`secrets-core` 的 `migrate`）。
+- **Web 会话**：与上项 **同一数据库 URL**；`secrets-mcp` 启动时对 tower-sessions 的 PostgreSQL 存储 **auto-migrate**（会话表与业务表共存于该实例，无需第二套连接串）。

 ### 表结构（摘录）

@@ -37,15 +38,18 @@ secrets/
 entries (
  id          UUID PRIMARY KEY DEFAULT uuidv7(),
  user_id     UUID,                                -- 多租户：NULL=遗留行；非空=归属用户
-  namespace   VARCHAR(64)   NOT NULL,
-  kind        VARCHAR(64)   NOT NULL,
+  folder      VARCHAR(128)  NOT NULL DEFAULT '',
+  type        VARCHAR(64)   NOT NULL DEFAULT '',
  name        VARCHAR(256)  NOT NULL,
+  notes       TEXT          NOT NULL DEFAULT '',
  tags        TEXT[]        NOT NULL DEFAULT '{}',
  metadata    JSONB         NOT NULL DEFAULT '{}',
  version     BIGINT        NOT NULL DEFAULT 1,
  created_at  TIMESTAMPTZ   NOT NULL DEFAULT NOW(),
  updated_at  TIMESTAMPTZ   NOT NULL DEFAULT NOW()
 )
+-- 唯一：UNIQUE(user_id, folder, name) WHERE user_id IS NOT NULL；
+--       UNIQUE(folder, name) WHERE user_id IS NULL（单租户遗留）
 ```

 ```sql
@@ -82,22 +86,31 @@ oauth_accounts (
  user_id      UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
  provider     VARCHAR(32) NOT NULL,
  provider_id  VARCHAR(256) NOT NULL,
-  ...
+  email        VARCHAR(256),
+  name         VARCHAR(256),
+  avatar_url   TEXT,
+  created_at   TIMESTAMPTZ NOT NULL DEFAULT NOW(),
  UNIQUE(provider, provider_id)
 )
+-- 另有唯一索引 UNIQUE(user_id, provider)（迁移中 idx_oauth_accounts_user_provider）：同一用户每种 provider 至多一条关联。
 ```

 ### audit_log / history

-与迁移脚本一致：`audit_log`、`entries_history`、`secrets_history` 用于审计与时间旅行恢复；字段定义见 `crates/secrets-core/src/db.rs` 内 `migrate` SQL。`audit_log` 中普通业务事件的 `namespace/kind/name` 对应 entry 坐标；登录类事件固定使用 `namespace='auth'`，此时 `kind/name` 表示认证目标而非 entry 身份。
+与迁移脚本一致：`audit_log`、`entries_history`、`secrets_history` 用于审计与时间旅行恢复；字段定义见 `crates/secrets-core/src/db.rs` 内 `migrate` SQL。`audit_log` 含可选 **`user_id`**（多租户下标识操作者；可空以兼容遗留数据）。`audit_log` 中普通业务事件使用 **`folder` / `type` / `name`** 对应 entry 坐标；登录类事件固定使用 **`folder='auth'`**，此时 `type`/`name` 表示认证目标而非 entry 身份。
+
+### MCP 消歧（AI 调用）
+
+按 `name` 定位条目的工具（`get` / `update` / 单条 `delete` / `history` / `rollback`）：若该用户下仅一条匹配则直接执行；若多条（同 `name`、不同 `folder`）则返回错误并提示补全 `folder`。`secrets_delete` 的 `dry_run=true` 与真实删除使用相同消歧规则。

 ### 字段职责

 | 字段 | 含义 | 示例 |
 |------|------|------|
-| `namespace` | 隔离空间 | `refining` |
-| `kind` | 记录类型 | `server`, `service`, `key` |
-| `name` | 标识名 | `gitea`, `i-example0…` |
+| `folder` | 隔离空间（参与唯一键） | `refining` |
+| `type` | 软分类（不参与唯一键） | `server`, `service`, `key`, `person` |
+| `name` | 标识名 | `gitea`, `aliyun` |
+| `notes` | 非敏感说明 | 自由文本 |
 | `tags` | 标签 | `["aliyun","prod"]` |
 | `metadata` | 明文描述 | `ip`、`url`、`key_ref` |
 | `secrets.field_name` | 加密字段名（明文） | `token`, `ssh_key` |
@@ -105,7 +118,7 @@ oauth_accounts (

 ### PEM 共享（`key_ref`）

-将共享 PEM 存为 `kind=key` 的 entry；其它记录在 `metadata.key_ref` 指向该 key 的 `name`。更新 key 记录后，引用方通过服务层解析合并逻辑即可使用新密钥（实现见 `secrets_core::service`）。
+将共享 PEM 存为 **`type=key`** 的 entry；其它记录在 `metadata.key_ref` 指向该 key 的 `name`。更新 key 记录后，引用方通过服务层解析合并逻辑即可使用新密钥（实现见 `secrets_core::service`）。

 ## 代码规范

@@ -140,10 +153,10 @@ git tag -l 'secrets-mcp-*'

 ## CI/CD

- **触发**：任意分支 `push`，且路径含 `crates/**`、`deploy/**`、根目录 `Cargo.toml`、`Cargo.lock`（见 `.gitea/workflows/secrets.yml`）。
- **版本与 tag**：从 `crates/secrets-mcp/Cargo.toml` 读版本；若远程已存在同名 `secrets-mcp-<version>` tag，则复用现有 tag 继续构建；否则由 CI 创建并推送该 tag。
+- **触发**：任意分支 `push`，且路径含 `crates/**`、`deploy/**`、根目录 `Cargo.toml`、`Cargo.lock`、`.gitea/workflows/**`（见 `.gitea/workflows/secrets.yml`）。
+- **版本与 tag**：从 `crates/secrets-mcp/Cargo.toml` 读版本；构建成功后打 `secrets-mcp-<version>`：若远端已存在同名 tag，CI 会先删后于**当前提交**重建并推送（覆盖式发版）。
 - **质量与构建**：`fmt` / `clippy --locked` / `test --locked` → `x86_64-unknown-linux-musl` 发布构建 `secrets-mcp`。
- **Release（可选）**：`secrets.RELEASE_TOKEN`（Gitea PAT）用于创建草稿 Release、上传 `tar.gz` + `.sha256`、构建成功后发布；未配置则跳过 API Release，仅 tag + 构建。
+- **Release（可选）**：`secrets.RELEASE_TOKEN`（Gitea PAT）用于通过 API **创建或更新**该 tag 的 Release（非 draft）、上传 `tar.gz` + `.sha256`；未配置则跳过 API Release，仅 tag + 构建。
 - **部署（可选）**：仅 `main`、`feat/mcp`、`mcp` 分支在构建成功时跑 `deploy-mcp`；需 `vars.DEPLOY_HOST`、`vars.DEPLOY_USER`、`secrets.DEPLOY_SSH_KEY`。勿把 OAuth/DB 等写进 workflow，用 `deploy/.env.example` 在目标机配置。
 - **Secrets 写法**：Actions **secrets 须为原始值**（PEM、PAT 明文），**勿** base64；否则 SSH/Release 会失败。**勿**在 CI 中保存 `GOOGLE_CLIENT_SECRET`、DB 密码。
 - **通知**：`vars.WEBHOOK_URL`（可选，飞书）。
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1968,7 +1968,7 @@ dependencies = [

 [[package]]
 name = "secrets-mcp"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
 "anyhow",
 "askama",
--- a/README.md
+++ b/README.md
@@ -21,13 +21,22 @@ cargo build --release -p secrets-mcp
 | `BASE_URL` | 对外访问基址；OAuth 回调为 `{BASE_URL}/auth/google/callback`。默认 `http://localhost:9315`。 |
 | `SECRETS_MCP_BIND` | 监听地址，默认 `127.0.0.1:9315`。容器内或直接对外暴露端口时请改为 `0.0.0.0:9315`；反代时常为 `127.0.0.1:9315`。 |
 | `GOOGLE_CLIENT_ID` / `GOOGLE_CLIENT_SECRET` | 可选；不配置则无 Google 登录入口。运行时从环境读取，勿写入 CI、勿打入二进制。 |
+| `RUST_LOG` | 可选；日志级别，如 `secrets_mcp=debug`。 |

 ```bash
 cargo run -p secrets-mcp
 ```

 - **Web**：`BASE_URL`（登录、Dashboard、设置密码短语、创建 API Key）。
- **MCP**：Streamable HTTP 基址 `{BASE_URL}/mcp`，需 `Authorization: Bearer <api_key>` + `X-Encryption-Key: <hex>` 请求头。
+- **MCP**：Streamable HTTP 基址 `{BASE_URL}/mcp`，需 `Authorization: Bearer <api_key>` + `X-Encryption-Key: <hex>` 请求头（读密文工具须带密钥）。
+
+## MCP 与 AI 工作流（v0.3+）
+
+条目在逻辑上以 **`(folder, name)`** 在用户内唯一（数据库唯一索引：`user_id + folder + name`）。同名可在不同 folder 下各存一条（例如 `refining/aliyun` 与 `ricnsmart/aliyun`）。
+
+- **`secrets_search`**：发现条目（可按 query / folder / type / name 过滤）；不要求加密头。
+- **`secrets_get` / `secrets_update` / `secrets_delete`（按 name）/ `secrets_history` / `secrets_rollback`**：仅 `name` 且全局唯一则直接命中；若多条同名，返回消歧错误，需在参数中补 **`folder`**。
+- **`secrets_delete`**：`dry_run=true` 时与真实删除相同的消歧规则——唯一则预览一条，多条则报错并要求 `folder`。

 ## 加密架构（混合 E2EE）

@@ -121,13 +130,14 @@ flowchart LR

 ## 数据模型

-主表 **`entries`**（`namespace`、`kind`、`name`、`tags`、`metadata`，多租户时带 `user_id`）+ 子表 **`secrets`**（每行一个加密字段：`field_name`、`encrypted`）。另有 `entries_history`、`secrets_history`、`audit_log`，以及 **`users`**（含 `key_salt`、`key_check`、`key_params`、`api_key`）、**`oauth_accounts`**。首次连库自动迁移建表。
+主表 **`entries`**（`folder`、`type`、`name`、`notes`、`tags`、`metadata`，多租户时带 `user_id`）+ 子表 **`secrets`**（每行一个加密字段：`field_name`、`encrypted`）。**唯一性**：`UNIQUE(user_id, folder, name)`（`user_id` 为空时为遗留行唯一 `(folder, name)`）。另有 `entries_history`、`secrets_history`、`audit_log`，以及 **`users`**（含 `key_salt`、`key_check`、`key_params`、`api_key`）、**`oauth_accounts`**。首次连库自动迁移建表（`secrets-core` 的 `migrate`）；已有库可对照 [`scripts/migrate-v0.3.0.sql`](scripts/migrate-v0.3.0.sql) 做列重命名与索引重建。**Web 登录会话**（tower-sessions）使用同一 `SECRETS_DATABASE_URL`，进程启动时对会话存储执行迁移（见 `secrets-mcp` 中 `PostgresStore::migrate`），无需额外环境变量。

 | 位置 | 字段 | 说明 |
 |------|------|------|
-| entries | namespace | 一级隔离，如 `refining`、`ricnsmart` |
-| entries | kind | `server`、`service`、`key` 等（可扩展） |
-| entries | name | 人类可读标识 |
+| entries | folder | 组织/隔离空间，如 `refining`、`ricnsmart`；参与唯一键 |
+| entries | type | 软分类，如 `server`、`service`、`key`、`person`（可扩展，不参与唯一键） |
+| entries | name | 人类可读标识；与 `folder` 一起在用户内唯一 |
+| entries | notes | 非敏感说明文本 |
 | entries | metadata | 明文 JSON（ip、url、`key_ref` 等） |
 | secrets | field_name | 明文字段名，便于 schema 展示 |
 | secrets | encrypted | AES-GCM 密文（含 nonce） |
@@ -137,15 +147,15 @@ flowchart LR

 ### PEM 共享（`key_ref`）

-同一 PEM 可被多条 `server` 记录引用：将 PEM 存为 `kind=key` 的 entry，在服务器条目的 `metadata.key_ref` 中写 key 的名称；轮换时只更新 key 对应记录即可。
+同一 PEM 可被多条 `server` 等记录引用：将 PEM 存为 **`type=key`** 的 entry，在其它条目的 `metadata.key_ref` 中写该 key 条目的 `name`；轮换时只更新 key 对应记录即可。

 ## 审计日志

-`add`、`update`、`delete` 等写操作写入 **`audit_log`**（操作类型、对象、摘要，不含 secret 明文）。
-其中业务条目事件使用 `[namespace/kind] name` 语义；登录类事件使用 `namespace='auth'`，此时 `kind/name` 表示认证目标（例如 `oauth/google`），不表示某条 secrets entry。
+`add`、`update`、`delete` 等写操作写入 **`audit_log`**（操作类型、对象、摘要，不含 secret 明文）。多租户场景下可写 **`user_id`**（可空，兼容遗留行）。
+业务条目事件使用 **`folder` / `type` / `name`**；登录类事件使用 **`folder='auth'`**，此时 `type`/`name` 表示认证目标（例如 `oauth` / `google`），不表示某条 secrets entry。

 ```sql
-SELECT action, namespace, kind, name, detail, created_at
+SELECT action, folder, type, name, detail, user_id, created_at
 FROM audit_log
 ORDER BY created_at DESC
 LIMIT 20;
@@ -158,6 +168,7 @@ Cargo.toml
 crates/secrets-core/     # db / crypto / models / audit / service
 crates/secrets-mcp/     # MCP HTTP、Web、OAuth、API Key
 scripts/
+  migrate-v0.3.0.sql    # 可选：手动 SQL 迁移（namespace/kind → folder/type、唯一键含 folder）
 deploy/                 # systemd、.env 示例
 ```

@@ -165,9 +176,9 @@ deploy/                 # systemd、.env 示例

 见 [`.gitea/workflows/secrets.yml`](.gitea/workflows/secrets.yml)。

- **触发**：任意分支 `push`，且变更路径包含 `crates/**`、`deploy/**`、根目录 `Cargo.toml` / `Cargo.lock`。
- **流水线**：解析 `crates/secrets-mcp/Cargo.toml` 版本 → 若 `secrets-mcp-<version>` 的 tag 已存在则**复用现有 tag 继续构建**，否则自动打 tag → `cargo fmt` / `clippy --locked` / `test --locked` → 交叉编译 `x86_64-unknown-linux-musl` 的 `secrets-mcp`。
- **Release（可选）**：配置仓库 Secret `RELEASE_TOKEN`（Gitea PAT，明文勿 base64）时，会通过 API 创建**草稿** Release、在 Linux 构建成功后上传 `tar.gz` 与 `.sha256`，再自动将草稿**正式发布**；未配置则跳过创建 Release 与产物上传，仅保留 tag 与构建结果。
+- **触发**：任意分支 `push`，且变更路径包含 `crates/**`、`deploy/**`、根目录 `Cargo.toml` / `Cargo.lock`、`.gitea/workflows/**`。
+- **流水线**：解析 `crates/secrets-mcp/Cargo.toml` 版本 → `cargo fmt` / `clippy --locked` / `test --locked` → 交叉编译 `x86_64-unknown-linux-musl` 的 `secrets-mcp` → 构建成功后打 tag `secrets-mcp-<version>`（若远端已存在同名 tag，会先删除再于**当前提交**重建并推送，覆盖式发版）。
+- **Release（可选）**：配置仓库 Secret `RELEASE_TOKEN`（Gitea PAT，明文勿 base64）时，会通过 API **创建或更新**已指向该 tag 的 Release（非 draft）、上传 `tar.gz` 与 `.sha256`；未配置则跳过 API Release，仅 tag + 构建结果。
 - **部署（可选）**：仅在 `main`、`feat/mcp` 或 `mcp` 分支且构建成功时，若已配置 `vars.DEPLOY_HOST`、`vars.DEPLOY_USER` 与 `secrets.DEPLOY_SSH_KEY`，则 `deploy-mcp` 通过 SCP/SSH 更新目标机二进制并 `systemctl restart secrets-mcp`。
 - **通知（可选）**：`vars.WEBHOOK_URL` 为飞书 Webhook 时，构建/部署/发布节点会推送简要状态。

--- a/crates/secrets-core/src/audit.rs
+++ b/crates/secrets-core/src/audit.rs
@@ -3,7 +3,7 @@ use sqlx::{PgPool, Postgres, Transaction};
 use uuid::Uuid;

 pub const ACTION_LOGIN: &str = "login";
-pub const NAMESPACE_AUTH: &str = "auth";
+pub const FOLDER_AUTH: &str = "auth";

 fn login_detail(provider: &str, client_ip: Option<&str>, user_agent: Option<&str>) -> Value {
    json!({
@@ -16,7 +16,7 @@ fn login_detail(provider: &str, client_ip: Option<&str>, user_agent: Option<&str
 /// Write a login audit entry without requiring an explicit transaction.
 pub async fn log_login(
    pool: &PgPool,
-    kind: &str,
+    entry_type: &str,
    provider: &str,
    user_id: Uuid,
    client_ip: Option<&str>,
@@ -24,22 +24,22 @@ pub async fn log_login(
 ) {
    let detail = login_detail(provider, client_ip, user_agent);
    let result: Result<_, sqlx::Error> = sqlx::query(
-        "INSERT INTO audit_log (user_id, action, namespace, kind, name, detail) \
+        "INSERT INTO audit_log (user_id, action, folder, type, name, detail) \
         VALUES ($1, $2, $3, $4, $5, $6)",
    )
    .bind(user_id)
    .bind(ACTION_LOGIN)
-    .bind(NAMESPACE_AUTH)
-    .bind(kind)
+    .bind(FOLDER_AUTH)
+    .bind(entry_type)
    .bind(provider)
    .bind(&detail)
    .execute(pool)
    .await;

    if let Err(e) = result {
-        tracing::warn!(error = %e, kind, provider, "failed to write login audit log");
+        tracing::warn!(error = %e, entry_type, provider, "failed to write login audit log");
    } else {
-        tracing::debug!(kind, provider, ?user_id, "login audit logged");
+        tracing::debug!(entry_type, provider, ?user_id, "login audit logged");
    }
 }

@@ -48,19 +48,19 @@ pub async fn log_tx(
    tx: &mut Transaction<'_, Postgres>,
    user_id: Option<Uuid>,
    action: &str,
-    namespace: &str,
-    kind: &str,
+    folder: &str,
+    entry_type: &str,
    name: &str,
    detail: Value,
 ) {
    let result: Result<_, sqlx::Error> = sqlx::query(
-        "INSERT INTO audit_log (user_id, action, namespace, kind, name, detail) \
+        "INSERT INTO audit_log (user_id, action, folder, type, name, detail) \
         VALUES ($1, $2, $3, $4, $5, $6)",
    )
    .bind(user_id)
    .bind(action)
-    .bind(namespace)
-    .bind(kind)
+    .bind(folder)
+    .bind(entry_type)
    .bind(name)
    .bind(&detail)
    .execute(&mut **tx)
@@ -69,7 +69,7 @@ pub async fn log_tx(
    if let Err(e) = result {
        tracing::warn!(error = %e, "failed to write audit log");
    } else {
-        tracing::debug!(action, namespace, kind, name, "audit logged");
+        tracing::debug!(action, folder, entry_type, name, "audit logged");
    }
 }

--- a/crates/secrets-core/src/db.rs
+++ b/crates/secrets-core/src/db.rs
@@ -22,9 +22,10 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {
        CREATE TABLE IF NOT EXISTS entries (
            id          UUID PRIMARY KEY DEFAULT uuidv7(),
            user_id     UUID,
-            namespace   VARCHAR(64)  NOT NULL,
-            kind        VARCHAR(64)  NOT NULL,
+            folder      VARCHAR(128) NOT NULL DEFAULT '',
+            type        VARCHAR(64)  NOT NULL DEFAULT '',
            name        VARCHAR(256) NOT NULL,
+            notes       TEXT         NOT NULL DEFAULT '',
            tags        TEXT[]       NOT NULL DEFAULT '{}',
            metadata    JSONB        NOT NULL DEFAULT '{}',
            version     BIGINT       NOT NULL DEFAULT 1,
@@ -34,19 +35,19 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {

        -- Legacy unique constraint without user_id (single-user mode)
        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_legacy
-            ON entries(namespace, kind, name)
+            ON entries(folder, name)
            WHERE user_id IS NULL;

        -- Multi-user unique constraint
        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_user
-            ON entries(user_id, namespace, kind, name)
+            ON entries(user_id, folder, name)
            WHERE user_id IS NOT NULL;

-        CREATE INDEX IF NOT EXISTS idx_entries_namespace ON entries(namespace);
-        CREATE INDEX IF NOT EXISTS idx_entries_kind      ON entries(kind);
-        CREATE INDEX IF NOT EXISTS idx_entries_user_id   ON entries(user_id) WHERE user_id IS NOT NULL;
-        CREATE INDEX IF NOT EXISTS idx_entries_tags      ON entries USING GIN(tags);
-        CREATE INDEX IF NOT EXISTS idx_entries_metadata  ON entries USING GIN(metadata jsonb_path_ops);
+        CREATE INDEX IF NOT EXISTS idx_entries_folder   ON entries(folder) WHERE folder <> '';
+        CREATE INDEX IF NOT EXISTS idx_entries_type     ON entries(type) WHERE type <> '';
+        CREATE INDEX IF NOT EXISTS idx_entries_user_id  ON entries(user_id) WHERE user_id IS NOT NULL;
+        CREATE INDEX IF NOT EXISTS idx_entries_tags     ON entries USING GIN(tags);
+        CREATE INDEX IF NOT EXISTS idx_entries_metadata ON entries USING GIN(metadata jsonb_path_ops);

        -- ── secrets: one row per encrypted field ─────────────────────────────────
        CREATE TABLE IF NOT EXISTS secrets (
@@ -67,23 +68,23 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {
            id          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
            user_id     UUID,
            action      VARCHAR(32)  NOT NULL,
-            namespace   VARCHAR(64)  NOT NULL,
-            kind        VARCHAR(64)  NOT NULL,
+            folder      VARCHAR(128) NOT NULL DEFAULT '',
+            type        VARCHAR(64)  NOT NULL DEFAULT '',
            name        VARCHAR(256) NOT NULL,
            detail      JSONB        NOT NULL DEFAULT '{}',
            created_at  TIMESTAMPTZ  NOT NULL DEFAULT NOW()
        );

-        CREATE INDEX IF NOT EXISTS idx_audit_log_created  ON audit_log(created_at DESC);
-        CREATE INDEX IF NOT EXISTS idx_audit_log_ns_kind  ON audit_log(namespace, kind);
-        CREATE INDEX IF NOT EXISTS idx_audit_log_user_id  ON audit_log(user_id) WHERE user_id IS NOT NULL;
+        CREATE INDEX IF NOT EXISTS idx_audit_log_created      ON audit_log(created_at DESC);
+        CREATE INDEX IF NOT EXISTS idx_audit_log_folder_type  ON audit_log(folder, type);
+        CREATE INDEX IF NOT EXISTS idx_audit_log_user_id      ON audit_log(user_id) WHERE user_id IS NOT NULL;

        -- ── entries_history ───────────────────────────────────────────────────────
        CREATE TABLE IF NOT EXISTS entries_history (
            id          BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
            entry_id    UUID         NOT NULL,
-            namespace   VARCHAR(64)  NOT NULL,
-            kind        VARCHAR(64)  NOT NULL,
+            folder      VARCHAR(128) NOT NULL DEFAULT '',
+            type        VARCHAR(64)  NOT NULL DEFAULT '',
            name        VARCHAR(256) NOT NULL,
            version     BIGINT       NOT NULL,
            action      VARCHAR(16)  NOT NULL,
@@ -94,8 +95,8 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {

        CREATE INDEX IF NOT EXISTS idx_entries_history_entry_id
            ON entries_history(entry_id, version DESC);
-        CREATE INDEX IF NOT EXISTS idx_entries_history_ns_kind_name
-            ON entries_history(namespace, kind, name, version DESC);
+        CREATE INDEX IF NOT EXISTS idx_entries_history_folder_type_name
+            ON entries_history(folder, type, name, version DESC);

        -- Backfill: add user_id to entries_history for multi-tenant isolation
        ALTER TABLE entries_history ADD COLUMN IF NOT EXISTS user_id UUID;
@@ -103,6 +104,9 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {
            ON entries_history(user_id) WHERE user_id IS NOT NULL;
        ALTER TABLE entries_history DROP COLUMN IF EXISTS actor;

+        -- Backfill: add notes to entries if not present (fresh installs already have it)
+        ALTER TABLE entries ADD COLUMN IF NOT EXISTS notes TEXT NOT NULL DEFAULT '';
+
        -- ── secrets_history: field-level snapshot ────────────────────────────────
        CREATE TABLE IF NOT EXISTS secrets_history (
            id              BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
@@ -123,9 +127,6 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {
        -- Drop redundant actor column (derivable via entries_history JOIN)
        ALTER TABLE secrets_history DROP COLUMN IF EXISTS actor;

-        -- Drop redundant actor column; user_id already identifies the business user
-        ALTER TABLE audit_log DROP COLUMN IF EXISTS actor;
-
        -- ── users ─────────────────────────────────────────────────────────────────
        CREATE TABLE IF NOT EXISTS users (
            id          UUID PRIMARY KEY DEFAULT uuidv7(),
@@ -191,12 +192,179 @@ pub async fn migrate(pool: &PgPool) -> Result<()> {
    )
    .execute(pool)
    .await?;
+    migrate_schema(pool).await?;
    restore_plaintext_api_keys(pool).await?;

    tracing::debug!("migrations complete");
    Ok(())
 }

+/// Idempotent schema migration: rename namespace→folder, kind→type in existing databases.
+async fn migrate_schema(pool: &PgPool) -> Result<()> {
+    sqlx::raw_sql(
+        r#"
+        -- ── entries: rename namespace→folder, kind→type ──────────────────────────
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries' AND column_name = 'namespace'
+            ) THEN
+                ALTER TABLE entries RENAME COLUMN namespace TO folder;
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries' AND column_name = 'kind'
+            ) THEN
+                ALTER TABLE entries RENAME COLUMN kind TO type;
+            END IF;
+        END $$;
+
+        -- ── audit_log: rename namespace→folder, kind→type ────────────────────────
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'audit_log' AND column_name = 'namespace'
+            ) THEN
+                ALTER TABLE audit_log RENAME COLUMN namespace TO folder;
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'audit_log' AND column_name = 'kind'
+            ) THEN
+                ALTER TABLE audit_log RENAME COLUMN kind TO type;
+            END IF;
+        END $$;
+
+        -- ── entries_history: rename namespace→folder, kind→type ──────────────────
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries_history' AND column_name = 'namespace'
+            ) THEN
+                ALTER TABLE entries_history RENAME COLUMN namespace TO folder;
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries_history' AND column_name = 'kind'
+            ) THEN
+                ALTER TABLE entries_history RENAME COLUMN kind TO type;
+            END IF;
+        END $$;
+
+        -- ── Set empty defaults for new folder/type columns ────────────────────────
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries' AND column_name = 'folder'
+            ) THEN
+                UPDATE entries SET folder = '' WHERE folder IS NULL;
+                ALTER TABLE entries ALTER COLUMN folder SET NOT NULL;
+                ALTER TABLE entries ALTER COLUMN folder SET DEFAULT '';
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries' AND column_name = 'type'
+            ) THEN
+                UPDATE entries SET type = '' WHERE type IS NULL;
+                ALTER TABLE entries ALTER COLUMN type SET NOT NULL;
+                ALTER TABLE entries ALTER COLUMN type SET DEFAULT '';
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'audit_log' AND column_name = 'folder'
+            ) THEN
+                UPDATE audit_log SET folder = '' WHERE folder IS NULL;
+                ALTER TABLE audit_log ALTER COLUMN folder SET NOT NULL;
+                ALTER TABLE audit_log ALTER COLUMN folder SET DEFAULT '';
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'audit_log' AND column_name = 'type'
+            ) THEN
+                UPDATE audit_log SET type = '' WHERE type IS NULL;
+                ALTER TABLE audit_log ALTER COLUMN type SET NOT NULL;
+                ALTER TABLE audit_log ALTER COLUMN type SET DEFAULT '';
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries_history' AND column_name = 'folder'
+            ) THEN
+                UPDATE entries_history SET folder = '' WHERE folder IS NULL;
+                ALTER TABLE entries_history ALTER COLUMN folder SET NOT NULL;
+                ALTER TABLE entries_history ALTER COLUMN folder SET DEFAULT '';
+            END IF;
+        END $$;
+
+        DO $$ BEGIN
+            IF EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'entries_history' AND column_name = 'type'
+            ) THEN
+                UPDATE entries_history SET type = '' WHERE type IS NULL;
+                ALTER TABLE entries_history ALTER COLUMN type SET NOT NULL;
+                ALTER TABLE entries_history ALTER COLUMN type SET DEFAULT '';
+            END IF;
+        END $$;
+
+        -- ── Rebuild unique indexes on entries: folder is now part of the key ────────
+        -- (user_id, folder, name) allows same name in different folders.
+        DROP INDEX IF EXISTS idx_entries_unique_legacy;
+        DROP INDEX IF EXISTS idx_entries_unique_user;
+
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_legacy
+            ON entries(folder, name)
+            WHERE user_id IS NULL;
+
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_user
+            ON entries(user_id, folder, name)
+            WHERE user_id IS NOT NULL;
+
+        -- ── Replace old namespace/kind indexes ────────────────────────────────────
+        DROP INDEX IF EXISTS idx_entries_namespace;
+        DROP INDEX IF EXISTS idx_entries_kind;
+        DROP INDEX IF EXISTS idx_audit_log_ns_kind;
+        DROP INDEX IF EXISTS idx_entries_history_ns_kind_name;
+
+        CREATE INDEX IF NOT EXISTS idx_entries_folder
+            ON entries(folder) WHERE folder <> '';
+        CREATE INDEX IF NOT EXISTS idx_entries_type
+            ON entries(type) WHERE type <> '';
+        CREATE INDEX IF NOT EXISTS idx_audit_log_folder_type
+            ON audit_log(folder, type);
+        CREATE INDEX IF NOT EXISTS idx_entries_history_folder_type_name
+            ON entries_history(folder, type, name, version DESC);
+
+        -- ── Drop legacy actor columns ─────────────────────────────────────────────
+        ALTER TABLE secrets_history DROP COLUMN IF EXISTS actor;
+        ALTER TABLE audit_log DROP COLUMN IF EXISTS actor;
+        "#,
+    )
+    .execute(pool)
+    .await?;
+    Ok(())
+}
+
 async fn restore_plaintext_api_keys(pool: &PgPool) -> Result<()> {
    let has_users_api_key: bool = sqlx::query_scalar(
        "SELECT EXISTS (
@@ -265,8 +433,8 @@ async fn restore_plaintext_api_keys(pool: &PgPool) -> Result<()> {
 pub struct EntrySnapshotParams<'a> {
    pub entry_id: uuid::Uuid,
    pub user_id: Option<uuid::Uuid>,
-    pub namespace: &'a str,
-    pub kind: &'a str,
+    pub folder: &'a str,
+    pub entry_type: &'a str,
    pub name: &'a str,
    pub version: i64,
    pub action: &'a str,
@@ -280,12 +448,12 @@ pub async fn snapshot_entry_history(
 ) -> Result<()> {
    sqlx::query(
        "INSERT INTO entries_history \
-         (entry_id, namespace, kind, name, version, action, tags, metadata, user_id) \
+         (entry_id, folder, type, name, version, action, tags, metadata, user_id) \
         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)",
    )
    .bind(p.entry_id)
-    .bind(p.namespace)
-    .bind(p.kind)
+    .bind(p.folder)
+    .bind(p.entry_type)
    .bind(p.name)
    .bind(p.version)
    .bind(p.action)
--- a/crates/secrets-core/src/models.rs
+++ b/crates/secrets-core/src/models.rs
@@ -4,15 +4,18 @@ use serde_json::Value;
 use std::collections::BTreeMap;
 use uuid::Uuid;

-/// A top-level entry (server, service, key, …).
+/// A top-level entry (server, service, key, person, …).
 /// Sensitive fields are stored separately in `secrets`.
 #[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
 pub struct Entry {
    pub id: Uuid,
    pub user_id: Option<Uuid>,
-    pub namespace: String,
-    pub kind: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    #[sqlx(rename = "type")]
+    pub entry_type: String,
    pub name: String,
+    pub notes: String,
    pub tags: Vec<String>,
    pub metadata: Value,
    pub version: i64,
@@ -40,8 +43,12 @@ pub struct SecretField {
 pub struct EntryRow {
    pub id: Uuid,
    pub version: i64,
+    pub folder: String,
+    #[sqlx(rename = "type")]
+    pub entry_type: String,
    pub tags: Vec<String>,
    pub metadata: Value,
+    pub notes: String,
 }

 /// Minimal secret field row fetched before snapshots or cascade deletes.
@@ -128,10 +135,14 @@ pub struct ExportData {
 /// A single entry with decrypted secrets for export/import.
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ExportEntry {
-    pub namespace: String,
-    pub kind: String,
    pub name: String,
    #[serde(default)]
+    pub folder: String,
+    #[serde(default, rename = "type")]
+    pub entry_type: String,
+    #[serde(default)]
+    pub notes: String,
+    #[serde(default)]
    pub tags: Vec<String>,
    #[serde(default)]
    pub metadata: Value,
@@ -181,8 +192,10 @@ pub struct AuditLogEntry {
    pub id: i64,
    pub user_id: Option<Uuid>,
    pub action: String,
-    pub namespace: String,
-    pub kind: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    #[sqlx(rename = "type")]
+    pub entry_type: String,
    pub name: String,
    pub detail: Value,
    pub created_at: DateTime<Utc>,
--- a/crates/secrets-core/src/service/add.rs
+++ b/crates/secrets-core/src/service/add.rs
@@ -159,18 +159,20 @@ pub fn flatten_json_fields(prefix: &str, value: &Value) -> Vec<(String, Value)>

 #[derive(Debug, serde::Serialize)]
 pub struct AddResult {
-    pub namespace: String,
-    pub kind: String,
    pub name: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    pub entry_type: String,
    pub tags: Vec<String>,
    pub meta_keys: Vec<String>,
    pub secret_keys: Vec<String>,
 }

 pub struct AddParams<'a> {
-    pub namespace: &'a str,
-    pub kind: &'a str,
    pub name: &'a str,
+    pub folder: &'a str,
+    pub entry_type: &'a str,
+    pub notes: &'a str,
    pub tags: &'a [String],
    pub meta_entries: &'a [String],
    pub secret_entries: &'a [String],
@@ -186,25 +188,23 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->

    let mut tx = pool.begin().await?;

-    // Fetch existing entry (user-scoped or global depending on user_id)
+    // Fetch existing entry by (user_id, folder, name) — the natural unique key
    let existing: Option<EntryRow> = if let Some(uid) = params.user_id {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id = $1 AND folder = $2 AND name = $3",
        )
        .bind(uid)
-        .bind(params.namespace)
-        .bind(params.kind)
+        .bind(params.folder)
        .bind(params.name)
        .fetch_optional(&mut *tx)
        .await?
    } else {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id IS NULL AND folder = $1 AND name = $2",
        )
-        .bind(params.namespace)
-        .bind(params.kind)
+        .bind(params.folder)
        .bind(params.name)
        .fetch_optional(&mut *tx)
        .await?
@@ -216,8 +216,8 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->
            db::EntrySnapshotParams {
                entry_id: ex.id,
                user_id: params.user_id,
-                namespace: params.namespace,
-                kind: params.kind,
+                folder: params.folder,
+                entry_type: params.entry_type,
                name: params.name,
                version: ex.version,
                action: "add",
@@ -232,10 +232,13 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->

    let entry_id: Uuid = if let Some(uid) = params.user_id {
        sqlx::query_scalar(
-            r#"INSERT INTO entries (user_id, namespace, kind, name, tags, metadata, version, updated_at)
-               VALUES ($1, $2, $3, $4, $5, $6, 1, NOW())
-               ON CONFLICT (user_id, namespace, kind, name) WHERE user_id IS NOT NULL
+            r#"INSERT INTO entries (user_id, folder, type, name, notes, tags, metadata, version, updated_at)
+               VALUES ($1, $2, $3, $4, $5, $6, $7, 1, NOW())
+               ON CONFLICT (user_id, folder, name) WHERE user_id IS NOT NULL
               DO UPDATE SET
+                   folder     = EXCLUDED.folder,
+                   type       = EXCLUDED.type,
+                   notes      = EXCLUDED.notes,
                   tags       = EXCLUDED.tags,
                   metadata   = EXCLUDED.metadata,
                   version    = entries.version + 1,
@@ -243,28 +246,33 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->
               RETURNING id"#,
        )
        .bind(uid)
-        .bind(params.namespace)
-        .bind(params.kind)
+        .bind(params.folder)
+        .bind(params.entry_type)
        .bind(params.name)
+        .bind(params.notes)
        .bind(params.tags)
        .bind(&metadata)
        .fetch_one(&mut *tx)
        .await?
    } else {
        sqlx::query_scalar(
-            r#"INSERT INTO entries (namespace, kind, name, tags, metadata, version, updated_at)
-               VALUES ($1, $2, $3, $4, $5, 1, NOW())
-               ON CONFLICT (namespace, kind, name) WHERE user_id IS NULL
+            r#"INSERT INTO entries (folder, type, name, notes, tags, metadata, version, updated_at)
+               VALUES ($1, $2, $3, $4, $5, $6, 1, NOW())
+               ON CONFLICT (folder, name) WHERE user_id IS NULL
               DO UPDATE SET
+                   folder     = EXCLUDED.folder,
+                   type       = EXCLUDED.type,
+                   notes      = EXCLUDED.notes,
                   tags       = EXCLUDED.tags,
                   metadata   = EXCLUDED.metadata,
                   version    = entries.version + 1,
                   updated_at = NOW()
               RETURNING id"#,
        )
-        .bind(params.namespace)
-        .bind(params.kind)
+        .bind(params.folder)
+        .bind(params.entry_type)
        .bind(params.name)
+        .bind(params.notes)
        .bind(params.tags)
        .bind(&metadata)
        .fetch_one(&mut *tx)
@@ -282,8 +290,8 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->
            db::EntrySnapshotParams {
                entry_id,
                user_id: params.user_id,
-                namespace: params.namespace,
-                kind: params.kind,
+                folder: params.folder,
+                entry_type: params.entry_type,
                name: params.name,
                version: new_entry_version,
                action: "create",
@@ -348,8 +356,8 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->
        &mut tx,
        params.user_id,
        "add",
-        params.namespace,
-        params.kind,
+        params.folder,
+        params.entry_type,
        params.name,
        serde_json::json!({
            "tags": params.tags,
@@ -362,9 +370,9 @@ pub async fn run(pool: &PgPool, params: AddParams<'_>, master_key: &[u8; 32]) ->
    tx.commit().await?;

    Ok(AddResult {
-        namespace: params.namespace.to_string(),
-        kind: params.kind.to_string(),
        name: params.name.to_string(),
+        folder: params.folder.to_string(),
+        entry_type: params.entry_type.to_string(),
        tags: params.tags.to_vec(),
        meta_keys,
        secret_keys,
--- a/crates/secrets-core/src/service/audit_log.rs
+++ b/crates/secrets-core/src/service/audit_log.rs
@@ -8,7 +8,7 @@ pub async fn list_for_user(pool: &PgPool, user_id: Uuid, limit: i64) -> Result<V
    let limit = limit.clamp(1, 200);

    let rows = sqlx::query_as(
-        "SELECT id, user_id, action, namespace, kind, name, detail, created_at \
+        "SELECT id, user_id, action, folder, type, name, detail, created_at \
         FROM audit_log \
         WHERE user_id = $1 \
         ORDER BY created_at DESC, id DESC \
--- a/crates/secrets-core/src/service/delete.rs
+++ b/crates/secrets-core/src/service/delete.rs
@@ -8,9 +8,10 @@ use crate::models::{EntryRow, SecretFieldRow};

 #[derive(Debug, serde::Serialize)]
 pub struct DeletedEntry {
-    pub namespace: String,
-    pub kind: String,
    pub name: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    pub entry_type: String,
 }

 #[derive(Debug, serde::Serialize)]
@@ -20,34 +21,29 @@ pub struct DeleteResult {
 }

 pub struct DeleteParams<'a> {
-    pub namespace: &'a str,
-    pub kind: Option<&'a str>,
+    /// If set, delete a single entry by name.
    pub name: Option<&'a str>,
+    /// Folder filter for bulk delete.
+    pub folder: Option<&'a str>,
+    /// Type filter for bulk delete.
+    pub entry_type: Option<&'a str>,
    pub dry_run: bool,
    pub user_id: Option<Uuid>,
 }

 pub async fn run(pool: &PgPool, params: DeleteParams<'_>) -> Result<DeleteResult> {
    match params.name {
-        Some(name) => {
-            let kind = params
-                .kind
-                .ok_or_else(|| anyhow::anyhow!("--kind is required when --name is specified"))?;
-            delete_one(
-                pool,
-                params.namespace,
-                kind,
-                name,
-                params.dry_run,
-                params.user_id,
-            )
-            .await
-        }
+        Some(name) => delete_one(pool, name, params.folder, params.dry_run, params.user_id).await,
        None => {
+            if params.folder.is_none() && params.entry_type.is_none() {
+                anyhow::bail!(
+                    "Bulk delete requires at least one of: name, folder, or type filter."
+                );
+            }
            delete_bulk(
                pool,
-                params.namespace,
-                params.kind,
+                params.folder,
+                params.entry_type,
                params.dry_run,
                params.user_id,
            )
@@ -58,93 +54,169 @@ pub async fn run(pool: &PgPool, params: DeleteParams<'_>) -> Result<DeleteResult

 async fn delete_one(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    dry_run: bool,
    user_id: Option<Uuid>,
 ) -> Result<DeleteResult> {
    if dry_run {
-        let exists: bool = if let Some(uid) = user_id {
-            sqlx::query_scalar(
-                "SELECT EXISTS(SELECT 1 FROM entries \
-                 WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4)",
+        // Dry-run uses the same disambiguation logic as actual delete:
+        // - 0 matches  → nothing to delete
+        // - 1 match    → show what would be deleted (with correct folder/type)
+        // - 2+ matches → disambiguation error (same as non-dry-run)
+        #[derive(sqlx::FromRow)]
+        struct DryRunRow {
+            folder: String,
+            #[sqlx(rename = "type")]
+            entry_type: String,
+        }
+
+        let rows: Vec<DryRunRow> = if let Some(uid) = user_id {
+            if let Some(f) = folder {
+                sqlx::query_as(
+                    "SELECT folder, type FROM entries WHERE user_id = $1 AND folder = $2 AND name = $3",
+                )
+                .bind(uid)
+                .bind(f)
+                .bind(name)
+                .fetch_all(pool)
+                .await?
+            } else {
+                sqlx::query_as("SELECT folder, type FROM entries WHERE user_id = $1 AND name = $2")
+                    .bind(uid)
+                    .bind(name)
+                    .fetch_all(pool)
+                    .await?
+            }
+        } else if let Some(f) = folder {
+            sqlx::query_as(
+                "SELECT folder, type FROM entries WHERE user_id IS NULL AND folder = $1 AND name = $2",
            )
-            .bind(uid)
-            .bind(namespace)
-            .bind(kind)
+            .bind(f)
            .bind(name)
-            .fetch_one(pool)
+            .fetch_all(pool)
            .await?
        } else {
-            sqlx::query_scalar(
-                "SELECT EXISTS(SELECT 1 FROM entries \
-                 WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3)",
-            )
-            .bind(namespace)
-            .bind(kind)
-            .bind(name)
-            .fetch_one(pool)
-            .await?
+            sqlx::query_as("SELECT folder, type FROM entries WHERE user_id IS NULL AND name = $1")
+                .bind(name)
+                .fetch_all(pool)
+                .await?
        };

-        let deleted = if exists {
-            vec![DeletedEntry {
-                namespace: namespace.to_string(),
-                kind: kind.to_string(),
-                name: name.to_string(),
-            }]
-        } else {
-            vec![]
+        return match rows.len() {
+            0 => Ok(DeleteResult {
+                deleted: vec![],
+                dry_run: true,
+            }),
+            1 => {
+                let row = rows.into_iter().next().unwrap();
+                Ok(DeleteResult {
+                    deleted: vec![DeletedEntry {
+                        name: name.to_string(),
+                        folder: row.folder,
+                        entry_type: row.entry_type,
+                    }],
+                    dry_run: true,
+                })
+            }
+            _ => {
+                let folders: Vec<&str> = rows.iter().map(|r| r.folder.as_str()).collect();
+                anyhow::bail!(
+                    "Ambiguous: {} entries named '{}' found in folders: [{}]. \
+                     Specify 'folder' to disambiguate.",
+                    rows.len(),
+                    name,
+                    folders.join(", ")
+                )
+            }
        };
-        return Ok(DeleteResult {
-            deleted,
-            dry_run: true,
-        });
    }

    let mut tx = pool.begin().await?;

-    let row: Option<EntryRow> = if let Some(uid) = user_id {
+    // Fetch matching rows with FOR UPDATE; use folder when provided to resolve ambiguity.
+    let rows: Vec<EntryRow> = if let Some(uid) = user_id {
+        if let Some(f) = folder {
+            sqlx::query_as(
+                "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+                 WHERE user_id = $1 AND folder = $2 AND name = $3 FOR UPDATE",
+            )
+            .bind(uid)
+            .bind(f)
+            .bind(name)
+            .fetch_all(&mut *tx)
+            .await?
+        } else {
+            sqlx::query_as(
+                "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+                 WHERE user_id = $1 AND name = $2 FOR UPDATE",
+            )
+            .bind(uid)
+            .bind(name)
+            .fetch_all(&mut *tx)
+            .await?
+        }
+    } else if let Some(f) = folder {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4 FOR UPDATE",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id IS NULL AND folder = $1 AND name = $2 FOR UPDATE",
        )
-        .bind(uid)
-        .bind(namespace)
-        .bind(kind)
+        .bind(f)
        .bind(name)
-        .fetch_optional(&mut *tx)
+        .fetch_all(&mut *tx)
        .await?
    } else {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id IS NULL AND name = $1 FOR UPDATE",
        )
-        .bind(namespace)
-        .bind(kind)
        .bind(name)
-        .fetch_optional(&mut *tx)
+        .fetch_all(&mut *tx)
        .await?
    };

-    let Some(row) = row else {
-        tx.rollback().await?;
-        return Ok(DeleteResult {
-            deleted: vec![],
-            dry_run: false,
-        });
+    let row = match rows.len() {
+        0 => {
+            tx.rollback().await?;
+            return Ok(DeleteResult {
+                deleted: vec![],
+                dry_run: false,
+            });
+        }
+        1 => rows.into_iter().next().unwrap(),
+        _ => {
+            tx.rollback().await?;
+            let folders: Vec<&str> = rows.iter().map(|r| r.folder.as_str()).collect();
+            anyhow::bail!(
+                "Ambiguous: {} entries named '{}' found in folders: [{}]. \
+                 Specify 'folder' to disambiguate.",
+                rows.len(),
+                name,
+                folders.join(", ")
+            )
+        }
    };

-    snapshot_and_delete(&mut tx, namespace, kind, name, &row, user_id).await?;
-    crate::audit::log_tx(&mut tx, user_id, "delete", namespace, kind, name, json!({})).await;
+    let folder = row.folder.clone();
+    let entry_type = row.entry_type.clone();
+    snapshot_and_delete(&mut tx, &folder, &entry_type, name, &row, user_id).await?;
+    crate::audit::log_tx(
+        &mut tx,
+        user_id,
+        "delete",
+        &folder,
+        &entry_type,
+        name,
+        json!({}),
+    )
+    .await;
    tx.commit().await?;

    Ok(DeleteResult {
        deleted: vec![DeletedEntry {
-            namespace: namespace.to_string(),
-            kind: kind.to_string(),
            name: name.to_string(),
+            folder,
+            entry_type,
        }],
        dry_run: false,
    })
@@ -152,8 +224,8 @@ async fn delete_one(

 async fn delete_bulk(
    pool: &PgPool,
-    namespace: &str,
-    kind: Option<&str>,
+    folder: Option<&str>,
+    entry_type: Option<&str>,
    dry_run: bool,
    user_id: Option<Uuid>,
 ) -> Result<DeleteResult> {
@@ -161,62 +233,57 @@ async fn delete_bulk(
    struct FullEntryRow {
        id: Uuid,
        version: i64,
-        kind: String,
+        folder: String,
+        #[sqlx(rename = "type")]
+        entry_type: String,
        name: String,
        metadata: serde_json::Value,
        tags: Vec<String>,
+        notes: String,
    }

-    let rows: Vec<FullEntryRow> = match (user_id, kind) {
-        (Some(uid), Some(k)) => {
-            sqlx::query_as(
-                "SELECT id, version, kind, name, metadata, tags FROM entries \
-             WHERE user_id = $1 AND namespace = $2 AND kind = $3 ORDER BY name",
-            )
-            .bind(uid)
-            .bind(namespace)
-            .bind(k)
-            .fetch_all(pool)
-            .await?
-        }
-        (Some(uid), None) => {
-            sqlx::query_as(
-                "SELECT id, version, kind, name, metadata, tags FROM entries \
-             WHERE user_id = $1 AND namespace = $2 ORDER BY kind, name",
-            )
-            .bind(uid)
-            .bind(namespace)
-            .fetch_all(pool)
-            .await?
-        }
-        (None, Some(k)) => {
-            sqlx::query_as(
-                "SELECT id, version, kind, name, metadata, tags FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 ORDER BY name",
-            )
-            .bind(namespace)
-            .bind(k)
-            .fetch_all(pool)
-            .await?
-        }
-        (None, None) => {
-            sqlx::query_as(
-                "SELECT id, version, kind, name, metadata, tags FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 ORDER BY kind, name",
-            )
-            .bind(namespace)
-            .fetch_all(pool)
-            .await?
-        }
-    };
+    let mut conditions: Vec<String> = Vec::new();
+    let mut idx: i32 = 1;
+
+    if user_id.is_some() {
+        conditions.push(format!("user_id = ${}", idx));
+        idx += 1;
+    } else {
+        conditions.push("user_id IS NULL".to_string());
+    }
+    if folder.is_some() {
+        conditions.push(format!("folder = ${}", idx));
+        idx += 1;
+    }
+    if entry_type.is_some() {
+        conditions.push(format!("type = ${}", idx));
+    }
+
+    let where_clause = format!("WHERE {}", conditions.join(" AND "));
+    let sql = format!(
+        "SELECT id, version, folder, type, name, metadata, tags, notes \
+         FROM entries {where_clause} ORDER BY type, name"
+    );
+
+    let mut q = sqlx::query_as::<_, FullEntryRow>(&sql);
+    if let Some(uid) = user_id {
+        q = q.bind(uid);
+    }
+    if let Some(f) = folder {
+        q = q.bind(f);
+    }
+    if let Some(t) = entry_type {
+        q = q.bind(t);
+    }
+    let rows = q.fetch_all(pool).await?;

    if dry_run {
        let deleted = rows
            .iter()
            .map(|r| DeletedEntry {
-                namespace: namespace.to_string(),
-                kind: r.kind.clone(),
                name: r.name.clone(),
+                folder: r.folder.clone(),
+                entry_type: r.entry_type.clone(),
            })
            .collect();
        return Ok(DeleteResult {
@@ -230,29 +297,37 @@ async fn delete_bulk(
        let entry_row = EntryRow {
            id: row.id,
            version: row.version,
+            folder: row.folder.clone(),
+            entry_type: row.entry_type.clone(),
            tags: row.tags.clone(),
            metadata: row.metadata.clone(),
+            notes: row.notes.clone(),
        };
        let mut tx = pool.begin().await?;
        snapshot_and_delete(
-            &mut tx, namespace, &row.kind, &row.name, &entry_row, user_id,
+            &mut tx,
+            &row.folder,
+            &row.entry_type,
+            &row.name,
+            &entry_row,
+            user_id,
        )
        .await?;
        crate::audit::log_tx(
            &mut tx,
            user_id,
            "delete",
-            namespace,
-            &row.kind,
+            &row.folder,
+            &row.entry_type,
            &row.name,
            json!({"bulk": true}),
        )
        .await;
        tx.commit().await?;
        deleted.push(DeletedEntry {
-            namespace: namespace.to_string(),
-            kind: row.kind.clone(),
            name: row.name.clone(),
+            folder: row.folder.clone(),
+            entry_type: row.entry_type.clone(),
        });
    }

@@ -264,8 +339,8 @@ async fn delete_bulk(

 async fn snapshot_and_delete(
    tx: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    namespace: &str,
-    kind: &str,
+    folder: &str,
+    entry_type: &str,
    name: &str,
    row: &EntryRow,
    user_id: Option<Uuid>,
@@ -275,8 +350,8 @@ async fn snapshot_and_delete(
        db::EntrySnapshotParams {
            entry_id: row.id,
            user_id,
-            namespace,
-            kind,
+            folder,
+            entry_type,
            name,
            version: row.version,
            action: "delete",
--- a/crates/secrets-core/src/service/env_map.rs
+++ b/crates/secrets-core/src/service/env_map.rs
@@ -12,8 +12,8 @@ use crate::service::search::{fetch_entries, fetch_secrets_for_entries};
 #[allow(clippy::too_many_arguments)]
 pub async fn build_env_map(
    pool: &PgPool,
-    namespace: Option<&str>,
-    kind: Option<&str>,
+    folder: Option<&str>,
+    entry_type: Option<&str>,
    name: Option<&str>,
    tags: &[String],
    only_fields: &[String],
@@ -21,7 +21,7 @@ pub async fn build_env_map(
    master_key: &[u8; 32],
    user_id: Option<Uuid>,
 ) -> Result<HashMap<String, String>> {
-    let entries = fetch_entries(pool, namespace, kind, name, tags, None, user_id).await?;
+    let entries = fetch_entries(pool, folder, entry_type, name, tags, None, user_id).await?;

    let mut combined: HashMap<String, String> = HashMap::new();

@@ -68,16 +68,8 @@ async fn build_entry_env_map(

    // Resolve key_ref
    if let Some(key_ref) = entry.metadata.get("key_ref").and_then(|v| v.as_str()) {
-        let key_entries = fetch_entries(
-            pool,
-            Some(&entry.namespace),
-            Some("key"),
-            Some(key_ref),
-            &[],
-            None,
-            None,
-        )
-        .await?;
+        let key_entries =
+            fetch_entries(pool, None, Some("key"), Some(key_ref), &[], None, None).await?;

        if let Some(key_entry) = key_entries.first() {
            let key_ids = vec![key_entry.id];
--- a/crates/secrets-core/src/service/export.rs
+++ b/crates/secrets-core/src/service/export.rs
@@ -9,8 +9,8 @@ use crate::models::{ExportData, ExportEntry, ExportFormat};
 use crate::service::search::{fetch_entries, fetch_secrets_for_entries};

 pub struct ExportParams<'a> {
-    pub namespace: Option<&'a str>,
-    pub kind: Option<&'a str>,
+    pub folder: Option<&'a str>,
+    pub entry_type: Option<&'a str>,
    pub name: Option<&'a str>,
    pub tags: &'a [String],
    pub query: Option<&'a str>,
@@ -25,8 +25,8 @@ pub async fn export(
 ) -> Result<ExportData> {
    let entries = fetch_entries(
        pool,
-        params.namespace,
-        params.kind,
+        params.folder,
+        params.entry_type,
        params.name,
        params.tags,
        params.query,
@@ -62,9 +62,10 @@ pub async fn export(
        };

        export_entries.push(ExportEntry {
-            namespace: entry.namespace.clone(),
-            kind: entry.kind.clone(),
            name: entry.name.clone(),
+            folder: entry.folder.clone(),
+            entry_type: entry.entry_type.clone(),
+            notes: entry.notes.clone(),
            tags: entry.tags.clone(),
            metadata: entry.metadata.clone(),
            secrets,
--- a/crates/secrets-core/src/service/get_secret.rs
+++ b/crates/secrets-core/src/service/get_secret.rs
@@ -5,31 +5,19 @@ use std::collections::HashMap;
 use uuid::Uuid;

 use crate::crypto;
-use crate::service::search::{fetch_entries, fetch_secrets_for_entries};
+use crate::service::search::{fetch_secrets_for_entries, resolve_entry};

 /// Decrypt a single named field from an entry.
+/// `folder` is optional; if omitted and multiple entries share the name, an error is returned.
 pub async fn get_secret_field(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    field_name: &str,
    master_key: &[u8; 32],
    user_id: Option<Uuid>,
 ) -> Result<Value> {
-    let entries = fetch_entries(
-        pool,
-        Some(namespace),
-        Some(kind),
-        Some(name),
-        &[],
-        None,
-        user_id,
-    )
-    .await?;
-    let entry = entries
-        .first()
-        .ok_or_else(|| anyhow::anyhow!("Not found: [{}/{}] {}", namespace, kind, name))?;
+    let entry = resolve_entry(pool, name, folder, user_id).await?;

    let entry_ids = vec![entry.id];
    let secrets_map = fetch_secrets_for_entries(pool, &entry_ids).await?;
@@ -44,27 +32,15 @@ pub async fn get_secret_field(
 }

 /// Decrypt all secret fields from an entry. Returns a map field_name → decrypted Value.
+/// `folder` is optional; if omitted and multiple entries share the name, an error is returned.
 pub async fn get_all_secrets(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    master_key: &[u8; 32],
    user_id: Option<Uuid>,
 ) -> Result<HashMap<String, Value>> {
-    let entries = fetch_entries(
-        pool,
-        Some(namespace),
-        Some(kind),
-        Some(name),
-        &[],
-        None,
-        user_id,
-    )
-    .await?;
-    let entry = entries
-        .first()
-        .ok_or_else(|| anyhow::anyhow!("Not found: [{}/{}] {}", namespace, kind, name))?;
+    let entry = resolve_entry(pool, name, folder, user_id).await?;

    let entry_ids = vec![entry.id];
    let secrets_map = fetch_secrets_for_entries(pool, &entry_ids).await?;
--- a/crates/secrets-core/src/service/history.rs
+++ b/crates/secrets-core/src/service/history.rs
@@ -3,6 +3,8 @@ use serde_json::Value;
 use sqlx::PgPool;
 use uuid::Uuid;

+use crate::service::search::resolve_entry;
+
 #[derive(Debug, serde::Serialize)]
 pub struct HistoryEntry {
    pub version: i64,
@@ -10,11 +12,12 @@ pub struct HistoryEntry {
    pub created_at: String,
 }

+/// Return version history for the entry identified by `name`.
+/// `folder` is optional; if omitted and multiple entries share the name, an error is returned.
 pub async fn run(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    limit: u32,
    user_id: Option<Uuid>,
 ) -> Result<Vec<HistoryEntry>> {
@@ -25,32 +28,16 @@ pub async fn run(
        created_at: chrono::DateTime<chrono::Utc>,
    }

-    let rows: Vec<Row> = if let Some(uid) = user_id {
-        sqlx::query_as(
-            "SELECT version, action, created_at FROM entries_history \
-             WHERE namespace = $1 AND kind = $2 AND name = $3 AND user_id = $4 \
-             ORDER BY id DESC LIMIT $5",
-        )
-        .bind(namespace)
-        .bind(kind)
-        .bind(name)
-        .bind(uid)
-        .bind(limit as i64)
-        .fetch_all(pool)
-        .await?
-    } else {
-        sqlx::query_as(
-            "SELECT version, action, created_at FROM entries_history \
-             WHERE namespace = $1 AND kind = $2 AND name = $3 AND user_id IS NULL \
-             ORDER BY id DESC LIMIT $4",
-        )
-        .bind(namespace)
-        .bind(kind)
-        .bind(name)
-        .bind(limit as i64)
-        .fetch_all(pool)
-        .await?
-    };
+    let entry = resolve_entry(pool, name, folder, user_id).await?;
+
+    let rows: Vec<Row> = sqlx::query_as(
+        "SELECT version, action, created_at FROM entries_history \
+         WHERE entry_id = $1 ORDER BY id DESC LIMIT $2",
+    )
+    .bind(entry.id)
+    .bind(limit as i64)
+    .fetch_all(pool)
+    .await?;

    Ok(rows
        .into_iter()
@@ -64,12 +51,11 @@ pub async fn run(

 pub async fn run_json(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    limit: u32,
    user_id: Option<Uuid>,
 ) -> Result<Value> {
-    let entries = run(pool, namespace, kind, name, limit, user_id).await?;
+    let entries = run(pool, name, folder, limit, user_id).await?;
    Ok(serde_json::to_value(entries)?)
 }
--- a/crates/secrets-core/src/service/import.rs
+++ b/crates/secrets-core/src/service/import.rs
@@ -47,10 +47,9 @@ pub async fn run(
    for entry in &data.entries {
        let exists: bool = sqlx::query_scalar(
            "SELECT EXISTS(SELECT 1 FROM entries \
-             WHERE namespace = $1 AND kind = $2 AND name = $3 AND user_id IS NOT DISTINCT FROM $4)",
+             WHERE folder = $1 AND name = $2 AND user_id IS NOT DISTINCT FROM $3)",
        )
-        .bind(&entry.namespace)
-        .bind(&entry.kind)
+        .bind(&entry.folder)
        .bind(&entry.name)
        .bind(params.user_id)
        .fetch_one(pool)
@@ -59,9 +58,7 @@ pub async fn run(

        if exists && !params.force {
            return Err(anyhow::anyhow!(
-                "Import aborted: conflict on [{}/{}/{}]",
-                entry.namespace,
-                entry.kind,
+                "Import aborted: conflict on '{}'",
                entry.name
            ));
        }
@@ -81,9 +78,10 @@ pub async fn run(
        match add_run(
            pool,
            AddParams {
-                namespace: &entry.namespace,
-                kind: &entry.kind,
                name: &entry.name,
+                folder: &entry.folder,
+                entry_type: &entry.entry_type,
+                notes: &entry.notes,
                tags: &entry.tags,
                meta_entries: &meta_entries,
                secret_entries: &secret_entries,
@@ -98,8 +96,6 @@ pub async fn run(
            }
            Err(e) => {
                tracing::error!(
-                    namespace = entry.namespace,
-                    kind = entry.kind,
                    name = entry.name,
                    error = %e,
                    "failed to import entry"
--- a/crates/secrets-core/src/service/rollback.rs
+++ b/crates/secrets-core/src/service/rollback.rs
@@ -8,17 +8,19 @@ use crate::db;

 #[derive(Debug, serde::Serialize)]
 pub struct RollbackResult {
-    pub namespace: String,
-    pub kind: String,
    pub name: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    pub entry_type: String,
    pub restored_version: i64,
 }

+/// Roll back entry `name` to `to_version` (or the most recent snapshot if None).
+/// `folder` is optional; if omitted and multiple entries share the name, an error is returned.
 pub async fn run(
    pool: &PgPool,
-    namespace: &str,
-    kind: &str,
    name: &str,
+    folder: Option<&str>,
    to_version: Option<i64>,
    master_key: &[u8; 32],
    user_id: Option<Uuid>,
@@ -26,69 +28,122 @@ pub async fn run(
    #[derive(sqlx::FromRow)]
    struct EntryHistoryRow {
        entry_id: Uuid,
+        folder: String,
+        #[sqlx(rename = "type")]
+        entry_type: String,
        version: i64,
        action: String,
        tags: Vec<String>,
        metadata: Value,
    }

-    let snap: Option<EntryHistoryRow> = if let Some(ver) = to_version {
-        if let Some(uid) = user_id {
-            sqlx::query_as(
-                "SELECT entry_id, version, action, tags, metadata FROM entries_history \
-                 WHERE namespace = $1 AND kind = $2 AND name = $3 AND version = $4 \
-                 AND user_id = $5 ORDER BY id DESC LIMIT 1",
+    // Disambiguate: find the unique entry_id for (name, folder).
+    // Query entries_history by entry_id once we know it; first resolve via name + optional folder.
+    let entry_id: Option<Uuid> = if let Some(uid) = user_id {
+        if let Some(f) = folder {
+            sqlx::query_scalar(
+                "SELECT DISTINCT entry_id FROM entries_history \
+                 WHERE name = $1 AND folder = $2 AND user_id = $3 LIMIT 1",
            )
-            .bind(namespace)
-            .bind(kind)
            .bind(name)
-            .bind(ver)
+            .bind(f)
            .bind(uid)
            .fetch_optional(pool)
            .await?
        } else {
-            sqlx::query_as(
-                "SELECT entry_id, version, action, tags, metadata FROM entries_history \
-                 WHERE namespace = $1 AND kind = $2 AND name = $3 AND version = $4 \
-                 AND user_id IS NULL ORDER BY id DESC LIMIT 1",
+            let ids: Vec<Uuid> = sqlx::query_scalar(
+                "SELECT DISTINCT entry_id FROM entries_history \
+                 WHERE name = $1 AND user_id = $2",
            )
-            .bind(namespace)
-            .bind(kind)
            .bind(name)
-            .bind(ver)
-            .fetch_optional(pool)
-            .await?
+            .bind(uid)
+            .fetch_all(pool)
+            .await?;
+            match ids.len() {
+                0 => None,
+                1 => Some(ids[0]),
+                _ => {
+                    let folders: Vec<String> = sqlx::query_scalar(
+                        "SELECT DISTINCT folder FROM entries_history \
+                         WHERE name = $1 AND user_id = $2",
+                    )
+                    .bind(name)
+                    .bind(uid)
+                    .fetch_all(pool)
+                    .await?;
+                    anyhow::bail!(
+                        "Ambiguous: entries named '{}' exist in folders: [{}]. \
+                         Specify 'folder' to disambiguate.",
+                        name,
+                        folders.join(", ")
+                    )
+                }
+            }
        }
-    } else if let Some(uid) = user_id {
-        sqlx::query_as(
-            "SELECT entry_id, version, action, tags, metadata FROM entries_history \
-             WHERE namespace = $1 AND kind = $2 AND name = $3 \
-             AND user_id = $4 ORDER BY id DESC LIMIT 1",
+    } else if let Some(f) = folder {
+        sqlx::query_scalar(
+            "SELECT DISTINCT entry_id FROM entries_history \
+             WHERE name = $1 AND folder = $2 AND user_id IS NULL LIMIT 1",
        )
-        .bind(namespace)
-        .bind(kind)
        .bind(name)
-        .bind(uid)
+        .bind(f)
+        .fetch_optional(pool)
+        .await?
+    } else {
+        let ids: Vec<Uuid> = sqlx::query_scalar(
+            "SELECT DISTINCT entry_id FROM entries_history \
+             WHERE name = $1 AND user_id IS NULL",
+        )
+        .bind(name)
+        .fetch_all(pool)
+        .await?;
+        match ids.len() {
+            0 => None,
+            1 => Some(ids[0]),
+            _ => {
+                let folders: Vec<String> = sqlx::query_scalar(
+                    "SELECT DISTINCT folder FROM entries_history \
+                     WHERE name = $1 AND user_id IS NULL",
+                )
+                .bind(name)
+                .fetch_all(pool)
+                .await?;
+                anyhow::bail!(
+                    "Ambiguous: entries named '{}' exist in folders: [{}]. \
+                     Specify 'folder' to disambiguate.",
+                    name,
+                    folders.join(", ")
+                )
+            }
+        }
+    };
+
+    let entry_id = entry_id.ok_or_else(|| anyhow::anyhow!("No history found for '{}'", name))?;
+
+    let snap: Option<EntryHistoryRow> = if let Some(ver) = to_version {
+        sqlx::query_as(
+            "SELECT entry_id, folder, type, version, action, tags, metadata \
+             FROM entries_history \
+             WHERE entry_id = $1 AND version = $2 ORDER BY id DESC LIMIT 1",
+        )
+        .bind(entry_id)
+        .bind(ver)
        .fetch_optional(pool)
        .await?
    } else {
        sqlx::query_as(
-            "SELECT entry_id, version, action, tags, metadata FROM entries_history \
-             WHERE namespace = $1 AND kind = $2 AND name = $3 \
-             AND user_id IS NULL ORDER BY id DESC LIMIT 1",
+            "SELECT entry_id, folder, type, version, action, tags, metadata \
+             FROM entries_history \
+             WHERE entry_id = $1 ORDER BY id DESC LIMIT 1",
        )
-        .bind(namespace)
-        .bind(kind)
-        .bind(name)
+        .bind(entry_id)
        .fetch_optional(pool)
        .await?
    };

    let snap = snap.ok_or_else(|| {
        anyhow::anyhow!(
-            "No history found for [{}/{}] {}{}.",
-            namespace,
-            kind,
+            "No history found for '{}'{}.",
            name,
            to_version
                .map(|v| format!(" at version {}", v))
@@ -130,43 +185,32 @@ pub async fn run(
    struct LiveEntry {
        id: Uuid,
        version: i64,
+        folder: String,
+        #[sqlx(rename = "type")]
+        entry_type: String,
        tags: Vec<String>,
        metadata: Value,
+        #[allow(dead_code)]
+        notes: String,
    }

-    // Query live entry with correct user_id scoping to avoid PK conflicts
-    let live: Option<LiveEntry> = if let Some(uid) = user_id {
-        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4 FOR UPDATE",
-        )
-        .bind(uid)
-        .bind(namespace)
-        .bind(kind)
-        .bind(name)
-        .fetch_optional(&mut *tx)
-        .await?
-    } else {
-        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
-        )
-        .bind(namespace)
-        .bind(kind)
-        .bind(name)
-        .fetch_optional(&mut *tx)
-        .await?
-    };
+    // Lock the live entry if it exists (matched by entry_id for precision).
+    let live: Option<LiveEntry> = sqlx::query_as(
+        "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+         WHERE id = $1 FOR UPDATE",
+    )
+    .bind(entry_id)
+    .fetch_optional(&mut *tx)
+    .await?;

-    let entry_id = if let Some(ref lr) = live {
-        // Snapshot current state before overwriting
+    let live_entry_id = if let Some(ref lr) = live {
        if let Err(e) = db::snapshot_entry_history(
            &mut tx,
            db::EntrySnapshotParams {
                entry_id: lr.id,
                user_id,
-                namespace,
-                kind,
+                folder: &lr.folder,
+                entry_type: &lr.entry_type,
                name,
                version: lr.version,
                action: "rollback",
@@ -209,7 +253,6 @@ pub async fn run(
            }
        }

-        // Update the existing row in-place to preserve its primary key and user_id
        sqlx::query(
            "UPDATE entries SET tags = $1, metadata = $2, version = version + 1, \
             updated_at = NOW() WHERE id = $3",
@@ -222,16 +265,15 @@ pub async fn run(

        lr.id
    } else {
-        // No live entry — insert a fresh one with a new UUID
        if let Some(uid) = user_id {
            sqlx::query_scalar(
                "INSERT INTO entries \
-                 (user_id, namespace, kind, name, tags, metadata, version, updated_at) \
-                 VALUES ($1, $2, $3, $4, $5, $6, $7, NOW()) RETURNING id",
+                 (user_id, folder, type, name, notes, tags, metadata, version, updated_at) \
+                 VALUES ($1, $2, $3, $4, '', $5, $6, $7, NOW()) RETURNING id",
            )
            .bind(uid)
-            .bind(namespace)
-            .bind(kind)
+            .bind(&snap.folder)
+            .bind(&snap.entry_type)
            .bind(name)
            .bind(&snap.tags)
            .bind(&snap.metadata)
@@ -241,11 +283,11 @@ pub async fn run(
        } else {
            sqlx::query_scalar(
                "INSERT INTO entries \
-                 (namespace, kind, name, tags, metadata, version, updated_at) \
-                 VALUES ($1, $2, $3, $4, $5, $6, NOW()) RETURNING id",
+                 (folder, type, name, notes, tags, metadata, version, updated_at) \
+                 VALUES ($1, $2, $3, '', $4, $5, $6, NOW()) RETURNING id",
            )
-            .bind(namespace)
-            .bind(kind)
+            .bind(&snap.folder)
+            .bind(&snap.entry_type)
            .bind(name)
            .bind(&snap.tags)
            .bind(&snap.metadata)
@@ -256,7 +298,7 @@ pub async fn run(
    };

    sqlx::query("DELETE FROM secrets WHERE entry_id = $1")
-        .bind(entry_id)
+        .bind(live_entry_id)
        .execute(&mut *tx)
        .await?;

@@ -265,7 +307,7 @@ pub async fn run(
            continue;
        }
        sqlx::query("INSERT INTO secrets (entry_id, field_name, encrypted) VALUES ($1, $2, $3)")
-            .bind(entry_id)
+            .bind(live_entry_id)
            .bind(&f.field_name)
            .bind(&f.encrypted)
            .execute(&mut *tx)
@@ -276,8 +318,8 @@ pub async fn run(
        &mut tx,
        user_id,
        "rollback",
-        namespace,
-        kind,
+        &snap.folder,
+        &snap.entry_type,
        name,
        serde_json::json!({
            "restored_version": snap.version,
@@ -289,9 +331,9 @@ pub async fn run(
    tx.commit().await?;

    Ok(RollbackResult {
-        namespace: namespace.to_string(),
-        kind: kind.to_string(),
        name: name.to_string(),
+        folder: snap.folder,
+        entry_type: snap.entry_type,
        restored_version: snap.version,
    })
 }
--- a/crates/secrets-core/src/service/search.rs
+++ b/crates/secrets-core/src/service/search.rs
@@ -9,8 +9,8 @@ use crate::models::{Entry, SecretField};
 pub const FETCH_ALL_LIMIT: u32 = 100_000;

 pub struct SearchParams<'a> {
-    pub namespace: Option<&'a str>,
-    pub kind: Option<&'a str>,
+    pub folder: Option<&'a str>,
+    pub entry_type: Option<&'a str>,
    pub name: Option<&'a str>,
    pub tags: &'a [String],
    pub query: Option<&'a str>,
@@ -44,16 +44,16 @@ pub async fn run(pool: &PgPool, params: SearchParams<'_>) -> Result<SearchResult
 /// Fetch entries matching the given filters — returns all matching entries up to FETCH_ALL_LIMIT.
 pub async fn fetch_entries(
    pool: &PgPool,
-    namespace: Option<&str>,
-    kind: Option<&str>,
+    folder: Option<&str>,
+    entry_type: Option<&str>,
    name: Option<&str>,
    tags: &[String],
    query: Option<&str>,
    user_id: Option<Uuid>,
 ) -> Result<Vec<Entry>> {
    let params = SearchParams {
-        namespace,
-        kind,
+        folder,
+        entry_type,
        name,
        tags,
        query,
@@ -77,12 +77,12 @@ async fn fetch_entries_paged(pool: &PgPool, a: &SearchParams<'_>) -> Result<Vec<
        conditions.push("user_id IS NULL".to_string());
    }

-    if a.namespace.is_some() {
-        conditions.push(format!("namespace = ${}", idx));
+    if a.folder.is_some() {
+        conditions.push(format!("folder = ${}", idx));
        idx += 1;
    }
-    if a.kind.is_some() {
-        conditions.push(format!("kind = ${}", idx));
+    if a.entry_type.is_some() {
+        conditions.push(format!("type = ${}", idx));
        idx += 1;
    }
    if a.name.is_some() {
@@ -106,8 +106,9 @@ async fn fetch_entries_paged(pool: &PgPool, a: &SearchParams<'_>) -> Result<Vec<
    }
    if a.query.is_some() {
        conditions.push(format!(
-            "(name ILIKE ${i} ESCAPE '\\' OR namespace ILIKE ${i} ESCAPE '\\' \
-             OR kind ILIKE ${i} ESCAPE '\\' OR metadata::text ILIKE ${i} ESCAPE '\\' \
+            "(name ILIKE ${i} ESCAPE '\\' OR folder ILIKE ${i} ESCAPE '\\' \
+             OR type ILIKE ${i} ESCAPE '\\' OR notes ILIKE ${i} ESCAPE '\\' \
+             OR metadata::text ILIKE ${i} ESCAPE '\\' \
             OR EXISTS (SELECT 1 FROM unnest(tags) t WHERE t ILIKE ${i} ESCAPE '\\'))",
            i = idx
        ));
@@ -131,8 +132,8 @@ async fn fetch_entries_paged(pool: &PgPool, a: &SearchParams<'_>) -> Result<Vec<
    };

    let sql = format!(
-        "SELECT id, user_id, \
-         namespace, kind, name, tags, metadata, version, created_at, updated_at \
+        "SELECT id, user_id, folder, type, name, notes, tags, metadata, version, \
+         created_at, updated_at \
         FROM entries {where_clause} ORDER BY {order} LIMIT ${limit_idx} OFFSET ${offset_idx}"
    );

@@ -141,10 +142,10 @@ async fn fetch_entries_paged(pool: &PgPool, a: &SearchParams<'_>) -> Result<Vec<
    if let Some(uid) = a.user_id {
        q = q.bind(uid);
    }
-    if let Some(v) = a.namespace {
+    if let Some(v) = a.folder {
        q = q.bind(v);
    }
-    if let Some(v) = a.kind {
+    if let Some(v) = a.entry_type {
        q = q.bind(v);
    }
    if let Some(v) = a.name {
@@ -207,15 +208,51 @@ pub async fn fetch_secrets_for_entries(
    Ok(map)
 }

-// ── Internal raw row (because user_id is nullable in DB) ─────────────────────
+/// Resolve exactly one entry by name, with optional folder for disambiguation.
+///
+/// - If `folder` is provided: exact `(folder, name)` match.
+/// - If `folder` is None and exactly one entry matches: returns it.
+/// - If `folder` is None and multiple entries match: returns an error listing
+///   the folders and asking the caller to specify one.
+pub async fn resolve_entry(
+    pool: &PgPool,
+    name: &str,
+    folder: Option<&str>,
+    user_id: Option<Uuid>,
+) -> Result<crate::models::Entry> {
+    let entries = fetch_entries(pool, folder, None, Some(name), &[], None, user_id).await?;
+    match entries.len() {
+        0 => {
+            if let Some(f) = folder {
+                anyhow::bail!("Not found: '{}' in folder '{}'", name, f)
+            } else {
+                anyhow::bail!("Not found: '{}'", name)
+            }
+        }
+        1 => Ok(entries.into_iter().next().unwrap()),
+        _ => {
+            let folders: Vec<&str> = entries.iter().map(|e| e.folder.as_str()).collect();
+            anyhow::bail!(
+                "Ambiguous: {} entries named '{}' found in folders: [{}]. \
+                 Specify 'folder' to disambiguate.",
+                entries.len(),
+                name,
+                folders.join(", ")
+            )
+        }
+    }
+}

+// ── Internal raw row (because user_id is nullable in DB) ─────────────────────
 #[derive(sqlx::FromRow)]
 struct EntryRaw {
    id: Uuid,
    user_id: Option<Uuid>,
-    namespace: String,
-    kind: String,
+    folder: String,
+    #[sqlx(rename = "type")]
+    entry_type: String,
    name: String,
+    notes: String,
    tags: Vec<String>,
    metadata: Value,
    version: i64,
@@ -228,9 +265,10 @@ impl From<EntryRaw> for Entry {
        Entry {
            id: r.id,
            user_id: r.user_id,
-            namespace: r.namespace,
-            kind: r.kind,
+            folder: r.folder,
+            entry_type: r.entry_type,
            name: r.name,
+            notes: r.notes,
            tags: r.tags,
            metadata: r.metadata,
            version: r.version,
--- a/crates/secrets-core/src/service/update.rs
+++ b/crates/secrets-core/src/service/update.rs
@@ -13,9 +13,10 @@ use crate::service::add::{

 #[derive(Debug, serde::Serialize)]
 pub struct UpdateResult {
-    pub namespace: String,
-    pub kind: String,
    pub name: String,
+    pub folder: String,
+    #[serde(rename = "type")]
+    pub entry_type: String,
    pub add_tags: Vec<String>,
    pub remove_tags: Vec<String>,
    pub meta_keys: Vec<String>,
@@ -25,9 +26,10 @@ pub struct UpdateResult {
 }

 pub struct UpdateParams<'a> {
-    pub namespace: &'a str,
-    pub kind: &'a str,
    pub name: &'a str,
+    /// Optional folder for disambiguation when multiple entries share the same name.
+    pub folder: Option<&'a str>,
+    pub notes: Option<&'a str>,
    pub add_tags: &'a [String],
    pub remove_tags: &'a [String],
    pub meta_entries: &'a [String],
@@ -44,45 +46,76 @@ pub async fn run(
 ) -> Result<UpdateResult> {
    let mut tx = pool.begin().await?;

-    let row: Option<EntryRow> = if let Some(uid) = params.user_id {
+    // Fetch matching rows with FOR UPDATE; use folder when provided to resolve ambiguity.
+    let rows: Vec<EntryRow> = if let Some(uid) = params.user_id {
+        if let Some(folder) = params.folder {
+            sqlx::query_as(
+                "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+                 WHERE user_id = $1 AND folder = $2 AND name = $3 FOR UPDATE",
+            )
+            .bind(uid)
+            .bind(folder)
+            .bind(params.name)
+            .fetch_all(&mut *tx)
+            .await?
+        } else {
+            sqlx::query_as(
+                "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+                 WHERE user_id = $1 AND name = $2 FOR UPDATE",
+            )
+            .bind(uid)
+            .bind(params.name)
+            .fetch_all(&mut *tx)
+            .await?
+        }
+    } else if let Some(folder) = params.folder {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id = $1 AND namespace = $2 AND kind = $3 AND name = $4 FOR UPDATE",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id IS NULL AND folder = $1 AND name = $2 FOR UPDATE",
        )
-        .bind(uid)
-        .bind(params.namespace)
-        .bind(params.kind)
+        .bind(folder)
        .bind(params.name)
-        .fetch_optional(&mut *tx)
+        .fetch_all(&mut *tx)
        .await?
    } else {
        sqlx::query_as(
-            "SELECT id, version, tags, metadata FROM entries \
-             WHERE user_id IS NULL AND namespace = $1 AND kind = $2 AND name = $3 FOR UPDATE",
+            "SELECT id, version, folder, type, tags, metadata, notes FROM entries \
+             WHERE user_id IS NULL AND name = $1 FOR UPDATE",
        )
-        .bind(params.namespace)
-        .bind(params.kind)
        .bind(params.name)
-        .fetch_optional(&mut *tx)
+        .fetch_all(&mut *tx)
        .await?
    };

-    let row = row.ok_or_else(|| {
-        anyhow::anyhow!(
-            "Not found: [{}/{}] {}. Use `add` to create it first.",
-            params.namespace,
-            params.kind,
-            params.name
-        )
-    })?;
+    let row = match rows.len() {
+        0 => {
+            tx.rollback().await?;
+            anyhow::bail!(
+                "Not found: '{}'. Use `add` to create it first.",
+                params.name
+            )
+        }
+        1 => rows.into_iter().next().unwrap(),
+        _ => {
+            tx.rollback().await?;
+            let folders: Vec<&str> = rows.iter().map(|r| r.folder.as_str()).collect();
+            anyhow::bail!(
+                "Ambiguous: {} entries named '{}' found in folders: [{}]. \
+                 Specify 'folder' to disambiguate.",
+                rows.len(),
+                params.name,
+                folders.join(", ")
+            )
+        }
+    };

    if let Err(e) = db::snapshot_entry_history(
        &mut tx,
        db::EntrySnapshotParams {
            entry_id: row.id,
            user_id: params.user_id,
-            namespace: params.namespace,
-            kind: params.kind,
+            folder: &row.folder,
+            entry_type: &row.entry_type,
            name: params.name,
            version: row.version,
            action: "update",
@@ -117,12 +150,16 @@ pub async fn run(
    }
    let metadata = Value::Object(meta_map);

+    let new_notes = params.notes.unwrap_or(&row.notes);
+
    let result = sqlx::query(
-        "UPDATE entries SET tags = $1, metadata = $2, version = version + 1, updated_at = NOW() \
-         WHERE id = $3 AND version = $4",
+        "UPDATE entries SET tags = $1, metadata = $2, notes = $3, \
+         version = version + 1, updated_at = NOW() \
+         WHERE id = $4 AND version = $5",
    )
    .bind(&tags)
    .bind(&metadata)
+    .bind(new_notes)
    .bind(row.id)
    .bind(row.version)
    .execute(&mut *tx)
@@ -131,9 +168,7 @@ pub async fn run(
    if result.rows_affected() == 0 {
        tx.rollback().await?;
        anyhow::bail!(
-            "Concurrent modification detected for [{}/{}] {}. Please retry.",
-            params.namespace,
-            params.kind,
+            "Concurrent modification detected for '{}'. Please retry.",
            params.name
        );
    }
@@ -243,8 +278,8 @@ pub async fn run(
        &mut tx,
        params.user_id,
        "update",
-        params.namespace,
-        params.kind,
+        "",
+        "",
        params.name,
        serde_json::json!({
            "add_tags": params.add_tags,
@@ -260,9 +295,9 @@ pub async fn run(
    tx.commit().await?;

    Ok(UpdateResult {
-        namespace: params.namespace.to_string(),
-        kind: params.kind.to_string(),
        name: params.name.to_string(),
+        folder: row.folder.clone(),
+        entry_type: row.entry_type.clone(),
        add_tags: params.add_tags.to_vec(),
        remove_tags: params.remove_tags.to_vec(),
        meta_keys,
--- a/crates/secrets-mcp/Cargo.toml
+++ b/crates/secrets-mcp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "secrets-mcp"
-version = "0.2.1"
+version = "0.3.0"
 edition.workspace = true

 [[bin]]
--- a/crates/secrets-mcp/src/tools.rs
+++ b/crates/secrets-mcp/src/tools.rs
@@ -155,17 +155,18 @@ impl SecretsService {

 #[derive(Debug, Deserialize, JsonSchema)]
 struct SearchInput {
-    #[schemars(description = "Namespace filter (e.g. 'refining', 'ricnsmart')")]
-    namespace: Option<String>,
-    #[schemars(description = "Kind filter (e.g. 'server', 'service', 'key')")]
-    kind: Option<String>,
-    #[schemars(description = "Exact record name")]
+    #[schemars(description = "Fuzzy search across name, folder, type, notes, tags, metadata")]
+    query: Option<String>,
+    #[schemars(description = "Folder filter (e.g. 'refining', 'personal', 'family')")]
+    folder: Option<String>,
+    #[schemars(description = "Type filter (e.g. 'server', 'service', 'person', 'key')")]
+    #[serde(rename = "type")]
+    entry_type: Option<String>,
+    #[schemars(description = "Exact name to match")]
    name: Option<String>,
    #[schemars(description = "Tag filters (all must match)")]
    tags: Option<Vec<String>>,
-    #[schemars(description = "Fuzzy search across name, namespace, kind, tags, metadata")]
-    query: Option<String>,
-    #[schemars(description = "Return only summary fields (name/tags/desc/updated_at)")]
+    #[schemars(description = "Return only summary fields (name/tags/notes/updated_at)")]
    summary: Option<bool>,
    #[schemars(description = "Sort order: 'name' (default), 'updated', 'created'")]
    sort: Option<String>,
@@ -177,24 +178,29 @@ struct SearchInput {

 #[derive(Debug, Deserialize, JsonSchema)]
 struct GetSecretInput {
-    #[schemars(description = "Namespace of the entry")]
-    namespace: String,
-    #[schemars(description = "Kind of the entry (e.g. 'server', 'service')")]
-    kind: String,
    #[schemars(description = "Name of the entry")]
    name: String,
+    #[schemars(
+        description = "Folder for disambiguation when multiple entries share the same name (optional)"
+    )]
+    folder: Option<String>,
    #[schemars(description = "Specific field to retrieve. If omitted, returns all fields.")]
    field: Option<String>,
 }

 #[derive(Debug, Deserialize, JsonSchema)]
 struct AddInput {
-    #[schemars(description = "Namespace")]
-    namespace: String,
-    #[schemars(description = "Kind (e.g. 'server', 'service', 'key')")]
-    kind: String,
-    #[schemars(description = "Unique name within namespace+kind")]
+    #[schemars(description = "Unique name for this entry")]
    name: String,
+    #[schemars(description = "Folder for organization (optional, e.g. 'personal', 'refining')")]
+    folder: Option<String>,
+    #[schemars(
+        description = "Type/category of this entry (optional, e.g. 'server', 'person', 'key')"
+    )]
+    #[serde(rename = "type")]
+    entry_type: Option<String>,
+    #[schemars(description = "Free-text notes for this entry (optional)")]
+    notes: Option<String>,
    #[schemars(description = "Tags for this entry")]
    tags: Option<Vec<String>>,
    #[schemars(description = "Metadata fields as 'key=value' or 'key:=json' strings")]
@@ -205,12 +211,14 @@ struct AddInput {

 #[derive(Debug, Deserialize, JsonSchema)]
 struct UpdateInput {
-    #[schemars(description = "Namespace")]
-    namespace: String,
-    #[schemars(description = "Kind")]
-    kind: String,
-    #[schemars(description = "Name")]
+    #[schemars(description = "Name of the entry to update")]
    name: String,
+    #[schemars(
+        description = "Folder for disambiguation when multiple entries share the same name (optional)"
+    )]
+    folder: Option<String>,
+    #[schemars(description = "Update the notes field")]
+    notes: Option<String>,
    #[schemars(description = "Tags to add")]
    add_tags: Option<Vec<String>>,
    #[schemars(description = "Tags to remove")]
@@ -227,46 +235,49 @@ struct UpdateInput {

 #[derive(Debug, Deserialize, JsonSchema)]
 struct DeleteInput {
-    #[schemars(description = "Namespace")]
-    namespace: String,
-    #[schemars(description = "Kind filter (required for single delete)")]
-    kind: Option<String>,
-    #[schemars(description = "Exact name to delete. Omit for bulk delete by namespace+kind.")]
+    #[schemars(description = "Name of the entry to delete (single delete). \
+        Omit to bulk delete by folder/type filters.")]
    name: Option<String>,
+    #[schemars(description = "Folder filter for bulk delete")]
+    folder: Option<String>,
+    #[schemars(description = "Type filter for bulk delete")]
+    #[serde(rename = "type")]
+    entry_type: Option<String>,
    #[schemars(description = "Preview deletions without writing")]
    dry_run: Option<bool>,
 }

 #[derive(Debug, Deserialize, JsonSchema)]
 struct HistoryInput {
-    #[schemars(description = "Namespace")]
-    namespace: String,
-    #[schemars(description = "Kind")]
-    kind: String,
-    #[schemars(description = "Name")]
+    #[schemars(description = "Name of the entry")]
    name: String,
+    #[schemars(
+        description = "Folder for disambiguation when multiple entries share the same name (optional)"
+    )]
+    folder: Option<String>,
    #[schemars(description = "Max history entries to return (default 20)")]
    limit: Option<u32>,
 }

 #[derive(Debug, Deserialize, JsonSchema)]
 struct RollbackInput {
-    #[schemars(description = "Namespace")]
-    namespace: String,
-    #[schemars(description = "Kind")]
-    kind: String,
-    #[schemars(description = "Name")]
+    #[schemars(description = "Name of the entry")]
    name: String,
+    #[schemars(
+        description = "Folder for disambiguation when multiple entries share the same name (optional)"
+    )]
+    folder: Option<String>,
    #[schemars(description = "Target version number. Omit to restore the most recent snapshot.")]
    to_version: Option<i64>,
 }

 #[derive(Debug, Deserialize, JsonSchema)]
 struct ExportInput {
-    #[schemars(description = "Namespace filter")]
-    namespace: Option<String>,
-    #[schemars(description = "Kind filter")]
-    kind: Option<String>,
+    #[schemars(description = "Folder filter")]
+    folder: Option<String>,
+    #[schemars(description = "Type filter")]
+    #[serde(rename = "type")]
+    entry_type: Option<String>,
    #[schemars(description = "Exact name filter")]
    name: Option<String>,
    #[schemars(description = "Tag filters")]
@@ -279,10 +290,11 @@ struct ExportInput {

 #[derive(Debug, Deserialize, JsonSchema)]
 struct EnvMapInput {
-    #[schemars(description = "Namespace filter")]
-    namespace: Option<String>,
-    #[schemars(description = "Kind filter")]
-    kind: Option<String>,
+    #[schemars(description = "Folder filter")]
+    folder: Option<String>,
+    #[schemars(description = "Type filter")]
+    #[serde(rename = "type")]
+    entry_type: Option<String>,
    #[schemars(description = "Exact name filter")]
    name: Option<String>,
    #[schemars(description = "Tag filters")]
@@ -316,8 +328,8 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_search",
            ?user_id,
-            namespace = input.namespace.as_deref(),
-            kind = input.kind.as_deref(),
+            folder = input.folder.as_deref(),
+            entry_type = input.entry_type.as_deref(),
            name = input.name.as_deref(),
            query = input.query.as_deref(),
            "tool call start",
@@ -326,8 +338,8 @@ impl SecretsService {
        let result = svc_search(
            &self.pool,
            SearchParams {
-                namespace: input.namespace.as_deref(),
-                kind: input.kind.as_deref(),
+                folder: input.folder.as_deref(),
+                entry_type: input.entry_type.as_deref(),
                name: input.name.as_deref(),
                tags: &tags,
                query: input.query.as_deref(),
@@ -347,12 +359,11 @@ impl SecretsService {
            .map(|e| {
                if summary {
                    serde_json::json!({
-                        "namespace": e.namespace,
-                        "kind": e.kind,
                        "name": e.name,
+                        "folder": e.folder,
+                        "type": e.entry_type,
                        "tags": e.tags,
-                        "desc": e.metadata.get("desc").or_else(|| e.metadata.get("url"))
-                            .and_then(|v| v.as_str()).unwrap_or(""),
+                        "notes": e.notes,
                        "updated_at": e.updated_at.format("%Y-%m-%dT%H:%M:%SZ").to_string(),
                    })
                } else {
@@ -363,9 +374,10 @@ impl SecretsService {
                        .unwrap_or_default();
                    serde_json::json!({
                        "id": e.id,
-                        "namespace": e.namespace,
-                        "kind": e.kind,
                        "name": e.name,
+                        "folder": e.folder,
+                        "type": e.entry_type,
+                        "notes": e.notes,
                        "tags": e.tags,
                        "metadata": e.metadata,
                        "secret_fields": schema,
@@ -408,8 +420,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_get",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            field = input.field.as_deref(),
            "tool call start",
@@ -418,9 +428,8 @@ impl SecretsService {
        if let Some(field_name) = &input.field {
            let value = get_secret_field(
                &self.pool,
-                &input.namespace,
-                &input.kind,
                &input.name,
+                input.folder.as_deref(),
                field_name,
                &user_key,
                Some(user_id),
@@ -440,9 +449,8 @@ impl SecretsService {
        } else {
            let secrets = get_all_secrets(
                &self.pool,
-                &input.namespace,
-                &input.kind,
                &input.name,
+                input.folder.as_deref(),
                &user_key,
                Some(user_id),
            )
@@ -478,22 +486,26 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_add",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
+            folder = input.folder.as_deref(),
+            entry_type = input.entry_type.as_deref(),
            "tool call start",
        );

        let tags = input.tags.unwrap_or_default();
        let meta = input.meta.unwrap_or_default();
        let secrets = input.secrets.unwrap_or_default();
+        let folder = input.folder.as_deref().unwrap_or("");
+        let entry_type = input.entry_type.as_deref().unwrap_or("");
+        let notes = input.notes.as_deref().unwrap_or("");

        let result = svc_add(
            &self.pool,
            AddParams {
-                namespace: &input.namespace,
-                kind: &input.kind,
                name: &input.name,
+                folder,
+                entry_type,
+                notes,
                tags: &tags,
                meta_entries: &meta,
                secret_entries: &secrets,
@@ -507,8 +519,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_add",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            elapsed_ms = t.elapsed().as_millis(),
            "tool call ok",
@@ -532,8 +542,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_update",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            "tool call start",
        );
@@ -548,9 +556,9 @@ impl SecretsService {
        let result = svc_update(
            &self.pool,
            UpdateParams {
-                namespace: &input.namespace,
-                kind: &input.kind,
                name: &input.name,
+                folder: input.folder.as_deref(),
+                notes: input.notes.as_deref(),
                add_tags: &add_tags,
                remove_tags: &remove_tags,
                meta_entries: &meta,
@@ -567,8 +575,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_update",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            elapsed_ms = t.elapsed().as_millis(),
            "tool call ok",
@@ -578,8 +584,8 @@ impl SecretsService {
    }

    #[tool(
-        description = "Delete one entry (specify namespace+kind+name) or bulk delete all \
-        entries matching namespace+kind. Use dry_run=true to preview.",
+        description = "Delete one entry by name, or bulk delete entries matching folder and/or type. \
+        Use dry_run=true to preview.",
        annotations(title = "Delete Secret Entry", destructive_hint = true)
    )]
    async fn secrets_delete(
@@ -592,9 +598,9 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_delete",
            ?user_id,
-            namespace = %input.namespace,
-            kind = input.kind.as_deref(),
            name = input.name.as_deref(),
+            folder = input.folder.as_deref(),
+            entry_type = input.entry_type.as_deref(),
            dry_run = input.dry_run.unwrap_or(false),
            "tool call start",
        );
@@ -602,9 +608,9 @@ impl SecretsService {
        let result = svc_delete(
            &self.pool,
            DeleteParams {
-                namespace: &input.namespace,
-                kind: input.kind.as_deref(),
                name: input.name.as_deref(),
+                folder: input.folder.as_deref(),
+                entry_type: input.entry_type.as_deref(),
                dry_run: input.dry_run.unwrap_or(false),
                user_id,
            },
@@ -615,7 +621,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_delete",
            ?user_id,
-            namespace = %input.namespace,
            elapsed_ms = t.elapsed().as_millis(),
            "tool call ok",
        );
@@ -642,17 +647,14 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_history",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            "tool call start",
        );

        let result = svc_history(
            &self.pool,
-            &input.namespace,
-            &input.kind,
            &input.name,
+            input.folder.as_deref(),
            input.limit.unwrap_or(20),
            user_id,
        )
@@ -684,8 +686,6 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_rollback",
            ?user_id,
-            namespace = %input.namespace,
-            kind = %input.kind,
            name = %input.name,
            to_version = input.to_version,
            "tool call start",
@@ -693,9 +693,8 @@ impl SecretsService {

        let result = svc_rollback(
            &self.pool,
-            &input.namespace,
-            &input.kind,
            &input.name,
+            input.folder.as_deref(),
            input.to_version,
            &user_key,
            Some(user_id),
@@ -734,8 +733,8 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_export",
            ?user_id,
-            namespace = input.namespace.as_deref(),
-            kind = input.kind.as_deref(),
+            folder = input.folder.as_deref(),
+            entry_type = input.entry_type.as_deref(),
            format,
            "tool call start",
        );
@@ -743,8 +742,8 @@ impl SecretsService {
        let data = svc_export(
            &self.pool,
            ExportParams {
-                namespace: input.namespace.as_deref(),
-                kind: input.kind.as_deref(),
+                folder: input.folder.as_deref(),
+                entry_type: input.entry_type.as_deref(),
                name: input.name.as_deref(),
                tags: &tags,
                query: input.query.as_deref(),
@@ -800,16 +799,16 @@ impl SecretsService {
        tracing::info!(
            tool = "secrets_env_map",
            ?user_id,
-            namespace = input.namespace.as_deref(),
-            kind = input.kind.as_deref(),
+            folder = input.folder.as_deref(),
+            entry_type = input.entry_type.as_deref(),
            prefix = input.prefix.as_deref().unwrap_or(""),
            "tool call start",
        );

        let env_map = secrets_core::service::env_map::build_env_map(
            &self.pool,
-            input.namespace.as_deref(),
-            input.kind.as_deref(),
+            input.folder.as_deref(),
+            input.entry_type.as_deref(),
            input.name.as_deref(),
            &tags,
            &only_fields,
--- a/crates/secrets-mcp/src/web.rs
+++ b/crates/secrets-mcp/src/web.rs
@@ -39,6 +39,15 @@ const SESSION_LOGIN_PROVIDER: &str = "login_provider";
 #[template(path = "login.html")]
 struct LoginTemplate {
    has_google: bool,
+    base_url: String,
+    version: &'static str,
+}
+
+#[derive(Template)]
+#[template(path = "home.html")]
+struct HomeTemplate {
+    is_logged_in: bool,
+    base_url: String,
    version: &'static str,
 }

@@ -134,7 +143,8 @@ pub fn web_router() -> Router<AppState> {
            "/.well-known/oauth-protected-resource",
            get(oauth_protected_resource_metadata),
        )
-        .route("/", get(login_page))
+        .route("/", get(home_page))
+        .route("/login", get(login_page))
        .route("/auth/google", get(auth_google))
        .route("/auth/google/callback", get(auth_google_callback))
        .route("/auth/logout", post(auth_logout))
@@ -188,6 +198,21 @@ async fn favicon_svg() -> Response {
        .expect("favicon response")
 }

+// ── Home page (public) ───────────────────────────────────────────────────────
+
+async fn home_page(
+    State(state): State<AppState>,
+    session: Session,
+) -> Result<Response, StatusCode> {
+    let is_logged_in = current_user_id(&session).await.is_some();
+    let tmpl = HomeTemplate {
+        is_logged_in,
+        base_url: state.base_url.clone(),
+        version: env!("CARGO_PKG_VERSION"),
+    };
+    render_template(tmpl)
+}
+
 // ── Login page ────────────────────────────────────────────────────────────────

 async fn login_page(
@@ -200,6 +225,7 @@ async fn login_page(

    let tmpl = LoginTemplate {
        has_google: state.google_config.is_some(),
+        base_url: state.base_url.clone(),
        version: env!("CARGO_PKG_VERSION"),
    };
    render_template(tmpl)
@@ -282,16 +308,16 @@ where
 {
    if let Some(err) = params.error {
        tracing::warn!(provider, error = %err, "OAuth error");
-        return Ok(Redirect::to("/?error=oauth_error").into_response());
+        return Ok(Redirect::to("/login?error=oauth_error").into_response());
    }

    let Some(code) = params.code else {
        tracing::warn!(provider, "OAuth callback missing code");
-        return Ok(Redirect::to("/?error=oauth_missing_code").into_response());
+        return Ok(Redirect::to("/login?error=oauth_missing_code").into_response());
    };
    let Some(returned_state) = params.state.as_deref() else {
        tracing::warn!(provider, "OAuth callback missing state");
-        return Ok(Redirect::to("/?error=oauth_missing_state").into_response());
+        return Ok(Redirect::to("/login?error=oauth_missing_state").into_response());
    };

    let expected_state: Option<String> = session.get(SESSION_OAUTH_STATE).await.map_err(|e| {
@@ -304,7 +330,7 @@ where
            expected_present = expected_state.is_some(),
            "OAuth state mismatch (empty session often means SameSite=Strict or server restart)"
        );
-        return Ok(Redirect::to("/?error=oauth_state").into_response());
+        return Ok(Redirect::to("/login?error=oauth_state").into_response());
    }
    if let Err(e) = session.remove::<String>(SESSION_OAUTH_STATE).await {
        tracing::warn!(provider, error = %e, "failed to remove oauth_state from session");
@@ -430,7 +456,7 @@ async fn dashboard(
    session: Session,
 ) -> Result<Response, StatusCode> {
    let Some(user_id) = current_user_id(&session).await else {
-        return Ok(Redirect::to("/").into_response());
+        return Ok(Redirect::to("/login").into_response());
    };

    let user = match get_user_by_id(&state.pool, user_id).await.map_err(|e| {
@@ -438,7 +464,7 @@ async fn dashboard(
        StatusCode::INTERNAL_SERVER_ERROR
    })? {
        Some(u) => u,
-        None => return Ok(Redirect::to("/").into_response()),
+        None => return Ok(Redirect::to("/login").into_response()),
    };

    let tmpl = DashboardTemplate {
@@ -457,7 +483,7 @@ async fn audit_page(
    session: Session,
 ) -> Result<Response, StatusCode> {
    let Some(user_id) = current_user_id(&session).await else {
-        return Ok(Redirect::to("/").into_response());
+        return Ok(Redirect::to("/login").into_response());
    };

    let user = match get_user_by_id(&state.pool, user_id).await.map_err(|e| {
@@ -465,7 +491,7 @@ async fn audit_page(
        StatusCode::INTERNAL_SERVER_ERROR
    })? {
        Some(u) => u,
-        None => return Ok(Redirect::to("/").into_response()),
+        None => return Ok(Redirect::to("/login").into_response()),
    };

    let rows = list_for_user(&state.pool, user_id, 100)
@@ -480,7 +506,7 @@ async fn audit_page(
        .map(|row| AuditEntryView {
            created_at_iso: row.created_at.to_rfc3339_opts(SecondsFormat::Secs, true),
            action: row.action,
-            target: format_audit_target(&row.namespace, &row.kind, &row.name),
+            target: format_audit_target(&row.folder, &row.entry_type, &row.name),
            detail: serde_json::to_string_pretty(&row.detail).unwrap_or_else(|_| "{}".to_string()),
        })
        .collect();
@@ -757,11 +783,15 @@ fn render_template<T: Template>(tmpl: T) -> Result<Response, StatusCode> {
    Ok(Html(html).into_response())
 }

-fn format_audit_target(namespace: &str, kind: &str, name: &str) -> String {
-    // Auth events reuse kind/name as a provider-scoped target, not an entry identity.
-    if namespace == "auth" {
-        format!("{}/{}", kind, name)
+fn format_audit_target(folder: &str, entry_type: &str, name: &str) -> String {
+    // Auth events (folder="auth") use entry_type/name as provider-scoped target.
+    if folder == "auth" {
+        format!("{}/{}", entry_type, name)
+    } else if !folder.is_empty() && !entry_type.is_empty() {
+        format!("[{}/{}] {}", folder, entry_type, name)
+    } else if !folder.is_empty() {
+        format!("[{}] {}", folder, name)
    } else {
-        format!("[{}/{}] {}", namespace, kind, name)
+        name.to_string()
    }
 }
--- a/crates/secrets-mcp/static/llms.txt
+++ b/crates/secrets-mcp/static/llms.txt
@@ -2,10 +2,15 @@

 > 给 AI 与自动化工具的简要说明。本站是 **secrets-mcp**：Streamable HTTP **MCP**（Model Context Protocol）与 **Web 控制台** 的组合，用于在多租户场景下存储条目元数据与加密后的秘密字段；持久化在 PostgreSQL。用户通过 OAuth（如已配置）登录 Web；MCP 调用使用 API Key 与加密相关请求头。

+## 公开页面
+
+- **`/`**：公开首页，说明安全架构（客户端密钥派生、密文存储、多租户与审计等），无需登录。
+
 ## 不应抓取或索引的内容

 - **`/mcp`**：MCP 流式 HTTP 端点（JSON-RPC 等），**不是** HTML 文档，也不适合作为公开知识库来源。
 - **`/api/*`**：会话或 API Key 相关的 HTTP API。
+- **`/login`**：登录入口页（`noindex` / robots 通常 disallow）。
 - **`/dashboard`、`/audit`、`/auth/*`、`/account/*`**：需浏览器会话，属于用户私有界面与 OAuth 流程。

 ## 给 AI 助手的实用提示
@@ -16,7 +21,7 @@

 ## 延伸阅读

- 开源仓库中的 `README.md`、`AGENTS.md`（若可访问）包含环境变量、表结构与运维约定。
+- 源码仓库：<https://gitea.refining.dev/refining/secrets>（`README.md`、`AGENTS.md` 含环境变量、表结构与运维约定）。

 ## 关于本文件

--- a/crates/secrets-mcp/static/robots.txt
+++ b/crates/secrets-mcp/static/robots.txt
@@ -8,8 +8,11 @@ Disallow: /api/
 Disallow: /dashboard
 Disallow: /audit
 Disallow: /auth/
+Disallow: /login
 Disallow: /account/

+# 首页 `/` 为公开安全说明页，允许抓取。
+
 # 面向 AI / LLM 的机器可读站点说明（Markdown）：/llms.txt
 # Human & AI-readable site summary: /llms.txt (also /ai.txt)

@@ -24,4 +27,5 @@ Disallow: /api/
 Disallow: /dashboard
 Disallow: /audit
 Disallow: /auth/
+Disallow: /login
 Disallow: /account/
--- a/crates/secrets-mcp/templates/home.html
+++ b/crates/secrets-mcp/templates/home.html
@@ -0,0 +1,269 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="Secrets MCP：基于 Model Context Protocol 的密钥与配置管理。密码短语在浏览器本地 PBKDF2 派生，密文 AES-GCM 存储，完整审计与历史版本。">
+    <meta name="keywords" content="secrets management,MCP,Model Context Protocol,end-to-end encryption,AES-GCM,PBKDF2,API key,密钥管理">
+    <meta name="robots" content="index, follow">
+    <link rel="canonical" href="{{ base_url }}/">
+    <link rel="icon" href="/favicon.svg?v={{ version }}" type="image/svg+xml">
+    <title>Secrets MCP — 端到端加密的密钥管理</title>
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="{{ base_url }}/">
+    <meta property="og:title" content="Secrets MCP — 端到端加密的密钥管理">
+    <meta property="og:description" content="密码短语客户端派生，密文存储；MCP API 与 Web 控制台，多租户与审计。">
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="Secrets MCP — 端到端加密的密钥管理">
+    <meta name="twitter:description" content="密码短语客户端派生，密文存储；MCP API 与 Web 控制台，多租户与审计。">
+    <style>
+        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
+        @import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@500;600&family=Inter:wght@400;500;600&display=swap');
+        :root {
+            --bg: #0d1117;
+            --surface: #161b22;
+            --surface2: #21262d;
+            --border: #30363d;
+            --text: #e6edf3;
+            --text-muted: #8b949e;
+            --accent: #58a6ff;
+            --accent-hover: #79b8ff;
+        }
+        html, body { height: 100%; overflow: hidden; }
+        @supports (height: 100dvh) {
+            html, body { height: 100dvh; }
+        }
+        body {
+            background: var(--bg);
+            color: var(--text);
+            font-family: 'Inter', sans-serif;
+            display: flex;
+            flex-direction: column;
+        }
+        .nav {
+            flex-shrink: 0;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            padding: 14px 24px;
+            border-bottom: 1px solid var(--border);
+            background: var(--surface);
+        }
+        .brand {
+            font-family: 'JetBrains Mono', monospace;
+            font-size: 15px;
+            font-weight: 600;
+            color: var(--text);
+            text-decoration: none;
+        }
+        .brand span { color: var(--accent); }
+        .nav-right { display: flex; align-items: center; gap: 14px; }
+        .lang-bar { display: flex; gap: 2px; background: rgba(255,255,255,0.04); border-radius: 6px; padding: 2px; }
+        .lang-btn {
+            padding: 4px 10px; border: none; background: none; color: var(--text-muted);
+            font-size: 12px; cursor: pointer; border-radius: 4px;
+        }
+        .lang-btn.active { background: var(--border); color: var(--text); }
+        .cta {
+            display: inline-flex; align-items: center; justify-content: center;
+            padding: 8px 18px; border-radius: 8px; font-size: 13px; font-weight: 600;
+            text-decoration: none; border: 1px solid var(--accent);
+            background: rgba(88, 166, 255, 0.12); color: var(--accent);
+            transition: background 0.15s, color 0.15s;
+        }
+        .cta:hover { background: var(--accent); color: var(--bg); }
+        .main {
+            flex: 1;
+            min-height: 0;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            padding: 16px 24px 12px;
+            gap: 20px;
+        }
+        .hero { text-align: center; max-width: 720px; }
+        .hero h1 { font-size: clamp(20px, 4vw, 28px); font-weight: 600; margin-bottom: 8px; line-height: 1.25; }
+        .hero .tagline { color: var(--text-muted); font-size: clamp(13px, 2vw, 15px); line-height: 1.5; }
+        .grid {
+            display: grid;
+            grid-template-columns: repeat(3, 1fr);
+            gap: 12px;
+            width: 100%;
+            max-width: 900px;
+        }
+        @media (max-width: 900px) {
+            .grid { grid-template-columns: repeat(2, 1fr); }
+        }
+        @media (max-width: 480px) {
+            .grid { grid-template-columns: 1fr; gap: 8px; }
+            .main { justify-content: flex-start; padding-top: 12px; }
+        }
+        .card {
+            background: var(--surface);
+            border: 1px solid var(--border);
+            border-radius: 10px;
+            padding: 14px 14px 12px;
+            min-height: 0;
+        }
+        .card-icon {
+            width: 32px; height: 32px; border-radius: 8px;
+            background: var(--surface2);
+            display: flex; align-items: center; justify-content: center;
+            margin-bottom: 10px; color: var(--accent);
+        }
+        .card-icon svg { width: 18px; height: 18px; }
+        .card h2 { font-size: 13px; font-weight: 600; margin-bottom: 6px; line-height: 1.3; }
+        .card p { font-size: 12px; color: var(--text-muted); line-height: 1.45; }
+        .foot {
+            flex-shrink: 0;
+            text-align: center;
+            padding: 8px 16px 12px;
+            font-size: 11px;
+            color: var(--text-muted);
+            border-top: 1px solid var(--border);
+            background: var(--surface);
+        }
+        .foot a { color: var(--accent); text-decoration: none; }
+        .foot a:hover { text-decoration: underline; }
+    </style>
+</head>
+<body>
+    <header class="nav">
+        <a class="brand" href="/">secrets<span>-mcp</span></a>
+        <div class="nav-right">
+            <div class="lang-bar">
+                <button type="button" class="lang-btn" onclick="setLang('zh-CN')">简</button>
+                <button type="button" class="lang-btn" onclick="setLang('zh-TW')">繁</button>
+                <button type="button" class="lang-btn" onclick="setLang('en')">EN</button>
+            </div>
+            {% if is_logged_in %}
+            <a class="cta" href="/dashboard" data-i18n="ctaDashboard">进入控制台</a>
+            {% else %}
+            <a class="cta" href="/login" data-i18n="ctaLogin">登录</a>
+            {% endif %}
+        </div>
+    </header>
+    <main class="main">
+        <div class="hero">
+            <h1 data-i18n="heroTitle">端到端加密的密钥与配置管理</h1>
+            <p class="tagline" data-i18n="heroTagline">Streamable HTTP MCP 与 Web 控制台：元数据与密文分库存储，密钥永不离开你的客户端逻辑。</p>
+        </div>
+        <div class="grid">
+            <article class="card">
+                <div class="card-icon" aria-hidden="true">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 11c1.66 0 3-1.34 3-3V5c0-1.66-1.34-3-3-3S9 3.34 9 5v3c0 1.66 1.34 3 3 3z"/><path d="M19 10v1a7 7 0 01-14 0v-1"/><path d="M12 14v7M9 18h6"/></svg>
+                </div>
+                <h2 data-i18n="c1t">客户端密钥派生</h2>
+                <p data-i18n="c1d">PBKDF2-SHA256（约 60 万次）在浏览器本地从密码短语派生密钥；服务端仅保存盐与校验值，不持有密码或明文主密钥。</p>
+            </article>
+            <article class="card">
+                <div class="card-icon" aria-hidden="true">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg>
+                </div>
+                <h2 data-i18n="c2t">AES-256-GCM 加密</h2>
+                <p data-i18n="c2d">敏感字段以 AES-GCM 密文落库；Web 端在本地加解密，明文默认不经过服务端持久化。</p>
+            </article>
+            <article class="card">
+                <div class="card-icon" aria-hidden="true">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><path d="M14 2v6h6M16 13H8M16 17H8M10 9H8"/></svg>
+                </div>
+                <h2 data-i18n="c3t">审计与历史</h2>
+                <p data-i18n="c3d">操作写入审计日志；条目与密文保留历史版本，支持按版本查看与恢复。</p>
+            </article>
+        </div>
+    </main>
+    <footer class="foot">
+        <span data-i18n="versionLabel">版本</span> {{ version }} ·
+        <a href="/llms.txt">llms.txt</a>
+        <span data-i18n="sep"> · </span>
+        <a href="https://gitea.refining.dev/refining/secrets" target="_blank" rel="noopener noreferrer" data-i18n="footRepo">源码仓库</a>
+        {% if !is_logged_in %}
+        <span data-i18n="sep"> · </span>
+        <a href="/login" data-i18n="footLogin">登录</a>
+        {% endif %}
+    </footer>
+    <script>
+    const T = {
+        'zh-CN': {
+            docTitle: 'Secrets MCP — 端到端加密的密钥管理',
+            ctaDashboard: '进入控制台',
+            ctaLogin: '登录',
+            heroTitle: '端到端加密的密钥与配置管理',
+            heroTagline: 'Streamable HTTP MCP 与 Web 控制台：元数据与密文分库存储，密钥永不离开你的客户端逻辑。',
+            c1t: '客户端密钥派生',
+            c1d: 'PBKDF2-SHA256（约 60 万次）在浏览器本地从密码短语派生密钥；服务端仅保存盐与校验值，不持有密码或明文主密钥。',
+            c2t: 'AES-256-GCM 加密',
+            c2d: '敏感字段以 AES-GCM 密文落库；Web 端在本地加解密，明文默认不经过服务端持久化。',
+            c3t: '审计与历史',
+            c3d: '操作写入审计日志；条目与密文保留历史版本，支持按版本查看与恢复。',
+            versionLabel: '版本',
+            sep: ' · ',
+            footRepo: '源码仓库',
+            footLogin: '登录',
+        },
+        'zh-TW': {
+            docTitle: 'Secrets MCP — 端到端加密的金鑰管理',
+            ctaDashboard: '進入控制台',
+            ctaLogin: '登入',
+            heroTitle: '端到端加密的金鑰與設定管理',
+            heroTagline: 'Streamable HTTP MCP 與 Web 控制台：中繼資料與密文分庫儲存，金鑰不離開你的用戶端邏輯。',
+            c1t: '用戶端金鑰派生',
+            c1d: 'PBKDF2-SHA256（約 60 萬次）在瀏覽器本地從密碼片語派生金鑰；伺服端僅保存鹽與校驗值，不持有密碼或明文主金鑰。',
+            c2t: 'AES-256-GCM 加密',
+            c2d: '敏感欄位以 AES-GCM 密文落庫；Web 端在本地加解密，明文預設不經伺服端持久化。',
+            c3t: '稽核與歷史',
+            c3d: '操作寫入稽核日誌；條目與密文保留歷史版本，支援依版本檢視與還原。',
+            versionLabel: '版本',
+            sep: ' · ',
+            footRepo: '原始碼倉庫',
+            footLogin: '登入',
+        },
+        'en': {
+            docTitle: 'Secrets MCP — End-to-end encrypted secrets',
+            ctaDashboard: 'Open dashboard',
+            ctaLogin: 'Sign in',
+            heroTitle: 'End-to-end encrypted secrets and configuration',
+            heroTagline: 'Streamable HTTP MCP plus web console: metadata and ciphertext stored separately; keys stay on your client.',
+            c1t: 'Client-side key derivation',
+            c1d: 'PBKDF2-SHA256 (~600k iterations) derives keys from your passphrase in the browser; the server stores only salt and a verification blob, never your password or raw master key.',
+            c2t: 'AES-256-GCM',
+            c2d: 'Secret fields are stored as AES-GCM ciphertext; the web UI encrypts and decrypts locally so plaintext is not persisted server-side by default.',
+            c3t: 'Audit and history',
+            c3d: 'Operations are audited; entries and secrets keep version history for review and rollback.',
+            versionLabel: 'Version',
+            sep: ' · ',
+            footRepo: 'Source repository',
+            footLogin: 'Sign in',
+        }
+    };
+
+    let currentLang = localStorage.getItem('lang') || 'zh-CN';
+
+    function t(key) {
+        return (T[currentLang] && T[currentLang][key]) || T['en'][key] || key;
+    }
+
+    function applyLang() {
+        document.documentElement.lang = currentLang;
+        document.title = t('docTitle');
+        document.querySelectorAll('[data-i18n]').forEach(el => {
+            const key = el.getAttribute('data-i18n');
+            el.textContent = t(key);
+        });
+        document.querySelectorAll('.lang-btn').forEach(btn => {
+            const map = { 'zh-CN': '简', 'zh-TW': '繁', 'en': 'EN' };
+            btn.classList.toggle('active', btn.textContent === map[currentLang]);
+        });
+    }
+
+    function setLang(lang) {
+        currentLang = lang;
+        localStorage.setItem('lang', lang);
+        applyLang();
+    }
+
+    applyLang();
+    </script>
+</body>
+</html>
--- a/crates/secrets-mcp/templates/login.html
+++ b/crates/secrets-mcp/templates/login.html
@@ -3,8 +3,19 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="robots" content="noindex, follow">
+    <meta name="description" content="登录 Secrets MCP Web 控制台，安全管理跨设备加密 secrets。">
+    <meta name="keywords" content="Secrets MCP,登录,OAuth,密钥管理">
+    <link rel="canonical" href="{{ base_url }}/login">
    <link rel="icon" href="/favicon.svg?v={{ version }}" type="image/svg+xml">
-    <title>Secrets — Sign In</title>
+    <title>登录 — Secrets MCP</title>
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="{{ base_url }}/login">
+    <meta property="og:title" content="登录 — Secrets MCP">
+    <meta property="og:description" content="登录 Web 控制台，管理加密存储的密钥与配置。">
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:title" content="登录 — Secrets MCP">
+    <meta name="twitter:description" content="登录 Web 控制台，管理加密存储的密钥与配置。">
    <style>
        *, *::before, *::after { box-sizing: border-box; margin: 0; padding: 0; }
        @import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap');
@@ -17,6 +28,7 @@
            --accent: #58a6ff;
            --accent-hover: #79b8ff;
            --google: #4285f4;
+            --danger: #f85149;
        }
        body { background: var(--bg); color: var(--text); font-family: 'Inter', sans-serif;
               min-height: 100vh; display: flex; align-items: center; justify-content: center; }
@@ -25,11 +37,24 @@
            padding: 48px 40px; width: 100%; max-width: 400px;
            box-shadow: 0 8px 32px rgba(0,0,0,0.4);
        }
-        .topbar { display: flex; justify-content: flex-end; margin-bottom: 20px; }
-        .lang-bar { display: flex; gap: 2px; background: rgba(255,255,255,0.04); border-radius: 6px; padding: 2px; }
+        .topbar { display: flex; justify-content: space-between; align-items: flex-start; margin-bottom: 20px; gap: 12px; }
+        .back-home {
+            font-size: 13px; color: var(--accent); text-decoration: none; white-space: nowrap;
+        }
+        .back-home:hover { text-decoration: underline; }
+        .lang-bar { display: flex; gap: 2px; background: rgba(255,255,255,0.04); border-radius: 6px; padding: 2px; flex-shrink: 0; }
        .lang-btn { padding: 3px 9px; border: none; background: none; color: var(--text-muted);
                    font-size: 12px; cursor: pointer; border-radius: 4px; }
        .lang-btn.active { background: var(--border); color: var(--text); }
+        .oauth-alert {
+            display: none;
+            margin-bottom: 16px; padding: 10px 12px; border-radius: 8px;
+            font-size: 13px; line-height: 1.4;
+            background: rgba(248, 81, 73, 0.12);
+            border: 1px solid rgba(248, 81, 73, 0.35);
+            color: #ffa198;
+        }
+        .oauth-alert.visible { display: block; }
        h1 { font-size: 22px; font-weight: 600; margin-bottom: 8px; }
        .subtitle { color: var(--text-muted); font-size: 14px; margin-bottom: 32px; }
        .btn {
@@ -48,12 +73,14 @@
 <body>
    <div class="card">
        <div class="topbar">
+            <a class="back-home" href="/" data-i18n="backHome">返回首页</a>
            <div class="lang-bar">
-                <button class="lang-btn" onclick="setLang('zh-CN')">简</button>
-                <button class="lang-btn" onclick="setLang('zh-TW')">繁</button>
-                <button class="lang-btn" onclick="setLang('en')">EN</button>
+                <button type="button" class="lang-btn" onclick="setLang('zh-CN')">简</button>
+                <button type="button" class="lang-btn" onclick="setLang('zh-TW')">繁</button>
+                <button type="button" class="lang-btn" onclick="setLang('en')">EN</button>
            </div>
        </div>
+        <div id="oauth-alert" class="oauth-alert" role="alert"></div>
        <h1 data-i18n="title">登录</h1>
        <p class="subtitle" data-i18n="subtitle">安全管理你的跨设备 secrets。</p>

@@ -78,22 +105,40 @@
    <script>
    const T = {
        'zh-CN': {
+            docTitle: '登录 — Secrets MCP',
+            backHome: '返回首页',
            title: '登录',
            subtitle: '安全管理你的跨设备 secrets。',
            google: '使用 Google 登录',
            noProviders: '未配置登录方式，请联系管理员。',
+            err_oauth_error: '登录失败：授权提供方返回错误，请重试。',
+            err_oauth_missing_code: '登录失败：未收到授权码，请重试。',
+            err_oauth_missing_state: '登录失败：缺少安全校验参数，请重试。',
+            err_oauth_state: '登录失败：会话校验不匹配（可能因 Cookie 策略或服务器重启）。请返回首页再试。',
        },
        'zh-TW': {
+            docTitle: '登入 — Secrets MCP',
+            backHome: '返回首頁',
            title: '登入',
            subtitle: '安全管理你的跨裝置 secrets。',
            google: '使用 Google 登入',
            noProviders: '尚未設定登入方式，請聯絡管理員。',
+            err_oauth_error: '登入失敗：授權方回傳錯誤，請再試一次。',
+            err_oauth_missing_code: '登入失敗：未取得授權碼，請再試一次。',
+            err_oauth_missing_state: '登入失敗：缺少安全校驗參數，請再試一次。',
+            err_oauth_state: '登入失敗：工作階段校驗不符（可能與 Cookie 政策或伺服器重啟有關）。請回到首頁再試。',
        },
        'en': {
+            docTitle: 'Sign in — Secrets MCP',
+            backHome: 'Back to home',
            title: 'Sign in',
            subtitle: 'Manage your cross-device secrets securely.',
            google: 'Continue with Google',
            noProviders: 'No login providers configured. Please contact your administrator.',
+            err_oauth_error: 'Sign-in failed: the identity provider returned an error. Please try again.',
+            err_oauth_missing_code: 'Sign-in failed: no authorization code was returned. Please try again.',
+            err_oauth_missing_state: 'Sign-in failed: missing security state. Please try again.',
+            err_oauth_state: 'Sign-in failed: session state mismatch (often cookies or server restart). Open the home page and try again.',
        }
    };

@@ -101,8 +146,23 @@

    function t(key) { return T[currentLang][key] || T['en'][key] || key; }

+    function showOAuthError() {
+        const params = new URLSearchParams(window.location.search);
+        const code = params.get('error');
+        const el = document.getElementById('oauth-alert');
+        if (!code || !code.startsWith('oauth_')) {
+            el.classList.remove('visible');
+            el.textContent = '';
+            return;
+        }
+        const key = 'err_' + code;
+        el.textContent = t(key) || t('err_oauth_error');
+        el.classList.add('visible');
+    }
+
    function applyLang() {
        document.documentElement.lang = currentLang;
+        document.title = t('docTitle');
        document.querySelectorAll('[data-i18n]').forEach(el => {
            const key = el.getAttribute('data-i18n');
            el.textContent = t(key);
@@ -111,6 +171,7 @@
            const map = { 'zh-CN': '简', 'zh-TW': '繁', 'en': 'EN' };
            btn.classList.toggle('active', btn.textContent === map[currentLang]);
        });
+        showOAuthError();
    }

    function setLang(lang) {
--- a/deploy/.env.example
+++ b/deploy/.env.example
@@ -22,6 +22,9 @@ GOOGLE_CLIENT_SECRET=
 # WECHAT_APP_CLIENT_ID=
 # WECHAT_APP_CLIENT_SECRET=

+# ─── 日志（可选）──────────────────────────────────────────────────────
+# RUST_LOG=secrets_mcp=debug
+
 # ─── 注意 ─────────────────────────────────────────────────────────────
 # SERVER_MASTER_KEY 已不再需要。
 # 新架构（E2EE）中，加密密钥由用户密码短语在客户端本地派生，服务端不持有原始密钥。
--- a/scripts/migrate-v0.3.0.sql
+++ b/scripts/migrate-v0.3.0.sql
@@ -0,0 +1,194 @@
+-- ============================================================================
+-- migrate-v0.3.0.sql
+-- Schema migration from v0.2.x → v0.3.0
+--
+-- Changes:
+--   • entries:         namespace → folder, kind → type; add notes column
+--   • audit_log:       namespace → folder, kind → type
+--   • entries_history: namespace → folder, kind → type; add user_id column
+--   • Unique index: (user_id, name) → (user_id, folder, name)
+--     Same name in different folders is now allowed; no rename needed.
+--
+-- Safe to run multiple times (fully idempotent).
+-- Preserves all data in users, entries, secrets.
+-- ============================================================================
+
+BEGIN;
+
+-- ── entries: rename namespace→folder, kind→type ──────────────────────────────
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries' AND column_name = 'namespace'
+    ) THEN
+        ALTER TABLE entries RENAME COLUMN namespace TO folder;
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries' AND column_name = 'kind'
+    ) THEN
+        ALTER TABLE entries RENAME COLUMN kind TO type;
+    END IF;
+END $$;
+
+-- Set NOT NULL + default for folder/type in entries
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries' AND column_name = 'folder'
+    ) THEN
+        UPDATE entries SET folder = '' WHERE folder IS NULL;
+        ALTER TABLE entries ALTER COLUMN folder SET NOT NULL;
+        ALTER TABLE entries ALTER COLUMN folder SET DEFAULT '';
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries' AND column_name = 'type'
+    ) THEN
+        UPDATE entries SET type = '' WHERE type IS NULL;
+        ALTER TABLE entries ALTER COLUMN type SET NOT NULL;
+        ALTER TABLE entries ALTER COLUMN type SET DEFAULT '';
+    END IF;
+END $$;
+
+-- Add notes column to entries if missing
+ALTER TABLE entries ADD COLUMN IF NOT EXISTS notes TEXT NOT NULL DEFAULT '';
+
+-- ── audit_log: rename namespace→folder, kind→type ────────────────────────────
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'audit_log' AND column_name = 'namespace'
+    ) THEN
+        ALTER TABLE audit_log RENAME COLUMN namespace TO folder;
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'audit_log' AND column_name = 'kind'
+    ) THEN
+        ALTER TABLE audit_log RENAME COLUMN kind TO type;
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'audit_log' AND column_name = 'folder'
+    ) THEN
+        UPDATE audit_log SET folder = '' WHERE folder IS NULL;
+        ALTER TABLE audit_log ALTER COLUMN folder SET NOT NULL;
+        ALTER TABLE audit_log ALTER COLUMN folder SET DEFAULT '';
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'audit_log' AND column_name = 'type'
+    ) THEN
+        UPDATE audit_log SET type = '' WHERE type IS NULL;
+        ALTER TABLE audit_log ALTER COLUMN type SET NOT NULL;
+        ALTER TABLE audit_log ALTER COLUMN type SET DEFAULT '';
+    END IF;
+END $$;
+
+ALTER TABLE audit_log DROP COLUMN IF EXISTS actor;
+
+-- ── entries_history: rename namespace→folder, kind→type; add user_id ─────────
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries_history' AND column_name = 'namespace'
+    ) THEN
+        ALTER TABLE entries_history RENAME COLUMN namespace TO folder;
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries_history' AND column_name = 'kind'
+    ) THEN
+        ALTER TABLE entries_history RENAME COLUMN kind TO type;
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries_history' AND column_name = 'folder'
+    ) THEN
+        UPDATE entries_history SET folder = '' WHERE folder IS NULL;
+        ALTER TABLE entries_history ALTER COLUMN folder SET NOT NULL;
+        ALTER TABLE entries_history ALTER COLUMN folder SET DEFAULT '';
+    END IF;
+END $$;
+
+DO $$ BEGIN
+    IF EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'entries_history' AND column_name = 'type'
+    ) THEN
+        UPDATE entries_history SET type = '' WHERE type IS NULL;
+        ALTER TABLE entries_history ALTER COLUMN type SET NOT NULL;
+        ALTER TABLE entries_history ALTER COLUMN type SET DEFAULT '';
+    END IF;
+END $$;
+
+ALTER TABLE entries_history ADD COLUMN IF NOT EXISTS user_id UUID;
+ALTER TABLE entries_history DROP COLUMN IF EXISTS actor;
+
+-- ── secrets_history: drop actor column ───────────────────────────────────────
+ALTER TABLE secrets_history DROP COLUMN IF EXISTS actor;
+
+-- ── Rebuild unique indexes: (user_id, folder, name) ──────────────────────────
+-- Note: folder is now part of the key, so same name in different folders is
+-- naturally distinct — no rename of existing rows needed.
+DROP INDEX IF EXISTS idx_entries_unique_legacy;
+DROP INDEX IF EXISTS idx_entries_unique_user;
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_legacy
+    ON entries(folder, name)
+    WHERE user_id IS NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_entries_unique_user
+    ON entries(user_id, folder, name)
+    WHERE user_id IS NOT NULL;
+
+-- ── Replace old namespace/kind indexes with folder/type ──────────────────────
+DROP INDEX IF EXISTS idx_entries_namespace;
+DROP INDEX IF EXISTS idx_entries_kind;
+DROP INDEX IF EXISTS idx_audit_log_ns_kind;
+DROP INDEX IF EXISTS idx_entries_history_ns_kind_name;
+
+CREATE INDEX IF NOT EXISTS idx_entries_folder
+    ON entries(folder) WHERE folder <> '';
+CREATE INDEX IF NOT EXISTS idx_entries_type
+    ON entries(type) WHERE type <> '';
+CREATE INDEX IF NOT EXISTS idx_entries_user_id
+    ON entries(user_id) WHERE user_id IS NOT NULL;
+CREATE INDEX IF NOT EXISTS idx_audit_log_folder_type
+    ON audit_log(folder, type);
+CREATE INDEX IF NOT EXISTS idx_entries_history_folder_type_name
+    ON entries_history(folder, type, name, version DESC);
+CREATE INDEX IF NOT EXISTS idx_entries_history_user_id
+    ON entries_history(user_id) WHERE user_id IS NOT NULL;
+
+COMMIT;
+
+-- ── Verification queries (run these manually to confirm) ─────────────────────
+-- SELECT column_name, data_type FROM information_schema.columns
+--   WHERE table_name = 'entries' ORDER BY ordinal_position;
+-- SELECT indexname, indexdef FROM pg_indexes WHERE tablename = 'entries';
+-- SELECT COUNT(*) FROM entries;
+-- SELECT COUNT(*) FROM users;
+-- SELECT COUNT(*) FROM secrets;
Author	SHA1	Message	Date
voson	409fd78a35	Release secrets-mcp 0.3.0: folder/type schema and MCP folder disambiguation All checks were successful Secrets MCP — Build & Release / 检查 / 构建 / 发版 (push) Successful in 3m39s Details Secrets MCP — Build & Release / 部署 secrets-mcp (push) Successful in 5s Details - Rename namespace/kind to folder/type on entries, audit_log, and history tables; add notes. Unique key is (user_id, folder, name). - Service layer and MCP tools support name-first lookup with optional folder when multiple entries share the same name. - secrets_delete dry_run uses the same disambiguation as real deletes. - Add scripts/migrate-v0.3.0.sql for manual DB migration. Refresh README and AGENTS.md. Made-with: Cursor	2026-03-26 15:12:28 +08:00
voson	f7afd7f819	docs: 同步 CI 触发路径、覆盖式 tag/Release 说明与 RUST_LOG 示例 All checks were successful Secrets MCP — Build & Release / 检查 / 构建 / 发版 (push) Successful in 2m11s Details Secrets MCP — Build & Release / 部署 secrets-mcp (push) Successful in 5s Details - AGENTS.md / README：与 workflow 变更路径、远端 tag 覆盖及非 draft Release 行为一致 - deploy/.env.example：补充可选 RUST_LOG 注释 Made-with: Cursor	2026-03-22 16:15:29 +08:00
voson	719bdd7e08	feat(secrets-mcp): public home at /, login at /login (0.2.2) All checks were successful Secrets MCP — Build & Release / 检查 / 构建 / 发版 (push) Successful in 3m17s Details Secrets MCP — Build & Release / 部署 secrets-mcp (push) Successful in 5s Details Bump secrets-mcp to 0.2.2 and sync Cargo.lock. Add home.html landing with SEO and footer link to the refining/secrets repository; serve it at / and expose /login for sign-in. Update OAuth error redirects and dashboard unauthenticated redirects to /login. Improve login page meta tags, back-home link, and OAuth error alert. Refresh llms.txt and robots.txt. Made-with: Cursor	2026-03-22 16:11:59 +08:00